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.29
retrieving revision 1.201
diff -u -p -r1.29 -r1.201
--- pkgsrc/devel/glib2/Makefile	2003/08/27 09:06:12	1.29
+++ pkgsrc/devel/glib2/Makefile	2012/05/01 18:45:51	1.201
@@ -1,41 +1,57 @@
-# $NetBSD: Makefile,v 1.29 2003/08/27 09:06:12 wiz Exp $
+# $NetBSD: Makefile,v 1.201 2012/05/01 18:45:51 adam Exp $
+
+.include "Makefile.common"
+.include "options.mk"
 
-DISTNAME=		glib-2.2.3
-PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.2/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
-COMMENT=		Some useful routines for C programming
-
-BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK2=		yes
-USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
-USE_PERL5=		yes
-
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE=	${WRKSRC}/glib-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/gmodule-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/gobject-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/gthread-2.0.pc.in
-
-GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
-
-TEST_TARGET=		check
-
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
 
+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
+
+FILES_SUBST+=		GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
+FILES_SUBST+=		GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
+FILES_SUBST+=		GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas
+FILES_SUBST+=		GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
+
+# gtester is the glib unit testing and reporting framework
+# 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
+
+.if ${OBJECT_FMT} == "ELF"
+.include "../../devel/libelf/buildlink3.mk"
+.endif
+
+.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"