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

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/devel/glib2/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/devel/glib2/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.198
retrieving revision 1.223
diff -u -p -r1.198 -r1.223
--- pkgsrc/devel/glib2/Makefile	2012/04/06 10:40:36	1.198
+++ pkgsrc/devel/glib2/Makefile	2014/10/07 06:29:21	1.223
@@ -1,28 +1,22 @@
-# $NetBSD: Makefile,v 1.198 2012/04/06 10:40:36 taca Exp $
+# $NetBSD: Makefile,v 1.223 2014/10/07 06:29:21 adam Exp $
 
 .include "Makefile.common"
-.include "options.mk"
 
-PKGREVISION=		1
-CATEGORIES=		devel
+CATEGORIES=		devel gnome
 
 COMMENT=		Some useful routines for C programming (glib2)
 
-USE_TOOLS+=		msgfmt perl:run
+USE_TOOLS+=		msgfmt perl:run readlink
 
-PKGCONFIG_OVERRIDE=	glib-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	glib-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gmodule-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gmodule-no-export-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule-no-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gobject-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gobject-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gthread-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gio-unix-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-windows-2.0.pc.in
 
 FILES_SUBST+=		GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
 FILES_SUBST+=		GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
@@ -36,7 +30,7 @@ CHECK_INTERPRETER_SKIP+=	bin/gtester-rep
 CHECK_INTERPRETER_SKIP+=	bin/gdbus-codegen
 
 # need pcre utf8 + unicode-properties
-BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.11
+BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.31
 # to avoid pkg-config dependency, explicitly specify pcre location
 CONFIGURE_ARGS+=	PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
 CONFIGURE_ARGS+=	PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
@@ -44,7 +38,21 @@ CONFIGURE_ARGS+=	PCRE_LIBS="${COMPILER_R
 # needs gz_header structure
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.2.1
 
-LIBS.SunOS+=	-lnsl -lsocket
+LIBS.SunOS+=		-lnsl -lsocket
+CPPFLAGS.SunOS+=	-DBSD_COMP
+
+.if ${OBJECT_FMT} == "ELF"
+.  if ${OPSYS} == "SunOS"
+.    if ${ABI} == 32
+# Solaris libelf in 32-bit mode does not support largefile.  We patch files
+# individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf
+# after configure disabled it.
+CONFIGURE_ENV+=		LIBELF_LIBS='-lelf'
+.    endif
+.  else
+.  include "../../devel/libelf/buildlink3.mk"
+.  endif
+.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"