Index: Makefile
===================================================================
--- Makefile	(revision 446656)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nx
 DISTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF/next-scripting/${DISTVERSION}/
 DISTNAME=	nsf${DISTVERSION}
@@ -14,8 +15,6 @@
 
 OPTIONS_DEFINE=	DOCS
 
-CONFLICTS=	xotcl-1.*
-
 USES+=		gmake tcl:85+,tea
 USE_LDCONFIG=	yes
 TEST_TARGET=	test
@@ -22,6 +21,10 @@
 PLIST_SUB+=	PKGNAME=${DISTNAME}
 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}
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 446656)
+++ pkg-plist	(working copy)
@@ -58,12 +58,12 @@
 lib/%%PKGNAME%%/xotcl/serialize/pkgIndex.tcl
 lib/%%PKGNAME%%/xotcl/xotcl2.tcl
 lib/nsfConfig.sh
-man/man1/nxsh.1.gz
-man/man1/nxwish.1.gz
-man/man1/xotclsh.1.gz
-man/man1/xowish.1.gz
-man/man3/Class.3.gz
-man/man3/Object.3.gz
-man/man3/configure.3.gz
-man/man3/current.3.gz
-man/man3/next.3.gz
+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