Update to 1.2.4.

7 files changed, 47 insertions, 61 deletions

diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 3e6108268f3e..e36c47b3f019 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.2.3
-PORTREVISION=	2
+PORTVERSION=	1.2.4
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,7 +20,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		mpeg_lib-1.3.1.tar.gz:mpeg
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	the GNU Image Manipulation Program
+COMMENT=	The GNU Image Manipulation Program
 
 LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -43,7 +42,7 @@ LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${MPEG_WRKSRC}" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MPEG_DISTFILE=	${DISTDIR}/mpeg_lib-1.3.1.tar.gz
@@ -52,10 +51,23 @@ MPEG_CONFIGURE_ENV=	OPTIMIZE="${CFLAGS}"
 MPEG_CONFIGURE_ARGS=	--prefix=${PREFIX} \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
-MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1 \
-		escputil-1.2.1 gimp-1.2.1 gimp-remote-1.2.1 gimptool-1.2.1
+MAN1=		gimp.1 gimptool.1 gimp-remote.1 \
+		gimp-1.2.1 gimp-remote-1.2.1 gimptool-1.2.1
 MAN5=		gimprc.5 gimprc-1.2.5
 
+.if defined(WITHOUT_PRINT)
+CONFIGURE_ARGS+=	--disable-print
+.else
+LIB_DEPENDS+=		gimpprint.2:${PORTSDIR}/print/gimp-print
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "The Gimp has the following tunable option(s):"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	WITHOUT_PRINT=yes	Turns off GIMP printing"
+	@${ECHO_MSG} ""
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(cd ${WRKDIR} && ${BZIP2_CMD} -dc ${GIMP_DISTFILE} | ${TAR} -xf -)
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 747412faca28..bab1f5c5c4ff 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-1.2.3.tar.bz2) = b19235f19f524f772a4aef597a69b1da
+MD5 (gimp-1.2.4.tar.bz2) = 63ac650507eaa2748eb28e9ff4801c32
 MD5 (mpeg_lib-1.3.1.tar.gz) = 9d803be0073f42acf87d5fbb339a183b
diff --git a/graphics/gimp1/files/patch-configure b/graphics/gimp1/files/patch-configure
index 25dd31d25b59..4d64eb9d8f9d 100644
--- a/graphics/gimp1/files/patch-configure
+++ b/graphics/gimp1/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Sun Feb 10 08:21:30 2002
-+++ configure	Sun May 19 23:52:50 2002
-@@ -746,7 +746,7 @@
+--- configure.orig	Mon May 19 18:46:21 2003
++++ configure	Sat May 31 19:37:03 2003
+@@ -1475,7 +1475,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
  LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
@@ -12,7 +9,7 @@ $FreeBSD$
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
  LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-@@ -5577,6 +5577,7 @@
+@@ -7535,6 +7535,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -20,7 +17,7 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11957,8 +11958,8 @@
+@@ -18639,8 +18640,8 @@
  
  fi
  
@@ -31,15 +28,3 @@ $FreeBSD$
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -13133,11 +13134,6 @@
-   *) # Relative path.
-     srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
--  esac
--
--  case "$ac_given_INSTALL" in
--  [/$]*) INSTALL="$ac_given_INSTALL" ;;
--  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-   esac
- 
-   echo creating "$ac_file"
diff --git a/graphics/gimp1/files/patch-libgimp::Makefile.in b/graphics/gimp1/files/patch-libgimp::Makefile.in
index b9cdc7868203..f025eddbe488 100644
--- a/graphics/gimp1/files/patch-libgimp::Makefile.in
+++ b/graphics/gimp1/files/patch-libgimp::Makefile.in
@@ -1,19 +1,19 @@
---- libgimp/Makefile.in.orig	Tue Feb 12 05:46:08 2002
-+++ libgimp/Makefile.in	Wed Feb 20 14:02:07 2002
-@@ -225,13 +225,13 @@
+--- libgimp/Makefile.in.orig	Mon May 19 19:07:25 2003
++++ libgimp/Makefile.in	Sat May 31 19:41:48 2003
+@@ -226,13 +226,13 @@
  gimpinclude_HEADERS =  	gimp.h				${PDB_WRAPPERS_H}		gimpchainbutton.h		gimpchannel.h			gimpcolorbutton.h		gimpcolordisplay.h		gimpcolorselector.h		gimpcolorspace.h	        gimpcompat.h			gimpdrawable.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimpgradientselect.h		gimphelpui.h			gimpimage.h			gimplayer.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimpparasite.h			gimpparasiteio.h		gimppatheditor.h		gimppixelrgn.h			gimppixmap.h			gimpproceduraldb.h		gimpquerybox.h			gimpselection.h			gimpsignal.h			gimpsizeentry.h			gimptile.h			gimptypes.h			gimpui.h			gimpunit.h			gimpunitmenu.h			gimputils.h			gimpvector.h			gimpwidgets.h			gimpintl.h
  
  
 -libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	$(no_undefined) 	$(libgimp_export_symbols)
