From 203180cb034392dc5c276b3957fd6fb6de4103c6 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Sat, 19 Sep 1998 01:22:42 +0000 Subject: [PATCH] Make this build in an ELF world. --- graphics/giflib/Makefile | 10 ++++++++-- graphics/giflib/pkg-plist | 5 +++-- graphics/libungif/Makefile | 10 ++++++++-- graphics/libungif/pkg-plist | 5 +++-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index f14af7f8930d..04483b3ca512 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -3,7 +3,7 @@ # Date created: 03 May 1997 # Whom: Thomas Gellekum # -# $Id: Makefile,v 1.1.1.1 1997/05/05 12:33:44 tg Exp $ +# $Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp $ # DISTNAME= giflib-3.0 @@ -17,6 +17,12 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/giflib @${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/giflib .endif - @${LDCONFIG} -m ${PREFIX}/lib + @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include + +.if ${PORTOBJFORMAT} == "elf" +GIFLIB= libgif.so.3 +.else +GIFLIB= libgif.so.3.0 +.endif diff --git a/graphics/giflib/pkg-plist b/graphics/giflib/pkg-plist index 78baa70d895a..0f1dac5e1567 100644 --- a/graphics/giflib/pkg-plist +++ b/graphics/giflib/pkg-plist @@ -31,9 +31,10 @@ include/giflib/getarg.h include/giflib/gif_hash.h include/giflib/gif_lib.h lib/libgif.a +lib/libgif.so lib/libgif.so.3.0 -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/doc/giflib/gif2bgi.html share/doc/giflib/gif2epsn.html share/doc/giflib/gif2herc.html diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile index f14af7f8930d..04483b3ca512 100644 --- a/graphics/libungif/Makefile +++ b/graphics/libungif/Makefile @@ -3,7 +3,7 @@ # Date created: 03 May 1997 # Whom: Thomas Gellekum # -# $Id: Makefile,v 1.1.1.1 1997/05/05 12:33:44 tg Exp $ +# $Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp $ # DISTNAME= giflib-3.0 @@ -17,6 +17,12 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/giflib @${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/giflib .endif - @${LDCONFIG} -m ${PREFIX}/lib + @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include + +.if ${PORTOBJFORMAT} == "elf" +GIFLIB= libgif.so.3 +.else +GIFLIB= libgif.so.3.0 +.endif diff --git a/graphics/libungif/pkg-plist b/graphics/libungif/pkg-plist index 78baa70d895a..0f1dac5e1567 100644 --- a/graphics/libungif/pkg-plist +++ b/graphics/libungif/pkg-plist @@ -31,9 +31,10 @@ include/giflib/getarg.h include/giflib/gif_hash.h include/giflib/gif_lib.h lib/libgif.a +lib/libgif.so lib/libgif.so.3.0 -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/doc/giflib/gif2bgi.html share/doc/giflib/gif2epsn.html share/doc/giflib/gif2herc.html