[104380] trunk/dports/www/rtmpdump

Sun Mar 24 00:08:45 PDT 2013

Revision: 104380
          https://trac.macports.org/changeset/104380
Author:   larryv at macports.org
Date:     2013-03-24 00:08:45 -0700 (Sun, 24 Mar 2013)
Log Message:
-----------
rtmpdump: Update to 2.4 (#32482).

Modified Paths:
--------------
    trunk/dports/www/rtmpdump/Portfile
    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	2013-03-24 04:16:15 UTC (rev 104379)
+++ trunk/dports/www/rtmpdump/Portfile	2013-03-24 07:08:45 UTC (rev 104380)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                rtmpdump
-version             2.3
+version             2.4
 categories          www net
 platforms           darwin
 maintainers         gmail.com:captsolo openmaintainer
@@ -20,12 +20,12 @@
 homepage            http://rtmpdump.mplayerhq.hu/
 master_sites        ${homepage}download/
 
-checksums           sha1    b65ce7708ae79adb51d1f43dd0b6d987076d7c42 \
-                    rmd160  1d48925e6567783806fa68819d6a695cd06138bc
+checksums           rmd160  a8cf22e88e544061f15769e758754b028f1be7ff \
+                    sha256  0be975011d116bbdf1befad2a984ac83d09b1061c86550326a7ec496d2f188fc
 
 depends_lib         port:openssl
 
-extract.suffix      .tgz
+worksrcdir          ${name}
 
 patchfiles          patch-Makefile.diff \
                     patch-librtmp-Makefile.diff
@@ -34,12 +34,17 @@
 
 variant universal {}
 
-build.target        SYS=posix
 build.args          prefix="${prefix}" CC="${configure.cc} [get_canonical_archflags cc]"
 build.pre_args-delete -w
 
-destroot.args       prefix="${prefix}"
+pre-destroot {
+    destroot.args   [join ${build.args}]
+}
 
+platform darwin {
+    build.args-append SYS=darwin
+}
+
 livecheck.url       [lindex ${master_sites} 0]
 livecheck.type      regex
 livecheck.regex     ${name}-(\[0-9a-z.\]+)\\.

Modified: trunk/dports/www/rtmpdump/files/patch-Makefile.diff
===================================================================
--- trunk/dports/www/rtmpdump/files/patch-Makefile.diff	2013-03-24 04:16:15 UTC (rev 104379)
+++ trunk/dports/www/rtmpdump/files/patch-Makefile.diff	2013-03-24 07:08:45 UTC (rev 104380)
@@ -1,12 +1,12 @@
---- Makefile.orig	2010-06-30 14:58:35.000000000 -0500
-+++ Makefile	2011-04-18 21:43:32.000000000 -0500
+--- Makefile.orig	2011-07-11 19:24:33.000000000 -0500
++++ Makefile	2012-01-08 01:11:59.000000000 -0600
 @@ -1,4 +1,4 @@
--VERSION=v2.3
-+VERSION=2.3
+-VERSION=v2.4
++VERSION=2.4
  
  prefix=/usr/local
  
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
  
  bindir=$(prefix)/bin
  sbindir=$(prefix)/sbin
@@ -15,12 +15,3 @@
  
  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=

Modified: trunk/dports/www/rtmpdump/files/patch-librtmp-Makefile.diff
===================================================================
--- trunk/dports/www/rtmpdump/files/patch-librtmp-Makefile.diff	2013-03-24 04:16:15 UTC (rev 104379)
+++ trunk/dports/www/rtmpdump/files/patch-librtmp-Makefile.diff	2013-03-24 07:08:45 UTC (rev 104380)
@@ -1,29 +1,11 @@
---- 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
+--- librtmp/Makefile.orig	2011-07-11 19:24:33.000000000 -0500
++++ librtmp/Makefile	2012-01-08 01:14:08.000000000 -0600
+@@ -1,11 +1,11 @@
+-VERSION=v2.4
++VERSION=2.4
  
  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
@@ -32,29 +14,12 @@
  BINDIR=$(DESTDIR)$(bindir)
  INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
-@@ -60,9 +61,9 @@
- librtmp.a: $(OBJS)
- 	$(AR) rs $@ $?
+@@ -52,7 +52,7 @@
+ SODIR=$(SODIR_$(SYS))
  
--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)
+ SO_LDFLAGS_posix=-shared -Wl,-soname,$@
+-SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \
++SO_LDFLAGS_darwin=-dynamiclib -install_name $(prefix)/lib/$@ -flat_namespace -undefined suppress -fno-common \
+ 	-headerpad_max_install_names
+ SO_LDFLAGS_mingw=-shared
+ SO_LDFLAGS=$(SO_LDFLAGS_$(SYS))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130324/849fdb5f/attachment-0001.html>
