aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2011-09-22 19:20:20 +0000
committerDoug Barton <dougb@FreeBSD.org>2011-09-22 19:20:20 +0000
commitc0848621142d27cc7ea19075825fc451155db7f8 (patch)
tree10af16eb60412cf188506e956a7f74d2e47f7e9a
parent5d06122609a40bfe196b972aa41c1abc4e03ddf4 (diff)
downloadports-c0848621142d27cc7ea19075825fc451155db7f8.tar.gz
ports-c0848621142d27cc7ea19075825fc451155db7f8.zip
Notes
-rw-r--r--x11/xterm/Makefile12
-rw-r--r--x11/xterm/pkg-plist8
2 files changed, 10 insertions, 10 deletions
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 36f913fe0e2c..d5fcece75982 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -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
diff --git a/x11/xterm/pkg-plist b/x11/xterm/pkg-plist
index 3d5b730dd95e..7192b18bd2f5 100644
--- a/x11/xterm/pkg-plist
+++ b/x11/xterm/pkg-plist
@@ -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