3 files changed, 40 insertions, 20 deletions

diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile
index abe35a461f4d..7de34399b5d4 100644
--- a/x11-wm/ratpoison/Makefile
+++ b/x11-wm/ratpoison/Makefile
@@ -11,15 +11,34 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	bkhl@elektrubadur.se
+MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Simple window manager with no fat library dependencies
 
-MAN1=		ratpoison.1
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
+OPTIONS=	GDM_SUPPORT "Install session data files for GDM" off
+
+.include <bsd.port.pre.mk>
+
+.if defined (WITH_GDM_SUPPORT)
+PLIST_SUB+=	WITH_GDM=""
+post-configure:
+	${SED} -e 's,%%PREFIX%%,${PREFIX},' ${FILESDIR}/ratpoison.desktop \
+	  > ${WRKSRC}/ratpoison.desktop
+
+post-install:
+	${MKDIR} ${PREFIX}/etc/gdm/Sessions
+	${INSTALL_DATA} ${WRKSRC}/ratpoison.desktop ${PREFIX}/etc/dm/Sessions/
+.else
+PLIST_SUB+=	WITH_GDM="@comment "
+.endif
+
 .if defined(NOPORTDOCS)
 INSTALL_TARGET=	SUBDIRS=src install-exec
+.else
+MAN1=		ratpoison.1
+INFO=		ratpoison
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/ratpoison/files/ratpoison.desktop b/x11-wm/ratpoison/files/ratpoison.desktop
new file mode 100644
index 000000000000..c460957784f5
--- /dev/null
+++ b/x11-wm/ratpoison/files/ratpoison.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Name=Ratpoison
+Exec=%%PREFIX%%/bin/ratpoison
diff --git a/x11-wm/ratpoison/pkg-plist b/x11-wm/ratpoison/pkg-plist
index 5dd666a0dfc9..55f864f807a6 100644
--- a/x11-wm/ratpoison/pkg-plist
+++ b/x11-wm/ratpoison/pkg-plist
@@ -1,19 +1,17 @@
 @comment $FreeBSD$
 bin/ratpoison
-share/ratpoison/allwindows.sh
-share/ratpoison/clickframe.pl
-share/ratpoison/genrpbindings
-share/ratpoison/ratpoison.el
-share/ratpoison/rpshowall.sh
-share/ratpoison/rpws
-share/ratpoison/split.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/ratpoison %D/info/dir
-%%PORTDOCS%%info/ratpoison.info
-%%PORTDOCS%%@exec install-info %D/info/ratpoison.info %D/info/dir
-%%PORTDOCS%%share/doc/ratpoison/AUTHORS
-%%PORTDOCS%%share/doc/ratpoison/COPYING
-%%PORTDOCS%%share/doc/ratpoison/ChangeLog
-%%PORTDOCS%%share/doc/ratpoison/NEWS
-%%PORTDOCS%%share/doc/ratpoison/README
-%%PORTDOCS%%@dirrm share/doc/ratpoison
-@dirrm share/ratpoison
+%%PORTDOCS%%%%DATADIR%%/allwindows.sh
+%%PORTDOCS%%%%DATADIR%%/clickframe.pl
+%%PORTDOCS%%%%DATADIR%%/genrpbindings
+%%PORTDOCS%%%%DATADIR%%/ratpoison.el
+%%PORTDOCS%%%%DATADIR%%/rpshowall.sh
+%%PORTDOCS%%%%DATADIR%%/rpws
+%%PORTDOCS%%%%DATADIR%%/split.sh
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%WITH_GDM%%etc/dm/Sessions/ratpoison.desktop
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DATADIR%%