From owner-svn-ports-head@FreeBSD.ORG Tue Dec 31 12:47:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B418505; Tue, 31 Dec 2013 12:47:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1F2B1EC1; Tue, 31 Dec 2013 12:47:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBVClpYN088917; Tue, 31 Dec 2013 12:47:51 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBVClp2p088916; Tue, 31 Dec 2013 12:47:51 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201312311247.rBVClp2p088916@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Tue, 31 Dec 2013 12:47:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338287 - head/astro/weather X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Dec 2013 12:47:52 -0000 Author: sunpoet Date: Tue Dec 31 12:47:51 2013 New Revision: 338287 URL: http://svnweb.freebsd.org/changeset/ports/338287 Log: - Merge post-install: to do-install: - Support STAGEDIR Modified: head/astro/weather/Makefile Modified: head/astro/weather/Makefile ============================================================================== --- head/astro/weather/Makefile Tue Dec 31 12:47:23 2013 (r338286) +++ head/astro/weather/Makefile Tue Dec 31 12:47:51 2013 (r338287) @@ -15,17 +15,16 @@ LICENSE= ISCL CONFLICTS_INSTALL= expect-[0-9]* expect-nox11-[0-9]* -NO_STAGE= yes USE_PYTHON= yes USE_XZ= yes USES= shebangfix -MAN1= ${PORTNAME}.1 -MAN5= ${PORTNAME}rc.5 PLIST_FILES= bin/${PORTNAME} \ %%PYTHON_SITELIBDIR%%/${PORTNAME}.py \ %%PYTHON_SITELIBDIR%%/${PORTNAME}.pyc \ - %%PYTHON_SITELIBDIR%%/${PORTNAME}.pyo + %%PYTHON_SITELIBDIR%%/${PORTNAME}.pyo \ + man/man1/${PORTNAME}.1.gz \ + man/man5/${PORTNAME}rc.5.gz PORTDATA= airports places stations zctas zones SHEBANG_FILES= ${PORTNAME} @@ -37,14 +36,13 @@ do-build: @${PYTHON_CMD} -O -m compileall ${WRKSRC}/${PORTNAME}.py do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} - cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTNAME}.py ${PORTNAME}.pyc ${PORTNAME}.pyo ${PYTHON_SITELIBDIR}/ - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1/${PORTNAME}.1 - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}rc.5 ${MANPREFIX}/man/man5/${PORTNAME}rc.5 - ${MKDIR} ${DATADIR}/ - cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDATA} ${DATADIR}/ - -post-install: + ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/ + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTNAME}.py ${PORTNAME}.pyc ${PORTNAME}.pyo ${STAGEDIR}${PYTHON_SITELIBDIR}/ + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}rc.5 ${STAGEDIR}${MANPREFIX}/man/man5/${PORTNAME}rc.5 + ${MKDIR} ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDATA} ${STAGEDIR}${DATADIR}/ @${ECHO_MSG} "" @${ECHO_MSG} "Please add the following to your .weatherrc in order to use installed data files:" @${ECHO_MSG} ""