diff options
author | tsarna <tsarna@pkgsrc.org> | 1999-05-02 17:46:19 +0000 |
---|---|---|
committer | tsarna <tsarna@pkgsrc.org> | 1999-05-02 17:46:19 +0000 |
commit | 2404734a6a70628a32bbb9094629b6789e6be20e (patch) | |
tree | e2dd46693ae6ce963f96784c92c6f55a20964540 /graphics | |
parent | 872b3cc653569d595b9c643af3ec4e3c9cb538d0 (diff) | |
download | pkgsrc-2404734a6a70628a32bbb9094629b6789e6be20e.tar.gz |
Changed to build shared libraries. Closes PR#7403 by Jarkko Torppa.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/gd/Makefile | 4 | ||||
-rw-r--r-- | graphics/gd/patches/patch-aa | 46 | ||||
-rw-r--r-- | graphics/gd/pkg/PLIST | 3 |
3 files changed, 38 insertions, 15 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 3f1e65559d2..1db60c099f5 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/08/20 15:17:00 tsarna Exp $ +# $NetBSD: Makefile,v 1.7 1999/05/02 17:46:19 tsarna Exp $ # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp # @@ -10,6 +10,8 @@ MASTER_SITES= ftp://www.boutell.com/pub/boutell/gd/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.boutell.com/gd/ +USE_LIBTOOL= yes + pre-install: ${MKDIR} ${PREFIX}/include/gd ${MKDIR} ${PREFIX}/share/examples/gd diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa index 39bb185a6ba..dcd62665a76 100644 --- a/graphics/gd/patches/patch-aa +++ b/graphics/gd/patches/patch-aa @@ -1,27 +1,47 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:46 agc Exp $ - ---- Makefile.orig Tue Aug 8 14:28:27 1995 -+++ Makefile Sat Jun 14 18:19:04 1997 -@@ -7,9 +7,9 @@ +$NetBSD: patch-aa,v 1.3 1999/05/02 17:46:19 tsarna Exp $ +--- Makefile.orig Tue Aug 8 15:28:27 1995 ++++ Makefile Fri Apr 16 03:49:36 1999 +@@ -7,28 +7,32 @@ #If the ar command fails on your system, consult the ar manpage #for your system. -CC=gcc -AR=ar -CFLAGS=-O -+#CC=gcc -+#AR=ar -+#CFLAGS=-O - LIBS=-L./ -lgd -lm +-LIBS=-L./ -lgd -lm ++CC=${LIBTOOL} cc ++LIBS=libgd.la -lm ++OBJS=gd.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o all: libgd.a gddemo giftogd webgif -@@ -32,3 +32,11 @@ + + gddemo: gddemo.o libgd.a gd.h gdfonts.h gdfontl.h +- $(CC) gddemo.o -o gddemo $(LIBS) ++ ${LIBTOOL} --mode=link cc gddemo.o -o gddemo $(LIBS) + + giftogd: giftogd.o libgd.a gd.h +- $(CC) giftogd.o -o giftogd $(LIBS) ++ ${LIBTOOL} --mode=link cc giftogd.o -o giftogd $(LIBS) + +-libgd.a: gd.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \ +- gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h +- rm -f libgd.a +- $(AR) rc libgd.a gd.o gdfontt.o gdfonts.o gdfontmb.o \ +- gdfontl.o gdfontg.o ++libgd.a: ${OBJS} gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h ++ ${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:0 + + webgif: webgif.o libgd.a gd.h +- $(CC) webgif.o -o webgif $(LIBS) ++ ${LIBTOOL} --mode=link cc webgif.o -o webgif $(LIBS) + clean: - rm -f *.o *.a gddemo giftogd +- rm -f *.o *.a gddemo giftogd ++ rm -f *.lo *.o *.a gddemo giftogd +install: -+ install -cs -o bin -g bin gddemo giftogd webgif ${PREFIX}/bin -+ install -c -o bin -g bin libgd.a ${PREFIX}/lib ++ ${LIBTOOL} --mode=install install -cs -o bin -g bin gddemo giftogd webgif ${PREFIX}/bin ++ ${LIBTOOL} --mode=install install -c -o bin -g bin libgd.la ${PREFIX}/lib + install -c -o bin -g bin gd.h gdfonts.h ${PREFIX}/include/gd + install -c -o bin -g bin gdfontt.h gdfontmb.h ${PREFIX}/include/gd + install -c -o bin -g bin gdfontl.h gdfontg.h ${PREFIX}/include/gd diff --git a/graphics/gd/pkg/PLIST b/graphics/gd/pkg/PLIST index 1b2aee46472..b7b86ecda32 100644 --- a/graphics/gd/pkg/PLIST +++ b/graphics/gd/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1998/03/08 00:49:34 tron Exp $ +@comment $NetBSD: PLIST,v 1.3 1999/05/02 17:46:20 tsarna Exp $ bin/gddemo bin/giftogd bin/webgif @@ -9,6 +9,7 @@ include/gd/gdfontmb.h include/gd/gdfonts.h include/gd/gdfontt.h lib/libgd.a +lib/libgd.so.0.0 share/examples/gd/demoin.gif share/examples/gd/index.html @dirrm include/gd |