[patch] bsd.port.mk fixup for "Add share/applications to mtree"

[Dmitry Marakasov]

* Bryan Drewery (bdrewery at 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 at .
> >> > 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 at amdmi3.ru  ..:  jabber: amdmi3 at jabber.ru    http://www.amdmi3.ru