From de10f9063ca6f6d51124b0a0ac99c9690a6614c1 Mon Sep 17 00:00:00 2001
From: Ion-Mihai Tetcu <itetcu@FreeBSD.org>
Date: Sun, 7 Sep 2008 07:45:07 +0000
Subject: - conflict with sysutils/gapcmon when WITH_GAPCMON is on since this
 installs the bundled gapcmon in the same place - bump PORTREVISION

This is a temporary fix as his suggestion from the PR to depend on
sysutils/gapcmon is good but need further tests.

PR:		ports/126932
Submitted by:	Jason E. Hale (sysutils/gapcmon maintainer)
---
 sysutils/apcupsd/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sysutils')

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index d28eca866510..4bf0d943e304 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apcupsd
 PORTVERSION=	3.14.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:src_sf/g} \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \
@@ -84,6 +85,7 @@ PLIST_SUB+=		CGI="@comment "
 CONFIGURE_ARGS+=	--enable-gapcmon
 USE_GNOME+=		gconf2
 PLIST_SUB+=		GAPCMON=""
+CONFLICTS+=		gapcmon-[0-9]*
 .else
 PLIST_SUB+=		GAPCMON="@comment "
 .endif
-- 
cgit v1.2.3