svn commit: r390714 - head/astro/xephem

[Baptiste Daroussin]

Author: bapt
Date: Sat Jun 27 14:50:08 2015
New Revision: 390714
URL: https://svnweb.freebsd.org/changeset/ports/390714

Log:
  Fix packaging as User
  Fix wrong conversion to stage

Modified:
  head/astro/xephem/Makefile

Modified: head/astro/xephem/Makefile
==============================================================================
--- head/astro/xephem/Makefile	Sat Jun 27 14:33:52 2015	(r390713)
+++ head/astro/xephem/Makefile	Sat Jun 27 14:50:08 2015	(r390714)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xephem
 PORTVERSION=	3.7.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	# http://www.clearskyinstitute.com/xephem/
 
@@ -45,7 +45,7 @@ post-patch:
 		s|-O2 ||g'
 
 pre-build:
-	@${ECHO_CMD} 'XEphem.ShareDir: ${STAGEDIR}${PREFIX}/lib/X11/xephem' \
+	@${ECHO_CMD} 'XEphem.ShareDir: ${PREFIX}/lib/X11/xephem' \
 		> ${WRKSRC}/XEphem.ad
 
 pre-install:
@@ -55,13 +55,9 @@ pre-install:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xephem ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XEphem.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XEphem
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xephem
-	${TAR} -C ${WRKSRC} -cf - auxil catalogs fifos fits gallery help lo \
-		| ${TAR} -C ${STAGEDIR}${PREFIX}/lib/X11/xephem --unlink -xf -
-	@${FIND} ${STAGEDIR}${PREFIX}/lib/X11/xephem \
-		| ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGROUP}
-	@${FIND} ${STAGEDIR}${PREFIX}/lib/X11/xephem -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+	@cd ${WRKSRC}; ${COPYTREE_SHARE} \
+		"auxil catalogs fifos fits gallery help lo" \
+		${STAGEDIR}${PREFIX}/lib/X11/xephem
 
 .include <bsd.port.post.mk>