Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (5fb52e1c96c616d209bb99c5897446a3b7dfbbec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (5fb52e1c96c616d209bb99c5897446a3b7dfbbec)
  • Date: Tue, 5 Apr 2011 05:10:26 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

FUNCTIONS | 103
+++++++++++++++++++++++++++++++++++++
audio-libs/openal-soft/DETAILS | 4 -
devel/ghc/BUILD | 2
devel/ghc/DEPENDS | 7 ++
devel/ghc/DETAILS | 14 ++---
devel/ghc/PRE_BUILD | 6 +-
devel/oprofile/BUILD | 4 -
devel/swiprolog/DETAILS | 2
gnustep-apps/FUNCTIONS | 4 -
gnustep-libs/gnustep-make/DEPENDS | 2
graphics/brlcad/DETAILS | 4 -
graphics/brlcad/HISTORY | 5 +
graphics/brlcad/PRE_BUILD | 4 +
graphics/gmic/DETAILS | 4 -
http/bfilter/DETAILS | 4 -
http/firefox/BUILD | 44 +++------------
http/firefox/DEPENDS | 18 +-----
http/firefox/DETAILS | 2
http/firefox/PRE_BUILD | 6 --
http/firefox/mozconfig3 | 20 -------
http/luakit/DETAILS | 10 +++
http/luakit/PREPARE | 5 +
http/xulrunner/BUILD | 40 ++------------
http/xulrunner/DEPENDS | 17 +-----
http/xulrunner/DETAILS | 2
http/xulrunner/INSTALL | 2
http/xulrunner/PRE_BUILD | 9 ++-
http/xulrunner/mozconfig3 | 37 ++-----------
java/ant/DETAILS | 4 -
java/ant/PRE_BUILD | 2
java/ant/ant-buildfile-junit.patch | 22 +++----
java/antlr/DETAILS | 9 +--
kernels/linux/UPDATE_BOOTLOADER | 2
libs/ace/DETAILS | 2
libs/mpfr/DETAILS | 5 -
mail/mutt/DETAILS | 2
mail/thunderbird/BUILD | 37 +------------
mail/thunderbird/DEPENDS | 20 -------
utils/virtualbox/DEPENDS | 24 +++++---
video-libs/avifile/DEPENDS | 2
wm-addons/procmeter/PRE_BUILD | 11 +++
wm-addons/tabbed/DETAILS | 4 -
x11-libs/fontconfig/BUILD | 1
43 files changed, 258 insertions(+), 270 deletions(-)

New commits:
commit 5fb52e1c96c616d209bb99c5897446a3b7dfbbec
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/brlcad: version 7.18.2

commit 51761b8007eb7d7dbad55b9fa16181e97346d1ab
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-libs/wine: version 1.3.17

diff --git a/FUNCTIONS b/FUNCTIONS
index 6e26adc..cf66e56 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -532,6 +532,109 @@ qt4_build() {
make
}

+mozilla_build() {
+ #
+ # Only strip if the user wants us to
+ #
+ if echo $LDFLAGS | grep -q -- '-s'; then
+ echo "ac_add_options --enable-strip" >> .mozconfig || return 1
+ fi &&
+
+ #
+ # No fast optimization for Mozilla, bit us so many times...
+ #
+ CFLAGS="${CFLAGS/-O?/-O2}" &&
+ CXXFLAGS="${CXXFLAGS/-O?/-O2}" &&
+ CFLAGS="${CFLAGS/-ffast-math/}" &&
+ CXXFLAGS="${CXXFLAGS/-ffast-math/}" &&
+ CFLAGS="${CFLAGS/-mfpmath=sse/}" &&
+ CXXFLAGS="${CXXFLAGS/-mfpmath=sse/}" &&
+
+#unset CFLAGS CXXFLAGS CPPFLAGS &&
+ CFLAGS="-fpermissive $CFLAGS" &&
+ CXXFLAGS="-fpermissive $CXXFLAGS" &&
+
+ CFLAGS="-fno-tree-vectorize $CFLAGS" &&
+ CXXFLAGS="-fno-tree-vectorize $CXXFLAGS" &&
+
+ echo "ac_add_options --enable-optimize=\"-O2\"" >> .mozconfig &&
+ echo "ac_add_options --enable-debug" >> .mozconfig &&
+ echo "ac_add_options --disable-strip" >> .mozconfig &&
+ echo "ac_add_options --disable-install-strip" >> .mozconfig &&
+ echo "ac_add_options --enable-svg" >> .mozconfig &&
+ echo "ac_add_options --enable-canvas" >> .mozconfig &&
+ echo "ac_add_options --enable-extensions=default" >> .mozconfig &&
+ echo "ac_add_options --with-pthreads" >> .mozconfig &&
+ echo "ac_add_options --disable-dbus" >> .mozconfig &&
+# echo "ac_add_options --disable-freetype2" >> .mozconfig &&
+ echo "ac_add_options --disable-installer" >> .mozconfig &&
+ echo "ac_add_options --disable-tests" >> .mozconfig &&
+ echo "ac_add_options --disable-ipdl-tests" >> .mozconfig &&
+# broken with cairo 1.10
+# echo "ac_add_options --enable-system-cairo" >> .mozconfig &&
+# echo "ac_add_options --enable-svg-renderer=cairo" >> .mozconfig &&
+ echo "ac_add_options --enable-default-toolkit=cairo-gtk2" >> .mozconfig &&
+ echo "ac_add_options --enable-safe-browsing" >> .mozconfig &&
+# echo "ac_add_options --enable-xpctools" >> .mozconfig &&
+# echo "ac_add_options --enable-js-binary" >> .mozconfig &&
+# echo "ac_add_options --enable-image-encoder=all" >> .mozconfig &&
+# echo "ac_add_options --enable-lcms" >> .mozconfig &&
+# echo "ac_add_options --enable-storage" >> .mozconfig &&
+# echo "ac_add_options --enable-webservices" >> .mozconfig &&
+ echo "ac_add_options --enable-pango" >> .mozconfig &&
+# echo "ac_add_options --enable-xft" >> .mozconfig &&
+ echo "ac_add_options --prefix=${INSTALL_ROOT}/usr" >> .mozconfig &&
+# echo "ac_add_options --build=${BUILD}" >> .mozconfig &&
+ if [[ $CROSS_INSTALL == on ]]; then
+ echo "ac_add_options --host=${HOST}" >> .mozconfig || return 1
+ fi &&
+ for opt in $OPTS; do
+ echo "ac_add_options ${opt}" >> .mozconfig || return 1
+ done &&
+ echo "ac_add_options --disable-crashreporter" >> .mozconfig &&
+# echo "ac_add_options --disable-xprint" >> .mozconfig &&
+# echo "ac_add_options --with-system-sqlite" >> .mozconfig &&
+ echo "ac_add_options --with-system-jpeg=/usr/lib" >> .mozconfig &&
+ echo "ac_add_options --with-system-bz2" >> .mozconfig &&
+# echo "ac_add_options --with-system-hunspell" >> .mozconfig &&
+# echo "ac_add_options --with-system-png=/usr/lib" >> .mozconfig &&
+# echo "ac_add_options --with-system-mng=/usr/lib" >> .mozconfig &&
+ echo "ac_add_options --with-system-nss" >> .mozconfig &&
+ echo "ac_add_options --with-system-nspr" >> .mozconfig &&
+ echo "ac_add_options --with-system-zlib=/usr/lib" >> .mozconfig &&
+ echo "ac_add_options --with-distribution-id=org.sourcemage" >> .mozconfig
&&
+
+ message "${MESSAGE_COLOR}$(cat .mozconfig)${DEFAULT_COLOR}" &&
+
+ make_single &&
+ make -f client.mk build &&
+ make_normal
+}
+
+mozilla_depends() {
+ depends cairo &&
+ depends gtk+2 &&
+ depends glib2 &&
+ depends pango &&
+ depends libxft &&
+ depends python &&
+ depends perl &&
+ depends libidl &&
+ depends zip &&
+ depends libnotify &&
+# depends curl &&
+ depends -sub SECURE_DELETE sqlite &&
+ depends JPEG &&
+ depends bzip2 &&
+ depends hunspell &&
+ depends -sub APNG libpng &&
+ depends -sub "3.12.x" nss &&
+ depends nspr &&
+# depends libevent &&
+ depends libmng &&
+ depends zlib
+}
+
# check whether the QT provider is qt4
function check_if_qt4_provider()
{
diff --git a/audio-libs/openal-soft/DETAILS b/audio-libs/openal-soft/DETAILS
index 7fcd734..4032515 100755
--- a/audio-libs/openal-soft/DETAILS
+++ b/audio-libs/openal-soft/DETAILS
@@ -1,6 +1,6 @@
SPELL=openal-soft
- VERSION=1.12.854
-
SOURCE_HASH=sha512:44f3bb11156bda2df3e035506e67fd750716c51f414cbc58fdfb547cad63c01303b5a7a1ae5ae493321c2eef509f55050c333d53c775ddd78add33f36b2a150f
+ VERSION=1.13
+
SOURCE_HASH=sha512:8820f03888e36614345806440ae74ba4d40faa6e93545cd9e67440334a89f3b5d1c280695f4eac14fcc0257affe3d6fed53f186d1a02ac20f56a7e0bfa8bb723
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://kcat.strangesoft.net/openal-releases/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/devel/ghc/BUILD b/devel/ghc/BUILD
index 42c1c79..f2694ec 100755
--- a/devel/ghc/BUILD
+++ b/devel/ghc/BUILD
@@ -17,11 +17,11 @@ fi &&

cd $SPELL-$VERSION &&

-PATH="$GHC_DIR:$PATH" &&
./configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
--mandir=${INSTALL_ROOT}/usr/share/man \
--infodir=${INSTALL_ROOT}/usr/share/info \
+ --with-ghc=$GHC_DIR/ghc \
$OPTS &&
make
diff --git a/devel/ghc/DEPENDS b/devel/ghc/DEPENDS
index e2b10a2..8138c31 100755
--- a/devel/ghc/DEPENDS
+++ b/devel/ghc/DEPENDS
@@ -1 +1,6 @@
-depends gmp
+depends gmp &&
+depends libbsd &&
+depends libffi &&
+depends python &&
+depends perl &&
+depends ncurses
diff --git a/devel/ghc/DETAILS b/devel/ghc/DETAILS
index 7e1dddc..464d5c4 100755
--- a/devel/ghc/DETAILS
+++ b/devel/ghc/DETAILS
@@ -1,16 +1,16 @@
SPELL=ghc
- VERSION=6.12.3
+ VERSION=7.0.2
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://darcs.haskell.org/download/dist/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:e6f021d92fbdb5ddd041811ffc41750a24bfd625cced89c4e13443d1d749dc5288d342f631713d11f0cccf68ad416957254e89f8c5d839133225af6b4042f791
+ SOURCE_URL[0]=http://www.haskell.org/${SPELL}/dist/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:074b6755d89347ba86562a762448ae2dd976cabc090807e0b9afb45709cd30531ce449890fdcaf96965f684974fe90a37e702316752603c6e535ee2151f790f0
if [[ ! -x /usr/bin/ghc ]] ; then
ARCH="$(uname -m)"
[[ "$ARCH" = i686 ]] && ARCH=i386
- SOURCE2=$SPELL-$VERSION-$ARCH-unknown-linux-n.tar.bz2
- SOURCE2_URL[0]=http://darcs.haskell.org/download/dist/$VERSION/$SOURCE2
-
SOURCE2_HASH=sha512:b19b46d62587b9ef0b46f5c9aed05fa009009884ca15db8c43002b1c9d344db0dc019431971e7bcd8264e39505f5762d8cc840fd570d7438dfa1ffbf0068c3c4
- [ "$ARCH" = "x86_64" ] &&
SOURCE2_HASH=sha512:ab5fb2dc550162279ede57e543dfff1827c3b8494945c33a484533ee04a23e1ae32e0d617454ce92d3e4165f2ae4d4532f86495ce1f455567ff893b3403bce25
+ SOURCE2=${SPELL}-${VERSION}-${ARCH}-unknown-linux.tar.bz2
+ SOURCE2_URL[0]=http://www.haskell.org/${SPELL}/dist/${VERSION}/${SOURCE2}
+
SOURCE2_HASH=sha512:deb5bf2bd660dde0d781c1920a9c6b56d9074edd7974848fdf98db3e2ffc4425ffce5c3ca26709425dc33d7a7b24fe0a9b2e7b3840182acffb2ef84cb54f2c4e
+ [ "$ARCH" = "x86_64" ] &&
SOURCE2_HASH=sha512:fcfb16361e93ca0e2612a16674c69378a089ea82ce943f0636fe4162d40f2ecc02d884e99014bfa6a046cf4b2d7c9e1d23e69287664dbb490f0828171c85d345
fi

LICENSE[0]=BSD
diff --git a/devel/ghc/PRE_BUILD b/devel/ghc/PRE_BUILD
index 122200e..01e1642 100755
--- a/devel/ghc/PRE_BUILD
+++ b/devel/ghc/PRE_BUILD
@@ -9,5 +9,7 @@ fi &&
unpack_file &&

if [[ $GHC_NO_OPTS == "y" ]] ; then
- cp -v ${SCRIPT_DIRECTORY}/build.mk.no-opts
${SOURCE_DIRECTORY}/${SPELL}-${VERSION}/mk/build.mk
-fi
+ cp -v ${SCRIPT_DIRECTORY}/build.mk
${SOURCE_DIRECTORY}/${SPELL}-${VERSION}/mk/build.mk
+fi &&
+cd ${SOURCE_DIRECTORY}/${SPELL}-${VERSION} &&
+perl boot
diff --git a/devel/oprofile/BUILD b/devel/oprofile/BUILD
index 4de071c..05789af 100755
--- a/devel/oprofile/BUILD
+++ b/devel/oprofile/BUILD
@@ -4,6 +4,6 @@ if [[ $(installed_version "linux") == 2.4.* ]] ; then
else
OPROFILEOPT="--with-kernel-support"
fi &&
-OPTS="$OPTS $OPROFILEOPT" &&
-disable_pic &&
+OPTS="$OPTS $OPROFILEOPT" &&
+disable_pic &&
default_build
diff --git a/devel/swiprolog/DETAILS b/devel/swiprolog/DETAILS
index 16ee272..4b3122c 100755
--- a/devel/swiprolog/DETAILS
+++ b/devel/swiprolog/DETAILS
@@ -1,5 +1,5 @@
SPELL=swiprolog
- VERSION=5.10.0
+ VERSION=5.10.2
SOURCE=pl-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pl-$VERSION
SOURCE_URL[0]=http://www.swi-prolog.org/download/stable/src/${SOURCE}
diff --git a/gnustep-apps/FUNCTIONS b/gnustep-apps/FUNCTIONS
index 33dd678..99dc77f 100755
--- a/gnustep-apps/FUNCTIONS
+++ b/gnustep-apps/FUNCTIONS
@@ -19,8 +19,8 @@ function default_post_install()
{
real_default_post_install &&
if [[ -x ${INSTALL_ROOT}/usr/bin/make_services ]]; then
- message "Running make_services"
- ${INSTALL_ROOT}/usr/bin/make_services
+ message "Running make_services" &&
+ ${INSTALL_ROOT}/usr/bin/make_services || return 1
fi
}

diff --git a/gnustep-libs/gnustep-make/DEPENDS
b/gnustep-libs/gnustep-make/DEPENDS
index ee0ea90..9cbdc87 100755
--- a/gnustep-libs/gnustep-make/DEPENDS
+++ b/gnustep-libs/gnustep-make/DEPENDS
@@ -1 +1 @@
-depends objc
+depends -sub OBJC gcc
diff --git a/graphics/brlcad/DETAILS b/graphics/brlcad/DETAILS
index faf7c4d..d395cb7 100755
--- a/graphics/brlcad/DETAILS
+++ b/graphics/brlcad/DETAILS
@@ -1,9 +1,9 @@
SPELL=brlcad
- VERSION=7.18.0
+ VERSION=7.18.2
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:218c80c55dc87bfc6f9648f4947e438331144b5754c2d980df6aae6518acd625a1db216e717409ed61c042f5d0dd69f99bbfef4972b4ed47cfba3000595a1669
+
SOURCE_HASH=sha512:bd99e609794ae17729cc1c71bf9ca9972ef2f265470e9ba18d6a7c10eff3326dfc941396194014f3cbfb1cd6f23cd2439f2b0ce514987dff71852b3a8e43e618
WEB_SITE=http://brlcad.org/
ENTERED=20050109
LICENSE[0]="GPL"
diff --git a/graphics/brlcad/HISTORY b/graphics/brlcad/HISTORY
index f422f17..70135c5 100644
--- a/graphics/brlcad/HISTORY
+++ b/graphics/brlcad/HISTORY
@@ -1,3 +1,8 @@
+2011-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.18.2
+ * PRE_BUILD: removed -Werror from CFLAGS to fix build error
+ with gcc 4.6
+
2010-12-24 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 7.18.0

diff --git a/graphics/brlcad/PRE_BUILD b/graphics/brlcad/PRE_BUILD
new file mode 100755
index 0000000..93653d7
--- /dev/null
+++ b/graphics/brlcad/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's:-Werror::' configure.ac &&
+./autogen.sh
diff --git a/graphics/gmic/DETAILS b/graphics/gmic/DETAILS
index 4b6dbdc..5a36adb 100755
--- a/graphics/gmic/DETAILS
+++ b/graphics/gmic/DETAILS
@@ -1,8 +1,8 @@
SPELL=gmic
- VERSION=1.4.5.2
+ VERSION=1.4.7.4
SOURCE="${SPELL}_${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:bf1e804d3137e8f7690c35b45fdc6655a1789ac889e60b5ed58ef0a865762615a145b5a305b7eb82dbffab61a54f77351267aebfe24daf4c9211975620400580
+
SOURCE_HASH=sha512:1a3dbed193e61e0dbfa003c0a888057d4b6769d4092682fb97dc271fb0ed67da2366c6394bf6dfd72a97e966b18763563b7b794d733e0a2772ebd9f6df5364af
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gmic.sourceforge.net/";
LICENSE[0]="CeCILL"
diff --git a/http/bfilter/DETAILS b/http/bfilter/DETAILS
index 1c03c02..85e10aa 100755
--- a/http/bfilter/DETAILS
+++ b/http/bfilter/DETAILS
@@ -1,8 +1,8 @@
SPELL=bfilter
- VERSION=1.0.5
+ VERSION=1.1.4
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:0a9d22cf11d4a3991557110585f53bb77bface47fd3b17ef21954c2e8ad06500d03825d5f77fe97136609f1ac2086ed756307386fbe851c9134f8e59c8373a96
+
SOURCE_HASH=sha512:d501e09e449a29f175ec5484ba5aa77ce6bd1a51cb146222fca3af4215c162aff885565086cb64be9dc7cdac63611be1a0970b3d2d81e3f2038009ea3f527e5e
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://bfilter.sourceforge.net/
ENTERED=20051015
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 498a968..d45b8d2 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -3,41 +3,19 @@ cd $SOURCE_DIRECTORY/mozilla* &&
FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
export MOZ_PHOENIX=1 &&

-#
-# Only strip if the user wants us to
-#
-if echo $LDFLAGS | grep -q -- '-s'; then
- OPTS="$OPTS --enable-strip"
-fi &&
-
-#
-# No fast optimization for Mozilla, bit us so many times...
-#
-CFLAGS="${CFLAGS//-Os/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-Os/-O2}" &&
-CFLAGS="${CFLAGS//-O3/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
-
-#
-# -ffast-math breaks plugins
-#
-CFLAGS="${CFLAGS//-ffast-math/}" &&
-CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&

if [[ "$FIREFOX_CVS" == "y" ]]; then
- autoconf-2.13 &&
-
-# workaround for configure not handling --disable-webm correctly
- if [[ $OPTS =~ --disable-webm ]]; then
- echo ac_add_options --disable-webm >> .mozconfig
- fi
+ autoconf-2.13 || return 1
+fi &&
+
+echo ac_add_options --enable-application=browser >> .mozconfig &&
+echo ac_add_options --disable-necko-wifi >> .mozconfig &&
+echo ac_add_options --disable-mailnews >> .mozconfig &&
+echo "ac_add_options --disable-updater" >> .mozconfig &&
+echo ac_add_options --with-system-libxul
--with-libxul-sdk=/usr/lib/xulrunner-1.9 >> .mozconfig &&
+if [[ $FIREFOX_OFFICIAL == y ]]; then
+ echo "ac_add_options --enable-official-branding" >> .mozconfig || return 1
fi &&

-# necko-wifi is part of xulrunner if enabled, but firefox
-# compile fails without wireless_tools without this option
-echo ac_add_options --disable-necko-wifi >> .mozconfig &&
-echo ac_add_options --enable-optimize=-O2 >> .mozconfig &&
+mozilla_build

-make_single &&
-make -f client.mk build &&
-make_normal
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 1f90fe5..6b279ab 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,19 +1,10 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+mozilla_depends &&
depends atk &&
-depends curl &&
-depends g++ &&
-depends glib2 &&
-depends JPEG &&
-depends pango &&
-depends perl &&
-depends zip &&
-depends zlib &&
-depends cairo &&
-depends python &&
-depends libnotify &&
if [[ "$FIREFOX_CVS" = "n" ]]; then
depends nspr &&
depends -sub "3.12.x" nss &&
-depends -sub APNG libpng &&
+depends -sub APNG libpng &&
depends xulrunner
else
depends autoconf-2.13 &&
@@ -24,8 +15,5 @@ optional_depends yasm \
"enables the WebM video format"
fi &&

-depends gtk+2 &&
-depends libidl &&
-
suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 9c3ee61..2fded40 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6.15
+ VERSION=4.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index f2f9e2b..3691261 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,7 +1,7 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file '' &&
-cd mozilla* &&
+cd mozilla-2.0 &&

patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch &&

@@ -11,7 +11,3 @@ else
cp -v $SPELL_DIRECTORY/mozconfig4 .mozconfig
fi

-
-if [[ $FIREFOX_OFFICIAL == y ]]; then
- sed -i '24iac_add_options --enable-official-branding' .mozconfig || return
1
-fi
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
index fa47e6e..5b294c3 100644
--- a/http/firefox/mozconfig3
+++ b/http/firefox/mozconfig3
@@ -6,23 +6,3 @@
mk_add_options MOZ_CO_PROJECT=browser

# Options for 'configure' (same as command-line options).
-ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-ac_add_options --with-system-png=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --enable-application=browser
-ac_add_options --disable-system-cairo
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-freetype2
-ac_add_options --enable-pango
-ac_add_options --disable-dbus
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --with-system-libxul
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
diff --git a/http/luakit/DETAILS b/http/luakit/DETAILS
index 3f5504d..660844a 100755
--- a/http/luakit/DETAILS
+++ b/http/luakit/DETAILS
@@ -1,4 +1,13 @@
SPELL=luakit
+if [[ $LUAKIT_DEVEL == "n" ]]; then
+ VERSION=2010.12.25-r2
+ VERGITHASH=45b37c0
+ SOURCE="${SPELL}-${VERSION}-${VERGITHASH}.tar.gz"
+
SOURCE_URL[0]="http://github.com/mason-larobina/${SPELL}/tarball/${VERSION}";
+ SOURCE_HINTS[0]="no-check-certificate"
+
SOURCE_HASH=sha512:a89eb36e442d3e03e6674f3d3e29ebe216b0971844d0ad15aa43ac12c625aec0094742787911cc9cf3dc32bdae22b0dbe5371f4884c0c0e7d9ed8cfcab91b142
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mason-larobina-${SPELL}-${VERGITHASH}"
+else
if [[ "$LUAKIT_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
@@ -8,6 +17,7 @@ fi
SOURCE_URL[0]=git://github.com/mason-larobina/luakit:luakit-git
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+fi
WEB_SITE="http://www.luakit.org/projects/luakit";
LICENSE[0]=GPL
ENTERED=20100830
diff --git a/http/luakit/PREPARE b/http/luakit/PREPARE
index f441410..9148cb7 100755
--- a/http/luakit/PREPARE
+++ b/http/luakit/PREPARE
@@ -1 +1,4 @@
-config_query LUAKIT_AUTOUPDATE "Queue for update on every system update?" n
+config_query LUAKIT_DEVEL "Use the developer version?" n &&
+if [[ $LUAKIT_DEVEL == "y" ]]; then
+ config_query LUAKIT_AUTOUPDATE "Queue for update on every system
update?" n
+fi
diff --git a/http/xulrunner/BUILD b/http/xulrunner/BUILD
index bf87044..9161b98 100755
--- a/http/xulrunner/BUILD
+++ b/http/xulrunner/BUILD
@@ -1,38 +1,14 @@
-cd "$SOURCE_DIRECTORY/mozilla-1.9.2" &&
+cd "$SOURCE_DIRECTORY/mozilla-2.0" &&

XULRUNNER_HOME="$INSTALL_ROOT/usr/lib/xulrunner" &&
export MOZ_PHOENIX=1 &&

-#
-# Only strip if the user wants us to
-#
-if echo $LDFLAGS | grep -q -- '-s'; then
- OPTS="$OPTS --enable-strip"
-fi &&
+#echo "ac_add_options --with-system-libevent" >> .mozconfig &&
+echo "ac_add_options --disable-javaxpcom" >> .mozconfig &&
+echo "ac_add_options --disable-mochitest" >> .mozconfig &&
+echo "ac_add_options --enable-jemalloc" >> .mozconfig &&
+echo "ac_add_options --enable-jsd" >> .mozconfig &&
+echo "ac_add_options --enable-libnotify" >> .mozconfig &&

-#
-# No fast optimization for Mozilla, bit us so many times...
-#
-CFLAGS="${CFLAGS//-Os/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-Os/-O2}" &&
-CFLAGS="${CFLAGS//-O3/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&

-#
-# -ffast-math breaks plugins
-#
-CFLAGS="${CFLAGS//-ffast-math/}" &&
-CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
-
-OPTS="${OPTS} --enable-optimize=-O2" &&
-
-./configure --prefix=$INSTALL_ROOT/usr \
- --mandir=$INSTALL_ROOT/usr/share/man \
- $OPTS &&
-make_single &&
-# workaround for configure not handling --disable-necko-wifi correctly
-if [[ $OPTS =~ --disable-necko-wifi ]]; then
- echo ac_add_options --disable-necko-wifi >> .mozconfig
-fi &&
-make -f client.mk build &&
-make_normal
+mozilla_build
diff --git a/http/xulrunner/DEPENDS b/http/xulrunner/DEPENDS
index 52d480a..5508cdd 100755
--- a/http/xulrunner/DEPENDS
+++ b/http/xulrunner/DEPENDS
@@ -1,18 +1,7 @@
-depends gtk+2 &&
-depends cairo &&
-depends JPEG &&
-depends libidl &&
-depends libxft &&
-depends -sub APNG libpng &&
-depends -sub SECURE_DELETE sqlite &&
-depends nspr &&
-depends -sub "3.12.x" nss &&
-depends perl &&
-depends python &&
+. ${GRIMOIRE}/FUNCTIONS &&
+mozilla_depends &&
+
depends libxt '--with-x' &&
-depends zip &&
-depends zlib &&
-depends libnotify &&

optional_depends openldap \
'--enable-ldap' \
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 5215fdc..337f901 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
SPELL=xulrunner
VERSION=1.9.2.15
- FFVERSION=3.6.15
+ FFVERSION=4.0
SOURCE=firefox-$FFVERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/http/xulrunner/INSTALL b/http/xulrunner/INSTALL
index b3d09e3..4f2ca33 100755
--- a/http/xulrunner/INSTALL
+++ b/http/xulrunner/INSTALL
@@ -1,4 +1,4 @@
-cd "$SOURCE_DIRECTORY/mozilla-1.9.2" &&
+cd "$SOURCE_DIRECTORY/mozilla-2.0" &&

MOZILLA_FIVE_HOME="$INSTALL_ROOT/usr/lib/xulrunner-1.9" &&

diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 933f54b..21f810e 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -1,18 +1,21 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file '' &&
-cd mozilla-1.9.2 &&
+cd mozilla-2.0 &&
# fix for gcc-4.4
sed -i 's/^#elif$/#else/' toolkit/xre/nsAppRunner.cpp &&
-patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
+#patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&

-patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&
+#patch -p0 < ${SCRIPT_DIRECTORY}/python2.7.patch &&
+
+#patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&

# Needed to make things using XUL find NSPR.
echo "Requires: nspr" >> xulrunner/installer/libxul-embedding.pc.in &&

cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&

+
if [[ $FIREFOX_OFFICIAL == y ]]; then
sed -i '24iac_add_options --enable-official-branding' .mozconfig
fi
diff --git a/http/xulrunner/mozconfig3 b/http/xulrunner/mozconfig3
index 1063b83..b16ae8e 100644
--- a/http/xulrunner/mozconfig3
+++ b/http/xulrunner/mozconfig3
@@ -6,38 +6,13 @@
#mk_add_options MOZ_CO_PROJECT=xulrunner

# Options for 'configure' (same as command-line options).
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --with-pthreads

-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --enable-image-encoder=all
-ac_add_options --enable-js-binary
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-ac_add_options --with-system-png=/usr/lib
+#ac_add_options --disable-mailnews
ac_add_options --enable-application=xulrunner
-ac_add_options --enable-system-cairo
-ac_add_options --enable-storage
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-svg-renderer=cairo
-ac_add_options --enable-pango
+#ac_add_options --enable-image-encoder=all
+#ac_add_options --enable-js-binary
+#ac_add_options --enable-lcms
+#ac_add_options --enable-storage
+#ac_add_options --enable-webservices
ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner
-ac_add_options --enable-webservices
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-lcms
ac_add_options --disable-mailnews
-ac_add_options --disable-freetype2
-ac_add_options --disable-dbus
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-crashreporter
diff --git a/java/ant/DETAILS b/java/ant/DETAILS
index ee3846a..c5a97ad 100755
--- a/java/ant/DETAILS
+++ b/java/ant/DETAILS
@@ -1,10 +1,10 @@
SPELL=ant
- VERSION=1.7.1
+ VERSION=1.8.2
SOURCE=apache-$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache-$SPELL-$VERSION
SOURCE_URL[0]=http://archive.apache.org/dist/ant/source/$SOURCE
SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE
-
SOURCE_HASH=sha512:bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc
+
SOURCE_HASH=sha512:d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c
LICENSE[0]=APACHE
WEB_SITE=http://ant.apache.org/
KEYWORDS="java"
diff --git a/java/ant/PRE_BUILD b/java/ant/PRE_BUILD
index 5c5cb06..0460c7c 100755
--- a/java/ant/PRE_BUILD
+++ b/java/ant/PRE_BUILD
@@ -3,5 +3,5 @@ cd $SOURCE_DIRECTORY &&

# fix bugs #13749 and #3230 : removing junit task if not installed
if ! spell_ok junit; then
- patch -p0 < ${SPELL_DIRECTORY}/ant-buildfile-junit.patch
+ patch -p1 < ${SPELL_DIRECTORY}/ant-buildfile-junit.patch
fi
diff --git a/java/ant/ant-buildfile-junit.patch
b/java/ant/ant-buildfile-junit.patch
index 21a4a0d..eea64e7 100644
--- a/java/ant/ant-buildfile-junit.patch
+++ b/java/ant/ant-buildfile-junit.patch
@@ -1,11 +1,11 @@
---- build.xml.old 2008-08-30 13:59:52.000000000 +0200
-+++ build.xml 2008-08-30 14:00:00.000000000 +0200
-@@ -925,7 +925,7 @@
- ===================================================================
- -->
- <target name="dist-lite"
-- depends="jars,test-jar"
-+ depends="jars"
- description="--> creates a minimum distribution to run Apache Ant">
-
- <mkdir dir="${dist.dir}"/>
+--- apache-ant-1.8.2/build.xml.orig 2011-03-16 11:53:17.304405762 +0100
++++ apache-ant-1.8.2/build.xml 2011-03-16 11:53:50.674255313 +0100
+@@ -791,7 +791,7 @@
+ ===================================================================
+ -->
+ <target name="dist-lite"
+- depends="jars,test-jar"
++ depends="jars"
+ description="--> creates a minimum distribution to run Apache Ant">
+
+ <mkdir dir="${dist.dir}"/>
diff --git a/java/antlr/DETAILS b/java/antlr/DETAILS
index 43edfbd..594a287 100755
--- a/java/antlr/DETAILS
+++ b/java/antlr/DETAILS
@@ -1,11 +1,10 @@
SPELL=antlr
- VERSION=2.7.7
+ VERSION=3.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://antlr2.org/download/$SOURCE
- SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-#
SOURCE_HASH=sha512:4f37f77223af918b95c5649a9c24eacc87c806c3c926271bd04e67f3daddcb273e944eb56b5754ce1a7898e00d9e63ad44470860708b60c3de4465281f705ba8
+ SOURCE_URL[0]=http://www.antlr.org/download/${SOURCE}
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:d45c6e6d20bdab04272ef8baf465443226d203eb7e9ac77bb2699f824261c08e721cef58b523bf4c4b2537bdc3a3d197e12929593019a82c7943a248e46d7c9b
LICENSE[0]=PD
KEYWORDS="java"
WEB_SITE=http://antlr2.org/
diff --git a/kernels/linux/UPDATE_BOOTLOADER b/kernels/linux/UPDATE_BOOTLOADER
index 013c90e..32fcb91 100755
--- a/kernels/linux/UPDATE_BOOTLOADER
+++ b/kernels/linux/UPDATE_BOOTLOADER
@@ -180,7 +180,7 @@ case `uname -m` in
*) if [ -f /etc/lilo.conf -a -x /sbin/lilo ]
then
boot_loader="lilo"
- update_lilo
+ update_lilo || return 1
elif [ -f /boot/grub/grub.cfg -a -x /usr/sbin/grub-mkconfig ]
then
boot_loader="grub2"
diff --git a/libs/ace/DETAILS b/libs/ace/DETAILS
index daeeef7..87e99ce 100755
--- a/libs/ace/DETAILS
+++ b/libs/ace/DETAILS
@@ -1,5 +1,5 @@
SPELL=ace
- VERSION=5.6.1
+ VERSION=6.0.1
SOURCE=ACE-src-$VERSION.tar.bz2

SOURCE_HASH=sha512:15b9946120048cce150ff60c2ef53ccd06e1d6cb92df79f884514ac9518e470b7a8ed381ea332fd4a7bf2da534fa53b764d4273c53aca9a9452362aa53e9b0ab
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ACE_wrappers
diff --git a/libs/mpfr/DETAILS b/libs/mpfr/DETAILS
index 1332dfd..07eee3c 100755
--- a/libs/mpfr/DETAILS
+++ b/libs/mpfr/DETAILS
@@ -1,8 +1,7 @@
SPELL=mpfr
- VERSION=2.4.2
- PATCHLEVEL=0
+ VERSION=3.0.0
SECURITY_PATCH=2
-
SOURCE_HASH=sha512:c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e
+
SOURCE_HASH=sha512:f404a5ebc48624406ff62ddc7c75c75ae06c207b0cdb60d330e95f2782fca9cf4875f8b8389b666bc96d4f157afbdf270d39d95ae890fc7f81027f744632d016
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.mpfr.org/mpfr-$VERSION/$SOURCE
diff --git a/mail/mutt/DETAILS b/mail/mutt/DETAILS
index 9482f54..19e2f29 100755
--- a/mail/mutt/DETAILS
+++ b/mail/mutt/DETAILS
@@ -15,7 +15,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-mercurial
;;
devel)
- VERSION=1.5.20
+ VERSION=1.5.21
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=ftp://ftp.mutt.org/mutt/devel/${SOURCE}
diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index ffe9a9b..d5ebc6d 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -3,39 +3,12 @@ cd $SOURCE_DIRECTORY/comm-1.9.2 &&
THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
export MOZ_THUNDERBIRD="1" &&

-#
-# No fast optimization for Mozilla, bit us so many times...
-#
-export CFLAGS="${CFLAGS//-O3/-O2}" &&
-export CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
-
-#
-# -ffast-math breaks plugins
-#
-CFLAGS="${CFLAGS//-ffast-math/}" &&
-CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
-
-#
-# Forcing SSE for mfpmath causes Thunderbird to segfault on start
-#
-CFLAGS="${CFLAGS//-mfpmath=sse/}" &&
-CXXFLAGS="${CXXFLAGS//-mfpmath=sse/}" &&
-
-if echo $LDFLAGS | grep -q '\-s'; then
- OPTS="$OPTS --enable-strip"
-fi &&
-
-LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&

if [[ $THUNDERBIRD_OFFICIAL == y ]]; then
- OPTS="$OPTS --enable-official-branding"
+ echo ac_add_options --enable-official-branding >> .mozconfig || return 1
fi
+echo ac_add_options --with-user-appdir=.thunderbird >> .mozconfig &&
+echo ac_add_options --enable-application=mail >> .mozconfig &&
+echo ac_add_options --enable-static >> .mozconfig &&

-./configure --prefix=${INSTALL_ROOT}/usr \
- --with-user-appdir=.thunderbird \
- --enable-application=mail \
- --enable-static \
- --disable-crashreporter \
- $OPTS &&
-
-make
+mozilla_build
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 4e5ce86..c7e984b 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,15 +1,5 @@
-depends g++
&&
-depends nspr '--with-system-nspr'
&&
-depends nss '--with-system-nss'
&&
-depends zlib '--with-system-zlib'
&&
-depends JPEG '--with-system-jpeg'
&&
-depends libidl
&&
-depends libpng '--with-system-png'
&&
-depends libmng '--with-system-mng'
&&
-depends perl
&&
-depends zip
&&
-depends gtk+2
\
- '--enable-xft --disable-freetype2 --enable-default-toolkit=gtk2'
&&
+. ${GRIMOIRE}/FUNCTIONS
&&
+mozilla_depends
&&
#
# LDAP support doesn't work (fails to build)
#
@@ -23,12 +13,6 @@ optional_depends gnome-vfs2 \
"--disable-gnomevfs" \
"for GnomeVFS support" &&

-optional_depends cairo \
- "--enable-system-cairo \
- --enable-default-toolkit=cairo-gtk2" \
- "" \
- "for native SVG rendering" &&
-
optional_depends startup-notification \
'--enable-startup-notification' \
'--disable-startup-notification' \
diff --git a/utils/virtualbox/DEPENDS b/utils/virtualbox/DEPENDS
index b0b8d0b..2623e40 100755
--- a/utils/virtualbox/DEPENDS
+++ b/utils/virtualbox/DEPENDS
@@ -1,14 +1,15 @@
suggest_depends virtualbox-module "" "" "for vboxdrv kernel module" &&

-depends dev86 &&
-depends iasl &&
-depends libxslt &&
-depends libxml2 &&
-depends qt4 &&
-depends sdl &&
-depends libidl &&
+depends dev86 &&
+depends iasl &&
+depends libxslt &&
+depends libxml2 &&
+depends qt4 &&
+depends sdl &&
+depends libidl &&
depends xorg-libs &&
-depends makeself &&
+depends makeself &&
+depends linux-pam &&

optional_depends python \
"" \
@@ -28,4 +29,9 @@ optional_depends JAVA \
optional_depends pulseaudio \
"" \
"--disable-pulse" \
- "for PulseAudio output support"
+ "for PulseAudio output support" &&
+
+optional_depends texlive \
+ "" \
+ "--disable-docs" \
+ "to build documentation"
diff --git a/video-libs/avifile/DEPENDS b/video-libs/avifile/DEPENDS
index c740ed9..c8c60f0 100755
--- a/video-libs/avifile/DEPENDS
+++ b/video-libs/avifile/DEPENDS
@@ -1,4 +1,4 @@
-depends gcc34 &&
+#depends gcc34 &&

optional_depends win32codecs \
"" \
diff --git a/wm-addons/procmeter/PRE_BUILD b/wm-addons/procmeter/PRE_BUILD
index 775e51e..10cf911 100755
--- a/wm-addons/procmeter/PRE_BUILD
+++ b/wm-addons/procmeter/PRE_BUILD
@@ -1,3 +1,12 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-sedit "s:^CFLAGS=.*:CFLAGS=${CFLAGS}:" Makefile
+sedit "s:^CFLAGS=.*:CFLAGS=${CFLAGS}:" Makefile
&&
+sedit "s:^INSTDIR=.*:INSTDIR=${INSTALL_ROOT}/usr:" Makefile
&&
+sedit "s:^INSTDIR=.*:INSTDIR=${INSTALL_ROOT}/usr:" modules/Makefile
&&
+sedit "s:^#define INSTDIR.*:#define INSTDIR ${INSTALL_ROOT}/usr:"
procmeterp.h &&
+sedit "s:^MANDIR=.*:MANDIR=${INSTALL_ROOT}/usr/share/man:" Makefile
&&
+sedit "s:^LIB_PATH=.*:LIB_PATH=${INSTALL_ROOT}/usr/lib/procmeter:" Makefile
&&
+sedit "s:^LIB_PATH=.*:LIB_PATH=${INSTALL_ROOT}/usr/lib/procmeter:"
modules/Makefile &&
+sedit "s:^#define LIB_PATH.*:#define LIB_PATH
${INSTALL_ROOT}/usr/lib/procmeter:" procmeterp.h &&
+sedit "s:^RC_PATH=.*:RC_PATH=${INSTALL_ROOT}/etc/procmeter:" Makefile
&&
+sedit "s:^#define RC_PATH.*:#define RC_PATH ${INSTALL_ROOT}/etc/procmeter:"
procmeterp.h
diff --git a/wm-addons/tabbed/DETAILS b/wm-addons/tabbed/DETAILS
index f915234..e0a3f49 100755
--- a/wm-addons/tabbed/DETAILS
+++ b/wm-addons/tabbed/DETAILS
@@ -1,8 +1,8 @@
SPELL=tabbed
- VERSION=0.2
+ VERSION=0.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://dl.suckless.org/tools/${SOURCE}
-
SOURCE_HASH=sha512:b9b1f25361e10b22b589ff459a69e2ceba9eb147d1e0e9584ae6d902e1ed99122aa3501c5db2eef6e32c1e9fbb88e8778a0131034cdf6ff91383ca0010bbd73d
+
SOURCE_HASH=sha512:b311fb3a3e8fa82bba6bd5d3d31128202a842315bcc2dc154bbf0df857f64fd245b50cd618ea2ad98fb5137682699473d9b1e9af5cab4724bfacb65889238ebf
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://tools.suckless.org/tabbed";
LICENSE[0]="MIT/X"
diff --git a/x11-libs/fontconfig/BUILD b/x11-libs/fontconfig/BUILD
index c1eaa99..eba4de6 100755
--- a/x11-libs/fontconfig/BUILD
+++ b/x11-libs/fontconfig/BUILD
@@ -7,5 +7,6 @@ OPTS="--with-add-fonts=/usr/lib/X11/fonts/TTF,\
/usr/share/fonts/X11/misc,\
/usr/share/fonts/X11/local \
$OPTS" &&
+CFLAGS="$CFLAGS -fno-tree-vectorize" &&

default_build




Archive powered by MHonArc 2.6.24.

Top of Page