From ecea26a1d7b29ae8a0dbb77d08f80c6ffc8f607b Mon Sep 17 00:00:00 2001
From: sahil <sahil@FreeBSD.org>
Date: Mon, 17 May 2010 01:54:37 +0000
Subject: - Update to 1.2.1 - No longer BROKEN on ZFS Version 6 - ${CP} sample
 to real configuration file if latter does not exist

PR:		ports/146554
Submitted by:	Boris Kochergin <spawk@acm.poly.edu> (maintainer)
Approved by:	wxs@ (mentor)
---
 sysutils/geomWatch/Makefile             | 14 +++++++++-----
 sysutils/geomWatch/distinfo             |  6 +++---
 sysutils/geomWatch/files/pkg-message.in |  8 +++-----
 sysutils/geomWatch/pkg-plist            |  4 ++++
 4 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 sysutils/geomWatch/pkg-plist

diff --git a/sysutils/geomWatch/Makefile b/sysutils/geomWatch/Makefile
index cd98c423770b..13df75ca9d6e 100644
--- a/sysutils/geomWatch/Makefile
+++ b/sysutils/geomWatch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geomWatch
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://isis.poly.edu/~bk/${PORTNAME}/ \
 		http://bk.macroblock.net/${PORTNAME}/
@@ -17,20 +17,24 @@ COMMENT=	Watches for and e-mails admins about GEOM/ZFS state changes
 
 LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
 
-PLIST_FILES=	sbin/${PORTNAME} \
-		etc/${PORTNAME}.conf.sample
-
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 702102
+.if ${OSVERSION} < 700036
 MAKE_ARGS+=	WITHOUT_ZFS=yes
+.elif ${OSVERSION} < 702102 || \
+	(${OSVERSION} >= 800000 && ${OSVERSION} < 800054)
+MAKE_ARGS+=	WITH_ZFS=6
 .endif
 
 post-install:
+	@if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
+		${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample \
+		${PREFIX}/etc/${PORTNAME}.conf ; \
+	fi
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/geomWatch/distinfo b/sysutils/geomWatch/distinfo
index 3b92ab712b0a..76e99e68af4b 100644
--- a/sysutils/geomWatch/distinfo
+++ b/sysutils/geomWatch/distinfo
@@ -1,3 +1,3 @@
-MD5 (geomWatch-1.2.0.tbz) = 587fbb59fecf107ea5130ad567d4b1b1
-SHA256 (geomWatch-1.2.0.tbz) = 660bc8da29cba43bd3e206bb9af50c9f26ebd287f6ddc6ef7064f8ef794e834c
-SIZE (geomWatch-1.2.0.tbz) = 258951
+MD5 (geomWatch-1.2.1.tbz) = a9454d6a13501299375c43d996c9e992
+SHA256 (geomWatch-1.2.1.tbz) = 8a73a93d8269d41da6b014f2e80d0a4d12d32b2da59e6328c1d6d754edc530eb
+SIZE (geomWatch-1.2.1.tbz) = 78993
diff --git a/sysutils/geomWatch/files/pkg-message.in b/sysutils/geomWatch/files/pkg-message.in
index 79cbb2b2a295..6cd14ac1a0a7 100644
--- a/sysutils/geomWatch/files/pkg-message.in
+++ b/sysutils/geomWatch/files/pkg-message.in
@@ -1,12 +1,10 @@
 
-A sample geomWatch configuration file has been installed as
-%%PREFIX%%/etc/geomWatch.conf.sample. You should copy it to
-%%PREFIX%%/etc/geomWatch.conf, edit it to your liking, and add the following
-line to /etc/rc.conf:
+Before starting geomWatch, you should edit its configuration file,
+%%PREFIX%%/etc/geomWatch.conf. Then, add the following line to /etc/rc.conf:
 
 geomwatch_enable="YES"
 
-Finally, to start geomWatch, run the following command:
+Finally, to start it, run the following command:
 
 %%PREFIX%%/etc/rc.d/geomWatch start
 
diff --git a/sysutils/geomWatch/pkg-plist b/sysutils/geomWatch/pkg-plist
new file mode 100644
index 000000000000..95318307db5b
--- /dev/null
+++ b/sysutils/geomWatch/pkg-plist
@@ -0,0 +1,4 @@
+sbin/geomWatch
+@unexec if cmp -s %D/etc/geomWatch.conf.sample %D/etc/geomWatch.conf; then rm -f %D/etc/geomWatch.conf; fi
+etc/geomWatch.conf.sample
+@exec if [ ! -f %D/etc/geomWatch.conf ] ; then cp -p %D/%F %B/geomWatch.conf; fi
-- 
cgit