diff options
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/imlib/Makefile | 28 | ||||
-rw-r--r-- | graphics/imlib/files/md5 | 5 | ||||
-rw-r--r-- | graphics/imlib/patches/patch-ac | 57 | ||||
-rw-r--r-- | graphics/imlib/patches/patch-ad | 22 | ||||
-rw-r--r-- | graphics/imlib/patches/patch-ae | 20 | ||||
-rw-r--r-- | graphics/imlib/pkg/PLIST | 27 |
6 files changed, 147 insertions, 12 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index f878e833159..c6361351c90 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,15 +1,16 @@ -# $NetBSD: Makefile,v 1.11 1999/01/06 00:43:23 tron Exp $ +# $NetBSD: Makefile,v 1.12 1999/01/16 02:38:43 tron Exp $ # -DISTNAME= imlib-1.8.2 +DISTNAME= imlib-1.9.0 CATEGORIES= graphics -MASTER_SITES= ftp://gnomeftp.wgn.net/pub/gnome/sources/ \ - ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ +MASTER_SITES= ftp://ftp.gnome.org/pub/imlib/TAR/ \ + ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/imlib/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PNG_DISTNAME}${EXTRACT_SUFX} MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.labs.redhat.com/imlib/ -DEPENDS+= gtk+-1.1.9:../../x11/gtk +DEPENDS+= gtk+-1.1.12:../../x11/gtk DEPENDS+= tiff-3.4:../../graphics/tiff DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= giflib-3.0:../../graphics/giflib @@ -23,6 +24,21 @@ GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE} -CONFIGURE_ENV+= CPPFLAGS='-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib' +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} .include "../../mk/bsd.pkg.mk" diff --git a/graphics/imlib/files/md5 b/graphics/imlib/files/md5 index 2518a3633c9..1688decb434 100644 --- a/graphics/imlib/files/md5 +++ b/graphics/imlib/files/md5 @@ -1,3 +1,4 @@ -$NetBSD: md5,v 1.3 1998/12/21 16:50:01 tron Exp $ +$NetBSD: md5,v 1.4 1999/01/16 02:38:43 tron Exp $ -MD5 (imlib-1.8.2.tar.gz) = 4b86ee764f51241ef9a25f563e10c01d +MD5 (imlib-1.9.0.tar.gz) = 493d4b98bd411504f243d5775b76fea9 +MD5 (libpng-1.0.1.tar.gz) = 7dd031b93f0a9b99bd5fdccb38e270cb diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac new file mode 100644 index 00000000000..624661306f4 --- /dev/null +++ b/graphics/imlib/patches/patch-ac @@ -0,0 +1,57 @@ +$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 new file mode 100644 index 00000000000..ca2dd1ee349 --- /dev/null +++ b/graphics/imlib/patches/patch-ad @@ -0,0 +1,22 @@ +$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 new file mode 100644 index 00000000000..11cf1652853 --- /dev/null +++ b/graphics/imlib/patches/patch-ae @@ -0,0 +1,20 @@ +$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 91b38b99ddc..d5563923411 100644 --- a/graphics/imlib/pkg/PLIST +++ b/graphics/imlib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1998/12/13 21:42:03 tron Exp $ +@comment $NetBSD: PLIST,v 1.3 1999/01/16 02:38:44 tron Exp $ bin/imlib_config bin/imlib-config etc/imrc @@ -9,8 +9,27 @@ include/gdk_imlib_types.h include/Imlib.h include/Imlib_private.h include/Imlib_types.h -lib/libgdk_imlib.a -lib/libgdk_imlib.so.9.1 -lib/libImlib.so.9.1 +include/png101/png.h +include/png101/pngconf.h +lib/libImlib.so.10.0 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 share/aclocal/imlib.m4 +@dirrm include/png101 |