From 16013d5acf03756ff9322af68e6c8a52ef251354 Mon Sep 17 00:00:00 2001 From: heko Date: Sat, 10 Nov 2001 11:13:48 +0000 Subject: [PATCH] Use libungif instead of libgif. brad@ ok --- astro/wmglobe/Makefile | 4 ++-- astro/wmglobe/patches/patch-Makefile | 9 ++++----- graphics/imlib/Makefile | 4 ++-- lang/kaffe/Makefile | 4 ++-- x11/windowmaker/Makefile | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile index 2d789d20d79..7efc3fede89 100644 --- a/astro/wmglobe/Makefile +++ b/astro/wmglobe/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2001/10/25 22:34:48 wilfried Exp $ +# $OpenBSD: Makefile,v 1.10 2001/11/10 11:13:48 heko Exp $ COMMENT= 'wm-dockapp; displays the earth on an icon' @@ -20,7 +20,7 @@ MASTER_SITES= ${HOMEPAGE} LIB_DEPENDS= jpeg.62::graphics/jpeg \ tiff.35::graphics/tiff \ png.2::graphics/png \ - gif.4::graphics/giflib \ + ungif.5::graphics/libungif \ wraster.4::x11/windowmaker USE_X11= Yes diff --git a/astro/wmglobe/patches/patch-Makefile b/astro/wmglobe/patches/patch-Makefile index a5e9c0fc5b5..1c221c02f49 100644 --- a/astro/wmglobe/patches/patch-Makefile +++ b/astro/wmglobe/patches/patch-Makefile @@ -1,13 +1,12 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/18 13:45:39 naddy Exp $ ---- Makefile.orig Mon Nov 8 20:26:54 1999 -+++ Makefile Tue Jan 16 22:38:36 2001 +$OpenBSD: patch-Makefile,v 1.2 2001/11/10 11:13:49 heko Exp $ +--- Makefile.orig Sun Aug 12 18:41:22 2001 ++++ Makefile Fri Nov 2 15:34:42 2001 @@ -1,12 +1,12 @@ -INC = -I/usr/X11R6/include -LIBS = -lXext -lX11 -lm -L/usr/X11R6/lib \ -- -ltiff -lXpm -lpng -lz -ljpeg -lungif -lwraster +INC = -I$(X11BASE)/include -I$(LOCALBASE)/include +LIBS = -lXext -lX11 -lm -L$(X11BASE)/lib -L$(LOCALBASE)/lib \ -+ -ltiff -lXpm -lpng -lz -ljpeg -lgif -lwraster + -ltiff -lXpm -lpng -lz -ljpeg -lungif -lwraster OBJS = src/wmglobe.o src/rend.o src/wmgutil.o \ src/sunpos.o src/myconvert.o src/mycontext.o diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 644edd178f3..32063db8618 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2001/11/01 21:16:53 wilfried Exp $ +# $OpenBSD: Makefile,v 1.36 2001/11/10 11:13:49 heko Exp $ # $FreeBSD: Makefile,v 1.45 1999/03/09 01:08:57 nectar Exp $ COMMENT= "image manipulation library for X11" @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= stable/sources/imlib LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \ jpeg.62::graphics/jpeg \ - gif.4.1::graphics/giflib \ + ungif.5::graphics/libungif \ png.2::graphics/png \ tiff.35::graphics/tiff BUILD_DEPENDS= ::graphics/netpbm diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index 44b7555cc93..5058df33d68 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2001/05/24 02:27:58 kevlo Exp $ +# $OpenBSD: Makefile,v 1.19 2001/11/10 11:13:49 heko Exp $ # # If you are getting compile errors like these: # Undefined symbol `_postOutOfMemory' referenced from text segment @@ -18,7 +18,7 @@ BUILD_DEPENDS= libtool::devel/libtool # You must have the X11 client packages installed; no good way to DEPEND this # (if you don't, I think it will build a command-line-only Java--untested). LIB_DEPENDS= jpeg.62.::graphics/jpeg \ - gif.4.::graphics/giflib \ + ungif.5.::graphics/libungif \ png.2.::graphics/png \ gmp.4.::devel/gmp diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile index 32c951c4d8d..0bcf9f9d7e7 100644 --- a/x11/windowmaker/Makefile +++ b/x11/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.48 2001/10/24 13:54:38 wilfried Exp $ +# $OpenBSD: Makefile,v 1.49 2001/11/10 11:13:49 heko Exp $ COMMENT= 'window manager that emulates NEXTSTEP(tm)' @@ -23,7 +23,7 @@ EXTRACT_SUFX= .tar.bz2 LIB_DEPENDS= jpeg.62::graphics/jpeg \ tiff.35::graphics/tiff \ png.2::graphics/png \ - gif.4.1::graphics/giflib + ungif.5::graphics/libungif NO_REGRESS= Yes SEPARATE_BUILD= concurrent