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.149 retrieving revision 1.241 diff -u -p -r1.149 -r1.241 --- pkgsrc/devel/glib2/Makefile 2008/11/29 19:09:04 1.149 +++ pkgsrc/devel/glib2/Makefile 2018/08/19 18:32:27 1.241 @@ -1,113 +1,74 @@ -# $NetBSD: Makefile,v 1.149 2008/11/29 19:09:04 jmcneill Exp $ +# $NetBSD: Makefile,v 1.241 2018/08/19 18:32:27 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/} -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 +.include "Makefile.common" -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) +CATEGORIES= devel gnome -PKG_INSTALLATION_TYPES= overwrite pkgviews -PKG_DESTDIR_SUPPORT= user-destdir +COMMENT= Some useful routines for C programming (glib2) -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 readlink -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 +PKGCONFIG_OVERRIDE+= gio-windows-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 -# need pcre utf8 + unicode-properties -BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1 - -# Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE:Q} - -CONFIGURE_ENV+= PERL_PATH=${PERL5:Q} - -.include "../../mk/bsd.prefs.mk" +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 -.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" +# 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 -SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g" +. include "../../devel/libelf/buildlink3.mk" . 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 - -# Overridden in options.mk. -CONFIGURE_ARGS+= --disable-fam - -.if ${OPSYS} != "HPUX" && ${OPSYS} != "OSF1" -.include "options.mk" -.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 "../../mk/dlopen.buildlink3.mk" - -.if !empty(MACHINE_PLATFORM:MIRIX-5*) -CONFIGURE_ARGS+= --disable-threads -.else -.include "../../mk/pthread.buildlink3.mk" -.endif .include "../../devel/pcre/buildlink3.mk" - +.include "../../devel/zlib/buildlink3.mk" +.include "../../devel/libffi/buildlink3.mk" .include "../../mk/bsd.pkg.mk"