Attachment #126374 for bug #170138

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




#

PORTNAME=	irsim
PORTVERSION=	9.7.74
PORTREVISION=	0
CATEGORIES=	cad
MASTER_SITES=	http://opencircuitdesign.com/irsim/archive/
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	An event-driven logic-level simulator for MOS circuis

LICENSE=	GPLv2

OPTIONS_DEFINE=	INTERPRETER
OPTIONS_SINGLE=	INTERPRETER
OPTIONS_SINGLE_INTERPRETER=	SCHEME TCL
OPTIONS_DEFAULT=	INTERPRETER SCHEME
INTERPRETER_DESC=	Enable built-in interpreter support
SCHEME_DESC=	Scheme interpreter
TCL_DESC=	Tcl interpreter

CONFIGURE_WRKSRC=	${WRKSRC}/scripts

USE_XORG=	x11
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
MAKE_JOBS_SAFE=	yes

CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ENV+=	PIC_CFLAGS="-fpic" \
		PTHREAD_LIBS="${PTHREAD_LIBS}"

OPTIONS_SINGLE=	INTERPRETER
OPTIONS_SINGLE_INTERPRETER=	TCL SCHEME
OPTIONS_DEFAULT=	SCHEME
SCHEME_DESC=	Enable built-in Scheme interpreter
TCL_DESC=	Enable built-in Tcl interpreter

MAN1=		irsim.1
MAN3=		irsim-analyzer.3
MAN5=		netchange.5

TK_VER=		8.4

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MTCL}
USE_TK_BUILD=	yes
USE_TK=		yes
CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} \
			--with-tk=${TK_LIBDIR} \
			--with-tclincls=${TCL_INCLUDEDIR} \
			--with-tkincls=${TK_INCLUDEDIR} \
			--with-tcllibs=${LOCALBASE}/lib \
			--with-tklibs=${LOCALBASE}/lib \
			--with-interpreter=tcl
PLIST_SUB+=	TCL="" NOTCL="@comment "
.else
WISH=		${FALSE}
PLIST_SUB+=	TCL="@comment " NOTCL=""
.endif

.if ${PORT_OPTIONS:MSCHEME}
CONFIGURE_ARGS+=	--with-interpreter=scheme
PLIST_SUB+=	SCHEME=""
.else
PLIST_SUB+=	SCHEME="@comment "
.endif

.if empty(PORT_OPTIONS:MSCHEME) && empty(PORT_OPTIONS:MTCL)
CONFIGURE_ARGS+=	--with-interpreter=no
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|FreeBSD-\*|*-*-freebsd*| ; \
		 s|wish |${WISH:T} | ; \
		 s|-lpthread|${PTHREAD_LIBS}| ; \
		 s|"-fpic"|"-fPIC"| ; \
		 /-l\/usr\/X11R6\/include/d' ${CONFIGURE_WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)cad/irsim/distinfo (-2 / +2 lines)
1	SHA256 (irsim-9.7.72.tgz) = 1e783d24715d31fa3294ebef3e7c9662e13d63402fde7bbc8c327f90c91023ea	1	SHA256 (irsim-9.7.74.tgz) = d467e32e5c8577ffdc53a20928f9a2acfe834a7ec8148b7bccf7118481839d98
2	SIZE (irsim-9.7.72.tgz) = 454387	2	SIZE (irsim-9.7.74.tgz) = 454474




--- scripts/configure.orig	Tue Oct 24 21:09:50 2006
+++ scripts/configure	Wed Jan 10 21:17:08 2007
@@ -8180,8 +8180,9 @@
 fi
 
 if test $usingTcl ; then
+	echo "=============>$target"
   case $target in
-    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
+    *-sunos4*|*-*-netbsd|NetBSD-*|*-*-freebsd*|OpenBSD-*)
       TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
       ;;
@@ -8421,7 +8422,7 @@
 #define HAVE_PTHREADS 1
 _ACEOF
 
-    gr_libs="$gr_libs -lpthread"
+    gr_libs="$gr_libs $PTHREAD_LIBS"
     gr_srcs="$gr_srcs thread.c"
     gr_hsrcs=""
     gr_hprog=""
@@ -10258,9 +10259,8 @@
 
     *-freebsd*)
       # Not available on all versions:  check for include file.
-      SHLIB_CFLAGS="-fpic"
+      SHLIB_CFLAGS=${PIC_CFLAGS}
       LDDL_FLAGS="-shared ${LIB_SPECS}"
-      CFLAGS="${CFLAGS} -l/usr/X11R6/include"
       ;;
 
     *-netbsd*|*-openbsd*)

Lines 4-6 Link Here

(-)cad/irsim/pkg-descr (+2 lines)
4	where magic was installed, e.g. /usr/local. Alternatively, the system	4	where magic was installed, e.g. /usr/local. Alternatively, the system
5	administrator can create a dummy user named 'cad' with its home	5	administrator can create a dummy user named 'cad' with its home
6	directory set to the installation directory.	6	directory set to the installation directory.
		7
		8	WWW: http://opencircuitdesign.com/irsim/

Lines 1-6 Link Here

(-)cad/irsim/pkg-plist (-2 / +2 lines)
		1	%%NOTCL%%bin/genspktbl
		2	%%NOTCL%%bin/gentbl
1	bin/irsim	3	bin/irsim
2	%%SCHEME%%bin/gentbl
3	%%SCHEME%%bin/genspktbl
4	lib/irsim/doc/irsim-analyzer.doc	4	lib/irsim/doc/irsim-analyzer.doc
5	lib/irsim/doc/irsim.doc	5	lib/irsim/doc/irsim.doc
6	lib/irsim/doc/netchange.doc	6	lib/irsim/doc/netchange.doc

Return to bug 170138

Lines 6-13 Link Here

(-)cad/irsim/Makefile (-25 / +37 lines)
6	#	6	#
7		7
8	PORTNAME= irsim	8	PORTNAME= irsim
9	PORTVERSION= 9.7.72	9	PORTVERSION= 9.7.74
10	PORTREVISION= 0
11	CATEGORIES= cad	10	CATEGORIES= cad
12	MASTER_SITES= http://opencircuitdesign.com/irsim/archive/	11	MASTER_SITES= http://opencircuitdesign.com/irsim/archive/
13	EXTRACT_SUFX= .tgz	12	EXTRACT_SUFX= .tgz
Lines 15-63 Link Here
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= An event-driven logic-level simulator for MOS circuis	15	COMMENT= An event-driven logic-level simulator for MOS circuis
17		16
		17	LICENSE= GPLv2
		18
		19	OPTIONS_DEFINE= INTERPRETER
		20	OPTIONS_SINGLE= INTERPRETER
		21	OPTIONS_SINGLE_INTERPRETER= SCHEME TCL
		22	OPTIONS_DEFAULT= INTERPRETER SCHEME
		23	INTERPRETER_DESC= Enable built-in interpreter support
		24	SCHEME_DESC= Scheme interpreter
		25	TCL_DESC= Tcl interpreter
		26
		27	CONFIGURE_WRKSRC= ${WRKSRC}/scripts
		28
18	USE_XORG= x11	29	USE_XORG= x11
19	USE_GMAKE= yes	30	USE_GMAKE= yes
20	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
21	CONFIGURE_WRKSRC= ${WRKSRC}/scripts/	32	MAKE_JOBS_SAFE= yes
22		33
23	CFLAGS+= -I${LOCALBASE}/include	34	CFLAGS+= -I${LOCALBASE}/include
24	LDFLAGS+= -L${LOCALBASE}/lib	35	LDFLAGS+= -L${LOCALBASE}/lib
25	CONFIGURE_ENV+= PIC_CFLAGS="-fpic" \
26	PTHREAD_LIBS="${PTHREAD_LIBS}"
27
28	OPTIONS_SINGLE= INTERPRETER
29	OPTIONS_SINGLE_INTERPRETER= TCL SCHEME
30	OPTIONS_DEFAULT= SCHEME
31	SCHEME_DESC= Enable built-in Scheme interpreter
32	TCL_DESC= Enable built-in Tcl interpreter
33		36
34	MAN1= irsim.1	37	MAN1= irsim.1
35	MAN3= irsim-analyzer.3	38	MAN3= irsim-analyzer.3
36	MAN5= netchange.5	39	MAN5= netchange.5
37		40
38	TK_VER= 8.4
39
40	.include <bsd.port.options.mk>	41	.include <bsd.port.options.mk>
41		42
42	.if ${PORT_OPTIONS:MTCL}	43	.if ${PORT_OPTIONS:MTCL}
43	LIB_DEPENDS+= tk84.1:${PORTSDIR}/x11-toolkits/tk84	44	USE_TK_BUILD= yes
44	CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \	45	USE_TK= yes
45	--with-tk=${LOCALBASE}/lib/tk${TK_VER} \	46	CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} \
46	--with-tcllibs=${LOCALBASE}/lib/ \	47	--with-tk=${TK_LIBDIR} \
47	--with-tklibs=${LOCALBASE}/lib/ \	48	--with-tclincls=${TCL_INCLUDEDIR} \
48	--with-tclincls=${LOCALBASE}/include/tcl${TK_VER} \	49	--with-tkincls=${TK_INCLUDEDIR} \
49	--with-tkincls=${LOCALBASE}/include/tk${TK_VER} \	50	--with-tcllibs=${LOCALBASE}/lib \
		51	--with-tklibs=${LOCALBASE}/lib \
50	--with-interpreter=tcl	52	--with-interpreter=tcl
51	PLIST_SUB+= TCL=""	53	PLIST_SUB+= TCL="" NOTCL="@comment "
52	.else	54	.else
53	PLIST_SUB+= TCL="@comment "	55	WISH= ${FALSE}
		56	PLIST_SUB+= TCL="@comment " NOTCL=""
54	.endif	57	.endif
55		58
56	.if ${PORT_OPTIONS:MSCHEME}	59	.if ${PORT_OPTIONS:MSCHEME}
57	CONFIGURE_ARGS+= --with-interpreter=scheme	60	CONFIGURE_ARGS+= --with-interpreter=scheme
58	PLIST_SUB+= SCHEME=""
59	.else
60	PLIST_SUB+= SCHEME="@comment "
61	.endif	61	.endif
62		62
		63	.if empty(PORT_OPTIONS:MSCHEME) && empty(PORT_OPTIONS:MTCL)
		64	CONFIGURE_ARGS+= --with-interpreter=no
		65	.endif
		66
		67	post-patch:
		68	@${REINPLACE_CMD} -e \
		69	's\|FreeBSD-\\|--freebsd\| ; \
		70	s\|wish \|${WISH:T} \| ; \
		71	s\|-lpthread\|${PTHREAD_LIBS}\| ; \
		72	s\|"-fpic"\|"-fPIC"\| ; \
		73	/-l\/usr\/X11R6\/include/d' ${CONFIGURE_WRKSRC}/configure
		74
63	.include <bsd.port.mk>	75	.include <bsd.port.mk>

Lines 1-33 Link Here

(-)cad/irsim/files/patch-scripts_configure (-33 lines)
1	--- scripts/configure.orig Tue Oct 24 21:09:50 2006
2	+++ scripts/configure Wed Jan 10 21:17:08 2007
3	@@ -8180,8 +8180,9 @@
4	fi
5
6	if test $usingTcl ; then
7	+ echo "=============>$target"
8	case $target in
9	- -sunos4\|--netbsd\|NetBSD-\|FreeBSD-\|OpenBSD-*)
10	+ -sunos4\|--netbsd\|NetBSD-\|--freebsd\|OpenBSD-*)
11	TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
12	TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
13	;;
14	@@ -8421,7 +8422,7 @@
15	#define HAVE_PTHREADS 1
16	_ACEOF
17
18	- gr_libs="$gr_libs -lpthread"
19	+ gr_libs="$gr_libs $PTHREAD_LIBS"
20	gr_srcs="$gr_srcs thread.c"
21	gr_hsrcs=""
22	gr_hprog=""
23	@@ -10258,9 +10259,8 @@
24
25	-freebsd)
26	# Not available on all versions: check for include file.
27	- SHLIB_CFLAGS="-fpic"
28	+ SHLIB_CFLAGS=${PIC_CFLAGS}
29	LDDL_FLAGS="-shared ${LIB_SPECS}"
30	- CFLAGS="${CFLAGS} -l/usr/X11R6/include"
31	;;
32
33	-netbsd\|-openbsd)