upgrade to 1.00

5 files changed, 26 insertions, 70 deletions

diff --git a/x11-toolkits/p5-Gnome2/Makefile b/x11-toolkits/p5-Gnome2/Makefile
index 73d7cf1299ee..d3f66781c7e0 100644
--- a/x11-toolkits/p5-Gnome2/Makefile
+++ b/x11-toolkits/p5-Gnome2/Makefile
@@ -7,14 +7,16 @@
 #
 
 PORTNAME=	Gnome2
-PORTVERSION=	0.90
-PORTREVISION=	1
+PORTVERSION=	1.00
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits gnome perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	../by-authors/id/R/RM/RMCFARLA/Gtk2-Perl \
-		gtk2-perl
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
+MASTER_SITE_SUBDIR=	../by-authors/id/R/RM/RMCFARLA/Gtk2-Perl/:cpan \
+		gtk2-perl/:sf
 PKGNAMEPREFIX=	p5-
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan \
+		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows a perl developer to use the Gnome libraries
@@ -23,57 +25,16 @@ BUILD_DEPENDS=	${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-De
 		${SITE_PERL}/ExtUtils/PkgConfig.pm:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
 		${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
 		${SITE_PERL}/${PERL_ARCH}/Gtk2/CodeGen.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Gnome2/VFS.pm:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS
+		${SITE_PERL}/${PERL_ARCH}/Gnome2/VFS.pm:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
+		${SITE_PERL}/${PERL_ARCH}/Gnome2/Canvas.pm:${PORTSDIR}/x11-toolkits/p5-Gnome2-Canvas
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
+		${SITE_PERL}/${PERL_ARCH}/Gtk2/CodeGen.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		${SITE_PERL}/${PERL_ARCH}/Gnome2/VFS.pm:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
+		${SITE_PERL}/${PERL_ARCH}/Gnome2/Canvas.pm:${PORTSDIR}/x11-toolkits/p5-Gnome2-Canvas
 
 USE_GNOME=	libgnomeui libgnome libbonoboui
 PERL_CONFIGURE=	yes
-
-MAN3=	Gnome2.3 \
-	Gnome2::About.3 \
-	Gnome2::App.3 \
-	Gnome2::AppBar.3 \
-	Gnome2::AppHelper.3 \
-	Gnome2::AuthenticationManager.3 \
-	Gnome2::Bonobo.3 \
-	Gnome2::Bonobo::Dock.3 \
-	Gnome2::Bonobo::DockItem.3 \
-	Gnome2::Client.3 \
-	Gnome2::ColorPicker.3 \
-	Gnome2::Config.3 \
-	Gnome2::Config::Iterator.3 \
-	Gnome2::DateEdit.3 \
-	Gnome2::Druid.3 \
-	Gnome2::DruidPage.3 \
-	Gnome2::DruidPageEdge.3 \
-	Gnome2::DruidPageStandard.3 \
-	Gnome2::Entry.3 \
-	Gnome2::FileEntry.3 \
-	Gnome2::FontPicker.3 \
-	Gnome2::HRef.3 \
-	Gnome2::Help.3 \
-	Gnome2::I18N.3 \
-	Gnome2::IconEntry.3 \
-	Gnome2::IconList.3 \
-	Gnome2::IconSelection.3 \
-	Gnome2::IconTextItem.3 \
-	Gnome2::IconTheme.3 \
-	Gnome2::ModuleInfo.3 \
-	Gnome2::PasswordDialog.3 \
-	Gnome2::PixmapEntry.3 \
-	Gnome2::PopupMenu.3 \
-	Gnome2::Program.3 \
-	Gnome2::Score.3 \
-	Gnome2::Scores.3 \
-	Gnome2::Sound.3 \
-	Gnome2::Thumbnail.3 \
-	Gnome2::ThumbnailFactory.3 \
-	Gnome2::UIDefs.3 \
-	Gnome2::URL.3 \
-	Gnome2::Util.3 \
-	Gnome2::Window.3 \
-	Gnome2::WindowIcon.3 \
-	Gnome2::index.3 \
-	Gnome2::main.3
+USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -81,4 +42,8 @@ MAN3=	Gnome2.3 \
 IGNORE=		This port requires perl 5.8.0 or later. Install lang/perl5.8 then try again
 .endif
 
+post-install:
+	@cd ${WRKSRC}/blib/man3 && ${FIND} * -name "*.3" | ${SED} \
+		's,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,' >> ${TMPPLIST}
+
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/p5-Gnome2/distinfo b/x11-toolkits/p5-Gnome2/distinfo
index 43a653205e4b..0f7f2bd2458f 100644
--- a/x11-toolkits/p5-Gnome2/distinfo
+++ b/x11-toolkits/p5-Gnome2/distinfo
@@ -1,2 +1,2 @@
-MD5 (Gnome2-0.90.tar.gz) = 2e2219cc133afef04e6ac7b62ffacfc5
-SIZE (Gnome2-0.90.tar.gz) = 74170
+MD5 (Gnome2-1.00.tar.gz) = e749cbfaa828caa50972c1ad7374e9dc
+SIZE (Gnome2-1.00.tar.gz) = 76176
diff --git a/x11-toolkits/p5-Gnome2/files/patch-Makefile.PL b/x11-toolkits/p5-Gnome2/files/patch-Makefile.PL
deleted file mode 100644
index cd26b0787b74..000000000000
--- a/x11-toolkits/p5-Gnome2/files/patch-Makefile.PL
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.PL.orig	Wed Dec 10 07:32:09 2003
-+++ Makefile.PL	Wed Jan  7 16:02:44 2004
-@@ -35,7 +35,8 @@
-            # it's recent enough, too 
-            . "use Glib '$build_reqs{'perl-Glib'}';"
-            . "use Gtk2 '$build_reqs{'perl-Gtk2'}';"
--           . "use Gnome2::VFS '$build_reqs{'perl-Gnome2-VFS'}';"
-+#  this will cause ExtUtils::PkgConfig fail
-+#           . "use Gnome2::VFS '$build_reqs{'perl-Gnome2-VFS'}';"
-            . "1") {
-    warn "$@\n";
-    WriteMakefile(
diff --git a/x11-toolkits/p5-Gnome2/pkg-descr b/x11-toolkits/p5-Gnome2/pkg-descr
index 1c96f08e4bf5..4680ea42df74 100644
--- a/x11-toolkits/p5-Gnome2/pkg-descr
+++ b/x11-toolkits/p5-Gnome2/pkg-descr
@@ -1,5 +1,7 @@
 The Gnome2 module allows a perl developer to use the Gnome libraries.  Find out
-more about Gnome+ at http://www.gnome.org.
+more about Gnome+ at http://www.gnome.org/.
 
 The perl bindings follow the C API very closely, and the C reference
 documentation should be considered the canonical source.
+
+WWW: http://search.cpan.org/dist/Gnome2/
diff --git a/x11-toolkits/p5-Gnome2/pkg-plist b/x11-toolkits/p5-Gnome2/pkg-plist
index c533c2ad4f66..0150b4142381 100644
--- a/x11-toolkits/p5-Gnome2/pkg-plist
+++ b/x11-toolkits/p5-Gnome2/pkg-plist
@@ -28,9 +28,10 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/IconTextItem.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/IconTheme.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/doctypes
 %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome.typemap
 %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl-version.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl-versions.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install/gnome2perl.typemap
 %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/ModuleInfo.pod