-+libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) 	$(libgimp_export_symbols)
++libgimp_la_LDFLAGS =   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)    $(libgimp_export_symbols)
  
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
+-libgimp_la_LIBADD = $(GLIB_LIBS) $(libmath)
++libgimp_la_LIBADD = $(GTK_LIBS) $(libmath)
  
  libgimp_la_DEPENDENCIES = $(gimp_def)
  
 -libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	$(no_undefined) 	$(libgimpui_export_symbols)
-+libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) 	$(libgimpui_export_symbols)
++libgimpui_la_LDFLAGS =         -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)    $(libgimpui_export_symbols)
  
  
  libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)
diff --git a/graphics/gimp1/files/patch-plug-ins_Makefile.in b/graphics/gimp1/files/patch-plug-ins_Makefile.in
index 829f78c7162b..503a87e4f6e0 100644
--- a/graphics/gimp1/files/patch-plug-ins_Makefile.in
+++ b/graphics/gimp1/files/patch-plug-ins_Makefile.in
@@ -1,9 +1,9 @@
---- plug-ins/Makefile.in.orig	Fri Jul 27 21:36:22 2001
-+++ plug-ins/Makefile.in	Wed Aug 15 22:02:54 2001
-@@ -113,7 +113,7 @@
- HAVE_FINITE = @HAVE_FINITE@
+--- plug-ins/Makefile.in.orig	Mon May 19 19:07:31 2003
++++ plug-ins/Makefile.in	Sat May 31 19:44:38 2003
+@@ -111,7 +111,7 @@
+ GTK_CONFIG = @GTK_CONFIG@
+ GTK_LIBS = @GTK_LIBS@
  HAVE_GTK_DOC = @HAVE_GTK_DOC@
- HAVE_ISFINITE = @HAVE_ISFINITE@
 -HELPBROWSER = @HELPBROWSER@
 +#HELPBROWSER = @HELPBROWSER@
  HTML_DIR = @HTML_DIR@
diff --git a/graphics/gimp1/files/patch-plug-ins_print_print-escp2_c b/graphics/gimp1/files/patch-plug-ins_print_print-escp2_c
deleted file mode 100644
index 9575c80c7952..000000000000
--- a/graphics/gimp1/files/patch-plug-ins_print_print-escp2_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- plug-ins/print/print-escp2.c.orig	Fri Oct 13 01:17:44 2000
-+++ plug-ins/print/print-escp2.c	Fri Oct 13 01:18:14 2000
-@@ -26,6 +26,8 @@
-  * compile on generic platforms that don't support glib, gimp, gtk, etc.
-  */
- 
-+#include <sys/types.h>
-+
- #ifndef WEAVETEST
- #include "print.h"
- #endif
-@@ -4000,7 +4002,7 @@
- 	      if (lineoffs[0].v[j] != 0)
- 		fprintf(stderr,
- 			"WARNING: pass %d subpass %d row %d: lineoffs %ld\n",
--			w.pass, i, row, lineoffs[0].v[j]);
-+			w.pass, i, row, (long)lineoffs[0].v[j]);
- 	      lineoffs[0].v[j] = 0;
- 	      lineactive[0].v[j] = 0;
- 	    }
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 22845e4045c2..b276c8e85ffd 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1,5 +1,3 @@
-bin/escputil
-bin/escputil-1.2
 bin/gimp
 bin/gimp-1.2
 bin/gimp-config
@@ -1316,6 +1314,7 @@ share/gimp/scripts/pupi-button.scm
 share/gimp/scripts/rendermap.scm
 share/gimp/scripts/ripply-anim.scm
 share/gimp/scripts/round-corners.scm
+share/gimp/scripts/script-fu-util.scm
 share/gimp/scripts/sel-to-anim-img.scm
 share/gimp/scripts/select_to_brush.scm
 share/gimp/scripts/select_to_image.scm
@@ -1357,6 +1356,8 @@ share/gimp/tips/gimp_tips.ko.txt
 share/gimp/tips/gimp_tips.lt.txt
 share/gimp/tips/gimp_tips.pl.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.sk.txt
+share/gimp/tips/gimp_tips.sl.txt
 share/gimp/tips/gimp_tips.txt
 share/gimp/tips/gimp_tips.tr.txt
 share/gimp/tips/gimp_tips.uk.txt
@@ -1447,6 +1448,10 @@ share/locale/pl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pl/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/pl/LC_MESSAGES/gimp.mo
+share/locale/pt/LC_MESSAGES/gimp-libgimp.mo
+share/locale/pt/LC_MESSAGES/gimp-script-fu.mo
+share/locale/pt/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/pt/LC_MESSAGES/gimp.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
@@ -1463,6 +1468,10 @@ share/locale/sk/LC_MESSAGES/gimp-libgimp.mo
 share/locale/sk/LC_MESSAGES/gimp-script-fu.mo
 share/locale/sk/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/sk/LC_MESSAGES/gimp.mo
+share/locale/sl/LC_MESSAGES/gimp-libgimp.mo
+share/locale/sl/LC_MESSAGES/gimp-script-fu.mo
+share/locale/sl/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/sl/LC_MESSAGES/gimp.mo
 share/locale/sv/LC_MESSAGES/gimp-libgimp.mo
 share/locale/sv/LC_MESSAGES/gimp-script-fu.mo
 share/locale/sv/LC_MESSAGES/gimp-std-plugins.mo