Index: head/dns/dnsmasq/Makefile
===================================================================
--- head/dns/dnsmasq/Makefile	(revision 156707)
+++ head/dns/dnsmasq/Makefile	(revision 156708)
@@ -1,40 +1,59 @@
 # New ports collection makefile for:	dnsmasq
 # Date created:				1 June 2003
 # Whom:					Steven Honson <steven@honson.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	dnsmasq
 PORTVERSION=	2.26
-CATEGORIES=	dns
+PORTREVISION=	1
+CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/
 
 MAINTAINER=	steven@honson.org
 COMMENT=	Lightweight, easy to configure DNS forwarder and DHCP server
 
 MAN8=		dnsmasq.8
-PLIST_FILES=	sbin/dnsmasq etc/dnsmasq.conf.example
 
+docs=		FAQ DBus-interface UPGRADING_to_2.0 doc.html setup.html
+PORTDOCS=	${docs:T}
+
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 MAKE_ENV=	LIBS="${LDFLAGS}" RPM_OPT_FLAGS="${CPPFLAGS}"
 
 .if defined(WITHOUT_IPV6)
 CFLAGS+=	-DNO_IPV6
 .endif
 
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
+CFLAGS+=	-DWITH_DBUS
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500037
 USE_RC_SUBR=	dnsmasq.sh
 .else
 USE_RCORDER=	dnsmasq.sh
 .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
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
+.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/
 
 .include <bsd.port.post.mk>

Property changes on: head/dns/dnsmasq/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.25
\ No newline at end of property
+1.26
\ No newline at end of property
Index: head/dns/dnsmasq/pkg-plist
===================================================================
--- head/dns/dnsmasq/pkg-plist	(nonexistent)
+++ head/dns/dnsmasq/pkg-plist	(revision 156708)
@@ -0,0 +1,9 @@
+sbin/dnsmasq
+etc/dnsmasq.conf.example
+%%EXAMPLESDIR%%/dnslist/dhcp.css
+%%EXAMPLESDIR%%/dnslist/dnslist.pl
+%%EXAMPLESDIR%%/dnslist/dnslist.tt2
+%%EXAMPLESDIR%%/dynamic-dnsmasq/dynamic-dnsmasq.pl
+@dirrm %%EXAMPLESDIR%%/dnslist
+@dirrm %%EXAMPLESDIR%%/dynamic-dnsmasq
+@dirrm %%EXAMPLESDIR%%

Property changes on: head/dns/dnsmasq/pkg-plist
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.4
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property