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.65
retrieving revision 1.174
diff -u -p -r1.65 -r1.174
--- pkgsrc/devel/glib2/Makefile	2005/02/04 11:21:11	1.65
+++ pkgsrc/devel/glib2/Makefile	2010/05/31 17:30:36	1.174
@@ -1,78 +1,31 @@
-# $NetBSD: Makefile,v 1.65 2005/02/04 11:21:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.174 2010/05/31 17:30:36 drochner Exp $
+
+.include "Makefile.common"
 
-DISTNAME=		glib-2.6.2
-PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.6/}
-EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
 COMMENT=		Some useful routines for C programming (glib2)
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-BUILD_USES_MSGFMT=	yes
+USE_TOOLS+=		msgfmt perl:run
 
-USE_BUILDLINK3=		yes
-USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		make
-USE_PERL5=		yes
-USE_LIBTOOL=		yes
-TEST_TARGET=		check
-
-PKGCONFIG_OVERRIDE=	glib-2.0.pc.in
+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
 
-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
-CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
-
-CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=gnu
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=		F77=${FALSE}
-
-CONFIGURE_ENV+=		PERL=${PERL5}
-CONFIGURE_ENV+=		PERL_PATH=${PERL5}
-
-CPPFLAGS+=		-DPREFIX=\"\\\"${PREFIX}\\\"\"
-CPPFLAGS+=		-DPKGLOCALEDIR=\"\\\"${PKGLOCALEDIR}\\\"\"
-CPPFLAGS+=		-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
-
-.include "../../mk/bsd.prefs.mk"
-
-# FreeBSD fix for libgthread:
-# Be sure libgthread is linked to the threaded library (libc_r), otherwise
-# -pthread is added and this won't work with libraries, only executable
-# binaries.
-
-.if ${OPSYS} == "FreeBSD"
-
-SUBST_CLASSES=		thr
-SUBST_STAGE.thr=	post-patch
-SUBST_FILES.thr=	gthread/Makefile.in
-SUBST_SED.thr=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
-SUBST_MESSAGE.thr=	"Fixing libgthread."
-
-.endif
-
-# Handle directories shared with devel/glib.
-PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
-				{ print "@unexec $${RMDIR} %D/" $$2 \
-				  " 2>/dev/null || $${TRUE}"; next; }
+# 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/pkgconfig/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"