4 files changed, 16 insertions, 36 deletions

diff --git a/x11-toolkits/p5-Gnome/Makefile b/x11-toolkits/p5-Gnome/Makefile
index 4022031a17ee..a0d274371c40 100644
--- a/x11-toolkits/p5-Gnome/Makefile
+++ b/x11-toolkits/p5-Gnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Gnome
-PORTVERSION=	0.7004
+PORTVERSION=	0.7005
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gtk
@@ -19,10 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk
 
 USE_PERL5=	yes
 USE_GNOME=	yes
+PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	--with-panel CC="${CC}" CCFLAGS="${CFLAGS}"
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gnome/distinfo b/x11-toolkits/p5-Gnome/distinfo
index ebd8f2180544..dee506a44476 100644
--- a/x11-toolkits/p5-Gnome/distinfo
+++ b/x11-toolkits/p5-Gnome/distinfo
@@ -1 +1 @@
-MD5 (Gtk-Perl-0.7004.tar.gz) = f8f5d889e7a005667a93946ab1bf3e69
+MD5 (Gtk-Perl-0.7005.tar.gz) = a1a1e13f1017e7dd005cc8bc426b09aa
diff --git a/x11-toolkits/p5-Gnome/files/patch-Makefile.PL b/x11-toolkits/p5-Gnome/files/patch-Makefile.PL
index ee3779a021d1..760ec0736a12 100644
--- a/x11-toolkits/p5-Gnome/files/patch-Makefile.PL
+++ b/x11-toolkits/p5-Gnome/files/patch-Makefile.PL
@@ -1,35 +1,17 @@
---- Makefile.PL.orig	Tue Jun 20 18:36:15 2000
-+++ Makefile.PL	Mon Oct 30 03:52:25 2000
-@@ -1,7 +1,5 @@
+--- Makefile.PL.orig	Mon Mar 12 06:06:22 2001
++++ Makefile.PL	Mon Mar 12 06:08:32 2001
+@@ -1,6 +1,4 @@
  use ExtUtils::MakeMaker;
- use File::Basename;
--use blib '..';
+-use blib '../Gtk';
 -use blib '../GdkImlib';
- use Gtk::Install::Files;
- use Gtk::Gdk::ImlibImage::Install::Files;
  use Cwd;
-@@ -46,12 +44,12 @@
- 	$typemaps, [keys %defs], [@defines], [@headers], $pm);
- 
- foreach (@typemaps) {
--	print "Add typemap: $Gtk::Install::Files::CORE/$_\n";
--	push(@$typemaps, cwd() .'/'.$Gtk::Install::Files::CORE . '/'. $_);
-+	print "Add typemap: $Gtk::Install::Files::CORE$_\n";
-+	push(@$typemaps, '/'.$Gtk::Install::Files::CORE . $_);
- }
- foreach (@Gtk::Gdk::ImlibImage::Install::Files::typemaps) {
--	print "Add typemap: $Gtk::Gdk::ImlibImage::Install::Files::CORE/$_\n";
--	push(@$typemaps, cwd() .'/'.$Gtk::Gdk::ImlibImage::Install::Files::CORE . '/'. $_);
-+	print "Add typemap: $Gtk::Gdk::ImlibImage::Install::Files::CORE$_\n";
-+	push(@$typemaps, '/'.$Gtk::Gdk::ImlibImage::Install::Files::CORE . $_);
- }
- push(@defines, @Gtk::Install::Files::defines, @Gtk::Gdk::ImlibImage::Install::Files::defines);
- #push(@defines, '-I../build', '-Ibuild', '-I.', '-I../Gtk');
-@@ -127,7 +125,6 @@
- 	'LIBS' => [$libs],
- 	'OBJECT' => $object,
- 	'clean' => {FILES => join(' ', @clean) },
+ require '../Depends.pm';
+ require '../tools/gendefs.pl';
+@@ -88,7 +86,6 @@
+ 	'XSOPT' => '-noversioncheck',
+ 	'DEFINE'    => join(' ',@defines),
+ 	'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" },
 -	'OPTIMIZE' => '-O2 -g',
- 	#'LDFROM' => $ldfrom,
  	'depend' => $depend,
+ 	$gnome->get_makefile_vars,
  );
diff --git a/x11-toolkits/p5-Gnome/pkg-plist b/x11-toolkits/p5-Gnome/pkg-plist
index 08066ed9557a..cbc7751b4970 100644
--- a/x11-toolkits/p5-Gnome/pkg-plist
+++ b/x11-toolkits/p5-Gnome/pkg-plist
@@ -1,10 +1,11 @@
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Types.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/Files.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeDefs.h
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeTypemap
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/GnomeTypes.h
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/PerlGnomeInt.h
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Install/pkg.typemap
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gnome/Types.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Gnome.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gnome/Gnome.so