Index: head/dns/dnsmasq-devel/Makefile =================================================================== --- head/dns/dnsmasq-devel/Makefile (revision 389261) +++ head/dns/dnsmasq-devel/Makefile (revision 389262) @@ -1,134 +1,134 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.73rc9 +DISTVERSION= 2.73rc10 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/release-candidates/ PKGNAMESUFFIX= -devel MAINTAINER= mandree@FreeBSD.org COMMENT= Lightweight DNS forwarder, DHCP, and TFTP server LICENSE= GPLv2 #IGNORE= build stable version instead, it is newer than this release candidate CONFLICTS_INSTALL=dnsmasq-2* PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html SUB_FILES= pkg-message CFLAGS+= -Wall -Wno-unused-value CPPFLAGS+= -I${LOCALBASE}/include MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}" COPTS="${CFLAGS}" LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}" OPTIONS_DEFINE= IPV6 DBUS LUA DNSSEC DOCS OPTIONS_DEFAULT= IPV6 NLS DNSSEC OPTIONS_EXCLUDE+= EXAMPLES OPTIONS_RADIO= INTL OPTIONS_RADIO_INTL= IDN NLS INTL_DESC= Internationalization Support Level NLS_DESC= IDN+NLS: Int'l Domain Names & National Language support IDN_DESC= IDN: Int'l Domain Names WITHOUT full NLS LUA_DESC= Support lease-change scripts written in Lua DNSSEC_DESC= Enable DNSSEC caching and validation USES= cpe shebangfix tar:xz SHEBANG_FILES= contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl \ contrib/dnslist/dnslist.pl CPE_VENDOR= thekelleys CPE_VERSION= ${DISTVERSION:C/r.*//} CPE_UPDATE= ${DISTVERSION:C/.*rc/rc/} .include .if empty(PORT_OPTIONS:MIPV6) CFLAGS+= -DNO_IPV6 .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext gmake iconv pkgconfig LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn PLIST_SUB+= NLS="" ALL_TARGET= all-i18n _intllibs= -lintl .else _intllibs= PLIST_SUB+= NLS="@comment " .if ${PORT_OPTIONS:MIDN} USES+= iconv CFLAGS+= -DHAVE_IDN LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn _intllibs+= -lidn .endif .endif .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus USES+= pkgconfig CPPFLAGS+= `pkg-config --cflags dbus-1` CFLAGS+= -DHAVE_DBUS LDFLAGS+= `pkg-config --libs dbus-1` .endif .if ${PORT_OPTIONS:MLUA} CPPFLAGS+= -I${LUA_INCDIR} CFLAGS+= -DHAVE_LUASCRIPT LDFLAGS+= -L${LUA_LIBDIR} -llua-${LUA_VER} USES+= lua .endif .if ${PORT_OPTIONS:MDNSSEC} CFLAGS+= -DHAVE_DNSSEC USES+= pkgconfig LIB_DEPENDS+= libnettle.so:${PORTSDIR}/security/nettle LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp .endif USE_RC_SUBR= dnsmasq .include LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB} post-patch: ${REINPLACE_CMD} -e "s/lua5\.1/lua-${LUA_VER}/" ${WRKSRC}/Makefile pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} .if empty(PORT_OPTIONS:MNLS) @if ${OBJDUMP} -p ${LOCALBASE}/lib/libidn.so \ | ${EGREP} -q 'NEEDED[[:space:]]+libintl\.so' ; \ then ${ECHO} ; ${ECHO} 'WARNING: dns/libidn was compiled with NLS support!' ; \ ${ECHO} 'Recompile libidn WITHOUT_NLS to get rid of NLS dependencies.' ; ${ECHO} ; \ fi .else @${ECHO} 'WARNING: IDN and NLS enabled, building IDN WITH NLS.' .endif .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc - ${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.example + ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample + ${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/trust-anchors.conf ${STAGEDIR}${DATADIR}/ .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MNLS} .for i in de es fi fr id it no pl pt_BR ro ${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/src/${i}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/${PORTNAME}.mo .endfor .endif ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/dynamic-dnsmasq ${STAGEDIR}${EXAMPLESDIR}/dnslist ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl ${STAGEDIR}${EXAMPLESDIR}/dynamic-dnsmasq/ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dnslist/dnslist.pl ${STAGEDIR}${EXAMPLESDIR}/dnslist/ ${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dhcp.css ${STAGEDIR}${EXAMPLESDIR}/dnslist/ ${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dnslist.tt2 ${STAGEDIR}${EXAMPLESDIR}/dnslist/ .include Index: head/dns/dnsmasq-devel/distinfo =================================================================== --- head/dns/dnsmasq-devel/distinfo (revision 389261) +++ head/dns/dnsmasq-devel/distinfo (revision 389262) @@ -1,2 +1,2 @@ -SHA256 (dnsmasq-2.73rc9.tar.xz) = 7d010a938a6e807e4db60d0a2d7a4b8960971b04a7952a925b34f2cb99720592 -SIZE (dnsmasq-2.73rc9.tar.xz) = 482432 +SHA256 (dnsmasq-2.73rc10.tar.xz) = 7e51f32abecc18306c41116f1f069893e5602acd7ff57bcc80a3678656fcdf2a +SIZE (dnsmasq-2.73rc10.tar.xz) = 485028 Index: head/dns/dnsmasq-devel/pkg-plist =================================================================== --- head/dns/dnsmasq-devel/pkg-plist (revision 389261) +++ head/dns/dnsmasq-devel/pkg-plist (revision 389262) @@ -1,20 +1,18 @@ sbin/dnsmasq -@unexec if cmp -s %D/etc/dnsmasq.conf %D/etc/dnsmasq.conf.example ; then rm -f %D/etc/dnsmasq.conf ; fi -etc/dnsmasq.conf.example -@exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi +@sample etc/dnsmasq.conf.sample man/man8/dnsmasq.8.gz %%DATADIR%%/trust-anchors.conf %%EXAMPLESDIR%%/dnslist/dhcp.css %%EXAMPLESDIR%%/dnslist/dnslist.pl %%EXAMPLESDIR%%/dnslist/dnslist.tt2 %%EXAMPLESDIR%%/dynamic-dnsmasq/dynamic-dnsmasq.pl %%NLS%%share/locale/de/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/es/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/fi/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/fr/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/id/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/it/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/no/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/pl/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/dnsmasq.mo %%NLS%%share/locale/ro/LC_MESSAGES/dnsmasq.mo