ports/92379: [PATCH] dns/dnsmasq: Also install scripts and documentation.
Jeffrey H. Johnson
CPE1704TKS at bellsouth.net
Thu Jan 26 16:50:09 UTC 2006
>Number: 92379
>Category: ports
>Synopsis: [PATCH] dns/dnsmasq: Also install scripts and documentation.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 26 16:50:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jeffrey H. Johnson
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD offworld.cqasys.com 6.0-STABLE FreeBSD 6.0-STABLE #21: Wed Jan 18 22:35:45 EST 2006
>Description:
- Add support for WITH_DBUS
- Install contributed perl example scripts
- Install additional user documentaiton
Added file(s):
- pkg-plist
A question for the port committers - the perl scripts are not required
for the usage of dnsmasq. Is it correct to not USE_PERL5 and avoid
the perl5 dependency? I think this is the most correct thing to do.
Port maintainer (steven at honson.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- dnsmasq-2.26_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/Makefile /usr/home/trn/port-work/dnsmasq/Makefile
--- /usr/ports/dns/dnsmasq/Makefile Wed Jan 25 06:01:34 2006
+++ /usr/home/trn/port-work/dnsmasq/Makefile Thu Jan 26 09:57:05 2006
@@ -7,6 +7,7 @@
PORTNAME= dnsmasq
PORTVERSION= 2.26
+PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
@@ -14,16 +15,26 @@
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
+#USE_PERL5= 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
@@ -36,5 +47,16 @@
${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}
+ ${MKDIR} ${EXAMPLESDIR}/dynamic-dnsmasq
+ ${MKDIR} ${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>
diff -ruN --exclude=CVS /usr/ports/dns/dnsmasq/pkg-plist /usr/home/trn/port-work/dnsmasq/pkg-plist
--- /usr/ports/dns/dnsmasq/pkg-plist Wed Dec 31 19:00:00 1969
+++ /usr/home/trn/port-work/dnsmasq/pkg-plist Thu Jan 26 09:57:32 2006
@@ -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
+ at dirrm %%EXAMPLESDIR%%/dnslist
+ at dirrm %%EXAMPLESDIR%%/dynamic-dnsmasq
+ at dirrm %%EXAMPLESDIR%%
--- dnsmasq-2.26_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list