Attachment 152131 Details for Bug 197073 – Improve net/libsrtp, bump PORTREVISION

[patch] Improve net/libsrtp, bump PORTREVISION

libsrtp.diff (text/plain), 2.58 KB, created by Mikhail T. on 2015-01-25 18:23:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2015-01-25 18:23:45 UTC

Size: 2.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 377897)
>+++ Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	libsrtp
> DISTVERSIONPREFIX=	v
> DISTVERSION=	1.5.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net
> MASTER_SITES=	GHR
> 
>@@ -20,11 +20,10 @@
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-openssl
>-CFLAGS+=	-fPIC	# Taken from configure script
> USES=		gmake pathfix pkgconfig
> USE_LDCONFIG=	yes
> USE_OPENSSL=	yes
>-WITH_OPENSSL_PORT=	yes
>+ALL_TARGET=	all libsrtp.so.0
> 
> .if ! defined(WITH_DEBUG)
> CONFIGURE_ARGS+=--disable-debug
>@@ -38,11 +37,17 @@
> 	@${REINPLACE_CMD} '/pkg-config/s/openssl/libcrypto/' \
> 		${WRKSRC}/configure
> 
>-post-build:
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
>-		${MAKEFILE} ${MAKE_ARGS} libsrtp.so.0)
>-
> post-install:
> 	${LN} -s libsrtp.so.0 ${STAGEDIR}${PREFIX}/lib/libsrtp.so
> 
>-.include <bsd.port.mk>
>+regression-test test check runtest: build
>+	${GMAKE} -C ${WRKSRC} runtest
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OPENSSLLIB} != "/usr/lib"
>+LDFLAGS+=	-L${OPENSSLLIB}
>+.endif
>+LDFLAGS+=	-lcrypto
>+
>+.include <bsd.port.post.mk>
>Index: files/patch-libsrtp.pc.in
>===================================================================
>--- files/patch-libsrtp.pc.in	(revision 377897)
>+++ files/patch-libsrtp.pc.in	(working copy)
>@@ -1,10 +1,9 @@
>---- libsrtp.pc.in.orig	2014-12-30 16:27:06 UTC
>+--- libsrtp.pc.in	2014-12-30 16:27:06 UTC
> +++ libsrtp.pc.in
>-@@ -7,5 +7,6 @@ Name: @PACKAGE_NAME@
>+@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
>  Version: @PACKAGE_VERSION@
>  Description: Library for SRTP (Secure Realtime Transport Protocol)
>  
> -Libs: -L${libdir} -lsrtp @LIBS@
> +Libs: -L${libdir} -lsrtp
>-+Requires.private: libcrypto
>  Cflags: -I${includedir}
>Index: files/patch-shared-objects
>===================================================================
>--- files/patch-shared-objects	(revision 0)
>+++ files/patch-shared-objects	(working copy)
>@@ -0,0 +1,21 @@
>+--- Makefile.in	2014-10-13 10:35:33.000000000 -0400
>++++ Makefile.in	2015-01-25 12:55:19.000000000 -0500
>+@@ -87,4 +87,7 @@
>+ 	$(COMPILE) -c $< -o $@
>+ 
>++%.So: %.c
>++	$(COMPILE) -DPIC -fPIC -c $< -o $@
>++
>+ %$(EXE): %.c
>+ 	$(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
>+@@ -122,7 +125,7 @@
>+ 	$(RANLIB) libsrtp.a
>+ 
>+-libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi) 
>+-	$(CC) -shared -Wl,-soname,libsrtp.so \
>+-	    -o libsrtp.so $^ $(LDFLAGS)
>++libsrtp.so: $(srtpobj:.o=.So) $(cryptobj:.o=.So) $(gdoi:.o=.So) 
>++	$(CC) -shared -Wl,-soname,libsrtp.so \
>++	    -o libsrtp.so $^ $(LDFLAGS)
>+ 
>+ # libcryptomath.a contains general-purpose routines that are used to
>

Actions: View | Diff

Attachments on bug 197073: 152131