diff options
| author | hrs <hrs@FreeBSD.org> | 2013-10-17 15:37:29 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2013-10-17 15:37:29 +0800 |
| commit | 8b9ced418577a84d3e6dc7c8d146ca8854ca5afa (patch) | |
| tree | fccebf87b8655fc5055697f723cf853c87ec746c | |
| parent | a2cbfad90a87e15528ee03804666a0ae29bf4131 (diff) | |
| download | freebsd-ports-gnome-8b9ced418577a84d3e6dc7c8d146ca8854ca5afa.tar.gz freebsd-ports-gnome-8b9ced418577a84d3e6dc7c8d146ca8854ca5afa.tar.zst freebsd-ports-gnome-8b9ced418577a84d3e6dc7c8d146ca8854ca5afa.zip | |
- Add STAGEDIR support.
- Fix build on stable/10 and head.
- Style clean-ups.
| -rw-r--r-- | multimedia/flvstreamer/Makefile | 14 | ||||
| -rw-r--r-- | multimedia/flvstreamer/files/patch-Makefile | 12 | ||||
| -rw-r--r-- | multimedia/flvstreamer/files/patch-bytes.h | 11 | ||||
| -rw-r--r-- | multimedia/flvstreamer/pkg-descr | 2 |
4 files changed, 30 insertions, 9 deletions
diff --git a/multimedia/flvstreamer/Makefile b/multimedia/flvstreamer/Makefile index 23ebbb10d7bd..2e76b3b5f3ad 100644 --- a/multimedia/flvstreamer/Makefile +++ b/multimedia/flvstreamer/Makefile @@ -1,4 +1,3 @@ -# Created by: hrs # $FreeBSD$ PORTNAME= flvstreamer @@ -12,7 +11,7 @@ DISTNAME= ${PORTNAME}-2.1c1 MAINTAINER= hrs@FreeBSD.org COMMENT= An open source command-line RTMP client -USE_GMAKE= yes +USES= gmake ALL_TARGET= posix WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_ARGS= THREADLIB="${PTHREAD_LIBS}" \ @@ -21,15 +20,16 @@ MAKE_ARGS= THREADLIB="${PTHREAD_LIBS}" \ PLIST_FILES= bin/flvstreamer bin/streams PORTDOCS= ChangeLog ChangeLog.rtmpdump README -NO_STAGE= yes do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_FILES:S,^bin/,,} \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/multimedia/flvstreamer/files/patch-Makefile b/multimedia/flvstreamer/files/patch-Makefile index 919b1d2aab7d..dd18cfc1e0b4 100644 --- a/multimedia/flvstreamer/files/patch-Makefile +++ b/multimedia/flvstreamer/files/patch-Makefile @@ -1,5 +1,5 @@ --- Makefile.orig 2010-02-15 10:06:20.000000000 +0900 -+++ Makefile 2011-12-14 03:51:16.000000000 +0900 ++++ Makefile 2013-10-17 09:16:18.000000000 +0900 @@ -1,12 +1,12 @@ -CC=$(CROSS_COMPILE)gcc -LD=$(CROSS_COMPILE)ld @@ -17,3 +17,13 @@ SLIBS=$(THREADLIB) $(LIBS) EXT= +@@ -18,8 +18,7 @@ + + progs: flvstreamer streams rtmpsrv rtmpsuck + +-posix linux unix osx: +- @$(MAKE) $(MAKEFLAGS) progs ++posix linux unix osx: progs + + mingw: + @$(MAKE) CROSS_COMPILE=mingw32- LIBS="$(LIBS) -lws2_32 -lwinmm -lgdi32" THREADLIB= EXT=.exe $(MAKEFLAGS) progs diff --git a/multimedia/flvstreamer/files/patch-bytes.h b/multimedia/flvstreamer/files/patch-bytes.h new file mode 100644 index 000000000000..bf9a3969d48c --- /dev/null +++ b/multimedia/flvstreamer/files/patch-bytes.h @@ -0,0 +1,11 @@ +--- bytes.h.orig 2013-10-17 16:32:03.000000000 +0900 ++++ bytes.h 2010-02-12 06:31:58.000000000 +0900 +@@ -35,7 +35,7 @@ + + typedef unsigned char uint8_t; + +-#elif (defined(__FreeBSD__) && __FreeBSD_version >= 470000) || defined(__OpenBSD__) || defined(__NetBSD__) // *BSD ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) // *BSD + #include <sys/endian.h> + #define __BIG_ENDIAN BIG_ENDIAN + #define __LITTLE_ENDIAN LITTLE_ENDIAN diff --git a/multimedia/flvstreamer/pkg-descr b/multimedia/flvstreamer/pkg-descr index 44770293d8d6..ea5a014f3e83 100644 --- a/multimedia/flvstreamer/pkg-descr +++ b/multimedia/flvstreamer/pkg-descr @@ -7,4 +7,4 @@ on the internet today. It was developed entirely by reverse engineering methods and without access to any proprietary or restrictive-license protocol specifications. -WWW: http://savannah.nongnu.org/projects/flvstreamer/ +WWW: http://savannah.nongnu.org/projects/flvstreamer/ |