4 files changed, 25 insertions, 10 deletions

diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index 19a40ddbb335..970707a0cdb2 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	1.4.10
+PORTVERSION=	1.4.12
 CATEGORIES=	dns
-MASTER_SITES=	http://www.maradns.org/download/1.4/${PORTVERSION}/ \
-		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
+MASTER_SITES=	http://www.maradns.org/download/1.4/
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	DNS server with focus on security and simplicity
@@ -19,6 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 REINPLACE_ARGS=	-i ""
 MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CONFIGURE_ENV=	LANG=
 
 USE_BZIP2=	yes
 USE_RC_SUBR=	${PORTNAME} zoneserver
diff --git a/dns/maradns/distinfo b/dns/maradns/distinfo
index f4a15bf7016d..2e40c84c1093 100644
--- a/dns/maradns/distinfo
+++ b/dns/maradns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (maradns-1.4.10.tar.bz2) = 3aaa2361341c559e1c91876544cfd5973ea960b9bfd5c8d0bb54617291f40555
-SIZE (maradns-1.4.10.tar.bz2) = 1121427
+SHA256 (maradns-1.4.12.tar.bz2) = 72c0e0fd10e4d9ed70d8c7addb9b0abd2cf2d23f6b477db3aefd69c9faa0893b
+SIZE (maradns-1.4.12.tar.bz2) = 1178772
diff --git a/dns/maradns/files/patch-build_Makefile.freebsd b/dns/maradns/files/patch-build_Makefile.freebsd
new file mode 100644
index 000000000000..dea3ef6f6394
--- /dev/null
+++ b/dns/maradns/files/patch-build_Makefile.freebsd
@@ -0,0 +1,15 @@
+--- /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd 1970-01-01 09:00:00.000000000 +0900
++++ dns/maradns1/files/patch-build_Makefile.freebsd 2012-01-17 15:13:25.000000000 +0900
+@@ -0,0 +1,12 @@
++--- build/Makefile.freebsd.orig   2006-01-22 14:22:01.000000000 +0900
+++++ build/Makefile.freebsd 2012-01-17 15:13:16.000000000 +0900
++@@ -27,8 +27,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
diff --git a/dns/maradns/pkg-descr b/dns/maradns/pkg-descr
index a7604496fb97..9dd4b44b7681 100644
--- a/dns/maradns/pkg-descr
+++ b/dns/maradns/pkg-descr
@@ -1,25 +1,25 @@
 MaraDNS is a package that implements the Domain Name Service (DNS), an
-essential internet service. MaraDNS has the following advantages: 
+essential internet service. MaraDNS has the following advantages:
 
 o Secure. MaraDNS has a security history as good as or better than any other DNS
   server. For example, MaraDNS has always randomized, using a secure random
   number generator, the Query ID and source port of DNS queries; and was never
-  vulnerable to the "new" cache poisoning attack. 
+  vulnerable to the "new" cache poisoning attack.
 
 o Supported. MaraDNS has a long history of being maintained and updated.
   Actively developed since 2001, MaraDNS continues to be fully supported: The
   most recent release was done on August 4, 2009. Deadwood, the code that will
-  become part of MaraDNS 2.0, is frequently updated. 
+  become part of MaraDNS 2.0, is frequently updated.
 
 o Easy to use. A basic recursive configuration needs only a single three-line
   configuration file. A basic authoritative configuration needs only a four-line
   configuration file and a one-line zone file. MaraDNS is fully documented, with
-  both easy-to-follow tutorials and a complete and up-to-date reference manual. 
+  both easy-to-follow tutorials and a complete and up-to-date reference manual.
 
 o Small. MaraDNS is well suited for embedded applications and other environments
   where the server must use the absolute minimum number of resources possible.
   MaraDNS' binary is smaller than that of any other currently maintained
-  recursive DNS server. 
+  recursive DNS server.
 
 o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD
   license that is almost identical to the FreeBSD license.