From owner-svn-ports-head@FreeBSD.ORG  Fri Mar 14 10:16:42 2014
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 ESMTPS id D1A58CC3;
 Fri, 14 Mar 2014 10:16:42 +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 BF163265;
 Fri, 14 Mar 2014 10:16:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2EAGgmK020385;
 Fri, 14 Mar 2014 10:16:42 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2EAGgx1020384;
 Fri, 14 Mar 2014 10:16:42 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201403141016.s2EAGgx1020384@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Fri, 14 Mar 2014 10:16:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348201 - head/devel/ftjam
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, 14 Mar 2014 10:16:42 -0000

Author: gahr
Date: Fri Mar 14 10:16:42 2014
New Revision: 348201
URL: http://svnweb.freebsd.org/changeset/ports/348201
QAT: https://qat.redports.org/buildarchive/r348201/

Log:
  - Take maintainership
  - Modernize Makefile
  - Remove conflict with devel/jam

Modified:
  head/devel/ftjam/Makefile

Modified: head/devel/ftjam/Makefile
==============================================================================
--- head/devel/ftjam/Makefile	Fri Mar 14 10:15:52 2014	(r348200)
+++ head/devel/ftjam/Makefile	Fri Mar 14 10:16:42 2014	(r348201)
@@ -6,16 +6,14 @@ PORTVERSION=	2.5.2
 CATEGORIES=	devel
 MASTER_SITES=	SF/freetype/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Small build tool that can be used as a replacement for make(1)
 
-CONFLICTS=	jam-[0-9]*
+OPTIONS_DEFINE=	DOCS
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 
-PORTDOCS=	\
-		Jam.html \
+PORTDOCS=	Jam.html \
 		Jambase.html \
 		Jamfile.html \
 		Porting \
@@ -26,18 +24,14 @@ PORTDOCS=	\
 PLIST_FILES=	bin/${PORTNAME}
 
 do-configure:
-	@${REINPLACE_CMD} -E \
-		-e 's|^(CC[[:space:]]*=).*$$|\1${CC}|' \
-		-e 's|^(CFLAGS[[:space:]]*=).*$$|\1${CFLAGS}|' \
-		${BUILD_WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e '/^CC/s|=|?=|; /^CFLAGS/s|=|?=|' \
+	    ${BUILD_WRKSRC}/${MAKEFILE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-. for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
+. for f in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 . endfor
-# INSTALL_WRKSRC changes depending on ARCH
-	@${INSTALL_PROGRAM} `${FIND} ${WRKSRC} -name "bin.unix*"`/jam \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin.unix/jam ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>