diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2013-10-21 08:39:36 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2013-10-21 08:39:36 +0000 |
| commit | 0801f9b2819f8e5b762ba6cb3e343fd23ea7abd8 (patch) | |
| tree | a5e568006eec7953fbfcf864a79e559398a25f77 /multimedia/rtmpdump | |
| parent | 9e85f692d4302d474fd65a81bd0d5b2cd33c2087 (diff) | |
| download | ports-0801f9b2819f8e5b762ba6cb3e343fd23ea7abd8.tar.gz ports-0801f9b2819f8e5b762ba6cb3e343fd23ea7abd8.zip | |
Fix a build breakage when security/openssl is installed.
PR: ports/183100, ports/183061
Notes
Notes:
svn path=/head/; revision=331102
Diffstat (limited to 'multimedia/rtmpdump')
| -rw-r--r-- | multimedia/rtmpdump/Makefile | 12 | ||||
| -rw-r--r-- | multimedia/rtmpdump/files/patch-Makefile | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/multimedia/rtmpdump/Makefile b/multimedia/rtmpdump/Makefile index 6f04930b64b6..86a4e0d78590 100644 --- a/multimedia/rtmpdump/Makefile +++ b/multimedia/rtmpdump/Makefile @@ -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> diff --git a/multimedia/rtmpdump/files/patch-Makefile b/multimedia/rtmpdump/files/patch-Makefile index c82bd9cde84c..84cc3b5a940e 100644 --- a/multimedia/rtmpdump/files/patch-Makefile +++ b/multimedia/rtmpdump/files/patch-Makefile @@ -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)) |