3 files changed, 73 insertions, 8 deletions

diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index 3085589f96ad..b92f45d188f4 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -2,19 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	mailfront
-PORTVERSION=	2.01
-PORTREVISION=	1
+PORTVERSION=	2.12
 CATEGORIES=	mail
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
 		http://untroubled.org/${PORTNAME}/archive/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Mail server network protocol front-ends
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcvm-v2client.so:security/cvm
+LIB_DEPENDS=	libcvm-v2client.so:security/cvm \
+		libbg.so:devel/bglibs
 
 USES=		qmail:vars
 
@@ -39,9 +39,14 @@ OPTIONS_DEFAULT=LUA
 OPTIONS_SUB=	yes
 
 LUA_ALL_TARGET=	lua
-LUA_USES=	lua:51
+LUA_USES=	lua
 LUA_VARS=	CFLAGS+=-I${LUA_INCDIR} LUA_CFLAGS_SO+=-L${LUA_LIBDIR} LUA_LDFLAGS+=-L${LUA_LIBDIR}
 
+CPPFLAGS+=      -I${LUA_INCDIR}
+CFLAGS+=        -DHAVE_LUASCRIPT
+LDFLAGS+=       -L${LUA_LIBDIR} -llua-${LUA_VER}
+USES+=          lua:51
+
 do-configure:
 	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
 	${ECHO_CMD} "${PREFIX}/include"	> ${WRKSRC}/conf-include
@@ -54,7 +59,7 @@ do-configure:
 	${ECHO_CMD} "${QMAIL_PREFIX}"	> ${WRKSRC}/conf-qmail
 
 post-patch:
-	@${REINPLACE_CMD} 's,-llua,-llua-${LUA_VER},' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's,-llua-,-llua-${LUA_VER},' ${WRKSRC}/Makefile
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/mailfront/distinfo b/mail/mailfront/distinfo
index 5cab462cd797..ad93731ebae6 100644
--- a/mail/mailfront/distinfo
+++ b/mail/mailfront/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mailfront-2.01.tar.gz) = 1fb069ef7c36dc8487e1ba102ac5548f35f7bdfdbfb583662387e9044bc72b63
-SIZE (mailfront-2.01.tar.gz) = 119144
+TIMESTAMP = 1490368396
+SHA256 (mailfront-2.12.tar.gz) = a3e3eb2e180a3dfab95f98c3ec65e4add9fb8c14a66987eebdcf02c5f80dca6d
+SIZE (mailfront-2.12.tar.gz) = 123228
diff --git a/mail/mailfront/files/patch-Makefile b/mail/mailfront/files/patch-Makefile
new file mode 100644
index 000000000000..76318fae6f0d
--- /dev/null
+++ b/mail/mailfront/files/patch-Makefile
@@ -0,0 +1,59 @@
+--- Makefile.orig	2015-02-12 14:10:37 UTC
++++ Makefile
+@@ -31,11 +31,12 @@ clean: TARGETS
+ clean-spac: clean AUTOFILES
+ 	rm -f `cat AUTOFILES`
+ 
+-compile: conf-cc
+-	( echo '#!/bin/sh'; \
++compile: conf-cc conf-bgincs
++	( bgincs=`head -n 1 conf-bgincs`; \
++	  echo '#!/bin/sh'; \
+ 	  echo 'source=$$1; shift'; \
+ 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
+-	  echo exec `head -n 1 conf-cc` -I.  '-o $${base}.o -c $$source $${1+"$$@"}'; \
++	  echo exec `head -n 1 conf-cc` -I. "-I /usr/local/include/" "-I'$${bgincs}'" '-o $${base}.o -c $$source $${1+"$$@"}'; \
+ 	) >compile
+ 	chmod 755 compile
+ 
+@@ -79,10 +80,11 @@ iobytes.o: compile iobytes.c
+ 
+ libraries: pop3.a plugin-starttls-ucspi.so plugin-rbl.so plugin-clamav.so plugin-cvm-authenticate.so plugin-patterns.so backend-echo.so plugin-counters.so backend-qmail.so plugin-cvm-validate.so protocol-qmtp.so backend-queuedir.so plugin-check-fqdn.so plugin-mailrules.so protocol-smtp.so plugin-add-received.so plugin-qmail-validate.so protocol-qmqp.so plugin-spamassassin.so
+ 
+-load: conf-ld
+-	( echo '#!/bin/sh';\
++load: conf-ld conf-bglibs
++	( bglibs=`head -n 1 conf-bglibs`; \
++	  echo '#!/bin/sh';\
+ 	  echo 'main="$$1"; shift';\
+-	  echo exec `head -n 1 conf-ld` -L. '-o "$$main" "$$main.o" $${1+"$$@"}'; \
++	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}'; \
+ 	) >load
+ 	chmod 755 load
+ 
+@@ -103,11 +105,13 @@ makelib: 
+ 	) >makelib
+ 	chmod 755 makelib
+ 
+-makeso: conf-ccso conf-ld
+-	( echo '#!/bin/sh'; \
++makeso: conf-ccso conf-ld conf-bglibs conf-bgincs
++	( bglibs=`head -n 1 conf-bglibs`; \
++	  bgincs=`head -n 1 conf-bgincs`; \
++	  echo '#!/bin/sh'; \
+ 	  echo 'source=$$1; shift'; \
+ 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
+-	  echo exec `head -n 1 conf-ccso` -DSHARED -I. -L. '-o $${base}.so $$source $${1+"$$@"}'; \
++	  echo exec `head -n 1 conf-ccso` -DSHARED -I. -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" "-I'$${bgincs}'" "-I /usr/local/include" '-o $${base}.so $$source $${1+"$$@"}'; \
+ 	) >makeso
+ 	chmod 755 makeso
+ 
+@@ -133,7 +137,7 @@ plugin-cvm-validate.so: makeso plugin-cv
+ 	./makeso plugin-cvm-validate.c  -lcvm-v2client -lbg 
+ 
+ plugin-lua.so: makeso plugin-lua.c mailfront.h responses.h constants.h
+-	./makeso plugin-lua.c  -lbg -llua 
++	./makeso plugin-lua.c  -lbg -llua- 
+ 
+ plugin-mailrules.so: makeso plugin-mailrules.c mailfront.h responses.h constants.h
+ 	./makeso plugin-mailrules.c  -lbg