-Remove all commented stuff.

-Remove maintainer line in pkg-descr.
-portlint:
	-Use DATADIR in plist.

3 files changed, 70 insertions, 115 deletions

diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 256a99129fe0..33bd7775cc9c 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -12,12 +12,6 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-#.if defined(WITH_REMEMBER)
-#PATCH_SITES=		http://www.bugfactory.org/~gav/fluxbox/
-#PATCHFILES=		remember-0.1.14-7.gz
-#PATCH_DIST_STRIP=	-p1
-#.endif
-
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A small and fast window manager based on BlackBox
 
@@ -35,27 +29,12 @@ MAN1=		fluxbox.1
 CONFIGURE_ARGS+=	--enable-kde
 .endif
 
-#.if defined(WITH_REMEMBER)
-#USE_GMAKE=		yes
-#USE_AUTOTOOLS=		automake:14:env
-#.endif
-
 .if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-xinerama
 .endif
 
 .include <bsd.port.pre.mk>
 
-#.if ${OSVERSION} >= 500000
-#.undef WITH_WINSNAP
-#.endif
-#
-#.if defined(WITH_WINSNAP)
-#PATCH_SITES+=		http://www.raisdorf.net/files/FreeBSD/
-#PATCHFILES+=		winsnap-0.1.14.patch
-#PATCH_DIST_STRIP=	-p1
-#.endif
-
 .if ${HAVE_GNOME:Mgnomelibs}!="" || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
@@ -67,30 +46,9 @@ pre-everything::
 .if !defined(WITH_KDE)
 	@${ECHO_CMD} "WITH_KDE	- Enable KDE slit support"
 .endif
-#.if !defined(WITH_REMEMBER)
-#	@${ECHO_CMD} "WITH_REMEMBER	- Enable the unofficial remember patch"
-#.endif
-#.if !defined(WITH_WINSNAP)
-#	@${ECHO_CMD} "WITH_WINSNAP	- Enable the unofficial window snapping patch"
-#	@${ECHO_CMD} "            	  (does not work on -current)"
-#.endif
 .if !defined(WITH_XINERAMA)
 	@${ECHO_CMD} "WITH_XINERAMA	- Enable Xinerama support"
 .endif
 	@${ECHO_CMD} ""
 
-#post-install:
-#.if defined(WITH_WINSNAP)
-#	@${ECHO_CMD} ""
-#	@${ECHO_CMD} "The window snapping patch from Shawn Singh requires some"
-#	@${ECHO_CMD} "changes to your ~/.fluxbox/init file:"
-#	@${ECHO_CMD} ""
-#	@${ECHO_CMD} "    session.screen0.edgeSnapThreshold: 10"
-#	@${ECHO_CMD} "    session.screen0.edgeResistThreshold: 10"
-#	@${ECHO_CMD} ""
-#	@${ECHO_CMD} "The values can be changed to mimic the behavior of Enlightenment:"
-#	@${ECHO_CMD} "snap: 3, resist: 15"
-#	@${ECHO_CMD} ""
-#.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11-wm/fluxbox/pkg-descr b/x11-wm/fluxbox/pkg-descr
index 535880856e53..381fcdfe6656 100644
--- a/x11-wm/fluxbox/pkg-descr
+++ b/x11-wm/fluxbox/pkg-descr
@@ -8,6 +8,3 @@ Fluxbox is a window manager based on BlackBox with some new features:
  o KDE and partial Gnome support
  
 WWW: http://fluxbox.sourceforge.net/
-
-- Hendrik Scholz
-hendrik@scholz.net
diff --git a/x11-wm/fluxbox/pkg-plist b/x11-wm/fluxbox/pkg-plist
index d8b7af83e744..481821c9119f 100644
--- a/x11-wm/fluxbox/pkg-plist
+++ b/x11-wm/fluxbox/pkg-plist
@@ -1,73 +1,73 @@
 bin/fbrun
 bin/fluxbox
 bin/fluxbox-generate_menu
-share/fluxbox/init
-share/fluxbox/keys
-share/fluxbox/menu
-share/fluxbox/nls/C/fluxbox.cat
-share/fluxbox/nls/bg_BG/fluxbox.cat
-share/fluxbox/nls/da_DK/fluxbox.cat
-share/fluxbox/nls/es_ES/fluxbox.cat
-share/fluxbox/nls/et_EE/fluxbox.cat
-share/fluxbox/nls/fr_FR/fluxbox.cat
-share/fluxbox/nls/it_IT/fluxbox.cat
-share/fluxbox/nls/ja_JP/fluxbox.cat
-share/fluxbox/nls/lv_LV/fluxbox.cat
-share/fluxbox/nls/pt_BR/fluxbox.cat
-share/fluxbox/nls/pt_PT/fluxbox.cat
-share/fluxbox/nls/ru_RU/fluxbox.cat
-share/fluxbox/nls/sv_SE/fluxbox.cat
-share/fluxbox/nls/tr_TR/fluxbox.cat
-share/fluxbox/styles/Artwiz
-share/fluxbox/styles/Blue
-share/fluxbox/styles/BlueNight
-share/fluxbox/styles/Carbondioxide
-share/fluxbox/styles/Clean
-share/fluxbox/styles/CleanColor
-share/fluxbox/styles/Cthulhain
-share/fluxbox/styles/Flux
-share/fluxbox/styles/LemonSpace
-share/fluxbox/styles/Makro
-share/fluxbox/styles/MerleyKay
-share/fluxbox/styles/Minimal
-share/fluxbox/styles/Nyz
-share/fluxbox/styles/Operation
-share/fluxbox/styles/Outcomes
-share/fluxbox/styles/Rampage
-share/fluxbox/styles/Rancor
-share/fluxbox/styles/Results
-share/fluxbox/styles/Shade
-share/fluxbox/styles/Spiff
-share/fluxbox/styles/Twice
-share/fluxbox/styles/qnx-photon
-@unexec rm %D/share/fluxbox/nls/lv 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/fr 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/es 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/en_US 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/en 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/US_ASCII 2>&1 >/dev/null || true
-@unexec rm %D/share/fluxbox/nls/POSIX 2>&1 >/dev/null || true
-@exec ln -s lv_LV %D/share/fluxbox/nls/lv
-@exec ln -s fr_FR %D/share/fluxbox/nls/fr
-@exec ln -s es_ES %D/share/fluxbox/nls/es
-@exec ln -s C %D/share/fluxbox/nls/en_US
-@exec ln -s C %D/share/fluxbox/nls/en
-@exec ln -s C %D/share/fluxbox/nls/US_ASCII
-@exec ln -s C %D/share/fluxbox/nls/POSIX
-@dirrm share/fluxbox/styles
-@dirrm share/fluxbox/nls/tr_TR
-@dirrm share/fluxbox/nls/sv_SE
-@dirrm share/fluxbox/nls/ru_RU
-@dirrm share/fluxbox/nls/pt_PT
-@dirrm share/fluxbox/nls/pt_BR
-@dirrm share/fluxbox/nls/lv_LV
-@dirrm share/fluxbox/nls/ja_JP
-@dirrm share/fluxbox/nls/it_IT
-@dirrm share/fluxbox/nls/fr_FR
-@dirrm share/fluxbox/nls/et_EE
-@dirrm share/fluxbox/nls/es_ES
-@dirrm share/fluxbox/nls/da_DK
-@dirrm share/fluxbox/nls/bg_BG
-@dirrm share/fluxbox/nls/C
-@dirrm share/fluxbox/nls
-@dirrm share/fluxbox
+%%DATADIR%%/init
+%%DATADIR%%/keys
+%%DATADIR%%/menu
+%%DATADIR%%/nls/C/fluxbox.cat
+%%DATADIR%%/nls/bg_BG/fluxbox.cat
+%%DATADIR%%/nls/da_DK/fluxbox.cat
+%%DATADIR%%/nls/es_ES/fluxbox.cat
+%%DATADIR%%/nls/et_EE/fluxbox.cat
+%%DATADIR%%/nls/fr_FR/fluxbox.cat
+%%DATADIR%%/nls/it_IT/fluxbox.cat
+%%DATADIR%%/nls/ja_JP/fluxbox.cat
+%%DATADIR%%/nls/lv_LV/fluxbox.cat
+%%DATADIR%%/nls/pt_BR/fluxbox.cat
+%%DATADIR%%/nls/pt_PT/fluxbox.cat
+%%DATADIR%%/nls/ru_RU/fluxbox.cat
+%%DATADIR%%/nls/sv_SE/fluxbox.cat
+%%DATADIR%%/nls/tr_TR/fluxbox.cat
+%%DATADIR%%/styles/Artwiz
+%%DATADIR%%/styles/Blue
+%%DATADIR%%/styles/BlueNight
+%%DATADIR%%/styles/Carbondioxide
+%%DATADIR%%/styles/Clean
+%%DATADIR%%/styles/CleanColor
+%%DATADIR%%/styles/Cthulhain
+%%DATADIR%%/styles/Flux
+%%DATADIR%%/styles/LemonSpace
+%%DATADIR%%/styles/Makro
+%%DATADIR%%/styles/MerleyKay
+%%DATADIR%%/styles/Minimal
+%%DATADIR%%/styles/Nyz
+%%DATADIR%%/styles/Operation
+%%DATADIR%%/styles/Outcomes
+%%DATADIR%%/styles/Rampage
+%%DATADIR%%/styles/Rancor
+%%DATADIR%%/styles/Results
+%%DATADIR%%/styles/Shade
+%%DATADIR%%/styles/Spiff
+%%DATADIR%%/styles/Twice
+%%DATADIR%%/styles/qnx-photon
+@unexec rm %D/%%DATADIR%%/nls/lv 2>&1 >/dev/null || true
+@unexec rm %D/%%DATADIR%%/nls/fr 2>&1 >/dev/null || true
+@unexec rm %D/%%DATADIR%%/nls/es 2>&1 >/dev/null || true
+@unexec rm %D/%%DATADIR%%/nls/en_US 2>&1 >/dev/null || true
+@unexec rm %D/%%DATADIR%%/nls/en 2>&1 >/dev/null || true
+@unexec rm %D/%%DATADIR%%/nls/US_ASCII 2>&1 >/dev/null || true
+@unexec rm %D/%%DATADIR%%/nls/POSIX 2>&1 >/dev/null || true
+@exec ln -s lv_LV %D/%%DATADIR%%/nls/lv
+@exec ln -s fr_FR %D/%%DATADIR%%/nls/fr
+@exec ln -s es_ES %D/%%DATADIR%%/nls/es
+@exec ln -s C %D/%%DATADIR%%/nls/en_US
+@exec ln -s C %D/%%DATADIR%%/nls/en
+@exec ln -s C %D/%%DATADIR%%/nls/US_ASCII
+@exec ln -s C %D/%%DATADIR%%/nls/POSIX
+@dirrm %%DATADIR%%/styles
+@dirrm %%DATADIR%%/nls/tr_TR
+@dirrm %%DATADIR%%/nls/sv_SE
+@dirrm %%DATADIR%%/nls/ru_RU
+@dirrm %%DATADIR%%/nls/pt_PT
+@dirrm %%DATADIR%%/nls/pt_BR
+@dirrm %%DATADIR%%/nls/lv_LV
+@dirrm %%DATADIR%%/nls/ja_JP
+@dirrm %%DATADIR%%/nls/it_IT
+@dirrm %%DATADIR%%/nls/fr_FR
+@dirrm %%DATADIR%%/nls/et_EE
+@dirrm %%DATADIR%%/nls/es_ES
+@dirrm %%DATADIR%%/nls/da_DK
+@dirrm %%DATADIR%%/nls/bg_BG
+@dirrm %%DATADIR%%/nls/C
+@dirrm %%DATADIR%%/nls
+@dirrm %%DATADIR%%