ports/85535: Update port: net/nam

[KATO Tsuguru]

>Number:         85535
>Category:       ports
>Synopsis:       Update port: net/nam
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 31 17:10:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Fix LIB_DEPENDS
- Support CXXFLAGS properly

Remove file:
files/patch-aa

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/net/nam/Makefile net/nam/Makefile
--- /usr/ports/net/nam/Makefile	Wed Aug 31 16:25:16 2005
+++ net/nam/Makefile	Wed Aug 31 22:19:31 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	nam
 PORTVERSION=	1.11
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
 DISTNAME=	nam-src-${PORTVERSION}
@@ -16,16 +16,17 @@
 COMMENT=	Animation tool for network simulation traces
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS=	otcl.1:${PORTSDIR}/lang/otcl
 
-MAN1=		nam.1
-MANCOMPRESSED=	no
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-ALL_TARGET=	# empty
+MAKE_ARGS=	CCOPT="${CXXFLAGS}"
+ALL_TARGET=	${PORTNAME}
+
+MAN1=		nam.1
 
 .include <bsd.port.pre.mk>
 
@@ -34,11 +35,12 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,friend Queue,friend class Queue,' ${WRKSRC}/queue.h
+	@${REINPLACE_CMD} -e 's|const = NULL|const = 0|g' ${WRKSRC}/agent.h
+	@${REINPLACE_CMD} -e 's|friend Queue|friend class Queue|g' ${WRKSRC}/queue.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/nam.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ex/* ${EXAMPLESDIR}
diff -urN /usr/ports/net/nam/files/patch-aa net/nam/files/patch-aa
--- /usr/ports/net/nam/files/patch-aa	Wed Jul 27 13:32:27 2005
+++ net/nam/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,20 +0,0 @@
---- M	Tue Jul 26 12:13:26 2005
-+++ Makefile.in	Tue Jul 26 12:13:47 2005
-@@ -62,7 +62,7 @@
- 
- STATIC = @V_STATIC@
- DEFINE = -DTCL_TK @V_DEFINE@ @V_DEFINES@
--CFLAGS = $(CCOPT) $(DEFINE) $(INCLUDE)
-+CFLAGS += $(CCOPT) $(DEFINE) $(INCLUDE)
- 
- INSTALL = @INSTALL@
- RANLIB = @V_RANLIB@
-@@ -70,7 +70,7 @@
- BLANK	= # make a blank space.  DO NOT add anything to this line
- AR	= ar rc $(BLANK)
- LINK	= $(CPP)
--LDFLAGS	=
-+LDFLAGS	+=
- LDOUT	= -o $(BLANK)
- PERL	= perl
- RM	= rm -f
>Release-Note:
>Audit-Trail:
>Unformatted: