Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Dec 2015 17:46:27 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r403318 - in head/misc/astrolog: . files
Message-ID:  <201512081746.tB8HkRgC089105@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Dec  8 17:46:27 2015
New Revision: 403318
URL: https://svnweb.freebsd.org/changeset/ports/403318

Log:
  - Switch to options helpers
  - Switch from makefile echo's to pkg-message

Added:
  head/misc/astrolog/files/pkg-message.in   (contents, props changed)
Modified:
  head/misc/astrolog/Makefile

Modified: head/misc/astrolog/Makefile
==============================================================================
--- head/misc/astrolog/Makefile	Tue Dec  8 17:44:35 2015	(r403317)
+++ head/misc/astrolog/Makefile	Tue Dec  8 17:46:27 2015	(r403318)
@@ -35,15 +35,13 @@ NO_WRKSUBDIR=	yes
 
 PORTDOCS=	helpfile.540 readme.541 changes.txt
 
+SUB_FILES=	pkg-message
+
 OPTIONS_DEFINE=	X11 DOCS
 OPTIONS_DEFAULT=X11
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11
-MAKE_ARGS=	-DX11
-.endif
+X11_USE=	XORG=x11
+X11_MAKE_ARGS=	-DX11
 
 post-extract:
 	${RM} ${WRKSRC}/swe[a-z]*
@@ -55,12 +53,9 @@ do-install:
 	cd ${WRKSRC}; \
 		${INSTALL_DATA} astrolog.dat ${STAGEDIR}${PREFIX}/lib/astrolog/astrolog.dat-dist
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
-	@${ECHO_MSG}
-	@${ECHO_MSG} "See the file ${PREFIX}/share/doc/astrolog/helpfile.540 for help"
-	@${ECHO_MSG} "and tune ${PREFIX}/lib/astrolog/astrolog.dat"
 
 .include <bsd.port.mk>

Added: head/misc/astrolog/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/astrolog/files/pkg-message.in	Tue Dec  8 17:46:27 2015	(r403318)
@@ -0,0 +1,2 @@
+See the file %%PREFIX%%/share/doc/astrolog/helpfile.540 for help
+and tune %%PREFIX%%/lib/astrolog/astrolog.dat



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512081746.tB8HkRgC089105>