Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Jul 2012 20:40:36 +0000 (UTC)
From:      Olivier Duchateau <olivierd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r301036 - head/archivers/xarchiver
Message-ID:  <201207172040.q6HKeaRR091833@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.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 <bsd.port.post.mk>
+post-install:
+	@-update-desktop-database
+
+.include <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207172040.q6HKeaRR091833>