support STAGEDIR.

25 files changed, 211 insertions, 222 deletions

diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index a386c306ade..349adf79808 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
-NO_STAGE=	yes
 USES=		gmake perl5 pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20
@@ -26,7 +25,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-garmin
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		gpsdrive.1
 MANLANG=	"" de es
 
 OPTIONS_DEFINE=	NLS
@@ -46,9 +44,4 @@ post-patch:
 		${WRKSRC}/Makefile.in
 .endif
 
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
 .include <bsd.port.mk>
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist
index aa407df2bc7..b3d5ee98c32 100644
--- a/astro/gpsdrive/pkg-plist
+++ b/astro/gpsdrive/pkg-plist
@@ -20,8 +20,10 @@ lib/libnautic.a
 lib/libnautic.la
 lib/libnautic.so
 lib/libnautic.so.2
+man/de/man1/gpsdrive.1.gz
+man/es/man1/gpsdrive.1.gz
+man/man1/gpsdrive.1.gz
 share/applications/gpsdrive.desktop
-share/pixmaps/gpsicon.png
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/CREDITS
 %%DATADIR%%/FAQ.gpsdrive
@@ -61,10 +63,7 @@ share/pixmaps/gpsicon.png
 %%NLS%%share/locale/sk/LC_MESSAGES/gpsdrive.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gpsdrive.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/gpsdrive.mo
+share/pixmaps/gpsicon.png
 %%NLS%%@dirrmtry share/locale/gr/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/gr
-@dirrmtry man/es/man1
-@dirrmtry man/es
-@dirrmtry man/de/man1
-@dirrmtry man/de
 @dirrm %%DATADIR%%
diff --git a/astro/jday/Makefile b/astro/jday/Makefile
index 16846164bd5..e2b325ddfb1 100644
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@@ -8,17 +8,15 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Astronomical Julian date calculator
 
-NO_STAGE=	yes
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
+USES=		pathfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=	jday.1
-
-PLIST_FILES=	bin/jday bin/j2d bin/dbd \
+PLIST_FILES=	bin/dbd bin/j2d bin/jday \
 		include/jday.h lib/libjday.a \
-		lib/libjday.so lib/libjday.so.2 \
-		lib/libjday.la libdata/pkgconfig/jday.pc
+		lib/libjday.la lib/libjday.so \
+		lib/libjday.so.2 libdata/pkgconfig/jday.pc \
+		man/man1/jday.1.gz
 
 .include <bsd.port.mk>
diff --git a/astro/luna/Makefile b/astro/luna/Makefile
index 524f8367b57..5b432fae1d6 100644
--- a/astro/luna/Makefile
+++ b/astro/luna/Makefile
@@ -10,7 +10,6 @@ DISTNAME=	luna19s
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display the moon's phase
 
-NO_STAGE=	yes
 USE_DOS2UNIX=	yes
 USE_LHA=	yes
 NO_WRKSUBDIR=	yes
diff --git a/astro/luna/files/patch-ab b/astro/luna/files/patch-makefile
index 3566040f4cd..39a3160d502 100644
--- a/astro/luna/files/patch-ab
+++ b/astro/luna/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig	Sun May 24 03:57:22 1992
-+++ makefile	Mon Feb 21 02:45:58 2000
+--- makefile.orig	2013-10-25 16:28:17.000000000 +0800
++++ makefile	2013-10-25 16:28:43.000000000 +0800
 @@ -2,23 +2,24 @@
  # 	Makefile for luna using BSD cc
  # 
@@ -38,7 +38,7 @@
  
  # The program name
  PROG = luna$(EXE)
-@@ -26,7 +27,8 @@
+@@ -26,7 +27,8 @@ PROG = luna$(EXE)
  # All modules
  SRCS = famplan.c luna.c pyramid.c
  OBJS = famplan$(O) luna$(O) pyramid$(O)
@@ -48,12 +48,12 @@
  HDRS = luna.h
  HDRSPR = pyramid.h
  HDRSIP = iprintf/iansilib.h iprintf/iprint.h
-@@ -35,13 +37,18 @@
+@@ -35,13 +37,18 @@ HDRSIP = iprintf/iansilib.h iprintf/ipri
  #
  all : $(PROG)
  
 +install:
