- Stage support

- Fix plist without EXAMPLES

2 files changed, 102 insertions, 103 deletions

diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile
index 4d4198f83648..7950dce54468 100644
--- a/astro/pp3/Makefile
+++ b/astro/pp3/Makefile
@@ -10,7 +10,6 @@ MASTER_SITES=	SF/${PORTNAME}/PP3/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates celestial charts
 
-NO_STAGE=	yes
 USE_BZIP2=	yes
 USE_TEX=	latex
 
@@ -21,17 +20,17 @@ do-build:
 		&& ${CXX} ${CXXFLAGS} -DPP3DATA=\"${DATADIR}\" pp3.cc -o pp3
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pp3 ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.dat ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/pp3 ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.dat ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/astro/pp3/pkg-plist b/astro/pp3/pkg-plist
index 2baebb6a25f2..709b4a71dd62 100644
--- a/astro/pp3/pkg-plist
+++ b/astro/pp3/pkg-plist
@@ -4,101 +4,101 @@ bin/pp3
 %%DATADIR%%/milkyway.dat
 %%DATADIR%%/nebulae.dat
 %%DATADIR%%/stars.dat
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/andromeda.pp3
-%%EXAMPLESDIR%%/antlia.pp3
-%%EXAMPLESDIR%%/apus.pp3
-%%EXAMPLESDIR%%/aquarius.pp3
-%%EXAMPLESDIR%%/aquila.pp3
-%%EXAMPLESDIR%%/ara.pp3
-%%EXAMPLESDIR%%/aries.pp3
-%%EXAMPLESDIR%%/auriga.pp3
-%%EXAMPLESDIR%%/bootes.pp3
-%%EXAMPLESDIR%%/caelum.pp3
-%%EXAMPLESDIR%%/camelopardalis.pp3
-%%EXAMPLESDIR%%/cancer.pp3
-%%EXAMPLESDIR%%/canes_venatici.pp3
-%%EXAMPLESDIR%%/canis_major.pp3
-%%EXAMPLESDIR%%/canis_minor.pp3
-%%EXAMPLESDIR%%/capricornus.pp3
-%%EXAMPLESDIR%%/carina.pp3
-%%EXAMPLESDIR%%/cassiopeia.pp3
-%%EXAMPLESDIR%%/centaurus.pp3
-%%EXAMPLESDIR%%/cepheus.pp3
-%%EXAMPLESDIR%%/cetus.pp3
-%%EXAMPLESDIR%%/chamaeleon.pp3
-%%EXAMPLESDIR%%/circinus.pp3
-%%EXAMPLESDIR%%/columba.pp3
-%%EXAMPLESDIR%%/coma_berenices.pp3
-%%EXAMPLESDIR%%/corona_australis.pp3
-%%EXAMPLESDIR%%/corona_borealis.pp3
-%%EXAMPLESDIR%%/corvus.pp3
-%%EXAMPLESDIR%%/crater.pp3
-%%EXAMPLESDIR%%/crux.pp3
-%%EXAMPLESDIR%%/cygnus.pp3
-%%EXAMPLESDIR%%/delphinus.pp3
-%%EXAMPLESDIR%%/dorado.pp3
-%%EXAMPLESDIR%%/draco.pp3
-%%EXAMPLESDIR%%/equuleus.pp3
-%%EXAMPLESDIR%%/eridanus.pp3
-%%EXAMPLESDIR%%/fornax.pp3
-%%EXAMPLESDIR%%/gemini.pp3
-%%EXAMPLESDIR%%/grus.pp3
-%%EXAMPLESDIR%%/hercules.pp3
-%%EXAMPLESDIR%%/horologium.pp3
-%%EXAMPLESDIR%%/hydra.pp3
-%%EXAMPLESDIR%%/hydrus.pp3
-%%EXAMPLESDIR%%/indus.pp3
-%%EXAMPLESDIR%%/lacerta.pp3
-%%EXAMPLESDIR%%/leo.pp3
-%%EXAMPLESDIR%%/leo_minor.pp3
-%%EXAMPLESDIR%%/lepus.pp3
-%%EXAMPLESDIR%%/libra.pp3
-%%EXAMPLESDIR%%/lupus.pp3
-%%EXAMPLESDIR%%/lynx.pp3
-%%EXAMPLESDIR%%/lyra.pp3
-%%EXAMPLESDIR%%/mensa.pp3
-%%EXAMPLESDIR%%/microscopium.pp3
-%%EXAMPLESDIR%%/monoceros.pp3
-%%EXAMPLESDIR%%/musca.pp3
-%%EXAMPLESDIR%%/nh.pp3
-%%EXAMPLESDIR%%/norma.pp3
-%%EXAMPLESDIR%%/octans.pp3
-%%EXAMPLESDIR%%/ophiuchus.pp3
-%%EXAMPLESDIR%%/orion.pp3
-%%EXAMPLESDIR%%/pavo.pp3
-%%EXAMPLESDIR%%/pegasus.pp3
-%%EXAMPLESDIR%%/perseus.pp3
-%%EXAMPLESDIR%%/phoenix.pp3
-%%EXAMPLESDIR%%/pictor.pp3
-%%EXAMPLESDIR%%/pisces.pp3
-%%EXAMPLESDIR%%/piscis_austrinus.pp3
-%%EXAMPLESDIR%%/puppis.pp3
-%%EXAMPLESDIR%%/pyxis.pp3
-%%EXAMPLESDIR%%/reticulum.pp3
-%%EXAMPLESDIR%%/sagitta.pp3
-%%EXAMPLESDIR%%/sagittarius.pp3
-%%EXAMPLESDIR%%/scorpius.pp3
-%%EXAMPLESDIR%%/sculptor.pp3
-%%EXAMPLESDIR%%/scutum.pp3
-%%EXAMPLESDIR%%/serpens.pp3
-%%EXAMPLESDIR%%/sextans.pp3
-%%EXAMPLESDIR%%/taurus.pp3
-%%EXAMPLESDIR%%/telescopium.pp3
-%%EXAMPLESDIR%%/triangulum.pp3
-%%EXAMPLESDIR%%/triangulum_australe.pp3
-%%EXAMPLESDIR%%/tucana.pp3
-%%EXAMPLESDIR%%/ursa_major.pp3
-%%EXAMPLESDIR%%/ursa_minor.pp3
-%%EXAMPLESDIR%%/vela.pp3
-%%EXAMPLESDIR%%/virgo.pp3
-%%EXAMPLESDIR%%/volans.pp3
-%%EXAMPLESDIR%%/vulpecula.pp3
-%%EXAMPLESDIR%%/wiki-convert-sky-chart.scm
-%%EXAMPLESDIR%%/wiki.pp3
-%%EXAMPLESDIR%%/wiki.tex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/andromeda.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/antlia.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aquarius.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aquila.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ara.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aries.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auriga.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bootes.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caelum.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/camelopardalis.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cancer.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canes_venatici.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canis_major.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canis_minor.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/capricornus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/carina.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cassiopeia.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centaurus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cepheus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cetus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chamaeleon.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circinus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/columba.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coma_berenices.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/corona_australis.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/corona_borealis.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/corvus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crater.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crux.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cygnus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/delphinus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dorado.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draco.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equuleus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eridanus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fornax.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gemini.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hercules.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/horologium.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hydra.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hydrus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/indus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lacerta.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/leo.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/leo_minor.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lepus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/libra.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lupus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lynx.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lyra.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mensa.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/microscopium.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/monoceros.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/musca.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nh.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/norma.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/octans.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ophiuchus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/orion.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pavo.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pegasus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perseus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/phoenix.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pictor.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pisces.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/piscis_austrinus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/puppis.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pyxis.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reticulum.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sagitta.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sagittarius.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scorpius.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sculptor.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scutum.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serpens.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sextans.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/taurus.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/telescopium.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triangulum.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triangulum_australe.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tucana.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ursa_major.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ursa_minor.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vela.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/virgo.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/volans.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vulpecula.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wiki-convert-sky-chart.scm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wiki.pp3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wiki.tex
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%