From owner-svn-ports-head@FreeBSD.ORG  Sun Jul 28 10:27:28 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4DBBDC20;
 Sun, 28 Jul 2013 10:27:28 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
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 20E4F286F;
 Sun, 28 Jul 2013 10:27:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6SARRIP005371;
 Sun, 28 Jul 2013 10:27:28 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6SARRVB005370;
 Sun, 28 Jul 2013 10:27:27 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201307281027.r6SARRVB005370@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sun, 28 Jul 2013 10:27:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323818 - head/textproc/ocaml-text
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.14
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: Sun, 28 Jul 2013 10:27:28 -0000

Author: danfe
Date: Sun Jul 28 10:27:27 2013
New Revision: 323818
URL: http://svnweb.freebsd.org/changeset/ports/323818

Log:
  Unbreak parallel builds and cleanup Makefile while I am at it.

Modified:
  head/textproc/ocaml-text/Makefile

Modified: head/textproc/ocaml-text/Makefile
==============================================================================
--- head/textproc/ocaml-text/Makefile	Sun Jul 28 09:46:15 2013	(r323817)
+++ head/textproc/ocaml-text/Makefile	Sun Jul 28 10:27:27 2013	(r323818)
@@ -11,35 +11,27 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${
 MAINTAINER=	jaapb@kerguelen.org
 COMMENT=	OCaml library for dealing with text
 
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS=		--docdir ${DOCSDIR} --prefix ${PREFIX} --mandir ${PREFIX}/man
-USE_GMAKE=		yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--docdir ${DOCSDIR} --prefix ${PREFIX} --mandir ${PREFIX}/man
+USES=		gmake
 
 USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAMLFIND_PLIST=	yes
 
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
 OPTIONS_DEFINE=	PCRE
 OPTIONS_DEFAULT=	PCRE
 
-SA_DIR=			${LOCALBASE}/${OCAML_SITELIBDIR}
-
-.include <bsd.port.pre.mk>
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPCRE}
-CONFIGURE_ARGS+=	--enable-pcre
-BUILD_DEPENDS+=		${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
-RUN_DEPENDS+=		${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
-.else
-CONFIGURE_ARGS+=	--disable-pcre
-.endif
+PCRE_CONFIGURE_ENABLE=	pcre
+PCRE_BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
+PCRE_RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
 
 post-extract:
-# For nonstandard prefixes
+# For non-standard prefixes
 .if !exists(${OCAMLFIND_DESTDIR})
 	${MKDIR} ${OCAMLFIND_DESTDIR}
 .endif
@@ -47,4 +39,7 @@ post-extract:
 	${TOUCH} ${OCAMLFIND_LDCONF}
 .endif
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's,"make","${GMAKE}",' ${WRKSRC}/setup.ml
+
+.include <bsd.port.mk>