Make this package work on Solaris.

4 files changed, 66 insertions, 10 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index c94daec26ac..2bcb38be90d 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/09/16 15:25:08 tron Exp $
+# $NetBSD: Makefile,v 1.16 1999/09/30 15:21:55 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/09/24 06:55:01 tg Exp
 #
 
@@ -11,6 +11,12 @@ HOMEPAGE=	http://www.ccil.org/~esr/giflib/
 
 USE_LIBTOOL=	yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=	CC="${CC} -I${LOCALBASE}/include"
+.endif
+
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/gif2x11.html
 
diff --git a/graphics/giflib/files/patch-sum b/graphics/giflib/files/patch-sum
index 425504fe576..0bed25cd927 100644
--- a/graphics/giflib/files/patch-sum
+++ b/graphics/giflib/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:07 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/30 15:21:55 agc Exp $
 
 MD5 (patch-aa) = 9ecb7a3292ae539e6c3664ee255cf50a
-MD5 (patch-ab) = d99558946b7bb4941ce2915452d2c1ca
+MD5 (patch-ab) = ba2b8becb479b6762d41c68649d88373
 MD5 (patch-ac) = 2a058183175ff62add83420abb13315c
 MD5 (patch-ad) = 708895123a702ec7beb4c7fe31990e17
+MD5 (patch-ae) = 2b918a85267684e8ed99bdfe725e7bc8
diff --git a/graphics/giflib/patches/patch-ab b/graphics/giflib/patches/patch-ab
index c2b6e19ae01..8e04eab6ca4 100644
--- a/graphics/giflib/patches/patch-ab
+++ b/graphics/giflib/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.6 1998/11/12 23:36:24 frueauf Exp $
+$NetBSD: patch-ab,v 1.7 1999/09/30 15:21:55 agc Exp $
 
---- util/Makefile.orig	Thu Jun 26 13:22:30 1997
-+++ util/Makefile	Mon Sep 14 20:26:57 1998
+--- util/Makefile.orig	Thu Jun 26 18:22:30 1997
++++ util/Makefile	Thu Sep 30 16:01:59 1999
 @@ -22,12 +22,12 @@
  # X_INC_DIR = /server/sun4/usr/new/lib/X11R4
  
@@ -9,7 +9,7 @@ $NetBSD: patch-ab,v 1.6 1998/11/12 23:36:24 frueauf Exp $
 -INC = -I../lib
 -GIF_LIB = ../lib/libgif.a
 -GIF_INC_DEPEND = ../lib/libgif.a ../lib/gif_lib.h ../lib/getarg.h
-+CFLAGS+= -I../lib
++CDEFS= -I../lib
 +GIF_LIB = ../lib/libgif.la
 +GIF_INC_DEPEND = ../lib/libgif.la ../lib/gif_lib.h ../lib/getarg.h
  
@@ -48,12 +48,14 @@ $NetBSD: patch-ab,v 1.6 1998/11/12 23:36:24 frueauf Exp $
  
  install-rle:
  	cp $(RLE) $(DEST)
-@@ -114,7 +115,7 @@
+@@ -113,8 +114,8 @@
+ install-iris:
  	cp $(IRIS) $(DEST)
  
- .c:
+-.c:
 -	$(CC) $(CFLAGS) $< $(GIF_LIB) -lm $(LDFLAGS) -o $*
-+	${LIBTOOL} --mode=link $(CC) $(CFLAGS) $< $(GIF_LIB) -lm $(LDFLAGS) -L$(X_LIB_DIR) $(XLIBS) -o $*
++.c:
++	${LIBTOOL} --mode=link $(CC) $(CDEFS) ${CFLAGS} $< $(GIF_LIB) -lm $(LDFLAGS) -L$(X_LIB_DIR) $(XLIBS) -o $*
  
  uninstall-utils:
  	(cd $(DEST); rm -f $(BINARIES) $(RLE) $(IRIS) $(SCRIPTS))
diff --git a/graphics/giflib/patches/patch-ae b/graphics/giflib/patches/patch-ae
new file mode 100644
index 00000000000..966191e838d
--- /dev/null
+++ b/graphics/giflib/patches/patch-ae
@@ -0,0 +1,47 @@
+$NetBSD: patch-ae,v 1.1 1999/09/30 15:21:55 agc Exp $
+
+Use ${MAKE}, not make
+
+--- Makefile	1999/09/30 15:10:53	1.1
++++ Makefile	1999/09/30 15:11:26
+@@ -5,20 +5,20 @@
+ VERSION=3.0
+ 
+ all:
+-	cd lib; make static shared
+-	cd util; make all
++	cd lib; ${MAKE} static shared
++	cd util; ${MAKE} all
+ 
+ install:
+-	cd lib; make install-lib
+-	cd util; make install-all
++	cd lib; ${MAKE} install-lib
++	cd util; ${MAKE} install-all
+ 
+ uninstall:
+-	cd lib; make uninstall-lib
+-	cd util; make uninstall-all
++	cd lib; ${MAKE} uninstall-lib
++	cd util; ${MAKE} uninstall-all
+ 
+ clean:
+-	cd lib; make clean
+-	cd util; make clean
++	cd lib; ${MAKE} clean
++	cd util; ${MAKE} clean
+ 	rm -f giflib-$(VERSION)-1.i386.rpm giflib-$(VERSION)-1.src.rpm \
+ 		giflib-$(VERSION).tar.gz core giflib.lsm
+ 
+@@ -28,9 +28,9 @@
+ 	gzip -f giflib-$(VERSION).tar
+ 
+ dist: Makefile
+-	make giflib-$(VERSION).tar.gz
++	${MAKE} giflib-$(VERSION).tar.gz
+ 	lsmgen.sh $(VERSION) `wc -c giflib-$(VERSION).tar.gz` >giflib.lsm
+-	make giflib-$(VERSION).tar.gz
++	${MAKE} giflib-$(VERSION).tar.gz
+ 	ls -l giflib-$(VERSION).tar.gz
+ 	@echo "Don't forget to build RPMs from root!"
+