diff options
author | joerg <joerg@pkgsrc.org> | 2013-10-18 16:57:15 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-10-18 16:57:15 +0000 |
commit | dfecec2505c695bd15c904a3c5f933f45ea8301e (patch) | |
tree | b5afc3b216d7d1146e4509c5ce47c0b13491d2fc /textproc | |
parent | 18a7318697db4fe8f93df7da6a385bdbdfd0c9f5 (diff) | |
download | pkgsrc-dfecec2505c695bd15c904a3c5f933f45ea8301e.tar.gz |
Retire jade, replaced a long time ago by textproc/openjade.
Diffstat (limited to 'textproc')
29 files changed, 1 insertions, 708 deletions
diff --git a/textproc/Makefile b/textproc/Makefile index fff3513cd70..5f802a48a7e 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.744 2013/09/15 16:31:47 taca Exp $ +# $NetBSD: Makefile,v 1.745 2013/10/18 16:57:15 joerg Exp $ # COMMENT= Text processing utilities (does not include desktop publishing) @@ -276,7 +276,6 @@ SUBDIR+= itstool SUBDIR+= ja-grep SUBDIR+= ja-groff SUBDIR+= ja-sed -SUBDIR+= jade SUBDIR+= jansson SUBDIR+= java-mecab SUBDIR+= java-native-hyperestraier diff --git a/textproc/jade/DESCR b/textproc/jade/DESCR deleted file mode 100644 index fb7d7323127..00000000000 --- a/textproc/jade/DESCR +++ /dev/null @@ -1,15 +0,0 @@ -An object-oriented SGML/XML parser toolkit and DSSSL engine. - - Features summary: - - * Includes nsgmls - * Provides access to all information about SGML document - * Supports almost all optional SGML features - * Sophisticated entity manager - * Supports multi-byte character sets - * Object-oriented - * Written in C++ from scratch - * Fast - * Portable - * Production quality - * Free diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile deleted file mode 100644 index e44411c57e4..00000000000 --- a/textproc/jade/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# $NetBSD: Makefile,v 1.52 2013/04/08 11:17:23 rodent Exp $ - -DISTNAME= jade-1.2.1 -PKGREVISION= 13 -CATEGORIES= textproc -MASTER_SITES= ftp://ftp.jclark.com/pub/jade/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.jclark.com/pub/jade/ - -MAINTAINER= rh@NetBSD.org -HOMEPAGE= http://www.jclark.com/jade/ -COMMENT= Object-oriented SGML/XML parser toolkit and DSSSL engine - -MAKE_JOBS_SAFE= no - -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCHFILES= jade_1.2.1-18.diff.gz -PATCH_DIST_STRIP= -p1 - -CONFLICTS+= sp-[0-9]* - -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake m4 -GNU_CONFIGURE= YES -USE_LIBTOOL= YES - -SGML_CATALOGS= ${PREFIX}/share/sgml/jade/catalog - -CONFIGURE_ARGS+= --enable-default-catalog=${PREFIX:Q}/share/sgml/jade/catalog -CONFIGURE_ARGS+= --enable-mif - -CXXFLAGS+= ${CFLAGS} - -INSTALLATION_DIRS= include/sp lib share/doc/jade share/sgml/jade - -post-patch: - chmod -R +w ${WRKSRC} - find ${WRKSRC} -name '*.orig' -size 0c -type f -exec rm {} \; - find ${WRKSRC} -name '*.orig_dist' -size 0c -type f -exec rm {} \; - -post-install: - set -e; \ - for prog in jade nsgmls sgmlnorm spam spent sx; do \ - ${ECHO_MSG} "strip ${DESTDIR}${PREFIX}/bin/$${prog}"; \ - strip "${DESTDIR}${PREFIX}/bin/$${prog}"; \ - done - ${INSTALL_DATA} ${WRKSRC}/include/*.cxx ${WRKSRC}/include/*.h \ - ${DESTDIR}${PREFIX}/include/sp - ${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${DESTDIR}${PREFIX}/share/doc/jade - ${INSTALL_DATA} ${WRKSRC}/dsssl/* ${DESTDIR}${PREFIX}/share/sgml/jade -# Installed by print/tex-jadetex - rm ${DESTDIR}${PREFIX}/share/sgml/jade/*jadetex.* - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../textproc/xmlcatmgr/catalogs.mk" -.include "../../mk/bsd.pkg.mk" - -# Turn off C++ optimization as there seem to be problems with the generated -# code: jade dumps core on some files if compiled with -O2. This might be -# a compiler bug, or something deep inside the code... -# -# This is placed after the inclusion of bsd.pkg.mk to force this option to -# be the last optimization flag specified. -# -CXXFLAGS+= -O0 diff --git a/textproc/jade/PLIST b/textproc/jade/PLIST deleted file mode 100644 index ce4493ee620..00000000000 --- a/textproc/jade/PLIST +++ /dev/null @@ -1,161 +0,0 @@ -@comment $NetBSD: PLIST,v 1.8 2009/06/14 21:36:32 joerg Exp $ -bin/jade -bin/nsgmls -bin/sgmlnorm -bin/spam -bin/spent -bin/sx -include/sp/Allocator.h -include/sp/ArcEngine.h -include/sp/Attribute.h -include/sp/Attributed.h -include/sp/Big5CodingSystem.h -include/sp/Boolean.h -include/sp/CharMap.cxx -include/sp/CharMap.h -include/sp/CharsetDecl.h -include/sp/CharsetInfo.h -include/sp/CharsetRegistry.h -include/sp/CmdLineApp.h -include/sp/CodingSystem.h -include/sp/CodingSystemKit.h -include/sp/ConsoleOutput.h -include/sp/ContentState.h -include/sp/ContentToken.h -include/sp/CopyOwner.cxx -include/sp/CopyOwner.h -include/sp/DescriptorManager.h -include/sp/Dtd.h -include/sp/EUCJPCodingSystem.h -include/sp/ElementType.h -include/sp/Entity.h -include/sp/EntityApp.h -include/sp/EntityCatalog.h -include/sp/EntityDecl.h -include/sp/EntityManager.h -include/sp/ErrnoMessageArg.h -include/sp/ErrorCountEventHandler.h -include/sp/Event.h -include/sp/EventsWanted.h -include/sp/ExtendEntityManager.h -include/sp/ExternalId.h -include/sp/Fixed2CodingSystem.h -include/sp/GenericEventHandler.h -include/sp/Hash.h -include/sp/HashTable.cxx -include/sp/HashTable.h -include/sp/HashTableItemBase.cxx -include/sp/HashTableItemBase.h -include/sp/IList.h -include/sp/IListBase.h -include/sp/IListIter.h -include/sp/IListIterBase.h -include/sp/IQueue.cxx -include/sp/IQueue.h -include/sp/ISet.cxx -include/sp/ISet.h -include/sp/ISetIter.h -include/sp/IdentityCodingSystem.h -include/sp/InputSource.h -include/sp/InternalInputSource.h -include/sp/Link.h -include/sp/LinkProcess.h -include/sp/List.cxx -include/sp/List.h -include/sp/ListIter.h -include/sp/LiteralStorage.h -include/sp/Location.h -include/sp/Lpd.h -include/sp/Markup.h -include/sp/Message.h -include/sp/MessageArg.h -include/sp/MessageBuilder.h -include/sp/MessageEventHandler.h -include/sp/MessageFormatter.h -include/sp/MessageReporter.h -include/sp/MessageTable.h -include/sp/Mode.h -include/sp/NCVector.h -include/sp/Named.h -include/sp/NamedResource.h -include/sp/NamedResourceTable.h -include/sp/NamedTable.h -include/sp/Notation.h -include/sp/NotationStorage.h -include/sp/OpenElement.h -include/sp/Options.cxx -include/sp/Options.h -include/sp/OutputByteStream.h -include/sp/OutputCharStream.h -include/sp/Owner.cxx -include/sp/Owner.h -include/sp/OwnerTable.cxx -include/sp/OwnerTable.h -include/sp/ParserApp.h -include/sp/ParserOptions.h -include/sp/PointerTable.cxx -include/sp/PointerTable.h -include/sp/PosixStorage.h -include/sp/Ptr.cxx -include/sp/Ptr.h -include/sp/RangeMap.cxx -include/sp/RangeMap.h -include/sp/Resource.h -include/sp/RewindStorageObject.h -include/sp/SJISCodingSystem.h -include/sp/SOEntityCatalog.h -include/sp/Sd.h -include/sp/SdText.h -include/sp/SearchResultMessageArg.h -include/sp/SgmlParser.h -include/sp/ShortReferenceMap.h -include/sp/StdioStorage.h -include/sp/StorageManager.h -include/sp/StringC.h -include/sp/StringOf.cxx -include/sp/StringOf.h -include/sp/StringResource.h -include/sp/SubstTable.cxx -include/sp/SubstTable.h -include/sp/Syntax.h -include/sp/Text.h -include/sp/TranslateCodingSystem.h -include/sp/TypeId.h -include/sp/URLStorage.h -include/sp/UTF8CodingSystem.h -include/sp/UnicodeCodingSystem.h -include/sp/UnivCharsetDesc.h -include/sp/Vector.cxx -include/sp/Vector.h -include/sp/Win32CodingSystem.h -include/sp/WinApp.h -include/sp/WinInetStorage.h -include/sp/XMLCodingSystem.h -include/sp/XcharMap.cxx -include/sp/XcharMap.h -include/sp/config.h -include/sp/constant.h -include/sp/macros.h -include/sp/rtti.h -include/sp/sptchar.h -include/sp/types.h -include/sp/xnew.h -lib/libgrove.la -lib/libsp.la -lib/libspgrove.la -lib/libstyle.la -share/doc/jade/TeX.htm -share/doc/jade/autoconf.htm -share/doc/jade/dsssl2.htm -share/doc/jade/jade.htm -share/doc/jade/mif.htm -share/doc/jade/transform.htm -share/sgml/jade/FOT.tex -share/sgml/jade/Makefile.jadetex -share/sgml/jade/catalog -share/sgml/jade/demo.dsl -share/sgml/jade/demo.sgm -share/sgml/jade/demoMaster.tex -share/sgml/jade/dsssl.dtd -share/sgml/jade/fot.dtd -share/sgml/jade/style-sheet.dtd diff --git a/textproc/jade/buildlink3.mk b/textproc/jade/buildlink3.mk deleted file mode 100644 index 238baea4960..00000000000 --- a/textproc/jade/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2011/04/22 13:42:00 obache Exp $ - -BUILDLINK_TREE+= jade - -.if !defined(JADE_BUILDLINK3_MK) -JADE_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.jade+= jade>=1.2.1nb7 -BUILDLINK_ABI_DEPENDS.jade+= jade>=1.2.1nb13 -BUILDLINK_PKGSRCDIR.jade?= ../../textproc/jade - -.include "../../devel/gettext-lib/buildlink3.mk" -.endif # JADE_BUILDLINK3_MK - -BUILDLINK_TREE+= -jade diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo deleted file mode 100644 index 03670997631..00000000000 --- a/textproc/jade/distinfo +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: distinfo,v 1.17 2012/11/13 19:02:26 bsiegert Exp $ - -SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06 -RMD160 (jade-1.2.1.tar.gz) = 615ebcc1b17a284d60a7976f13649a0ea78aa58d -Size (jade-1.2.1.tar.gz) = 1092062 bytes -SHA1 (jade_1.2.1-18.diff.gz) = b3d00e797239d061ef6063b44e9d3e14055da940 -RMD160 (jade_1.2.1-18.diff.gz) = c2e9dc256b0c95a6c5e43142537e40b92ebe1df3 -Size (jade_1.2.1-18.diff.gz) = 121329 bytes -SHA1 (patch-aa) = 65c8f88d6b61851c1c5b1a4da52378bf7330677f -SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1 -SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d -SHA1 (patch-ad) = 7d3ef2dfc7d0a2b0f7b040d1fa36c9f17143647d -SHA1 (patch-ae) = a01bd39d4be17884f902a06c5c7324912935241f -SHA1 (patch-af) = eb8c986dd4051cb183ccbb8d6aa97f1e801eab58 -SHA1 (patch-ag) = 593c1b6488fee22cd634fa10c90c89fd858c8981 -SHA1 (patch-ah) = cd3e9d30e5fada5be5271f3277b1e0d5d0e83bb2 -SHA1 (patch-ai) = 09a1331aceeb7ec74c05b57746eb5b9be51f7bf1 -SHA1 (patch-aj) = 67f48f9c0beefa3bd0985e688cd28c808e9f5bc4 -SHA1 (patch-ak) = adc76c80e288fd7802f2d673eafb37204c687de1 -SHA1 (patch-al) = 0a1f8a4be1bbd2215a0a08722f3ea2c6e2334c80 -SHA1 (patch-am) = 6851ea44e1abdcaa887df3cf965593f5bb896e9b -SHA1 (patch-an) = 514a3bf20ba6c2e1e6474c85e770e9e3b836df2d -SHA1 (patch-ao) = 16bc7c55cdc8c3d5dc5959807dd100d36985429c -SHA1 (patch-ap) = 156ac9a4947d7b74727b4d787e8abf0897e0a0bb -SHA1 (patch-aq) = fbc9fc7dbc5c38d91d7968e29a4d832c6ffccc7f -SHA1 (patch-ar) = 3c7676797519b35c654513885c5ca799e55a6baf -SHA1 (patch-as) = 8dc4d8867ea38b09f0cfadde840d8695ca1e110c -SHA1 (patch-at) = 6b4aaee9de24eb5f648a10362fa57f92439cd00f -SHA1 (patch-au) = f1cf55a99836b2bcbc31d4b1e12b31a1b5a28682 -SHA1 (patch-lib_assert.cxx) = 72a220e15516f83903c7cea344dd9be527fd2c4d diff --git a/textproc/jade/hacks.mk b/textproc/jade/hacks.mk deleted file mode 100644 index 0275c79cd05..00000000000 --- a/textproc/jade/hacks.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:51:03 rillig Exp $ - -.if !defined(JADE_HACKS_MK) -JADE_HACKS_MK= # defined - -### [Tue Jan 25 20:25:41 UTC 2005 : tv] -### Interix system-supplied g++ 3.3 is generating broken global ctors/dtors -### -.if ${OPSYS} == "Interix" -PKG_HACKS+= g++-broken-globals -GCC_REQD+= 3.3.4 -.endif - -.endif diff --git a/textproc/jade/patches/patch-aa b/textproc/jade/patches/patch-aa deleted file mode 100644 index 2ba77bb296d..00000000000 --- a/textproc/jade/patches/patch-aa +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2011/01/25 22:22:16 shattered Exp $ - ---- configure.orig 2006-01-19 21:35:56.000000000 +0100 -+++ configure -@@ -620,9 +620,9 @@ ac_configure=$ac_aux_dir/configure # Thi - TOP=`pwd` - - --if test "$CXXFLAGS" = ""; then -- CXXFLAGS="-O2" --fi -+#if test "$CXXFLAGS" = ""; then -+# CXXFLAGS="-O2" -+#fi - - LTVERSION=`cat VERSION | cut -d'.' -f1,2 | sed 's/\./:/g'` - -@@ -1684,6 +1684,13 @@ EOF - - fi - -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ - echo $ac_n "checking for memmove""... $ac_c" 1>&6 - echo "configure:1689: checking for memmove" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then -@@ -1988,6 +1995,13 @@ fi - - - -+ac_ext=C -+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cxx_cross -+ - echo $ac_n "checking for ANSI template instantiation""... $ac_c" 1>&6 - echo "configure:1993: checking for ANSI template instantiation" >&5 - if eval "test \"`echo '$''{'ac_cv_c_template_ansi'+set}'`\" = set"; then -@@ -2030,6 +2044,13 @@ EOF - - fi - -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ - # Check whether --enable-http or --disable-http was given. - if test "${enable_http+set}" = set; then - enableval="$enable_http" diff --git a/textproc/jade/patches/patch-ab b/textproc/jade/patches/patch-ab deleted file mode 100644 index 62c97e042cf..00000000000 --- a/textproc/jade/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/03/29 01:02:59 hubertf Exp $ - ---- style/Interpreter.cxx.orig Thu Oct 1 07:14:54 1998 -+++ style/Interpreter.cxx -@@ -184,7 +184,8 @@ - }; - size_t nUnits = dsssl2() ? SIZEOF(units) : SIZEOF(units) - 1; - for (size_t i = 0; i < nUnits; i++) { -- Unit *unit = lookupUnit(makeStringC(units[i].name)); -+ StringC temp = makeStringC(units[i].name); /* temp var to work around */ -+ Unit *unit = lookupUnit(temp); /* compiler prob(?) */ - long n = unitsPerInch_ * units[i].numer; - if (n % units[i].denom == 0) - unit->setValue(long(n / units[i].denom)); diff --git a/textproc/jade/patches/patch-ac b/textproc/jade/patches/patch-ac deleted file mode 100644 index ec7c4189fd3..00000000000 --- a/textproc/jade/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 1999/03/15 08:48:16 rh Exp $ - ---- lib/instmac.m4.orig Thu Oct 1 07:13:24 1998 -+++ lib/instmac.m4 Sun Mar 14 18:03:17 1999 -@@ -75,7 +75,7 @@ - __undefine(`undefine')__dnl - __undefine(`undivert')__dnl - __undefine(`unix')__dnl --__dnl __changequote(,)__dnl disable quoting -+__dnl __changequote(,)__dnl - - #ifdef SP_NAMESPACE - } diff --git a/textproc/jade/patches/patch-ad b/textproc/jade/patches/patch-ad deleted file mode 100644 index 895f2c046d3..00000000000 --- a/textproc/jade/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2008/03/15 20:29:35 joerg Exp $ - ---- Makefile.prog.in.orig 1998-10-12 03:36:20.000000000 +0200 -+++ Makefile.prog.in -@@ -13,13 +13,13 @@ Makefile.lt: - - all: $(PROG) - --$(PROG): $(OBJS) $(COBJS) $(LT_LIBS) -+$(PROG): $(OBJS) $(COBJS) - $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) - - install: $(PROG) -- -test -d $(bindir) || (mkdir $(bindir); chmod 755 $(bindir)) -- -rm -f $(bindir)/$(PROG) -- $(LIBTOOL) --mode=install $(INSTALL) $(PROG) $(bindir) -+ -test -d ${DESTDIR}$(bindir) || (mkdir ${DESTDIR}$(bindir); chmod 755 ${DESTDIR}$(bindir)) -+ -rm -f ${DESTDIR}$(bindir)/$(PROG) -+ $(LIBTOOL) --mode=install $(INSTALL) $(PROG) ${DESTDIR}$(bindir) - - depend: depend_src - depend.temp: $(GENSRCS) diff --git a/textproc/jade/patches/patch-ae b/textproc/jade/patches/patch-ae deleted file mode 100644 index b5ae63b912a..00000000000 --- a/textproc/jade/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2001/10/14 12:19:16 tron Exp $ - ---- lib/assert.cxx.orig Wed Apr 25 12:42:54 2001 -+++ lib/assert.cxx Wed Apr 25 12:43:26 2001 -@@ -6,7 +6,7 @@ - #include "macros.h" - - #ifdef __GNUG__ --void exit (int __status) __THROW __attribute__ ((__noreturn__)); -+void exit (int __status) throw () __attribute__ ((__noreturn__)); - #endif - - #ifdef SP_NAMESPACE diff --git a/textproc/jade/patches/patch-af b/textproc/jade/patches/patch-af deleted file mode 100644 index 3ef2977a951..00000000000 --- a/textproc/jade/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.2 2002/08/25 18:40:04 jlam Exp $ - ---- spgrove/Makefile.sub.orig Sun Oct 14 13:51:50 2001 -+++ spgrove/Makefile.sub Sun Oct 14 13:58:15 2001 -@@ -1,6 +1,6 @@ - LIB=spgrove - INCLUDE=-I$(srcdir)/../grove --DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp $(LIB_THREADS) -+DEPLIBS=-lm $(TOP)/grove/libgrove.la $(TOP)/lib/libsp.la $(LIB_THREADS) - OBJS=GroveApp.o GroveBuilder.o SdNode.o - GENSRCS=grove_inst.cxx - diff --git a/textproc/jade/patches/patch-ag b/textproc/jade/patches/patch-ag deleted file mode 100644 index 8d45b0e5935..00000000000 --- a/textproc/jade/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/08/25 18:40:04 jlam Exp $ - ---- style/Makefile.sub.orig Sun Oct 14 13:51:50 2001 -+++ style/Makefile.sub Sun Oct 14 14:01:26 2001 -@@ -1,6 +1,6 @@ - LIB=style --DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp \ -- -L$(TOP)/spgrove/.libs -lspgrove -+DEPLIBS=-lm $(TOP)/grove/libgrove.la $(TOP)/lib/libsp.la \ -+ $(TOP)/spgrove/libspgrove.la - OBJS=Collector.o \ - DssslApp.o \ - DssslSpecEventHandler.o \ diff --git a/textproc/jade/patches/patch-ah b/textproc/jade/patches/patch-ah deleted file mode 100644 index 150243a733a..00000000000 --- a/textproc/jade/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2008/03/15 20:29:35 joerg Exp $ - ---- Makefile.lib.in.orig 2008-03-15 20:06:44.000000000 +0100 -+++ Makefile.lib.in -@@ -18,11 +18,11 @@ Makefile.lt: - echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt - - lib$(LIB).la: $(LT_OBJS) -- $(LIBTOOL) --mode=link $(CC) -o lib$(LIB).la $(LT_OBJS) \ -+ $(LIBTOOL) --mode=link $(CXX) -o lib$(LIB).la $(LT_OBJS) \ - -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS) - - install: -- $(LIBTOOL) --mode=install $(INSTALL) lib$(LIB).la $(libdir) -+ $(LIBTOOL) --mode=install $(INSTALL) lib$(LIB).la ${DESTDIR}$(libdir) - - install-man: - depend: depend_src diff --git a/textproc/jade/patches/patch-ai b/textproc/jade/patches/patch-ai deleted file mode 100644 index 35ef27f65f1..00000000000 --- a/textproc/jade/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2003/10/09 22:14:13 kristerw Exp $ - ---- lib/parser_inst.cxx.orig Fri Sep 16 14:43:02 2022 -+++ lib/parser_inst.cxx Fri Sep 16 14:44:09 2022 -@@ -1324,7 +1324,7 @@ - #endif - #endif - #endif --#if SIZEOF_SIZE_T == 8 -+#if defined(_LP64) || defined(__arm__) - #ifdef __DECCXX - #pragma define_template Vector<size_t> - #else diff --git a/textproc/jade/patches/patch-aj b/textproc/jade/patches/patch-aj deleted file mode 100644 index c0b52a06fde..00000000000 --- a/textproc/jade/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2003/10/09 22:14:13 kristerw Exp $ - ---- lib/parser_inst.m4.orig Fri Sep 16 14:43:02 2022 -+++ lib/parser_inst.m4 Fri Sep 16 14:44:12 2022 -@@ -164,7 +164,7 @@ - __instantiate(Vector<ContentModelAmbiguity>) - __instantiate(Vector<Transition>) - __instantiate(Vector<LeafContentToken*>) --#if SIZEOF_SIZE_T == 8 -+#if defined(_LP64) || defined(__arm__) - __instantiate(Vector<size_t>) - #endif - __instantiate(Vector<unsigned int>) diff --git a/textproc/jade/patches/patch-ak b/textproc/jade/patches/patch-ak deleted file mode 100644 index 138d4e080cf..00000000000 --- a/textproc/jade/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.3 2012/11/13 19:02:26 bsiegert Exp $ - ---- nsgmls/RastEventHandler.cxx.orig Fri Sep 16 14:43:02 2022 -+++ nsgmls/RastEventHandler.cxx Fri Sep 16 14:44:18 2022 -@@ -28,7 +28,7 @@ - namespace SP_NAMESPACE { - #endif - --#if SIZEOF_SIZE_T == 8 -+#if !defined(__APPLE__) && (defined(_LP64) || defined(__arm__)) - #ifdef __DECCXX - #pragma define_template Vector<size_t> - #else diff --git a/textproc/jade/patches/patch-al b/textproc/jade/patches/patch-al deleted file mode 100644 index 9c090e8bf78..00000000000 --- a/textproc/jade/patches/patch-al +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-al,v 1.1 2002/12/23 20:05:07 jschauma Exp $ - ---- include/Vector.cxx.orig Sun Dec 22 13:01:13 2002 -+++ include/Vector.cxx Sun Dec 22 13:01:31 2002 -@@ -7,6 +7,10 @@ - #include <stddef.h> - #include <string.h> - -+#ifdef sgi -+#include "Vector.h" -+#endif -+ - #ifdef SP_QUAL_TEMPLATE_DTOR_BROKEN - #define DTOR(T) ~T - #else diff --git a/textproc/jade/patches/patch-am b/textproc/jade/patches/patch-am deleted file mode 100644 index 4bf4975a563..00000000000 --- a/textproc/jade/patches/patch-am +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-am,v 1.1 2002/12/23 20:05:07 jschauma Exp $ - ---- lib/Location.cxx.orig Sun Dec 22 13:31:18 2002 -+++ lib/Location.cxx Sun Dec 22 13:30:04 2002 -@@ -5,6 +5,7 @@ - #pragma implementation - #endif - #include "splib.h" -+#include "Notation.h" - #include "Location.h" - #include "Entity.h" - #include "Mutex.h" diff --git a/textproc/jade/patches/patch-an b/textproc/jade/patches/patch-an deleted file mode 100644 index 8bc31643e1a..00000000000 --- a/textproc/jade/patches/patch-an +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-an,v 1.1 2002/12/23 20:05:07 jschauma Exp $ - ---- spam/CopyEventHandler.cxx.orig Sun Dec 22 14:35:53 2002 -+++ spam/CopyEventHandler.cxx Sun Dec 22 14:59:25 2002 -@@ -5,6 +5,11 @@ - #pragma implementation - #endif - -+#ifdef sgi -+#define SP_DEFINE_TEMPLATES 1 -+#undef NCVector_DEF_INCLUDED -+#endif -+ - #include "config.h" - #include "CopyEventHandler.h" - #include "macros.h" diff --git a/textproc/jade/patches/patch-ao b/textproc/jade/patches/patch-ao deleted file mode 100644 index bd7a58edf5c..00000000000 --- a/textproc/jade/patches/patch-ao +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2003/09/21 20:03:53 tron Exp $ - ---- include/Ptr.h.orig Wed Oct 7 14:15:50 1998 -+++ include/Ptr.h Tue Jul 22 09:19:49 2003 -@@ -5,6 +5,7 @@ - #define Ptr_INCLUDED 1 - - #include "Boolean.h" -+#include "Resource.h" - - // T must have Resource as a public base class - // T may be an incomplete type diff --git a/textproc/jade/patches/patch-ap b/textproc/jade/patches/patch-ap deleted file mode 100644 index bdcccf58e1c..00000000000 --- a/textproc/jade/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2003/09/21 20:03:53 tron Exp $ - ---- include/Ptr.cxx.orig Tue Jul 22 09:20:15 2003 -+++ include/Ptr.cxx Tue Jul 22 09:20:42 2003 -@@ -19,7 +19,7 @@ - Ptr<T>::~Ptr() - { - if (ptr_) { -- if (ptr_->unref()) -+ if (((Resource*)ptr_)->unref()) - delete ptr_; - ptr_ = 0; - } diff --git a/textproc/jade/patches/patch-aq b/textproc/jade/patches/patch-aq deleted file mode 100644 index cb1f4b8c6a0..00000000000 --- a/textproc/jade/patches/patch-aq +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2006/01/20 11:36:18 jmmv Exp $ - ---- include/config.h.orig 2006-01-20 00:09:04.000000000 +0100 -+++ include/config.h -@@ -31,6 +31,10 @@ - #define SP_ANSI_LIB - #define SP_NO_STD_NAMESPACE - #undef SP_NEW_H_MISSING -+#if __GNUC__ > 2 -+#define SP_HAVE_TYPENAME -+#undef SP_NO_STD_NAMESPACE -+#endif - #endif - - #endif /* __GNUG__ */ -@@ -40,7 +44,7 @@ - #define SP_STAT_BLKSIZE - #endif - --#if (defined __MACH__) && (! defined __GNU__) -+#if (defined __MACH__) && (! defined __GNU__) && (!defined __Darwin__) && (! defined __APPLE__) - #define SP_MUTEX_MACH - #endif - -@@ -297,4 +301,9 @@ - #define SP_NAMESPACE_SCOPE - #endif - -+#if defined(__APPLE__) || defined(__Darwin__) -+#define SP_DEFINE_TEMPLATES -+#define SP_MANUAL_INST -+#endif -+ - #endif /* not config_INCLUDED */ diff --git a/textproc/jade/patches/patch-ar b/textproc/jade/patches/patch-ar deleted file mode 100644 index 4066e8e101b..00000000000 --- a/textproc/jade/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2006/01/20 11:36:18 jmmv Exp $ - ---- spgrove/threads.h.orig 2006-01-20 10:44:28.000000000 +0100 -+++ spgrove/threads.h -@@ -141,7 +141,7 @@ private: - - #endif /* _MSC_VER && _MT */ - --#if (defined __MACH__) || (defined __GNU__) -+#if ((defined __MACH__) && (! defined __Darwin__) && (! defined __APPLE__)) || (defined __GNU__) - - // For Mach, using C Threads. May or may not work as-is on your Mach-based OS. - // Written by Raf Schietekat <RfSchtkt@maze.ruca.ua.ac.be> on 1996-11-10. diff --git a/textproc/jade/patches/patch-as b/textproc/jade/patches/patch-as deleted file mode 100644 index 633112c9c94..00000000000 --- a/textproc/jade/patches/patch-as +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-as,v 1.1 2006/01/20 11:36:18 jmmv Exp $ - ---- nsgmls/nsgmls_inst.cxx.orig 1998-10-01 07:22:18.000000000 +0200 -+++ nsgmls/nsgmls_inst.cxx -@@ -96,14 +96,18 @@ typedef IQueue<LinkRulePi> Dummy_4; - #endif - #ifdef __DECCXX - #pragma define_template Vector<Vector<size_t> > -+#pragma define_template Vector<size_t> - #else - #ifdef __xlC__ - #pragma define(Vector<Vector<size_t> >) -+#pragma define(Vector<size_t>) - #else - #ifdef SP_ANSI_CLASS_INST - template class Vector<Vector<size_t> >; -+template class Vector<size_t>; - #else - typedef Vector<Vector<size_t> > Dummy_5; -+typedef Vector<size_t> Dummy_5; - #endif - #endif - #endif diff --git a/textproc/jade/patches/patch-at b/textproc/jade/patches/patch-at deleted file mode 100644 index 30b43cdd1c7..00000000000 --- a/textproc/jade/patches/patch-at +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-at,v 1.1 2006/01/20 11:36:18 jmmv Exp $ - ---- jade/HtmlFOTBuilder_inst.cxx.orig 1998-10-07 12:06:36.000000000 +0200 -+++ jade/HtmlFOTBuilder_inst.cxx -@@ -106,14 +106,18 @@ typedef Vector<Vector<HtmlFOTBuilder::Ad - #endif - #ifdef __DECCXX - #pragma define_template Vector<Vector<size_t> > -+#pragma define_template Vector<size_t> - #else - #ifdef __xlC__ --#pragma define(Vector<Vector<size_t> >) -+#pragma define(Vector<size_t>) -+#pragma define(Vector<size_t>) - #else - #ifdef SP_ANSI_CLASS_INST --template class Vector<Vector<size_t> >; -+template class Vector<size_t>; -+template class Vector<size_t>; - #else --typedef Vector<Vector<size_t> > Dummy_6; -+typedef Vector<size_t> Dummy_6; -+typedef Vector<size_t> Dummy_6; - #endif - #endif - #endif diff --git a/textproc/jade/patches/patch-au b/textproc/jade/patches/patch-au deleted file mode 100644 index 5bb1ebd96fa..00000000000 --- a/textproc/jade/patches/patch-au +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-au,v 1.1 2006/01/20 11:36:18 jmmv Exp $ - ---- jade/RtfFOTBuilder_inst.cxx.orig 1998-10-07 12:06:36.000000000 +0200 -+++ jade/RtfFOTBuilder_inst.cxx -@@ -218,6 +218,20 @@ typedef Vector<Vector<char> > Dummy_14; - #endif - #endif - #endif -+#ifdef __DECCXX -+#pragma define_template Vector<size_t> -+#else -+#ifdef __xlC__ -+#pragma define(Vector<size_t>) -+#else -+#ifdef SP_ANSI_CLASS_INST -+template class Vector<size_t>; -+#else -+typedef Vector<size_t> Dummy_15; -+#endif -+#endif -+#endif -+ - - #ifdef DSSSL_NAMESPACE - } diff --git a/textproc/jade/patches/patch-lib_assert.cxx b/textproc/jade/patches/patch-lib_assert.cxx deleted file mode 100644 index e3a966c5cd7..00000000000 --- a/textproc/jade/patches/patch-lib_assert.cxx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_assert.cxx,v 1.1 2012/04/22 20:32:19 joerg Exp $ - ---- lib/assert.cxx.orig 2012-04-20 13:14:25.000000000 +0000 -+++ lib/assert.cxx -@@ -5,10 +5,6 @@ - #include <stdlib.h> - #include "macros.h" - --#ifdef __GNUG__ --void exit (int __status) throw () __attribute__ ((__noreturn__)); --#endif -- - #ifdef SP_NAMESPACE - namespace SP_NAMESPACE { - #endif |