New commits:
commit bd35fa90f5c73dedc8ca654f223167ea6d9e3809
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gdbm: => 1.9.1
commit b3f0f070900b0437c8a7664345ba33923cc8fba2
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
openoffice: it conflicts with libreoffice-bin
commit b32808619d6b9a3fa42ad0bf770a4c7fad7e6eef
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
miro 4.0.3
commit 5cd1caca331425cfee84b7d005c4a0821938aa5e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
firefox 6.0
switched to system nspr and nss
fails with internal nss, linux 3 problem, fixed in new nss:
make[6]: Entering directory
`/usr/src/firefox-6.0/mozilla-release/security/dbm'
../coreconf/config.mk:71: ../coreconf/Linux3.0.mk: No such file or
directory
/usr/bin/make -j1: *** No rule to make target ../coreconf/Linux3.0.mk.
Stop.
make[6]: *** [../coreconf/Linux3.0.mk] Error 1
commit 703ea6cfc80e5a36ecfd29419bff1bc52545f30c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
jinja2: => 2.6
commit ac04e0197abf5322438b15973c2743c324d8286a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
xxxterm 1.489
commit 715553c49d4047cf10796d2d6d4a99ade1b2c551
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
commit 71968a228c8901615731fea4f0d87fb6a9c04cc0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
seamonkey 2.3
commit a1808c91ef8bb74c2f68ec4b5e5528da28d64910
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
devel/sas: new spell, pure POSIX shell assembler
commit efe58655a850c9ab124573b14ba24219e7c8784c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
links-twibright 2.3
diff --git a/ChangeLog b/ChangeLog
index 834e04d..517190d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-08-15 Justin Boffemmyer <flux AT sourcemage.org>
+ * devel/sas: new spell, pure POSIX shell-implemented assembler
+
2011-08-12 Ladislav Hagara <hgr AT vabo.cz>
* crypto/polarssl: new spell, embedded SSL/TLS cryptographic library
diff --git a/devel/sas/BUILD b/devel/sas/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/devel/sas/BUILD
@@ -0,0 +1 @@
+true
diff --git a/devel/sas/DEPENDS b/devel/sas/DEPENDS
new file mode 100755
index 0000000..457fdb9
--- /dev/null
+++ b/devel/sas/DEPENDS
@@ -0,0 +1 @@
+runtime_depends coreutils
diff --git a/devel/sas/DETAILS b/devel/sas/DETAILS
new file mode 100755
index 0000000..1d2deca
--- /dev/null
+++ b/devel/sas/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=sas
+ VERSION=SCM
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]="git://gitorious.org/$SPELL/$SPELL.git"
+ WEB_SITE="http://gitorious.org/$SPELL/"
+ ENTERED=20110815
+ LICENSE[0]="BSD"
+ DOCS="LICENSE API CREDITS Roadmap"
+ SHORT="shell assembler"
+cat << EOF
+sas is a Shell ASsembler written in pure POSIX shell. It is tested under
+various shells to ensure that it has few to no bashisms and is portable as
+possible. There is a logically separated assembler core and separate ISA
+instruction set files (e.g. x86.set). It assembles much slower than native
+assemblers (such as nasm, yasm, gas, etc.), but is much smaller and its only
+dependencies are a functioning shell, tr, printf, and cat, so it might be
+useful in constrained systems (penetration testing, embedded, educational,
+etc.).
+EOF
diff --git a/devel/sas/HISTORY b/devel/sas/HISTORY
new file mode 100644
index 0000000..c9c6fc2
--- /dev/null
+++ b/devel/sas/HISTORY
@@ -0,0 +1,3 @@
+2011-08-15 Justin Boffemmyer <flux AT sourcemage.org>
+ * ALL: spell created
+
diff --git a/devel/sas/INSTALL b/devel/sas/INSTALL
new file mode 100755
index 0000000..9965737
--- /dev/null
+++ b/devel/sas/INSTALL
@@ -0,0 +1,47 @@
+# path where the scripts and data will be based
+install_path="$INSTALL_ROOT"
+# strip any unnecessary trailing '/' from install_path
+install_path="${install_path%/}"
+
+#--------------
+# installation functions
+#--------------
+function install_dir() {
+ local dir="$1"
+ local dest="${2:-$install_path}"
+
+ # create the directory
+ install -v -d -m 0755 "$dest/$dir"
+}
+
+function install_dir_files() {
+ local dir="$1"
+ local dest="${2:-$install_path}"
+
+ # install all the files in the provided dir (no child directories)
+ find "$dir" -maxdepth 1 -type f -exec install -v -m 0644 -t "$dest" '{}' \;
+}
+
+function install_dir_single() {
+ local dir="$1"
+ local dest="${2:-$install_path}"
+
+ # create the directory
+ install_dir "$dir" "$dest" &&
+
+ # install all the files in it (no child directories)
+ install_dir_files "$dir" "$dest/$dir"
+}
+
+archdir="$install_path/usr/share/sas" &&
+
+install_dir_single arch "$install_path/usr/share/sas" &&
+
+# modify the default search path for the ISA files
+sed -i '/SAS_ARCH_DIR="${0.*"/d' sas.sh &&
+sed -i '/\[ -d "$SAS_ARCH_DIR".*/d' sas.sh &&
+sed -i 's#\(SAS_ARCH_DIR="\)${SAS_ARCH_DIR}#\1'"$archdir"'#' sas.sh &&
+
+# install main sas.sh script as usr/bin/sas
+install -v -m 0755 sas.sh "$install_path/usr/bin/sas"
+
diff --git a/editors/openoffice/CONFLICTS b/editors/openoffice/CONFLICTS
index e57273a..a088dca 100755
--- a/editors/openoffice/CONFLICTS
+++ b/editors/openoffice/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts libreoffice-bin &&
conflicts openoffice-bin &&
conflicts openoffice2-bin &&
conflicts openoffice3-bin
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 423e4f8..0fadeb4 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,6 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with libreoffice-bin
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on gcj to dependency on gcc with
sub-depends on JAVA (scripted)
diff --git a/firefox.gpg b/firefox.gpg
index 689944e..5e2a27c 100644
Binary files a/firefox.gpg and b/firefox.gpg differ
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index c933eea..a9ac203 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=5.0.1
+ VERSION=6.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY