From owner-freebsd-gnome@FreeBSD.ORG Wed Oct 23 08:07:29 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 BF78F313; Wed, 23 Oct 2013 08:07:29 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from fep21.mx.upcmail.net (fep21.mx.upcmail.net [62.179.121.41]) by mx1.freebsd.org (Postfix) with ESMTP id AC0EB2B75; Wed, 23 Oct 2013 08:07:28 +0000 (UTC) Received: from edge01.upcmail.net ([192.168.13.236]) by viefep21-int.chello.at (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP id <20131023080726.TZAX23383.viefep21-int.chello.at@edge01.upcmail.net>; Wed, 23 Oct 2013 10:07:26 +0200 Received: from [127.0.0.1] ([178.84.134.112]) by edge01.upcmail.net with edge id gY7R1m00L2Rg3Ey01Y7Rhc; Wed, 23 Oct 2013 10:07:26 +0200 X-SourceIP: 178.84.134.112 Message-ID: <526783B9.4020502@rainbow-runner.nl> Date: Wed, 23 Oct 2013 10:07:21 +0200 From: Koop Mast User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Dmitry Marakasov , Bryan Drewery Subject: Re: [patch] bsd.port.mk fixup for "Add share/applications to mtree" 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> <20131023052307.GA96134@hades.panopticon> In-Reply-To: <20131023052307.GA96134@hades.panopticon> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Antivirus: avast! (VPS 131022-1, 22-10-2013), Outbound message X-Antivirus-Status: Clean 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 08:07:29 -0000 On 23-10-2013 7:23, Dmitry Marakasov wrote: > * 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 --- > approved