Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1556435209200800"
MIME-Version: 1.0
Date: Sun, 28 Apr 2019 07:06:49 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/glade
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20190428070649.76C9CFB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1556435209200800
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun Apr 28 07:06:49 UTC 2019

Added Files:
	pkgsrc/devel/glade: buildlink3.mk
	pkgsrc/devel/glade/patches: patch-configure
Removed Files:
	pkgsrc/devel/glade/patches: patch-aa patch-ab patch-ac patch-ad

Log Message:
glade: replace with glade3, nothing uses this.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/glade/buildlink3.mk
cvs rdiff -u -r1.7 -r0 pkgsrc/devel/glade/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/glade/patches/patch-ab \
    pkgsrc/devel/glade/patches/patch-ac pkgsrc/devel/glade/patches/patch-ad
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/glade/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1556435209200800
Content-Disposition: inline
Content-Length: 3197
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Added files:

Index: pkgsrc/devel/glade/buildlink3.mk
diff -u /dev/null pkgsrc/devel/glade/buildlink3.mk:1.1
--- /dev/null	Sun Apr 28 07:06:49 2019
+++ pkgsrc/devel/glade/buildlink3.mk	Sun Apr 28 07:06:49 2019
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/04/28 07:06:49 wiz Exp $
+
+BUILDLINK_TREE+=	glade
+
+.if !defined(GLADE_BUILDLINK3_MK)
+GLADE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.glade+=	glade>=3.22.0
+BUILDLINK_ABI_DEPENDS.glade+=	glade>=3.22.0
+BUILDLINK_PKGSRCDIR.glade?=	../../devel/glade
+
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.endif # GLADE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-glade

Index: pkgsrc/devel/glade/patches/patch-configure
diff -u /dev/null pkgsrc/devel/glade/patches/patch-configure:1.1
--- /dev/null	Sun Apr 28 07:06:49 2019
+++ pkgsrc/devel/glade/patches/patch-configure	Sun Apr 28 07:06:49 2019
@@ -0,0 +1,38 @@
+$NetBSD: patch-configure,v 1.1 2019/04/28 07:06:49 wiz Exp $
+
+Use portable test(1) operator.
+
+--- configure.orig	2018-04-02 22:07:35.000000000 +0000
++++ configure
+@@ -13210,7 +13210,8 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+ if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+       INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+ else
+-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
++      PKGSRC_random=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
++      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$PKGSRC_random && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+ fi
+       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -14913,7 +14914,7 @@ for d in sc.get_config_var('INCLDIRSTOMA
+ 
+ print(' '.join(incldirs))
+ "
+-if test "x$PYTHON_INCLUDES" == x; then
++if test "x$PYTHON_INCLUDES" = x; then
+   PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
+ fi
+ 
+@@ -14946,10 +14947,10 @@ print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+-if test "x$PYTHON_LIBS" == x; then
++if test "x$PYTHON_LIBS" = x; then
+ 	PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
+ fi
+-if test "x$PYTHON_LIB_LOC" == x; then
++if test "x$PYTHON_LIB_LOC" = x; then
+ 	PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
+ fi
+ 


--_----------=_1556435209200800--