Source Mage code commit list

[Thomas Orgis <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 archive/bzip2/BUILD     |    6 +++++-
 archive/bzip2/CONFIGURE |    1 +
 archive/bzip2/DETAILS   |    2 +-
 archive/bzip2/HISTORY   |    5 +++++
 archive/bzip2/INSTALL   |    7 ++++++-
 5 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit ffe556725295bb6fd8b268b0f8d35a1b22aa7c32
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    bzip2 as default to /usr/bin, but option for /bin

diff --git a/archive/bzip2/BUILD b/archive/bzip2/BUILD
index dedbb8d..c7d808d 100755
--- a/archive/bzip2/BUILD
+++ b/archive/bzip2/BUILD
@@ -2,5 +2,9 @@ sedit  "s/-O2/-fPIC ${CFLAGS}/;s|)/man|)
 sedit  's/\$(PREFIX)\/bin/\$(EPREFIX)\/bin/g'                     Makefile  
&&
 sedit  "s/-O2/${CFLAGS}/;s|)/man|)/share/man|;/^LDFLAGS/d"            \
        Makefile-libbz2_so                                                   
&&
-make  "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT" &&
+if [[ "$BZIP2_ROOT" == "y" ]]; then 
+  make "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT"
+else
+  make "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT/usr"
+fi &&
 make  -f  Makefile-libbz2_so
diff --git a/archive/bzip2/CONFIGURE b/archive/bzip2/CONFIGURE
new file mode 100755
index 0000000..149a81c
--- /dev/null
+++ b/archive/bzip2/CONFIGURE
@@ -0,0 +1 @@
+config_query BZIP2_ROOT "Place binaries into /bin?" n
diff --git a/archive/bzip2/DETAILS b/archive/bzip2/DETAILS
index f880b89..60bf581 100755
--- a/archive/bzip2/DETAILS
+++ b/archive/bzip2/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
      
SOURCE_HASH=sha512:b213ae1dbfe40f9f1742bab3f61af74588ff13a3eb5df274bf1c15552d78d038de811e4d4e568189dc62e993c94ca286060a36f245a7d00227686ceaac3417c1
         WEB_SITE=http://www.bzip.org/
          ENTERED=20010922
-      PATCHLEVEL=2
+      PATCHLEVEL=3
       LICENSE[0]=BSD
         KEYWORDS="archive"
            SHORT="Free, patent free, high-quality data compressor"
diff --git a/archive/bzip2/HISTORY b/archive/bzip2/HISTORY
index 46b4f33..47d45e0 100644
--- a/archive/bzip2/HISTORY
+++ b/archive/bzip2/HISTORY
@@ -1,3 +1,8 @@
+2007-02-05 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD, INSTALL: make the install to /bin an opt-in, default
+         being install to /usr/bin
+       * DETAILS: again patchlevel for the change
+
 2007-02-03 Thomas Orgis <sobukus AT sourcemage.org>
        * BUILD, INSTALL: no need to rm -f installed files in BUILD (anymore),
          install binaries to /bin as bzip2 is considered to be a basic system
diff --git a/archive/bzip2/INSTALL b/archive/bzip2/INSTALL
index 4a4542a..e4fcd1f 100755
--- a/archive/bzip2/INSTALL
+++ b/archive/bzip2/INSTALL
@@ -1,4 +1,9 @@
-make  "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT" install &&
+
+if [[ "$BZIP2_ROOT" == "y" ]]; then
+  make  "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT" install
+else
+  make  "PREFIX=$INSTALL_ROOT/usr" "EPREFIX=$INSTALL_ROOT/usr" install
+fi &&
 #  make  -f  Makefile-libbz2_so  &&
 rm  -vf  ${INSTALL_ROOT}/usr/lib/libbz2.so*  &&
 cp   libbz2.so.${VERSION}  ${INSTALL_ROOT}/usr/lib  &&