news/husky*: Update ports to latest versions

PR:		243030
Submitted by:	Oleg Sharoyko <osharoiko@gmail.com> (maintainer)
Reported by:	Ruslan Suleimanov <rs@paket.ua>

32 files changed, 199 insertions, 393 deletions

diff --git a/news/husky-areafix/Makefile b/news/husky-areafix/Makefile
index 72dd71f1e714..4f15cf24ff55 100644
--- a/news/husky-areafix/Makefile
+++ b/news/husky-areafix/Makefile
@@ -4,7 +4,11 @@ PORTNAME=	husky-areafix
 
 COMMENT=	Husky FTN areafix library
 
-LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf
+LICENSE=	LGPL20
+
+LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf \
+		libhusky.so:news/husky-huskylib \
+		libsmapi.so:news/husky-smapi
 
 USE_LDCONFIG=	yes
 
diff --git a/news/husky-areafix/pkg-plist b/news/husky-areafix/pkg-plist
index cb709714b629..9003374be3b8 100644
--- a/news/husky-areafix/pkg-plist
+++ b/news/husky-areafix/pkg-plist
@@ -5,4 +5,5 @@ include/areafix/query.h
 include/areafix/version.h
 lib/libareafix.a
 lib/libareafix.so
-lib/libareafix.so.1
+lib/libareafix.so.1.9
+lib/libareafix.so.1.9.0
diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile
index 64307714d08e..a0f1621a54e0 100644
--- a/news/husky-fidoconf/Makefile
+++ b/news/husky-fidoconf/Makefile
@@ -4,15 +4,18 @@ PORTNAME=	husky-fidoconf
 
 COMMENT=	Husky FTN configuration library
 
-LIB_DEPENDS=	libsmapi.so:news/husky-smapi
+LICENSE=	LGPL20
+
+LIB_DEPENDS=	libsmapi.so:news/husky-smapi \
+		libhusky.so:news/husky-huskylib
 
 USES+=		perl5 shebangfix
-SHEBANG_FILES=	util/fconf2areasbbs.pl util/fconf2na.pl util/sq2fc.pl
-USE_LDCONFIG=   yes
+SHEBANG_FILES=	fidoconf/util/fconf2areasbbs.pl fidoconf/util/fconf2na.pl fidoconf/util/sq2fc.pl
+USE_LDCONFIG=	yes
 INSTALL_TARGET=	install install-man
 
-MASTERDIR=      ${.CURDIR}/../husky
-COMPONENT_SUBDIR=       fidoconf
+MASTERDIR=	${.CURDIR}/../husky
+COMPONENT_SUBDIR=fidoconf
 
 # Settings below are required to handle texi output (html, INFO page)
 USES+=		makeinfo
