Date: Thu, 3 Jul 2014 20:22:16 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360455 - head/astro/ephem Message-ID: <201407032022.s63KMG8v063316@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Jul 3 20:22:16 2014 New Revision: 360455 URL: http://svnweb.freebsd.org/changeset/ports/360455 QAT: https://qat.redports.org/buildarchive/r360455/ Log: The do-install logic didn't work with stage. Modified: head/astro/ephem/Makefile head/astro/ephem/pkg-plist Modified: head/astro/ephem/Makefile ============================================================================== --- head/astro/ephem/Makefile Thu Jul 3 20:18:05 2014 (r360454) +++ head/astro/ephem/Makefile Thu Jul 3 20:22:16 2014 (r360455) @@ -3,6 +3,7 @@ PORTNAME= ephem PORTVERSION= 4.28 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -17,14 +18,13 @@ 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> Modified: head/astro/ephem/pkg-plist ============================================================================== --- head/astro/ephem/pkg-plist Thu Jul 3 20:18:05 2014 (r360454) +++ head/astro/ephem/pkg-plist Thu Jul 3 20:22:16 2014 (r360455) @@ -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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407032022.s63KMG8v063316>