-+	${BSD_INSTALL_PROGRAM} $(PROG) ${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} $(PROG) ${DESTDIR}${PREFIX}/bin
 +clean:
 +	rm -fr $(OBJS) $(OBJSIP) $(PROG)
 +
@@ -71,7 +71,7 @@
  
  $(OBJS) : $(HDRS)
  
-@@ -50,13 +57,13 @@
+@@ -50,13 +57,13 @@ luna$(O) pyramid$(O) : $(HDRSPR)
  $(OBJS) : $(MAKEFILE)
  
  # UNIX
diff --git a/astro/mymoon/Makefile b/astro/mymoon/Makefile
index 2f211ead112..adc73a20289 100644
--- a/astro/mymoon/Makefile
+++ b/astro/mymoon/Makefile
@@ -16,7 +16,6 @@ LIB_DEPENDS=	nova:${PORTSDIR}/astro/libnova
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake
 
diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile
index f31d06e8f5d..e8c46f5b375 100644
--- a/astro/openuniverse/Makefile
+++ b/astro/openuniverse/Makefile
@@ -14,7 +14,6 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
 
 USE_GL=		glut
 
-NO_STAGE=	yes
 USES=		gmake
 USE_XORG=	sm ice xmu xi xext x11
 GNU_CONFIGURE=	yes
diff --git a/astro/openuniverse/pkg-plist b/astro/openuniverse/pkg-plist
index 462fc9f5242..e867b37209f 100644
--- a/astro/openuniverse/pkg-plist
+++ b/astro/openuniverse/pkg-plist
@@ -1,117 +1,117 @@
 bin/openuniverse
