mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Fix a build breakage when security/openssl is installed.

Browse Source 
PR:	ports/183100, ports/183061
This commit is contained in:
Hiroki Sato 2013-10-21 08:39:36 +00:00
parent 9e85f692d4
commit 0801f9b281
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=331102
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
multimedia/rtmpdump/Makefile
View File

@ -14,17 +14,13 @@ USES= pkgconfig
USE_LDCONFIG= yes
USE_OPENSSL= yes
MAKE_ENV= THREADLIB="${PTHREAD_LIBS}"
CFLAGS+= ${PTHREAD_CFLAGS}
CFLAGS+= ${PTHREAD_CFLAGS} -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
PORTDOCS= ChangeLog README
OPTIONS_DEFINE= DOCS
.include <bsd.port.pre.mk>
.if ${OPENSSLBASE} != "/usr"
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
.endif
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
post-install:
@ -32,4 +28,4 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

12
multimedia/rtmpdump/files/patch-Makefile
View File

@ -1,7 +1,7 @@
--- Makefile.orig 2010-07-01 04:58:35.000000000 +0900
+++ Makefile 2010-08-01 01:26:30.000000000 +0900
--- Makefile.orig 2013-10-07 03:52:05.000000000 +0900
+++ Makefile 2013-10-20 14:37:46.000000000 +0900
@@ -1,9 +1,9 @@
VERSION=v2.3
VERSION=v2.4
-prefix=/usr/local
+prefix=${PREFIX}
@ -13,7 +13,7 @@
SYS=posix
#SYS=mingw
@@ -20,8 +20,9 @@
@@ -21,8 +21,9 @@
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
OPT=-O2
@ -25,9 +25,9 @@
bindir=$(prefix)/bin
sbindir=$(prefix)/sbin
@@ -37,7 +38,7 @@
@@ -41,7 +42,7 @@
THREADLIB_posix=-lpthread
THREADLIB_darwin=-lpthread
THREADLIB_mingw=
-THREADLIB=$(THREADLIB_$(SYS))
+THREADLIB?=$(THREADLIB_$(SYS))