diff options
| author | Mark Murray <markm@FreeBSD.org> | 1998-09-14 19:43:12 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 1998-09-14 19:43:12 +0000 |
| commit | 22f81a0cd92b47df3231d043a680bd5fce1d2d61 (patch) | |
| tree | 0dbd00d4b2a4f186efff7c528b548a4cc8906dcc /graphics | |
| parent | ELF conversions as per Satoshi's instructions. (diff) | |
Convert to ELF in accordance with Satoshi's instructions.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/png/Makefile | 4 | ||||
| -rw-r--r-- | graphics/png/files/patch-aa | 8 | ||||
| -rw-r--r-- | graphics/png/pkg-plist | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 7517727db20a..46ee3c0bd51a 100644 --- a/graphics/png/Makefile +++ b/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> diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa index b7b896056f86..4930132fe3e6 100644 --- a/graphics/png/files/patch-aa +++ b/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 diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist index 7ce1a8f82bac..e79be6a03e34 100644 --- a/graphics/png/pkg-plist +++ b/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 |