Date: Wed, 16 Oct 2013 21:36:39 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330547 - in head/multimedia/rtmpdump: . files Message-ID: <201310162136.r9GLadh2091629@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Wed Oct 16 21:36:39 2013 New Revision: 330547 URL: http://svnweb.freebsd.org/changeset/ports/330547 Log: - Update to 2.4.20130923 snapshot. - Add STAGEDIR support. Modified: head/multimedia/rtmpdump/Makefile head/multimedia/rtmpdump/distinfo head/multimedia/rtmpdump/files/patch-librtmp-Makefile head/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in head/multimedia/rtmpdump/pkg-descr head/multimedia/rtmpdump/pkg-plist Modified: head/multimedia/rtmpdump/Makefile ============================================================================== --- head/multimedia/rtmpdump/Makefile Wed Oct 16 21:27:24 2013 (r330546) +++ head/multimedia/rtmpdump/Makefile Wed Oct 16 21:36:39 2013 (r330547) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= rtmpdump -PORTVERSION= 2.4 -PORTREVISION= 2 +PORTVERSION= 2.4.20130923 CATEGORIES= multimedia net -MASTER_SITES= http://rtmpdump.mplayerhq.hu/download/ +MASTER_SITES= LOCAL/hrs MAINTAINER= hrs@FreeBSD.org COMMENT= A tool to download RTMP streams @@ -16,16 +15,10 @@ USE_LDCONFIG= yes USE_OPENSSL= yes MAKE_ENV= THREADLIB="${PTHREAD_LIBS}" CFLAGS+= ${PTHREAD_CFLAGS} -WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= ChangeLog README -MAN1= rtmpdump.1 -MAN3= librtmp.3 -MAN8= rtmpgw.8 - OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${OPENSSLBASE} != "/usr" @@ -35,8 +28,8 @@ LDFLAGS+= -L${OPENSSLLIB} .if ${PORT_OPTIONS:MDOCS} post-install: - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.post.mk> Modified: head/multimedia/rtmpdump/distinfo ============================================================================== --- head/multimedia/rtmpdump/distinfo Wed Oct 16 21:27:24 2013 (r330546) +++ head/multimedia/rtmpdump/distinfo Wed Oct 16 21:36:39 2013 (r330547) @@ -1,2 +1,2 @@ -SHA256 (rtmpdump-2.4.tar.gz) = 0be975011d116bbdf1befad2a984ac83d09b1061c86550326a7ec496d2f188fc -SIZE (rtmpdump-2.4.tar.gz) = 134558 +SHA256 (rtmpdump-2.4.20130923.tar.gz) = 220259e3ac6b9f17d4f8643ec019fbf88780b5033bf7781fe69f1f86eff759f6 +SIZE (rtmpdump-2.4.20130923.tar.gz) = 143065 Modified: head/multimedia/rtmpdump/files/patch-librtmp-Makefile ============================================================================== --- head/multimedia/rtmpdump/files/patch-librtmp-Makefile Wed Oct 16 21:27:24 2013 (r330546) +++ head/multimedia/rtmpdump/files/patch-librtmp-Makefile Wed Oct 16 21:36:39 2013 (r330547) @@ -1,5 +1,5 @@ ---- librtmp/Makefile.orig 2011-07-12 09:24:33.000000000 +0900 -+++ librtmp/Makefile 2013-07-05 11:19:02.000000000 +0900 +--- librtmp/Makefile.orig 2013-10-07 03:52:05.000000000 +0900 ++++ librtmp/Makefile 2013-10-07 03:59:04.000000000 +0900 @@ -1,19 +1,21 @@ VERSION=v2.4 @@ -26,23 +26,24 @@ SYS=posix CRYPTO=OPENSSL -@@ -23,13 +25,13 @@ +@@ -23,14 +25,14 @@ DEF_GNUTLS=-DUSE_GNUTLS DEF_=-DNO_CRYPTO - REQ_GNUTLS=gnutls + REQ_GNUTLS=gnutls,hogweed,nettle -REQ_OPENSSL=libssl,libcrypto +#REQ_OPENSSL=libssl,libcrypto + PUB_GNUTLS=-lgmp LIBZ=-lz LIBS_posix= LIBS_darwin= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 - LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) + LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) -LIB_OPENSSL=-lssl -lcrypto $(LIBZ) -+LIB_OPENSSL=-L${OPENSSLLIB} -lssl -lcrypto $(LIBZ) ++LIB_OPENSSL=-L$(OPENSSLLIB) -lssl -lcrypto $(LIBZ) LIB_POLARSSL=-lpolarssl $(LIBZ) PRIVATE_LIBS=$(LIBS_$(SYS)) CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS) -@@ -67,7 +69,8 @@ +@@ -74,7 +76,8 @@ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 @@ -52,23 +53,24 @@ LDFLAGS=$(XLDFLAGS) -@@ -95,15 +98,17 @@ +@@ -102,16 +105,18 @@ sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \ -e "s;@VERSION@;$(VERSION);" \ -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \ + -e "s;@OPENSSLLIB@;$(OPENSSLLIB);" \ + -e "s;@OPENSSLINC@;$(OPENSSLINC);" \ + -e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \ -e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@ install: install_base $(SO_INST) install_base: librtmp.a librtmp.pc -- -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 -+ -mkdir -p $(INCDIR) $(LIBDATADIR)/pkgconfig $(MANDIR)/man3 +- -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR) ++ -mkdir -p $(INCDIR) $(LIBDATADIRDIR)/pkgconfig $(MANDIR)/man3 $(SODIR) cp amf.h http.h log.h rtmp.h $(INCDIR) cp librtmp.a $(LIBDIR) - cp librtmp.pc $(LIBDIR)/pkgconfig + cp librtmp.pc $(LIBDATADIR)/pkgconfig cp librtmp.3 $(MANDIR)/man3 - install_so: librtmp.$(SO_EXT) + install_so: librtmp$(SO_EXT) Modified: head/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in ============================================================================== --- head/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in Wed Oct 16 21:27:24 2013 (r330546) +++ head/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in Wed Oct 16 21:36:39 2013 (r330547) @@ -1,11 +1,11 @@ ---- librtmp/librtmp.pc.in.orig 2011-07-12 09:24:33.000000000 +0900 -+++ librtmp/librtmp.pc.in 2012-01-26 10:58:43.000000000 +0900 +--- librtmp/librtmp.pc.in.orig 2013-10-07 03:52:05.000000000 +0900 ++++ librtmp/librtmp.pc.in 2013-10-07 04:00:16.000000000 +0900 @@ -8,6 +8,6 @@ Version: @VERSION@ Requires: @CRYPTO_REQ@ URL: http://rtmpdump.mplayerhq.hu --Libs: -L${libdir} -lrtmp -lz -+Libs: -L${libdir} -L@OPENSSLLIB@ -lrtmp -lz -lssl -lcrypto +-Libs: -L${libdir} -lrtmp -lz @PUBLIC_LIBS@ ++Libs: -L${libdir} -L@OPENSSLLIB@ -lrtmp -lz @PUBLIC_LIBS@ Libs.private: @PRIVATE_LIBS@ -Cflags: -I${incdir} +Cflags: -I${incdir} -I@OPENSSLINC@ Modified: head/multimedia/rtmpdump/pkg-descr ============================================================================== --- head/multimedia/rtmpdump/pkg-descr Wed Oct 16 21:27:24 2013 (r330546) +++ head/multimedia/rtmpdump/pkg-descr Wed Oct 16 21:36:39 2013 (r330547) @@ -1,4 +1,4 @@ rtmpdump is a tool to download RTMP streams. All forms of RTMP are supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. -WWW: http://rtmpdump.mplayerhq.hu/ +WWW: http://rtmpdump.mplayerhq.hu/ Modified: head/multimedia/rtmpdump/pkg-plist ============================================================================== --- head/multimedia/rtmpdump/pkg-plist Wed Oct 16 21:27:24 2013 (r330546) +++ head/multimedia/rtmpdump/pkg-plist Wed Oct 16 21:36:39 2013 (r330547) @@ -12,3 +12,6 @@ lib/librtmp.a lib/librtmp.so lib/librtmp.so.0 libdata/pkgconfig/librtmp.pc +man/man1/rtmpdump.1.gz +man/man3/librtmp.3.gz +man/man8/rtmpgw.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310162136.r9GLadh2091629>