svn commit: r323879 - head/net/ns

[Alexey Dokuchaev]

Author: danfe
Date: Mon Jul 29 09:33:40 2013
New Revision: 323879
URL: http://svnweb.freebsd.org/changeset/ports/323879

Log:
  - Trim Makefile header to standard two lines
  - Convert USE_GMAKE, drop no-op MANCOMPRESSED=no
  - Do no install examples as PORTDOCS, convert to OptionsNG
  - Fix the build with modern C++ compilers and Tcl 8.6
  
  Reported by:	pointyhat-west

Modified:
  head/net/ns/Makefile

Modified: head/net/ns/Makefile
==============================================================================
--- head/net/ns/Makefile	Mon Jul 29 09:32:50 2013	(r323878)
+++ head/net/ns/Makefile	Mon Jul 29 09:33:40 2013	(r323879)
@@ -1,38 +1,50 @@
-# New ports collection makefile for: ns-2
-# Date created:		26 April 1999
-# Whom:			obonilla
-#
+# Created by: Oscar Bonilla <obonilla at fisicc-ufm.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	ns
 PORTVERSION=	2.35
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}nam/${PORTNAME}-2/${PORTVERSION}
-DISTFILES=	${PORTNAME}-src-${PORTVERSION}.tar.gz
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	masaki at club.kyutech.ac.jp
 COMMENT=	Discrete event simulator for networking research
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 
+USES=		gmake
+USE_TK=		85+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-tcl-ver=${TCL_VER} \
+		--with-tk-ver=${TK_VER} \
+		--x-libraries=${LOCALBASE}/lib \
+		--x-includes=${LOCALBASE}/include
+
+WRKSRC=		${WRKDIR}/ns-${PORTVERSION}
+
 MAN1=		ns.1
-MANCOMPRESSED=	no
 
-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+
+OPTIONS_DEFINE=	EXAMPLES
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,Tcl_GetHashKey,static_cast<char*>&," \
+		${WRKSRC}/pushback/ident-tree.h \
+		${WRKSRC}/webcache/pagepool.cc
+	@${REINPLACE_CMD} -e "/^CFLAGS =/s,$$, -DUSE_INTERP_RESULT," \
+		${WRKSRC}/indep-utils/webtrace-conv/dec/Makefile.in \
+		${WRKSRC}/indep-utils/webtrace-conv/epa/Makefile.in \
+		${WRKSRC}/indep-utils/webtrace-conv/nlanr/Makefile.in \
+		${WRKSRC}/indep-utils/webtrace-conv/ucb/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ns.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR}
 .endif