[arch-commits] CVS update of extra/office/netpbm (Makefile.config PKGBUILD)
kevin at archlinux.org
Wed May 16 02:39:43 UTC 2007
Date: Tuesday, May 15, 2007 @ 22:39:43
Modified: Makefile.config (1.1 -> 1.2) PKGBUILD (1.18 -> 1.19)
upgpkg: netpbm 10.35-298
Source now only available via SVN
Makefile.config | 84 ++++++++++++++++++++++++++++++++++++++++++------------
PKGBUILD | 26 +++++++++-------
2 files changed, 80 insertions(+), 30 deletions(-)
diff -u extra/office/netpbm/Makefile.config:1.1 extra/office/netpbm/Makefile.config:1.2
--- extra/office/netpbm/Makefile.config:1.1 Wed Apr 13 11:30:11 2005
+++ extra/office/netpbm/Makefile.config Tue May 15 22:39:43 2007
@@ -69,11 +69,18 @@
# This is the name of the header file that declares the types
# uint32_t, etc. This name is used as #include $(INTTYPES_H) .
# Set to null if the types come automatically without including anything.
+# We have a report (2005.09.17) that on IRIX 5.3 with the native IDO
+# cc, inttypes.h and sys/types.h conflict (and Netpbm programs include
+# sys/types for other things), so for that environment, <inttypes.h>
+# won't work, but "inttypes_netpbm.h" might.
INTTYPES_H = <inttypes.h>
# Linux libc5:
#INTTYPES_H = <types.h>
-#INTTYPES_H = <sys/inttypes.h>
+# Solaris has <sys/inttypes.h>, but it doesn't define int_fast2_t, etc.
+#INTTYPES_H = "inttypes_netpbm.h"
#INTTYPES_H = <sys/stdint.h>
#INTTYPES_H = <sys/types.h>
@@ -93,6 +100,7 @@
# to use to compile and link build tools.
CC_FOR_BUILD = $(CC)
LD_FOR_BUILD = $(LD)
+CFLAGS_FOR_BUILD = $(CFLAGS)
# MAKE is set automatically by Make to what was used to invoke Make.
@@ -128,11 +136,18 @@
RANLIB = ranlib
# IRIX, SCO don't have Ranlib:
#RANLIB = true
+# LEX is the beginning of a shell command that runs a Lex-like
+# pattern matcher generator. Null string means there isn't any such
+# command. That means the build will skip parts that need one.
LEX = flex
# LEX = flex -e
-# Or just skip parts that need Lex:
+# Windows Mingw:
# LEX =
+# LEX = lex
# C compiler options
@@ -140,8 +155,9 @@
# -ansi and -Werror should work too, but are not included
# by default because there's no point in daring the build to fail.
# -pedantic isn't a problem because it causes at worst a warning.
-#CFLAGS = -O3 -fast-math -pedantic \
-# -Wall -Wno-uninitialized -Wmissing-declarations
+#CFLAGS = -O3 -ffast-math -pedantic -fno-common \
+# -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit \
+# -Wwrite-string -Wmissing-prototypes -Wundef
# The merged programs have a main_XXX subroutine instead of main(),
# which would cause a warning with -Wmissing-declarations or
@@ -185,6 +201,15 @@
# LDFLAGS is often set as an environment variable; A setting here overrides
# it. So either make sure you want to override it, or do a "LDFLAGS +=" here.
+# LDFLAGS is usually not the right place for a -L option, because we put
+# LDFLAGS _before_ our own -L options, so it would cancel out our
+# specific selection of libraries. For example, if you say
+# LDFLAGS=/usr/local/lib and an old copy of the libnetpbm is in
+# /usr/local/lib, then you'd be linking against that old copy instead of
+# the copy you just built, which is located by a -L option later on the
+# link command. LIBS is the right variable for adding -L options. LIBS
+# goes after any of our make files' own -L options.
# Eunice users may want to use -noshare so that the executables can
# run standalone:
#LDFLAGS += -noshare
@@ -202,13 +227,6 @@
#LDFLAGS += -Wl,+b,/usr/pubsw/lib
#LDFLAGS += -n32
-# (04.03.15 This may be a mistake. LDFLAGS may already be set to this as
-# an environment variable. We used to override the environment variable
-# here with LDFLAGS =, which would mean we had to override with the same
-# value it already had. I suspect it will work fine with no LDFLAGS
-# setting at all; need to confirm this on real FreeBSD and OpenBSD systems)
-#LDFLAGS += -L/usr/local/lib
# Linker options for created Netpbm shared libraries.
@@ -310,7 +328,7 @@
# The following variables tell where your various libraries on which
# Netpbm depends live. The LIBxxx variable is a full file
# specification of the link library (not necessarily the library used
-# at run time). e.g. "/usr/local/lib/graphics/libpng.so". It usually
+# at run time). e.g. "/usr/local/lib/graphics/libjpeg.so". It usually
# doesn't matter if the library prefix and suffix are right -- you can
# use "lib" and ".so" or ".a" regardless of what your system actually
# uses because these just turn into "-L" and "-l" linker options
@@ -318,7 +336,7 @@
# If you don't have the library in question, use a value of NONE for
# LIBxxx and the build will simply skip the programs that require that
# library. If the library is in your linker's (or the Netpbm build's)
-# default search path, leave off the directory part, e.g. "libpng.so".
+# default search path, leave off the directory part, e.g. "libjpeg.so".
# The xxxHDR_DIR variable is the directory in which the interface
# headers for the library live (e.g. /usr/include). If they are in your
@@ -390,8 +408,15 @@
# The PNG library, by convention starting around April 2002, gets installed
# with names that include a version number, such as libpng10.a and header
-# files in /usr/include/libpng10.
+# files in /usr/include/libpng10. But there is conventionally an unnumbered
+# alias (e.g. libpng.a, /usr/include/libpng) for the preferred version.
+# Recent versions of the library (since some time in the 2002-2006 period)
+# have an associated 'libpng-config' that tells how to link it. The make
+# files will use that program if it exists (must be in the PATH). In that
+# case, PNGLIB and PNGHDR_DIR are irrelevant, but PNGVER is still meaningful,
+# because the make file runs 'libpng$(PNGVER)-config'.
PNGLIB = NONE
@@ -408,6 +433,8 @@
# anything that needs the PNG library (see above). If you selected
# NONE for the PNG library, it doesn't matter what you specify here --
# it won't get used.
+# If you have 'libpng-config' (see above), these are irrelevant.
ZLIB = NONE
@@ -432,13 +459,22 @@
URTLIB = $(BUILDDIR)/urt/librle.a
URTHDR_DIR = $(SRCDIR)/urt
+# The X11 library has facilities for talking to an X Window System
+# server. It is required by Pamx.
+X11LIB = NONE
+#X11LIB = /usr/lib/libX11.so
# The Linux SVGA library (Svgalib) is a facility for displaying graphics
# on the Linux console. It is required by Ppmsvgalib.
LINUXSVGALIB = NONE
+#LINUXSVGALIB = /usr/lib/libvga.so
#LINUXSVGAHDR_DIR = /usr/include/vgalib
# If you don't want any network functions, set OMIT_NETWORK to "y".
@@ -466,6 +502,11 @@
#VMS = yes
+# DONT_HAVE_PROCESS_MGMT is Y if this system doesn't have the usual
+# Unix process management stuff - fork, wait, etc. N for a regular Unix
+DONT_HAVE_PROCESS_MGMT = N
# The following variables are used only by 'make install' (and the
# variants of it). Paths here don't, for example, get built into any
@@ -474,6 +515,10 @@
# override it by setting 'pkgdir' on the Make command line.
PKGDIR_DEFAULT = /tmp/netpbm
+# Subdirectory of the package directory ($(pkgdir)) in which man pages
+PKGMANDIR = man
# File permissions for installed files.
# Note that on some systems (e.g. Solaris), 'install' can't use the
# mnemonic permissions - you have to use octal.
@@ -544,7 +589,7 @@
#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename
#of a shared library may have on this system. Traditionally, it's
-#just "lib", as in libc or libpbm. On Windows, though, varying
+#just "lib", as in libc or libnetpbm. On Windows, though, varying
#prefixes are used when multiple alternative forms of a library are
#available. The first prefix in this list is what we use to name the
#Netpbm shared libraries.
@@ -584,13 +629,14 @@
####Lines above were copied from Makefile.config.in by 'configure'.
####Lines below were added by 'configure' based on the GNU platform.
DEFAULT_TARGET = nonmerge
-CFLAGS = -O3 -march=i686 -pipe -ffast-math -pedantic -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes
+CFLAGS = -O3 -march=i686 -pipe -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef
CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes
LDRELOC = ld --reloc
@@ -599,4 +645,6 @@
JPEGLIB = libjpeg.so
PNGLIB = libpng.so
ZLIB = libz.so
+#X11LIB = libX11.so
+#LINUXSVGALIB = libvga.so
NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
diff -u extra/office/netpbm/PKGBUILD:1.18 extra/office/netpbm/PKGBUILD:1.19
--- extra/office/netpbm/PKGBUILD:1.18 Tue Apr 3 06:55:24 2007
+++ extra/office/netpbm/PKGBUILD Tue May 15 22:39:43 2007
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD,v 1.18 2007/04/03 10:55:24 andyrtr Exp $
+# $Id: PKGBUILD,v 1.19 2007/05/16 02:39:43 kevin Exp $
# Maintainer: Kevin Piche <kevin at archlinux.org>
# Contributor: Jochem Kossen <j.kossen at home.nl>
pkgdesc="A toolkit for manipulation of graphic images"
depends=('perl' 'libjpeg' 'libpng' 'libtiff' 'libxml2')
- Makefile.config arch.patch)
+# Releases after 10.34 are available via SVN only.
- export MAKEFLAGS="-j1"
- cd $startdir/src/$pkgname-$pkgver
+ /usr/bin/svn checkout --config-dir ./ -r $pkgrel $_svntrunk $_svnmod
+ cd $startdir/src/$pkgname
/usr/bin/patch -p1 < ../arch.patch
- /bin/mv ../Makefile.config .
+ /bin/cp ../Makefile.config .
if [ "$CARCH" == "x86_64" ]; then
sed -i "s/^\(CFLAGS =\) .*/\1 $CFLAGS/" Makefile.config
@@ -28,6 +29,7 @@
sed -i 's/\(.*\$(SYMLINK) \)\(pnmtopnm\)\(\$(EXE) \)\(pamtopnm\)/\1\4\3\2/' converter/other/Makefile
+ export MAKEFLAGS="-j1"
/usr/bin/make || return 1
/usr/bin/make package pkgdir=$startdir/pkg/usr
More information about the arch-commits