2 files changed, 100 insertions, 98 deletions

diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile
index 6ef044454068..bfc5000b4479 100644
--- a/astro/pp3/Makefile
+++ b/astro/pp3/Makefile
@@ -8,14 +8,14 @@
 
 PORTNAME=	pp3
 PORTVERSION=	1.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/PP3/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates celestial charts
 
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base
 
 USE_BZIP2=	yes
 
@@ -31,6 +31,8 @@ do-install:
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
diff --git a/astro/pp3/pkg-plist b/astro/pp3/pkg-plist
index 1e8e60f754fd..2baebb6a25f2 100644
--- a/astro/pp3/pkg-plist
+++ b/astro/pp3/pkg-plist
@@ -1,104 +1,104 @@
 bin/pp3
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/andromeda.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/antlia.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/apus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/aquarius.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/aquila.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/ara.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/aries.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/auriga.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/bootes.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/caelum.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/camelopardalis.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/cancer.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/canes_venatici.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/canis_major.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/canis_minor.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/capricornus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/carina.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/cassiopeia.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/centaurus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/cepheus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/cetus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/chamaeleon.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/circinus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/columba.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/coma_berenices.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/corona_australis.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/corona_borealis.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/corvus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/crater.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/crux.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/cygnus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/delphinus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/dorado.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/draco.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/equuleus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/eridanus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/fornax.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/gemini.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/grus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/hercules.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/horologium.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/hydra.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/hydrus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/indus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/lacerta.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/leo.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/leo_minor.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/lepus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/libra.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/lupus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/lynx.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/lyra.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/mensa.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/microscopium.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/monoceros.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/musca.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/nh.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/norma.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/octans.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/ophiuchus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/orion.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/pavo.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/pegasus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/perseus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/phoenix.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/pictor.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/pisces.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/piscis_austrinus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/puppis.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/pyxis.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/reticulum.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/sagitta.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/sagittarius.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/scorpius.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/sculptor.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/scutum.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/serpens.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/sextans.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/taurus.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/telescopium.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/triangulum.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/triangulum_australe.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/tucana.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/ursa_major.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/ursa_minor.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/vela.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/virgo.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/volans.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/vulpecula.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/wiki-convert-sky-chart.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/wiki.pp3
-%%PORTDOCS%%%%EXAMPLESDIR%%/wiki.tex
 %%DATADIR%%/boundaries.dat
 %%DATADIR%%/lines.dat
 %%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
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
+@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%