Attachment 145294 Details for Bug 185154 – Updates husky-devel to 1.9.20140519 (svn diff --ignore-properties)

[patch] Updates husky-devel to 1.9.20140519 (svn diff --ignore-properties)

husky-devel.20140803.diff (text/plain), 55.97 KB, created by Oleg Sharoyko on 2014-08-03 09:53:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Sharoyko

Created: 2014-08-03 09:53:58 UTC

Size: 55.97 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 363863)
>+++ MOVED	(working copy)
>@@ -6367,3 +6367,4 @@
> lang/dragonegg46-33||2014-08-01|Has expired: Dead upstream, impractical to build on 10 and later
> lang/dragonegg47-33||2014-08-01|Has expired: Dead upstream, impractical to build on 10 and later
> print/freetype-tools|print/texlive-texmf|2014-08-01|Has been incorporated in TeXLive
>+news/husky-base-devel||2014-08-03|Has been incorporated into the build process of other husky-*-devel ports
>Index: news/husky-areafix-devel/Makefile
>===================================================================
>--- news/husky-areafix-devel/Makefile	(revision 0)
>+++ news/husky-areafix-devel/Makefile	(working copy)
>@@ -0,0 +1,18 @@
>+# $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>
>Index: news/husky-areafix-devel/pkg-descr
>===================================================================
>--- news/husky-areafix-devel/pkg-descr	(revision 0)
>+++ news/husky-areafix-devel/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+MSGAPI for Husky Fidosoft Project.
>+Development version.
>+
>+Husky is complete freeware suite of Fidonet applications. 
>+
>+WWW: http://husky.sourceforge.net/
>Index: news/husky-areafix-devel/pkg-plist
>===================================================================
>--- news/husky-areafix-devel/pkg-plist	(revision 0)
>+++ news/husky-areafix-devel/pkg-plist	(working copy)
>@@ -0,0 +1,9 @@
>+include/areafix/afglobal.h
>+include/areafix/areafix.h
>+include/areafix/callback.h
>+include/areafix/query.h
>+include/areafix/version.h
>+lib/libareafix.a
>+lib/libareafix.so
>+lib/libareafix.so.1
>+@dirrmtry include/areafix
>Index: news/husky-base-devel/Makefile
>===================================================================
>--- news/husky-base-devel/Makefile	(revision 363863)
>+++ news/husky-base-devel/Makefile	(working copy)
>@@ -1,31 +0,0 @@
>-# Created by: Oleg Sharoiko <os@rsu.ru>
>-# $FreeBSD$
>-
>-PORTNAME=	base
>-PORTVERSION=	1.4
>-PORTREVISION=	1
>-CATEGORIES=	news mail
>-MASTER_SITES=	SF/husky/huskybase/1.4%20RC4
>-DISTNAME=	huskybase-${PORTVERSION}
>-EXTRACT_SUFX=	-tar.gz
>-
>-MAINTAINER=	os@rsu.ru
>-COMMENT=	Common files for Husky Fidosoft Project. Development version
>-
>-CONFLICTS=	husky-base-[0-9]*
>-
>-WRKSRC=		${WRKDIR}/huskybse
>-NO_BUILD=	yes
>-
>-NO_STAGE=	yes
>-pre-install:
>-	@ ${SETENV} PKG_PREFIX=${PREFIX} \
>-		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
>-
>-do-install:
>-	@${MKDIR} ${PREFIX}/etc/fido ${PREFIX}/share/doc/husky
>-	@${CHOWN} fido:fido ${PREFIX}/etc/fido
>-	@${INSTALL_DATA} ${WRKSRC}/huskymak.cfg ${PREFIX}/etc/fido
>-
>-.include "${.CURDIR}/../husky-base-devel/Makefile.inc"
>-.include <bsd.port.mk>
>Index: news/husky-base-devel/Makefile.inc
>===================================================================
>--- news/husky-base-devel/Makefile.inc	(revision 363863)
>+++ news/husky-base-devel/Makefile.inc	(working copy)
>@@ -1,23 +0,0 @@
>-#
>-# $FreeBSD$
>-#
>-
>-PKGNAMEPREFIX=	husky-
>-PKGNAMESUFFIX=	-devel
>-DIST_SUBDIR=	husky
>-
>-WRKSRC?=	${WRKDIR}/${PORTNAME}
>-ONLY_FOR_ARCHS=	i386
>-
>-.if ${PORTNAME} != "base"
>-BUILD_DEPENDS=	${LOCALBASE}/etc/fido/huskymak.cfg:${PORTSDIR}/news/husky-base-devel
>-
>-USES+=		gmake
>-
>-MAKE_ARGS+=	PREFIX="${PREFIX}" \
>-		CC="${CC}" CXX="${CXX}" GPP="${CXX}" MKSHARED="${CC}" \
>-		OPTCFLAGS="-c ${CFLAGS}" WARNFLAGS=""
>-
>-pre-build:
>-	@${LN} -sf ${LOCALBASE}/etc/fido/huskymak.cfg ${WRKDIR}
>-.endif
>Index: news/husky-base-devel/distinfo
>===================================================================
>--- news/husky-base-devel/distinfo	(revision 363863)
>+++ news/husky-base-devel/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (husky/huskybase-1.4-tar.gz) = 691d01576e5c654f281ff27bf161954e3b0c2010c753c7d75ac4b7facccd2812
>-SIZE (husky/huskybase-1.4-tar.gz) = 43627
>Index: news/husky-base-devel/files/patch-huskymak.cfg
>===================================================================
>--- news/husky-base-devel/files/patch-huskymak.cfg	(revision 363863)
>+++ news/husky-base-devel/files/patch-huskymak.cfg	(working copy)
>@@ -1,95 +0,0 @@
>---- huskymak.cfg.orig	Sat Jun 21 12:50:44 2003
>-+++ huskymak.cfg	Wed Oct 19 17:47:43 2005
>-@@ -38,15 +38,15 @@
>- # 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).
>--# INFODIR=/usr/local/info
>-+INFODIR=$(PREFIX)/info
>- 
>- # The same as above, but for DVI documentation. This requires a working
>- # "texi2dvi" program.
>--# DVIDIR=${PREFIX}/share/doc/husky
>-+DVIDIR=${PREFIX}/share/doc/husky
>- 
>- # The same as above, but for HTML documentation. This requires a working
>- # "texi2html" program.
>--#HTMLDIR=$(PREFIX)/lib/husky
>-+HTMLDIR=$(PREFIX)/share/doc/husky
>- 
>- # Name of the config file of MSGED TE:
>- MSGEDCFG=\"$(CFGDIR)/msged.cfg\"
>-@@ -116,7 +116,7 @@
>- 
>- # update dynamic library cache
>- # If your operating system does not need this, you may comment out this line.
>--LDCONFIG=/sbin/ldconfig
>-+#LDCONFIG=/sbin/ldconfig
>- 
>- # rename a file
>- MV=mv
>-@@ -139,8 +139,8 @@
>- OSTYPE=UNIX
>- 
>- # short name of operating system (used for PID lines etc.)
>--UNAME=LNX
>--#UNAME=BSD
>-+#UNAME=LNX
>-+UNAME=BSD
>- #UNAME=OS2
>- #UNAME=BEOS
>- 
>-@@ -151,7 +151,7 @@
>- SHORTNAMES=0
>- 
>- # Perl support
>--PERL=0
>-+PERL=1
>- 
>- # ZipInternal packer
>- USE_HPTZIP=0
>-@@ -179,7 +179,7 @@
>- WARNFLAGS=-Wall
>- 
>- # C-compiler: optimization
>--OPTCFLAGS=-c -s -O3 -fomit-frame-pointer -fstrength-reduce -fPIC
>-+OPTCFLAGS=
>- 
>- ifeq ( $(DYNLIBS), 0 )
>-   ifeq ($(OSTYPE), UNIX)
>-@@ -216,8 +216,8 @@
>- DEBLFLAGS=-g
>- 
>- # options for installing programs
>--OPTIBOPT=-c -s -m 555
>--DEBIBOPT=-c -m 555
>-+OPTIBOPT=-c -s -m 555 -o root -g wheel
>-+DEBIBOPT=-c -m 555 -o root -g wheel
>- 
>- ifeq ($(DEBUG), 1)
>-   IBOPT = $(DEBIBOPT)
>-@@ -226,19 +226,19 @@
>- endif
>- 
>- # options for installing scripts
>--ISOPT=-c -m 555
>-+ISOPT=-c -m 555 -o root -g wheel
>- 
>- # options for installing shared libs
>--ILOPT=-c -m 555
>-+ILOPT=-c -m 555 -o root -g wheel
>- 
>- # options for installing static libs
>--ISLOPT=-c -m 444
>-+ISLOPT=-c -m 444 -o root -g wheel
>- 
>- # options for installing man-pages
>--IMOPT=-c -m 444
>-+IMOPT=-c -m 444 -o root -g wheel
>- 
>- # options for installing includes
>--IIOPT=-c -m 444
>-+IIOPT=-c -m 444 -o root -g wheel
>- 
>- # options for linking files
>- LNOPT=-sf
>Index: news/husky-base-devel/pkg-descr
>===================================================================
>--- news/husky-base-devel/pkg-descr	(revision 363863)
>+++ news/husky-base-devel/pkg-descr	(working copy)
>@@ -1,6 +0,0 @@
>-Common files for Husky Fidosoft Project.
>-Development version.
>-
>-Husky is complete freeware suite of Fidonet applications. 
>-
>-WWW: http://husky.sourceforge.net/
>Index: news/husky-base-devel/pkg-install
>===================================================================
>--- news/husky-base-devel/pkg-install	(revision 363863)
>+++ news/husky-base-devel/pkg-install	(working copy)
>@@ -1,72 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: /tmp/pcvs/ports/news/husky-base-devel/pkg-install,v 1.1 2005-10-26 15:43:45 garga Exp $
>-#
>-
>-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
>-BATCH=${BATCH:=no}
>-PW=/usr/sbin/pw
>-
>-ask() {
>-    local question default answer
>-
>-    question=$1
>-    default=$2
>-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
>-        read -p "${question} [${default}]? " answer
>-    fi
>-    if [ x${answer} = x ]; then
>-        answer=${default}
>-    fi
>-    echo ${answer}
>-}
>-
>-yesno() {
>-    local question default answer
>-
>-    question=$1
>-    default=$2
>-    while :; do
>-        answer=$(ask "${question}" "${default}")
>-        case "${answer}" in
>-        [Yy]*)	return 0;;
>-        [Nn]*)	return 1;;
>-        esac
>-        echo "Please answer yes or no."
>-    done
>-}
>-
>-if [ x"$2" = xPRE-INSTALL ]; then
>-    USER=fido
>-    GROUP=fido
>-    UID=111
>-    GID=111
>-
>-    if ${PW} groupshow "${GROUP}" 2>/dev/null; then
>-        echo "You already have a group \"${GROUP}\", so I will use it."
>-    else
>-        if ${PW} groupadd ${GROUP} -g ${GID}
>-	then
>-	    echo "Added group \"${GROUP}\"."
>-	else
>-	    echo "Adding group \"${GROUP}\" failed..."
>-            echo "Please create it, and try again."
>-            exit 1
>-        fi
>-    fi
>-
>-    if ${PW} user show "${USER}" 2>/dev/null; then
>-        echo "You already have a user \"${USER}\", so I will use it."
>-    else
>-        if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
>-           -d ${PKG_PREFIX}/fido \
>-           -c "Fido System"
>-	then
>-	    echo "Added user \"${USER}\"."
>-	else
>-	    echo "Adding user \"${USER}\" failed..."
>-            echo "Please create it, and try again."
>-            exit 1
>-        fi
>-    fi
>-fi
>Index: news/husky-base-devel/pkg-plist
>===================================================================
>--- news/husky-base-devel/pkg-plist	(revision 363863)
>+++ news/husky-base-devel/pkg-plist	(working copy)
>@@ -1,4 +0,0 @@
>-etc/fido/huskymak.cfg
>-@exec mkdir -p %D/share/doc/husky
>-@dirrm etc/fido
>-@dirrm share/doc/husky
>Index: news/husky-devel/Makefile
>===================================================================
>--- news/husky-devel/Makefile	(revision 363863)
>+++ news/husky-devel/Makefile	(working copy)
>@@ -1,31 +1,15 @@
>-# Created by: Oleg Sharoiko <os@rsu.ru>
> # $FreeBSD$
> 
>-PORTNAME=	base
>-PORTVERSION=	1.4
>-PORTREVISION=	1
>-CATEGORIES=	news mail
>-MASTER_SITES=	SF/husky/huskybase/1.4%20RC4
>-DISTNAME=	huskybase-${PORTVERSION}
>-EXTRACT_SUFX=	-tar.gz
>+PORTNAME=	husky
> 
>-MAINTAINER=	os@rsu.ru
>-COMMENT=	Common files for Husky Fidosoft Project. Development version
>+COMMENT=	Husky full featured highly portable FTN Tosser (development version)
> 
>-CONFLICTS=	husky-base-[0-9]*
>+RUN_DEPENDS=	hpt:${PORTSDIR}/news/husky-hpt-devel \
>+		htick:${PORTSDIR}/news/husky-htick-devel
> 
>-WRKSRC=		${WRKDIR}/huskybse
>+MASTERDIR=	${.CURDIR}
>+
> NO_BUILD=	yes
>+NO_INSTALL=	yes
> 
>-NO_STAGE=	yes
>-pre-install:
>-	@ ${SETENV} PKG_PREFIX=${PREFIX} \
>-		${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL
>-
>-do-install:
>-	@${MKDIR} ${PREFIX}/etc/fido ${PREFIX}/share/doc/husky
>-	@${CHOWN} fido:fido ${PREFIX}/etc/fido
>-	@${INSTALL_DATA} ${WRKSRC}/huskymak.cfg ${PREFIX}/etc/fido
>-
>-.include "${.CURDIR}/../husky-base-devel/Makefile.inc"
> .include <bsd.port.mk>
>Index: news/husky-devel/Makefile.local
>===================================================================
>--- news/husky-devel/Makefile.local	(revision 0)
>+++ news/husky-devel/Makefile.local	(working copy)
>@@ -0,0 +1,32 @@
>+# vim:filetype=make
>+# $FreeBSD$
>+
>+PORTVERSION=	1.9.20140519
>+CATEGORIES=	news mail
>+PKGNAMESUFFIX=	-devel
>+
>+.if ${PORTNAME} == "husky-smapi"
>+PORTEPOCH=	1
>+.endif
>+
>+MAINTAINER=	osharoiko@gmail.com
>+
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	husky/husky/1.9-current/2014.05.19
>+DISTNAME=	husky-all-1.9-source-20140519
>+EXTRACT_SUFX=	.tgz
>+
>+HUSKY_ROOTDIR=	${WRKDIR}/husky
>+PATCH_WRKSRC=	${HUSKY_ROOTDIR}
>+WRKSRC=		${HUSKY_ROOTDIR}/${COMPONENT_SUBDIR}
>+PKGDIR=		${.CURDIR}
>+
>+CONFLICTS=	${PORTNAME}-[0-9]*
>+
>+USERS=		fido
>+GROUPS=		fido
>+
>+USES+=		gmake perl5
>+
>+pre-build:
>+	${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR}
>Index: news/husky-devel/distinfo
>===================================================================
>--- news/husky-devel/distinfo	(revision 363863)
>+++ news/husky-devel/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (husky/huskybase-1.4-tar.gz) = 691d01576e5c654f281ff27bf161954e3b0c2010c753c7d75ac4b7facccd2812
>-SIZE (husky/huskybase-1.4-tar.gz) = 43627
>+SHA256 (husky-all-1.9-source-20140519.tgz) = d8e199b78331c94323ffff3fc985dd081dfe1c9ee2c924bfc465949835b399d3
>+SIZE (husky-all-1.9-source-20140519.tgz) = 4113348
>Index: news/husky-devel/files/patch-areafix_Makefile
>===================================================================
>--- news/husky-devel/files/patch-areafix_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-areafix_Makefile	(working copy)
>@@ -0,0 +1,50 @@
>+--- 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)
>Index: news/husky-devel/files/patch-fidoconf_Makefile
>===================================================================
>--- news/husky-devel/files/patch-fidoconf_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-fidoconf_Makefile	(working copy)
>@@ -0,0 +1,72 @@
>+--- 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
>+ endif
>+ include make/makefile.inc
>+-include makefile.in2
>+ TARGETLIB = $(LIBPREFIX)$(LIBNAME)$(LIBSUFFIX)$(_LIB)
>+ TARGETDLL = $(DLLPREFIX)$(LIBNAME)$(DLLSUFFIX)$(_DLL)
>+-LIBS=-lhusky
>+ 
>+ progs: commonprogs
>+ 
>+ ifeq ($(DYNLIBS), 1)
>+   TARGET = $(TARGETDLL)
>+-  all: commonlibs $(TARGETDLL).$(VER)
>++  all: commonlibs $(TARGETDLL).$(VERMAJOR)
>+ 	$(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
>Index: news/husky-devel/files/patch-fidoconf_doc_Makefile
>===================================================================
>--- news/husky-devel/files/patch-fidoconf_doc_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-fidoconf_doc_Makefile	(working copy)
>@@ -0,0 +1,29 @@
>+--- 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
>+ 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 INFODIR
>+-info: fidoconfig.info fidoconfig.ru.info
>++info: fidoconfig.info
>+ else
>+ info:
>+ 	@echo
>+@@ -86,7 +85,6 @@ install: info html dvi
>+ ifdef INFODIR
>+ 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(INFODIR)
>+ 	$(INSTALL) $(IMOPT) fidoconfig.info $(DESTDIR)$(INFODIR)
>+-	-install-info --info-dir=$(INFODIR)  $(DESTDIR)$(INFODIR)$(DIRSEP)fidoconfig.info
>+ endif
>+ ifdef HTMLDIR
>+ 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(HTMLDIR)
>Index: news/husky-devel/files/patch-fidoconf_makefile.inc
>===================================================================
>--- news/husky-devel/files/patch-fidoconf_makefile.inc	(revision 0)
>+++ news/husky-devel/files/patch-fidoconf_makefile.inc	(working copy)
>@@ -0,0 +1,10 @@
>+--- 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/
>+ 
>Index: news/husky-devel/files/patch-fidoconf_man_Makefile
>===================================================================
>--- news/husky-devel/files/patch-fidoconf_man_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-fidoconf_man_Makefile	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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)
>+ 
>+ all:
>+ 
>+-install:	copy link
>++install:	copy
>+ 
>+ 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:
>+ 
>Index: news/husky-devel/files/patch-fidoconf_man_linkedto.1
>===================================================================
>--- news/husky-devel/files/patch-fidoconf_man_linkedto.1	(revision 0)
>+++ news/husky-devel/files/patch-fidoconf_man_linkedto.1	(working copy)
>@@ -0,0 +1,15 @@
>+--- 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.
>+ .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.
>+ .SH NOTES
>+ All Husky-Software is written by various developers. For detailed information
>+ about the Husky-Team take a look at 
>Index: news/husky-devel/files/patch-hpt_Makefile
>===================================================================
>--- news/husky-devel/files/patch-hpt_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-hpt_Makefile	(working copy)
>@@ -0,0 +1,23 @@
>+--- hpt/Makefile.orig	2010-01-19 22:43:29.000000000 +0000
>++++ hpt/Makefile	2013-04-13 19:28:49.000000000 +0000
>+@@ -33,6 +33,7 @@ endif
>+ ifeq ($(PERL), 1)
>+   CFLAGS += -DDO_PERL `perl -MExtUtils::Embed -e ccopts`
>+   PERLLIBS = `perl -MExtUtils::Embed -e ldopts`
>++  LFLAGS += $(PERLLIBS)
>+   PERLOBJ = perl$(_OBJ)
>+ endif
>+ 
>+@@ -61,10 +62,10 @@ all: commonall hpt.1.gz hptlink.1.gz hpt
>+ endif
>+ 
>+ doc:
>+-	-cd doc; make all
>++	-cd doc; $(MAKE) all
>+ 
>+ install-doc:
>+-	-cd doc; make install
>++	-cd doc; $(MAKE) install
>+ 
>+ ifeq ($(SHORTNAMES), 1)
>+ install: hpt$(_EXE) pktinfo$(_EXE) txt2pkt$(_EXE) hptlink$(_EXE) hpttree$(_EXE)
>Index: news/husky-devel/files/patch-hpt_doc_Makefile
>===================================================================
>--- news/husky-devel/files/patch-hpt_doc_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-hpt_doc_Makefile	(working copy)
>@@ -0,0 +1,10 @@
>+--- hpt/doc/Makefile.orig	2009-03-23 12:44:57.000000000 +0000
>++++ hpt/doc/Makefile	2014-08-02 23:05:26.007741567 +0000
>+@@ -64,7 +64,6 @@ install: info html dvi
>+ ifdef INFODIR
>+ 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(INFODIR)
>+ 	$(INSTALL) $(IMOPT) hpt.info $(DESTDIR)$(INFODIR)
>+-	-install-info --info-dir=$(INFODIR)  $(DESTDIR)$(INFODIR)$(DIRSEP)hpt.info
>+ endif
>+ ifdef HTMLDIR
>+ 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(HTMLDIR)
>Index: news/husky-devel/files/patch-htick_Makefile
>===================================================================
>--- news/husky-devel/files/patch-htick_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-htick_Makefile	(working copy)
>@@ -0,0 +1,15 @@
>+--- htick/Makefile.orig	2010-04-20 19:10:55.000000000 +0000
>++++ htick/Makefile	2014-08-02 22:22:28.572741488 +0000
>+@@ -45,6 +45,12 @@ CDEFS=-D$(OSTYPE) $(ADDCDEFS)
>+ 
>+ all: $(OBJS) htick$(EXE)
>+ 
>++doc:
>++	-cd doc; $(MAKE) all
>++
>++install-doc:
>++	-cd doc; $(MAKE) install
>++
>+ %$(_OBJ): $(SRC_DIR)%.c
>+ 	$(CC) $(CFLAGS) $(CDEFS) $(SRC_DIR)$*.c
>+ 
>Index: news/husky-devel/files/patch-htick_doc_Makefile
>===================================================================
>--- news/husky-devel/files/patch-htick_doc_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-htick_doc_Makefile	(working copy)
>@@ -0,0 +1,30 @@
>+--- 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
>+ all: html info dvi
>+ 
>+ ifdef HTMLDIR
>+-html: htick.html htick.rus.html
>++html: htick.html
>+ else
>+ html:
>+ 	@echo
>+@@ -33,7 +33,7 @@ dvi:
>+ endif
>+ 
>+ ifdef INFODIR
>+-info: htick.info htick.rus.info
>++info: htick.info
>+ else
>+ info:
>+ 	@echo
>+@@ -73,8 +73,7 @@ install: info html dvi
>+ 	@echo .
>+ ifdef INFODIR
>+ 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(INFODIR)
>+-	$(INSTALL) $(IMOPT) htick.info htick.rus.info $(DESTDIR)$(INFODIR)
>+-	-install-info --info-dir=$(DESTDIR)$(INFODIR)  $(DESTDIR)$(INFODIR)$(DIRSEP)htick.info
>++	$(INSTALL) $(IMOPT) htick.info $(DESTDIR)$(INFODIR)
>+ endif
>+ ifdef HTMLDIR
>+ 	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(HTMLDIR)
>Index: news/husky-devel/files/patch-huskybse_huskymak.cfg
>===================================================================
>--- news/husky-devel/files/patch-huskybse_huskymak.cfg	(revision 0)
>+++ news/husky-devel/files/patch-huskybse_huskymak.cfg	(working copy)
>@@ -0,0 +1,103 @@
>+--- huskybse/huskymak.cfg.orig	2007-02-23 21:47:15.000000000 +0000
>++++ huskybse/huskymak.cfg	2013-03-25 19:36:08.000000000 +0000
>+@@ -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).
>+-# INFODIR=/usr/local/info
>++INFODIR=$(PREFIX)/info
>+ 
>+ # The same as above, but for DVI documentation. This requires a working
>+ # "texi2dvi" program.
>+@@ -46,7 +46,7 @@ CFGDIR=$(PREFIX)/etc/fido
>+ 
>+ # The same as above, but for HTML documentation. This requires a working
>+ # "texi2html" program.
>+-#HTMLDIR=$(PREFIX)/lib/husky
>++HTMLDIR=$(PREFIX)/share/doc/husky
>+ 
>+ # Name of the config file of MSGED TE:
>+ MSGEDCFG=\"$(CFGDIR)/msged.cfg\"
>+@@ -102,7 +102,7 @@ RM=rm
>+ 
>+ # The "install" program.
>+ # On Linux and FreeBSD/NetBSD, use this:
>+-INSTALL=install
>++INSTALL=
>+ # On Tru64 Unix, use this:
>+ # INSTALL=installbsd
>+ # On Solaris, use this:
>+@@ -116,7 +116,7 @@ MKDIR=mkdir
>+ 
>+ # update dynamic library cache
>+ # If your operating system does not need this, you may comment out this line.
>+-LDCONFIG=/sbin/ldconfig
>++#LDCONFIG=/sbin/ldconfig
>+ 
>+ # rename a file
>+ MV=mv
>+@@ -139,8 +139,8 @@ H2PAS=h2pas
>+ OSTYPE=UNIX
>+ 
>+ # short name of operating system (used for PID lines etc.)
>+-UNAME=LNX
>+-#UNAME=BSD
>++#UNAME=LNX
>++UNAME=BSD
>+ #UNAME=OS2
>+ #UNAME=BEOS
>+ 
>+@@ -151,7 +151,7 @@ DEBUG=0
>+ SHORTNAMES=0
>+ 
>+ # Perl support
>+-PERL=0
>++PERL=1
>+ 
>+ # ZipInternal packer
>+ USE_HPTZIP=0
>+@@ -179,7 +179,7 @@ EXENAMEFLAG=-o
>+ WARNFLAGS=-Wall
>+ 
>+ # C-compiler: optimization
>+-OPTCFLAGS=-c -s -O3 -fomit-frame-pointer -fstrength-reduce -fPIC
>++OPTCFLAGS=-c -fPIC
>+ 
>+ ifeq ( $(DYNLIBS), 0 )
>+   ifeq ($(OSTYPE), UNIX)
>+@@ -216,29 +216,22 @@ OPTLFLAGS=-s
>+ DEBLFLAGS=-g
>+ 
>+ # options for installing programs
>+-OPTIBOPT=-c -s -m 555
>+-DEBIBOPT=-c -m 555
>+-
>+-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)
>+ 
>+ # options for installing shared libs
>+-ILOPT=-c -m 555
>++ILOPT=$(BSD_INSTALL_LIB)
>+ 
>+ # options for installing static libs
>+-ISLOPT=-c -m 444
>++ISLOPT=$(BSD_INSTALL_LIB)
>+ 
>+ # options for installing man-pages
>+-IMOPT=-c -m 444
>++IMOPT=$(BSD_INSTALL_MAN)
>+ 
>+ # options for installing includes
>+-IIOPT=-c -m 444
>++IIOPT=$(BSD_INSTALL_DATA)
>+ 
>+ # options for making links
>+ LNOPT=-sf
>Index: news/husky-devel/files/patch-huskylib_Makefile
>===================================================================
>--- news/husky-devel/files/patch-huskylib_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-huskylib_Makefile	(working copy)
>@@ -0,0 +1,59 @@
>+--- 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)
>Index: news/husky-devel/files/patch-smapi_Makefile
>===================================================================
>--- news/husky-devel/files/patch-smapi_Makefile	(revision 0)
>+++ news/husky-devel/files/patch-smapi_Makefile	(working copy)
>@@ -0,0 +1,50 @@
>+--- 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)
>Index: news/husky-devel/pkg-descr
>===================================================================
>--- news/husky-devel/pkg-descr	(revision 363863)
>+++ news/husky-devel/pkg-descr	(working copy)
>@@ -1,3 +1,8 @@
>+The "meta-port" for Husky Fidosoft Project.
>+
>+Husky is complete freeware suite of Fidonet applications. 
>+
>+WWW: http://husky.sourceforge.net/
> Common files for Husky Fidosoft Project.
> Development version.
> 
>Index: news/husky-fidoconf-devel/Makefile
>===================================================================
>--- news/husky-fidoconf-devel/Makefile	(revision 363863)
>+++ news/husky-fidoconf-devel/Makefile	(working copy)
>@@ -1,43 +1,38 @@
>-# Created by: Oleg Sharoiko <os@rsu.ru>
> # $FreeBSD$
> 
>-PORTNAME=	fidoconf
>-DISTVERSION=	1.4-rc5
>+PORTNAME=	husky-fidoconf
> CATEGORIES=	news mail
>-MASTER_SITES=	SF/husky/fidoconfig/1.4-RC5
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Configuration library for Husky Fidosoft Project. Development version
>+MAINTAINER=	osharoiko@gmail.com
>+COMMENT=	Husky FTN configuration library (development version)
> 
> LIB_DEPENDS=	libsmapi.so:${PORTSDIR}/news/husky-smapi-devel
>-RUN_DEPENDS=	${LOCALBASE}/etc/fido/huskymak.cfg:${PORTSDIR}/news/husky-base-devel
> 
> CONFLICTS=	husky-fidoconf-[0-9]*
> 
>-USE_LDCONFIG=	yes
>+USES=		shebangfix
>+SHEBANG_FILES=	util/fconf2areasbbs.pl util/fconf2na.pl util/sq2fc.pl
>+USE_LDCONFIG=   yes
> INSTALL_TARGET=	install install-man
> 
>-MAN1=		dumpfcfg.1 fconf2.1 linked.1 linkedto.1 tparser.1
>-MLINKS=		fconf2.1 fconf2aquaed.1 \
>-		fconf2.1 fconf2areasbbs.1 \
>-		fconf2.1 fconf2binkd.1 \
>-		fconf2.1 fconf2dir.1 \
>-		fconf2.1 fconf2fidogate.1 \
>-		fconf2.1 fconf2golded.1 \
>-		fconf2.1 fconf2msged.1 \
>-		fconf2.1 fconf2na.pl.1 \
>-		fconf2.1 fconf2squish.1 \
>-		fconf2.1 fconf2tornado.1 \
>-		fconf2.1 fecfg2fconf.1
>-INFO=		fidoconfig
>+MASTERDIR=      ${.CURDIR}/../husky-devel
>+COMPONENT_SUBDIR=       fidoconf
> 
>-NO_STAGE=	yes
> post-patch:
>-	@${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \
>-		${WRKSRC}/man/dumpfcfg.1
>-	@${REINPLACE_CMD} -e 's^/etc/fido/config^${PREFIX}/etc/fido/config^' \
>-		${WRKSRC}/man/fconf2.1 \
>-		${WRKSRC}/man/tparser.1
>+	${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
>+		${WRKSRC}/man/linkedto.1
> 
>-.include "${.CURDIR}/../husky-base-devel/Makefile.inc"
>+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>
>Index: news/husky-fidoconf-devel/distinfo
>===================================================================
>--- news/husky-fidoconf-devel/distinfo	(revision 363863)
>+++ news/husky-fidoconf-devel/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (husky/fidoconf-1.4-rc5.tar.gz) = e107699575427ec1020035e014185b3aac5372ef474f6478049258b1ff668865
>-SIZE (husky/fidoconf-1.4-rc5.tar.gz) = 259164
>Index: news/husky-fidoconf-devel/files/patch-Makefile
>===================================================================
>--- news/husky-fidoconf-devel/files/patch-Makefile	(revision 363863)
>+++ news/husky-fidoconf-devel/files/patch-Makefile	(working copy)
>@@ -1,49 +0,0 @@
>---- Makefile.orig	Wed Oct 19 20:29:25 2005
>-+++ Makefile	Wed Oct 19 20:32:23 2005
>-@@ -87,7 +87,7 @@
>- progs: commonprogs
>- 
>- ifeq ($(DYNLIBS), 1)
>--  all: commonlibs ranlib $(LIBFIDOCONFIG).so.$(VER)
>-+  all: commonlibs ranlib $(LIBFIDOCONFIG).so.$(VERMAJOR)
>- 	$(MAKE) progs
>- 	(cd doc && $(MAKE) all)
>- else
>-@@ -105,28 +105,26 @@
>- 	(cd doc && $(MAKE) distclean)
>- 
>- ifeq (~$(MKSHARED)~, ~ld~)
>--$(LIBFIDOCONFIG).so.$(VER): $(LOBJS)
>--	$(LD) $(LFLAGS) -o $(LIBFIDOCONFIG).so.$(VER) \
>-+$(LIBFIDOCONFIG).so.$(VERMAJOR): $(LOBJS)
>-+	$(LD) $(LFLAGS) -o $(LIBFIDOCONFIG).so.$(VERMAJOR) \
>- 	    $(LOBJS) $(LOPT)
>- else
>--$(LIBFIDOCONFIG).so.$(VER): $(LOBJS)
>--	$(CC) -shared -Wl,-soname,$(LIBFIDOCONFIG).so.$(VERH) \
>--         -o $(LIBFIDOCONFIG).so.$(VER) $(LOBJS) $(LOPT)
>-+$(LIBFIDOCONFIG).so.$(VERMAJOR): $(LOBJS)
>-+	$(CC) -shared -Wl,-soname,$(LIBFIDOCONFIG).so.$(VERMAJOR) \
>-+         -o $(LIBFIDOCONFIG).so.$(VERMAJOR) $(LOBJS) $(LOPT)
>- endif
>--	$(LN) $(LNOPT) $(LIBFIDOCONFIG).so.$(VER) $(LIBFIDOCONFIG).so.$(VERH) ;\
>--	$(LN) $(LNOPT) $(LIBFIDOCONFIG).so.$(VER) $(LIBFIDOCONFIG).so
>-+	$(LN) $(LNOPT) $(LIBFIDOCONFIG).so.$(VERMAJOR) $(LIBFIDOCONFIG).so
>- 
>- %$(OBJ): %.c
>- 	$(CC) $(CDEFS) $(COPT) $*.c
>- 
>- ifeq ($(DYNLIBS), 1)
>--instdyn: $(LIBFIDOCONFIG).so.$(VER)
>-+instdyn: $(LIBFIDOCONFIG).so.$(VERMAJOR)
>- 	-$(MKDIR) $(MKDIROPT) $(LIBDIR)
>--	$(INSTALL) $(ILOPT) $(LIBFIDOCONFIG).so.$(VER) $(LIBDIR)
>-+	$(INSTALL) $(ILOPT) $(LIBFIDOCONFIG).so.$(VERMAJOR) $(LIBDIR)
>- # Removed path from symlinks.
>- 	cd $(LIBDIR) ;\
>--	$(LN) $(LNOPT) $(LIBFIDOCONFIG).so.$(VER) $(LIBFIDOCONFIG).so.$(VERH) ;\
>--	$(LN) $(LNOPT) $(LIBFIDOCONFIG).so.$(VER) $(LIBFIDOCONFIG).so
>-+	$(LN) $(LNOPT) $(LIBFIDOCONFIG).so.$(VERMAJOR) $(LIBFIDOCONFIG).so
>- ifneq (~$(LDCONFIG)~, ~~)
>- 	$(LDCONFIG)
>- endif
>Index: news/husky-fidoconf-devel/files/patch-doc__Makefile
>===================================================================
>--- news/husky-fidoconf-devel/files/patch-doc__Makefile	(revision 363863)
>+++ news/husky-fidoconf-devel/files/patch-doc__Makefile	(working copy)
>@@ -1,31 +0,0 @@
>---- doc/Makefile.orig	Sat Jun  4 09:06:32 2005
>-+++ doc/Makefile	Wed Oct 19 16:34:38 2005
>-@@ -6,7 +6,7 @@
>- include ../../huskymak.cfg
>- endif
>- 
>--all: html info dvi
>-+all: html info
>- 
>- ifdef HTMLDIR
>- html: fidoconfig.html
>-@@ -68,7 +68,7 @@
>- 	-$(RM) $(RMOPT) fidoconfig.doc
>- 	-$(RM) $(RMOPT) fidoconfig.info*
>- 
>--install: info html dvi
>-+install: info html
>- 	@echo .
>- ifdef INFODIR
>- 	-$(MKDIR) $(MKDIROPT) $(INFODIR)
>-@@ -78,10 +78,6 @@
>- ifdef HTMLDIR
>- 	-$(MKDIR) $(MKDIROPT) $(HTMLDIR)
>- 	$(INSTALL) $(IMOPT) fidoconfig*html $(HTMLDIR)
>--endif
>--ifdef DVIDIR
>--	-$(MKDIR) $(MKDIROPT) $(DVIDIR)
>--	$(INSTALL) $(IMOPT) fidoconfig.dvi $(DVIDIR)
>- endif
>- 
>- uninstall:
>Index: news/husky-fidoconf-devel/files/patch-makefile.inc
>===================================================================
>--- news/husky-fidoconf-devel/files/patch-makefile.inc	(revision 363863)
>+++ news/husky-fidoconf-devel/files/patch-makefile.inc	(working copy)
>@@ -1,10 +0,0 @@
>---- makefile.inc.orig	Tue Apr 13 14:24:40 2004
>-+++ makefile.inc	Wed Oct 19 20:39:32 2005
>-@@ -5,6 +5,7 @@
>- 
>- VER = 1.4.0
>- VERH = 1.4
>-+VERMAJOR = 1
>- 
>- include makefile.in1
>- 
>Index: news/husky-fidoconf-devel/files/patch-man__Makefile
>===================================================================
>--- news/husky-fidoconf-devel/files/patch-man__Makefile	(revision 363863)
>+++ news/husky-fidoconf-devel/files/patch-man__Makefile	(working copy)
>@@ -1,20 +0,0 @@
>---- man/Makefile.orig	Wed Feb  5 14:51:47 2003
>-+++ man/Makefile	Wed Oct 19 20:57:40 2005
>-@@ -20,7 +20,7 @@
>- 
>- all:
>- 
>--install:	copy link
>-+install:	copy
>- 
>- copy:
>- 	$(MKDIR) $(MKDIROPT) $(MAN1DIR)
>-@@ -28,7 +28,7 @@
>- 
>- 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:
>- 
>Index: news/husky-fidoconf-devel/files/patch-man__linkedto.1
>===================================================================
>--- news/husky-fidoconf-devel/files/patch-man__linkedto.1	(revision 363863)
>+++ news/husky-fidoconf-devel/files/patch-man__linkedto.1	(working copy)
>@@ -1,11 +0,0 @@
>---- man/linkedto.1.orig	Sat Jan 11 17:52:57 2003
>-+++ man/linkedto.1	Sat Jan 11 17:53:14 2003
>-@@ -19,8 +19,6 @@
>- .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.
>- .SH NOTES
>Index: news/husky-fidoconf-devel/files/patch-tparser.c
>===================================================================
>--- news/husky-fidoconf-devel/files/patch-tparser.c	(revision 363863)
>+++ news/husky-fidoconf-devel/files/patch-tparser.c	(working copy)
>@@ -1,11 +0,0 @@
>---- tparser.c.orig	Wed Oct 19 16:43:38 2005
>-+++ tparser.c	Wed Oct 19 16:43:49 2005
>-@@ -1141,7 +1141,7 @@
>- 
>- const char *smapi_cvs_date(){
>- static
>--#include "../smapi/cvsdate.h"
>-+#include <smapi/cvsdate.h>
>- return cvs_date;
>- }
>- 
>Index: news/husky-fidoconf-devel/pkg-plist
>===================================================================
>--- news/husky-fidoconf-devel/pkg-plist	(revision 363863)
>+++ news/husky-fidoconf-devel/pkg-plist	(working copy)
>@@ -1,8 +1,5 @@
>-share/doc/husky/fidoconfig.html
>-lib/libfidoconfig.so.1
>-lib/libfidoconfig.so
>-lib/libfidoconfig.a
> bin/fconf2aquaed
>+bin/fconf2areasbbs.pl
> bin/fconf2binkd
> bin/fconf2fidogate
> bin/fconf2golded
>@@ -10,25 +7,41 @@
> bin/fconf2na.pl
> bin/fconf2squish
> bin/fconf2tornado
>-bin/tparser
>+bin/fecfg2fconf
> bin/linked
> bin/linkedto
>-bin/fconf2areasbbs
>-include/fidoconf/adcase.h
>+bin/sq2fc.pl
>+bin/tparser
> include/fidoconf/afixcmd.h
> include/fidoconf/arealist.h
> include/fidoconf/areatree.h
> include/fidoconf/common.h
>-include/fidoconf/crc.h
>-include/fidoconf/dirlayer.h
> include/fidoconf/fidoconf.h
> include/fidoconf/fidoconf.pas
> include/fidoconf/findtok.h
>-include/fidoconf/log.h
>-include/fidoconf/recode.h
>-include/fidoconf/temp.h
>-include/fidoconf/tree.h
>-include/fidoconf/typesize.h
>+include/fidoconf/grptree.h
>+include/fidoconf/stat.h
> include/fidoconf/version.h
>-include/fidoconf/xstr.h
>-@dirrm include/fidoconf
>+%%PORTDOCS%%info/fidoconfig.info
>+lib/libfidoconfig.a
>+lib/libfidoconfig.so
>+lib/libfidoconfig.so.1
>+%%PORTDOCS%%man/man1/dumpfcfg.1.gz
>+%%PORTDOCS%%man/man1/fconf2.1.gz
>+%%PORTDOCS%%man/man1/fconf2aquaed.1.gz
>+%%PORTDOCS%%man/man1/fconf2areasbbs.1.gz
>+%%PORTDOCS%%man/man1/fconf2binkd.1.gz
>+%%PORTDOCS%%man/man1/fconf2dir.1.gz
>+%%PORTDOCS%%man/man1/fconf2fidogate.1.gz
>+%%PORTDOCS%%man/man1/fconf2golded.1.gz
>+%%PORTDOCS%%man/man1/fconf2msged.1.gz
>+%%PORTDOCS%%man/man1/fconf2na.pl.1.gz
>+%%PORTDOCS%%man/man1/fconf2squish.1.gz
>+%%PORTDOCS%%man/man1/fconf2tornado.1.gz
>+%%PORTDOCS%%man/man1/fecfg2fconf.1.gz
>+%%PORTDOCS%%man/man1/linked.1.gz
>+%%PORTDOCS%%man/man1/linkedto.1.gz
>+%%PORTDOCS%%man/man1/tparser.1.gz
>+%%PORTDOCS%%share/doc/husky/fidoconfig.html
>+@dirrmtry include/fidoconf
>+@dirrmtry share/doc/husky
>Index: news/husky-hpt-devel/Makefile
>===================================================================
>--- news/husky-hpt-devel/Makefile	(revision 363863)
>+++ news/husky-hpt-devel/Makefile	(working copy)
>@@ -1,50 +1,29 @@
>-# Created by: Oleg Sharoiko <os@rsu.ru>
> # $FreeBSD$
> 
>-PORTNAME=	hpt
>-DISTVERSION=	1.4-rc5
>+PORTNAME=	husky-hpt
> CATEGORIES=	news mail
>-MASTER_SITES=	SF/husky/${PORTNAME}/1.4-RC5
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Highly Portable Tosser (full-featured FTN tosser). Development version
>+MAINTAINER=	osharoiko@gmail.com
>+COMMENT=	Husky FTN tosser (development version)
> 
>-LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf-devel
>+LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf-devel \
>+		libareafix.so:${PORTSDIR}/news/husky-areafix-devel
> 
> CONFLICTS=	husky-hpt-[0-9]*
> 
>-.if !defined(WITHOUT_PERL)
>-MAKE_ARGS+=	PERL=1
>-USES=		perl5
>-.else
>-MAKE_ARGS+=	PERL=0
>-.endif
>-
>-MAN1=		hpt.1 hptlink.1 hpttree.1 pktinfo.1 txt2pkt.1
>-MANCOMPRESSED=	yes
>+ALL_TARGET=	all doc
>+INSTALL_TARGET=	install install-doc
> INFO=		hpt
> 
>-DOCSDIR=	${PREFIX}/share/doc/husky
>-PORTDOCS=	hpt.html
>+MASTERDIR=	${.CURDIR}/../husky-devel
>+COMPONENT_SUBDIR=       hpt
> 
>-NO_STAGE=	yes
> post-patch:
>-	@${REINPLACE_CMD} -e 's^/path/to/config^${PREFIX}/etc/fido/config^' \
>+	${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^' \
>+	${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^' \
>+	${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \
> 		${WRKSRC}/man/txt2pkt.1
> 
>-post-build:
>-.if !defined(NOPORTDOCS)
>-	@cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} all
>-.endif
>-
>-post-install:
>-.if !defined(NOPORTDOCS)
>-	@cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} install
>-.endif
>-
>-.include "${.CURDIR}/../husky-base-devel/Makefile.inc"
> .include <bsd.port.mk>
>Index: news/husky-hpt-devel/distinfo
>===================================================================
>--- news/husky-hpt-devel/distinfo	(revision 363863)
>+++ news/husky-hpt-devel/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (husky/hpt-1.4-rc5.tar.gz) = 5ff8c4079fcb43431fcc87b47b4df1262f085b33c04fd2981c42ce096291d197
>-SIZE (husky/hpt-1.4-rc5.tar.gz) = 373304
>Index: news/husky-hpt-devel/files/patch-doc__Makefile
>===================================================================
>--- news/husky-hpt-devel/files/patch-doc__Makefile	(revision 363863)
>+++ news/husky-hpt-devel/files/patch-doc__Makefile	(working copy)
>@@ -1,31 +0,0 @@
>---- doc/Makefile.orig	Sat Jun  4 09:06:45 2005
>-+++ doc/Makefile	Wed Oct 19 17:15:31 2005
>-@@ -5,7 +5,7 @@
>- include ../../huskymak.cfg
>- endif
>- 
>--all: html info dvi
>-+all: html info
>- 
>- ifdef HTMLDIR
>- html: hpt.html
>-@@ -59,7 +59,7 @@
>- 	-$(RM) $(RMOPT) hpt.inf
>- 	-$(RM) $(RMOPT) hpt*html
>- 
>--install: info html dvi
>-+install: info html
>- 	@echo .
>- ifdef INFODIR
>- 	-$(MKDIR) $(MKDIROPT) $(INFODIR)
>-@@ -69,10 +69,6 @@
>- ifdef HTMLDIR
>- 	-$(MKDIR) $(MKDIROPT) $(HTMLDIR)
>- 	$(INSTALL) $(IMOPT) hpt*html $(HTMLDIR)
>--endif
>--ifdef DVIDIR
>--	-$(MKDIR) $(MKDIROPT) $(DVIDIR)
>--	$(INSTALL)  hpt.dvi $(DVIDIR)
>- endif
>- uninstall:
>- 	-install-info --remove --info-dir=$(INFODIR) $(INFODIR)$(DIRSEP)hpt.info
>Index: news/husky-hpt-devel/pkg-plist
>===================================================================
>--- news/husky-hpt-devel/pkg-plist	(revision 363863)
>+++ news/husky-hpt-devel/pkg-plist	(working copy)
>@@ -1,5 +1,10 @@
> bin/hpt
>+bin/hptlink
>+bin/hpttree
> bin/pktinfo
> bin/txt2pkt
>-bin/hptlink
>-bin/hpttree
>+%%PORTDOCS%%man/man1/hpt.1.gz
>+%%PORTDOCS%%man/man1/hptlink.1.gz
>+%%PORTDOCS%%man/man1/hpttree.1.gz
>+%%PORTDOCS%%man/man1/txt2pkt.1.gz
>+%%PORTDOCS%%share/doc/husky/hpt.html
>Index: news/husky-htick-devel/Makefile
>===================================================================
>--- news/husky-htick-devel/Makefile	(revision 363863)
>+++ news/husky-htick-devel/Makefile	(working copy)
>@@ -1,36 +1,26 @@
>-# Created by: Andrew Clarke <mail@ozzmosis.com>
> # $FreeBSD$
> 
>-PORTNAME=	htick
>-DISTVERSION=	1.4-rc5
>+PORTNAME=	husky-htick
> CATEGORIES=	news mail
>-MASTER_SITES=	SF/husky/${PORTNAME}/1.4-RC5
> 
>-PKGNAMESUFFIX=	-devel
>+MAINTAINER=     osharoiko@gmail.com
>+COMMENT=	Husky FTN file ticker (development version)
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	FTN File ticker, development version
>+LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf-devel \
>+		libareafix.so:${PORTSDIR}/news/husky-areafix-devel
> 
>-LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf-devel
>-
> CONFLICTS=	husky-htick-[0-9]*
> 
>-MAN1=		htick.1
>+ALL_TARGET=	all doc
>+INSTALL_TARGET=	install install-doc
> INFO=		htick
>+USE_LDCONFIG=   yes
> 
>-PLIST_FILES=	bin/htick \
>-		share/doc/husky/htick.html
>+MASTERDIR=      ${.CURDIR}/../husky-devel
>+COMPONENT_SUBDIR=       htick
> 
>-NO_STAGE=	yes
> post-patch:
>-	@${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \
>+	${REINPLACE_CMD} -e 's^/fido/etc/config^${PREFIX}/etc/fido/config^' \
> 		${WRKSRC}/man/htick.1
> 
>-post-build:
>-	@cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} all
>-
>-post-install:
>-	@cd ${WRKSRC}/doc && ${MAKE_CMD} ${MAKE_ARGS} install
>-
>-.include "${.CURDIR}/../husky-base-devel/Makefile.inc"
> .include <bsd.port.mk>
>Index: news/husky-htick-devel/distinfo
>===================================================================
>--- news/husky-htick-devel/distinfo	(revision 363863)
>+++ news/husky-htick-devel/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (husky/htick-1.4-rc5.tar.gz) = 03b9eda2d6bc5467acbdfd939d13911837bc8d04dd95b9c398369a625a494bde
>-SIZE (husky/htick-1.4-rc5.tar.gz) = 122481
>Index: news/husky-htick-devel/files/patch-doc__Makefile
>===================================================================
>--- news/husky-htick-devel/files/patch-doc__Makefile	(revision 363863)
>+++ news/husky-htick-devel/files/patch-doc__Makefile	(working copy)
>@@ -1,31 +0,0 @@
>---- ./doc/Makefile.orig	2005-06-04 04:00:00.000000000 +1000
>-+++ ./doc/Makefile	2008-04-17 02:27:17.000000000 +1000
>-@@ -16,7 +16,7 @@
>- include ../../huskymak.cfg
>- endif
>- 
>--all: html info dvi
>-+all: html info
>- 
>- ifdef HTMLDIR
>- html: htick.html
>-@@ -72,7 +72,7 @@
>- 	-$(RM) $(RMOPT) htick.inf
>- 	-$(RM) $(RMOPT) htick*html
>- 
>--install: info html dvi
>-+install: info html
>- 	@echo .
>- ifdef INFODIR
>- 	-$(MKDIR) $(MKDIROPT) $(INFODIR)
>-@@ -83,10 +83,6 @@
>- 	-$(MKDIR) $(MKDIROPT) $(HTMLDIR)
>- 	$(INSTALL) $(IMOPT) htick*html $(HTMLDIR)
>- endif
>--ifdef DVIDIR
>--	-$(MKDIR) $(MKDIROPT) $(DVIDIR)
>--	$(INSTALL) $(IMOPT) htick.dvi $(DVIDIR)
>--endif
>- 
>- uninstall:
>- 	-install-info --remove --info-dir=$(INFODIR) $(INFODIR)$(DIRSEP)htick.info
>Index: news/husky-htick-devel/pkg-plist
>===================================================================
>--- news/husky-htick-devel/pkg-plist	(revision 0)
>+++ news/husky-htick-devel/pkg-plist	(working copy)
>@@ -0,0 +1,3 @@
>+bin/htick
>+%%PORTDOCS%%man/man1/htick.1.gz
>+%%PORTDOCS%%share/doc/husky/htick.html
>Index: news/husky-huskylib-devel/Makefile
>===================================================================
>--- news/husky-huskylib-devel/Makefile	(revision 0)
>+++ news/husky-huskylib-devel/Makefile	(working copy)
>@@ -0,0 +1,15 @@
>+# $FreeBSD$
>+
>+PORTNAME=	husky-huskylib
>+CATEGORIES=	news mail
>+
>+MAINTAINER=	osharoiko@gmail.com
>+COMMENT=	Husky generic FTN library (development version)
>+
>+INSTALL_TARGET= install install-man
>+USE_LDCONFIG=	yes
>+
>+MASTERDIR=	${.CURDIR}/../husky-devel
>+COMPONENT_SUBDIR=	huskylib
>+
>+.include <bsd.port.mk>
>Index: news/husky-huskylib-devel/pkg-descr
>===================================================================
>--- news/husky-huskylib-devel/pkg-descr	(revision 0)
>+++ news/husky-huskylib-devel/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+MSGAPI for Husky Fidosoft Project.
>+Development version.
>+
>+Husky is complete freeware suite of Fidonet applications. 
>+
>+WWW: http://husky.sourceforge.net/
>Index: news/husky-huskylib-devel/pkg-plist
>===================================================================
>--- news/husky-huskylib-devel/pkg-plist	(revision 0)
>+++ news/husky-huskylib-devel/pkg-plist	(working copy)
>@@ -0,0 +1,48 @@
>+bin/gnmsgid
>+include/huskylib/BCD.h
>+include/huskylib/BCO.h
>+include/huskylib/BCW.h
>+include/huskylib/BEOS5.h
>+include/huskylib/BORLANDC.h
>+include/huskylib/DJGPP.h
>+include/huskylib/EMX.h
>+include/huskylib/HIGHC.h
>+include/huskylib/IBMC_OS2.h
>+include/huskylib/MINGW32.h
>+include/huskylib/MSC.h
>+include/huskylib/MSVC.h
>+include/huskylib/SASC.h
>+include/huskylib/UNIX.h
>+include/huskylib/WATCOMC.h
>+include/huskylib/WCD.h
>+include/huskylib/WCO.h
>+include/huskylib/WCW.h
>+include/huskylib/WCX.h
>+include/huskylib/calendar.h
>+include/huskylib/compiler.h
>+include/huskylib/crc.h
>+include/huskylib/cvtdate.h
>+include/huskylib/dirlayer.h
>+include/huskylib/fexist.h
>+include/huskylib/ffind.h
>+include/huskylib/ftnaddr.h
>+include/huskylib/huskyext.h
>+include/huskylib/huskylib.h
>+include/huskylib/locking.h
>+include/huskylib/log.h
>+include/huskylib/memory.h
>+include/huskylib/pstdint.h
>+include/huskylib/recode.h
>+include/huskylib/strext.h
>+include/huskylib/syslogp.h
>+include/huskylib/temp.h
>+include/huskylib/tree.h
>+include/huskylib/typesize.h
>+include/huskylib/unused.h
>+include/huskylib/vixie.h
>+include/huskylib/xstr.h
>+lib/libhusky.a
>+lib/libhusky.so
>+lib/libhusky.so.1
>+%%PORTDOCS%%man/man1/gnmsgid.1.gz
>+@dirrmtry include/huskylib
>Index: news/husky-smapi-devel/Makefile
>===================================================================
>--- news/husky-smapi-devel/Makefile	(revision 363863)
>+++ news/husky-smapi-devel/Makefile	(working copy)
>@@ -1,18 +1,18 @@
>-# Created by: Oleg Sharoiko <os@rsu.ru>
> # $FreeBSD$
> 
>-PORTNAME=	smapi
>-DISTVERSION=	2.4-rc5
>+PORTNAME=	husky-smapi
> CATEGORIES=	news mail
>-MASTER_SITES=	SF/husky/${PORTNAME}/2.4-RC5
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	MSGAPI for Husky Fidosoft Project. Development version
>+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
> 
>-NO_STAGE=	yes
>-.include "${.CURDIR}/../husky-base-devel/Makefile.inc"
>+MASTERDIR=	${.CURDIR}/../husky-devel
>+COMPONENT_SUBDIR=	smapi
>+
> .include <bsd.port.mk>
>Index: news/husky-smapi-devel/distinfo
>===================================================================
>--- news/husky-smapi-devel/distinfo	(revision 363863)
>+++ news/husky-smapi-devel/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (husky/smapi-2.4-rc5.tar.gz) = 5dde977cc8c52c18ea805edda5758d228d9ab0a85aabb1b1b3b5cec488c56fd8
>-SIZE (husky/smapi-2.4-rc5.tar.gz) = 179989
>Index: news/husky-smapi-devel/files/patch-Makefile
>===================================================================
>--- news/husky-smapi-devel/files/patch-Makefile	(revision 363863)
>+++ news/husky-smapi-devel/files/patch-Makefile	(working copy)
>@@ -1,73 +0,0 @@
>---- Makefile.orig	Wed Oct 19 18:02:47 2005
>-+++ Makefile	Wed Oct 19 18:06:41 2005
>-@@ -30,14 +30,7 @@
>- 
>- 
>- ifeq ($(DYNLIBS), 1)
>--ALL: $(TARGET) $(LIBPREFIX)smapi.so.$(VER)
>--else
>--ALL: $(TARGET)
>--endif
>--
>--
>--ifeq ($(DYNLIBS), 1)
>--all: $(TARGET) $(LIBPREFIX)smapi.so.$(VER)
>-+all: $(TARGET) $(LIBPREFIX)smapi.so.$(VERMAJOR)
>- else
>- all: $(TARGET)
>- endif
>-@@ -53,26 +46,23 @@
>- 
>- ifeq ($(DYNLIBS), 1)
>-   ifeq (~$(MKSHARED)~,~ld~)
>--$(LIBPREFIX)smapi.so.$(VER): $(OBJS)
>-+$(LIBPREFIX)smapi.so.$(VERMAJOR): $(OBJS)
>- 	$(LD) $(OPTLFLAGS) \
>--	      -o $(LIBPREFIX)smapi.so.$(VER) $(OBJS)
>-+	      -o $(LIBPREFIX)smapi.so.$(VERMAJOR) $(OBJS)
>-   else
>--$(LIBPREFIX)smapi.so.$(VER): $(OBJS)
>--	$(CC) -shared -Wl,-soname,$(LIBPREFIX)smapi.so.$(VERH) \
>--          -o $(LIBPREFIX)smapi.so.$(VER) $(OBJS)
>-+$(LIBPREFIX)smapi.so.$(VERMAJOR): $(OBJS)
>-+	$(CC) -shared -Wl,-soname,$(LIBPREFIX)smapi.so.$(VERMAJOR) \
>-+          -o $(LIBPREFIX)smapi.so.$(VERMAJOR) $(OBJS)
>-   endif
>- 
>--instdyn: $(TARGET) $(LIBPREFIX)smapi.so.$(VER)
>-+instdyn: $(TARGET) $(LIBPREFIX)smapi.so.$(VERMAJOR)
>- 	-$(MKDIR) $(MKDIROPT) $(LIBDIR)
>--	$(INSTALL) $(ILOPT) $(LIBPREFIX)smapi.so.$(VER) $(LIBDIR)
>--	-$(RM) $(RMOPT) $(LIBDIR)/$(LIBPREFIX)smapi.so.$(VERH)
>-+	$(INSTALL) $(ILOPT) $(LIBPREFIX)smapi.so.$(VERMAJOR) $(LIBDIR)
>- 	-$(RM) $(RMOPT) $(LIBDIR)/$(LIBPREFIX)smapi.so
>- # Changed the symlinks from symlinks with full path to just symlinks.
>- # Better so :)
>- 	cd $(LIBDIR) ;\
>--	$(LN) $(LNOPT) $(LIBPREFIX)smapi.so.$(VER) $(LIBPREFIX)smapi.so.$(VERH) ;\
>--	$(LN) $(LNOPT) $(LIBPREFIX)smapi.so.$(VER) $(LIBPREFIX)smapi.so.$(VERMAJOR) ;\
>--	$(LN) $(LNOPT) $(LIBPREFIX)smapi.so.$(VER) $(LIBPREFIX)smapi.so
>-+	$(LN) $(LNOPT) $(LIBPREFIX)smapi.so.$(VERMAJOR) $(LIBPREFIX)smapi.so
>- ifneq (~$(LDCONFIG)~, ~~)
>- 	$(LDCONFIG)
>- endif
>-@@ -101,10 +91,8 @@
>- 	-cd $(INCDIR)$(DIRSEP)smapi$(DIRSEP) ;\
>- 	$(RM) $(RMOPT) $(HEADERS)
>- 	-$(RM) $(RMOPT) $(LIBDIR)$(DIRSEP)$(TARGET)
>--	-$(RM) $(RMOPT) $(LIBDIR)$(DIRSEP)$(LIBPREFIX)smapi.so.$(VER)
>--	-$(RM) $(RMOPT) $(LIBDIR)$(DIRSEP)$(LIBPREFIX)smapi.so.$(VERH)
>--	-$(RM) $(RMOPT) $(LIBDIR)$(DIRSEP)$(LIBPREFIX)smapi.so.$(VERMAJOR)
>- 	-$(RM) $(RMOPT) $(LIBDIR)$(DIRSEP)$(LIBPREFIX)smapi.so
>-+	-$(RM) $(RMOPT) $(LIBDIR)$(DIRSEP)$(LIBPREFIX)smapi.so.$(VERMAJOR)
>- 
>- clean:
>- 	-$(RM) $(RMOPT) *$(OBJ)
>-@@ -112,6 +100,6 @@
>- 
>- distclean: clean
>- 	-$(RM) $(RMOPT) $(TARGET)
>--	-$(RM) $(RMOPT) $(LIBPREFIX)smapi.so.$(VER)
>-+	-$(RM) $(RMOPT) $(LIBPREFIX)smapi.so.$(VERMAJOR)
>- 
>- all: $(TARGET)
>Index: news/husky-smapi-devel/files/patch-makefile.inc1
>===================================================================
>--- news/husky-smapi-devel/files/patch-makefile.inc1	(revision 363863)
>+++ news/husky-smapi-devel/files/patch-makefile.inc1	(working copy)
>@@ -1,11 +0,0 @@
>---- makefile.inc.orig	Wed Oct 19 16:39:50 2005
>-+++ makefile.inc	Wed Oct 19 16:40:10 2005
>-@@ -9,7 +9,7 @@
>- 
>- OBJS	= 1stchar$(OBJ) api_sdm$(OBJ) sq_area$(OBJ) sq_hash$(OBJ) sq_help$(OBJ) sq_idx$(OBJ)  sq_kill$(OBJ) sq_lock$(OBJ) sq_misc$(OBJ) sq_msg$(OBJ) sq_read$(OBJ) sq_uid$(OBJ) sq_write$(OBJ) api_jam$(OBJ) cvtdate$(OBJ) date2bin$(OBJ) dosdate$(OBJ) fexist$(OBJ) ffind$(OBJ) flush$(OBJ) locking$(OBJ) months$(OBJ) msgapi$(OBJ) parsenn$(OBJ) patmat$(OBJ) qksort$(OBJ) strextra$(OBJ) strftim$(OBJ) strocpy$(OBJ) structrw$(OBJ) trail$(OBJ) weekday$(OBJ) setfsize$(OBJ) tdelay$(OBJ) genmsgid$(OBJ)
>- 
>--HEADERS = api_brow.h api_jam.h compiler.h ffind.h msgapi.h patmat.h prog.h progprot.h stamp.h typedefs.h unused.h
>-+HEADERS = api_brow.h api_jam.h compiler.h cvsdate.h ffind.h msgapi.h patmat.h prog.h progprot.h stamp.h typedefs.h unused.h
>- 
>- GMOBJS	= genmsgid$(OBJ) fexist$(OBJ) ffind$(OBJ) trail$(OBJ) patmat$(OBJ)
>- 
>Index: news/husky-smapi-devel/pkg-plist
>===================================================================
>--- news/husky-smapi-devel/pkg-plist	(revision 363863)
>+++ news/husky-smapi-devel/pkg-plist	(working copy)
>@@ -1,16 +1,13 @@
>+include/smapi/api_jam.h
>+include/smapi/api_jamp.h
>+include/smapi/api_sdm.h
>+include/smapi/api_sdmp.h
>+include/smapi/api_sq.h
>+include/smapi/api_sqp.h
>+include/smapi/apidebug.h
>+include/smapi/msgapi.h
>+include/smapi/old_msg.h
>+lib/libsmapi.a
> lib/libsmapi.so
> lib/libsmapi.so.2
>-lib/libsmapi.a
>-include/smapi/api_brow.h
>-include/smapi/api_jam.h
>-include/smapi/compiler.h
>-include/smapi/cvsdate.h
>-include/smapi/ffind.h
>-include/smapi/msgapi.h
>-include/smapi/patmat.h
>-include/smapi/prog.h
>-include/smapi/progprot.h
>-include/smapi/stamp.h
>-include/smapi/typedefs.h
>-include/smapi/unused.h
>-@dirrm include/smapi
>+@dirrmtry include/smapi

Flags:

osharoiko: maintainer-approval+

Actions: View | Diff

Attachments on bug 185154: 139000 | 145294 | 145295 | 145348 | 145349 | 145350 | 145351 | 145352 | 145353 | 145354 | 145355 | 145356