Support WITH_PERL properly on -current.

4 files changed, 25 insertions, 3 deletions

diff --git a/graphics/gimp-devel/files/patch-ac b/graphics/gimp-devel/files/patch-ac
new file mode 100644
index 000000000000..22755b47efc9
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-ac
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat May  6 01:10:00 2000
++++ Makefile.in	Sat May  6 01:10:12 2000
+@@ -196,7 +196,7 @@
+ 
+ man_MANS = gimp.1 gimptool.1 gimprc.5
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
+ m4data_DATA = gimp.m4
+ 
+ scriptdata = 
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index 02c26a51f920..3fc2ddb5578a 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -19,7 +19,7 @@
  
 -gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
-+gimpdatadir=$datadir/gimp
++gimpdatadir=$datadir/$PACKAGE
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  localedir='${prefix}/${DATADIRNAME}/locale'
  
diff --git a/graphics/gimp-devel/files/patch-at b/graphics/gimp-devel/files/patch-at
new file mode 100644
index 000000000000..7bcd4597b5a2
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-at
@@ -0,0 +1,11 @@
+--- plug-ins/perl/config.pl.in.orig	Sat Apr  8 00:17:49 2000
++++ plug-ins/perl/config.pl.in	Sat Apr  8 00:18:18 2000
+@@ -91,7 +91,7 @@
+ $GIMP_LIBS_NOUI	=~ s%\$topdir%$topdir%g;
+ 
+ # $...1 variables should be put in front of the corresponding MakeMaker values.
+-$INC1    = "-I$topdir";
++$INC1    = "-I$topdir -I\$(PERL_INC)";
+ $DEFINE1 = $IN_GIMP ? "-DIN_GIMP" : "";
+ $DEFINE1 = " -Ddatadir=\"\\\"".expand($datadir)."\\\"\"";
+ 
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 83277a3e4bba..0ae8650bdd89 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -593,8 +593,8 @@ share/gimp/gradients/Coffee
 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/Dark_1
 share/gimp/gradients/Deep_Sea
 share/gimp/gradients/Default
 share/gimp/gradients/Flare_Glow_Angular_1
@@ -1311,8 +1311,8 @@ 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/tips/gimp_tips.uk.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/ca/LC_MESSAGES/gimp-libgimp.mo