Stage cad/spice

3 files changed, 45 insertions, 32 deletions

diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 55a4bddf77cd..de05b66ce1d2 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -3,33 +3,29 @@
 
 PORTNAME=	spice
 PORTVERSION=	3f5.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	cad
 MASTER_SITES=	http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:sources
 PKGNAMESUFFIX=	${NOX11SUFX}
-DISTFILES=	spice3f5${EXTRACT_SUFX}:sources	\
-		cp.ps toc.ps doc.ps
+DISTFILES=	spice3f5${EXTRACT_SUFX}:sources	cp.ps toc.ps doc.ps
 DIST_SUBDIR=	spice
 EXTRACT_ONLY=	spice3f5${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General-purpose circuit simulation program
 
-LICENSE=	BSD
+LICENSE=	SPICE
+LICENSE_NAME=	BSD Copyright
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 WRKSRC=		${WRKDIR}/${PORTNAME}3f5
 MAKEFILE=	${FILESDIR}/Makefile
-MAKE_ENV+=	STRIP_CMD=${STRIP_CMD}
 MAKE_JOBS_UNSAFE=	yes
-MAN1=		sconvert.1 nutmeg.1 spice.1
-MAN3=		mfb.3
-MAN5=		mfbcap.5
-MLINKS=		spice.1 spice3.1
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=DOCS X11
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
@@ -37,27 +33,29 @@ USE_XORG=	x11 xaw xext xmu xt
 NOX11SUFX=
 .else
 NOX11SUFX=	-nox11
-COMMENT=	A general-purpose circuit simulation program (non-X11 version)
 MAKE_ARGS+=	-DWITHOUT_X11
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/ucb|${LOCALBASE}/bin|' ${WRKSRC}/util/build
+	@${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
+	@${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
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/*.ps > ${DOCSDIR}/spice3f3.ps
-	${GZIP_CMD} ${DOCSDIR}/*.ps
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/*.ps > \
+		${STAGEDIR}${DOCSDIR}/spice3f3.ps
+	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/*.ps
 .endif
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/spice/files/Makefile b/cad/spice/files/Makefile
index a93fdab4e7ad..f0c37acfcc1d 100644
--- a/cad/spice/files/Makefile
+++ b/cad/spice/files/Makefile
@@ -12,16 +12,26 @@ all:
 	util/build ${CONFIG} default
 
 install:
-	util/build ${CONFIG} install 
-	chmod a+rx ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
-	  ${PREFIX}/bin/sconvert ${PREFIX}/bin/help	\
-	  ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
-	${STRIP_CMD} ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg	\
-	  ${PREFIX}/bin/sconvert ${PREFIX}/bin/help \
-	  ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
-	chmod -R a+rX ${PREFIX}/share/spice
-	install -c -m 644 -o bin -g bin man/man5/mfbcap.5 ${PREFIX}/man/man5/mfbcap.5
-	install -c -m 644 -o bin -g bin man/man1/sconvert.1 ${PREFIX}/man/man1/sconvert.1
-	install -c -m 644 -o bin -g bin man/man1/nutmeg.1 ${PREFIX}/man/man1/nutmeg.1
-	install -c -m 644 -o bin -g bin man/man1/spice.1 ${PREFIX}/man/man1/spice.1
-	install -c -m 644 -o bin -g bin man/man3/mfb.3 ${PREFIX}/man/man3/mfb.3
+	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)
+	${BSD_INSTALL_DATA} lib/helpdir/spice.txt \
+		${DESTDIR}${PREFIX}/share/spice/helpdir
+	${BSD_INSTALL_SCRIPT} lib/scripts/setplot lib/scripts/spinit \
+		${DESTDIR}${PREFIX}/share/spice/scripts
+	${BSD_INSTALL_DATA} lib/mfbcap lib/news \
+		${DESTDIR}${PREFIX}/share/spice
+	${BSD_INSTALL_MAN} man/man5/mfbcap.5 \
+		${DESTDIR}${PREFIX}/man/man5/mfbcap.5
+	${BSD_INSTALL_MAN} man/man1/sconvert.1 \
+		${DESTDIR}${PREFIX}/man/man1/sconvert.1
+	${BSD_INSTALL_MAN} man/man1/nutmeg.1 \
+		${DESTDIR}${PREFIX}/man/man1/nutmeg.1
+	${BSD_INSTALL_MAN} man/man1/spice.1 \
+		${DESTDIR}${PREFIX}/man/man1/spice.1
+	${BSD_INSTALL_MAN} man/man1/spice.1 \
+		${DESTDIR}${PREFIX}/man/man1/spice3.1
+	${BSD_INSTALL_MAN} man/man3/mfb.3 \
+		${DESTDIR}${PREFIX}/man/man3/mfb.3
diff --git a/cad/spice/pkg-plist b/cad/spice/pkg-plist
index b331e3759f35..b28b54fd7953 100644
--- a/cad/spice/pkg-plist
+++ b/cad/spice/pkg-plist
@@ -4,8 +4,13 @@ bin/sconvert
 bin/help
 bin/proc2mod
 bin/multidec
+man/man1/sconvert.1.gz
+man/man1/nutmeg.1.gz
+man/man1/spice.1.gz
+man/man1/spice3.1.gz
+man/man3/mfb.3.gz
+man/man5/mfbcap.5.gz
 %%DATADIR%%/helpdir/spice.txt
-%%DATADIR%%/helpdir/spice.idx
 %%DATADIR%%/scripts/setplot
 %%DATADIR%%/scripts/spinit
 %%DATADIR%%/mfbcap