From owner-svn-ports-all@FreeBSD.ORG  Mon Jul 29 09:33:41 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A22839BF;
 Mon, 29 Jul 2013 09:33:41 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7594529C4;
 Mon, 29 Jul 2013 09:33:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6T9Xfc2025521;
 Mon, 29 Jul 2013 09:33:41 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6T9Xfa7025520;
 Mon, 29 Jul 2013 09:33:41 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201307290933.r6T9Xfa7025520@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 29 Jul 2013 09:33:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323879 - head/net/ns
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jul 2013 09:33:41 -0000

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@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@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