Index: head/astro/ephem/Makefile
===================================================================
--- head/astro/ephem/Makefile	(revision 360454)
+++ head/astro/ephem/Makefile	(revision 360455)
@@ -1,30 +1,30 @@
 # Created by: eserte
 # $FreeBSD$
 
 PORTNAME=	ephem
 PORTVERSION=	4.28
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 DISTNAME=	${PORTNAME}_${PORTVERSION}_unix
 
 MAINTAINER=	slaven@rezic.de
 COMMENT=	Interactive terminal-based astronomical ephemeris program
 
 NO_WRKSUBDIR=	yes
 ALL_TARGET=
 
 CFLAGS+=	-Wno-implicit -Wno-return-type
 
 do-install:
-	-cd ${WRKSRC}; \
-	${INSTALL_PROGRAM} ephem ${STAGEDIR}${PREFIX}/bin; \
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/ephem; \
-	${INSTALL_DATA} Man.txt ${STAGEDIR}${PREFIX}/share/ephem/; \
-	[ ! -f ${PREFIX}/share/ephem/ephem.db ] && ${INSTALL_DATA} ephem.db ${STAGEDIR}${PREFIX}/share/ephem/; \
-	[ ! -f ${PREFIX}/share/ephem/ephem.cfg ] && ${INSTALL_DATA} ephem.cfg ${STAGEDIR}${PREFIX}/share/ephem/
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/ephem ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/Man.txt ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/ephem.cfg ${STAGEDIR}${DATADIR}/ephem.cfg.sample
+	${INSTALL_DATA} ${WRKSRC}/ephem.db ${STAGEDIR}${DATADIR}/ephem.db.sample
 
 post-install:
-	@${ECHO_MSG} Don\'t forget to edit ${PREFIX}/share/ephem/ephem.cfg!
+	@${ECHO_MSG} "Don't forget to edit ${PREFIX}/share/ephem/ephem.cfg!"
 
 .include <bsd.port.mk>
Index: head/astro/ephem/pkg-plist
===================================================================
--- head/astro/ephem/pkg-plist	(revision 360454)
+++ head/astro/ephem/pkg-plist	(revision 360455)
@@ -1,5 +1,5 @@
 bin/ephem
-share/ephem/Man.txt
-share/ephem/ephem.cfg
-share/ephem/ephem.db
-@dirrm share/ephem
+%%DATADIR%%/Man.txt
+@sample %%DATADIR%%/ephem.cfg.sample
+@sample %%DATADIR%%/ephem.db.sample
+@dirrm %%DATADIR%%