Attachment #145177 for bug #192288

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




PORTNAME=	maradns
PORTVERSION=	2.0.09
CATEGORIES=	dns
MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/\
		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/

MAINTAINER=	mat@FreeBSD.org

INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}

OPTIONS_DEFINE=	IPV6 DOCS EXAMPLES
OPTIONS_DEFAULT=	IPV6
IPV6_DESC=	With support for IPv6

DOCSSRCDIR=	${WRKSRC}/doc/en
IPV6_CONFIGURE_ON=	--ipv6

PORTDOCS=	*
PORTEXAMPLES=	*

post-patch:
	@${REINPLACE_CMD} -e 's/cc/${CC}/' ${WRKSRC}/build/Makefile.freebsd
	@${FIND} ${WRKSRC} -type f ! -name "*.orig" | ${XARGS} ${REINPLACE_CMD} -e \
		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g' -e\
		's|/etc/deadwood|${ETCDIR}|g' -e\
		's| = 99| = 53|g'
	@${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${REINPLACE_CMD} -e \
		's|make |\$$\{MAKE\} |g'
	@${FIND} ${DOCSSRCDIR} -name '*Makefile*' -delete

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin

	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin
	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${DOCSSRCDIR}/man/askmara.1 ${STAGEDIR}${MANPREFIX}/man/man1
	${INSTALL_MAN} ${DOCSSRCDIR}/man/getzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
	${INSTALL_MAN} ${DOCSSRCDIR}/man/fetchzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
	${INSTALL_MAN} ${DOCSSRCDIR}/man/maradns.8 ${STAGEDIR}${MANPREFIX}/man/man8
	${INSTALL_MAN} ${DOCSSRCDIR}/man/zoneserver.8 ${STAGEDIR}${MANPREFIX}/man/man8
	${INSTALL_MAN} ${DOCSSRCDIR}/man/duende.8 ${STAGEDIR}${MANPREFIX}/man/man8
	${INSTALL_MAN} ${DOCSSRCDIR}/man/mararc.5 ${STAGEDIR}${MANPREFIX}/man/man5
	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv1.5 ${STAGEDIR}${MANPREFIX}/man/man5
	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv2.5 ${STAGEDIR}${MANPREFIX}/man/man5
	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv2_txt.5 ${STAGEDIR}${MANPREFIX}/man/man5
	${INSTALL_MAN} ${DOCSSRCDIR}/man/Deadwood.1 ${STAGEDIR}${MANPREFIX}/man/man1
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/Deadwood.1 ${STAGEDIR}${MANPREFIX}/man/man1

	@${MKDIR} ${STAGEDIR}${ETCDIR}
	${INSTALL_DATA} ${DOCSSRCDIR}/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
	${INSTALL_DATA} ${DOCSSRCDIR}/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample

	@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in QuickStart README changelog.txt credits.txt faq.html faq.txt files.txt
	${INSTALL_DATA} ${DOCSSRCDIR}/${i} ${STAGEDIR}${DOCSDIR}
.endfor
.for i in misc text tutorial webpage
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
	cd ${DOCSSRCDIR}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i}
.endfor
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	cd ${DOCSSRCDIR}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)./files/patch-MaraDns.h (+9 lines)
1	--- ./MaraDns.h.orig 2014-02-12 08:17:18.000000000 +0000	1	--- ./MaraDns.h.orig 2014-02-12 08:17:18.000000000 +0000
2	+++ ./MaraDns.h 2014-02-20 15:23:22.000000000 +0000	2	+++ ./MaraDns.h 2014-02-20 15:23:22.000000000 +0000
		3	@@ -54,7 +54,7 @@
		4	/* The default UID (User ID) that MaraDNS has; I put this here so packagers
		5	can change this easily. This should be the 'nobody' user, or, optionally
		6	a special 'MaraDNS' user. This user needs to be able to enter
		7	- the /etc/maradns directory, and read all zone files in /etc/maradns
		8	+ the /usr/local/etc/maradns directory, and read all zone files in /usr/local/etc/maradns
		9
		10	If you change this from 99, please also change the mararc man page, which
		11	states the default value for this is 99. To change the man page:
3	@@ -77,21 +77,21 @@	12	@@ -77,21 +77,21 @@
4	line to point to Bash	13	line to point to Bash
5	*/	14	*/




--- build/Makefile.freebsd.orig	2012-02-12 15:04:11.000000000 +0900
+++ build/Makefile.freebsd	2014-02-21 15:20:18.000000000 +0900
@@ -31,8 +31,7 @@
 Q="DEFINES=-DSELECT_PROBLEM"
 
 # FreeBSD needs some special flags to compile MaraDNS
-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
-M=CC=$(CC) 
+M="CC=$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
 V="VERSION=$(VERSION)"
 
 # Debug

Lines 1-11 Link Here

(-)./files/patch-tools__Makefile (-11 lines)
1	--- ./tools/Makefile.orig 2010-09-09 20:21:09.000000000 +0000
2	+++ ./tools/Makefile 2014-02-20 15:23:49.000000000 +0000
3	@@ -18,7 +18,7 @@
4	rm -f core $(EXECS) *.exe
5
6	askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
7	- $(CC) $(FLAGS) -DAUTHONLY -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
8	+ $(CC) $(FLAGS) -DAUTHONLY -DIPV6 -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
9
10	askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
11	$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)

Return to bug 192288

Lines 4-10 Link Here

(-)./Makefile (-26 / +27 lines)
4	PORTNAME= maradns	4	PORTNAME= maradns
5	PORTVERSION= 2.0.09	5	PORTVERSION= 2.0.09
6	CATEGORIES= dns	6	CATEGORIES= dns
7	MASTER_SITES= http://www.maradns.org/download/2.0/${PORTVERSION}/\	7	MASTER_SITES= http://maradns.samiam.org/download/2.0/${PORTVERSION}/\
8	SF/${PORTNAME}/MaraDNS/${PORTVERSION}/	8	SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
9		9
10	MAINTAINER= mat@FreeBSD.org	10	MAINTAINER= mat@FreeBSD.org
Lines 27-46 Link Here
27	INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX}	27	INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX}
28		28
29	OPTIONS_DEFINE= IPV6 DOCS EXAMPLES	29	OPTIONS_DEFINE= IPV6 DOCS EXAMPLES
30	OPTIONS_DEFAULT= IPV6
31	IPV6_DESC= With support for IPv6
32		30
		31	DOCSSRCDIR= ${WRKSRC}/doc/en
33	IPV6_CONFIGURE_ON= --ipv6	32	IPV6_CONFIGURE_ON= --ipv6
34		33
35	PORTDOCS= *	34	PORTDOCS= *
36	PORTEXAMPLES= *	35	PORTEXAMPLES= *
37		36
38	post-patch:	37	post-patch:
39	@${REINPLACE_CMD} -e 's/cc/${CC}/' ${WRKSRC}/build/Makefile.freebsd
40	@${FIND} ${WRKSRC} -type f ! -name "*.orig" \| ${XARGS} ${REINPLACE_CMD} -e \	38	@${FIND} ${WRKSRC} -type f ! -name "*.orig" \| ${XARGS} ${REINPLACE_CMD} -e \
41	's\|/etc/maradns\|${ETCDIR}\|g; s\|/etc/mararc\|${ETCDIR}\|g' -e\	39	's\|/etc/maradns\|${ETCDIR}\|g; s\|/etc/mararc\|${ETCDIR}\|g' -e\
42	's\|/etc/deadwood\|${ETCDIR}\|g' -e\	40	's\|/etc/deadwood\|${ETCDIR}\|g' -e\
43	's\| = 99\| = 53\|g'	41	's\| = 99\| = 53\|g'
		42	@${FIND} ${WRKSRC} -name 'Makefile' \| ${XARGS} ${REINPLACE_CMD} -e \
		43	's\|make \|\$$\{MAKE\} \|g'
		44	@${FIND} ${DOCSSRCDIR} -name 'Makefile' -delete
44		45
45	do-install:	46	do-install:
46	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin	47	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
Lines 50-79 Link Here
50	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin	51	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin
51	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin	52	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin
52	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${PREFIX}/bin	53	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${PREFIX}/bin
53		54	${INSTALL_MAN} ${DOCSSRCDIR}/man/askmara.1 ${STAGEDIR}${MANPREFIX}/man/man1
54	${INSTALL_MAN} ${WRKSRC}/doc/en/man/askmara.1 ${STAGEDIR}${MANPREFIX}/man/man1	55	${INSTALL_MAN} ${DOCSSRCDIR}/man/getzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
55	${INSTALL_MAN} ${WRKSRC}/doc/en/man/getzone.1 ${STAGEDIR}${MANPREFIX}/man/man1	56	${INSTALL_MAN} ${DOCSSRCDIR}/man/fetchzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
56	${INSTALL_MAN} ${WRKSRC}/doc/en/man/fetchzone.1 ${STAGEDIR}${MANPREFIX}/man/man1	57	${INSTALL_MAN} ${DOCSSRCDIR}/man/maradns.8 ${STAGEDIR}${MANPREFIX}/man/man8
57	${INSTALL_MAN} ${WRKSRC}/doc/en/man/maradns.8 ${STAGEDIR}${MANPREFIX}/man/man8	58	${INSTALL_MAN} ${DOCSSRCDIR}/man/zoneserver.8 ${STAGEDIR}${MANPREFIX}/man/man8
58	${INSTALL_MAN} ${WRKSRC}/doc/en/man/zoneserver.8 ${STAGEDIR}${MANPREFIX}/man/man8	59	${INSTALL_MAN} ${DOCSSRCDIR}/man/duende.8 ${STAGEDIR}${MANPREFIX}/man/man8
59	${INSTALL_MAN} ${WRKSRC}/doc/en/man/duende.8 ${STAGEDIR}${MANPREFIX}/man/man8	60	${INSTALL_MAN} ${DOCSSRCDIR}/man/mararc.5 ${STAGEDIR}${MANPREFIX}/man/man5
60	${INSTALL_MAN} ${WRKSRC}/doc/en/man/mararc.5 ${STAGEDIR}${MANPREFIX}/man/man5	61	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv1.5 ${STAGEDIR}${MANPREFIX}/man/man5
61	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv1.5 ${STAGEDIR}${MANPREFIX}/man/man5	62	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv2.5 ${STAGEDIR}${MANPREFIX}/man/man5
62	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2.5 ${STAGEDIR}${MANPREFIX}/man/man5	63	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv2_txt.5 ${STAGEDIR}${MANPREFIX}/man/man5
63	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2_txt.5 ${STAGEDIR}${MANPREFIX}/man/man5	64	${INSTALL_MAN} ${DOCSSRCDIR}/man/Deadwood.1 ${STAGEDIR}${MANPREFIX}/man/man1
64	${INSTALL_MAN} ${WRKSRC}/doc/en/man/Deadwood.1 ${STAGEDIR}${MANPREFIX}/man/man1
65
66	@${MKDIR} ${STAGEDIR}${ETCDIR}	65	@${MKDIR} ${STAGEDIR}${ETCDIR}
67	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample	66	${INSTALL_DATA} ${DOCSSRCDIR}/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
68	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample	67	${INSTALL_DATA} ${DOCSSRCDIR}/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
69	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample	68	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
70
71	@${MKDIR} ${STAGEDIR}${DOCSDIR}	69	@${MKDIR} ${STAGEDIR}${DOCSDIR}
72	cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}	70	.for i in QuickStart README changelog.txt credits.txt faq.html faq.txt files.txt
73	@${RM} -rf ${STAGEDIR}${DOCSDIR}/man \	71	${INSTALL_DATA} ${DOCSSRCDIR}/${i} ${STAGEDIR}${DOCSDIR}
74	${STAGEDIR}${DOCSDIR}/source \	72	.endfor
75	${STAGEDIR}${DOCSDIR}/pdf	73	.for i in misc text tutorial webpage
76	@${FIND} ${STAGEDIR}${DOCSDIR} -name Makefile -delete	74	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
77	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}	75	cd ${DOCSSRCDIR}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i}
		76	.endfor
		77	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		78	cd ${DOCSSRCDIR}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
78		79
79	.include <bsd.port.mk>	80	.include <bsd.port.mk>

Line 0 Link Here

(-)./files/patch-build_Makefile (+12 lines)
	1	--- build/Makefile.freebsd.orig 2012-02-12 15:04:11.000000000 +0900
	2	+++ build/Makefile.freebsd 2014-02-21 15:20:18.000000000 +0900
	3	@@ -31,8 +31,7 @@
	4	Q="DEFINES=-DSELECT_PROBLEM"
	5
	6	# FreeBSD needs some special flags to compile MaraDNS
	7	-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
	8	-M=CC=$(CC)
	9	+M="CC=$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
	10	V="VERSION=$(VERSION)"
	11
	12	# Debug