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.184
retrieving revision 1.192
diff -u -p -r1.184 -r1.192
--- pkgsrc/devel/glib2/Makefile	2011/05/25 09:38:42	1.184
+++ pkgsrc/devel/glib2/Makefile	2012/01/31 14:43:06	1.192
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.184 2011/05/25 09:38:42 drochner Exp $
+# $NetBSD: Makefile,v 1.192 2012/01/31 14:43:06 abs Exp $
 
 .include "Makefile.common"
+.include "options.mk"
+
+PKGREVISION=		1
 
 CATEGORIES=		devel
 
@@ -31,14 +34,27 @@ FILES_SUBST+=		GLIB_SCHEMAS_DIR=${PREFIX
 # agc doesn't want glib2 to depend on python so we install it
 # in a broken and useless state.
 CHECK_INTERPRETER_SKIP+=	bin/gtester-report
+CHECK_INTERPRETER_SKIP+=	bin/gdbus-codegen
 
 # need pcre utf8 + unicode-properties
 BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.11
+# 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"
+
+# needs gz_header structure
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.2.1
 
 LIBS.SunOS+=	-lnsl -lsocket
 
+# Until the implicit but not declared dependency on python is resolved
+post-install:
+	${RM} ${DESTDIR}${PREFIX}/bin/gdbus-codegen
+	${RM} -r ${DESTDIR}${PREFIX}/lib/gdbus-2.0
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"