@@ -25,7 +28,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
-		${WRKSRC}/man/linkedto.1
+		${BUILD_WRKSRC}/man/linkedto.1
 
 post-install:
 	${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/man/man1/fconf2aquaed.1
diff --git a/news/husky-fidoconf/pkg-plist b/news/husky-fidoconf/pkg-plist
index 309cffae4c5d..130d3731d316 100644
--- a/news/husky-fidoconf/pkg-plist
+++ b/news/husky-fidoconf/pkg-plist
@@ -24,7 +24,8 @@ include/fidoconf/stat.h
 include/fidoconf/version.h
 lib/libfidoconfig.a
 lib/libfidoconfig.so
-lib/libfidoconfig.so.1
+lib/libfidoconfig.so.1.9
+lib/libfidoconfig.so.1.9.0
 man/man1/dumpfcfg.1.gz
 man/man1/fconf2.1.gz
 man/man1/fconf2aquaed.1.gz
diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile
index adb75c10803d..86687291b681 100644
--- a/news/husky-hpt/Makefile
+++ b/news/husky-hpt/Makefile
@@ -4,26 +4,30 @@ PORTNAME=	husky-hpt
 
 COMMENT=	Husky FTN tosser
 
-LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf \
-		libareafix.so:news/husky-areafix
+LICENSE=	GPLv2
 
-USES+=		makeinfo
+LIB_DEPENDS=	libareafix.so:news/husky-areafix \
+		libfidoconfig.so:news/husky-fidoconf \
+		libhusky.so:news/husky-huskylib \
+		libsmapi.so:news/husky-smapi
+
+USES+=		makeinfo perl5
 ALL_TARGET=	all doc
 INSTALL_TARGET=	install install-doc
 INFO=		hpt
 
 MASTERDIR=	${.CURDIR}/../husky
-COMPONENT_SUBDIR=       hpt
+COMPONENT_SUBDIR=hpt
 MAKE_ARGS=	INFODIR=${PREFIX}/${INFO_PATH}
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
-		${WRKSRC}/man/hptlink.1
+		${BUILD_WRKSRC}/man/hptlink.1
 	${REINPLACE_CMD} -e 's^/some/path/config^${PREFIX}/etc/fido/config^' \
-		${WRKSRC}/man/hpttree.1
+		${BUILD_WRKSRC}/man/hpttree.1
 	${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \
-		${WRKSRC}/man/txt2pkt.1
+		${BUILD_WRKSRC}/man/txt2pkt.1
 
 .include "${MASTERDIR}/Makefile"
diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile
index 49ce619592f6..bceb8c0a39be 100644
--- a/news/husky-htick/Makefile
+++ b/news/husky-htick/Makefile
@@ -4,16 +4,20 @@ PORTNAME=	husky-htick
 
 COMMENT=	Husky FTN file ticker
 
-LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf \
-		libareafix.so:news/husky-areafix
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libareafix.so:news/husky-areafix \
+		libfidoconfig.so:news/husky-fidoconf \
+		libhusky.so:news/husky-huskylib \
+		libsmapi.so:news/husky-smapi
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install
-USE_LDCONFIG=   yes
+USE_LDCONFIG=	yes
 PLIST_FILES=	bin/htick man/man1/htick.1.gz
 
-MASTERDIR=      ${.CURDIR}/../husky
-COMPONENT_SUBDIR=       htick
+MASTERDIR=	${.CURDIR}/../husky
+COMPONENT_SUBDIR=htick
 
 # Settings below are required to handle texi output (html, INFO page)
 USES+=			makeinfo
@@ -28,6 +32,6 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \
-		${WRKSRC}/man/htick.1
+		${BUILD_WRKSRC}/man/htick.1
 
 .include "${MASTERDIR}/Makefile"
diff --git a/news/husky-huskylib/Makefile b/news/husky-huskylib/Makefile
index 00fe96816a93..8bcae1c24214 100644
--- a/news/husky-huskylib/Makefile
+++ b/news/husky-huskylib/Makefile
@@ -4,7 +4,9 @@ PORTNAME=	husky-huskylib
 
 COMMENT=	Husky generic FTN library
 
-INSTALL_TARGET= install install-man
+LICENSE=	LGPL21
+
+INSTALL_TARGET=	install install-man
 USE_LDCONFIG=	yes
 
 MASTERDIR=	${.CURDIR}/../husky
diff --git a/news/husky-huskylib/pkg-plist b/news/husky-huskylib/pkg-plist
index d6f032a655ac..b057ead919de 100644
--- a/news/husky-huskylib/pkg-plist
+++ b/news/husky-huskylib/pkg-plist
@@ -43,5 +43,6 @@ include/huskylib/vixie.h
 include/huskylib/xstr.h
 lib/libhusky.a
 lib/libhusky.so
-lib/libhusky.so.1
+lib/libhusky.so.1.9
+lib/libhusky.so.1.9.0
 %%PORTDOCS%%man/man1/gnmsgid.1.gz
diff --git a/news/husky-smapi/Makefile b/news/husky-smapi/Makefile
index ce0c0c793134..956c37ad0bb5 100644
--- a/news/husky-smapi/Makefile
+++ b/news/husky-smapi/Makefile
@@ -5,7 +5,9 @@ PORTEPOCH=	1
 
 COMMENT=	Husky FTN MSGAPI library
 
-LIB_DEPENDS=    libhusky.so:news/husky-huskylib
+LICENSE=	LGPL21
+
+LIB_DEPENDS=	libhusky.so:news/husky-huskylib
 
 USE_LDCONFIG=	yes
 
diff --git a/news/husky-smapi/pkg-plist b/news/husky-smapi/pkg-plist
index a3d46225e755..9eb4d8295e7d 100644
--- a/news/husky-smapi/pkg-plist
+++ b/news/husky-smapi/pkg-plist
@@ -9,4 +9,5 @@ include/smapi/msgapi.h
 include/smapi/old_msg.h
 lib/libsmapi.a
 lib/libsmapi.so
-lib/libsmapi.so.2
+lib/libsmapi.so.2.5
+lib/libsmapi.so.2.5.0
diff --git a/news/husky-sqpack/Makefile b/news/husky-sqpack/Makefile
index 3ffe1f48811e..c9a21f691788 100644
--- a/news/husky-sqpack/Makefile
+++ b/news/husky-sqpack/Makefile
@@ -4,7 +4,11 @@ PORTNAME=	husky-sqpack
 
 COMMENT=	Husky FTN msgbase packer
 
-LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf \
+		libhusky.so:news/husky-huskylib \
+		libsmapi.so:news/husky-smapi
 
 USE_LDCONFIG=	yes
 PLIST_FILES=	bin/sqpack man/man1/sqpack.1.gz
@@ -14,6 +18,6 @@ COMPONENT_SUBDIR=	sqpack
 
 post-patch:
 	${REINPLACE_CMD} -e 's^/etc/fido/config^${PREFIX}/etc/fido/config^' \
-		${WRKSRC}/sqpack.1
+		${BUILD_WRKSRC}/sqpack.1
 
 .include "${MASTERDIR}/Makefile"
diff --git a/news/husky-sqpack/pkg-descr b/news/husky-sqpack/pkg-descr
index c557ea6d40a0..69b358a71df2 100644
--- a/news/husky-sqpack/pkg-descr
+++ b/news/husky-sqpack/pkg-descr
@@ -1,6 +1,6 @@
 sqpack purges squish and jam msgbases taken from fidoconfig
 
 sqpack is a part of Husky Fidosoft Project.
-Husky is complete freeware suite of Fidonet applications. 
+Husky is complete freeware suite of Fidonet applications.
 
 WWW: http://husky.sourceforge.net/
diff --git a/news/husky/Makefile b/news/husky/Makefile
index 90479bb7a3cc..733fb3de1c80 100644
--- a/news/husky/Makefile
+++ b/news/husky/Makefile
@@ -1,17 +1,15 @@
 # $FreeBSD$
 
 PORTNAME?=	husky
-PORTVERSION=	1.9.20140519
-PORTREVISION?=	3
+PORTVERSION=	1.9.20191207
 PORTEPOCH?=	0
 CATEGORIES?=	news mail
-MASTER_SITES=	SF/husky/husky/1.9-current/2014.05.19
+MASTER_SITES=	http://download.huskyproject.org/sources/
+DISTNAME=	husky-all-1.9-source-20191207
 
 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:news/husky-hpt \
 		htick:news/husky-htick
@@ -20,19 +18,19 @@ NO_BUILD=	yes
 NO_INSTALL=	yes
 .endif
 
-USES+=		alias gmake tar:tgz
+USES+=		alias dos2unix gmake zip
 
-HUSKY_ROOTDIR=	${WRKDIR}/husky
-PATCH_WRKSRC=	${HUSKY_ROOTDIR}
-WRKSRC=		${HUSKY_ROOTDIR}/${COMPONENT_SUBDIR}
+NO_WRKSUBDIR=	yes
+BUILD_WRKSRC=	${WRKSRC}/${COMPONENT_SUBDIR}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 PKGDIR=		${.CURDIR}
 
 USERS=		fido
 GROUPS=		fido
 
 pre-build:
-	${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR}
+	${LN} -sf ${WRKSRC}/huskybse/huskymak.cfg ${WRKSRC}
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \
-		${HUSKY_ROOTDIR}/huskybse/huskymak.cfg
+		${WRKSRC}/huskybse/huskymak.cfg
 
 .include <bsd.port.mk>
diff --git a/news/husky/distinfo b/news/husky/distinfo
index 1bcea1365920..9bf450c90ff6 100644
--- a/news/husky/distinfo
+++ b/news/husky/distinfo
@@ -1,2 +1,3 @@
-SHA256 (husky-all-1.9-source-20140519.tgz) = d8e199b78331c94323ffff3fc985dd081dfe1c9ee2c924bfc465949835b399d3
-SIZE (husky-all-1.9-source-20140519.tgz) = 4113348
+TIMESTAMP = 1579179267
+SHA256 (husky-all-1.9-source-20191207.zip) = a58d040d9c7047f5c972ec4af62e4b1dc61324c7826abc9f8a9652b12eae5adf
+SIZE (husky-all-1.9-source-20191207.zip) = 5468150
diff --git a/news/husky/files/patch-areafix_Makefile b/news/husky/files/patch-areafix_Makefile
deleted file mode 100644
index 8d4131a0791a..000000000000
--- a/news/husky/files/patch-areafix_Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
---- areafix/Makefile.orig	2013-03-25 21:35:46.000000000 +0000
-+++ areafix/Makefile	2013-03-25 21:37:31.000000000 +0000
-@@ -37,7 +37,7 @@ CDEFS=-D$(OSTYPE) $(ADDCDEFS) -I$(H_DIR)
- LIBS=-lhusky -lsmapi -lfidoconfig
- 
- ifeq ($(DYNLIBS), 1)
--all: $(TARGETLIB) $(TARGETDLL).$(VER)
-+all: $(TARGETLIB) $(TARGETDLL).$(VERMAJOR)
- else
- all: $(TARGETLIB)
- endif
-@@ -54,24 +54,22 @@ endif                                   
- 
- ifeq ($(DYNLIBS), 1)
-   ifeq (~$(MKSHARED)~,~ld~)
--$(TARGETDLL).$(VER): $(OBJS)
--	$(LD) $(LFLAGS) -o $(TARGETDLL).$(VER) $(OBJS) $(LIBS)
-+$(TARGETDLL).$(VERMAJOR): $(OBJS)
-+	$(LD) $(LFLAGS) -o $(TARGETDLL).$(VERMAJOR) $(OBJS) $(LIBS)
-   else
--$(TARGETDLL).$(VER): $(OBJS)
--	$(CC) $(LFLAGS) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
--          -o $(TARGETDLL).$(VER) $(OBJS) $(LIBS)
-+$(TARGETDLL).$(VERMAJOR): $(OBJS)
-+	$(CC) $(LFLAGS) -shared -Wl,-soname,$(TARGETDLL).$(VERMAJOR) \
-+          -o $(TARGETDLL).$(VERMAJOR) $(OBJS) $(LIBS)
-   endif
- 
--instdyn: $(TARGETLIB) $(TARGETDLL).$(VER)
-+instdyn: $(TARGETLIB) $(TARGETDLL).$(VERMAJOR)
- 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(LIBDIR)
--	$(INSTALL) $(ILOPT) $(TARGETDLL).$(VER) $(DESTDIR)$(LIBDIR)
--	-$(RM) $(RMOPT) $(DESTDIR)$(LIBDIR)$(DIRSEP)$(TARGETDLL).$(VERH)
-+	$(INSTALL) $(ILOPT) $(TARGETDLL).$(VERMAJOR) $(DESTDIR)$(LIBDIR)
- 	-$(RM) $(RMOPT) $(DESTDIR)$(LIBDIR)$(DIRSEP)$(TARGETDLL)
- # Changed the symlinks from symlinks with full path to just symlinks.
- # Better so :)
- 	cd $(DESTDIR)$(LIBDIR) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL).$(VERH) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL)
-+	$(LN) $(LNOPT) $(TARGETDLL).$(VERMAJOR) $(TARGETDLL)
- ifneq (~$(LDCONFIG)~, ~~)
- 	$(LDCONFIG)
- endif
-@@ -106,4 +104,4 @@ clean:
- 
- distclean: clean
- 	-$(RM) $(RMOPT) $(TARGETLIB)
--	-$(RM) $(RMOPT) $(TARGETDLL).$(VER)
-+	-$(RM) $(RMOPT) $(TARGETDLL).$(VERMAJOR)
diff --git a/news/husky/files/patch-fidoconf_Makefile b/news/husky/files/patch-fidoconf_Makefile
index c580d4680329..60c91cc647ff 100644
--- a/news/husky/files/patch-fidoconf_Makefile
+++ b/news/husky/files/patch-fidoconf_Makefile
@@ -1,72 +1,19 @@
---- fidoconf/Makefile.orig	2012-08-22 06:00:53.000000000 +0000
-+++ fidoconf/Makefile	2013-12-22 22:45:05.795932476 +0000
-@@ -67,16 +67,14 @@ else
- include make/fn_long.inc
+--- fidoconf/Makefile.orig	2020-02-05 22:47:47 UTC
++++ fidoconf/Makefile
+@@ -59,6 +59,8 @@ ifeq ($(OSTYPE), UNIX)
+   DLLPREFIX=lib
  endif
- include make/makefile.inc
--include makefile.in2
- TARGETLIB = $(LIBPREFIX)$(LIBNAME)$(LIBSUFFIX)$(_LIB)
- TARGETDLL = $(DLLPREFIX)$(LIBNAME)$(DLLSUFFIX)$(_DLL)
--LIBS=-lhusky
  
++TARGET = $(TARGETDLL).$(VER)
++
+ default: all
+ 
+ ifeq ($(SHORTNAMES), 1)
+@@ -75,7 +77,6 @@ LIBS=-lhusky
  progs: commonprogs
  
  ifeq ($(DYNLIBS), 1)
-   TARGET = $(TARGETDLL)
--  all: commonlibs $(TARGETDLL).$(VER)
-+  all: commonlibs $(TARGETDLL).$(VERMAJOR)
+-  TARGET = $(TARGETDLL)
+   all: commonlibs $(TARGETDLL).$(VER)
  	$(MAKE) progs
  	(cd doc && $(MAKE) all)
- else
-@@ -86,21 +84,24 @@ else
- 	(cd doc && $(MAKE) all)
- endif
- 
-+include makefile.in2
-+LIBS=-lhusky
- 
- ifeq (~$(MKSHARED)~, ~ld~)
--$(TARGETDLL).$(VER): $(LOBJS)
--	$(LD) $(LFLAGS) $(EXENAMEFLAG) $(TARGETDLL).$(VER) $(LOBJS) $(LIBS)
-+$(TARGETDLL).$(VERMAJOR): $(LOBJS)
-+	$(LD) $(LFLAGS) $(EXENAMEFLAG) $(TARGETDLL).$(VERMAJOR) $(LOBJS) $(LIBS)
- else
--$(TARGETDLL).$(VER): $(LOBJS)
--	$(CC) $(LFLAGS) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
--	-o $(TARGETDLL).$(VER) $(LOBJS) $(LIBS)
-+$(TARGETDLL).$(VERMAJOR): $(LOBJS)
-+	$(CC) $(LFLAGS) -shared -Wl,-soname,$(TARGETDLL).$(VERMAJOR) \
-+	-o $(TARGETDLL).$(VERMAJOR) $(LOBJS) $(LIBS)
- endif
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL).$(VERH) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL)
-+
-+$(TARGETDLL): $(TARGETDLL).$(VERMAJOR)
-+	$(LN) $(LNOPT) $(TARGETDLL).$(VERMAJOR) $(TARGETDLL)
- 
- 
- clean: commonclean
--	-$(RM) $(RMOPT) $(TARGETDLL).$(VERH)
-+	-$(RM) $(RMOPT) $(TARGETDLL).$(VERMAJOR)
- 	-$(RM) $(RMOPT) $(TARGETDLL)
- 	(cd doc && $(MAKE) clean)
- 
-@@ -110,15 +111,13 @@ distclean: commondistclean
- 
- 
- ifeq ($(DYNLIBS), 1)
--instdyn: $(TARGETLIB) $(TARGETDLL).$(VER)
-+instdyn: $(TARGETLIB) $(TARGETDLL).$(VERMAJOR)
- 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(LIBDIR)
--	$(INSTALL) $(ILOPT) $(TARGETDLL).$(VER) $(DESTDIR)$(LIBDIR)
--	-$(RM) $(RMOPT) $(DESTDIR)$(LIBDIR)$(DIRSEP)$(TARGETDLL).$(VERH)
-+	$(INSTALL) $(ILOPT) $(TARGETDLL).$(VERMAJOR) $(DESTDIR)$(LIBDIR)
- 	-$(RM) $(RMOPT) $(DESTDIR)$(LIBDIR)$(DIRSEP)$(TARGETDLL)
- # Removed path from symlinks.
- 	cd $(DESTDIR)$(LIBDIR) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL).$(VERH) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL)
-+	$(LN) $(LNOPT) $(TARGETDLL).$(VERMAJOR) $(TARGETDLL)
- ifneq (~$(LDCONFIG)~, ~~)
- 	$(LDCONFIG)
- endif
diff --git a/news/husky/files/patch-fidoconf_doc_Makefile b/news/husky/files/patch-fidoconf_doc_Makefile
index 34c7b8fa509f..23c517d19cf8 100644
--- a/news/husky/files/patch-fidoconf_doc_Makefile
+++ b/news/husky/files/patch-fidoconf_doc_Makefile
@@ -1,16 +1,22 @@
---- fidoconf/doc/Makefile.orig	2011-03-23 19:30:40.000000000 +0000
-+++ fidoconf/doc/Makefile	2014-08-02 22:23:51.291760607 +0000
-@@ -12,8 +12,7 @@ endif
+--- fidoconf/doc/Makefile.orig	2020-01-16 23:01:53 UTC
++++ fidoconf/doc/Makefile
+@@ -12,21 +12,21 @@ endif
  all: html info dvi
  
  ifdef HTMLDIR
 -html: fidoconfig.html fidoconfig.ru.html
