Add optional (default to ON) SSL support built on OpenSSL. All the other SSL

backends are still supported.

Submitted by:	Matthew Luckie <mjl@luckie.org.nz>

6 files changed, 56 insertions, 14 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index b69429f4d9b2..8e8bed19c42c 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,11 +6,19 @@
 
 PORTNAME=	gaim
 PORTVERSION=	0.71
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+.if !defined(WITHOUT_OPENSSL)
+PATCH_SITES=		${MASTER_SITE_LOCAL} \
+			http://people.FreeBSD.org/~marcus/
+PATCH_SITE_SUBDIR=	marcus
+PATCHFILES=		${DISTNAME}-openssl.patch.gz
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT=	Gtk+-2.0 open-source 'clone' of AOL's Instant Messenger client
 
@@ -31,16 +39,25 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C
 
 MAN1=		gaim.1 gaim-remote.1
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_NSS)
-WITH_NSS=	yes
+.if defined(WITHOUT_OPENSSL)
+CONFIGURE_ARGS+=	--enable-openssl=no
+PLIST_SUB+=		OPENSSL:="@comment "
+.else
+USE_OPENSSL=		yes
+CONFIGURE_ARGS+=	--enable-openssl
+PLIST_SUB+=		OPENSSL:="" 
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if exists(${LOCALBASE}/lib/libgnutls.so) && !defined(WITHOUT_GNUTLS)
 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
@@ -98,12 +115,14 @@ pre-everything::
 	@${ECHO_MSG} "Gaim has the following tunable option(s):"
 	@${ECHO_MSG} "	WITHOUT_GTKSPELL	Turns off spell checking"
 	@${ECHO_MSG} "	WITHOUT_AUDIO		Disable audio support"
+	@${ECHO_MSG} "	WITHOUT_OPENSSL		Disable OpenSSL encryption support"
 	@${ECHO_MSG} "	WITH_GNUTLS		Enable TLS encryption support"
-	@${ECHO_MSG} "	WITHOUT_NSS		Disable Mozilla NSS encryption support"
+	@${ECHO_MSG} "	WITH_NSS		Enable 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(WITH_NSS) && defined(WITHOUT_OPENSSL)
 	@${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} ""
 .endif
 
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index d3fc23a1bea8..167c9134a360 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1,2 @@
 MD5 (gaim-0.71.tar.bz2) = 89d1aeabdfcb16df479031b08ad5fb99
+MD5 (gaim-0.71-openssl.patch.gz) = a0ecd16191e99724a7897d4c3cf05797
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 6ee414ccbdb3..5fadd0b293e4 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -23,6 +23,7 @@ lib/gaim/notify.so
 lib/gaim/spellchk.so
 lib/gaim/ssl-gnutls.so
 lib/gaim/ssl-nss.so
+%%OPENSSL:%%lib/gaim/ssl-openssl.so
 lib/gaim/ssl.so
 lib/gaim/statenotify.so
 %%TCL:%%lib/gaim/tcl.so
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index b69429f4d9b2..8e8bed19c42c 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -6,11 +6,19 @@
 
 PORTNAME=	gaim
 PORTVERSION=	0.71
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
+.if !defined(WITHOUT_OPENSSL)
+PATCH_SITES=		${MASTER_SITE_LOCAL} \
+			http://people.FreeBSD.org/~marcus/
+PATCH_SITE_SUBDIR=	marcus
+PATCHFILES=		${DISTNAME}-openssl.patch.gz
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT=	Gtk+-2.0 open-source 'clone' of AOL's Instant Messenger client
 
@@ -31,16 +39,25 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C
 
 MAN1=		gaim.1 gaim-remote.1
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_NSS)
-WITH_NSS=	yes
+.if defined(WITHOUT_OPENSSL)
+CONFIGURE_ARGS+=	--enable-openssl=no
+PLIST_SUB+=		OPENSSL:="@comment "
+.else
+USE_OPENSSL=		yes
+CONFIGURE_ARGS+=	--enable-openssl
+PLIST_SUB+=		OPENSSL:="" 
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if exists(${LOCALBASE}/lib/libgnutls.so) && !defined(WITHOUT_GNUTLS)
 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
@@ -98,12 +115,14 @@ pre-everything::
 	@${ECHO_MSG} "Gaim has the following tunable option(s):"
 	@${ECHO_MSG} "	WITHOUT_GTKSPELL	Turns off spell checking"
 	@${ECHO_MSG} "	WITHOUT_AUDIO		Disable audio support"
+	@${ECHO_MSG} "	WITHOUT_OPENSSL		Disable OpenSSL encryption support"
 	@${ECHO_MSG} "	WITH_GNUTLS		Enable TLS encryption support"
-	@${ECHO_MSG} "	WITHOUT_NSS		Disable Mozilla NSS encryption support"
+	@${ECHO_MSG} "	WITH_NSS		Enable 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(WITH_NSS) && defined(WITHOUT_OPENSSL)
 	@${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} ""
 .endif
 
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index d3fc23a1bea8..167c9134a360 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1 +1,2 @@
 MD5 (gaim-0.71.tar.bz2) = 89d1aeabdfcb16df479031b08ad5fb99
+MD5 (gaim-0.71-openssl.patch.gz) = a0ecd16191e99724a7897d4c3cf05797
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index 6ee414ccbdb3..5fadd0b293e4 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -23,6 +23,7 @@ lib/gaim/notify.so
 lib/gaim/spellchk.so
 lib/gaim/ssl-gnutls.so
 lib/gaim/ssl-nss.so
+%%OPENSSL:%%lib/gaim/ssl-openssl.so
 lib/gaim/ssl.so
 lib/gaim/statenotify.so
 %%TCL:%%lib/gaim/tcl.so