Attachment #39369 for bug #62083

View | Details | Raw Unified | Return to bug 62083
Collapse All | Expand All




# New ports collection makefile for:	dnsmasq
# Date created:				1 June 2003
# Whom:					Steven Honson <steven@honson.org>
#
# $FreeBSD: ports/dns/dnsmasq/Makefile,v 1.5 2003/11/10 13:26:57 leeym Exp $
#

PORTNAME=	dnsmasq
PORTVERSION=	2.1
CATEGORIES=	dns
MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/

MAINTAINER=	steven@honson.org
COMMENT=	A caching DNS forwarder

USE_REINPLACE=	yes

	s|^CFLAGS = -O2|CFLAGS+=-O2|g' ${WRKSRC}/Makefile

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/etc/dnsmasq.conf.example
	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${PREFIX}/man/man8

.include <bsd.port.mk>

Line 1 Link Here

(-)/usr/home/shonson/dnsmasq/distinfo (-1 / +1 lines)
1	MD5 (dnsmasq-1.18.tar.gz) = a90478d2248009ada61ed5bee87c034c	1	MD5 (dnsmasq-2.1.tar.gz) = 9883dc9f3b984b1f174bce6b40f62ec2

Line 0 Link Here

(-)/usr/home/shonson/dnsmasq/files/patch-config.h (+11 lines)
	1	--- src/config.h.orig Fri Jan 30 09:09:52 2004
	2	+++ src/config.h Fri Jan 30 09:10:09 2004
	3	@@ -19,7 +19,7 @@
	4	#define LOGRATE 120 /* log table overflows every LOGRATE seconds */
	5	#define CACHESIZ 150 /* default cache size */
	6	#define SMALLDNAME 40 /* most domain names are smaller than this */
	7	-#define CONFFILE "/etc/dnsmasq.conf"
	8	+#define CONFFILE "/usr/local/etc/dnsmasq.conf"
	9	#define HOSTSFILE "/etc/hosts"
	10	#ifdef __uClinux__
	11	# define RESOLVFILE "/etc/config/resolv.conf"




--- dnsmasq.8.orig	Tue Jan 27 06:13:09 2004
+++ dnsmasq.8	Fri Jan 30 09:23:54 2004
@@ -132,7 +132,7 @@
 .TP
 .B \-R, --no-resolv
 Don't read /etc/resolv.conf. Get upstream servers only from the command
-line or /etc/dnsmasq.conf.
+line or /usr/local/etc/dnsmasq.conf.
 .TP
 .B \-o, --strict-order
 By default, dnsmasq will send queries to any of the upstream servers
@@ -307,10 +307,10 @@
 Add the domain-suffix to simple names (without a period) in /etc/hosts
 in the same way as for DHCP-derived names.
 .SH CONFIG FILE
-At startup, dnsmasq reads /etc/dnsmasq.conf, if it exists. The format of this
+At startup, dnsmasq reads /usr/local/etc/dnsmasq.conf, if it exists. The format of this
 file consists of one option per line, exactly as the long options detailed 
 in the OPTIONS section but without the leading "--". Lines starting with # are comments and ignored. For
-options which may only be specified once, /etc/dnsmasq.conf overrides 
+options which may only be specified once, /usr/local/etc/dnsmasq.conf overrides 
 the command line. Use the --conf-file option to specify a different
 configuration file.
 .SH NOTES
@@ -320,7 +320,7 @@
 .B
 --no-poll
 is set SIGHUP also re-reads /etc/resolv.conf. SIGHUP
-does NOT re-read /etc/dnsmasq.conf.
+does NOT re-read /usr/local/etc/dnsmasq.conf.
 .PP
 When it receives a SIGUSR1,
 .B dnsmasq 
@@ -365,7 +365,7 @@
 last, giving automatic switching between DNS servers.
 .PP
 Upstream servers may also be specified on the command line or in
-/etc/dnsmasq.conf. These server specifications optionally take a
+/usr/local/etc/dnsmasq.conf. These server specifications optionally take a
 domain name which tells dnsmasq to use that server only to find names
 in that particular domain.
 .PP
@@ -382,7 +382,7 @@
 option. This second technique allows for dynamic update of the server
 addresses by PPP or DHCP.
 .SH FILES
-.IR /etc/dnsmasq.conf
+.IR /usr/local/etc/dnsmasq.conf
 
 .IR /etc/resolv.conf
 

Lines 7-10 Link Here

(-)/usr/home/shonson/dnsmasq/pkg-descr (-1 / +1 lines)
7	WWW: http://www.thekelleys.org.uk/dnsmasq/doc.html	7	WWW: http://www.thekelleys.org.uk/dnsmasq/doc.html
8		8
9	- Steven Honson	9	- Steven Honson
10	shonson@isoproplex.net	10	steven@honson.org

