svn commit: r330614 - in head/multimedia/flvstreamer: . files

[Hiroki Sato]

Author: hrs
Date: Thu Oct 17 07:37:29 2013
New Revision: 330614
URL: http://svnweb.freebsd.org/changeset/ports/330614

Log:
  - Add STAGEDIR support.
  - Fix build on stable/10 and head.
  - Style clean-ups.

Added:
  head/multimedia/flvstreamer/files/patch-bytes.h   (contents, props changed)
Modified:
  head/multimedia/flvstreamer/Makefile
  head/multimedia/flvstreamer/files/patch-Makefile
  head/multimedia/flvstreamer/pkg-descr

Modified: head/multimedia/flvstreamer/Makefile
==============================================================================
--- head/multimedia/flvstreamer/Makefile	Thu Oct 17 07:21:30 2013	(r330613)
+++ head/multimedia/flvstreamer/Makefile	Thu Oct 17 07:37:29 2013	(r330614)
@@ -1,4 +1,3 @@
-# Created by: hrs
 # $FreeBSD$
 
 PORTNAME=	flvstreamer
@@ -12,7 +11,7 @@ DISTNAME=	${PORTNAME}-2.1c1
 MAINTAINER=	hrs at 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>

Modified: head/multimedia/flvstreamer/files/patch-Makefile
==============================================================================
--- head/multimedia/flvstreamer/files/patch-Makefile	Thu Oct 17 07:21:30 2013	(r330613)
+++ head/multimedia/flvstreamer/files/patch-Makefile	Thu Oct 17 07:37:29 2013	(r330614)
@@ -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

Added: head/multimedia/flvstreamer/files/patch-bytes.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/flvstreamer/files/patch-bytes.h	Thu Oct 17 07:37:29 2013	(r330614)
@@ -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

Modified: head/multimedia/flvstreamer/pkg-descr
==============================================================================
--- head/multimedia/flvstreamer/pkg-descr	Thu Oct 17 07:21:30 2013	(r330613)
+++ head/multimedia/flvstreamer/pkg-descr	Thu Oct 17 07:37:29 2013	(r330614)
@@ -7,4 +7,4 @@ on the internet today. It was developed 
 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/