diff options
| author | Thomas Abthorpe <tabthorpe@FreeBSD.org> | 2008-09-05 13:02:37 +0000 |
|---|---|---|
| committer | Thomas Abthorpe <tabthorpe@FreeBSD.org> | 2008-09-05 13:02:37 +0000 |
| commit | b87927e46514847d8e4dd19ba7ab573323321ad2 (patch) | |
| tree | 3bbde15c2fccb097e1ed7a0730806f9ddae95305 /sysutils | |
| parent | 231427f634d6d203d8b65a9b306cf099b4822352 (diff) | |
- Fix CONFLICTS between neon26 and neon28
PR: ports/126843
Submitted by: Josh Paetzel <josh tcbug.org>
Approved by: Joerg Pulz <Joerg.Pulz frm2.tum.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=219904
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nut/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/nut22/Makefile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 80e9cb5c82b1..3783c61bec61 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -116,7 +116,11 @@ PLIST_SUB+= NUT_SNMP="@comment " .endif .if !defined(WITHOUT_NEON) +.if exists(${LOCALBASE}/lib/libneon.so.26) LIB_DEPENDS+= neon.26:${PORTSDIR}/www/neon26 +.else +LIB_DEPENDS+= neon.28:${PORTSDIR}/www/neon28 +.endif CONFIGURE_ARGS+= --with-neonxml MAN8+= netxml-ups.8 PLIST_SUB+= NUT_NEON="" diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile index 80e9cb5c82b1..3783c61bec61 100644 --- a/sysutils/nut22/Makefile +++ b/sysutils/nut22/Makefile @@ -116,7 +116,11 @@ PLIST_SUB+= NUT_SNMP="@comment " .endif .if !defined(WITHOUT_NEON) +.if exists(${LOCALBASE}/lib/libneon.so.26) LIB_DEPENDS+= neon.26:${PORTSDIR}/www/neon26 +.else +LIB_DEPENDS+= neon.28:${PORTSDIR}/www/neon28 +.endif CONFIGURE_ARGS+= --with-neonxml MAN8+= netxml-ups.8 PLIST_SUB+= NUT_NEON="" |