From owner-svn-ports-all@freebsd.org Wed Sep 23 16:46:57 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 39EE13FE940; Wed, 23 Sep 2020 16:46:57 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxPGT0pHGz3Zvh; Wed, 23 Sep 2020 16:46:57 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2730139A8; Wed, 23 Sep 2020 16:46:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08NGkuO2041287; Wed, 23 Sep 2020 16:46:56 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08NGkuIT041285; Wed, 23 Sep 2020 16:46:56 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202009231646.08NGkuIT041285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 23 Sep 2020 16:46:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549749 - head/devel/glib20 X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/devel/glib20 X-SVN-Commit-Revision: 549749 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 16:46:57 -0000 Author: bapt Date: Wed Sep 23 16:46:56 2020 New Revision: 549749 URL: https://svnweb.freebsd.org/changeset/ports/549749 Log: And the final bit of the patch which was forgotten... Bump portrevision as people may have upgraded glib already Submitted by: fluffy Modified: head/devel/glib20/Makefile head/devel/glib20/pkg-plist Modified: head/devel/glib20/Makefile ============================================================================== --- head/devel/glib20/Makefile Wed Sep 23 16:42:58 2020 (r549748) +++ head/devel/glib20/Makefile Wed Sep 23 16:46:56 2020 (r549749) @@ -3,6 +3,7 @@ PORTNAME= glib PORTVERSION= 2.66.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME @@ -16,8 +17,6 @@ LICENSE= LGPL20 USES= tar:xz PORTSCOUT= limitw:1,even -.if !defined(REFERENCE_PORT) - LIB_DEPENDS+= libpcre.so:devel/pcre \ libffi.so:devel/libffi @@ -32,8 +31,9 @@ MESON_ARGS= -Db_lundef=false \ -Dlibmount=disabled \ -Dselinux=disabled \ -Dinstalled_tests=false \ + -Ddefault_library=both \ -Dxattr=false -BINARY_ALIAS= python3=${PYTHON_VERSION} +BINARY_ALIAS= python3=${PYTHON_CMD} LIBVERSION= 0.6600.0 PLIST_SUB+= LIBVERSION=${LIBVERSION} @@ -72,7 +72,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|/usr/share/locale/locale|${LOCALBASE}/share/locale/locale|g' \ ${WRKSRC}/glib/gutils.c - @${REINPLACE_CMD} -e 's|@PYTHON@|${PYTHON_VERSION}|g' \ + @${REINPLACE_CMD} -e 's|@PYTHON@|${PYTHON_CMD}|g' \ ${WRKSRC}/gio/gdbus-2.0/codegen/gdbus-codegen.in \ ${WRKSRC}/glib/gtester-report.in \ ${WRKSRC}/gobject/glib-genmarshal.in \ @@ -104,5 +104,3 @@ post-install: @${RM} -r ${STAGEDIR}${PREFIX}/libexec/installed-tests .include - -.endif Modified: head/devel/glib20/pkg-plist ============================================================================== --- head/devel/glib20/pkg-plist Wed Sep 23 16:42:58 2020 (r549748) +++ head/devel/glib20/pkg-plist Wed Sep 23 16:46:56 2020 (r549749) @@ -282,18 +282,23 @@ include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h lib/glib-2.0/include/glibconfig.h +lib/libgio-2.0.a lib/libgio-2.0.so lib/libgio-2.0.so.0 lib/libgio-2.0.so.%%LIBVERSION%% +lib/libglib-2.0.a lib/libglib-2.0.so lib/libglib-2.0.so.0 lib/libglib-2.0.so.%%LIBVERSION%% +lib/libgmodule-2.0.a lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0 lib/libgmodule-2.0.so.%%LIBVERSION%% +lib/libgobject-2.0.a lib/libgobject-2.0.so lib/libgobject-2.0.so.0 lib/libgobject-2.0.so.%%LIBVERSION%% +lib/libgthread-2.0.a lib/libgthread-2.0.so lib/libgthread-2.0.so.0 lib/libgthread-2.0.so.%%LIBVERSION%%