mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00
Code Issues Releases Activity

Install xterm.desktop file unconditionally, it's useful for non-gnome

Browse Source 
cases such as xfce (at least).

Make update-desktop-database stuff conditional on WITH_GNOME

Approved by:	maintainer
This commit is contained in:
Doug Barton 2011-09-22 19:20:20 +00:00
parent 5d06122609
commit c084862114
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=282194
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11/xterm/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xterm
PORTVERSION= 275
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
@ -27,7 +27,7 @@ OPTIONS= WIDE_CHARS "enable wide-character support" on \
256_COLOR "enable 256-color support" off \
DEC_LOCATOR "enable DECterm Locator support" off \
PCRE "use PCRE for regular-expressions" off \
DESKTOP "install desktop entries" off
GNOME "include gnome support for .desktop file" off
CPPFLAGS+= -I${LOCALBASE}/include
@ -55,11 +55,11 @@ CONFIGURE_ARGS+= --with-pcre
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
.endif
.if defined(WITH_DESKTOP)
.if defined(WITH_GNOME)
USE_GNOME= desktopfileutils
PLIST_SUB+= DESKTOP=""
PLIST_SUB+= GNOME=""
.else
PLIST_SUB+= DESKTOP="@comment "
PLIST_SUB+= GNOME="@comment "
.endif
MAN1= resize.1 koi8rxterm.1 uxterm.1 xterm.1
@ -74,9 +74,9 @@ post-install:
.for f in koi8rxterm resize uxterm xterm
@${CHMOD} ${BINMODE} ${PREFIX}/bin/${f}
.endfor
.if defined(WITH_DESKTOP)
@${MKDIR} ${PREFIX}/share/applications/
@${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${PREFIX}/share/applications/
.if defined(WITH_GNOME)
@-update-desktop-database
.endif

8
x11/xterm/pkg-plist
View File

@ -8,11 +8,11 @@ lib/X11/app-defaults/UXTerm
lib/X11/app-defaults/UXTerm-color
lib/X11/app-defaults/XTerm
lib/X11/app-defaults/XTerm-color
%%DESKTOP%%share/applications/xterm.desktop
share/applications/xterm.desktop
share/pixmaps/xterm-color_32x32.xpm
share/pixmaps/xterm-color_48x48.xpm
share/pixmaps/xterm_32x32.xpm
share/pixmaps/xterm_48x48.xpm
%%DESKTOP%%@dirrmtry share/applications
%%DESKTOP%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
%%DESKTOP%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/applications
%%GNOME%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
%%GNOME%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true