Attachment #25587 for bug #43700

View | Details | Raw Unified | Return to bug 43700
Collapse All | Expand All

Lines 6-12 Link Here

(-)graphics/netpbm/Makefile (-2 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= netpbm	8	PORTNAME= netpbm
9	PORTVERSION= 10.8	9	PORTVERSION= 10.9
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 28-37 Link Here
28	INSTALLS_SHLIB= yes	28	INSTALLS_SHLIB= yes
29		29
30	post-patch:	30	post-patch:
31	@${REINPLACE_CMD} -e 's\|%%X11BASE%%\|${X11BASE}\|g' ${WRKSRC}/pm_config.h	31	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g ; \
		32	s\|%%LOCALBASE%%\|${LOCALBASE}\|g ; \
		33	s\|%%X11BASE%%\|${X11BASE}\|g' ${WRKSRC}/pm_config.h
32	@${REINPLACE_CMD} -e 's\|<shhopt.h>\|<pm_shhopt.h>\|g' ${WRKSRC}/lib/pm.h	34	@${REINPLACE_CMD} -e 's\|<shhopt.h>\|<pm_shhopt.h>\|g' ${WRKSRC}/lib/pm.h
33	@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config	35	@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
34	@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h	36	@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
35	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h	37	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
		38
		39	post-install:
		40	@${MKDIR} ${DATADIR}
		41	${INSTALL_DATA} ${WRKSRC}/lib/rgb.txt ${DATADIR}
		42	${INSTALL_DATA} ${WRKSRC}/converter/other/pnmtopalm/*.map ${DATADIR}
36		43
37	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Line 1 Link Here

(-)graphics/netpbm/distinfo (-1 / +1 lines)
1	MD5 (netpbm-10.8.tgz) = bd550c71b76bcb18992ab722962756e2	1	MD5 (netpbm-10.9.tgz) = b6fe7198e2f3c2cbecabab9b39554617




--- Makefile.common.orig	Tue Sep  3 10:56:40 2002
+++ Makefile.common	Sat Oct  5 00:00:00 2002
@@ -235,19 +235,19 @@
 INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
 .PHONY: $(INSTALLBIN_TARGETS)
 $(INSTALLBIN_TARGETS): $(PKGDIR)/bin

+	${BSD_INSTALL_SCRIPT} \
 	  $(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
 
 .PHONY: install.data
 install.data: $(DATAFILES:%=%_installdata) 
 
 .PHONY: $(DATAFILES:%=%_installdata) 
-$(DATAFILES:%=%_installdata): $(PKGDIR)/misc
-	$(INSTALL) -c -m $(INSTALL_PERM_DATA) \
+$(DATAFILES:%=%_installdata): $(PKGDIR)/share/netpbm
+	${BSD_INSTALL_DATA} \
 	  $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $<
 
 




--- 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)
 .PHONY: install.bin.local
-install.bin.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
+install.bin.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
 
 install.merge: install.merge.local
 .PHONY: install.merge.local
-install.merge.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
+install.merge.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
 
 %_installdata:
-	$(INSTALL) -c -m $(INSTALL_PERM_DATA) \
-	  $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $(PKGDIR)/misc;
+	${BSD_INSTALL_DATA} \
+	  $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $(PKGDIR)/share/netpbm;
 
 
 clean: cleanspecial

Lines 1-6 Link Here

(-)graphics/netpbm/files/patch-lib::Makefile (-11 / +12 lines)
1	--- lib/Makefile.orig Wed Jun 12 13:00:32 2002	1	--- lib/Makefile.orig Thu Sep 19 12:58:41 2002
2	+++ lib/Makefile Tue Jun 18 00:00:00 2002	2	+++ lib/Makefile Sat Oct 5 00:00:00 2002
3	@@ -31,12 +31,14 @@	3	@@ -32,14 +32,16 @@
4	# Library objects to be linked but not built by Makefile.common:	4	# Library objects to be linked but not built by Makefile.common:
5	LIBOBJECTS_X = util/shhopt.o util/nstring.o	5	LIBOBJECTS_X = util/shhopt.o util/nstring.o
6		6
Lines 15-23 Link Here
15	+ pgm.h ppm.h ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h colorname.h \	15	+ pgm.h ppm.h ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h colorname.h \
16	+ pnm.h pam.h pammap.h util/pm_shhopt.h util/pm_nstring.h	16	+ pnm.h pam.h pammap.h util/pm_shhopt.h util/pm_nstring.h
17		17
		18	-DATAFILE = rgb.txt
		19	+DATAFILES = rgb.txt
		20
18	HEADERLINKS = pm_config.h version.h compile.h shhopt.h	21	HEADERLINKS = pm_config.h version.h compile.h shhopt.h
19		22
20	@@ -57,6 +59,9 @@	23	@@ -69,12 +71,15 @@
21		24
22	$(LIBOBJECTS): %.o: %.c $(HEADERLINKS)	25	$(LIBOBJECTS): %.o: %.c $(HEADERLINKS)
23	# Note that the user may have configured -I options into CFLAGS.	26	# Note that the user may have configured -I options into CFLAGS.
Lines 26-33 Link Here
26	+$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS)	29	+$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS)
27	$(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $<	30	$(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $<
28		31
29	SUBDIRS = util
30	@@ -67,7 +72,7 @@
31	MAJ = $(NETPBM_MAJOR_RELEASE)	32	MAJ = $(NETPBM_MAJOR_RELEASE)
32	MIN = $(NETPBM_MINOR_RELEASE)	33	MIN = $(NETPBM_MINOR_RELEASE)
33		34
Lines 36-42 Link Here
36		37
37	ifeq ($(NETPBMLIBTYPE),irixshared)	38	ifeq ($(NETPBMLIBTYPE),irixshared)
38	# The libxxx.so link is needed to link the executables.	39	# The libxxx.so link is needed to link the executables.
39	@@ -97,12 +102,9 @@	40	@@ -98,12 +103,9 @@
40	# The $(SONAME) link is only needed to test the programs without	41	# The $(SONAME) link is only needed to test the programs without
41	# installing the libraries (in that case, you also need to direct the	42	# installing the libraries (in that case, you also need to direct the
42	# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).	43	# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
Lines 45-58 Link Here
45	- $(SYMLINK) $< $@	46	- $(SYMLINK) $< $@
46	-libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)	47	-libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
47	- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \	48	- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
48	- -lc $(CADD)	49	- -lc $(LADD)
49	+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)	50	+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
50	+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \	51	+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
51	+ $(CADD)	52	+ $(LADD)
52	endif	53	endif
53		54
54	ifeq ($(NETPBMLIBTYPE),dll)	55	ifeq ($(NETPBMLIBTYPE),dll)
55	@@ -181,13 +183,10 @@	56	@@ -180,13 +182,10 @@
56	.PHONY: install.lib	57	.PHONY: install.lib
57	ifeq ($(NETPBMLIBTYPE),unixshared)	58	ifeq ($(NETPBMLIBTYPE),unixshared)
58	# install a Unix-style shared library	59	# install a Unix-style shared library
Lines 70-76 Link Here
70	endif	71	endif
71	ifeq ($(NETPBMLIBTYPE),dll)	72	ifeq ($(NETPBMLIBTYPE),dll)
72	#install a Windows DLL shared library	73	#install a Windows DLL shared library
73	@@ -217,23 +216,23 @@	74	@@ -216,23 +215,23 @@
74	# directory when you compile your programs.	75	# directory when you compile your programs.
75		76
76	%_installhdr: $(PKGDIR)/include	77	%_installhdr: $(PKGDIR)/include

Lines 1-5 Link Here

(-)graphics/netpbm/files/patch-pm_config.h (-4 / +4 lines)
1	--- pm_config.h.orig Sat Jun 15 05:36:45 2002	1	--- pm_config.h.orig Sat Aug 10 01:19:45 2002
2	+++ pm_config.h Tue Jun 18 00:00:00 2002	2	+++ pm_config.h Sat Oct 5 00:00:00 2002
3	@@ -35,6 +35,10 @@	3	@@ -35,6 +35,10 @@
4	typedef unsigned int uint32n;	4	typedef unsigned int uint32n;
5	typedef signed int int32n;	5	typedef signed int int32n;
Lines 27-34 Link Here
27	-#define RGB_DB1 "/usr/lib/X11/rgb.txt"	27	-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
28	-#define RGB_DB2 "/usr/openwin/lib/rgb.txt"	28	-#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
29	-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"	29	-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
30	+#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt"	30	+#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt"
31	+#define RGB_DB2 "%%X11BASE%%/lib/X11/rgb.txt"	31	+#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt"
32	+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt"	32	+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt"
33	#endif	33	#endif
34		34




bin/pgmtofs
bin/pgmtolispm
bin/pgmtopbm
bin/pgmtopgm
bin/pgmtoppm
bin/pi1toppm
bin/pi3topbm

bin/ppmquantall
bin/ppmrainbow
bin/ppmrelief
bin/ppmrough
bin/ppmshadow
bin/ppmshift
bin/ppmspread

bin/ppmtopict
bin/ppmtopj
bin/ppmtopjxl
bin/ppmtoppm
bin/ppmtopuzz
bin/ppmtorgb3
bin/ppmtosixel
bin/ppmtoterm
bin/ppmtouil
bin/ppmtowinicon
bin/ppmtoxpm

share/netpbm/palmgray1.map
share/netpbm/palmgray2.map
share/netpbm/palmgray4.map
share/netpbm/rgb.txt
@dirrm share/netpbm

Return to bug 43700

Lines 1-6 Link Here

(-)graphics/netpbm/files/patch-Makefile.common (-4 / +14 lines)
1	--- Makefile.common.orig Fri Jun 14 11:55:58 2002	1	--- Makefile.common.orig Tue Sep 3 10:56:40 2002
2	+++ Makefile.common Tue Jun 18 00:00:00 2002	2	+++ Makefile.common Sat Oct 5 00:00:00 2002
3	@@ -209,11 +209,11 @@	3	@@ -235,19 +235,19 @@
4	INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin	4	INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
5	.PHONY: $(INSTALLBIN_TARGETS)	5	.PHONY: $(INSTALLBIN_TARGETS)
6	$(INSTALLBIN_TARGETS): $(PKGDIR)/bin	6	$(INSTALLBIN_TARGETS): $(PKGDIR)/bin
Lines 13-16 Link Here
13	+ ${BSD_INSTALL_SCRIPT} \	13	+ ${BSD_INSTALL_SCRIPT} \
14	$(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<	14	$(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
15		15
16	.PHONY: install.man install.man1 install.man3 install.man5	16	.PHONY: install.data
		17	install.data: $(DATAFILES:%=%_installdata)
		18
		19	.PHONY: $(DATAFILES:%=%_installdata)
		20	-$(DATAFILES:%=%_installdata): $(PKGDIR)/misc
		21	- $(INSTALL) -c -m $(INSTALL_PERM_DATA) \
		22	+$(DATAFILES:%=%_installdata): $(PKGDIR)/share/netpbm
		23	+ ${BSD_INSTALL_DATA} \
		24	$(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $<
		25
		26

Lines 1-22 Link Here

(-)graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile (-20 / +9 lines)
1	--- converter/other/pnmtopalm/Makefile.orig Mon Jun 10 13:40:28 2002	1	--- converter/other/pnmtopalm/Makefile.orig Thu Sep 19 12:30:39 2002
2	+++ converter/other/pnmtopalm/Makefile Tue Jun 18 00:00:00 2002	2	+++ converter/other/pnmtopalm/Makefile Sat Oct 5 00:00:00 2002
3	@@ -35,15 +35,15 @@	3	@@ -11,7 +11,7 @@
		4	OBJECTS = $(BINARIES:%=%.o) palmcolormap.o
		5	MERGE_OBJECTS = $(BINARIES:%=%.o2) palmcolormap.o
		6	MERGEBINARIES = $(BINARIES)
		7	-DATAFILE = palmcolor8.map palmgray1.map palmgray2.map palmgray4.map
		8	+DATAFILES = palmcolor8.map palmgray1.map palmgray2.map palmgray4.map
4		9
5	install.bin: install.bin.local	10	all: $(BINARIES)
6	.PHONY: install.bin.local
7	-install.bin.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
8	+install.bin.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
9		11
10	install.merge: install.merge.local
11	.PHONY: install.merge.local
12	-install.merge.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
13	+install.merge.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
14
15	%_installdata:
16	- $(INSTALL) -c -m $(INSTALL_PERM_DATA) \
17	- $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $(PKGDIR)/misc;
18	+ ${BSD_INSTALL_DATA} \
19	+ $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $(PKGDIR)/share/netpbm;
20
21
22	clean: cleanspecial

Lines 111-116 Link Here

(-)graphics/netpbm/pkg-plist (+5 lines)
111	bin/pgmtofs	111	bin/pgmtofs
112	bin/pgmtolispm	112	bin/pgmtolispm
113	bin/pgmtopbm	113	bin/pgmtopbm
		114	bin/pgmtopgm
114	bin/pgmtoppm	115	bin/pgmtoppm
115	bin/pi1toppm	116	bin/pi1toppm
116	bin/pi3topbm	117	bin/pi3topbm
Lines 194-199 Link Here
194	bin/ppmquantall	195	bin/ppmquantall
195	bin/ppmrainbow	196	bin/ppmrainbow
196	bin/ppmrelief	197	bin/ppmrelief
		198	bin/ppmrough
197	bin/ppmshadow	199	bin/ppmshadow
198	bin/ppmshift	200	bin/ppmshift
199	bin/ppmspread	201	bin/ppmspread
Lines 216-224 Link Here
216	bin/ppmtopict	218	bin/ppmtopict
217	bin/ppmtopj	219	bin/ppmtopj
218	bin/ppmtopjxl	220	bin/ppmtopjxl
		221	bin/ppmtoppm
219	bin/ppmtopuzz	222	bin/ppmtopuzz
220	bin/ppmtorgb3	223	bin/ppmtorgb3
221	bin/ppmtosixel	224	bin/ppmtosixel
		225	bin/ppmtoterm
222	bin/ppmtouil	226	bin/ppmtouil
223	bin/ppmtowinicon	227	bin/ppmtowinicon
224	bin/ppmtoxpm	228	bin/ppmtoxpm
Lines 277-280 Link Here
277	share/netpbm/palmgray1.map	281	share/netpbm/palmgray1.map
278	share/netpbm/palmgray2.map	282	share/netpbm/palmgray2.map
279	share/netpbm/palmgray4.map	283	share/netpbm/palmgray4.map
		284	share/netpbm/rgb.txt
280	@dirrm share/netpbm	285	@dirrm share/netpbm