diff options
author | itetcu <itetcu@FreeBSD.org> | 2008-09-07 15:45:07 +0800 |
---|---|---|
committer | itetcu <itetcu@FreeBSD.org> | 2008-09-07 15:45:07 +0800 |
commit | 6ea988498e6efab53ee685532d061166886eecfc (patch) | |
tree | 31bfb71c01dba7ad884a841dc739e285401acf29 | |
parent | 98ca25d76fa3c85fb68fd85078e443ad2e6a9bfc (diff) | |
download | freebsd-ports-gnome-6ea988498e6efab53ee685532d061166886eecfc.tar.gz freebsd-ports-gnome-6ea988498e6efab53ee685532d061166886eecfc.tar.zst freebsd-ports-gnome-6ea988498e6efab53ee685532d061166886eecfc.zip |
- 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)
-rw-r--r-- | sysutils/apcupsd/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
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 |