diff options
author | Ismael Luceno | 2008-03-12 01:40:46 -0300 |
---|---|---|
committer | Ismael Luceno | 2008-03-12 01:40:46 -0300 |
commit | a35448eaa93774a83c279438f6eb972dcfe2bdb8 (patch) | |
tree | 920bbbd5bd1ed9125aeed312fd5687817ce07f44 | |
parent | 6ce57b97a3ce68402e781903051505b83725cd2c (diff) |
revert almost all the bogus changes I did, sorry
115 files changed, 142 insertions, 306 deletions
diff --git a/archive/ncompress/BUILD b/archive/ncompress/BUILD index b1a7cc177e..d8579de26b 100755 --- a/archive/ncompress/BUILD +++ b/archive/ncompress/BUILD @@ -1,7 +1,6 @@ -persistent_add LBOPT="$CFLAGS $LDFLAGS" - unpack_file 2 && zcat $SOURCE2 | patch -p1 && cat $SCRIPT_DIRECTORY/ncompress-gcc34.patch | patch -p1 && +export LBOPT="$CFLAGS $LDFLAGS" && sed -e 's/LBOPT=//' Makefile.def > Makefile && make diff --git a/archive/ncompress/HISTORY b/archive/ncompress/HISTORY index 0eb4cd9153..724f918750 100644 --- a/archive/ncompress/HISTORY +++ b/archive/ncompress/HISTORY @@ -1,6 +1,3 @@ -2008-03-03 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * INSTALL: use TRACK_ROOT not INSTALL_ROOT when linking #9163 diff --git a/archive/rpm/BUILD b/archive/rpm/BUILD index cbc4413770..e832571b09 100755 --- a/archive/rpm/BUILD +++ b/archive/rpm/BUILD @@ -1,5 +1,5 @@ WITH_DB_SUBDIR=/usr/lib && -persistent_add LDFLAGS=${LDFLAGS/-z combreloc/} && +export LDFLAGS=${LDFLAGS/-z combreloc/} && OPTS="$OPTS $RPM_API $RPM_SELINUX --with-libintl-prefix=/usr" && -#persistent_add CPPFLAGS="$CPPFLAGS -I/usr/include/python$(installed_version python| cut -c 1-3)" && +#export CPPFLAGS="$CPPFLAGS -I/usr/include/python$(installed_version python| cut -c 1-3)" && default_build diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY index 12c2d58d97..c7e11d619c 100644 --- a/archive/rpm/HISTORY +++ b/archive/rpm/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-03-02 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 5.0.2. Updated SOURCE_URL Fixed long description wrap diff --git a/audio-creation/cheesetracker/BUILD b/audio-creation/cheesetracker/BUILD index 7a055c1e3d..ca19eeaf3e 100755 --- a/audio-creation/cheesetracker/BUILD +++ b/audio-creation/cheesetracker/BUILD @@ -1,2 +1,2 @@ -persistent_add QTDIR=/usr && +export QTDIR=/usr && scons diff --git a/audio-creation/cheesetracker/HISTORY b/audio-creation/cheesetracker/HISTORY index e14849888a..495e18c2b7 100644 --- a/audio-creation/cheesetracker/HISTORY +++ b/audio-creation/cheesetracker/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/audio-soft/annotator/BUILD b/audio-soft/annotator/BUILD index 46198b9d2a..c641e36bfc 100755 --- a/audio-soft/annotator/BUILD +++ b/audio-soft/annotator/BUILD @@ -1,6 +1,8 @@ # add link to /usr/bin/qt4 so annotator can find it ln -s $TRACK_ROOT/usr/bin/qt4 /usr/lib/qt4/bin -persistent_add QTDIR=/usr/lib/qt4 && +export OLDQTDIR=$QTDIR && +unset QTDIR && +export QTDIR=/usr/lib/qt4 && cd vmqt && scons clam_prefix=$INSTALL_ROOT/usr prefix=$INSTALL_ROOT/usr && cd $SOURCE_DIRECTORY && diff --git a/audio-soft/annotator/FINAL b/audio-soft/annotator/FINAL index 9be9dfcfc3..abd0b11f6b 100755 --- a/audio-soft/annotator/FINAL +++ b/audio-soft/annotator/FINAL @@ -1,3 +1,6 @@ # cleanup rm /usr/lib/qt4/bin && +unset QTDIR && +export QTDIR=$OLDQTDIR && +unset OLDQTDIR && message "${MESSAGE_COLOR}Remember to set your QTDIR to qt4 before starting annotator.${DEFAULT_COLOR}" diff --git a/audio-soft/annotator/HISTORY b/audio-soft/annotator/HISTORY index 5a9196bdda..b16a89034e 100644 --- a/audio-soft/annotator/HISTORY +++ b/audio-soft/annotator/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD, FINAL: use persistent_add instead of export - 2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * BUILD: use TRACK_ROOT when linking #9163 diff --git a/chat-im/gaim-encryption-1.x/BUILD b/chat-im/gaim-encryption-1.x/BUILD index a14f36707b..9a7c668bd2 100755 --- a/chat-im/gaim-encryption-1.x/BUILD +++ b/chat-im/gaim-encryption-1.x/BUILD @@ -1,7 +1,7 @@ ### had to cook up some pkg-config files for nss and nspr if spell_ok nss ; then - persistent_add PKG_CONFIG_PATH="/usr/include/nss:/usr/include/nspr" -fi && + export PKG_CONFIG_PATH="/usr/include/nss:/usr/include/nspr" +fi && make_single && OPTS="--with-nspr-includes=/usr/include/nspr --with-nspr-libs=/usr/lib $OPTS" && OPTS="--with-nss-includes=/usr/include/nss --with-nss-libs=/usr/lib $OPTS" && diff --git a/chat-im/gaim-encryption-1.x/HISTORY b/chat-im/gaim-encryption-1.x/HISTORY index 8e398c1554..3dad6a93ee 100644 --- a/chat-im/gaim-encryption-1.x/HISTORY +++ b/chat-im/gaim-encryption-1.x/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-11-11 George Sherwood <george@beernabeer.com> * ALL: Created from gaim-encryption spell diff --git a/chat-im/gaim1.5/BUILD b/chat-im/gaim1.5/BUILD index 4a4d7d54b9..b142722fce 100755 --- a/chat-im/gaim1.5/BUILD +++ b/chat-im/gaim1.5/BUILD @@ -1,6 +1,6 @@ ### had to cook up some pkg-config files for nss and nspr CFLAGS="$CFLAGS -I/usr/X11R6/include" -persistent_add PKG_CONFIG_PATH='/usr/include/nss:/usr/include/nspr' && +export PKG_CONFIG_PATH='/usr/include/nss:/usr/include/nspr' && make_single && default_build && cd $SOURCE_DIRECTORY diff --git a/chat-im/gaim1.5/HISTORY b/chat-im/gaim1.5/HISTORY index 86c20a5ec4..b09b1e6c80 100644 --- a/chat-im/gaim1.5/HISTORY +++ b/chat-im/gaim1.5/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-05-20 Arwed v. Merkatz <v.merkatz@gmx.net> * DEPENDS: renamed evolution2 to evolution diff --git a/chat-im/pidgin-encryption/BUILD b/chat-im/pidgin-encryption/BUILD index 90cdbe6be6..9a7c668bd2 100755 --- a/chat-im/pidgin-encryption/BUILD +++ b/chat-im/pidgin-encryption/BUILD @@ -1,6 +1,6 @@ ### had to cook up some pkg-config files for nss and nspr if spell_ok nss ; then - persistent_add PKG_CONFIG_PATH="/usr/include/nss:/usr/include/nspr" + export PKG_CONFIG_PATH="/usr/include/nss:/usr/include/nspr" fi && make_single && OPTS="--with-nspr-includes=/usr/include/nspr --with-nspr-libs=/usr/lib $OPTS" && diff --git a/chat-im/pidgin-encryption/HISTORY b/chat-im/pidgin-encryption/HISTORY index 4e5dd59b6a..a82dfe611e 100644 --- a/chat-im/pidgin-encryption/HISTORY +++ b/chat-im/pidgin-encryption/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-10-15 Lalo Martins <lalo@sourcemage.org> * DETAILS, CONFIGURE: updating urls, and cvs->svn diff --git a/chat-im/pidgin/BUILD b/chat-im/pidgin/BUILD index 44e307ae6a..5f756dc2f4 100755 --- a/chat-im/pidgin/BUILD +++ b/chat-im/pidgin/BUILD @@ -1,6 +1,6 @@ ### had to cook up some pkg-config files for nss and nspr CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include" -persistent_add PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr" && +export PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr" && make_single && default_build && cd $SOURCE_DIRECTORY diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY index 7de2e9fc7c..4197d0c049 100644 --- a/chat-im/pidgin/HISTORY +++ b/chat-im/pidgin/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-03-02 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 2.4.0 diff --git a/chat-im/psi/BUILD b/chat-im/psi/BUILD index 8b841c0d45..b0f50e506b 100755 --- a/chat-im/psi/BUILD +++ b/chat-im/psi/BUILD @@ -1,7 +1,8 @@ -persistent_add QTDIR=/usr && -PATH=$QTDIR/bin/qt4:$PATH && -./configure --prefix=/usr $OPTS && -sedit "s/QTDIR)\/include/QTDIR)\/include\/qt/g" Makefile && -make_single && -make && -make_normal + QTDIR=/usr && + PATH=$QTDIR/bin/qt4:$PATH + export QTDIR=/usr && + ./configure --prefix=/usr $OPTS && + sedit "s/QTDIR)\/include/QTDIR)\/include\/qt/g" Makefile && + make_single && + make && + make_normal diff --git a/chat-im/psi/HISTORY b/chat-im/psi/HISTORY index 5649b555ed..83533d9038 100644 --- a/chat-im/psi/HISTORY +++ b/chat-im/psi/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-02-23 George Sherwood <george@beernabeer.com> * DETAILS: Updated devel to version 0.12-RC1 diff --git a/chat-irc/bitchx/BUILD b/chat-irc/bitchx/BUILD index 253df21b7d..03f6a8f4fa 100755 --- a/chat-irc/bitchx/BUILD +++ b/chat-irc/bitchx/BUILD @@ -1,4 +1,4 @@ - # the following persistent_add was to deal with a zvt compilation problem. - persistent_add CFLAGS="-I/usr/include/gnome-1.0" + # the following export was to deal with a zvt compilation problem. + export CFLAGS="-I/usr/include/gnome-1.0" OPTS="--without-gtk $OPTS" && default_build diff --git a/chat-irc/bitchx/HISTORY b/chat-irc/bitchx/HISTORY index 85c394ad75..5e71b557c0 100644 --- a/chat-irc/bitchx/HISTORY +++ b/chat-irc/bitchx/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-06-23 George Sherwood <george@beernabeer.com> * DETAILS: converted to upstream signature checking * bitchx.gpg: added gpg keyring diff --git a/crypto/nss/BUILD b/crypto/nss/BUILD index 52fc1cff2a..99ad2f3537 100755 --- a/crypto/nss/BUILD +++ b/crypto/nss/BUILD @@ -1,5 +1,5 @@ -persistent_add BUILD_OPT=1 && -persistent_add SOURCE_PREFIX=$(pwd) && +export BUILD_OPT=1 && +export SOURCE_PREFIX=$(pwd) && # use our CFLAGS and pre-installed NSPR headers #echo "OS_CFLAGS += $CFLAGS -I$INSTALL_ROOT/usr/include/nspr" >>coreconf/Linux.mk && diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY index f3615d05af..b684a022d9 100644 --- a/crypto/nss/HISTORY +++ b/crypto/nss/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-02-08 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 3.11.9 diff --git a/crypto/xca/BUILD b/crypto/xca/BUILD index d4cbb55ce2..86dcb713f1 100755 --- a/crypto/xca/BUILD +++ b/crypto/xca/BUILD @@ -5,8 +5,8 @@ sedit 's:mandir=man:mandir=share/man:' doc/Makefile && sedit 's:QTDIR/bin/:QTDIR/bin/qt4:' configure && sedit 's:/qt/Qt /qt4/Qt:/Qt:' configure && -persistent_add QTDIR="/usr" && -persistent_add PATH=${TRACK_ROOT}/usr/bin/qt4:$PATH && +export QTDIR="/usr" && +export PATH=${TRACK_ROOT}/usr/bin/qt4:$PATH && ./configure && make diff --git a/crypto/xca/HISTORY b/crypto/xca/HISTORY index 3758a05a8c..8c07a35954 100644 --- a/crypto/xca/HISTORY +++ b/crypto/xca/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-10-23 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.6.4 * BUILD: updated diff --git a/devel/expect/BUILD b/devel/expect/BUILD index 2af6aac928..68f8889ef1 100755 --- a/devel/expect/BUILD +++ b/devel/expect/BUILD @@ -1,5 +1,5 @@ if echo ${OPTS} | grep -q tk; then - persistent_add LDFLAGS="$LDFLAGS -L /usr/X11R6/lib" + export LDFLAGS="$LDFLAGS -L /usr/X11R6/lib" fi && OPTS="--with-tcl=/usr/lib \ diff --git a/devel/expect/HISTORY b/devel/expect/HISTORY index 6f8d3a3365..519da60d45 100644 --- a/devel/expect/HISTORY +++ b/devel/expect/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-03-04 Ladislav Hagara <hgr@vabo.cz> * DETAILS: fixed SOURCE_HASH [Bug 10714] diff --git a/devel/lazarus/BUILD b/devel/lazarus/BUILD index cb79b75749..387fb210d7 100755 --- a/devel/lazarus/BUILD +++ b/devel/lazarus/BUILD @@ -1,4 +1,4 @@ -persistent_add LCL_PLATFORM=$LAZ_GUI && +export LCL_PLATFORM=$LAZ_GUI && make_single && make FPC=fpc && strip -s lazarus startlazarus && diff --git a/devel/lazarus/HISTORY b/devel/lazarus/HISTORY index cc3fe8f49a..612d439c0b 100644 --- a/devel/lazarus/HISTORY +++ b/devel/lazarus/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-12-24 Treeve Jelbert <treeve@sourcemage.org> * BUILD, INSTALL: set FPC, for use on x86_64 diff --git a/devel/mozart-base/BUILD b/devel/mozart-base/BUILD index 72340ae407..94aed0d09d 100755 --- a/devel/mozart-base/BUILD +++ b/devel/mozart-base/BUILD @@ -1,5 +1,5 @@ #the bison and flex checks were seriously borked, I patch the configure -persistent_add YACC=yacc && +export YACC=yacc && patch -p1 < $SCRIPT_DIRECTORY/mozart.patch && ./configure \ --host=$HOST \ diff --git a/devel/mozart-base/HISTORY b/devel/mozart-base/HISTORY index 3954f596b4..e1abb9485e 100644 --- a/devel/mozart-base/HISTORY +++ b/devel/mozart-base/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-03-24 Jeremy Blosser <jblosser-smgl@firinn.org> * DEPENDS: Add gdbm, bug 11456. diff --git a/devel/mysqlnavigator/BUILD b/devel/mysqlnavigator/BUILD index 137e9109ca..ada42e53a2 100755 --- a/devel/mysqlnavigator/BUILD +++ b/devel/mysqlnavigator/BUILD @@ -1,6 +1,6 @@ ### bug 4334 adding -DUSE_OLD_FUNCTIONS for newer mysql sedit "s/CXXFLAGS=\"-O2 -Wall\"/CXXFLAGS=\"-O2 -Wall $CXXFLAGS -DUSE_OLD_FUNCTIONS\"/g" configure && -persistent_add QTDIR="/usr" && +export QTDIR="/usr" && ### gcc3.3.X multiline string problem patch -p1 < $SCRIPT_DIRECTORY/mysqlnavigator-gcc3.3.X.patch && default_build diff --git a/devel/mysqlnavigator/HISTORY b/devel/mysqlnavigator/HISTORY index 000497d5ea..07e99d2742 100644 --- a/devel/mysqlnavigator/HISTORY +++ b/devel/mysqlnavigator/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/devel/patch/BUILD b/devel/patch/BUILD index 4248cd51fc..9cb78cea87 100755 --- a/devel/patch/BUILD +++ b/devel/patch/BUILD @@ -1,4 +1,4 @@ -persistent_add CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" && +export CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" && OPTS="$OPTS --build=${BUILD}" [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}" diff --git a/devel/patch/HISTORY b/devel/patch/HISTORY index 8c62dc128d..ae8998e15e 100644 --- a/devel/patch/HISTORY +++ b/devel/patch/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/disk/grub/BUILD b/disk/grub/BUILD index caf4592e1d..6351e17bd1 100755 --- a/disk/grub/BUILD +++ b/disk/grub/BUILD @@ -1,5 +1,6 @@ +unset CFLAGS && unset CXXFLAGS && -persistent_add CFLAGS="-Os" && +export CFLAGS="-Os" && # Begin setting up OPTS based on responses from CONFIGURE diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY index 2148729912..dc7a870656 100644 --- a/disk/grub/HISTORY +++ b/disk/grub/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-03-15 George Sherwood <george@beernabeer.com> * CONFIGURE: Add query to use graphical boot screen. Bug #12852 * PRE_BUILD: Added if statement to check if user wants to diff --git a/disk/xfsprogs/BUILD b/disk/xfsprogs/BUILD index bf77aab853..be15431f97 100755 --- a/disk/xfsprogs/BUILD +++ b/disk/xfsprogs/BUILD @@ -7,6 +7,6 @@ OPTS="DEBUG=-DNDEBUG \ --sbindir=$DEFAULT_ROOT/sbin \ $OPTS" && -persistent_add OPTIMIZER=$CFLAGS && +export OPTIMIZER=$CFLAGS && default_build diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY index ac1572d68a..13b29a6831 100644 --- a/disk/xfsprogs/HISTORY +++ b/disk/xfsprogs/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-03-03 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 2.9.7 diff --git a/display/directfb/BUILD b/display/directfb/BUILD index 859e899503..3db6c551f2 100755 --- a/display/directfb/BUILD +++ b/display/directfb/BUILD @@ -6,7 +6,7 @@ OPTS="--with-inputdrivers=$inputdrivers \ if is_depends_enabled $SPELL libmpeg3; then - persistent_add CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/" + export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/" fi && default_build diff --git a/display/directfb/CONFIGURE b/display/directfb/CONFIGURE index f9c1ddd0e4..383d476865 100755 --- a/display/directfb/CONFIGURE +++ b/display/directfb/CONFIGURE @@ -51,12 +51,12 @@ if ! grep -q "gfxdrivers" $SPELL_CONFIG ;then if query "select gfxdrivers to compile?" n then gfxdrivers=all - OLD_IFS="$IFS" - persistent_add IFS=" + OLD_IFS=$IFS + export IFS=" " gfxdrivers=`get_gfx | tr '\n' ','` echo "gfxdrivers=$gfxdrivers" >> $SPELL_CONFIG - persistent_add IFS="$OLD_IFS" + export IFS=$OLD_IFS else echo gfxdrivers=all >> $SPELL_CONFIG fi fi && diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY index 22138dac72..8f7202e793 100644 --- a/display/directfb/HISTORY +++ b/display/directfb/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * CONFIGURE, BUILD: use persistent_add instead of export - 2008-01-28 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * BUILD: removed is_depends_enabled.function reference diff --git a/display/fresco/BUILD b/display/fresco/BUILD index 636382d361..6040df7043 100755 --- a/display/fresco/BUILD +++ b/display/fresco/BUILD @@ -1,4 +1,4 @@ -persistent_add LDFLAGS="$LDFLAGS -L /usr/X11R6/lib" && +export LDFLAGS="$LDFLAGS -L /usr/X11R6/lib" && if [ "$CVS" = "yes" ]; then ./autogen.sh diff --git a/display/fresco/HISTORY b/display/fresco/HISTORY index 0f63ab4536..fcd05f96a6 100644 --- a/display/fresco/HISTORY +++ b/display/fresco/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/display/xdirectfb/BUILD b/display/xdirectfb/BUILD index eb5b83412c..83cab08d48 100755 --- a/display/xdirectfb/BUILD +++ b/display/xdirectfb/BUILD @@ -2,7 +2,7 @@ message "Building xdirectfb takes a very long time." && rm -f config/cf/host.def && if (echo $CFLAGS | grep -q -- "-Os"); then - persistent_add CFLAGS="-O2 ${CFLAGS//-Os/}" + export CFLAGS="-O2 ${CFLAGS//-Os/}" fi && if spell_ok linux-pam; then diff --git a/display/xdirectfb/HISTORY b/display/xdirectfb/HISTORY index 7632cb87db..ccf1524d17 100644 --- a/display/xdirectfb/HISTORY +++ b/display/xdirectfb/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-02-15 Thomas Orgis <sobukus@sourcemage.org> * CONFIGURE, BUILD: make queries for mmx,sse,3dnow instead of grepping CFLAGS (the -m* flags are gone there) diff --git a/e/imlib/BUILD b/e/imlib/BUILD index 97ccca294e..ac14d37c05 100755 --- a/e/imlib/BUILD +++ b/e/imlib/BUILD @@ -1,3 +1,3 @@ -persistent_add CPPFLAGS="$CPPFLAGS -w -I/usr/include/libpng12" && +export CPPFLAGS="$CPPFLAGS -w -I/usr/include/libpng12" && OPTS="--sysconfdir=${INSTALL_ROOT}/etc/imlib" && default_build diff --git a/e/imlib/HISTORY b/e/imlib/HISTORY index aef9e57ed4..1dc019edcc 100644 --- a/e/imlib/HISTORY +++ b/e/imlib/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-02-28 Dale E. Edmons <linuxfan@sourcemage.org> * DETAILS: KEYWORDS update. diff --git a/editors/emacs/BUILD b/editors/emacs/BUILD index 58f2b8d145..78a08d5a14 100755 --- a/editors/emacs/BUILD +++ b/editors/emacs/BUILD @@ -1,16 +1,16 @@ -# don't make it track all info files in /usr/share/info + # don't make it track all info files in /usr/share/info # sedit 's:${COPYDESTS} ${infodir}:${COPYDESTS}:' Makefile.in && -# Fixes Bug #2938 -persistent_add LDFLAGS="${LDFLAGS/-z combreloc/}" && + # Fixes Bug #2938 + export LDFLAGS="${LDFLAGS/-z combreloc/}" && # # Fails to link if using -Wl,-O1 # -persistent_add LDFLAGS="${LDFLAGS//-Wl,-O1/}" && +export LDFLAGS="${LDFLAGS//-Wl,-O1/}" && if [ "$CVS" == "y" ]; then # Crashes with -03 - persistent_add CFLAGS="${CFLAGS//-O3/-O2}" && + export CFLAGS="${CFLAGS//-O3/-O2}" && OPTS="$OPTS --build=${BUILD}" diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY index 829ed6a47f..dc2be3228a 100644 --- a/editors/emacs/HISTORY +++ b/editors/emacs/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-02-25 Pol Vinogradov <vin.public@gmail.com> * DEPENDS: fixed gtk+2 flag diff --git a/editors/j/BUILD b/editors/j/BUILD index 7ceca31f1f..06ddc15364 100755 --- a/editors/j/BUILD +++ b/editors/j/BUILD @@ -1,11 +1,11 @@ -. /etc/profile.d/java.sh && -chmod +x configure mkinstalldirs && +. /etc/profile.d/java.sh && +chmod +x configure mkinstalldirs && -./configure --build=${BUILD} \ +./configure --build=${BUILD} \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --with-jdk=${JAVA_HOME} \ ${OPTS} && -persistent_add MAKE_MODE=unix && +export MAKE_MODE=unix && make diff --git a/editors/j/HISTORY b/editors/j/HISTORY index 831eeeaa71..516ef8b302 100644 --- a/editors/j/HISTORY +++ b/editors/j/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/editors/openoffice/BUILD b/editors/openoffice/BUILD index 635fe1c1cc..182c658b17 100755 --- a/editors/openoffice/BUILD +++ b/editors/openoffice/BUILD @@ -4,9 +4,9 @@ fi ### configure -cd $SOURCE_DIRECTORY/config_office/ && -persistent_add CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -I/usr/include/nspr -I/usr/include/nss" && -persistent_add CFLAGS="${CFLAGS} -I/usr/include/nspr -I/usr/include/nss" && + cd $SOURCE_DIRECTORY/config_office/ && + export CXXFLAGS="${CXXFLAGS} -I/usr/X11R6/include -I/usr/include/nspr -I/usr/include/nss" && +export CFLAGS="${CFLAGS} -I/usr/include/nspr -I/usr/include/nss" && if [ "$OPENOFFICE_VERSION" == "stable" ]; then optimize fi diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY index d15751288f..0b512dbbd1 100644 --- a/editors/openoffice/HISTORY +++ b/editors/openoffice/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-02-06 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: removed mktemp (deprecated), is a part of coreutils now (which included in basesystem) diff --git a/editors/pdfedit/BUILD b/editors/pdfedit/BUILD index 1afa1c3d01..768b2c5487 100755 --- a/editors/pdfedit/BUILD +++ b/editors/pdfedit/BUILD @@ -1,3 +1,3 @@ -persistent_add QMAKESPEC=${QTDIR}/share/qt/mkspecs/linux-g++ && +export QMAKESPEC=${QTDIR}/share/qt/mkspecs/linux-g++ && default_build diff --git a/editors/pdfedit/HISTORY b/editors/pdfedit/HISTORY index 328005b3b6..af51ad63d8 100644 --- a/editors/pdfedit/HISTORY +++ b/editors/pdfedit/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-03-06 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.4.1 diff --git a/graphics/djview4/BUILD b/graphics/djview4/BUILD index 92190ae0ac..00e75ab3c8 100755 --- a/graphics/djview4/BUILD +++ b/graphics/djview4/BUILD @@ -1,3 +1,4 @@ -persistent_add QTDIR="" && -persistent_add PATH=${INSTALL_ROOT}/usr/bin/qt4:$PATH && +export QTDIR="" && +export PATH=${INSTALL_ROOT}/usr/bin/qt4:$PATH && default_build + diff --git a/graphics/djview4/HISTORY b/graphics/djview4/HISTORY index 239b959282..2fffaf340a 100644 --- a/graphics/djview4/HISTORY +++ b/graphics/djview4/HISTORY @@ -1,6 +1,3 @@ -2008-03-03 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-11-10 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.2 diff --git a/graphics/qcad/BUILD b/graphics/qcad/BUILD index 533fa9d853..54f38b6741 100755 --- a/graphics/qcad/BUILD +++ b/graphics/qcad/BUILD @@ -1,5 +1,5 @@ -persistent_add QTDIR=${QTDIR:-$INSTALL_ROOT/usr} -persistent_add QMAKESPEC=${QTDIR}/share/qt/mkspecs/linux-g++ +export QTDIR=${QTDIR:-$INSTALL_ROOT/usr} && +export QMAKESPEC=${QTDIR}/share/qt/mkspecs/linux-g++ && for i in fparser dxflib do diff --git a/graphics/qcad/HISTORY b/graphics/qcad/HISTORY index c29f65214f..d11e056127 100644 --- a/graphics/qcad/HISTORY +++ b/graphics/qcad/HISTORY @@ -1,6 +1,3 @@ -2008-03-03 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/graphics/wings3d/BUILD b/graphics/wings3d/BUILD index 6d51970c2c..62bf2a91a3 100755 --- a/graphics/wings3d/BUILD +++ b/graphics/wings3d/BUILD @@ -1,4 +1,4 @@ -local WINGS3D_PATH +local WINGS3D_PATH && if spell_ok xorg-server; then sedit 's:GL_LIBS = -lGLU -lGL:GL_LIBS = -L/usr/lib -lGLU -lGL:' plugins_src/accel/Makefile @@ -6,7 +6,7 @@ else sedit 's:GL_LIBS = -lGLU -lGL:GL_LIBS = -L/usr/X11R6/lib -lGLU -lGL:' plugins_src/accel/Makefile fi && -persistent_add ESDL_PATH=/usr/lib/esdl -WINGS3D_PATH=/usr/lib/wings +export ESDL_PATH=/usr/lib/esdl && +WINGS3D_PATH=/usr/lib/wings && make_single && make diff --git a/graphics/wings3d/HISTORY b/graphics/wings3d/HISTORY index e6eb5a924c..6488226891 100644 --- a/graphics/wings3d/HISTORY +++ b/graphics/wings3d/HISTORY @@ -1,6 +1,3 @@ -2008-03-03 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-03-09 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.99.02 diff --git a/ham/unixcw/BUILD b/ham/unixcw/BUILD index 7e5cccea1a..ac44175a14 100755 --- a/ham/unixcw/BUILD +++ b/ham/unixcw/BUILD @@ -1,15 +1,15 @@ -if ! [ -e /usr/lib/libqt.so ]; then - ln -s $TRACK_ROOT/usr/lib/libqt-mt.so.3.0.4 /usr/lib/libqt.so -fi + if ! [ -e /usr/lib/libqt.so ]; then + ln -s $TRACK_ROOT/usr/lib/libqt-mt.so.3.0.4 /usr/lib/libqt.so + fi -mkdir /tmp/unixcw_qt -ln -s $TRACK_ROOT/usr/include/qt /tmp/unixcw_qt/include -ln -s $TRACK_ROOT/usr/bin /tmp/unixcw_qt/bin -ln -s $TRACK_ROOT/usr/lib/qt /tmp/unixcw_qt/lib -persistent_add QTDIR=/tmp/unixcw_qt + mkdir /tmp/unixcw_qt + ln -s $TRACK_ROOT/usr/include/qt /tmp/unixcw_qt/include + ln -s $TRACK_ROOT/usr/bin /tmp/unixcw_qt/bin + ln -s $TRACK_ROOT/usr/lib/qt /tmp/unixcw_qt/lib + export QTDIR=/tmp/unixcw_qt -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - $OPTS && -make all + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + $OPTS && + make all diff --git a/ham/unixcw/HISTORY b/ham/unixcw/HISTORY index 207ef99f31..ded6a501d7 100644 --- a/ham/unixcw/HISTORY +++ b/ham/unixcw/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * BUILD, INSTALL: use TRACK_ROOT when linking #9163 diff --git a/http/firefox/BUILD b/http/firefox/BUILD index 462b6e480b..9509edf3ba 100755 --- a/http/firefox/BUILD +++ b/http/firefox/BUILD @@ -1,7 +1,7 @@ cd $SOURCE_DIRECTORY/mozilla && FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firefox && -persistent_add MOZ_PHOENIX=1 && +export MOZ_PHOENIX=1 && # # Only strip if the user wants us to diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY index a74ace837e..efe2fb76b2 100644 --- a/http/firefox/HISTORY +++ b/http/firefox/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-02-13 George Sherwood <george@beernabeer.com> * DETAILS: Updated devel to version 3.0 beta 3 diff --git a/http/icecat/BUILD b/http/icecat/BUILD index b52a274284..19c5a36e1d 100755 --- a/http/icecat/BUILD +++ b/http/icecat/BUILD @@ -1,8 +1,8 @@ local ICECAT_HOME=${INSTALL_ROOT}/usr/lib/${SPELL} && -persistent_add MOZ_PHOENIX=1 && +export MOZ_PHOENIX=1 && -persistent_add CFLAGS="${CFLAGS//-O3/-O2}" && -persistent_add CXXFLAGS="${CXXFLAGS//-O3/-O2}" && +export CFLAGS="${CFLAGS//-O3/-O2}" && +export CXXFLAGS="${CXXFLAGS//-O3/-O2}" && OPTS="$ICECAT_MAILNEWS $ICECAT_CALENDAR $ICECAT_CHAT $ICECAT_COMPOSER \ $ICECAT_MATHML $ICECAT_JS $OPTS" && diff --git a/http/icecat/HISTORY b/http/icecat/HISTORY index ece6824a91..92363456ce 100644 --- a/http/icecat/HISTORY +++ b/http/icecat/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-02-06 Pol Vinogradov <vin.public@gmail.com> * CONFIGURE: removed iceweasel's defaults * CONFLICTS: removed diff --git a/java/ant/BUILD b/java/ant/BUILD index 5a06dace73..1de551a49e 100755 --- a/java/ant/BUILD +++ b/java/ant/BUILD @@ -7,7 +7,7 @@ fi && set_java_env && if list_find "$OPTS" "--with-antlr"; then - persistent_add CLASSPATH="$INSTALL_ROOT/usr/share/antlr-$(installed_version antlr)/antlr.jar:$CLASSPATH" + export CLASSPATH="$INSTALL_ROOT/usr/share/antlr-$(installed_version antlr)/antlr.jar:$CLASSPATH" fi && ./build.sh -Ddist.dir=antbuild dist diff --git a/java/ant/HISTORY b/java/ant/HISTORY index d91a79157b..8bc3ca8397 100644 --- a/java/ant/HISTORY +++ b/java/ant/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-09-28 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Incremented PATCHLEVEL=1 to install update ant.sh * ant.sh: Ant requires Java to run, so make sure JAVA_HOME is set if not diff --git a/kernels/e100/BUILD b/kernels/e100/BUILD index 511cf8ca2a..ca15e78606 100755 --- a/kernels/e100/BUILD +++ b/kernels/e100/BUILD @@ -1,3 +1,3 @@ -persistent_add CFLAGS="${CFLAGS//-[fD]PIC/}" && +export CFLAGS="${CFLAGS//-[fD]PIC/}" && cd src && make diff --git a/kernels/e100/HISTORY b/kernels/e100/HISTORY index 9e7cdc69c6..9a0ccb6283 100644 --- a/kernels/e100/HISTORY +++ b/kernels/e100/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/kernels/e1000/BUILD b/kernels/e1000/BUILD index 511cf8ca2a..ca15e78606 100755 --- a/kernels/e1000/BUILD +++ b/kernels/e1000/BUILD @@ -1,3 +1,3 @@ -persistent_add CFLAGS="${CFLAGS//-[fD]PIC/}" && +export CFLAGS="${CFLAGS//-[fD]PIC/}" && cd src && make diff --git a/kernels/e1000/HISTORY b/kernels/e1000/HISTORY index 37adcb1343..0aeee76c1d 100644 --- a/kernels/e1000/HISTORY +++ b/kernels/e1000/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/libs/dbxml/BUILD b/libs/dbxml/BUILD index f27bf9d829..993e491c09 100755 --- a/libs/dbxml/BUILD +++ b/libs/dbxml/BUILD @@ -1,10 +1,9 @@ if [ -z $JAVA_HOME ]; then if spell_ok j2sdk; then - JAVA_HOME=/opt/java/j2sdk + export JAVA_HOME=/opt/java/j2sdk elif spell_ok j2sdk-bin; then - JAVA_HOME=/usr/lib/j2sdk1.4.1 + export JAVA_HOME=/usr/lib/j2sdk1.4.1 fi - persistent_add JAVA_HOME fi && cd build_unix && diff --git a/libs/dbxml/HISTORY b/libs/dbxml/HISTORY index 5a33096aeb..445caf4773 100644 --- a/libs/dbxml/HISTORY +++ b/libs/dbxml/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/libs/gdkxft/BUILD b/libs/gdkxft/BUILD index 52f4045d31..b4b9072482 100755 --- a/libs/gdkxft/BUILD +++ b/libs/gdkxft/BUILD @@ -1,2 +1,2 @@ -persistent_add CFLAGS="`freetype-config --cflags` $CFLAGS -I/usr/include/libcapplet1" && -default_build + export CFLAGS="`freetype-config --cflags` $CFLAGS -I/usr/include/libcapplet1" && + default_build diff --git a/libs/gdkxft/HISTORY b/libs/gdkxft/HISTORY index 2a8b0d0b2f..00ef6a0e50 100644 --- a/libs/gdkxft/HISTORY +++ b/libs/gdkxft/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/libs/gettext/BUILD b/libs/gettext/BUILD index 9e780f4bce..4bb84c95dd 100755 --- a/libs/gettext/BUILD +++ b/libs/gettext/BUILD @@ -1,7 +1,7 @@ # disable emacs, bug #8592 sedit 's/EMACS = @EMACS@/EMACS = no/' gettext-tools/misc/Makefile.in && -persistent_add CC=gcc && +export CC=gcc && make_single && diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY index 77a143dae4..deb4816fd0 100644 --- a/libs/gettext/HISTORY +++ b/libs/gettext/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-01-28 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * BUILD: added missing parameter to the is_depends_enabled call * INSTALL: added missing parameter to the is_depends_enabled call diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD index e040e7e05a..667f72c6b2 100755 --- a/libs/glibc/BUILD +++ b/libs/glibc/BUILD @@ -20,7 +20,7 @@ fi && # in configurations and doesn't force recompile when it should. This stops it from # using the old cache entries. # -persistent_add CCACHE_RECACHE=true && +export CCACHE_RECACHE=true && # # End ccache fix # @@ -55,8 +55,8 @@ else CFLAGS="-Os $CFLAGS" fi && -persistent_add CFLAGS="${CFLAGS/-ffast-math/}" && -persistent_add CC=gcc && +export CFLAGS="${CFLAGS/-ffast-math/}" && +export CC=gcc && # # LD_LIBRARY_PATH includes $PWD bug @@ -73,46 +73,44 @@ if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then # headers, not sparc64 # if echo "$CFLAGS" | grep -q -- "-m64"; then - persistent_add CC=gcc64 + export CC=gcc64 fi && # # Fixes from Gentoo's 2.3.3.20040420-r2 ebuild # sedit "s:CPPFLAGS += -DHAVE_INITFINI:CPPFLAGS += -DHAVE_INITFINI -fno-pie -fno-PIE:" csu/Makefile - CFLAGS="${CFLAGS/-fcall-used-g7/}" - CFLAGS="$CFLAGS -fcall-used-g6" - CFLAGS="${CFLAGS/-mcpu=v9/}" - CFLAGS="${CFLAGS/-mtune=ultrasparc/}" - CFLAGS="${CFLAGS/-mvis/}" - persistent_add CFLAGS + export CFLAGS="${CFLAGS/-fcall-used-g7/}" + export CFLAGS="$CFLAGS -fcall-used-g6" + export CFLAGS="${CFLAGS/-mcpu=v9/}" + export CFLAGS="${CFLAGS/-mtune=ultrasparc/}" + export CFLAGS="${CFLAGS/-mvis/}" # Setup the HOST properly to insure "sparcv9" # This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler [ "$HOST" = "sparc-unknown-linux-gnu" ] && - persistent_add HOST="sparcv9-unknown-linux-gnu" && + export HOST="sparcv9-unknown-linux-gnu" && [ "$BUILD" = "sparc-unknown-linux-gnu" ] && - persistent_add BUILD="sparcv9-unknown-linux-gnu" + export BUILD="sparcv9-unknown-linux-gnu" elif [[ ${SMGL_COMPAT_ARCHS[0]} == 32 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then # # Fixes from Gentoo's 2.3.3.20040420-r2 ebuild # sedit "s:CPPFLAGS += -DHAVE_INITFINI:CPPFLAGS += -DHAVE_INITFINI -fno-pie -fno-PIE:" csu/Makefile - CFLAGS="${CFLAGS/-fcall-used-g7/}" - CFLAGS="$CFLAGS -fcall-used-g6" - persistent_add CFLAGS + export CFLAGS="${CFLAGS/-fcall-used-g7/}" + export CFLAGS="$CFLAGS -fcall-used-g6" elif [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then # This is a first attempt to get alpha going, being paranoid about any CFLAGS, # not without reason: -Os/-O breaks compile in strange ways: # either an elf/ld.so that segfaults (build failing at sunrpc) or # internal compiler error(s) in intl/ # glibc knows itself what flags to choose - persistent_add CFLAGS="" + export CFLAGS="" fi && # CPPFLAGS setting is needed so the check for cpp works on boxes that don't # have any kernel headers in /usr/include yet -persistent_add CPPFLAGS="$CPPFLAGS -I$GLIBC_HEADERS_DIR/usr/include" && +export CPPFLAGS="$CPPFLAGS -I$GLIBC_HEADERS_DIR/usr/include" && # # End sanitised glibc-kernel-headers setup # diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 6b4eecfc6c..e525c400f4 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-10-31 David Brown <dmlb2000@gmail.com> * BUILD: updated new cflags for 2.7 * DETAILS: updated glibc to 2.7 diff --git a/libs/libfwbuilder/BUILD b/libs/libfwbuilder/BUILD index 0a96964b5f..d433333b3f 100755 --- a/libs/libfwbuilder/BUILD +++ b/libs/libfwbuilder/BUILD @@ -1,2 +1,2 @@ -persistent_add CPPFLAGS="$CPPFLAGS -I /usr/include/libxml2/libxml" && +export CPPFLAGS="$CPPFLAGS -I /usr/include/libxml2/libxml" && default_build diff --git a/libs/libfwbuilder/HISTORY b/libs/libfwbuilder/HISTORY index 261c036d47..cec5339e2f 100644 --- a/libs/libfwbuilder/HISTORY +++ b/libs/libfwbuilder/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/libs/libmcal/BUILD b/libs/libmcal/BUILD index 221f861f3e..fcfe68a438 100755 --- a/libs/libmcal/BUILD +++ b/libs/libmcal/BUILD @@ -6,5 +6,5 @@ cd ./icap/ && make && cd .. && cd ./mstore/ && make && cd .. && OPTS="$OPTS --with-icap --with-mstore" && -persistent_add OTHER_CFLAGS="$CFLAGS" && +export OTHER_CFLAGS="$CFLAGS" && default_build diff --git a/libs/libmcal/HISTORY b/libs/libmcal/HISTORY index c3080b7f91..a8dd03fede 100644 --- a/libs/libmcal/HISTORY +++ b/libs/libmcal/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-03-03 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * BUILD: moved invoke_gcc to PRE_BUILD #10641 diff --git a/libs/libpathan/BUILD b/libs/libpathan/BUILD index 25d877fd01..e4bd3e9a08 100755 --- a/libs/libpathan/BUILD +++ b/libs/libpathan/BUILD @@ -1,4 +1,4 @@ -persistent_add XERCESCROOT=$INSTALL_ROOT/usr && +export XERCESCROOT=$INSTALL_ROOT/usr && make_single && default_build && make_normal diff --git a/libs/libpathan/HISTORY b/libs/libpathan/HISTORY index 263a10812b..2c8088aca0 100644 --- a/libs/libpathan/HISTORY +++ b/libs/libpathan/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-01-29 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * DETAILS: updated spell to 1.2-2; fixes #11070 diff --git a/libs/minidom/BUILD b/libs/minidom/BUILD index 036c326979..f01ad358df 100755 --- a/libs/minidom/BUILD +++ b/libs/minidom/BUILD @@ -1,7 +1,7 @@ -persistent_add CPPFLAGS="$CPPFLAGS -I /usr/include/libxml2/libxml" -./configure --build=$BUILD \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - $OPTS && -make + export CPPFLAGS="$CPPFLAGS -I /usr/include/libxml2/libxml" + ./configure --build=$BUILD \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + $OPTS && + make diff --git a/libs/minidom/HISTORY b/libs/minidom/HISTORY index a5ec571e51..ea02048a02 100644 --- a/libs/minidom/HISTORY +++ b/libs/minidom/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed BUILD_API=2. diff --git a/libs/pyqt/BUILD b/libs/pyqt/BUILD index d31d079618..098f690df7 100755 --- a/libs/pyqt/BUILD +++ b/libs/pyqt/BUILD @@ -2,7 +2,7 @@ source /etc/profile.d/qt.sh if [ $PYQT_BIG == y ];then VBIG=-c fi && -persistent_add QMAKESPEC=/usr/share/qt/mkspecs/default/ && +export QMAKESPEC=/usr/share/qt/mkspecs/default/ && /bin/echo "yes" | python ./configure.py -b /usr/bin \ -v /usr/share/sip $VBIG -y qt-mt && make diff --git a/libs/pyqt/HISTORY b/libs/pyqt/HISTORY index 0618fcbd67..52ec0b4c9e 100644 --- a/libs/pyqt/HISTORY +++ b/libs/pyqt/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-12-30 Remko van der Vossen <wich@sourcemage.org> * DETAILS: version 3.17.4 diff --git a/libs/pyqt4/BUILD b/libs/pyqt4/BUILD index daddb412f4..5d88b279f5 100755 --- a/libs/pyqt4/BUILD +++ b/libs/pyqt4/BUILD @@ -1,8 +1,8 @@ if [ $PYQT_BIG == y ];then VBIG=-c fi && -persistent_add QTDIR=/usr && +export QTDIR=/usr && PATH=$QTDIR/bin/qt4:$PATH && -#persistent_add QMAKESPEC=/usr/share/qt4/mkspecs/default/ && +#export QMAKESPEC=/usr/share/qt4/mkspecs/default/ && /bin/echo "yes" | python ./configure.py $VBIG && make diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY index 79dda7f017..6a39b2fe40 100644 --- a/libs/pyqt4/HISTORY +++ b/libs/pyqt4/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-09-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS; version 4.3.1 diff --git a/libs/xalan-c/BUILD b/libs/xalan-c/BUILD index 02e3398e9a..8bad84bda9 100755 --- a/libs/xalan-c/BUILD +++ b/libs/xalan-c/BUILD @@ -1,5 +1,5 @@ cd c && -persistent_add XALANCROOT=$SOURCE_DIRECTORY/c && +export XALANCROOT=$SOURCE_DIRECTORY/c && ./runConfigure -p linux -c gcc -P /usr && make diff --git a/libs/xalan-c/HISTORY b/libs/xalan-c/HISTORY index ef46571673..cf5304eeb3 100644 --- a/libs/xalan-c/HISTORY +++ b/libs/xalan-c/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-05-30 Ladislav Hagara <hgr@vabo.cz> * DETAILS, BUILD, INSTALL: created this spell, version 1_10_0 diff --git a/libs/xerces-c/BUILD b/libs/xerces-c/BUILD index 44f1db6292..a0e294ccf4 100755 --- a/libs/xerces-c/BUILD +++ b/libs/xerces-c/BUILD @@ -1,7 +1,7 @@ -persistent_add XERCESCROOT=$SOURCE_DIRECTORY +export XERCESCROOT=$SOURCE_DIRECTORY if echo $OPTS | grep -q 'ticu'; then - persistent_add ICUROOT=/usr + export ICUROOT=/usr fi && cd src/xercesc && diff --git a/libs/xerces-c/HISTORY b/libs/xerces-c/HISTORY index e7cb9f6da6..87d91f3105 100644 --- a/libs/xerces-c/HISTORY +++ b/libs/xerces-c/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-12-15 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2_8_0 new url diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD index aeed5d2833..e89dab33b2 100755 --- a/mail/thunderbird/BUILD +++ b/mail/thunderbird/BUILD @@ -1,13 +1,13 @@ cd $SOURCE_DIRECTORY/mozilla && THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird && -persistent_add MOZ_THUNDERBIRD="1" && +export MOZ_THUNDERBIRD="1" && # # No fast optimization for Mozilla, bit us so many times... # -persistent_add CFLAGS="${CFLAGS//-O3/-O2}" && -persistent_add CXXFLAGS="${CXXFLAGS//-O3/-O2}" && +export CFLAGS="${CFLAGS//-O3/-O2}" && +export CXXFLAGS="${CXXFLAGS//-O3/-O2}" && # # -ffast-math breaks plugins diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY index bca5ad3b63..af6810c195 100644 --- a/mail/thunderbird/HISTORY +++ b/mail/thunderbird/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * INSTALL, BUILD: use persistent_add instead of export - 2008-02-27 Julien "_kaze_" ROZO <julien@rozo.org> * DETAILS: updated version to 2.0.0.12, SECURITY_PATCH=11 diff --git a/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL index ea9cc9ee69..ab35c191aa 100755 --- a/mail/thunderbird/INSTALL +++ b/mail/thunderbird/INSTALL @@ -14,8 +14,8 @@ if [ "$BUILD_ENIGMAIL" == "y" ]; then fi && cd ${INSTALL_ROOT}/usr/lib/thunderbird && -persistent_add LD_LIBRARY_PATH="$THUNDERBIRD_HOME" && -persistent_add MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" && +export LD_LIBRARY_PATH="$THUNDERBIRD_HOME" && +export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" && ./regxpcom && touch `find . -name *.rdf` && diff --git a/science-libs/cln/BUILD b/science-libs/cln/BUILD index cd9a8495e2..613d97314a 100755 --- a/science-libs/cln/BUILD +++ b/science-libs/cln/BUILD @@ -1,2 +1,2 @@ -persistent_add CXXFLAGS="${CXXFLAGS//-O3/-O2}" && +export CXXFLAGS="${CXXFLAGS//-O3/-O2}" && default_build diff --git a/science-libs/cln/HISTORY b/science-libs/cln/HISTORY index c9b48e898a..1848baa54b 100644 --- a/science-libs/cln/HISTORY +++ b/science-libs/cln/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org> * DETAILS: [automated] Removed UPDATED. diff --git a/science-libs/vtk/BUILD b/science-libs/vtk/BUILD index 05636394cd..23466e0d20 100755 --- a/science-libs/vtk/BUILD +++ b/science-libs/vtk/BUILD @@ -1,6 +1,6 @@ -persistent_add VTK_DATA_ROOT=/usr/share/vtk/VTKData && -persistent_add VTK_INSTALL_PATH=/usr && -persistent_add CMAKE_INSTALL_PREFIX=/usr && +export VTK_DATA_ROOT=/usr/share/vtk/VTKData && +export VTK_INSTALL_PATH=/usr && +export CMAKE_INSTALL_PREFIX=/usr && cmake . && sedit "s/^CMAKE_INSTALL_PREFIX:PATH=.*$/CMAKE_INSTALL_PREFIX:PATH=\/usr/" CMakeCache.txt && diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY index aa096c1407..0655fcea03 100644 --- a/science-libs/vtk/HISTORY +++ b/science-libs/vtk/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-01-28 Mathieu Lonjaret <lejatorn@sourcemage.org> * DETAILS: update to 5.0.4 diff --git a/security-libs/linux-pam/BUILD b/security-libs/linux-pam/BUILD index 8cd9927a9b..9e833c2cfa 100755 --- a/security-libs/linux-pam/BUILD +++ b/security-libs/linux-pam/BUILD @@ -1,8 +1,8 @@ if [ "${PAM_DOCS}" == "n" ]; then - persistent_add SGML2LATEX=no + export SGML2LATEX=no fi -persistent_add PS2PDF=no +export PS2PDF=no #autoconf && ./configure --libdir=/lib \ diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY index ed153f034e..b075a2250d 100644 --- a/security-libs/linux-pam/HISTORY +++ b/security-libs/linux-pam/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-03-03 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.99.10.0 diff --git a/shell-term-fm/unixtree/BUILD b/shell-term-fm/unixtree/BUILD index 31caaef025..0f12847f31 100755 --- a/shell-term-fm/unixtree/BUILD +++ b/shell-term-fm/unixtree/BUILD @@ -10,7 +10,7 @@ if ! echo $OPTS | grep -q 'with-x'; then unset X11_LIBS && unset X11_INCS && unset XPMDIR && - persistent_add USE_X11=no && - persistent_add LIBXVT=libxvt-dummy + export USE_X11=no && + export LIBXVT=libxvt-dummy fi && make diff --git a/shell-term-fm/unixtree/HISTORY b/shell-term-fm/unixtree/HISTORY index d9739316b4..e5e8ecc8df 100644 --- a/shell-term-fm/unixtree/HISTORY +++ b/shell-term-fm/unixtree/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * INSTALL: use TRACK_ROOT not INSTALL_ROOT when linking #9163 diff --git a/utils/sunbird/BUILD b/utils/sunbird/BUILD index c33c36be91..6cec49a147 100755 --- a/utils/sunbird/BUILD +++ b/utils/sunbird/BUILD @@ -1,8 +1,8 @@ -persistent_add CFLAGS="${CFLAGS//-O3/-O2}" && -persistent_add CXXFLAGS="${CXXFLAGS//-O3/-O2}" && -persistent_add MOZ_CO_PROJECT=calendar && -persistent_add BUILD_OFFICIAL=1 && -persistent_add MOZILLA_OFFICIAL=1 && +export CFLAGS="${CFLAGS//-O3/-O2}" && +export CXXFLAGS="${CXXFLAGS//-O3/-O2}" && +export MOZ_CO_PROJECT=calendar && +export BUILD_OFFICIAL=1 && +export MOZILLA_OFFICIAL=1 && OPTS="--with-pthreads \ --with-default-mozilla-five-home=$INSTALL_ROOT/usr/lib/$SPELL \ diff --git a/utils/sunbird/HISTORY b/utils/sunbird/HISTORY index 8ad396bba5..4c894b79e4 100644 --- a/utils/sunbird/HISTORY +++ b/utils/sunbird/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-08-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: corrected SOURCE_URL[0] diff --git a/video-libs/libdvb/BUILD b/video-libs/libdvb/BUILD index b1ebc7f094..f4e3d7a0a2 100755 --- a/video-libs/libdvb/BUILD +++ b/video-libs/libdvb/BUILD @@ -1,5 +1,5 @@ -persistent_add CFLAGS="${CFLAGS} -Wall -g" && -persistent_add CXXFLAGS=${CFLAGS} && +export CFLAGS="${CFLAGS} -Wall -g" && +export CXXFLAGS=${CFLAGS} && make_single && make && make_normal diff --git a/video-libs/libdvb/HISTORY b/video-libs/libdvb/HISTORY index 36b92c206e..1c3cb085cd 100644 --- a/video-libs/libdvb/HISTORY +++ b/video-libs/libdvb/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2007-03-13 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: updated to 0.5.5.1 * config.patch, makefile.patch: removed diff --git a/video-libs/xine-lib/BUILD b/video-libs/xine-lib/BUILD index 0ab52e0a5b..88c7c6be00 100755 --- a/video-libs/xine-lib/BUILD +++ b/video-libs/xine-lib/BUILD @@ -1,3 +1,3 @@ # breaks with lots of stuff, let it use its own CFLAGS -persistent_add CFLAGS="" && +export CFLAGS="" && default_build diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY index 810a98d6c5..e06ec29422 100644 --- a/video-libs/xine-lib/HISTORY +++ b/video-libs/xine-lib/HISTORY @@ -1,6 +1,3 @@ -2008-03-11 Ismael Luceno <ismael@sourcemage.org> - * BUILD: use persistent_add instead of export - 2008-02-08 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.1.10.1, SECURITY_PATCH=5, CVE-2008-0486 |