svn commit: r358595 - head/net-mgmt/weathermap

[Vanilla I. Shu]

Author: vanilla
Date: Fri Jun 20 15:49:29 2014
New Revision: 358595
URL: http://svnweb.freebsd.org/changeset/ports/358595
QAT: https://qat.redports.org/buildarchive/r358595/

Log:
  1: Stagify.
  2: use @sample on pkg-plist, bump version.
  
  Approved by:	portmgr@

Modified:
  head/net-mgmt/weathermap/Makefile
  head/net-mgmt/weathermap/pkg-plist

Modified: head/net-mgmt/weathermap/Makefile
==============================================================================
--- head/net-mgmt/weathermap/Makefile	Fri Jun 20 15:46:27 2014	(r358594)
+++ head/net-mgmt/weathermap/Makefile	Fri Jun 20 15:49:29 2014	(r358595)
@@ -3,19 +3,20 @@
 
 PORTNAME=	weathermap
 PORTVERSION=	1.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://netmon.grnet.gr/weathermap/dist/
 
 MAINTAINER=	lippe at FreeBSD.org
 COMMENT=	This tool displays the utilization of the network links
 
-LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		mrtg:${PORTSDIR}/net-mgmt/mrtg
 
-USES=		perl5
+USES=		perl5 shebangfix
 NO_BUILD=	yes
+SHEBANG_FILES=	weathermap
 
 OPTIONS_DEFINE=	WGET
 WGET_DESC=	WGET support
@@ -27,7 +28,6 @@ CONFIGURE_ARGS=	--with-gd-lib=${LOCALBAS
 
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MWGET}
@@ -40,19 +40,14 @@ post-patch:
 		${WRKSRC}/weathermap
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/weathermap ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	@${MKDIR} ${PREFIX}/etc/weathermap
-	@${INSTALL_DATA} ${WRKSRC}/example/* ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/example/weathermap.conf ${PREFIX}/etc/weathermap/weathermap.sample.conf
-	@[ -f ${PREFIX}/etc/weathermap/weathermap.conf ] || \
-		${INSTALL_DATA} ${WRKSRC}/example/weathermap.conf ${PREFIX}/etc/weathermap/weathermap.conf
+	@${INSTALL_SCRIPT} ${WRKSRC}/weathermap ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/example/* ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/example/weathermap.conf ${STAGEDIR}${ETCDIR}/weathermap.conf.sample
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>

Modified: head/net-mgmt/weathermap/pkg-plist
==============================================================================
--- head/net-mgmt/weathermap/pkg-plist	Fri Jun 20 15:46:27 2014	(r358594)
+++ head/net-mgmt/weathermap/pkg-plist	Fri Jun 20 15:49:29 2014	(r358595)
@@ -5,7 +5,6 @@ bin/weathermap
 %%EXAMPLESDIR%%/overlib_mini.js
 %%EXAMPLESDIR%%/weathermap-background.png
 %%EXAMPLESDIR%%/weathermap-overlib.html
- at unexec if cmp -s %%PREFIX%%/etc/weathermap/weathermap.conf %%PREFIX%%/etc/weathermap/weathermap.sample.conf; then rm %%PREFIX%%/etc/weathermap/weathermap.conf; fi
-etc/weathermap/weathermap.sample.conf
+ at sample etc/weathermap/weathermap.conf.sample
 @dirrmtry etc/weathermap
 @dirrm %%EXAMPLESDIR%%