Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/net/ns/Makefile	2004/03/09 23:06:59	1.14
+++ pkgsrc/net/ns/Makefile	2012/09/29 04:23:02	1.34
@@ -1,50 +1,58 @@
-# $NetBSD: Makefile,v 1.14 2004/03/09 23:06:59 minskim Exp $
+# $NetBSD: Makefile,v 1.34 2012/09/29 04:23:02 dholland Exp $
 
-DISTNAME=	ns-src-2.27
-PKGNAME=	${DISTNAME:S/-src//}
+DISTNAME=	ns-2.33
+PKGREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	http://www.isi.edu/nsnam/dist/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nsnam/}
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://www.isi.edu/nsnam/ns/
+HOMEPAGE=	http://nsnam.isi.edu/nsnam/
 COMMENT=	The UCB/LBNL Network Simulator Version 2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-USE_BUILDLINK3=	yes
-USE_LANGUAGES=	c c++
+WRKSRC=		${WRKDIR}/${PKGNAME}
+USE_LANGUAGES=	c99 c++
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
-USE_X11=	yes
 PTHREAD_OPTS+=	require
 # Perl is only needed if you want to run the validation tests.
-#USE_PERL5=		build
+#USE_TOOLS+=		perl
 
+CONFIGURE_ARGS+=	LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`"
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
-CONFIGURE_ARGS+=	--with-tcl-ver=8.4
+CONFIGURE_ARGS+=	--with-tcl-ver=8.5
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
-CONFIGURE_ARGS+=	--with-tk-ver=8.4
+CONFIGURE_ARGS+=	--with-tk-ver=8.5
 CONFIGURE_ARGS+=	--with-otcl=${BUILDLINK_PREFIX.tcl-otcl}
 CONFIGURE_ARGS+=	--with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
+CONFIGURE_ENV+=		X11LIBDIR=${X11PREFIX}/lib${LIBABISUFFIX}
+CONFIGURE_ENV+=		X11INCDIR=${X11PREFIX}/include
 
 MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/ns
+
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/cmu-scen-gen/setdest/calcdest ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/dec/dec-tr-stat ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/epa/epa-tr-stat ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/nlanr/nlanr-tr-stat ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/cmu-scen-gen/setdest/setdest ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/ucb/ucb-tr-stat ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${DESTDIR}${PREFIX}/share/doc/ns
+
+BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../devel/tcl-tclcl/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../lang/tcl-otcl/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-# Remove a left over executable in the source tarball.
-post-extract:
-	${_PKG_SILENT}${_PKG_DEBUG}			\
-	${RM} ${WRKSRC}/indep-utils/cmu-scen-gen/setdest/calcdest
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ns
-	${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${PREFIX}/share/doc/html/ns
-
 .include "../../mk/bsd.pkg.mk"