ports/74704: [maintainer update] dns/dnsmasq to version 2.18

[Steven Honson]

>Number:         74704
>Category:       ports
>Synopsis:       [maintainer update] dns/dnsmasq to version 2.18
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 05 06:40:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Steven Honson
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
>Description:
This update moves dns/dnsmasq to version 2.18, and also fixes up a few things thanks to the 
great sugestions from Eric in PRs ports/74270 and ports/74338, which can now both be closed.

>How-To-Repeat:
>Fix:

--- dnsmasq.patch begins here ---
diff -urN /usr/ports/dns/dnsmasq/Makefile /home/shonson/dnsmasq/Makefile
--- /usr/ports/dns/dnsmasq/Makefile	Thu Nov 25 21:43:05 2004
+++ /home/shonson/dnsmasq/Makefile	Sun Dec  5 17:26:39 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dnsmasq
-PORTVERSION=	2.17
+PORTVERSION=	2.18
 CATEGORIES=	dns
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/
 
@@ -14,19 +14,27 @@
 COMMENT=	Lightweight, easy to configure DNS forwarder and DHCP server
 
 USE_REINPLACE=	yes
+USE_RC_SUBR=	yes
 
 MAN8=		dnsmasq.8
 PLIST_FILES=	sbin/dnsmasq etc/dnsmasq.conf.example etc/rc.d/dnsmasq.sh
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-	's|^CC = gcc|CC?=cc|g ; \
-	s|^CFLAGS = -O2|CFLAGS+=-O2|g' ${WRKSRC}/Makefile
+USE_GETOPT_LONG=	yes
+MAKE_ENV+=	"LIBS=${LDFLAGS}"
+.if defined(WITHOUT_IPV6)
+MAKE_ENV+=	RPM_OPT_FLAGS="${CPPFLAGS} -DNO_IPV6"
+.else
+MAKE_ENV+=	RPM_OPT_FLAGS="${CPPFLAGS}"
+.endif
+
+post-build:
+	@${SED} -e "s|%%RC_SUBR%%|${RC_SUBR}|g;s|%%PREFIX%%|${PREFIX}|g" \
+	<${FILESDIR}/dnsmasq.sh >${WRKDIR}/dnsmasq.sh
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/etc
-	${INSTALL_SCRIPT} ${FILESDIR}/dnsmasq.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKDIR}/dnsmasq.sh ${PREFIX}/etc/rc.d
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff -urN /usr/ports/dns/dnsmasq/distinfo /home/shonson/dnsmasq/distinfo
--- /usr/ports/dns/dnsmasq/distinfo	Thu Nov 25 21:43:05 2004
+++ /home/shonson/dnsmasq/distinfo	Sun Dec  5 17:27:32 2004
@@ -1,2 +1,2 @@
-MD5 (dnsmasq-2.17.tar.gz) = c66ded2740975cf05040934ed4427f6a
-SIZE (dnsmasq-2.17.tar.gz) = 132911
+MD5 (dnsmasq-2.18.tar.gz) = 7a3d4864c97ebf484cd4e76487ad5e3c
+SIZE (dnsmasq-2.18.tar.gz) = 133590
diff -urN /usr/ports/dns/dnsmasq/files/dnsmasq.sh /home/shonson/dnsmasq/files/dnsmasq.sh
--- /usr/ports/dns/dnsmasq/files/dnsmasq.sh	Wed Jun 30 17:14:28 2004
+++ /home/shonson/dnsmasq/files/dnsmasq.sh	Sun Dec  5 17:29:06 2004
@@ -14,12 +14,12 @@
 dnsmasq_enable=NO
 
 
-. /etc/rc.subr
+. %%RC_SUBR%%
 
 name=dnsmasq
 rcvar=$(set_rcvar)
 
-command=/usr/local/sbin/${name}
+command=%%PREFIX%%/sbin/${name}
 pidfile=/var/run/${name}.pid
 required_files=${dnsmasq_conf}
 #start_precmd=${name}_precmd
--- dnsmasq.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: