diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-02-28 20:00:23 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-02-28 20:00:23 +0000 |
| commit | ba127194e9f9130d7c690fa15cbf40406d12b573 (patch) | |
| tree | 47d472ab2e53a7ae2ab6a65a531cfc2135b6d387 /lang/p5-ePerl | |
| parent | PsychoPy is an open-source package for creating psychology stimuli (diff) | |
- Unbreak after strndup MFC
- Pass maintainership to submitter
PR: 132160
Submitted by: Florian Smeets <flo@kasimir.com>
Notes
Notes:
svn path=/head/; revision=229243
Diffstat (limited to 'lang/p5-ePerl')
| -rw-r--r-- | lang/p5-ePerl/Makefile | 10 | ||||
| -rw-r--r-- | lang/p5-ePerl/files/patch-eperl_parse.c | 24 | ||||
| -rw-r--r-- | lang/p5-ePerl/files/patch-eperl_proto.h | 13 |
3 files changed, 34 insertions, 13 deletions
diff --git a/lang/p5-ePerl/Makefile b/lang/p5-ePerl/Makefile index dc11bd5438cf..fe1617944a01 100644 --- a/lang/p5-ePerl/Makefile +++ b/lang/p5-ePerl/Makefile @@ -12,17 +12,11 @@ MASTER_SITES= ${MASTER_SITE_OSSP} MASTER_SITE_SUBDIR= tool/${PORTNAME} PKGNAMEPREFIX= p5- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= flo@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 || (${OSVERSION} >= 701101 && ${OSVERSION} < 800000) -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/p5-ePerl/files/patch-eperl_parse.c b/lang/p5-ePerl/files/patch-eperl_parse.c index d9b506801d79..2082b206d816 100644 --- a/lang/p5-ePerl/files/patch-eperl_parse.c +++ b/lang/p5-ePerl/files/patch-eperl_parse.c @@ -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 --git a/lang/p5-ePerl/files/patch-eperl_proto.h b/lang/p5-ePerl/files/patch-eperl_proto.h index 852e32c65977..0962542c817d 100644 --- a/lang/p5-ePerl/files/patch-eperl_proto.h +++ b/lang/p5-ePerl/files/patch-eperl_proto.h @@ -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 */ |