Date: Thu, 21 Aug 2014 06:03:30 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365531 - in head/cad/spice: . files Message-ID: <201408210603.s7L63U34069028@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Aug 21 06:03:30 2014 New Revision: 365531 URL: http://svnweb.freebsd.org/changeset/ports/365531 QAT: https://qat.redports.org/buildarchive/r365531/ Log: - Fix MASTER_SITES for PS documents. - Fix LICENSE. SPICE license is a variant of MIT license, not BSDL, while the copyright holder is UCB. - Style clean-ups. Modified: head/cad/spice/Makefile head/cad/spice/files/FreeBSD head/cad/spice/files/FreeBSD.without_x11 head/cad/spice/files/Makefile head/cad/spice/pkg-plist Modified: head/cad/spice/Makefile ============================================================================== --- head/cad/spice/Makefile Thu Aug 21 03:59:26 2014 (r365530) +++ head/cad/spice/Makefile Thu Aug 21 06:03:30 2014 (r365531) @@ -3,59 +3,64 @@ PORTNAME= spice PORTVERSION= 3f5.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= cad -MASTER_SITES= http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:sources +MASTER_SITES= http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:srcs \ + LOCAL/hrs/${PORTNAME}:docs PKGNAMESUFFIX= ${NOX11SUFX} -DISTFILES= spice3f5${EXTRACT_SUFX}:sources cp.ps toc.ps doc.ps +DISTFILES= spice3f5${EXTRACT_SUFX}:srcs cp.ps:docs toc.ps:docs doc.ps:docs DIST_SUBDIR= spice EXTRACT_ONLY= spice3f5${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= General-purpose circuit simulation program -LICENSE= SPICE -LICENSE_NAME= BSD Copyright +LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYRIGHT -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept WRKSRC= ${WRKDIR}/${PORTNAME}3f5 MAKEFILE= ${FILESDIR}/Makefile MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= DOCS X11 -OPTIONS_DEFAULT=DOCS X11 +PORTDOCS= spice3f3.ps.gz +PORTEXAMPLES= bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \ + diodisto.cir ltra_1.cir ltra_2.cir ltra_3.cir \ + mixdisto.cir mos6inv.cir mosamp2.cir mosmem.cir process.mod \ + process.pro pz2.cir pzt.cir rc.cir rca3040.cir resnoise.cir \ + rtlinv.cir schmitt.cir simplepz.cir + +OPTIONS_DEFINE= DOCS EXAMPLES X11 +OPTIONS_DEFAULT=DOCS EXAMPLES X11 .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} USE_XORG= x11 xaw xext xmu xt NOX11SUFX= +CONFIGFILE= ${FILESDIR}/FreeBSD .else NOX11SUFX= -nox11 -MAKE_ARGS+= -DWITHOUT_X11 +CONFIGFILE= ${FILESDIR}/FreeBSD.without_x11 .endif -post-patch: - @${REINPLACE_CMD} -e 's|/usr/ucb|${LOCALBASE}/bin|' \ - ${WRKSRC}/util/build - do-configure: - @${CP} ${FILESDIR}/FreeBSD ${WRKSRC}/conf/FreeBSD - @${CP} ${FILESDIR}/FreeBSD.without_x11 \ - ${WRKSRC}/conf/FreeBSD.without_x11 - @${REINPLACE_CMD} -e 's+@CC@+${CC}+ ; s+@CFLAGS@+${CFLAGS}+ ; \ - s+@X11BASE@+${LOCALBASE}+;' \ - ${WRKSRC}/conf/FreeBSD ${WRKSRC}/conf/FreeBSD.without_x11 + (${CAT} ${CONFIGFILE}; \ + ${ECHO_CMD} "CC= ${CC}"; \ + ${ECHO_CMD} "MAKE= ${MAKE}"; \ + ${ECHO_CMD} "CC_OPT+= ${CFLAGS}"; \ + ${ECHO_CMD} "LOCALBASE=${LOCALBASE}"; \ + ) > ${WRKSRC}/conf/FreeBSD post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/*.ps > \ - ${STAGEDIR}${DOCSDIR}/spice3f3.ps - ${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/*.ps + ${CAT} ${DISTDIR}/${DIST_SUBDIR}/*.ps | ${GZIP_CMD} > \ + ${STAGEDIR}${DOCSDIR}/${PORTDOCS} .endif +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && \ + ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} +.endif .include <bsd.port.mk> Modified: head/cad/spice/files/FreeBSD ============================================================================== --- head/cad/spice/files/FreeBSD Thu Aug 21 03:59:26 2014 (r365530) +++ head/cad/spice/files/FreeBSD Thu Aug 21 06:03:30 2014 (r365531) @@ -1,8 +1,5 @@ # FreeBSD config exception file -MAKE = /usr/bin/make INTERFACE_OPTS = -DWANT_MFB -DWANT_X11 -CC = @CC@ -CC_OPT += @CFLAGS@ -LDFLAGS += -L@X11BASE@/lib -lm -ltermcap +LDFLAGS += -L${LOCALBASE}/lib -lm -ltermcap SYS_CFLAGS = -Dbsd Modified: head/cad/spice/files/FreeBSD.without_x11 ============================================================================== --- head/cad/spice/files/FreeBSD.without_x11 Thu Aug 21 03:59:26 2014 (r365530) +++ head/cad/spice/files/FreeBSD.without_x11 Thu Aug 21 06:03:30 2014 (r365531) @@ -1,9 +1,6 @@ # FreeBSD config exception file (non-x11 version) -MAKE = /usr/bin/make INTERFACE_OPTS = -DWANT_MFB -CC = @CC@ -CC_OPT += @CFLAGS@ LDFLAGS += -lm -ltermcap SYS_CFLAGS = -Dbsd X_DIR = Modified: head/cad/spice/files/Makefile ============================================================================== --- head/cad/spice/files/Makefile Thu Aug 21 03:59:26 2014 (r365530) +++ head/cad/spice/files/Makefile Thu Aug 21 06:03:30 2014 (r365531) @@ -1,22 +1,16 @@ # # $FreeBSD$ # - -.ifdef WITHOUT_X11 -CONFIG= FreeBSD.without_x11 -.else -CONFIG= FreeBSD -.endif - all: - util/build ${CONFIG} default + ${SH} util/build FreeBSD default install: mkdir -p ${DESTDIR}${PREFIX}/share/spice/helpdir \ ${DESTDIR}${PREFIX}/share/spice/scripts - (cd ${CONFIG}/obj/bin && ${BSD_INSTALL_PROGRAM} \ - spice3 nutmeg sconvert help proc2mod multidec \ - ${DESTDIR}${PREFIX}/bin) + cd FreeBSD/obj/bin && \ + ${BSD_INSTALL_PROGRAM} \ + spice3 nutmeg sconvert help proc2mod multidec \ + ${DESTDIR}${PREFIX}/bin ${BSD_INSTALL_DATA} lib/helpdir/spice.txt \ ${DESTDIR}${PREFIX}/share/spice/helpdir ${BSD_INSTALL_SCRIPT} lib/scripts/setplot lib/scripts/spinit \ Modified: head/cad/spice/pkg-plist ============================================================================== --- head/cad/spice/pkg-plist Thu Aug 21 03:59:26 2014 (r365530) +++ head/cad/spice/pkg-plist Thu Aug 21 06:03:30 2014 (r365531) @@ -18,26 +18,3 @@ man/man5/mfbcap.5.gz @dirrm %%DATADIR%%/helpdir @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%% -%%PORTDOCS%%%%DOCSDIR%%/spice3f3.ps.gz -%%EXAMPLESDIR%%/bjtnoise.cir -%%EXAMPLESDIR%%/bsim1tst.cir -%%EXAMPLESDIR%%/bsim2tst.cir -%%EXAMPLESDIR%%/diffpair.cir -%%EXAMPLESDIR%%/diodisto.cir -%%EXAMPLESDIR%%/ltra_1.cir -%%EXAMPLESDIR%%/ltra_2.cir -%%EXAMPLESDIR%%/ltra_3.cir -%%EXAMPLESDIR%%/mixdisto.cir -%%EXAMPLESDIR%%/mos6inv.cir -%%EXAMPLESDIR%%/mosamp2.cir -%%EXAMPLESDIR%%/mosmem.cir -%%EXAMPLESDIR%%/pz2.cir -%%EXAMPLESDIR%%/pzt.cir -%%EXAMPLESDIR%%/rc.cir -%%EXAMPLESDIR%%/rca3040.cir -%%EXAMPLESDIR%%/resnoise.cir -%%EXAMPLESDIR%%/rtlinv.cir -%%EXAMPLESDIR%%/schmitt.cir -%%EXAMPLESDIR%%/simplepz.cir -@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408210603.s7L63U34069028>