From owner-svn-ports-all@FreeBSD.ORG Thu Oct 17 07:37:30 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 36B1BE6; Thu, 17 Oct 2013 07:37:30 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 237942977; Thu, 17 Oct 2013 07:37:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9H7bUhB012662; Thu, 17 Oct 2013 07:37:30 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9H7bTfg012658; Thu, 17 Oct 2013 07:37:29 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201310170737.r9H7bTfg012658@svn.freebsd.org> From: Hiroki Sato Date: Thu, 17 Oct 2013 07:37:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330614 - in head/multimedia/flvstreamer: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 07:37:30 -0000 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@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 + +.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 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 + #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/