upgrade to 1.040

3 files changed, 47 insertions, 184 deletions

diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index 357bd941f90d..5c7b69e500e0 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	Gtk2
-PORTVERSION=	1.021
-PORTREVISION=	1
+PORTVERSION=	1.040
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang 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=	clsung@dragon2.net
 COMMENT=	Perl module for Gtk+ 2.x graphical user interface library
@@ -21,186 +23,20 @@ COMMENT=	Perl module for Gtk+ 2.x graphical user interface library
 BUILD_DEPENDS=	${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-Depends \
 		${SITE_PERL}/ExtUtils/PkgConfig.pm:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
 		${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2
 
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 pango
 PERL_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-MAN3=		Gtk2.3 \
-	Gtk2::AccelGroup.3 \
-	Gtk2::AccelLabel.3 \
-	Gtk2::Accelerator.3 \
-	Gtk2::Adjustment.3 \
-	Gtk2::Alignment.3 \
-	Gtk2::Arrow.3 \
-	Gtk2::AspectFrame.3 \
-	Gtk2::Bin.3 \
-	Gtk2::Box.3 \
-	Gtk2::Button.3 \
-	Gtk2::ButtonBox.3 \
-	Gtk2::Calendar.3 \
-	Gtk2::CellEditable.3 \
-	Gtk2::CellRenderer.3 \
-	Gtk2::CellRendererPixbuf.3 \
-	Gtk2::CellRendererText.3 \
-	Gtk2::CellRendererToggle.3 \
-	Gtk2::CheckButton.3 \
-	Gtk2::CheckMenuItem.3 \
-	Gtk2::Clipboard.3 \
-	Gtk2::CodeGen.3 \
-	Gtk2::ColorSelection.3 \
-	Gtk2::ColorSelectionDialog.3 \
-	Gtk2::Combo.3 \
-	Gtk2::Container.3 \
-	Gtk2::Curve.3 \
-	Gtk2::Dialog.3 \
-	Gtk2::Drag.3 \
-	Gtk2::DrawingArea.3 \
-	Gtk2::Editable.3 \
-	Gtk2::Entry.3 \
-	Gtk2::EventBox.3 \
-	Gtk2::FileSelection.3 \
-	Gtk2::Fixed.3 \
-	Gtk2::FontSelection.3 \
-	Gtk2::FontSelectionDialog.3 \
-	Gtk2::Frame.3 \
-	Gtk2::GammaCurve.3 \
-	Gtk2::Gdk.3 \
-	Gtk2::Gdk::Atom.3 \
-	Gtk2::Gdk::Bitmap.3 \
-	Gtk2::Gdk::Color.3 \
-	Gtk2::Gdk::Colormap.3 \
-	Gtk2::Gdk::Cursor.3 \
-	Gtk2::Gdk::Display.3 \
-	Gtk2::Gdk::DisplayManager.3 \
-	Gtk2::Gdk::DragContext.3 \
-	Gtk2::Gdk::Drawable.3 \
-	Gtk2::Gdk::Event.3 \
-	Gtk2::Gdk::GC.3 \
-	Gtk2::Gdk::Geometry.3 \
-	Gtk2::Gdk::Keymap.3 \
-	Gtk2::Gdk::Keysyms.3 \
-	Gtk2::Gdk::Keyval.3 \
-	Gtk2::Gdk::Pixbuf.3 \
-	Gtk2::Gdk::PixbufAnimation.3 \
-	Gtk2::Gdk::PixbufAnimationIter.3 \
-	Gtk2::Gdk::PixbufLoader.3 \
-	Gtk2::Gdk::Pixmap.3 \
-	Gtk2::Gdk::Rectangle.3 \
-	Gtk2::Gdk::Rgb.3 \
-	Gtk2::Gdk::Screen.3 \
-	Gtk2::Gdk::Selection.3 \
-	Gtk2::Gdk::Threads.3 \
-	Gtk2::Gdk::Window.3 \
-	Gtk2::HBox.3 \
-	Gtk2::HButtonBox.3 \
-	Gtk2::HPaned.3 \
-	Gtk2::HRuler.3 \
-	Gtk2::HScale.3 \
-	Gtk2::HScrollbar.3 \
-	Gtk2::HSeparator.3 \
-	Gtk2::HandleBox.3 \
-	Gtk2::Helper.3 \
-	Gtk2::IconFactory.3 \
-	Gtk2::IconSet.3 \
-	Gtk2::IconSize.3 \
-	Gtk2::IconSource.3 \
-	Gtk2::Image.3 \
-	Gtk2::ImageMenuItem.3 \
-	Gtk2::InputDialog.3 \
-	Gtk2::Invisible.3 \
-	Gtk2::Item.3 \
-	Gtk2::ItemFactory.3 \
-	Gtk2::Label.3 \
-	Gtk2::Layout.3 \
-	Gtk2::List.3 \
-	Gtk2::ListItem.3 \
-	Gtk2::ListStore.3 \
-	Gtk2::Menu.3 \
-	Gtk2::MenuBar.3 \
-	Gtk2::MenuItem.3 \
-	Gtk2::MenuShell.3 \
-	Gtk2::MessageDialog.3 \
-	Gtk2::Misc.3 \
-	Gtk2::Notebook.3 \
-	Gtk2::Object.3 \
-	Gtk2::OptionMenu.3 \
-	Gtk2::Paned.3 \
-	Gtk2::Pango.3 \
-	Gtk2::Pango::Context.3 \
-	Gtk2::Pango::FontDescription.3 \
-	Gtk2::Pango::FontFamily.3 \
-	Gtk2::Pango::FontMetrics.3 \
-	Gtk2::Pango::Layout.3 \
-	Gtk2::Pango::TabArray.3 \
-	Gtk2::Plug.3 \
-	Gtk2::ProgressBar.3 \
-	Gtk2::RadioButton.3 \
-	Gtk2::RadioMenuItem.3 \
-	Gtk2::Range.3 \
-	Gtk2::Rc.3 \
-	Gtk2::RcStyle.3 \
-	Gtk2::Requisition.3 \
-	Gtk2::Ruler.3 \
-	Gtk2::Scale.3 \
-	Gtk2::Scrollbar.3 \
-	Gtk2::ScrolledWindow.3 \
-	Gtk2::Selection.3 \
-	Gtk2::SelectionData.3 \
-	Gtk2::Separator.3 \
-	Gtk2::SeparatorMenuItem.3 \
-	Gtk2::SimpleList.3 \
-	Gtk2::SimpleMenu.3 \
-	Gtk2::SizeGroup.3 \
-	Gtk2::Socket.3 \
-	Gtk2::SpinButton.3 \
-	Gtk2::Statusbar.3 \
-	Gtk2::Stock.3 \
-	Gtk2::Style.3 \
-	Gtk2::Table.3 \
-	Gtk2::TargetList.3 \
-	Gtk2::TearoffMenuItem.3 \
-	Gtk2::TextAttributes.3 \
-	Gtk2::TextBuffer.3 \
-	Gtk2::TextIter.3 \
-	Gtk2::TextMark.3 \
-	Gtk2::TextTag.3 \
-	Gtk2::TextTagTable.3 \
-	Gtk2::TextView.3 \
-	Gtk2::ToggleButton.3 \
-	Gtk2::Toolbar.3 \
-	Gtk2::Tooltips.3 \
-	Gtk2::TreeDragDest.3 \
-	Gtk2::TreeDragSource.3 \
-	Gtk2::TreeModel.3 \
-	Gtk2::TreeModelSort.3 \
-	Gtk2::TreePath.3 \
-	Gtk2::TreeRowReference.3 \
-	Gtk2::TreeSelection.3 \
-	Gtk2::TreeSortable.3 \
-	Gtk2::TreeStore.3 \
-	Gtk2::TreeView.3 \
-	Gtk2::TreeViewColumn.3 \
-	Gtk2::VBox.3 \
-	Gtk2::VButtonBox.3 \
-	Gtk2::VPaned.3 \
-	Gtk2::VRuler.3 \
-	Gtk2::VScale.3 \
-	Gtk2::VScrollbar.3 \
-	Gtk2::VSeparator.3 \
-	Gtk2::Viewport.3 \
-	Gtk2::Widget.3 \
-	Gtk2::Window.3 \
-	Gtk2::api.3 \
-	Gtk2::devel.3 \
-	Gtk2::index.3 \
-	Gtk2::main.3
-
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
 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-Gtk2/distinfo b/x11-toolkits/p5-Gtk2/distinfo
index e73731fdf966..57b81abb88d6 100644
--- a/x11-toolkits/p5-Gtk2/distinfo
+++ b/x11-toolkits/p5-Gtk2/distinfo
@@ -1,2 +1,2 @@
-MD5 (Gtk2-1.021.tar.gz) = c587682922a499c7cc6ba90237e2d80e
-SIZE (Gtk2-1.021.tar.gz) = 388451
+MD5 (Gtk2-1.040.tar.gz) = 51d643e79dcd369885cf036a1f8c3d89
+SIZE (Gtk2-1.040.tar.gz) = 524549
diff --git a/x11-toolkits/p5-Gtk2/pkg-plist b/x11-toolkits/p5-Gtk2/pkg-plist
index 43c7a38c075d..1a9959827fcf 100644
--- a/x11-toolkits/p5-Gtk2/pkg-plist
+++ b/x11-toolkits/p5-Gtk2/pkg-plist
@@ -1,6 +1,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/AccelGroup.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/AccelLabel.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/AccelMap.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Accelerator.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Adjustment.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Alignment.pod
@@ -48,17 +50,34 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/DragContext.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Drawable.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Button.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Client.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Configure.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Crossing.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/DND.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Expose.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Focus.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Key.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Motion.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/NoExpose.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Property.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Proximity.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Scroll.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Selection.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Setting.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/Visibility.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event/WindowState.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/GC.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Geometry.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Keymap.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Keysyms.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Keyval.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pixbuf.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PixbufAnimation.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PixbufAnimationIter.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/PixbufLoader.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Pixmap.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Rectangle.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Region.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Rgb.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Screen.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Selection.pod
@@ -81,9 +100,11 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ImageMenuItem.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/InputDialog.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/doctypes
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gdk.typemap
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk.typemap
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk2perl-autogen.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk2perl-versions.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk2perl.h
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install/gtk2perl.typemap
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Invisible.pod
@@ -106,11 +127,13 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Paned.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Context.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Font.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/FontDescription.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/FontFamily.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/FontMetrics.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/Layout.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/TabArray.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango/version.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Plug.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ProgressBar.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/RadioButton.pod
@@ -136,10 +159,13 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Stock.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Style.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Table.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TargetEntry.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TargetList.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TearoffMenuItem.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TestHelper.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextAttributes.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextBuffer.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextChildAnchor.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextIter.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextMark.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TextTag.pod
@@ -169,18 +195,19 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Viewport.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Widget.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Window.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/WindowGroup.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/api.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/devel.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/enums.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/index.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/main.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/version.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Gtk2.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/Gtk2.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2 2>/dev/null || true