Attachment #20365 for bug #35960

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




#

PORTNAME=	netpbm
PORTVERSION=	9.25
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


MAINTAINER=	ports@FreeBSD.org

LIB_DEPENDS=	jbig.1:${PORTSDIR}/graphics/jbigkit \
		jpeg.9:${PORTSDIR}/graphics/jpeg \
		png.5:${PORTSDIR}/graphics/png \
		tiff.4:${PORTSDIR}/graphics/tiff

USE_GMAKE=	yes
MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"

Line 1 Link Here

(-)graphics/netpbm/distinfo (-1 / +1 lines)
1	MD5 (netpbm-9.24.tgz) = 4c73dbf91b8ee858f9e2fe688d7b0fff	1	MD5 (netpbm-9.25.tgz) = cb8036f3649c93cf51ee377971ddbf1c

Lines 1-6 Link Here

(-)graphics/netpbm/files/Makefile.config.FreeBSD (+4 lines)
1	DEFAULT_TARGET = merge	1	DEFAULT_TARGET = merge
2	BUILD_FIASCO = Y	2	BUILD_FIASCO = Y
3	LD = ${CC}	3	LD = ${CC}
		4	CC_FOR_BUILD = ${CC}
		5	LD_FOR_BUILD = ${CC}
4	SYMLINK = ${LN} -sf	6	SYMLINK = ${LN} -sf
5	MANCP = ${BSD_INSTALL_MAN}	7	MANCP = ${BSD_INSTALL_MAN}
6	LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)	8	LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
Lines 14-19 Link Here
14	PNGHDR_DIR = ${LOCALBASE}/include	16	PNGHDR_DIR = ${LOCALBASE}/include
15	ZLIB_DIR = /usr/lib	17	ZLIB_DIR = /usr/lib
16	ZHDR_DIR = /usr/include	18	ZHDR_DIR = /usr/include
		19	JBIGLIB_DIR = ${LOCALBASE}/lib
		20	JBIGHDR_DIR = ${LOCALBASE}/include
17	URTLIB_DIR = NONE	21	URTLIB_DIR = NONE
18	URTHDR_DIR = NONE	22	URTHDR_DIR = NONE
19	LINUXSVGALIB_DIR = NONE	23	LINUXSVGALIB_DIR = NONE




MAN1+=	asciitopgm.1
MAN1+=	atktopbm.1
MAN1+=	bioradtopgm.1
MAN1+=	bmptopnm.1
MAN1+=	brushtopbm.1
MAN1+=	cmuwmtopbm.1
MAN1+=	eyuvtoppm.1

MAN1+=	mdatopbm.1
MAN1+=	mgrtopbm.1
MAN1+=	mtvtoppm.1
MAN1+=	netpbm.1
MAN1+=	neotoppm.1
MAN1+=	netpbm.1
MAN1+=	palmtopnm.1
MAN1+=	pamchannel.1
MAN1+=	pamcut.1
MAN1+=	pamdeinterlace.1
MAN1+=	pamdice.1
MAN1+=	pamfile.1
MAN1+=	pamoil.1
MAN1+=	pamstretch-gen.1

MAN1+=	pbmtopi3.1
MAN1+=	pbmtopk.1
MAN1+=	pbmtoplot.1
MAN1+=	pbmtoppa.1
MAN1+=	pbmtopsg3.1
MAN1+=	pbmtoptx.1
MAN1+=	pbmtowbmp.1

MAN1+=	pgmhist.1
MAN1+=	pgmkernel.1
MAN1+=	pgmnoise.1
MAN1+=	pgmnorm.1
MAN1+=	pgmramp.1
MAN1+=	pgmslice.1
MAN1+=	pgmtexture.1

MAN1+=	pnmmargin.1
MAN1+=	pnmmontage.1
MAN1+=	pnmnlfilt.1
MAN1+=	pnmnorm.1
MAN1+=	pnmpad.1
MAN1+=	pnmpaste.1
MAN1+=	pnmpsnr.1

MAN1+=	pnmtofits.1
MAN1+=	pnmtojbig.1
MAN1+=	pnmtojpeg.1
MAN1+=	pnmtopalm.1
MAN1+=	pnmtoplainpnm.1
MAN1+=	pnmtopng.1
MAN1+=	pnmtops.1

MAN1+=	ppmlabel.1
MAN1+=	ppmmake.1
MAN1+=	ppmmix.1
MAN1+=	ppmnorm.1
MAN1+=	ppmntsc.1
MAN1+=	ppmpat.1
MAN1+=	ppmquant.1




--- pbm/Makefile.orig	Mon Feb 18 04:18:04 2002
+++ pbm/Makefile	Sat Mar 16 00:00:00 2002
@@ -52,6 +52,7 @@
 
 # Library objects to be built and linked by Makefile.common:
 LIBOBJECTS = libpm.o libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o bitio.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
 ifneq (${VMS}x,x)
 LIBOBJECTS += libpbmvms.o
 endif
@@ -71,7 +72,7 @@
 	$(MAKE) -C pbmtoppa all
 .PHONY: all
 all:	$(LIBPBM) $(BINARIES) $(EXTRA_STATICLIB)
-	$(MAKE) -C pbmtoppa all
 
 .PHONY: merge
-merge: $(MERGENAME)
-	$(MAKE) -C pbmtoppa all
+merge: $(MERGENAME) $(EXTRA_STATICLIB)
 	$(MAKE) -C pbmtoppa all
 
 .PHONY: install.bin
 install.bin: install.bin.common
-	$(MAKE) -C pbmtoppa install.bin
 
 .PHONY: install.merge
 install.merge: install.merge.common
-	$(MAKE) -C pbmtoppa install.bin
 
 .PHONY: install.lib
 install.lib: install.lib.common
 
 .PHONY: install.man
 install.man: install.man.common
-	$(MAKE) -C pbmtoppa install.man
 
 HEADERLINKS = pm_config.h version.h compile.h
 
@@ -110,6 +106,5 @@
 clean: clean.common
 	rm -f thinkjettopbm.c
 	rm -f compile.h
-	$(MAKE) -C pbmtoppa clean
 
 FORCE:




--- ppm/Makefile.orig	Wed Mar 13 11:09:21 2002
+++ ppm/Makefile	Sat Mar 16 00:00:00 2002
@@ -74,6 +74,7 @@
 
 LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
 	libppmfloyd.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
 
 MANUALS1 = $(BINARIES) $(SCRIPTS)
 MANUALS3 = libppm
@@ -81,14 +82,14 @@
 
 MERGENAME= ppmmerge
 
-INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h
+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
 
 .PHONY: all
 all: $(LIBPPM) $(BINARIES) $(EXTRA_STATICLIB)
@@ -92,7 +93,7 @@
 	$(MAKE) -C ppmtompeg all
 	$(MAKE) -C hpcdtoppm all
 .PHONY: merge




bin/asciitopgm
bin/atktopbm
bin/bioradtopgm
bin/bmptopnm
bin/brushtopbm
bin/cmuwmtopbm
bin/eyuvtoppm

bin/pamchannel
bin/pamcut
bin/pamdeinterlace
bin/pamdice
bin/pamfile
bin/pamoil
bin/pamstretch

bin/pbmtopi3
bin/pbmtopk
bin/pbmtoplot
bin/pbmtoppa
bin/pbmtopsg3
bin/pbmtoptx
bin/pbmtowbmp

bin/pgmkernel
bin/pgmmerge
bin/pgmnoise
bin/pgmnorm
bin/pgmramp
bin/pgmslice
bin/pgmtexture

bin/pnmmerge
bin/pnmmontage
bin/pnmnlfilt
bin/pnmnorm
bin/pnmpad
bin/pnmpaste
bin/pnmpsnr

bin/ppmmake
bin/ppmmerge
bin/ppmmix
bin/ppmnorm
bin/ppmntsc
bin/ppmpat
bin/ppmquant

bin/yuvsplittoppm
bin/yuvtoppm
bin/zeisstopnm
include/bitio.h
include/pam.h
include/pammap.h
include/pbm.h

Return to bug 35960

Lines 6-12 Link Here

(-)graphics/netpbm/Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= netpbm	8	PORTNAME= netpbm
9	PORTVERSION= 9.24	9	PORTVERSION= 9.25
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 14-22 Link Here
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16		16
17	LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \	17	LIB_DEPENDS= jbig.1:${PORTSDIR}/graphics/jbigkit \
18	jpeg.9:${PORTSDIR}/graphics/jpeg \	18	jpeg.9:${PORTSDIR}/graphics/jpeg \
19	png.5:${PORTSDIR}/graphics/png	19	png.5:${PORTSDIR}/graphics/png \
		20	tiff.4:${PORTSDIR}/graphics/tiff
20		21
21	USE_GMAKE= yes	22	USE_GMAKE= yes
22	MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}"	23	MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}"

Lines 3-9 Link Here

(-)graphics/netpbm/files/manpages (-5 / +6 lines)
3	MAN1+= asciitopgm.1	3	MAN1+= asciitopgm.1
4	MAN1+= atktopbm.1	4	MAN1+= atktopbm.1
5	MAN1+= bioradtopgm.1	5	MAN1+= bioradtopgm.1
6	MAN1+= bmptoppm.1	6	MAN1+= bmptopnm.1
7	MAN1+= brushtopbm.1	7	MAN1+= brushtopbm.1
8	MAN1+= cmuwmtopbm.1	8	MAN1+= cmuwmtopbm.1
9	MAN1+= eyuvtoppm.1	9	MAN1+= eyuvtoppm.1
Lines 27-38 Link Here
27	MAN1+= mdatopbm.1	27	MAN1+= mdatopbm.1
28	MAN1+= mgrtopbm.1	28	MAN1+= mgrtopbm.1
29	MAN1+= mtvtoppm.1	29	MAN1+= mtvtoppm.1
30	MAN1+= netpbm.1
31	MAN1+= neotoppm.1	30	MAN1+= neotoppm.1
		31	MAN1+= netpbm.1
32	MAN1+= palmtopnm.1	32	MAN1+= palmtopnm.1
33	MAN1+= pamchannel.1	33	MAN1+= pamchannel.1
34	MAN1+= pamcut.1	34	MAN1+= pamcut.1
35	MAN1+= pamdeinterlace.1	35	MAN1+= pamdeinterlace.1
		36	MAN1+= pamdice.1
36	MAN1+= pamfile.1	37	MAN1+= pamfile.1
37	MAN1+= pamoil.1	38	MAN1+= pamoil.1
38	MAN1+= pamstretch-gen.1	39	MAN1+= pamstretch-gen.1
Lines 69-74 Link Here
69	MAN1+= pbmtopi3.1	70	MAN1+= pbmtopi3.1
70	MAN1+= pbmtopk.1	71	MAN1+= pbmtopk.1
71	MAN1+= pbmtoplot.1	72	MAN1+= pbmtoplot.1
		73	MAN1+= pbmtoppa.1
72	MAN1+= pbmtopsg3.1	74	MAN1+= pbmtopsg3.1
73	MAN1+= pbmtoptx.1	75	MAN1+= pbmtoptx.1
74	MAN1+= pbmtowbmp.1	76	MAN1+= pbmtowbmp.1
Lines 86-92 Link Here
86	MAN1+= pgmhist.1	88	MAN1+= pgmhist.1
87	MAN1+= pgmkernel.1	89	MAN1+= pgmkernel.1
88	MAN1+= pgmnoise.1	90	MAN1+= pgmnoise.1
89	MAN1+= pgmnorm.1
90	MAN1+= pgmramp.1	91	MAN1+= pgmramp.1
91	MAN1+= pgmslice.1	92	MAN1+= pgmslice.1
92	MAN1+= pgmtexture.1	93	MAN1+= pgmtexture.1
Lines 120-125 Link Here
120	MAN1+= pnmmargin.1	121	MAN1+= pnmmargin.1
121	MAN1+= pnmmontage.1	122	MAN1+= pnmmontage.1
122	MAN1+= pnmnlfilt.1	123	MAN1+= pnmnlfilt.1
		124	MAN1+= pnmnorm.1
123	MAN1+= pnmpad.1	125	MAN1+= pnmpad.1
124	MAN1+= pnmpaste.1	126	MAN1+= pnmpaste.1
125	MAN1+= pnmpsnr.1	127	MAN1+= pnmpsnr.1
Lines 137-143 Link Here
137	MAN1+= pnmtofits.1	139	MAN1+= pnmtofits.1
138	MAN1+= pnmtojbig.1	140	MAN1+= pnmtojbig.1
139	MAN1+= pnmtojpeg.1	141	MAN1+= pnmtojpeg.1
140	MAN1+= pnmtopalm.1	142	MAN1+= pnmtopalm.1
141	MAN1+= pnmtoplainpnm.1	143	MAN1+= pnmtoplainpnm.1
142	MAN1+= pnmtopng.1	144	MAN1+= pnmtopng.1
143	MAN1+= pnmtops.1	145	MAN1+= pnmtops.1
Lines 163-169 Link Here
163	MAN1+= ppmlabel.1	165	MAN1+= ppmlabel.1
164	MAN1+= ppmmake.1	166	MAN1+= ppmmake.1
165	MAN1+= ppmmix.1	167	MAN1+= ppmmix.1
166	MAN1+= ppmnorm.1
167	MAN1+= ppmntsc.1	168	MAN1+= ppmntsc.1
168	MAN1+= ppmpat.1	169	MAN1+= ppmpat.1
169	MAN1+= ppmquant.1	170	MAN1+= ppmquant.1

Lines 1-45 Link Here

(-)graphics/netpbm/files/patch-bd (-32 / +6 lines)
1	--- pbm/Makefile.orig Fri Nov 16 02:33:04 2001	1	--- pbm/Makefile.orig Mon Feb 18 04:18:04 2002
2	+++ pbm/Makefile Sat Dec 8 00:00:00 2001	2	+++ pbm/Makefile Sat Mar 16 00:00:00 2002
3	@@ -52,6 +52,7 @@	3	@@ -52,6 +52,7 @@
4		4
5	# Library objects to be built and linked by Makefile.common:	5	# Library objects to be built and linked by Makefile.common:
6	LIBOBJECTS = libpm.o libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o	6	LIBOBJECTS = libpm.o libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o bitio.o
7	+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))	7	+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
8	ifneq (${VMS}x,x)	8	ifneq (${VMS}x,x)
9	LIBOBJECTS += libpbmvms.o	9	LIBOBJECTS += libpbmvms.o
10	endif	10	endif
11	@@ -68,26 +69,21 @@	11	@@ -71,7 +72,7 @@
12		12	$(MAKE) -C pbmtoppa all
13	.PHONY: all
14	all: $(LIBPBM) $(BINARIES) $(EXTRA_STATICLIB)
15	- $(MAKE) -C pbmtoppa all
16		13
17	.PHONY: merge	14	.PHONY: merge
18	-merge: $(MERGENAME)	15	-merge: $(MERGENAME)
19	- $(MAKE) -C pbmtoppa all
20	+merge: $(MERGENAME) $(EXTRA_STATICLIB)	16	+merge: $(MERGENAME) $(EXTRA_STATICLIB)
		17	$(MAKE) -C pbmtoppa all
21		18
22	.PHONY: install.bin	19	.PHONY: install.bin
23	install.bin: install.bin.common
24	- $(MAKE) -C pbmtoppa install.bin
25
26	.PHONY: install.merge
27	install.merge: install.merge.common
28	- $(MAKE) -C pbmtoppa install.bin
29
30	.PHONY: install.lib
31	install.lib: install.lib.common
32
33	.PHONY: install.man
34	install.man: install.man.common
35	- $(MAKE) -C pbmtoppa install.man
36
37	HEADERLINKS = pm_config.h version.h compile.h
38
39	@@ -110,6 +106,5 @@
40	clean: clean.common
41	rm -f thinkjettopbm.c
42	rm -f compile.h
43	- $(MAKE) -C pbmtoppa clean
44
45	FORCE:

Lines 1-23 Link Here

(-)graphics/netpbm/files/patch-bg (-7 / +6 lines)
1	--- ppm/Makefile.orig Mon Jan 7 07:04:08 2002	1	--- ppm/Makefile.orig Wed Mar 13 11:09:21 2002
2	+++ ppm/Makefile Mon Jan 28 00:00:00 2002	2	+++ ppm/Makefile Sat Mar 16 00:00:00 2002
3	@@ -74,6 +74,7 @@	3	@@ -74,6 +74,7 @@
4		4
5	LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \	5	LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
6	libppmfloyd.o bitio.o	6	libppmfloyd.o
7	+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))	7	+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
8		8
9	MANUALS1 = $(BINARIES) $(SCRIPTS)	9	MANUALS1 = $(BINARIES) $(SCRIPTS)
10	MANUALS3 = libppm	10	MANUALS3 = libppm
11	@@ -81,7 +82,7 @@	11	@@ -81,14 +82,14 @@
12		12
13	MERGENAME= ppmmerge	13	MERGENAME= ppmmerge
14		14
15	-INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h	15	-INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h
16	+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h	16	+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
17		17
18	ppmsvgalib: %: %.o $(NETPBMLIBS) $(LIBOPT)	18	.PHONY: all
19	$(LD) $(LDFLAGS) -o $@ $< `$(LIBOPT) $(NETPBMLIBS)` $(LINUXSVGALD) \	19	all: $(LIBPPM) $(BINARIES) $(EXTRA_STATICLIB)
20	@@ -92,7 +93,7 @@
21	$(MAKE) -C ppmtompeg all	20	$(MAKE) -C ppmtompeg all
22	$(MAKE) -C hpcdtoppm all	21	$(MAKE) -C hpcdtoppm all
23	.PHONY: merge	22	.PHONY: merge

Lines 3-9 Link Here

(-)graphics/netpbm/pkg-plist (-3 / +5 lines)
3	bin/asciitopgm	3	bin/asciitopgm
4	bin/atktopbm	4	bin/atktopbm
5	bin/bioradtopgm	5	bin/bioradtopgm
6	bin/bmptoppm	6	bin/bmptopnm
7	bin/brushtopbm	7	bin/brushtopbm
8	bin/cmuwmtopbm	8	bin/cmuwmtopbm
9	bin/eyuvtoppm	9	bin/eyuvtoppm
Lines 32-37 Link Here
32	bin/pamchannel	32	bin/pamchannel
33	bin/pamcut	33	bin/pamcut
34	bin/pamdeinterlace	34	bin/pamdeinterlace
		35	bin/pamdice
35	bin/pamfile	36	bin/pamfile
36	bin/pamoil	37	bin/pamoil
37	bin/pamstretch	38	bin/pamstretch
Lines 69-74 Link Here
69	bin/pbmtopi3	70	bin/pbmtopi3
70	bin/pbmtopk	71	bin/pbmtopk
71	bin/pbmtoplot	72	bin/pbmtoplot
		73	bin/pbmtoppa
72	bin/pbmtopsg3	74	bin/pbmtopsg3
73	bin/pbmtoptx	75	bin/pbmtoptx
74	bin/pbmtowbmp	76	bin/pbmtowbmp
Lines 87-93 Link Here
87	bin/pgmkernel	89	bin/pgmkernel
88	bin/pgmmerge	90	bin/pgmmerge
89	bin/pgmnoise	91	bin/pgmnoise
90	bin/pgmnorm
91	bin/pgmramp	92	bin/pgmramp
92	bin/pgmslice	93	bin/pgmslice
93	bin/pgmtexture	94	bin/pgmtexture
Lines 122-127 Link Here
122	bin/pnmmerge	123	bin/pnmmerge
123	bin/pnmmontage	124	bin/pnmmontage
124	bin/pnmnlfilt	125	bin/pnmnlfilt
		126	bin/pnmnorm
125	bin/pnmpad	127	bin/pnmpad
126	bin/pnmpaste	128	bin/pnmpaste
127	bin/pnmpsnr	129	bin/pnmpsnr
Lines 166-172 Link Here
166	bin/ppmmake	168	bin/ppmmake
167	bin/ppmmerge	169	bin/ppmmerge
168	bin/ppmmix	170	bin/ppmmix
169	bin/ppmnorm
170	bin/ppmntsc	171	bin/ppmntsc
171	bin/ppmpat	172	bin/ppmpat
172	bin/ppmquant	173	bin/ppmquant
Lines 233-238 Link Here
233	bin/yuvsplittoppm	234	bin/yuvsplittoppm
234	bin/yuvtoppm	235	bin/yuvtoppm
235	bin/zeisstopnm	236	bin/zeisstopnm
		237	include/bitio.h
236	include/pam.h	238	include/pam.h
237	include/pammap.h	239	include/pammap.h
238	include/pbm.h	240	include/pbm.h