diff options
| author | olivierd <olivierd@FreeBSD.org> | 2012-07-18 04:40:36 +0800 |
|---|---|---|
| committer | olivierd <olivierd@FreeBSD.org> | 2012-07-18 04:40:36 +0800 |
| commit | 90d660c396b3f8c8876659fa27d44d27d5518614 (patch) | |
| tree | 8d5ad2e7171a22d9c3f818233d7b111fca7dfa46 /archivers | |
| parent | 58aaadde489a4e5a4a8fb6c8fc9b91a2095d8042 (diff) | |
| download | freebsd-ports-gnome-90d660c396b3f8c8876659fa27d44d27d5518614.tar.gz freebsd-ports-gnome-90d660c396b3f8c8876659fa27d44d27d5518614.tar.zst freebsd-ports-gnome-90d660c396b3f8c8876659fa27d44d27d5518614.zip | |
- 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)
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/xarchiver/Makefile | 21 | ||||
| -rw-r--r-- | archivers/xarchiver/pkg-plist | 15 |
2 files changed, 19 insertions, 17 deletions
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile index 3bae2e2328d6..3310cc87aea5 100644 --- a/archivers/xarchiver/Makefile +++ b/archivers/xarchiver/Makefile @@ -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/xdg-utils 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> diff --git a/archivers/xarchiver/pkg-plist b/archivers/xarchiver/pkg-plist index c066a6439cfd..e659cdc70d1e 100644 --- a/archivers/xarchiver/pkg-plist +++ b/archivers/xarchiver/pkg-plist @@ -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.png %%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 |