1 files changed, 3 insertions, 8 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 3a9ac1a5a8e2..54fbab03bd53 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gaim
 PORTVERSION=	0.74
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,17 +39,13 @@ MAN1=		gaim.1 gaim-remote.1
 WITH_GNUTLS=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libssl3.so) && !defined(WITHOUT_NSS)
-WITH_NSS=	yes
-.endif
-
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--disable-gnutls
 .endif
 
-.if defined(WITH_NSS)
+.if !defined(WITHOUT_NSS)
 LIB_DEPENDS+=		nss3:${PORTSDIR}/security/nss
 CONFIGURE_ARGS+=	--with-nspr-includes=${LOCALBASE}/include/nspr \
 			--with-nspr-libs=${LOCALBASE}/lib \
@@ -102,11 +98,10 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_AUDIO		Disable audio support"
 	@${ECHO_MSG} "	WITH_GNUTLS		Enable GNUTLS encryption support"
 	@${ECHO_MSG} "	WITHOUT_GNUTLS		Disable GNUTLS encryption support"
-	@${ECHO_MSG} "	WITH_NSS		Enable Mozilla NSS encryption support"
 	@${ECHO_MSG} "	WITHOUT_NSS		Disable Mozilla NSS encryption support"
 	@${ECHO_MSG} "	TCL_VER			Use Tcl/Tk (version)"
 	@${ECHO_MSG} ""
-.if !defined(WITH_GNUTLS) && !defined(WITH_NSS)
+.if !defined(WITH_GNUTLS) && defined(WITHOUT_NSS)
 	@${ECHO_MSG} "WARNING: In order to use MSN, you must define WITH_GNUTLS and/or WITH_NSS"
 	@${ECHO_MSG} "         if you disable OpenSSL support"
 	@${ECHO_MSG} ""