From owner-svn-ports-all@FreeBSD.ORG Tue Jul 17 20:40:37 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 453C51065670; Tue, 17 Jul 2012 20:40:37 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2F8B38FC14; Tue, 17 Jul 2012 20:40:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6HKeauK091837; Tue, 17 Jul 2012 20:40:36 GMT (envelope-from olivierd@svn.freebsd.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6HKeaRR091833; Tue, 17 Jul 2012 20:40:36 GMT (envelope-from olivierd@svn.freebsd.org) Message-Id: <201207172040.q6HKeaRR091833@svn.freebsd.org> From: Olivier Duchateau Date: Tue, 17 Jul 2012 20:40:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301036 - head/archivers/xarchiver X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jul 2012 20:40:37 -0000 Author: olivierd Date: Tue Jul 17 20:40:36 2012 New Revision: 301036 URL: http://svn.freebsd.org/changeset/ports/301036 Log: - Avoid warning of update-desktop-database command, when we delete application (.desktop file). - Convert to new options framework PR: 163924 Approved by: miwi, rene (mentors), maintainer timeout (6 months) Modified: head/archivers/xarchiver/Makefile head/archivers/xarchiver/pkg-plist Modified: head/archivers/xarchiver/Makefile ============================================================================== --- head/archivers/xarchiver/Makefile Tue Jul 17 20:38:19 2012 (r301035) +++ head/archivers/xarchiver/Makefile Tue Jul 17 20:40:36 2012 (r301036) @@ -7,7 +7,7 @@ PORTNAME= xarchiver PORTVERSION= 0.5.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= archivers MASTER_SITES= SF @@ -18,13 +18,13 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/ USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= glib20 gtk20 intltool pkgconfig +USE_GNOME= glib20 gtk20 intltool pkgconfig desktopfileutils GNU_CONFIGURE= yes INSTALLS_ICONS= yes -.include +.include -.if !defined(WITHOUT_NLS) +.if !empty(PORT_OPTIONS:MNLS) USE_GETTEXT= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -34,11 +34,16 @@ PLIST_SUB+= NLS="@comment " .endif post-patch: + @${REINPLACE_CMD} -e 's|;multipart/x-zip||' \ + ${WRKSRC}/xarchiver.desktop.in .if defined(NOPORTDOCS) - ${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in .endif -.if defined(WITHOUT_NLS) - ${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in +.if empty(PORT_OPTIONS:MNLS) + @${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in .endif -.include +post-install: + @-update-desktop-database + +.include Modified: head/archivers/xarchiver/pkg-plist ============================================================================== --- head/archivers/xarchiver/pkg-plist Tue Jul 17 20:38:19 2012 (r301035) +++ head/archivers/xarchiver/pkg-plist Tue Jul 17 20:40:36 2012 (r301036) @@ -39,10 +39,10 @@ share/applications/xarchiver.desktop %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog.png %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/xarchiver.css -%%NLS%%share/icons/hicolor/16x16/apps/xarchiver.png -%%NLS%%share/icons/hicolor/24x24/apps/xarchiver.png -%%NLS%%share/icons/hicolor/48x48/apps/xarchiver.png -%%NLS%%share/icons/hicolor/scalable/apps/xarchiver.svg +share/icons/hicolor/16x16/apps/xarchiver.png +share/icons/hicolor/24x24/apps/xarchiver.png +share/icons/hicolor/48x48/apps/xarchiver.png +share/icons/hicolor/scalable/apps/xarchiver.svg %%NLS%%share/locale/bg/LC_MESSAGES/xarchiver.mo %%NLS%%share/locale/ca/LC_MESSAGES/xarchiver.mo %%NLS%%share/locale/cs/LC_MESSAGES/xarchiver.mo @@ -73,12 +73,9 @@ share/pixmaps/xarchiver/xarchiver-html.p %%NLS%%@dirrm share/locale/nb_NO/LC_MESSAGES %%NLS%%@dirrm share/locale/nb_NO @dirrm share/pixmaps/xarchiver -@dirrmtry share/icons/hicolor/scalable/apps -@dirrmtry share/pixmaps/hicolor/48x48/apps -@dirrmtry share/pixmaps/hicolor/24x24/apps -@dirrmtry share/pixmaps/hicolor/16x16/apps @dirrmtry libexec/thunar-archive-plugin -@dirrmtry share/applications %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true