Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (14ed64edbb673f6e86559368cc28353a2736877d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (14ed64edbb673f6e86559368cc28353a2736877d)
  • Date: Fri, 19 Sep 2008 17:51:07 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

dev/null |binary
graphics/netpbm/DETAILS | 6 +++---
graphics/netpbm/DOWNLOAD | 8 --------
graphics/netpbm/FINAL | 4 ----
graphics/netpbm/INSTALL | 3 ---
graphics/netpbm/PREPARE | 5 +++++
graphics/netpbm/PRE_BUILD | 16 ++++++----------
graphics/netpbm/netpbm.hash.bz2 | 0
windowmanagers/fvwm/CONFIGURE | 2 +-
windowmanagers/fvwm/HISTORY | 4 ++++
10 files changed, 19 insertions(+), 29 deletions(-)

New commits:
commit 7fa0eafbfc1aa5173c4fe841a0d582e202c4f80f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

netpbm: they have 4 "releases". all svn based, so hash checking is
virtually impossible nowdays.

commit ce51ea82b931806a049442704a29c5dff6ce486f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

fvwm: removed leftover &&

diff --git a/graphics/netpbm/DETAILS b/graphics/netpbm/DETAILS
index ea0589c..3e25f67 100755
--- a/graphics/netpbm/DETAILS
+++ b/graphics/netpbm/DETAILS
@@ -1,10 +1,10 @@
SPELL=netpbm
- VERSION=10.42.0
+ VERSION=$NETPBM_RELEASE
SOURCE_IGNORE=volatile
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- WEB_SITE=http://netpbm.sourceforge.net
+
SOURCE_URL[0]=svn_http://netpbm.svn.sourceforge.net/svnroot/netpbm/$NETPBM_RELEASE:$SPELL
+ WEB_SITE=http://$SPELL.sourceforge.net
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="graphics"
diff --git a/graphics/netpbm/DOWNLOAD b/graphics/netpbm/DOWNLOAD
deleted file mode 100755
index 5408a32..0000000
--- a/graphics/netpbm/DOWNLOAD
+++ /dev/null
@@ -1,8 +0,0 @@
-if [[ ! -f "$SOURCE_CACHE/$SOURCE" || $FORCE_DOWNLOAD ]]; then
- message "${MESSAGE_COLOR}checking out release${DEFAULT_COLOR}" &&
- svn co
http://netpbm.svn.sourceforge.net/svnroot/netpbm/release_number/$VERSION \
- "${SOURCE_DIRECTORY/$BUILD_DIRECTORY\//}" &&
- message "${MESSAGE_COLOR}creating source tarball${DEFAULT_COLOR}" &&
- tar -cjf "$SOURCE" "${SOURCE_DIRECTORY/$BUILD_DIRECTORY\//}" &&
- mv "$SOURCE" "$SOURCE_CACHE"
-fi
diff --git a/graphics/netpbm/FINAL b/graphics/netpbm/FINAL
deleted file mode 100755
index 877eeb6..0000000
--- a/graphics/netpbm/FINAL
+++ /dev/null
@@ -1,4 +0,0 @@
-# Clean up directory used during install...
-if [ -d /tmp/netpbm ]; then
- rm -r /tmp/netpbm
-fi
diff --git a/graphics/netpbm/INSTALL b/graphics/netpbm/INSTALL
deleted file mode 100755
index d85dc3a..0000000
--- a/graphics/netpbm/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
- echo -e "/tmp/netpbm\n/usr\n\n\nY\n\n\n\n/usr/share/man\n\n" |
- ./installnetpbm &&
- rm -rf /tmp/netpbm #cleanup
diff --git a/graphics/netpbm/PREPARE b/graphics/netpbm/PREPARE
new file mode 100755
index 0000000..e1cfc7f
--- /dev/null
+++ b/graphics/netpbm/PREPARE
@@ -0,0 +1,5 @@
+message "There are a couple of possible branches you can choose from:" &&
+message "superstable: quite old but pretty much bugfree. stable: a bit more
recent, but well tested" &&
+message "advanced: released every 3 months plus low risk high reward fixes."
&&
+message "trunk: every change by the developpers is tracked. could be very
unstable" &&
+config_query_list NETPBM_RELEASE "Which branch would you like to track?"
advanced stable superstable trunk
diff --git a/graphics/netpbm/PRE_BUILD b/graphics/netpbm/PRE_BUILD
index 08fbe06..115fedc 100755
--- a/graphics/netpbm/PRE_BUILD
+++ b/graphics/netpbm/PRE_BUILD
@@ -1,12 +1,8 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file_simple $SOURCE &&
-message "${MESSAGE_COLOR}hash checking
${SPELL_COLOR}${SPELL}${MESSAGE_COLOR} source tree...${DEFAULT_COLOR}" &&
+default_pre_build &&
cd $SOURCE_DIRECTORY &&
-find . -type f ! -wholename '*/.svn/*' -exec gpg --print-md sha512 {} \; >
/tmp/netpbm.hash &&
-DIFF=$(bzcat "$SCRIPT_DIRECTORY/netpbm.hash.bz2" | diff /tmp/netpbm.hash -)
-if [[ $DIFF ]]; then
- error_message "${PROBLEM_COLOR}hash check failed!${DEFAULT_COLOR}" &&
- hash_user_query 1 "$SPELL" spell || false
-fi
-patch -p1 < $SCRIPT_DIRECTORY/netpbm-10.42.0-gcc43.patch &&
+
+if [ $NETPBM_RELEASE = stable ] || [ $NETPBM = superstable ]; then
+ patch -p1 < $SCRIPT_DIRECTORY/netpbm-10.42.0-gcc43.patch
+fi &&
+
sedit 's:/usr/man/web:/usr/share/man/web:' buildtools/installnetpbm.pl
diff --git a/graphics/netpbm/netpbm.hash.bz2 b/graphics/netpbm/netpbm.hash.bz2
deleted file mode 100644
index 3e9cdb8..0000000
Binary files a/graphics/netpbm/netpbm.hash.bz2 and /dev/null differ
diff --git a/windowmanagers/fvwm/CONFIGURE b/windowmanagers/fvwm/CONFIGURE
index 922c308..81e2817 100755
--- a/windowmanagers/fvwm/CONFIGURE
+++ b/windowmanagers/fvwm/CONFIGURE
@@ -2,5 +2,5 @@ if [ ! "${FVWM_RELEASE}" = "stable" ]; then
config_query_option FVWM_OPTS \
"Enable NLS?" y \
"--enable-nls" \
- "--disable-nls" &&
+ "--disable-nls"
fi
diff --git a/windowmanagers/fvwm/HISTORY b/windowmanagers/fvwm/HISTORY
index 4edcbfc..a0fc9fb 100644
--- a/windowmanagers/fvwm/HISTORY
+++ b/windowmanagers/fvwm/HISTORY
@@ -1,3 +1,7 @@
+2009-09-19 Arjan Bouter <abouter AT sourcemage.org>
+ * CONFIGURE: removed an unneeded &&
+ thanks for the catch hybris
+
2008-09-19 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS,CONFIGURE: moved dependencies on libsm, libxext,
libxrender and libxrandr to DEPENDS



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (14ed64edbb673f6e86559368cc28353a2736877d), Arjan Bouter, 09/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page