4 files changed, 35 insertions, 89 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 88c8a14640eb..bf2c51e62b03 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	png
-PORTVERSION=    1.2.1
+PORTVERSION=    1.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libpng.org/pub/png/src/ \
 		ftp://swrinde.nde.swri.edu/pub/png/src/ \
@@ -19,7 +19,7 @@ DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ache@FreeBSD.org
 
-MAKEFILE=	${WRKSRC}/scripts/makefile.std
+MAKEFILE=       ${WRKSRC}/scripts/makefile.freebsd
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	5
 
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index dd8f6f0a6f24..e7b14b028c8d 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1 +1 @@
-MD5 (libpng-1.2.1.tar.gz) = 75a21cbfae566158a0ac6d9f39087c4d
+MD5 (libpng-1.2.2.tar.gz) = 4a23be1a1752537ec3bf210bb3fd03ad
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
index 68afc9966bd9..77f9e454ca43 100644
--- a/graphics/png/files/patch-aa
+++ b/graphics/png/files/patch-aa
@@ -1,95 +1,37 @@
---- scripts/makefile.std.orig	Sat Jan  6 03:25:50 2001
-+++ scripts/makefile.std	Tue Sep 11 05:44:27 2001
-@@ -2,18 +2,30 @@
+--- scripts/makefile.freebsd.orig	Mon Apr 15 18:11:36 2002
++++ scripts/makefile.freebsd	Sun Apr 21 20:03:05 2002
+@@ -3,11 +3,13 @@
  # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
  # For conditions of distribution and use, see copyright notice in png.h
  
-+# read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
-+# have to change it.
-+# I bump PNGMAJ to 3, because imlib can't work with png 1.0.2.
-+# I should bump PNGMAJ for ports depend.
-+PNGMAJ = $(SHLIB_VER)
-+.if (${PORTOBJFORMAT} == "elf")
-+PNGVER = $(PNGMAJ)
-+.else
-+PNGMIN = 0
-+PNGVER = $(PNGMAJ).$(PNGMIN)
-+.endif
++.include <bsd.own.mk>
 +
  # where make install puts libpng.a and png.h
 -prefix=/usr/local
 +prefix=${PREFIX}
  
- # Where the zlib library and include files are located
- #ZLIBLIB=/usr/local/lib
- #ZLIBINC=/usr/local/include
--ZLIBLIB=../zlib
--ZLIBINC=../zlib
-+#ZLIBLIB=../zlib
-+#ZLIBINC=../zlib
- 
--CC=cc
--CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
--LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-+#CC=cc
-+CFLAGS+=-I.
-+LDFLAGS+=-L. -lpng -lz -lm -static
- 
- #RANLIB=echo
- RANLIB=ranlib
-@@ -22,12 +34,29 @@
- 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- 	pngwtran.o pngmem.o pngerror.o pngpread.o
- 
--all: libpng.a pngtest
-+.if (${ARCH} == "i386")
-+CFLAGS+=-DPNG_USE_PNGGCCRD
-+OBJS+=pnggccrd.o
-+.endif
-+
-+.SUFFIXES: .c .so .o
-+
-+.c.so:
-+	${CC} ${CFLAGS} -fPIC -DPIC -o $@ -c $<
-+
-+all: libpng.a libpng.so.${PNGVER}
- 
- libpng.a: $(OBJS)
- 	ar rc $@  $(OBJS)
+-PNGMAJ= 5
+-.if (${OBJFORMAT} == "elf")
++PNGMAJ= $(SHLIB_VER)
++.if (${PORTOBJFORMAT} == "elf")
+ PNGVER= $(PNGMAJ)
+ .else
+ PNGMIN= 0
+@@ -15,7 +17,7 @@
+ .endif
+ 
+ CFLAGS+= -I. -DPNG_USE_PNGGCCRD
+-.if (${MACHINE_ARCH} != "i386")
++.if (${ARCH} != "i386")
+ CFLAGS+= -DPNG_NO_ASSEMBLER_CODE
+ .endif
+ LDFLAGS+=-L. -lpng -lz -lm -static
+@@ -36,7 +38,7 @@
  	$(RANLIB) $@
  
-+libpng.so.${PNGVER}: $(OBJS:S/o$/so/g)
+ libpng.so.${PNGVER}: $(OBJS:S/o$/so/g)
+-.if (${OBJFORMAT} == "elf")
 +.if (${PORTOBJFORMAT} == "elf")
-+	${CC} -shared -Wl,-x,-soname,$@ -o $@ $(OBJS:S/o$/so/g) -lz -lm
-+.else
-+	${CC} -shared -Wl,-x -o $@ $(OBJS:S/o$/so/g) -lz -lm
-+.endif
-+
- pngtest: pngtest.o libpng.a
- 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
- 
-@@ -37,12 +66,12 @@
- install: libpng.a
- 	-@mkdir $(prefix)/include
- 	-@mkdir $(prefix)/lib
--	cp png.h $(prefix)/include
--	cp pngconf.h $(prefix)/include
--	chmod 644 $(prefix)/include/png.h
--	chmod 644 $(prefix)/include/pngconf.h
--	cp libpng.a $(prefix)/lib
--	chmod 644 $(prefix)/lib/libpng.a
-+	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include
-+	${BSD_INSTALL_DATA} libpng.a libpng.so.${PNGVER} $(prefix)/lib
-+	ln -sf libpng.so.${PNGVER} $(prefix)/lib/libpng.so
-+	$(RANLIB) $(prefix)/lib/libpng.a
-+	${BSD_INSTALL_MAN} libpng.3 libpngpf.3 $(prefix)/man/man3
-+	${BSD_INSTALL_MAN} png.5 $(prefix)/man/man5
- 
- clean:
- 	rm -f *.o libpng.a pngtest pngout.png
-@@ -69,4 +98,5 @@
- pngwtran.o: png.h pngconf.h
- pngwutil.o: png.h pngconf.h
- pngpread.o: png.h pngconf.h
-+pnggccrd.o: png.h pngconf.h pngasmrd.h
- 
+ 	${CC} -shared -Wl,-x,-soname,$@ -o $@ $(OBJS:S/o$/so/g) -lz -lm
+ .else
+ 	${CC} -shared -Wl,-x -o $@ $(OBJS:S/o$/so/g) -lz -lm
diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist
index 6ee9f0ba0b3b..bb355ff3d2c9 100644
--- a/graphics/png/pkg-plist
+++ b/graphics/png/pkg-plist
@@ -1,5 +1,9 @@
-include/png.h
-include/pngconf.h
+include/libpng/png.h
+@exec ln -sf libpng/%f %D/include/%f
+@unexec rm -f %D/include/%f
+include/libpng/pngconf.h
+@exec ln -sf libpng/%f %D/include/%f
+@unexec rm -f %D/include/%f
 lib/libpng.a
 lib/libpng.so.%%SHLIB_VER%%
 @exec ln -sf %f %B/libpng.so