[Lunar-commits] <moonbase> moonbase: replace old-style OPTS usage

Paul Bredbury brebs at lunar-linux.org
Sun Jan 23 12:01:35 CET 2011


commit 89cdd2fbec6f728664390fad52585f990aeb5bf6
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Sun Jan 23 18:01:35 2011 +0700

    moonbase: replace old-style OPTS usage
    
    Done using:
    
    find -name BUILD | xargs grep 'OPTS="\$' | cut -d: -f1 > list
    cat list | xargs sed -i -e 's:OPTS="\$OPTS :OPTS+=" :'
---
 app-themes/Candido-Engine/BUILD              |    4 +-
 app-themes/gtk-nodoka-engine/BUILD           |    2 +-
 app-themes/ubuntulooks/BUILD                 |    2 +-
 audio/gmpc/BUILD                             |    2 +-
 audio/gnonlin/BUILD                          |    2 +-
 audio/gst-plugins-bad/BUILD                  |    2 +-
 audio/gst-plugins-base/BUILD                 |    2 +-
 audio/gst-plugins-good/BUILD                 |    2 +-
 audio/libmad/BUILD                           |    2 +-
 audio/madplay/BUILD                          |    2 +-
 audio/wavpack/BUILD                          |    2 +-
 cd/burgner/BUILD                             |    4 +-
 cd/libcdaudio/BUILD                          |    2 +-
 chat/BitchX/BUILD                            |    8 +++---
 chat/Ultimate/BUILD                          |   10 ++++----
 chat/bitlbee/BUILD                           |    2 +-
 chat/empathy/BUILD                           |    2 +-
 chat/gajim/BUILD                             |    2 +-
 chat/ircd-ratbox/BUILD                       |    2 +-
 chat/meanwhile/BUILD                         |    2 +-
 chat/ratbox-services/BUILD                   |    2 +-
 chat/xchat/BUILD                             |    2 +-
 compilers/llvm/BUILD                         |    2 +-
 compilers/php5-suhosin/BUILD                 |    6 ++--
 compilers/php5/BUILD                         |    6 ++--
 compilers/ruby/BUILD                         |    2 +-
 devel/bless/BUILD                            |    2 +-
 devel/cmake/BUILD                            |    2 +-
 devel/dbus/BUILD                             |    2 +-
 devel/expect/BUILD                           |    2 +-
 devel/hal/BUILD                              |    2 +-
 devel/rapidsvn/BUILD                         |    2 +-
 devel/subversion/BUILD                       |    2 +-
 distributed/aMule/BUILD                      |    2 +-
 distributed/ganglia/BUILD                    |    2 +-
 editors/gtkspell/BUILD                       |    2 +-
 editors/nano/BUILD                           |    6 ++--
 editors/vile/BUILD                           |    4 +-
 editors/vim/BUILD                            |    2 +-
 editors/xemacs/BUILD                         |    2 +-
 ftp/d4x/BUILD                                |    2 +-
 ftp/gtk-gnutella/BUILD                       |    2 +-
 ftp/lftp/BUILD                               |    4 +-
 ftp/proftpd/BUILD                            |    6 ++--
 ftp/pure-ftpd/BUILD                          |    2 +-
 ftp/wput/BUILD                               |    2 +-
 games/foobillard/BUILD                       |    4 +-
 games/quake2/BUILD                           |    2 +-
 gnome2/core/gtk-engines2/BUILD               |    2 +-
 gnome2/desktop/gdm/BUILD                     |    2 +-
 gnome2/desktop/gnome-themes/BUILD            |    2 +-
 gnome2/platform/gnome-vfs/BUILD              |    4 +-
 graphics/GraphicsMagick/BUILD                |    2 +-
 graphics/ImageMagick/BUILD                   |    2 +-
 graphics/cinepaint/BUILD                     |    4 +-
 graphics/devil/BUILD                         |    2 +-
 graphics/gimp/BUILD                          |    2 +-
 graphics/libEMF/BUILD                        |    2 +-
 graphics/libcaca/BUILD                       |    2 +-
 libs/ClanLib/BUILD                           |    4 +-
 libs/apr-iconv/BUILD                         |    2 +-
 libs/apr-util/BUILD                          |    2 +-
 libs/apr/BUILD                               |    2 +-
 libs/erlang/BUILD                            |    4 +-
 libs/fftw/BUILD                              |    2 +-
 libs/fltk/BUILD                              |    2 +-
 libs/fltk2/BUILD                             |    2 +-
 libs/gle/BUILD                               |    2 +-
 libs/glib-2/BUILD                            |    2 +-
 libs/gpgme/BUILD                             |    2 +-
 libs/libpaper/BUILD                          |    2 +-
 libs/librsync/BUILD                          |    2 +-
 libs/libsigsegv/BUILD                        |    2 +-
 libs/loudmouth/BUILD                         |    2 +-
 libs/ncurses/BUILD                           |    8 +++---
 libs/ncursesw/BUILD                          |    8 +++---
 libs/neon/BUILD                              |    6 ++--
 libs/nspr/BUILD                              |    4 +-
 libs/openMotif/BUILD                         |    2 +-
 libs/poppler/BUILD                           |    2 +-
 libs/wxGTK/BUILD                             |    2 +-
 mail/citadel/BUILD                           |    2 +-
 mail/dovecot/BUILD                           |    4 +-
 mail/nmh/BUILD                               |    2 +-
 mail/qpopper/BUILD                           |    4 +-
 net/avahi/BUILD                              |    2 +-
 net/libpcap/BUILD                            |    2 +-
 net/ngrep/BUILD                              |    2 +-
 net/openntpd/BUILD                           |    2 +-
 net/tcpdump/BUILD                            |    2 +-
 net/wireshark/BUILD                          |    2 +-
 printer/enscript/BUILD                       |    2 +-
 printer/gimp-print/BUILD                     |    2 +-
 printer/hplip/BUILD                          |    4 +-
 printer/hylafax/BUILD                        |    2 +-
 printer/lilypond/BUILD                       |    2 +-
 python/Python/BUILD                          |    2 +-
 python/mod_python/BUILD                      |    2 +-
 science/GMT/BUILD                            |    2 +-
 science/celestia-gtk/BUILD                   |    2 +-
 science/gpsd/BUILD                           |    2 +-
 science/gpsim/BUILD                          |    2 +-
 science/grace/BUILD                          |    2 +-
 science/pcb/BUILD                            |    2 +-
 security/pam_ldap/BUILD                      |    2 +-
 security/pam_mount/BUILD                     |    2 +-
 security/shadow/BUILD                        |    4 +-
 security/sudo/BUILD                          |    2 +-
 security/tls/BUILD                           |    2 +-
 sql/postgresql/BUILD                         |    4 +-
 sql/unixODBC/BUILD                           |    2 +-
 terminal/Eterm/BUILD                         |    2 +-
 terminal/aterm/BUILD                         |    2 +-
 terminal/qingy/BUILD                         |    2 +-
 utils/amanda/BUILD                           |    2 +-
 utils/discover/BUILD                         |    2 +-
 utils/gcal/BUILD                             |    2 +-
 utils/gnokii/BUILD                           |    2 +-
 utils/gpsbabel/BUILD                         |    2 +-
 utils/openmosix-tools/BUILD                  |    2 +-
 utils/pilot-link/BUILD                       |    2 +-
 utils/rrdtool/BUILD                          |    2 +-
 video/ftgl/BUILD                             |    2 +-
 video/gpac/BUILD                             |    2 +-
 video/kino/BUILD                             |    2 +-
 video/libquicktime/BUILD                     |    2 +-
 video/transcode/BUILD                        |    2 +-
 virtual/bochs/BUILD                          |   28 +++++++++++++-------------
 virtual/dosbox/BUILD                         |    2 +-
 virtual/dosemu/BUILD                         |    2 +-
 web/apache2/BUILD                            |    4 +-
 web/chromium/BUILD                           |   10 ++++----
 web/webalizer/BUILD                          |    2 +-
 web/webkit/BUILD                             |    2 +-
 x11-apps/dia/BUILD                           |    2 +-
 x11-apps/openoffice-src/BUILD                |    6 ++--
 x11-apps/rss-glx/BUILD                       |    4 +-
 x11-utils/imwheel/BUILD                      |    2 +-
 x11-utils/wininfo/BUILD                      |    2 +-
 x11-utils/xpad/BUILD                         |    2 +-
 x11-wm/fluxbox/BUILD                         |    6 ++--
 x11/libxklavier/BUILD                        |    2 +-
 x11/xplanet/BUILD                            |    2 +-
 xfce4/goodies/notification-daemon-xfce/BUILD |    2 +-
 xorg7/driver/xf86-video-intel/BUILD          |    2 +-
 xorg7/font/font-util/BUILD                   |    2 +-
 xorg7/xorg-server/BUILD                      |    2 +-
 zbeta/airconfig-svn/BUILD                    |    2 +-
 zbeta/bmpx/BUILD                             |    2 +-
 zbeta/compiz/compiz/BUILD                    |    2 +-
 zbeta/e17/e17-svn/BUILD                      |    2 +-
 zbeta/e17/ecore-svn/BUILD                    |    2 +-
 zbeta/e17/emphasis-svn/BUILD                 |    2 +-
 zbeta/e17/enhance-svn/BUILD                  |    2 +-
 zbeta/e17/evas-svn/BUILD                     |    2 +-
 zbeta/enna-hg/BUILD                          |    2 +-
 zbeta/eweather-svn/BUILD                     |    2 +-
 zbeta/expect-cvs/BUILD                       |    2 +-
 zbeta/gcompris/BUILD                         |    2 +-
 zbeta/ghal-svn/BUILD                         |    2 +-
 zbeta/libgdbus-git/BUILD                     |    2 +-
 zbeta/moodbar/BUILD                          |    2 +-
 zbeta/openafs-devel/BUILD                    |    6 ++--
 zbeta/openafs-driver-devel/BUILD             |    6 ++--
 zbeta/pcb-cvs/BUILD                          |    2 +-
 zbeta/pcb-git/BUILD                          |    2 +-
 zbeta/rage-svn/BUILD                         |    2 +-
 zbeta/transcode-cvs/BUILD                    |   10 ++++----
 zbeta/x264-git/BUILD                         |    2 +-
 zbeta/x264-snapshot/BUILD                    |    2 +-
 zbeta/xcache/BUILD                           |    2 +-
 zbeta/xemacs-beta/BUILD                      |    4 +-
 zdeprecated/gstreamer/BUILD                  |    2 +-
 zdeprecated/kvm/BUILD                        |    2 +-
 zdeprecated/php/BUILD                        |    8 +++---
 zdeprecated/xpdf/BUILD                       |    2 +-
 176 files changed, 249 insertions(+), 249 deletions(-)

diff --git a/app-themes/Candido-Engine/BUILD b/app-themes/Candido-Engine/BUILD
index 6910d38..dc95571 100644
--- a/app-themes/Candido-Engine/BUILD
+++ b/app-themes/Candido-Engine/BUILD
@@ -1,9 +1,9 @@
 (
 
   if [[ "$ANIMATION" == "y" ]]; then
-    OPTS="$OPTS --enable-animation"
+    OPTS+=" --enable-animation"
   else
-    OPTS="$OPTS --disable-animation"
+    OPTS+=" --disable-animation"
   fi
 
   default_build
diff --git a/app-themes/gtk-nodoka-engine/BUILD b/app-themes/gtk-nodoka-engine/BUILD
index 0dd8e2f..01fa7ef 100644
--- a/app-themes/gtk-nodoka-engine/BUILD
+++ b/app-themes/gtk-nodoka-engine/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS  --enable-animation"
+  OPTS+="  --enable-animation"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/app-themes/ubuntulooks/BUILD b/app-themes/ubuntulooks/BUILD
index 0dd8e2f..01fa7ef 100644
--- a/app-themes/ubuntulooks/BUILD
+++ b/app-themes/ubuntulooks/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS  --enable-animation"
+  OPTS+="  --enable-animation"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/audio/gmpc/BUILD b/audio/gmpc/BUILD
index 41d38d3..4c7489c 100644
--- a/audio/gmpc/BUILD
+++ b/audio/gmpc/BUILD
@@ -2,7 +2,7 @@
 
   # tchan added this hack because neither 0.17 nor 0.18 would compile for me without it
   # should be removed in the future if the gmpc devs ever get around to fixing it
-  OPTS="$OPTS --disable-sm" &&
+  OPTS+=" --disable-sm" &&
 
   default_build
 
diff --git a/audio/gnonlin/BUILD b/audio/gnonlin/BUILD
index 24474b0..1130e9d 100644
--- a/audio/gnonlin/BUILD
+++ b/audio/gnonlin/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS  --disable-valgrind"
+  OPTS+="  --disable-valgrind"
 
   default_build
 
diff --git a/audio/gst-plugins-bad/BUILD b/audio/gst-plugins-bad/BUILD
index a4e72b2..a793a10 100644
--- a/audio/gst-plugins-bad/BUILD
+++ b/audio/gst-plugins-bad/BUILD
@@ -15,7 +15,7 @@
   #Disable x264, since x264-git doesn't work with it, and
   #I can't seem to find a version of x264-snapshot that does either
 
-  OPTS="$OPTS  --disable-valgrind --disable-debug --disable-examples  " &&
+  OPTS+="  --disable-valgrind --disable-debug --disable-examples  " &&
 
   default_build
 
diff --git a/audio/gst-plugins-base/BUILD b/audio/gst-plugins-base/BUILD
index fedee7f..61c76c5 100644
--- a/audio/gst-plugins-base/BUILD
+++ b/audio/gst-plugins-base/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS \
+  OPTS+=" \
         --enable-experimental  \
         --enable-gio           \
         --disable-valgrind     \
diff --git a/audio/gst-plugins-good/BUILD b/audio/gst-plugins-good/BUILD
index dfce437..42d31d1 100644
--- a/audio/gst-plugins-good/BUILD
+++ b/audio/gst-plugins-good/BUILD
@@ -4,7 +4,7 @@
   #Check at the next version bump
   sedit 's:@MKINSTALLDIRS@:mkinstalldirs:g' po/Makefile.in.in &&
 
-  OPTS="$OPTS  --disable-valgrind  --disable-debug  --disable-examples" &&
+  OPTS+="  --disable-valgrind  --disable-debug  --disable-examples" &&
 
   default_config &&
 
diff --git a/audio/libmad/BUILD b/audio/libmad/BUILD
index ae9336b..f8811ed 100644
--- a/audio/libmad/BUILD
+++ b/audio/libmad/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS  --disable-debugging --enable-accuracy" &&
+  OPTS+="  --disable-debugging --enable-accuracy" &&
 
   if [ `arch` == "x86_64" ] ; then
     OPTS="--enable-fpm=64bit"
diff --git a/audio/madplay/BUILD b/audio/madplay/BUILD
index 5407416..d59db07 100644
--- a/audio/madplay/BUILD
+++ b/audio/madplay/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS  --disable-debugging --enable-shared"
+  OPTS+="  --disable-debugging --enable-shared"
 
   default_build
 
diff --git a/audio/wavpack/BUILD b/audio/wavpack/BUILD
index 952090b..3a8e762 100644
--- a/audio/wavpack/BUILD
+++ b/audio/wavpack/BUILD
@@ -1,6 +1,6 @@
 (
 
-  egrep '\<mmx\>' /proc/cpuinfo &> /dev/null && OPTS="$OPTS --enable-mmx"
+  egrep '\<mmx\>' /proc/cpuinfo &> /dev/null && OPTS+=" --enable-mmx"
 
   default_build
 
diff --git a/cd/burgner/BUILD b/cd/burgner/BUILD
index 27ed470..d79df01 100644
--- a/cd/burgner/BUILD
+++ b/cd/burgner/BUILD
@@ -1,9 +1,9 @@
 (
 
-  export OPTS="$OPTS --enable-plugin-gestures" 
+  export OPTS+=" --enable-plugin-gestures"
   # gcc-3.3.x fix
   sedit "s/##i##/i/g" libburgnerisofs/burgner-isofs-tree-volume-descriptor.c &&
   sedit "s/##i/i/g" libburgnerisofs/burgner-isofs-tree-volume-descriptor.c &&
   default_build
-  
+
 ) > $C_FIFO 2>&1
diff --git a/cd/libcdaudio/BUILD b/cd/libcdaudio/BUILD
index 0982c97..5fef6c1 100644
--- a/cd/libcdaudio/BUILD
+++ b/cd/libcdaudio/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-threads --with-pic"
+  OPTS+=" --enable-threads --with-pic"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/chat/BitchX/BUILD b/chat/BitchX/BUILD
index d122d66..60fcd54 100644
--- a/chat/BitchX/BUILD
+++ b/chat/BitchX/BUILD
@@ -1,20 +1,20 @@
 (
 
   if [ "$IPV6" == "y" ] ; then
-    OPTS="$OPTS --enable-ipv6"
+    OPTS+=" --enable-ipv6"
   fi
 
   if [ "$CDROM" == "y" ] ; then
-    OPTS="$OPTS --enable-cdrom"
+    OPTS+=" --enable-cdrom"
   fi
 
   if [ "$PLUGINS" == "y" ] ; then
-    OPTS="$OPTS --with-plugins"
+    OPTS+=" --with-plugins"
   fi
 
   if module_installed openssl ; then   # Ya just never know...
     if [ "$SSL" == "y" ] ; then
-      OPTS="$OPTS --with-ssl"
+      OPTS+=" --with-ssl"
     fi
   fi
 
diff --git a/chat/Ultimate/BUILD b/chat/Ultimate/BUILD
index 92fb7aa..b0675dc 100644
--- a/chat/Ultimate/BUILD
+++ b/chat/Ultimate/BUILD
@@ -3,19 +3,19 @@
   add_priv_user ultimate:ultimate "-m -s /bin/sh -d /var/lib/ultimateircd" &&
 
   if [ "$IPV6" == "y" ]; then 
-      OPTS="$OPTS --enable-ipv6"
+      OPTS+=" --enable-ipv6"
   fi
   if [ "$Acebot" == "y" ]; then 
-      OPTS="$OPTS --enable-acebot-rejection"
+      OPTS+=" --enable-acebot-rejection"
   fi
   if [ "$Chinese" == "y" ]; then 
-      OPTS="$OPTS --enable-chinese-nick"
+      OPTS+=" --enable-chinese-nick"
   fi
   if [ "$Crypt" == "y" ]; then 
-      OPTS="$OPTS --disable-crypted-oper-password"
+      OPTS+=" --disable-crypted-oper-password"
   fi
   if [ "$Chanops" == "y" ]; then 
-      OPTS="$OPTS --disable-no-chanops-when-split"
+      OPTS+=" --disable-no-chanops-when-split"
   fi
   
   # We don't need the lame default start/stop/rehash scripts
diff --git a/chat/bitlbee/BUILD b/chat/bitlbee/BUILD
index bd92021..2c3d0a2 100644
--- a/chat/bitlbee/BUILD
+++ b/chat/bitlbee/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --etcdir=/etc/bitlbee"
+  OPTS+=" --etcdir=/etc/bitlbee"
   default_build &&
   make install-etc
   
diff --git a/chat/empathy/BUILD b/chat/empathy/BUILD
index f6d3d15..4d48515 100644
--- a/chat/empathy/BUILD
+++ b/chat/empathy/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-compile-warnings=yes"
+  OPTS+=" --with-compile-warnings=yes"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/chat/gajim/BUILD b/chat/gajim/BUILD
index 7b3c399..1371346 100644
--- a/chat/gajim/BUILD
+++ b/chat/gajim/BUILD
@@ -1,6 +1,6 @@
 (
 
- OPTS="$OPTS --disable-trayicon " &&
+ OPTS+=" --disable-trayicon " &&
 
  default_build
 
diff --git a/chat/ircd-ratbox/BUILD b/chat/ircd-ratbox/BUILD
index 560b315..820c4d8 100644
--- a/chat/ircd-ratbox/BUILD
+++ b/chat/ircd-ratbox/BUILD
@@ -4,7 +4,7 @@
   sedit "66,73d" help/Makefile.in  &&
   sedit "149,155d" modules/Makefile.in  &&
 
-  OPTS="$OPTS --prefix=/opt/lunar/ratbox \
+  OPTS+=" --prefix=/opt/lunar/ratbox \
               --with-confdir=/etc/ratbox \
               --with-logdir=/var/log/ratbox \
               --with-nicklen=18 \
diff --git a/chat/meanwhile/BUILD b/chat/meanwhile/BUILD
index dda2434..d32c415 100644
--- a/chat/meanwhile/BUILD
+++ b/chat/meanwhile/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-doxygen=no"
+  OPTS+=" --enable-doxygen=no"
 
   default_build
 
diff --git a/chat/ratbox-services/BUILD b/chat/ratbox-services/BUILD
index 7ec21eb..bae0f84 100644
--- a/chat/ratbox-services/BUILD
+++ b/chat/ratbox-services/BUILD
@@ -4,7 +4,7 @@
 
   sedit "s:example.conf:example.services.conf:" Makefile.in  &&
 
-  OPTS="$OPTS --prefix=/opt/lunar/ratbox \
+  OPTS+=" --prefix=/opt/lunar/ratbox \
               --sysconfdir=/etc/ratbox \
               --with-logdir=/var/log/ratbox \
               --with-rundir=/var/run \
diff --git a/chat/xchat/BUILD b/chat/xchat/BUILD
index a505dcf..19d68f5 100644
--- a/chat/xchat/BUILD
+++ b/chat/xchat/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-ipv6"
+  OPTS+=" --enable-ipv6"
 
   sedit 's/GtkType/GType/g' src/fe-gtk/xtext.{c,h} &&
 
diff --git a/compilers/llvm/BUILD b/compilers/llvm/BUILD
index dfd27b9..5329ff9 100644
--- a/compilers/llvm/BUILD
+++ b/compilers/llvm/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-optimized --enable-shared --enable-pic --enable-targets=host-only"
+  OPTS+=" --enable-optimized --enable-shared --enable-pic --enable-targets=host-only"
 
   if [ "$USE_ASSERTS" == "y" ] ; then
      OPTS="--enable-assertions"
diff --git a/compilers/php5-suhosin/BUILD b/compilers/php5-suhosin/BUILD
index d230824..fecdb24 100644
--- a/compilers/php5-suhosin/BUILD
+++ b/compilers/php5-suhosin/BUILD
@@ -10,13 +10,13 @@
 #  ./buildconf --force &&
 
   if [ "$USE_REGGLOBALS" == "y" ]; then
-    OPTS="$OPTS "
+    OPTS+=" "
   fi &&
 
   if module_installed apache || module_installed apache-mod_ssl ; then
-    OPTS="$OPTS --with-apxs=/usr/sbin/apxs"
+    OPTS+=" --with-apxs=/usr/sbin/apxs"
   elif module_installed apache2 ; then
-    OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
+    OPTS+=" --with-apxs2=/usr/sbin/apxs"
   fi &&
 
   if [ -s /etc/httpsd/httpd.conf ] ; then
diff --git a/compilers/php5/BUILD b/compilers/php5/BUILD
index 10c997e..622908a 100644
--- a/compilers/php5/BUILD
+++ b/compilers/php5/BUILD
@@ -1,13 +1,13 @@
 (
 
   if [ "$USE_REGGLOBALS" == "y" ]; then
-    OPTS="$OPTS "
+    OPTS+=" "
   fi
 
   if module_installed apache || module_installed apache-mod_ssl ; then
-    OPTS="$OPTS --with-apxs=/usr/sbin/apxs"
+    OPTS+=" --with-apxs=/usr/sbin/apxs"
   elif module_installed apache2 ; then
-    OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
+    OPTS+=" --with-apxs2=/usr/sbin/apxs"
   fi
 
   if [ -s /etc/httpsd/httpd.conf ] ; then
diff --git a/compilers/ruby/BUILD b/compilers/ruby/BUILD
index 9589a23..863607b 100644
--- a/compilers/ruby/BUILD
+++ b/compilers/ruby/BUILD
@@ -1,7 +1,7 @@
 (
 
   bad_flags -fomit-frame-pointer
-  OPTS="$OPTS --enable-frame-address --enable-pthread --enable-shared"
+  OPTS+=" --enable-frame-address --enable-pthread --enable-shared"
   default_build  &&
   make install-doc
 
diff --git a/devel/bless/BUILD b/devel/bless/BUILD
index ade3f1b..4d110e2 100644
--- a/devel/bless/BUILD
+++ b/devel/bless/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-unix-specific --disable-nls"
+  OPTS+=" --enable-unix-specific --disable-nls"
 
   default_build
 
diff --git a/devel/cmake/BUILD b/devel/cmake/BUILD
index 1369a21..54ca225 100644
--- a/devel/cmake/BUILD
+++ b/devel/cmake/BUILD
@@ -2,7 +2,7 @@
 
 # Else it puts it in /usr/usr/share/main1
 
-  OPTS="$OPTS --mandir=/man"
+  OPTS+=" --mandir=/man"
 
   default_build
 
diff --git a/devel/dbus/BUILD b/devel/dbus/BUILD
index 1aa82cf..4bbc54e 100644
--- a/devel/dbus/BUILD
+++ b/devel/dbus/BUILD
@@ -4,7 +4,7 @@
   rm -fr /usr/lib/systemd/system/sockets.target.wants/dbus.socket
   rm -fr /usr/lib/systemd/system/multi-user.target.wants/dbus.service
 
-  OPTS="$OPTS --enable-checks --with-xml=expat                       \
+  OPTS+=" --enable-checks --with-xml=expat                       \
         --with-system-pid-file=/var/run/messagebus.pid               \
         --localstatedir=/var --enable-inotify --disable-dnotify      \
         --with-session-socket-dir=/tmp  --with-dbus-user=messagebus  \
diff --git a/devel/expect/BUILD b/devel/expect/BUILD
index 4796bbf..7d6cf11 100644
--- a/devel/expect/BUILD
+++ b/devel/expect/BUILD
@@ -1,7 +1,7 @@
 (
 
  if in_depends $MODULE tk ; then
-   OPTS="$OPTS --with-tk=$SOURCE_DIRECTORY/libtke/tk/unix"
+   OPTS+=" --with-tk=$SOURCE_DIRECTORY/libtke/tk/unix"
    cp -f "/usr/lib/tkConfig.sh" libtke/tk/unix
  fi
 
diff --git a/devel/hal/BUILD b/devel/hal/BUILD
index 6e01c8c..f4c4db0 100644
--- a/devel/hal/BUILD
+++ b/devel/hal/BUILD
@@ -1,6 +1,6 @@
 (
 
-    OPTS="$OPTS --disable-docbook-docs --with-pid-file=/var/run/hald.pid              \
+    OPTS+=" --disable-docbook-docs --with-pid-file=/var/run/hald.pid              \
                 --with-backend=linux --enable-umount-helper --with-udev-prefix=/lib" &&
 
     # This is a temp workaround until hal realizes usb.ids can also be
diff --git a/devel/rapidsvn/BUILD b/devel/rapidsvn/BUILD
index 851b99b..e0727e8 100644
--- a/devel/rapidsvn/BUILD
+++ b/devel/rapidsvn/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-apr-config=/usr/bin/apr-1-config \
+  OPTS+=" --with-apr-config=/usr/bin/apr-1-config \
               --with-apu-config=/usr/bin/apu-1-config "  &&
 
   default_build  &&
diff --git a/devel/subversion/BUILD b/devel/subversion/BUILD
index 9a01b2b..1358dfc 100644
--- a/devel/subversion/BUILD
+++ b/devel/subversion/BUILD
@@ -12,7 +12,7 @@
     BINDINGS_INSTALL+=" install-javahl"
   fi        
 
-  OPTS="$OPTS --disable-neon-version-check --with-neon=`neon-config --prefix` --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-apr-util=`which apu-$(installed_version apr-util | cut -d. -f1)-config`"
+  OPTS+=" --disable-neon-version-check --with-neon=`neon-config --prefix` --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-apr-util=`which apu-$(installed_version apr-util | cut -d. -f1)-config`"
 
   if in_depends $MODULE swig ; then
     if module_installed perl; then
diff --git a/distributed/aMule/BUILD b/distributed/aMule/BUILD
index f04e065..97d8c41 100644
--- a/distributed/aMule/BUILD
+++ b/distributed/aMule/BUILD
@@ -3,7 +3,7 @@
 # Removing a redundant wxFont.
   sedit "s|::wxFont||"  src/utils/wxCas/src/wxcasframe.cpp &&
 
-  OPTS="$OPTS --disable-debug \
+  OPTS+=" --disable-debug \
               --enable-wxcas \
               --enable-cas \
               --enable-ccache"  &&
diff --git a/distributed/ganglia/BUILD b/distributed/ganglia/BUILD
index 9c20f9d..26ac6b5 100644
--- a/distributed/ganglia/BUILD
+++ b/distributed/ganglia/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-gmetad"
+  OPTS+=" --with-gmetad"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/editors/gtkspell/BUILD b/editors/gtkspell/BUILD
index aa9621f..b69f0d0 100644
--- a/editors/gtkspell/BUILD
+++ b/editors/gtkspell/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --disable-gtk-doc"
+  OPTS+=" --disable-gtk-doc"
 
   autoconf  &&
   default_build
diff --git a/editors/nano/BUILD b/editors/nano/BUILD
index 8a275bc..5b1026c 100644
--- a/editors/nano/BUILD
+++ b/editors/nano/BUILD
@@ -1,13 +1,13 @@
 (
 
   if [[ "$COLOR" == "y" ]] ; then
-    OPTS="$OPTS --enable-color"
+    OPTS+=" --enable-color"
   fi
   if [[ "$NANORC" == "y" ]] ; then
-    OPTS="$OPTS --enable-nanorc"
+    OPTS+=" --enable-nanorc"
   fi
   if [[ "$MULTI" == "y" ]] ; then
-    OPTS="$OPTS --enable-multibuffer"
+    OPTS+=" --enable-multibuffer"
   fi
   
   default_build  &&
diff --git a/editors/vile/BUILD b/editors/vile/BUILD
index e61c482..8f22789 100644
--- a/editors/vile/BUILD
+++ b/editors/vile/BUILD
@@ -2,12 +2,12 @@
 
     default_build                       &&
     if [ "$USE_MOTIF" == "y" ]; then
-      OPTS="$OPTS --with-screen=motif"  &&
+      OPTS+=" --with-screen=motif"  &&
       default_config                    &&
       make                              &&
       make install
     elif [ "$USE_X11" == "y" ]; then
-      OPTS="$OPTS --with-screen=x11"    &&
+      OPTS+=" --with-screen=x11"    &&
       default_config                    &&
       make                              &&
       make install
diff --git a/editors/vim/BUILD b/editors/vim/BUILD
index 8c98867..175d024 100644
--- a/editors/vim/BUILD
+++ b/editors/vim/BUILD
@@ -1,7 +1,7 @@
 (
   # Enable multibyte support if this is the user's wish
   if [[ "$MULTIBYTE" == "y" ]]; then
-    OPTS="$OPTS --enable-multibyte"
+    OPTS+=" --enable-multibyte"
   fi
 
   cd src           &&
diff --git a/editors/xemacs/BUILD b/editors/xemacs/BUILD
index 8d7e89c..ad9f663 100644
--- a/editors/xemacs/BUILD
+++ b/editors/xemacs/BUILD
@@ -3,7 +3,7 @@
   LDFLAGS=`echo $LDFLAGS | sed "s/-z combreloc//"`
 
   if [[ "$XEMACS_MULE" == "y" ]]; then
-      OPTS="$OPTS --with-mule --with-xim=xlib"
+      OPTS+=" --with-mule --with-xim=xlib"
   fi
 
   ./configure  --prefix=/usr             \
diff --git a/ftp/d4x/BUILD b/ftp/d4x/BUILD
index 67a6a19..5ea15d7 100644
--- a/ftp/d4x/BUILD
+++ b/ftp/d4x/BUILD
@@ -1,6 +1,6 @@
 ( 
 
-  OPTS="$OPTS --enable-release"
+  OPTS+=" --enable-release"
   default_build &&
 
   # No, docs don't go here...
diff --git a/ftp/gtk-gnutella/BUILD b/ftp/gtk-gnutella/BUILD
index 81af676..52c0179 100644
--- a/ftp/gtk-gnutella/BUILD
+++ b/ftp/gtk-gnutella/BUILD
@@ -1,7 +1,7 @@
 (
 
   if [ "$CONFIG_NLS" == "n" ]; then
-    OPTS="$OPTS -U d_enablenls"
+    OPTS+=" -U d_enablenls"
   fi
 
   # shoot metaconfig in the head please:
diff --git a/ftp/lftp/BUILD b/ftp/lftp/BUILD
index 3086bd1..93328d5 100644
--- a/ftp/lftp/BUILD
+++ b/ftp/lftp/BUILD
@@ -1,9 +1,9 @@
 (
   
   if [ "$CONFIG_NLS" == "n" ]; then
-    OPTS="$OPTS --disable-nls"
+    OPTS+=" --disable-nls"
   else
-    OPTS="$OPTS --enable-nls"
+    OPTS+=" --enable-nls"
   fi
   default_build
               
diff --git a/ftp/proftpd/BUILD b/ftp/proftpd/BUILD
index fcad37a..521bd42 100644
--- a/ftp/proftpd/BUILD
+++ b/ftp/proftpd/BUILD
@@ -13,11 +13,11 @@
   # We default to MySQL if both are enabled
   if in_depends $MODULE mysql; then
     MODS="$MODS:mod_sql:mod_sql_mysql"
-    OPTS="$OPTS --with-includes=/usr/include/mysql"
+    OPTS+=" --with-includes=/usr/include/mysql"
   else
     if in_depends $MODULE postgresql; then
       MODS="$MODS:mod_sql:mod_sql_postgres"
-      OPTS="$OPTS --with-includes=/usr/include/postgresql"
+      OPTS+=" --with-includes=/usr/include/postgresql"
     fi
   fi
 
@@ -25,7 +25,7 @@
 
 
   if [ -n "$MODS" ]; then
-    OPTS="$OPTS --with-modules=$MODS"
+    OPTS+=" --with-modules=$MODS"
   fi
 
   if  module_installed  Linux-PAM;  then
diff --git a/ftp/pure-ftpd/BUILD b/ftp/pure-ftpd/BUILD
index cd6628c..5b28b45 100644
--- a/ftp/pure-ftpd/BUILD
+++ b/ftp/pure-ftpd/BUILD
@@ -1,7 +1,7 @@
 (
 
   if module_installed Linux-PAM;  then
-    OPTS="$OPTS --with-pam"
+    OPTS+=" --with-pam"
   fi
 
   ./configure  --sysconfdir=/etc        \
diff --git a/ftp/wput/BUILD b/ftp/wput/BUILD
index 66d839b..d4437d6 100644
--- a/ftp/wput/BUILD
+++ b/ftp/wput/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --disable-g-switch"
+  OPTS+=" --disable-g-switch"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/games/foobillard/BUILD b/games/foobillard/BUILD
index 6d74255..f2c9b8a 100644
--- a/games/foobillard/BUILD
+++ b/games/foobillard/BUILD
@@ -3,9 +3,9 @@
   sedit "s:prefix}/share:prefix}/share/games:"   configure  &&
 
   if module_installed NVIDIA; then
-        OPTS="$OPTS --enable-bumpref=yes"
+        OPTS+=" --enable-bumpref=yes"
   else
-        OPTS="$OPTS --enable-bumpref=no"
+        OPTS+=" --enable-bumpref=no"
   fi
 
   default_game_build
diff --git a/games/quake2/BUILD b/games/quake2/BUILD
index bdc5bd7..b9f35cc 100644
--- a/games/quake2/BUILD
+++ b/games/quake2/BUILD
@@ -1,7 +1,7 @@
 (
 
   if [ "$WERR" == "n" ]; then
-    OPTS="$OPTS --disable-warn"
+    OPTS+=" --disable-warn"
   fi
   
   default_game_build
diff --git a/gnome2/core/gtk-engines2/BUILD b/gnome2/core/gtk-engines2/BUILD
index 3852fc4..7841e7d 100644
--- a/gnome2/core/gtk-engines2/BUILD
+++ b/gnome2/core/gtk-engines2/BUILD
@@ -4,7 +4,7 @@
   # activated by the user in the grkrc file) and enables the
   # lua based scritping engine (uses an internal version of lua,
   # no outside depends needed)
-  OPTS="$OPTS  --enable-animation  --enable-lua"
+  OPTS+="  --enable-animation  --enable-lua"
 
   default_build
 
diff --git a/gnome2/desktop/gdm/BUILD b/gnome2/desktop/gdm/BUILD
index fd53dea..93ad8ec 100644
--- a/gnome2/desktop/gdm/BUILD
+++ b/gnome2/desktop/gdm/BUILD
@@ -11,7 +11,7 @@
                                      else  SCHEME="auto"
  fi
 
- OPTS="$OPTS --enable-authentication-scheme=$SCHEME"
+ OPTS+=" --enable-authentication-scheme=$SCHEME"
 
  LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
 
diff --git a/gnome2/desktop/gnome-themes/BUILD b/gnome2/desktop/gnome-themes/BUILD
index 54f78a5..2f05450 100644
--- a/gnome2/desktop/gnome-themes/BUILD
+++ b/gnome2/desktop/gnome-themes/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS  --enable-all-themes"
+  OPTS+="  --enable-all-themes"
 
   default_build
 
diff --git a/gnome2/platform/gnome-vfs/BUILD b/gnome2/platform/gnome-vfs/BUILD
index 9e5c1f0..832061c 100644
--- a/gnome2/platform/gnome-vfs/BUILD
+++ b/gnome2/platform/gnome-vfs/BUILD
@@ -1,12 +1,12 @@
 (
 
    if module_installed openssl ; then
-        OPTS="$OPTS --enable-openssl \
+        OPTS+=" --enable-openssl \
                     --with-openssl-includes=/usr/include/openssl \
                     --with-openssl-libs=/usr/lib \
                     --disable-gnutls"
    else
-        OPTS="$OPTS --enable-gnutls --disable-openssl"
+        OPTS+=" --enable-gnutls --disable-openssl"
    fi &&
 
    ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
diff --git a/graphics/GraphicsMagick/BUILD b/graphics/GraphicsMagick/BUILD
index b8b60c2..83d3e2a 100644
--- a/graphics/GraphicsMagick/BUILD
+++ b/graphics/GraphicsMagick/BUILD
@@ -7,7 +7,7 @@
   sedit "s:flags(png_ptr):flags(ping):" coders/png.c  &&
   sedit "s:flags(png_ptr,:flags(ping,:" coders/png.c  &&
 
-  OPTS="$OPTS --enable-shared --enable-symbol-prefix --with-modules" &&
+  OPTS+=" --enable-shared --enable-symbol-prefix --with-modules" &&
 
   default_build
 
diff --git a/graphics/ImageMagick/BUILD b/graphics/ImageMagick/BUILD
index dec9feb..79a9168 100644
--- a/graphics/ImageMagick/BUILD
+++ b/graphics/ImageMagick/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-shared=yes --enable-hdri --disable-static"
+  OPTS+=" --enable-shared=yes --enable-hdri --disable-static"
 
 # They say to run this if you got dirty autotools.
 # autoreconf         &&
diff --git a/graphics/cinepaint/BUILD b/graphics/cinepaint/BUILD
index 6554b24..78015c7 100644
--- a/graphics/cinepaint/BUILD
+++ b/graphics/cinepaint/BUILD
@@ -5,10 +5,10 @@
   sedit "s:oyGetMonitorProfileName:oyGetMonitorProfileNameFromDB:" plug-ins/icc_examin/icc_examin/icc_oyranos.cpp
 
   if module_installed Python ; then
-   OPTS="$OPTS --enable-pygimp --with-python=/usr/bin/python"
+   OPTS+=" --enable-pygimp --with-python=/usr/bin/python"
   fi &&
 
-  OPTS="$OPTS --enable-gtk2"
+  OPTS+=" --enable-gtk2"
 
   default_build 
 
diff --git a/graphics/devil/BUILD b/graphics/devil/BUILD
index b454942..023b605 100644
--- a/graphics/devil/BUILD
+++ b/graphics/devil/BUILD
@@ -1,6 +1,6 @@
 (                                                                                    
 
-  OPTS="$OPTS --enable-ILU --enable-ILUT"
+  OPTS+=" --enable-ILU --enable-ILUT"
 
   default_build
 
diff --git a/graphics/gimp/BUILD b/graphics/gimp/BUILD
index 378a06f..ea6203b 100644
--- a/graphics/gimp/BUILD
+++ b/graphics/gimp/BUILD
@@ -1,7 +1,7 @@
 (
 
   touch plug-ins/pygimp/pygimp-logo.png  &&
-  export OPTS="$OPTS --without-sendmail"
+  export OPTS+=" --without-sendmail"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/graphics/libEMF/BUILD b/graphics/libEMF/BUILD
index 16be738..f910996 100644
--- a/graphics/libEMF/BUILD
+++ b/graphics/libEMF/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-editing"
+  OPTS+=" --enable-editing"
 
   default_build
 
diff --git a/graphics/libcaca/BUILD b/graphics/libcaca/BUILD
index 75df880..bd6d0b9 100644
--- a/graphics/libcaca/BUILD
+++ b/graphics/libcaca/BUILD
@@ -1,6 +1,6 @@
 (
   
-  OPTS="$OPTS --disable-debug --disable-doc"
+  OPTS+=" --disable-debug --disable-doc"
 
   bad_flags "-Wl,-O1,--as-needed" &&
   bad_flags "-Wl,--as-needed" &&
diff --git a/libs/ClanLib/BUILD b/libs/ClanLib/BUILD
index b8df5dd..3545a99 100644
--- a/libs/ClanLib/BUILD
+++ b/libs/ClanLib/BUILD
@@ -1,8 +1,8 @@
 (
 
   # No docs until the clanlib developers fix their autotools
-  OPTS="$OPTS --disable-docs" 
- 
+  OPTS+=" --disable-docs"
+
   sedit "s/Documentation //g" Makefile.in &&
 
   default_build &&
diff --git a/libs/apr-iconv/BUILD b/libs/apr-iconv/BUILD
index d58603d..600748f 100644
--- a/libs/apr-iconv/BUILD
+++ b/libs/apr-iconv/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config`"
+  OPTS+=" --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config`"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/apr-util/BUILD b/libs/apr-util/BUILD
index 3c2f646..8efa07e 100644
--- a/libs/apr-util/BUILD
+++ b/libs/apr-util/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-iconv=/usr" &&
+  OPTS+=" --with-apr=`which apr-$(installed_version apr | cut -d. -f1)-config` --with-iconv=/usr" &&
 
   default_build
 
diff --git a/libs/apr/BUILD b/libs/apr/BUILD
index 2382f82..40f0fa0 100644
--- a/libs/apr/BUILD
+++ b/libs/apr/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-installbuilddir=/usr/libexec/apr"
+  OPTS+=" --with-installbuilddir=/usr/libexec/apr"
 
   default_build
 
diff --git a/libs/erlang/BUILD b/libs/erlang/BUILD
index 8e04fa7..133468d 100644
--- a/libs/erlang/BUILD
+++ b/libs/erlang/BUILD
@@ -10,9 +10,9 @@
 
 # threads are automatic with enabled smp support
   if [ "$USE_SMP" == "n" ]; then
-    OPTS="$OPTS --disable-smp-support --enable-threads"
+    OPTS+=" --disable-smp-support --enable-threads"
    else
-    OPTS="$OPTS --enable-smp-support --enable-threads"
+    OPTS+=" --enable-smp-support --enable-threads"
   fi &&
 
   default_build
diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index cd45589..465fc11 100644
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -8,7 +8,7 @@
 
   case `arch` in
     i386|i486|i586|i686|athlon)
-      OPTS="$OPTS --enable-i386-hacks"
+      OPTS+=" --enable-i386-hacks"
       ;;
     *)
   esac
diff --git a/libs/fltk/BUILD b/libs/fltk/BUILD
index 484244b..99c5ef3 100644
--- a/libs/fltk/BUILD
+++ b/libs/fltk/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-largefile --enable-xinerama --enable-threads --enable-shared --enable-xft"
+  OPTS+=" --enable-largefile --enable-xinerama --enable-threads --enable-shared --enable-xft"
 
   default_build
 
diff --git a/libs/fltk2/BUILD b/libs/fltk2/BUILD
index 47ad298..6f4a656 100644
--- a/libs/fltk2/BUILD
+++ b/libs/fltk2/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-shared"
+  OPTS+=" --enable-shared"
 
   default_build
 
diff --git a/libs/gle/BUILD b/libs/gle/BUILD
index cc1da4d..e9c9d1b 100644
--- a/libs/gle/BUILD
+++ b/libs/gle/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-x" &&
+  OPTS+=" --with-x" &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/glib-2/BUILD b/libs/glib-2/BUILD
index ea11419..9c33cc8 100644
--- a/libs/glib-2/BUILD
+++ b/libs/glib-2/BUILD
@@ -2,7 +2,7 @@
 
   # Do not remove --enable-debug=minimum, it will break some common
   # API functions if debug is entirely disabled
-  export OPTS="$OPTS --enable-static --enable-shared --enable-debug=minimum"  &&
+  export OPTS+=" --enable-static --enable-shared --enable-debug=minimum"  &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/gpgme/BUILD b/libs/gpgme/BUILD
index b0d1392..bd43ab2 100644
--- a/libs/gpgme/BUILD
+++ b/libs/gpgme/BUILD
@@ -1,7 +1,7 @@
 (
 
     if [ "$LARGE_FILES" == "n" ] ; then
-       OPTS="$OPTS --disable-largefile"
+       OPTS+=" --disable-largefile"
     fi  &&
 
    default_build
diff --git a/libs/libpaper/BUILD b/libs/libpaper/BUILD
index 584c5cc..5fa2b42 100644
--- a/libs/libpaper/BUILD
+++ b/libs/libpaper/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --includedir=/usr/include/libpaper"
+  OPTS+=" --includedir=/usr/include/libpaper"
 
   default_build
 
diff --git a/libs/librsync/BUILD b/libs/librsync/BUILD
index 155c8a7..4a0fb53 100644
--- a/libs/librsync/BUILD
+++ b/libs/librsync/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-shared"  &&
+  OPTS+=" --enable-shared"  &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/libsigsegv/BUILD b/libs/libsigsegv/BUILD
index 47ad298..6f4a656 100644
--- a/libs/libsigsegv/BUILD
+++ b/libs/libsigsegv/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-shared"
+  OPTS+=" --enable-shared"
 
   default_build
 
diff --git a/libs/loudmouth/BUILD b/libs/loudmouth/BUILD
index dbec7b5..b8928fd 100644
--- a/libs/loudmouth/BUILD
+++ b/libs/loudmouth/BUILD
@@ -6,7 +6,7 @@
   autoconf &&
 
   #gtk-doc is broken for now
-  OPTS="$OPTS --disable-gtk-doc --with-asyncns=yes" &&
+  OPTS+=" --disable-gtk-doc --with-asyncns=yes" &&
 
   default_build
 
diff --git a/libs/ncurses/BUILD b/libs/ncurses/BUILD
index cae6a70..84acdee 100644
--- a/libs/ncurses/BUILD
+++ b/libs/ncurses/BUILD
@@ -1,15 +1,15 @@
 (
 
   if [ $WITH_DEBUG == "y" ]; then
-    OPTS="$OPTS --with-debug"
+    OPTS+=" --with-debug"
   else
-    OPTS="$OPTS --without-debug"
+    OPTS+=" --without-debug"
   fi;
 
   if [ $WITH_PROFILING == "y" ]; then
-    OPTS="$OPTS --with-profile"
+    OPTS+=" --with-profile"
   else
-    OPTS="$OPTS --without-profile"
+    OPTS+=" --without-profile"
   fi;
 
 # Seems that ncurses-5.5 has problems with garbage in /usr/share/terminfo
diff --git a/libs/ncursesw/BUILD b/libs/ncursesw/BUILD
index c4328f1..94c027f 100644
--- a/libs/ncursesw/BUILD
+++ b/libs/ncursesw/BUILD
@@ -6,15 +6,15 @@
     OPTS+=" --without-gpm"
   fi
   if [ $WITH_DEBUG == "y" ]; then
-    OPTS="$OPTS --with-debug"
+    OPTS+=" --with-debug"
   else
-    OPTS="$OPTS --without-debug"
+    OPTS+=" --without-debug"
   fi;
 
   if [ $WITH_PROFILING == "y" ]; then
-    OPTS="$OPTS --with-profile"
+    OPTS+=" --with-profile"
   else
-    OPTS="$OPTS --without-profile"
+    OPTS+=" --without-profile"
   fi;
 
 # ************************ WARNING *************************
diff --git a/libs/neon/BUILD b/libs/neon/BUILD
index 640efbd..696ef5e 100644
--- a/libs/neon/BUILD
+++ b/libs/neon/BUILD
@@ -1,12 +1,12 @@
 (
 
   if module_installed openssl ; then
-        OPTS="$OPTS --with-ssl=openssl"
+        OPTS+=" --with-ssl=openssl"
   else
-        OPTS="$OPTS --with-ssl=gnutls"
+        OPTS+=" --with-ssl=gnutls"
   fi &&
 
-  OPTS="$OPTS --enable-shared"
+  OPTS+=" --enable-shared"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/nspr/BUILD b/libs/nspr/BUILD
index 711256e..79bcdcb 100644
--- a/libs/nspr/BUILD
+++ b/libs/nspr/BUILD
@@ -3,10 +3,10 @@
   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
 
   if [ "`arch`" == "x86_64" ]; then
-    OPTS="$OPTS --enable-64bit"
+    OPTS+=" --enable-64bit"
   fi  &&
 
-  OPTS="$OPTS --libdir=/usr/lib --enable-system-sqlite --with-mozilla --with-pthreads --enable-strip"  &&
+  OPTS+=" --libdir=/usr/lib --enable-system-sqlite --with-mozilla --with-pthreads --enable-strip"  &&
   mkdir build inst  &&
   sedit 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' mozilla/nsprpub/config/rules.mk  &&
 
diff --git a/libs/openMotif/BUILD b/libs/openMotif/BUILD
index 7918781..98a960c 100644
--- a/libs/openMotif/BUILD
+++ b/libs/openMotif/BUILD
@@ -4,7 +4,7 @@
     patch_it $SOURCE2 0
   fi &&
 
-  OPTS="$OPTS --x-libraries=/usr/lib/xorg --prefix=/usr --sysconfdir=/etc \
+  OPTS+=" --x-libraries=/usr/lib/xorg --prefix=/usr --sysconfdir=/etc \
               --enable-jpeg --enable-png --enable-themes --with-x --enable-xft \
               --x-includes=/usr/include/X11"
 
diff --git a/libs/poppler/BUILD b/libs/poppler/BUILD
index 41f897a..73b38cb 100644
--- a/libs/poppler/BUILD
+++ b/libs/poppler/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --disable-gtk-test --enable-xpdf-headers"
+  OPTS+=" --disable-gtk-test --enable-xpdf-headers"
 
   if in_depends poppler qt4; then
     . /etc/profile.d/qt4.rc
diff --git a/libs/wxGTK/BUILD b/libs/wxGTK/BUILD
index 9b1b15d..1e33a70 100644
--- a/libs/wxGTK/BUILD
+++ b/libs/wxGTK/BUILD
@@ -1,7 +1,7 @@
 ( 
 
   if [[ $UCODE == "y" ]]; then
-    OPTS="$OPTS --enable-unicode"
+    OPTS+=" --enable-unicode"
   fi  &&
   
   ./configure   --build=$BUILD     \
diff --git a/mail/citadel/BUILD b/mail/citadel/BUILD
index d855cd7..98159c4 100644
--- a/mail/citadel/BUILD
+++ b/mail/citadel/BUILD
@@ -3,7 +3,7 @@
 # It should run as something other than root.
   add_priv_user citadel:citadel &&
 
-  OPTS="$OPTS -prefix=${MODULE_PREFIX}"
+  OPTS+=" -prefix=${MODULE_PREFIX}"
 
   default_build
 
diff --git a/mail/dovecot/BUILD b/mail/dovecot/BUILD
index 332be45..9a76bd5 100644
--- a/mail/dovecot/BUILD
+++ b/mail/dovecot/BUILD
@@ -1,11 +1,11 @@
 (
 
-  OPTS="$OPTS --with-ssl=openssl"
+  OPTS+=" --with-ssl=openssl"
 
   add_priv_user dovecot:dovecot &&
 
   if [ "$DISABLE_POP3" == "y" ]; then
-    OPTS="$OPTS --without-pop3d"
+    OPTS+=" --without-pop3d"
   fi &&
 
   default_build &&
diff --git a/mail/nmh/BUILD b/mail/nmh/BUILD
index 0f2e1a0..4049a49 100644
--- a/mail/nmh/BUILD
+++ b/mail/nmh/BUILD
@@ -1,7 +1,7 @@
 (
 
   # By default, nmh fills /usr/lib with a bunch of binaries 
-  OPTS="$OPTS --libdir=${MODULE_PREFIX}/libexec"
+  OPTS+=" --libdir=${MODULE_PREFIX}/libexec"
 
   default_build
 
diff --git a/mail/qpopper/BUILD b/mail/qpopper/BUILD
index 59487ab..a2286b3 100644
--- a/mail/qpopper/BUILD
+++ b/mail/qpopper/BUILD
@@ -1,9 +1,9 @@
 (
 
   if module_installed Linux-PAM; then
-    OPTS="$OPTS --with-pam"
+    OPTS+=" --with-pam"
   else
-    OPTS="$OPTS --without-pam"
+    OPTS+=" --without-pam"
   fi
 
   if in_depends $MODULE openssl ; then
diff --git a/net/avahi/BUILD b/net/avahi/BUILD
index 05a9cb6..1e0aeac 100644
--- a/net/avahi/BUILD
+++ b/net/avahi/BUILD
@@ -11,7 +11,7 @@
 # Add this missing group. It is used in /etc/dbus-1/system.d/avahi-dbus.conf
    add_priv_group netdev &&
 
-   OPTS="$OPTS --enable-compat-howl --enable-compat-libdns_sd --disable-gtk3 --disable-qt3 \
+   OPTS+=" --enable-compat-howl --enable-compat-libdns_sd --disable-gtk3 --disable-qt3 \
         --disable-stack-protector --disable-gdbm --with-distro=none" &&
 
     default_build
diff --git a/net/libpcap/BUILD b/net/libpcap/BUILD
index 2469eaa..6869c70 100644
--- a/net/libpcap/BUILD
+++ b/net/libpcap/BUILD
@@ -1,7 +1,7 @@
 (
 
   if [[ "$IPV6" == "y" ]]; then
-    OPTS="$OPTS --enable-ipv6"
+    OPTS+=" --enable-ipv6"
   fi
 
   default_build
diff --git a/net/ngrep/BUILD b/net/ngrep/BUILD
index 9deb313..6cff9c0 100644
--- a/net/ngrep/BUILD
+++ b/net/ngrep/BUILD
@@ -1,7 +1,7 @@
 (
 
   sedit "s/\/man\/man8/\/share\0/" Makefile.in
-  OPTS="$OPTS --with-pcap-includes=/usr/include/pcap"
+  OPTS+=" --with-pcap-includes=/usr/include/pcap"
   touch *
   default_build
  
diff --git a/net/openntpd/BUILD b/net/openntpd/BUILD
index daf3b05..7b9698f 100644
--- a/net/openntpd/BUILD
+++ b/net/openntpd/BUILD
@@ -1,7 +1,7 @@
 (
 
   add_priv_user ntp:ntp -d /var/empty   &&
-  OPTS="$OPTS --with-privsep-user=ntp"  &&
+  OPTS+=" --with-privsep-user=ntp"  &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/net/tcpdump/BUILD b/net/tcpdump/BUILD
index 2469eaa..6869c70 100644
--- a/net/tcpdump/BUILD
+++ b/net/tcpdump/BUILD
@@ -1,7 +1,7 @@
 (
 
   if [[ "$IPV6" == "y" ]]; then
-    OPTS="$OPTS --enable-ipv6"
+    OPTS+=" --enable-ipv6"
   fi
 
   default_build
diff --git a/net/wireshark/BUILD b/net/wireshark/BUILD
index ec19166..fed96e0 100644
--- a/net/wireshark/BUILD
+++ b/net/wireshark/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-ssl --enable-wireshark --enable-usr-local=no --enable-randpkt"
+  OPTS+=" --with-ssl --enable-wireshark --enable-usr-local=no --enable-randpkt"
 
   default_build
 
diff --git a/printer/enscript/BUILD b/printer/enscript/BUILD
index 25d1ccd..2bc570d 100644
--- a/printer/enscript/BUILD
+++ b/printer/enscript/BUILD
@@ -2,7 +2,7 @@
 
   unset CC &&
 
-  OPTS="$OPTS --with-media" &&
+  OPTS+=" --with-media" &&
 
   default_build
 
diff --git a/printer/gimp-print/BUILD b/printer/gimp-print/BUILD
index 45b50f9..9f62e85 100644
--- a/printer/gimp-print/BUILD
+++ b/printer/gimp-print/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-testpattern"
+  OPTS+=" --with-testpattern"
   
   default_build
 
diff --git a/printer/hplip/BUILD b/printer/hplip/BUILD
index 99ada5d..807d775 100644
--- a/printer/hplip/BUILD
+++ b/printer/hplip/BUILD
@@ -5,11 +5,11 @@
   fi &&
 
   if [[ "$PP" == "y" ]] ; then
-    OPTS="$OPTS --disable-pp-build"
+    OPTS+=" --disable-pp-build"
   fi &&
 
   if [[ "$FAX" == "n" ]] ; then
-    OPTS="$OPTS --disable-fax-build"
+    OPTS+=" --disable-fax-build"
   fi &&
 
   # Install /usr/bin/hpijs so don't get this error:
diff --git a/printer/hylafax/BUILD b/printer/hylafax/BUILD
index e41cfc2..16a1837 100644
--- a/printer/hylafax/BUILD
+++ b/printer/hylafax/BUILD
@@ -2,7 +2,7 @@
 
   sedit "s:/usr/local:/usr:g" configure
 
-  OPTS="$OPTS --nointeractive"
+  OPTS+=" --nointeractive"
 
   ./configure $OPTS &&
 
diff --git a/printer/lilypond/BUILD b/printer/lilypond/BUILD
index ecc3d0e..97b2e02 100644
--- a/printer/lilypond/BUILD
+++ b/printer/lilypond/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --disable-documentation" &&
+  OPTS+=" --disable-documentation" &&
 
   patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
diff --git a/python/Python/BUILD b/python/Python/BUILD
index 415f39e..0b7ab45 100644
--- a/python/Python/BUILD
+++ b/python/Python/BUILD
@@ -2,7 +2,7 @@
 
   sedit "s:-O3:$CFLAGS -Os:g" configure  &&
 
-  OPTS="$OPTS --enable-shared"  &&
+  OPTS+=" --enable-shared"  &&
 
   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
 
diff --git a/python/mod_python/BUILD b/python/mod_python/BUILD
index 49640ef..2b2eb13 100644
--- a/python/mod_python/BUILD
+++ b/python/mod_python/BUILD
@@ -1,5 +1,5 @@
 (
-  export OPTS="$OPTS --with-apxs=/usr/sbin/apxs" &&
+  export OPTS+=" --with-apxs=/usr/sbin/apxs" &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/science/GMT/BUILD b/science/GMT/BUILD
index e7ba53a..92a8ee6 100644
--- a/science/GMT/BUILD
+++ b/science/GMT/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-shared --enable-eps --enable-netcdf=/usr"
+  OPTS+=" --enable-shared --enable-eps --enable-netcdf=/usr"
 
   default_build
 
diff --git a/science/celestia-gtk/BUILD b/science/celestia-gtk/BUILD
index 93b05fd..0cccf7f 100644
--- a/science/celestia-gtk/BUILD
+++ b/science/celestia-gtk/BUILD
@@ -3,7 +3,7 @@
   sed -i "16i #include <stdio.h>" src/celengine/overlay.h src/celengine/spiceinterface.cpp &&
   sed -i "18i #include <stdio.h>" src/celengine/star.cpp &&
 
-  OPTS="$OPTS --with-lua" &&
+  OPTS+=" --with-lua" &&
 
   default_build  &&
 
diff --git a/science/gpsd/BUILD b/science/gpsd/BUILD
index 5362a41..7ecb7b0 100644
--- a/science/gpsd/BUILD
+++ b/science/gpsd/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-itrax --disable-tnt --enable-dbus" &&
+  OPTS+=" --enable-itrax --disable-tnt --enable-dbus" &&
 
   default_build &&
 
diff --git a/science/gpsim/BUILD b/science/gpsim/BUILD
index 8b5d514..f87c55f 100644
--- a/science/gpsim/BUILD
+++ b/science/gpsim/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-sockets"
+  OPTS+=" --enable-sockets"
 
   default_build
 
diff --git a/science/grace/BUILD b/science/grace/BUILD
index d2eccf3..9ac41b5 100644
--- a/science/grace/BUILD
+++ b/science/grace/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --x-includes=/usr/X11R6/include --enable-grace-home=/usr/share/grace"
+  OPTS+=" --x-includes=/usr/X11R6/include --enable-grace-home=/usr/share/grace"
   default_build &&
   if [ ! -e /usr/bin/xmgrace ] ; then
     ln -s /usr/share/grace/bin/xmgrace /usr/bin/xmgrace
diff --git a/science/pcb/BUILD b/science/pcb/BUILD
index d86c2cb..6b3b7a7 100644
--- a/science/pcb/BUILD
+++ b/science/pcb/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-dbus --enable-toporouter-output --enable-m4lib-png --with-xdgdatadir=$XDG_DATA_DIRS" &&
+  OPTS+=" --enable-dbus --enable-toporouter-output --enable-m4lib-png --with-xdgdatadir=$XDG_DATA_DIRS" &&
 
   default_build
 
diff --git a/security/pam_ldap/BUILD b/security/pam_ldap/BUILD
index 6ccd901..c5383d7 100644
--- a/security/pam_ldap/BUILD
+++ b/security/pam_ldap/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --libdir=/lib"        &&
+  OPTS+=" --libdir=/lib"        &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/security/pam_mount/BUILD b/security/pam_mount/BUILD
index f2febc1..aafcf91 100644
--- a/security/pam_mount/BUILD
+++ b/security/pam_mount/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --libdir=/lib"
+  OPTS+=" --libdir=/lib"
   default_build &&
   [ -e /etc/security/pam_mount.conf ] || \
   install -m644 config/pam_mount.conf /etc/security/
diff --git a/security/shadow/BUILD b/security/shadow/BUILD
index b499d49..d02a8fa 100644
--- a/security/shadow/BUILD
+++ b/security/shadow/BUILD
@@ -15,9 +15,9 @@
   sedit '/^SUBDIRS/ n; s/etc//' Makefile.in Makefile.am &&
 
   if  module_installed  Linux-PAM;  then
-    OPTS="$OPTS --with-libpam"
+    OPTS+=" --with-libpam"
   else
-    OPTS="$OPTS --without-libpam"
+    OPTS+=" --without-libpam"
   fi &&
 
   ./configure --prefix=/ \
diff --git a/security/sudo/BUILD b/security/sudo/BUILD
index 6c01cc5..aabe90b 100644
--- a/security/sudo/BUILD
+++ b/security/sudo/BUILD
@@ -3,7 +3,7 @@ EDITOR=`which  nano`                  &&
 
 (
 
-  OPTS="$OPTS --with-editor=$EDITOR"
+  OPTS+=" --with-editor=$EDITOR"
 
   default_build
 
diff --git a/security/tls/BUILD b/security/tls/BUILD
index f7cacff..ed8e4b0 100644
--- a/security/tls/BUILD
+++ b/security/tls/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-threads     \
+  OPTS+=" --enable-threads     \
               --enable-shared      \
               --with-ssl-dir=/usr"
 
diff --git a/sql/postgresql/BUILD b/sql/postgresql/BUILD
index 8c355ce..82e1387 100644
--- a/sql/postgresql/BUILD
+++ b/sql/postgresql/BUILD
@@ -4,10 +4,10 @@
   sleep 5
 
   if in_depends $MODULE timezone-data; then
-    OPTS="$OPTS --with-system-tzdata=/usr/share/zoneinfo"
+    OPTS+=" --with-system-tzdata=/usr/share/zoneinfo"
   fi &&
 
-  OPTS="$OPTS --enable-thread-safety --enable-nls --enable-integer-datetimes"
+  OPTS+=" --enable-thread-safety --enable-nls --enable-integer-datetimes"
 
   default_build &&
 
diff --git a/sql/unixODBC/BUILD b/sql/unixODBC/BUILD
index 7ee2e38..9d2aa09 100644
--- a/sql/unixODBC/BUILD
+++ b/sql/unixODBC/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-fdb --disable-gui --sysconfdir=/etc/$MODULE"
+  OPTS+=" --enable-fdb --disable-gui --sysconfdir=/etc/$MODULE"
 
   default_build
 
diff --git a/terminal/Eterm/BUILD b/terminal/Eterm/BUILD
index be4d8fa..09f4fbe 100644
--- a/terminal/Eterm/BUILD
+++ b/terminal/Eterm/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-multi-charset --enable-trans \
+  OPTS+=" --enable-multi-charset --enable-trans \
               --with-delete=execute --with-theme-update \
               --enable-escreen-fx --enable-etwin"
 
diff --git a/terminal/aterm/BUILD b/terminal/aterm/BUILD
index c3648ba..aaac36c 100644
--- a/terminal/aterm/BUILD
+++ b/terminal/aterm/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS  --enable-fading            \
+  OPTS+="  --enable-fading            \
                --enable-transparency      \
                --enable-background-image  \
                --enable-menubar           \
diff --git a/terminal/qingy/BUILD b/terminal/qingy/BUILD
index a64b596..bebee46 100644
--- a/terminal/qingy/BUILD
+++ b/terminal/qingy/BUILD
@@ -1,6 +1,6 @@
 (
   
-  OPTS="$OPTS --sbindir=/sbin --disable-optimizations"
+  OPTS+=" --sbindir=/sbin --disable-optimizations"
 
   default_build  &&
 
diff --git a/utils/amanda/BUILD b/utils/amanda/BUILD
index bf46c4f..8467a19 100644
--- a/utils/amanda/BUILD
+++ b/utils/amanda/BUILD
@@ -1,7 +1,7 @@
 (
 
   add_priv_user amanda:amanda
-  OPTS="$OPTS --with-user=amanda --with-group=amanda"
+  OPTS+=" --with-user=amanda --with-group=amanda"
 
   default_build
 
diff --git a/utils/discover/BUILD b/utils/discover/BUILD
index 481e95e..7d700cd 100644
--- a/utils/discover/BUILD
+++ b/utils/discover/BUILD
@@ -9,7 +9,7 @@
     sedit 's:docbook-to-man:echo:' doctools/docbook.mk
   fi  &&
 
-  OPTS="$OPTS --disable-curl"
+  OPTS+=" --disable-curl"
 
   default_config  &&
   make  &&
diff --git a/utils/gcal/BUILD b/utils/gcal/BUILD
index 2f93aff..f84b739 100644
--- a/utils/gcal/BUILD
+++ b/utils/gcal/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-included-regexps"
+  OPTS+=" --with-included-regexps"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/utils/gnokii/BUILD b/utils/gnokii/BUILD
index b1730fb..2302885 100644
--- a/utils/gnokii/BUILD
+++ b/utils/gnokii/BUILD
@@ -5,7 +5,7 @@
      groupadd gnokii
   fi
 
-  OPTS="$OPTS --enable-security --disable-xdebug"
+  OPTS+=" --enable-security --disable-xdebug"
   if echo $OPTS | grep -q 'with-x' ; then
     sedit "s:LDLIBS += :LDLIBS += -lXpm :" xgnokii/Makefile.am
   fi  &&
diff --git a/utils/gpsbabel/BUILD b/utils/gpsbabel/BUILD
index f29995f..e5bcf1e 100644
--- a/utils/gpsbabel/BUILD
+++ b/utils/gpsbabel/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-shapefile --enable-pdb --enable-csv \
+  OPTS+=" --enable-shapefile --enable-pdb --enable-csv \
         --enable-filters --with-cet=all --with-zlib=system"
 
   default_build
diff --git a/utils/openmosix-tools/BUILD b/utils/openmosix-tools/BUILD
index 13d5e1b..d94435a 100644
--- a/utils/openmosix-tools/BUILD
+++ b/utils/openmosix-tools/BUILD
@@ -1,4 +1,4 @@
 ( 
-  OPTS="$OPTS --with-kerneldir=/usr/src/linux" &&
+  OPTS+=" --with-kerneldir=/usr/src/linux" &&
   default_build
 ) > $C_FIFO 2>&1
diff --git a/utils/pilot-link/BUILD b/utils/pilot-link/BUILD
index 8a873db..4c5f7e9 100644
--- a/utils/pilot-link/BUILD
+++ b/utils/pilot-link/BUILD
@@ -2,7 +2,7 @@
 
   bad_flags -Werror &&
 
-  OPTS="$OPTS --enable-conduits --with-libpng=/usr --enable-threads" &&
+  OPTS+=" --enable-conduits --with-libpng=/usr --enable-threads" &&
 
   default_build &&
 
diff --git a/utils/rrdtool/BUILD b/utils/rrdtool/BUILD
index b872f9c..9a3d1d2 100644
--- a/utils/rrdtool/BUILD
+++ b/utils/rrdtool/BUILD
@@ -4,7 +4,7 @@
   sedit "s/^sleep 1/#sleep 1/g" configure        &&
   sedit "s/^# Just in case/sleep 1/g" configure  &&
 
-  OPTS="$OPTS --enable-static --enable-shared --enable-perl-site-install"  &&
+  OPTS+=" --enable-static --enable-shared --enable-perl-site-install"  &&
 
   default_build
 
diff --git a/video/ftgl/BUILD b/video/ftgl/BUILD
index ac7b31e..53c7f15 100644
--- a/video/ftgl/BUILD
+++ b/video/ftgl/BUILD
@@ -4,7 +4,7 @@ ndrivers="NVIDIA NVIDIA-old NVIDIA-legacy NVIDIA-beta NVIDIA-fx"
 for driver in $ndrivers
 do
   if module_installed $driver; then
-    OPTS="$OPTS --with-gl-lib=/usr/lib/opengl/nvidia/"
+    OPTS+=" --with-gl-lib=/usr/lib/opengl/nvidia/"
     break
   fi
 done &&
diff --git a/video/gpac/BUILD b/video/gpac/BUILD
index 0a139d9..b1e4326 100644
--- a/video/gpac/BUILD
+++ b/video/gpac/BUILD
@@ -2,7 +2,7 @@
 
   chmod +x configure  &&
 
-  OPTS="$OPTS --mozdir=/opt/lunar/plugins --cpu=$CPU"
+  OPTS+=" --mozdir=/opt/lunar/plugins --cpu=$CPU"
 
   default_build       &&
 
diff --git a/video/kino/BUILD b/video/kino/BUILD
index 73d7474..828c919 100644
--- a/video/kino/BUILD
+++ b/video/kino/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-hotplug-script-dir=/etc/hotplug/usb  \
+  OPTS+=" --with-hotplug-script-dir=/etc/hotplug/usb  \
            --with-hotplug-usermap-dir=/etc/hotplug/usb"  &&
 
 # A minor glitch where this is supposed to be
diff --git a/video/libquicktime/BUILD b/video/libquicktime/BUILD
index d1720ce..a5cad43 100644
--- a/video/libquicktime/BUILD
+++ b/video/libquicktime/BUILD
@@ -1,7 +1,7 @@
 (
 
 # Disabling gtk usage for now, causes the make to barf.
-  OPTS="$OPTS --enable-gpl --without-gtk"
+  OPTS+=" --enable-gpl --without-gtk"
 
   default_build
 
diff --git a/video/transcode/BUILD b/video/transcode/BUILD
index f855523..d238e83 100644
--- a/video/transcode/BUILD
+++ b/video/transcode/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-ffmpeg \
+  OPTS+=" --enable-ffmpeg \
         --enable-libmpeg2 --enable-libmpeg2convert --enable-libpostproc"  &&
 
   default_build
diff --git a/virtual/bochs/BUILD b/virtual/bochs/BUILD
index d797573..aa9b334 100644
--- a/virtual/bochs/BUILD
+++ b/virtual/bochs/BUILD
@@ -2,55 +2,55 @@
 
 bad_flags -malign-double 
 
-OPTS="$OPTS --enable-cpu-level=6"
-OPTS="$OPTS --with-all-libs"
+OPTS+=" --enable-cpu-level=6"
+OPTS+=" --with-all-libs"
 
 if [[ $ALL == "y" ]]; then
-  OPTS="$OPTS --enable-all-optimizations"
+  OPTS+=" --enable-all-optimizations"
 else
   if [[ $G2H == "y" ]]; then
-    OPTS="$OPTS --enable-guest2host-tlb"
+    OPTS+=" --enable-guest2host-tlb"
   fi
 
   if [[ $REPEAT == "y" ]]; then
-    OPTS="$OPTS --enable-repeat-speedups"
+    OPTS+=" --enable-repeat-speedups"
   fi
 
   if [[ $ICACHE == "y" ]]; then
-    OPTS="$OPTS --enable-icache"
+    OPTS+=" --enable-icache"
   fi
 
   if [[ $ASM == "y" ]]; then
-    OPTS="$OPTS --enable-host-specific-asms"
+    OPTS+=" --enable-host-specific-asms"
   fi
 fi
 
 if [[ $SB16 == "y" ]]; then
-  OPTS="$OPTS --enable-sb16=linux"
+  OPTS+=" --enable-sb16=linux"
 fi
 
 if [[ $PLUGINS == "y" ]]; then
-  OPTS="$OPTS --enable-plugins"
+  OPTS+=" --enable-plugins"
 fi
 
 if [[ $GLOBAL == "y" ]]; then
-  OPTS="$OPTS --enable-global-pages"
+  OPTS+=" --enable-global-pages"
 fi
 
 if [[ $SLOWDOWN == "y" ]]; then
-  OPTS="$OPTS --enable-slowdown"
+  OPTS+=" --enable-slowdown"
 fi
 
 if [[ $IDLE == "y" ]]; then
-  OPTS="$OPTS --enable-idle-hack"
+  OPTS+=" --enable-idle-hack"
 fi
 
 if [[ $NE2000 == "y" ]]; then
-  OPTS="$OPTS --enable-ne2000"
+  OPTS+=" --enable-ne2000"
 fi
 
 if [[ $MSR == "y" ]]; then
-  OPTS="$OPTS --enable-ignore-bad-msr"
+  OPTS+=" --enable-ignore-bad-msr"
 fi
 
 default_build
diff --git a/virtual/dosbox/BUILD b/virtual/dosbox/BUILD
index b18da8b..e153669 100644
--- a/virtual/dosbox/BUILD
+++ b/virtual/dosbox/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-core-inline"
+  OPTS+=" --enable-core-inline"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/virtual/dosemu/BUILD b/virtual/dosemu/BUILD
index 4c2e6cb..02a5895 100644
--- a/virtual/dosemu/BUILD
+++ b/virtual/dosemu/BUILD
@@ -2,7 +2,7 @@
 
   sedit "s:cp -a:cp -aL:" src/arch/linux/Makefile.main &&
 
-  OPTS="$OPTS --with-x --with-fdtarball=$SOURCE_CACHE/$SOURCE2"
+  OPTS+=" --with-x --with-fdtarball=$SOURCE_CACHE/$SOURCE2"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/web/apache2/BUILD b/web/apache2/BUILD
index d6f2506..cbcf5e9 100644
--- a/web/apache2/BUILD
+++ b/web/apache2/BUILD
@@ -24,9 +24,9 @@
 
 
   if [ "$USE_WORKER" == "n" ]; then
-    OPTS="$OPTS --with-mpm=prefork"
+    OPTS+=" --with-mpm=prefork"
   else
-    OPTS="$OPTS --with-mpm=worker"
+    OPTS+=" --with-mpm=worker"
   fi
 
   echo "CFLAGS=$CFLAGS"  &&
diff --git a/web/chromium/BUILD b/web/chromium/BUILD
index 9d00208..ba0bc2a 100644
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -27,7 +27,7 @@
 EOF
 
   if module_installed libjpeg-turbo; then
-  OPTS="$OPTS -Duse_libjpeg_turbo=1"
+  OPTS+=" -Duse_libjpeg_turbo=1"
   fi &&
 
 #  if module_installed libvpx; then
@@ -41,21 +41,21 @@ EOF
 #  cp $SOURCE_CACHE/$SOURCE3 third_party/speex
 #  fi &&
 
-  OPTS="$OPTS -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 \
+  OPTS+=" -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 \
   -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_zlib=1 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 \
   -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Duse_system_zlib=1 \
   -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1"
 
   # set the target arch here
   if [ "`arch`" == "x86_64" ]; then
-    OPTS="$OPTS -Dtarget_arch=x64"
+    OPTS+=" -Dtarget_arch=x64"
   else
-    OPTS="$OPTS -Dtarget_arch=ia32"
+    OPTS+=" -Dtarget_arch=ia32"
   fi
 
   gcc_ver=`installed_version gcc | cut -d. -f1,2`
   if [[ $gcc_ver == "4.4" ]]; then
-    OPTS="$OPTS -Dno_strict_aliasing=1 -Dgcc_version=44"
+    OPTS+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
   fi
 
   # This is the configure step
diff --git a/web/webalizer/BUILD b/web/webalizer/BUILD
index c24a7c3..c4029b2 100644
--- a/web/webalizer/BUILD
+++ b/web/webalizer/BUILD
@@ -1,7 +1,7 @@
 (
 
   sedit "s/#define _LARGEFILE64_SOURCE = 1/#define _LARGEFILE64_SOURCE 1/" webalizer.c
-  OPTS="$OPTS --enable-dns"
+  OPTS+=" --enable-dns"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/web/webkit/BUILD b/web/webkit/BUILD
index debd911..f89d6f3 100644
--- a/web/webkit/BUILD
+++ b/web/webkit/BUILD
@@ -8,7 +8,7 @@
 # Fix an icu4c problem.
   sedit "s:class TextBreakIterator;:typedef struct UBreakIterator TextBreakIterator;:" WebCore/platform/text/TextBreakIterator.h &&
 
-  OPTS="$OPTS --enable-svg --enable-svg-animation      \
+  OPTS+=" --enable-svg --enable-svg-animation      \
         --enable-svg-fonts --enable-svg-foreign-object \
 	--enable-svg-as-image --enable-3D-transforms   \
         --enable-optimizations --disable-gtk-doc-html" &&
diff --git a/x11-apps/dia/BUILD b/x11-apps/dia/BUILD
index 46d1a5a..4b694c0 100644
--- a/x11-apps/dia/BUILD
+++ b/x11-apps/dia/BUILD
@@ -2,7 +2,7 @@
 
   export LIBART_CONFIG=/usr/bin/libart2-config
 
-  OPTS="$OPTS --with-python --enable-debug=no --disable-db2html"
+  OPTS+=" --with-python --enable-debug=no --disable-db2html"
 
   default_build
 
diff --git a/x11-apps/openoffice-src/BUILD b/x11-apps/openoffice-src/BUILD
index f820c8f..cc78a30 100644
--- a/x11-apps/openoffice-src/BUILD
+++ b/x11-apps/openoffice-src/BUILD
@@ -42,7 +42,7 @@
   # All of the options have been carefully chosen. Don't edit them unless you
   # really know what you're doing
 
-  OPTS="$OPTS --prefix=$OO_DIR --enable-dbus --disable-dbgutil --disable-static-gtk \
+  OPTS+=" --prefix=$OO_DIR --enable-dbus --disable-dbgutil --disable-static-gtk \
               --disable-fontooo --disable-odk --disable-debug --enable-opengl \
               --disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \
               --enable-mozilla --enable-binfilter --enable-xrender-link       \
@@ -70,10 +70,10 @@
   fi &&
 
   if module_installed sun-jdk ; then
-    OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
+    OPTS+=" --with-jdk-home=$JAVA_HOME";
    else
     if  module_installed j2sdk ; then
-    OPTS="$OPTS --with-jdk-home=$JAVA_HOME";
+    OPTS+=" --with-jdk-home=$JAVA_HOME";
     fi
   fi &&
 
diff --git a/x11-apps/rss-glx/BUILD b/x11-apps/rss-glx/BUILD
index 25e4699..bf57d42 100644
--- a/x11-apps/rss-glx/BUILD
+++ b/x11-apps/rss-glx/BUILD
@@ -1,7 +1,7 @@
 (
 
-  OPTS="$OPTS --bindir=/usr/libexec/xscreensaver"
-  OPTS="$OPTS --with-configdir=/usr/share/xscreensaver/"
+  OPTS+=" --bindir=/usr/libexec/xscreensaver"
+  OPTS+=" --with-configdir=/usr/share/xscreensaver/"
 
   default_build
 
diff --git a/x11-utils/imwheel/BUILD b/x11-utils/imwheel/BUILD
index 3595b33..fa72b90 100644
--- a/x11-utils/imwheel/BUILD
+++ b/x11-utils/imwheel/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --disable-gpm --disable-gpm-doc"
+  OPTS+=" --disable-gpm --disable-gpm-doc"
   
   default_build &&
   install imwheelrc /etc/X11/imwheelrc &&
diff --git a/x11-utils/wininfo/BUILD b/x11-utils/wininfo/BUILD
index 8c65259..f7a4342 100644
--- a/x11-utils/wininfo/BUILD
+++ b/x11-utils/wininfo/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --with-x"
+  OPTS+=" --with-x"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/x11-utils/xpad/BUILD b/x11-utils/xpad/BUILD
index b4ba7a4..bc487e6 100644
--- a/x11-utils/xpad/BUILD
+++ b/x11-utils/xpad/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-binreloc --enable-binreloc-threads --disable-rpath"
+  OPTS+=" --enable-binreloc --enable-binreloc-threads --disable-rpath"
   default_build
  
 ) > $C_FIFO 2>&1
diff --git a/x11-wm/fluxbox/BUILD b/x11-wm/fluxbox/BUILD
index 01211f3..7b67803 100644
--- a/x11-wm/fluxbox/BUILD
+++ b/x11-wm/fluxbox/BUILD
@@ -1,15 +1,15 @@
 (
 
   if [ "$KDE" == "y" ] ; then
-    OPTS="$OPTS --enable-kde"
+    OPTS+=" --enable-kde"
   fi
 
   if [ "$GNOME" == "n" ] ; then
-    OPTS="$OPTS --disable-gnome"
+    OPTS+=" --disable-gnome"
   fi
 
   if [ "$XIN" == "y" ] ; then
-    OPTS="$OPTS --enable-xinerama"
+    OPTS+=" --enable-xinerama"
   fi
 
   ./configure  --build=$BUILD             \
diff --git a/x11/libxklavier/BUILD b/x11/libxklavier/BUILD
index dc684fd..be108dc 100644
--- a/x11/libxklavier/BUILD
+++ b/x11/libxklavier/BUILD
@@ -1,6 +1,6 @@
 (
 
-  export OPTS="$OPTS --with-xkb-base=/usr/share/X11/xkb --with-xkb-bin-base=/usr/bin --prefix=/usr"  &&
+  export OPTS+=" --with-xkb-base=/usr/share/X11/xkb --with-xkb-bin-base=/usr/bin --prefix=/usr"  &&
 
   default_build
 
diff --git a/x11/xplanet/BUILD b/x11/xplanet/BUILD
index 58eddf4..1b3ce45 100644
--- a/x11/xplanet/BUILD
+++ b/x11/xplanet/BUILD
@@ -3,7 +3,7 @@
   sed -i "1i #include <stdio.h>" src/Separation.cpp src/Satellite.cpp &&
 
   if module_installed xscreensaver; then
-    OPTS="$OPTS --with-xscreensaver"
+    OPTS+=" --with-xscreensaver"
   fi                                       &&
 
   ./configure  --prefix=/usr                \
diff --git a/xfce4/goodies/notification-daemon-xfce/BUILD b/xfce4/goodies/notification-daemon-xfce/BUILD
index 341c120..ec24d33 100644
--- a/xfce4/goodies/notification-daemon-xfce/BUILD
+++ b/xfce4/goodies/notification-daemon-xfce/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   OPTS="$OPTS --enable-gradient-look"
+   OPTS+=" --enable-gradient-look"
 
    default_build
 
diff --git a/xorg7/driver/xf86-video-intel/BUILD b/xorg7/driver/xf86-video-intel/BUILD
index 9e41915..92c2556 100644
--- a/xorg7/driver/xf86-video-intel/BUILD
+++ b/xorg7/driver/xf86-video-intel/BUILD
@@ -4,7 +4,7 @@
 
   . /etc/profile.d/x11r7.rc &&
 
-#  OPTS="$OPTS --with-xserver-source=`pwd -P`" &&
+#  OPTS+=" --with-xserver-source=`pwd -P`" &&
   CFLAGS="$CFLAGS -I`pwd -P`/src/parser" &&
   default_build
 
diff --git a/xorg7/font/font-util/BUILD b/xorg7/font/font-util/BUILD
index e70fc6c..3b647f5 100644
--- a/xorg7/font/font-util/BUILD
+++ b/xorg7/font/font-util/BUILD
@@ -1,7 +1,7 @@
 (
   . /etc/profile.d/x11r7.rc &&
 
-  OPTS="$OPTS --with-mapdir=/usr/share/fonts/util"
+  OPTS+=" --with-mapdir=/usr/share/fonts/util"
 
   default_build
 
diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index 50676e7..11fe68e 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -9,7 +9,7 @@
   fi  &&
 
 #  if [[ "$USE_NVIDIA" = "y" ]]; then
-#    OPTS="$OPTS --disable-glx --disable-glx-tlx"
+#    OPTS+=" --disable-glx --disable-glx-tlx"
 #  fi &&
 
   OPTS+=" --enable-composite --enable-aiglx --disable-devel-docs \
diff --git a/zbeta/airconfig-svn/BUILD b/zbeta/airconfig-svn/BUILD
index e96291e..bb5d2c6 100644
--- a/zbeta/airconfig-svn/BUILD
+++ b/zbeta/airconfig-svn/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   OPTS="$OPTS  --disable-gtk-doc"
+   OPTS+="  --disable-gtk-doc"
 
    touch INSTALL  &&
 
diff --git a/zbeta/bmpx/BUILD b/zbeta/bmpx/BUILD
index 2dae5ce..0fd4fef 100644
--- a/zbeta/bmpx/BUILD
+++ b/zbeta/bmpx/BUILD
@@ -1,7 +1,7 @@
 (
 
   # Disable debug and add some boost hints to help the compile along
-  OPTS="$OPTS --disable-profile --disable-debug     \
+  OPTS+=" --disable-profile --disable-debug     \
               --with-boost-filesystem=gcc41-1_34_1  \
               --with-boost-regex=gcc41-1_34_1       \
               --with-boost-iostreams=gcc41-1_34_1"
diff --git a/zbeta/compiz/compiz/BUILD b/zbeta/compiz/compiz/BUILD
index 5034a13..348fb36 100644
--- a/zbeta/compiz/compiz/BUILD
+++ b/zbeta/compiz/compiz/BUILD
@@ -1,6 +1,6 @@
 (
 
-   OPTS="$OPTS  --disable-kde"
+   OPTS+="  --disable-kde"
    default_build
 
 ) > $C_FIFO 2>&1
diff --git a/zbeta/e17/e17-svn/BUILD b/zbeta/e17/e17-svn/BUILD
index 811db99..7611bf9 100644
--- a/zbeta/e17/e17-svn/BUILD
+++ b/zbeta/e17/e17-svn/BUILD
@@ -5,7 +5,7 @@
   export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
   export USER=nobody
 
-  OPTS="$OPTS --with-profile=FAST_PC"
+  OPTS+=" --with-profile=FAST_PC"
 
   default_cvs_build &&
 
diff --git a/zbeta/e17/ecore-svn/BUILD b/zbeta/e17/ecore-svn/BUILD
index f126558..1b84929 100644
--- a/zbeta/e17/ecore-svn/BUILD
+++ b/zbeta/e17/ecore-svn/BUILD
@@ -4,7 +4,7 @@
   export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
   export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
 
-  OPTS="$OPTS  --with-x"
+  OPTS+="  --with-x"
 
   default_cvs_build
 
diff --git a/zbeta/e17/emphasis-svn/BUILD b/zbeta/e17/emphasis-svn/BUILD
index 46c8c34..315c99a 100644
--- a/zbeta/e17/emphasis-svn/BUILD
+++ b/zbeta/e17/emphasis-svn/BUILD
@@ -4,7 +4,7 @@
   export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
   export USER=nobody
 
-  OPTS="$OPTS --with-profile=FAST_PC"
+  OPTS+=" --with-profile=FAST_PC"
 
   default_cvs_build
 
diff --git a/zbeta/e17/enhance-svn/BUILD b/zbeta/e17/enhance-svn/BUILD
index 46c8c34..315c99a 100644
--- a/zbeta/e17/enhance-svn/BUILD
+++ b/zbeta/e17/enhance-svn/BUILD
@@ -4,7 +4,7 @@
   export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
   export USER=nobody
 
-  OPTS="$OPTS --with-profile=FAST_PC"
+  OPTS+=" --with-profile=FAST_PC"
 
   default_cvs_build
 
diff --git a/zbeta/e17/evas-svn/BUILD b/zbeta/e17/evas-svn/BUILD
index 8261c1c..5bfc88e 100644
--- a/zbeta/e17/evas-svn/BUILD
+++ b/zbeta/e17/evas-svn/BUILD
@@ -4,7 +4,7 @@
   export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
   export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
 
-  OPTS="$OPTS  --enable-image-loader-eet        \
+  OPTS+="  --enable-image-loader-eet        \
                --with-x                         \
                --enable-software-x11            \
                --enable-xrender-x11             \
diff --git a/zbeta/enna-hg/BUILD b/zbeta/enna-hg/BUILD
index 46c8c34..315c99a 100644
--- a/zbeta/enna-hg/BUILD
+++ b/zbeta/enna-hg/BUILD
@@ -4,7 +4,7 @@
   export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
   export USER=nobody
 
-  OPTS="$OPTS --with-profile=FAST_PC"
+  OPTS+=" --with-profile=FAST_PC"
 
   default_cvs_build
 
diff --git a/zbeta/eweather-svn/BUILD b/zbeta/eweather-svn/BUILD
index 46c8c34..315c99a 100644
--- a/zbeta/eweather-svn/BUILD
+++ b/zbeta/eweather-svn/BUILD
@@ -4,7 +4,7 @@
   export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
   export USER=nobody
 
-  OPTS="$OPTS --with-profile=FAST_PC"
+  OPTS+=" --with-profile=FAST_PC"
 
   default_cvs_build
 
diff --git a/zbeta/expect-cvs/BUILD b/zbeta/expect-cvs/BUILD
index 9a93bdf..6705c13 100644
--- a/zbeta/expect-cvs/BUILD
+++ b/zbeta/expect-cvs/BUILD
@@ -1,7 +1,7 @@
 (
 
  if in_depends $MODULE tk ; then
-   OPTS="$OPTS --with-tkinclude=/usr/include/"
+   OPTS+=" --with-tkinclude=/usr/include/"
  fi
 
  cd $SOURCE_DIRECTORY/                 &&
diff --git a/zbeta/gcompris/BUILD b/zbeta/gcompris/BUILD
index d62c834..57a3068 100644
--- a/zbeta/gcompris/BUILD
+++ b/zbeta/gcompris/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --prefix=/usr/games/$MODULE --enable-sqlite \
+  OPTS+=" --prefix=/usr/games/$MODULE --enable-sqlite \
               --enable-binreloc --enable-gnet"
 
   default_build
diff --git a/zbeta/ghal-svn/BUILD b/zbeta/ghal-svn/BUILD
index e96291e..bb5d2c6 100644
--- a/zbeta/ghal-svn/BUILD
+++ b/zbeta/ghal-svn/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   OPTS="$OPTS  --disable-gtk-doc"
+   OPTS+="  --disable-gtk-doc"
 
    touch INSTALL  &&
 
diff --git a/zbeta/libgdbus-git/BUILD b/zbeta/libgdbus-git/BUILD
index 4604a03..a4e2cfa 100644
--- a/zbeta/libgdbus-git/BUILD
+++ b/zbeta/libgdbus-git/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-dbus-glib"
+  OPTS+=" --enable-dbus-glib"
 
   sh bootstrap &&
   default_build
diff --git a/zbeta/moodbar/BUILD b/zbeta/moodbar/BUILD
index 0c177a0..1549829 100644
--- a/zbeta/moodbar/BUILD
+++ b/zbeta/moodbar/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --prefix=`pkg-config --variable=prefix gstreamer-0.10`"
+  OPTS+=" --prefix=`pkg-config --variable=prefix gstreamer-0.10`"
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/zbeta/openafs-devel/BUILD b/zbeta/openafs-devel/BUILD
index c02addc..1c08fad 100644
--- a/zbeta/openafs-devel/BUILD
+++ b/zbeta/openafs-devel/BUILD
@@ -4,9 +4,9 @@
   ./regen.sh                && 
 
   case `uname -s -r` in
-    [lL]inux\ 2.4.*) OPTS="$OPTS --with-afs-sysname=i386_linux24"
+    [lL]inux\ 2.4.*) OPTS+=" --with-afs-sysname=i386_linux24"
       ;;
-    [lL]inux\ 2.6.*) OPTS="$OPTS --with-afs-sysname=i386_linux26"
+    [lL]inux\ 2.6.*) OPTS+=" --with-afs-sysname=i386_linux26"
       ;;
     *) message "Unsupported OS!"
       exit -1
@@ -18,7 +18,7 @@
     message "You need to have the source for your running kernel online and configured!"
     exit -1
   fi
-  OPTS="$OPTS --with-linux-kernel-headers=/lib/modules/`uname -r`/build"
+  OPTS+=" --with-linux-kernel-headers=/lib/modules/`uname -r`/build"
 
   ./configure         --prefix=/usr                        \
                 --sysconfdir=/usr/vice/etc        \
diff --git a/zbeta/openafs-driver-devel/BUILD b/zbeta/openafs-driver-devel/BUILD
index c2bcf90..463a2ab 100644
--- a/zbeta/openafs-driver-devel/BUILD
+++ b/zbeta/openafs-driver-devel/BUILD
@@ -5,9 +5,9 @@
   ./regen.sh &&
 
   case `uname -s -r` in
-    [lL]inux\ 2.4.*) OPTS="$OPTS --with-afs-sysname=i386_linux24"
+    [lL]inux\ 2.4.*) OPTS+=" --with-afs-sysname=i386_linux24"
       ;;
-    [lL]inux\ 2.6.*) OPTS="$OPTS --with-afs-sysname=i386_linux26"
+    [lL]inux\ 2.6.*) OPTS+=" --with-afs-sysname=i386_linux26"
       ;;
     *) message "Unsupported OS!"
       exit -1
@@ -19,7 +19,7 @@
     message "You need to have the source for your running kernel online and configured!"
     exit -1
   fi
-  OPTS="$OPTS --with-linux-kernel-headers=/lib/modules/`uname -r`/build"
+  OPTS+=" --with-linux-kernel-headers=/lib/modules/`uname -r`/build"
 
   ./configure         --prefix=/usr                        \
                 --sysconfdir=/usr/vice/etc        \
diff --git a/zbeta/pcb-cvs/BUILD b/zbeta/pcb-cvs/BUILD
index 741374f..d3c6783 100644
--- a/zbeta/pcb-cvs/BUILD
+++ b/zbeta/pcb-cvs/BUILD
@@ -2,7 +2,7 @@
 
   ./autogen.sh &&
 
-  OPTS="$OPTS --enable-dbus"
+  OPTS+=" --enable-dbus"
 
   default_build
 
diff --git a/zbeta/pcb-git/BUILD b/zbeta/pcb-git/BUILD
index 741374f..d3c6783 100644
--- a/zbeta/pcb-git/BUILD
+++ b/zbeta/pcb-git/BUILD
@@ -2,7 +2,7 @@
 
   ./autogen.sh &&
 
-  OPTS="$OPTS --enable-dbus"
+  OPTS+=" --enable-dbus"
 
   default_build
 
diff --git a/zbeta/rage-svn/BUILD b/zbeta/rage-svn/BUILD
index 7ae82c1..7644c06 100644
--- a/zbeta/rage-svn/BUILD
+++ b/zbeta/rage-svn/BUILD
@@ -4,7 +4,7 @@
   export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
   export USER=nobody
 
-  OPTS="$OPTS --with-profile=FAST_PC"
+  OPTS+=" --with-profile=FAST_PC"
 
   default_cvs_build
 
diff --git a/zbeta/transcode-cvs/BUILD b/zbeta/transcode-cvs/BUILD
index 68a1fe5..15c7b3a 100644
--- a/zbeta/transcode-cvs/BUILD
+++ b/zbeta/transcode-cvs/BUILD
@@ -1,12 +1,12 @@
 (
   autoreconf -i -f
 
-  modprobe -l | grep v4l &> /dev/null && OPTS="$OPTS --enable-v4l" || :
+  modprobe -l | grep v4l &> /dev/null && OPTS+=" --enable-v4l" || :
 
-  egrep '\<mmx\>' /proc/cpuinfo &> /dev/null && OPTS="$OPTS --enable-mmx" || :
-  egrep '\<sse\>' /proc/cpuinfo &> /dev/null && OPTS="$OPTS --enable-sse" || :
-  egrep '\<sse2\>' /proc/cpuinfo &> /dev/null && OPTS="$OPTS --enable-sse2" || :
-  egrep '\<3dnow\>' /proc/cpuinfo &> /dev/null && OPTS="$OPTS --enable-3dnow" || :
+  egrep '\<mmx\>' /proc/cpuinfo &> /dev/null && OPTS+=" --enable-mmx" || :
+  egrep '\<sse\>' /proc/cpuinfo &> /dev/null && OPTS+=" --enable-sse" || :
+  egrep '\<sse2\>' /proc/cpuinfo &> /dev/null && OPTS+=" --enable-sse2" || :
+  egrep '\<3dnow\>' /proc/cpuinfo &> /dev/null && OPTS+=" --enable-3dnow" || :
 
   default_build
 
diff --git a/zbeta/x264-git/BUILD b/zbeta/x264-git/BUILD
index 5d945b7..9c67347 100644
--- a/zbeta/x264-git/BUILD
+++ b/zbeta/x264-git/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-shared --enable-gtk --enable-pthread \
+  OPTS+=" --enable-shared --enable-gtk --enable-pthread \
               --enable-visualize --enable-pic"
 
   default_build
diff --git a/zbeta/x264-snapshot/BUILD b/zbeta/x264-snapshot/BUILD
index 9946640..0b10141 100644
--- a/zbeta/x264-snapshot/BUILD
+++ b/zbeta/x264-snapshot/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS --enable-shared --enable-pthread \
+  OPTS+=" --enable-shared --enable-pthread \
               --enable-visualize --enable-pic" &&
 
   default_build
diff --git a/zbeta/xcache/BUILD b/zbeta/xcache/BUILD
index 977adcd..93e8d64 100644
--- a/zbeta/xcache/BUILD
+++ b/zbeta/xcache/BUILD
@@ -2,7 +2,7 @@
 
   /usr/bin/phpize  &&
 
-  OPTS="$OPTS --enable-xcache \
+  OPTS+=" --enable-xcache \
               --enable-xcache-optimizer"  &&
 
   default_build  &&
diff --git a/zbeta/xemacs-beta/BUILD b/zbeta/xemacs-beta/BUILD
index d9d8409..d962c33 100644
--- a/zbeta/xemacs-beta/BUILD
+++ b/zbeta/xemacs-beta/BUILD
@@ -3,11 +3,11 @@
   LDFLAGS=`echo $LDFLAGS | sed "s/-z combreloc//"`
   pwd
   if [[ "$XEMACS_MULE" == "y" ]]; then
-      OPTS="$OPTS --with-mule"
+      OPTS+=" --with-mule"
   fi
 
   if [[ "$XEMACS_XIM" == "y" ]]; then
-      OPTS="$OPTS --with-xim=xlib"
+      OPTS+=" --with-xim=xlib"
   fi
 
   ./configure  --prefix=/usr             \
diff --git a/zdeprecated/gstreamer/BUILD b/zdeprecated/gstreamer/BUILD
index ae3f4a1..ae6f90b 100644
--- a/zdeprecated/gstreamer/BUILD
+++ b/zdeprecated/gstreamer/BUILD
@@ -1,6 +1,6 @@
 (
 
-  OPTS="$OPTS  --disable-tests  --disable-docs-build --disable-examples --disable-valgrind"
+  OPTS+="  --disable-tests  --disable-docs-build --disable-examples --disable-valgrind"
 
   default_build
 
diff --git a/zdeprecated/kvm/BUILD b/zdeprecated/kvm/BUILD
index 08c85c3..44bf443 100644
--- a/zdeprecated/kvm/BUILD
+++ b/zdeprecated/kvm/BUILD
@@ -3,7 +3,7 @@
   echo 'KERNEL=="kvm", NAME="%k", GROUP="kvm"' > 90-kvm.rules  &&
 
   if module_installed qemu; then
-   OPTS="$OPTS --qemu-cc=${GCC3_PREFIX:-/opt/lunar/gcc3}/bin/gcc"
+   OPTS+=" --qemu-cc=${GCC3_PREFIX:-/opt/lunar/gcc3}/bin/gcc"
   fi  &&
 
   add_priv_group kvm  &&
diff --git a/zdeprecated/php/BUILD b/zdeprecated/php/BUILD
index 0688928..1496614 100644
--- a/zdeprecated/php/BUILD
+++ b/zdeprecated/php/BUILD
@@ -11,17 +11,17 @@
   if [ "$IMAP" == "y" ]; then
     unpack $SOURCE2
     make -C imap-${IMAP_VERSION} slx SPECIALS="SSLDIR=/etc/ssl SSLINCLUDE=/usr/include SSLLIB=/usr/lib"
-    OPTS="$OPTS --with-imap=imap-${IMAP_VERSION}"
+    OPTS+=" --with-imap=imap-${IMAP_VERSION}"
   fi
   
   if module_installed apache || module_installed apache-mod_ssl ; then
-    OPTS="$OPTS --with-apxs=/usr/sbin/apxs"
+    OPTS+=" --with-apxs=/usr/sbin/apxs"
   elif module_installed apache2 ; then
-    OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
+    OPTS+=" --with-apxs2=/usr/sbin/apxs"
   fi
 
   if [ "x${FASTCGI}" != "x" ]; then
-    OPTS="$OPTS --enable-fastcgi"
+    OPTS+=" --enable-fastcgi"
   fi
 
   if echo $OPTS | grep -q -- --enable-xslt ; then
diff --git a/zdeprecated/xpdf/BUILD b/zdeprecated/xpdf/BUILD
index 84fef96..93f7dcc 100644
--- a/zdeprecated/xpdf/BUILD
+++ b/zdeprecated/xpdf/BUILD
@@ -5,7 +5,7 @@
   patch_it $SOURCE_CACHE/$SOURCE4 1 &&
   patch_it $SOURCE_CACHE/$SOURCE5 1 &&
 
-  OPTS="$OPTS --with-freetype2-includes=/usr/include/freetype2       \
+  OPTS+=" --with-freetype2-includes=/usr/include/freetype2       \
               --sysconfdir=/etc --enable-opi --enable-multithreaded  \
               --enable-wordlist --with-gzip"                        &&
 


More information about the Lunar-commits mailing list