aboutsummaryrefslogtreecommitdiffstats
path: root/dns
diff options
context:
space:
mode:
authorsem <sem@FreeBSD.org>2004-12-13 09:12:31 +0800
committersem <sem@FreeBSD.org>2004-12-13 09:12:31 +0800
commit6cab93850af0e6ef695152d9cbae84da116daa6a (patch)
tree05c7ab252f21749033af8abceac075a92424108c /dns
parentbdf7b7fa2f14ef82779c260a8dcf0ce6e0ab8b5e (diff)
downloadfreebsd-ports-gnome-6cab93850af0e6ef695152d9cbae84da116daa6a.tar.gz
freebsd-ports-gnome-6cab93850af0e6ef695152d9cbae84da116daa6a.tar.zst
freebsd-ports-gnome-6cab93850af0e6ef695152d9cbae84da116daa6a.zip
- Update to 2.18
PR: ports/74704 Submitted by: maintainer
Diffstat (limited to 'dns')
-rw-r--r--dns/dnsmasq/Makefile20
-rw-r--r--dns/dnsmasq/distinfo4
-rw-r--r--dns/dnsmasq/files/dnsmasq.sh4
3 files changed, 18 insertions, 10 deletions
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 37e45e6aab31..4e9bfddfbfa3 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -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 @@ MAINTAINER= steven@honson.org
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 --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo
index 413de2904a21..83731d2a860d 100644
--- a/dns/dnsmasq/distinfo
+++ b/dns/dnsmasq/distinfo
@@ -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 --git a/dns/dnsmasq/files/dnsmasq.sh b/dns/dnsmasq/files/dnsmasq.sh
index 529c437715eb..c723b1ec3361 100644
--- a/dns/dnsmasq/files/dnsmasq.sh
+++ b/dns/dnsmasq/files/dnsmasq.sh
@@ -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