Attachment 126374 Details for Bug 170138 – file.diff

[patch] file.diff

file.diff (text/plain), 5.12 KB, created by tkato432 on 2012-07-25 19:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-07-25 19:10:08 UTC

Size: 5.12 KB

patch

obsolete

>diff -urN /usr/ports/cad/irsim/Makefile cad/irsim/Makefile
>--- /usr/ports/cad/irsim/Makefile	2012-06-01 22:18:21.000000000 +0900
>+++ cad/irsim/Makefile	2012-07-06 18:42:42.000000000 +0900
>@@ -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 @@
> 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>
>diff -urN /usr/ports/cad/irsim/distinfo cad/irsim/distinfo
>--- /usr/ports/cad/irsim/distinfo	2011-03-20 21:46:12.000000000 +0900
>+++ cad/irsim/distinfo	2012-07-06 04:42:03.000000000 +0900
>@@ -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
>diff -urN /usr/ports/cad/irsim/files/patch-scripts_configure cad/irsim/files/patch-scripts_configure
>--- /usr/ports/cad/irsim/files/patch-scripts_configure	2007-01-11 03:21:44.000000000 +0900
>+++ cad/irsim/files/patch-scripts_configure	1970-01-01 09:00:00.000000000 +0900
>@@ -1,33 +0,0 @@
>---- 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*)
>diff -urN /usr/ports/cad/irsim/pkg-descr cad/irsim/pkg-descr
>--- /usr/ports/cad/irsim/pkg-descr	2011-10-23 08:49:46.000000000 +0900
>+++ cad/irsim/pkg-descr	2012-07-06 04:37:10.000000000 +0900
>@@ -4,3 +4,5 @@
> 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/
>diff -urN /usr/ports/cad/irsim/pkg-plist cad/irsim/pkg-plist
>--- /usr/ports/cad/irsim/pkg-plist	2008-05-15 17:52:12.000000000 +0900
>+++ cad/irsim/pkg-plist	2012-07-06 18:40:45.000000000 +0900
>@@ -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

Actions: View | Diff

Attachments on bug 170138: 126374