Date: Fri, 25 Oct 2013 08:46:56 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331563 - in head/devel/desktop-file-utils: . files Message-ID: <201310250846.r9P8kuxg076669@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Fri Oct 25 08:46:56 2013 New Revision: 331563 URL: http://svnweb.freebsd.org/changeset/ports/331563 Log: remove custom code for deleting share/applications now that it is in BSD.local.dist, and stageify [1]. Bump portrevision so redports/QAT picks up the change. Submitted by: Dmitry Marakasov <amdmi3@amdmi3.ru> (based on) [1] Modified: head/devel/desktop-file-utils/Makefile head/devel/desktop-file-utils/files/pkg-deinstall.in head/devel/desktop-file-utils/files/pkg-install.in head/devel/desktop-file-utils/pkg-plist Modified: head/devel/desktop-file-utils/Makefile ============================================================================== --- head/devel/desktop-file-utils/Makefile Fri Oct 25 07:53:24 2013 (r331562) +++ head/devel/desktop-file-utils/Makefile Fri Oct 25 08:46:56 2013 (r331563) @@ -4,6 +4,7 @@ PORTNAME= desktop-file-utils PORTVERSION= 0.22 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/ @@ -19,9 +20,6 @@ CONFIGURE_ENV= EMACS="no" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= desktop-file-edit.1 desktop-file-install.1 \ - desktop-file-validate.1 update-desktop-database.1 - PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall @@ -29,12 +27,8 @@ PORT_MIMEDIRS= ${LOCALBASE}/share/applic 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 +36,6 @@ post-patch: 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> Modified: head/devel/desktop-file-utils/files/pkg-deinstall.in ============================================================================== --- head/devel/desktop-file-utils/files/pkg-deinstall.in Fri Oct 25 07:53:24 2013 (r331562) +++ head/devel/desktop-file-utils/files/pkg-deinstall.in Fri Oct 25 08:46:56 2013 (r331563) @@ -14,8 +14,4 @@ for mdir in %%MIMEDIRS%%; do fi done -for pmdir in $(echo %%RMDIRS%% | sort -r); do - rmdir ${pmdir} 2>/dev/null -done - exit 0 Modified: head/devel/desktop-file-utils/files/pkg-install.in ============================================================================== --- head/devel/desktop-file-utils/files/pkg-install.in Fri Oct 25 07:53:24 2013 (r331562) +++ head/devel/desktop-file-utils/files/pkg-install.in Fri Oct 25 08:46:56 2013 (r331563) @@ -8,10 +8,6 @@ if [ "$2" != "POST-INSTALL" ]; then exit 0 fi -for pmdir in %%PORT_MIMEDIRS%%; do - mkdir -p ${pmdir} -done - ${PKG_PREFIX}/bin/update-desktop-database -q exit 0 Modified: head/devel/desktop-file-utils/pkg-plist ============================================================================== --- head/devel/desktop-file-utils/pkg-plist Fri Oct 25 07:53:24 2013 (r331562) +++ head/devel/desktop-file-utils/pkg-plist Fri Oct 25 08:46:56 2013 (r331563) @@ -2,4 +2,8 @@ bin/desktop-file-edit bin/desktop-file-install bin/desktop-file-validate bin/update-desktop-database +man/man1/desktop-file-edit.1.gz +man/man1/desktop-file-install.1.gz +man/man1/desktop-file-validate.1.gz +man/man1/update-desktop-database.1.gz share/emacs/site-lisp/desktop-entry-mode.el
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310250846.r9P8kuxg076669>