View | Details | Raw Unified | Return to bug 227802 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-37 / +46 lines)
Lines 2-77 Link Here
2
# $FreeBSD: head/dns/maradns/Makefile 465596 2018-03-26 13:49:19Z mat $
2
# $FreeBSD: head/dns/maradns/Makefile 465596 2018-03-26 13:49:19Z mat $
3
3
4
PORTNAME=	maradns
4
PORTNAME=	maradns
5
PORTVERSION=	2.0.14
5
PORTVERSION=	2.0.15
6
PORTREVISION=	1
7
CATEGORIES=	dns
6
CATEGORIES=	dns
8
MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/\
7
MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/
9
		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
10
8
11
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	je3kmz@freebsd.org
12
COMMENT=	DNS server with focus on security and simplicity
10
COMMENT=	DNS server with focus on security and simplicity
13
11
14
LICENSE=	BSD2CLAUSE
12
LICENSE=	BSD2CLAUSE
15
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
16
14
17
DEADWOOD_VER=	3.2.10
15
DEADWOOD_VER=	3.2.11
18
16
19
REINPLACE_ARGS=	-i ""
17
REINPLACE_ARGS=	-i ""
20
MAKE_ENV=	FLAGS="${CFLAGS}"
21
18
22
HAS_CONFIGURE=	yes
19
HAS_CONFIGURE=	yes
20
USES=		tar:bz2
23
USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
21
USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
24
USES=		tar:bz2 python:2.7,run shebangfix
25
USERS=		bind
22
USERS=		bind
26
GROUPS=		bind
23
GROUPS=		bind
27
INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
24
INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
28
SHEBANG_FILES=	tools/bind2csv2.py
25
SHEBANG_FILES=	tools/bind2csv2.py
29
26
30
OPTIONS_DEFINE=	IPV6 DOCS EXAMPLES CONV
27
OPTIONS_DEFINE=	CONV DOCS EXAMPLES IPV6
31
OPTIONS_SUB=	yes
28
OPTIONS_SUB=	yes
32
CONV_DESC=	Install bind2csv2 tool (needs python)
33
29
30
CONV_DESC=	Install bind2csv2 tool (needs python)
31
CONV_USES=	python:2.7,run shebangfix
34
IPV6_CONFIGURE_ON=	--ipv6
32
IPV6_CONFIGURE_ON=	--ipv6
35
CONV_USES=	python:2.7,run
36
33
37
PORTDOCS=	*
34
PORTDOCS=	*
38
PORTEXAMPLES=	*
35
PORTEXAMPLES=	*
39
36
40
post-patch:
37
post-patch:
41
	@${REINPLACE_CMD} -e 's|\<cc\>|${CC}|' ${WRKSRC}/build/Makefile.freebsd
38
	${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |g'\
42
	@${FIND} ${WRKSRC} -type f ! -name "*.orig" | ${XARGS} ${REINPLACE_CMD} -e \
39
		${WRKSRC}/build/Makefile.freebsd
40
	${FIND} ${WRKSRC} -type f ! -name "*.orig" |\
41
		${XARGS} ${REINPLACE_CMD} -e\
43
		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g; \
42
		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g; \
44
		 s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g'
43
		s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g; \
44
		s|${PREFIX}/${ETCDIR}/|${ETCDIR}/|g'
45
45
46
do-install:
46
do-install:
47
	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
47
.for i in deadwood-${DEADWOOD_VER}/src/Deadwood server/maradns tcp/zoneserver
48
	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin
48
	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin
49
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin
49
.endfor
50
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
50
.for i in tcp/getzone tcp/fetchzone tools/askmara tools/duende tools/misc/mqhash
51
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin
51
	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
52
	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin
52
.endfor
53
	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${PREFIX}/bin
53
.for i in askmara.1 bind2csv2.1 getzone.1 fetchzone.1 mqhash.1\
54
	${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/mqhash ${STAGEDIR}${PREFIX}/bin
54
	maradns.8 zoneserver.8 duende.8\
55
	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin/bind2csv2
55
	mararc.5 csv1.5 csv2.5 csv2_txt.5 Deadwood.1
56
56
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/${i}\
57
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
57
		${STAGEDIR}${MANPREFIX}/man/${i:C|.*\.|man|}/${i:C|\.*||}
58
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.8 ${STAGEDIR}${MANPREFIX}/man/man8
58
.endfor
59
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.5 ${STAGEDIR}${MANPREFIX}/man/man5
60
61
	@${MKDIR} ${STAGEDIR}${ETCDIR}
59
	@${MKDIR} ${STAGEDIR}${ETCDIR}
62
	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
60
	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc\
63
	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
61
		${STAGEDIR}${ETCDIR}/mararc.sample
64
	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
62
	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2\
63
		${STAGEDIR}${ETCDIR}/csv2.sample
64
	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc\
65
		${STAGEDIR}${ETCDIR}/dwood3rc.sample
66
67
do-install-CONV-on:
68
	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin
65
69
66
post-install-DOCS-on:
70
post-install-DOCS-on:
67
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
71
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
68
	cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
72
.for i in QuickStart README changelog.txt credits.txt faq.html faq.txt files.txt
69
	@${RM} -r ${STAGEDIR}${DOCSDIR}/man \
73
	${INSTALL_DATA} ${WRKSRC}/doc/en/${i} ${STAGEDIR}${DOCSDIR}
70
		${STAGEDIR}${DOCSDIR}/source \
74
.endfor
71
		${STAGEDIR}${DOCSDIR}/pdf
75
.for i in misc text tutorial webpage
72
	@${FIND} ${STAGEDIR}${DOCSDIR} -name Makefile -delete
76
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
77
	cd ${WRKSRC}/doc/en/${i} && ${COPYTREE_SHARE} .\
78
		${STAGEDIR}${DOCSDIR}/${i}
79
.endfor
73
80
74
post-install-EXAMPLES-on:
81
post-install-EXAMPLES-on:
75
	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
82
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
83
	cd ${WRKSRC}/doc/en/examples && ${COPYTREE_SHARE} .\
84
		${STAGEDIR}${EXAMPLESDIR}
76
85
77
.include <bsd.port.mk>
86
.include <bsd.port.mk>
(-)./distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1511188457
1
TIMESTAMP = 1524796813
2
SHA256 (maradns-2.0.14.tar.bz2) = 1a529c818df9cbd431fa09e3a413dfbbb410f7be3542a766028a36bc5ef94e29
2
SHA256 (maradns-2.0.15.tar.bz2) = 2c20588dc9a79492aca94a477864c59ac28ec7ae4715046022311e9cefe332b2
3
SIZE (maradns-2.0.14.tar.bz2) = 1156272
3
SIZE (maradns-2.0.15.tar.bz2) = 1166133
(-)./files/patch-MaraDns.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- MaraDns.h.orig	2015-09-26 05:35:18 UTC
1
--- MaraDns.h.orig	2018-02-05 21:13:38 UTC
2
+++ MaraDns.h
2
+++ MaraDns.h
3
@@ -71,21 +71,21 @@
3
@@ -71,21 +71,21 @@
4
      line to point to Bash
4
      line to point to Bash
(-)./files/patch-configure (-3 / +3 lines)
Lines 1-6 Link Here
1
--- ./configure.orig	2014-01-14 21:46:25.000000000 +0000
1
--- configure.orig	2015-08-19 04:44:49 UTC
2
+++ ./configure	2014-02-20 15:33:18.000000000 +0000
2
+++ configure
3
@@ -93,6 +93,9 @@
3
@@ -93,6 +93,9 @@ elif echo $UNAME | grep -i cygwin > /dev
4
 	echo It looks like you are using Cygwin\; this should compile fine
4
 	echo It looks like you are using Cygwin\; this should compile fine
5
 	echo by typing in \'make\'.
5
 	echo by typing in \'make\'.
6
 	EXITCODE=0
6
 	EXITCODE=0
(-)./files/patch-tools__Makefile (-3 / +3 lines)
Lines 1-6 Link Here
1
--- ./tools/Makefile.orig	2010-09-09 20:21:09.000000000 +0000
1
--- tools/Makefile.orig	2010-09-09 20:21:09 UTC
2
+++ ./tools/Makefile	2014-02-20 15:23:49.000000000 +0000
2
+++ tools/Makefile
3
@@ -18,7 +18,7 @@
3
@@ -18,7 +18,7 @@ clean:
4
 	rm -f core $(EXECS) *.exe
4
 	rm -f core $(EXECS) *.exe
5
 
5
 
6
 askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
6
 askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
(-)./pkg-plist (-1 / +1 lines)
Lines 1-5 Link Here
1
bin/askmara
1
bin/askmara
2
%%CONV%%bin/bind2csv2
2
%%CONV%%bin/bind2csv2.py
3
bin/duende
3
bin/duende
4
bin/fetchzone
4
bin/fetchzone
5
bin/getzone
5
bin/getzone

Return to bug 227802