3 files changed, 125 insertions, 56 deletions

diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
index 3bdf3b4131b0..d605b4805522 100644
--- a/lang/onyx/Makefile
+++ b/lang/onyx/Makefile
@@ -6,22 +6,26 @@
 #
 
 PORTNAME=	onyx
-PORTVERSION=	2.3.1
+PORTVERSION=	3.0.0
 CATEGORIES=	lang
 MASTER_SITES=	http://www.canonware.com/download/onyx/
 
 MAINTAINER=	jasone@FreeBSD.org
 
 BUILD_DEPENDS=	cook:${PORTSDIR}/devel/cook
+LIB_DEPENDS=	edit.5:${PORTSDIR}/devel/libedit
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libedit-prefix=${PREFIX}
 INSTALLS_SHLIB=	yes
 
 MAN1=		onyx.1
 MANCOMPRESSED=	no
 
+PLIST_SUB=	ONYX_VERSION=${PORTVERSION}
+
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} cook libs mods bins)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} cook)
 
 do-install:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} cook install)
diff --git a/lang/onyx/distinfo b/lang/onyx/distinfo
index e84457b31dad..16ea91bf846d 100644
--- a/lang/onyx/distinfo
+++ b/lang/onyx/distinfo
@@ -1 +1 @@
-MD5 (onyx-2.3.1.tar.gz) = 90aa1b08e0a79d40f04613a97af3893b
+MD5 (onyx-3.0.0.tar.gz) = 3a74054494f59c189bf48e238fc7766b
diff --git a/lang/onyx/pkg-plist b/lang/onyx/pkg-plist
index 9e1c16d55a57..c48bf1ef2009 100644
--- a/lang/onyx/pkg-plist
+++ b/lang/onyx/pkg-plist
@@ -1,3 +1,6 @@
+lib/libonyx.so.6
+lib/libonyx.so
+lib/libonyx.a
 include/libonyx/libonyx.h
 include/libonyx/ch.h
 include/libonyx/dch.h
@@ -22,8 +25,8 @@ include/libonyx/nxo_operator.h
 include/libonyx/nxo_pmark.h
 include/libonyx/nxo_stack.h
 include/libonyx/nxo_string.h
-include/libonyx/nxo_thread.h
 include/libonyx/ql.h
+include/libonyx/nxo_thread.h
 include/libonyx/qr.h
 include/libonyx/qs.h
 include/libonyx/systemdict.h
@@ -35,58 +38,120 @@ include/libonyx/nxo_condition.h
 include/libonyx/nxo_mutex.h
 include/libonyx/thd.h
 include/libonyx/tsd.h
+include/libonyx/nxo_real.h
 include/libonyx/libonyx_defs.h
