3 files changed, 41 insertions, 15 deletions

diff --git a/lang/eperl/Makefile b/lang/eperl/Makefile
index 5f856b2c3e59..4580dd3b0d79 100644
--- a/lang/eperl/Makefile
+++ b/lang/eperl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eperl
 PORTVERSION=	2.2.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang www perl5
 MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	tool/${PORTNAME}
@@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR=	tool/${PORTNAME}
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Embedded Perl 5 Language
 
-BROKEN=		does not configure
-
 # User-controlled variables list
 # INSTALL_ALSO_AS_SSSL
 #	install ePerl also as a Server-Side
@@ -48,6 +46,11 @@ BROKEN=		Does not compile on sparc64: duplicate definition of strndup
 .endif
 .endif
 
+# Perl 5.14 changed some symbol names
+.if ${PERL_LEVEL} >= 501400
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-eperl_perl5.c
+.endif
+
 test:
 	@(cd ${WRKSRC}; ${MAKE} test)
 
@@ -55,6 +58,8 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*.[ch]" | \
 		${XARGS} ${GREP} -l strnstr | \
 		${XARGS} ${PERL} -pi -e 's|strnstr|ePerl_strnstr|g'
+	@${REINPLACE_CMD} -e 's#%%PERL_VERSION%%#${PERL_VERSION}#g' \
+		${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/eperl ${PREFIX}/bin/eperl
diff --git a/lang/eperl/files/extra-patch-eperl_perl5.c b/lang/eperl/files/extra-patch-eperl_perl5.c
new file mode 100644
index 000000000000..1fd71c64c3e8
--- /dev/null
+++ b/lang/eperl/files/extra-patch-eperl_perl5.c
@@ -0,0 +1,13 @@
+--- eperl_perl5.c.orig	2011-05-18 15:30:35.000000000 -0400
++++ eperl_perl5.c	2011-05-18 15:30:47.000000000 -0400
+@@ -98,8 +98,8 @@
+ void Perl5_SetScalar(char *pname, char *vname, char *vvalue)
+ {
+     ENTER;
+-    save_hptr(&curstash); 
+-    curstash = gv_stashpv(pname, TRUE);
++    save_hptr(&PL_curstash); 
++    PL_curstash = gv_stashpv(pname, TRUE);
+     sv_setpv(perl_get_sv(vname, TRUE), vvalue);
+     LEAVE;
+     return;
diff --git a/lang/eperl/files/patch-configure b/lang/eperl/files/patch-configure
index 508d5b20b9a4..8f0c93111fb7 100644
--- a/lang/eperl/files/patch-configure
+++ b/lang/eperl/files/patch-configure
@@ -1,34 +1,42 @@
---- configure.orig	1998-08-02 22:48:40.000000000 +0900
-+++ configure	2010-02-06 14:30:44.165551147 +0900
-@@ -571,7 +571,8 @@
+--- configure.orig	1998-08-02 09:48:40.000000000 -0400
++++ configure	2011-05-18 14:18:27.000000000 -0400
+@@ -571,7 +571,7 @@
  if test "${with_perl+set}" = set; then
    withval="$with_perl"
    perlprog=$with_perl
 -perlvers=`$perlprog -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
-+perlvers=`$perlprog -v | grep "This is perl" | sed -e 's/^.* version //' -e 's/^.* v//' -e 's/ built.*//' -e 's/ with.*//'`
-+perlvers=`echo ${perlvers} | sed -e 's/ (\*)//'`
++perlvers=%%PERL_VERSION%%
  
  else
    TMPFILE=/tmp/x.$$
-@@ -600,7 +601,7 @@
+@@ -583,7 +583,7 @@
+          if test -f "$dir/$perl"; then
+              if test -x "$dir/$perl"; then
+                  perl="$dir/$perl"
+-                 version=`$perl -v | grep version | sed -e 's/.* version //' -e 's/ built.*//' -e 's/ with.*//'`
++                 version=%%PERL_VERSION%%
+                  versionnum="`echo $version | sed -e 's/\.//g' -e 's/_//g'`"
+                  versionnum=`expr $versionnum - $c`
+                  echo "$versionnum $version $perl" >>$TMPFILE
+@@ -600,7 +600,7 @@
  PATH_PERL=$perlprog
  echo "$ac_t""$perlprog v$perlvers" 1>&6
  case $perlvers in
 -    5.003* | 5.004* | 5.005* | 5.006* )
-+    5.003* | 5.004* | 5.005* | 5.006* | 5.6.* | 5.8.* | 5.10.* )
++    5.003* | 5.004* | 5.005* | 5.006* | 5.6.* | 5.8.* | 5.10.* | 5.12.* | 5.14.* )
          ;;
      * ) echo ""
          echo "Latest Perl found on your system is $perlvers,"
-@@ -617,6 +618,8 @@
+@@ -617,6 +617,8 @@
  	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 
      5.00[3-6] ) 
  	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/$/00/'` ;; 
-+    5.[68].* | 5.10.* ) 
++    5.[68].* | 5.10.* | 5.12.* | 5.14.* ) 
 +	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/\./0/' -e 's/$/00/'` ;; 
  	* ) 
  	    perlvnum=`echo $perlvers | sed -e 's/\.//' -e 's/_//'` ;; 
  esac
-@@ -708,7 +711,9 @@
+@@ -708,7 +710,9 @@
  #define HAVE_PERL_DYNALOADER 1
  EOF
  
@@ -39,7 +47,7 @@
          ;;
      * )
          rc=no
-@@ -1028,7 +1033,7 @@
+@@ -1028,7 +1032,7 @@
      CFLAGS="-Wall -g -ggdb3"
      LDFLAGS="-g -ggdb3"
  else
@@ -48,7 +56,7 @@
      LDFLAGS="-g"
  fi
  x="enabled"
-@@ -1039,7 +1044,7 @@
+@@ -1039,7 +1043,7 @@
  
  
  else