From owner-svn-ports-head@FreeBSD.ORG  Wed May 20 17:18:32 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BC4D3BA1;
 Wed, 20 May 2015 17:18:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 90F1D170A;
 Wed, 20 May 2015 17:18:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KHIWcZ087354;
 Wed, 20 May 2015 17:18:32 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KHIW8T087350;
 Wed, 20 May 2015 17:18:32 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201505201718.t4KHIW8T087350@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 20 May 2015 17:18:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r386870 - head/sysutils/geomWatch
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 May 2015 17:18:32 -0000

Author: jbeich
Date: Wed May 20 17:18:31 2015
New Revision: 386870
URL: https://svnweb.freebsd.org/changeset/ports/386870

Log:
  sysutils/geomWatch: unbreak on 11.0C and ignore on DragonFly
  
  /tmp/geomWatch-4db8f7.o: In function `ZPool::update()':
  geomWatch.cpp:(.text+0x4a92): undefined reference to `nvlist_free'
  geomWatch.cpp:(.text+0x5046): undefined reference to `nvlist_free'
  geomWatch.cpp:(.text+0x537f): undefined reference to `nvlist_free'
  
  geom.hpp:33:21: fatal error: libgeom.h: No such file or directory
  
  Reported by:	pkg-fallout, DPorts
  Approved by:	portmgr blanket

Modified:
  head/sysutils/geomWatch/Makefile
  head/sysutils/geomWatch/distinfo

Modified: head/sysutils/geomWatch/Makefile
==============================================================================
--- head/sysutils/geomWatch/Makefile	Wed May 20 17:15:10 2015	(r386869)
+++ head/sysutils/geomWatch/Makefile	Wed May 20 17:18:31 2015	(r386870)
@@ -6,18 +6,36 @@ PORTVERSION=	1.3.0
 PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://isis.poly.edu/~bk/${PORTNAME}/ \
-		http://bk.macroblock.net/${PORTNAME}/
-EXTRACT_SUFX=	.tbz
+		http://bk.macroblock.net/${PORTNAME}/ \
+		http://svnweb.freebsd.org/base/head/sys/cddl/compat/opensolaris/sys/:nvpair
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		nvpair.h\?revision=279437\&view=co:nvpair
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	spawk@acm.poly.edu
 COMMENT=	Watches for and e-mails admins about GEOM/ZFS state changes
 
 LIB_DEPENDS=	libesmtp.so:${PORTSDIR}/mail/libesmtp
 
+USES=		tar:tbz
+
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
 MAKE_ARGS=	WITH_ZFS=28
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == DragonFly
+IGNORE=		requires geom(4) support
+.endif
+
+post-extract:
+# base r279437 renamed libnvpair symbols
+.if ${OSVERSION} > 1100062
+	${CP} ${_DISTDIR}/${DISTFILES:M*\:nvpair:C/:.*//} \
+		${WRKSRC}/zfs/v28/sys/cddl/compat/opensolaris/sys/nvpair.h
+.endif
+
 .include <bsd.port.mk>

Modified: head/sysutils/geomWatch/distinfo
==============================================================================
--- head/sysutils/geomWatch/distinfo	Wed May 20 17:15:10 2015	(r386869)
+++ head/sysutils/geomWatch/distinfo	Wed May 20 17:18:31 2015	(r386870)
@@ -1,2 +1,4 @@
 SHA256 (geomWatch-1.3.0.tbz) = ef81cbaf27558d9e957f924697e681d20cc2e44fafa0eff6c192fd2c1c242570
 SIZE (geomWatch-1.3.0.tbz) = 128787
+SHA256 (nvpair.h?revision=279437&view=co) = dbd19f3d9bff31a9c44e0ad807a020e7a38827626ebe5b882a05f32017413700
+SIZE (nvpair.h?revision=279437&view=co) = 13424