2 files changed, 49 insertions, 48 deletions

diff --git a/net/nam/Makefile b/net/nam/Makefile
index ccf3613515ae..a88a4dbc2002 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -11,30 +11,30 @@ MAINTAINER=	masaki@club.kyutech.ac.jp
 COMMENT=	Animation tool for network simulation traces
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-LIB_DEPENDS=	otcl.1:${PORTSDIR}/lang/otcl
+LIB_DEPENDS=	libotcl.so:${PORTSDIR}/lang/otcl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USES=		gmake tk:85+
 USE_XORG=	xmu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
-USE_GMAKE=	yes
-USE_TK=		85+
 ALL_TARGET=	${PORTNAME}
 
-MAN1=		nam.1
+OPTIONS_DEFINE=	EXAMPLES
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
 		${WRKSRC}/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nam.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/ex/* ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/nam ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/nam.1 ${STAGEDIR}${PREFIX}/man/man1
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/ex/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/nam/pkg-plist b/net/nam/pkg-plist
index 6a03049a52c5..db42749c79fe 100644
--- a/net/nam/pkg-plist
+++ b/net/nam/pkg-plist
@@ -1,39 +1,40 @@
 bin/nam
-%%PORTDOCS%%share/examples/nam/9nodetree.nam
-%%PORTDOCS%%share/examples/nam/DSR.nam
-%%PORTDOCS%%share/examples/nam/README
-%%PORTDOCS%%share/examples/nam/adc.README
-%%PORTDOCS%%share/examples/nam/adc.nam.gz
-%%PORTDOCS%%share/examples/nam/algo-out-50sub.nam
-%%PORTDOCS%%share/examples/nam/att.README
-%%PORTDOCS%%share/examples/nam/att.nam.gz
-%%PORTDOCS%%share/examples/nam/dynamic-nam.conf
-%%PORTDOCS%%share/examples/nam/dynamics-demo.nam
-%%PORTDOCS%%share/examples/nam/dynamics-demo.txt
-%%PORTDOCS%%share/examples/nam/flat-out-50sub.nam
-%%PORTDOCS%%share/examples/nam/hier-out-50sub.nam
-%%PORTDOCS%%share/examples/nam/lan.nam
-%%PORTDOCS%%share/examples/nam/lantest2.nam
-%%PORTDOCS%%share/examples/nam/losspatterns.README
-%%PORTDOCS%%share/examples/nam/losspatterns.nam
-%%PORTDOCS%%share/examples/nam/mbone96.layout.nam
-%%PORTDOCS%%share/examples/nam/mbone96.nam
-%%PORTDOCS%%share/examples/nam/mcache.nam
-%%PORTDOCS%%share/examples/nam/mobigen.nam
-%%PORTDOCS%%share/examples/nam/pktdemo.nam.gz
-%%PORTDOCS%%share/examples/nam/rbp_demo.README
-%%PORTDOCS%%share/examples/nam/rbp_demo.nam
-%%PORTDOCS%%share/examples/nam/rpm-vs-srm.nam
-%%PORTDOCS%%share/examples/nam/sample.nam.tcl
-%%PORTDOCS%%share/examples/nam/session.README
-%%PORTDOCS%%share/examples/nam/session.nam.gz
-%%PORTDOCS%%share/examples/nam/simple_mcast.nam
-%%PORTDOCS%%share/examples/nam/srm-example.nam
-%%PORTDOCS%%share/examples/nam/tcpecn.nam.gz
-%%PORTDOCS%%share/examples/nam/tcpsrm.nam.gz
-%%PORTDOCS%%share/examples/nam/test.nam.gz
-%%PORTDOCS%%share/examples/nam/ts100.layout.nam.gz
-%%PORTDOCS%%share/examples/nam/ts100.nam.gz
-%%PORTDOCS%%share/examples/nam/ts20.nam.gz
-%%PORTDOCS%%share/examples/nam/webcache.nam
-%%PORTDOCS%%@dirrm share/examples/nam
+man/man1/nam.1.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/9nodetree.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/DSR.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adc.README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adc.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/algo-out-50sub.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/att.README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/att.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic-nam.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamics-demo.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamics-demo.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flat-out-50sub.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hier-out-50sub.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lan.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lantest2.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/losspatterns.README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/losspatterns.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mbone96.layout.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mbone96.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mcache.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mobigen.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pktdemo.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rbp_demo.README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rbp_demo.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpm-vs-srm.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.nam.tcl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/session.README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/session.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple_mcast.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srm-example.nam
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpecn.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tcpsrm.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ts100.layout.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ts100.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ts20.nam.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webcache.nam
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%