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.7
retrieving revision 1.173
diff -u -p -r1.7 -r1.173
--- pkgsrc/devel/glib2/Makefile	2002/09/10 16:06:39	1.7
+++ pkgsrc/devel/glib2/Makefile	2010/04/20 17:43:50	1.173
@@ -1,44 +1,32 @@
-# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:39 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.173 2010/04/20 17:43:50 jmmv Exp $
+
+.include "Makefile.common"
 
-DISTNAME=		glib-2.0.6
-PKGNAME=		${DISTNAME:S/glib/glib2/}
 PKGREVISION=		1
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
-			http://www.ameth.org/gimp/pub/gtk/v2.0/ \
-			${MASTER_SITE_GNOME:=stable/sources/glib/}
-
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
-COMMENT=		Some useful routines for C programming
-
-BUILD_USES_MSGFMT=	yes
-GNU_CONFIGURE=		yes
-USE_BUILDLINK_ONLY=	yes
-USE_GMAKE=		yes
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_PERL5=		yes
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-
-# GLib needs a working pre-emptive pthreads implementation
-PTHREAD_OPTS+=		native
-
-test: build
-	cd ${WRKSRC} &&  ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
-		tee ${WRKDIR}/check.log
-
-.include "../../converters/libiconv/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/pkgconfig/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-CPPFLAGS+=		-I${BUILDLINK_DIR}/PTL/include
-.  include "../../devel/ptl2/buildlink.mk"
-.endif
 
+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
+
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+=	pcre>=7.4nb1
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"