Attachment #56649 for bug #85535

View | Details | Raw Unified | Return to bug 85535
Collapse All | Expand All





PORTNAME=	nam
PORTVERSION=	1.11
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://www.isi.edu/nsnam/dist/
DISTNAME=	nam-src-${PORTVERSION}

COMMENT=	Animation tool for network simulation traces

BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
LIB_DEPENDS=	otcl.1:${PORTSDIR}/lang/otcl

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
MANCOMPRESSED=	no

USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4
MAKE_ARGS=	CCOPT="${CXXFLAGS}"
ALL_TARGET=	${PORTNAME}

MAN1=		nam.1

.include <bsd.port.pre.mk>


.endif

post-patch:
	@${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 ${MANPREFIX}/man/man1
.if !defined(NOPORTDOCS)
	@${MKDIR} ${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/ex/* ${EXAMPLESDIR}




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

Return to bug 85535

Lines 7-13 Link Here

(-)net/nam/Makefile (-8 / +10 lines)
7		7
8	PORTNAME= nam	8	PORTNAME= nam
9	PORTVERSION= 1.11	9	PORTVERSION= 1.11
10	#PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= net	11	CATEGORIES= net
12	MASTER_SITES= http://www.isi.edu/nsnam/dist/	12	MASTER_SITES= http://www.isi.edu/nsnam/dist/
13	DISTNAME= nam-src-${PORTVERSION}	13	DISTNAME= nam-src-${PORTVERSION}
Lines 16-31 Link Here
16	COMMENT= Animation tool for network simulation traces	16	COMMENT= Animation tool for network simulation traces
17		17
18	BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl	18	BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
19	LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84	19	LIB_DEPENDS= otcl.1:${PORTSDIR}/lang/otcl
20		20
21	MAN1= nam.1	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
22	MANCOMPRESSED= no
23		22
24	USE_REINPLACE= yes	23	USE_REINPLACE= yes
25	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4	25	CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	26	MAKE_ARGS= CCOPT="${CXXFLAGS}"
28	ALL_TARGET= # empty	27	ALL_TARGET= ${PORTNAME}
		28
		29	MAN1= nam.1
29		30
30	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
31		32
Lines 34-44 Link Here
34	.endif	35	.endif
35		36
36	post-patch:	37	post-patch:
37	@${REINPLACE_CMD} -e 's,friend Queue,friend class Queue,' ${WRKSRC}/queue.h	38	@${REINPLACE_CMD} -e 's\|const = NULL\|const = 0\|g' ${WRKSRC}/agent.h
		39	@${REINPLACE_CMD} -e 's\|friend Queue\|friend class Queue\|g' ${WRKSRC}/queue.h
38		40
39	do-install:	41	do-install:
40	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin	42	${INSTALL_PROGRAM} ${WRKSRC}/nam ${PREFIX}/bin
41	${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/man/man1	43	${INSTALL_MAN} ${WRKSRC}/nam.1 ${MANPREFIX}/man/man1
42	.if !defined(NOPORTDOCS)	44	.if !defined(NOPORTDOCS)
43	@${MKDIR} ${EXAMPLESDIR}	45	@${MKDIR} ${EXAMPLESDIR}
44	${INSTALL_DATA} ${WRKSRC}/ex/* ${EXAMPLESDIR}	46	${INSTALL_DATA} ${WRKSRC}/ex/* ${EXAMPLESDIR}

Lines 1-20 Link Here

(-)net/nam/files/patch-aa (-20 lines)
1	--- M Tue Jul 26 12:13:26 2005
2	+++ Makefile.in Tue Jul 26 12:13:47 2005
3	@@ -62,7 +62,7 @@
4
5	STATIC = @V_STATIC@
6	DEFINE = -DTCL_TK @V_DEFINE@ @V_DEFINES@
7	-CFLAGS = $(CCOPT) $(DEFINE) $(INCLUDE)
8	+CFLAGS += $(CCOPT) $(DEFINE) $(INCLUDE)
9
10	INSTALL = @INSTALL@
11	RANLIB = @V_RANLIB@
12	@@ -70,7 +70,7 @@
13	BLANK = # make a blank space. DO NOT add anything to this line
14	AR = ar rc $(BLANK)
15	LINK = $(CPP)
16	-LDFLAGS =
17	+LDFLAGS +=
18	LDOUT = -o $(BLANK)
19	PERL = perl
20	RM = rm -f