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.

41 files changed, 67 insertions, 81 deletions

diff --git a/MOVED b/MOVED
index d7f3f74d212..428f053e2ae 100644
--- a/MOVED
+++ b/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
diff --git a/news/Makefile b/news/Makefile
index 8e74c00086e..e0ce273942a 100644
--- a/news/Makefile
+++ b/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
diff --git a/news/husky-areafix-devel/Makefile b/news/husky-areafix-devel/Makefile
deleted file mode 100644
index 17c9a128d2f..00000000000
--- a/news/husky-areafix-devel/Makefile
+++ /dev/null
@@ -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>
diff --git a/news/husky-areafix/Makefile b/news/husky-areafix/Makefile
new file mode 100644
index 00000000000..94a70670916
--- /dev/null
+++ b/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>
diff --git a/news/husky-areafix-devel/pkg-descr b/news/husky-areafix/pkg-descr
index 1c3b7260e71..1c3b7260e71 100644
--- a/news/husky-areafix-devel/pkg-descr
+++ b/news/husky-areafix/pkg-descr
diff --git a/news/husky-areafix-devel/pkg-plist b/news/husky-areafix/pkg-plist
index 21ae7a36ccf..21ae7a36ccf 100644
--- a/news/husky-areafix-devel/pkg-plist
+++ b/news/husky-areafix/pkg-plist
diff --git a/news/husky-devel/Makefile b/news/husky-devel/Makefile
deleted file mode 100644
index df7591161a2..00000000000
--- a/news/husky-devel/Makefile
+++ /dev/null
@@ -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>
diff --git a/news/husky-fidoconf-devel/Makefile b/news/husky-fidoconf/Makefile
index fd19a56fbdc..a0abd5bf530 100644
--- a/news/husky-fidoconf-devel/Makefile
+++ b/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:
diff --git a/news/husky-fidoconf-devel/pkg-descr b/news/husky-fidoconf/pkg-descr
index e390170e81d..e390170e81d 100644
--- a/news/husky-fidoconf-devel/pkg-descr
+++ b/news/husky-fidoconf/pkg-descr
diff --git a/news/husky-fidoconf-devel/pkg-plist b/news/husky-fidoconf/pkg-plist
index 217226275bc..217226275bc 100644
--- a/news/husky-fidoconf-devel/pkg-plist
+++ b/news/husky-fidoconf/pkg-plist
diff --git a/news/husky-hpt-devel/Makefile b/news/husky-hpt/Makefile
index 11ec75c347f..2945ed8acab 100644
--- a/news/husky-hpt-devel/Makefile
+++ b/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:
diff --git a/news/husky-hpt-devel/pkg-descr b/news/husky-hpt/pkg-descr
index 0eec9371891..0eec9371891 100644
--- a/news/husky-hpt-devel/pkg-descr
+++ b/news/husky-hpt/pkg-descr
diff --git a/news/husky-hpt-devel/pkg-plist b/news/husky-hpt/pkg-plist
index d91c2c82356..d91c2c82356 100644
--- a/news/husky-hpt-devel/pkg-plist
+++ b/news/husky-hpt/pkg-plist
diff --git a/news/husky-htick-devel/Makefile b/news/husky-htick/Makefile
index 4a24eaab693..2b594719237 100644
--- a/news/husky-htick-devel/Makefile
+++ b/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:
diff --git a/news/husky-htick-devel/pkg-descr b/news/husky-htick/pkg-descr
index 2164dedf93e..2164dedf93e 100644
--- a/news/husky-htick-devel/pkg-descr
+++ b/news/husky-htick/pkg-descr
diff --git a/news/husky-htick-devel/pkg-plist b/news/husky-htick/pkg-plist
index 4cb3715a33d..4cb3715a33d 100644
--- a/news/husky-htick-devel/pkg-plist
+++ b/news/husky-htick/pkg-plist
diff --git a/news/husky-huskylib-devel/Makefile b/news/husky-huskylib/Makefile
index 82d5b582554..646fac70572 100644
--- a/news/husky-huskylib-devel/Makefile
+++ b/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>
diff --git a/news/husky-huskylib-devel/pkg-descr b/news/husky-huskylib/pkg-descr
index 1c3b7260e71..1c3b7260e71 100644
--- a/news/husky-huskylib-devel/pkg-descr
+++ b/news/husky-huskylib/pkg-descr
diff --git a/news/husky-huskylib-devel/pkg-plist b/news/husky-huskylib/pkg-plist
index acf82deb778..acf82deb778 100644
--- a/news/husky-huskylib-devel/pkg-plist
+++ b/news/husky-huskylib/pkg-plist
diff --git a/news/husky-smapi-devel/Makefile b/news/husky-smapi-devel/Makefile
deleted file mode 100644
index af376cd849e..00000000000
--- a/news/husky-smapi-devel/Makefile
+++ /dev/null
@@ -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>
diff --git a/news/husky-smapi/Makefile b/news/husky-smapi/Makefile
new file mode 100644
index 00000000000..1693b1a3f14
--- /dev/null
+++ b/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>
diff --git a/news/husky-smapi-devel/pkg-descr b/news/husky-smapi/pkg-descr
index 1c3b7260e71..1c3b7260e71 100644
--- a/news/husky-smapi-devel/pkg-descr
+++ b/news/husky-smapi/pkg-descr
diff --git a/news/husky-smapi-devel/pkg-plist b/news/husky-smapi/pkg-plist
index f70aec5d1dc..f70aec5d1dc 100644
--- a/news/husky-smapi-devel/pkg-plist
+++ b/news/husky-smapi/pkg-plist
diff --git a/news/husky/Makefile b/news/husky/Makefile
new file mode 100644
index 00000000000..e70cd3975d9
--- /dev/null
+++ b/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>
diff --git a/news/husky-devel/Makefile.local b/news/husky/Makefile.local
index 008211799d8..008211799d8 100644
--- a/news/husky-devel/Makefile.local
+++ b/news/husky/Makefile.local
diff --git a/news/husky-devel/distinfo b/news/husky/distinfo
index 1bcea136592..1bcea136592 100644
--- a/news/husky-devel/distinfo
+++ b/news/husky/distinfo
diff --git a/news/husky-devel/files/patch-areafix_Makefile b/news/husky/files/patch-areafix_Makefile
index 8d4131a0791..8d4131a0791 100644
--- a/news/husky-devel/files/patch-areafix_Makefile
+++ b/news/husky/files/patch-areafix_Makefile
diff --git a/news/husky-devel/files/patch-fidoconf_Makefile b/news/husky/files/patch-fidoconf_Makefile
index c580d468032..c580d468032 100644
--- a/news/husky-devel/files/patch-fidoconf_Makefile
+++ b/news/husky/files/patch-fidoconf_Makefile
diff --git a/news/husky-devel/files/patch-fidoconf_doc_Makefile b/news/husky/files/patch-fidoconf_doc_Makefile
index 34c7b8fa509..34c7b8fa509 100644
--- a/news/husky-devel/files/patch-fidoconf_doc_Makefile
+++ b/news/husky/files/patch-fidoconf_doc_Makefile
diff --git a/news/husky-devel/files/patch-fidoconf_makefile.in2 b/news/husky/files/patch-fidoconf_makefile.in2
index 716ddc89329..716ddc89329 100644
--- a/news/husky-devel/files/patch-fidoconf_makefile.in2
+++ b/news/husky/files/patch-fidoconf_makefile.in2
diff --git a/news/husky-devel/files/patch-fidoconf_makefile.inc b/news/husky/files/patch-fidoconf_makefile.inc
index 25f04729e33..25f04729e33 100644
--- a/news/husky-devel/files/patch-fidoconf_makefile.inc
+++ b/news/husky/files/patch-fidoconf_makefile.inc
diff --git a/news/husky-devel/files/patch-fidoconf_man_Makefile b/news/husky/files/patch-fidoconf_man_Makefile
index 29d07d34a48..29d07d34a48 100644
--- a/news/husky-devel/files/patch-fidoconf_man_Makefile
+++ b/news/husky/files/patch-fidoconf_man_Makefile
diff --git a/news/husky-devel/files/patch-fidoconf_man_linkedto.1 b/news/husky/files/patch-fidoconf_man_linkedto.1
index deabaa00d38..deabaa00d38 100644
--- a/news/husky-devel/files/patch-fidoconf_man_linkedto.1
+++ b/news/husky/files/patch-fidoconf_man_linkedto.1
diff --git a/news/husky-devel/files/patch-hpt_Makefile b/news/husky/files/patch-hpt_Makefile
index 44a6bd8ee30..44a6bd8ee30 100644
--- a/news/husky-devel/files/patch-hpt_Makefile
+++ b/news/husky/files/patch-hpt_Makefile
diff --git a/news/husky-devel/files/patch-hpt_doc_Makefile b/news/husky/files/patch-hpt_doc_Makefile
index 9a6f0bee724..9a6f0bee724 100644
--- a/news/husky-devel/files/patch-hpt_doc_Makefile
+++ b/news/husky/files/patch-hpt_doc_Makefile
diff --git a/news/husky-devel/files/patch-htick_Makefile b/news/husky/files/patch-htick_Makefile
index 40ca65b75ba..40ca65b75ba 100644
--- a/news/husky-devel/files/patch-htick_Makefile
+++ b/news/husky/files/patch-htick_Makefile
diff --git a/news/husky-devel/files/patch-htick_doc_Makefile b/news/husky/files/patch-htick_doc_Makefile
index 65465076ab3..65465076ab3 100644
--- a/news/husky-devel/files/patch-htick_doc_Makefile
+++ b/news/husky/files/patch-htick_doc_Makefile
diff --git a/news/husky-devel/files/patch-huskybse_huskymak.cfg b/news/husky/files/patch-huskybse_huskymak.cfg
index ec053e956e8..ec053e956e8 100644
--- a/news/husky-devel/files/patch-huskybse_huskymak.cfg
+++ b/news/husky/files/patch-huskybse_huskymak.cfg
diff --git a/news/husky-devel/files/patch-huskylib_Makefile b/news/husky/files/patch-huskylib_Makefile
index 4c494b50924..4c494b50924 100644
--- a/news/husky-devel/files/patch-huskylib_Makefile
+++ b/news/husky/files/patch-huskylib_Makefile
diff --git a/news/husky-devel/files/patch-smapi_Makefile b/news/husky/files/patch-smapi_Makefile
index 8cc44b6deec..8cc44b6deec 100644
--- a/news/husky-devel/files/patch-smapi_Makefile
+++ b/news/husky/files/patch-smapi_Makefile
diff --git a/news/husky-devel/pkg-descr b/news/husky/pkg-descr
index 313ad1bfedd..313ad1bfedd 100644
--- a/news/husky-devel/pkg-descr
+++ b/news/husky/pkg-descr