3 files changed, 35 insertions, 5 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 2ff2313a692b..f91e8535b327 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
+PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -24,9 +25,8 @@ XEMACS_REL=	21.4
 XEMACS_VER=	21.4.17
 XEMACS_ARCH=	${CONFIGURE_TARGET}
 
-RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
-
 USE_BZIP2=	yes
+WANT_GNOME=	yes
 STRIP=
 USE_AUTOCONF_VER=213
 CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
@@ -45,7 +45,8 @@ MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
 ALL_TARGET=	all dist
 
-PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH}
+PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \
+		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
 .include <bsd.port.pre.mk>
 
@@ -55,11 +56,13 @@ CONFIGURE_ARGS+=	--with-system-malloc --pdump
 BROKEN=		"Incomplete pkg-plist"
 .endif
 
+.if !defined(WITHOUT_XEMACS_PACKAGES)
+RUN_DEPENDS+=	${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
+.endif
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		compface.1:${PORTSDIR}/mail/faces
+		tiff.4:${PORTSDIR}/graphics/tiff
 CONFIGURE_ARGS+=	--with-png --with-jpeg --with-tiff
 USE_XLIB=	yes
 USE_XPM=	yes
@@ -81,6 +84,17 @@ CONFIGURE_ARGS+=	--with-athena=3d
 CONFIGURE_ARGS+=	--without-x11
 .endif
 
+.if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!=""
+USE_GNOME+=	gnomehier
+PLIST_SUB+=	DESKTOP=""
+.else
+PLIST_SUB+=	DESKTOP="@comment "
+.endif
+
+post-extract::
+	@${SED} -e 's|@XEMACS_ICON@|${LOCALBASE}/lib/xemacs-${XEMACS_VER}/etc/xemacs-icon.xpm|' \
+		<${FILESDIR}/xemacs.desktop.in >${WRKDIR}/xemacs.desktop
+
 pre-patch:
 .if !defined(WITHOUT_X11)
 .if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC)
@@ -114,6 +128,10 @@ post-install::
 .for f in b2m ctags ellcc etags gnuclient xemacs-${XEMACS_VER}
 	${STRIP_CMD} ${PREFIX}/bin/${f}
 .endfor
+.if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!=""
+	${INSTALL_DATA} ${WRKDIR}/xemacs.desktop \
+		${X11BASE}/share/gnome/applications
+.endif
 # For some reason install no longer makes ${PREFIX}/lib/xemacs/site-lisp.
 # Do what PLIST does for pkg_add.
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
diff --git a/editors/xemacs/files/xemacs.desktop.in b/editors/xemacs/files/xemacs.desktop.in
new file mode 100644
index 000000000000..66e1abdb4855
--- /dev/null
+++ b/editors/xemacs/files/xemacs.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=XEmacs
+Comment=XEmacs Text Editor
+Exec=xemacs %F
+Terminal=false
+Type=Application
+Icon=@XEMACS_ICON@
+Categories=Application;Utility;TextEditor;
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index 3caf94839fdf..c3b5f768c61f 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -1262,6 +1262,9 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
+%%DESKTOP%%@cwd %%X11BASE%%
+%%DESKTOP%%share/gnome/applications/xemacs.desktop
+%%DESKTOP%%@cwd %%LOCALBASE%%
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp