Upgrade to 1.3.3

PR:		27032
Submitted by:	maintainer
OK'ed by:	markm

5 files changed, 80 insertions, 53 deletions

diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index a4cb1db3a817..a8bbab797a30 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	HTML-Embperl
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
@@ -14,12 +14,24 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kapr@crosswinds.net
 
+.if !defined(WITHOUT_APACHE)
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
+.endif
 
 PERL_CONFIGURE=	yes
-IS_INTERACTIVE=	yes
+.if !defined(WITHOUT_APACHE)
+CONFIGURE_ARGS=	DEFINE=-DAPACHE INC=-I${LOCALBASE}/include/apache
+.endif
 
+INSTALL_TARGET=	pure_install
+
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		HTML::Embperl.3 HTML::EmbperlD.3 HTML::EmbperlObject.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN1=		embpexec.pl.1
+
+pre-configure:
+	${CP} -f ${FILESDIR}/Makefile.PL ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Embperl/distinfo b/www/p5-HTML-Embperl/distinfo
index f5696c8741a3..5a3ee2483f99 100644
--- a/www/p5-HTML-Embperl/distinfo
+++ b/www/p5-HTML-Embperl/distinfo
@@ -1 +1 @@
-MD5 (HTML-Embperl-1.3.0.tar.gz) = d62c04100c70161733c9ff38602ee528
+MD5 (HTML-Embperl-1.3.3.tar.gz) = f2a4579210f7797e1ff4d756f3b7e037
diff --git a/www/p5-HTML-Embperl/files/Makefile.PL b/www/p5-HTML-Embperl/files/Makefile.PL
new file mode 100644
index 000000000000..8284983037d8
--- /dev/null
+++ b/www/p5-HTML-Embperl/files/Makefile.PL
@@ -0,0 +1,45 @@
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+	NAME		=> 'HTML::Embperl',
+	VERSION_FROM	=> 'Embperl.pm',
+	OBJECT		=> 'Embperl$(OBJ_EXT) epmain$(OBJ_EXT) epio$(OBJ_EXT) '.
+			'epchar$(OBJ_EXT) epcmd$(OBJ_EXT) eputil$(OBJ_EXT) '.
+			'epeval$(OBJ_EXT) epapinit$(OBJ_EXT)',
+	MAN3PODS	=> {
+		'Embperl.pod'		=> '$(INST_MAN3DIR)/HTML::Embperl.3',
+		'EmbperlD.pod'		=> '$(INST_MAN3DIR)/HTML::EmbperlD.3',
+		'EmbperlObject.pm'	=> '$(INST_MAN3DIR)/HTML::EmbperlObject.3',
+	},
+	PM		=> {
+		'Embperl.pm'		=> '$(INST_LIBDIR)/Embperl.pm',
+		'EmbperlObject.pm'	=> '$(INST_LIBDIR)/EmbperlObject.pm',
+		'Embperl/Module.pm'	=> '$(INST_LIBDIR)/Embperl/Module.pm',
+		'Embperl/Mail.pm'	=> '$(INST_LIBDIR)/Embperl/Mail.pm',
+		'Embperl/Session.pm'	=> '$(INST_LIBDIR)/Embperl/Session.pm',
+		'Embperl.pod'		=> '$(INST_LIBDIR)/Embperl.pod',
+		'EmbperlD.pod'		=> '$(INST_LIBDIR)/EmbperlD.pod',
+		'Intro.pod'		=> '$(INST_LIBDIR)/Embperl/Intro.pod',
+		'IntroD.pod'		=> '$(INST_LIBDIR)/Embperl/IntroD.pod',
+		'IntroEmbperlObject.pod'=> '$(INST_LIBDIR)/IntroEmbperlObject.pod',
+		'Features.pod'		=> '$(INST_LIBDIR)/Embperl/Features.pod',
+		'FeaturesD.pod'		=> '$(INST_LIBDIR)/Embperl/FeaturesD.pod',
+		'Faq.pod'		=> '$(INST_LIBDIR)/Embperl/Faq.pod',
+		'TipsAndTricks.pod'	=> '$(INST_LIBDIR)/Embperl/TipsAndTricks.pod',
+		'embpcgi.pl'		=> '$(INST_LIBDIR)/Embperl/embpcgi.pl',
+		'epocgi.pl'		=> '$(INST_LIBDIR)/Embperl/epocgi.pl',
+	},
+	EXE_FILES	=> [ 'embpexec.pl' ],
+	PREREQ_PM	=> "@ARGV" !~ /\bDEFINE=-DAPACHE\b/ ? {} :
+	{
+		'Apache::Session'	=> '1.50',
+		'mod_perl'		=> '1.22',
+	},
+	ABSTRACT	=> 'Embed Perl code in HTML documents',
+	AUTHOR		=> 'Gerald Richter <richter@dev.ecos.de>',
+);
+
+@bins = ('embpexec.pl', 'embpcgi.pl', 'epocgi.pl');
+foreach (@bins) {
+	rename "$_.templ", $_;
+}
diff --git a/www/p5-HTML-Embperl/files/patch-aa b/www/p5-HTML-Embperl/files/patch-aa
deleted file mode 100644
index 2e2b71f76053..000000000000
--- a/www/p5-HTML-Embperl/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.PL.orig	Mon Nov 13 10:14:28 2000
-+++ Makefile.PL	Tue Dec 19 12:09:13 2000
-@@ -26,7 +26,7 @@
- %neededmodules =
-     ( 
-       'mod_perl.c' => { name	    => 'perl_module', 
--			path	    => ['$apache_src/modules/perl/libperl.so', '$EPBINDIR/modules/libperl.so', '$apache_src/mod_perl.so'],
-+			path	    => ['/usr/local/libexec/apache/libperl.so', '$EPBINDIR/modules/libperl.so', '$apache_src/mod_perl.so'],
- 			win32path   => ['$mpdll', '$mpdll/apachemoduleperl.dll', '$EPBINDIR/modules/apachemoduleperl.dll'],
- 			file	    => 'libperl.so',
- 			win32file   => 'apachemoduleperl.dll',
-@@ -468,23 +468,7 @@
- 
-     #### look in which subdir the include files resides ####
-     
--    if (-e "$apache_src/httpd.h")
--         {
--         $inc_dir = $apache_src ;
--         }
--    elsif (-e "$apache_src/main/httpd.h")
--         {
--         $inc_dir = "$apache_src/main" ;
--         }
--    elsif (-e "$apache_src/include/httpd.h")
--         {
--         $inc_dir = "$apache_src/include" ;
--         }
--    elsif (-e "$ENV{APACHE_HDR}/httpd.h")
--         {
--         $inc_dir = "$ENV{APACHE_HDR}" ;
--         }
--        
-+	$inc_dir = "/usr/local/include/apache";
- 
-     if ($win32)
- 	{ 
diff --git a/www/p5-HTML-Embperl/pkg-plist b/www/p5-HTML-Embperl/pkg-plist
index 4675a6251dd9..2a0403d858ba 100644
--- a/www/p5-HTML-Embperl/pkg-plist
+++ b/www/p5-HTML-Embperl/pkg-plist
@@ -1,18 +1,24 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Features.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/IntroD.pod
+bin/embpexec.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/FeaturesD.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Faq.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Features.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/FeaturesD.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Intro.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/IntroD.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Mail.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Session.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Module.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/INSTALL.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/EmbperlObject.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Faq.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Changes.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/Session.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/TipsAndTricks.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/embpcgi.pl
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl/epocgi.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/EmbperlD.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Intro.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/NEWS.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/EmbperlObject.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/IntroEmbperlObject.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Embperl
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true