onyx: remove package

dead upstream, last release from 2005, sometimes hangs in bulk builds

13 files changed, 3 insertions, 554 deletions

diff --git a/doc/CHANGES-2017 b/doc/CHANGES-2017
index 8054d5b35b8..63d448b2fd1 100644
--- a/doc/CHANGES-2017
+++ b/doc/CHANGES-2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.4056 2017/09/26 10:32:32 wiz Exp $
+$NetBSD: CHANGES-2017,v 1.4057 2017/09/26 10:33:36 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -5787,3 +5787,4 @@ Changes to the packages collection and infrastructure in 2017:
 	Removed textproc/kdoc [wiz 2017-09-26]
 	Removed x11/qwt [wiz 2017-09-26]
 	Removed devel/its4 [wiz 2017-09-26]
+	Removed lang/onyx [wiz 2017-09-26]
diff --git a/lang/Makefile b/lang/Makefile
index 33365b50866..47d7a9890cc 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.464 2017/08/24 03:40:26 jnemeth Exp $
+# $NetBSD: Makefile,v 1.465 2017/09/26 10:33:36 wiz Exp $
 #
 
 COMMENT=	Programming languages
@@ -147,7 +147,6 @@ SUBDIR+=	nqp
 SUBDIR+=	nuitka
 SUBDIR+=	objc
 SUBDIR+=	ocaml
-SUBDIR+=	onyx
 SUBDIR+=	oo2c
 SUBDIR+=	open-cobol-ce
 SUBDIR+=	opencobol
diff --git a/lang/onyx/DESCR b/lang/onyx/DESCR
deleted file mode 100644
index e5e758c8e20..00000000000
--- a/lang/onyx/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Onyx is an embeddable stack-based threaded interpreted language.  This package
-contains both a stand alone interpreter and a library that can be used to embed
-Onyx in an application.  Extensive documentation is included.
diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
deleted file mode 100644
index 0790cabe8a8..00000000000
--- a/lang/onyx/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2017/09/24 14:33:23 wiz Exp $
-
-DISTNAME=	onyx-${VERS}
-PKGREVISION=	2
-CATEGORIES=	lang
-#MASTER_SITES=	http://www.canonware.com/download/onyx/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://www.canonware.com/onyx/
-HOMEPAGE=	https://github.com/canonware/onyx
-COMMENT=	Embeddable stack-based threaded interpreted language
-
-BUILD_DEPENDS+=	cook-[0-9]*:../../devel/cook
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre}
-
-BUILDLINK_API_DEPENDS.pcre?=        pcre>=4.0
-
-VERS=		5.1.2
-PLIST_SUBST+=	VERS=${VERS:Q}
-
-MAKE_ENV+=	SHELL=/bin/sh
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} cook
-
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} cook install
-
-post-install:
-	strip ${DESTDIR}${PREFIX}/bin/onyx
-
-.include "../../devel/editline/buildlink3.mk"
-BUILDLINK_API_DEPENDS.editline+=	editline>=2.6	# explicitly checked
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if ${PTHREAD_TYPE} == "pth"
-.include "../../devel/pthread-sem/buildlink3.mk"
-LIBS+=		-lsemaphore
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/onyx/PLIST b/lang/onyx/PLIST
deleted file mode 100644
index ea79dd72e49..00000000000
--- a/lang/onyx/PLIST
+++ /dev/null
@@ -1,215 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:03:37 joerg Exp $
-bin/onyx
-bin/${PKGNAME}
-bin/onyx_config
-bin/onyx_config-${PKGVERSION}
-include/libonyx/ch.h
-include/libonyx/cnd.h
-include/libonyx/dch.h
-include/libonyx/gcdict.h
-include/libonyx/libonyx.h
-include/libonyx/libonyx_defs.h
-include/libonyx/mb.h
-include/libonyx/mem.h
-include/libonyx/mq.h
-include/libonyx/mtx.h
-include/libonyx/nx.h
-include/libonyx/nxa.h
-include/libonyx/nxm.h
-include/libonyx/nxn.h
-include/libonyx/nxo.h
-include/libonyx/nxo_array.h
-include/libonyx/nxo_boolean.h
-include/libonyx/nxo_class.h
-include/libonyx/nxo_condition.h
-include/libonyx/nxo_dict.h
-include/libonyx/nxo_file.h
-include/libonyx/nxo_fino.h
-include/libonyx/nxo_handle.h
-include/libonyx/nxo_instance.h
-include/libonyx/nxo_integer.h
-include/libonyx/nxo_mark.h
-include/libonyx/nxo_mutex.h
-include/libonyx/nxo_name.h
-include/libonyx/nxo_no.h
-include/libonyx/nxo_null.h
-include/libonyx/nxo_operator.h
-include/libonyx/nxo_pmark.h
-include/libonyx/nxo_real.h
-include/libonyx/nxo_regex.h
-include/libonyx/nxo_regsub.h
-include/libonyx/nxo_stack.h
-include/libonyx/nxo_string.h
-include/libonyx/nxo_thread.h
-include/libonyx/ql.h
-include/libonyx/qr.h
-include/libonyx/qs.h
-include/libonyx/systemdict.h
-include/libonyx/thd.h
-include/libonyx/tsd.h
-include/libonyx/xep.h
-lib/libonyx.a
-lib/libonyx.so
-lib/libonyx.so.13
-man/man1/onyx.1
-man/man1/onyx_config.1
-share/${PKGNAME}/libonyx/libonyx_init.nx
-share/${PKGNAME}/nx/modclopt/clopt.nx
-share/${PKGNAME}/nx/modclopt/modclopt.nx
-share/${PKGNAME}/nx/modclopt/modclopt_defs.nx
-share/${PKGNAME}/nx/modprompt/modprompt.nx
-share/${PKGNAME}/nx/modprompt/modprompt_defs.nx
-share/${PKGNAME}/nxm/modprompt.nxm
-share/doc/${PKGNAME}/html/contents.png
-share/doc/${PKGNAME}/html/img1.png
-share/doc/${PKGNAME}/html/img10.png
-share/doc/${PKGNAME}/html/img11.png
-share/doc/${PKGNAME}/html/img12.png
-share/doc/${PKGNAME}/html/img13.png
-share/doc/${PKGNAME}/html/img14.png
-share/doc/${PKGNAME}/html/img15.png
-share/doc/${PKGNAME}/html/img2.png
-share/doc/${PKGNAME}/html/img3.png
-share/doc/${PKGNAME}/html/img4.png
-share/doc/${PKGNAME}/html/img5.png
-share/doc/${PKGNAME}/html/img6.png
-share/doc/${PKGNAME}/html/img7.png
-share/doc/${PKGNAME}/html/img8.png
-share/doc/${PKGNAME}/html/img9.png
-share/doc/${PKGNAME}/html/index.html
-share/doc/${PKGNAME}/html/index.png
-share/doc/${PKGNAME}/html/next.png
-share/doc/${PKGNAME}/html/next_g.png
-share/doc/${PKGNAME}/html/node1.html
-share/doc/${PKGNAME}/html/node10.html
-share/doc/${PKGNAME}/html/node100.html
-share/doc/${PKGNAME}/html/node11.html
-share/doc/${PKGNAME}/html/node101.html
-share/doc/${PKGNAME}/html/node102.html
-share/doc/${PKGNAME}/html/node103.html
-share/doc/${PKGNAME}/html/node104.html
-share/doc/${PKGNAME}/html/node105.html
-share/doc/${PKGNAME}/html/node106.html
-share/doc/${PKGNAME}/html/node107.html
-share/doc/${PKGNAME}/html/node108.html
-share/doc/${PKGNAME}/html/node109.html
-share/doc/${PKGNAME}/html/node110.html
-share/doc/${PKGNAME}/html/node111.html
-share/doc/${PKGNAME}/html/node112.html
-share/doc/${PKGNAME}/html/node113.html
-share/doc/${PKGNAME}/html/node114.html
-share/doc/${PKGNAME}/html/node115.html
-share/doc/${PKGNAME}/html/node116.html
-share/doc/${PKGNAME}/html/node117.html
-share/doc/${PKGNAME}/html/node118.html
-share/doc/${PKGNAME}/html/node119.html
-share/doc/${PKGNAME}/html/node12.html
-share/doc/${PKGNAME}/html/node120.html
-share/doc/${PKGNAME}/html/node121.html
-share/doc/${PKGNAME}/html/node122.html
-share/doc/${PKGNAME}/html/node123.html
-share/doc/${PKGNAME}/html/node124.html
-share/doc/${PKGNAME}/html/node13.html
-share/doc/${PKGNAME}/html/node14.html
-share/doc/${PKGNAME}/html/node15.html
-share/doc/${PKGNAME}/html/node16.html
-share/doc/${PKGNAME}/html/node17.html
-share/doc/${PKGNAME}/html/node18.html
-share/doc/${PKGNAME}/html/node19.html
-share/doc/${PKGNAME}/html/node2.html
-share/doc/${PKGNAME}/html/node20.html
-share/doc/${PKGNAME}/html/node21.html
-share/doc/${PKGNAME}/html/node22.html
-share/doc/${PKGNAME}/html/node23.html
-share/doc/${PKGNAME}/html/node24.html
-share/doc/${PKGNAME}/html/node25.html
-share/doc/${PKGNAME}/html/node26.html
-share/doc/${PKGNAME}/html/node27.html
-share/doc/${PKGNAME}/html/node28.html
-share/doc/${PKGNAME}/html/node29.html
-share/doc/${PKGNAME}/html/node3.html
-share/doc/${PKGNAME}/html/node30.html
-share/doc/${PKGNAME}/html/up.png
-share/doc/${PKGNAME}/html/node31.html
-share/doc/${PKGNAME}/html/node32.html
-share/doc/${PKGNAME}/html/node33.html
-share/doc/${PKGNAME}/html/node34.html
-share/doc/${PKGNAME}/html/node35.html
-share/doc/${PKGNAME}/html/node36.html
-share/doc/${PKGNAME}/html/node37.html
-share/doc/${PKGNAME}/html/node38.html
-share/doc/${PKGNAME}/html/node39.html
-share/doc/${PKGNAME}/html/node4.html
-share/doc/${PKGNAME}/html/node40.html
-share/doc/${PKGNAME}/html/node41.html
-share/doc/${PKGNAME}/html/node42.html
-share/doc/${PKGNAME}/html/node43.html
-share/doc/${PKGNAME}/html/node44.html
-share/doc/${PKGNAME}/html/node45.html
-share/doc/${PKGNAME}/html/node46.html
-share/doc/${PKGNAME}/html/node47.html
-share/doc/${PKGNAME}/html/node48.html
-share/doc/${PKGNAME}/html/node49.html
-share/doc/${PKGNAME}/html/node5.html
-share/doc/${PKGNAME}/html/node50.html
-share/doc/${PKGNAME}/html/node51.html
-share/doc/${PKGNAME}/html/node52.html
-share/doc/${PKGNAME}/html/node53.html
-share/doc/${PKGNAME}/html/node54.html
-share/doc/${PKGNAME}/html/node55.html
-share/doc/${PKGNAME}/html/node56.html
-share/doc/${PKGNAME}/html/node57.html
-share/doc/${PKGNAME}/html/node58.html
-share/doc/${PKGNAME}/html/node59.html
-share/doc/${PKGNAME}/html/node6.html
-share/doc/${PKGNAME}/html/node60.html
-share/doc/${PKGNAME}/html/node61.html
-share/doc/${PKGNAME}/html/node62.html
-share/doc/${PKGNAME}/html/node63.html
-share/doc/${PKGNAME}/html/node64.html
-share/doc/${PKGNAME}/html/node65.html
-share/doc/${PKGNAME}/html/node66.html
-share/doc/${PKGNAME}/html/node67.html
-share/doc/${PKGNAME}/html/node68.html
-share/doc/${PKGNAME}/html/node69.html
-share/doc/${PKGNAME}/html/node7.html
-share/doc/${PKGNAME}/html/node70.html
-share/doc/${PKGNAME}/html/node71.html
-share/doc/${PKGNAME}/html/node72.html
-share/doc/${PKGNAME}/html/node73.html
-share/doc/${PKGNAME}/html/node74.html
-share/doc/${PKGNAME}/html/node75.html
-share/doc/${PKGNAME}/html/node76.html
-share/doc/${PKGNAME}/html/node77.html
-share/doc/${PKGNAME}/html/node78.html
-share/doc/${PKGNAME}/html/node79.html
-share/doc/${PKGNAME}/html/node8.html
-share/doc/${PKGNAME}/html/node80.html
-share/doc/${PKGNAME}/html/node81.html
-share/doc/${PKGNAME}/html/node82.html
-share/doc/${PKGNAME}/html/node83.html
-share/doc/${PKGNAME}/html/node84.html
-share/doc/${PKGNAME}/html/node85.html
-share/doc/${PKGNAME}/html/node86.html
-share/doc/${PKGNAME}/html/node87.html
-share/doc/${PKGNAME}/html/node88.html
-share/doc/${PKGNAME}/html/node89.html
-share/doc/${PKGNAME}/html/node9.html
-share/doc/${PKGNAME}/html/node90.html
-share/doc/${PKGNAME}/html/node91.html
-share/doc/${PKGNAME}/html/node92.html
-share/doc/${PKGNAME}/html/node93.html
-share/doc/${PKGNAME}/html/node94.html
-share/doc/${PKGNAME}/html/node95.html
-share/doc/${PKGNAME}/html/node96.html
-share/doc/${PKGNAME}/html/node97.html
-share/doc/${PKGNAME}/html/node98.html
-share/doc/${PKGNAME}/html/node99.html
-share/doc/${PKGNAME}/html/onyx.css
-share/doc/${PKGNAME}/html/onyx.html
-share/doc/${PKGNAME}/html/prev.png
-share/doc/${PKGNAME}/html/prev_g.png
-share/doc/${PKGNAME}/html/up_g.png
-share/doc/${PKGNAME}/pdf/onyx.pdf
-share/doc/onyx
-share/onyx
diff --git a/lang/onyx/distinfo b/lang/onyx/distinfo
deleted file mode 100644
index 1243c477e4c..00000000000
--- a/lang/onyx/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.10 2015/12/29 23:34:53 dholland Exp $
-
-SHA1 (onyx-5.1.2.tar.bz2) = 1164431e4c5d4fd5122b7d41698baefc1c70d63d
-RMD160 (onyx-5.1.2.tar.bz2) = 0ecca943f37eb9dfb6370c57e9932567a955ed59
-SHA512 (onyx-5.1.2.tar.bz2) = 0dca456a25117599d91be802748ba35c48670dac7e2f45b2b7497ea35bdab7b36400a5e69cd25c98248f006fbe522e7a66e57e4b65b93154f453031592515178
-Size (onyx-5.1.2.tar.bz2) = 1397404 bytes
-SHA1 (patch-Cookfile.in) = 55453d66c7dab512b1c65afa9d6937678d708f66
-SHA1 (patch-bin_onyx_Cookfile.inc.in) = bdabf724e953b933b2d463f5ef7e85cca7b3a1b3
-SHA1 (patch-bin_onyx__config_Cookfile.inc.in) = fada70f113d3446b3cc2e17f19c8b2e14e148acf
-SHA1 (patch-doc_latex_onyx_Cookfile.inc.in) = 78820495be8b31f8bbe5b59bb3289f9134cc241f
-SHA1 (patch-lib_libonyx_Cookfile.inc.in) = 836a144e5a32b3bb0805e0aa2b09cd6b3cf37392
-SHA1 (patch-mod_modclopt_Cookfile.inc.in) = edb3c4e9b0c3e446921891f6521ddfb673f129d7
-SHA1 (patch-mod_modprompt_Cookfile.inc.in) = 8e86609bed11ca3c24cad9767551d3a5a0a02ecc
diff --git a/lang/onyx/patches/patch-Cookfile.in b/lang/onyx/patches/patch-Cookfile.in
deleted file mode 100644
index 3cf932cf876..00000000000
--- a/lang/onyx/patches/patch-Cookfile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Cookfile.in,v 1.2 2015/12/29 23:34:53 dholland Exp $
-
-DESTDIR support.
-
---- Cookfile.in.orig	2005-03-17 07:54:57.000000000 +0000
-+++ Cookfile.in
-@@ -37,4 +37,6 @@
-  *
-  ******************************************************************************/
- 
-+DESTDIR = [getenv DESTDIR];
-+
- #include-cooked @objroot@/Cookfile.inc
diff --git a/lang/onyx/patches/patch-bin_onyx_Cookfile.inc.in b/lang/onyx/patches/patch-bin_onyx_Cookfile.inc.in
deleted file mode 100644
index 2ea2a7e43e1..00000000000
--- a/lang/onyx/patches/patch-bin_onyx_Cookfile.inc.in
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-bin_onyx_Cookfile.inc.in,v 1.2 2015/12/29 23:34:53 dholland Exp $
-
-DESTDIR support.
-
---- bin/onyx/Cookfile.inc.in.orig	2005-03-17 07:54:59.000000000 +0000
-+++ bin/onyx/Cookfile.inc.in
-@@ -428,26 +428,26 @@ onyx_bins_check_update : onyx_bins_tests
- onyx_bins_install : [ONYX] mods_install
-                     libonyx_libs_install_s
- {
--  @INSTALL@ -d [BINDIR];
-+  @INSTALL@ -d [DESTDIR][BINDIR];
- 
--  @INSTALL@ -m 0755 [ONYX] [BINDIR]/onyx-@onyx_version@;
--  rm -f [BINDIR]/onyx;
--  ln -s onyx-@onyx_version@ [BINDIR]/onyx;
--
--  @INSTALL@ -d [MANDIR]/man1;
--  @INSTALL@ -m 0444 @objroot@/bin/onyx/man/man1/onyx.1 [MANDIR]/man1;
--
--  @INSTALL@ -d [DATADIR];
--  rm -f [DATADIR]/onyx;
--  ln -s onyx-@onyx_version@ [DATADIR]/onyx;
-+  @INSTALL@ -m 0755 [ONYX] [DESTDIR][BINDIR]/onyx-@onyx_version@;
-+  rm -f [DESTDIR][BINDIR]/onyx;
-+  ln -s onyx-@onyx_version@ [DESTDIR][BINDIR]/onyx;
-+
-+  @INSTALL@ -d [DESTDIR][MANDIR]/man1;
-+  @INSTALL@ -m 0444 @objroot@/bin/onyx/man/man1/onyx.1 [DESTDIR][MANDIR]/man1;
-+
-+  @INSTALL@ -d [DESTDIR][DATADIR];
-+  rm -f [DESTDIR][DATADIR]/onyx;
-+  ln -s onyx-@onyx_version@ [DESTDIR][DATADIR]/onyx;
- }
- 
- onyx_bins_uninstall :
- {
--  rm -f [BINDIR]/onyx-@onyx_version@;
--  rm -f [BINDIR]/onyx;
--  rm -f [MANDIR]/man1/onyx.1;
--  rm -f [DATADIR]/onyx;
-+  rm -f [DESTDIR][BINDIR]/onyx-@onyx_version@;
-+  rm -f [DESTDIR][BINDIR]/onyx;
-+  rm -f [DESTDIR][MANDIR]/man1/onyx.1;
-+  rm -f [DESTDIR][DATADIR]/onyx;
- }
- 
- onyx_bins_clean :
diff --git a/lang/onyx/patches/patch-bin_onyx__config_Cookfile.inc.in b/lang/onyx/patches/patch-bin_onyx__config_Cookfile.inc.in
deleted file mode 100644
index 42b5983ccfd..00000000000
--- a/lang/onyx/patches/patch-bin_onyx__config_Cookfile.inc.in
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-bin_onyx__config_Cookfile.inc.in,v 1.2 2015/12/29 23:34:53 dholland Exp $
-
-DESTDIR support.
-
---- bin/onyx_config/Cookfile.inc.in.orig	2005-03-17 07:55:08.000000000 +0000
-+++ bin/onyx_config/Cookfile.inc.in
-@@ -72,22 +72,22 @@ onyx_config_bins_install : [ONYX_CONFIG]
-                            mods_install
-                            onyx_bins_install
- {
--  @INSTALL@ -d [BINDIR];
-+  @INSTALL@ -d [DESTDIR][BINDIR];
- 
--  @INSTALL@ -m 0755 [ONYX_CONFIG] [BINDIR]/onyx_config-@onyx_version@;
--  rm -f [BINDIR]/onyx_config;
--  ln -s onyx_config-@onyx_version@ [BINDIR]/onyx_config;
-+  @INSTALL@ -m 0755 [ONYX_CONFIG] [DESTDIR][BINDIR]/onyx_config-@onyx_version@;
-+  rm -f [DESTDIR][BINDIR]/onyx_config;
-+  ln -s onyx_config-@onyx_version@ [DESTDIR][BINDIR]/onyx_config;
- 
--  @INSTALL@ -d [MANDIR]/man1;
-+  @INSTALL@ -d [DESTDIR][MANDIR]/man1;
-   @INSTALL@ -m 0444 @objroot@/bin/onyx_config/man/man1/onyx_config.1
--            [MANDIR]/man1;
-+            [DESTDIR][MANDIR]/man1;
- }
- 
- onyx_config_bins_uninstall :
- {
--  rm -f [BINDIR]/onyx_config-@onyx_version@;
--  rm -f [BINDIR]/onyx_config;
--  rm -f [MANDIR]/man1/onyx_config.1;
-+  rm -f [DESTDIR][BINDIR]/onyx_config-@onyx_version@;
-+  rm -f [DESTDIR][BINDIR]/onyx_config;
-+  rm -f [DESTDIR][MANDIR]/man1/onyx_config.1;
- }
- 
- onyx_config_bins_clean :
diff --git a/lang/onyx/patches/patch-doc_latex_onyx_Cookfile.inc.in b/lang/onyx/patches/patch-doc_latex_onyx_Cookfile.inc.in
deleted file mode 100644
index 2fb7d0a0950..00000000000
--- a/lang/onyx/patches/patch-doc_latex_onyx_Cookfile.inc.in
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-doc_latex_onyx_Cookfile.inc.in,v 1.2 2015/12/29 23:34:53 dholland Exp $
-
-DESTDIR support.
-
---- doc/latex/onyx/Cookfile.inc.in.orig	2005-03-17 07:54:59.000000000 +0000
-+++ doc/latex/onyx/Cookfile.inc.in
-@@ -82,31 +82,31 @@ onyx_docs_html :
- 
- onyx_docs_install_pdf : onyx_docs_pdf onyx_docs_install
- {
--  @INSTALL@ -d [DATADIR]/doc/onyx-@onyx_version@/pdf;
--  @INSTALL@ -m 0444 [ONYX_PDF] [DATADIR]/doc/onyx-@onyx_version@/pdf;
-+  @INSTALL@ -d [DESTDIR][DATADIR]/doc/onyx-@onyx_version@/pdf;
-+  @INSTALL@ -m 0444 [ONYX_PDF] [DESTDIR][DATADIR]/doc/onyx-@onyx_version@/pdf;
- }
- 
- onyx_docs_install_html : onyx_docs_html onyx_docs_install
- {
--  @INSTALL@ -d [DATADIR]/doc/onyx-@onyx_version@/html;
-+  @INSTALL@ -d [DESTDIR][DATADIR]/doc/onyx-@onyx_version@/html;
- 
-   loop local f = [glob [dirname [ONYX_HTML]]"/*"]
-   {
--    @INSTALL@ -m 0444 [f] [DATADIR]/doc/onyx-@onyx_version@/html;
-+    @INSTALL@ -m 0444 [f] [DESTDIR][DATADIR]/doc/onyx-@onyx_version@/html;
-   }
- }
- 
- onyx_docs_install :
- {
--  @INSTALL@ -d [DATADIR]/doc;
--  rm -f [DATADIR]/doc/onyx;
--  ln -s onyx-@onyx_version@ [DATADIR]/doc/onyx;
-+  @INSTALL@ -d [DESTDIR][DATADIR]/doc;
-+  rm -f [DESTDIR][DATADIR]/doc/onyx;
-+  ln -s onyx-@onyx_version@ [DESTDIR][DATADIR]/doc/onyx;
- }
- 
- onyx_docs_uninstall :
- {
--  rm -rf [DATADIR]/doc/onyx-@onyx_version@;
--  rm -f [DATADIR]/doc/onyx;
-+  rm -rf [DESTDIR][DATADIR]/doc/onyx-@onyx_version@;
-+  rm -f [DESTDIR][DATADIR]/doc/onyx;
- }
- 
- onyx_docs_clean :
diff --git a/lang/onyx/patches/patch-lib_libonyx_Cookfile.inc.in b/lang/onyx/patches/patch-lib_libonyx_Cookfile.inc.in
deleted file mode 100644
index fc2af65d59a..00000000000
--- a/lang/onyx/patches/patch-lib_libonyx_Cookfile.inc.in
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-lib_libonyx_Cookfile.inc.in,v 1.2 2015/12/29 23:34:53 dholland Exp $
-
-DESTDIR support.
-
---- lib/libonyx/Cookfile.inc.in.orig	2005-03-17 07:54:57.000000000 +0000
-+++ lib/libonyx/Cookfile.inc.in
-@@ -235,10 +235,10 @@ libonyx_libs_install : libonyx_libs_inst
- 
- libonyx_libs_uninstall :
- {
--  rm -f [glob [LIBDIR]/libonyx*];
--  rm -rf [INCLUDEDIR]/libonyx;
-+  rm -f [glob [DESTDIR][LIBDIR]/libonyx*];
-+  rm -rf [DESTDIR][INCLUDEDIR]/libonyx;
- #if @enable_posix@
--  rm -rf [DATADIR]/onyx-@onyx_version@/libonyx;
-+  rm -rf [DESTDIR][DATADIR]/onyx-@onyx_version@/libonyx;
- #endif
- }
- 
-@@ -303,37 +303,37 @@ libonyx_libs_install_i :
-                          [LIBONYX_INIT]
- #endif
- {
--  @INSTALL@ -d [INCLUDEDIR]/libonyx;
-+  @INSTALL@ -d [DESTDIR][INCLUDEDIR]/libonyx;
- 
-   loop local f = [LIBONYX_INCS]
-   {
--    @INSTALL@ -m 0644 [f] [INCLUDEDIR]/libonyx/;
-+    @INSTALL@ -m 0644 [f] [DESTDIR][INCLUDEDIR]/libonyx/;
-   }
- 
- #if @enable_posix@
--  @INSTALL@ -d [DATADIR]/onyx-@onyx_version@/libonyx;
-+  @INSTALL@ -d [DESTDIR][DATADIR]/onyx-@onyx_version@/libonyx;
- 
--  @INSTALL@ -m 0644 [LIBONYX_INIT] [DATADIR]/onyx-@onyx_version@/libonyx/;
-+  @INSTALL@ -m 0644 [LIBONYX_INIT] [DESTDIR][DATADIR]/onyx-@onyx_version@/libonyx/;
- #endif
- }
- 
- libonyx_libs_install_common :
- {
--  @INSTALL@ -d [LIBDIR];
-+  @INSTALL@ -d [DESTDIR][LIBDIR];
- }
- 
- libonyx_libs_install_a : [LIBONYX_A] libonyx_libs_install_common
- {
--  @INSTALL@ -m 0444 [LIBONYX_A] [LIBDIR];
-+  @INSTALL@ -m 0444 [LIBONYX_A] [DESTDIR][LIBDIR];
- }
- 
- libonyx_libs_install_s : [LIBONYX_S] libonyx_libs_install_common
- {
--  @INSTALL@ -m 0444 [LIBONYX_S] [LIBDIR];
-+  @INSTALL@ -m 0444 [LIBONYX_S] [DESTDIR][LIBDIR];
- 
- #if [count [LIBONYX_LNAME]]
--  rm -f [LIBDIR]/[LIBONYX_LNAME];
--  ln -s [LIBONYX_SNAME] [LIBDIR]/[LIBONYX_LNAME];
-+  rm -f [DESTDIR][LIBDIR]/[LIBONYX_LNAME];
-+  ln -s [LIBONYX_SNAME] [DESTDIR][LIBDIR]/[LIBONYX_LNAME];
- #endif
- }
- 
diff --git a/lang/onyx/patches/patch-mod_modclopt_Cookfile.inc.in b/lang/onyx/patches/patch-mod_modclopt_Cookfile.inc.in
deleted file mode 100644
index 346c923a04e..00000000000
--- a/lang/onyx/patches/patch-mod_modclopt_Cookfile.inc.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-mod_modclopt_Cookfile.inc.in,v 1.2 2015/12/29 23:34:53 dholland Exp $
-
-DESTDIR support.
-
---- mod/modclopt/Cookfile.inc.in.orig	2005-03-17 07:54:59.000000000 +0000
-+++ mod/modclopt/Cookfile.inc.in
-@@ -92,18 +92,18 @@ modclopt_mods_check_update : modclopt_mo
- 
- modclopt_mods_install :
- {
--  @INSTALL@ -d [DATADIR]/onyx-@onyx_version@/nx/modclopt;
-+  @INSTALL@ -d [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modclopt;
- 
-   loop local f = [MODCLOPT_NX] [MODCLOPT_NX_GEN]
-   {
--    @INSTALL@ -m 0644 [f] [DATADIR]/onyx-@onyx_version@/nx/modclopt/;
-+    @INSTALL@ -m 0644 [f] [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modclopt/;
-   }
- }
- 
- modclopt_mods_uninstall :
- {
--  rm -f [DATADIR]/onyx-@onyx_version@/nxm/modclopt.nxm;
--  rm -rf [DATADIR]/onyx-@onyx_version@/nx/modclopt;
-+  rm -f [DESTDIR][DATADIR]/onyx-@onyx_version@/nxm/modclopt.nxm;
-+  rm -rf [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modclopt;
- }
- 
- modclopt_mods_clean :
diff --git a/lang/onyx/patches/patch-mod_modprompt_Cookfile.inc.in b/lang/onyx/patches/patch-mod_modprompt_Cookfile.inc.in
deleted file mode 100644
index 8906c3d2df6..00000000000
--- a/lang/onyx/patches/patch-mod_modprompt_Cookfile.inc.in
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-mod_modprompt_Cookfile.inc.in,v 1.2 2015/12/29 23:34:53 dholland Exp $
-
-DESTDIR support.
-
---- mod/modprompt/Cookfile.inc.in.orig	2005-03-17 07:54:59.000000000 +0000
-+++ mod/modprompt/Cookfile.inc.in
-@@ -73,20 +73,20 @@ modprompt_mods_check_update : ;
- 
- modprompt_mods_install : [MODPROMPT]
- {
--  @INSTALL@ -d [DATADIR]/onyx-@onyx_version@/nxm;
--  @INSTALL@ -m 0444 [MODPROMPT] [DATADIR]/onyx-@onyx_version@/nxm;
--  @INSTALL@ -d [DATADIR]/onyx-@onyx_version@/nx/modprompt;
-+  @INSTALL@ -d [DESTDIR][DATADIR]/onyx-@onyx_version@/nxm;
-+  @INSTALL@ -m 0444 [MODPROMPT] [DESTDIR][DATADIR]/onyx-@onyx_version@/nxm;
-+  @INSTALL@ -d [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modprompt;
- 
-   loop local f = [MODPROMPT_NX] [MODPROMPT_NX_GEN]
-   {
--    @INSTALL@ -m 0644 [f] [DATADIR]/onyx-@onyx_version@/nx/modprompt/;
-+    @INSTALL@ -m 0644 [f] [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modprompt/;
-   }
- }
- 
- modprompt_mods_uninstall :
- {
--  rm -f [DATADIR]/onyx-@onyx_version@/nxm/modprompt.nxm;
--  rm -rf [DATADIR]/onyx-@onyx_version@/nx/modprompt;
-+  rm -f [DESTDIR][DATADIR]/onyx-@onyx_version@/nxm/modprompt.nxm;
-+  rm -rf [DESTDIR][DATADIR]/onyx-@onyx_version@/nx/modprompt;
- }
- 
- modprompt_mods_clean :