Attachment #19341 for bug #34382

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

Lines 6-12 Link Here

(-)graphics/netpbm/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= netpbm	8	PORTNAME= netpbm
9	PORTVERSION= 9.23	9	PORTVERSION= 9.24
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}

Line 1 Link Here

(-)graphics/netpbm/distinfo (-1 / +1 lines)
1	MD5 (netpbm-9.23.tgz) = 5ee895ffdaaa90cb2f7614ec16d859ff	1	MD5 (netpbm-9.24.tgz) = 4c73dbf91b8ee858f9e2fe688d7b0fff

Lines 16-21 Link Here

(-)graphics/netpbm/files/Makefile.config.FreeBSD (+2 lines)
16	ZHDR_DIR = /usr/include	16	ZHDR_DIR = /usr/include
17	URTLIB_DIR = NONE	17	URTLIB_DIR = NONE
18	URTHDR_DIR = NONE	18	URTHDR_DIR = NONE
		19	LINUXSVGALIB_DIR = NONE
		20	LINUXSVGAHDR_DIR = NONE
19	INSTALL_PREFIX = ${PREFIX}	21	INSTALL_PREFIX = ${PREFIX}
20	INSTALLBINARIES = $(INSTALL_PREFIX)/bin	22	INSTALLBINARIES = $(INSTALL_PREFIX)/bin
21	INSTALLSCRIPTS = $(INSTALLBINARIES)	23	INSTALLSCRIPTS = $(INSTALLBINARIES)

Lines 1-5 Link Here

(-)graphics/netpbm/files/patch-be (-3 / +3 lines)
1	--- pgm/Makefile.orig Fri Aug 17 13:42:24 2001	1	--- pgm/Makefile.orig Sun Sep 9 04:31:29 2001
2	+++ pgm/Makefile Wed Sep 5 00:00:00 2001	2	+++ pgm/Makefile Mon Jan 28 00:00:00 2002
3	@@ -33,6 +33,7 @@	3	@@ -33,6 +33,7 @@
4	MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))	4	MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
5		5
Lines 13-19 Link Here
13	all: $(PGMLIB) $(BINARIES) $(EXTRA_STATICLIB)	13	all: $(PGMLIB) $(BINARIES) $(EXTRA_STATICLIB)
14	.PHONY: merge	14	.PHONY: merge
15	-merge: $(MERGENAME)	15	-merge: $(MERGENAME)
16	+merge: $(MERGENAME) $(EXTRA_STATICLIB) $(EXTRA_STATICLIB)	16	+merge: $(MERGENAME) $(EXTRA_STATICLIB)
17		17
18	# LIBRARIES	18	# LIBRARIES
19		19




--- ppm/Makefile.orig	Mon Jan  7 07:04:08 2002
+++ ppm/Makefile	Mon Jan 28 00:00:00 2002
@@ -74,6 +74,7 @@
 
 LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
 	libppmfloyd.o bitio.o

 
 MANUALS1 = $(BINARIES) $(SCRIPTS)
 MANUALS3 = libppm
@@ -81,7 +82,7 @@
 
 MERGENAME= ppmmerge
 
-INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h
+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
 
 ppmsvgalib: %: %.o $(NETPBMLIBS) $(LIBOPT)
 	$(LD) $(LDFLAGS) -o $@ $< `$(LIBOPT) $(NETPBMLIBS)` $(LINUXSVGALD) \
@@ -92,7 +93,7 @@
 	$(MAKE) -C ppmtompeg all
 	$(MAKE) -C hpcdtoppm all
 .PHONY: merge

Lines 234-239 Link Here

(-)graphics/netpbm/pkg-plist (+1 lines)
234	bin/yuvtoppm	234	bin/yuvtoppm
235	bin/zeisstopnm	235	bin/zeisstopnm
236	include/pam.h	236	include/pam.h
		237	include/pammap.h
237	include/pbm.h	238	include/pbm.h
238	include/pgm.h	239	include/pgm.h
239	include/pm.h	240	include/pm.h

Return to bug 34382

Lines 1-6 Link Here

(-)graphics/netpbm/files/patch-bg (-6 / +7 lines)
1	--- ppm/Makefile.orig Fri Aug 17 13:43:06 2001	1	--- ppm/Makefile.orig Mon Jan 7 07:04:08 2002
2	+++ ppm/Makefile Wed Sep 5 00:00:00 2001	2	+++ ppm/Makefile Mon Jan 28 00:00:00 2002
3	@@ -67,6 +67,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 bitio.o
Lines 8-22 Link Here
8		8
9	MANUALS1 = $(BINARIES) $(SCRIPTS)	9	MANUALS1 = $(BINARIES) $(SCRIPTS)
10	MANUALS3 = libppm	10	MANUALS3 = libppm
11	@@ -74,14 +75,14 @@	11	@@ -81,7 +82,7 @@
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	.PHONY: all	18	ppmsvgalib: %: %.o $(NETPBMLIBS) $(LIBOPT)
19	all: $(LIBPPM) $(BINARIES) $(EXTRA_STATICLIB)	19	$(LD) $(LDFLAGS) -o $@ $< `$(LIBOPT) $(NETPBMLIBS)` $(LINUXSVGALD) \
		20	@@ -92,7 +93,7 @@
20	$(MAKE) -C ppmtompeg all	21	$(MAKE) -C ppmtompeg all
21	$(MAKE) -C hpcdtoppm all	22	$(MAKE) -C hpcdtoppm all
22	.PHONY: merge	23	.PHONY: merge