--	-wget -O fastecho2fidoconfig.html "http://sourceforge.net/apps/mediawiki/husky/index.php?title=%D0%9F%D1%80%D0%BE%D0%B3%D1%80%D0%B0%D0%BC%D0%BC%D0%B0_fecfg2fconf&printable=yes"
 +html: fidoconfig.html
  else
  html:
  	@echo
-@@ -27,7 +26,7 @@ dvi:
+ endif
+ 
+ ifdef DVIDIR
+-dvi: fidoconfig.dvi fidoconfig.ru.dvi
++dvi: fidoconfig.dvi
+ else
+ dvi:
+ 	@echo
  endif
  
  ifdef INFODIR
@@ -19,7 +25,7 @@
  else
  info:
  	@echo
-@@ -86,7 +85,6 @@ install: info html dvi
+@@ -85,7 +85,6 @@ install: info html dvi
  ifdef INFODIR
  	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(INFODIR)
  	$(INSTALL) $(IMOPT) fidoconfig.info $(DESTDIR)$(INFODIR)
diff --git a/news/husky/files/patch-fidoconf_doc_fidoconfig.texi b/news/husky/files/patch-fidoconf_doc_fidoconfig.texi
deleted file mode 100644
index 1c310344a54d..000000000000
--- a/news/husky/files/patch-fidoconf_doc_fidoconfig.texi
+++ /dev/null
@@ -1,30 +0,0 @@
---- fidoconf/doc/fidoconfig.texi.orig	2011-08-07 16:19:23 UTC
-+++ fidoconf/doc/fidoconfig.texi
-@@ -2531,7 +2531,7 @@ found error in config please correct you
- 
- @table @asis
- @item Syntax:
--@command{tparser [-h|@minus{-help}] [-Dvar=value] [-E] [-P] [/path/to/config/file]}
-+@command{tparser [-h|--help] [-Dvar=value] [-E] [-P] [/path/to/config/file]}
- @item Example:
- @example
- @command{tparser -Dmodule=hpt | less}
-@@ -2544,15 +2544,15 @@ config settings. It will grumble on ever
- stop after the first error (not warning) to give you the ability to change
- your config.
- 
--@subsection Options
-+@section Options
- 
--@table @asis
-+@table @code
- @item -Dvar=value
- Set the config variable @code{var} to @code{value}.
- @item -E
- Dumps config into stdout (all config variables expanded).
- @item -h
--@itemx @minus{-help}
-+@itemx --help
- Display usage information.
- @item -P
- Try to create non-existing directories.
diff --git a/news/husky/files/patch-fidoconf_makefile.in2 b/news/husky/files/patch-fidoconf_makefile.in2
deleted file mode 100644
index 716ddc893298..000000000000
--- a/news/husky/files/patch-fidoconf_makefile.in2
+++ /dev/null
@@ -1,11 +0,0 @@
---- fidoconf/makefile.in2.orig	2014-08-10 22:55:10.000000000 +0100
-+++ fidoconf/makefile.in2	2014-08-10 22:55:27.000000000 +0100
-@@ -2,7 +2,7 @@
- # (legacy makefile, no dynlibs, no huskymak support)
- # this file is only a include file included by other files.
- 
--CC   = gcc
-+#CC   = gcc
- EXENAMEFLAG = -o
- AR   = ar
- AR_R = rs
diff --git a/news/husky/files/patch-fidoconf_makefile.inc b/news/husky/files/patch-fidoconf_makefile.inc
deleted file mode 100644
index 25f04729e335..000000000000
--- a/news/husky/files/patch-fidoconf_makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
---- fidoconf/makefile.inc.orig	2010-03-24 20:32:22.000000000 +0000
-+++ fidoconf/makefile.inc	2013-03-25 00:12:55.000000000 +0000
-@@ -5,6 +5,7 @@
- 
- VER = 1.9.0
- VERH = 1.9
-+VERMAJOR = 1
- 
- _SRC_DIR = src/
- 
diff --git a/news/husky/files/patch-fidoconf_man_Makefile b/news/husky/files/patch-fidoconf_man_Makefile
index 29d07d34a484..77a26f5f8f62 100644
--- a/news/husky/files/patch-fidoconf_man_Makefile
+++ b/news/husky/files/patch-fidoconf_man_Makefile
@@ -1,6 +1,6 @@
---- fidoconf/man/Makefile.orig	2009-03-22 21:04:17.000000000 +0000
-+++ fidoconf/man/Makefile	2013-03-25 00:12:55.000000000 +0000
-@@ -20,7 +20,7 @@ MAN1DIR   = $(DESTDIR)$(MANDIR)$(DIRSEP)
+--- fidoconf/man/Makefile.orig	2020-01-16 21:50:04 UTC
++++ fidoconf/man/Makefile
+@@ -20,7 +20,7 @@ MAN1DIR   = $(DESTDIR)$(MANDIR)$(DIRSEP)man1
  
  all:
  
@@ -9,12 +9,3 @@
  
  copy:
  	$(MKDIR) $(MKDIROPT) $(MAN1DIR)
-@@ -28,7 +28,7 @@ copy:
- 
- link:
- 	cd $(MAN1DIR)$(DIRSEP); \
--	for f in $(FCONF2ALIASES) ; do $(LN) -s fconf2.1 $$f ; done
-+	for f in $(FCONF2ALIASES) ; $(LN) -s fconf2.1 $$f ; done
- 
- clean:
- 
diff --git a/news/husky/files/patch-fidoconf_man_linkedto.1 b/news/husky/files/patch-fidoconf_man_linkedto.1
index deabaa00d380..66f2b03869cf 100644
--- a/news/husky/files/patch-fidoconf_man_linkedto.1
+++ b/news/husky/files/patch-fidoconf_man_linkedto.1
@@ -1,15 +1,13 @@
---- fidoconf/man/linkedto.1.orig	2002-08-29 07:59:26.000000000 +0000
-+++ fidoconf/man/linkedto.1	2014-08-02 23:05:26.005741877 +0000
-@@ -19,10 +19,8 @@ The Address for the Information.
+--- fidoconf/man/linkedto.1.orig	2020-01-16 23:01:53 UTC
++++ fidoconf/man/linkedto.1
+@@ -19,9 +19,8 @@ The Address for the Information.
  .br
  .nf
  .\" set tabstop to longest possible filename, plus a wee bit
 -.ta \w'/etc/fido/config   'u
 -\fI/etc/fido/config\fR
--.ta \w'/usr/local/etc/fido/config   'u
--\fI/usr/local/etc/fido/config\fR  Default Fidoconfig.
-+.ta \w'/path/to/config   'u
-+\fI/path/to/config\fR  Default Fidoconfig.
+ .ta \w'/usr/local/etc/fido/config   'u
++\fI/etc/fido/config\fR
+ \fI/usr/local/etc/fido/config\fR  Default Fidoconfig.
  .SH NOTES
  All Husky-Software is written by various developers. For detailed information
