Update "gimp" package to version 1.0.3 and libtoolize it properly.

"gimp" now uses "gtk+" version 1.2.x.

5 files changed, 50 insertions, 60 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index afc1cf030d3..a59b253570c 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.32 1999/03/04 14:59:23 tron Exp $
+# $NetBSD: Makefile,v 1.33 1999/04/04 14:42:19 tron Exp $
 
-DISTNAME=	gimp-1.0.2
+DISTNAME=	gimp-1.0.3
 CATEGORIES=	graphics
-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/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.0/v1.0.2/
-
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.0/v1.0.3/ \
+		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gimp/v1.0/v1.0.3/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.0/v1.0.3/
+EXTRACT_SUFX=	.tar.bz2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${GIMP_DATA}${EXTRACT_SUFX}
 
@@ -14,27 +14,25 @@ HOMEPAGE=	http://www.gimp.org/
 
 BUILD_DEPENDS=	emacs:../../editors/emacs
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	gtk10-1.0.6:../../x11/gtk10
+DEPENDS+=	gtk+-1.2.0:../../x11/gtk
 DEPENDS+=	mpeg-1.2.1:../../graphics/mpeg-lib
 DEPENDS+=	png-1.0.3:../../graphics/png
 DEPENDS+=	tiff-3.4:../../graphics/tiff
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
-NOT_FOR_ARCHS=	alpha	#illegal instruction, core dumped.
-
 GIMP_DATA=	gimp-data-extras-1.0.0
 
 .ifndef DISPLAY
-IS_INTERACTIVE=	yes
+IS_INTERACTIVE=		yes
 .endif
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk10-config"
-CFLAGS=		-pipe -O2 -I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-
-INFO_FILES=	pdb.info
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CPPFLAGS=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
+CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}"
 
 post-configure:
 	@${ECHO_MSG} "--> now configuring in ${GIMP_DATA}"
@@ -48,8 +46,9 @@ 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})
+.for DOC_TARGET in ${ALL_TARGET} ${INSTALL_TARGET}
+	@(cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${DOC_TARGET})
+.endfor
 	@${ECHO_MSG} "--> now installing in ${GIMP_DATA}"
 	@(cd ${WRKDIR}/${GIMP_DATA} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
 	    ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET})
diff --git a/graphics/gimp/files/md5 b/graphics/gimp/files/md5
index bcb947e5ac7..392e5da4204 100644
--- a/graphics/gimp/files/md5
+++ b/graphics/gimp/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.6 1998/11/07 17:21:29 mycroft Exp $
+$NetBSD: md5,v 1.7 1999/04/04 14:42:19 tron Exp $
 
-MD5 (gimp-1.0.2.tar.gz) = 39a8d5e927c7deecbcad7fd832239ea3
-MD5 (gimp-data-extras-1.0.0.tar.gz) = 62fbffda0fdc34e89f04fb70c8e17672
+MD5 (gimp-1.0.3.tar.bz2) = d4af07e1d05e39f9d07cf83ad6fba188
+MD5 (gimp-data-extras-1.0.0.tar.bz2) = 6c3865f33f9d950fed89c4298178ec2c
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index 177a2a3e83f..67ee97cf185 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,17 +1,33 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:47 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/04/04 14:42:19 tron Exp $
 
---- configure.orig	Wed Apr  8 10:16:20 1998
-+++ configure	Tue Apr 14 12:47:47 1998
-@@ -634,7 +634,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
+--- configure.orig	Mon Mar 29 22:52:47 1999
++++ configure	Sun Apr  4 14:59:12 1999
+@@ -642,7 +642,7 @@
+ # It thinks the first close brace ends the variable substitution.
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
- echo "configure:641: checking whether build environment is sane" >&5
-@@ -2228,7 +2228,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+@@ -1543,6 +1543,7 @@
+ fi
+ 
+ # Always use our own libtool.
++if false; then
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # Check for any special flags to pass to ltconfig.
+@@ -1774,6 +1775,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -3056,7 +3058,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
deleted file mode 100644
index 250071c80d4..00000000000
--- a/graphics/gimp/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.6 1999/02/19 14:25:31 rh Exp $
-
---- plug-ins/MapObject/Makefile.in.orig	Thu Oct 15 05:20:04 1998
-+++ plug-ins/MapObject/Makefile.in	Fri Feb 19 13:41:28 1999
-@@ -123,10 +123,10 @@
- 	amb1.xpm amb2.xpm arcball.c arcball.h diffint1.xpm diffint2.xpm diffref1.xpm diffref2.xpm high1.xpm high2.xpm mapobject_apply.c mapobject_apply.h mapobject_image.c mapobject_image.h mapobject_main.c mapobject_main.h mapobject_pixmaps.h mapobject_preview.c mapobject_preview.h mapobject_shade.c mapobject_shade.h mapobject_ui.c mapobject_ui.h specref1.xpm specref2.xpm	
- 
- INCLUDES = \
-+	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/plug-ins/libgck	\
--	-I$(includedir)			\
--	$(X_CFLAGS)
-+	-I$(includedir)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimpui.la	\
diff --git a/graphics/gimp/pkg/PLIST b/graphics/gimp/pkg/PLIST
index 486027af8e6..b3830a77277 100644
--- a/graphics/gimp/pkg/PLIST
+++ b/graphics/gimp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 1998/11/07 17:21:30 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.10 1999/04/04 14:42:20 tron Exp $
 bin/gimp
 bin/gimptool
 include/gck/gck.h
@@ -15,11 +15,6 @@ 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
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
-@exec install-info %D/info/pdb.info %D/info/dir
 lib/gimp/1.0/plug-ins/AlienMap
 lib/gimp/1.0/plug-ins/CEL
 lib/gimp/1.0/plug-ins/CML_explorer
@@ -143,14 +138,11 @@ lib/gimp/1.0/plug-ins/xpm
 lib/gimp/1.0/plug-ins/xwd
 lib/gimp/1.0/plug-ins/zealouscrop
 lib/libgck.a
-lib/libgck.la
 lib/libgck.so.1.0
 lib/libgimp.a
-lib/libgimp.la
-lib/libgimp.so.1.2
+lib/libgimp.so.1.3
 lib/libgimpui.a
-lib/libgimpui.la
-lib/libgimpui.so.1.2
+lib/libgimpui.so.1.3
 lib/libgpc.a
 lib/libmegawidget.a
 man/man1/gimp.1