2 files changed, 40 insertions, 47 deletions

diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 2d16da63d6cd..ea6ce9cd268b 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Gtk
 PORTVERSION=	0.7010
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/x11-toolkits/p5-Gtk/pkg-plist b/x11-toolkits/p5-Gtk/pkg-plist
index 9cec2f7878d4..b469a4958f83 100644
--- a/x11-toolkits/p5-Gtk/pkg-plist
+++ b/x11-toolkits/p5-Gtk/pkg-plist
@@ -1,51 +1,44 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Atoms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/CListModel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/ColorSelectButton.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Keysyms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/Files.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GdkTypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkDefs.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkTypemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/GtkTypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/MiscTypes.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkExt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkInt.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gendefs.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gendoc.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/genext.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gpdoc2pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.0.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.1.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.3.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.4.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.6.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.defs
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install/ppport.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP/http.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LogHandler.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Types.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/TypesLazy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/io.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/lazy.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gtk.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/base/.packlist
+%%SITE_ARCH%%/Gtk.pm
+%%SITE_ARCH%%/Gtk/Atoms.pm
+%%SITE_ARCH%%/Gtk/CListModel.pm
+%%SITE_ARCH%%/Gtk/ColorSelectButton.pm
+%%SITE_ARCH%%/Gtk/Gdk.pm
+%%SITE_ARCH%%/Gtk/Keysyms.pm
+%%SITE_ARCH%%/Gtk/Install/Files.pm
+%%SITE_ARCH%%/Gtk/Install/GdkTypes.h
+%%SITE_ARCH%%/Gtk/Install/GtkDefs.h
+%%SITE_ARCH%%/Gtk/Install/GtkTypemap
+%%SITE_ARCH%%/Gtk/Install/GtkTypes.h
+%%SITE_ARCH%%/Gtk/Install/MiscTypes.h
+%%SITE_ARCH%%/Gtk/Install/PerlGtkExt.h
+%%SITE_ARCH%%/Gtk/Install/PerlGtkInt.h
+%%SITE_ARCH%%/Gtk/Install/gendefs.pl
+%%SITE_ARCH%%/Gtk/Install/gendoc.pl
+%%SITE_ARCH%%/Gtk/Install/genext.pl
+%%SITE_ARCH%%/Gtk/Install/gpdoc2pod
+%%SITE_ARCH%%/Gtk/Install/gtk-0.99.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-0.99.typemap
+%%SITE_ARCH%%/Gtk/Install/gtk-1.0.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.1.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.3.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.4.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.6.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.1.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.2.defs
+%%SITE_ARCH%%/Gtk/Install/gtk-1.2.typemap
+%%SITE_ARCH%%/Gtk/Install/ppport.h
+%%SITE_ARCH%%/Gtk/LWP.pm
+%%SITE_ARCH%%/Gtk/LWP/http.pm
+%%SITE_ARCH%%/Gtk/LogHandler.pm
+%%SITE_ARCH%%/Gtk/Types.pm
+%%SITE_ARCH%%/Gtk/TypesLazy.pm
+%%SITE_ARCH%%/Gtk/io.pm
+%%SITE_ARCH%%/Gtk/lazy.pm
+%%SITE_ARCH%%/auto/Gtk/Gdk/autosplit.ix
+%%SITE_ARCH%%/auto/Gtk/Gtk.so
+%%SITE_ARCH%%/auto/Gtk/autosplit.ix
 %%PERL5_MAN3%%/Gtk.3pm.gz
 %%PERL5_MAN3%%/Gtk::CListModel.3pm.gz
 %%PERL5_MAN3%%/Gtk::cookbook.3pm.gz
 %%PERL5_MAN3%%/Gtk::objects.3pm.gz
 %%PERL5_MAN3%%/Gtk::reference.3pm.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/LWP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Install
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/base
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk