CVS commit: pkgsrc/devel/glib2

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Dec 29 19:58:47 UTC 2019

Modified Files:
        pkgsrc/devel/glib2: PLIST distinfo
        pkgsrc/devel/glib2/patches: patch-glib_gmacros.h

Log Message:
glib2: fix typos

pkgsrc changes:
---------------
  * fix typo in patch.
  * fix LOCALBASE in PLIST (thanks to Leonardo).


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.263 -r1.264 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/glib2/patches/patch-glib_gmacros.h

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

Modified files:

Index: pkgsrc/devel/glib2/PLIST
diff -u pkgsrc/devel/glib2/PLIST:1.111 pkgsrc/devel/glib2/PLIST:1.112
--- pkgsrc/devel/glib2/PLIST:1.111      Sun Dec 29 19:40:56 2019
+++ pkgsrc/devel/glib2/PLIST    Sun Dec 29 19:58:47 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.111 2019/12/29 19:40:56 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.112 2019/12/29 19:58:47 triaxx Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -306,8 +306,8 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load/usr/pkg/lib/libglib-2.0.so.0.6200.4-gdb.py
-share/gdb/auto-load/usr/pkg/lib/libgobject-2.0.so.0.6200.4-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6200.4-gdb.py
+share/gdb/auto-load${LOCALBASE}/libgobject-2.0.so.0.6200.4-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.263 pkgsrc/devel/glib2/distinfo:1.264
--- pkgsrc/devel/glib2/distinfo:1.263   Sun Dec 29 19:40:56 2019
+++ pkgsrc/devel/glib2/distinfo Sun Dec 29 19:58:47 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.263 2019/12/29 19:40:56 triaxx Exp $
+$NetBSD: distinfo,v 1.264 2019/12/29 19:58:47 triaxx Exp $
 
 SHA1 (glib-2.62.4.tar.xz) = f9a493c86f98482f13c6ed742c19487e6fa8f34b
 RMD160 (glib-2.62.4.tar.xz) = 4cac1bc54a690b007c859db2e9d65c33dc97395c
@@ -17,7 +17,7 @@ SHA1 (patch-glib_gatomic.c) = 875ad9c828
 SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1
 SHA1 (patch-glib_genviron.c) = 7182f5ef2ebc7f17d8d4fb892e946c52c8c0ad1d
 SHA1 (patch-glib_glibconfig.h.in) = 1964b5fb15317e681dad426d4862e3f48c4274f7
-SHA1 (patch-glib_gmacros.h) = 641107ccb6b285c472ed6cb337e53e4764f8d6a8
+SHA1 (patch-glib_gmacros.h) = b2737b6b089556ca9bb54176a41371042e329b9c
 SHA1 (patch-glib_gmain.c) = 4c834b3cb35b1e64b77dfe15f4b3aa01d4d5daa1
 SHA1 (patch-glib_gspawn.c) = 17a6f1b38660123eafd6fb66966eb240dee26db7
 SHA1 (patch-glib_gtypes.h) = ad193e4a991a9df84b0c38f5464d58d8025ee44c

Index: pkgsrc/devel/glib2/patches/patch-glib_gmacros.h
diff -u pkgsrc/devel/glib2/patches/patch-glib_gmacros.h:1.1 pkgsrc/devel/glib2/patches/patch-glib_gmacros.h:1.2
--- pkgsrc/devel/glib2/patches/patch-glib_gmacros.h:1.1 Fri Dec  6 14:36:58 2019
+++ pkgsrc/devel/glib2/patches/patch-glib_gmacros.h     Sun Dec 29 19:58:47 2019
@@ -1,6 +1,8 @@
-$NetBSD: patch-glib_gmacros.h,v 1.1 2019/12/06 14:36:58 nros Exp $
+$NetBSD: patch-glib_gmacros.h,v 1.2 2019/12/29 19:58:47 triaxx Exp $
+
 * on some compilers __STDC_VERSION__ is defined when using c++
   but _Static_assert is not available
+
 --- glib/gmacros.h.orig        2019-12-06 12:21:18.948881370 +0000
 +++ glib/gmacros.h
 @@ -734,7 +734,7 @@