Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/geomWatch/Makefile,v
--- Makefile	2 Feb 2010 17:24:11 -0000	1.5
+++ Makefile	2 May 2010 21:44:54 -0000
@@ -6,25 +6,25 @@ 
 #
 
 PORTNAME=	geomWatch
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://isis.poly.edu/~bk/geomWatch/ \
-		http://bk.macroblock.net/geomWatch/
+MASTER_SITES=	http://isis.poly.edu/~bk/${PORTNAME}/ \
+		http://bk.macroblock.net/${PORTNAME}/
 EXTRACT_SUFX=	.tbz
 
 MAINTAINER=	spawk@acm.poly.edu
-COMMENT=	Watches for and e-mails admins about GEOM state changes
+COMMENT=	Watches for and e-mails admins about GEOM/ZFS state changes
 
 LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
 
-PLIST_FILES=	sbin/geomWatch \
-				etc/rc.d/geomWatch \
-		etc/geomWatch.conf.sample
+PLIST_FILES=	sbin/${PORTNAME} \
+		etc/${PORTNAME}.conf.sample
 
-SUB_FILES=	pkg-message geomWatch
+SUB_FILES=	pkg-message
+
+USE_RC_SUBR=	${PORTNAME}
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/geomWatch ${PREFIX}/etc/rc.d/geomWatch
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/geomWatch/distinfo,v
--- distinfo	2 Feb 2010 17:24:11 -0000	1.4
+++ distinfo	2 May 2010 21:44:54 -0000
@@ -1,3 +1,3 @@ 
-MD5 (geomWatch-1.1.2.tbz) = 0b9b9a31dd07deb59c6fa34d94de247e
-SHA256 (geomWatch-1.1.2.tbz) = 6b793ddc71847e0b97b18f6431d753152087bd8672060dcff05fd322375034f4
-SIZE (geomWatch-1.1.2.tbz) = 6840
+MD5 (geomWatch-1.2.0.tbz) = 587fbb59fecf107ea5130ad567d4b1b1
+SHA256 (geomWatch-1.2.0.tbz) = 660bc8da29cba43bd3e206bb9af50c9f26ebd287f6ddc6ef7064f8ef794e834c
+SIZE (geomWatch-1.2.0.tbz) = 258951
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/sysutils/geomWatch/pkg-descr,v
--- pkg-descr	14 Jan 2010 04:26:41 -0000	1.1
+++ pkg-descr	2 May 2010 21:44:54 -0000
@@ -1,9 +1,9 @@ 
-geomWatch is a program for monitoring the well-being of GEOM providers. It
-checks the state of each configured provider at a configured interval, and, if
-it notices that a provider has lost a component, or encounters a problem while
-checking a provider's state, it will send an e-mail with details of the
-matter--such as what components were lost and which remain, or, in the event of
-a problem, what the problem was--to an arbitrary number of recipients, so that
+geomWatch is a program for monitoring the well-being of GEOM providers and ZFS
+pools. It checks the state of each configured provider and pool at a configured
+interval, and, if it notices that a component has been lost, or encounters a
+problem during the check, it will send an e-mail with details of the matter--
+such as what components were lost and which remain, or, in the event of a
+problem, what the problem was--to an arbitrary number of recipients, so that
 corrective action can be taken (for example, replacing a failed disk).
 
 WWW: http://acm.poly.edu/wiki/GEOM_Watch
Index: files/pkg-message.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/geomWatch/files/pkg-message.in,v
--- files/pkg-message.in	15 Jan 2010 00:55:51 -0000	1.2
+++ files/pkg-message.in	2 May 2010 21:44:54 -0000
@@ -1,8 +1,8 @@ 
 
 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:
+%%PREFIX%%/etc/geomWatch.conf, edit it to your liking, and add the following
+line to /etc/rc.conf:
 
 geomwatch_enable="YES"