pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/vinagre make use of "avahi" an option, default to ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/478561e3a7a7
branches:  trunk
changeset: 569808:478561e3a7a7
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Jan 19 20:02:40 2010 +0000

description:
make use of "avahi" an option, default to "off"
(because we don't have nss support for it, and it conflicts with
"mdnsd" on NetBSD-current)
bump PKGREVISION

diffstat:

 net/vinagre/Makefile |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 7fe7df237af3 -r 478561e3a7a7 net/vinagre/Makefile
--- a/net/vinagre/Makefile      Tue Jan 19 10:07:49 2010 +0000
+++ b/net/vinagre/Makefile      Tue Jan 19 20:02:40 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/01/19 20:02:40 drochner Exp $
 #
 
 DISTNAME=      vinagre-2.28.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/vinagre/2.28/}
 
@@ -19,13 +19,21 @@
 
 GCONF_SCHEMAS+=        vinagre.schemas
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.vinagre
+PKG_SUPPORTED_OPTIONS= avahi
+.include "../../mk/bsd.options.mk"
+.if empty(PKG_OPTIONS:Mavahi)
+CONFIGURE_ARGS+= --disable-avahi
+.else
+.include "../../net/avahi/buildlink3.mk"
+.endif
+
 .include "../../databases/shared-mime-info/mimedb.mk"
 BUILDLINK_API_DEPENDS.GConf+=  GConf>=2.16.0
 .include "../../devel/GConf/schemas.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.17.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../net/avahi/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk-vnc+=        gtk-vnc>=0.3.8nb1
 .include "../../net/gtk-vnc/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"



Home | Main Index | Thread Index | Old Index