- about the Husky-Team take a look at 
diff --git a/news/husky/files/patch-fidoconf_src_line.c b/news/husky/files/patch-fidoconf_src_line.c
new file mode 100644
index 000000000000..594de58f900a
--- /dev/null
+++ b/news/husky/files/patch-fidoconf_src_line.c
@@ -0,0 +1,20 @@
+--- fidoconf/src/line.c.orig	2020-01-16 21:50:04 UTC
++++ fidoconf/src/line.c
+@@ -3036,7 +3036,7 @@ int parseCarbonDelete(char *token, s_fidoconfig *confi
+            break; /* this was the end of a previous set expressions */
+        if(cb->move==CC_delete) /* delete */
+            break;
+-       if(!cb->rule&CC_AND) /* OR */
++       if(!(cb->rule&CC_AND)) /* OR */
+            cb->move=CC_delete;
+    }
+    return 0;
+@@ -3086,7 +3086,7 @@ int parseCarbonExtern(char *token, s_fidoconfig *confi
+            break; /* this was the end of a previous set expressions */
+        if(cb->move==CC_delete) /* delete */
+            break;
+-       if(!cb->rule&CC_AND){ /* OR */
++       if(!(cb->rule&CC_AND)){ /* OR */
+            fc_copyString(token, &(cb->areaName));
+            cb->extspawn=1;
+            cb->move=CC_copy;
diff --git a/news/husky/files/patch-hpt_Makefile b/news/husky/files/patch-hpt_Makefile
index 44a6bd8ee30d..857610586155 100644
--- a/news/husky/files/patch-hpt_Makefile
+++ b/news/husky/files/patch-hpt_Makefile
@@ -1,5 +1,5 @@
---- hpt/Makefile.orig	2010-01-19 22:43:29.000000000 +0000
-+++ hpt/Makefile	2013-04-13 19:28:49.000000000 +0000
+--- hpt/Makefile.orig	2020-01-16 21:50:04 UTC
++++ hpt/Makefile
 @@ -33,6 +33,7 @@ endif
  ifeq ($(PERL), 1)
    CFLAGS += -DDO_PERL `perl -MExtUtils::Embed -e ccopts`
@@ -8,7 +8,7 @@
    PERLOBJ = perl$(_OBJ)
  endif
  
-@@ -61,10 +62,10 @@ all: commonall hpt.1.gz hptlink.1.gz hpt
+@@ -61,10 +62,10 @@ all: commonall hpt.1.gz hptlink.1.gz hpttree.1.gz txt2
  endif
  
  doc:
diff --git a/news/husky/files/patch-hpt_doc_Makefile b/news/husky/files/patch-hpt_doc_Makefile
index 9a6f0bee724e..a927fa9d7fc1 100644
--- a/news/husky/files/patch-hpt_doc_Makefile
+++ b/news/husky/files/patch-hpt_doc_Makefile
@@ -1,5 +1,5 @@
---- hpt/doc/Makefile.orig	2009-03-23 12:44:57.000000000 +0000
-+++ hpt/doc/Makefile	2014-08-02 23:05:26.007741567 +0000
+--- hpt/doc/Makefile.orig	2020-01-16 21:50:04 UTC
++++ hpt/doc/Makefile
 @@ -64,7 +64,6 @@ install: info html dvi
  ifdef INFODIR
  	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(INFODIR)
diff --git a/news/husky/files/patch-hpt_src_perl.c b/news/husky/files/patch-hpt_src_perl.c
index b0b95370007a..8a9f2d3b4049 100644
--- a/news/husky/files/patch-hpt_src_perl.c
+++ b/news/husky/files/patch-hpt_src_perl.c
@@ -1,14 +1,15 @@
---- hpt/src/perl.c.orig	2018-03-28 16:01:18 UTC
+--- hpt/src/perl.c.orig	2020-01-16 21:50:04 UTC
 +++ hpt/src/perl.c
-@@ -109,9 +109,9 @@ extern "C" {
+@@ -109,10 +109,12 @@ extern "C" {
  # define min(a, b)      ((a) < (b) ? (a) : (b))
  #endif
  
--#ifdef __GNUC__
-+/*#ifdef __GNUC__
- # define Perl___notused Perl___notused __attribute__ ((unused))
--#endif
-+#endif*/
++#if 0
+ #ifdef __GNUC__
+ # ifdef _OLDPERL_
+ #  define Perl___notused Perl___notused __attribute__ ((unused))
+ # endif
++#endif
+ #endif
  
  #ifndef LL_PERL
- # define LL_PERL LL_EXEC
diff --git a/news/husky/files/patch-htick_Makefile b/news/husky/files/patch-htick_Makefile
index 40ca65b75bab..2ce9c3949c9e 100644
--- a/news/husky/files/patch-htick_Makefile
+++ b/news/husky/files/patch-htick_Makefile
@@ -1,5 +1,5 @@
---- htick/Makefile.orig	2010-04-20 19:10:55.000000000 +0000
-+++ htick/Makefile	2014-08-02 22:22:28.572741488 +0000
+--- htick/Makefile.orig	2020-01-16 21:50:04 UTC
++++ htick/Makefile
 @@ -45,6 +45,12 @@ CDEFS=-D$(OSTYPE) $(ADDCDEFS)
  
  all: $(OBJS) htick$(EXE)
diff --git a/news/husky/files/patch-htick_doc_Makefile b/news/husky/files/patch-htick_doc_Makefile
index 65465076ab32..4649016d2a22 100644
--- a/news/husky/files/patch-htick_doc_Makefile
+++ b/news/husky/files/patch-htick_doc_Makefile
@@ -1,6 +1,6 @@
---- htick/doc/Makefile.orig	2011-03-23 19:30:40.000000000 +0000
-+++ htick/doc/Makefile	2014-08-02 22:23:11.957742250 +0000
-@@ -19,7 +19,7 @@ endif
+--- htick/doc/Makefile.orig	2020-01-16 21:50:04 UTC
++++ htick/doc/Makefile
+@@ -19,21 +19,21 @@ endif
  all: html info dvi
  
  ifdef HTMLDIR
@@ -9,7 +9,14 @@
  else
  html:
  	@echo
-@@ -33,7 +33,7 @@ dvi:
+ endif
+ 
+ ifdef DVIDIR
+-dvi: htick.dvi htick.rus.dvi
++dvi: htick.dvi
+ else
+ dvi:
+ 	@echo
  endif
  
  ifdef INFODIR
diff --git a/news/husky/files/patch-htick_doc_htick.texi b/news/husky/files/patch-htick_doc_htick.texi
deleted file mode 100644
index c36416b283ba..000000000000
--- a/news/husky/files/patch-htick_doc_htick.texi
+++ /dev/null
@@ -1,15 +0,0 @@
---- htick/doc/htick.texi.orig	2011-08-07 10:51:35 UTC
-+++ htick/doc/htick.texi
-@@ -13,9 +13,9 @@
- @titlepage
- @title @value{HTICK} @value{VERSION} manual
- @subtitle Husky Ticker
--@author Georgi Fofanov @@ 2:5050/29, fg@fg.udm.ru
--@author Nestyurkin Nikolay @@ 2:5020/3600, 3600@mail.ru
--@author Max Chernogor @@ 2:464/108, mche@ua.fm
-+@author Georgi Fofanov @@ 2:5050/29, fg@@fg.udm.ru
-+@author Nestyurkin Nikolay @@ 2:5020/3600, 3600@@mail.ru
-+@author Max Chernogor @@ 2:464/108, mche@@ua.fm
- @page
- @c{empty page to get the page numbering right}
- @end titlepage
diff --git a/news/husky/files/patch-huskybse_huskymak.cfg b/news/husky/files/patch-huskybse_huskymak.cfg
index ec053e956e85..04d5478d286d 100644
--- a/news/husky/files/patch-huskybse_huskymak.cfg
+++ b/news/husky/files/patch-huskybse_huskymak.cfg
@@ -1,6 +1,6 @@
---- huskybse/huskymak.cfg.orig	2007-02-23 21:47:15.000000000 +0000
-+++ huskybse/huskymak.cfg	2014-08-10 22:33:05.000000000 +0100
-@@ -38,7 +38,7 @@
+--- huskybse/huskymak.cfg.orig	2020-01-16 23:01:53 UTC
++++ huskybse/huskymak.cfg
+@@ -38,7 +38,7 @@ CFGDIR=$(PREFIX)/etc/fido
  # will not be compiled, and you won't know how to use the software ;-).
  # You should take care that this directory is listed in the INFOPATH 
  # environment variable (if necessary, modify your /etc/profile file).
@@ -9,7 +9,7 @@
  
  # The same as above, but for DVI documentation. This requires a working
  # "texi2dvi" program.
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ CFGDIR=$(PREFIX)/etc/fido
  
  # The same as above, but for HTML documentation. This requires a working
  # "texi2html" program.
@@ -18,20 +18,47 @@
  
  # Name of the config file of MSGED TE:
  MSGEDCFG=\"$(CFGDIR)/msged.cfg\"
-@@ -66,10 +66,10 @@
+@@ -54,7 +54,7 @@ MSGEDCFG=\"$(CFGDIR)/msged.cfg\"
+ 
+ ##############################################################################
+ #PART 2: PLATFORM DEPENDENT SECTION
+-#If you are running Linux with GNU gcc, you don't need to modify anything in
++#If you are running Linux with GNU cc, you don't need to modify anything in
+ #the following sections. If you are running any other operating system or using
+ #any other C compiler, you should check the values. For some operating
+ #systems, the comments contain information on what you need to change.
+@@ -66,10 +66,10 @@ MSGEDCFG=\"$(CFGDIR)/msged.cfg\"
  ##############################################################################
  
  # C-Compiler
 -CC=gcc
-+#CC=gcc
++#CC=cc
  
  # C++-Compiler
 -CXX=g++
-+#CXX=g++
++#CXX=c++
  
  #Msged needs access to a termcap library. Define its name here.
  #On Linux, termcap is integrated into ncurses:
-@@ -95,14 +95,14 @@
+@@ -79,7 +79,7 @@ TERMCAP=ncurses
+ #TERMCAP=terminfo
+ 
+ # C++-Compiler
+-GPP=g++
++GPP=c++
+ 
+ # Pascal-Compiler (the compiler is optional, but the value of this
+ # variable must be defined even if you don't have a Pascal compiler).
+@@ -89,20 +89,20 @@ PC=ppc386
+ AR=ar
+ 
+ # how to build shared libraries
+-# use gcc on Linux and FreeBSD
+-# use ld on BeOS and also try ld if gcc does not work for you
+-# only "gcc" will put so version numbers into the shared object 
++# use cc on Linux and FreeBSD
++# use ld on BeOS and also try ld if cc does not work for you
++# only "cc" will put so version numbers into the shared object 
  # On Solaris use "-G" as additional linkerflag !!!!!!!
  # MKSHARED=ld
  # LD=ld -G
@@ -48,7 +75,7 @@
  # On Tru64 Unix, use this:
  # INSTALL=installbsd
  # On Solaris, use this:
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ MKDIR=mkdir
  
  # update dynamic library cache
  # If your operating system does not need this, you may comment out this line.
@@ -57,7 +84,7 @@
  
  # rename a file
  MV=mv
-@@ -139,8 +139,8 @@
+@@ -139,8 +139,8 @@ H2PAS=h2pas
  OSTYPE=UNIX
  
  # short name of operating system (used for PID lines etc.)
@@ -68,7 +95,7 @@
  #UNAME=OS2
  #UNAME=BEOS
  
-@@ -151,7 +151,7 @@
+@@ -151,14 +151,14 @@ DEBUG=0
  SHORTNAMES=0
  
  # Perl support
@@ -77,7 +104,15 @@
  
  # ZipInternal packer
  USE_HPTZIP=0
-@@ -179,7 +179,7 @@
+ 
+ # The DYNLIBS switch controls if dynamic or static linkage is used.
+ # This is tricky. If you set DYNLIBS=1, dynamic libraries (.so files)
+-# will be generated and used. This will only work if you are running "gcc"
++# will be generated and used. This will only work if you are running "cc"
+ # on Linux, FreeBSD or another real Unix operating system.
+ 
+ # On other systems, you must set DYNLIBS=0. Even on Linux, you might 
+@@ -179,7 +179,7 @@ EXENAMEFLAG=-o
  WARNFLAGS=-Wall
  
  # C-compiler: optimization
@@ -86,20 +121,20 @@
  
  ifeq ( $(DYNLIBS), 0 )
    ifeq ($(OSTYPE), UNIX)
-@@ -216,29 +216,22 @@
+@@ -216,29 +216,22 @@ OPTLFLAGS=-s
  DEBLFLAGS=-g
  
  # options for installing programs
 -OPTIBOPT=-c -s -m 555
 -DEBIBOPT=-c -m 555
--
++IBOPT=$(BSD_INSTALL_PROGRAM)
+ 
 -ifeq ($(DEBUG), 1)
 -  IBOPT = $(DEBIBOPT)
 -else
 -  IBOPT = $(OPTIBOPT)
 -endif
-+IBOPT=$(BSD_INSTALL_PROGRAM)
- 
+-
  # options for installing scripts
 -ISOPT=-c -m 555
 +ISOPT=$(BSD_INSTALL_SCRIPT)
diff --git a/news/husky/files/patch-huskylib_Makefile b/news/husky/files/patch-huskylib_Makefile
deleted file mode 100644
index 4c494b50924e..000000000000
--- a/news/husky/files/patch-huskylib_Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
---- huskylib/Makefile.orig	2009-07-02 08:23:20.000000000 +0000
-+++ huskylib/Makefile	2013-03-25 19:30:48.000000000 +0000
-@@ -31,7 +31,7 @@ LIBS=
- #-L. -l$(LIBNAME)
- 
- ifeq ($(DYNLIBS), 1)
--all: $(TARGETLIB) $(TARGETDLL).$(VER) $(PROGRAMS)
-+all: $(TARGETLIB) $(TARGETDLL).$(VERMAJOR) $(PROGRAMS)
- else
- all: $(TARGETLIB) $(PROGRAMS)
- endif
-@@ -50,26 +50,22 @@ endif
- 
- ifeq ($(DYNLIBS), 1)
-   ifeq (~$(MKSHARED)~,~ld~)
--$(TARGETDLL).$(VER): $(OBJS)
--	$(LD) $(LFLAGS) -o $(TARGETDLL).$(VER) $(OBJS)
-+$(TARGETDLL).$(VERMAJOR): $(OBJS)
-+	$(LD) $(LFLAGS) -o $(TARGETDLL).$(VERMAJOR) $(OBJS)
-   else
--$(TARGETDLL).$(VER): $(OBJS)
--	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
--          -o $(TARGETDLL).$(VER) $(OBJS)
-+$(TARGETDLL).$(VERMAJOR): $(OBJS)
-+	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERMAJOR) \
-+          -o $(TARGETDLL).$(VERMAJOR) $(OBJS)
-   endif
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL).$(VERH) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL)
- 
--install-dynlib: $(TARGETLIB) $(TARGETDLL).$(VER)
-+install-dynlib: $(TARGETLIB) $(TARGETDLL).$(VERMAJOR)
- 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(LIBDIR)
--	$(INSTALL) $(ILOPT) $(TARGETDLL).$(VER) $(DESTDIR)$(LIBDIR)
--	-$(RM) $(RMOPT) $(DESTDIR)$(LIBDIR)$(DIRSEP)$(TARGETDLL).$(VERH)
-+	$(INSTALL) $(ILOPT) $(TARGETDLL).$(VERMAJOR) $(DESTDIR)$(LIBDIR)
- 	-$(RM) $(RMOPT) $(DESTDIR)$(LIBDIR)$(DIRSEP)$(TARGETDLL)
- # Changed the symlinks from symlinks with full path to just symlinks.
- # Better so :)
- 	cd $(DESTDIR)$(LIBDIR) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL).$(VERH) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL)
-+	$(LN) $(LNOPT) $(TARGETDLL).$(VERMAJOR) $(TARGETDLL)
- ifneq (~$(LDCONFIG)~, ~~)
- 	$(LDCONFIG)
- endif
-@@ -133,10 +129,10 @@ uninstall:
- 
- clean:
- 	-$(RM) $(RMOPT) *$(_OBJ)
--	-$(RM) $(RMOPT) $(TARGETDLL).$(VERH)
-+	-$(RM) $(RMOPT) $(TARGETDLL).$(VERMAJOR)
- 	-$(RM) $(RMOPT) $(TARGETDLL)
- 
- distclean: clean
- 	-$(RM) $(RMOPT) $(TARGETLIB)
--	-$(RM) $(RMOPT) $(TARGETDLL).$(VER)
-+	-$(RM) $(RMOPT) $(TARGETDLL).$(VERMAJOR)
- 	-$(RM) $(RMOPT) $(PROGRAMS)
diff --git a/news/husky/files/patch-smapi_Makefile b/news/husky/files/patch-smapi_Makefile
deleted file mode 100644
index 8cc44b6deec4..000000000000
--- a/news/husky/files/patch-smapi_Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
---- smapi/Makefile.orig	2013-03-24 23:40:00.000000000 +0000
-+++ smapi/Makefile	2013-03-24 23:40:05.000000000 +0000
-@@ -33,7 +33,7 @@ CDEFS=-D$(OSTYPE) $(ADDCDEFS) -I$(H_DIR)
- LIBS=-lhusky
- 
- ifeq ($(DYNLIBS), 1)
--all: $(TARGETLIB) $(TARGETDLL).$(VER)
-+all: $(TARGETLIB) $(TARGETDLL).$(VERMAJOR)
- else
- all: $(TARGETLIB)
- endif
-@@ -50,24 +50,22 @@ endif                                   
- 
- ifeq ($(DYNLIBS), 1)
-   ifeq (~$(MKSHARED)~,~ld~)
--$(TARGETDLL).$(VER): $(OBJS)
--	$(LD) $(LFLAGS) -o $(TARGETDLL).$(VER) $(OBJS) -L$(LIBDIR) $(LIBS)
-+$(TARGETDLL).$(VERMAJOR): $(OBJS)
-+	$(LD) $(LFLAGS) -o $(TARGETDLL).$(VERMAJOR) $(OBJS) -L$(LIBDIR) $(LIBS)
-   else
--$(TARGETDLL).$(VER): $(OBJS)
--	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
--          -o $(TARGETDLL).$(VER) $(OBJS) -L$(LIBDIR) $(LIBS)
-+$(TARGETDLL).$(VERMAJOR): $(OBJS)
-+	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERMAJOR) \
-+          -o $(TARGETDLL).$(VERMAJOR) $(OBJS) -L$(LIBDIR) $(LIBS)
-   endif
- 
--instdyn: $(TARGETLIB) $(TARGETDLL).$(VER)
-+instdyn: $(TARGETLIB) $(TARGETDLL).$(VERMAJOR)
- 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(DIRSEP)$(LIBDIR)
--	$(INSTALL) $(ILOPT) $(TARGETDLL).$(VER) $(DESTDIR)$(DIRSEP)$(LIBDIR)
--	-$(RM) $(RMOPT) $(DESTDIR)$(DIRSEP)$(LIBDIR)$(DIRSEP)$(TARGETDLL).$(VERH)
-+	$(INSTALL) $(ILOPT) $(TARGETDLL).$(VERMAJOR) $(DESTDIR)$(DIRSEP)$(LIBDIR)
- 	-$(RM) $(RMOPT) $(DESTDIR)$(DIRSEP)$(LIBDIR)$(DIRSEP)$(TARGETDLL)
- # Changed the symlinks from symlinks with full path to just symlinks.
- # Better so :)
- 	cd $(DESTDIR)$(DIRSEP)$(LIBDIR) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL).$(VERH) ;\
--	$(LN) $(LNOPT) $(TARGETDLL).$(VER) $(TARGETDLL)
-+	$(LN) $(LNOPT) $(TARGETDLL).$(VERMAJOR) $(TARGETDLL)
- ifneq (~$(LDCONFIG)~, ~~)
- 	$(LDCONFIG)
- endif
-@@ -102,4 +100,4 @@ clean:
- 
- distclean: clean
- 	-$(RM) $(RMOPT) $(TARGETLIB)
--	-$(RM) $(RMOPT) $(TARGETDLL).$(VER)
-+	-$(RM) $(RMOPT) $(TARGETDLL).$(VERMAJOR)