19 files changed, 53 insertions, 138 deletions

diff --git a/news/husky-base-devel/Makefile b/news/husky-base-devel/Makefile
index 70cb3abacf19..f55cc7081bbc 100644
--- a/news/husky-base-devel/Makefile
+++ b/news/husky-base-devel/Makefile
@@ -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>
diff --git a/news/husky-base-devel/Makefile.inc b/news/husky-base-devel/Makefile.inc
index a22052479400..74a4d52b14a1 100644
--- a/news/husky-base-devel/Makefile.inc
+++ b/news/husky-base-devel/Makefile.inc
@@ -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}" \
diff --git a/news/husky-base/Makefile b/news/husky-base/Makefile
index b1d720926d71..ce8710f909b7 100644
--- a/news/husky-base/Makefile
+++ b/news/husky-base/Makefile
@@ -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>
diff --git a/news/husky-base/Makefile.inc b/news/husky-base/Makefile.inc
index 3a2ef3df2c0e..4690657a5a1c 100644
--- a/news/husky-base/Makefile.inc
+++ b/news/husky-base/Makefile.inc
@@ -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}" \
diff --git a/news/husky-bsopack/Makefile b/news/husky-bsopack/Makefile
index ab9d1f961492..0ceace03ac2d 100644
--- a/news/husky-bsopack/Makefile
+++ b/news/husky-bsopack/Makefile
@@ -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>
diff --git a/news/husky-fidoconf-devel/Makefile b/news/husky-fidoconf-devel/Makefile
index 399b61cf1b61..58d744394888 100644
--- a/news/husky-fidoconf-devel/Makefile
+++ b/news/husky-fidoconf-devel/Makefile
@@ -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>
diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile
index 4a9a46aa0a98..3cbd89a0f949 100644
--- a/news/husky-fidoconf/Makefile
+++ b/news/husky-fidoconf/Makefile
@@ -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>
diff --git a/news/husky-hpt-devel/Makefile b/news/husky-hpt-devel/Makefile
index 64a149b481d1..80ec7f0a24b2 100644
--- a/news/husky-hpt-devel/Makefile
+++ b/news/husky-hpt-devel/Makefile
@@ -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>
diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile
index 9aa9f9041676..bb65a47508a8 100644
--- a/news/husky-hpt/Makefile
+++ b/news/husky-hpt/Makefile
@@ -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>
diff --git a/news/husky-hptkill/Makefile b/news/husky-hptkill/Makefile
index c704c1621790..5a54744ba4ab 100644
--- a/news/husky-hptkill/Makefile
+++ b/news/husky-hptkill/Makefile
@@ -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>
diff --git a/news/husky-hptsqfix/Makefile b/news/husky-hptsqfix/Makefile
index 1eb7d2cf3637..77ad08780024 100644
--- a/news/husky-hptsqfix/Makefile
+++ b/news/husky-hptsqfix/Makefile
@@ -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>
diff --git a/news/husky-hpucode/Makefile b/news/husky-hpucode/Makefile
index fb9550839220..7c8b7da53bb8 100644
--- a/news/husky-hpucode/Makefile
+++ b/news/husky-hpucode/Makefile
@@ -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>
diff --git a/news/husky-htick-devel/Makefile b/news/husky-htick-devel/Makefile
index a1653c496f56..42cc96071310 100644
--- a/news/husky-htick-devel/Makefile
+++ b/news/husky-htick-devel/Makefile
@@ -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>
diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile
index 7ee67540084f..24b4eea19eab 100644
--- a/news/husky-htick/Makefile
+++ b/news/husky-htick/Makefile
@@ -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>
diff --git a/news/husky-msged/Makefile b/news/husky-msged/Makefile
index 2c4873e09b90..2047a01fb5e1 100644
--- a/news/husky-msged/Makefile
+++ b/news/husky-msged/Makefile
@@ -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>
diff --git a/news/husky-nltools/Makefile b/news/husky-nltools/Makefile
index 17fc0be54fcb..793b4c007d9c 100644
--- a/news/husky-nltools/Makefile
+++ b/news/husky-nltools/Makefile
@@ -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>
diff --git a/news/husky-smapi-devel/Makefile b/news/husky-smapi-devel/Makefile
index c0dc7d799181..05b4ec599700 100644
--- a/news/husky-smapi-devel/Makefile
+++ b/news/husky-smapi-devel/Makefile
@@ -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>
diff --git a/news/husky-smapi/Makefile b/news/husky-smapi/Makefile
index 9fdda15f738c..c275401ba810 100644
--- a/news/husky-smapi/Makefile
+++ b/news/husky-smapi/Makefile
@@ -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>
diff --git a/news/husky-sqpack/Makefile b/news/husky-sqpack/Makefile
index 47664544ea75..256cc82d1d81 100644
--- a/news/husky-sqpack/Makefile
+++ b/news/husky-sqpack/Makefile
@@ -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>