Attachment 210935 Details for Bug 243030 – Update news/husky* ports to 1.9.20191207

[patch] Update news/husky* ports to 1.9.20191207

husky_update_v2.diff (text/plain), 28.36 KB, created by Oleg Sharoyko on 2020-01-21 21:59:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Sharoyko

Created: 2020-01-21 21:59:57 UTC

Size: 28.36 KB

patch

obsolete

>Index: news/husky/Makefile
>===================================================================
>--- news/husky/Makefile	(revision 523195)
>+++ news/husky/Makefile	(working copy)
>@@ -1,17 +1,14 @@
> # $FreeBSD$
> 
> PORTNAME?=	husky
>-PORTVERSION=	1.9.20140519
>-PORTREVISION?=	3
>-PORTEPOCH?=	0
>+PORTVERSION=	1.9.20191207
> CATEGORIES?=	news mail
>-MASTER_SITES=	SF/husky/husky/1.9-current/2014.05.19
>+MASTER_SITES=	http://download.huskyproject.org/sources/
>+DISTNAME=	husky-all-1.9-source-20191207
> 
> MAINTAINER?=	osharoiko@gmail.com
> COMMENT?=	Husky full featured highly portable FTN Tosser
> 
>-DISTNAME=	husky-all-1.9-source-20140519
>-
> .if ${PORTNAME} == "husky"
> RUN_DEPENDS=	hpt:news/husky-hpt \
> 		htick:news/husky-htick
>@@ -20,10 +17,11 @@
> NO_INSTALL=	yes
> .endif
> 
>-USES+=		alias gmake tar:tgz
>+USES+=		alias dos2unix gmake zip
> 
>-HUSKY_ROOTDIR=	${WRKDIR}/husky
>+HUSKY_ROOTDIR=	${WRKDIR}
> PATCH_WRKSRC=	${HUSKY_ROOTDIR}
>+DOS2UNIX_WRKSRC=${HUSKY_ROOTDIR}
> WRKSRC=		${HUSKY_ROOTDIR}/${COMPONENT_SUBDIR}
> PKGDIR=		${.CURDIR}
> 
>Index: news/husky/distinfo
>===================================================================
>--- news/husky/distinfo	(revision 523195)
>+++ news/husky/distinfo	(working copy)
>@@ -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: news/husky/files/patch-areafix_Makefile
>===================================================================
>--- news/husky/files/patch-areafix_Makefile	(revision 523195)
>+++ news/husky/files/patch-areafix_Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- 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)
>+--- areafix/Makefile.orig	2020-01-16 23:00:05 UTC
>++++ areafix/Makefile
>+@@ -37,7 +37,7 @@ CDEFS=-D$(OSTYPE) $(ADDCDEFS) -I$(H_DIR) -I$(INCDIR)
>  LIBS=-lhusky -lsmapi -lfidoconfig
>  
>  ifeq ($(DYNLIBS), 1)
>@@ -9,7 +9,7 @@
>  else
>  all: $(TARGETLIB)
>  endif
>-@@ -54,24 +54,22 @@ endif                                   
>+@@ -54,24 +54,22 @@ endif                                                 
>  
>  ifeq ($(DYNLIBS), 1)
>    ifeq (~$(MKSHARED)~,~ld~)
>Index: news/husky/files/patch-fidoconf_Makefile
>===================================================================
>--- news/husky/files/patch-fidoconf_Makefile	(revision 523195)
>+++ news/husky/files/patch-fidoconf_Makefile	(working copy)
>@@ -1,29 +1,43 @@
>---- 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-01-16 21:50:04 UTC
>++++ fidoconf/Makefile
>+@@ -61,6 +61,10 @@ endif
>+ 
>+ default: all
>+ 
>++TARGETLIB = $(LIBPREFIX)$(LIBNAME)$(LIBSUFFIX)$(_LIB)
>++TARGETDLL = $(DLLPREFIX)$(LIBNAME)$(DLLSUFFIX)$(_DLL)
>++TARGET=$(TARGETDLL)
>++
>+ ifeq ($(SHORTNAMES), 1)
>+ include make/fn_short.inc
>+ else
>+@@ -68,39 +72,36 @@ 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
>+ include makefile.in2
>+-TARGETLIB = $(LIBPREFIX)$(LIBNAME)$(LIBSUFFIX)$(_LIB)
>+-TARGETDLL = $(DLLPREFIX)$(LIBNAME)$(DLLSUFFIX)$(_DLL)
>+ LIBS=-lhusky
>  
>  progs: commonprogs
>  
>  ifeq ($(DYNLIBS), 1)
>-   TARGET = $(TARGETDLL)
>+-  TARGET = $(TARGETDLL)
> -  all: commonlibs $(TARGETDLL).$(VER)
>-+  all: commonlibs $(TARGETDLL).$(VERMAJOR)
>++  $(TARGETDLL): $(TARGETDLL).$(VERMAJOR)
>++	$(LN) $(LNOPT) $(TARGETDLL).$(VERMAJOR) $(TARGETDLL)
>++
>++  all: commonlibs $(TARGETDLL)
>  	$(MAKE) progs
>  	(cd doc && $(MAKE) all)
>  else
>-@@ -86,21 +84,24 @@ else
>+   TARGET = $(TARGETLIB)
>+-  all: commonlibs
>+-	$(MAKE) progs
>++  all: commonlibs progs
>  	(cd doc && $(MAKE) all)
>  endif
>  
>-+include makefile.in2
>-+LIBS=-lhusky
>  
>  ifeq (~$(MKSHARED)~, ~ld~)
> -$(TARGETDLL).$(VER): $(LOBJS)
>@@ -32,17 +46,13 @@
> +	$(LD) $(LFLAGS) $(EXENAMEFLAG) $(TARGETDLL).$(VERMAJOR) $(LOBJS) $(LIBS)
>  else
> -$(TARGETDLL).$(VER): $(LOBJS)
>--	$(CC) $(LFLAGS) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
>++$(TARGETDLL).$(VERMAJOR): $(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
>Index: news/husky/files/patch-fidoconf_doc_Makefile
>===================================================================
>--- news/husky/files/patch-fidoconf_doc_Makefile	(revision 523195)
>+++ news/husky/files/patch-fidoconf_doc_Makefile	(working copy)
>@@ -1,18 +1,24 @@
>---- 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
>@@ -19,7 +25,7 @@
>  else
>  info:
>  	@echo
>-@@ -86,7 +85,6 @@ install: info html dvi
>+@@ -85,7 +85,6 @@ install: info html dvi
>  ifdef INFODIR
>  	-$(MKDIR) $(MKDIROPT) $(DESTDIR)$(INFODIR)
>  	$(INSTALL) $(IMOPT) fidoconfig.info $(DESTDIR)$(INFODIR)
>Index: news/husky/files/patch-fidoconf_doc_fidoconfig.texi
>===================================================================
>--- news/husky/files/patch-fidoconf_doc_fidoconfig.texi	(revision 523195)
>+++ 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: 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: news/husky/files/patch-fidoconf_makefile.in2
>===================================================================
>--- news/husky/files/patch-fidoconf_makefile.in2	(revision 523195)
>+++ 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: 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: news/husky/files/patch-fidoconf_makefile.inc
>===================================================================
>--- news/husky/files/patch-fidoconf_makefile.inc	(revision 523195)
>+++ news/husky/files/patch-fidoconf_makefile.inc	(working copy)
>@@ -1,5 +1,5 @@
>---- fidoconf/makefile.inc.orig	2010-03-24 20:32:22.000000000 +0000
>-+++ fidoconf/makefile.inc	2013-03-25 00:12:55.000000000 +0000
>+--- fidoconf/makefile.inc.orig	2020-01-16 21:50:04 UTC
>++++ fidoconf/makefile.inc
> @@ -5,6 +5,7 @@
>  
>  VER = 1.9.0
>Index: news/husky/files/patch-fidoconf_man_Makefile
>===================================================================
>--- news/husky/files/patch-fidoconf_man_Makefile	(revision 523195)
>+++ news/husky/files/patch-fidoconf_man_Makefile	(working copy)
>@@ -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:
>- 
>Index: news/husky/files/patch-fidoconf_man_linkedto.1
>===================================================================
>--- news/husky/files/patch-fidoconf_man_linkedto.1	(revision 523195)
>+++ news/husky/files/patch-fidoconf_man_linkedto.1	(working copy)
>@@ -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: news/husky/files/patch-fidoconf_src_line.c
>===================================================================
>--- news/husky/files/patch-fidoconf_src_line.c	(nonexistent)
>+++ news/husky/files/patch-fidoconf_src_line.c	(working copy)
>@@ -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: 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: news/husky/files/patch-hpt_Makefile
>===================================================================
>--- news/husky/files/patch-hpt_Makefile	(revision 523195)
>+++ news/husky/files/patch-hpt_Makefile	(working copy)
>@@ -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:
>Index: news/husky/files/patch-hpt_doc_Makefile
>===================================================================
>--- news/husky/files/patch-hpt_doc_Makefile	(revision 523195)
>+++ news/husky/files/patch-hpt_doc_Makefile	(working copy)
>@@ -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)
>Index: news/husky/files/patch-hpt_src_perl.c
>===================================================================
>--- news/husky/files/patch-hpt_src_perl.c	(revision 523195)
>+++ news/husky/files/patch-hpt_src_perl.c	(working copy)
>@@ -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: news/husky/files/patch-htick_Makefile
>===================================================================
>--- news/husky/files/patch-htick_Makefile	(revision 523195)
>+++ news/husky/files/patch-htick_Makefile	(working copy)
>@@ -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)
>Index: news/husky/files/patch-htick_doc_Makefile
>===================================================================
>--- news/husky/files/patch-htick_doc_Makefile	(revision 523195)
>+++ news/husky/files/patch-htick_doc_Makefile	(working copy)
>@@ -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,9 +9,16 @@
>  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
>Index: news/husky/files/patch-htick_doc_htick.texi
>===================================================================
>--- news/husky/files/patch-htick_doc_htick.texi	(revision 523195)
>+++ 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: 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: news/husky/files/patch-huskybse_huskymak.cfg
>===================================================================
>--- news/husky/files/patch-huskybse_huskymak.cfg	(revision 523195)
>+++ news/husky/files/patch-huskybse_huskymak.cfg	(working copy)
>@@ -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)
>Index: news/husky/files/patch-huskylib_Makefile
>===================================================================
>--- news/husky/files/patch-huskylib_Makefile	(revision 523195)
>+++ news/husky/files/patch-huskylib_Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- huskylib/Makefile.orig	2009-07-02 08:23:20.000000000 +0000
>-+++ huskylib/Makefile	2013-03-25 19:30:48.000000000 +0000
>+--- huskylib/Makefile.orig	2020-01-16 21:50:04 UTC
>++++ huskylib/Makefile
> @@ -31,7 +31,7 @@ LIBS=
>  #-L. -l$(LIBNAME)
>  
>@@ -19,10 +19,9 @@
> +	$(LD) $(LFLAGS) -o $(TARGETDLL).$(VERMAJOR) $(OBJS)
>    else
> -$(TARGETDLL).$(VER): $(OBJS)
>--	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
>++$(TARGETDLL).$(VERMAJOR): $(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) ;\
>@@ -44,6 +43,15 @@
>  ifneq (~$(LDCONFIG)~, ~~)
>  	$(LDCONFIG)
>  endif
>+@@ -80,7 +76,7 @@ install-dynlib:
>+ endif
>+ 
>+ #ifeq ($(DYNLIBS), 1)
>+-#$(PROGRAMS): $(TARGETDLL).$(VER)
>++#$(PROGRAMS): $(TARGETDLL).$(VERMAJOR)
>+ #	$(CC) $(CFLAGS) $(CDEFS) $(COPT) $(_SRC_DIR)$@.c
>+ #	$(CC) $(LFLAGS) $(EXENAMEFLAG) $@ $@$(_OBJ) $(LIBS) $<
>+ #else
> @@ -133,10 +129,10 @@ uninstall:
>  
>  clean:
>Index: news/husky/files/patch-smapi_Makefile
>===================================================================
>--- news/husky/files/patch-smapi_Makefile	(revision 523195)
>+++ news/husky/files/patch-smapi_Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- 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)
>+--- smapi/Makefile.orig	2020-01-16 21:50:04 UTC
>++++ smapi/Makefile
>+@@ -33,7 +33,7 @@ CDEFS=-D$(OSTYPE) $(ADDCDEFS) -I$(H_DIR) -I$(INCDIR)
>  LIBS=-lhusky
>  
>  ifeq ($(DYNLIBS), 1)
>@@ -9,7 +9,7 @@
>  else
>  all: $(TARGETLIB)
>  endif
>-@@ -50,24 +50,22 @@ endif                                   
>+@@ -50,24 +50,22 @@ endif                                                 
>  
>  ifeq ($(DYNLIBS), 1)
>    ifeq (~$(MKSHARED)~,~ld~)
>@@ -19,10 +19,9 @@
> +	$(LD) $(LFLAGS) -o $(TARGETDLL).$(VERMAJOR) $(OBJS) -L$(LIBDIR) $(LIBS)
>    else
> -$(TARGETDLL).$(VER): $(OBJS)
>--	$(CC) -shared -Wl,-soname,$(TARGETDLL).$(VERH) \
>++$(TARGETDLL).$(VERMAJOR): $(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
>  
>Index: news/husky-areafix/Makefile
>===================================================================
>--- news/husky-areafix/Makefile	(revision 523195)
>+++ news/husky-areafix/Makefile	(working copy)
>@@ -4,6 +4,9 @@
> 
> COMMENT=	Husky FTN areafix library
> 
>+LICENSE=	LGPL21+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf
> 
> USE_LDCONFIG=	yes
>Index: news/husky-fidoconf/Makefile
>===================================================================
>--- news/husky-fidoconf/Makefile	(revision 523195)
>+++ news/husky-fidoconf/Makefile	(working copy)
>@@ -4,15 +4,18 @@
> 
> COMMENT=	Husky FTN configuration library
> 
>+LICENSE=	LGPL21+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> LIB_DEPENDS=	libsmapi.so:news/husky-smapi
> 
> USES+=		perl5 shebangfix
> SHEBANG_FILES=	util/fconf2areasbbs.pl util/fconf2na.pl util/sq2fc.pl
>-USE_LDCONFIG=   yes
>+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
>Index: news/husky-hpt/Makefile
>===================================================================
>--- news/husky-hpt/Makefile	(revision 523195)
>+++ news/husky-hpt/Makefile	(working copy)
>@@ -4,16 +4,19 @@
> 
> COMMENT=	Husky FTN tosser
> 
>+LICENSE=	LGPL21+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf \
> 		libareafix.so:news/husky-areafix
> 
>-USES+=		makeinfo
>+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
>Index: news/husky-htick/Makefile
>===================================================================
>--- news/husky-htick/Makefile	(revision 523195)
>+++ news/husky-htick/Makefile	(working copy)
>@@ -4,16 +4,19 @@
> 
> COMMENT=	Husky FTN file ticker
> 
>+LICENSE=	LGPL21+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf \
> 		libareafix.so:news/husky-areafix
> 
> 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
>Index: news/husky-huskylib/Makefile
>===================================================================
>--- news/husky-huskylib/Makefile	(revision 523195)
>+++ news/husky-huskylib/Makefile	(working copy)
>@@ -4,7 +4,10 @@
> 
> COMMENT=	Husky generic FTN library
> 
>-INSTALL_TARGET= install install-man
>+LICENSE=	LGPL21+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+INSTALL_TARGET=	install install-man
> USE_LDCONFIG=	yes
> 
> MASTERDIR=	${.CURDIR}/../husky
>Index: news/husky-smapi/Makefile
>===================================================================
>--- news/husky-smapi/Makefile	(revision 523195)
>+++ news/husky-smapi/Makefile	(working copy)
>@@ -1,12 +1,14 @@
> # $FreeBSD$
> 
> PORTNAME=	husky-smapi
>-PORTEPOCH=	1
> 
> COMMENT=	Husky FTN MSGAPI library
> 
>-LIB_DEPENDS=    libhusky.so:news/husky-huskylib
>+LICENSE=	LGPL21+
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+LIB_DEPENDS=	libhusky.so:news/husky-huskylib
>+
> USE_LDCONFIG=	yes
> 
> MASTERDIR=	${.CURDIR}/../husky
>Index: news/husky-sqpack/Makefile
>===================================================================
>--- news/husky-sqpack/Makefile	(revision 523195)
>+++ news/husky-sqpack/Makefile	(working copy)
>@@ -4,6 +4,9 @@
> 
> COMMENT=	Husky FTN msgbase packer
> 
>+LICENSE=	LGPL21+
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> LIB_DEPENDS=	libfidoconfig.so:news/husky-fidoconf
> 
> USE_LDCONFIG=	yes
>Index: news/husky-sqpack/pkg-descr
>===================================================================
>--- news/husky-sqpack/pkg-descr	(revision 523195)
>+++ news/husky-sqpack/pkg-descr	(working copy)
>@@ -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/

Flags:

osharoiko: maintainer-approval+

Actions: View | Diff

Attachments on bug 243030: 210935 | 210936 | 211459 | 211460 | 211487 | 211488 | 211498