- Fix WWW: line in port description: previous one was cybersquatted by some

  stupid Russian recruiting website
- While here, convert to OptionsNG and clean up Makefile a bit

PR:		ports/174718
Approved by:	maintainer timeout

2 files changed, 30 insertions, 30 deletions

diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile
index b916307084f2..5c50ab274f47 100644
--- a/x11-wm/fvwm-crystal/Makefile
+++ b/x11-wm/fvwm-crystal/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fvwm-crystal
-# Date created:				11 December 2007
-# Whom:					Giacomo Mariani
-#
+# Created by: Giacomo Mariani <giacomomariani@yahoo.it>
 # $FreeBSD$
-#
 
 PORTNAME=	fvwm-crystal
 PORTVERSION=	3.0.6
@@ -12,7 +8,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://download.gna.org/fvwm-crystal/${PORTVERSION}/
 
 MAINTAINER=	giacomomariani@yahoo.it
-COMMENT=	Easy, eye-candy, light and powerful virtual wm for X
+COMMENT=	Easy, eye-candy, light, and powerful window manager for X11
 
 RUN_DEPENDS=	fvwm>=2.5:${PORTSDIR}/x11-wm/fvwm2 \
 		bash:${PORTSDIR}/shells/bash
@@ -21,56 +17,60 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 MAKE_ENV=	prefix="${PREFIX}" addondir="${DOCSDIR}/addons"
-PORTDOCS=*
+PORTDOCS=	*
 
-MAN1=	ApplicationDatabase.1 CrystalRoxHOWTO.1 FVWMCrystalFAQ.1 \
-	KeyboardBindings.1 MouseBindings.1 Tips.1
+MAN1=		ApplicationDatabase.1 CrystalRoxHOWTO.1 FVWMCrystalFAQ.1 \
+		KeyboardBindings.1 MouseBindings.1 Tips.1
 
-OPTIONS=	ROX "Rox-filer support" on \
-		IMAGEMAGICK "Window thumbnails and screenshots support" on \
-		XSCREENSAVER "Desktop screensaver support" on \
-		TRAYER "Tray/notification area support" on \
-		SUDO "Running text-based applications as superuser" on \
-		HSETROOT "Set the desktop wallpaper" on \
-		CMUS "A music playera" off
+OPTIONS_DEFINE=	ROX IMAGEMAGICK XSCREENSAVER TRAYER SUDO HSETROOT CMUS DOCS
+OPTIONS_DEFAULT=	ROX IMAGEMAGICK XSCREENSAVER TRAYER SUDO HSETROOT
 
-.include <bsd.port.pre.mk>
+ROX_DESC=		Rox-filer file manager support
+IMAGEMAGICK_DESC=	Window thumbnails and screenshots support
+XSCREENSAVER_DESC=	Desktop screensaver support
+TRAYER_DESC=		Tray (notification area) support
+SUDO_DESC=		Run text-based applications as superuser
+HSETROOT_DESC=		Allow to set desktop wallpaper
+CMUS_DESC=		Play music via audio/cmus player
 
-.if defined(WITH_ROX)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MROX}
 RUN_DEPENDS+=	rox:${PORTSDIR}/x11-fm/rox-filer
 .endif
 
-.if defined(WITH_IMAGEMAGICK)
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
 RUN_DEPENDS+=	display:${PORTSDIR}/graphics/ImageMagick
 .endif
 
-.if defined(WITH_XSCREENSAVER)
+.if ${PORT_OPTIONS:MXSCREENSAVER}
 RUN_DEPENDS+=	xscreensaver:${PORTSDIR}/x11/xscreensaver
 .endif
 
-.if defined(WITH_TRAYER)
+.if ${PORT_OPTIONS:MTRAYER}
 RUN_DEPENDS+=	trayer:${PORTSDIR}/x11/trayer
 .endif
 
-.if defined(WITH_SUDO)
+.if ${PORT_OPTIONS:MSUDO}
 RUN_DEPENDS+=	sudo:${PORTSDIR}/security/sudo
 .endif
 
-.if defined(WITH_HSETROOT)
+.if ${PORT_OPTIONS:MHSETROOT}
 RUN_DEPENDS+=	hsetroot:${PORTSDIR}/graphics/hsetroot
 .endif
 
-.if defined(WITH_CMUS)
+.if ${PORT_OPTIONS:MCMUS}
 RUN_DEPENDS+=	cmus:${PORTSDIR}/audio/cmus
 .endif
 
 post-extract:
-	@cd ${WRKSRC} && ${FIND} . -depth -type d -name .svn -exec ${RM} -rf {} \;
+	@cd ${WRKSRC} && ${FIND} . -depth -type d -name .svn \
+		-exec ${RM} -rf {} \;
 
-.if !defined(NOPORTDOCS)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile
+.if ${PORT_OPTIONS:MDOCS}
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile
 .else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile_NODOC
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile_NODOC
 .endif
 
 post-patch:
@@ -85,4 +85,4 @@ scrivi:
 	${ECHO_CMD} ${LOCALBASE}
 	${ECHO_CMD} ${PREFIX}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/fvwm-crystal/pkg-descr b/x11-wm/fvwm-crystal/pkg-descr
index b341cceb9624..62a72d27d531 100644
--- a/x11-wm/fvwm-crystal/pkg-descr
+++ b/x11-wm/fvwm-crystal/pkg-descr
@@ -7,4 +7,4 @@ aterm, mrxvt or urxvt as terminal emulators, MPD or XMMS as music players
 tools for different functions, like setting a wallpaper or making screen
 shots.
 
-WWW: http://fvwm-crystal.org/
+WWW: http://gna.org/projects/fvwm-crystal/