Attachment #125108 for bug #168672

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





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

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

BROKEN=		does not configure

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

USE_XORG=	xmu
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+
ALL_TARGET=	${PORTNAME}

MAN1=		nam.1




--- random.cc.org	2006-09-27 04:28:19.000000000 +0900
+++ random.cc	2012-06-04 19:23:10.000000000 +0900
@@ -50,8 +50,11 @@
 RANDOM_RETURN_TYPE
 random() GCC_THROW
 {
+	return (long)Random::uniform();
+	/*
 	printf("random() called in nam.\nRandom is not portable, please use Random::uniform() instead.\n");
 	abort();
+	*/
 }
 
 #endif /* !WIN32 */

Return to bug 168672

Lines 7-13 Link Here

(-)/usr/ports/net/nam/Makefile (-6 / +4 lines)
7		7
8	PORTNAME= nam	8	PORTNAME= nam
9	PORTVERSION= 1.12	9	PORTVERSION= 1.12
10	PORTREVISION= 3	10	PORTREVISION= 4
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 18-32 Link Here
18	BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl	18	BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
19	LIB_DEPENDS= otcl.1:${PORTSDIR}/lang/otcl	19	LIB_DEPENDS= otcl.1:${PORTSDIR}/lang/otcl
20		20
21	BROKEN= does not configure
22
23	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
24		22
25	USE_XORG= xmu	23	USE_XORG= xmu
26	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
27	CXXFLAGS+= -I${LOCALBASE}/include/tclcl	25	CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
28	CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4	26	USE_GMAKE= yes
29	MAKE_ARGS= CCOPT="${CXXFLAGS}"	27	USE_TK= 85+
30	ALL_TARGET= ${PORTNAME}	28	ALL_TARGET= ${PORTNAME}
31		29
32	MAN1= nam.1	30	MAN1= nam.1

Line 0 Link Here

(-)/usr/ports/net/nam/files/patch-random.cc (+14 lines)
	1	--- random.cc.org 2006-09-27 04:28:19.000000000 +0900
	2	+++ random.cc 2012-06-04 19:23:10.000000000 +0900
	3	@@ -50,8 +50,11 @@
	4	RANDOM_RETURN_TYPE
	5	random() GCC_THROW
	6	{
	7	+ return (long)Random::uniform();
	8	+ /*
	9	printf("random() called in nam.\nRandom is not portable, please use Random::uniform() instead.\n");
	10	abort();
	11	+ */
	12	}
	13
	14	#endif /* !WIN32 */