Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jan 2014 21:00:06 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340478 - head/cad/z88
Message-ID:  <201401202100.s0KL06DE070170@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Mon Jan 20 21:00:05 2014
New Revision: 340478
URL: http://svnweb.freebsd.org/changeset/ports/340478
QAT: https://qat.redports.org/buildarchive/r340478/

Log:
  Stage support

Modified:
  head/cad/z88/Makefile
  head/cad/z88/pkg-plist

Modified: head/cad/z88/Makefile
==============================================================================
--- head/cad/z88/Makefile	Mon Jan 20 20:56:45 2014	(r340477)
+++ head/cad/z88/Makefile	Mon Jan 20 21:00:05 2014	(r340478)
@@ -11,7 +11,7 @@ DIST_SUBDIR=	z88
 EXTRACT_ONLY=	${PORTNAME}130${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A compact Finite Element Analysis System
+COMMENT=	Compact Finite Element Analysis System
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 
@@ -24,14 +24,12 @@ USE_GNOME=	gtk20
 BROWSER?=	firefox3
 XEDITOR?=	gedit
 
+OPTIONS_DEFINE=	DOCS
+
 Z88_BINS=	z88f z88i1 z88i2 z88com z88d z88e z88g z88h z88n z88o	\
 		z88x z88v
 Z88_DATA=	z88.fcd z88.dyn *.dxf *.txt
 
-NO_STAGE=	yes
-
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${CP} ${WRKSRC}/z88.fcd.linux ${WRKSRC}/z88.fcd
 	@${CP} ${WRKSRC}/z88.mk.kernel.gcc32 ${WRKSRC}/z88.kernel.mk
@@ -59,17 +57,15 @@ do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f z88.gtk.mk gtk)
 
 do-install:
-	@${MKDIR} ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/z88.sh ${PREFIX}/bin/z88
-	@${INSTALL_PROGRAM} ${Z88_BINS:S|^|${WRKSRC}/|} ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${Z88_DATA:S|^|${WRKSRC}/|} ${DATADIR}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.htm ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.gif ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.jpg ${DOCSDIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/z88mane.pdf ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/z88.sh ${STAGEDIR}${PREFIX}/bin/z88
+	${INSTALL_PROGRAM} ${Z88_BINS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${Z88_DATA:S|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.htm ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.gif ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.jpg ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/z88mane.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/cad/z88/pkg-plist
==============================================================================
--- head/cad/z88/pkg-plist	Mon Jan 20 20:56:45 2014	(r340477)
+++ head/cad/z88/pkg-plist	Mon Jan 20 21:00:05 2014	(r340478)
@@ -10,7 +10,6 @@ bin/z88i2
 bin/z88n
 bin/z88o
 bin/z88v
-bin/z88v
 bin/z88x
 %%DATADIR%%/b10_2.txt
 %%DATADIR%%/b10_3.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401202100.s0KL06DE070170>