Remove '-devel' prefix from husky* ports

Today the older unstaged husky-* ports were removed as the first part
of a transition move the development versions into their place.  This
commit completes the relocation of husky-*-devel ports.

MOVED

@@ -6429,13 +6429,9 @@ x11-clocks/alarm-clock||2014-08-18|Removed: disappeared upstream
 mail/rss2email|mail/rss2email2|2014-08-19|Renamed to avoid ambiguity with mail/rss2email3
 news/husky-base||2014-08-19|Obsolete due to husky-*-devel => husky-* migration
 news/husky-bsopack||2014-08-19|Obsolete due to husky-*-devel => husky-* migration
-news/husky-fidoconf||2014-08-19|Temporary, husky-fidoconf-devel will move here
-news/husky-hpt||2014-08-19|Temporary, husky-hpt-devel will move here
 news/husky-hptkill||2014-08-19|Obsolete due to husky-*-devel => husky-* migration
 news/husky-hptsqfix||2014-08-19|Obsolete due to husky-*-devel => husky-* migration
 news/husky-hpucode||2014-08-19|Obsolete due to husky-*-devel => husky-* migration
-news/husky-htick||2014-08-19|Temporary, husky-htick-devel will move here
 news/husky-msged||2014-08-19|Obsolete due to husky-*-devel => husky-* migration
 news/husky-nltools||2014-08-19|Obsolete due to husky-*-devel => husky-* migration
-news/husky-smapi||2014-08-19|Temporary, husky-smapi-devel will move here
 news/husky-sqpack||2014-08-19|Obsolete due to husky-*-devel => husky-* migration

news/Makefile

@@ -17,13 +17,13 @@
     SUBDIR += golded+
     SUBDIR += gup
     SUBDIR += hellanzb
-    SUBDIR += husky-areafix-devel
-    SUBDIR += husky-devel
-    SUBDIR += husky-fidoconf-devel
-    SUBDIR += husky-hpt-devel
-    SUBDIR += husky-htick-devel
-    SUBDIR += husky-huskylib-devel
-    SUBDIR += husky-smapi-devel
+    SUBDIR += husky-areafix
+    SUBDIR += husky
+    SUBDIR += husky-fidoconf
+    SUBDIR += husky-hpt
+    SUBDIR += husky-htick
+    SUBDIR += husky-huskylib
+    SUBDIR += husky-smapi
     SUBDIR += ifmail
     SUBDIR += inn
     SUBDIR += knews

news/husky-areafix-devel/Makefile

@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	husky-areafix
-CATEGORIES=	news mail
-
-MAINTAINER=	osharoiko@gmail.com
-COMMENT=	Husky FTN areafix library (development version)
-
-LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf-devel
-
-CONFLICTS=	husky-smapi-[0-9]*
-
-USE_LDCONFIG=	yes
-
-MASTERDIR=	${.CURDIR}/../husky-devel
-COMPONENT_SUBDIR=	areafix
-
-.include <bsd.port.mk>

news/husky-areafix/Makefile

@@ -0,0 +1,16 @@
+# $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>

news/husky-devel/Makefile

@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	husky
-
-COMMENT=	Husky full featured highly portable FTN Tosser (development version)
-
-RUN_DEPENDS=	hpt:${PORTSDIR}/news/husky-hpt-devel \
-		htick:${PORTSDIR}/news/husky-htick-devel
-
-MASTERDIR=	${.CURDIR}
-
-NO_BUILD=	yes
-NO_INSTALL=	yes
-
-.include <bsd.port.mk>

news/husky-fidoconf/Makefile

@@ -4,18 +4,16 @@ PORTNAME=	husky-fidoconf
 CATEGORIES=	news mail
 
 MAINTAINER=	osharoiko@gmail.com
-COMMENT=	Husky FTN configuration library (development version)
+COMMENT=	Husky FTN configuration library
 
-LIB_DEPENDS=	libsmapi.so:${PORTSDIR}/news/husky-smapi-devel
-
-CONFLICTS=	husky-fidoconf-[0-9]*
+LIB_DEPENDS=	libsmapi.so:${PORTSDIR}/news/husky-smapi
 
 USES+=		perl5 shebangfix makeinfo
 SHEBANG_FILES=	util/fconf2areasbbs.pl util/fconf2na.pl util/sq2fc.pl
 USE_LDCONFIG=   yes
 INSTALL_TARGET=	install install-man
 
-MASTERDIR=      ${.CURDIR}/../husky-devel
+MASTERDIR=      ${.CURDIR}/../husky
 COMPONENT_SUBDIR=       fidoconf
 
 post-patch:

news/husky-hpt/Makefile

@@ -4,18 +4,16 @@ PORTNAME=	husky-hpt
 CATEGORIES=	news mail
 
 MAINTAINER=	osharoiko@gmail.com
-COMMENT=	Husky FTN tosser (development version)
+COMMENT=	Husky FTN tosser
 
-LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf-devel \
-		libareafix.so:${PORTSDIR}/news/husky-areafix-devel
-
-CONFLICTS=	husky-hpt-[0-9]*
+LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \
+		libareafix.so:${PORTSDIR}/news/husky-areafix
 
 ALL_TARGET=	all doc
 INSTALL_TARGET=	install install-doc
 INFO=		hpt
 
-MASTERDIR=	${.CURDIR}/../husky-devel
+MASTERDIR=	${.CURDIR}/../husky
 COMPONENT_SUBDIR=       hpt
 
 post-patch:

news/husky-htick/Makefile

@@ -4,19 +4,17 @@ PORTNAME=	husky-htick
 CATEGORIES=	news mail
 
 MAINTAINER=     osharoiko@gmail.com
-COMMENT=	Husky FTN file ticker (development version)
+COMMENT=	Husky FTN file ticker
 
-LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf-devel \
-		libareafix.so:${PORTSDIR}/news/husky-areafix-devel
-
-CONFLICTS=	husky-htick-[0-9]*
+LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf \
+		libareafix.so:${PORTSDIR}/news/husky-areafix
 
 ALL_TARGET=	all doc
 INSTALL_TARGET=	install install-doc
 INFO=		htick
 USE_LDCONFIG=   yes
 
-MASTERDIR=      ${.CURDIR}/../husky-devel
+MASTERDIR=      ${.CURDIR}/../husky
 COMPONENT_SUBDIR=       htick
 
 post-patch:

news/husky-huskylib/Makefile

@@ -4,12 +4,12 @@ PORTNAME=	husky-huskylib
 CATEGORIES=	news mail
 
 MAINTAINER=	osharoiko@gmail.com
-COMMENT=	Husky generic FTN library (development version)
+COMMENT=	Husky generic FTN library
 
 INSTALL_TARGET= install install-man
 USE_LDCONFIG=	yes
 
-MASTERDIR=	${.CURDIR}/../husky-devel
+MASTERDIR=	${.CURDIR}/../husky
 COMPONENT_SUBDIR=	huskylib
 
 .include <bsd.port.mk>

news/husky-smapi-devel/Makefile

@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	husky-smapi
-CATEGORIES=	news mail
-
-MAINTAINER=	osharoiko@gmail.com
-COMMENT=	Husky FTN MSGAPI library (development version)
-
-LIB_DEPENDS=    libhusky.so:${PORTSDIR}/news/husky-huskylib-devel
-
-CONFLICTS=	husky-smapi-[0-9]*
-
-USE_LDCONFIG=	yes
-
-MASTERDIR=	${.CURDIR}/../husky-devel
-COMPONENT_SUBDIR=	smapi
-
-.include <bsd.port.mk>

news/husky-smapi/Makefile

@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME=	husky-smapi
+CATEGORIES=	news mail
+
+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>

news/husky/Makefile

@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	husky
+
+COMMENT=	Husky full featured highly portable FTN Tosser
+
+RUN_DEPENDS=	hpt:${PORTSDIR}/news/husky-hpt \
+		htick:${PORTSDIR}/news/husky-htick
+
+MASTERDIR=	${.CURDIR}
+
+NO_BUILD=	yes
+NO_INSTALL=	yes
+
+.include <bsd.port.mk>