Index: head/x11-wm/jwm/Makefile
===================================================================
--- head/x11-wm/jwm/Makefile	(revision 309075)
+++ head/x11-wm/jwm/Makefile	(revision 309076)
@@ -1,73 +1,65 @@
-# New ports collection makefile for:   jwm
-# Date created:        26 DEC 2005
-# Whom:                babak@farrokhi.net
-#
+# Created by: Babak Farrokhi <babak@farrokhi.net>
 # $FreeBSD$
-#
 
 PORTNAME=	jwm
 PORTVERSION=	2.0.1
 PORTREVISION=	4
 CATEGORIES=	x11-wm
-MASTER_SITES=	SF \
-		http://joewing.net/programs/jwm/releases/
+MASTER_SITES=	SF http://joewing.net/programs/jwm/releases/
 
 MAINTAINER=	admin@mjbrune.org
 COMMENT=	Joe's Window Manager
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		jwm.1
 
-OPTIONS=	FRIBIDI "Fribidi support"       on \
-		XFT     "Xft support    "       on \
-		XINERAMA "XINERAMA support"     on \
-		JPEG    "JPEG support"          on \
-		DEBUG   "Enable Debugging"      off
+OPTIONS_DEFINE=	FRIBIDI XFT XINERAMA JPEG DEBUG
+OPTIONS_DEFAULT=	FRIBIDI XFT XINERAMA JPEG
+DEBUG_DESC=	Enable debugging
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_FRIBIDI)
-BUILD_DEPENDS+=         fribidi:${PORTSDIR}/converters/fribidi
+.if ${PORT_OPTIONS:MFRIBIDI}
+BUILD_DEPENDS+=	fribidi:${PORTSDIR}/converters/fribidi
 .endif
 
-.if defined(WITH_XFT)
-LIB_DEPENDS+=           Xft:${PORTSDIR}/x11-fonts/libXft
+.if ${PORT_OPTIONS:MXFT}
+USE_XORG+=	xft
 .endif
 
-.if defined(WITH_XINERAMA)
-LIB_DEPENDS+=           Xinerama:${PORTSDIR}/x11/libXinerama
-
+.if ${PORT_OPTIONS:MXINERAMA}
+USE_XORG+=	xinerama
 .endif
 
-.if defined(WITH_JPEG)
-LIB_DEPENDS+=   jpeg:${PORTSDIR}/graphics/jpeg
+.if ${PORT_OPTIONS:MJPEG}
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=        --enable-debug
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc
 	@${REINPLACE_CMD} -e 's|fribidi_char_sets_utf8.h|fribidi-char-sets.h|' ${WRKSRC}/src/jwm.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc.sample
 	if ! [ -f ${PREFIX}/etc/system.jwmrc ]; then \
 		${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc; \
 	fi
-	${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/x11-wm/jwm/pkg-descr
===================================================================
--- head/x11-wm/jwm/pkg-descr	(revision 309075)
+++ head/x11-wm/jwm/pkg-descr	(revision 309076)
@@ -1,4 +1,6 @@
-WM is a window manager for the X11 Window System. 
-JWM is written in C and uses only Xlib at a minimum. 
+JWM is a window manager for the X11 Window System.  JWM is written in C and
+uses only Xlib at a minimum, though additional libraries are supported for
+extended functionality and features.  JWM supports MWM and Extended Window
+Manager Hints (EWMH).
 
-WWW: http://joewing.net/programs/jwm/index.shtml
+WWW: http://joewing.net/programs/jwm/