From beecf92d77c54ddfb29854933c3e41e24fa09c08 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Thu, 4 Dec 2003 19:41:29 +0000 Subject: - update to 10.19 --- graphics/netpbm/Makefile | 2 +- graphics/netpbm/distinfo | 2 +- .../netpbm/files/patch-converter-other-pnmtopng.c | 16 ++++ .../files/patch-converter::other::pnmtopng.c | 16 ---- graphics/netpbm/files/patch-lib-Makefile | 97 +++++++++++++++++++++ graphics/netpbm/files/patch-lib::Makefile | 99 ---------------------- graphics/netpbm/pkg-plist | 12 ++- 7 files changed, 124 insertions(+), 120 deletions(-) create mode 100644 graphics/netpbm/files/patch-converter-other-pnmtopng.c delete mode 100644 graphics/netpbm/files/patch-converter::other::pnmtopng.c create mode 100644 graphics/netpbm/files/patch-lib-Makefile delete mode 100644 graphics/netpbm/files/patch-lib::Makefile (limited to 'graphics/netpbm') diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index d32cff8161d0..62d6606a3c98 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -6,7 +6,7 @@ # PORTNAME= netpbm -PORTVERSION= 10.17 +PORTVERSION= 10.19 PORTREVISION?= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 1d4869eacd5f..ab2214d8701f 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1 +1 @@ -MD5 (netpbm-10.17.tgz) = 2d806c5a71eda87792a8e2754600deba +MD5 (netpbm-10.19.tgz) = e6bf74f0cef5271041e0ee4842c8fcef diff --git a/graphics/netpbm/files/patch-converter-other-pnmtopng.c b/graphics/netpbm/files/patch-converter-other-pnmtopng.c new file mode 100644 index 000000000000..9a5fbf3a7037 --- /dev/null +++ b/graphics/netpbm/files/patch-converter-other-pnmtopng.c @@ -0,0 +1,16 @@ +--- converter/other/pnmtopng.c.orig Sun Jun 23 12:51:37 2002 ++++ converter/other/pnmtopng.c Sat Jul 6 00:00:00 2002 +@@ -1903,8 +1903,13 @@ + */ + fprintf(stderr, " Compiled with libpng %s.\n", + PNG_LIBPNG_VER_STRING); ++#ifdef zlib_version + fprintf(stderr, " Compiled with zlib %s; using zlib %s.\n", + ZLIB_VERSION, zlib_version); ++#else ++ fprintf(stderr, " Compiled with zlib %s.\n", ++ ZLIB_VERSION); ++#endif + fprintf(stderr, + " Compiled with %d-bit netpbm support " + "(PPM_OVERALLMAXVAL = %d).\n", diff --git a/graphics/netpbm/files/patch-converter::other::pnmtopng.c b/graphics/netpbm/files/patch-converter::other::pnmtopng.c deleted file mode 100644 index 9a5fbf3a7037..000000000000 --- a/graphics/netpbm/files/patch-converter::other::pnmtopng.c +++ /dev/null @@ -1,16 +0,0 @@ ---- converter/other/pnmtopng.c.orig Sun Jun 23 12:51:37 2002 -+++ converter/other/pnmtopng.c Sat Jul 6 00:00:00 2002 -@@ -1903,8 +1903,13 @@ - */ - fprintf(stderr, " Compiled with libpng %s.\n", - PNG_LIBPNG_VER_STRING); -+#ifdef zlib_version - fprintf(stderr, " Compiled with zlib %s; using zlib %s.\n", - ZLIB_VERSION, zlib_version); -+#else -+ fprintf(stderr, " Compiled with zlib %s.\n", -+ ZLIB_VERSION); -+#endif - fprintf(stderr, - " Compiled with %d-bit netpbm support " - "(PPM_OVERALLMAXVAL = %d).\n", diff --git a/graphics/netpbm/files/patch-lib-Makefile b/graphics/netpbm/files/patch-lib-Makefile new file mode 100644 index 000000000000..2b480b273929 --- /dev/null +++ b/graphics/netpbm/files/patch-lib-Makefile @@ -0,0 +1,97 @@ +--- lib/Makefile.orig Thu Sep 25 18:23:47 2003 ++++ lib/Makefile Mon Dec 1 14:28:48 2003 +@@ -32,12 +32,14 @@ + # Library objects to be linked but not built by Makefile.common: + LIBOBJECTS_X = util/shhopt.o util/nstring.o + ++SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) ++ + MANUALS3 = libnetpbm + MANUALS5 = pbm pgm ppm pnm pam + + INTERFACE_HEADERS = pm.h pbm.h bitio.h pbmfont.h \ + pgm.h ppm.h ppm.h ppmcmap.h ppmfloyd.h colorname.h \ + pnm.h pam.h pammap.h util/shhopt.h util/nstring.h util/mallocvar.h + + DATAFILES = rgb.txt + +@@ -71,12 +71,15 @@ + + $(LIBOBJECTS): %.o: %.c $(HEADERLINKS) + # Note that the user may have configured -I options into CFLAGS. ++ $(CC) -c $(INCLUDES) $(CFLAGS) $(CADD) -o $@ $< ++ ++$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS) + $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $< + + MAJ = $(NETPBM_MAJOR_RELEASE) + MIN = $(NETPBM_MINOR_RELEASE) + +-SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) ++SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(SOVER) + + ifeq ($(NETPBMLIBTYPE),irixshared) + # The libxxx.so link is needed to link the executables. +@@ -101,11 +104,8 @@ + # The $(SONAME) link is needed only to test the programs without + # installing the libraries (in that case, you also need to direct the + # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH). +-$(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) +- rm -f $@ +- $(SYMLINK) $< $@ +-libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) +- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ ++$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) ++ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \ + $(SHLIB_CLIB) $(LADD) + endif + +@@ -183,13 +183,10 @@ + .PHONY: install.lib + ifeq ($(NETPBMLIBTYPE),unixshared) + # install a Unix-style shared library +-install.lib: $(PKGDIR)/lib $(PKGDIR)/link +- cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* +- $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ +- libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ +- cd $(PKGDIR)/lib/ ; \ +- rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ); \ +- $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME) ++install.lib: $(PKGDIR)/lib ++ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).* ++ ${BSD_INSTALL_DATA} \ ++ $(SONAME) $(PKGDIR)/lib/ + endif + ifeq ($(NETPBMLIBTYPE),dll) + #install a Windows DLL shared library +@@ -219,23 +216,23 @@ + # directory when you compile your programs. + + %_installhdr: $(PKGDIR)/include +- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \ ++ ${BSD_INSTALL_DATA} \ + $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/; + + .PHONY: install.staticlib +-install.staticlib: $(PKGDIR)/link +- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ +- $(PKGDIR)/link ++install.staticlib: $(PKGDIR)/lib ++ ${BSD_INSTALL_DATA} libnetpbm.$(STATICLIBSUFFIX) \ ++ $(PKGDIR)/lib + + # Install a shared library stub -- the ".so" file used at link time to + # prepare a program for dynamically linking a library at run time + .PHONY: install.sharedlibstub +-install.sharedlibstub: $(PKGDIR)/link ++install.sharedlibstub: $(PKGDIR)/lib + ifeq ($(NETPBMLIBTYPE),unixshared) + # install the link-time (.so) links to the runtime libraries +- cd $(PKGDIR)/link ; \ ++ cd $(PKGDIR)/lib ; \ + rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ +- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ ++ $(SYMLINK) $(SONAME) \ + libnetpbm.$(NETPBMLIBSUFFIX) + endif + ifeq ($(NETPBMLIBTYPE),dll) diff --git a/graphics/netpbm/files/patch-lib::Makefile b/graphics/netpbm/files/patch-lib::Makefile deleted file mode 100644 index 95d954d6ec69..000000000000 --- a/graphics/netpbm/files/patch-lib::Makefile +++ /dev/null @@ -1,99 +0,0 @@ ---- lib/Makefile.orig Wed Oct 9 11:21:57 2002 -+++ lib/Makefile Sat Oct 12 00:00:00 2002 -@@ -32,12 +32,14 @@ - # Library objects to be linked but not built by Makefile.common: - LIBOBJECTS_X = util/shhopt.o util/nstring.o - -+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) -+ - MANUALS3 = libnetpbm - MANUALS5 = pbm pgm ppm pnm pam - - INTERFACE_HEADERS = pm.h pbm.h bitio.h pbmfont.h \ -- pgm.h ppm.h ppm.h ppmcmap.h ppmfloyd.h colorname.h \ -- pnm.h pam.h pammap.h util/shhopt.h util/nstring.h -+ pgm.h ppm.h ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h colorname.h \ -+ pnm.h pam.h pammap.h util/pm_shhopt.h util/pm_nstring.h - - DATAFILES = rgb.txt - -@@ -69,12 +71,15 @@ - - $(LIBOBJECTS): %.o: %.c $(HEADERLINKS) - # Note that the user may have configured -I options into CFLAGS. -+ $(CC) -c $(INCLUDES) $(CFLAGS) $(CADD) -o $@ $< -+ -+$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS) - $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $< - - MAJ = $(NETPBM_MAJOR_RELEASE) - MIN = $(NETPBM_MINOR_RELEASE) - --SONAME = libnetpbm.so.$(MAJ) -+SONAME = libnetpbm.so.$(SOVER) - - ifeq ($(NETPBMLIBTYPE),irixshared) - # The libxxx.so link is needed to link the executables. -@@ -98,11 +103,8 @@ - # The $(SONAME) link is needed only to test the programs without - # installing the libraries (in that case, you also need to direct the - # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH). --$(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) -- rm -f $@ -- $(SYMLINK) $< $@ --libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) -- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ -+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) -+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \ - $(SHLIB_CLIB) $(LADD) - endif - -@@ -180,13 +182,10 @@ - .PHONY: install.lib - ifeq ($(NETPBMLIBTYPE),unixshared) - # install a Unix-style shared library --install.lib: $(PKGDIR)/lib $(PKGDIR)/link -- cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* -- $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ -- libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ -- cd $(PKGDIR)/lib/ ; \ -- rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ); \ -- $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME) -+install.lib: $(PKGDIR)/lib -+ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).* -+ ${BSD_INSTALL_DATA} \ -+ $(SONAME) $(PKGDIR)/lib/ - endif - ifeq ($(NETPBMLIBTYPE),dll) - #install a Windows DLL shared library -@@ -216,23 +215,23 @@ - # directory when you compile your programs. - - %_installhdr: $(PKGDIR)/include -- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \ -+ ${BSD_INSTALL_DATA} \ - $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/; - - .PHONY: install.staticlib --install.staticlib: $(PKGDIR)/link -- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ -- $(PKGDIR)/link -+install.staticlib: $(PKGDIR)/lib -+ ${BSD_INSTALL_DATA} libnetpbm.$(STATICLIBSUFFIX) \ -+ $(PKGDIR)/lib - - # Install a shared library stub -- the ".so" file used at link time to - # prepare a program for dynamically linking a library at run time - .PHONY: install.sharedlibstub --install.sharedlibstub: $(PKGDIR)/link -+install.sharedlibstub: $(PKGDIR)/lib - ifeq ($(NETPBMLIBTYPE),unixshared) - # install the link-time (.so) links to the runtime libraries -- cd $(PKGDIR)/link ; \ -+ cd $(PKGDIR)/lib ; \ - rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ -- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ -+ $(SYMLINK) $(SONAME) \ - libnetpbm.$(NETPBMLIBSUFFIX) - endif - ifeq ($(NETPBMLIBTYPE),dll) diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist index 41413aab3f36..4b70c739e9af 100644 --- a/graphics/netpbm/pkg-plist +++ b/graphics/netpbm/pkg-plist @@ -8,6 +8,8 @@ bin/bmptopnm bin/bmptoppm bin/brushtopbm bin/cmuwmtopbm +bin/ddbugtopbm +bin/escp2topbm bin/eyuvtoppm bin/fiascotopnm bin/fitstopnm @@ -31,6 +33,7 @@ bin/macptopbm bin/manweb bin/mdatopbm bin/mgrtopbm +bin/mrftopbm bin/mtvtoppm bin/neotoppm bin/palmtopnm @@ -74,6 +77,7 @@ bin/pbmtobbnbg bin/pbmtocmuwm bin/pbmtoepsi bin/pbmtoepson +bin/pbmtoescp2 bin/pbmtog3 bin/pbmtogem bin/pbmtogo @@ -82,8 +86,10 @@ bin/pbmtolj bin/pbmtoln03 bin/pbmtolps bin/pbmtomacp +bin/pbmtomatrixorbital bin/pbmtomda bin/pbmtomgr +bin/pbmtomrf bin/pbmtonokia bin/pbmtopgm bin/pbmtopi3 @@ -270,6 +276,9 @@ bin/yuvtoppm bin/zeisstopnm include/bitio.h include/colorname.h +include/mallocvar.h +include/nstring.h +include/shhopt.h include/pam.h include/pammap.h include/pbm.h @@ -277,12 +286,9 @@ include/pbmfont.h include/pgm.h include/pm.h include/pm_config.h -include/pm_nstring.h -include/pm_shhopt.h include/pnm.h include/ppm.h include/ppmcmap.h -include/ppmdraw.h include/ppmfloyd.h lib/libnetpbm.a lib/libnetpbm.so -- cgit v1.2.3