From owner-svn-ports-head@FreeBSD.ORG Sun Aug 31 19:44:17 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 382E3DE7; Sun, 31 Aug 2014 19:44:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B9F3107E; Sun, 31 Aug 2014 19:44:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7VJiGd3028460; Sun, 31 Aug 2014 19:44:16 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7VJiGcg028459; Sun, 31 Aug 2014 19:44:16 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201408311944.s7VJiGcg028459@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sun, 31 Aug 2014 19:44:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366821 - head/cad/spice X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2014 19:44:17 -0000 Author: hrs Date: Sun Aug 31 19:44:16 2014 New Revision: 366821 URL: http://svnweb.freebsd.org/changeset/ports/366821 QAT: https://qat.redports.org/buildarchive/r366821/ Log: - Add MAKE_JOBS_UNSAFE [*]. - Simplify LICENSE_COMB=multi handling. PR: 193180 [*] Modified: head/cad/spice/Makefile Modified: head/cad/spice/Makefile ============================================================================== --- head/cad/spice/Makefile Sun Aug 31 19:40:09 2014 (r366820) +++ head/cad/spice/Makefile Sun Aug 31 19:44:16 2014 (r366821) @@ -30,6 +30,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}3f5 MAKEFILE= ${FILESDIR}/Makefile CONFIGURE_ENV= CONFIGFILE="${CONFIGFILE}" \ LOCALBASE="${LOCALBASE}" +MAKE_JOBS_UNSAFE=yes PORTDOCS= spice3f3.ps.gz PORTEXAMPLES= bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \ @@ -44,8 +45,13 @@ OPTIONS_DEFAULT=DOCS EXAMPLES X11 X11_USE= XORG=x11,xaw,xext,xmu,xt X11_CONFIGURE_ENV= WITH_X11=yes DEV_BSIM3_DESC= BSIM3v3 MOS Transistor Model Support +DEV_BSIM3_LICENSE= BSIML +DEV_BSIM3_LICENSE_FILE= ${WRKSRC}/src/lib/dev/bsim3/B3TERMS_OF_USE DEV_BSIM4_DESC= BSIM4v4 MOS Transistor Model Support +DEV_BSIM4_LICENSE= BSIML +DEV_BSIM4_LICENSE_FILE= ${WRKSRC}/src/lib/dev/bsim4/B4TERMS_OF_USE.txt DEV_HISIM2_DESC= HiSIM2 IGFET Model Support +DEV_HISIM2_LICENSE= HISIML .include @@ -53,35 +59,27 @@ DEV_HISIM2_DESC= HiSIM2 IGFET Model Supp CC_OPT= ${CFLAGS} CONFIGFILE= ${WRKSRC}/conf/FreeBSD DEVICES= -.for D in BSIM3 BSIM4 HISIM2 -. if !empty(PORT_OPTIONS:MDEV_$D) -DEVICES+= ${D:tl} -. endif -.endfor -.if !empty(PORT_OPTIONS:MDEV_BSIM3) || \ - !empty(PORT_OPTIONS:MDEV_BSIM4) || \ - !empty(PORT_OPTIONS:MDEV_HISIM2) -LICENSE_COMB= multi LICENSE_FILE_MIT= ${WRKSRC}/COPYRIGHT -.if !empty(PORT_OPTIONS:MDEV_BSIM3) || \ - !empty(PORT_OPTIONS:MDEV_BSIM4) -LICENSE+= BSIML LICENSE_NAME_BSIML= BSIM license LICENSE_PERMS_BSIML= dist-mirror pkg-mirror auto-accept -.if !empty(PORT_OPTIONS:MDEV_BSIM3) -LICENSE_FILE_BSIML= ${WRKSRC}/src/lib/dev/bsim3/B3TERMS_OF_USE -.else -LICENSE_FILE_BSIML= ${WRKSRC}/src/lib/dev/bsim4/B4TERMS_OF_USE.txt -.endif -.endif -.if !empty(PORT_OPTIONS:MDEV_HISIM2) -LICENSE+= HISIML LICENSE_NAME_HISIML= HiSIM license LICENSE_PERMS_HISIML= dist-mirror pkg-mirror auto-accept LICENSE_FILE_HISIML= ${FILESDIR}/hisim2-license.txt -.endif -.endif + +.for D in ${OPTIONS_DEFINE:MDEV_*:S/DEV_//} +. if !empty(PORT_OPTIONS:MDEV_$D) +LICENSE_COMB= multi +DEVICES+= ${D:tl} +. if !empty(DEV_${D}_LICENSE) +LICENSE+= ${DEV_${D}_LICENSE} +. if !empty(DEV_${D}_LICENSE_FILE) +LICENSE_FILE_${DEV_${D}_LICENSE}= ${DEV_${D}_LICENSE_FILE} +. endif +. endif +. endif +.endfor +LICENSE:= ${LICENSE:O:u} post-extract: @${DO_NADA}