New commits:
commit cb21172ec7655d13b733e2e22bd1f9144425eb07
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kde4-bindings-profile: perlqt -> perlqt4
commit c67e1531d9f76f126c7205b4060c3241e38200bd
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>
kde4-bindings/perlqt -> perlqt4: to avoid duplicated spells
commit 23418ae0385f951a7c583d400ac172113f87b3a9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
apr-util: corrected info message color
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
diff --git a/ChangeLog b/ChangeLog
index b13b754..14fe061 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * kde4-bindings/perlqt -> perlqt4: to avoid duplicated spells
+
2011-08-15 Justin Boffemmyer <flux AT sourcemage.org>
* devel/sas: new spell, pure POSIX shell-implemented assembler
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/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
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=5.0.1
+ VERSION=6.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 53c87c2..a1e4dc4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2011-08-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 6.0
+ * mozconfig5: --with-system-nspr and --with-system-nss added
+
2011-08-06 George Sherwood <gsherwood AT sourcemage.org>
* CONFIGURE: Added option for safe browsing
* DEPENDS: Added optional depends yasm removed depends yasm
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig5
index 25aef0c..9e9d2f0 100644
--- a/http/firefox/mozconfig5
+++ b/http/firefox/mozconfig5
@@ -18,6 +18,8 @@ ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-freetype2
ac_add_options --enable-pango
ac_add_options --enable-svg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
ac_add_options --disable-dbus
ac_add_options --disable-installer
ac_add_options --disable-updater
diff --git a/kde4-bindings/kde4-bindings-profile/DEPENDS
b/kde4-bindings/kde4-bindings-profile/DEPENDS
index 9194a8b..43e7d19 100755
--- a/kde4-bindings/kde4-bindings-profile/DEPENDS
+++ b/kde4-bindings/kde4-bindings-profile/DEPENDS
@@ -5,7 +5,7 @@ optional_depends qyoto "" "" ".NET/Mono bindings for the Qt
libraries." &&
optional_depends smokekde "" "" "SMOKE bindings for libraries created by the
KDE community. Used by language bindings." &&
optional_depends kimono "" "" ".NET/Mono bindings for the KDE libraries." &&
optional_depends kross-interpreters "" "" "Language interpreters to enable
in-process scripting with Kross." &&
-optional_depends perlqt "" "" "Perl bindings for the Qt libraries." &&
+optional_depends perlqt4 "" "" "Perl bindings for the Qt libraries." &&
optional_depends qtruby "" "" "Ruby bindings for the Qt libraries." &&
optional_depends smokegen "" "" "A general purpose C++ parser with a plugin
infrastructure enabling 'generators'" &&
optional_depends smokeqt "" "" "SMOKE bindings for the Qt libraries. Used by
language bindings."
\ No newline at end of file
diff --git a/kde4-bindings/kde4-bindings-profile/HISTORY
b/kde4-bindings/kde4-bindings-profile/HISTORY
index 4919f50..21accf7 100644
--- a/kde4-bindings/kde4-bindings-profile/HISTORY
+++ b/kde4-bindings/kde4-bindings-profile/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: perlqt -> perlqt4
+
2011-08-15 Bor Kraljič <pyrobor AT ver.si>
* CONFLICTS: it conflicts with kdebindings4
* BUILD, CONFLICTS, DEPENDS, DETAILS, FINAL, INSTALL, PRE_BUILD:
added missing HISTORY file
diff --git a/kde4-bindings/perlqt/CONFIGURE b/kde4-bindings/perlqt/CONFIGURE
deleted file mode 100755
index 3e2e1ef..0000000
--- a/kde4-bindings/perlqt/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4-bindings/perlqt/CONFLICTS b/kde4-bindings/perlqt/CONFLICTS
deleted file mode 100755
index 3697608..0000000
--- a/kde4-bindings/perlqt/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/perlqt/DEPENDS b/kde4-bindings/perlqt/DEPENDS
deleted file mode 100755
index b4b4f02..0000000
--- a/kde4-bindings/perlqt/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde4-bindings/perlqt/DETAILS b/kde4-bindings/perlqt/DETAILS
deleted file mode 100755
index add074d..0000000
--- a/kde4-bindings/perlqt/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
- SPELL=perlqt
- VERSION=4.7.0
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:18a4a7f156059afac0e92f5716c32f0920fb6a4598fa93ca68500293afeabd893a5828644ae2d036035ec5b6bf621e857e65b9f58e5ca6ece09e304cc9a4664e
- SOURCE_URL=$KDE_URL/stable/$VERSION/src/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.kde.org
- ENTERED=20110804
- LICENSE[0]=GPL
- KEYWORDS="kde4"
- SHORT="Perl bindings for the Qt libraries."
-cat << EOF
-Perl bindings for the Qt libraries.
-EOF
diff --git a/kde4-bindings/perlqt/HISTORY b/kde4-bindings/perlqt/HISTORY
deleted file mode 100644
index f032151..0000000
--- a/kde4-bindings/perlqt/HISTORY
+++ /dev/null
@@ -1,6 +0,0 @@
-2011-08-15 Bor Kraljič <pyrobor AT ver.si>
- * CONFLICTS: it conflicts with kdebindings4
-
-2011-08-04 Bor Kraljič <pyrobor AT ver.si>
- * CONFIGURE, DEPENDS, DETAILS: spell created
-
diff --git a/kde4-bindings/perlqt4/CONFIGURE b/kde4-bindings/perlqt4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4-bindings/perlqt4/CONFIGURE
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4-bindings/perlqt4/CONFLICTS b/kde4-bindings/perlqt4/CONFLICTS
new file mode 100755
index 0000000..3697608
--- /dev/null
+++ b/kde4-bindings/perlqt4/CONFLICTS
@@ -0,0 +1 @@
+conflicts kdebindings4 y
\ No newline at end of file
diff --git a/kde4-bindings/perlqt4/DEPENDS b/kde4-bindings/perlqt4/DEPENDS
new file mode 100755
index 0000000..b4b4f02
--- /dev/null
+++ b/kde4-bindings/perlqt4/DEPENDS
@@ -0,0 +1 @@
+source $SECTION_DIRECTORY/KDE_DEPENDS
diff --git a/kde4-bindings/perlqt4/DETAILS b/kde4-bindings/perlqt4/DETAILS
new file mode 100755
index 0000000..a4acfe5
--- /dev/null
+++ b/kde4-bindings/perlqt4/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=perlqt4
+ SPELLX=${SPELL//4}
+ VERSION=4.7.0
+ SOURCE=$SPELLX-$VERSION.tar.bz2
+
SOURCE_HASH=sha512:18a4a7f156059afac0e92f5716c32f0920fb6a4598fa93ca68500293afeabd893a5828644ae2d036035ec5b6bf621e857e65b9f58e5ca6ece09e304cc9a4664e
+ SOURCE_URL=$KDE_URL/stable/$VERSION/src/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ WEB_SITE=http://www.kde.org
+ ENTERED=20110804
+ LICENSE[0]=GPL
+ KEYWORDS="kde4"
+ SHORT="Perl bindings for the Qt libraries."
+cat << EOF
+Perl bindings for the Qt libraries.
+EOF
diff --git a/kde4-bindings/perlqt4/HISTORY b/kde4-bindings/perlqt4/HISTORY
new file mode 100644
index 0000000..22bd2cc
--- /dev/null
+++ b/kde4-bindings/perlqt4/HISTORY
@@ -0,0 +1,9 @@
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: renamed spell to perlqt4
+
+2011-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * CONFLICTS: it conflicts with kdebindings4
+
+2011-08-04 Bor Kraljič <pyrobor AT ver.si>
+ * CONFIGURE, DEPENDS, DETAILS: spell created
+
diff --git a/libs/apr-util/DEPENDS b/libs/apr-util/DEPENDS
index 48cbd8c..68d6080 100755
--- a/libs/apr-util/DEPENDS
+++ b/libs/apr-util/DEPENDS
@@ -1,5 +1,5 @@
-message ${WARNING_COLOR}you only need one of:\
- db,gdbm,postgresql,sqlite,sqlite2 ${DEFAULT_COLOUR}&&
+message ${MESSAGE_COLOR}INFO: you only need one of:\
+ db,gdbm,postgresql,sqlite,sqlite2${DEFAULT_COLOR} &&
depends apr "--with-apr=$INSTALL_ROOT/usr" &&
depends expat "--with-expat=$INSTALL_ROOT/usr" &&
optional_depends db \
diff --git a/libs/apr-util/HISTORY b/libs/apr-util/HISTORY
index 150cd32..22e3039 100644
--- a/libs/apr-util/HISTORY
+++ b/libs/apr-util/HISTORY
@@ -1,3 +1,6 @@
+2011-08-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: corrected info message color
+
2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
* {{REPAIR^all^,}PRE_,}SUB_DEPENDS: added LDAP subdependency