upgraded eperl port to new release 2.1.1

my very last changes:
- put ftp site before http site
- commented out INSTALL_ALSO_AS_SSSL=	yes
  because the apache ssl port is currently marked broken
- because of SSL brokenness I removed cgi-bin/nph-eperl from
  the PLIST so that this port packages fine ...

This port should be revamped by the author to be organized like the
apache port, because INSTALL_ALSO_AS_SSSL= influences the PLIST.

PR:
Reviewed by:	andreas
Submitted by:	Ralf S. Engelschall <rse@engelschall.com>
Obtained from:

6 files changed, 98 insertions, 70 deletions

diff --git a/lang/eperl/Makefile b/lang/eperl/Makefile
index 0408eef503fb..77744ccccf41 100644
--- a/lang/eperl/Makefile
+++ b/lang/eperl/Makefile
@@ -1,39 +1,86 @@
 # New ports collection makefile for:	eperl
-# Version required:		2.0.3
-# Date created:			Sat Jan  4 18:04:13 MET 1997
-# Whom:				Ralf S. Engelschall <rse@engelschall.com>
-#				Andreas Klemm <andreas@klemm.gtn.com>
+# Version required:	2.1.1
+# Date created:		Fri May  2 13:16:31 MET DST 1997
+# Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
-# $Id: Makefile,v 1.2 1997/01/04 23:40:16 andreas Exp $
+# $Id$
 #
 
-DISTNAME=	eperl-2.0.3
-CATEGORIES=	www perl5
-MASTER_SITES=	http://www.engelschall.com/sw/eperl/dist/
+DISTNAME=	eperl-2.1.1
+CATEGORIES=	lang www perl5
+MASTER_SITES=	ftp://ftp.engelschall.com/sw/ \
+		http://www.engelschall.com/sw/eperl/distrib/
 
 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	# apache's SSL port is currently marked BROKEN
+#ENABLE_UID_SWITCHING=	yes
+
 BUILD_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
+.if defined(INSTALL_ALSO_AS_SSSL)
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5 \
 		${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/www/apache
+.else
+RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
+.endif
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-perl=${PREFIX}/bin/perl
 
 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
-	${INSTALL_PROGRAM} ${WRKSRC}/nph-eperl ${PREFIX}/www/cgi-bin/
+.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)
-	${MKDIR} -p ${PREFIX}/share/doc/eperl
-	${INSTALL_DATA} ${WRKSRC}/doc/about.txt \
-		${PREFIX}/share/doc/eperl/about.txt
-	${INSTALL_DATA} ${WRKSRC}/doc/about.ps \
-		${PREFIX}/share/doc/eperl/about.ps
-	${INSTALL_DATA} ${WRKSRC}/doc/faq.txt \
-		${PREFIX}/share/doc/eperl/faq.txt
-	${INSTALL_DATA} ${WRKSRC}/doc/faq.ps \
-		${PREFIX}/share/doc/eperl/faq.ps
+	@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                                    
+
+.if defined(INSTALL_ALSO_AS_SSSL)
+	@if [ ".`grep x-httpd-eperl ${PREFIX}/etc/apache/srm.conf`" = . ]; then \
+		echo "AddType  application/x-httpd-eperl  .phtml .eperl .epl" \
+			>>${PREFIX}/etc/apache/srm.conf; \
+		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"; \
+	else \
+		echo "Apache srm.conf is already aware of ePerl"; \
+	fi
 .endif                                    
 
 .include <bsd.port.mk>
diff --git a/lang/eperl/distinfo b/lang/eperl/distinfo
index 2e971cad7c0f..ba41df3c300c 100644
--- a/lang/eperl/distinfo
+++ b/lang/eperl/distinfo
@@ -1 +1 @@
-MD5 (eperl-2.0.3.tar.gz) = 87a57944df393aaf6f1b9145256395e2
+MD5 (eperl-2.1.1.tar.gz) = 7a1836d348e4fce376f7d224528b4102
diff --git a/lang/eperl/pkg-comment b/lang/eperl/pkg-comment
index 27d4becad37a..eb4b5ac63136 100644
--- a/lang/eperl/pkg-comment
+++ b/lang/eperl/pkg-comment
@@ -1 +1 @@
-Embedded Perl 5 for HTML (server-side scripting language)
+Embedded Perl 5 Language
diff --git a/lang/eperl/pkg-descr b/lang/eperl/pkg-descr
index c5695eaffd06..5957bb79ea65 100644
--- a/lang/eperl/pkg-descr
+++ b/lang/eperl/pkg-descr
@@ -4,12 +4,16 @@
   |  __/  __/  __/ |  | |
    \___|_|   \___|_|  |_|
                          
-  ePerl -- Embedded Perl 5 for HTML
+  ePerl -- Embedded Perl 5 Language
 
-  ePerl interprets a HTML markup file bristled with Perl 5 program
-  statements by expanding the Perl 5 code. It operates as a stand-alone 
-  NPH-CGI/1.0 compliant Unix program and produces pure HTML markup code 
-  as the resulting data.
+  Version 2.1.1 (01-05-1997)
+
+  ePerl interprets an ASCII file bristled with Perl 5 program statements by
+  evaluating the Perl 5 code while passing through the plain ASCII data. It
+  can operate both as a standard Unix filter for general file generation tasks
+  and as a powerful Webserver scripting language for dynamic HTML page
+  programming. 
 
   The documentation and latest release can be found on
   http://www.engelschall.com/sw/eperl/
+
diff --git a/lang/eperl/pkg-message b/lang/eperl/pkg-message
index 9a2581aeee7c..72f0b2b38c04 100644
--- a/lang/eperl/pkg-message
+++ b/lang/eperl/pkg-message
@@ -1,41 +1,13 @@
-  L I C E N S E   A G R E E M E N T
+  Copyright (c) 1996-1997 Ralf S. Engelschall, All rights reserved.
+
+  This program is free software; it may be redistributed and/or modified only
+  under the terms of either the Artistic License or the GNU General Public
+  License, which may be found in the ePerl source distribution.  Look at the
+  files ARTISTIC and COPYING or run ``eperl -l'' to receive a builtin copy of
+  both license files.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See either the GNU General Public License
+  or the Artistic License for more details.
 
-  Copyright (c) 1996,1997 Ralf S. Engelschall, All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-  
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer. 
-  
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the
-     distribution.
-  
-  3. All advertising materials mentioning features or use of this
-     software must display the following acknowledgment:
-         "This product includes software developed by 
-          Ralf S. Engelschall <rse@engelschall.com>."
-  
-  4. Redistributions of any form whatsoever must retain the following
-     acknowledgment:
-         "This product includes software developed by 
-          Ralf S. Engelschall <rse@engelschall.com>."
-  
-  5. The names "ePerl" and "Embedded Perl 5 for HTML" must not be used to
-     endorse or promote products derived from this software without
-     prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``AS IS'' AND ANY
-  EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL RALF S. ENGELSCHALL OR HIS CONTRIBUTORS
-  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
diff --git a/lang/eperl/pkg-plist b/lang/eperl/pkg-plist
index 27ce9fb361eb..159c8013c0a7 100644
--- a/lang/eperl/pkg-plist
+++ b/lang/eperl/pkg-plist
@@ -1,8 +1,13 @@
-www/cgi-bin/nph-eperl
+bin/eperl
+man/man1/eperl.1
 @exec echo "AddType  application/x-httpd-eperl  .phtml .eperl .epl" >>%D/etc/apache/srm.conf 
 @exec echo "Action   application/x-httpd-eperl  /cgi-bin/nph-eperl" >>%D/etc/apache/srm.conf
 @unexec grep -v "application/x-httpd-eperl" %D/etc/apache/srm.conf >%D/etc/apache/srm.conf.bak; mv %D/etc/apache/srm.conf.bak %D/etc/apache/srm.conf
-share/doc/eperl/about.txt
-share/doc/eperl/about.ps
-share/doc/eperl/faq.txt
-share/doc/eperl/faq.ps
+share/examples/eperl/demo-01.phtml
+share/examples/eperl/demo-02.phtml
+share/examples/eperl/demo-03.phtml
+share/examples/eperl/demo-04.phtml
+share/examples/eperl/demo-05.phtml
+share/examples/eperl/demo-06.phtml
+share/examples/eperl/demo-07.phtml
+share/examples/eperl/demo-08.phtml