View | Details | Raw Unified | Return to bug 243030 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 243030