Update to 2.3.

- Use PTHREAD_*.
- Add librtmp(3) and pkg-config(1) support.

5 files changed, 108 insertions, 14 deletions

diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile
index dd361a1b8bfd..88524fce1dd6 100644
--- a/multimedia/rtmpdump/Makefile
+++ b/multimedia/rtmpdump/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rtmpdump
-PORTVERSION=	2.2d
+PORTVERSION=	2.3
 CATEGORIES=	multimedia net
 MASTER_SITES=	http://rtmpdump.mplayerhq.hu/download/
 EXTRACT_SUFX=	.tgz
@@ -13,13 +13,13 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A tool to download RTMP streams
 
-USE_GMAKE=	yes
-ALL_TARGET=	posix
-
 MAN1=		rtmpdump.1
+MAN3=		librtmp.3
 MAN8=		rtmpgw.8
 
-PLIST_FILES=	bin/rtmpdump bin/rtmpgw bin/rtmpsrv bin/rtmpsuck
+USE_GNOME=	pkgconfig
+USE_LDCONFIG=	yes
+MAKE_ENV=	CFLAGS="${PTHREAD_CFLAGS}" THREADLIB="${PTHREAD_LIBS}"
 PORTDOCS=	ChangeLog README
 
 .include <bsd.port.pre.mk>
@@ -28,12 +28,6 @@ PORTDOCS=	ChangeLog README
 BROKEN=		does not compile on 6.X
 .endif
 
-do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_FILES:S,^bin/,,} \
-		${PREFIX}/bin \
-		&& ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 \
-		&& ${INSTALL_MAN} ${MAN8} ${MAN1PREFIX}/man/man8
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/multimedia/rtmpdump/distinfo b/multimedia/rtmpdump/distinfo
index 813e03ff8680..511a4c22c821 100644
--- a/multimedia/rtmpdump/distinfo
+++ b/multimedia/rtmpdump/distinfo
@@ -1,3 +1,3 @@
-MD5 (rtmpdump-2.2d.tgz) = f12086283002c27e0fa11e33e83b7647
-SHA256 (rtmpdump-2.2d.tgz) = a5660fed0b66e36fb7727b9492d5fe210b87acb6f7b493eb52ac91fbeac84c70
-SIZE (rtmpdump-2.2d.tgz) = 118309
+MD5 (rtmpdump-2.3.tgz) = eb961f31cd55f0acf5aad1a7b900ef59
+SHA256 (rtmpdump-2.3.tgz) = ef38b7a99d82ce6912063d21063aeaf28185341b3df486e24bffce5354224b2c
+SIZE (rtmpdump-2.3.tgz) = 125103
diff --git a/multimedia/rtmpdump/files/patch-Makefile b/multimedia/rtmpdump/files/patch-Makefile
new file mode 100644
index 000000000000..c82bd9cde84c
--- /dev/null
+++ b/multimedia/rtmpdump/files/patch-Makefile
@@ -0,0 +1,36 @@
+--- Makefile.orig	2010-07-01 04:58:35.000000000 +0900
++++ Makefile	2010-08-01 01:26:30.000000000 +0900
+@@ -1,9 +1,9 @@
+ VERSION=v2.3
+ 
+-prefix=/usr/local
++prefix=${PREFIX}
+ 
+-CC=$(CROSS_COMPILE)gcc
+-LD=$(CROSS_COMPILE)ld
++#CC=$(CROSS_COMPILE)gcc
++#LD=$(CROSS_COMPILE)ld
+ 
+ SYS=posix
+ #SYS=mingw
+@@ -20,8 +20,9 @@
+ 
+ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
+ OPT=-O2
+-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
+-LDFLAGS=-Wall $(XLDFLAGS)
++#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
++CFLAGS+=$(DEF)
++#LDFLAGS=-Wall $(XLDFLAGS)
+ 
+ bindir=$(prefix)/bin
+ sbindir=$(prefix)/sbin
+@@ -37,7 +38,7 @@
+ 
+ THREADLIB_posix=-lpthread
+ THREADLIB_mingw=
+-THREADLIB=$(THREADLIB_$(SYS))
++THREADLIB?=$(THREADLIB_$(SYS))
+ SLIBS=$(THREADLIB) $(LIBS)
+ 
+ LIBRTMP=librtmp/librtmp.a
diff --git a/multimedia/rtmpdump/files/patch-librtmp-Makefile b/multimedia/rtmpdump/files/patch-librtmp-Makefile
new file mode 100644
index 000000000000..9c54876dd8fa
--- /dev/null
+++ b/multimedia/rtmpdump/files/patch-librtmp-Makefile
@@ -0,0 +1,50 @@
+--- librtmp/Makefile.orig	2010-07-01 05:01:28.000000000 +0900
++++ librtmp/Makefile	2010-08-01 01:18:35.000000000 +0900
+@@ -1,10 +1,10 @@
+ VERSION=v2.3
+ 
+-prefix=/usr/local
++prefix=${PREFIX}
+ 
+-CC=$(CROSS_COMPILE)gcc
+-LD=$(CROSS_COMPILE)ld
+-AR=$(CROSS_COMPILE)ar
++#CC=$(CROSS_COMPILE)gcc
++#LD=$(CROSS_COMPILE)ld
++#AR=$(CROSS_COMPILE)ar
+ 
+ SYS=posix
+ CRYPTO=OPENSSL
+@@ -39,15 +39,18 @@
+ 
+ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
+ OPT=-O2
+-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
++#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
++CFLAGS+= $(DEF) $(SO_DEF)
+ 
+ incdir=$(prefix)/include/librtmp
+ bindir=$(prefix)/bin
+ libdir=$(prefix)/lib
++libdatadir=$(prefix)/libdata
+ mandir=$(prefix)/man
+ BINDIR=$(DESTDIR)$(bindir)
+ INCDIR=$(DESTDIR)$(incdir)
+ LIBDIR=$(DESTDIR)$(libdir)
++LIBDATADIR=$(DESTDIR)$(libdatadir)
+ MANDIR=$(DESTDIR)$(mandir)
+ 
+ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
+@@ -77,10 +80,10 @@
+ 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
+ 	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.0:	librtmp.so.0
diff --git a/multimedia/rtmpdump/pkg-plist b/multimedia/rtmpdump/pkg-plist
new file mode 100644
index 000000000000..34323800fa96
--- /dev/null
+++ b/multimedia/rtmpdump/pkg-plist
@@ -0,0 +1,14 @@
+@comment $FreeBSD$
+bin/rtmpdump
+sbin/rtmpgw
+sbin/rtmpsrv
+sbin/rtmpsuck
+include/librtmp/amf.h
+include/librtmp/http.h
+include/librtmp/log.h
+include/librtmp/rtmp.h
+@dirrm include/librtmp
+lib/librtmp.a
+lib/librtmp.so
+lib/librtmp.so.0
+libdata/pkgconfig/librtmp.pc