Line 1 Link Here

(-)/usr/home/shonson/dnsmasq/pkg-plist (+1 lines)
		1	etc/dnsmasq.conf.example
1	sbin/dnsmasq	2	sbin/dnsmasq

Return to bug 62083

Lines 1-16 Link Here

(-)/usr/home/shonson/dnsmasq/Makefile (-4 / +5 lines)
1	# New ports collection makefile for: dnsmasq	1	# New ports collection makefile for: dnsmasq
2	# Date created: 1 June 2003	2	# Date created: 1 June 2003
3	# Whom: Steven Honson <shonson@isoproplex.net>	3	# Whom: Steven Honson <steven@honson.org>
4	#	4	#
5	# $FreeBSD: ports/dns/dnsmasq/Makefile,v 1.5 2003/11/10 13:26:57 leeym Exp $	5	# $FreeBSD: ports/dns/dnsmasq/Makefile,v 1.5 2003/11/10 13:26:57 leeym Exp $
6	#	6	#
7		7
8	PORTNAME= dnsmasq	8	PORTNAME= dnsmasq
9	PORTVERSION= 1.18	9	PORTVERSION= 2.1
10	CATEGORIES= dns	10	CATEGORIES= dns
11	MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/	11	MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
12		12
13	MAINTAINER= shonson@isoproplex.net	13	MAINTAINER= steven@honson.org
14	COMMENT= A caching DNS forwarder	14	COMMENT= A caching DNS forwarder
15		15
16	USE_REINPLACE= yes	16	USE_REINPLACE= yes
Lines 23-29 Link Here
23	s\|^CFLAGS = -O2\|CFLAGS+=-O2\|g' ${WRKSRC}/Makefile	23	s\|^CFLAGS = -O2\|CFLAGS+=-O2\|g' ${WRKSRC}/Makefile
24		24
25	do-install:	25	do-install:
26	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin	26	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
		27	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/etc/dnsmasq.conf.example
27	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${PREFIX}/man/man8	28	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${PREFIX}/man/man8
28		29
29	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/home/shonson/dnsmasq/files/patch-dnsmasq.8 (+51 lines)
	1	--- dnsmasq.8.orig Tue Jan 27 06:13:09 2004
	2	+++ dnsmasq.8 Fri Jan 30 09:23:54 2004
	3	@@ -132,7 +132,7 @@
	4	.TP
	5	.B \-R, --no-resolv
	6	Don't read /etc/resolv.conf. Get upstream servers only from the command
	7	-line or /etc/dnsmasq.conf.
	8	+line or /usr/local/etc/dnsmasq.conf.
	9	.TP
	10	.B \-o, --strict-order
	11	By default, dnsmasq will send queries to any of the upstream servers
	12	@@ -307,10 +307,10 @@
	13	Add the domain-suffix to simple names (without a period) in /etc/hosts
	14	in the same way as for DHCP-derived names.
	15	.SH CONFIG FILE
	16	-At startup, dnsmasq reads /etc/dnsmasq.conf, if it exists. The format of this
	17	+At startup, dnsmasq reads /usr/local/etc/dnsmasq.conf, if it exists. The format of this
	18	file consists of one option per line, exactly as the long options detailed
	19	in the OPTIONS section but without the leading "--". Lines starting with # are comments and ignored. For
	20	-options which may only be specified once, /etc/dnsmasq.conf overrides
	21	+options which may only be specified once, /usr/local/etc/dnsmasq.conf overrides
	22	the command line. Use the --conf-file option to specify a different
	23	configuration file.
	24	.SH NOTES
	25	@@ -320,7 +320,7 @@
	26	.B
	27	--no-poll
	28	is set SIGHUP also re-reads /etc/resolv.conf. SIGHUP
	29	-does NOT re-read /etc/dnsmasq.conf.
	30	+does NOT re-read /usr/local/etc/dnsmasq.conf.
	31	.PP
	32	When it receives a SIGUSR1,
	33	.B dnsmasq
	34	@@ -365,7 +365,7 @@
	35	last, giving automatic switching between DNS servers.
	36	.PP
	37	Upstream servers may also be specified on the command line or in
	38	-/etc/dnsmasq.conf. These server specifications optionally take a
	39	+/usr/local/etc/dnsmasq.conf. These server specifications optionally take a
	40	domain name which tells dnsmasq to use that server only to find names
	41	in that particular domain.
	42	.PP
	43	@@ -382,7 +382,7 @@
	44	option. This second technique allows for dynamic update of the server
	45	addresses by PPP or DHCP.
	46	.SH FILES
	47	-.IR /etc/dnsmasq.conf
	48	+.IR /usr/local/etc/dnsmasq.conf
	49
	50	.IR /etc/resolv.conf
	51