svn commit: r332001 - in head/multimedia/rtmpdump: . files

[Hiroki Sato]

Author: hrs
Date: Tue Oct 29 20:49:22 2013
New Revision: 332001
URL: http://svnweb.freebsd.org/changeset/ports/332001

Log:
  Fix a build issue when security/openssl is installed.
  
  PR:	ports/183219, ports/183306

Modified:
  head/multimedia/rtmpdump/Makefile
  head/multimedia/rtmpdump/files/patch-librtmp-Makefile

Modified: head/multimedia/rtmpdump/Makefile
==============================================================================
--- head/multimedia/rtmpdump/Makefile	Tue Oct 29 20:47:32 2013	(r332000)
+++ head/multimedia/rtmpdump/Makefile	Tue Oct 29 20:49:22 2013	(r332001)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rtmpdump
 PORTVERSION=	2.4.20130923
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 MASTER_SITES=	LOCAL/hrs
 

Modified: head/multimedia/rtmpdump/files/patch-librtmp-Makefile
==============================================================================
--- head/multimedia/rtmpdump/files/patch-librtmp-Makefile	Tue Oct 29 20:47:32 2013	(r332000)
+++ head/multimedia/rtmpdump/files/patch-librtmp-Makefile	Tue Oct 29 20:49:22 2013	(r332001)
@@ -1,5 +1,5 @@
 --- librtmp/Makefile.orig	2013-10-07 03:52:05.000000000 +0900
-+++ librtmp/Makefile	2013-10-17 10:05:14.000000000 +0900
++++ librtmp/Makefile	2013-10-30 05:16:36.000000000 +0900
 @@ -1,19 +1,21 @@
  VERSION=v2.4
  
@@ -43,16 +43,18 @@
  LIB_POLARSSL=-lpolarssl $(LIBZ)
  PRIVATE_LIBS=$(LIBS_$(SYS))
  CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS)
-@@ -74,7 +76,8 @@
+@@ -74,8 +76,9 @@
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2
 -CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
+-LDFLAGS=$(XLDFLAGS)
 +#CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
-+CFLAGS=$(DEF) $(OPT) $(SO_DEF)
- LDFLAGS=$(XLDFLAGS)
++CFLAGS+=$(DEF) $(SO_DEF)
++#LDFLAGS=$(XLDFLAGS)
  
  
+ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
 @@ -102,16 +105,18 @@
  	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
  		-e "s;@VERSION@;$(VERSION);" \