Date: Mon, 11 Jun 2001 01:30:05 -0700 (PDT) From: Alex Kapranoff <kapr@crosswinds.net> To: freebsd-ports@FreeBSD.org Subject: Re: ports/27032: [mnt port update] www/p5-HTML-Embperl Message-ID: <200106110830.f5B8U5u00393@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/27032; it has been noted by GNATS.
From: Alex Kapranoff <kapr@crosswinds.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Anton Berezin <tobez@tobez.org>
Subject: Re: ports/27032: [mnt port update] www/p5-HTML-Embperl
Date: Mon, 11 Jun 2001 11:09:47 +0400
This is an updated patch with all (I hope) issues resolved. I thank
Anton for comments. I tested this both on 4.3-RELEASE and 5.0-CURRENT
boxes.
1. The port build is made non-interactive by sacrificing some time into
composing Makefile.PL from scratch. This will hardly ease
maintainability (but original Makefile.PL is genuinely evil).
2. It is updated to 1.3.3.
3. plist is fixed and sorted.
4. WITHOUT_APACHE knob implemented.
diff -ruN /usr/ports/www/p5-HTML-Embperl/Makefile p5-HTML-Embperl/Makefile
--- /usr/ports/www/p5-HTML-Embperl/Makefile Thu Mar 29 17:48:54 2001
+++ p5-HTML-Embperl/Makefile Mon Jun 11 10:41:51 2001
@@ -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,25 @@
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
+RUN_DEPENDS= ${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
-MAN3= HTML::Embperl.3 HTML::EmbperlD.3 HTML::EmbperlObject.3
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+CONFIGURE_ARGS+=INSTALLMAN1DIR=${MANPREFIX}/man/man1
+MAN3= HTML::Embperl.3 HTML::EmbperlD.3 HTML::EmbperlObject.3
+MAN1= embpexec.pl.1
+
+pre-configure:
+ ${CP} -f ${FILESDIR}/Makefile.PL ${WRKSRC}
.include <bsd.port.mk>
diff -ruN /usr/ports/www/p5-HTML-Embperl/distinfo p5-HTML-Embperl/distinfo
--- /usr/ports/www/p5-HTML-Embperl/distinfo Thu Dec 21 14:22:10 2000
+++ p5-HTML-Embperl/distinfo Sat Jun 9 21:45:32 2001
@@ -1 +1 @@
-MD5 (HTML-Embperl-1.3.0.tar.gz) = d62c04100c70161733c9ff38602ee528
+MD5 (HTML-Embperl-1.3.3.tar.gz) = f2a4579210f7797e1ff4d756f3b7e037
diff -ruN /usr/ports/www/p5-HTML-Embperl/files/Makefile.PL p5-HTML-Embperl/files/Makefile.PL
--- /usr/ports/www/p5-HTML-Embperl/files/Makefile.PL Thu Jan 1 03:00:00 1970
+++ p5-HTML-Embperl/files/Makefile.PL Mon Jun 11 01:00:03 2001
@@ -0,0 +1,44 @@
+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 => {
+ '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 -ruN /usr/ports/www/p5-HTML-Embperl/files/patch-aa p5-HTML-Embperl/files/patch-aa
--- /usr/ports/www/p5-HTML-Embperl/files/patch-aa Thu Dec 21 14:22:10 2000
+++ p5-HTML-Embperl/files/patch-aa Thu Jan 1 03:00:00 1970
@@ -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 -ruN /usr/ports/www/p5-HTML-Embperl/pkg-plist p5-HTML-Embperl/pkg-plist
--- /usr/ports/www/p5-HTML-Embperl/pkg-plist Thu Dec 21 14:22:10 2000
+++ p5-HTML-Embperl/pkg-plist Mon Jun 11 10:28:42 2001
@@ -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
--
Alex Kapranoff, Voice: +7(0832)791845
We've lived 160 days in the brand new millenium...
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200106110830.f5B8U5u00393>