Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (05a03c6acf1da8c9c64c8ecf6d1e6eede05a6d74)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (05a03c6acf1da8c9c64c8ecf6d1e6eede05a6d74)
  • Date: Mon, 5 Jan 2009 21:37:48 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

doc/groff/DEPENDS | 21 +++++++--------------
doc/groff/DETAILS | 9 ++++-----
doc/groff/HISTORY | 5 ++++-
graphics/netpbm/BUILD | 8 ++------
graphics/netpbm/DEPENDS | 6 +++++-
graphics/netpbm/DETAILS | 16 ++++++++++++----
graphics/netpbm/HISTORY | 8 ++++++++
graphics/netpbm/INSTALL | 2 ++
graphics/netpbm/PREPARE | 15 ++++++++++-----
graphics/netpbm/PRE_BUILD | 16 ++++++++++------
10 files changed, 64 insertions(+), 42 deletions(-)

New commits:
commit 05a03c6acf1da8c9c64c8ecf6d1e6eede05a6d74
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

groff: => 1.20

commit 9e60310dc3800e613633d94ca6f5f6f4707e630f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

netpbm: 10.26.58

diff --git a/doc/groff/DEPENDS b/doc/groff/DEPENDS
index 7d7a6d6..4fc2d53 100755
--- a/doc/groff/DEPENDS
+++ b/doc/groff/DEPENDS
@@ -1,16 +1,9 @@
-depends g++ &&
+depends g++ &&
+depends bison &&
+depends netpbm &&

-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

@@ -92,4 +96,3 @@
24-07-2002 Joel Mayes <bluebird AT optushome.com.au>
* DETAILS: Version bumped to 1.18
* HISTORY: Added
-
diff --git a/graphics/netpbm/BUILD b/graphics/netpbm/BUILD
index 05cccc3..2c84b91 100755
--- a/graphics/netpbm/BUILD
+++ b/graphics/netpbm/BUILD
@@ -4,8 +4,8 @@ DEFAULT_TARGET = nonmerge
NETPBMLIBTYPE=unixshared
NETPBMLIBSUFFIX=so
STATICLIB_TOO=n
-CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized
-Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef
-CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes
+CFLAGS = -ffast-math -pedantic -Wall -Wno-uninitialized
-Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef
+CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes -fno-common
LDRELOC = ld --reloc
LINKER_CAN_DO_EXPLICIT_LIBRARY = Y
LINKERISCOMPILER = Y
@@ -30,8 +30,4 @@ fi &&
sedit "s/^\(CFLAGS =\)/\1 ${CFLAGS} /" Makefile.config &&
make_single &&
make &&
-if [ -e /tmp/netpbm ]; then
- rm -rf /tmp/netpbm
-fi &&
-make package pkgdir=/tmp/netpbm &&
make_normal
diff --git a/graphics/netpbm/DEPENDS b/graphics/netpbm/DEPENDS
index d5937cd..00dad81 100755
--- a/graphics/netpbm/DEPENDS
+++ b/graphics/netpbm/DEPENDS
@@ -1,7 +1,11 @@
depends perl &&
depends libpng &&
depends libxml2 &&
-depends SVN &&
+
+if [[ $NETPBM_SVN == y ]]; then
+ depends SVN
+fi &&
+
optional_depends jpeg yes-jpeg no-jpeg "jpeg support" &&
optional_depends tiff yes-tiff no-tiff "tiff support" &&
optional_depends zlib yes-zlib no-zlib "compression support" &&
diff --git a/graphics/netpbm/DETAILS b/graphics/netpbm/DETAILS
index 3e25f67..aa5021d 100755
--- a/graphics/netpbm/DETAILS
+++ b/graphics/netpbm/DETAILS
@@ -1,14 +1,22 @@
SPELL=netpbm
+if [[ $NETPBM_SVN == y ]]; then
VERSION=$NETPBM_RELEASE
- SOURCE_IGNORE=volatile
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

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" &&

-if [ "$NETPBM_RELEASE" = "stable" ] || [ "$NETPBM" = "superstable" ]; then
- patch -p1 < $SCRIPT_DIRECTORY/netpbm-10.42.0-gcc43.patch
-fi &&
+if [[ $NETPBM_RELEASE == stable ]] || [[ $NETPBM_RELEASE == superstable ]];
then
+ patch -p1 < "$SPELL_DIRECTORY/netpbm-10.42.0-gcc43.patch"
+fi &&

-sedit 's:/usr/man/web:/usr/share/man/web:' buildtools/installnetpbm.pl
+# don't install empty dir
+sed -i "s:\$(PKGDIR)/link::g" lib/Makefile &&
+
+# fixing paths
+sed -i "s:misc:share/netpbm:;s:/man/:/share/man/:g" Makefile.common



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (05a03c6acf1da8c9c64c8ecf6d1e6eede05a6d74), Vlad Glagolev, 01/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page