3 files changed, 48 insertions, 94 deletions

diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index 9cbaad696c67..d93ca2caf321 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	Prima
-PORTVERSION=	1.16
-PORTREPOCH=	1
+PORTVERSION=	1.21
 CATEGORIES=	x11-toolkits perl5 graphics
-MASTER_SITES=	http://www.prima.eu.org/download/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=Prima
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dmitry@karasik.eu.org
@@ -20,17 +20,37 @@ LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+MAN1=	gencls.1.gz VB.1.gz cfgmaint.1.gz
+MAN3=	Prima::Clipboard.3.gz Prima::Drawable.3.gz Prima::File.3.gz Prima::Image.3.gz  \
+	Prima::Menu.3.gz Prima::Object.3.gz Prima::Printer.3.gz Prima::Timer.3.gz  \
+	Prima::Widget.3.gz Prima::Widget::pack.3.gz Prima::Widget::place.3.gz  \
+	Prima::Window.3.gz Prima::codecs.3.gz Prima::gp-problems.3.gz Prima::image-load.3.gz  \
+	Prima::faq.3.gz Prima::internals.3.gz Prima.3.gz Prima::Image::TransparencyControl.3.gz  \
+	Prima::PS::Encodings.3.gz Prima::PS::Fonts.3.gz Prima::PS::Printer.3.gz  \
+	Prima::PS::Drawable.3.gz Prima::VB::CfgMaint.3.gz Prima::VB::Classes.3.gz  \
+	Prima::VB::VBLoader.3.gz Prima::ComboBox.3.gz Prima::Application.3.gz Prima::Buttons.3.gz  \
+	Prima::ColorDialog.3.gz Prima::Const.3.gz Prima::DockManager.3.gz Prima::Docks.3.gz  \
+	Prima::EditDialog.3.gz Prima::ExtLists.3.gz Prima::FontDialog.3.gz Prima::Grids.3.gz  \
+	Prima::Lists.3.gz Prima::Header.3.gz Prima::DetailedList.3.gz Prima::DetailedOutline.3.gz  \
+	Prima::Edit.3.gz Prima::ImageViewer.3.gz Prima::IniFile.3.gz Prima::ImageDialog.3.gz  \
+	Prima::InputLine.3.gz Prima::IntUtils.3.gz Prima::KeySelector.3.gz Prima::Label.3.gz  \
+	Prima::MDI.3.gz Prima::Make.3.gz Prima::MsgBox.3.gz Prima::Notebooks.3.gz Prima::Outlines.3.gz  \
+	Prima::PrintDialog.3.gz Prima::ScrollBar.3.gz Prima::ScrollWidget.3.gz  \
+	Prima::StartupWindow.3.gz Prima::StdBitmap.3.gz Prima::StdDlg.3.gz Prima::Stress.3.gz  \
+	Prima::Themes.3.gz Prima::Utils.3.gz Prima::Widgets.3.gz Prima::Classes.3.gz  \
+	Prima::FileDialog.3.gz Prima::PodView.3.gz Prima::Sliders.3.gz Prima::FrameSet.3.gz  \
+	Prima::TextView.3.gz Prima::Tie.3.gz Prima::HelpViewer.3.gz Prima::Calendar.3.gz Prima::X11.3.gz  \
+	Prima::EventHook.3.gz Prima::sys::win32::FileDialog.3.gz Prima::tutorial.3.gz
+
 CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALL_MAN3="${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3" \
-			INSTALL_MAN1="${PREFIX}/man/man1"
-CONFIGURE_SCRIPT=       Makefile.PL
+			INSTALL_MAN1="${PREFIX}/man/man1" X11BASE="${X11BASE}"
+CONFIGURE_SCRIPT=	Makefile.PL
 USE_XPM=		1
 USE_XLIB=		1
 USE_PERL5=		yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \
-		${WRKSRC}/Makefile.PL
+MAN3PREFIX=		lib/perl5/${PERL_VERSION}
+NOMANCOMPRESS=	yes
 
 post-configure:
 	@cd ${CONFIGURE_WRKSRC} && ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
