1.0.2

The docs build uses the script-fu plug-in, so do it in the post-install target,
after the rest of the package is installed.

4 files changed, 21 insertions, 29 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 65139f46dd4..00962906eff 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 1998/09/22 06:11:37 garbled Exp $
+# $NetBSD: Makefile,v 1.26 1998/11/07 17:21:29 mycroft Exp $
 
-DISTNAME=	gimp-1.0.0
+DISTNAME=	gimp-1.0.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.0/v1.0.0/ \
-		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gimp/v1.0/v1.0.0/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.0/v1.0.2/ \
+		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gimp/v1.0/v1.0.2/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${GIMP_DATA}${EXTRACT_SUFX}
 
@@ -13,13 +13,13 @@ MAINTAINER=	bsieker@techfak.uni-bielefeld.de
 HOMEPAGE=	http://www.gimp.org/
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	gtk+-1.0.4:../../x11/gtk10
+DEPENDS+=	gtk+-1.0.6:../../x11/gtk10
 DEPENDS+=	mpeg-1.2.1:../../graphics/mpeg-lib
 DEPENDS+=	png-1.0.2:../../graphics/png
 DEPENDS+=	tiff-3.4:../../graphics/tiff
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
-CONFLICTS+=	gimp-0.99.28
+CONFLICTS+=	gimp-0.99.28 gimp-1.0.0
 
 GIMP_DATA=	gimp-data-extras-1.0.0
 
@@ -31,13 +31,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include"
 CFLAGS=		-pipe -O2 -I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 INFO_FILES=	pdb.info
 
 post-configure:
 	@${ECHO_MSG} "--> now configuring in ${GIMP_DATA}"
-	@(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${CONFIGURE_ENV} ${SH} \
-		${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} )
+	@(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${CONFIGURE_ENV} \
+	    ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 
 pre-build:
 	@if [ "$$DISPLAY" = "" ]; then \
@@ -46,8 +47,10 @@ pre-build:
 	 fi
 
 post-install:
+	@(cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET})
+	@(cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET})
 	@${ECHO_MSG} "--> now installing in ${GIMP_DATA}"
 	@(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+	    ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET})
 
 .include <../../mk/bsd.pkg.mk>
diff --git a/graphics/gimp/files/md5 b/graphics/gimp/files/md5
index c4356f6a270..bcb947e5ac7 100644
--- a/graphics/gimp/files/md5
+++ b/graphics/gimp/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.5 1998/08/07 13:21:36 agc Exp $
+$NetBSD: md5,v 1.6 1998/11/07 17:21:29 mycroft Exp $
 
-MD5 (gimp-1.0.0.tar.gz) = b08fbdea508e6df7058b5e3bef5b1e12
+MD5 (gimp-1.0.2.tar.gz) = 39a8d5e927c7deecbcad7fd832239ea3
 MD5 (gimp-data-extras-1.0.0.tar.gz) = 62fbffda0fdc34e89f04fb70c8e17672
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
deleted file mode 100644
index 9e3dc887a7c..00000000000
--- a/graphics/gimp/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 1998/08/07 10:40:47 agc Exp $
-
---- Makefile.in-orig	Sun Apr 12 00:42:59 1998
-+++ Makefile.in	Sun May  3 01:35:04 1998
-@@ -111,7 +111,7 @@
- palettedata = @palettedata@
- patterndata = @patterndata@
- 
--SUBDIRS = libgimp plug-ins app data
-+SUBDIRS = libgimp plug-ins app data docs
- 
- EXTRA_DIST = TODO NOTES gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc
- 
diff --git a/graphics/gimp/pkg/PLIST b/graphics/gimp/pkg/PLIST
index 30ef4c70ffc..486027af8e6 100644
--- a/graphics/gimp/pkg/PLIST
+++ b/graphics/gimp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1998/06/20 23:47:26 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 1998/11/07 17:21:30 mycroft Exp $
 bin/gimp
 bin/gimptool
 include/gck/gck.h
@@ -12,6 +12,7 @@ include/gck/gckui.h
 include/gck/gckvector.h
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
+include/libgimp/gimpfeatures.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpui.h
 @unexec install-info --delete %D/info/pdb.info %D/info/dir
@@ -80,8 +81,6 @@ lib/gimp/1.0/plug-ins/illusion
 lib/gimp/1.0/plug-ins/iwarp
 lib/gimp/1.0/plug-ins/jpeg
 lib/gimp/1.0/plug-ins/laplace
-lib/gimp/1.0/plug-ins/libgpc.a
-lib/gimp/1.0/plug-ins/libmegawidget.a
 lib/gimp/1.0/plug-ins/mail
 lib/gimp/1.0/plug-ins/max_rgb
 lib/gimp/1.0/plug-ins/maze
@@ -148,13 +147,16 @@ lib/libgck.la
 lib/libgck.so.1.0
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so.1.0
+lib/libgimp.so.1.2
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so.1.0
+lib/libgimpui.so.1.2
+lib/libgpc.a
+lib/libmegawidget.a
 man/man1/gimp.1
 man/man1/gimptool.1
 man/man3/gpc.3
+share/aclocal/gimp.m4
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr