diff options
author | grant <grant> | 2005-08-19 10:24:25 +0000 |
---|---|---|
committer | grant <grant> | 2005-08-19 10:24:25 +0000 |
commit | ba8a79093d0bf2c1b49bde4e0920f50a103c9f9c (patch) | |
tree | a268defe0ff9120c7d490c683e2cb6bccd3e3f02 | |
parent | a7320dfc121bca4c0af286d0ac4dbf448e4cb6c1 (diff) | |
download | pkgsrc-ba8a79093d0bf2c1b49bde4e0920f50a103c9f9c.tar.gz |
add option to build with gnutls support. no change to the default
(nss) so no PKGREVISION bump.
ok'd by the MAINTAINER, Matthew Luckie.
-rw-r--r-- | chat/gaim/Makefile | 10 | ||||
-rw-r--r-- | chat/gaim/options.mk | 22 |
2 files changed, 25 insertions, 7 deletions
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index a2281f4b3c5..1f428f2051f 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 @@ CONFIGURE_ARGS+= --disable-screensaver .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 --git a/chat/gaim/options.mk b/chat/gaim/options.mk new file mode 100644 index 00000000000..22eca2afcf5 --- /dev/null +++ b/chat/gaim/options.mk @@ -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 |