From owner-freebsd-gnome@FreeBSD.ORG Wed Oct 23 05:23:12 2013 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 02F6D6D3; Wed, 23 Oct 2013 05:23:12 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.114.190]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AD4A321EC; Wed, 23 Oct 2013 05:23:11 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1VYquS-00005T-Af; Wed, 23 Oct 2013 09:23:08 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id E2B5FF3; Wed, 23 Oct 2013 09:23:07 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id CA458B98; Wed, 23 Oct 2013 09:23:07 +0400 (MSK) Date: Wed, 23 Oct 2013 09:23:07 +0400 From: Dmitry Marakasov To: Bryan Drewery Subject: Re: [patch] bsd.port.mk fixup for "Add share/applications to mtree" Message-ID: <20131023052307.GA96134@hades.panopticon> References: <20131022211621.176e8292@kalimero.tijl.coosemans.org> <20131022211722.72954240@kalimero.tijl.coosemans.org> <20131022230353.031cb976@kalimero.tijl.coosemans.org> <56d6e97d98c47851fd60b27477dfc9ee@shatow.net> <20131022231008.69f25ba9@kalimero.tijl.coosemans.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: gnome@FreeBSD.org, Tijl Coosemans , portmgr@freebsd.org X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 05:23:12 -0000 * Bryan Drewery (bdrewery@FreeBSD.org) wrote: > >> >>> Pleas approve attached is patch for bsd.port.mk so it no longer adds > >> >>> "@unexec rmdir ${DESKTOPDIR} ..." to pkg-plist for DESKTOP_ENTRIES. > >> >> > >> >> Sigh, now with patch. > > Approved, please commit. > > >> > > >> > I think it's important to get this committed before the weekly package > >> > builds start. QAT has already complained about several ports on > >> > ports@. > >> > I'm about to go to bed now so feel free to commit it. > >> > >> Specifically which ports are broken? > >> > >> Are these just leftovers? > >> > >> I did an exp-run, but not for plists. So package creation will be > >> fine. > >> > > > > https://qat.redports.org//~tijl@FreeBSD.org/20131022160801-46647-211456/tilp2-1.17_1.log At least for tilp2, the problem is (also) in devel/desktop-file-utils: it does remove share/applications in pkg-deinstall in its own way, so I've missed it as well. The patch attached helps, but it should likely be reviewed by gnome team before committing. --- desktop-file-utils.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 331348) +++ Makefile (working copy) @@ -29,12 +29,8 @@ MIMEDIRS= ${PORT_MIMEDIRS} -RMDIRS= ${PORT_MIMEDIRS} - -NO_STAGE= yes post-patch: @${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}| ;\ - s|%%RMDIRS%%|${RMDIRS}| ; \ s|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \ < ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL} @${SED} -e 's|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \ @@ -42,9 +38,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/misc/desktop-entry-mode.el \ - ${PREFIX}/share/emacs/site-lisp/desktop-entry-mode.el -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif + ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/desktop-entry-mode.el .include Index: files/pkg-deinstall.in =================================================================== --- files/pkg-deinstall.in (revision 331348) +++ files/pkg-deinstall.in (working copy) @@ -14,8 +14,4 @@ fi done -for pmdir in $(echo %%RMDIRS%% | sort -r); do - rmdir ${pmdir} 2>/dev/null -done - exit 0 Index: files/pkg-install.in =================================================================== --- files/pkg-install.in (revision 331348) +++ files/pkg-install.in (working copy) @@ -8,10 +8,6 @@ exit 0 fi -for pmdir in %%PORT_MIMEDIRS%%; do - mkdir -p ${pmdir} -done - ${PKG_PREFIX}/bin/update-desktop-database -q exit 0 --- desktop-file-utils.patch ends here --- -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru