From owner-svn-ports-all@freebsd.org Mon Feb 29 03:13:09 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18C32AB61DC; Mon, 29 Feb 2016 03:13:09 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD5ADABB; Mon, 29 Feb 2016 03:13:08 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1T3D72B078554; Mon, 29 Feb 2016 03:13:07 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1T3D7Rl078546; Mon, 29 Feb 2016 03:13:07 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201602290313.u1T3D7Rl078546@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 29 Feb 2016 03:13:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409797 - in head/multimedia: librtmp librtmp/files rtmpdump rtmpdump/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.20 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: Mon, 29 Feb 2016 03:13:09 -0000 Author: hrs Date: Mon Feb 29 03:13:06 2016 New Revision: 409797 URL: https://svnweb.freebsd.org/changeset/ports/409797 Log: - Update to a snapshot as of 20151223. - Strip binaries. Modified: head/multimedia/librtmp/Makefile head/multimedia/librtmp/distinfo head/multimedia/librtmp/files/patch-librtmp-Makefile head/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in head/multimedia/librtmp/pkg-plist head/multimedia/rtmpdump/Makefile head/multimedia/rtmpdump/distinfo head/multimedia/rtmpdump/files/patch-Makefile Modified: head/multimedia/librtmp/Makefile ============================================================================== --- head/multimedia/librtmp/Makefile Mon Feb 29 02:22:42 2016 (r409796) +++ head/multimedia/librtmp/Makefile Mon Feb 29 03:13:06 2016 (r409797) @@ -1,17 +1,17 @@ # $FreeBSD$ PORTNAME= librtmp -PORTVERSION= 2.4.20130923 +PORTVERSION= 2.4.20151223 CATEGORIES= multimedia net MASTER_SITES= LOCAL/hrs -DISTNAME= rtmpdump-${PORTVERSION} +DISTNAME= rtmpdump-2.4.fa8646da MAINTAINER= hrs@FreeBSD.org COMMENT= RTMP stream library LICENSE= GPLv2 -USES= pkgconfig +USES= pkgconfig tar:bz2 USE_LDCONFIG= yes USE_OPENSSL= yes CFLAGS+= -I${OPENSSLINC} Modified: head/multimedia/librtmp/distinfo ============================================================================== --- head/multimedia/librtmp/distinfo Mon Feb 29 02:22:42 2016 (r409796) +++ head/multimedia/librtmp/distinfo Mon Feb 29 03:13:06 2016 (r409797) @@ -1,2 +1,2 @@ -SHA256 (rtmpdump-2.4.20130923.tar.gz) = 220259e3ac6b9f17d4f8643ec019fbf88780b5033bf7781fe69f1f86eff759f6 -SIZE (rtmpdump-2.4.20130923.tar.gz) = 143065 +SHA256 (rtmpdump-2.4.fa8646da.tar.bz2) = 2d37a0db88477c580d3d7226bf8606444fdb130008ee5256bf0ddaf00c76d771 +SIZE (rtmpdump-2.4.fa8646da.tar.bz2) = 110969 Modified: head/multimedia/librtmp/files/patch-librtmp-Makefile ============================================================================== --- head/multimedia/librtmp/files/patch-librtmp-Makefile Mon Feb 29 02:22:42 2016 (r409796) +++ head/multimedia/librtmp/files/patch-librtmp-Makefile Mon Feb 29 03:13:06 2016 (r409797) @@ -1,5 +1,5 @@ ---- Makefile.orig 2013-10-07 03:52:05.000000000 +0900 -+++ Makefile 2013-10-30 05:16:36.000000000 +0900 +--- Makefile.orig 2016-02-29 01:15:13 UTC ++++ Makefile @@ -1,19 +1,21 @@ VERSION=v2.4 @@ -26,7 +26,7 @@ SYS=posix CRYPTO=OPENSSL -@@ -23,14 +25,14 @@ +@@ -23,14 +25,14 @@ DEF_OPENSSL=-DUSE_OPENSSL DEF_GNUTLS=-DUSE_GNUTLS DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls,hogweed,nettle @@ -43,7 +43,7 @@ LIB_POLARSSL=-lpolarssl $(LIBZ) PRIVATE_LIBS=$(LIBS_$(SYS)) CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS) -@@ -74,8 +76,9 @@ +@@ -74,8 +76,9 @@ SO_INST=$(SOINST_$(SHARED)) DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 @@ -55,7 +55,7 @@ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o -@@ -102,16 +105,18 @@ +@@ -102,20 +105,22 @@ librtmp.pc: librtmp.pc.in Makefile sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \ -e "s;@VERSION@;$(VERSION);" \ -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \ @@ -76,3 +76,8 @@ cp librtmp.3 $(MANDIR)/man3 install_so: librtmp$(SO_EXT) +- cp librtmp$(SO_EXT) $(SODIR) ++ ${BSD_INSTALL_LIB} librtmp$(SO_EXT) $(SODIR) + $(INSTALL_IMPLIB) + cd $(SODIR); ln -sf librtmp$(SO_EXT) librtmp.$(SOX) + Modified: head/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in ============================================================================== --- head/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in Mon Feb 29 02:22:42 2016 (r409796) +++ head/multimedia/librtmp/files/patch-librtmp-librtmp.pc.in Mon Feb 29 03:13:06 2016 (r409797) @@ -1,6 +1,6 @@ ---- librtmp.pc.in.orig 2013-10-07 03:52:05.000000000 +0900 -+++ librtmp.pc.in 2013-10-07 04:00:16.000000000 +0900 -@@ -8,6 +8,6 @@ +--- librtmp.pc.in.orig 2016-02-29 01:15:13 UTC ++++ librtmp.pc.in +@@ -8,6 +8,6 @@ Description: RTMP implementation Version: @VERSION@ Requires: @CRYPTO_REQ@ URL: http://rtmpdump.mplayerhq.hu Modified: head/multimedia/librtmp/pkg-plist ============================================================================== --- head/multimedia/librtmp/pkg-plist Mon Feb 29 02:22:42 2016 (r409796) +++ head/multimedia/librtmp/pkg-plist Mon Feb 29 03:13:06 2016 (r409797) @@ -4,6 +4,6 @@ include/librtmp/log.h include/librtmp/rtmp.h lib/librtmp.a lib/librtmp.so -lib/librtmp.so.0 +lib/librtmp.so.1 libdata/pkgconfig/librtmp.pc man/man3/librtmp.3.gz Modified: head/multimedia/rtmpdump/Makefile ============================================================================== --- head/multimedia/rtmpdump/Makefile Mon Feb 29 02:22:42 2016 (r409796) +++ head/multimedia/rtmpdump/Makefile Mon Feb 29 03:13:06 2016 (r409797) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= rtmpdump -PORTVERSION= 2.4.20130923 -PORTREVISION= 2 +PORTVERSION= 2.4.20151223 CATEGORIES= multimedia net MASTER_SITES= LOCAL/hrs +DISTNAME= ${PORTNAME}-2.4.fa8646da MAINTAINER= hrs@FreeBSD.org COMMENT= RTMP streams download utility @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp -USES= pkgconfig +USES= pkgconfig tar:bz2 USE_OPENSSL= yes MAKE_ENV= THREADLIB="-lpthread" CFLAGS+= -I${OPENSSLINC} Modified: head/multimedia/rtmpdump/distinfo ============================================================================== --- head/multimedia/rtmpdump/distinfo Mon Feb 29 02:22:42 2016 (r409796) +++ head/multimedia/rtmpdump/distinfo Mon Feb 29 03:13:06 2016 (r409797) @@ -1,2 +1,2 @@ -SHA256 (rtmpdump-2.4.20130923.tar.gz) = 220259e3ac6b9f17d4f8643ec019fbf88780b5033bf7781fe69f1f86eff759f6 -SIZE (rtmpdump-2.4.20130923.tar.gz) = 143065 +SHA256 (rtmpdump-2.4.fa8646da.tar.bz2) = 2d37a0db88477c580d3d7226bf8606444fdb130008ee5256bf0ddaf00c76d771 +SIZE (rtmpdump-2.4.fa8646da.tar.bz2) = 110969 Modified: head/multimedia/rtmpdump/files/patch-Makefile ============================================================================== --- head/multimedia/rtmpdump/files/patch-Makefile Mon Feb 29 02:22:42 2016 (r409796) +++ head/multimedia/rtmpdump/files/patch-Makefile Mon Feb 29 03:13:06 2016 (r409797) @@ -1,5 +1,5 @@ ---- Makefile.orig 2013-10-07 03:52:05.000000000 +0900 -+++ Makefile 2013-10-30 15:30:57.000000000 +0900 +--- Makefile.orig 2016-02-29 01:15:13 UTC ++++ Makefile @@ -1,9 +1,9 @@ VERSION=v2.4 @@ -13,7 +13,7 @@ SYS=posix #SYS=mingw -@@ -21,8 +21,9 @@ +@@ -21,8 +21,9 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 @@ -25,7 +25,7 @@ bindir=$(prefix)/bin sbindir=$(prefix)/sbin -@@ -35,13 +36,13 @@ +@@ -35,13 +36,13 @@ MANDIR=$(DESTDIR)$(mandir) LIBS_posix= LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 @@ -41,7 +41,7 @@ SLIBS=$(THREADLIB) $(LIBS) LIBRTMP=librtmp/librtmp.a -@@ -54,9 +55,7 @@ +@@ -54,21 +55,17 @@ EXT=$(EXT_$(SYS)) PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck @@ -52,11 +52,15 @@ install: $(PROGS) -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 -@@ -64,11 +63,9 @@ - cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) - cp rtmpdump.1 $(MANDIR)/man1 - cp rtmpgw.8 $(MANDIR)/man8 +- cp rtmpdump$(EXT) $(BINDIR) +- cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) +- cp rtmpdump.1 $(MANDIR)/man1 +- cp rtmpgw.8 $(MANDIR)/man8 - @cd librtmp; $(MAKE) install ++ ${BSD_INSTALL_PROGRAM} rtmpdump$(EXT) $(BINDIR) ++ ${BSD_INSTALL_PROGRAM} rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) ++ ${BSD_INSTALL_DATA} rtmpdump.1 $(MANDIR)/man1 ++ ${BSD_INSTALL_DATA} rtmpgw.8 $(MANDIR)/man8 clean: rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)