From owner-svn-ports-all@FreeBSD.ORG  Fri Jan 10 08:50:19 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 99588B69;
 Fri, 10 Jan 2014 08:50:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 869EE157C;
 Fri, 10 Jan 2014 08:50:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0A8oJ1w005218;
 Fri, 10 Jan 2014 08:50:19 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0A8oJIB005217;
 Fri, 10 Jan 2014 08:50:19 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401100850.s0A8oJIB005217@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 10 Jan 2014 08:50:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339332 - head/mail/imapfilter
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jan 2014 08:50:19 -0000

Author: bapt
Date: Fri Jan 10 08:50:19 2014
New Revision: 339332
URL: http://svnweb.freebsd.org/changeset/ports/339332

Log:
  Port to lua 5.2, avoid patching when MAKE_ARGS can do the same jobs

Modified:
  head/mail/imapfilter/Makefile

Modified: head/mail/imapfilter/Makefile
==============================================================================
--- head/mail/imapfilter/Makefile	Fri Jan 10 08:47:02 2014	(r339331)
+++ head/mail/imapfilter/Makefile	Fri Jan 10 08:50:19 2014	(r339332)
@@ -13,9 +13,9 @@ COMMENT=	IMAP mail filtering utility
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USE_LUA=	5.1
+USES=		lua
 USE_OPENSSL=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LUA_INCDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
@@ -40,18 +40,13 @@ PLIST_FILES=	bin/imapfilter \
 		%%EXAMPLESDIR%%/config.lua \
 		%%EXAMPLESDIR%%/extend.lua
 PLIST_DIRS=	%%DATADIR%% %%EXAMPLESDIR%%
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	${REINPLACE_CMD} -Ee ' \
-	    s|^(PREFIX =).*|\1${PREFIX}|; \
-	    s|^(MYCFLAGS =).*|\1${CPPFLAGS}|; \
-	    s|^(MYLDFLAGS =).*|\1${LDFLAGS}|; \
-	    s|^(BINDIR =).*|\1${PREFIX}/bin|; \
-	    s|^(SHAREDIR =).*|\1${DATADIR}|; \
-	    s|^(MANDIR =).*|\1${MANPREFIX}/man|' \
-	    ${WRKSRC}/src/Makefile
+MAKE_ARGS=	PREFIX=${PREFIX} \
+		MYCFLAGS="${CPPFLAGS}" \
+		MYLDFLAGS="${LDFLAGS}" \
+		BINDIR=${PREFIX}/bin \
+		SHAREDIR=${DATADIR} \
+		MANDIR=${MANPREFIX}/man \
+		LIBLUA=-llua-${LUA_VER}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/imapfilter
@@ -59,9 +54,7 @@ post-install:
 	cd ${WRKSRC}/samples && \
 		${INSTALL_DATA} config.lua extend.lua \
 			${STAGEDIR}/${EXAMPLESDIR}
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}/${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>