From 755eb458abddb08a146538b2c48a36bb47592b10 Mon Sep 17 00:00:00 2001 From: tabthorpe Date: Fri, 5 Sep 2008 13:02:37 +0000 Subject: - Fix CONFLICTS between neon26 and neon28 PR: ports/126843 Submitted by: Josh Paetzel Approved by: Joerg Pulz (maintainer) --- sysutils/nut/Makefile | 4 ++++ sysutils/nut22/Makefile | 4 ++++ 2 files changed, 8 insertions(+) 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="" -- cgit