CVS commit: pkgsrc/devel/glib2

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 23 08:26:50 UTC 2018

Modified Files:
        pkgsrc/devel/glib2: Makefile Makefile.common PLIST buildlink3.mk

Log Message:
glib2: PLIST fix for Darwin; small pkglint cleanups


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.98 -r1.99 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/glib2/buildlink3.mk

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/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.238 pkgsrc/devel/glib2/Makefile:1.239
--- pkgsrc/devel/glib2/Makefile:1.238   Wed Nov  8 14:03:42 2017
+++ pkgsrc/devel/glib2/Makefile Mon Apr 23 08:26:50 2018
@@ -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 @@ BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2
 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 @@ CPPFLAGS.SunOS+=      -DBSD_COMP
 CONFIGURE_ENV+=                LIBELF_LIBS='-lelf'
 .    endif
 .  else
-.  include "../../devel/libelf/buildlink3.mk"
+.    include "../../devel/libelf/buildlink3.mk"
 .  endif
 .endif
 

Index: pkgsrc/devel/glib2/Makefile.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.62 pkgsrc/devel/glib2/Makefile.common:1.63
--- pkgsrc/devel/glib2/Makefile.common:1.62     Tue Apr 17 08:03:38 2018
+++ pkgsrc/devel/glib2/Makefile.common  Mon Apr 23 08:26:50 2018
@@ -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_FO
 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

Index: pkgsrc/devel/glib2/PLIST
diff -u pkgsrc/devel/glib2/PLIST:1.98 pkgsrc/devel/glib2/PLIST:1.99
--- pkgsrc/devel/glib2/PLIST:1.98       Tue Apr 17 08:03:38 2018
+++ pkgsrc/devel/glib2/PLIST    Mon Apr 23 08:26:50 2018
@@ -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/gresource
 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

Index: pkgsrc/devel/glib2/buildlink3.mk
diff -u pkgsrc/devel/glib2/buildlink3.mk:1.28 pkgsrc/devel/glib2/buildlink3.mk:1.29
--- pkgsrc/devel/glib2/buildlink3.mk:1.28       Fri Jan 19 22:20:19 2018
+++ pkgsrc/devel/glib2/buildlink3.mk    Mon Apr 23 08:26:50 2018
@@ -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 @@ GLIB2_BUILDLINK3_MK:=
 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