diff options
| author | miwi <miwi@FreeBSD.org> | 2009-03-01 22:06:56 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2009-03-01 22:06:56 +0800 |
| commit | 7b8fec556bd5212ad441499dd351ab43d2265962 (patch) | |
| tree | 58b7fd650e1612af7f2dc6318623b8cf3342041f /audio/tosha | |
| parent | d7a585072530e6d45a0025d461e22da081abae37 (diff) | |
| download | freebsd-ports-graphics-7b8fec556bd5212ad441499dd351ab43d2265962.tar.gz freebsd-ports-graphics-7b8fec556bd5212ad441499dd351ab43d2265962.tar.zst freebsd-ports-graphics-7b8fec556bd5212ad441499dd351ab43d2265962.zip | |
- Unbreak after strndup MFC [1]
- Move to PLIST_FILES
PR: 132067
Submitted by: Florian Smeets <flo@kasimir.com>
Diffstat (limited to 'audio/tosha')
| -rw-r--r-- | audio/tosha/Makefile | 9 | ||||
| -rw-r--r-- | audio/tosha/files/patch-utils.c | 21 | ||||
| -rw-r--r-- | audio/tosha/files/patch-utils.h | 21 | ||||
| -rw-r--r-- | audio/tosha/pkg-plist | 4 |
4 files changed, 45 insertions, 10 deletions
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile index 13a39b130eb..738e17cb210 100644 --- a/audio/tosha/Makefile +++ b/audio/tosha/Makefile @@ -18,10 +18,7 @@ COMMENT= Read CD digital audio and video data via the SCSI bus MAN1= pcmfade.1 pcmplay.1 tosha.1 MANCOMPRESSED= yes -.include <bsd.port.pre.mk> +PLIST_FILES= bin/tosha bin/pcmplay \ + bin/pcmfade etc/tosharc -.if ${OSVERSION} >= 800058 || (${OSVERSION} >= 701101 && ${OSVERSION} < 800000) -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/tosha/files/patch-utils.c b/audio/tosha/files/patch-utils.c new file mode 100644 index 00000000000..4b34b37e9d3 --- /dev/null +++ b/audio/tosha/files/patch-utils.c @@ -0,0 +1,21 @@ +--- utils.c.orig 2009-02-24 14:41:16.000000000 +0100 ++++ utils.c 2009-02-24 14:41:55.000000000 +0100 +@@ -59,6 +59,9 @@ + return (mem); + } + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100 + char *strndup (char *src, int num) + { + char *dst; +@@ -68,6 +71,8 @@ + dst[num] = '\0'; + return (strncpy(dst, src, num)); + } ++#endif ++#endif + + char *justify (char *str) + { diff --git a/audio/tosha/files/patch-utils.h b/audio/tosha/files/patch-utils.h new file mode 100644 index 00000000000..32b32cbee6a --- /dev/null +++ b/audio/tosha/files/patch-utils.h @@ -0,0 +1,21 @@ +--- utils.h.orig 2009-02-24 14:41:21.000000000 +0100 ++++ utils.h 2009-02-24 14:42:08.000000000 +0100 +@@ -63,6 +63,9 @@ + * allocated. + */ + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100 + char *strndup (char *src, int num); + /* + * Like strdup(), but limits the string length to at most +@@ -71,6 +74,8 @@ + * Always allocates <num>+1 bytes, even if less space would + * be sufficient to store <src>. + */ ++#endif ++#endif + + char *justify (char *str); + /* diff --git a/audio/tosha/pkg-plist b/audio/tosha/pkg-plist deleted file mode 100644 index 115f8509f59..00000000000 --- a/audio/tosha/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/tosha -bin/pcmplay -bin/pcmfade -etc/tosharc |