Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Sep 2020 16:46:56 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549749 - head/devel/glib20
Message-ID:  <202009231646.08NGkuIT041285@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.post.mk>
-
-.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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009231646.08NGkuIT041285>