svn commit: r528069 - in head/news: husky husky-areafix husky-fidoconf husky-hpt husky-htick husky-huskylib husky-smapi husky-sqpack husky/files
Tobias C. Berner
tcberner at FreeBSD.org
Sun Mar 8 19:09:21 UTC 2020
Author: tcberner
Date: Sun Mar 8 19:09:14 2020
New Revision: 528069
URL: https://svnweb.freebsd.org/changeset/ports/528069
Log:
news/husky*: Update ports to latest versions
PR: 243030
Submitted by: Oleg Sharoyko <osharoiko at gmail.com> (maintainer)
Reported by: Ruslan Suleimanov <rs at paket.ua>
Added:
head/news/husky/files/patch-fidoconf_src_line.c (contents, props changed)
Deleted:
head/news/husky/files/patch-areafix_Makefile
head/news/husky/files/patch-fidoconf_doc_fidoconfig.texi
head/news/husky/files/patch-fidoconf_makefile.in2
head/news/husky/files/patch-fidoconf_makefile.inc
head/news/husky/files/patch-htick_doc_htick.texi
head/news/husky/files/patch-huskylib_Makefile
head/news/husky/files/patch-smapi_Makefile
Modified:
head/news/husky-areafix/Makefile
head/news/husky-areafix/pkg-plist
head/news/husky-fidoconf/Makefile
head/news/husky-fidoconf/pkg-plist
head/news/husky-hpt/Makefile
head/news/husky-htick/Makefile
head/news/husky-huskylib/Makefile
head/news/husky-huskylib/pkg-plist
head/news/husky-smapi/Makefile
head/news/husky-smapi/pkg-plist
head/news/husky-sqpack/Makefile
head/news/husky-sqpack/pkg-descr
head/news/husky/Makefile
head/news/husky/distinfo
head/news/husky/files/patch-fidoconf_Makefile
head/news/husky/files/patch-fidoconf_doc_Makefile
head/news/husky/files/patch-fidoconf_man_Makefile
head/news/husky/files/patch-fidoconf_man_linkedto.1
head/news/husky/files/patch-hpt_Makefile
head/news/husky/files/patch-hpt_doc_Makefile
head/news/husky/files/patch-hpt_src_perl.c
head/news/husky/files/patch-htick_Makefile
head/news/husky/files/patch-htick_doc_Makefile
head/news/husky/files/patch-huskybse_huskymak.cfg
Modified: head/news/husky-areafix/Makefile
==============================================================================
--- head/news/husky-areafix/Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-areafix/Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky-areafix/pkg-plist
==============================================================================
--- head/news/husky-areafix/pkg-plist Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-areafix/pkg-plist Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky-fidoconf/Makefile
==============================================================================
--- head/news/husky-fidoconf/Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-fidoconf/Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky-fidoconf/pkg-plist
==============================================================================
--- head/news/husky-fidoconf/pkg-plist Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-fidoconf/pkg-plist Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky-hpt/Makefile
==============================================================================
--- head/news/husky-hpt/Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-hpt/Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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"
Modified: head/news/husky-htick/Makefile
==============================================================================
--- head/news/husky-htick/Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-htick/Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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"
Modified: head/news/husky-huskylib/Makefile
==============================================================================
--- head/news/husky-huskylib/Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-huskylib/Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky-huskylib/pkg-plist
==============================================================================
--- head/news/husky-huskylib/pkg-plist Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-huskylib/pkg-plist Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky-smapi/Makefile
==============================================================================
--- head/news/husky-smapi/Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-smapi/Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky-smapi/pkg-plist
==============================================================================
--- head/news/husky-smapi/pkg-plist Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-smapi/pkg-plist Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky-sqpack/Makefile
==============================================================================
--- head/news/husky-sqpack/Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-sqpack/Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -4,8 +4,12 @@ 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"
Modified: head/news/husky-sqpack/pkg-descr
==============================================================================
--- head/news/husky-sqpack/pkg-descr Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky-sqpack/pkg-descr Sun Mar 8 19:09:14 2020 (r528069)
@@ -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/
Modified: head/news/husky/Makefile
==============================================================================
--- head/news/husky/Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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 at 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>
Modified: head/news/husky/distinfo
==============================================================================
--- head/news/husky/distinfo Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/distinfo Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky/files/patch-fidoconf_Makefile
==============================================================================
--- head/news/husky/files/patch-fidoconf_Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-fidoconf_Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky/files/patch-fidoconf_doc_Makefile
==============================================================================
--- head/news/husky/files/patch-fidoconf_doc_Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-fidoconf_doc_Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -1,25 +1,31 @@
---- 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
-info: fidoconfig.info fidoconfig.ru.info
+info: fidoconfig.info
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)
Modified: head/news/husky/files/patch-fidoconf_man_Makefile
==============================================================================
--- head/news/husky/files/patch-fidoconf_man_Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-fidoconf_man_Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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:
-
Modified: head/news/husky/files/patch-fidoconf_man_linkedto.1
==============================================================================
--- head/news/husky/files/patch-fidoconf_man_linkedto.1 Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-fidoconf_man_linkedto.1 Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Added: head/news/husky/files/patch-fidoconf_src_line.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/news/husky/files/patch-fidoconf_src_line.c Sun Mar 8 19:09:14 2020 (r528069)
@@ -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;
Modified: head/news/husky/files/patch-hpt_Makefile
==============================================================================
--- head/news/husky/files/patch-hpt_Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-hpt_Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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:
Modified: head/news/husky/files/patch-hpt_doc_Makefile
==============================================================================
--- head/news/husky/files/patch-hpt_doc_Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-hpt_doc_Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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)
Modified: head/news/husky/files/patch-hpt_src_perl.c
==============================================================================
--- head/news/husky/files/patch-hpt_src_perl.c Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-hpt_src_perl.c Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky/files/patch-htick_Makefile
==============================================================================
--- head/news/husky/files/patch-htick_Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-htick_Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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)
Modified: head/news/husky/files/patch-htick_doc_Makefile
==============================================================================
--- head/news/husky/files/patch-htick_doc_Makefile Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-htick_doc_Makefile Sun Mar 8 19:09:14 2020 (r528069)
@@ -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
Modified: head/news/husky/files/patch-huskybse_huskymak.cfg
==============================================================================
--- head/news/husky/files/patch-huskybse_huskymak.cfg Sun Mar 8 18:44:05 2020 (r528068)
+++ head/news/husky/files/patch-huskybse_huskymak.cfg Sun Mar 8 19:09:14 2020 (r528069)
@@ -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)
More information about the svn-ports-all
mailing list