Modify these files to reflect bsd.lua.mk as tested on the cluster.

PR:		ports/101612
Submitted by:	alepulver
Hat:		portmgr

2 files changed, 19 insertions, 88 deletions

diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 5f41a032bce3..41b1d2569d56 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -13,35 +13,39 @@ MASTER_SITES=	http://imapfilter.hellug.gr/source/
 MAINTAINER=	stefan@FreeBSD.org
 COMMENT=	IMAP mail filtering utility
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lua.hpp:${PORTSDIR}/lang/lua
-
 USE_BZIP2=	yes
+USE_LUA=	5.1
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-d ${PREFIX} -s ${DATADIR}
+CPPFLAGS=	-I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 
 MAN1=		imapfilter.1
 MAN5=		imapfilter_config.5
 PORTDOCS=	LICENSE NEWS README
 PLIST_FILES=	bin/imapfilter \
-		${DATADIR:S%${PREFIX}/%%}/interface.lua \
-		${DATADIR:S%${PREFIX}/%%}/auxiliary.lua \
-		${EXAMPLESDIR:S%${PREFIX}/%%}/sample.config.lua \
-		${EXAMPLESDIR:S%${PREFIX}/%%}/sample.extend.lua
-PLIST_DIRS=	${DATADIR:S%${PREFIX}/%%} ${EXAMPLESDIR:S%${PREFIX}/%%}
+		%%DATADIR%%/interface.lua \
+		%%DATADIR%%/auxiliary.lua \
+		%%EXAMPLESDIR%%/sample.config.lua \
+		%%EXAMPLESDIR%%/sample.extend.lua
+PLIST_DIRS=	%%DATADIR%% %%EXAMPLESDIR%%
 
 post-patch:
-	${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/configure
-	${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -Ee \
+		's|^(incdirs=).*|\1"${CPPFLAGS}"| ; \
+		 s|^(libdirs=).*|\1"${LDFLAGS}"| ; \
+		 s|^(mycflags=).*|\1"${CFLAGS}"| ; \
+		 s|-llualib||' \
+		${WRKSRC}/configure
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/imapfilter
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} interface.lua \
-		auxiliary.lua ${DATADIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} sample.config.lua \
-		sample.extend.lua ${EXAMPLESDIR}
+	@${MKDIR} ${DATADIR} ${EXAMPLESDIR}
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} interface.lua auxiliary.lua ${DATADIR} && \
+		${INSTALL_DATA} sample.config.lua sample.extend.lua \
+			${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/mail/imapfilter/files/patch-configure b/mail/imapfilter/files/patch-configure
index 4e6b39d8b00b..e69de29bb2d1 100644
--- a/mail/imapfilter/files/patch-configure
+++ b/mail/imapfilter/files/patch-configure
@@ -1,73 +0,0 @@
---- configure.orig	Thu Mar  9 23:58:22 2006
-+++ configure	Fri May 26 21:52:12 2006
-@@ -2,7 +2,7 @@
- 
- # Default values
- 
--destdir="/usr/local"
-+destdir="%%PREFIX%%"
- bindir="$destdir/bin"
- sharedir="$destdir/share/imapfilter"
- mandir="$destdir/man"
-@@ -10,13 +10,13 @@
- ssltls="yes"
- crammd5="yes"
- 
--incdirs="-I/usr/local/include"
--libdirs="-L/usr/local/lib"
-+incdirs="-I%%LOCALBASE%%/include"
-+libdirs="-L%%LOCALBASE%%/lib"
- 
- mycflags="-Wall -O"
- myldflags=""
- 
--libs="-lm -llua -llualib"
-+libs="-lm -llua"
- libssl="-lssl"
- libcrypto="-lcrypto"
- 
-@@ -145,16 +145,16 @@
- SHAREDIR = $sharedir
- MANDIR = $mandir
- 
-+INST_BIN = \$(BSD_INSTALL_PROGRAM)
-+INST_DOC = \$(BSD_INSTALL_MAN)
-+
- INCDIRS = $incdirs
- LIBDIRS = $libdirs
- 
--MYCFLAGS = $mycflags
--MYLDFLAGS = $myldflags
--
- DEFS = $defs
- 
--CFLAGS = \$(MYCFLAGS) \$(DEFS) \$(INCDIRS)
--LDFLAGS = \$(MYLDFLAGS) \$(LIBDIRS)
-+CFLAGS += \$(DEFS) \$(INCDIRS)
-+LDFLAGS += \$(LIBDIRS)
- 
- LIBS = $libs
- 
-@@ -184,19 +184,9 @@
- imapfilter.o: version.h
- 
- install: \$(BIN)
--	if test ! -d \$(BINDIR); then mkdir -p \$(BINDIR); fi
--	cp -f \$(BIN) \$(BINDIR) && chmod 0755 \$(BINDIR)/\$(BIN)
--	if test ! -d \$(SHAREDIR); then mkdir -p \$(SHAREDIR); fi
--	cp -f \$(INTERFACE_LUA) \$(SHAREDIR) && \\
--		chmod 0644 \$(SHAREDIR)/\$(INTERFACE_LUA)
--	cp -f \$(AUXILIARY_LUA) \$(SHAREDIR) && \\
--		chmod 0644 \$(SHAREDIR)/\$(AUXILIARY_LUA)
--	if test ! -d \$(MANDIR)/man1; then mkdir -p \$(MANDIR)/man1; fi
--	cp -f \$(MAN_BIN) \$(MANDIR)/man1 && \\
--		chmod 0644 \$(MANDIR)/man1/\$(MAN_BIN)
--	if test ! -d \$(MANDIR)/man5; then mkdir -p \$(MANDIR)/man5; fi
--	cp -f \$(MAN_CONFIG) \$(MANDIR)/man5 && \\
--		chmod 0644 \$(MANDIR)/man5/\$(MAN_CONFIG)
-+	\$(INST_BIN) \$(BIN) \$(BINDIR)
-+	\$(INST_DOC) \$(MAN_BIN) \$(MANDIR)/man1
-+	\$(INST_DOC) \$(MAN_CONFIG) \$(MANDIR)/man5
- 
- deinstall:
- 	rm -f \$(BINDIR)/\$(BIN) \$(SHAREDIR)/\$(INTERFACE_LUA) \\