diff options
| author | wxs <wxs@FreeBSD.org> | 2009-02-25 22:24:04 +0800 |
|---|---|---|
| committer | wxs <wxs@FreeBSD.org> | 2009-02-25 22:24:04 +0800 |
| commit | da7940da35b45446b92ddce71bef9ff71b72134e (patch) | |
| tree | 15ca0dd68d4dbd032dd1f4808bca105e4a4262aa /devel | |
| parent | b48f747cc882221bbd30343b1d5f7f3270b4a43f (diff) | |
| download | freebsd-ports-gnome-da7940da35b45446b92ddce71bef9ff71b72134e.tar.gz freebsd-ports-gnome-da7940da35b45446b92ddce71bef9ff71b72134e.tar.zst freebsd-ports-gnome-da7940da35b45446b92ddce71bef9ff71b72134e.zip | |
- Unbreak on versions after strndup MFC
- Pass maintainership to submitter
PR: ports/132070
Submitted by: Florian Smeets <flo@kasimir.com>
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cvswrap/Makefile | 17 | ||||
| -rw-r--r-- | devel/cvswrap/files/patch-cvswrap.c | 34 |
2 files changed, 39 insertions, 12 deletions
diff --git a/devel/cvswrap/Makefile b/devel/cvswrap/Makefile index 450f3e827283..3c74150bdd00 100644 --- a/devel/cvswrap/Makefile +++ b/devel/cvswrap/Makefile @@ -5,25 +5,18 @@ # $FreeBSD$ # -PORTNAME= cvswrap +PORTNAME= cvswrap PORTVERSION= 0.2 -CATEGORIES= devel +CATEGORIES= devel MASTER_SITES+= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= alfred -MAINTAINER= ports@FreeBSD.org -COMMENT= Helper for multiple CVS repositories. +MAINTAINER= flo@kasimir.com +COMMENT= Helper for multiple CVS repositories GNU_CONFIGURE= yes MAN1= cvswrap.1 MAN5= cvswrap.conf.5 -.include <bsd.port.pre.mk> - -# Redefines strndup(3) -.if ${OSVERSION} >= 800058 || (${OSVERSION} >= 701101 && ${OSVERSION} < 800000) -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/cvswrap/files/patch-cvswrap.c b/devel/cvswrap/files/patch-cvswrap.c new file mode 100644 index 000000000000..db5ed64d145f --- /dev/null +++ b/devel/cvswrap/files/patch-cvswrap.c @@ -0,0 +1,34 @@ +--- cvswrap.c.orig 2009-02-24 15:40:55.000000000 +0100 ++++ cvswrap.c 2009-02-24 15:38:24.000000000 +0100 +@@ -94,7 +94,12 @@ + char **cvsrootp); + static void slashfix(char *); + static int strings_have_line(char * const *strings, const char *line); ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100 + static char * strndup(const char *str, size_t len); ++#endif ++#endif + static int timeval_diff(const struct timeval *tv1, + const struct timeval *tv2); + static int writebuf(int fd, const char *buf, size_t len); +@@ -324,6 +329,9 @@ + return (0); + } + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100 + /* + * return: a copy of "len" bytes from byte string "str" and NULL terminate. + */ +@@ -340,6 +348,8 @@ + *(ret + len) = '\0'; + return (ret); + } ++#endif ++#endif + + /* + * Wait for child cvs process to exit. |