Bug 170138

Summary: cad/irsim: Update to version 9.7.74
Product: Ports & Packages Reporter: tkato432
Component: Individual Port(s)Assignee: Martin Wilke <miwi>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description tkato432 2012-07-25 19:10:08 UTC
- Update to version 9.7.74

Remove file:
files/patch-scripts_configure
Comment 1 Edwin Groothuis freebsd_committer 2012-07-25 19:10:43 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants his PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer 2012-08-05 06:03:13 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer 2012-08-05 06:03:45 UTC
Author: miwi
Date: Sun Aug  5 05:03:31 2012
New Revision: 302054
URL: http://svn.freebsd.org/changeset/ports/302054

Log:
  - Update to 9.7.74
  
  PR:		170138
  Submitted by:	Ports Fury

Deleted:
  head/cad/irsim/files/patch-scripts_configure
Modified:
  head/cad/irsim/Makefile
  head/cad/irsim/distinfo
  head/cad/irsim/pkg-descr
  head/cad/irsim/pkg-plist

Modified: head/cad/irsim/Makefile
==============================================================================
--- head/cad/irsim/Makefile	Sun Aug  5 05:03:26 2012	(r302053)
+++ head/cad/irsim/Makefile	Sun Aug  5 05:03:31 2012	(r302054)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	irsim
-PORTVERSION=	9.7.72
-PORTREVISION=	0
+PORTVERSION=	9.7.74
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/irsim/archive/
 EXTRACT_SUFX=	.tgz
@@ -15,49 +14,62 @@ 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
-CONFIGURE_WRKSRC=	${WRKSRC}/scripts/
+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}
-LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-			--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
-			--with-tcllibs=${LOCALBASE}/lib/ \
-			--with-tklibs=${LOCALBASE}/lib/ \
-			--with-tclincls=${LOCALBASE}/include/tcl${TK_VER} \
-			--with-tkincls=${LOCALBASE}/include/tk${TK_VER} \
+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=""
+PLIST_SUB+=	TCL="" NOTCL="@comment "
 .else
-PLIST_SUB+=	TCL="@comment "
+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>

Modified: head/cad/irsim/distinfo
==============================================================================
--- head/cad/irsim/distinfo	Sun Aug  5 05:03:26 2012	(r302053)
+++ head/cad/irsim/distinfo	Sun Aug  5 05:03:31 2012	(r302054)
@@ -1,2 +1,2 @@
-SHA256 (irsim-9.7.72.tgz) = 1e783d24715d31fa3294ebef3e7c9662e13d63402fde7bbc8c327f90c91023ea
-SIZE (irsim-9.7.72.tgz) = 454387
+SHA256 (irsim-9.7.74.tgz) = d467e32e5c8577ffdc53a20928f9a2acfe834a7ec8148b7bccf7118481839d98
+SIZE (irsim-9.7.74.tgz) = 454474

Modified: head/cad/irsim/pkg-descr
==============================================================================
--- head/cad/irsim/pkg-descr	Sun Aug  5 05:03:26 2012	(r302053)
+++ head/cad/irsim/pkg-descr	Sun Aug  5 05:03:31 2012	(r302054)
@@ -4,3 +4,5 @@ To run irsim, users should set CAD_HOME 
 where magic was installed, e.g. /usr/local.  Alternatively, the system
 administrator can create a dummy user named 'cad' with its home
 directory set to the installation directory.
+
+WWW: http://opencircuitdesign.com/irsim/

Modified: head/cad/irsim/pkg-plist
==============================================================================
--- head/cad/irsim/pkg-plist	Sun Aug  5 05:03:26 2012	(r302053)
+++ head/cad/irsim/pkg-plist	Sun Aug  5 05:03:31 2012	(r302054)
@@ -1,6 +1,6 @@
+%%NOTCL%%bin/genspktbl
+%%NOTCL%%bin/gentbl
 bin/irsim
-%%SCHEME%%bin/gentbl
-%%SCHEME%%bin/genspktbl
 lib/irsim/doc/irsim-analyzer.doc
 lib/irsim/doc/irsim.doc
 lib/irsim/doc/netchange.doc
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"