Date: Mon, 30 Sep 2013 16:44:42 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328831 - head/dns/dnsmasq Message-ID: <201309301644.r8UGighr087427@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Mon Sep 30 16:44:41 2013 New Revision: 328831 URL: http://svnweb.freebsd.org/changeset/ports/328831 Log: Convert to support STAGEDIR; misc. LIB_DEPENDS cleanups. Modified: head/dns/dnsmasq/Makefile head/dns/dnsmasq/pkg-plist Modified: head/dns/dnsmasq/Makefile ============================================================================== --- head/dns/dnsmasq/Makefile Mon Sep 30 16:36:55 2013 (r328830) +++ head/dns/dnsmasq/Makefile Mon Sep 30 16:44:41 2013 (r328831) @@ -16,8 +16,6 @@ LICENSE= GPLv2 CONFLICTS_INSTALL=dnsmasq-devel-* -MAN8= dnsmasq.8 - PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html SUB_FILES= pkg-message @@ -32,7 +30,6 @@ NLS_DESC= National Language Support (NLS IDN_DESC= International Domain Names (IDN) WITHOUT NLS LUA_DESC= Support lease-change scripts in LUA -NO_STAGE= yes .include <bsd.port.options.mk> .if empty(PORT_OPTIONS:MIPV6) @@ -41,20 +38,20 @@ CFLAGS+= -DNO_IPV6 .if ${PORT_OPTIONS:MNLS} USES+= pkgconfig gettext -LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn +LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn PLIST_SUB+= NLS="" ALL_TARGET= all-i18n -USE_GMAKE= yes +USES+= gmake .else PLIST_SUB+= NLS="@comment " .if ${PORT_OPTIONS:MIDN} CFLAGS+= -DHAVE_IDN -LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn +LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn .endif .endif .if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus +LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus USES+= pkgconfig CFLAGS+= -DHAVE_DBUS .endif @@ -86,28 +83,24 @@ pre-configure: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/etc - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.8 ${PREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc + ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${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} ${PREFIX}/share/locale/${i}/LC_MESSAGES + ${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/src/${i}.mo \ - ${PREFIX}/share/locale/${i}/LC_MESSAGES/${PORTNAME}.mo + ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/${PORTNAME}.mo .endfor .endif - ${MKDIR} ${EXAMPLESDIR}/dynamic-dnsmasq ${EXAMPLESDIR}/dnslist - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl ${EXAMPLESDIR}/dynamic-dnsmasq/ - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dnslist/dnslist.pl ${EXAMPLESDIR}/dnslist/ - ${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dhcp.css ${EXAMPLESDIR}/dnslist/ - ${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dnslist.tt2 ${EXAMPLESDIR}/dnslist/ - if [ ! -f ${PREFIX}/etc/dnsmasq.conf ]; then \ - ${CP} -p ${PREFIX}/etc/dnsmasq.conf.example ${PREFIX}/etc/dnsmasq.conf; \ - fi - @${CAT} ${PKGMESSAGE} + ${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 <bsd.port.post.mk> Modified: head/dns/dnsmasq/pkg-plist ============================================================================== --- head/dns/dnsmasq/pkg-plist Mon Sep 30 16:36:55 2013 (r328830) +++ head/dns/dnsmasq/pkg-plist Mon Sep 30 16:44:41 2013 (r328831) @@ -1,7 +1,8 @@ sbin/dnsmasq -@exec if [ ! -f %D/etc/dnsmasq.conf ]; then cp -p %D/%F %B/dnsmasq.conf; fi @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 +man/man8/dnsmasq.8.gz %%EXAMPLESDIR%%/dnslist/dhcp.css %%EXAMPLESDIR%%/dnslist/dnslist.pl %%EXAMPLESDIR%%/dnslist/dnslist.tt2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309301644.r8UGighr087427>