diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile index e0f1095ffb9c..058a5f9fa8f0 100644 --- a/news/husky-fidoconf/Makefile +++ b/news/husky-fidoconf/Makefile @@ -1,44 +1,44 @@ PORTNAME= husky-fidoconf COMMENT= Husky FTN configuration library LICENSE= LGPL20 LIB_DEPENDS= libsmapi.so:news/husky-smapi \ libhusky.so:news/husky-huskylib USES+= perl5 shebangfix 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 # 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^' \ ${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 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2aquaed.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2areasbbs.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2binkd.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2dir.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2fidogate.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2golded.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2msged.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2na.pl.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2squish.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fconf2tornado.1 + ${LN} -sf fconf2.1 ${STAGEDIR}${PREFIX}/share/man/man1/fecfg2fconf.1 .include "${MASTERDIR}/Makefile" diff --git a/news/husky-fidoconf/pkg-plist b/news/husky-fidoconf/pkg-plist index 130d3731d316..fee364f5f8ad 100644 --- a/news/husky-fidoconf/pkg-plist +++ b/news/husky-fidoconf/pkg-plist @@ -1,44 +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.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 +share/man/man1/dumpfcfg.1.gz +share/man/man1/fconf2.1.gz +share/man/man1/fconf2aquaed.1.gz +share/man/man1/fconf2areasbbs.1.gz +share/man/man1/fconf2binkd.1.gz +share/man/man1/fconf2dir.1.gz +share/man/man1/fconf2fidogate.1.gz +share/man/man1/fconf2golded.1.gz +share/man/man1/fconf2msged.1.gz +share/man/man1/fconf2na.pl.1.gz +share/man/man1/fconf2squish.1.gz +share/man/man1/fconf2tornado.1.gz +share/man/man1/fecfg2fconf.1.gz +share/man/man1/linked.1.gz +share/man/man1/linkedto.1.gz +share/man/man1/tparser.1.gz diff --git a/news/husky-hpt/pkg-plist b/news/husky-hpt/pkg-plist index d91c2c823561..e822b1fdcff0 100644 --- a/news/husky-hpt/pkg-plist +++ b/news/husky-hpt/pkg-plist @@ -1,10 +1,10 @@ bin/hpt bin/hptlink bin/hpttree bin/pktinfo bin/txt2pkt -%%PORTDOCS%%man/man1/hpt.1.gz -%%PORTDOCS%%man/man1/hptlink.1.gz -%%PORTDOCS%%man/man1/hpttree.1.gz -%%PORTDOCS%%man/man1/txt2pkt.1.gz +%%PORTDOCS%%share/man/man1/hpt.1.gz +%%PORTDOCS%%share/man/man1/hptlink.1.gz +%%PORTDOCS%%share/man/man1/hpttree.1.gz +%%PORTDOCS%%share/man/man1/txt2pkt.1.gz %%PORTDOCS%%share/doc/husky/hpt.html diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile index 3fac416ad9ee..76c288053c9e 100644 --- a/news/husky-htick/Makefile +++ b/news/husky-htick/Makefile @@ -1,33 +1,33 @@ PORTNAME= husky-htick COMMENT= Husky FTN file ticker 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 -PLIST_FILES= bin/htick man/man1/htick.1.gz +PLIST_FILES= bin/htick share/man/man1/htick.1.gz 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} CFLAGS+= -fcommon # fix build failure with clang-11 on 13-CURRENT OPTIONS_DEFINE= DOCS .include "${MASTERDIR}/Makefile" diff --git a/news/husky-huskylib/pkg-plist b/news/husky-huskylib/pkg-plist index b057ead919de..4face6b2183f 100644 --- a/news/husky-huskylib/pkg-plist +++ b/news/husky-huskylib/pkg-plist @@ -1,48 +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.9 lib/libhusky.so.1.9.0 -%%PORTDOCS%%man/man1/gnmsgid.1.gz +%%PORTDOCS%%share/man/man1/gnmsgid.1.gz diff --git a/news/husky-sqpack/Makefile b/news/husky-sqpack/Makefile index 9bf0f2120b81..5d4b63fcfd30 100644 --- a/news/husky-sqpack/Makefile +++ b/news/husky-sqpack/Makefile @@ -1,21 +1,21 @@ PORTNAME= husky-sqpack COMMENT= Husky FTN msgbase packer 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 +PLIST_FILES= bin/sqpack share/man/man1/sqpack.1.gz MASTERDIR= ${.CURDIR}/../husky COMPONENT_SUBDIR= sqpack post-patch: ${REINPLACE_CMD} -e 's^/etc/fido/config^${PREFIX}/etc/fido/config^' \ ${BUILD_WRKSRC}/sqpack.1 .include "${MASTERDIR}/Makefile" diff --git a/news/husky/Makefile b/news/husky/Makefile index e1869c46e1b3..2db0eaaf2da5 100644 --- a/news/husky/Makefile +++ b/news/husky/Makefile @@ -1,35 +1,36 @@ PORTNAME?= husky PORTVERSION= 1.9.20201211 +PORTREVISION= 1 PORTEPOCH?= 0 CATEGORIES?= news mail MASTER_SITES= http://download.huskyproject.org/sources/ DISTNAME= husky-all-1.9-source-20201211 MAINTAINER?= osharoiko@gmail.com COMMENT?= Husky full featured highly portable FTN Tosser WWW= https://husky.sourceforge.net/ .if ${PORTNAME} == "husky" RUN_DEPENDS= hpt:news/husky-hpt \ htick:news/husky-htick NO_BUILD= yes NO_INSTALL= yes .endif USES+= alias dos2unix gmake zip NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/${COMPONENT_SUBDIR} INSTALL_WRKSRC= ${BUILD_WRKSRC} PKGDIR= ${.CURDIR} USERS= fido GROUPS= fido pre-build: ${LN} -sf ${WRKSRC}/huskybse/huskymak.cfg ${WRKSRC} @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \ ${WRKSRC}/huskybse/huskymak.cfg .include diff --git a/news/husky/files/patch-huskybse_huskymak.cfg b/news/husky/files/patch-huskybse_huskymak.cfg index 04d5478d286d..74845d2fed0c 100644 --- a/news/husky/files/patch-huskybse_huskymak.cfg +++ b/news/husky/files/patch-huskybse_huskymak.cfg @@ -1,159 +1,168 @@ ---- huskybse/huskymak.cfg.orig 2020-01-16 23:01:53 UTC +--- huskybse/huskymak.cfg.orig 2024-02-25 11:11:11 UTC +++ huskybse/huskymak.cfg +@@ -19,7 +19,7 @@ BINDIR=$(PREFIX)/bin + BINDIR=$(PREFIX)/bin + + # Where manual pages should be placed. +-MANDIR=$(PREFIX)/man ++MANDIR=$(PREFIX)/share/man + + # Where include files should be placed (don't worry, no files will be over- + # written, Husky will use its own subdirectories below this directory): @@ -38,7 +38,7 @@ CFGDIR=$(PREFIX)/etc/fido # will not be compiled, and you won't know how to use the software ;-). # You should take care that this directory is listed in the INFOPATH # environment variable (if necessary, modify your /etc/profile file). -# INFODIR=/usr/local/info +INFODIR=$(PREFIX)/info # The same as above, but for DVI documentation. This requires a working # "texi2dvi" program. @@ -46,7 +46,7 @@ CFGDIR=$(PREFIX)/etc/fido # The same as above, but for HTML documentation. This requires a working # "texi2html" program. -#HTMLDIR=$(PREFIX)/lib/husky +HTMLDIR=$(PREFIX)/share/doc/husky # Name of the config file of MSGED TE: MSGEDCFG=\"$(CFGDIR)/msged.cfg\" @@ -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=cc # C++-Compiler -CXX=g++ +#CXX=c++ #Msged needs access to a termcap library. Define its name here. #On Linux, termcap is integrated into ncurses: @@ -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 +@@ -89,20 +89,20 @@ AR=ar 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 @@ MKDIR=mkdir # update dynamic library cache # If your operating system does not need this, you may comment out this line. -LDCONFIG=/sbin/ldconfig +#LDCONFIG=/sbin/ldconfig # rename a file MV=mv -@@ -139,8 +139,8 @@ H2PAS=h2pas +@@ -139,8 +139,8 @@ OSTYPE=UNIX 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,14 +151,14 @@ DEBUG=0 +@@ -151,14 +151,14 @@ SHORTNAMES=0 SHORTNAMES=0 # Perl support -PERL=0 +PERL=1 # ZipInternal packer USE_HPTZIP=0 # 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 +@@ -179,7 +179,7 @@ WARNFLAGS=-Wall WARNFLAGS=-Wall # C-compiler: optimization -OPTCFLAGS=-c -s -O3 -fomit-frame-pointer -fstrength-reduce -fPIC +OPTCFLAGS=-c -fPIC ifeq ( $(DYNLIBS), 0 ) ifeq ($(OSTYPE), UNIX) -@@ -216,29 +216,22 @@ OPTLFLAGS=-s +@@ -216,29 +216,22 @@ DEBLFLAGS=-g 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 - # 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