Sat Sep 29 04:24:08 2012 UTC ()
WRKSRC should use PKGNAME_NOREV.


(dholland)
diff -r1.34 -r1.35 pkgsrc/net/ns/Makefile
cvs diff -r1.34 -r1.35 pkgsrc/net/ns/Makefile (switch to unified diff)

--- pkgsrc/net/ns/Makefile 2012/09/29 04:23:02 1.34
+++ pkgsrc/net/ns/Makefile 2012/09/29 04:24:08 1.35
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1# $NetBSD: Makefile,v 1.34 2012/09/29 04:23:02 dholland Exp $ 1# $NetBSD: Makefile,v 1.35 2012/09/29 04:24:08 dholland Exp $
2 2
3DISTNAME= ns-2.33 3DISTNAME= ns-2.33
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nsnam/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nsnam/}
7 7
8MAINTAINER= minskim@NetBSD.org 8MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= http://nsnam.isi.edu/nsnam/ 9HOMEPAGE= http://nsnam.isi.edu/nsnam/
10COMMENT= The UCB/LBNL Network Simulator Version 2 10COMMENT= The UCB/LBNL Network Simulator Version 2
11 11
12PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15WRKSRC= ${WRKDIR}/${PKGNAME} 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
16USE_LANGUAGES= c99 c++ 16USE_LANGUAGES= c99 c++
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19PTHREAD_OPTS+= require 19PTHREAD_OPTS+= require
20# Perl is only needed if you want to run the validation tests. 20# Perl is only needed if you want to run the validation tests.
21#USE_TOOLS+= perl 21#USE_TOOLS+= perl
22 22
23CONFIGURE_ARGS+= LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`" 23CONFIGURE_ARGS+= LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`"
24CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} 24CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
25CONFIGURE_ARGS+= --with-tcl-ver=8.5 25CONFIGURE_ARGS+= --with-tcl-ver=8.5
26CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} 26CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
27CONFIGURE_ARGS+= --with-tk-ver=8.5 27CONFIGURE_ARGS+= --with-tk-ver=8.5
28CONFIGURE_ARGS+= --with-otcl=${BUILDLINK_PREFIX.tcl-otcl} 28CONFIGURE_ARGS+= --with-otcl=${BUILDLINK_PREFIX.tcl-otcl}
29CONFIGURE_ARGS+= --with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl} 29CONFIGURE_ARGS+= --with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
30CONFIGURE_ENV+= X11LIBDIR=${X11PREFIX}/lib${LIBABISUFFIX} 30CONFIGURE_ENV+= X11LIBDIR=${X11PREFIX}/lib${LIBABISUFFIX}
31CONFIGURE_ENV+= X11INCDIR=${X11PREFIX}/include 31CONFIGURE_ENV+= X11INCDIR=${X11PREFIX}/include
32 32
33MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE} 33MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE}
34 34
35INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/ns 35INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/ns
36 36
37post-install: 37post-install:
38 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/cmu-scen-gen/setdest/calcdest ${DESTDIR}${PREFIX}/bin 38 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/cmu-scen-gen/setdest/calcdest ${DESTDIR}${PREFIX}/bin
39 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/dec/dec-tr-stat ${DESTDIR}${PREFIX}/bin 39 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/dec/dec-tr-stat ${DESTDIR}${PREFIX}/bin
40 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/epa/epa-tr-stat ${DESTDIR}${PREFIX}/bin 40 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/epa/epa-tr-stat ${DESTDIR}${PREFIX}/bin
41 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/nlanr/nlanr-tr-stat ${DESTDIR}${PREFIX}/bin 41 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/nlanr/nlanr-tr-stat ${DESTDIR}${PREFIX}/bin
42 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/cmu-scen-gen/setdest/setdest ${DESTDIR}${PREFIX}/bin 42 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/cmu-scen-gen/setdest/setdest ${DESTDIR}${PREFIX}/bin
43 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/ucb/ucb-tr-stat ${DESTDIR}${PREFIX}/bin 43 ${INSTALL_PROGRAM} ${WRKSRC}/indep-utils/webtrace-conv/ucb/ucb-tr-stat ${DESTDIR}${PREFIX}/bin
44 ${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${DESTDIR}${PREFIX}/share/doc/ns 44 ${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${DESTDIR}${PREFIX}/share/doc/ns
45 45
46BUILDLINK_DEPMETHOD.libXt?= build 46BUILDLINK_DEPMETHOD.libXt?= build
47 47
48.include "../../devel/tcl-tclcl/buildlink3.mk" 48.include "../../devel/tcl-tclcl/buildlink3.mk"
49.include "../../lang/tcl/buildlink3.mk" 49.include "../../lang/tcl/buildlink3.mk"
50.include "../../lang/tcl-otcl/buildlink3.mk" 50.include "../../lang/tcl-otcl/buildlink3.mk"
51.include "../../net/libpcap/buildlink3.mk" 51.include "../../net/libpcap/buildlink3.mk"
52.include "../../x11/libX11/buildlink3.mk" 52.include "../../x11/libX11/buildlink3.mk"
53.include "../../x11/libXext/buildlink3.mk" 53.include "../../x11/libXext/buildlink3.mk"
54.include "../../x11/libXt/buildlink3.mk" 54.include "../../x11/libXt/buildlink3.mk"
55.include "../../x11/tk/buildlink3.mk" 55.include "../../x11/tk/buildlink3.mk"
56.include "../../mk/pthread.buildlink3.mk" 56.include "../../mk/pthread.buildlink3.mk"
57 57
58.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"