Index: head/lang/nx/Makefile
===================================================================
--- head/lang/nx/Makefile	(revision 516622)
+++ head/lang/nx/Makefile	(revision 516623)
@@ -1,33 +1,33 @@
 # Created by: gahr@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	nx
 DISTVERSION=	2.3.0
 PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	SF/next-scripting/${DISTVERSION}/
 DISTNAME=	nsf${DISTVERSION}
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Highly flexible, Tcl-based, object-oriented scripting language
 
 LICENSE=	MIT
 
 OPTIONS_DEFINE=	DOCS
 
 USES+=		gmake tcl:tea
 USE_LDCONFIG=	yes
 TEST_TARGET=	test
-PLIST_SUB+=	PKGNAME=${DISTNAME}
+PLIST_SUB+=	PKGNAME=${DISTNAME} PORTVERSION=${PORTVERSION}
 PORTDOCS=	*
 
 post-patch:
 	cd ${WRKSRC}/doc && for f in *.1; do ${MV} $$f $${f%.1}.nx.1; done
 	cd ${WRKSRC}/doc && for f in *.3; do ${MV} $$f $${f%.3}.nx.3; done
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/lib${DISTNAME}.so
 
 .include <bsd.port.mk>
Index: head/lang/nx/pkg-plist
===================================================================
--- head/lang/nx/pkg-plist	(revision 516622)
+++ head/lang/nx/pkg-plist	(revision 516623)
@@ -1,69 +1,69 @@
 bin/nxsh
 bin/nxwish
 bin/xotclsh
 bin/xowish
 include/nsf.h
 include/nsfDecls.h
 include/nsfInt.h
 include/nsfIntDecls.h
 lib/lib%%PKGNAME%%.so
 lib/%%PKGNAME%%/COPYRIGHT
 lib/%%PKGNAME%%/lib/make.tcl
 lib/%%PKGNAME%%/lib/mkIndex.tcl
 lib/%%PKGNAME%%/lib/nx-callback.tcl
 lib/%%PKGNAME%%/lib/nx-help.tcl
 lib/%%PKGNAME%%/lib/nx-pp.tcl
 lib/%%PKGNAME%%/lib/nx-shell.tcl
 lib/%%PKGNAME%%/lib/nx-test.tcl
 lib/%%PKGNAME%%/lib/nx-traits.tcl
 lib/%%PKGNAME%%/lib/nx-volatile.tcl
 lib/%%PKGNAME%%/lib/nx-zip.tcl
 lib/%%PKGNAME%%/lib/pkgIndex.tcl
 lib/%%PKGNAME%%/lib%%PKGNAME%%.so
-lib/%%PKGNAME%%/libnsfstub2.2.0.a
+lib/%%PKGNAME%%/libnsfstub%%PORTVERSION%%.a
 lib/%%PKGNAME%%/nx/class-method.tcl
 lib/%%PKGNAME%%/nx/nx.tcl
 lib/%%PKGNAME%%/nx/pkgIndex.tcl
 lib/%%PKGNAME%%/nx/plain-object-method.tcl
 lib/%%PKGNAME%%/pkgIndex.tcl
 lib/%%PKGNAME%%/serialize/pkgIndex.tcl
 lib/%%PKGNAME%%/serialize/serializer.tcl
 lib/%%PKGNAME%%/xotcl/COPYRIGHT
 lib/%%PKGNAME%%/xotcl/comm/Access.xotcl
 lib/%%PKGNAME%%/xotcl/comm/Connection.xotcl
 lib/%%PKGNAME%%/xotcl/comm/Dav.xotcl
 lib/%%PKGNAME%%/xotcl/comm/Ftp.xotcl
 lib/%%PKGNAME%%/xotcl/comm/Httpd.xotcl
 lib/%%PKGNAME%%/xotcl/comm/Imap.xotcl
 lib/%%PKGNAME%%/xotcl/comm/Ldap.xotcl
 lib/%%PKGNAME%%/xotcl/comm/Mime.xotcl
 lib/%%PKGNAME%%/xotcl/comm/PCache.xotcl
 lib/%%PKGNAME%%/xotcl/comm/pkgIndex.tcl
 lib/%%PKGNAME%%/xotcl/lib/Script.xotcl
 lib/%%PKGNAME%%/xotcl/lib/htmllib.xotcl
 lib/%%PKGNAME%%/xotcl/lib/makeDoc.xotcl
 lib/%%PKGNAME%%/xotcl/lib/metadataAnalyzer.xotcl
 lib/%%PKGNAME%%/xotcl/lib/mixinStrategy.xotcl
 lib/%%PKGNAME%%/xotcl/lib/package.xotcl
 lib/%%PKGNAME%%/xotcl/lib/pkgIndex.tcl
 lib/%%PKGNAME%%/xotcl/lib/staticMetadata.xotcl
 lib/%%PKGNAME%%/xotcl/lib/trace.xotcl
 lib/%%PKGNAME%%/xotcl/lib/upvarcompat.xotcl
 lib/%%PKGNAME%%/xotcl/lib/wafecompat.tcl
 lib/%%PKGNAME%%/xotcl/lib/xodoc.xotcl
 lib/%%PKGNAME%%/xotcl/pkgIndex.tcl
 lib/%%PKGNAME%%/xotcl/serialize/RecoveryPoint.xotcl
 lib/%%PKGNAME%%/xotcl/serialize/ScriptCreator.xotcl
 lib/%%PKGNAME%%/xotcl/serialize/Serializer.xotcl
 lib/%%PKGNAME%%/xotcl/serialize/pkgIndex.tcl
 lib/%%PKGNAME%%/xotcl/xotcl2.tcl
 lib/nsfConfig.sh
 man/man1/nxsh.nx.1.gz
 man/man1/nxwish.nx.1.gz
 man/man1/xotclsh.nx.1.gz
 man/man1/xowish.nx.1.gz
 man/man3/Class.nx.3.gz
 man/man3/Object.nx.3.gz
 man/man3/configure.nx.3.gz
 man/man3/current.nx.3.gz
 man/man3/next.nx.3.gz