- Fixing gnugetopt dependency for FreeBSD 5.x [1]

- Updating to version 0.5.9 [2]

PR:		73795 [1], 73840 [2]
Submitted by:	leeym [1], Frank W. Josellis <frank@dynamical-systems.org> [2]

5 files changed, 18 insertions, 54 deletions

diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index 2008812257a..b58a59d38c1 100644
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	siproxd
-PORTVERSION=	0.5.8
+PORTVERSION=	0.5.9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	siproxd
@@ -16,26 +16,35 @@ COMMENT=	A proxy/masquerading daemon for the SIP protocol
 
 LIB_DEPENDS=	osip2.2:${PORTSDIR}/net/libosip2
 
+USE_REINPLACE=	yes
 USE_GETOPT_LONG=yes
 USE_RC_SUBR=	yes
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	# empty
 
-PORTDOCS=	AUTHORS ChangeLog README RELNOTES \
-		doc/FAQ doc/KNOWN_BUGS doc/RFC3261_compliance.txt \
-		doc/sample_cfg_budgetone.txt doc/sample_cfg_x-lite.txt
+PORTDOCS1=	AUTHORS ChangeLog README RELNOTES
+PORTDOCS2=	FAQ KNOWN_BUGS RFC3261_compliance.txt \
+		sample_cfg_budgetone.txt sample_cfg_x-lite.txt
+PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
+PLIST_FILES=	etc/rc.d/siproxd.sh etc/siproxd.conf.example \
+		etc/siproxd_passwd.cfg sbin/siproxd
 
 .include <bsd.port.pre.mk>
 
+post-patch:
 .if ${OSVERSION} >= 500041
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+	@${REINPLACE_CMD} -e 's,-lgnugetopt,,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
+.for i in ${PORTDOCS1}
 	${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
+.for i in ${PORTDOCS2}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DOCSDIR}
+.endfor
 .endif
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/net/siproxd/distinfo b/net/siproxd/distinfo
index 6a0b1af9d50..8a3ab109fe0 100644
--- a/net/siproxd/distinfo
+++ b/net/siproxd/distinfo
@@ -1,2 +1,2 @@
-MD5 (siproxd-0.5.8.tar.gz) = b987151719fced722b6df7d16c06f58d
-SIZE (siproxd-0.5.8.tar.gz) = 193802
+MD5 (siproxd-0.5.9.tar.gz) = 7428bc04eb8d60a5741d68190b06f10b
+SIZE (siproxd-0.5.9.tar.gz) = 198530
diff --git a/net/siproxd/files/patch-src_siproxd.c b/net/siproxd/files/patch-src_siproxd.c
deleted file mode 100644
index 66163104292..00000000000
--- a/net/siproxd/files/patch-src_siproxd.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/siproxd.c.orig	Thu Aug 26 19:32:08 2004
-+++ src/siproxd.c	Thu Oct 14 07:18:15 2004
-@@ -179,6 +179,7 @@
- /*
-  * Init stuff
-  */
-+   INFO(PACKAGE"-"VERSION"-"BUILDSTR" started");
- 
-    /* read the config file */
-    if (read_config(configfile, config_search) == STS_FAILURE) exit(1);
-@@ -245,7 +246,6 @@
-    /* initialize the registration facility */
-    register_init();
- 
--   INFO(PACKAGE"-"VERSION"-"BUILDSTR" started");
- /*
-  * silence the log - if so required...
-  */
diff --git a/net/siproxd/files/patch-src_utils.c b/net/siproxd/files/patch-src_utils.c
deleted file mode 100644
index ea32b78c3bc..00000000000
--- a/net/siproxd/files/patch-src_utils.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/utils.c.orig	Sun Aug 22 21:04:37 2004
-+++ src/utils.c	Thu Oct 14 07:18:15 2004
-@@ -247,12 +247,12 @@
-           * as it loads some dynamic libraries. Once chrootet
-           * these libraries will *not* be found and gethostbyname()
-           * calls will simply fail (return NULL pointer and h_errno=0).
-+          * Also (at least for FreeBSD) syslog() needs to be called
-+          * before chroot()ing - this is done in main() by an INFO().
-           * Took me a while to figure THIS one out
-           */
-          struct in_addr dummy;
--         DEBUGC(DBCLASS_DNS, "Initializing DNS, the following DNS "
--                             "failure is normal, don't worry");
--         get_ip_by_host("foobar", &dummy);
-+         get_ip_by_host("localhost", &dummy);
-          DEBUGC(DBCLASS_CONFIG,"chrooting to %s",
-                 configuration.chrootjail);
-          sts = chroot(configuration.chrootjail);
diff --git a/net/siproxd/pkg-plist b/net/siproxd/pkg-plist
deleted file mode 100644
index b813e5de77a..00000000000
--- a/net/siproxd/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-etc/rc.d/siproxd.sh
-etc/siproxd.conf.example
-etc/siproxd_passwd.cfg
-sbin/siproxd
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
-%%PORTDOCS%%%%DOCSDIR%%/RFC3261_compliance.txt
-%%PORTDOCS%%%%DOCSDIR%%/sample_cfg_budgetone.txt
-%%PORTDOCS%%%%DOCSDIR%%/sample_cfg_x-lite.txt