-lib/libonyx.so
-lib/libonyx.so.5
-lib/libonyx.a
-share/onyx/doc/ps/onyx.ps
-share/onyx/doc/pdf/onyx.pdf
-share/onyx/doc/html/onyx.html
-share/onyx/doc/html/node1.html
-share/onyx/doc/html/node2.html
-share/onyx/doc/html/node3.html
-share/onyx/doc/html/node4.html
-share/onyx/doc/html/node5.html
-share/onyx/doc/html/node6.html
-share/onyx/doc/html/node7.html
-share/onyx/doc/html/node8.html
-share/onyx/doc/html/node9.html
-share/onyx/doc/html/node10.html
-share/onyx/doc/html/node11.html
-share/onyx/doc/html/node12.html
-share/onyx/doc/html/node13.html
-share/onyx/doc/html/node14.html
-share/onyx/doc/html/node15.html
-share/onyx/doc/html/node16.html
-share/onyx/doc/html/node17.html
-share/onyx/doc/html/node18.html
-share/onyx/doc/html/node19.html
-share/onyx/doc/html/node20.html
-share/onyx/doc/html/node21.html
-share/onyx/doc/html/up.png
-share/onyx/doc/html/node22.html
-share/onyx/doc/html/node23.html
-share/onyx/doc/html/node24.html
-share/onyx/doc/html/node25.html
-share/onyx/doc/html/node26.html
-share/onyx/doc/html/node27.html
-share/onyx/doc/html/node28.html
-share/onyx/doc/html/img1.png
-share/onyx/doc/html/img2.png
-share/onyx/doc/html/img3.png
-share/onyx/doc/html/next_g.png
-share/onyx/doc/html/prev.png
-share/onyx/doc/html/contents.png
-share/onyx/doc/html/next.png
-share/onyx/doc/html/index.png
-share/onyx/doc/html/prev_g.png
-share/onyx/doc/html/up_g.png
-share/onyx/doc/html/onyx.css
-share/onyx/doc/html/index.html
+share/onyx-%%ONYX_VERSION%%/doc/ps/onyx.ps
+share/onyx-%%ONYX_VERSION%%/doc/pdf/onyx.pdf
+share/onyx-%%ONYX_VERSION%%/doc/html/contents.png
+share/onyx-%%ONYX_VERSION%%/doc/html/img1.png
+share/onyx-%%ONYX_VERSION%%/doc/html/img2.png
+share/onyx-%%ONYX_VERSION%%/doc/html/img3.png
+share/onyx-%%ONYX_VERSION%%/doc/html/img4.png
+share/onyx-%%ONYX_VERSION%%/doc/html/img5.png
+share/onyx-%%ONYX_VERSION%%/doc/html/img6.png
+share/onyx-%%ONYX_VERSION%%/doc/html/index.html
+share/onyx-%%ONYX_VERSION%%/doc/html/index.png
+share/onyx-%%ONYX_VERSION%%/doc/html/next.png
+share/onyx-%%ONYX_VERSION%%/doc/html/next_g.png
+share/onyx-%%ONYX_VERSION%%/doc/html/node1.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node10.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node11.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node12.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node13.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node14.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node15.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node16.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node17.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node18.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node19.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node2.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node20.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node21.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node22.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node23.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node24.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node25.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node26.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node27.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node28.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node29.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node3.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node30.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node31.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node32.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node33.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node34.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node35.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node36.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node37.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node38.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node39.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node4.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node40.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node41.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node42.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node43.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node44.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node45.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node46.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node47.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node48.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node49.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node5.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node50.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node51.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node52.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node53.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node54.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node55.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node56.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node57.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node58.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node59.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node6.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node60.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node61.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node62.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node63.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node64.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node65.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node66.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node67.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node68.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node69.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node7.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node70.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node71.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node72.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node73.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node74.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node75.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node76.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node77.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node78.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node79.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node8.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node80.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node81.html
+share/onyx-%%ONYX_VERSION%%/doc/html/node9.html
+share/onyx-%%ONYX_VERSION%%/doc/html/onyx.css
+share/onyx-%%ONYX_VERSION%%/doc/html/onyx.html
+share/onyx-%%ONYX_VERSION%%/doc/html/prev.png
+share/onyx-%%ONYX_VERSION%%/doc/html/prev_g.png
+share/onyx-%%ONYX_VERSION%%/doc/html/up.png
+share/onyx-%%ONYX_VERSION%%/doc/html/up_g.png
+share/onyx-%%ONYX_VERSION%%/nxm/modprompt.nxm
+share/onyx-%%ONYX_VERSION%%/nx/modprompt/modprompt.nx
+share/onyx-%%ONYX_VERSION%%/nx/modprompt/modprompt_defs.nx
+share/onyx
+bin/onyx-%%ONYX_VERSION%%
 bin/onyx
 @dirrm include/libonyx
-@dirrm share/onyx/doc/ps
-@dirrm share/onyx/doc/pdf
-@dirrm share/onyx/doc/html
-@dirrm share/onyx/doc
-@dirrm share/onyx
+@dirrm share/onyx-%%ONYX_VERSION%%/doc/ps
+@dirrm share/onyx-%%ONYX_VERSION%%/doc/pdf
+@dirrm share/onyx-%%ONYX_VERSION%%/doc/html
+@dirrm share/onyx-%%ONYX_VERSION%%/doc
+@dirrm share/onyx-%%ONYX_VERSION%%/nxm
+@dirrm share/onyx-%%ONYX_VERSION%%/nx/modprompt
+@dirrm share/onyx-%%ONYX_VERSION%%/nx
+@dirrm share/onyx-%%ONYX_VERSION%%