Date: Sat, 12 Oct 2002 04:16:58 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/43969: Update port: graphics/netpbm to 10.10 Message-ID: <200210121116.g9CBGwQP017773@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 43969
>Category: ports
>Synopsis: Update port: graphics/netpbm to 10.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 12 04:20:06 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 10.10
New file:
file/patch-analyzer::Makefile
Remove file:
file/patch-converter::other::pnmtopalm::Makefile
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
--- /usr/ports/graphics/netpbm/Makefile Mon Oct 7 20:20:23 2002
+++ graphics/netpbm/Makefile Sat Oct 12 00:00:00 2002
@@ -6,7 +6,7 @@
#
PORTNAME= netpbm
-PORTVERSION= 10.9
+PORTVERSION= 10.10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,7 +24,7 @@
USE_GMAKE= yes
MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}"
MAKEFILE= GNUmakefile
-INSTALL_TARGET= install.bin install.lib install-dev
+INSTALL_TARGET= install.bin install.lib install.data install-dev
INSTALLS_SHLIB= yes
post-patch:
@@ -35,10 +35,5 @@
@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
-
-post-install:
- @${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/lib/rgb.txt ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/converter/other/pnmtopalm/*.map ${DATADIR}
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/netpbm/distinfo graphics/netpbm/distinfo
--- /usr/ports/graphics/netpbm/distinfo Mon Oct 7 20:20:23 2002
+++ graphics/netpbm/distinfo Sat Oct 12 00:00:00 2002
@@ -1 +1 @@
-MD5 (netpbm-10.9.tgz) = b6fe7198e2f3c2cbecabab9b39554617
+MD5 (netpbm-10.10.tgz) = 50c01683e45887d9e55c0a17927501df
diff -urN /usr/ports/graphics/netpbm/files/patch-Makefile.common graphics/netpbm/files/patch-Makefile.common
--- /usr/ports/graphics/netpbm/files/patch-Makefile.common Mon Oct 7 20:20:23 2002
+++ graphics/netpbm/files/patch-Makefile.common Sat Oct 12 00:00:00 2002
@@ -1,6 +1,6 @@
---- Makefile.common.orig Tue Sep 3 10:56:40 2002
-+++ Makefile.common Sat Oct 5 00:00:00 2002
-@@ -235,19 +235,19 @@
+--- Makefile.common.orig Wed Oct 9 11:17:24 2002
++++ Makefile.common Sat Oct 12 00:00:00 2002
+@@ -231,19 +231,19 @@
INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
.PHONY: $(INSTALLBIN_TARGETS)
$(INSTALLBIN_TARGETS): $(PKGDIR)/bin
@@ -14,7 +14,7 @@
$(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
.PHONY: install.data
- install.data: $(DATAFILES:%=%_installdata)
+ install.data: $(DATAFILES:%=%_installdata) $(SUBDIRS:%=%/install.data)
.PHONY: $(DATAFILES:%=%_installdata)
-$(DATAFILES:%=%_installdata): $(PKGDIR)/misc
diff -urN /usr/ports/graphics/netpbm/files/patch-analyzer::Makefile graphics/netpbm/files/patch-analyzer::Makefile
--- /usr/ports/graphics/netpbm/files/patch-analyzer::Makefile Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-analyzer::Makefile Sat Oct 12 00:00:00 2002
@@ -0,0 +1,11 @@
+--- analyzer/Makefile.orig Sat Sep 28 02:02:50 2002
++++ analyzer/Makefile Sat Oct 12 00:00:00 2002
+@@ -31,7 +31,7 @@
+ .PHONY: all
+ all: $(BINARIES)
+
+-HEADERLINKS = pm_config.h pm.h pbm.h pgm.h ppm.h pnm.h pam.h shhopt.h
++HEADERLINKS = pm_config.h pm.h pbm.h pgm.h ppm.h ppmcmap.h pnm.h pam.h shhopt.h nstring.h
+
+ include $(SRCDIR)/Makefile.common
+
diff -urN /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile
--- /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile Mon Oct 7 20:20:23 2002
+++ graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- converter/other/pnmtopalm/Makefile.orig Thu Sep 19 12:30:39 2002
-+++ converter/other/pnmtopalm/Makefile Sat Oct 5 00:00:00 2002
-@@ -11,7 +11,7 @@
- OBJECTS = $(BINARIES:%=%.o) palmcolormap.o
- MERGE_OBJECTS = $(BINARIES:%=%.o2) palmcolormap.o
- MERGEBINARIES = $(BINARIES)
--DATAFILE = palmcolor8.map palmgray1.map palmgray2.map palmgray4.map
-+DATAFILES = palmcolor8.map palmgray1.map palmgray2.map palmgray4.map
-
- all: $(BINARIES)
-
diff -urN /usr/ports/graphics/netpbm/files/patch-lib::Makefile graphics/netpbm/files/patch-lib::Makefile
--- /usr/ports/graphics/netpbm/files/patch-lib::Makefile Mon Oct 7 20:20:23 2002
+++ graphics/netpbm/files/patch-lib::Makefile Sat Oct 12 00:00:00 2002
@@ -1,6 +1,6 @@
---- lib/Makefile.orig Thu Sep 19 12:58:41 2002
-+++ lib/Makefile Sat Oct 5 00:00:00 2002
-@@ -32,14 +32,16 @@
+--- 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
@@ -15,10 +15,7 @@
+ 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
--DATAFILE = rgb.txt
-+DATAFILES = rgb.txt
-
- HEADERLINKS = pm_config.h version.h compile.h shhopt.h
+ DATAFILES = rgb.txt
@@ -69,12 +71,15 @@
@@ -37,8 +34,8 @@
ifeq ($(NETPBMLIBTYPE),irixshared)
# The libxxx.so link is needed to link the executables.
-@@ -98,12 +103,9 @@
- # The $(SONAME) link is only needed to test the programs without
+@@ -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)
@@ -46,13 +43,11 @@
- $(SYMLINK) $< $@
-libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
-- -lc $(LADD)
+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
-+ $(LADD)
+ $(SHLIB_CLIB) $(LADD)
endif
- ifeq ($(NETPBMLIBTYPE),dll)
@@ -180,13 +182,10 @@
.PHONY: install.lib
ifeq ($(NETPBMLIBTYPE),unixshared)
@@ -67,7 +62,7 @@
+install.lib: $(PKGDIR)/lib
+ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).*
+ ${BSD_INSTALL_DATA} \
-+ $(SONAME) $(PKGDIR)/lib/
++ $(SONAME) $(PKGDIR)/lib/
endif
ifeq ($(NETPBMLIBTYPE),dll)
#install a Windows DLL shared library
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210121116.g9CBGwQP017773>