ports/132160: [PATCH] lang/p5-eperl: fix after strndup addition/MFC, remove BROKEN tag, take mantainership

[Florian Smeets]

>Number:         132160
>Category:       ports
>Synopsis:       [PATCH] lang/p5-eperl: fix after strndup addition/MFC, remove BROKEN tag, take mantainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 27 12:50:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Florian Smeets
>Release:        FreeBSD 7.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD mail.solomo.de 7.1-STABLE FreeBSD 7.1-STABLE #4: Mon Jan  5 22:33:23 CET
>Description:
- this port was broken by the addition/MFC of strndup. With this patch it builds again.
- Take maintainership

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
this port was broken by the addition/MFC of strndup. With this patch it builds again.
>Fix:
use strndup function included in the port only in the cases where it's needed

--- p5-eperl-2.2.14.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/lang/p5-ePerl.orig/Makefile /usr/ports/lang/p5-ePerl/Makefile
--- /usr/ports/lang/p5-ePerl.orig/Makefile	2009-01-08 18:30:03.000000000 +0100
+++ /usr/ports/lang/p5-ePerl/Makefile	2009-02-27 13:42:40.000000000 +0100
@@ -2,7 +2,7 @@
 # Date created:		03-Sep-1997
 # Whom:	      		Ralf S. Engelschall <rse at engelschall.com>
 #
-# $FreeBSD: ports/lang/p5-ePerl/Makefile,v 1.29 2009/01/08 17:30:03 erwin Exp $
+# $FreeBSD: ports/lang/p5-ePerl/Makefile,v 1.30 2009/02/27 01:41:31 linimon Exp $
 #
 
 PORTNAME=	eperl
@@ -12,17 +12,11 @@
 MASTER_SITE_SUBDIR=	tool/${PORTNAME}
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	flo at kasimir.com
 COMMENT=	Perl Modules of ePerl package: Parse::ePerl, Apache::ePerl
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Parse::ePerl.3 Apache::ePerl.3
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800058
-BROKEN=		does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/lang/p5-ePerl.orig/files/patch-eperl_parse.c /usr/ports/lang/p5-ePerl/files/patch-eperl_parse.c
--- /usr/ports/lang/p5-ePerl.orig/files/patch-eperl_parse.c	2002-11-21 11:29:47.000000000 +0100
+++ /usr/ports/lang/p5-ePerl/files/patch-eperl_parse.c	2009-02-27 13:42:40.000000000 +0100
@@ -1,5 +1,5 @@
---- eperl_parse.c.orig	Thu Nov 21 21:27:34 2002
-+++ eperl_parse.c	Thu Nov 21 21:27:42 2002
+--- eperl_parse.c.orig	2009-02-27 12:23:36.000000000 +0000
++++ eperl_parse.c	2009-02-27 12:25:38.000000000 +0000
 @@ -298,6 +298,7 @@
      return NULL;
  }
@@ -16,3 +16,23 @@
  
  char *strncasestr(char *buf, char *str, int n)
  {
+@@ -326,6 +328,9 @@
+     return NULL;
+ }
+ 
++#if defined(__FreeBSD__)  
++#include <osreldate.h>  
++#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100  
+ char *strndup(char *buf, int n)
+ {
+     char *cp;
+@@ -334,7 +339,8 @@
+     strncpy(cp, buf, n);
+     return cp;
+ }
+-
++#endif
++#endif
+ 
+ /*
+ **  convert buffer from bristled format to plain format
diff -ruN --exclude=CVS /usr/ports/lang/p5-ePerl.orig/files/patch-eperl_proto.h /usr/ports/lang/p5-ePerl/files/patch-eperl_proto.h
--- /usr/ports/lang/p5-ePerl.orig/files/patch-eperl_proto.h	2007-05-30 19:14:50.000000000 +0200
+++ /usr/ports/lang/p5-ePerl/files/patch-eperl_proto.h	2009-02-27 13:42:40.000000000 +0100
@@ -1,5 +1,5 @@
---- eperl_proto.h.orig	Fri Jul 10 09:52:24 1998
-+++ eperl_proto.h	Wed May 30 19:13:42 2007
+--- eperl_proto.h.orig	2009-02-27 12:23:02.000000000 +0000
++++ eperl_proto.h	2009-02-27 12:24:39.000000000 +0000
 @@ -36,6 +36,7 @@
  #define EPERL_PROTO_H 1
  
@@ -8,12 +8,19 @@
  
  /* eperl_main.c */
  extern int mode;
-@@ -79,7 +80,7 @@
+@@ -79,9 +80,14 @@
  extern char *ePerl_Efwrite(char *cpBuf, int nBuf, int cNum, char *cpOut);
  extern char *ePerl_Cfwrite(char *cpBuf, int nBuf, int cNum, char *cpOut);
  extern char *strnchr(char *buf, char chr, int n);
 -extern char *strnstr(char *buf, char *str, int n);
 +/*extern char *strnstr(char *buf, char *str, int n);*/
  extern char *strncasestr(char *buf, char *str, int n);
++#if defined(__FreeBSD__)
++#include <osreldate.h>
++#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100
  extern char *strndup(char *buf, int n);
++#endif
++#endif
  extern char *ePerl_Bristled2Plain(char *cpBuf);
+ 
+ /* eperl_pp.c */
--- p5-eperl-2.2.14.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: