From owner-svn-ports-all@freebsd.org Tue Sep 29 07:38:49 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 567BD3F8732; Tue, 29 Sep 2020 07:38:49 +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 4C0rqF1d4lz4PxW; Tue, 29 Sep 2020 07:38:49 +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 00F0EADE9; Tue, 29 Sep 2020 07:38:49 +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 08T7cmCu086916; Tue, 29 Sep 2020 07:38:48 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08T7cma7086915; Tue, 29 Sep 2020 07:38:48 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202009290738.08T7cma7086915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 29 Sep 2020 07:38:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550473 - head/misc/shared-mime-info X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/misc/shared-mime-info X-SVN-Commit-Revision: 550473 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: Tue, 29 Sep 2020 07:38:49 -0000 Author: bapt Date: Tue Sep 29 07:38:48 2020 New Revision: 550473 URL: https://svnweb.freebsd.org/changeset/ports/550473 Log: Switch the dependencies from xmlto to minixmlto. This avoids a circular dependency on w3m when building w3m with INLINE_IMAGE option While here drop the now useless intltool [1] This also reduces the number of dependencies to build shared mime info, removing perl bash from the build dependencies Reported by: mi@ Modified: head/misc/shared-mime-info/Makefile Modified: head/misc/shared-mime-info/Makefile ============================================================================== --- head/misc/shared-mime-info/Makefile Tue Sep 29 07:16:43 2020 (r550472) +++ head/misc/shared-mime-info/Makefile Tue Sep 29 07:38:48 2020 (r550473) @@ -13,18 +13,19 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gmake:devel/gmake \ itstool:textproc/itstool \ - xmlto:textproc/xmlto + minixmlto:textproc/minixmlto USES= gettext gnome localbase meson pathfix pkgconfig shebangfix tar:xz CONFIGURE_ARGS= -Dupdate-mimedb=false \ -Dxdgmime-path=${WRKSRC}/src/xdgmime -USE_GNOME= glib20 libxml2 intltool +USE_GNOME= glib20 libxml2 USE_GITLAB= YES GL_SITE= https://gitlab.freedesktop.org/ GL_ACCOUNT= xdg GL_PROJECT= shared-mime-info GL_COMMIT= ef58b2b2f7ad4070171c6e45e3b3764daa3ff2c1 GL_TUPLE= xdg:xdgmime:6663a2288d11b37bc07f5a01b4b85dcd377787e1:xdgmime/src/xdgmime +bash_CMD= /bin/sh SHEBANG_FILES= ${WRKSRC}/data/freedesktop_generate.sh SUB_FILES= pkg-install @@ -34,6 +35,8 @@ MIMEDIRS= ${LOCALBASE}/share/mime \ ${PREFIX}/share/mime MIMESUBDIRS= application audio image inode message model multipart \ packages text video x-epoc x-content + +BINARY_ALIAS= xmlto=minixmlto post-patch: ${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \