6 files changed, 15 insertions, 11 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 258df3fbeebb..3bc8f03ea8a7 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	9.23
+PORTVERSION=	9.24
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index dae89118eaf7..733f8618640b 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-9.23.tgz) = 5ee895ffdaaa90cb2f7614ec16d859ff
+MD5 (netpbm-9.24.tgz) = 4c73dbf91b8ee858f9e2fe688d7b0fff
diff --git a/graphics/netpbm/files/Makefile.config.FreeBSD b/graphics/netpbm/files/Makefile.config.FreeBSD
index 3343fa84fd11..9d8314a9f0c4 100644
--- a/graphics/netpbm/files/Makefile.config.FreeBSD
+++ b/graphics/netpbm/files/Makefile.config.FreeBSD
@@ -16,6 +16,8 @@ ZLIB_DIR = /usr/lib
 ZHDR_DIR = /usr/include
 URTLIB_DIR = NONE
 URTHDR_DIR = NONE
+LINUXSVGALIB_DIR = NONE
+LINUXSVGAHDR_DIR = NONE
 INSTALL_PREFIX = ${PREFIX}
 INSTALLBINARIES = $(INSTALL_PREFIX)/bin
 INSTALLSCRIPTS = $(INSTALLBINARIES)
diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be
index fe9a3166f0fa..df4acd5e9823 100644
--- a/graphics/netpbm/files/patch-be
+++ b/graphics/netpbm/files/patch-be
@@ -1,5 +1,5 @@
---- pgm/Makefile.orig	Fri Aug 17 13:42:24 2001
-+++ pgm/Makefile	Wed Sep  5 00:00:00 2001
+--- pgm/Makefile.orig	Sun Sep  9 04:31:29 2001
++++ pgm/Makefile	Mon Jan 28 00:00:00 2002
 @@ -33,6 +33,7 @@
  MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
  
@@ -13,7 +13,7 @@
  all:	$(PGMLIB) $(BINARIES) $(EXTRA_STATICLIB)
  .PHONY: merge
 -merge: $(MERGENAME)
-+merge: $(MERGENAME) $(EXTRA_STATICLIB) $(EXTRA_STATICLIB)
++merge: $(MERGENAME) $(EXTRA_STATICLIB)
  
  # LIBRARIES
  
diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg
index 322d002f0fda..5e57637769e6 100644
--- a/graphics/netpbm/files/patch-bg
+++ b/graphics/netpbm/files/patch-bg
@@ -1,6 +1,6 @@
---- ppm/Makefile.orig	Fri Aug 17 13:43:06 2001
-+++ ppm/Makefile	Wed Sep  5 00:00:00 2001
-@@ -67,6 +67,7 @@
+--- 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
@@ -8,15 +8,16 @@
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libppm
-@@ -74,14 +75,14 @@
+@@ -81,7 +82,7 @@
  
  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)
+ ppmsvgalib: %: %.o $(NETPBMLIBS) $(LIBOPT)
+ 	$(LD) $(LDFLAGS) -o $@ $< `$(LIBOPT) $(NETPBMLIBS)` $(LINUXSVGALD) \
+@@ -92,7 +93,7 @@
  	$(MAKE) -C ppmtompeg all
  	$(MAKE) -C hpcdtoppm all
  .PHONY: merge
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index f44631df8d8c..4fb9dc80f76d 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -234,6 +234,7 @@ bin/yuvsplittoppm
 bin/yuvtoppm
 bin/zeisstopnm
 include/pam.h
+include/pammap.h
 include/pbm.h
 include/pgm.h
 include/pm.h