diff -ruN geomWatch.old/Makefile geomWatch/Makefile
--- geomWatch.old/Makefile	2010-05-13 14:05:26.000000000 -0400
+++ geomWatch/Makefile	2010-05-13 17:33:31.000000000 -0400
@@ -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 @@
 
 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 -ruN geomWatch.old/distinfo geomWatch/distinfo
--- geomWatch.old/distinfo	2010-05-13 14:05:26.000000000 -0400
+++ geomWatch/distinfo	2010-05-13 17:09:44.000000000 -0400
@@ -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 -ruN geomWatch.old/files/pkg-message.in geomWatch/files/pkg-message.in
--- geomWatch.old/files/pkg-message.in	2010-05-13 14:05:26.000000000 -0400
+++ geomWatch/files/pkg-message.in	2010-05-13 16:15:28.000000000 -0400
@@ -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 -ruN geomWatch.old/pkg-plist geomWatch/pkg-plist
--- geomWatch.old/pkg-plist	1969-12-31 19:00:00.000000000 -0500
+++ geomWatch/pkg-plist	2010-05-13 16:07:32.000000000 -0400
@@ -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