diff options
author | John Marino <marino@FreeBSD.org> | 2014-08-19 22:10:13 +0000 |
---|---|---|
committer | John Marino <marino@FreeBSD.org> | 2014-08-19 22:10:13 +0000 |
commit | a42ec116be28ea6ecf479a22023e11ce46f3800a (patch) | |
tree | c0ad89697a6533f51e7c23b2de3c21c167e2128d /news/husky | |
parent | 208afedf5cfa1fe35ff420dc88ba5c3b4b7acd69 (diff) | |
download | ports-a42ec116be28ea6ecf479a22023e11ce46f3800a.tar.gz ports-a42ec116be28ea6ecf479a22023e11ce46f3800a.zip |
Remove '-devel' prefix from husky* ports
Today the older unstaged husky-* ports were removed as the first part
of a transition move the development versions into their place. This
commit completes the relocation of husky-*-devel ports.
Notes
Notes:
svn path=/head/; revision=365427
Diffstat (limited to 'news/husky')
-rw-r--r-- | news/husky/Makefile | 15 | ||||
-rw-r--r-- | news/husky/Makefile.local | 34 | ||||
-rw-r--r-- | news/husky/distinfo | 2 | ||||
-rw-r--r-- | news/husky/files/patch-areafix_Makefile | 50 | ||||
-rw-r--r-- | news/husky/files/patch-fidoconf_Makefile | 72 | ||||
-rw-r--r-- | news/husky/files/patch-fidoconf_doc_Makefile | 29 | ||||
-rw-r--r-- | news/husky/files/patch-fidoconf_makefile.in2 | 11 | ||||
-rw-r--r-- | news/husky/files/patch-fidoconf_makefile.inc | 10 | ||||
-rw-r--r-- | news/husky/files/patch-fidoconf_man_Makefile | 20 | ||||
-rw-r--r-- | news/husky/files/patch-fidoconf_man_linkedto.1 | 15 | ||||
-rw-r--r-- | news/husky/files/patch-hpt_Makefile | 23 | ||||
-rw-r--r-- | news/husky/files/patch-hpt_doc_Makefile | 10 | ||||
-rw-r--r-- | news/husky/files/patch-htick_Makefile | 15 | ||||
-rw-r--r-- | news/husky/files/patch-htick_doc_Makefile | 30 | ||||
-rw-r--r-- | news/husky/files/patch-huskybse_huskymak.cfg | 124 | ||||
-rw-r--r-- | news/husky/files/patch-huskylib_Makefile | 59 | ||||
-rw-r--r-- | news/husky/files/patch-smapi_Makefile | 50 | ||||
-rw-r--r-- | news/husky/pkg-descr | 11 |
18 files changed, 580 insertions, 0 deletions
diff --git a/news/husky/Makefile b/news/husky/Makefile new file mode 100644 index 000000000000..e70cd3975d9a --- /dev/null +++ b/news/husky/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= husky + +COMMENT= Husky full featured highly portable FTN Tosser + +RUN_DEPENDS= hpt:${PORTSDIR}/news/husky-hpt \ + htick:${PORTSDIR}/news/husky-htick + +MASTERDIR= ${.CURDIR} + +NO_BUILD= yes +NO_INSTALL= yes + +.include <bsd.port.mk> diff --git a/news/husky/Makefile.local b/news/husky/Makefile.local new file mode 100644 index 000000000000..008211799d80 --- /dev/null +++ b/news/husky/Makefile.local @@ -0,0 +1,34 @@ +# vim:filetype=make +# $FreeBSD$ + +PORTVERSION= 1.9.20140519 +CATEGORIES= news mail +PKGNAMESUFFIX= -devel + +.if ${PORTNAME} == "husky-smapi" +PORTEPOCH= 1 +.endif + +MAINTAINER= osharoiko@gmail.com + +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= husky/husky/1.9-current/2014.05.19 +DISTNAME= husky-all-1.9-source-20140519 +EXTRACT_SUFX= .tgz + +HUSKY_ROOTDIR= ${WRKDIR}/husky +PATCH_WRKSRC= ${HUSKY_ROOTDIR} +WRKSRC= ${HUSKY_ROOTDIR}/${COMPONENT_SUBDIR} +PKGDIR= ${.CURDIR} + +CONFLICTS= ${PORTNAME}-[0-9]* + +USERS= fido +GROUPS= fido + +USES+= gmake + +pre-build: + ${LN} -sf ${HUSKY_ROOTDIR}/huskybse/huskymak.cfg ${HUSKY_ROOTDIR} + @${REINPLACE_CMD} -e 's|gcc|${CC}|; s|g++|${CXX}|' \ + ${HUSKY_ROOTDIR}/huskymak.cfg diff --git a/news/husky/distinfo b/news/husky/distinfo new file mode 100644 index 000000000000..1bcea1365920 --- /dev/null +++ b/news/husky/distinfo @@ -0,0 +1,2 @@ +SHA256 (husky-all-1.9-source-20140519.tgz) = d8e199b78331c94323ffff3fc985dd081dfe1c9ee2c924bfc465949835b399d3 +SIZE (husky-all-1.9-source-20140519.tgz) = 4113348 diff --git a/news/husky/files/patch-areafix_Makefile b/news/husky/files/patch-areafix_Makefile new file mode 100644 index 000000000000..8d4131a0791a --- /dev/null +++ b/news/husky/files/patch-areafix_Makefile @@ -0,0 +1,50 @@ +--- 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) diff --git a/news/husky/files/patch-fidoconf_Makefile b/news/husky/files/patch-fidoconf_Makefile new file mode 100644 index 000000000000..c580d4680329 --- /dev/null +++ b/news/husky/files/patch-fidoconf_Makefile @@ -0,0 +1,72 @@ +--- 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 + endif + include make/makefile.inc +-include makefile.in2 + TARGETLIB = $(LIBPREFIX)$(LIBNAME)$(LIBSUFFIX)$(_LIB) + TARGETDLL = $(DLLPREFIX)$(LIBNAME)$(DLLSUFFIX)$(_DLL) +-LIBS=-lhusky + + progs: commonprogs + + ifeq ($(DYNLIBS), 1) + TARGET = $(TARGETDLL) +- all: commonlibs $(TARGETDLL).$(VER) ++ all: commonlibs $(TARGETDLL).$(VERMAJOR) + $(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 diff --git a/news/husky/files/patch-fidoconf_doc_Makefile b/news/husky/files/patch-fidoconf_doc_Makefile new file mode 100644 index 000000000000..34c7b8fa509f --- /dev/null +++ b/news/husky/files/patch-fidoconf_doc_Makefile @@ -0,0 +1,29 @@ +--- 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 + 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 INFODIR +-info: fidoconfig.info fidoconfig.ru.info ++info: fidoconfig.info + else + info: + @echo +@@ -86,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) diff --git a/news/husky/files/patch-fidoconf_makefile.in2 b/news/husky/files/patch-fidoconf_makefile.in2 new file mode 100644 index 000000000000..716ddc893298 --- /dev/null +++ b/news/husky/files/patch-fidoconf_makefile.in2 @@ -0,0 +1,11 @@ +--- 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 diff --git a/news/husky/files/patch-fidoconf_makefile.inc b/news/husky/files/patch-fidoconf_makefile.inc new file mode 100644 index 000000000000..25f04729e335 --- /dev/null +++ b/news/husky/files/patch-fidoconf_makefile.inc @@ -0,0 +1,10 @@ +--- 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/ + diff --git a/news/husky/files/patch-fidoconf_man_Makefile b/news/husky/files/patch-fidoconf_man_Makefile new file mode 100644 index 000000000000..29d07d34a484 --- /dev/null +++ b/news/husky/files/patch-fidoconf_man_Makefile @@ -0,0 +1,20 @@ +--- 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) + + 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: + diff --git a/news/husky/files/patch-fidoconf_man_linkedto.1 b/news/husky/files/patch-fidoconf_man_linkedto.1 new file mode 100644 index 000000000000..deabaa00d380 --- /dev/null +++ b/news/husky/files/patch-fidoconf_man_linkedto.1 @@ -0,0 +1,15 @@ +--- 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. + .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. + .SH NOTES + All Husky-Software is written by various developers. For detailed information + about the Husky-Team take a look at diff --git a/news/husky/files/patch-hpt_Makefile b/news/husky/files/patch-hpt_Makefile new file mode 100644 index 000000000000..44a6bd8ee30d --- /dev/null +++ b/news/husky/files/patch-hpt_Makefile @@ -0,0 +1,23 @@ +--- hpt/Makefile.orig 2010-01-19 22:43:29.000000000 +0000 ++++ hpt/Makefile 2013-04-13 19:28:49.000000000 +0000 +@@ -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 + 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) diff --git a/news/husky/files/patch-hpt_doc_Makefile b/news/husky/files/patch-hpt_doc_Makefile new file mode 100644 index 000000000000..9a6f0bee724e --- /dev/null +++ b/news/husky/files/patch-hpt_doc_Makefile @@ -0,0 +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 +@@ -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) diff --git a/news/husky/files/patch-htick_Makefile b/news/husky/files/patch-htick_Makefile new file mode 100644 index 000000000000..40ca65b75bab --- /dev/null +++ b/news/husky/files/patch-htick_Makefile @@ -0,0 +1,15 @@ +--- htick/Makefile.orig 2010-04-20 19:10:55.000000000 +0000 ++++ htick/Makefile 2014-08-02 22:22:28.572741488 +0000 +@@ -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 + diff --git a/news/husky/files/patch-htick_doc_Makefile b/news/husky/files/patch-htick_doc_Makefile new file mode 100644 index 000000000000..65465076ab32 --- /dev/null +++ b/news/husky/files/patch-htick_doc_Makefile @@ -0,0 +1,30 @@ +--- 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 + 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 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) diff --git a/news/husky/files/patch-huskybse_huskymak.cfg b/news/husky/files/patch-huskybse_huskymak.cfg new file mode 100644 index 000000000000..ec053e956e85 --- /dev/null +++ b/news/husky/files/patch-huskybse_huskymak.cfg @@ -0,0 +1,124 @@ +--- 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 @@ + # 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 @@ + + # 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 @@ + ############################################################################## + + # C-Compiler +-CC=gcc ++#CC=gcc + + # C++-Compiler +-CXX=g++ ++#CXX=g++ + + #Msged needs access to a termcap library. Define its name here. + #On Linux, termcap is integrated into ncurses: +@@ -95,14 +95,14 @@ + # 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 @@ + + # 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 @@ + 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 @@ + SHORTNAMES=0 + + # Perl support +-PERL=0 ++PERL=1 + + # ZipInternal packer + USE_HPTZIP=0 +@@ -179,7 +179,7 @@ + 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 @@ + DEBLFLAGS=-g + + # options for installing programs +-OPTIBOPT=-c -s -m 555 +-DEBIBOPT=-c -m 555 +- +-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 diff --git a/news/husky/files/patch-huskylib_Makefile b/news/husky/files/patch-huskylib_Makefile new file mode 100644 index 000000000000..4c494b50924e --- /dev/null +++ b/news/husky/files/patch-huskylib_Makefile @@ -0,0 +1,59 @@ +--- 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) diff --git a/news/husky/files/patch-smapi_Makefile b/news/husky/files/patch-smapi_Makefile new file mode 100644 index 000000000000..8cc44b6deec4 --- /dev/null +++ b/news/husky/files/patch-smapi_Makefile @@ -0,0 +1,50 @@ +--- 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) diff --git a/news/husky/pkg-descr b/news/husky/pkg-descr new file mode 100644 index 000000000000..313ad1bfedd7 --- /dev/null +++ b/news/husky/pkg-descr @@ -0,0 +1,11 @@ +The "meta-port" for Husky Fidosoft Project. + +Husky is complete freeware suite of Fidonet applications. + +WWW: http://husky.sourceforge.net/ +Common files for Husky Fidosoft Project. +Development version. + +Husky is complete freeware suite of Fidonet applications. + +WWW: http://husky.sourceforge.net/ |