Index: head/news/husky/Makefile.local
===================================================================
--- head/news/husky/Makefile.local	(revision 397522)
+++ head/news/husky/Makefile.local	(nonexistent)
@@ -1,32 +0,0 @@
-# vim:filetype=make
-# $FreeBSD$
-
-PORTVERSION=	1.9.20140519
-PORTREVISION=	2
-CATEGORIES=	news mail
-
-.if ${PORTNAME} == "husky-smapi"
-PORTEPOCH=	1
-.endif
-
-MAINTAINER=	osharoiko@gmail.com
-
-MASTER_SITES=	SF/husky/husky/1.9-current/2014.05.19
-DISTNAME=	husky-all-1.9-source-20140519
-
-HUSKY_ROOTDIR=	${WRKDIR}/husky
-PATCH_WRKSRC=	${HUSKY_ROOTDIR}
-WRKSRC=		${HUSKY_ROOTDIR}/${COMPONENT_SUBDIR}
-PKGDIR=		${.CURDIR}
-
-CONFLICTS=	${PORTNAME}-[0-9]*
-
-USERS=		fido
-GROUPS=		fido
-
-USES+=		alias gmake tar:tgz
-
-pre-build:
-	${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR}
-	@${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \
-		${HUSKY_ROOTDIR}/huskymak.cfg

Property changes on: head/news/husky/Makefile.local
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/news/husky/Makefile
===================================================================
--- head/news/husky/Makefile	(revision 397522)
+++ head/news/husky/Makefile	(revision 397523)
@@ -1,15 +1,38 @@
 # $FreeBSD$
 
-PORTNAME=	husky
+PORTNAME?=	husky
+PORTVERSION=	1.9.20140519
+PORTREVISION?=	2
+PORTEPOCH?=	0
+CATEGORIES?=	news mail
+MASTER_SITES=	SF/husky/husky/1.9-current/2014.05.19
 
-COMMENT=	Husky full featured highly portable FTN Tosser
+MAINTAINER?=	osharoiko@gmail.com
+COMMENT?=	Husky full featured highly portable FTN Tosser
 
+DISTNAME=	husky-all-1.9-source-20140519
+
+.if ${PORTNAME} == "husky"
 RUN_DEPENDS=	hpt:${PORTSDIR}/news/husky-hpt \
 		htick:${PORTSDIR}/news/husky-htick
 
-MASTERDIR=	${.CURDIR}
-
 NO_BUILD=	yes
 NO_INSTALL=	yes
+.endif
+
+USES+=		alias gmake tar:tgz
+
+HUSKY_ROOTDIR=	${WRKDIR}/husky
+PATCH_WRKSRC=	${HUSKY_ROOTDIR}
+WRKSRC=		${HUSKY_ROOTDIR}/${COMPONENT_SUBDIR}
+PKGDIR=		${.CURDIR}
+
+USERS=		fido
+GROUPS=		fido
+
+pre-build:
+	${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR}
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \
+		${HUSKY_ROOTDIR}/huskymak.cfg
 
 .include <bsd.port.mk>
Index: head/news/husky-areafix/Makefile
===================================================================
--- head/news/husky-areafix/Makefile	(revision 397522)
+++ head/news/husky-areafix/Makefile	(revision 397523)
@@ -1,16 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	husky-areafix
-CATEGORIES=	news mail
 
-MAINTAINER=	osharoiko@gmail.com
 COMMENT=	Husky FTN areafix library
 
 LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf
 
 USE_LDCONFIG=	yes
 
 MASTERDIR=	${.CURDIR}/../husky
 COMPONENT_SUBDIR=	areafix
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: head/news/husky-fidoconf/Makefile
===================================================================
--- head/news/husky-fidoconf/Makefile	(revision 397522)
+++ head/news/husky-fidoconf/Makefile	(revision 397523)
@@ -1,42 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	husky-fidoconf
-CATEGORIES=	news mail
 
-MAINTAINER=	osharoiko@gmail.com
 COMMENT=	Husky FTN configuration library
 
 LIB_DEPENDS=	libsmapi.so:${PORTSDIR}/news/husky-smapi
 
 USES+=		perl5 shebangfix
 SHEBANG_FILES=	util/fconf2areasbbs.pl util/fconf2na.pl util/sq2fc.pl
 USE_LDCONFIG=   yes
 INSTALL_TARGET=	install install-man
 
 MASTERDIR=      ${.CURDIR}/../husky
 COMPONENT_SUBDIR=       fidoconf
 
 # Settings below are required to handle texi output (html, INFO page)
 USES+=		makeinfo
 PORTDOCS=	fidoconfig.html
 DOCSDIR=	${PREFIX}/share/doc/husky
 INFO=		fidoconfig
 
 post-patch:
 	${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
 		${WRKSRC}/man/linkedto.1
 
 post-install:
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2aquaed.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2areasbbs.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2binkd.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2dir.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2fidogate.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2golded.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2msged.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2na.pl.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2squish.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2tornado.1
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fecfg2fconf.1
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: head/news/husky-hpt/Makefile
===================================================================
--- head/news/husky-hpt/Makefile	(revision 397522)
+++ head/news/husky-hpt/Makefile	(revision 397523)
@@ -1,28 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	husky-hpt
-CATEGORIES=	news mail
 
-MAINTAINER=	osharoiko@gmail.com
 COMMENT=	Husky FTN tosser
 
 LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \
 		libareafix.so:${PORTSDIR}/news/husky-areafix
 
 USES+=		makeinfo
 ALL_TARGET=	all doc
 INSTALL_TARGET=	install install-doc
 INFO=		hpt
 
 MASTERDIR=	${.CURDIR}/../husky
 COMPONENT_SUBDIR=       hpt
 
 post-patch:
 	${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
 		${WRKSRC}/man/hptlink.1
 	${REINPLACE_CMD} -e 's^/some/path/config^${PREFIX}/etc/fido/config^' \
 		${WRKSRC}/man/hpttree.1
 	${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \
 		${WRKSRC}/man/txt2pkt.1
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: head/news/husky-htick/Makefile
===================================================================
--- head/news/husky-htick/Makefile	(revision 397522)
+++ head/news/husky-htick/Makefile	(revision 397523)
@@ -1,32 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	husky-htick
-CATEGORIES=	news mail
 
-MAINTAINER=     osharoiko@gmail.com
 COMMENT=	Husky FTN file ticker
 
 LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \
 		libareafix.so:${PORTSDIR}/news/husky-areafix
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install
 USE_LDCONFIG=   yes
 PLIST_FILES=	bin/htick man/man1/htick.1.gz
 
 MASTERDIR=      ${.CURDIR}/../husky
 COMPONENT_SUBDIR=       htick
 
 # Settings below are required to handle texi output (html, INFO page)
 USES+=			makeinfo
 ALL_TARGET+=		doc
 INSTALL_TARGET+=	install-doc
 PORTDOCS=		htick.html
 DOCSDIR=		${PREFIX}/share/doc/husky
 INFO=			htick
 
 post-patch:
 	${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \
 		${WRKSRC}/man/htick.1
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: head/news/husky-huskylib/Makefile
===================================================================
--- head/news/husky-huskylib/Makefile	(revision 397522)
+++ head/news/husky-huskylib/Makefile	(revision 397523)
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	husky-huskylib
-CATEGORIES=	news mail
 
-MAINTAINER=	osharoiko@gmail.com
 COMMENT=	Husky generic FTN library
 
 INSTALL_TARGET= install install-man
 USE_LDCONFIG=	yes
 
 MASTERDIR=	${.CURDIR}/../husky
 COMPONENT_SUBDIR=	huskylib
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: head/news/husky-smapi/Makefile
===================================================================
--- head/news/husky-smapi/Makefile	(revision 397522)
+++ head/news/husky-smapi/Makefile	(revision 397523)
@@ -1,16 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	husky-smapi
-CATEGORIES=	news mail
+PORTEPOCH=	1
 
-MAINTAINER=	osharoiko@gmail.com
 COMMENT=	Husky FTN MSGAPI library
 
 LIB_DEPENDS=    libhusky.so:${PORTSDIR}/news/husky-huskylib
 
 USE_LDCONFIG=	yes
 
 MASTERDIR=	${.CURDIR}/../husky
 COMPONENT_SUBDIR=	smapi
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"