commit edc0afaa50fd63722d88fb18c0dd8d662abc5c0e Author: Antti Nykanen <aon@iki.fi> Date: Tue Apr 3 18:17:06 2007 +0300 netpbm: took over maintainership, updated to 10.35.25 diff --git a/netpbm/.footprint b/netpbm/.footprint index 97675a0..9ba4b2a 100644 --- a/netpbm/.footprint +++ b/netpbm/.footprint @@ -79,6 +79,7 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm -rwxr-xr-x root/root usr/bin/pamstretch-gen -rwxr-xr-x root/root usr/bin/pamsumm -rwxr-xr-x root/root usr/bin/pamsummcol +-rwxr-xr-x root/root usr/bin/pamthreshold -rwxr-xr-x root/root usr/bin/pamtilt -rwxr-xr-x root/root usr/bin/pamtodjvurle -rwxr-xr-x root/root usr/bin/pamtofits @@ -91,6 +92,8 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm -rwxr-xr-x root/root usr/bin/pamtotga -rwxr-xr-x root/root usr/bin/pamtotiff -rwxr-xr-x root/root usr/bin/pamtouil +-rwxr-xr-x root/root usr/bin/pamtoxvmini +-rwxr-xr-x root/root usr/bin/pamx -rwxr-xr-x root/root usr/bin/pbmclean -rwxr-xr-x root/root usr/bin/pbmlife -rwxr-xr-x root/root usr/bin/pbmmake @@ -144,6 +147,7 @@ lrwxrwxrwx root/root usr/bin/gemtopbm -> gemtopnm -rwxr-xr-x root/root usr/bin/pgmabel -rwxr-xr-x root/root usr/bin/pgmbentley -rwxr-xr-x root/root usr/bin/pgmcrater +-rwxr-xr-x root/root usr/bin/pgmdeshadow lrwxrwxrwx root/root usr/bin/pgmedge -> pamedge -rwxr-xr-x root/root usr/bin/pgmenhance -rwxr-xr-x root/root usr/bin/pgmhist @@ -303,6 +307,7 @@ lrwxrwxrwx root/root usr/bin/ppmtouil -> pamtouil -rwxr-xr-x root/root usr/bin/spctoppm -rwxr-xr-x root/root usr/bin/spottopgm -rwxr-xr-x root/root usr/bin/sputoppm +-rwxr-xr-x root/root usr/bin/svgtopam -rwxr-xr-x root/root usr/bin/tgatoppm -rwxr-xr-x root/root usr/bin/thinkjettopbm -rwxr-xr-x root/root usr/bin/tifftopnm @@ -337,8 +342,8 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/ppmfloyd.h -rw-r--r-- root/root usr/include/shhopt.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libnetpbm.so.10 -> libnetpbm.so.10.33 --rwxr-xr-x root/root usr/lib/libnetpbm.so.10.33 +lrwxrwxrwx root/root usr/lib/libnetpbm.so.10 -> libnetpbm.so.10.35 +-rwxr-xr-x root/root usr/lib/libnetpbm.so.10.35 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/411toppm.1.gz @@ -418,6 +423,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/pamstretch.1.gz -rw-r--r-- root/root usr/man/man1/pamsumm.1.gz -rw-r--r-- root/root usr/man/man1/pamsummcol.1.gz +-rw-r--r-- root/root usr/man/man1/pamthreshold.1.gz -rw-r--r-- root/root usr/man/man1/pamtilt.1.gz -rw-r--r-- root/root usr/man/man1/pamtodjvurle.1.gz -rw-r--r-- root/root usr/man/man1/pamtofits.1.gz @@ -430,6 +436,8 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/pamtotga.1.gz -rw-r--r-- root/root usr/man/man1/pamtotiff.1.gz -rw-r--r-- root/root usr/man/man1/pamtouil.1.gz +-rw-r--r-- root/root usr/man/man1/pamtoxvmini.1.gz +-rw-r--r-- root/root usr/man/man1/pamx.1.gz -rw-r--r-- root/root usr/man/man1/pbmclean.1.gz -rw-r--r-- root/root usr/man/man1/pbmlife.1.gz -rw-r--r-- root/root usr/man/man1/pbmmake.1.gz @@ -483,6 +491,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/pgmabel.1.gz -rw-r--r-- root/root usr/man/man1/pgmbentley.1.gz -rw-r--r-- root/root usr/man/man1/pgmcrater.1.gz +-rw-r--r-- root/root usr/man/man1/pgmdeshadow.1.gz -rw-r--r-- root/root usr/man/man1/pgmenhance.1.gz -rw-r--r-- root/root usr/man/man1/pgmhist.1.gz -rw-r--r-- root/root usr/man/man1/pgmkernel.1.gz @@ -625,6 +634,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/spctoppm.1.gz -rw-r--r-- root/root usr/man/man1/spottopgm.1.gz -rw-r--r-- root/root usr/man/man1/sputoppm.1.gz +-rw-r--r-- root/root usr/man/man1/svgtopam.1.gz -rw-r--r-- root/root usr/man/man1/tgatoppm.1.gz -rw-r--r-- root/root usr/man/man1/thinkjettopbm.1.gz -rw-r--r-- root/root usr/man/man1/tifftopnm.1.gz diff --git a/netpbm/.md5sum b/netpbm/.md5sum index 1bc72d9..bbb4fb4 100644 --- a/netpbm/.md5sum +++ b/netpbm/.md5sum @@ -1,2 +1,2 @@ -46bcf59817df08cb94b0c286769d6a0e Makefile.config -b7292055fd825d5c132540a5fbdbe342 netpbm-10.33.tgz +5aa32e99a1e58adbbd28928d1086183e Makefile.config +da5d2df9f775a3a34d48fc4013f4bc13 netpbm-10.35.25.tar.gz diff --git a/netpbm/Makefile.config b/netpbm/Makefile.config index cad027f..775eead 100644 --- a/netpbm/Makefile.config +++ b/netpbm/Makefile.config @@ -69,11 +69,18 @@ LINKER_CAN_DO_EXPLICIT_LIBRARY=N # 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> # Solaris: -#INTTYPES_H = <sys/inttypes.h> +# Solaris has <sys/inttypes.h>, but it doesn't define int_fast2_t, etc. +#INTTYPES_H = "inttypes_netpbm.h" # Others: #INTTYPES_H = <sys/stdint.h> #INTTYPES_H = <sys/types.h> @@ -93,6 +100,7 @@ HAVE_INT64 = Y # 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 @@ AR = ar 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 # Solaris: # LEX = flex -e -# Or just skip parts that need Lex: +# Windows Mingw: # LEX = +# +# LEX = lex # C compiler options @@ -140,8 +155,9 @@ LEX = flex # -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 # -Wmissing-prototypes. @@ -185,6 +201,15 @@ EXE = # 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 @@ EXE = #LDFLAGS += -Wl,+b,/usr/pubsw/lib #IRIX: #LDFLAGS += -n32 -#FreeBSD, OpenBSD: -# (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 @@ RPATHOPTNAME = -rpath # 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 @@ RPATHOPTNAME = -rpath # 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 @@ JPEGHDR_DIR = # 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. -# option. +# 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 PNGHDR_DIR = PNGVER = @@ -408,6 +433,8 @@ PNGVER = # 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 ZHDR_DIR = @@ -432,13 +459,22 @@ JASPERDEPLIBS = 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 +X11HDR_DIR = + +#X11LIB = /usr/lib/libX11.so +#X11HDR_DIR = + # The Linux SVGA library (Svgalib) is a facility for displaying graphics # on the Linux console. It is required by Ppmsvgalib. LINUXSVGALIB = NONE LINUXSVGAHDR_DIR = -#LINUXSVGALIB_DIR = +#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 = #VMS: #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 +# system. +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 # programs. @@ -474,6 +515,10 @@ VMS = # override it by setting 'pkgdir' on the Make command line. PKGDIR_DEFAULT = /tmp/netpbm +# Subdirectory of the package directory ($(pkgdir)) in which man pages +# go. +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 @@ STATICLIBSUFFIX = a #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,6 +629,7 @@ NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ + ####Lines above were copied from Makefile.config.in by 'configure'. ####Lines below were added by 'configure' based on the GNU platform. DEFAULT_TARGET = nonmerge @@ -599,4 +645,5 @@ TIFFLIB = libtiff.so JPEGLIB = libjpeg.so PNGLIB = libpng.so ZLIB = libz.so +X11LIB = /usr/lib/libX11.so NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ diff --git a/netpbm/Pkgfile b/netpbm/Pkgfile index 560050b..c930d86 100644 --- a/netpbm/Pkgfile +++ b/netpbm/Pkgfile @@ -1,19 +1,20 @@ -# Maintainer: Jay Dolan, jdolan at jdolan dot dyndns dot org +# Maintainer: Antti Nykanen, aon at iki dot fi # Description: A toolkit for manipulation of graphic images # URL: http://netpbm.sf.net -# Depends on: libjpeg, libpng, libtiff, ghostscript +# Depends on: ghostscript name=netpbm -version=10.33 +version=10.35.25 release=1 -source=(http://dl.sf.net/$name/$name-$version.tgz Makefile.config) +source=(http://ptoplus.net/~anttinyk/files/$name-$version.tar.gz + Makefile.config) build() { cd $name-$version - sed -e "s|#CFLAGS#|$CFLAGS|" ../Makefile.config > Makefile.config + sed -e "s|#CFLAGS#|$CFLAGS|" $SRC/Makefile.config > Makefile.config make && make pkgdir=$PKG/usr package mkdir $PKG/usr/share mv $PKG/usr/misc $PKG/usr/share/$name - rm -rf $PKG/usr/{README,VERSION,link,man/web} - rm -rf $PKG/usr/{config_template,pkginfo,bin/doc.url} + rm -r $PKG/usr/{README,VERSION,link,man/web} + rm -r $PKG/usr/{config_template,pkginfo,bin/doc.url} }