4 files changed, 33 insertions, 22 deletions

diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 871993c0bc2c..d8b829a0f21a 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.1.18
+PORTVERSION=	1.1.19
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/old/v${PORTVERSION}/ \
-		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/ \
-		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
+		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
+		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
+		ftp://ftp.gimp.org/pub/gimp/unstable/old/v${PORTVERSION}/
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-.if !defined (WITHOUT_PERL)
+.if defined(USE_PERL)
 BUILD_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 RUN_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
@@ -37,9 +38,11 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-.if defined (WITHOUT_PERL)
+
+.if !defined(USE_PERL)
 CONFIGURE_ARGS=	--disable-perl
 .endif
+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
@@ -52,7 +55,7 @@ MAN5=		gimprc.5
 WITH_GNOME=	yes
 .endif
 
-.if defined(WITHOUT_PERL)
+.if !defined(USE_PERL)
 PLISTORIG=		${PKGDIR}/PLIST
 PLIST=			${WRKDIR}/PLIST
 .else
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 75190c8cb8f4..19af233ba067 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.18.tar.bz2) = 472ef3f6e814250d31faa63e467b03b9
+MD5 (gimp-1.1.19.tar.bz2) = 8ea7b1d7c79900f750392767980d7d55
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index 267a91fa0f0d..963f2c046f7d 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.orig	Sat Mar  4 10:23:00 2000
-+++ configure	Sun Apr  2 21:42:36 2000
+--- configure.orig	Wed Mar 29 18:55:23 2000
++++ configure	Sun Apr  9 14:46:44 2000
 @@ -1494,8 +1494,8 @@
  LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
  LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -37,23 +37,26 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7017,7 +7021,7 @@
+@@ -7016,8 +7020,8 @@
+ 
  fi
  
- gimpdatadir=$datadir/gimp
+-gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
++gimpdatadir=$datadir/gimp
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8563,10 +8567,6 @@
+@@ -8602,11 +8606,6 @@
+   *) # Relative path.
+     srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
- 
+-  esac
+-
 -  case "$ac_given_INSTALL" in
 -  [/$]*) INSTALL="$ac_given_INSTALL" ;;
 -  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--  esac
+   esac
  
    echo creating "$ac_file"
-   rm -f "$ac_file"
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 43f671d40a8d..f536b229402a 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -28,6 +28,7 @@ include/libgimp/gimppixmap.h
 include/libgimp/gimpquerybox.h
 include/libgimp/gimpsizeentry.h
 include/libgimp/gimpui.h
+include/libgimp/gimputils.h
 include/libgimp/gimpunit.h
 include/libgimp/gimpunitmenu.h
 include/libgimp/gimpvector.h
@@ -39,15 +40,15 @@ include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
-lib/libgck.so.18
+lib/libgck.so.19
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.18
+lib/libgimp.so.19
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.18
+lib/libgimpui.so.19
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 libexec/gimp/1.1/modules/libcdisplay_gamma.la
@@ -271,6 +272,7 @@ share/gimp/devel-docs/html/libgimp/gimppixmap.html
 share/gimp/devel-docs/html/libgimp/gimpsizeentry.html
 share/gimp/devel-docs/html/libgimp/gimpunitmenu.html
 share/gimp/devel-docs/html/libgimp/index.html
+share/gimp/devel-docs/html/libgimp/index.sgml
 share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
 share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
@@ -289,6 +291,7 @@ share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
 share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
@@ -349,7 +352,6 @@ share/gimp/gflare/Distant_Sun
 share/gimp/gflare/GFlare_101
 share/gimp/gflare/GFlare_102
 share/gimp/gflare/Hidden_Planet
-share/gimp/gimp1_1_splash.ppm
 share/gimp/gimp_logo.ppm
 share/gimp/gimp_splash.ppm
 share/gimp/gimprc
@@ -463,6 +465,7 @@ share/gimp/gradients/Cold_Steel
 share/gimp/gradients/Cold_Steel_2
 share/gimp/gradients/Crown_molding
 share/gimp/gradients/Dark_1
+share/gimp/gradients/Danish_flag
 share/gimp/gradients/Deep_Sea
 share/gimp/gradients/Default
 share/gimp/gradients/Flare_Glow_Angular_1
@@ -604,6 +607,7 @@ share/gimp/help/C/dialogs/paths/index.html
 share/gimp/help/C/dialogs/paths/paths.html
 share/gimp/help/C/dialogs/paths/rename_path.html
 share/gimp/help/C/dialogs/pattern_selection.html
+share/gimp/help/C/dialogs/preferences/default_comment.html
 share/gimp/help/C/dialogs/preferences/directories.html
 share/gimp/help/C/dialogs/preferences/display.html
 share/gimp/help/C/dialogs/preferences/environment.html
@@ -1078,6 +1082,7 @@ share/gimp/scripts/alien-glow-bar.scm
 share/gimp/scripts/alien-glow-bullet.scm
 share/gimp/scripts/alien-glow-button.scm
 share/gimp/scripts/alien-glow-logo.scm
+share/gimp/scripts/alien-neon-logo.scm
 share/gimp/scripts/asc2img.scm
 share/gimp/scripts/basic1-logo.scm
 share/gimp/scripts/basic2-logo.scm
@@ -1151,7 +1156,6 @@ share/gimp/scripts/starscape-logo.scm
 share/gimp/scripts/swirltile.scm
 share/gimp/scripts/swirly-pattern.scm
 share/gimp/scripts/t-o-p-logo.scm
-share/gimp/scripts/test-sphere.scm
 share/gimp/scripts/text-circle.scm
 share/gimp/scripts/texture.jpg
 share/gimp/scripts/texture1.jpg
@@ -1175,6 +1179,7 @@ share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.ko.txt
 share/gimp/tips/gimp_tips.pl.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.uk.txt
 share/gimp/tips/gimp_tips.txt
 share/gimp/unitrc
 share/gimp/user_install