Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Jul 2014 15:02:32 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361457 - in head/net/siproxd: . files
Message-ID:  <201407101502.s6AF2WY7035822@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Thu Jul 10 15:02:32 2014
New Revision: 361457
URL: http://svnweb.freebsd.org/changeset/ports/361457
QAT: https://qat.redports.org/buildarchive/r361457/

Log:
  - Depend on net/libosip2 instead of net/libosip
  - Add INSTALL_TARGET=install-strip
  - Use @sample

Added:
  head/net/siproxd/files/patch-src__dejitter.c   (contents, props changed)
Modified:
  head/net/siproxd/Makefile
  head/net/siproxd/pkg-plist

Modified: head/net/siproxd/Makefile
==============================================================================
--- head/net/siproxd/Makefile	Thu Jul 10 14:39:53 2014	(r361456)
+++ head/net/siproxd/Makefile	Thu Jul 10 15:02:32 2014	(r361457)
@@ -3,7 +3,7 @@
 
 PORTNAME=	siproxd
 PORTVERSION=	0.7.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	SF
 
@@ -12,20 +12,20 @@ COMMENT=	Proxy/masquerading daemon for t
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libosip2.so:${PORTSDIR}/net/libosip
+LIB_DEPENDS=	libosip2.so:${PORTSDIR}/net/libosip2
 
+# :keepla because port uses lt_dlopen
 USES=		libtool:keepla
 USE_RC_SUBR=	siproxd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-doc --disable-static --with-libosip-prefix=${PREFIX}
+INSTALL_TARGET=	install-strip
 
 PORTDOCS1=	AUTHORS ChangeLog README RELNOTES
 PORTDOCS2=	FAQ KNOWN_BUGS RFC3261_compliance.txt \
 		sample_cfg_budgetone.txt sample_cfg_x-lite.txt
 PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,-lgnugetopt,,g ; 24600d ; 23998s,doc/Makefile ,,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
@@ -43,12 +43,9 @@ post-install:
 .for docs in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
-	${CP} ${WRKSRC}/doc/siproxd.conf.example ${STAGEDIR}${PREFIX}/etc
-	${CP} ${WRKSRC}/doc/siproxd_passwd.cfg ${STAGEDIR}${PREFIX}/etc
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/siproxd/plugin_defaulttarget.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/siproxd/plugin_demo.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/siproxd/plugin_fix_bogus_via.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/siproxd/plugin_logcall.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/siproxd/plugin_shortdial.so
+	${INSTALL_DATA} ${WRKSRC}/doc/siproxd.conf.example \
+		${STAGEDIR}${PREFIX}/etc/siproxd.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/doc/siproxd_passwd.cfg \
+		${STAGEDIR}${PREFIX}/etc/siproxd_passwd.cfg.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/net/siproxd/files/patch-src__dejitter.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/siproxd/files/patch-src__dejitter.c	Thu Jul 10 15:02:32 2014	(r361457)
@@ -0,0 +1,11 @@
+--- src/dejitter.c.orig	2014-07-10 16:37:54.000000000 +0200
++++ src/dejitter.c	2014-07-10 16:38:40.000000000 +0200
+@@ -24,6 +24,8 @@
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
++#include <string.h>
+ #include <netinet/in.h>
+ 
+ #include <osipparser2/osip_parser.h>

Modified: head/net/siproxd/pkg-plist
==============================================================================
--- head/net/siproxd/pkg-plist	Thu Jul 10 14:39:53 2014	(r361456)
+++ head/net/siproxd/pkg-plist	Thu Jul 10 15:02:32 2014	(r361457)
@@ -1,5 +1,5 @@
-etc/siproxd.conf.example
-etc/siproxd_passwd.cfg
+@sample etc/siproxd.conf.sample
+@sample etc/siproxd_passwd.cfg.sample
 lib/siproxd/plugin_defaulttarget.la
 lib/siproxd/plugin_defaulttarget.so
 lib/siproxd/plugin_demo.la



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407101502.s6AF2WY7035822>