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.12
retrieving revision 1.240
diff -u -p -r1.12 -r1.240
--- pkgsrc/devel/glib2/Makefile	2002/11/15 16:31:06	1.12
+++ pkgsrc/devel/glib2/Makefile	2018/05/21 08:39:38	1.240
@@ -1,52 +1,75 @@
-# $NetBSD: Makefile,v 1.12 2002/11/15 16:31:06 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.240 2018/05/21 08:39:38 jperkin Exp $
 
-DISTNAME=		glib-2.0.7
-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/ \
-			http://www.ameth.org/gimp/pub/gtk/v2.0/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.0/}
-
-MAINTAINER=		packages@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_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=		yes
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
+.include "Makefile.common"
 
-.include "../../mk/bsd.prefs.mk"
+PKGREVISION=		1
+CATEGORIES=		devel gnome
 
-.if defined(USE_PTL2)
-PTHREAD_OPTS+=		native
-.endif
+COMMENT=		Some useful routines for C programming (glib2)
 
-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"
+USE_TOOLS+=		msgfmt perl:run readlink
+
+PKGCONFIG_OVERRIDE+=	glib-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gmodule-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gmodule-export-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gmodule-no-export-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gobject-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-unix-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-windows-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_WRKREF_SKIP+=		bin/gtester-report
+
+# need pcre utf8 + unicode-properties
+BUILDLINK_API_DEPENDS.pcre+=	pcre>=8.31
+# 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
+CPPFLAGS.SunOS+=	-DBSD_COMP
+
+.if ${OBJECT_FMT} == "ELF"
+.  if ${OPSYS} == "SunOS"
+.    if empty(ABI:U:M64)
+# Solaris libelf in 32-bit mode does not support largefile.  We patch files
+# individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf
+# after configure disabled it.
+CONFIGURE_ENV+=		LIBELF_LIBS='-lelf'
+.    endif
+.  else
+.    include "../../devel/libelf/buildlink3.mk"
+.  endif
 .endif
 
+# XXX: Kludge to avoid uncoditionally pick up some gtkdoc-* tools if gtk-doc
+# XXX: package is installed and then fails in the installation phase.
+CONFIGURE_ENV+=	ac_cv_prog_GTKDOC_CHECK= \
+		ac_cv_path_GTKDOC_CHECK_PATH= \
+		ac_cv_path_GTKDOC_REBASE= \
+		ac_cv_path_GTKDOC_MKPDF=
+
+# to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
+TOOL_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+PYTHON_FOR_BUILD_ONLY?=	yes
+.include "../../lang/python/pyversion.mk"
+
+.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"