9 files changed, 40 insertions, 79 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index fe5720730205..236557f38573 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -133,9 +133,9 @@
     SUBDIR += p5-Gnome2-VFS
     SUBDIR += p5-Gtk
     SUBDIR += p5-Gtk2
+    SUBDIR += p5-Gtk2-Ex-PodViewer
     SUBDIR += p5-Gtk2-Ex-Simple-List
     SUBDIR += p5-Gtk2-Html2
-    SUBDIR += p5-Gtk2-PodViewer
     SUBDIR += p5-Gtk2-TrayIcon
     SUBDIR += p5-GtkXmHTML
     SUBDIR += p5-Prima
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
index 1fcfca99e537..574cc018f5cc 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
@@ -1,29 +1,35 @@
-# New ports collection makefile for:	p5-Gtk2-PodViewer
+# New ports collection makefile for:	p5-Gtk2-Ex-PodViewer
 # Date created:				2004-08-20
 # Whom:					ports@c0decafe.net
 #
 # $FreeBSD$
 #
 
-PORTNAME=	Gtk2-PodViewer
-PORTVERSION=	0.09
-PORTREVISION=	2
+PORTNAME=	Gtk2-Ex-PodViewer
+PORTVERSION=	0.17
 CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/G/GB/GBROWN/
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@c0decafe.net
-COMMENT=	Gtk2-Perl widget and program for displaying POD
+COMMENT=	Displays plain old documentation
 
-BUILD_DEPENDS=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
+		p5-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
+		p5-Gtk2-Ex-Simple-List>=0.50:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Simple-List \
+		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Simple
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN1=		podviewer.1
-MAN3=		Gtk2::PodViewer.3 Gtk2::PodViewer::Parser.3
+MAN1=	podviewer.1
+MAN3=	${PORTNAME:S/-/::/g}.3 ${PORTNAME:S/-/::/g}::Parser.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+IGNORE=	requires perl5.8 from ports
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/distinfo b/x11-toolkits/p5-Gtk2-Ex-PodViewer/distinfo
index d02c8e9ba0cf..56aa45a957aa 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/distinfo
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (Gtk2-PodViewer-0.09.tar.gz) = 1dc7b5b2ddadd681cefe982c27d66e08
-SHA256 (Gtk2-PodViewer-0.09.tar.gz) = 17bf904acf4ba3ac47fbc865df07b572d16637ebdcc795ef104c9f41adb3a69e
-SIZE (Gtk2-PodViewer-0.09.tar.gz) = 27600
+MD5 (Gtk2-Ex-PodViewer-0.17.tar.gz) = 7996d69ae9e534b4abf51a9c58cbeba7
+SHA256 (Gtk2-Ex-PodViewer-0.17.tar.gz) = 5ad44f81c223eca6ba37b864e30a34e2e0abc0ce1b2be8767477820f39ccd389
+SIZE (Gtk2-Ex-PodViewer-0.17.tar.gz) = 15450
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-descr b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-descr
index 52b5d70d53e4..91186d25e0d4 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-descr
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-descr
@@ -1,10 +1,11 @@
 Gtk2::PodViewer is a widget for rendering Perl POD documents.
-It is based on the Gtk2::TextView widget and uses Pod::Parser for manipulating
-POD data.
+It is based on the Gtk2::TextView widget and uses Pod::Parser
+for manipulating POD data.
 
-Also, podviewer provides a simple and attractive way to read Perl's POD 
-documentation. You can use it to read the Perl POD pages, module documentation
-and information about Perl's builtin functions.
+Also, podviewer provides a simple and attractive way to read
+Perl's POD documentation. You can use it to read the Perl POD
+pages, module documentation and information about Perl's
+builtin functions.
 
-Author:	gavin.brown-at-uk.com
-WWW:	http://search.cpan.org/dist/Gtk2-PodViewer/
+Author:	Gavin Brown <gavin.brown-at-uk.com>
+WWW:	http://search.cpan.org/dist/Gtk2-Ex-PodViewer/
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
index 290ca302d721..c8d8c6ca09cb 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
@@ -1,7 +1,10 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/PodViewer/.packlist
+%%SITE_PERL%%/Gtk2/Ex/PodViewer.pm
+%%SITE_PERL%%/Gtk2/Ex/PodViewer/Parser.pm
 bin/podviewer
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PodViewer/.packlist
-%%SITE_PERL%%/Gtk2/PodViewer.pm
-%%SITE_PERL%%/Gtk2/PodViewer/Parser.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PodViewer
-@dirrm %%SITE_PERL%%/Gtk2/PodViewer
+@dirrmtry %%SITE_PERL%%/Gtk2/Ex/PodViewer
+@dirrmtry %%SITE_PERL%%/Gtk2/Ex
 @dirrmtry %%SITE_PERL%%/Gtk2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex/PodViewer
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Ex
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-PodViewer/Makefile b/x11-toolkits/p5-Gtk2-PodViewer/Makefile
deleted file mode 100644
index 1fcfca99e537..000000000000
--- a/x11-toolkits/p5-Gtk2-PodViewer/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	p5-Gtk2-PodViewer
-# Date created:				2004-08-20
-# Whom:					ports@c0decafe.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Gtk2-PodViewer
-PORTVERSION=	0.09
-PORTREVISION=	2
-CATEGORIES=	x11-toolkits perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../../authors/id/G/GB/GBROWN/
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	ports@c0decafe.net
-COMMENT=	Gtk2-Perl widget and program for displaying POD
-
-BUILD_DEPENDS=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-
-MAN1=		podviewer.1
-MAN3=		Gtk2::PodViewer.3 Gtk2::PodViewer::Parser.3
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gtk2-PodViewer/distinfo b/x11-toolkits/p5-Gtk2-PodViewer/distinfo
deleted file mode 100644
index d02c8e9ba0cf..000000000000
--- a/x11-toolkits/p5-Gtk2-PodViewer/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (Gtk2-PodViewer-0.09.tar.gz) = 1dc7b5b2ddadd681cefe982c27d66e08
-SHA256 (Gtk2-PodViewer-0.09.tar.gz) = 17bf904acf4ba3ac47fbc865df07b572d16637ebdcc795ef104c9f41adb3a69e
-SIZE (Gtk2-PodViewer-0.09.tar.gz) = 27600
diff --git a/x11-toolkits/p5-Gtk2-PodViewer/pkg-descr b/x11-toolkits/p5-Gtk2-PodViewer/pkg-descr
deleted file mode 100644
index 52b5d70d53e4..000000000000
--- a/x11-toolkits/p5-Gtk2-PodViewer/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Gtk2::PodViewer is a widget for rendering Perl POD documents.
-It is based on the Gtk2::TextView widget and uses Pod::Parser for manipulating
-POD data.
-
-Also, podviewer provides a simple and attractive way to read Perl's POD 
-documentation. You can use it to read the Perl POD pages, module documentation
-and information about Perl's builtin functions.
-
-Author:	gavin.brown-at-uk.com
-WWW:	http://search.cpan.org/dist/Gtk2-PodViewer/
diff --git a/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist b/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist
deleted file mode 100644
index 290ca302d721..000000000000
--- a/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/podviewer
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PodViewer/.packlist
-%%SITE_PERL%%/Gtk2/PodViewer.pm
-%%SITE_PERL%%/Gtk2/PodViewer/Parser.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PodViewer
-@dirrm %%SITE_PERL%%/Gtk2/PodViewer
-@dirrmtry %%SITE_PERL%%/Gtk2