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.15
retrieving revision 1.150
diff -u -p -r1.15 -r1.150
--- pkgsrc/devel/glib2/Makefile	2002/12/19 13:07:10	1.15
+++ pkgsrc/devel/glib2/Makefile	2008/12/01 13:25:47	1.150
@@ -1,53 +1,106 @@
-# $NetBSD: Makefile,v 1.15 2002/12/19 13:07:10 grant Exp $
-#
+# $NetBSD: Makefile,v 1.150 2008/12/01 13:25:47 wiz Exp $
 
-DISTNAME=		glib-2.0.7
+# 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/}
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.0/}
+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=		packages@netbsd.org
-HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
-COMMENT=		Some useful routines for C programming
+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)
 
-BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK2=		yes
-USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
-USE_PERL5=		yes
+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
-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
+TEST_TARGET=		check
 
-GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+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=		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 defined(USE_PTL2)
-PTHREAD_OPTS+=		native
+.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; }
+
+PLIST_VARS+=		fam
+
+.if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1"
+.include "options.mk"
 .endif
 
-test: build
-	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
-		tee ${WRKDIR}/check.log
-
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.ptl2}/PTL/include
-.  include "../../devel/ptl2/buildlink2.mk"
+.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 "../../mk/bsd.pkg.mk"