Convert to ELF in accordance with Satoshi's instructions.

svn path=/head/; revision=13113

graphics/png/Makefile

@@ -3,7 +3,7 @@
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.12 1998/03/28 13:48:18 ache Exp $
+# $Id: Makefile,v 1.13 1998/07/09 23:39:36 ache Exp $
 #
 
 DISTNAME=       libpng-1.0.2
@@ -20,6 +20,6 @@ do-configure:
 	cd ${WRKSRC} && cp scripts/makefile.std Makefile
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>

graphics/png/files/patch-aa

@@ -45,10 +45,10 @@
   #RANLIB=echo
   RANLIB=ranlib
   
-+ # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
-+ # have to change it.
-+ PNGMAJ = 2
-+ PNGMIN = 1
++ # Set major and minor numbers that are ELF-compliant.
++ # The minor must _always_ be 0
++ PNGMAJ = 3
++ PNGMIN = 0
 + PNGVER = $(PNGMAJ).$(PNGMIN)
 + 
   # where make install puts libpng.a and png.h

graphics/png/pkg-plist

@@ -2,6 +2,6 @@ include/png.h
 include/pngconf.h
 lib/libpng.a
 @exec ranlib %D/%F
-lib/libpng.so.2.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libpng.so.3
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R