Date: Fri, 12 Jul 2013 12:28:43 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322828 - in head/news: husky-base husky-base-devel husky-bsopack husky-fidoconf husky-fidoconf-devel husky-hpt husky-hpt-devel husky-hptkill husky-hptsqfix husky-hpucode husky-htick hu... Message-ID: <201307121228.r6CCShh2092848@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Jul 12 12:28:43 2013 New Revision: 322828 URL: http://svnweb.freebsd.org/changeset/ports/322828 Log: Do not define gmake usage after pre.mk While here: - trim headers - convert to uses=gmake - remove now useless pre.mk/post.mk dancing Modified: head/news/husky-base-devel/Makefile head/news/husky-base-devel/Makefile.inc head/news/husky-base/Makefile head/news/husky-base/Makefile.inc head/news/husky-bsopack/Makefile head/news/husky-fidoconf-devel/Makefile head/news/husky-fidoconf/Makefile head/news/husky-hpt-devel/Makefile head/news/husky-hpt/Makefile head/news/husky-hptkill/Makefile head/news/husky-hptsqfix/Makefile head/news/husky-hpucode/Makefile head/news/husky-htick-devel/Makefile head/news/husky-htick/Makefile head/news/husky-msged/Makefile head/news/husky-nltools/Makefile head/news/husky-smapi-devel/Makefile head/news/husky-smapi/Makefile head/news/husky-sqpack/Makefile Modified: head/news/husky-base-devel/Makefile ============================================================================== --- head/news/husky-base-devel/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-base-devel/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-base-devel -# Date created: 2005-10-26 -# Whom: Oleg Sharoiko <os@rsu.ru> -# +# Created by: Oleg Sharoiko <os@rsu.ru> # $FreeBSD$ -# PORTNAME= base PORTVERSION= 1.4 @@ -30,6 +26,5 @@ do-install: @${CHOWN} fido:fido ${PREFIX}/etc/fido @${INSTALL_DATA} ${WRKSRC}/huskymak.cfg ${PREFIX}/etc/fido -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../news/husky-base-devel/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base-devel/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-base-devel/Makefile.inc ============================================================================== --- head/news/husky-base-devel/Makefile.inc Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-base-devel/Makefile.inc Fri Jul 12 12:28:43 2013 (r322828) @@ -12,7 +12,7 @@ ONLY_FOR_ARCHS= i386 .if ${PORTNAME} != "base" BUILD_DEPENDS= ${LOCALBASE}/etc/fido/huskymak.cfg:${PORTSDIR}/news/husky-base-devel -USE_GMAKE= yes +USES+= gmake MAKE_ARGS+= PREFIX="${PREFIX}" \ CC="${CC}" CXX="${CXX}" GPP="${CXX}" MKSHARED="${CC}" \ Modified: head/news/husky-base/Makefile ============================================================================== --- head/news/husky-base/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-base/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-base -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= base PORTVERSION= 1.0 @@ -28,6 +24,5 @@ do-install: @${CHOWN} fido:fido ${PREFIX}/etc/fido @${INSTALL_DATA} ${WRKSRC}/huskymak.cfg ${PREFIX}/etc/fido -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-base/Makefile.inc ============================================================================== --- head/news/husky-base/Makefile.inc Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-base/Makefile.inc Fri Jul 12 12:28:43 2013 (r322828) @@ -10,7 +10,7 @@ WRKSRC?= ${WRKDIR}/${PORTNAME} .if ${PORTNAME} != "base" BUILD_DEPENDS= ${LOCALBASE}/etc/fido/huskymak.cfg:${PORTSDIR}/news/husky-base -USE_GMAKE= yes +USES+= gmake MAKE_ARGS+= PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \ CC="${CC}" CXX="${CXX}" GPP="${CXX}" MKSHARED="${CC}" \ Modified: head/news/husky-bsopack/Makefile ============================================================================== --- head/news/husky-bsopack/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-bsopack/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-bsopack -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= bsopack PORTVERSION= 0.2.4 @@ -21,6 +17,5 @@ MAN1= bsopack.1 MANCOMPRESSED= yes INFO= bsopack -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-fidoconf-devel/Makefile ============================================================================== --- head/news/husky-fidoconf-devel/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-fidoconf-devel/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-fidoconf-devel -# Date created: 2005-10-26 -# Whom: Oleg Sharoiko <os@rsu.ru> -# +# Created by: Oleg Sharoiko <os@rsu.ru> # $FreeBSD$ -# PORTNAME= fidoconf DISTVERSION= 1.4-rc5 @@ -42,6 +38,5 @@ post-patch: ${WRKSRC}/man/fconf2.1 \ ${WRKSRC}/man/tparser.1 -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../news/husky-base-devel/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base-devel/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-fidoconf/Makefile ============================================================================== --- head/news/husky-fidoconf/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-fidoconf/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-fidoconf -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= fidoconf PORTVERSION= 0.14.4 @@ -40,6 +36,5 @@ post-patch: ${WRKSRC}/man/fconf2.1 \ ${WRKSRC}/man/tparser.1 -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-hpt-devel/Makefile ============================================================================== --- head/news/husky-hpt-devel/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-hpt-devel/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-hpt-devel -# Date created: 2005-10-26 -# Whom: Oleg Sharoiko <os@rsu.ru> -# +# Created by: Oleg Sharoiko <os@rsu.ru> # $FreeBSD$ -# PORTNAME= hpt DISTVERSION= 1.4-rc5 @@ -49,6 +45,5 @@ post-install: @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install .endif -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../news/husky-base-devel/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base-devel/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-hpt/Makefile ============================================================================== --- head/news/husky-hpt/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-hpt/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-hpt -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= hpt PORTVERSION= 1.2.4 @@ -44,6 +40,5 @@ post-build: post-install: @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-hptkill/Makefile ============================================================================== --- head/news/husky-hptkill/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-hptkill/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-hptkill -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= hptkill PORTVERSION= 1.10.4 @@ -21,6 +17,5 @@ MAN1= hptkill.1 MANCOMPRESSED= yes PLIST_FILES= bin/hptkill -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-hptsqfix/Makefile ============================================================================== --- head/news/husky-hptsqfix/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-hptsqfix/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-hptsqfix -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= hptsqfix PORTVERSION= 1.2.4 @@ -21,6 +17,5 @@ MAN1= hptsqfix.1 MANCOMPRESSED= yes PLIST_FILES= bin/hptsqfix -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-hpucode/Makefile ============================================================================== --- head/news/husky-hpucode/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-hpucode/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-hpucode -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= hpucode PORTVERSION= 1.2.4 @@ -21,6 +17,5 @@ MAN1= hpucode.1 MANCOMPRESSED= yes INFO= hpucode -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-htick-devel/Makefile ============================================================================== --- head/news/husky-htick-devel/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-htick-devel/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-htick-devel -# Date created: 2008-10-25 -# Whom: Andrew Clarke <mail@ozzmosis.com> -# +# Created by: Andrew Clarke <mail@ozzmosis.com> # $FreeBSD$ -# PORTNAME= htick DISTVERSION= 1.4-rc5 @@ -35,6 +31,5 @@ post-build: post-install: @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base-devel/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base-devel/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-htick/Makefile ============================================================================== --- head/news/husky-htick/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-htick/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-htick -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= htick PORTVERSION= 1.0.4 @@ -32,6 +28,5 @@ post-build: post-install: @cd ${WRKSRC}/doc && ${GMAKE} ${MAKE_ARGS} install -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-msged/Makefile ============================================================================== --- head/news/husky-msged/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-msged/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-msged -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= msged PORTVERSION= 6.2RC1 @@ -25,6 +21,5 @@ INFO= msged post-patch: @${REINPLACE_CMD} -e 's,html info,info,' -e 's,install-html install-info,install-info,' ${WRKSRC}/doc/manual/makefile.husky -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-nltools/Makefile ============================================================================== --- head/news/husky-nltools/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-nltools/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-nltools -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= nltools PORTVERSION= 1.2.4 @@ -17,6 +13,5 @@ COMMENT= Nodelist tools LIB_DEPENDS= fidoconfig.0:${PORTSDIR}/news/husky-fidoconf -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-smapi-devel/Makefile ============================================================================== --- head/news/husky-smapi-devel/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-smapi-devel/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-smapi-devel -# Date created: 2005-10-26 -# Whom: Oleg Sharoiko <os@rsu.ru> -# +# Created by: Oleg Sharoiko <os@rsu.ru> # $FreeBSD$ -# PORTNAME= smapi DISTVERSION= 2.4-rc5 @@ -17,6 +13,5 @@ CONFLICTS= husky-smapi-[0-9]* USE_LDCONFIG= yes -.include <bsd.port.pre.mk> -.include "${.CURDIR}/../../news/husky-base-devel/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base-devel/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-smapi/Makefile ============================================================================== --- head/news/husky-smapi/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-smapi/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-smapi -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= smapi PORTVERSION= 2.2.4 @@ -20,6 +16,5 @@ CONFLICTS= husky-smapi-devel-[0-9]* MAKE_ARGS= ADDCDEFS=-fPIC USE_LDCONFIG= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk> Modified: head/news/husky-sqpack/Makefile ============================================================================== --- head/news/husky-sqpack/Makefile Fri Jul 12 11:27:12 2013 (r322827) +++ head/news/husky-sqpack/Makefile Fri Jul 12 12:28:43 2013 (r322828) @@ -1,9 +1,5 @@ -# New ports collection makefile for: husky-sqpack -# Date created: 6 January 2003 -# Whom: Max Khon -# +# Created by: Max Khon # $FreeBSD$ -# PORTNAME= sqpack PORTVERSION= 1.2.4 @@ -25,6 +21,5 @@ post-patch: @${REINPLACE_CMD} -e 's^/etc/fido/config^${PREFIX}/etc/fido/config^' \ ${WRKSRC}/sqpack.1 -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/news/husky-base/Makefile.inc" -.include <bsd.port.post.mk> +.include "${.CURDIR}/../husky-base/Makefile.inc" +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307121228.r6CCShh2092848>