Upgrade to ePerl 2.2.1.

Reviewed by:	Andreas Klemm
Submitted by:	Ralf S. Engelschall

1 files changed, 31 insertions, 49 deletions

diff --git a/lang/eperl/Makefile b/lang/eperl/Makefile
index 0ae8d9d..1fc93a4 100644
--- a/lang/eperl/Makefile
+++ b/lang/eperl/Makefile
@@ -1,83 +1,65 @@
 # New ports collection makefile for:	eperl
-# Version required:	2.1.1
-# Date created:		Fri May  2 13:16:31 MET DST 1997
+# Version required:	2.2.1
+# Date created:		Sat Aug  2 17:22:46 MET DST 1997
 # Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
-# $Id: Makefile,v 1.7 1997/07/18 05:04:15 asami Exp $
+# $Id$
 #
 
-DISTNAME=	eperl-2.1.1
+DISTNAME=	eperl-2.2.1
 CATEGORIES=	lang www perl5
-MASTER_SITES=	http://www.engelschall.com/sw/eperl/distrib/ \
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
+		http://www.engelschall.com/sw/eperl/distrib/ \
 		ftp://ftp.engelschall.com/sw/
+MASTER_SITE_SUBDIR=Parse
 
 MAINTAINER=	rse@engelschall.com
 
 # User-controlled variables list
-#
-# Server-Side Scripting Language (SSSL) support:
-# INSTALL_ALSO_AS_SSSL - install ePerl also as SSSL for Apache
-# ENABLE_UID_SWITCHING - allow ePerl to switch the UID/GID to the
-#                        owner of the executed script when operating 
-#                        as a SSSL. Implies usage of SetUID bit!
-#
-INSTALL_ALSO_AS_SSSL=	yes
-#ENABLE_UID_SWITCHING=	yes
+# INSTALL_ALSO_AS_SSSL
+#	install ePerl also as a Server-Side
+#	Scripting Language (SSSL) for Apache
+INSTALL_ALSO_AS_SSSL=	no
 
 .if defined(INSTALL_ALSO_AS_SSSL)
 RUN_DEPENDS=	${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/www/apache-stable
 .endif
 
 USE_PERL5=	yes
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-perl=${PREFIX}/bin/perl
 
+MAN1=	eperl.1
+
+post-patch:
+	rm -f ${WRKSRC}/eg/demo.errsync.phtml # remove bad file
+
+test:
+	@(cd ${WRKSRC}; make test)
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/eperl ${PREFIX}/bin/eperl
 	${INSTALL_MAN} ${WRKSRC}/eperl.1 ${PREFIX}/man/man1/eperl.1
-.if defined(INSTALL_ALSO_AS_SSSL)
-	@if [ ! -d ${PREFIX}/www/cgi-bin ]; then \
-		${MKDIR} -p ${PREFIX}/www/cgi-bin; \
-	fi
-.if defined(ENABLE_UID_SWITCHING)
-	${INSTALL_PROGRAM} -o root -m u+s ${WRKSRC}/eperl \
-		${PREFIX}/www/cgi-bin/nph-eperl
-.else
-	${INSTALL_PROGRAM} ${WRKSRC}/eperl ${PREFIX}/www/cgi-bin/nph-eperl
-.endif
-.endif
 .if !defined(NOPORTDOCS)
 	@if [ ! -d ${PREFIX}/share/examples/eperl ]; then \
 		${MKDIR} -p ${PREFIX}/share/examples/eperl; \
 	fi
-	${INSTALL_DATA} ${WRKSRC}/eg/demo-01.phtml \
-		${PREFIX}/share/examples/eperl/demo-01.phtml
-	${INSTALL_DATA} ${WRKSRC}/eg/demo-02.phtml \
-		${PREFIX}/share/examples/eperl/demo-02.phtml
-	${INSTALL_DATA} ${WRKSRC}/eg/demo-03.phtml \
-		${PREFIX}/share/examples/eperl/demo-03.phtml
-	${INSTALL_DATA} ${WRKSRC}/eg/demo-04.phtml \
-		${PREFIX}/share/examples/eperl/demo-04.phtml
-	${INSTALL_DATA} ${WRKSRC}/eg/demo-05.phtml \
-		${PREFIX}/share/examples/eperl/demo-05.phtml
-	${INSTALL_DATA} ${WRKSRC}/eg/demo-06.phtml \
-		${PREFIX}/share/examples/eperl/demo-06.phtml
-	${INSTALL_DATA} ${WRKSRC}/eg/demo-07.phtml \
-		${PREFIX}/share/examples/eperl/demo-07.phtml
-	${INSTALL_DATA} ${WRKSRC}/eg/demo-08.phtml \
-		${PREFIX}/share/examples/eperl/demo-08.phtml
-.endif                                    
-
+	${CP} ${WRKSRC}/eg/* ${PREFIX}/share/examples/eperl/
+.endif
 .if defined(INSTALL_ALSO_AS_SSSL)
+	@if [ ! -d ${PREFIX}/www/cgi-bin ]; then \
+		${MKDIR} -p ${PREFIX}/www/cgi-bin; \
+	fi
+	${INSTALL_PROGRAM} ${WRKSRC}/eperl ${PREFIX}/www/cgi-bin/nph-eperl
 	@if [ ".`grep x-httpd-eperl ${PREFIX}/etc/apache/srm.conf`" = . ]; then \
-		echo "AddType  application/x-httpd-eperl  .phtml .eperl .epl" \
+		${ECHO} "AddType  application/x-httpd-eperl  .phtml .eperl .epl" \
 			>>${PREFIX}/etc/apache/srm.conf; \
-		echo "Action   application/x-httpd-eperl  /cgi-bin/nph-eperl" \
+		${ECHO} "Action   application/x-httpd-eperl  /cgi-bin/nph-eperl" \
 			>>${PREFIX}/etc/apache/srm.conf; \
-		echo "Added knowledge about ePerl to Apache's srm.conf"; \
+		${ECHO} "Added knowledge about ePerl to Apache's srm.conf"; \
 	else \
-		echo "Apache srm.conf is already aware of ePerl"; \
+		${ECHO} "Apache srm.conf is already aware of ePerl"; \
 	fi
-.endif                                    
+.endif
 
 .include <bsd.port.mk>