diff options
| author | marcus <marcus@FreeBSD.org> | 2003-12-18 03:12:25 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-12-18 03:12:25 +0800 |
| commit | 834df3c71e0865c3fba490a16cc4a4b0bcd9121b (patch) | |
| tree | 09f34d365dfea1daf9b8806c208bbac1dd25da86 /net | |
| parent | 5cc08832e73efce3d58d126d2f07ace87dffdaf5 (diff) | |
| download | freebsd-ports-gnome-834df3c71e0865c3fba490a16cc4a4b0bcd9121b.tar.gz freebsd-ports-gnome-834df3c71e0865c3fba490a16cc4a4b0bcd9121b.tar.zst freebsd-ports-gnome-834df3c71e0865c3fba490a16cc4a4b0bcd9121b.zip | |
Remove the OpenSSL plug-in. The gaim authors do not feel OpenSSL is
a system library, and thus not part of the GPL exemption.
Diffstat (limited to 'net')
| -rw-r--r-- | net/gaim/Makefile | 24 | ||||
| -rw-r--r-- | net/gaim/distinfo | 1 | ||||
| -rw-r--r-- | net/gaim/pkg-plist | 1 |
3 files changed, 3 insertions, 23 deletions
diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 5e13dbe56693..3a9ac1a5a8e2 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -6,19 +6,11 @@ PORTNAME= gaim PORTVERSION= 0.74 -PORTREVISION= 1 +PORTREVISION= 2 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 @@ -41,15 +33,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C MAN1= gaim.1 gaim-remote.1 -.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) @@ -96,7 +79,7 @@ _TCL_VER= ${_TCL_DVER:C/(.)/\1./} .if ${_TCL_VER} != 8.3 . error Currently GAIM can only use Tcl/Tk 8.3 .endif -LIB_DEPENDS+= tk${_TCL_DVER}:${PORTSDIR}/x11-toolkits/tk${_TCL_DVER} +LIB_DEPENDS+= tk${_TCL_DVER}:${PORTSDIR}/x11-toolkits/tk${_TCL_DVER} CONFIGURE_ARGS+=--with-tclconfig=${LOCALBASE}/lib/tcl${_TCL_VER} \ --with-tkconfig=${LOCALBASE}/lib/tk${_TCL_VER} CFLAGS+= -I${LOCALBASE}/include/tk${_TCL_VER} -I${LOCALBASE}/include/tcl${_TCL_VER} @@ -117,14 +100,13 @@ 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 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) && defined(WITHOUT_OPENSSL) +.if !defined(WITH_GNUTLS) && !defined(WITH_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} "" diff --git a/net/gaim/distinfo b/net/gaim/distinfo index d15f7186178f..37f71cc082b0 100644 --- a/net/gaim/distinfo +++ b/net/gaim/distinfo @@ -1,2 +1 @@ -MD5 (gaim-0.74-openssl.patch.gz) = 7d766e388cd1bacd661adca1bd5fb54f MD5 (gaim-0.74.tar.bz2) = 9af9287a96acea2b8a8937cfc9122412 diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist index 382ab6cf162c..8b58e53237fc 100644 --- a/net/gaim/pkg-plist +++ b/net/gaim/pkg-plist @@ -24,7 +24,6 @@ lib/gaim/spellchk.so lib/gaim/relnot.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 |