-share/openuniverse/data/stars.dat
-share/openuniverse/data/messier.dat
-share/openuniverse/3dmodels/amalthea.bmf
-share/openuniverse/3dmodels/apollo13.bmf
-share/openuniverse/3dmodels/bacchus.bmf
-share/openuniverse/3dmodels/castalia.bmf
-share/openuniverse/3dmodels/deimos.bmf
-share/openuniverse/3dmodels/discovery.bmf
-share/openuniverse/3dmodels/epimetheus.bmf
-share/openuniverse/3dmodels/gaspra.bmf
-share/openuniverse/3dmodels/geographos.bmf
-share/openuniverse/3dmodels/hst.bmf
-share/openuniverse/3dmodels/hyperion.bmf
-share/openuniverse/3dmodels/ida.bmf
-share/openuniverse/3dmodels/janus.bmf
-share/openuniverse/3dmodels/ky.bmf
-share/openuniverse/3dmodels/phobos.bmf
-share/openuniverse/3dmodels/prometheus.bmf
-share/openuniverse/3dmodels/proteus.bmf
-share/openuniverse/3dmodels/shuttle.bmf
-share/openuniverse/3dmodels/ss5.bmf
-share/openuniverse/3dmodels/toutatis.bmf
-share/openuniverse/3dmodels/vesta.bmf
-share/openuniverse/fonts/default.txf
-share/openuniverse/fonts/courier_14b.txf
-share/openuniverse/fonts/helvetica_12b.txf
-share/openuniverse/fonts/helvetica_14b.txf
-share/openuniverse/fonts/times_14b.txf
-share/openuniverse/textures/apl-bm2.jpg
-share/openuniverse/textures/apl-o01.jpg
-share/openuniverse/textures/apl-o02.jpg
-share/openuniverse/textures/apl-o03.jpg
-share/openuniverse/textures/apl-o04.jpg
-share/openuniverse/textures/asteroid.jpg
-share/openuniverse/textures/body_a.jpg
-share/openuniverse/textures/body_b.jpg
-share/openuniverse/textures/body_c.jpg
-share/openuniverse/textures/body_d.jpg
-share/openuniverse/textures/bottom.jpg
-share/openuniverse/textures/callisto.jpg
-share/openuniverse/textures/castalia.jpg
-share/openuniverse/textures/charon.jpg
-share/openuniverse/textures/clouds.jpg
-share/openuniverse/textures/cockpit2.jpg
-share/openuniverse/textures/cyclo.jpg
-share/openuniverse/textures/deimos.jpg
-share/openuniverse/textures/dione.jpg
-share/openuniverse/textures/earth.jpg
-share/openuniverse/textures/earthcld.jpg
-share/openuniverse/textures/eng_base.jpg
-share/openuniverse/textures/engine01.jpg
-share/openuniverse/textures/europa.jpg
-share/openuniverse/textures/flare1.jpg
-share/openuniverse/textures/flare2.jpg
-share/openuniverse/textures/flare3.jpg
-share/openuniverse/textures/flare4.jpg
-share/openuniverse/textures/flare5.jpg
-share/openuniverse/textures/flare6.jpg
-share/openuniverse/textures/ganymede.jpg
-share/openuniverse/textures/gaspra.jpg
-share/openuniverse/textures/heatshld.jpg
-share/openuniverse/textures/hole.jpg
-share/openuniverse/textures/hyperion.jpg
-share/openuniverse/textures/io.jpg
-share/openuniverse/textures/janus.jpg
-share/openuniverse/textures/jupiter.jpg
-share/openuniverse/textures/m31.jpg
-share/openuniverse/textures/m33.jpg
-share/openuniverse/textures/mars.jpg
-share/openuniverse/textures/mercury.jpg
-share/openuniverse/textures/moon.jpg
-share/openuniverse/textures/mw.jpg
-share/openuniverse/textures/neptune.jpg
-share/openuniverse/textures/panels.jpg
-share/openuniverse/textures/phobos.jpg
-share/openuniverse/textures/pluto.jpg
-share/openuniverse/textures/promethe.jpg
-share/openuniverse/textures/proteus.jpg
-share/openuniverse/textures/rhea.jpg
-share/openuniverse/textures/rings.jpg
-share/openuniverse/textures/saturn.jpg
-share/openuniverse/textures/sidemapl.jpg
-share/openuniverse/textures/sidemapr.jpg
-share/openuniverse/textures/sm_eng.jpg
-share/openuniverse/textures/smoke.jpg
-share/openuniverse/textures/splash1.jpg
-share/openuniverse/textures/splash2.jpg
-share/openuniverse/textures/splash3.jpg
-share/openuniverse/textures/splash4.jpg
-share/openuniverse/textures/station.jpg
-share/openuniverse/textures/sun.jpg
-share/openuniverse/textures/tail.jpg
-share/openuniverse/textures/tethys.jpg
-share/openuniverse/textures/titan.jpg
-share/openuniverse/textures/top.jpg
-share/openuniverse/textures/toutatis.jpg
-share/openuniverse/textures/triton.jpg
-share/openuniverse/textures/uranus.jpg
-share/openuniverse/textures/venus.jpg
-share/openuniverse/textures/wingtop.jpg
-share/openuniverse/conf/ou.conf
-share/openuniverse/docs/title.gif
-share/openuniverse/docs/shot3.gif
-share/openuniverse/docs/shot2.gif
-share/openuniverse/docs/linux.gif
-share/openuniverse/docs/cyclo.gif
-share/openuniverse/docs/OGL_sm.gif
-share/openuniverse/docs/manual.html
-share/openuniverse/docs/BUGS.TXT
-@dirrm share/openuniverse/data
-@dirrm share/openuniverse/3dmodels
-@dirrm share/openuniverse/fonts
-@dirrm share/openuniverse/textures
-@dirrm share/openuniverse/conf
-@dirrm share/openuniverse/docs
-@dirrm share/openuniverse/
+%%DATADIR%%/3dmodels/amalthea.bmf
+%%DATADIR%%/3dmodels/apollo13.bmf
+%%DATADIR%%/3dmodels/bacchus.bmf
+%%DATADIR%%/3dmodels/castalia.bmf
+%%DATADIR%%/3dmodels/deimos.bmf
+%%DATADIR%%/3dmodels/discovery.bmf
+%%DATADIR%%/3dmodels/epimetheus.bmf
+%%DATADIR%%/3dmodels/gaspra.bmf
+%%DATADIR%%/3dmodels/geographos.bmf
+%%DATADIR%%/3dmodels/hst.bmf
+%%DATADIR%%/3dmodels/hyperion.bmf
+%%DATADIR%%/3dmodels/ida.bmf
+%%DATADIR%%/3dmodels/janus.bmf
+%%DATADIR%%/3dmodels/ky.bmf
+%%DATADIR%%/3dmodels/phobos.bmf
+%%DATADIR%%/3dmodels/prometheus.bmf
+%%DATADIR%%/3dmodels/proteus.bmf
+%%DATADIR%%/3dmodels/shuttle.bmf
+%%DATADIR%%/3dmodels/ss5.bmf
+%%DATADIR%%/3dmodels/toutatis.bmf
+%%DATADIR%%/3dmodels/vesta.bmf
+%%DATADIR%%/conf/ou.conf
+%%DATADIR%%/data/messier.dat
+%%DATADIR%%/data/stars.dat
+%%DATADIR%%/docs/BUGS.TXT
+%%DATADIR%%/docs/OGL_sm.gif
+%%DATADIR%%/docs/cyclo.gif
+%%DATADIR%%/docs/linux.gif
+%%DATADIR%%/docs/manual.html
+%%DATADIR%%/docs/shot2.gif
+%%DATADIR%%/docs/shot3.gif
+%%DATADIR%%/docs/title.gif
+%%DATADIR%%/fonts/courier_14b.txf
+%%DATADIR%%/fonts/default.txf
+%%DATADIR%%/fonts/helvetica_12b.txf
+%%DATADIR%%/fonts/helvetica_14b.txf
+%%DATADIR%%/fonts/times_14b.txf
+%%DATADIR%%/textures/apl-bm2.jpg
+%%DATADIR%%/textures/apl-o01.jpg
+%%DATADIR%%/textures/apl-o02.jpg
+%%DATADIR%%/textures/apl-o03.jpg
+%%DATADIR%%/textures/apl-o04.jpg
+%%DATADIR%%/textures/asteroid.jpg
+%%DATADIR%%/textures/body_a.jpg
+%%DATADIR%%/textures/body_b.jpg
+%%DATADIR%%/textures/body_c.jpg
+%%DATADIR%%/textures/body_d.jpg
+%%DATADIR%%/textures/bottom.jpg
+%%DATADIR%%/textures/callisto.jpg
+%%DATADIR%%/textures/castalia.jpg
+%%DATADIR%%/textures/charon.jpg
+%%DATADIR%%/textures/clouds.jpg
+%%DATADIR%%/textures/cockpit2.jpg
+%%DATADIR%%/textures/cyclo.jpg
+%%DATADIR%%/textures/deimos.jpg
+%%DATADIR%%/textures/dione.jpg
+%%DATADIR%%/textures/earth.jpg
+%%DATADIR%%/textures/earthcld.jpg
+%%DATADIR%%/textures/eng_base.jpg
+%%DATADIR%%/textures/engine01.jpg
+%%DATADIR%%/textures/europa.jpg
+%%DATADIR%%/textures/flare1.jpg
+%%DATADIR%%/textures/flare2.jpg
+%%DATADIR%%/textures/flare3.jpg
+%%DATADIR%%/textures/flare4.jpg
+%%DATADIR%%/textures/flare5.jpg
+%%DATADIR%%/textures/flare6.jpg
+%%DATADIR%%/textures/ganymede.jpg
+%%DATADIR%%/textures/gaspra.jpg
+%%DATADIR%%/textures/heatshld.jpg
+%%DATADIR%%/textures/hole.jpg
+%%DATADIR%%/textures/hyperion.jpg
+%%DATADIR%%/textures/io.jpg
+%%DATADIR%%/textures/janus.jpg
+%%DATADIR%%/textures/jupiter.jpg
+%%DATADIR%%/textures/m31.jpg
+%%DATADIR%%/textures/m33.jpg
+%%DATADIR%%/textures/mars.jpg
+%%DATADIR%%/textures/mercury.jpg
+%%DATADIR%%/textures/moon.jpg
+%%DATADIR%%/textures/mw.jpg
+%%DATADIR%%/textures/neptune.jpg
+%%DATADIR%%/textures/panels.jpg
+%%DATADIR%%/textures/phobos.jpg
+%%DATADIR%%/textures/pluto.jpg
+%%DATADIR%%/textures/promethe.jpg
+%%DATADIR%%/textures/proteus.jpg
+%%DATADIR%%/textures/rhea.jpg
+%%DATADIR%%/textures/rings.jpg
+%%DATADIR%%/textures/saturn.jpg
+%%DATADIR%%/textures/sidemapl.jpg
+%%DATADIR%%/textures/sidemapr.jpg
+%%DATADIR%%/textures/sm_eng.jpg
+%%DATADIR%%/textures/smoke.jpg
+%%DATADIR%%/textures/splash1.jpg
+%%DATADIR%%/textures/splash2.jpg
+%%DATADIR%%/textures/splash3.jpg
+%%DATADIR%%/textures/splash4.jpg
+%%DATADIR%%/textures/station.jpg
+%%DATADIR%%/textures/sun.jpg
+%%DATADIR%%/textures/tail.jpg
+%%DATADIR%%/textures/tethys.jpg
+%%DATADIR%%/textures/titan.jpg
+%%DATADIR%%/textures/top.jpg
+%%DATADIR%%/textures/toutatis.jpg
+%%DATADIR%%/textures/triton.jpg
+%%DATADIR%%/textures/uranus.jpg
+%%DATADIR%%/textures/venus.jpg
+%%DATADIR%%/textures/wingtop.jpg
+@dirrm %%DATADIR%%/textures
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/docs
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/conf
+@dirrm %%DATADIR%%/3dmodels
+@dirrm %%DATADIR%%
diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile
index ed6b21baa6e..a88b63282f5 100644
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@@ -30,46 +30,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		perl5
 USE_PERL5=	modbuild
-NO_STAGE=	yes
-
-MAN3=		Astro::Catalog.3 \
-		Astro::Catalog::IO::ASCII.3 \
-		Astro::Catalog::IO::ASSM.3 \
-		Astro::Catalog::IO::Astrom.3 \
-		Astro::Catalog::IO::Binary.3 \
-		Astro::Catalog::IO::Cluster.3 \
-		Astro::Catalog::IO::FINDOFF.3 \
-		Astro::Catalog::IO::FITSTable.3 \
-		Astro::Catalog::IO::GaiaPick.3 \
-		Astro::Catalog::IO::JCMT.3 \
-		Astro::Catalog::IO::LCOGTFITSTable.3 \
-		Astro::Catalog::IO::Northstar.3 \
-		Astro::Catalog::IO::RITMatch.3 \
-		Astro::Catalog::IO::SExtractor.3 \
-		Astro::Catalog::IO::STL.3 \
-		Astro::Catalog::IO::Simple.3 \
-		Astro::Catalog::IO::TST.3 \
-		Astro::Catalog::IO::UKIRTBS.3 \
-		Astro::Catalog::IO::VOTable.3 \
-		Astro::Catalog::IO::XY.3 \
-		Astro::Catalog::Item.3 \
-		Astro::Catalog::Item::Morphology.3 \
-		Astro::Catalog::Query.3 \
-		Astro::Catalog::Query::2MASS.3 \
-		Astro::Catalog::Query::CMC.3 \
-		Astro::Catalog::Query::GSC.3 \
-		Astro::Catalog::Query::MPC.3 \
-		Astro::Catalog::Query::SIMBAD.3 \
-		Astro::Catalog::Query::Sesame.3 \
-		Astro::Catalog::Query::SkyCat.3 \
-		Astro::Catalog::Query::SuperCOSMOS.3 \
-		Astro::Catalog::Query::USNOA2.3 \
-		Astro::Catalog::Query::Vizier.3 \
-		Astro::Catalog::Star.3 \
-		Astro::Catalog::Star::Morphology.3 \
-		Astro::Catalog::Transport::REST.3 \
-		Astro::Catalog::Transport::WebService.3 \
-		Tk::AstroCatalog.3
 
 post-patch:
 	@${REINPLACE_CMD} -e '/\.cfg/ s|\.cfg|&.sample|2' ${WRKSRC}/Build.PL
diff --git a/astro/p5-Astro-Catalog/pkg-plist b/astro/p5-Astro-Catalog/pkg-plist
index 460261777fe..2ecd3c087e6 100644
--- a/astro/p5-Astro-Catalog/pkg-plist
+++ b/astro/p5-Astro-Catalog/pkg-plist
@@ -1,5 +1,43 @@
 etc/skycat.cfg.sample
 etc/sss.cfg.sample
+%%PERL5_MAN3%%/Astro::Catalog.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::ASCII.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::ASSM.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Astrom.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Binary.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Cluster.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::FINDOFF.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::FITSTable.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::GaiaPick.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::JCMT.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::LCOGTFITSTable.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Northstar.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::RITMatch.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::SExtractor.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::STL.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Simple.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::TST.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::UKIRTBS.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::VOTable.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::XY.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Item.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Item::Morphology.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::2MASS.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::CMC.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::GSC.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::MPC.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::SIMBAD.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::Sesame.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::SkyCat.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::SuperCOSMOS.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::USNOA2.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::Vizier.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Star.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Star::Morphology.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Transport::REST.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Transport::WebService.3.gz
+%%PERL5_MAN3%%/Tk::AstroCatalog.3.gz
 %%SITE_PERL%%/Astro/Catalog.pm
 %%SITE_PERL%%/Astro/Catalog/IO/ASCII.pm
 %%SITE_PERL%%/Astro/Catalog/IO/ASSM.pm
