[77989] trunk/dports/www/rtmpdump

[ryandesign at macports.org]

Revision: 77989
          http://trac.macports.org/changeset/77989
Author:   ryandesign at macports.org
Date:     2011-04-18 19:50:47 -0700 (Mon, 18 Apr 2011)
Log Message:
-----------
rtmpdump: update to 2.3; support build_arch and universal builds; indicate license; see #25871

Modified Paths:
--------------
    trunk/dports/www/rtmpdump/Portfile

Added Paths:
-----------
    trunk/dports/www/rtmpdump/files/
    trunk/dports/www/rtmpdump/files/patch-Makefile.diff
    trunk/dports/www/rtmpdump/files/patch-librtmp-Makefile.diff

Modified: trunk/dports/www/rtmpdump/Portfile
===================================================================
--- trunk/dports/www/rtmpdump/Portfile	2011-04-19 01:22:12 UTC (rev 77988)
+++ trunk/dports/www/rtmpdump/Portfile	2011-04-19 02:50:47 UTC (rev 77989)
@@ -4,10 +4,11 @@
 PortSystem 1.0
 
 name                rtmpdump
-version             2.2
-revision            1
+version             2.3
 categories          www net
 platforms           darwin
+license             GPL-2+
+
 depends_lib         port:openssl
 
 maintainers         gmail.com:captsolo openmaintainer
@@ -20,24 +21,28 @@
 homepage            http://rtmpdump.mplayerhq.hu/
 master_sites        ${homepage}download/
 
-checksums           md5     1ce6753c95754d1a72b635d488757096 \
-                    sha1    80ad4878b5b48c59cb6754fac31f811b8a7d399d \
-                    rmd160  673e9baf426d8fe0d32471d101648660080e996d
+checksums           sha1    b65ce7708ae79adb51d1f43dd0b6d987076d7c42 \
+                    rmd160  1d48925e6567783806fa68819d6a695cd06138bc
 
-use_bzip2           yes
+extract.suffix      .tgz
 
-post-patch {
-    reinplace "s|CC=.*\$|CC=${configure.cc}|" ${worksrcpath}/Makefile
-    reinplace "s|CXX=.*\$|CXX=${configure.cxx}|" ${worksrcpath}/Makefile
-}
+patchfiles          patch-Makefile.diff \
+                    patch-librtmp-Makefile.diff
+
 use_configure       no
 
-build.target        osx
+variant universal {}
+if {[variant_isset universal]} {
+    set archflags ${configure.universal_cflags}
+} else {
+    set archflags ${configure.cc_archflags}
+}
+
+build.target        SYS=posix
+build.args          prefix="${prefix}" CC="${configure.cc} ${archflags}"
 build.pre_args-delete -w
 
-destroot {
-    xinstall -m 755 -W ${worksrcpath} rtmpdump rtmpsuck rtmpsrv rtmpgw ${destroot}${prefix}/bin
-}
+destroot.args       prefix="${prefix}"
 
 livecheck.url       [lindex ${master_sites} 0]
 livecheck.type      regex

Added: trunk/dports/www/rtmpdump/files/patch-Makefile.diff
===================================================================
--- trunk/dports/www/rtmpdump/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/www/rtmpdump/files/patch-Makefile.diff	2011-04-19 02:50:47 UTC (rev 77989)
@@ -0,0 +1,26 @@
+--- Makefile.orig	2010-06-30 14:58:35.000000000 -0500
++++ Makefile	2011-04-18 21:43:32.000000000 -0500
+@@ -1,4 +1,4 @@
+-VERSION=v2.3
++VERSION=2.3
+ 
+ prefix=/usr/local
+ 
+@@ -25,7 +25,7 @@
+ 
+ bindir=$(prefix)/bin
+ sbindir=$(prefix)/sbin
+-mandir=$(prefix)/man
++mandir=$(prefix)/share/man
+ 
+ BINDIR=$(DESTDIR)$(bindir)
+ SBINDIR=$(DESTDIR)$(sbindir)
+@@ -40,7 +40,7 @@
+ THREADLIB=$(THREADLIB_$(SYS))
+ SLIBS=$(THREADLIB) $(LIBS)
+ 
+-LIBRTMP=librtmp/librtmp.a
++LIBRTMP=librtmp/librtmp.dylib
+ INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
+ 
+ EXT_posix=

Added: trunk/dports/www/rtmpdump/files/patch-librtmp-Makefile.diff
===================================================================
--- trunk/dports/www/rtmpdump/files/patch-librtmp-Makefile.diff	                        (rev 0)
+++ trunk/dports/www/rtmpdump/files/patch-librtmp-Makefile.diff	2011-04-19 02:50:47 UTC (rev 77989)
@@ -0,0 +1,60 @@
+--- librtmp/Makefile.orig	2010-06-30 15:01:28.000000000 -0500
++++ librtmp/Makefile	2011-04-18 21:43:50.000000000 -0500
+@@ -1,4 +1,5 @@
+-VERSION=v2.3
++VERSION=2.3
++VERSION_MAJOR=2
+ 
+ prefix=/usr/local
+ 
+@@ -25,13 +26,13 @@
+ CRYPTO_REQ=$(REQ_$(CRYPTO))
+ CRYPTO_DEF=$(DEF_$(CRYPTO))
+ 
+-SO_posix=so.0
++SO_posix=dylib
+ SO_mingw=dll
+ SO_EXT=$(SO_$(SYS))
+ 
+ SHARED=yes
+ SODEF_yes=-fPIC
+-SOLIB_yes=librtmp.$(SO_EXT)
++SOLIB_yes=librtmp.$(VERSION).$(SO_EXT)
+ SOINST_yes=install_$(SO_EXT)
+ SO_DEF=$(SODEF_$(SHARED))
+ SO_LIB=$(SOLIB_$(SHARED))
+@@ -44,7 +45,7 @@
+ incdir=$(prefix)/include/librtmp
+ bindir=$(prefix)/bin
+ libdir=$(prefix)/lib
+-mandir=$(prefix)/man
++mandir=$(prefix)/share/man
+ BINDIR=$(DESTDIR)$(bindir)
+ INCDIR=$(DESTDIR)$(incdir)
+ LIBDIR=$(DESTDIR)$(libdir)
+@@ -60,9 +61,9 @@
+ librtmp.a: $(OBJS)
+ 	$(AR) rs $@ $?
+ 
+-librtmp.$(SO_EXT): $(OBJS)
+-	$(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
+-	ln -sf $@ librtmp.so
++$(SO_LIB): $(OBJS)
++	$(CC) -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -install_name  $(prefix)/lib/$@ -compatibility_version $(VERSION_MAJOR) -current_version $(VERSION) -Wl,-single_module $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
++	ln -sf $@ librtmp.$(SO_EXT)
+ 
+ log.o: log.c log.h Makefile
+ rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile
+@@ -83,9 +84,9 @@
+ 	cp librtmp.pc $(LIBDIR)/pkgconfig
+ 	cp librtmp.3 $(MANDIR)/man3
+ 
+-install_so.0:	librtmp.so.0
+-	cp librtmp.so.0 $(LIBDIR)
+-	cd $(LIBDIR); ln -sf librtmp.so.0 librtmp.so
++install_$(SO_EXT):	librtmp.$(SO_EXT)
++	cp librtmp.$(VERSION).$(SO_EXT) $(LIBDIR)
++	cd $(LIBDIR); ln -sf librtmp.$(VERSION).$(SO_EXT) librtmp.$(SO_EXT)
+ 
+ install_dll:	librtmp.dll
+ 	cp librtmp.dll $(BINDIR)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110418/5e1b9711/attachment.html>