-optional_depends POSTSCRIPT-INTERPRETER \
- "" \
- "" \
- "required for creation of either pdf or html output"
&&
+optional_depends POSTSCRIPT-INTERPRETER \
+ "" "" \
+ "for creation of either pdf or html output" &&
-optional_depends psutils \
- "" \
- "" \
- "required for html output"
&&
-
-optional_depends netpbm \
- "" \
- "" \
- "required for html output"
+optional_depends psutils "" "" "required for html output"
diff --git a/doc/groff/DETAILS b/doc/groff/DETAILS
index cbc85fa..bf50c1f 100755
--- a/doc/groff/DETAILS
+++ b/doc/groff/DETAILS
@@ -1,18 +1,17 @@
SPELL=groff
- VERSION=1.19.2
+ VERSION=1.20
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/groff/groff.html
ENTERED=20010922
- UPDATED=20050913
LICENSE[0]=GPL
KEYWORDS="doc"
- SHORT="A device-independent document processor/formatter."
+ SHORT="device-independent document processor/formatter"
cat << EOF
groff - Document formatting system
Based on a device-independent version of 'troff,' 'groff' (GNU Troff) is
diff --git a/doc/groff/HISTORY b/doc/groff/HISTORY
index d345989..b10442c 100644
--- a/doc/groff/HISTORY
+++ b/doc/groff/HISTORY
@@ -1,3 +1,7 @@
+2009-01-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.20; quoting paths; fixed short desc
+ * DEPENDS: added missing deps; netpbm -> req
+
2007-06-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: converted to upstream signature checking; removed
redundant url
SOURCE_URL[0]=svn_http://netpbm.svn.sourceforge.net/svnroot/netpbm/$NETPBM_RELEASE:$SPELL
- WEB_SITE=http://$SPELL.sourceforge.net
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=1
+else
+ VERSION=10.26.58
+ SOURCE=$SPELL-$VERSION.tgz
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:2021b73597d99ceb071c58baa469563b8ef92343e19718576144180914787de0a1cbb91ceea7a536aaa0b74e73eb460c3f729da5b8ab757c9e7531071b19d57f
+fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://netpbm.sourceforge.net/
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="graphics"
- SHORT="netpbm contains 220 programs that convert graphics
formats."
+ SHORT="netpbm contains 220 programs that convert graphics formats"
cat << EOF
NetPBM (formerly PBMplus) is a package of over 220 programs that convert
from one graphics format to another and do simple editing and analysis
diff --git a/graphics/netpbm/HISTORY b/graphics/netpbm/HISTORY
index c0d0553..aae8f47 100644
--- a/graphics/netpbm/HISTORY
+++ b/graphics/netpbm/HISTORY
@@ -1,3 +1,11 @@
+2009-01-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added superstable versioned release: 10.26.58; fixed desc
+ * DEPENDS: svn is _optional_
+ * PREPARE: svn version is bad; disabled by default; use release
instead
+ * PRE_BUILD: fixed RELEASE var; quoting paths; cleaned up
+ * INSTALL: added, for proper installation procedure
+ * BUILD: removed b0rked build flags and unneeded packaging stage
+
2008-10-12 Arjan Bouter <abouter AT sourcemage.org>
* PRE_BUILD: fixed the if statement
* HISTORY: added missing history for commit
7fa0eafbfc1aa5173c4fe841a0d582e202c4f80f
diff --git a/graphics/netpbm/INSTALL b/graphics/netpbm/INSTALL
new file mode 100755
index 0000000..89e984a
--- /dev/null
+++ b/graphics/netpbm/INSTALL
@@ -0,0 +1,2 @@
+make -f GNUmakefile pkgdir="$INSTALL_ROOT/usr" \
+ install.bin install.data install.man install-dev
diff --git a/graphics/netpbm/PREPARE b/graphics/netpbm/PREPARE
index e1cfc7f..7bf4fcb 100755
--- a/graphics/netpbm/PREPARE
+++ b/graphics/netpbm/PREPARE
@@ -1,5 +1,10 @@
-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
+config_query NETPBM_SVN "Build release version from subversion tree?" n &&
+
+if [[ $NETPBM_SVN == y ]]; then
+ 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
+fi
diff --git a/graphics/netpbm/PRE_BUILD b/graphics/netpbm/PRE_BUILD
index 124f9ed..d900047 100755
--- a/graphics/netpbm/PRE_BUILD
+++ b/graphics/netpbm/PRE_BUILD
@@ -1,8 +1,12 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&