Update "imlib" package to version 1.9.4. Because "imlib" works with our

updated "png" package the included "libpng-1.0.1" has been removed.

7 files changed, 16 insertions, 169 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 48f7537ec52..8f588c8060a 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.16 1999/03/04 09:30:45 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/03/05 23:46:19 tron Exp $
 #
 
-DISTNAME=	imlib-1.9.0
+DISTNAME=	imlib-1.9.4
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gnome.org/pub/imlib/TAR/ \
-		ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/imlib/ \
-		ftp://ftp.cdrom.com/pub/png/src/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PNG_DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=   ftp://ftp.gnome.org/pub/GNOME/sources/gnome-1.0/sources/ \
+		ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
+		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.labs.redhat.com/imlib/
 
 DEPENDS+=	gtk+-1.2.0:../../x11/gtk
-DEPENDS+=	tiff-3.4:../../graphics/tiff
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	giflib-3.0:../../graphics/giflib
+DEPENDS+=	jpeg-6b:../../graphics/jpeg
+DEPENDS+=	netpbm-19940301:../../graphics/netpbm
+DEPENDS+=	png-1.0.3:../../graphics/png
+DEPENDS+=	tiff-3.4:../../graphics/tiff
 
 USE_X11BASE=	yes
 USE_LIBTOOL=	yes
