From owner-svn-ports-all@freebsd.org Fri Mar 22 23:57:13 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D70FD15555DC; Fri, 22 Mar 2019 23:57:12 +0000 (UTC) (envelope-from kwm@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) server-signature RSA-PSS (4096 bits) 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 7DD466A765; Fri, 22 Mar 2019 23:57:12 +0000 (UTC) (envelope-from kwm@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 3E06027B0B; Fri, 22 Mar 2019 23:57:12 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2MNvCPL054744; Fri, 22 Mar 2019 23:57:12 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2MNvBDa054742; Fri, 22 Mar 2019 23:57:11 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201903222357.x2MNvBDa054742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Fri, 22 Mar 2019 23:57:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496605 - head/devel/libglade2 X-SVN-Group: ports-head X-SVN-Commit-Author: kwm X-SVN-Commit-Paths: head/devel/libglade2 X-SVN-Commit-Revision: 496605 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7DD466A765 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 22 Mar 2019 23:57:13 -0000 Author: kwm Date: Fri Mar 22 23:57:11 2019 New Revision: 496605 URL: https://svnweb.freebsd.org/changeset/ports/496605 Log: Fix build after base r345349 While do some cleanup of the port. PR: 236141 Modified: head/devel/libglade2/Makefile head/devel/libglade2/pkg-plist Modified: head/devel/libglade2/Makefile ============================================================================== --- head/devel/libglade2/Makefile Fri Mar 22 23:13:05 2019 (r496604) +++ head/devel/libglade2/Makefile Fri Mar 22 23:57:11 2019 (r496605) @@ -1,6 +1,5 @@ # Created by: Ade Lovett # $FreeBSD$ -# $MCom: ports/devel/libglade2/Makefile,v 1.26 2007/08/01 16:13:48 mezz Exp $ PORTNAME= libglade2 PORTVERSION= 2.6.4 @@ -13,16 +12,22 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME glade library +LICENSE= LGPL20 + +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig + USES= tar:bzip2 .if !defined(REFERENCE_PORT) RUN_DEPENDS= xmlcatmgr:textproc/xmlcatmgr -GNU_CONFIGURE= yes -USES+= gmake libtool:keepla pathfix pkgconfig -USE_GNOME= libxml2 gtk20 referencehack +USES+= gmake gnome libtool:keepla pathfix pkgconfig +USE_GNOME= cairo gdkpixbuf2 libxml2 gtk20 referencehack USE_LDCONFIG= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc \ --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports @@ -42,11 +47,15 @@ USES+= python:2.7 PLIST_SUB+= PYTHON="" .else PLIST_SUB+= PYTHON="@comment " +.endif -post-patch: +post-patch-PYTHON-off: @${REINPLACE_CMD} -E 's/in (python.*)+ none/in none/' \ ${WRKSRC}/configure -.endif + +post-patch: + @${REINPLACE_CMD} -e 's|glib-2.0|gmodule-2.0 glib-2.0|g' \ + ${WRKSRC}/configure post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/libglade/2.0 Modified: head/devel/libglade2/pkg-plist ============================================================================== --- head/devel/libglade2/pkg-plist Fri Mar 22 23:13:05 2019 (r496604) +++ head/devel/libglade2/pkg-plist Fri Mar 22 23:57:11 2019 (r496605) @@ -11,6 +11,6 @@ lib/libglade-2.0.so.0 lib/libglade-2.0.so.0.0.7 libdata/pkgconfig/libglade-2.0.pc share/xml/libglade/glade-2.0.dtd -@unexec %%XMLCATALOG%% --noout --del %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true -@exec %%XMLCATALOG%% --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true +@postunexec %%XMLCATALOG%% --noout --del %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true +@postexec %%XMLCATALOG%% --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true @dir lib/libglade/2.0