Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2013 10:09:04 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r326797 - head/astro/weather
Message-ID:  <201309091009.r89A9458026325@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



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