@@ -23,21 +24,6 @@ GNU_CONFIGURE=	yes
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
-CONFIGURE_ENV+=		CPPFLAGS='-I${PNG_WRKSRC} -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib'
-
-PNG_DISTNAME=		libpng-1.0.1
-PNG_MAKE_PROGRAM=	make
-PNG_MAKEFILE=		scripts/makefile.std
-PNG_WRKSRC=		${WRKDIR}/${PNG_DISTNAME}
-
-pre-build:
-	@cd ${PNG_WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${PNG_MAKE_PROGRAM} ${MAKE_FLAGS} \
-	  -f ${PNG_MAKEFILE}  ${ALL_TARGET}
-
-pre-install:	
-	@cd ${PNG_WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${PNG_MAKE_PROGRAM} ${MAKE_FLAGS} \
-	  -f ${PNG_MAKEFILE}  ${INSTALL_TARGET}
+CONFIGURE_ENV+=		CPPFLAGS='-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/files/md5 b/graphics/imlib/files/md5
index 1688decb434..dbefc521907 100644
--- a/graphics/imlib/files/md5
+++ b/graphics/imlib/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.4 1999/01/16 02:38:43 tron Exp $
+$NetBSD: md5,v 1.5 1999/03/05 23:46:19 tron Exp $
 
-MD5 (imlib-1.9.0.tar.gz) = 493d4b98bd411504f243d5775b76fea9
-MD5 (libpng-1.0.1.tar.gz) = 7dd031b93f0a9b99bd5fdccb38e270cb
+MD5 (imlib-1.9.4.tar.gz) = 8d0e50e28a5b203ff76f114bb38627c7
diff --git a/graphics/imlib/patches/patch-aa b/graphics/imlib/patches/patch-aa
index 5d8222a0af2..29b96789b66 100644
--- a/graphics/imlib/patches/patch-aa
+++ b/graphics/imlib/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 1999/01/06 00:42:37 tron Exp $
+$NetBSD: patch-aa,v 1.5 1999/03/05 23:46:19 tron Exp $
 
 --- configure.orig	Wed Dec 16 04:14:28 1998
 +++ configure	Wed Jan  6 01:36:14 1999
@@ -26,23 +26,3 @@ $NetBSD: patch-aa,v 1.4 1999/01/06 00:42:37 tron Exp $
      gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
      gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-@@ -4130,7 +4133,7 @@
- echo "configure: warning: *** Native GIF support will not be built (GIF header not found) ***" 1>&2
- fi
- 
--
-+if false; then
- echo $ac_n "checking for png_read_info in -lpng""... $ac_c" 1>&6
- echo "configure:4136: checking for png_read_info in -lpng" >&5
- ac_lib_var=`echo png'_'png_read_info | sed 'y%./+-%__p_%'`
-@@ -4252,6 +4255,10 @@
-   png_ok=yes
- fi
- rm -f conftest*
-+
-+else
-+  png_ok=no
-+fi
- 
- echo "$ac_t""$png_ok" 1>&6
- 
diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac
deleted file mode 100644
index 624661306f4..00000000000
--- a/graphics/imlib/patches/patch-ac
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1999/01/16 02:38:43 tron Exp $
-
---- ../libpng-1.0.1/scripts/makefile.std.orig	Sat Mar  7 21:12:04 1998
-+++ ../libpng-1.0.1/scripts/makefile.std	Tue Jan 12 00:06:13 1999
-@@ -8,25 +8,24 @@
- ZLIBLIB=../zlib
- ZLIBINC=../zlib
- 
--CC=cc
--CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
--LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-+CC=${LIBTOOL} --mode=compile cc
-+CFLAGS=-O # -g -DPNG_DEBUG=5
-+LDFLAGS=libpng101.la -lz -lm
- 
- #RANLIB=echo
- RANLIB=ranlib
- 
- # where make install puts libpng.a and png.h
--prefix=/usr/local
-+prefix=${PREFIX}
- 
- OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- 	pngwtran.o pngmem.o pngerror.o pngpread.o
- 
--all: libpng.a pngtest
-+all: libpng101.la
- 
--libpng.a: $(OBJS)
--	ar rc $@  $(OBJS)
--	$(RANLIB) $@
-+libpng101.la: $(OBJS)
-+	${LIBTOOL} --mode=link cc -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
- 
- pngtest: pngtest.o libpng.a
- 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-@@ -34,15 +33,10 @@
- test: pngtest
- 	./pngtest
- 
--install: libpng.a
--	-@mkdir $(prefix)/include
--	-@mkdir $(prefix)/lib
--	cp png.h $(prefix)/include
--	cp pngconf.h $(prefix)/include
--	chmod 644 $(prefix)/include/png.h
--	chmod 644 $(prefix)/include/pngconf.h
--	cp libpng.a $(prefix)/lib
--	chmod 644 $(prefix)/lib/libpng.a
-+install: libpng101.la
-+	${BSD_INSTALL_DATA_DIR} $(prefix)/include/png101
-+	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include/png101
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libpng101.la $(prefix)/lib
- 
- clean:
- 	rm -f *.o libpng.a pngtest pngout.png
diff --git a/graphics/imlib/patches/patch-ad b/graphics/imlib/patches/patch-ad
deleted file mode 100644
index ca2dd1ee349..00000000000
--- a/graphics/imlib/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/01/16 02:38:43 tron Exp $
-
---- utils/Makefile.in.orig	Wed Dec 16 04:15:44 1998
-+++ utils/Makefile.in	Tue Jan 12 00:29:33 1999
-@@ -94,7 +94,7 @@
- 
- imlib_config_SOURCES = imlib_config.c icons.c testimg.c
- 
--LDADD = ../gdk_imlib/libgdk_imlib.la $(GTK_LIBS)
-+LDADD = ../gdk_imlib/libgdk_imlib.la ../../libpng-1.0.1/libpng101.la $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -105,7 +105,7 @@
- LIBS = @LIBS@
- imlib_config_OBJECTS =  imlib_config.o icons.o testimg.o
- imlib_config_LDADD = $(LDADD)
--imlib_config_DEPENDENCIES =  ../gdk_imlib/libgdk_imlib.la
-+imlib_config_DEPENDENCIES =  ../gdk_imlib/libgdk_imlib.la ../../libpng-1.0.1/libpng101.la
- imlib_config_LDFLAGS = 
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff --git a/graphics/imlib/patches/patch-ae b/graphics/imlib/patches/patch-ae
deleted file mode 100644
index 11cf1652853..00000000000
--- a/graphics/imlib/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/01/16 02:38:43 tron Exp $
-
---- imlib-config.in.orig	Tue Jan 12 22:52:36 1999
-+++ imlib-config.in	Sat Jan 16 03:15:10 1999
-@@ -48,13 +48,13 @@
-       if test @includedir@ != /usr/include ; then
-         includes=-I@includedir@
-       fi
--      echo $includes @X_CFLAGS@ 
-+      echo -I@includedir@/png101 $includes @X_CFLAGS@ 
-       ;;
-     --cflags-gdk)
-       if test @includedir@ != /usr/include ; then
-         includes=-I@includedir@
-       fi
--      echo `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
-+      echo -I@includedir@/png101 `@GTK_CONFIG@ --cflags` $includes @X_CFLAGS@
-       ;;
-     --libs)
-       libdirs=-L@libdir@
diff --git a/graphics/imlib/pkg/PLIST b/graphics/imlib/pkg/PLIST
index d5563923411..ee91c0713ff 100644
--- a/graphics/imlib/pkg/PLIST
+++ b/graphics/imlib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/01/16 02:38:44 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/03/05 23:46:20 tron Exp $
 bin/imlib_config
 bin/imlib-config
 etc/imrc
@@ -9,27 +9,8 @@ include/gdk_imlib_types.h
 include/Imlib.h
 include/Imlib_private.h
 include/Imlib_types.h
-include/png101/png.h
-include/png101/pngconf.h
-lib/libImlib.so.10.0
+lib/libImlib.so.10.4
 lib/libImlib.a
 lib/libgdk_imlib.a
-lib/libgdk_imlib.so.10.0
-lib/libimlib-bmp.so.0.0
-lib/libimlib-bmp.a
-lib/libimlib-xpm.so.0.0
-lib/libimlib-xpm.a
-lib/libimlib-ppm.so.0.0
-lib/libimlib-ppm.a
-lib/libimlib-ps.so.0.0
-lib/libimlib-ps.a
-lib/libimlib-gif.a
-lib/libimlib-gif.so.0.0
-lib/libimlib-jpeg.a
-lib/libimlib-jpeg.so.0.0
-lib/libimlib-tiff.so.0.0
-lib/libimlib-tiff.a
-lib/libpng101.so.1.0
-lib/libpng101.a
+lib/libgdk_imlib.so.10.4
 share/aclocal/imlib.m4
-@dirrm include/png101