Import of pkgsrc-2016Q3

chat/finch/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2015/08/17 17:11:20 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2016/07/09 06:37:52 wiz Exp $
 
 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	3
+PKGREVISION=	1
 
 COMMENT=	Multi-protocol Instant Messaging client console frontend
 
@@ -10,6 +10,7 @@ COMMENT=	Multi-protocol Instant Messaging client console frontend
 USE_TOOLS+=	intltool msgfmt perl
 
 CONFIGURE_ARGS+=	--enable-consoleui
+CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ENV+=		ac_cv_path_pythonpath=
 
 #CONFIGURE_ARGS+=	--disable-plugins
@@ -35,6 +36,10 @@ pre-build:
 
 INSTALL_DIRS=		finch doc
 
+# this was an option, but doesn't seem to be one as of 2.10.12
+.  include "../../multimedia/gstreamer1/buildlink3.mk"
+.  include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+
 BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

chat/finch/options.mk

@@ -1,14 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2015/08/06 19:39:19 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2016/01/13 22:25:38 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.finch
-PKG_SUPPORTED_OPTIONS+=		gstreamer debug
+PKG_SUPPORTED_OPTIONS+=		debug
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mgstreamer)
-.  include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 .endif