@@ -41,8 +61,6 @@ test: build
 post-install:
 	${STRIP_CMD} ${SITE_PERL}/${PERL_ARCH}/auto/Prima/Prima.so
 
-.include <bsd.port.mk>
-
 .if defined (WITHOUT_XFT)
 CONFIGURE_ARGS+=	WITH_XFT=0
 .else
@@ -53,3 +71,5 @@ CONFIGURE_ARGS+=	WITH_ICONV=0
 USE_ICONV=	yes
 .endif
 .endif
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Prima/distinfo b/x11-toolkits/p5-Prima/distinfo
index 46e0cc4c1a1d..3865a4db85d0 100644
--- a/x11-toolkits/p5-Prima/distinfo
+++ b/x11-toolkits/p5-Prima/distinfo
@@ -1,3 +1,3 @@
-MD5 (Prima-1.16.tar.gz) = 0d4c6055970238eda5f21f30d989c9da
-SHA256 (Prima-1.16.tar.gz) = 262835e58ca2b086ff54d3b87dc8d9c36a1bf2bed4fbee400090b58b6bb712f0
-SIZE (Prima-1.16.tar.gz) = 1330111
+MD5 (Prima-1.21.tar.gz) = fe97328d55983991cd41351a2fe8c488
+SHA256 (Prima-1.21.tar.gz) = 7e310f8fff9731f5c3353f5c0853dda33ad63db317f15db28994ce2e7530f668
+SIZE (Prima-1.21.tar.gz) = 1381991
diff --git a/x11-toolkits/p5-Prima/pkg-plist b/x11-toolkits/p5-Prima/pkg-plist
index 36246ed8d589..e0eb75551e30 100644
--- a/x11-toolkits/p5-Prima/pkg-plist
+++ b/x11-toolkits/p5-Prima/pkg-plist
@@ -135,11 +135,11 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VBControls.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/VBLoader.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/classes.gif
-%%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/starter.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples/Sample.fm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/VB/examples/Widgety.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/Hand.gif
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/amba
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/async
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/buttons
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/buttons2
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples/calendar
@@ -233,88 +233,21 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/X11.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget/pack.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget/place.pod
-man/man1/gencls.1.gz
-man/man1/VB.1.gz
-man/man1/cfgmaint.1.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Clipboard.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Drawable.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::File.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Image.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Menu.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Object.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Printer.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Timer.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Widget.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Widget::pack.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Widget::place.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Window.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::codecs.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::gp-problems.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::image-load.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::faq.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::internals.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Image::TransparencyControl.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::PS::Encodings.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::PS::Fonts.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::PS::Printer.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::PS::Drawable.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::VB::CfgMaint.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::VB::Classes.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::VB::VBLoader.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::ComboBox.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Application.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Buttons.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::ColorDialog.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Const.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::DockManager.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Docks.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::EditDialog.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::ExtLists.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::FontDialog.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Grids.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Lists.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Header.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::DetailedList.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::DetailedOutline.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Edit.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::ImageViewer.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::IniFile.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::ImageDialog.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::InputLine.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::IntUtils.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::KeySelector.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Label.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::MDI.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Make.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::MsgBox.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Notebooks.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Outlines.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::PrintDialog.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::ScrollBar.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::ScrollWidget.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::StartupWindow.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::StdBitmap.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::StdDlg.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Stress.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Themes.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Utils.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Widgets.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Classes.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::FileDialog.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::PodView.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Sliders.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::FrameSet.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::TextView.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Tie.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::HelpViewer.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::Calendar.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::X11.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::EventHook.3.gz
-lib/perl5/%%PERL_VERSION%%/man/man3/Prima::sys::win32::FileDialog.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/gettextbox.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello1.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello2.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello3.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello4.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello5.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/hello6.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/menu1.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/menu2.gif
+%%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial/menu3.gif
 bin/gencls
 bin/tmlink
 bin/VB
+bin/fmview
 bin/cfgmaint
 bin/p-class
 bin/podview
@@ -332,5 +265,6 @@ bin/podview
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/examples
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Image
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/Widget
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima/tutorial
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Prima
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prima