mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

- Avoid warning of update-desktop-database command, when we delete

Browse Source 
application (.desktop file).
- Convert to new options framework

PR:	163924
Approved by:	miwi, rene (mentors), maintainer timeout (6 months)
This commit is contained in:
Olivier Duchateau 2012-07-17 20:40:36 +00:00
parent 7b761bac00
commit a52367279c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=301036
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
archivers/xarchiver/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xarchiver PORTNAME= xarchiver
PORTVERSION= 0.5.2 PORTVERSION= 0.5.2
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= archivers CATEGORIES= archivers
MASTER_SITES= SF MASTER_SITES= SF
@ -18,13 +18,13 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
USE_BZIP2= yes USE_BZIP2= yes
USE_GMAKE= yes USE_GMAKE= yes
USE_GNOME= glib20 gtk20 intltool pkgconfig USE_GNOME= glib20 gtk20 intltool pkgconfig desktopfileutils
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
INSTALLS_ICONS= 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 USE_GETTEXT= yes
CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -L${LOCALBASE}/lib
@ -34,11 +34,16 @@ PLIST_SUB+= NLS="@comment "
.endif .endif
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|;multipart/x-zip||' \
${WRKSRC}/xarchiver.desktop.in
.if defined(NOPORTDOCS) .if defined(NOPORTDOCS)
${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
.endif .endif
.if defined(WITHOUT_NLS) .if empty(PORT_OPTIONS:MNLS)
${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in
.endif .endif
.include <bsd.port.post.mk> post-install:
@-update-desktop-database
.include <bsd.port.mk>

15
archivers/xarchiver/pkg-plist
View File

@ -39,10 +39,10 @@ share/applications/xarchiver.desktop
%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog.png %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog.png
%%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/xarchiver.css %%PORTDOCS%%%%DOCSDIR%%/html/xarchiver.css
%%NLS%%share/icons/hicolor/16x16/apps/xarchiver.png share/icons/hicolor/16x16/apps/xarchiver.png
%%NLS%%share/icons/hicolor/24x24/apps/xarchiver.png share/icons/hicolor/24x24/apps/xarchiver.png
%%NLS%%share/icons/hicolor/48x48/apps/xarchiver.png share/icons/hicolor/48x48/apps/xarchiver.png
%%NLS%%share/icons/hicolor/scalable/apps/xarchiver.svg share/icons/hicolor/scalable/apps/xarchiver.svg
%%NLS%%share/locale/bg/LC_MESSAGES/xarchiver.mo %%NLS%%share/locale/bg/LC_MESSAGES/xarchiver.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xarchiver.mo %%NLS%%share/locale/ca/LC_MESSAGES/xarchiver.mo
%%NLS%%share/locale/cs/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/LC_MESSAGES
%%NLS%%@dirrm share/locale/nb_NO %%NLS%%@dirrm share/locale/nb_NO
@dirrm share/pixmaps/xarchiver @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 libexec/thunar-archive-plugin
@dirrmtry share/applications
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%% %%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