- Update to 1.40

- Convert to new options helper
- Strip shared library

Changes:	http://search.cpan.org/dist/Prima/Changes

3 files changed, 134 insertions, 139 deletions

diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index 56d96c8acd20..ed31bf0cfe81 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Prima
-PORTVERSION=	1.37
-PORTREVISION=	1
+PORTVERSION=	1.40
 CATEGORIES=	x11-toolkits graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -27,25 +26,17 @@ USE_PERL5=	configure
 USE_XORG=	x11 xext xpm xrender
 MAKE_JOBS_UNSAFE=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXFT}
-USE_XORG+=	xft
-.if ${PORT_OPTIONS:MICONV}
-USES+=		iconv
-.else
-CONFIGURE_ARGS+=WITH_ICONV=0
-.endif
-.else
-CONFIGURE_ARGS+=WITH_XFT=0
-.endif
-
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME=	gtk20
-CONFIGURE_ARGS+=WITH_GTK2=1
-.endif
+GTK2_CONFIGURE_OFF=	WITH_GTK2=0
+GTK2_CONFIGURE_ON=	WITH_GTK2=1
+GTK2_USE=		GNOME=gtk20
+ICONV_CONFIGURE_OFF=	WITH_ICONV=0
+ICONV_CONFIGURE_ON=	WITH_ICONV=1
+ICONV_USES=		iconv
+XFT_CONFIGURE_OFF=	WITH_XFT=0
+XFT_CONFIGURE_ON=	WITH_XFT=1
+XFT_USE=		XORG=xft
 
 post-install:
-	@${SED} -i '' 's,${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/Prima/Config.pm
+	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Prima/Prima.so
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Prima/distinfo b/x11-toolkits/p5-Prima/distinfo
index d081203abf14..e03b3348b92f 100644
--- a/x11-toolkits/p5-Prima/distinfo
+++ b/x11-toolkits/p5-Prima/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Prima-1.37.tar.gz) = 7ab228f9116a92b28501c828aa271f6e42f2173529d4b55a921687d93754c967
-SIZE (Prima-1.37.tar.gz) = 1375708
+SHA256 (Prima-1.40.tar.gz) = daab2e2e305ba44bc8ca45642817bc47851dcaaf2ed1378f38a81e4567f4e946
+SIZE (Prima-1.40.tar.gz) = 1380314
diff --git a/x11-toolkits/p5-Prima/pkg-plist b/x11-toolkits/p5-Prima/pkg-plist
index e9efe86b2f89..bf2577830d8e 100644
--- a/x11-toolkits/p5-Prima/pkg-plist
+++ b/x11-toolkits/p5-Prima/pkg-plist
@@ -5,104 +5,6 @@ bin/gencls
 bin/p-class
 bin/podview
 bin/tmlink
-%%PERL5_MAN3%%/Prima.3.gz
-%%PERL5_MAN3%%/Prima::Application.3.gz
-%%PERL5_MAN3%%/Prima::Buttons.3.gz
-%%PERL5_MAN3%%/Prima::Calendar.3.gz
-%%PERL5_MAN3%%/Prima::Classes.3.gz
-%%PERL5_MAN3%%/Prima::ColorDialog.3.gz
-%%PERL5_MAN3%%/Prima::ComboBox.3.gz
-%%PERL5_MAN3%%/Prima::Config.3.gz
-%%PERL5_MAN3%%/Prima::Const.3.gz
-%%PERL5_MAN3%%/Prima::CurvedText.3.gz
-%%PERL5_MAN3%%/Prima::DetailedList.3.gz
-%%PERL5_MAN3%%/Prima::DetailedOutline.3.gz
-%%PERL5_MAN3%%/Prima::DockManager.3.gz
-%%PERL5_MAN3%%/Prima::Docks.3.gz
-%%PERL5_MAN3%%/Prima::Edit.3.gz
-%%PERL5_MAN3%%/Prima::EditDialog.3.gz
-%%PERL5_MAN3%%/Prima::EventHook.3.gz
-%%PERL5_MAN3%%/Prima::ExtLists.3.gz
-%%PERL5_MAN3%%/Prima::FileDialog.3.gz
-%%PERL5_MAN3%%/Prima::FontDialog.3.gz
-%%PERL5_MAN3%%/Prima::FrameSet.3.gz
-%%PERL5_MAN3%%/Prima::Gencls.3.gz
-%%PERL5_MAN3%%/Prima::Grids.3.gz
-%%PERL5_MAN3%%/Prima::Header.3.gz
-%%PERL5_MAN3%%/Prima::HelpViewer.3.gz
-%%PERL5_MAN3%%/Prima::Image::AnimateGIF.3.gz
-%%PERL5_MAN3%%/Prima::Image::TransparencyControl.3.gz
-%%PERL5_MAN3%%/Prima::Image::gif.3.gz
-%%PERL5_MAN3%%/Prima::Image::jpeg.3.gz
-%%PERL5_MAN3%%/Prima::Image::tiff.3.gz
-%%PERL5_MAN3%%/Prima::ImageDialog.3.gz
-%%PERL5_MAN3%%/Prima::ImageViewer.3.gz
-%%PERL5_MAN3%%/Prima::IniFile.3.gz
-%%PERL5_MAN3%%/Prima::InputLine.3.gz
-%%PERL5_MAN3%%/Prima::IntUtils.3.gz
-%%PERL5_MAN3%%/Prima::KeySelector.3.gz
-%%PERL5_MAN3%%/Prima::Label.3.gz
-%%PERL5_MAN3%%/Prima::Lists.3.gz
-%%PERL5_MAN3%%/Prima::MDI.3.gz
-%%PERL5_MAN3%%/Prima::MsgBox.3.gz
-%%PERL5_MAN3%%/Prima::Notebooks.3.gz
-%%PERL5_MAN3%%/Prima::Outlines.3.gz
-%%PERL5_MAN3%%/Prima::PS::Drawable.3.gz
-%%PERL5_MAN3%%/Prima::PS::Encodings.3.gz
-%%PERL5_MAN3%%/Prima::PS::Fonts.3.gz
-%%PERL5_MAN3%%/Prima::PS::Printer.3.gz
-%%PERL5_MAN3%%/Prima::PS::Setup.3.gz
-%%PERL5_MAN3%%/Prima::PodView.3.gz
-%%PERL5_MAN3%%/Prima::PrintDialog.3.gz
-%%PERL5_MAN3%%/Prima::RubberBand.3.gz
-%%PERL5_MAN3%%/Prima::ScrollBar.3.gz
-%%PERL5_MAN3%%/Prima::ScrollWidget.3.gz
-%%PERL5_MAN3%%/Prima::Sliders.3.gz
-%%PERL5_MAN3%%/Prima::StartupWindow.3.gz
-%%PERL5_MAN3%%/Prima::StdBitmap.3.gz
-%%PERL5_MAN3%%/Prima::StdDlg.3.gz
-%%PERL5_MAN3%%/Prima::Stress.3.gz
-%%PERL5_MAN3%%/Prima::Terminals.3.gz
-%%PERL5_MAN3%%/Prima::TextView.3.gz
-%%PERL5_MAN3%%/Prima::Themes.3.gz
-%%PERL5_MAN3%%/Prima::Tie.3.gz
-%%PERL5_MAN3%%/Prima::Utils.3.gz
-%%PERL5_MAN3%%/Prima::VB::CfgMaint.3.gz
-%%PERL5_MAN3%%/Prima::VB::Classes.3.gz
-%%PERL5_MAN3%%/Prima::VB::Config.3.gz
-%%PERL5_MAN3%%/Prima::VB::CoreClasses.3.gz
-%%PERL5_MAN3%%/Prima::VB::VBControls.3.gz
-%%PERL5_MAN3%%/Prima::VB::VBLoader.3.gz
-%%PERL5_MAN3%%/Prima::VB::examples::Widgety.3.gz
-%%PERL5_MAN3%%/Prima::Widgets.3.gz
-%%PERL5_MAN3%%/Prima::noARGV.3.gz
-%%PERL5_MAN3%%/Prima::noX11.3.gz
-%%PERL5_MAN3%%/Prima::sys::gtk2::FileDialog.3.gz
-%%PERL5_MAN3%%/Prima::sys::win32::FileDialog.3.gz
-%%PERL5_MAN3%%/Prima::themes::color.3.gz
-%%PERL5_MAN3%%/Prima::themes::round3d.3.gz
-%%PERL5_MAN3%%/Prima::themes::sysimage.3.gz
-%%PERL5_MAN3%%/Prima::themes::tabset.3.gz
-%%PERL5_MAN3%%/pod::Prima::Clipboard.3.gz
-%%PERL5_MAN3%%/pod::Prima::Drawable.3.gz
-%%PERL5_MAN3%%/pod::Prima::File.3.gz
-%%PERL5_MAN3%%/pod::Prima::Image.3.gz
-%%PERL5_MAN3%%/pod::Prima::Menu.3.gz
-%%PERL5_MAN3%%/pod::Prima::Object.3.gz
-%%PERL5_MAN3%%/pod::Prima::Printer.3.gz
-%%PERL5_MAN3%%/pod::Prima::Timer.3.gz
-%%PERL5_MAN3%%/pod::Prima::Widget.3.gz
-%%PERL5_MAN3%%/pod::Prima::Widget::pack.3.gz
-%%PERL5_MAN3%%/pod::Prima::Widget::place.3.gz
-%%PERL5_MAN3%%/pod::Prima::Window.3.gz
-%%PERL5_MAN3%%/pod::Prima::X11.3.gz
-%%PERL5_MAN3%%/pod::Prima::codecs.3.gz
-%%PERL5_MAN3%%/pod::Prima::faq.3.gz
-%%PERL5_MAN3%%/pod::Prima::gp-problems.3.gz
-%%PERL5_MAN3%%/pod::Prima::image-load.3.gz
-%%PERL5_MAN3%%/pod::Prima::internals.3.gz
-%%PERL5_MAN3%%/pod::Prima::tutorial.3.gz
-%%PERL5_MAN3%%/pod::gencls.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Application.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Buttons.pm
@@ -139,12 +41,13 @@ bin/tmlink
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/ComboBox.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Config.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Const.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/CurvedText.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/DetailedList.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/DetailedOutline.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/DockManager.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Docks.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable/CurvedText.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable/Subcanvas.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Edit.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/EditDialog.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/EventHook.pm
@@ -321,6 +224,7 @@ bin/tmlink
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/scrollbar.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/sheet.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/socket.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/socket_anyevent.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/spline.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/theme.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/transparent.pl
@@ -355,6 +259,105 @@ bin/tmlink
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima/Prima.so
 %%SITE_PERL%%/%%PERL_ARCH%%/gencls.pod
+%%PERL5_MAN3%%/Prima.3.gz
+%%PERL5_MAN3%%/Prima::Application.3.gz
+%%PERL5_MAN3%%/Prima::Buttons.3.gz
+%%PERL5_MAN3%%/Prima::Calendar.3.gz
+%%PERL5_MAN3%%/Prima::Classes.3.gz
+%%PERL5_MAN3%%/Prima::ColorDialog.3.gz
+%%PERL5_MAN3%%/Prima::ComboBox.3.gz
+%%PERL5_MAN3%%/Prima::Config.3.gz
+%%PERL5_MAN3%%/Prima::Const.3.gz
+%%PERL5_MAN3%%/Prima::DetailedList.3.gz
+%%PERL5_MAN3%%/Prima::DetailedOutline.3.gz
+%%PERL5_MAN3%%/Prima::DockManager.3.gz
+%%PERL5_MAN3%%/Prima::Docks.3.gz
+%%PERL5_MAN3%%/Prima::Drawable::CurvedText.3.gz
+%%PERL5_MAN3%%/Prima::Drawable::Subcanvas.3.gz
+%%PERL5_MAN3%%/Prima::Edit.3.gz
+%%PERL5_MAN3%%/Prima::EditDialog.3.gz
+%%PERL5_MAN3%%/Prima::EventHook.3.gz
+%%PERL5_MAN3%%/Prima::ExtLists.3.gz
+%%PERL5_MAN3%%/Prima::FileDialog.3.gz
+%%PERL5_MAN3%%/Prima::FontDialog.3.gz
+%%PERL5_MAN3%%/Prima::FrameSet.3.gz
+%%PERL5_MAN3%%/Prima::Gencls.3.gz
+%%PERL5_MAN3%%/Prima::Grids.3.gz
+%%PERL5_MAN3%%/Prima::Header.3.gz
+%%PERL5_MAN3%%/Prima::HelpViewer.3.gz
+%%PERL5_MAN3%%/Prima::Image::AnimateGIF.3.gz
+%%PERL5_MAN3%%/Prima::Image::TransparencyControl.3.gz
+%%PERL5_MAN3%%/Prima::Image::gif.3.gz
+%%PERL5_MAN3%%/Prima::Image::jpeg.3.gz
+%%PERL5_MAN3%%/Prima::Image::tiff.3.gz
+%%PERL5_MAN3%%/Prima::ImageDialog.3.gz
+%%PERL5_MAN3%%/Prima::ImageViewer.3.gz
+%%PERL5_MAN3%%/Prima::IniFile.3.gz
+%%PERL5_MAN3%%/Prima::InputLine.3.gz
+%%PERL5_MAN3%%/Prima::IntUtils.3.gz
+%%PERL5_MAN3%%/Prima::KeySelector.3.gz
+%%PERL5_MAN3%%/Prima::Label.3.gz
+%%PERL5_MAN3%%/Prima::Lists.3.gz
+%%PERL5_MAN3%%/Prima::MDI.3.gz
+%%PERL5_MAN3%%/Prima::MsgBox.3.gz
+%%PERL5_MAN3%%/Prima::Notebooks.3.gz
+%%PERL5_MAN3%%/Prima::Outlines.3.gz
+%%PERL5_MAN3%%/Prima::PS::Drawable.3.gz
+%%PERL5_MAN3%%/Prima::PS::Encodings.3.gz
+%%PERL5_MAN3%%/Prima::PS::Fonts.3.gz
+%%PERL5_MAN3%%/Prima::PS::Printer.3.gz
+%%PERL5_MAN3%%/Prima::PS::Setup.3.gz
+%%PERL5_MAN3%%/Prima::PodView.3.gz
+%%PERL5_MAN3%%/Prima::PrintDialog.3.gz
+%%PERL5_MAN3%%/Prima::RubberBand.3.gz
+%%PERL5_MAN3%%/Prima::ScrollBar.3.gz
+%%PERL5_MAN3%%/Prima::ScrollWidget.3.gz
+%%PERL5_MAN3%%/Prima::Sliders.3.gz
+%%PERL5_MAN3%%/Prima::StartupWindow.3.gz
+%%PERL5_MAN3%%/Prima::StdBitmap.3.gz
+%%PERL5_MAN3%%/Prima::StdDlg.3.gz
+%%PERL5_MAN3%%/Prima::Stress.3.gz
+%%PERL5_MAN3%%/Prima::Terminals.3.gz
+%%PERL5_MAN3%%/Prima::TextView.3.gz
+%%PERL5_MAN3%%/Prima::Themes.3.gz
+%%PERL5_MAN3%%/Prima::Tie.3.gz
+%%PERL5_MAN3%%/Prima::Utils.3.gz
+%%PERL5_MAN3%%/Prima::VB::CfgMaint.3.gz
+%%PERL5_MAN3%%/Prima::VB::Classes.3.gz
+%%PERL5_MAN3%%/Prima::VB::Config.3.gz
+%%PERL5_MAN3%%/Prima::VB::CoreClasses.3.gz
+%%PERL5_MAN3%%/Prima::VB::VBControls.3.gz
+%%PERL5_MAN3%%/Prima::VB::VBLoader.3.gz
+%%PERL5_MAN3%%/Prima::VB::examples::Widgety.3.gz
+%%PERL5_MAN3%%/Prima::Widgets.3.gz
+%%PERL5_MAN3%%/Prima::noARGV.3.gz
+%%PERL5_MAN3%%/Prima::noX11.3.gz
+%%PERL5_MAN3%%/Prima::sys::gtk2::FileDialog.3.gz
+%%PERL5_MAN3%%/Prima::sys::win32::FileDialog.3.gz
+%%PERL5_MAN3%%/Prima::themes::color.3.gz
+%%PERL5_MAN3%%/Prima::themes::round3d.3.gz
+%%PERL5_MAN3%%/Prima::themes::sysimage.3.gz
+%%PERL5_MAN3%%/Prima::themes::tabset.3.gz
+%%PERL5_MAN3%%/pod::Prima::Clipboard.3.gz
+%%PERL5_MAN3%%/pod::Prima::Drawable.3.gz
+%%PERL5_MAN3%%/pod::Prima::File.3.gz
+%%PERL5_MAN3%%/pod::Prima::Image.3.gz
+%%PERL5_MAN3%%/pod::Prima::Menu.3.gz
+%%PERL5_MAN3%%/pod::Prima::Object.3.gz
+%%PERL5_MAN3%%/pod::Prima::Printer.3.gz
+%%PERL5_MAN3%%/pod::Prima::Timer.3.gz
+%%PERL5_MAN3%%/pod::Prima::Widget.3.gz
+%%PERL5_MAN3%%/pod::Prima::Widget::pack.3.gz
+%%PERL5_MAN3%%/pod::Prima::Widget::place.3.gz
+%%PERL5_MAN3%%/pod::Prima::Window.3.gz
+%%PERL5_MAN3%%/pod::Prima::X11.3.gz
+%%PERL5_MAN3%%/pod::Prima::codecs.3.gz
+%%PERL5_MAN3%%/pod::Prima::faq.3.gz
+%%PERL5_MAN3%%/pod::Prima::gp-problems.3.gz
+%%PERL5_MAN3%%/pod::Prima::image-load.3.gz
+%%PERL5_MAN3%%/pod::Prima::internals.3.gz
+%%PERL5_MAN3%%/pod::Prima::tutorial.3.gz
+%%PERL5_MAN3%%/pod::gencls.3.gz
 man/man1/VB.1.gz
 man/man1/cfgmaint.1.gz
 man/man1/fmview.1.gz
@@ -362,21 +365,22 @@ man/man1/gencls.1.gz
 man/man1/p-class.1.gz
 man/man1/podview.1.gz
 man/man1/tmlink.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/themes
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/win32
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/unix
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Prima
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/themes
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/win32
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys/gtk2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/sys
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/locale
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS/fonts
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/PS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Drawable
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/unix
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE/generic
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/CORE
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima