From owner-svn-ports-head@FreeBSD.ORG  Fri Apr  4 12:58:02 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 77FB0210;
 Fri,  4 Apr 2014 12:58:02 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 63BFAAE8;
 Fri,  4 Apr 2014 12:58:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34Cw20L087938;
 Fri, 4 Apr 2014 12:58:02 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34Cw2og087937;
 Fri, 4 Apr 2014 12:58:02 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201404041258.s34Cw2og087937@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 4 Apr 2014 12:58:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350106 - head/archivers/snappy-java
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Apr 2014 12:58:02 -0000

Author: bapt
Date: Fri Apr  4 12:58:01 2014
New Revision: 350106
URL: http://svnweb.freebsd.org/changeset/ports/350106
QAT: https://qat.redports.org/buildarchive/r350106/

Log:
  Simplification and cleanup of the port

Modified:
  head/archivers/snappy-java/Makefile

Modified: head/archivers/snappy-java/Makefile
==============================================================================
--- head/archivers/snappy-java/Makefile	Fri Apr  4 12:54:24 2014	(r350105)
+++ head/archivers/snappy-java/Makefile	Fri Apr  4 12:58:01 2014	(r350106)
@@ -40,17 +40,14 @@ MAKE_ARGS+=	Default_CXX=${CXX}
 
 PLIST_FILES=	%%JAVAJARDIR%%/snappy-java.jar lib/libsnappyjava.so
 
-post-patch-script:
-	@${REINPLACE_CMD} -e 's|curl.*||g' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|MVN:=mvn|MVN:=mvn -Dmaven.repo.local=${WRKDIR}/repository --offline|g' \
+post-patch:
+	@${REINPLACE_CMD} -e 's|curl.*||g ; \
+		s|MVN:=mvn|MVN:=mvn -Dmaven.repo.local=${WRKDIR}/repository --offline|g' \
 		${WRKSRC}/Makefile
 
-pre-build:
+do-build:
 	@${MKDIR} ${WRKSRC}/target
 	@${CP} ${DISTDIR}/snappy-${PORTVERSION:R}.tar.gz ${WRKSRC}/target/
-
-do-build: pre-build
 	cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} \
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} && ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/repository --offline test