diff options
author | tv <tv@pkgsrc.org> | 1998-07-14 19:55:49 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 1998-07-14 19:55:49 +0000 |
commit | 8f2b7f65a55c69dd4b0c16f9c42f85d001649bd2 (patch) | |
tree | 8be7ae129194183703cc80a50ad65b15aa63c333 /graphics | |
parent | 653a9bd1923205fd5a6492e21e8bc8501aae3844 (diff) | |
download | pkgsrc-8f2b7f65a55c69dd4b0c16f9c42f85d001649bd2.tar.gz |
Update to use libtool; it now works on ELF and static-only platforms.
Make use of ${BSD_INSTALL_*} macros.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/giflib/Makefile | 9 | ||||
-rw-r--r-- | graphics/giflib/patches/patch-aa | 58 | ||||
-rw-r--r-- | graphics/giflib/patches/patch-ab | 37 | ||||
-rw-r--r-- | graphics/giflib/pkg/PLIST | 5 |
4 files changed, 69 insertions, 40 deletions
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index 5c4ee964b35..61453ef46fd 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/06/04 16:13:39 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 1998/07/14 19:55:49 tv Exp $ # FreeBSD Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp # @@ -8,13 +8,12 @@ MASTER_SITES= http://www.ccil.org/~esr/giflib/ MAINTAINER= packages@netbsd.org -.include "../../mk/bsd.prefs.mk" +BUILD_DEPENDS= ${PREFIX}/bin/libtool:../../devel/libtool + +MAKE_ENV= LIBTOOL=${PREFIX}/bin/libtool post-install: -.if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/giflib @${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/giflib -.endif - @${LDCONFIG} || ${TRUE} .include "../../mk/bsd.pkg.mk" diff --git a/graphics/giflib/patches/patch-aa b/graphics/giflib/patches/patch-aa index c39f47fd372..108b2ad4c65 100644 --- a/graphics/giflib/patches/patch-aa +++ b/graphics/giflib/patches/patch-aa @@ -1,5 +1,5 @@ ---- lib/Makefile.orig Thu Jun 26 20:07:56 1997 -+++ lib/Makefile Wed Sep 24 08:51:35 1997 +--- lib/Makefile.orig Thu Jun 26 14:07:56 1997 ++++ lib/Makefile Tue Jul 14 15:37:23 1998 @@ -11,9 +11,10 @@ # @@ -13,7 +13,7 @@ # # What devices we should be able to grab into gif images. Note that if -@@ -63,14 +64,22 @@ +@@ -63,28 +64,20 @@ CC = gcc # #CFLAGS = -fno-builtin -O -c -W -Wreturn-type -Wcomment @@ -24,38 +24,40 @@ OBJS = dev2gif.o egif_lib.o dgif_lib.o gifalloc.o gif_font.o gif_hash.o \ gif_err.o quantize.o qprintf.o getarg.o -+SOBJS = dev2gif.so egif_lib.so dgif_lib.so gifalloc.so gif_font.so \ -+ gif_hash.so gif_err.so quantize.so qprintf.so getarg.so -+ -+.SUFFIXES: .o .so -+ .c.o: - $(CC) $(INCS) $(DEVS) $(CFLAGS) $< -+ $(CC) -c $(INCS) $(DEVS) $(CFLAGS) $< -+ -+.c.so: -+ $(CC) -c $(INCS) $(DEVS) $(CFLAGS) -fpic -DPIC -o $@ $< - - all: static shared - -@@ -82,9 +91,9 @@ - ar rcv libgif.a $(OBJS) - -ranlib libgif.a - ++ ${LIBTOOL} --mode=compile $(CC) -c $(INCS) $(DEVS) $(CFLAGS) $< + +-all: static shared ++all static shared: libgif.la + +-static: libgif.a +-shared: $(SHLIB) +- +-libgif.a: $(OBJS) +- rm -f libgif.a +- ar rcv libgif.a $(OBJS) +- -ranlib libgif.a +- -$(SHLIB): $(OBJS) -+$(SHLIB): $(SOBJS) - rm -f libgif.so.$(V) +- rm -f libgif.so.$(V) - gcc -shared -o $(SHLIB) $(OBJS) -+ ld -Bshareable -o $(SHLIB) $(SOBJS) ++libgif.la: $(OBJS) ++ ${LIBTOOL} --mode=link ${CC} -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib \ ++ -version-info 3:0 dev2gif.o: gif_lib.h egif_lib.o: gif_lib.h gif_hash.h -@@ -99,6 +108,8 @@ - - install-lib: libgif.a - cp libgif.a libgif.so.$(V) $(LIBDIR) -+ mkdir -p $(INCDIR) -+ cp *.h $(INCDIR) +@@ -97,8 +90,10 @@ + qprintf.o: gif_lib.h + getarg.o: getarg.h + +-install-lib: libgif.a +- cp libgif.a libgif.so.$(V) $(LIBDIR) ++install-lib: libgif.la ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libgif.la ${PREFIX}/lib ++ mkdir -p ${INCDIR} ++ ${BSD_INSTALL_DATA} *.h ${INCDIR} uninstall-lib: shared static rm -f $(LIBDIR)/libgif.a $(LIBDIR)/$(SHLIB) diff --git a/graphics/giflib/patches/patch-ab b/graphics/giflib/patches/patch-ab index 443dace96f0..361d6796f2f 100644 --- a/graphics/giflib/patches/patch-ab +++ b/graphics/giflib/patches/patch-ab @@ -1,14 +1,15 @@ ---- util/Makefile.orig Wed Sep 24 05:11:17 1997 -+++ util/Makefile Wed Sep 24 05:13:59 1997 +--- util/Makefile.orig Thu Jun 26 13:22:30 1997 ++++ util/Makefile Tue Jul 14 15:46:43 1998 @@ -22,12 +22,13 @@ # X_INC_DIR = /server/sun4/usr/new/lib/X11R4 # Declare the include files and libraries for the GIF utils: -INC = -I../lib -GIF_LIB = ../lib/libgif.a +-GIF_INC_DEPEND = ../lib/libgif.a ../lib/gif_lib.h ../lib/getarg.h +CFLAGS+= -I../lib -+GIF_LIB = -L../lib -lgif - GIF_INC_DEPEND = ../lib/libgif.a ../lib/gif_lib.h ../lib/getarg.h ++GIF_LIB = ../lib/libgif.la ++GIF_INC_DEPEND = ../lib/libgif.la ../lib/gif_lib.h ../lib/getarg.h +LDFLAGS = -s # Where to copy executables to: @@ -34,3 +35,31 @@ BINARIES = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg \ gifclip gifclrmp gifcomb giffix gifflip gifhisto \ +@@ -105,7 +106,8 @@ + iris: $(IRIS) + + install-all: +- cp $(BINARIES) $(SCRIPTS) $(DEST) ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $(BINARIES) $(DEST) ++ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(DEST) + + install-rle: + cp $(RLE) $(DEST) +@@ -114,7 +116,7 @@ + cp $(IRIS) $(DEST) + + .c: +- $(CC) $(CFLAGS) $< $(GIF_LIB) -lm $(LDFLAGS) -o $* ++ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $< $(GIF_LIB) -lm $(LDFLAGS) -o $* + + uninstall-utils: + (cd $(DEST); rm -f $(BINARIES) $(RLE) $(IRIS) $(SCRIPTS)) +@@ -123,7 +125,7 @@ + $(CC) gif2iris.c $(CFLAGS) $(LDFLAGS) -lgl_s -o gif2iris + + gif2x11: gif2x11.c +- $(CC) gif2x11.c $(CFLAGS) -I$(X_INC_DIR) -L$(X_LIB_DIR) $(LDFLAGS) $(GIF_LIB) $(XLIBS) -o gif2x11 ++ ${LIBTOOL} --mode=link $(CC) gif2x11.c $(CFLAGS) -I$(X_INC_DIR) -L$(X_LIB_DIR) $(LDFLAGS) $(GIF_LIB) $(XLIBS) -o gif2x11 + + + clean: diff --git a/graphics/giflib/pkg/PLIST b/graphics/giflib/pkg/PLIST index 5018fbf7992..4f709325e97 100644 --- a/graphics/giflib/pkg/PLIST +++ b/graphics/giflib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1998/02/02 08:59:58 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/07/14 19:55:50 tv Exp $ bin/gif2epsn bin/gif2ps bin/gif2rgb @@ -32,9 +32,8 @@ include/giflib/getarg.h include/giflib/gif_hash.h include/giflib/gif_lib.h lib/libgif.a +lib/libgif.la lib/libgif.so.3.0 -@exec /sbin/ldconfig || /usr/bin/true -@unexec /sbin/ldconfig || /usr/bin/true share/doc/giflib/gif2bgi.html share/doc/giflib/gif2epsn.html share/doc/giflib/gif2herc.html |