Index: head/x11-wm/ratpoison/Makefile
===================================================================
--- head/x11-wm/ratpoison/Makefile	(revision 395928)
+++ head/x11-wm/ratpoison/Makefile	(revision 395929)
@@ -1,36 +1,47 @@
 # Created by: Gergely Nagy <8@free.bsd.hu>
 # $FreeBSD$
 
 PORTNAME=	ratpoison
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.8
 CATEGORIES=	x11-wm
-MASTER_SITES=	SAVANNAH http://mirror.4bit.ws/
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple window manager with no fat library dependencies
 
-USE_XORG=	xext xinerama xtst
+LICENSE=	GPLv2 # (or later)
+
+USES=		pkgconfig
+USE_XORG=	ice x11 xext xinerama xtst
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	GDM_SUPPORT DOCS
-GDM_SUPPORT_DESC=	Install session data files for GDM
+SUB_FILES=	ratpoison.desktop
 
 INFO=		ratpoison
-SUB_FILES=	ratpoison.desktop
 
+OPTIONS_DEFINE=		DOCS GDM_SUPPORT READLINE XFT
+OPTIONS_DEFAULT=	READLINE XFT
+OPTIONS_SUB=		yes
+
+GDM_SUPPORT_DESC=	Install session data files for GDM
+READLINE_USES=		readline
+READLINE_CONFIGURE_ENABLE=	history
+XFT_USE=		xorg=xft
+XFT_CONFIGURE_WITH=	xft
+
 .include <bsd.port.options.mk>
 
 post-patch:
-	${REINPLACE_CMD} -e 's|bash|sh|g' ${WRKSRC}/contrib/allwindows.sh
+	@${REINPLACE_CMD} -e \
+		'/^doc_DATA/s|COPYING||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|$$(lispdir)|$$(pkgdatadir)|' ${WRKSRC}/contrib/Makefile.in
 
-.if ${PORT_OPTIONS:MGDM_SUPPORT}
-PLIST_SUB+=	WITH_GDM=""
-
 post-install:
-	@${MKDIR} ${PREFIX}/etc/dm/Sessions
-	${INSTALL_DATA} ${WRKDIR}/ratpoison.desktop ${STAGEDIR}${PREFIX}/etc/dm/Sessions
-.else
-PLIST_SUB+=	WITH_GDM="@comment "
+.if ${PORT_OPTIONS:MGDM_SUPPORT}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dm/Sessions
+	(cd ${WRKDIR} && ${INSTALL_DATA} ratpoison.desktop \
+		${STAGEDIR}${PREFIX}/etc/dm/Sessions)
 .endif
 
 .include <bsd.port.mk>
Index: head/x11-wm/ratpoison/distinfo
===================================================================
--- head/x11-wm/ratpoison/distinfo	(revision 395928)
+++ head/x11-wm/ratpoison/distinfo	(revision 395929)
@@ -1,2 +1,2 @@
-SHA256 (ratpoison-1.4.6.tar.gz) = ea8396fc69e27841745b8f55846c162be45ede875a2b50bcebca8267171a2bf8
-SIZE (ratpoison-1.4.6.tar.gz) = 460169
+SHA256 (ratpoison-1.4.8.tar.gz) = 40004bbcb5aaae6a22f86f74c47580fab47688c53ac9b88123cc83004836045f
+SIZE (ratpoison-1.4.8.tar.gz) = 485609
Index: head/x11-wm/ratpoison/pkg-descr
===================================================================
--- head/x11-wm/ratpoison/pkg-descr	(revision 395928)
+++ head/x11-wm/ratpoison/pkg-descr	(revision 395929)
@@ -1,11 +1,10 @@
-Ratpoison is a simple Window Manager with no fat library
-dependencies, no fancy graphics, no window decorations,
-and no flashy wank. It is largely modelled after GNU
-Screen which has done wonders in virtual terminal market.
+Ratpoison is a simple Window Manager with no fat library dependencies,
+no fancy graphics, no window decorations, and no flashy wank. It is
+largely modelled after GNU Screen which has done wonders in virtual
+terminal market.
 
-All interaction with the window manager is done through
-keystrokes. ratpoison has a prefix map to minimize the
-key clobbering that cripples EMACS and other quality
-pieces of software.
+All interaction with the window manager is done through keystrokes.
+ratpoison has a prefix map to minimize the key clobbering that cripples
+EMACS and other quality pieces of software.
 
-WWW:		http://www.nongnu.org/ratpoison/
+WWW: http://www.nongnu.org/ratpoison/
Index: head/x11-wm/ratpoison/pkg-plist
===================================================================
--- head/x11-wm/ratpoison/pkg-plist	(revision 395928)
+++ head/x11-wm/ratpoison/pkg-plist	(revision 395929)
@@ -1,18 +1,18 @@
 bin/ratpoison
 bin/rpws
+%%GDM_SUPPORT%%etc/dm/Sessions/ratpoison.desktop
 man/man1/ratpoison.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/allwindows.sh
 %%DATADIR%%/clickframe.pl
 %%DATADIR%%/genrpbindings
+%%DATADIR%%/ratdate.sh
 %%DATADIR%%/ratpoison.el
 %%DATADIR%%/rpshowall.sh
 %%DATADIR%%/rpws
-%%DATADIR%%/split.sh
 %%DATADIR%%/sloppy.c
+%%DATADIR%%/split.sh
 %%DATADIR%%/unrat.c
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%WITH_GDM%%etc/dm/Sessions/ratpoison.desktop