Update to 1.3.6

Become maintainer

4 files changed, 27 insertions, 57 deletions

diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 0560bceae93d..e00d67d9dc0c 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -6,33 +6,47 @@
 #
 
 PORTNAME=	HTML-Embperl
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.6
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mharo@FreeBSD.org
 COMMENT=	A module to allow embedded perl in HTML documents
 
 .if !defined(WITHOUT_APACHE)
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
+#		${SITE_PERL}/Apache/SessionX.pm:${PORTSDIR}/www/p5-Apache-SessionX
 .endif
 
 PERL_CONFIGURE=	yes
+
 .if !defined(WITHOUT_APACHE)
-CONFIGURE_ARGS=	DEFINE=-DAPACHE INC=-I${LOCALBASE}/include/apache
+CONFIGURE_ENV=	EPHTTPD="${LOCALBASE}/sbin/httpd" EPMODDIR="${LOCALBASE}/libexec/apache"
+CONFIGURE_ARGS=	${LOCALBASE}/include/apache
+.else
+CONFIGURE_ENV=	NOAPACHE=true
 .endif
 
 INSTALL_TARGET=	pure_install
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		HTML::Embperl.3 HTML::EmbperlD.3 HTML::EmbperlObject.3
+MAN3=		HTML::Embperl.3 HTML::Embperl::Faq.3 HTML::Embperl::Changes.3 \
+		HTML::Embperl::FeaturesD.3 HTML::Embperl::TipsAndTricks.3 \
+		HTML::Embperl::Intro.3 HTML::Embperl::Session.3 HTML::Embperl::Mail.3 \
+		HTML::Embperl::INSTALL.3 HTML::Embperl::NEWS.3 HTML::EmbperlObject.3 \
+		HTML::Embperl::IntroD.3 HTML::EmbperlD.3 HTML::Embperl::Features.3 \
+		HTML::Embperl::IntroEmbperlObject.3
 MAN1=		embpexec.pl.1
 
-pre-configure:
-	${CP} -f ${FILESDIR}/Makefile.PL ${WRKSRC}
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500601
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/p5-HTML-Embperl/distinfo b/www/p5-HTML-Embperl/distinfo
index 9376447ddfd4..29dbbaa1c9f4 100644
--- a/www/p5-HTML-Embperl/distinfo
+++ b/www/p5-HTML-Embperl/distinfo
@@ -1,2 +1,2 @@
-MD5 (HTML-Embperl-1.3.3.tar.gz) = f2a4579210f7797e1ff4d756f3b7e037
-SIZE (HTML-Embperl-1.3.3.tar.gz) = 345235
+MD5 (HTML-Embperl-1.3.6.tar.gz) = b360a0f9ba5d5e35f6426c81dd91933d
+SIZE (HTML-Embperl-1.3.6.tar.gz) = 357623
diff --git a/www/p5-HTML-Embperl/files/Makefile.PL b/www/p5-HTML-Embperl/files/Makefile.PL
deleted file mode 100644
index 8284983037d8..000000000000
--- a/www/p5-HTML-Embperl/files/Makefile.PL
+++ /dev/null
@@ -1,45 +0,0 @@
-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/pkg-plist b/www/p5-HTML-Embperl/pkg-plist
index e5ed0fd0569c..e73454f7c85b 100644
--- a/www/p5-HTML-Embperl/pkg-plist
+++ b/www/p5-HTML-Embperl/pkg-plist
@@ -1,20 +1,21 @@
 bin/embpexec.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Changes.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Faq.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Features.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/FeaturesD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/INSTALL.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Intro.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/IntroD.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/IntroEmbperlObject.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Mail.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Module.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/NEWS.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/Session.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/TipsAndTricks.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/embpcgi.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl/epocgi.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/EmbperlD.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/HTML/EmbperlObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/HTML/IntroEmbperlObject.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so