Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Mar 2014 10:16:42 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r348201 - head/devel/ftjam
Message-ID:  <201403141016.s2EAGgx1020384@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403141016.s2EAGgx1020384>