Attachment #203789 for bug #234494

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524796813	1	TIMESTAMP = 1555660350
2	SHA256 (maradns-2.0.15.tar.bz2) = 2c20588dc9a79492aca94a477864c59ac28ec7ae4715046022311e9cefe332b2	2	SHA256 (maradns-2.0.17.tar.bz2) = 5ab6a6c226fb5614922147f11fd414871118f5ded7287d34b325787d0159fa6c
3	SIZE (maradns-2.0.15.tar.bz2) = 1166133	3	SIZE (maradns-2.0.17.tar.bz2) = 1135103




--- build/Makefile.freebsd.orig	2012-02-12 06:04:11 UTC
+++ build/Makefile.freebsd
@@ -31,8 +31,8 @@ M="VERSION=$(VERSION)"
 Q="DEFINES=-DSELECT_PROBLEM"
 
 # FreeBSD needs some special flags to compile MaraDNS
-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
-M=CC=$(CC) 
+#CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
+M=CC="$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
 V="VERSION=$(VERSION)"
 
 # Debug
@@ -47,7 +47,8 @@ all: 
 	cd ../qual ; make $(M) ; cd ../server ; \
 	make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \




# Created by: Anders Nordby <anders@fix.no>
# $FreeBSD: head/dns/maradns/Makefile 468929 2018-05-03 14:05:55Z mat $

PORTNAME=	maradns
PORTVERSION=	2.0.17
CATEGORIES=	dns
MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/

MAINTAINER=	takefu@airport.fm
COMMENT=	DNS server with focus on security and simplicity

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		tar:bz2

USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
USERS=		bind
GROUPS=		bind

PORTDOCS=	*
PORTEXAMPLES=	*
REINPLACE_ARGS=	-i ""
DEADWOOD_VER=	3.2.14

pre-patch:
	@${ECHO_MSG} max_mem = 0 >> ${WRKSRC}/doc/en/examples/example_full_mararc
	@${ECHO_MSG} hide_disclaimer = \"YES\" >> ${WRKSRC}/doc/en/examples/example_full_mararc

pre-patch-IPV6-on:
	@${ECHO_MSG} ipv6_bind_address = \"::1\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
	@${REINPLACE_CMD} -e 's|bind_address=\"127.0.0.1|bind_address=\"127.0.0.1,\ ::1|'\
		-e 's|127.0.0.1/16|127.0.0.1/16,\ ::1/128|' ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc

post-patch:
	@${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |' ${WRKSRC}/build/Makefile.freebsd

Return to bug 234494

Lines 1-5 Link Here

(-)./files/patch-build_Makefile.freebsd (+11 lines)
1	--- build/Makefile.freebsd.orig 2012-02-12 06:04:11 UTC	1	--- build/Makefile.freebsd.orig 2012-02-12 06:04:11 UTC
2	+++ build/Makefile.freebsd	2	+++ build/Makefile.freebsd
		3	@@ -31,8 +31,8 @@ M="VERSION=$(VERSION)"
		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	+#CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
		10	+M=CC="$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
		11	V="VERSION=$(VERSION)"
		12
		13	# Debug
3	@@ -47,7 +47,8 @@ all:	14	@@ -47,7 +47,8 @@ all:
4	cd ../qual ; make $(M) ; cd ../server ; \	15	cd ../qual ; make $(M) ; cd ../server ; \
5	make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \	16	make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \

Lines 1-18 Link Here

(-)./Makefile (-4 / +13 lines)
1	# Created by: Anders Nordby <anders@fix.no>
2	# $FreeBSD: head/dns/maradns/Makefile 468929 2018-05-03 14:05:55Z mat $	1	# $FreeBSD: head/dns/maradns/Makefile 468929 2018-05-03 14:05:55Z mat $
3		2
4	PORTNAME= maradns	3	PORTNAME= maradns
5	PORTVERSION= 2.0.15	4	PORTVERSION= 2.0.17
6	CATEGORIES= dns	5	CATEGORIES= dns
7	MASTER_SITES= http://maradns.samiam.org/download/2.0/${PORTVERSION}/	6	MASTER_SITES= http://maradns.samiam.org/download/2.0/${PORTVERSION}/
8		7
9	MAINTAINER= je3kmz@FreeBSD.org	8	MAINTAINER= takefu@airport.fm
10	COMMENT= DNS server with focus on security and simplicity	9	COMMENT= DNS server with focus on security and simplicity
11		10
12	LICENSE= BSD2CLAUSE	11	LICENSE= BSD2CLAUSE
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
15	USES= tar:bz2	14	USES= tar:bz2
		15
16	USE_RC_SUBR= ${PORTNAME} zoneserver Deadwood	16	USE_RC_SUBR= ${PORTNAME} zoneserver Deadwood
17	USERS= bind	17	USERS= bind
18	GROUPS= bind	18	GROUPS= bind
Lines 30-36 CONV_USES= python:2.7,run shebangfix Link Here
30	PORTDOCS= *	30	PORTDOCS= *
31	PORTEXAMPLES= *	31	PORTEXAMPLES= *
32	REINPLACE_ARGS= -i ""	32	REINPLACE_ARGS= -i ""
33	DEADWOOD_VER= 3.2.11	33	DEADWOOD_VER= 3.2.14
		34
		35	pre-patch:
		36	@${ECHO_MSG} max_mem = 0 >> ${WRKSRC}/doc/en/examples/example_full_mararc
		37	@${ECHO_MSG} hide_disclaimer = \"YES\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
		38
		39	pre-patch-IPV6-on:
		40	@${ECHO_MSG} ipv6_bind_address = \"::1\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
		41	@${REINPLACE_CMD} -e 's\|bind_address=\"127.0.0.1\|bind_address=\"127.0.0.1,\ ::1\|'\
		42	-e 's\|127.0.0.1/16\|127.0.0.1/16,\ ::1/128\|' ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc
34		43
35	post-patch:	44	post-patch:
36	@${REINPLACE_CMD} -e 's\|make \|\$$\{MAKE\} \|' ${WRKSRC}/build/Makefile.freebsd	45	@${REINPLACE_CMD} -e 's\|make \|\$$\{MAKE\} \|' ${WRKSRC}/build/Makefile.freebsd