5 files changed, 27 insertions, 24 deletions

diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 5c3f8baba165..772b687b48a3 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	HTML-Embperl
-PORTVERSION= 	1.3b2
+PORTVERSION= 	1.3.0
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kapr@crosswinds.net
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/p5-Apache
 
-IS_INTERACTIVE=	yes
 USE_PERL5=	yes
+IS_INTERACTIVE=	yes
 
-MAN3=		HTML::Embperl.3 HTML::EmbperlD.3
+MAN3=		HTML::Embperl.3 HTML::EmbperlD.3 HTML::EmbperlObject.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
diff --git a/www/p5-HTML-Embperl/distinfo b/www/p5-HTML-Embperl/distinfo
index d37fa496897e..f5696c8741a3 100644
--- a/www/p5-HTML-Embperl/distinfo
+++ b/www/p5-HTML-Embperl/distinfo
@@ -1 +1 @@
-MD5 (HTML-Embperl-1.3b2.tar.gz) = d49cc9040f7ad6c78c19615ec668ce59
+MD5 (HTML-Embperl-1.3.0.tar.gz) = d62c04100c70161733c9ff38602ee528
diff --git a/www/p5-HTML-Embperl/files/patch-aa b/www/p5-HTML-Embperl/files/patch-aa
index 54f3990b13c7..2e2b71f76053 100644
--- a/www/p5-HTML-Embperl/files/patch-aa
+++ b/www/p5-HTML-Embperl/files/patch-aa
@@ -1,15 +1,15 @@
---- Makefile.PL.orig	Sat Feb 12 06:18:23 2000
-+++ Makefile.PL	Sun Mar 19 13:19:43 2000
-@@ -24,7 +24,7 @@
+--- 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'],
-+			path	    => ['/usr/local/libexec/apache/libperl.so', '$apache_src/modules/perl/libperl.so', '$EPBINDIR/modules/libperl.so'],
- 			win32path   => ['$EPBINDIR/modules/apachemoduleperl.dll'],
- 			win32path   => ['$mpdll'],
+-			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',
-@@ -385,18 +385,7 @@
+ 			win32file   => 'apachemoduleperl.dll',
+@@ -468,23 +468,7 @@
  
      #### look in which subdir the include files resides ####
      
@@ -25,7 +25,12 @@
 -         {
 -         $inc_dir = "$apache_src/include" ;
 -         }
-+    $inc_dir = "/usr/local/include/apache";
-         
+-    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-descr b/www/p5-HTML-Embperl/pkg-descr
index affc35f264f0..db4bafae5cc0 100644
--- a/www/p5-HTML-Embperl/pkg-descr
+++ b/www/p5-HTML-Embperl/pkg-descr
@@ -3,4 +3,4 @@ This is Embperl, a module to allow embedded perl in HTML documents.
 Online documentation of this module as well as related modules can be
 found at:
 
-WWW: http://search.cpan.org/doc/GRICHTER/HTML-Embperl-1.3b2/EmbperlD.pod
+WWW: http://perl.apache.org/embperl/
diff --git a/www/p5-HTML-Embperl/pkg-plist b/www/p5-HTML-Embperl/pkg-plist
index 0d029a4f573b..4675a6251dd9 100644
--- a/www/p5-HTML-Embperl/pkg-plist
+++ b/www/p5-HTML-Embperl/pkg-plist
@@ -1,20 +1,18 @@
 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
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/embpcgi.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/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/Faq.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/embpcgi.test.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Features.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Embperl.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/embpexec.pl
-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/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%%/auto/HTML/Embperl/.packlist