- Unbreak: port fetches fine

- Switch to options helpers

2 files changed, 7 insertions, 411 deletions

diff --git a/cad/z88/Makefile b/cad/z88/Makefile
index c10d4c2e1bea..7e0da32e243b 100644
--- a/cad/z88/Makefile
+++ b/cad/z88/Makefile
@@ -15,9 +15,6 @@ COMMENT=	Compact Finite Element Analysis System
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 
-BROKEN=		Unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2015-11-26
 NO_WRKSUBDIR=	yes
 USES=		pkgconfig
 USE_GL=		glu
@@ -27,12 +24,15 @@ 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
 
+PORTDATA=	*
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${CP} ${WRKSRC}/z88.fcd.linux ${WRKSRC}/z88.fcd
 	@${CP} ${WRKSRC}/z88.mk.kernel.gcc32 ${WRKSRC}/z88.kernel.mk
@@ -65,6 +65,8 @@ do-install:
 	${INSTALL_PROGRAM} ${Z88_BINS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${Z88_DATA:S|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.htm ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.gif ${STAGEDIR}${DOCSDIR}
diff --git a/cad/z88/pkg-plist b/cad/z88/pkg-plist
index ff5370ec44ea..311b492977f2 100644
--- a/cad/z88/pkg-plist
+++ b/cad/z88/pkg-plist
@@ -11,409 +11,3 @@ bin/z88n
 bin/z88o
 bin/z88v
 bin/z88x
-%%DATADIR%%/b10_2.txt
-%%DATADIR%%/b10_3.txt
-%%DATADIR%%/b10_n.txt
-%%DATADIR%%/b12_1.txt
-%%DATADIR%%/b12_1e14.txt
-%%DATADIR%%/b12_2.txt
-%%DATADIR%%/b12_3.txt
-%%DATADIR%%/b12_q_1.txt
-%%DATADIR%%/b12_q_2.txt
-%%DATADIR%%/b12_q_3.txt
-%%DATADIR%%/b12_q_5.txt
-%%DATADIR%%/b16014_2.txt
-%%DATADIR%%/b16014_n.txt
-%%DATADIR%%/b16028_2.txt
-%%DATADIR%%/b16028_n.txt
-%%DATADIR%%/b16056_2.txt
-%%DATADIR%%/b16056_n.txt
-%%DATADIR%%/b16112_2.txt
-%%DATADIR%%/b16112_n.txt
-%%DATADIR%%/b16224_2.txt
-%%DATADIR%%/b16224_n.txt
-%%DATADIR%%/b16_2.txt
-%%DATADIR%%/b16_3.txt
-%%DATADIR%%/b18_2.txt
-%%DATADIR%%/b18_2rou.txt
-%%DATADIR%%/b1_2.txt
-%%DATADIR%%/b1_3.txt
-%%DATADIR%%/b1_4.txt
-%%DATADIR%%/b22_2.txt
-%%DATADIR%%/b22_3.txt
-%%DATADIR%%/b22_ni.txt
-%%DATADIR%%/b22_ni_r2.txt
-%%DATADIR%%/b22_ni_r3k5.txt
-%%DATADIR%%/b23_i2.txt
-%%DATADIR%%/b23_i3.txt
-%%DATADIR%%/b23_i5.txt
-%%DATADIR%%/b23_ni.txt
-%%DATADIR%%/b5_2.txt
-%%DATADIR%%/b5_3.txt
-%%DATADIR%%/b5_ele10_2.txt
-%%DATADIR%%/b5_ele10_3.txt
-%%DATADIR%%/b5_ele10_ni.txt
-%%DATADIR%%/b6_q_1.txt
-%%DATADIR%%/b6_q_2.txt
-%%DATADIR%%/b6_q_5.txt
-%%DATADIR%%/b7_2.txt
-%%DATADIR%%/b7_3.txt
-%%DATADIR%%/b7_e15_1.txt
-%%DATADIR%%/b7_e15_2.txt
-%%DATADIR%%/b7_e15_3.txt
-%%DATADIR%%/b9_1.txt
-%%DATADIR%%/b9_2.txt
-%%DATADIR%%/b9_3.txt
-%%DATADIR%%/b9_tf_2.txt
-%%DATADIR%%/b9_tf_3.txt
-%%DATADIR%%/b9_tf_ni.txt
-%%DATADIR%%/copying.txt
-%%DATADIR%%/z88.dyn
-%%DATADIR%%/z88.fcd
-%%DATADIR%%/b10_n.dxf
-%%DATADIR%%/b13_x.dxf
-%%DATADIR%%/b16_n.dxf
-%%DATADIR%%/b16step1.dxf
-%%DATADIR%%/b16step2.dxf
-%%DATADIR%%/b16step3.dxf
-%%DATADIR%%/b16step4.dxf
-%%DATADIR%%/b16step5.dxf
-%%DATADIR%%/b18_x.dxf
-%%DATADIR%%/b1_x.dxf
-%%DATADIR%%/b22_x.dxf
-%%DATADIR%%/b23_x.dxf
-%%DATADIR%%/b2_x.dxf
-%%DATADIR%%/b3_x.dxf
-%%DATADIR%%/b4_20ele_x.dxf
-%%DATADIR%%/b4_x.dxf
-%%DATADIR%%/b5_x.dxf
-%%DATADIR%%/b6_x.dxf
-%%DATADIR%%/b7_x.dxf
-%%DATADIR%%/z88x.dxf
-%%DOCSDIR%%/e88d.htm
-%%DOCSDIR%%/e88dy.htm
-%%DOCSDIR%%/e88dy1.jpg
-%%DOCSDIR%%/e88dy2.jpg
-%%DOCSDIR%%/e88dy3.jpg
-%%DOCSDIR%%/e88dy4.jpg
-%%DOCSDIR%%/e88e.htm
-%%DOCSDIR%%/e88e1.htm
-%%DOCSDIR%%/e88e10.htm
-%%DOCSDIR%%/e88e11.htm
-%%DOCSDIR%%/e88e12.htm
-%%DOCSDIR%%/e88e13.htm
-%%DOCSDIR%%/e88e1301.gif
-%%DOCSDIR%%/e88e14.htm
-%%DOCSDIR%%/e88e15.htm
-%%DOCSDIR%%/e88e16.htm
-%%DOCSDIR%%/e88e17.htm
-%%DOCSDIR%%/e88e18.htm
-%%DOCSDIR%%/e88e19.htm
-%%DOCSDIR%%/e88e2.htm
-%%DOCSDIR%%/e88e20.htm
-%%DOCSDIR%%/e88e201.gif
-%%DOCSDIR%%/e88e202.gif
-%%DOCSDIR%%/e88e3.htm
-%%DOCSDIR%%/e88e4.htm
-%%DOCSDIR%%/e88e5.htm
-%%DOCSDIR%%/e88e502.gif
-%%DOCSDIR%%/e88e6.htm
-%%DOCSDIR%%/e88e7.htm
-%%DOCSDIR%%/e88e8.htm
-%%DOCSDIR%%/e88e9.htm
-%%DOCSDIR%%/e88ea.htm
-%%DOCSDIR%%/e88f.htm
-%%DOCSDIR%%/e88f.jpg
-%%DOCSDIR%%/e88g.htm
-%%DOCSDIR%%/e88g1.jpg
-%%DOCSDIR%%/e88g2.jpg
-%%DOCSDIR%%/e88ge.htm
-%%DOCSDIR%%/e88ge06.gif
-%%DOCSDIR%%/e88ge12.gif
-%%DOCSDIR%%/e88gpl.htm
-%%DOCSDIR%%/e88h.htm
-%%DOCSDIR%%/e88i1.htm
-%%DOCSDIR%%/e88i2.htm
-%%DOCSDIR%%/e88i201.gif
-%%DOCSDIR%%/e88i202.gif
-%%DOCSDIR%%/e88i203.gif
-%%DOCSDIR%%/e88i204.gif
-%%DOCSDIR%%/e88i205.gif
-%%DOCSDIR%%/e88i3.htm
-%%DOCSDIR%%/e88i4.htm
-%%DOCSDIR%%/e88i5.htm
-%%DOCSDIR%%/e88ia.htm
-%%DOCSDIR%%/e88in.htm
-%%DOCSDIR%%/e88inu.jpg
-%%DOCSDIR%%/e88inw.jpg
-%%DOCSDIR%%/e88ite.htm
-%%DOCSDIR%%/e88ite1.jpg
-%%DOCSDIR%%/e88ite2.jpg
-%%DOCSDIR%%/e88ite3.jpg
-%%DOCSDIR%%/e88ix.htm
-%%DOCSDIR%%/e88mr1.jpg
-%%DOCSDIR%%/e88mr2.jpg
-%%DOCSDIR%%/e88mru.htm
-%%DOCSDIR%%/e88mrw.htm
-%%DOCSDIR%%/e88n.htm
-%%DOCSDIR%%/e88n01.gif
-%%DOCSDIR%%/e88n02.gif
-%%DOCSDIR%%/e88ni.htm
-%%DOCSDIR%%/e88ni01.gif
-%%DOCSDIR%%/e88o.htm
-%%DOCSDIR%%/e88o01.jpg
-%%DOCSDIR%%/e88o02.jpg
-%%DOCSDIR%%/e88o03.jpg
-%%DOCSDIR%%/e88o04.jpg
-%%DOCSDIR%%/e88o05.jpg
-%%DOCSDIR%%/e88o06.jpg
-%%DOCSDIR%%/e88p.htm
-%%DOCSDIR%%/e88s10.htm
-%%DOCSDIR%%/e88s1.htm
-%%DOCSDIR%%/e88s2.htm
-%%DOCSDIR%%/e88s3.htm
-%%DOCSDIR%%/e88s4.htm
-%%DOCSDIR%%/e88s401.gif
-%%DOCSDIR%%/e88s5.htm
-%%DOCSDIR%%/e88s6.htm
-%%DOCSDIR%%/e88s7.htm
-%%DOCSDIR%%/e88s8.htm
-%%DOCSDIR%%/e88s9.htm
-%%DOCSDIR%%/e88sa.htm
-%%DOCSDIR%%/e88v.htm
-%%DOCSDIR%%/e88v1.jpg
-%%DOCSDIR%%/e88x.htm
-%%DOCSDIR%%/e88x1.jpg
-%%DOCSDIR%%/g88d.htm
-%%DOCSDIR%%/g88dy.htm
-%%DOCSDIR%%/g88dy1.jpg
-%%DOCSDIR%%/g88dy2.jpg
-%%DOCSDIR%%/g88dy3.jpg
-%%DOCSDIR%%/g88dy4.jpg
-%%DOCSDIR%%/g88e.htm
-%%DOCSDIR%%/g88e1.htm
-%%DOCSDIR%%/g88e10.htm
-%%DOCSDIR%%/g88e1001.gif
-%%DOCSDIR%%/g88e101.gif
-%%DOCSDIR%%/g88e11.htm
-%%DOCSDIR%%/g88e1101.gif
-%%DOCSDIR%%/g88e12.htm
-%%DOCSDIR%%/g88e1201.gif
-%%DOCSDIR%%/g88e13.htm
-%%DOCSDIR%%/g88e1301.gif
-%%DOCSDIR%%/g88e14.htm
-%%DOCSDIR%%/g88e1401.gif
-%%DOCSDIR%%/g88e15.htm
-%%DOCSDIR%%/g88e1501.gif
-%%DOCSDIR%%/g88e16.htm
-%%DOCSDIR%%/g88e1601.gif
-%%DOCSDIR%%/g88e17.htm
-%%DOCSDIR%%/g88e1701.gif
-%%DOCSDIR%%/g88e18.gif
-%%DOCSDIR%%/g88e18.htm
-%%DOCSDIR%%/g88e19.gif
-%%DOCSDIR%%/g88e19.htm
-%%DOCSDIR%%/g88e2.htm
-%%DOCSDIR%%/g88e20.gif
-%%DOCSDIR%%/g88e20.htm
-%%DOCSDIR%%/g88e201.gif
-%%DOCSDIR%%/g88e202.gif
-%%DOCSDIR%%/g88e3.htm
-%%DOCSDIR%%/g88e301.gif
-%%DOCSDIR%%/g88e4.htm
-%%DOCSDIR%%/g88e401.gif
-%%DOCSDIR%%/g88e5.htm
-%%DOCSDIR%%/g88e501.gif
-%%DOCSDIR%%/g88e502.gif
-%%DOCSDIR%%/g88e6.htm
-%%DOCSDIR%%/g88e601.gif
-%%DOCSDIR%%/g88e7.htm
-%%DOCSDIR%%/g88e701.gif
-%%DOCSDIR%%/g88e8.htm
-%%DOCSDIR%%/g88e801.gif
-%%DOCSDIR%%/g88e9.htm
-%%DOCSDIR%%/g88e901.gif
-%%DOCSDIR%%/g88ea.htm
-%%DOCSDIR%%/g88f.htm
-%%DOCSDIR%%/g88f.jpg
-%%DOCSDIR%%/g88g.htm
-%%DOCSDIR%%/g88g1.jpg
-%%DOCSDIR%%/g88g2.jpg
-%%DOCSDIR%%/g88g3.jpg
-%%DOCSDIR%%/g88ge.htm
-%%DOCSDIR%%/g88ge01.gif
-%%DOCSDIR%%/g88ge02.gif
-%%DOCSDIR%%/g88ge03.gif
-%%DOCSDIR%%/g88ge04.gif
-%%DOCSDIR%%/g88ge05.gif
-%%DOCSDIR%%/g88ge06.gif
-%%DOCSDIR%%/g88ge07.gif
-%%DOCSDIR%%/g88ge08.gif
-%%DOCSDIR%%/g88ge09.gif
-%%DOCSDIR%%/g88ge10.gif
-%%DOCSDIR%%/g88ge11.gif
-%%DOCSDIR%%/g88ge12.gif
-%%DOCSDIR%%/g88ge13.gif
-%%DOCSDIR%%/g88ge14.gif
-%%DOCSDIR%%/g88h.htm
-%%DOCSDIR%%/g88i1.htm
-%%DOCSDIR%%/g88i2.htm
-%%DOCSDIR%%/g88i201.gif
-%%DOCSDIR%%/g88i202.gif
-%%DOCSDIR%%/g88i203.gif
-%%DOCSDIR%%/g88i204.gif
-%%DOCSDIR%%/g88i205.gif
-%%DOCSDIR%%/g88i3.htm
-%%DOCSDIR%%/g88i4.htm
-%%DOCSDIR%%/g88ia.htm
-%%DOCSDIR%%/g88in.htm
-%%DOCSDIR%%/g88inu.jpg
-%%DOCSDIR%%/g88inw.jpg
-%%DOCSDIR%%/g88ite.htm
-%%DOCSDIR%%/g88ite1.jpg
-%%DOCSDIR%%/g88ite2.jpg
-%%DOCSDIR%%/g88ix.htm
-%%DOCSDIR%%/g88mr1.jpg
-%%DOCSDIR%%/g88mr2.jpg
-%%DOCSDIR%%/g88mr3.jpg
-%%DOCSDIR%%/g88mr4.jpg
-%%DOCSDIR%%/g88mr5.jpg
-%%DOCSDIR%%/g88mr6.jpg
-%%DOCSDIR%%/g88mr7.jpg
-%%DOCSDIR%%/g88mr8.jpg
-%%DOCSDIR%%/g88mru.htm
-%%DOCSDIR%%/g88mrw.htm
-%%DOCSDIR%%/g88n.htm
-%%DOCSDIR%%/g88n01.gif
-%%DOCSDIR%%/g88n02.gif
-%%DOCSDIR%%/g88ni.htm
-%%DOCSDIR%%/g88ni01.gif
-%%DOCSDIR%%/g88o.htm
-%%DOCSDIR%%/g88s1.htm
-%%DOCSDIR%%/g88s101.gif
-%%DOCSDIR%%/g88s102.gif
-%%DOCSDIR%%/g88s103.gif
-%%DOCSDIR%%/g88s2.htm
-%%DOCSDIR%%/g88s201.gif
-%%DOCSDIR%%/g88s202.gif
-%%DOCSDIR%%/g88s3.htm
-%%DOCSDIR%%/g88s301.gif
-%%DOCSDIR%%/g88s4.htm
-%%DOCSDIR%%/g88s401.gif
-%%DOCSDIR%%/g88s402.gif
-%%DOCSDIR%%/g88s5.htm
-%%DOCSDIR%%/g88s501.gif
-%%DOCSDIR%%/g88s502.gif
-%%DOCSDIR%%/g88s6.htm
-%%DOCSDIR%%/g88s601.gif
-%%DOCSDIR%%/g88s7.htm
-%%DOCSDIR%%/g88s701.gif
-%%DOCSDIR%%/g88s702.gif
-%%DOCSDIR%%/g88s8.htm
-%%DOCSDIR%%/g88s9.htm
-%%DOCSDIR%%/g88sa.htm
-%%DOCSDIR%%/g88v.htm
-%%DOCSDIR%%/g88v1.jpg
-%%DOCSDIR%%/g88x.htm
-%%DOCSDIR%%/g88x01.gif
-%%DOCSDIR%%/g88x02.gif
-%%DOCSDIR%%/g88x03.gif
-%%DOCSDIR%%/g88x04.gif
-%%DOCSDIR%%/g88x05.gif
-%%DOCSDIR%%/g88x06.gif
-%%DOCSDIR%%/g88x07.gif
-%%DOCSDIR%%/g88x08.gif
-%%DOCSDIR%%/g88x09.gif
-%%DOCSDIR%%/g88x1.jpg
-%%DOCSDIR%%/g88x10.gif
-%%DOCSDIR%%/g88x2.gif
-%%DOCSDIR%%/g88x3.gif
-%%DOCSDIR%%/e88s1004.jpg
-%%DOCSDIR%%/e88s104.jpg
-%%DOCSDIR%%/e88s105.jpg
-%%DOCSDIR%%/e88s106.jpg
-%%DOCSDIR%%/e88s203.jpg
-%%DOCSDIR%%/e88s303.jpg
-%%DOCSDIR%%/e88s404.jpg
-%%DOCSDIR%%/e88s503.jpg
-%%DOCSDIR%%/e88s504.jpg
-%%DOCSDIR%%/e88s602.jpg
-%%DOCSDIR%%/e88s603.jpg
-%%DOCSDIR%%/e88s701.jpg
-%%DOCSDIR%%/e88s703.jpg
-%%DOCSDIR%%/e88s801.jpg
-%%DOCSDIR%%/e88s802.jpg
-%%DOCSDIR%%/e88s803.jpg
-%%DOCSDIR%%/e88s804.jpg
-%%DOCSDIR%%/e88s805.jpg
-%%DOCSDIR%%/e88s806.jpg
-%%DOCSDIR%%/e88s807.jpg
-%%DOCSDIR%%/e88s808.jpg
-%%DOCSDIR%%/e88s809.jpg
-%%DOCSDIR%%/e88s904.jpg
-%%DOCSDIR%%/e88s905.jpg
-%%DOCSDIR%%/e88s906.jpg
-%%DOCSDIR%%/e88s907.jpg
-%%DOCSDIR%%/e88s908.jpg
-%%DOCSDIR%%/e88s909.jpg
-%%DOCSDIR%%/g88e1002.gif
-%%DOCSDIR%%/g88e102.gif
-%%DOCSDIR%%/g88e1102.gif
-%%DOCSDIR%%/g88e1202.gif
-%%DOCSDIR%%/g88e1402.gif
-%%DOCSDIR%%/g88e1502.gif
-%%DOCSDIR%%/g88e1602.gif
-%%DOCSDIR%%/g88e1702.gif
-%%DOCSDIR%%/g88e702.gif
-%%DOCSDIR%%/g88e802.gif
-%%DOCSDIR%%/g88i5.htm
-%%DOCSDIR%%/g88i501.gif
-%%DOCSDIR%%/g88i502.gif
-%%DOCSDIR%%/g88ite3.jpg
-%%DOCSDIR%%/g88mr9.jpg
-%%DOCSDIR%%/g88o01.jpg
-%%DOCSDIR%%/g88o02.jpg
-%%DOCSDIR%%/g88o03.jpg
-%%DOCSDIR%%/g88o04.jpg
-%%DOCSDIR%%/g88o05.jpg
-%%DOCSDIR%%/g88o06.jpg
-%%DOCSDIR%%/g88s10.htm
-%%DOCSDIR%%/g88s1001.jpg
-%%DOCSDIR%%/g88s1002.jpg
-%%DOCSDIR%%/g88s1003.jpg
-%%DOCSDIR%%/g88s1004.jpg
-%%DOCSDIR%%/g88s104.jpg
-%%DOCSDIR%%/g88s105.jpg
-%%DOCSDIR%%/g88s106.jpg
-%%DOCSDIR%%/g88s203.jpg
-%%DOCSDIR%%/g88s302.jpg
-%%DOCSDIR%%/g88s303.jpg
-%%DOCSDIR%%/g88s403.jpg
-%%DOCSDIR%%/g88s404.jpg
-%%DOCSDIR%%/g88s503.jpg
-%%DOCSDIR%%/g88s504.jpg
-%%DOCSDIR%%/g88s602.jpg
-%%DOCSDIR%%/g88s603.jpg
-%%DOCSDIR%%/g88s701.jpg
-%%DOCSDIR%%/g88s702.jpg
-%%DOCSDIR%%/g88s703.jpg
-%%DOCSDIR%%/g88s801.jpg
-%%DOCSDIR%%/g88s802.jpg
-%%DOCSDIR%%/g88s803.jpg
-%%DOCSDIR%%/g88s804.jpg
-%%DOCSDIR%%/g88s805.jpg
-%%DOCSDIR%%/g88s806.jpg
-%%DOCSDIR%%/g88s807.jpg
-%%DOCSDIR%%/g88s808.jpg
-%%DOCSDIR%%/g88s809.jpg
-%%DOCSDIR%%/g88s901.jpg
-%%DOCSDIR%%/g88s902.jpg
-%%DOCSDIR%%/g88s903.jpg
-%%DOCSDIR%%/g88s904.jpg
-%%DOCSDIR%%/g88s905.jpg
-%%DOCSDIR%%/g88s906.jpg
-%%DOCSDIR%%/g88s907.jpg
-%%DOCSDIR%%/g88s908.jpg
-%%DOCSDIR%%/g88s909.jpg
-%%DOCSDIR%%/pla1.gif
-%%PORTDOCS%%%%DOCSDIR%%/z88mane.pdf