[pkgsrc/trunk]: pkgsrc/devel/glib2 glib2: PLIST fix for Darwin; ...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/72be3c8d8b42
branches:  trunk
changeset: 306681:72be3c8d8b42
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Apr 23 08:26:50 2018 +0000
description:
glib2: PLIST fix for Darwin; small pkglint cleanups

diffstat:

 devel/glib2/Makefile        |  9 +++++++--
 devel/glib2/Makefile.common |  3 +--
 devel/glib2/PLIST           |  6 +++---
 devel/glib2/buildlink3.mk   |  8 ++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diffs (89 lines):

diff -r e7b2f0260f45 -r 72be3c8d8b42 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Mon Apr 23 08:21:20 2018 +0000
+++ b/devel/glib2/Makefile      Mon Apr 23 08:26:50 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.238 2017/11/08 14:03:42 wiz Exp $
+# $NetBSD: Makefile,v 1.239 2018/04/23 08:26:50 adam Exp $
 
 .include "Makefile.common"
 
@@ -41,6 +41,11 @@
 LIBS.SunOS+=           -lnsl -lsocket
 CPPFLAGS.SunOS+=       -DBSD_COMP
 
+PLIST_VARS+=           unix
+.if ${OPSYS} != "Darwin"
+PLIST.unix=            yes
+.endif
+
 .if ${OBJECT_FMT} == "ELF"
 .  if ${OPSYS} == "SunOS"
 .    if empty(ABI:U:M64)
@@ -50,7 +55,7 @@
 CONFIGURE_ENV+=                LIBELF_LIBS='-lelf'
 .    endif
 .  else
-.  include "../../devel/libelf/buildlink3.mk"
+.    include "../../devel/libelf/buildlink3.mk"
 .  endif
 .endif
 
diff -r e7b2f0260f45 -r 72be3c8d8b42 devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Mon Apr 23 08:21:20 2018 +0000
+++ b/devel/glib2/Makefile.common       Mon Apr 23 08:26:50 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62 2018/04/17 08:03:38 wiz Exp $
+# $NetBSD: Makefile.common,v 1.63 2018/04/23 08:26:50 adam Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -63,7 +63,6 @@
 SUBST_SED.thr+=                -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
 .  endif
 SUBST_MESSAGE.thr=     Fixing libgthread.
-
 .endif
 
 # glib-2.48.0 dropped support for OSX < 10.9.0 just to add notification
diff -r e7b2f0260f45 -r 72be3c8d8b42 devel/glib2/PLIST
--- a/devel/glib2/PLIST Mon Apr 23 08:21:20 2018 +0000
+++ b/devel/glib2/PLIST Mon Apr 23 08:26:50 2018 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.98 2018/04/17 08:03:38 wiz Exp $
-bin/gapplication
+@comment $NetBSD: PLIST,v 1.99 2018/04/23 08:26:50 adam Exp $
+${PLIST.unix}bin/gapplication
 bin/gdbus
 bin/gio
 bin/gio-querymodules
@@ -11,7 +11,7 @@
 bin/gsettings
 bin/gtester
 bin/gtester-report
-include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
+${PLIST.unix}include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
 include/glib/gio-unix-2.0/gio/gfiledescriptorbased.h
 include/glib/gio-unix-2.0/gio/gunixconnection.h
 include/glib/gio-unix-2.0/gio/gunixcredentialsmessage.h
diff -r e7b2f0260f45 -r 72be3c8d8b42 devel/glib2/buildlink3.mk
--- a/devel/glib2/buildlink3.mk Mon Apr 23 08:21:20 2018 +0000
+++ b/devel/glib2/buildlink3.mk Mon Apr 23 08:26:50 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2018/01/19 22:20:19 sevan Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2018/04/23 08:26:50 adam Exp $
 
 BUILDLINK_TREE+=       glib2
 
@@ -8,9 +8,9 @@
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.4.0
 BUILDLINK_ABI_DEPENDS.glib2+=  glib2>=2.34.0
 BUILDLINK_PKGSRCDIR.glib2?=    ../../devel/glib2
-BUILDLINK_INCDIRS.glib2+=      include/glib/glib-2.0
-BUILDLINK_INCDIRS.glib2+=      include/glib/gio-unix-2.0
-BUILDLINK_INCDIRS.glib2+=      lib/glib-2.0/include
+BUILDLINK_INCDIRS.glib2+=      include/glib/glib-2.0
+BUILDLINK_INCDIRS.glib2+=      include/glib/gio-unix-2.0
+BUILDLINK_INCDIRS.glib2+=      lib/glib-2.0/include
 
 TOOL_DEPENDS+= glib2-tools-[0-9]*:../../devel/glib2-tools