From owner-svn-ports-all@FreeBSD.ORG Tue Apr 23 08:03:31 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BBCA4491; Tue, 23 Apr 2013 08:03:31 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward13.mail.yandex.net (forward13.mail.yandex.net [IPv6:2a02:6b8:0:801::3]) by mx1.freebsd.org (Postfix) with ESMTP id 387F11E91; Tue, 23 Apr 2013 08:03:31 +0000 (UTC) Received: from smtp12.mail.yandex.net (smtp12.mail.yandex.net [95.108.131.191]) by forward13.mail.yandex.net (Yandex) with ESMTP id B9A3B1413F2; Tue, 23 Apr 2013 12:03:28 +0400 (MSK) Received: from smtp12.mail.yandex.net (localhost [127.0.0.1]) by smtp12.mail.yandex.net (Yandex) with ESMTP id 5648C16A0198; Tue, 23 Apr 2013 12:03:28 +0400 (MSK) Received: from 93.91.0.190.tel.ru (93.91.0.190.tel.ru [93.91.0.190]) by smtp12.mail.yandex.net (nwsmtp/Yandex) with ESMTP id AXJkJkcHqq-3REG3Zbd; Tue, 23 Apr 2013 12:03:27 +0400 Message-ID: <5176404F.1030403@passap.ru> Date: Tue, 23 Apr 2013 12:03:27 +0400 From: Boris Samorodov Organization: =?UTF-8?B?0JfQkNCeICLQktCQ0KDQoiI=?= User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Koop Mast Subject: Re: svn commit: r315907 - head/Mk/Uses References: <201304162121.r3GLLPjp013493@svn.freebsd.org> <516E4A54.2020501@coosemans.org> <516E5A08.2010202@rainbow-runner.nl> In-Reply-To: <516E5A08.2010202@rainbow-runner.nl> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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, 23 Apr 2013 08:03:31 -0000 17.04.2013 12:15, Koop Mast пишет: > On 17-4-2013 9:08, Tijl Coosemans wrote: >> On 2013-04-16 23:21, Koop Mast wrote: >>> Added: head/Mk/Uses/shared-mime-info.mk >>> ============================================================================== >>> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >>> +++ head/Mk/Uses/shared-mime-info.mk Tue Apr 16 21:21:25 2013 (r315907) >>> @@ -0,0 +1,34 @@ >>> +# $FreeBSD$ >>> +# >>> +# handle dependency depends on shared-mime-info and package regen >>> +# >>> +# MAINTAINER: gnome@FreeBSD.org >>> +# >>> +# Feature: shared-mime-info >>> +# Usage: USES=shared-mime-info >>> +# Valid ARGS: does not require args >>> +# >>> +# >>> +.if !defined(_INCLUDE_USES_SHARED_MIME_INFO_MK) >>> +_INCLUDE_USES_SHARED_MIME_INFO_MK= yes >>> + >>> +.if defined(shared-mime-info_ARGS) >>> +IGNORE= USES=shared-mime-info does not require args >>> +.endif >>> + >>> +BUILD_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info >>> +RUN_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info >>> + >>> +# bolt our post-install target to post-install >>> +post-install: shared-mime-post-install >>> + >>> +shared-mime-post-install: >>> +# run for port post-install >>> + @-update-desktop-database >> Shouldn't this be update-mime-database? > > Ouch fixed. This is what you get when copieen files and not being > careful to change them properly. Thanks for reporting! > > -Koop Seems to be an inconsistency here (NOTE: "USES=desktop-file-items" was taken from Uses/desktop-file-utils.mk file): ----- % svn diff Index: Makefile =================================================================== --- Makefile (revision 316317) +++ Makefile (working copy) @@ -16,7 +16,7 @@ ${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:${PORTSDIR}/devel/py-qt4-help \ ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 -USE_GNOME= desktopfileutils +USES= desktop-file-items INSTALL_CMD= install.py -c -f eric4config.freebsd PLIST_FILES= SUB_FILES= eric4.desktop ----- The fix is: ----- % svn diff desktop-file-utils.mk Index: desktop-file-utils.mk =================================================================== --- desktop-file-utils.mk (revision 316317) +++ desktop-file-utils.mk (working copy) @@ -1,11 +1,11 @@ # $FreeBSD$ # -# handle dependency depends on desktop-file-info and package regen +# handle dependency depends on desktop-file-utils and package regen # # MAINTAINER: gnome@FreeBSD.org # -# Feature: desktop-file-info -# Usage: USES=desktop-file-info +# Feature: desktop-file-utils +# Usage: USES=desktop-file-utils # Valid ARGS: does not require args # # ----- Hence: the example and use case is fixed to use desktop-file-utils (s:info:utils:g). -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve