Index: head/news/husky/Makefile =================================================================== --- head/news/husky/Makefile (revision 528068) +++ head/news/husky/Makefile (revision 528069) @@ -1,38 +1,36 @@ # $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 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 Index: head/news/husky/distinfo =================================================================== --- head/news/husky/distinfo (revision 528068) +++ head/news/husky/distinfo (revision 528069) @@ -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 Index: head/news/husky/files/patch-areafix_Makefile =================================================================== --- head/news/husky/files/patch-areafix_Makefile (revision 528068) +++ head/news/husky/files/patch-areafix_Makefile (nonexistent) @@ -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) Property changes on: head/news/husky/files/patch-areafix_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/news/husky/files/patch-fidoconf_makefile.in2 =================================================================== --- head/news/husky/files/patch-fidoconf_makefile.in2 (revision 528068) +++ head/news/husky/files/patch-fidoconf_makefile.in2 (nonexistent) @@ -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 Property changes on: head/news/husky/files/patch-fidoconf_makefile.in2 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/news/husky/files/patch-fidoconf_doc_fidoconfig.texi =================================================================== --- head/news/husky/files/patch-fidoconf_doc_fidoconfig.texi (revision 528068) +++ head/news/husky/files/patch-fidoconf_doc_fidoconfig.texi (nonexistent) @@ -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. Property changes on: head/news/husky/files/patch-fidoconf_doc_fidoconfig.texi ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/news/husky/files/patch-huskylib_Makefile =================================================================== --- head/news/husky/files/patch-huskylib_Makefile (revision 528068) +++ head/news/husky/files/patch-huskylib_Makefile (nonexistent) @@ -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) Property changes on: head/news/husky/files/patch-huskylib_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/news/husky/files/patch-htick_doc_htick.texi =================================================================== --- head/news/husky/files/patch-htick_doc_htick.texi (revision 528068) +++ head/news/husky/files/patch-htick_doc_htick.texi (nonexistent) @@ -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 Property changes on: head/news/husky/files/patch-htick_doc_htick.texi ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/news/husky/files/patch-smapi_Makefile =================================================================== --- head/news/husky/files/patch-smapi_Makefile (revision 528068) +++ head/news/husky/files/patch-smapi_Makefile (nonexistent) @@ -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) Property changes on: head/news/husky/files/patch-smapi_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/news/husky/files/patch-fidoconf_makefile.inc =================================================================== --- head/news/husky/files/patch-fidoconf_makefile.inc (revision 528068) +++ head/news/husky/files/patch-fidoconf_makefile.inc (nonexistent) @@ -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/ - Property changes on: head/news/husky/files/patch-fidoconf_makefile.inc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/news/husky/files/patch-fidoconf_Makefile =================================================================== --- head/news/husky/files/patch-fidoconf_Makefile (revision 528068) +++ head/news/husky/files/patch-fidoconf_Makefile (revision 528069) @@ -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 Index: head/news/husky/files/patch-fidoconf_doc_Makefile =================================================================== --- head/news/husky/files/patch-fidoconf_doc_Makefile (revision 528068) +++ head/news/husky/files/patch-fidoconf_doc_Makefile (revision 528069) @@ -1,29 +1,35 @@ ---- 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) - -install-info --info-dir=$(INFODIR) $(DESTDIR)$(INFODIR)$(DIRSEP)fidoconfig.info endif ifdef HTMLDIR -$(MKDIR) $(MKDIROPT) $(DESTDIR)$(HTMLDIR) Index: head/news/husky/files/patch-fidoconf_man_Makefile =================================================================== --- head/news/husky/files/patch-fidoconf_man_Makefile (revision 528068) +++ head/news/husky/files/patch-fidoconf_man_Makefile (revision 528069) @@ -1,20 +1,11 @@ ---- 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: -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: head/news/husky/files/patch-fidoconf_man_linkedto.1 =================================================================== --- head/news/husky/files/patch-fidoconf_man_linkedto.1 (revision 528068) +++ head/news/husky/files/patch-fidoconf_man_linkedto.1 (revision 528069) @@ -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 Index: head/news/husky/files/patch-fidoconf_src_line.c =================================================================== --- head/news/husky/files/patch-fidoconf_src_line.c (nonexistent) +++ head/news/husky/files/patch-fidoconf_src_line.c (revision 528069) @@ -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; Property changes on: head/news/husky/files/patch-fidoconf_src_line.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/news/husky/files/patch-hpt_Makefile =================================================================== --- head/news/husky/files/patch-hpt_Makefile (revision 528068) +++ head/news/husky/files/patch-hpt_Makefile (revision 528069) @@ -1,23 +1,23 @@ ---- 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` 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 +@@ -61,10 +62,10 @@ all: commonall hpt.1.gz hptlink.1.gz hpttree.1.gz txt2 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: head/news/husky/files/patch-hpt_doc_Makefile =================================================================== --- head/news/husky/files/patch-hpt_doc_Makefile (revision 528068) +++ head/news/husky/files/patch-hpt_doc_Makefile (revision 528069) @@ -1,10 +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 +--- 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) $(INSTALL) $(IMOPT) hpt.info $(DESTDIR)$(INFODIR) - -install-info --info-dir=$(INFODIR) $(DESTDIR)$(INFODIR)$(DIRSEP)hpt.info endif ifdef HTMLDIR -$(MKDIR) $(MKDIROPT) $(DESTDIR)$(HTMLDIR) Index: head/news/husky/files/patch-hpt_src_perl.c =================================================================== --- head/news/husky/files/patch-hpt_src_perl.c (revision 528068) +++ head/news/husky/files/patch-hpt_src_perl.c (revision 528069) @@ -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 Index: head/news/husky/files/patch-htick_Makefile =================================================================== --- head/news/husky/files/patch-htick_Makefile (revision 528068) +++ head/news/husky/files/patch-htick_Makefile (revision 528069) @@ -1,15 +1,15 @@ ---- 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) +doc: + -cd doc; $(MAKE) all + +install-doc: + -cd doc; $(MAKE) install + %$(_OBJ): $(SRC_DIR)%.c $(CC) $(CFLAGS) $(CDEFS) $(SRC_DIR)$*.c Index: head/news/husky/files/patch-htick_doc_Makefile =================================================================== --- head/news/husky/files/patch-htick_doc_Makefile (revision 528068) +++ head/news/husky/files/patch-htick_doc_Makefile (revision 528069) @@ -1,30 +1,37 @@ ---- 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 -html: htick.html htick.rus.html +html: htick.html 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 -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: head/news/husky/files/patch-huskybse_huskymak.cfg =================================================================== --- head/news/husky/files/patch-huskybse_huskymak.cfg (revision 528068) +++ head/news/husky/files/patch-huskybse_huskymak.cfg (revision 528069) @@ -1,124 +1,159 @@ ---- 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). -# 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 @@ +@@ -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\" -@@ -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 -MKSHARED=gcc +MKSHARED=$(CC) # remove file 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 @@ +@@ -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 @@ +@@ -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 @@ +@@ -151,14 +151,14 @@ DEBUG=0 SHORTNAMES=0 # Perl support -PERL=0 +PERL=1 # 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 -OPTCFLAGS=-c -s -O3 -fomit-frame-pointer -fstrength-reduce -fPIC +OPTCFLAGS=-c -fPIC 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) # 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: head/news/husky-areafix/Makefile =================================================================== --- head/news/husky-areafix/Makefile (revision 528068) +++ head/news/husky-areafix/Makefile (revision 528069) @@ -1,14 +1,18 @@ # $FreeBSD$ 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 MASTERDIR= ${.CURDIR}/../husky COMPONENT_SUBDIR= areafix .include "${MASTERDIR}/Makefile" Index: head/news/husky-areafix/pkg-plist =================================================================== --- head/news/husky-areafix/pkg-plist (revision 528068) +++ head/news/husky-areafix/pkg-plist (revision 528069) @@ -1,8 +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 +lib/libareafix.so.1.9 +lib/libareafix.so.1.9.0 Index: head/news/husky-fidoconf/Makefile =================================================================== --- head/news/husky-fidoconf/Makefile (revision 528068) +++ head/news/husky-fidoconf/Makefile (revision 528069) @@ -1,43 +1,46 @@ # $FreeBSD$ 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 PORTDOCS= fidoconfig.html DOCSDIR= ${PREFIX}/share/doc/husky INFO= fidoconfig MAKE_ARGS= INFODIR=${PREFIX}/${INFO_PATH} 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 ${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 "${MASTERDIR}/Makefile" Index: head/news/husky-fidoconf/pkg-plist =================================================================== --- head/news/husky-fidoconf/pkg-plist (revision 528068) +++ head/news/husky-fidoconf/pkg-plist (revision 528069) @@ -1,43 +1,44 @@ bin/fconf2aquaed bin/fconf2areasbbs.pl bin/fconf2binkd bin/fconf2fidogate bin/fconf2golded bin/fconf2msged bin/fconf2na.pl bin/fconf2squish bin/fconf2tornado bin/fecfg2fconf bin/linked bin/linkedto bin/sq2fc.pl bin/tparser include/fidoconf/afixcmd.h include/fidoconf/arealist.h include/fidoconf/areatree.h include/fidoconf/common.h include/fidoconf/fidoconf.h include/fidoconf/fidoconf.pas include/fidoconf/findtok.h include/fidoconf/grptree.h 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 man/man1/fconf2areasbbs.1.gz man/man1/fconf2binkd.1.gz man/man1/fconf2dir.1.gz man/man1/fconf2fidogate.1.gz man/man1/fconf2golded.1.gz man/man1/fconf2msged.1.gz man/man1/fconf2na.pl.1.gz man/man1/fconf2squish.1.gz man/man1/fconf2tornado.1.gz man/man1/fecfg2fconf.1.gz man/man1/linked.1.gz man/man1/linkedto.1.gz man/man1/tparser.1.gz Index: head/news/husky-hpt/Makefile =================================================================== --- head/news/husky-hpt/Makefile (revision 528068) +++ head/news/husky-hpt/Makefile (revision 528069) @@ -1,29 +1,33 @@ # $FreeBSD$ 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" Index: head/news/husky-htick/Makefile =================================================================== --- head/news/husky-htick/Makefile (revision 528068) +++ head/news/husky-htick/Makefile (revision 528069) @@ -1,33 +1,37 @@ # $FreeBSD$ 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 ALL_TARGET+= doc INSTALL_TARGET+= install-doc PORTDOCS= htick.html DOCSDIR= ${PREFIX}/share/doc/husky INFO= htick MAKE_ARGS= INFODIR=${PREFIX}/${INFO_PATH} 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" Index: head/news/husky-huskylib/Makefile =================================================================== --- head/news/husky-huskylib/Makefile (revision 528068) +++ head/news/husky-huskylib/Makefile (revision 528069) @@ -1,15 +1,17 @@ # $FreeBSD$ 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 COMPONENT_SUBDIR= huskylib OPTIONS_DEFINE= DOCS .include "${MASTERDIR}/Makefile" Index: head/news/husky-huskylib/pkg-plist =================================================================== --- head/news/husky-huskylib/pkg-plist (revision 528068) +++ head/news/husky-huskylib/pkg-plist (revision 528069) @@ -1,47 +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 +lib/libhusky.so.1.9 +lib/libhusky.so.1.9.0 %%PORTDOCS%%man/man1/gnmsgid.1.gz Index: head/news/husky-smapi/Makefile =================================================================== --- head/news/husky-smapi/Makefile (revision 528068) +++ head/news/husky-smapi/Makefile (revision 528069) @@ -1,15 +1,17 @@ # $FreeBSD$ PORTNAME= husky-smapi 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 MASTERDIR= ${.CURDIR}/../husky COMPONENT_SUBDIR= smapi .include "${MASTERDIR}/Makefile" Index: head/news/husky-smapi/pkg-plist =================================================================== --- head/news/husky-smapi/pkg-plist (revision 528068) +++ head/news/husky-smapi/pkg-plist (revision 528069) @@ -1,12 +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.so.2.5 +lib/libsmapi.so.2.5.0 Index: head/news/husky-sqpack/Makefile =================================================================== --- head/news/husky-sqpack/Makefile (revision 528068) +++ head/news/husky-sqpack/Makefile (revision 528069) @@ -1,19 +1,23 @@ # $FreeBSD$ 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 MASTERDIR= ${.CURDIR}/../husky 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" Index: head/news/husky-sqpack/pkg-descr =================================================================== --- head/news/husky-sqpack/pkg-descr (revision 528068) +++ head/news/husky-sqpack/pkg-descr (revision 528069) @@ -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/