Enable stage support

2 files changed, 164 insertions, 174 deletions

diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index 6a248c40443c..1918be6de3df 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Interpreted language for scientific simulations
 
 USE_XORG=	x11
 MAKE_ARGS=	Y_HOME=relocatable Y_DOCDIR=/dev/null
-MAN1=		yorick.1 gist.1
 INFO=		yorick
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
@@ -23,9 +22,6 @@ PORTDOCS=	FILE_FORMATS README drat.doc graph.doc hex.doc \
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 # Change "cd foo; $(MAKE)" into "$(MAKE) -C foo" to unbreak parallel builds
 post-patch:
 	@${REINPLACE_CMD} -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|' \
@@ -33,8 +29,8 @@ post-patch:
 		${WRKSRC}/yorick/Makefile ${WRKSRC}/Makefile
 
 do-configure:
-	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ysite config)
+	cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ysite config
 
 post-build:
 	${MAKE} -C ${WRKSRC}/doc yorick.info
@@ -43,24 +39,16 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/emacs/yorick.el ${WRKSRC}/relocatable
 	@${RM} -rf ${WRKSRC}/relocatable/doc
 	@${RM} -rf ${PREFIX}/lib/${PORTNAME}
-	@${MV} ${WRKSRC}/relocatable ${PREFIX}/lib/${PORTNAME}
+	@${MV} ${WRKSRC}/relocatable ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .for f in gist yorick
-	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${MANPREFIX}/man/man1
-	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/bin/${f}
-	@${LN} -sf ${PREFIX}/lib/${PORTNAME}/bin/${f} ${PREFIX}/bin/${f}
+	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/bin/${f}
+	@${LN} -sf ${PREFIX}/lib/${PORTNAME}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
-	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/lib/codger
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
-	@${LN} -sf ${DOCSDIR} ${PREFIX}/lib/${PORTNAME}/doc
-.endif
-	${INSTALL_DATA} ${WRKSRC}/doc/yorick.info* ${PREFIX}/${INFO_PATH}
-
-# Hidden by default: this requires an X terminal to run all checks
-.ifdef MAINTAINER_MODE
-regression-test: build
-	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
-.endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/lib/codger
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+	@${LN} -sf ${DOCSDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/yorick.info* ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.mk>
diff --git a/lang/yorick/pkg-plist b/lang/yorick/pkg-plist
index e80f738e286b..90ae57c40256 100644
--- a/lang/yorick/pkg-plist
+++ b/lang/yorick/pkg-plist
@@ -1,169 +1,171 @@
 bin/yorick
 bin/gist
+lib/yorick/LICENSE
+lib/yorick/Make.cfg
+lib/yorick/Makedll
+lib/yorick/Makeexe
+lib/yorick/Makepkg
+lib/yorick/bin/gist
+lib/yorick/bin/yorick
 lib/yorick/g/README
+lib/yorick/g/axes.gs
+lib/yorick/g/boxed.gs
+lib/yorick/g/boxed2.gs
+lib/yorick/g/earth.gp
+lib/yorick/g/gray.gp
+lib/yorick/g/heat.gp
+lib/yorick/g/l_nobox.gs
+lib/yorick/g/ncar.gp
+lib/yorick/g/nobox.gs
 lib/yorick/g/ps.ps
-lib/yorick/g/yarg.gp
-lib/yorick/g/stern.gp
 lib/yorick/g/rainbow.gp
-lib/yorick/g/ncar.gp
-lib/yorick/g/heat.gp
-lib/yorick/g/gray.gp
-lib/yorick/g/earth.gp
-lib/yorick/g/work2.gs
-lib/yorick/g/work.gs
-lib/yorick/g/vgbox.gs
+lib/yorick/g/stern.gp
 lib/yorick/g/vg.gs
-lib/yorick/g/nobox.gs
-lib/yorick/g/l_nobox.gs
-lib/yorick/g/boxed2.gs
-lib/yorick/g/boxed.gs
-lib/yorick/g/axes.gs
-lib/yorick/i0/README
-lib/yorick/i0/stdx.i
-lib/yorick/i0/std.i
-lib/yorick/i0/paths.i
-lib/yorick/i0/matrix.i
-lib/yorick/i0/hex.i
-lib/yorick/i0/graph.i
-lib/yorick/i0/fft.i
-lib/yorick/i0/drat.i
+lib/yorick/g/vgbox.gs
+lib/yorick/g/work.gs
+lib/yorick/g/work2.gs
+lib/yorick/g/yarg.gp
+lib/yorick/i-start/50i.i
+lib/yorick/i-start/70drat.i
+lib/yorick/i-start/70hex.i
+lib/yorick/i-start/90pkg_mngr.i
+lib/yorick/i-start/README
 lib/yorick/i/README
-lib/yorick/i/zroots.i
-lib/yorick/i/ylmdec.i
-lib/yorick/i/unsigned.i
-lib/yorick/i/txpath.i
-lib/yorick/i/textload.i
-lib/yorick/i/teststr.i
-lib/yorick/i/testp.i
-lib/yorick/i/testm.i
-lib/yorick/i/testlp.i
-lib/yorick/i/testg.i
-lib/yorick/i/testfull.i
-lib/yorick/i/testb.i
-lib/yorick/i/test3.i
-lib/yorick/i/test2.i
-lib/yorick/i/test1.i
-lib/yorick/i/sysafe.i
-lib/yorick/i/style.i
-lib/yorick/i/string.i
-lib/yorick/i/splinef.i
-lib/yorick/i/spline.i
-lib/yorick/i/slice3.i
-lib/yorick/i/silo.i
-lib/yorick/i/show.i
-lib/yorick/i/series.i
-lib/yorick/i/roots.i
-lib/yorick/i/romberg.i
-lib/yorick/i/rkutta.i
-lib/yorick/i/rezone.i
-lib/yorick/i/regress.i
-lib/yorick/i/readn.i
-lib/yorick/i/rays.i
-lib/yorick/i/random.i
-lib/yorick/i/prefix.i
-lib/yorick/i/pnm.i
-lib/yorick/i/plwf.i
-lib/yorick/i/plclab.i
-lib/yorick/i/plato.i
-lib/yorick/i/pl3d.i
-lib/yorick/i/pkg_mngr.i
-lib/yorick/i/pixels.i
-lib/yorick/i/pathfun.i
-lib/yorick/i/netcdf.i
-lib/yorick/i/multi.i
-lib/yorick/i/msort.i
-lib/yorick/i/movie.i
-lib/yorick/i/mkdoc.i
-lib/yorick/i/md5.i
-lib/yorick/i/make.i
-lib/yorick/i/levmar.i
-lib/yorick/i/legndr.i
-lib/yorick/i/kepler.i
-lib/yorick/i/ieee.i
-lib/yorick/i/idlsave.i
-lib/yorick/i/hydra.i
-lib/yorick/i/gcd.i
-lib/yorick/i/gammp.i
-lib/yorick/i/gamma.i
-lib/yorick/i/fits.i
-lib/yorick/i/fitrat.i
-lib/yorick/i/fitlsq.i
-lib/yorick/i/filter.i
-lib/yorick/i/fermii.i
-lib/yorick/i/fermi.i
-lib/yorick/i/elliptic.i
-lib/yorick/i/ellipse.i
-lib/yorick/i/digit2.i
-lib/yorick/i/demo5.i
-lib/yorick/i/demo4.i
-lib/yorick/i/demo3.i
-lib/yorick/i/demo2.i
-lib/yorick/i/demo1.i
-lib/yorick/i/dawson.i
-lib/yorick/i/custom.i
-lib/yorick/i/copyb.i
-lib/yorick/i/convol.i
-lib/yorick/i/color.i
-lib/yorick/i/collec.i
-lib/yorick/i/cheby.i
-lib/yorick/i/calendar.i
-lib/yorick/i/button.i
-lib/yorick/i/bowtie.i
-lib/yorick/i/bessel.i
 lib/yorick/i/basfix.i
-lib/yorick/include/yio.h
-lib/yorick/include/ydata.h
-lib/yorick/include/yapi.h
-lib/yorick/include/yasync.h
-lib/yorick/include/prmtyp.h
-lib/yorick/include/parse.h
-lib/yorick/include/hash.h
-lib/yorick/include/defmem.h
-lib/yorick/include/binio.h
+lib/yorick/i/bessel.i
+lib/yorick/i/bowtie.i
+lib/yorick/i/button.i
+lib/yorick/i/calendar.i
+lib/yorick/i/cheby.i
+lib/yorick/i/collec.i
+lib/yorick/i/color.i
+lib/yorick/i/convol.i
+lib/yorick/i/copyb.i
+lib/yorick/i/custom.i
+lib/yorick/i/dawson.i
+lib/yorick/i/demo1.i
+lib/yorick/i/demo2.i
+lib/yorick/i/demo3.i
+lib/yorick/i/demo4.i
+lib/yorick/i/demo5.i
+lib/yorick/i/digit2.i
+lib/yorick/i/ellipse.i
+lib/yorick/i/elliptic.i
+lib/yorick/i/fermi.i
+lib/yorick/i/fermii.i
+lib/yorick/i/filter.i
+lib/yorick/i/fitlsq.i
+lib/yorick/i/fitrat.i
+lib/yorick/i/fits.i
+lib/yorick/i/gamma.i
+lib/yorick/i/gammp.i
+lib/yorick/i/gcd.i
+lib/yorick/i/hydra.i
+lib/yorick/i/idlsave.i
+lib/yorick/i/ieee.i
+lib/yorick/i/kepler.i
+lib/yorick/i/legndr.i
+lib/yorick/i/levmar.i
+lib/yorick/i/make.i
+lib/yorick/i/md5.i
+lib/yorick/i/mkdoc.i
+lib/yorick/i/movie.i
+lib/yorick/i/msort.i
+lib/yorick/i/multi.i
+lib/yorick/i/netcdf.i
+lib/yorick/i/pathfun.i
+lib/yorick/i/pixels.i
+lib/yorick/i/pkg_mngr.i
+lib/yorick/i/pl3d.i
+lib/yorick/i/plato.i
+lib/yorick/i/plclab.i
+lib/yorick/i/plwf.i
+lib/yorick/i/pnm.i
+lib/yorick/i/prefix.i
+lib/yorick/i/random.i
+lib/yorick/i/rays.i
+lib/yorick/i/readn.i
+lib/yorick/i/regress.i
+lib/yorick/i/rezone.i
+lib/yorick/i/rkutta.i
+lib/yorick/i/romberg.i
+lib/yorick/i/roots.i
+lib/yorick/i/series.i
+lib/yorick/i/show.i
+lib/yorick/i/silo.i
+lib/yorick/i/slice3.i
+lib/yorick/i/spline.i
+lib/yorick/i/splinef.i
+lib/yorick/i/string.i
+lib/yorick/i/style.i
+lib/yorick/i/sysafe.i
+lib/yorick/i/test1.i
+lib/yorick/i/test2.i
+lib/yorick/i/test3.i
+lib/yorick/i/testb.i
+lib/yorick/i/testfull.i
+lib/yorick/i/testg.i
+lib/yorick/i/testlp.i
+lib/yorick/i/testm.i
+lib/yorick/i/testp.i
+lib/yorick/i/teststr.i
+lib/yorick/i/textload.i
+lib/yorick/i/txpath.i
+lib/yorick/i/unsigned.i
+lib/yorick/i/ylmdec.i
+lib/yorick/i/zroots.i
+lib/yorick/i0/README
+lib/yorick/i0/drat.i
+lib/yorick/i0/fft.i
+lib/yorick/i0/graph.i
+lib/yorick/i0/hex.i
+lib/yorick/i0/matrix.i
+lib/yorick/i0/paths.i
+lib/yorick/i0/std.i
+lib/yorick/i0/stdx.i
 lib/yorick/include/bcast.h
-lib/yorick/include/xfancy.h
-lib/yorick/include/xbasic.h
-lib/yorick/include/ps.h
-lib/yorick/include/hlevel.h
-lib/yorick/include/gtext.h
-lib/yorick/include/gist.h
-lib/yorick/include/eps.h
-lib/yorick/include/engine.h
-lib/yorick/include/draw.h
-lib/yorick/include/clip.h
-lib/yorick/include/cgmin.h
+lib/yorick/include/binio.h
 lib/yorick/include/cgm.h
-lib/yorick/include/yversion.h
-lib/yorick/include/pstdlib.h
-lib/yorick/include/pstdio.h
-lib/yorick/include/pmin.h
-lib/yorick/include/plugin.h
-lib/yorick/include/playwin.h
-lib/yorick/include/play.h
-lib/yorick/include/phash.h
+lib/yorick/include/cgmin.h
+lib/yorick/include/clip.h
 lib/yorick/include/config.h
-lib/yorick/i-start/README
-lib/yorick/i-start/90pkg_mngr.i
-lib/yorick/i-start/70hex.i
-lib/yorick/i-start/70drat.i
-lib/yorick/i-start/50i.i
-lib/yorick/lib/libhex.a
-lib/yorick/lib/libdep.sh
-lib/yorick/lib/install.sh
+lib/yorick/include/defmem.h
+lib/yorick/include/draw.h
+lib/yorick/include/engine.h
+lib/yorick/include/eps.h
+lib/yorick/include/gist.h
+lib/yorick/include/gtext.h
+lib/yorick/include/hash.h
+lib/yorick/include/hlevel.h
+lib/yorick/include/parse.h
+lib/yorick/include/phash.h
+lib/yorick/include/play.h
+lib/yorick/include/playwin.h
+lib/yorick/include/plugin.h
+lib/yorick/include/pmin.h
+lib/yorick/include/prmtyp.h
+lib/yorick/include/ps.h
+lib/yorick/include/pstdio.h
+lib/yorick/include/pstdlib.h
+lib/yorick/include/xbasic.h
+lib/yorick/include/xfancy.h
+lib/yorick/include/yapi.h
+lib/yorick/include/yasync.h
+lib/yorick/include/ydata.h
+lib/yorick/include/yio.h
+lib/yorick/include/yversion.h
 lib/yorick/lib/codger
-lib/yorick/lib/main.o
-lib/yorick/lib/libyor.a
-lib/yorick/lib/libdrat.a
 lib/yorick/lib/install.grp
-lib/yorick/bin/yorick
-lib/yorick/bin/gist
+lib/yorick/lib/install.sh
+lib/yorick/lib/libdep.sh
+lib/yorick/lib/libdrat.a
+lib/yorick/lib/libhex.a
+lib/yorick/lib/libyor.a
+lib/yorick/lib/main.o
 lib/yorick/yorick.el
-lib/yorick/Makedll
-lib/yorick/Makeexe
-lib/yorick/Makepkg
-lib/yorick/Make.cfg
-lib/yorick/LICENSE
 %%PORTDOCS%%lib/yorick/doc
+man/man1/yorick.1.gz
+man/man1/gist.1.gz
 @dirrm lib/yorick/g
 @dirrm lib/yorick/i0
 @dirrm lib/yorick/i