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.206
diff -u -p -r1.198 -r1.206
--- pkgsrc/devel/glib2/Makefile	2012/04/06 10:40:36	1.198
+++ pkgsrc/devel/glib2/Makefile	2012/06/26 18:21:24	1.206
@@ -1,28 +1,25 @@
-# $NetBSD: Makefile,v 1.198 2012/04/06 10:40:36 taca Exp $
+# $NetBSD: Makefile,v 1.206 2012/06/26 18:21:24 drochner Exp $
 
 .include "Makefile.common"
 .include "options.mk"
 
 PKGREVISION=		1
+
 CATEGORIES=		devel
 
 COMMENT=		Some useful routines for C programming (glib2)
 
 USE_TOOLS+=		msgfmt perl:run
 
-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
@@ -44,7 +41,12 @@ 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" && ${OPSYS} != "SunOS"
+.include "../../devel/libelf/buildlink3.mk"
+.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"