diff options
| author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2008-09-07 07:45:07 +0000 |
|---|---|---|
| committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2008-09-07 07:45:07 +0000 |
| commit | de10f9063ca6f6d51124b0a0ac99c9690a6614c1 (patch) | |
| tree | 48242520720dddd0a884e6f1426403a273642398 /sysutils/apcupsd/Makefile | |
| parent | 9eae387a566ac96395b977171b8ffbf470d6a883 (diff) | |
| download | ports-de10f9063ca6f6d51124b0a0ac99c9690a6614c1.tar.gz ports-de10f9063ca6f6d51124b0a0ac99c9690a6614c1.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)
Notes
Notes:
svn path=/head/; revision=220079
Diffstat (limited to 'sysutils/apcupsd/Makefile')
| -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 |