diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-12-18 03:49:21 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-12-18 03:49:21 +0000 |
| commit | 15fcaf43147fff0ab943a4a75e5bf54fa2cff24c (patch) | |
| tree | a4ec13e5e3124c51a89389b6f5164c3769aee8a3 | |
| parent | f10e01f91e98e1a924af61795a5cba9377387633 (diff) | |
| download | ports-15fcaf43147fff0ab943a4a75e5bf54fa2cff24c.tar.gz ports-15fcaf43147fff0ab943a4a75e5bf54fa2cff24c.zip | |
Notes
| -rw-r--r-- | net-im/gaim/Makefile | 11 | ||||
| -rw-r--r-- | net/gaim/Makefile | 11 |
2 files changed, 6 insertions, 16 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} "" diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 3a9ac1a5a8e2..54fbab03bd53 100644 --- a/net/gaim/Makefile +++ b/net/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} "" |