@@ -38,7 +76,6 @@ etc/sss.cfg.sample
 %%SITE_PERL%%/Astro/Catalog/Transport/REST.pm
 %%SITE_PERL%%/Astro/Catalog/Transport/WebService.pm
 %%SITE_PERL%%/Tk/AstroCatalog.pm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
 @dirrmtry %%SITE_PERL%%/Tk
 @dirrm %%SITE_PERL%%/Astro/Catalog/Transport
 @dirrm %%SITE_PERL%%/Astro/Catalog/Star
diff --git a/astro/p5-Astro-FITS-Header/Makefile b/astro/p5-Astro-FITS-Header/Makefile
index cc2f1657e07..088e000b631 100644
--- a/astro/p5-Astro-FITS-Header/Makefile
+++ b/astro/p5-Astro-FITS-Header/Makefile
@@ -14,13 +14,5 @@ LICENSE=	GPLv3
 
 USES=		perl5
 USE_PERL5=	modbuild
-NO_STAGE=	yes
-
-MAN3=	Astro::FITS::Header.3 \
-	Astro::FITS::Header::AST.3 \
-	Astro::FITS::Header::CFITSIO.3 \
-	Astro::FITS::Header::GSD.3 \
-	Astro::FITS::Header::Item.3 \
-	Astro::FITS::Header::NDF.3
 
 .include <bsd.port.mk>
diff --git a/astro/p5-Astro-FITS-Header/pkg-plist b/astro/p5-Astro-FITS-Header/pkg-plist
index 26b1b7c8478..e68524ab858 100644
--- a/astro/p5-Astro-FITS-Header/pkg-plist
+++ b/astro/p5-Astro-FITS-Header/pkg-plist
@@ -1,3 +1,9 @@
+%%PERL5_MAN3%%/Astro::FITS::Header.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::AST.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::CFITSIO.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::GSD.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::Item.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::NDF.3.gz
 %%SITE_PERL%%/Astro/FITS/Header.pm
 %%SITE_PERL%%/Astro/FITS/Header/AST.pm
 %%SITE_PERL%%/Astro/FITS/Header/CFITSIO.pm
diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile
index d1a619a861e..c13414bed80 100644
--- a/astro/p5-Astro-SunTime/Makefile
+++ b/astro/p5-Astro-SunTime/Makefile
@@ -16,6 +16,5 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/astro/p5-Astro-satpass/Makefile b/astro/p5-Astro-satpass/Makefile
index 8bbdbb19203..4d556e76e03 100644
--- a/astro/p5-Astro-satpass/Makefile
+++ b/astro/p5-Astro-satpass/Makefile
@@ -29,19 +29,6 @@ USGS_DESC=		Add support for Geo::WebService::Elevation::USGS
 CONFIGURE_ARGS=	-y
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
-
-MAN1=		satpass.1
-MAN3=		Astro::Coord::ECI.3 \
-		Astro::Coord::ECI::Mixin.3 \
-		Astro::Coord::ECI::Moon.3 \
-		Astro::Coord::ECI::OVERVIEW.3 \
-		Astro::Coord::ECI::Star.3 \
-		Astro::Coord::ECI::Sun.3 \
-		Astro::Coord::ECI::TLE.3 \
-		Astro::Coord::ECI::TLE::Iridium.3 \
-		Astro::Coord::ECI::TLE::Set.3 \
-		Astro::Coord::ECI::Utils.3
 
 .include <bsd.port.options.mk>
 
diff --git a/astro/p5-Astro-satpass/pkg-plist b/astro/p5-Astro-satpass/pkg-plist
index 5bf0f39c64e..ac4b661a0c6 100644
--- a/astro/p5-Astro-satpass/pkg-plist
+++ b/astro/p5-Astro-satpass/pkg-plist
@@ -1,4 +1,14 @@
 bin/satpass
+%%PERL5_MAN3%%/Astro::Coord::ECI.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Mixin.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Moon.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::OVERVIEW.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Star.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Sun.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::TLE.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::TLE::Iridium.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::TLE::Set.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Utils.3.gz
 %%SITE_PERL%%/Astro/Coord/ECI.pm
 %%SITE_PERL%%/Astro/Coord/ECI/Mixin.pm
 %%SITE_PERL%%/Astro/Coord/ECI/Moon.pm
@@ -10,6 +20,7 @@ bin/satpass
 %%SITE_PERL%%/Astro/Coord/ECI/TLE/Set.pm
 %%SITE_PERL%%/Astro/Coord/ECI/Utils.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Coord/ECI/.packlist
+man/man1/satpass.1.gz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Coord/ECI
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Coord
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
diff --git a/astro/p5-GPS-Babel/Makefile b/astro/p5-GPS-Babel/Makefile
index 782dc8f7db8..8f972cb9fb7 100644
--- a/astro/p5-GPS-Babel/Makefile
+++ b/astro/p5-GPS-Babel/Makefile
@@ -17,8 +17,5 @@ RUN_DEPENDS=	p5-Geo-Gpx>=0.25:${PORTSDIR}/graphics/p5-Geo-Gpx \
 
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
-
-MAN3=	GPS::Babel.3
 
 .include <bsd.port.mk>
diff --git a/astro/p5-GPS-Babel/pkg-plist b/astro/p5-GPS-Babel/pkg-plist
index e7767f00dda..ea4e54d3c6b 100644
--- a/astro/p5-GPS-Babel/pkg-plist
+++ b/astro/p5-GPS-Babel/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/GPS::Babel.3.gz
 %%SITE_PERL%%/GPS/Babel.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/Babel/.packlist
 @dirrmtry %%SITE_PERL%%/GPS
diff --git a/astro/p5-Geo-METAR/Makefile b/astro/p5-Geo-METAR/Makefile
index 82b43ce0511..3c00694e504 100644
--- a/astro/p5-Geo-METAR/Makefile
+++ b/astro/p5-Geo-METAR/Makefile
@@ -13,8 +13,5 @@ COMMENT=	Perl module that processes METAR information from NOAA sources
 
 USES=		perl5
 USE_PERL5=	configure
-NO_STAGE=	yes
-
-MAN3=		Geo::METAR.3
 
 .include <bsd.port.mk>
diff --git a/astro/p5-Geo-METAR/pkg-plist b/astro/p5-Geo-METAR/pkg-plist
index 81491926dc8..c45709d1d21 100644
--- a/astro/p5-Geo-METAR/pkg-plist
+++ b/astro/p5-Geo-METAR/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Geo::METAR.3.gz
 %%SITE_PERL%%/Geo/METAR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index f348f81fd80..064aec53605 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -12,10 +12,8 @@ COMMENT=	Generates images of the Earth centered at a particular location
 
 LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
 
-MAN1=		rmap.1
 GNU_CONFIGURE=	yes
 USES=		gmake
-NO_STAGE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
diff --git a/astro/rmap/pkg-plist b/astro/rmap/pkg-plist
index d782b5af6af..19a0b0a938b 100644
--- a/astro/rmap/pkg-plist
+++ b/astro/rmap/pkg-plist
@@ -1,4 +1,5 @@
 bin/rmap
-share/rmap/rmap.colors
-share/rmap/earth.rez
-@dirrm share/rmap
+man/man1/rmap.1.gz
+%%DATADIR%%/earth.rez
+%%DATADIR%%/rmap.colors
+@dirrm %%DATADIR%%
diff --git a/astro/sky2000/Makefile b/astro/sky2000/Makefile
index 5c00663ddc4..a5d4b659b81 100644
--- a/astro/sky2000/Makefile
+++ b/astro/sky2000/Makefile
@@ -10,7 +10,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Binary representation of the Sky2000 star catalog
 
 GNU_CONFIGURE=	yes
-NO_STAGE=	yes
 
 DATADIR=	${PREFIX}/share/nova
 
diff --git a/astro/sky2000/files/patch-data-Makefile.in b/astro/sky2000/files/patch-data-Makefile.in
new file mode 100644
index 00000000000..db27639724d
--- /dev/null
+++ b/astro/sky2000/files/patch-data-Makefile.in
@@ -0,0 +1,17 @@
+--- data/Makefile.in.orig	2013-10-25 14:33:23.000000000 +0800
++++ data/Makefile.in	2013-10-25 14:36:57.000000000 +0800
+@@ -226,11 +226,11 @@ uninstall-am: uninstall-info-am
+ 
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) @NOVA_CATALOG_DIR@; 
+-	$(INSTALL_DATA) sky2000.ncd $(NOVA_CATALOG_DIR)../sky2000.ncd 
++	$(mkinstalldirs) $(DESTDIR)@NOVA_CATALOG_DIR@; 
++	$(INSTALL_DATA) sky2000.ncd $(DESTDIR)$(NOVA_CATALOG_DIR)../sky2000.ncd 
+ 	  for catalog in *.noc ; do \
+ 	    if test -f $$catalog; then \
+-	      $(INSTALL_DATA) $$catalog $(NOVA_CATALOG_DIR); \
++	      $(INSTALL_DATA) $$catalog $(DESTDIR)$(NOVA_CATALOG_DIR); \
+ 	    fi \
+ 	  done 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/astro/sky2000/pkg-plist b/astro/sky2000/pkg-plist
index d84727b181d..0eaa2d7e50d 100644
--- a/astro/sky2000/pkg-plist
+++ b/astro/sky2000/pkg-plist
@@ -1,3 +1,4 @@
+%%DATADIR%%/catalogs/sky2000.ncd
 %%DATADIR%%/catalogs/sky2000/sky2000-m10.noc
 %%DATADIR%%/catalogs/sky2000/sky2000-m11.noc
 %%DATADIR%%/catalogs/sky2000/sky2000-m12.noc
@@ -13,7 +14,6 @@
 %%DATADIR%%/catalogs/sky2000/sky2000-m7.noc
 %%DATADIR%%/catalogs/sky2000/sky2000-m8.noc
 %%DATADIR%%/catalogs/sky2000/sky2000-m9.noc
-%%DATADIR%%/catalogs/sky2000.ncd
 @dirrm %%DATADIR%%/catalogs/sky2000
 @dirrm %%DATADIR%%/catalogs
 @dirrmtry %%DATADIR%%
diff --git a/astro/wmsolar/Makefile b/astro/wmsolar/Makefile
index 32d4c5509b0..7fd6041e939 100644
--- a/astro/wmsolar/Makefile
+++ b/astro/wmsolar/Makefile
@@ -14,13 +14,12 @@ PLIST_FILES=	bin/wmSolar
 WRKSRC=		${WRKDIR}/wmSolar
 USE_XORG=	x11 xext xpm
 USES=		gmake
-NO_STAGE=	yes
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|values.h|float.h|; s|MAXDOUBLE|DBL_MAX|g' \
 		${WRKSRC}/wmSolar.c
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/wmSolar ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/wmSolar ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>