summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-11 23:03:16 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-11 23:03:16 +0000
commit6cf1a4f0936282e6f74cc1b685473eb7d70a15c6 (patch)
treea749bf4f5f12d4d195f9b299b403d059446c6ad5
parentBump the snapshot version. (diff)
Enable NSS encryption support by default so that packages can be built with
MSN enabled. NSS can still be disabled if so desired. Suggested by: Pav Lucistnik <pav@oook.cz>
Notes
Notes: svn path=/head/; revision=90868
-rw-r--r--net-im/gaim/Makefile8
-rw-r--r--net/gaim/Makefile8
2 files changed, 8 insertions, 8 deletions
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 640f27928459..44e1092a5e0c 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gaim
PORTVERSION= 0.71
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -32,11 +32,11 @@ MAN1= gaim.1 gaim-remote.1
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libnss3.so)
+.if !defined(WITHOUT_NSS)
WITH_NSS= yes
.endif
-.if exists(${LOCALBASE}/lib/libgnutls.so)
+.if exists(${LOCALBASE}/lib/libgnutls.so) && !defined(WITHOUT_GNUTLS)
WITH_GNUTLS= yes
.endif
@@ -97,7 +97,7 @@ pre-everything::
@${ECHO_MSG} " WITHOUT_GTKSPELL Turns off spell checking"
@${ECHO_MSG} " WITHOUT_AUDIO Disable audio support"
@${ECHO_MSG} " WITH_GNUTLS Enable TLS 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)
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 640f27928459..44e1092a5e0c 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gaim
PORTVERSION= 0.71
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -32,11 +32,11 @@ MAN1= gaim.1 gaim-remote.1
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libnss3.so)
+.if !defined(WITHOUT_NSS)
WITH_NSS= yes
.endif
-.if exists(${LOCALBASE}/lib/libgnutls.so)
+.if exists(${LOCALBASE}/lib/libgnutls.so) && !defined(WITHOUT_GNUTLS)
WITH_GNUTLS= yes
.endif
@@ -97,7 +97,7 @@ pre-everything::
@${ECHO_MSG} " WITHOUT_GTKSPELL Turns off spell checking"
@${ECHO_MSG} " WITHOUT_AUDIO Disable audio support"
@${ECHO_MSG} " WITH_GNUTLS Enable TLS 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)