[pkgsrc/trunk]: pkgsrc/chat/gaim add option to build with gnutls support. no ...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbae3e512a62
branches:  trunk
changeset: 498291:cbae3e512a62
user:      grant <grant%pkgsrc.org@localhost>
date:      Fri Aug 19 10:24:25 2005 +0000

description:
add option to build with gnutls support. no change to the default
(nss) so no PKGREVISION bump.

ok'd by the MAINTAINER, Matthew Luckie.

diffstat:

 chat/gaim/Makefile   |  10 +++-------
 chat/gaim/options.mk |  22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r 9bc2b8eab87b -r cbae3e512a62 chat/gaim/Makefile
--- a/chat/gaim/Makefile        Fri Aug 19 07:30:50 2005 +0000
+++ b/chat/gaim/Makefile        Fri Aug 19 10:24:25 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2005/08/12 17:52:16 reed Exp $
+# $NetBSD: Makefile,v 1.97 2005/08/19 10:24:25 grant Exp $
 
 DISTNAME=      gaim-1.5.0
 CATEGORIES=    chat x11
@@ -22,18 +22,15 @@
 SHLIBTOOL_OVERRIDE=    libtool
 
 CONFIGURE_ARGS+=       --disable-binreloc
-CONFIGURE_ARGS+=       --disable-gnutls
 CONFIGURE_ARGS+=       --disable-nas
 CONFIGURE_ARGS+=       --disable-perl
 CONFIGURE_ARGS+=       --disable-tcl
 CONFIGURE_ARGS+=       --disable-gevolution
-CONFIGURE_ARGS+=       --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
-CONFIGURE_ARGS+=       --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
-CONFIGURE_ARGS+=       --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
-CONFIGURE_ARGS+=       --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
 CONFIGURE_ARGS+=       --with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
 CONFIGURE_ARGS+=       --with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/lib/silc
 
+.include "options.mk"
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !exists(${X11BASE}/include/X11/extensions/scrnsaver.h)
@@ -45,7 +42,6 @@
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
 .include "../../devel/silc-toolkit/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 9bc2b8eab87b -r cbae3e512a62 chat/gaim/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/gaim/options.mk      Fri Aug 19 10:24:25 2005 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2005/08/19 10:24:25 grant Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.gaim
+PKG_SUPPORTED_OPTIONS+=                gnutls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+=       --disable-nss
+CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
+CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
+
+.  include "../../security/gnutls/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-gnutls
+CONFIGURE_ARGS+=       --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
+CONFIGURE_ARGS+=       --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
+CONFIGURE_ARGS+=       --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
+CONFIGURE_ARGS+=       --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
+
+.  include "../../devel/nss/buildlink3.mk"
+.endif