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.150
retrieving revision 1.196
diff -u -p -r1.150 -r1.196
--- pkgsrc/devel/glib2/Makefile	2008/12/01 13:25:47	1.150
+++ pkgsrc/devel/glib2/Makefile	2012/03/03 00:11:52	1.196
@@ -1,28 +1,14 @@
-# $NetBSD: Makefile,v 1.150 2008/12/01 13:25:47 wiz Exp $
+# $NetBSD: Makefile,v 1.196 2012/03/03 00:11:52 wiz Exp $
 
-# When updating glib2, please apply patch-ak to configure.in
-# Then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.18.3
-PKGREVISION=		1
-PKGNAME=		${DISTNAME:S/glib/glib2/}
+.include "Makefile.common"
+.include "options.mk"
+
+PKGREVISION=		3
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.18/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.18/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.18/}
-EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
 COMMENT=		Some useful routines for C programming (glib2)
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt perl:run pkg-config
-USE_LANGUAGES=		c c++ c99
-USE_LIBTOOL=		yes
-TEST_TARGET=		check
+USE_TOOLS+=		msgfmt perl:run
 
 PKGCONFIG_OVERRIDE=	glib-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	glib-2.0.pc.in
@@ -38,69 +24,31 @@ PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gio-unix-2.0.pc.in
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
-CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
-CONFIGURE_ARGS+=	--with-pcre=system
-
-CONFIGURE_ENV+=		PERL_PATH=${PERL5:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# configure detects wrongly
-CONFIGURE_ENV+=		ac_cv_func_statfs=no
-.endif
-
-CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
-CPPFLAGS+=		-DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
-CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-
-.if ${OPSYS} == "FreeBSD"
-SUBST_CLASSES+=		thr
-SUBST_STAGE.thr=	post-patch
-SUBST_FILES.thr=	gthread/Makefile.in
-.  if ${OS_VERSION:R} >= 5
-SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
-.  else
-SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
-.  endif
-SUBST_MESSAGE.thr=	Fixing libgthread.
-
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
-CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
-.endif
-
-.if ${OPSYS} == "HPUX"
-CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
-.endif
-
-# Handle directories shared with devel/glib.
-PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
-				{ print "@unexec $${RMDIR} %D/" $$2 \
-				  " 2>/dev/null || $${TRUE}"; next; }
+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
 
-PLIST_VARS+=		fam
+# 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"
 
-.if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"
-.include "options.mk"
-.endif
+# needs gz_header structure
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.2.1
+
+LIBS.SunOS+=	-lnsl -lsocket
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-
-.if !empty(MACHINE_PLATFORM:MIRIX-5*)
-CONFIGURE_ARGS+=	--disable-threads
-.else
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-# need pcre utf8 + unicode-properties
-BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 .include "../../devel/pcre/buildlink3.mk"
-
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"