From owner-svn-ports-all@FreeBSD.ORG Mon Sep 9 10:09:04 2013 Return-Path: Delivered-To: svn-ports-all@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 ESMTP id 8F0C3D96; Mon, 9 Sep 2013 10:09:04 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) 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 638AD2570; Mon, 9 Sep 2013 10:09:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r89A94Mw026327; Mon, 9 Sep 2013 10:09:04 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r89A9458026325; Mon, 9 Sep 2013 10:09:04 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201309091009.r89A9458026325@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Mon, 9 Sep 2013 10:09:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326797 - 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 10:09:04 -0000 Author: sunpoet Date: Mon Sep 9 10:09:03 2013 New Revision: 326797 URL: http://svnweb.freebsd.org/changeset/ports/326797 Log: - Install data files (airports, places, stations, zctas and zones) - Use CONFLICTS_INSTALL instead of CONFLICTS - Use USES=shebangfix - Add post-install: message - Bump PORTREVISION for package change PR: ports/181955 Submitted by: hiren Modified: head/astro/weather/Makefile Modified: head/astro/weather/Makefile ============================================================================== --- head/astro/weather/Makefile Mon Sep 9 10:09:00 2013 (r326796) +++ head/astro/weather/Makefile Mon Sep 9 10:09:03 2013 (r326797) @@ -3,6 +3,7 @@ PORTNAME= weather PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= astro python MASTER_SITES= http://fungi.yuggoth.org/weather/src/ \ LOCAL/sunpoet @@ -12,10 +13,11 @@ COMMENT= Utility to provide current weat LICENSE= ISCL -CONFLICTS= expect-[0-9]* expect-nox11-[0-9]* +CONFLICTS_INSTALL= expect-[0-9]* expect-nox11-[0-9]* USE_PYTHON= yes USE_XZ= yes +USES= shebangfix MAN1= ${PORTNAME}.1 MAN5= ${PORTNAME}rc.5 @@ -23,9 +25,11 @@ PLIST_FILES= bin/${PORTNAME} \ %%PYTHON_SITELIBDIR%%/${PORTNAME}.py \ %%PYTHON_SITELIBDIR%%/${PORTNAME}.pyc \ %%PYTHON_SITELIBDIR%%/${PORTNAME}.pyo +PORTDATA= airports places stations zctas zones -post-patch: - @${REINPLACE_CMD} -e '1 s|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/${PORTNAME} +SHEBANG_FILES= ${PORTNAME} +python_OLD_CMD= ${SETENV} python +python_CMD= ${PYTHON_CMD} do-build: @${PYTHON_CMD} -m compileall ${WRKSRC}/${PORTNAME}.py @@ -36,5 +40,15 @@ do-install: 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: + @${ECHO_MSG} "" + @${ECHO_MSG} "Please add the following to your .weatherrc in order to use installed data files:" + @${ECHO_MSG} "" + @${ECHO_MSG} "[default]" + @${ECHO_MSG} "setpath = ${DATADIR}" + @${ECHO_MSG} "" .include