Date: Wed, 23 Oct 2013 09:23:07 +0400 From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: Bryan Drewery <bdrewery@FreeBSD.org> Cc: gnome@FreeBSD.org, Tijl Coosemans <tijl@freebsd.org>, portmgr@freebsd.org Subject: Re: [patch] bsd.port.mk fixup for "Add share/applications to mtree" Message-ID: <20131023052307.GA96134@hades.panopticon> In-Reply-To: <ec137ad5b3a11e1f86fdd364daf0b426@shatow.net> 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> <ec137ad5b3a11e1f86fdd364daf0b426@shatow.net>
next in thread | previous in thread | raw e-mail | index | archive | help
* 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 <bsd.port.mk>
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131023052307.GA96134>