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

(-)graphics/netpbm/Makefile (-10 / +7 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	netpbm
8
PORTNAME=	netpbm
9
PORTVERSION=	9.25
9
PORTVERSION=	10.2
10
PORTREVISION=	1
11
CATEGORIES=	graphics
10
CATEGORIES=	graphics
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 23-38 Link Here
23
USE_GMAKE=	yes
22
USE_GMAKE=	yes
24
MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"
23
MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"
25
MAKEFILE=	GNUmakefile
24
MAKEFILE=	GNUmakefile
25
INSTALL_TARGET=	install.bin install.lib install-dev
26
INSTALLS_SHLIB=	yes
26
INSTALLS_SHLIB=	yes
27
27
28
.include <bsd.port.pre.mk>
29
30
.include "${FILESDIR}/manpages"
31
32
post-patch:
28
post-patch:
33
	@${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/pm_config.h
29
	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/pm_config.h
34
	@${PERL} -pi -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/pbm/pm.h
30
	@${REINPLACE_CMD} -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/lib/pm.h
35
	@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
31
	@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
36
	@${LN} -sf ${WRKSRC}/shhopt/shhopt.h ${WRKSRC}/shhopt/pm_shhopt.h
32
	@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
33
	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
37
34
38
.include <bsd.port.post.mk>
35
.include <bsd.port.mk>
(-)graphics/netpbm/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (netpbm-9.25.tgz) = cb8036f3649c93cf51ee377971ddbf1c
1
MD5 (netpbm-10.2.tgz) = 871cf2c42f101fcd57c51ad415160819
(-)graphics/netpbm/files/Makefile.config.FreeBSD (-22 / +9 lines)
Lines 1-40 Link Here
1
DEFAULT_TARGET = merge
1
DEFAULT_TARGET = nomerge
2
BUILD_FIASCO = Y
2
BUILD_FIASCO = Y
3
LD = ${CC}
3
LD = ${CC}
4
CC_FOR_BUILD = ${CC}
4
CC_FOR_BUILD = ${CC}
5
LD_FOR_BUILD = ${CC}
5
LD_FOR_BUILD = ${CC}
6
SYMLINK = ${LN} -sf
6
SYMLINK = ${LN} -sf
7
MANCP = ${BSD_INSTALL_MAN}
8
LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
7
LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
9
LDSHLIB = -shared -Wl,-soname,$(SONAME)
8
LDSHLIB = -shared -Wl,-soname,$(SONAME)
10
CFLAGS_SHLIB = -fpic -DPIC
9
CFLAGS_SHLIB = -fpic -DPIC
11
TIFFLIB_DIR = ${LOCALBASE}/lib
10
TIFFLIB = ${LOCALBASE}/lib/libtiff.so
12
TIFFHDR_DIR = ${LOCALBASE}/include
11
TIFFHDR_DIR = ${LOCALBASE}/include
13
JPEGLIB_DIR = ${LOCALBASE}/lib
12
JPEGLIB = ${LOCALBASE}/lib/libjpeg.so
14
JPEGHDR_DIR = ${LOCALBASE}/include
13
JPEGHDR_DIR = ${LOCALBASE}/include
15
PNGLIB_DIR = ${LOCALBASE}/lib
14
PNGLIB = ${LOCALBASE}/lib/libpng.so
16
PNGHDR_DIR = ${LOCALBASE}/include
15
PNGHDR_DIR = ${LOCALBASE}/include
17
ZLIB_DIR = /usr/lib
16
ZLIB = /usr/lib/libz.so
18
ZHDR_DIR = /usr/include
17
ZHDR_DIR = /usr/include
19
JBIGLIB_DIR = ${LOCALBASE}/lib
18
JBIGLIB = ${LOCALBASE}/lib/libjbig.so
20
JBIGHDR_DIR = ${LOCALBASE}/include
19
JBIGHDR_DIR = ${LOCALBASE}/include
21
URTLIB_DIR = $(SRCDIR)/urt
20
URTLIB =  $(BUILDDIR)/urt/librle.a
22
URTHDR_DIR = $(SRCDIR)/urt
21
URTHDR_DIR = $(SRCDIR)/urt
23
LINUXSVGALIB_DIR = NONE
22
LINUXSVGALIB = NONE
24
LINUXSVGAHDR_DIR = NONE
23
LINUXSVGAHDR_DIR = NONE
25
INSTALL_PREFIX = ${PREFIX}
26
INSTALLBINARIES = $(INSTALL_PREFIX)/bin
27
INSTALLSCRIPTS = $(INSTALLBINARIES)
28
INSTALLLIBS = $(INSTALL_PREFIX)/lib
29
INSTALLSTATICLIBS = $(INSTALLLIBS)
30
INSTALLMANUALS1 = $(INSTALL_PREFIX)/man/man1
31
SUFFIXMANUALS1 = 1
32
INSTALLMANUALS3 = $(INSTALL_PREFIX)/man/man3
33
SUFFIXMANUALS3 = 3
34
INSTALLMANUALS5 = $(INSTALL_PREFIX)/man/man5
35
SUFFIXMANUALS5 = 5
36
INSTALLHDRS = $(INSTALL_PREFIX)/include
37
INSTALLDATA = $(INSTALL_PREFIX)/share/netpbm
38
NETPBMLIBTYPE = unixshared
24
NETPBMLIBTYPE = unixshared
39
NETPBMLIBSUFFIX = so
25
NETPBMLIBSUFFIX = so
40
STATICLIB_TOO = y
26
STATICLIB_TOO = y
Lines 42-44 Link Here
42
SHLIBPREFIXLIST = lib
28
SHLIBPREFIXLIST = lib
43
NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
29
NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
44
SOVER = 1
30
SOVER = 1
31
pkgdir = ${PREFIX}
(-)graphics/netpbm/files/manpages (-244 lines)
Lines 1-244 Link Here
1
MAN1+=	411toppm.1
2
MAN1+=	anytopnm.1
3
MAN1+=	asciitopgm.1
4
MAN1+=	atktopbm.1
5
MAN1+=	bioradtopgm.1
6
MAN1+=	bmptopnm.1
7
MAN1+=	brushtopbm.1
8
MAN1+=	cmuwmtopbm.1
9
MAN1+=	eyuvtoppm.1
10
MAN1+=	fiascotopnm.1
11
MAN1+=	fitstopnm.1
12
MAN1+=	fstopgm.1
13
MAN1+=	g3topbm.1
14
MAN1+=	gemtopnm.1
15
MAN1+=	giftopnm.1
16
MAN1+=	gouldtoppm.1
17
MAN1+=	hipstopgm.1
18
MAN1+=	hpcdtoppm.1
19
MAN1+=	icontopbm.1
20
MAN1+=	ilbmtoppm.1
21
MAN1+=	imgtoppm.1
22
MAN1+=	jbigtopnm.1
23
MAN1+=	jpegtopnm.1
24
MAN1+=	leaftoppm.1
25
MAN1+=	lispmtopgm.1
26
MAN1+=	macptopbm.1
27
MAN1+=	mdatopbm.1
28
MAN1+=	mgrtopbm.1
29
MAN1+=	mtvtoppm.1
30
MAN1+=	neotoppm.1
31
MAN1+=	netpbm.1
32
MAN1+=	palmtopnm.1
33
MAN1+=	pamchannel.1
34
MAN1+=	pamcut.1
35
MAN1+=	pamdeinterlace.1
36
MAN1+=	pamdice.1
37
MAN1+=	pamfile.1
38
MAN1+=	pamoil.1
39
MAN1+=	pamstretch-gen.1
40
MAN1+=	pamstretch.1
41
MAN1+=	pamtopnm.1
42
MAN1+=	pbmclean.1
43
MAN1+=	pbmlife.1
44
MAN1+=	pbmmake.1
45
MAN1+=	pbmmask.1
46
MAN1+=	pbmpage.1
47
MAN1+=	pbmpscale.1
48
MAN1+=	pbmreduce.1
49
MAN1+=	pbmtext.1
50
MAN1+=	pbmto10x.1
51
MAN1+=	pbmto4425.1
52
MAN1+=	pbmtoascii.1
53
MAN1+=	pbmtoatk.1
54
MAN1+=	pbmtobbnbg.1
55
MAN1+=	pbmtocmuwm.1
56
MAN1+=	pbmtoepsi.1
57
MAN1+=	pbmtoepson.1
58
MAN1+=	pbmtog3.1
59
MAN1+=	pbmtogem.1
60
MAN1+=	pbmtogo.1
61
MAN1+=	pbmtoicon.1
62
MAN1+=	pbmtolj.1
63
MAN1+=	pbmtoln03.1
64
MAN1+=	pbmtolps.1
65
MAN1+=	pbmtomacp.1
66
MAN1+=	pbmtomda.1
67
MAN1+=	pbmtomgr.1
68
MAN1+=	pbmtonokia.1
69
MAN1+=	pbmtopgm.1
70
MAN1+=	pbmtopi3.1
71
MAN1+=	pbmtopk.1
72
MAN1+=	pbmtoplot.1
73
MAN1+=	pbmtoppa.1
74
MAN1+=	pbmtopsg3.1
75
MAN1+=	pbmtoptx.1
76
MAN1+=	pbmtowbmp.1
77
MAN1+=	pbmtox10bm.1
78
MAN1+=	pbmtoxbm.1
79
MAN1+=	pbmtoybm.1
80
MAN1+=	pbmtozinc.1
81
MAN1+=	pbmupc.1
82
MAN1+=	pcdindex.1
83
MAN1+=	pcxtoppm.1
84
MAN1+=	pgmbentley.1
85
MAN1+=	pgmcrater.1
86
MAN1+=	pgmedge.1
87
MAN1+=	pgmenhance.1
88
MAN1+=	pgmhist.1
89
MAN1+=	pgmkernel.1
90
MAN1+=	pgmnoise.1
91
MAN1+=	pgmramp.1
92
MAN1+=	pgmslice.1
93
MAN1+=	pgmtexture.1
94
MAN1+=	pgmtofs.1
95
MAN1+=	pgmtolispm.1
96
MAN1+=	pgmtopbm.1
97
MAN1+=	pgmtoppm.1
98
MAN1+=	pi1toppm.1
99
MAN1+=	pi3topbm.1
100
MAN1+=	picttoppm.1
101
MAN1+=	pjtoppm.1
102
MAN1+=	pktopbm.1
103
MAN1+=	pngtopnm.1
104
MAN1+=	pnmalias.1
105
MAN1+=	pnmarith.1
106
MAN1+=	pnmcat.1
107
MAN1+=	pnmcolormap.1
108
MAN1+=	pnmcomp.1
109
MAN1+=	pnmconvol.1
110
MAN1+=	pnmcrop.1
111
MAN1+=	pnmcut.1
112
MAN1+=	pnmdepth.1
113
MAN1+=	pnmenlarge.1
114
MAN1+=	pnmfile.1
115
MAN1+=	pnmflip.1
116
MAN1+=	pnmgamma.1
117
MAN1+=	pnmhisteq.1
118
MAN1+=	pnmhistmap.1
119
MAN1+=	pnmindex.1
120
MAN1+=	pnminvert.1
121
MAN1+=	pnmmargin.1
122
MAN1+=	pnmmontage.1
123
MAN1+=	pnmnlfilt.1
124
MAN1+=	pnmnorm.1
125
MAN1+=	pnmpad.1
126
MAN1+=	pnmpaste.1
127
MAN1+=	pnmpsnr.1
128
MAN1+=	pnmquant.1
129
MAN1+=	pnmremap.1
130
MAN1+=	pnmrotate.1
131
MAN1+=	pnmscale.1
132
MAN1+=	pnmscalefixed.1
133
MAN1+=	pnmshear.1
134
MAN1+=	pnmsmooth.1
135
MAN1+=	pnmsplit.1
136
MAN1+=	pnmtile.1
137
MAN1+=	pnmtoddif.1
138
MAN1+=	pnmtofiasco.1
139
MAN1+=	pnmtofits.1
140
MAN1+=	pnmtojbig.1
141
MAN1+=	pnmtojpeg.1
142
MAN1+=	pnmtopalm.1
143
MAN1+=	pnmtoplainpnm.1
144
MAN1+=	pnmtopng.1
145
MAN1+=	pnmtops.1
146
MAN1+=	pnmtorast.1
147
MAN1+=	pnmtorle.1
148
MAN1+=	pnmtosgi.1
149
MAN1+=	pnmtosir.1
150
MAN1+=	pnmtotiff.1
151
MAN1+=	pnmtotiffcmyk.1
152
MAN1+=	pnmtoxwd.1
153
MAN1+=	ppm3d.1
154
MAN1+=	ppmbrighten.1
155
MAN1+=	ppmchange.1
156
MAN1+=	ppmcie.1
157
MAN1+=	ppmcolormask.1
158
MAN1+=	ppmcolors.1
159
MAN1+=	ppmdim.1
160
MAN1+=	ppmdist.1
161
MAN1+=	ppmdither.1
162
MAN1+=	ppmfade.1
163
MAN1+=	ppmflash.1
164
MAN1+=	ppmforge.1
165
MAN1+=	ppmhist.1
166
MAN1+=	ppmlabel.1
167
MAN1+=	ppmmake.1
168
MAN1+=	ppmmix.1
169
MAN1+=	ppmntsc.1
170
MAN1+=	ppmpat.1
171
MAN1+=	ppmquant.1
172
MAN1+=	ppmquantall.1
173
MAN1+=	ppmqvga.1
174
MAN1+=	ppmrainbow.1
175
MAN1+=	ppmrelief.1
176
MAN1+=	ppmshadow.1
177
MAN1+=	ppmshift.1
178
MAN1+=	ppmspread.1
179
MAN1+=	ppmtoacad.1
180
MAN1+=	ppmtobmp.1
181
MAN1+=	ppmtoeyuv.1
182
MAN1+=	ppmtogif.1
183
MAN1+=	ppmtoicr.1
184
MAN1+=	ppmtoilbm.1
185
MAN1+=	ppmtoleaf.1
186
MAN1+=	ppmtolj.1
187
MAN1+=	ppmtomap.1
188
MAN1+=	ppmtomitsu.1
189
MAN1+=	ppmtompeg.1
190
MAN1+=	ppmtoneo.1
191
MAN1+=	ppmtopcx.1
192
MAN1+=	ppmtopgm.1
193
MAN1+=	ppmtopi1.1
194
MAN1+=	ppmtopict.1
195
MAN1+=	ppmtopj.1
196
MAN1+=	ppmtopjxl.1
197
MAN1+=	ppmtopuzz.1
198
MAN1+=	ppmtorgb3.1
199
MAN1+=	ppmtosixel.1
200
MAN1+=	ppmtotga.1
201
MAN1+=	ppmtouil.1
202
MAN1+=	ppmtowinicon.1
203
MAN1+=	ppmtoxpm.1
204
MAN1+=	ppmtoyuv.1
205
MAN1+=	ppmtoyuvsplit.1
206
MAN1+=	ppmtv.1
207
MAN1+=	psidtopgm.1
208
MAN1+=	pstopnm.1
209
MAN1+=	qrttoppm.1
210
MAN1+=	rasttopnm.1
211
MAN1+=	rawtopgm.1
212
MAN1+=	rawtoppm.1
213
MAN1+=	rgb3toppm.1
214
MAN1+=	rletopnm.1
215
MAN1+=	sbigtopgm.1
216
MAN1+=	sgitopnm.1
217
MAN1+=	sirtopnm.1
218
MAN1+=	sldtoppm.1
219
MAN1+=	spctoppm.1
220
MAN1+=	spottopgm.1
221
MAN1+=	sputoppm.1
222
MAN1+=	tgatoppm.1
223
MAN1+=	thinkjettopbm.1
224
MAN1+=	tifftopnm.1
225
MAN1+=	wbmptopbm.1
226
MAN1+=	winicontoppm.1
227
MAN1+=	xbmtopbm.1
228
MAN1+=	ximtoppm.1
229
MAN1+=	xpmtoppm.1
230
MAN1+=	xvminitoppm.1
231
MAN1+=	xwdtopnm.1
232
MAN1+=	ybmtopbm.1
233
MAN1+=	yuvsplittoppm.1
234
MAN1+=	yuvtoppm.1
235
MAN1+=	zeisstopnm.1
236
MAN3+=	libpbm.3
237
MAN3+=	libpgm.3
238
MAN3+=	libpnm.3
239
MAN3+=	libppm.3
240
MAN5+=	pam.5
241
MAN5+=	pbm.5
242
MAN5+=	pgm.5
243
MAN5+=	pnm.5
244
MAN5+=	ppm.5
(-)graphics/netpbm/files/patch-GNUmakefile (+11 lines)
Line 0 Link Here
1
--- GNUmakefile.orig	Fri Jun 14 11:57:11 2002
2
+++ GNUmakefile	Tue Jun 18 00:00:00 2002
3
@@ -236,7 +236,7 @@
4
 install.hdr: $(PKGDIR)/include
5
 	$(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
6
 	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr
7
-	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
8
+	${BSD_INSTALL_DATA} \
9
 	    $(SRCDIR)/pm_config.h $(PKGDIR)/include
10
 
11
 ifeq ($(STATICLIB_TOO),y)
(-)graphics/netpbm/files/patch-Makefile.common (+16 lines)
Line 0 Link Here
1
--- Makefile.common.orig	Fri Jun 14 11:55:58 2002
2
+++ Makefile.common	Tue Jun 18 00:00:00 2002
3
@@ -209,11 +209,11 @@
4
 INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
5
 .PHONY: $(INSTALLBIN_TARGETS)
6
 $(INSTALLBIN_TARGETS): $(PKGDIR)/bin
7
-	$(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
8
+	${BSD_INSTALL_PROGRAM} \
9
 	  $(@:%_installbin=%) $<
10
 
11
 $(SCRIPTS:%=%_installscript): $(PKGDIR)/bin
12
-	$(INSTALL) -c -m $(INSTALL_PERM_BIN) \
13
+	${BSD_INSTALL_SCRIPT} \
14
 	  $(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
15
 
16
 .PHONY: install.man install.man1 install.man3 install.man5
(-)graphics/netpbm/files/patch-aj (-35 lines)
Lines 1-35 Link Here
1
--- pm_config.h.orig	Mon Jun 11 08:37:08 2001
2
+++ pm_config.h	Mon Tue Jun 26 00:00:00 2001
3
@@ -19,6 +19,10 @@
4
 
5
 **************************************************************************/
6
 
7
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
8
+#include <sys/param.h>
9
+#endif
10
+
11
 #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
12
 #define SYSV
13
 #endif
14
@@ -28,7 +32,7 @@
15
 ** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're
16
 ** probably better off setting SYSV - all it affects is string handling.
17
 */
18
-#define BSD
19
+/* #define BSD */
20
 /* #define SYSV */
21
 /* #define MSDOS */
22
 /* #define AMIGA */
23
@@ -48,9 +52,9 @@
24
 #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
25
 #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
26
 #else
27
-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
28
-#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
29
-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
30
+#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt"
31
+#define RGB_DB2 "%%X11BASE%%/lib/X11/rgb.txt"
32
+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt"
33
 #endif
34
 
35
 /* CONFIGURE: This is the name of an environment variable that tells
(-)graphics/netpbm/files/patch-ap (-15 lines)
Lines 1-15 Link Here
1
--- pnm/pnmarith.c.orig	Sun Aug 13 13:08:04 1995
2
+++ pnm/pnmarith.c	Sat Oct 16 02:39:24 1999
3
@@ -147,9 +147,9 @@
4
 		    break;
5
 
6
 		    case '*':
7
-		    r1 = r1 * r2 / maxval3;
8
-		    g1 = g1 * g2 / maxval3;
9
-		    b1 = b1 * b2 / maxval3;
10
+		    r1 = (unsigned) r1 * r2 / maxval3;
11
+		    g1 = (unsigned) g1 * g2 / maxval3;
12
+		    b1 = (unsigned) b1 * b2 / maxval3;
13
 		    break;
14
 
15
 		    case 'D':
(-)graphics/netpbm/files/patch-ay (-15 lines)
Lines 1-15 Link Here
1
--- pnm/pnmtotiffcmyk.c.orig	Sat May 13 09:29:45 2000
2
+++ pnm/pnmtotiffcmyk.c	Fri Dec  8 00:00:00 2000
3
@@ -71,8 +71,12 @@
4
 #define VERSION 1.01
5
 
6
 /* beware - these evaluate more than once */
7
+#ifndef MAX
8
 #define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) )
9
+#endif
10
+#ifndef MIN
11
 #define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) )
12
+#endif
13
 
14
 /* only support 8 bit values */
15
 #define MAXTIFFBITS 8
(-)graphics/netpbm/files/patch-ba (-25 lines)
Lines 1-25 Link Here
1
--- GNUmakefile.orig	Sat Sep 22 01:26:48 2001
2
+++ GNUmakefile	Wed Oct 10 00:00:00 2001
3
@@ -69,7 +69,7 @@
4
 
5
 default: $(DEFAULT_TARGET)
6
 
7
-all: nonmerge
8
+all: default
9
 
10
 .PHONY: nonmerge
11
 nonmerge: $(SUBDIRS)
12
@@ -160,10 +160,10 @@
13
 install.hdr: $(INSTALLHDRS) $(SRCDIR)/pm_config.h
14
 # See notes in Makefile.common about how $(INSTALL) varies from one 
15
 # platform to another.
16
-	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
17
+	${BSD_INSTALL_DATA} \
18
 	    $(SRCDIR)/pm_config.h $(INSTALLHDRS)
19
-	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
20
-	    $(SRCDIR)/shhopt/shhopt.h $(INSTALLHDRS)
21
+	${BSD_INSTALL_DATA} \
22
+	    $(SRCDIR)/shhopt/pm_shhopt.h $(INSTALLHDRS)
23
 	for i in $(SUBDIRS) ; do \
24
 	    $(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.hdr ; \
25
 	done
(-)graphics/netpbm/files/patch-bb (-113 lines)
Lines 1-113 Link Here
1
--- Makefile.common.orig	Sat Jan  5 09:10:54 2002
2
+++ Makefile.common	Sun Jan  6 00:00:00 2002
3
@@ -175,9 +175,12 @@
4
 
5
 $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS)
6
 # Note that the user may have configured -I options into CFLAGS.
7
+	$(CC) -c $(INCLUDE) $(CFLAGS) $(CDEBUG) -o $@ $<
8
+
9
+$(SHLIBOBJECTS): %.lo: $(SRCSUBDIR)/%.c $(HEADERLINKS)
10
 	$(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CDEBUG) -o $@ $<
11
 
12
-SONAME = lib$(LIBROOT).so.$(MAJ)
13
+SONAME = lib$(LIBROOT).so.$(SOVER)
14
 
15
 ifeq ($(NETPBMLIBTYPE),unixshared)
16
 # The libxxx.so link is needed to link the executables.
17
@@ -187,13 +190,10 @@
18
 # The $(SONAME) link is only needed to test the programs without
19
 # installing the libraries (in that case, you also need to direct the 
20
 # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
21
-$(SONAME): lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
22
-	rm -f $@
23
-	$(SYMLINK) $< $@
24
-lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): \
25
-    $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
26
-	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
27
-          `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG)
28
+$(SONAME): \
29
+    $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
30
+	$(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
31
+          `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) $(CDEBUG)
32
 endif
33
 
34
 ifeq ($(NETPBMLIBTYPE),dll)
35
@@ -282,7 +282,7 @@
36
 install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
37
 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
38
 ifneq ($(MERGENAME)x,x)
39
-	$(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
40
+	${BSD_INSTALL_PROGRAM} \
41
             $(MERGENAME) $(INSTALLBINARIES)
42
 	cd $(INSTALLBINARIES) ; \
43
 	   for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
44
@@ -292,7 +292,7 @@
45
 ifneq ($(NOMERGEBINARIES)x,x)
46
 	for x in $(NOMERGEBINARIES); \
47
         do \
48
-           $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
49
+           ${BSD_INSTALL_PROGRAM} \
50
                $$x $(INSTALLBINARIES); \
51
 	done
52
 endif
53
@@ -303,7 +303,7 @@
54
 # Make and Install know that pbmmake.exe counts as pbmmake.
55
 	for x in $(BINARIES); \
56
 	do \
57
-	   $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
58
+	   ${BSD_INSTALL_PROGRAM} \
59
                $$x $(INSTALLBINARIES); \
60
 	done
61
 
62
@@ -312,7 +312,7 @@
63
 ifneq ($(SCRIPTS)x,x)
64
 	for x in $(SCRIPTS); \
65
 	do \
66
-	   $(INSTALL) -c -m $(INSTALL_PERM_BIN) $(SRCSUBDIR)/$$x \
67
+	   ${BSD_INSTALL_SCRIPT} $(SRCSUBDIR)/$$x \
68
                $(INSTALLSCRIPTS); \
69
 	done
70
 endif
71
@@ -349,7 +349,7 @@
72
 # directory when you compile your programs.
73
 	for x in $(INTERFACE_HEADERS); \
74
 	do \
75
-	   $(INSTALL) -c -m $(INSTALL_PERM_HDR) $(SRCSUBDIR)/$$x \
76
+	   ${BSD_INSTALL_DATA} $(SRCSUBDIR)/$$x \
77
                $(INSTALLHDRS); \
78
 	done
79
 
80
@@ -357,7 +357,7 @@
81
 #
82
 .PHONY: install.staticlib
83
 install.staticlib: lib$(LIBROOT).$(STATICLIBSUFFIX) 
84
-	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLSTATICLIBS)/$<
85
+	${BSD_INSTALL_DATA} $< $(INSTALLSTATICLIBS)/$<
86
 
87
 # Install a shared library stub -- the ".so" file used at link time to
88
 # prepare a program for dynamically linking a library at run time 
89
@@ -367,7 +367,7 @@
90
 install.sharedlibstub: 
91
 	cd $(INSTALLSTATICLIBS) ; \
92
           rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX); \
93
-          $(SYMLINK) $(INSTALLLIBS)/lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ) \
94
+          $(SYMLINK) $(SONAME) \
95
             lib$(LIBROOT).$(NETPBMLIBSUFFIX)
96
 else
97
 # I have no idea what link-time stuff is required for other library types.
98
@@ -381,12 +381,9 @@
99
 .PHONY: install.lib.common
100
 ifeq ($(NETPBMLIBTYPE),unixshared)
101
 # install a Unix-style shared library
102
-install.lib.common: lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) 
103
-	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).*
104
-	$(INSTALL) -c -m $(INSTALL_PERM_LIBD) $< $(INSTALLLIBS)
105
-	cd $(INSTALLLIBS) ; \
106
-          rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ); \
107
-          $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ)
108
+install.lib.common: $(SONAME)
109
+	cd $(INSTALLLIBS) ; rm -f $(SONAME)
110
+	${BSD_INSTALL_DATA} $< $(INSTALLLIBS)
111
 endif
112
 ifeq ($(NETPBMLIBTYPE),dll)
113
 #install a Windows DLL shared library
(-)graphics/netpbm/files/patch-bd (-19 lines)
Lines 1-19 Link Here
1
--- pbm/Makefile.orig	Mon Feb 18 04:18:04 2002
2
+++ pbm/Makefile	Sat Mar 16 00:00:00 2002
3
@@ -52,6 +52,7 @@
4
 
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 bitio.o
7
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
8
 ifneq (${VMS}x,x)
9
 LIBOBJECTS += libpbmvms.o
10
 endif
11
@@ -71,7 +72,7 @@
12
 	$(MAKE) -C pbmtoppa all
13
 
14
 .PHONY: merge
15
-merge: $(MERGENAME)
16
+merge: $(MERGENAME) $(EXTRA_STATICLIB)
17
 	$(MAKE) -C pbmtoppa all
18
 
19
 .PHONY: install.bin
(-)graphics/netpbm/files/patch-be (-19 lines)
Lines 1-19 Link Here
1
--- pgm/Makefile.orig	Sun Sep  9 04:31:29 2001
2
+++ pgm/Makefile	Mon Jan 28 00:00:00 2002
3
@@ -33,6 +33,7 @@
4
 MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
5
 
6
 LIBOBJECTS = libpgm1.o libpgm2.o
7
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
8
 
9
 MANUALS1 =	$(BINARIES)
10
 MANUALS3 =	libpgm
11
@@ -45,7 +46,7 @@
12
 .PHONY: all
13
 all:	$(PGMLIB) $(BINARIES) $(EXTRA_STATICLIB)
14
 .PHONY: merge
15
-merge: $(MERGENAME)
16
+merge: $(MERGENAME) $(EXTRA_STATICLIB)
17
 
18
 # LIBRARIES
19
 
(-)graphics/netpbm/files/patch-bf (-38 lines)
Lines 1-38 Link Here
1
--- pnm/Makefile.orig	Sat Jan  5 06:33:42 2002
2
+++ pnm/Makefile	Sun Jan  6 00:00:00 2002
3
@@ -146,13 +146,14 @@
4
 # MERGE_ALIASES is additional names to be linked to the merge binary which are
5
 # alternate names for a program whose source is called something else.
6
 # Every name here must be referenced in pnmmerge.c.
7
-MERGE_ALIASES = pnmnoraw gemtopbm
8
+MERGE_ALIASES =
9
 
10
 OBJECTS = $(patsubst %, %.o, $(BINARIES)) exif.o
11
 
12
 MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
13
 
14
 LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o libpammap.o
15
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
16
 
17
 MANUALS1 = $(BINARIES) $(SCRIPTS)
18
 MANUALS3 = libpnm
19
@@ -170,7 +171,7 @@
20
 	$(MAKE) -C jbig all
21
 	$(MAKE) -C pnmtopalm all
22
 PHONY: merge
23
-merge:    $(MERGENAME) $(NOMERGEBINARIES)
24
+merge:    $(MERGENAME) $(NOMERGEBINARIES) $(EXTRA_STATICLIB)
25
 ifneq ($(BUILD_FIASCO), N) 
26
 	$(MAKE) -C fiasco all
27
 endif
28
@@ -260,10 +261,6 @@
29
 
30
 .PHONY: install.man
31
 install.man: install.man.common
32
-# The following are for programs that have been renamed
33
-	rm -f $(INSTALLMANUALS1)/pnmnoraw.*
34
-	rm -f $(INSTALLMANUALS1)/gemtopnm.*
35
-	rm -f $(INSTALLMANUALS1)/pnminterp.*
36
 ifneq ($(BUILD_FIASCO), N) 
37
 	$(MAKE) -C fiasco install.man
38
 endif
(-)graphics/netpbm/files/patch-bg (-27 lines)
Lines 1-27 Link Here
1
--- ppm/Makefile.orig	Wed Mar 13 11:09:21 2002
2
+++ ppm/Makefile	Sat Mar 16 00:00:00 2002
3
@@ -74,6 +74,7 @@
4
 
5
 LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
6
 	libppmfloyd.o
7
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
8
 
9
 MANUALS1 = $(BINARIES) $(SCRIPTS)
10
 MANUALS3 = libppm
11
@@ -81,14 +82,14 @@
12
 
13
 MERGENAME= ppmmerge
14
 
15
-INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h
16
+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
17
 
18
 .PHONY: all
19
 all: $(LIBPPM) $(BINARIES) $(EXTRA_STATICLIB)
20
 	$(MAKE) -C ppmtompeg all
21
 	$(MAKE) -C hpcdtoppm all
22
 .PHONY: merge
23
-merge:      $(MERGENAME) $(NOMERGEBINARIES)
24
+merge:      $(MERGENAME) $(NOMERGEBINARIES) $(EXTRA_STATICLIB)
25
 	$(MAKE) -C ppmtompeg all
26
 	$(MAKE) -C hpcdtoppm all
27
 
(-)graphics/netpbm/files/patch-bi (-13 lines)
Lines 1-13 Link Here
1
--- pbm/pbmtog3.1.orig	Mon Oct  4 18:10:48 1993
2
+++ pbm/pbmtog3.1	Sat Apr  8 12:00:00 2000
3
@@ -6,8 +6,8 @@
4
 .B pbmtog3
5
 .RI [ pbmfile ]
6
 .SH DESCRIPTION
7
-Reads a portable bitmap as output.
8
-Produces a Group 3 fax file as input.
9
+Reads a portable bitmap as input.
10
+Produces a Group 3 fax file as output.
11
 .IX "Group 3 fax"
12
 .IX fax
13
 .SH REFERENCES
(-)graphics/netpbm/files/patch-co (-11 lines)
Lines 1-11 Link Here
1
--- pnm/pnmtopalm/Makefile.orig	Thu Jan 11 11:59:53 2001
2
+++ pnm/pnmtopalm/Makefile	Sat Jan 13 00:00:00 2001
3
@@ -48,7 +48,7 @@
4
 	$(SRCDIR)/mkinstalldirs $(INSTALLDATA)
5
 	for x in palmcolor8.map palmgray1.map palmgray2.map palmgray4.map ;\
6
 	do \
7
-	   $(INSTALL) -c -m $(INSTALL_PERM_DATA) $(SRCSUBDIR)/$$x \
8
+	   ${BSD_INSTALL_DATA} $(SRCSUBDIR)/$$x \
9
                $(INSTALLDATA); \
10
 	done
11
 
(-)graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile (+22 lines)
Line 0 Link Here
1
--- converter/other/pnmtopalm/Makefile.orig	Mon Jun 10 13:40:28 2002
2
+++ converter/other/pnmtopalm/Makefile	Tue Jun 18 00:00:00 2002
3
@@ -35,15 +35,15 @@
4
 
5
 install.bin: install.bin.local
6
 .PHONY: install.bin.local
7
-install.bin.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
8
+install.bin.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
9
 
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
(-)graphics/netpbm/files/patch-converter::other::pnmtopng.c (+16 lines)
Line 0 Link Here
1
--- converter/other/pnmtopng.c.orig	Thu Apr 25 09:37:11 2002
2
+++ converter/other/pnmtopng.c	Tue Jun 18 00:00:00 2002
3
@@ -1857,8 +1857,13 @@
4
       fprintf(stderr,"pnmtopng version %s.\n", VERSION);
5
       fprintf(stderr, "   Compiled with libpng %s; using libpng %s.\n",
6
         PNG_LIBPNG_VER_STRING, png_libpng_ver);
7
+#ifdef zlib_version
8
       fprintf(stderr, "   Compiled with zlib %s; using zlib %s.\n",
9
         ZLIB_VERSION, zlib_version);
10
+#else
11
+      fprintf(stderr, "   Compiled with zlib %s.\n",
12
+        ZLIB_VERSION);
13
+#endif
14
       fprintf(stderr,    
15
         "   Compiled with %d-bit netpbm support (PPM_OVERALLMAXVAL = %d).\n",
16
         pm_maxvaltobits (PPM_OVERALLMAXVAL), PPM_OVERALLMAXVAL);
(-)graphics/netpbm/files/patch-converter::other::pnmtotiffcmyk.c (+15 lines)
Line 0 Link Here
1
--- converter/other/pnmtotiffcmyk.c.orig	Sat May 13 09:29:45 2000
2
+++ converter/other/pnmtotiffcmyk.c	Tue Jun 18 00:00:00 2002
3
@@ -71,8 +71,12 @@
4
 #define VERSION 1.01
5
 
6
 /* beware - these evaluate more than once */
7
+#ifndef MAX
8
 #define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) )
9
+#endif
10
+#ifndef MIN
11
 #define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) )
12
+#endif
13
 
14
 /* only support 8 bit values */
15
 #define MAXTIFFBITS 8
(-)graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile (+23 lines)
Line 0 Link Here
1
--- converter/ppm/ppmtompeg/Makefile.orig	Mon Jun 10 13:35:38 2002
2
+++ converter/ppm/ppmtompeg/Makefile	Tue Jun 18 00:00:00 2002
3
@@ -8,18 +8,12 @@
4
 include $(BUILDDIR)/Makefile.config
5
 
6
 JPEGLD =
7
-ifeq ($(JPEGLIB_DIR),NONE)
8
+ifeq ($(JPEGLIB),NONE)
9
   # 'nojpeg' is a module that implements all the jpeg access routines as
10
   # error messages that tell you we don't have jpeg capability
11
   JPEG_MODULE = nojpeg
12
 else
13
-  ifneq ($(JPEGLIB_DIR)x,x)
14
-    JPEGLD += -L$(JPEGLIB_DIR)
15
-    ifeq ($(NEED_RUNTIME_PATH),Y)
16
-      JPEGLD += -R$(JPEGLIB_DIR)
17
-    endif
18
-  endif
19
-  JPEGLD += -ljpeg
20
+  JPEGLD += `$(LIBOPT) $(LIBOPTOPT) $(JPEGLIB)`
21
   # 'jpeg' is a module that accesses J-movies via the JPEG library.
22
   JPEG_MODULE = jpeg
23
 endif
(-)graphics/netpbm/files/patch-cp (-16 lines)
Lines 1-16 Link Here
1
--- pnm/pnmtopng.c.orig	Sun Jul 22 12:32:22 2001
2
+++ pnm/pnmtopng.c	Sat Dec  8 00:00:00 2001
3
@@ -1441,8 +1441,13 @@
4
       fprintf(stderr,"pnmtopng version %s.\n", VERSION);
5
       fprintf(stderr, "   Compiled with libpng %s; using libpng %s.\n",
6
         PNG_LIBPNG_VER_STRING, png_libpng_ver);
7
+#ifdef zlib_version
8
       fprintf(stderr, "   Compiled with zlib %s; using zlib %s.\n",
9
         ZLIB_VERSION, zlib_version);
10
+#else
11
+      fprintf(stderr, "   Compiled with zlib %s.\n",
12
+        ZLIB_VERSION);
13
+#endif
14
       fprintf(stderr,    
15
         "   Compiled with %d-bit netpbm support (PPM_OVERALLMAXVAL = %d).\n",
16
         pm_maxvaltobits (PPM_OVERALLMAXVAL), PPM_OVERALLMAXVAL);
(-)graphics/netpbm/files/patch-lib::Makefile (+103 lines)
Line 0 Link Here
1
--- lib/Makefile.orig	Wed Jun 12 13:00:32 2002
2
+++ lib/Makefile	Tue Jun 18 00:00:00 2002
3
@@ -31,12 +31,14 @@
4
 # Library objects to be linked but not built by Makefile.common:
5
 LIBOBJECTS_X = util/shhopt.o util/nstring.o
6
 
7
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
8
+
9
 MANUALS3 = libnetpbm
10
 MANUALS5 = pbm pgm ppm pnm pam
11
 
12
 INTERFACE_HEADERS =  pm.h pbm.h bitio.h pbmfont.h \
13
-	pgm.h ppm.h ppm.h ppmcmap.h ppmfloyd.h colorname.h \
14
-	pnm.h pam.h pammap.h util/shhopt.h util/nstring.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
17
 
18
 HEADERLINKS = pm_config.h version.h compile.h shhopt.h
19
 
20
@@ -57,6 +59,9 @@
21
 
22
 $(LIBOBJECTS): %.o: %.c $(HEADERLINKS)
23
 # Note that the user may have configured -I options into CFLAGS.
24
+	$(CC) -c $(INCLUDE) $(CFLAGS) $(CADD) -o $@ $<
25
+
26
+$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS)
27
 	$(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $<
28
 
29
 SUBDIRS = util
30
@@ -67,7 +72,7 @@
31
 MAJ = $(NETPBM_MAJOR_RELEASE)
32
 MIN = $(NETPBM_MINOR_RELEASE)
33
 
34
-SONAME = libnetpbm.so.$(MAJ)
35
+SONAME = libnetpbm.so.$(SOVER)
36
 
37
 ifeq ($(NETPBMLIBTYPE),irixshared)
38
 # The libxxx.so link is needed to link the executables.
39
@@ -97,12 +102,9 @@
40
 # 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
 # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
43
-$(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
44
-	rm -f $@
45
-	$(SYMLINK) $< $@
46
-libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
47
-	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
48
-          -lc $(CADD)
49
+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
50
+	$(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
51
+          $(CADD)
52
 endif
53
 
54
 ifeq ($(NETPBMLIBTYPE),dll)
55
@@ -181,13 +183,10 @@
56
 .PHONY: install.lib
57
 ifeq ($(NETPBMLIBTYPE),unixshared)
58
 # install a Unix-style shared library
59
-install.lib: $(PKGDIR)/lib $(PKGDIR)/link
60
-	cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
61
-	$(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
62
-	  libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)  $(PKGDIR)/lib/
63
-	cd $(PKGDIR)/lib/ ; \
64
-          rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ); \
65
-          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME)
66
+install.lib: $(PKGDIR)/lib
67
+	cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).*
68
+	${BSD_INSTALL_DATA} \
69
+	  $(SONAME) $(PKGDIR)/lib/
70
 endif
71
 ifeq ($(NETPBMLIBTYPE),dll)
72
 #install a Windows DLL shared library
73
@@ -217,23 +216,23 @@
74
 # directory when you compile your programs.
75
 
76
 %_installhdr: $(PKGDIR)/include
77
-	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
78
+	${BSD_INSTALL_DATA} \
79
 	  $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/;
80
 
81
 .PHONY: install.staticlib
82
-install.staticlib: $(PKGDIR)/link
83
-	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
84
-	  $(PKGDIR)/link
85
+install.staticlib: $(PKGDIR)/lib
86
+	${BSD_INSTALL_DATA} libnetpbm.$(STATICLIBSUFFIX) \
87
+	  $(PKGDIR)/lib
88
 
89
 # Install a shared library stub -- the ".so" file used at link time to
90
 # prepare a program for dynamically linking a library at run time 
91
 .PHONY: install.sharedlibstub
92
-install.sharedlibstub: $(PKGDIR)/link
93
+install.sharedlibstub: $(PKGDIR)/lib
94
 ifeq ($(NETPBMLIBTYPE),unixshared)
95
 # install the link-time (.so) links to the runtime libraries
96
-	cd $(PKGDIR)/link ; \
97
+	cd $(PKGDIR)/lib ; \
98
           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
99
-          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
100
+          $(SYMLINK) $(SONAME) \
101
             libnetpbm.$(NETPBMLIBSUFFIX)
102
 endif
103
 ifeq ($(NETPBMLIBTYPE),dll)
(-)graphics/netpbm/files/patch-other::pnmarith.c (+15 lines)
Line 0 Link Here
1
--- other/pnmarith.c.orig	Sun Aug 13 13:08:04 1995
2
+++ other/pnmarith.c	Tue Jun 18 00:00:00 2002
3
@@ -147,9 +147,9 @@
4
 		    break;
5
 
6
 		    case '*':
7
-		    r1 = r1 * r2 / maxval3;
8
-		    g1 = g1 * g2 / maxval3;
9
-		    b1 = b1 * b2 / maxval3;
10
+		    r1 = (unsigned) r1 * r2 / maxval3;
11
+		    g1 = (unsigned) g1 * g2 / maxval3;
12
+		    b1 = (unsigned) b1 * b2 / maxval3;
13
 		    break;
14
 
15
 		    case 'D':
(-)graphics/netpbm/files/patch-pm_config.h (+35 lines)
Line 0 Link Here
1
--- pm_config.h.orig	Sat Jun 15 05:36:45 2002
2
+++ pm_config.h	Tue Jun 18 00:00:00 2002
3
@@ -35,6 +35,10 @@
4
 typedef unsigned int uint32n;
5
 typedef signed int int32n;
6
 
7
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
8
+#include <sys/param.h>
9
+#endif
10
+
11
 #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
12
 #define SYSV
13
 #endif
14
@@ -44,7 +48,7 @@
15
 ** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're
16
 ** probably better off setting SYSV - all it affects is string handling.
17
 */
18
-#define BSD
19
+/* #define BSD */
20
 /* #define SYSV */
21
 /* #define MSDOS */
22
 /* #define AMIGA */
23
@@ -118,9 +122,9 @@
24
 #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
25
 #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
26
 #else
27
-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
28
-#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
29
-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
30
+#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt"
31
+#define RGB_DB2 "%%X11BASE%%/lib/X11/rgb.txt"
32
+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt"
33
 #endif
34
 
35
 /* CONFIGURE: This is the name of an environment variable that tells
(-)graphics/netpbm/pkg-plist (-18 / +23 lines)
Lines 4-9 Link Here
4
bin/atktopbm
4
bin/atktopbm
5
bin/bioradtopgm
5
bin/bioradtopgm
6
bin/bmptopnm
6
bin/bmptopnm
7
bin/bmptoppm
7
bin/brushtopbm
8
bin/brushtopbm
8
bin/cmuwmtopbm
9
bin/cmuwmtopbm
9
bin/eyuvtoppm
10
bin/eyuvtoppm
Lines 11-19 Link Here
11
bin/fitstopnm
12
bin/fitstopnm
12
bin/fstopgm
13
bin/fstopgm
13
bin/g3topbm
14
bin/g3topbm
15
bin/gemtopbm
14
bin/gemtopnm
16
bin/gemtopnm
15
bin/giftopnm
17
bin/giftopnm
16
bin/gouldtoppm
18
bin/gouldtoppm
19
bin/hdifftopam
17
bin/hipstopgm
20
bin/hipstopgm
18
bin/hpcdtoppm
21
bin/hpcdtoppm
19
bin/icontopbm
22
bin/icontopbm
Lines 24-29 Link Here
24
bin/leaftoppm
27
bin/leaftoppm
25
bin/lispmtopgm
28
bin/lispmtopgm
26
bin/macptopbm
29
bin/macptopbm
30
bin/manweb
27
bin/mdatopbm
31
bin/mdatopbm
28
bin/mgrtopbm
32
bin/mgrtopbm
29
bin/mtvtoppm
33
bin/mtvtoppm
Lines 33-52 Link Here
33
bin/pamcut
37
bin/pamcut
34
bin/pamdeinterlace
38
bin/pamdeinterlace
35
bin/pamdice
39
bin/pamdice
40
bin/pamendian
36
bin/pamfile
41
bin/pamfile
37
bin/pamoil
42
bin/pamoil
43
bin/pamseq
44
bin/pamstack
38
bin/pamstretch
45
bin/pamstretch
39
bin/pamstretch-gen
46
bin/pamstretch-gen
47
bin/pamtohdiff
40
bin/pamtopnm
48
bin/pamtopnm
49
bin/pamtouil
41
bin/pbmclean
50
bin/pbmclean
42
bin/pbmlife
51
bin/pbmlife
43
bin/pbmmake
52
bin/pbmmake
44
bin/pbmmask
53
bin/pbmmask
45
bin/pbmmerge
46
bin/pbmpage
54
bin/pbmpage
47
bin/pbmpscale
55
bin/pbmpscale
48
bin/pbmreduce
56
bin/pbmreduce
49
bin/pbmtext
57
bin/pbmtext
58
bin/pbmtextps
50
bin/pbmto10x
59
bin/pbmto10x
51
bin/pbmto4425
60
bin/pbmto4425
52
bin/pbmtoascii
61
bin/pbmtoascii
Lines 79-85 Link Here
79
bin/pbmtoybm
88
bin/pbmtoybm
80
bin/pbmtozinc
89
bin/pbmtozinc
81
bin/pbmupc
90
bin/pbmupc
82
bin/pcdindex
91
bin/pcdovtoppm
83
bin/pcxtoppm
92
bin/pcxtoppm
84
bin/pgmbentley
93
bin/pgmbentley
85
bin/pgmcrater
94
bin/pgmcrater
Lines 87-94 Link Here
87
bin/pgmenhance
96
bin/pgmenhance
88
bin/pgmhist
97
bin/pgmhist
89
bin/pgmkernel
98
bin/pgmkernel
90
bin/pgmmerge
91
bin/pgmnoise
99
bin/pgmnoise
100
bin/pgmnorm
101
bin/pgmoil
92
bin/pgmramp
102
bin/pgmramp
93
bin/pgmslice
103
bin/pgmslice
94
bin/pgmtexture
104
bin/pgmtexture
Lines 118-128 Link Here
118
bin/pnmhisteq
128
bin/pnmhisteq
119
bin/pnmhistmap
129
bin/pnmhistmap
120
bin/pnmindex
130
bin/pnmindex
131
bin/pnminterp
121
bin/pnminvert
132
bin/pnminvert
122
bin/pnmmargin
133
bin/pnmmargin
123
bin/pnmmerge
124
bin/pnmmontage
134
bin/pnmmontage
125
bin/pnmnlfilt
135
bin/pnmnlfilt
136
bin/pnmnoraw
126
bin/pnmnorm
137
bin/pnmnorm
127
bin/pnmpad
138
bin/pnmpad
128
bin/pnmpaste
139
bin/pnmpaste
Lines 167-179 Link Here
167
bin/ppmhist
178
bin/ppmhist
168
bin/ppmlabel
179
bin/ppmlabel
169
bin/ppmmake
180
bin/ppmmake
170
bin/ppmmerge
171
bin/ppmmix
181
bin/ppmmix
182
bin/ppmnorm
172
bin/ppmntsc
183
bin/ppmntsc
173
bin/ppmpat
184
bin/ppmpat
174
bin/ppmquant
185
bin/ppmquant
175
bin/ppmquantall
186
bin/ppmquantall
176
bin/ppmqvga
177
bin/ppmrainbow
187
bin/ppmrainbow
178
bin/ppmrelief
188
bin/ppmrelief
179
bin/ppmshadow
189
bin/ppmshadow
Lines 185-190 Link Here
185
bin/ppmtogif
195
bin/ppmtogif
186
bin/ppmtoicr
196
bin/ppmtoicr
187
bin/ppmtoilbm
197
bin/ppmtoilbm
198
bin/ppmtojpeg
188
bin/ppmtoleaf
199
bin/ppmtoleaf
189
bin/ppmtolj
200
bin/ppmtolj
190
bin/ppmtomap
201
bin/ppmtomap
Lines 237-266 Link Here
237
bin/yuvtoppm
248
bin/yuvtoppm
238
bin/zeisstopnm
249
bin/zeisstopnm
239
include/bitio.h
250
include/bitio.h
251
include/colorname.h
240
include/pam.h
252
include/pam.h
241
include/pammap.h
253
include/pammap.h
242
include/pbm.h
254
include/pbm.h
255
include/pbmfont.h
243
include/pgm.h
256
include/pgm.h
244
include/pm.h
257
include/pm.h
245
include/pm_config.h
258
include/pm_config.h
259
include/pm_nstring.h
246
include/pm_shhopt.h
260
include/pm_shhopt.h
247
include/pnm.h
261
include/pnm.h
248
include/ppm.h
262
include/ppm.h
249
include/ppmcmap.h
263
include/ppmcmap.h
250
include/ppmdraw.h
264
include/ppmdraw.h
251
include/ppmfloyd.h
265
include/ppmfloyd.h
252
lib/libpbm.a
266
lib/libnetpbm.a
253
lib/libpbm.so
267
lib/libnetpbm.so
254
lib/libpbm.so.1
268
lib/libnetpbm.so.1
255
lib/libpgm.a
256
lib/libpgm.so
257
lib/libpgm.so.1
258
lib/libpnm.a
259
lib/libpnm.so
260
lib/libpnm.so.1
261
lib/libppm.a
262
lib/libppm.so
263
lib/libppm.so.1
264
share/netpbm/palmcolor8.map
269
share/netpbm/palmcolor8.map
265
share/netpbm/palmgray1.map
270
share/netpbm/palmgray1.map
266
share/netpbm/palmgray2.map
271
share/netpbm/palmgray2.map

Return to bug 39482