5 files changed, 86 insertions, 45 deletions

diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile
index 1ab2e1780958..5ac8d384e814 100644
--- a/x11-wm/fvwm-crystal/Makefile
+++ b/x11-wm/fvwm-crystal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fvwm-crystal
-PORTVERSION=	3.0.5
-PORTREVISION=	1
+PORTVERSION=	3.0.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://download.gna.org/fvwm-crystal/${PORTVERSION}/
 
@@ -21,6 +20,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 MAKE_ENV=	prefix="${PREFIX}" addondir="${DOCSDIR}/addons"
+PORTDOCS=*
 
 MAN1=	ApplicationDatabase.1 CrystalRoxHOWTO.1 FVWMCrystalFAQ.1 \
 	KeyboardBindings.1 MouseBindings.1 Tips.1
@@ -63,13 +63,18 @@ RUN_DEPENDS+=	hsetroot:${PORTSDIR}/graphics/hsetroot
 RUN_DEPENDS+=	cmus:${PORTSDIR}/audio/cmus
 .endif
 
+post-extract:
+	@cd ${WRKSRC} && ${FIND} . -depth -type d -name .svn -exec ${RM} -rf {} \;
+
+.if !defined(NOPORTDOCS)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile_NODOC
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \
 		${WRKSRC}/${MAKEFILE}
-.if !defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^install: uninstall|& install-doc|' \
-		${WRKSRC}/${MAKEFILE}
-.endif
 
 scrivi:
 	${ECHO_CMD} ${LOCALBASE}
diff --git a/x11-wm/fvwm-crystal/distinfo b/x11-wm/fvwm-crystal/distinfo
index b5084140b516..96083cb361ef 100644
--- a/x11-wm/fvwm-crystal/distinfo
+++ b/x11-wm/fvwm-crystal/distinfo
@@ -1,3 +1,3 @@
-MD5 (fvwm-crystal-3.0.5.tar.gz) = 5f71420f3714de3fd4c4a89a5c48abf1
-SHA256 (fvwm-crystal-3.0.5.tar.gz) = bcbbfa1fe68fd4ea4168c4a8042a2696236a020da9ab11b922dfa4066e0c9baf
-SIZE (fvwm-crystal-3.0.5.tar.gz) = 3805580
+MD5 (fvwm-crystal-3.0.6.tar.gz) = 82e2800882abb2c822519f1aa4dc0c72
+SHA256 (fvwm-crystal-3.0.6.tar.gz) = 9a325f07929e2b4ab2cc8f3e82eab0219d97dd9111c103309711dab324f17fe9
+SIZE (fvwm-crystal-3.0.6.tar.gz) = 7857363
diff --git a/x11-wm/fvwm-crystal/files/extra-patch-Makefile b/x11-wm/fvwm-crystal/files/extra-patch-Makefile
new file mode 100644
index 000000000000..2713ad3b0056
--- /dev/null
+++ b/x11-wm/fvwm-crystal/files/extra-patch-Makefile
@@ -0,0 +1,58 @@
+--- Makefile.orig	2008-06-23 22:43:54.000000000 +0200
++++ Makefile	2008-07-01 18:00:25.000000000 +0200
+@@ -1,7 +1,7 @@
+ #!/usr/bin/make -f
+ .PHONY: all install uninstall dist correctpermissions install-doc uninstall-doc
+ 
+-prefix?=/usr/local
++prefix=$(PREFIX)
+ docdir?=$(prefix)/share/doc/fvwm-crystal/
+ addondir?=$(prefix)/share/fvwm-crystal/addons
+ 
+@@ -10,15 +10,15 @@
+ all:
+ 	@echo "There is nothing to compile."
+ 
+-install: uninstall correctpath
++install: uninstall install-doc correctpath
+ 	@echo Installing fvwm-crystal $(RELEASE) to $(prefix)
+ 	mkdir -p $(prefix)/bin $(prefix)/share/fvwm-crystal/fvwm 
+ 
+ 	install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(prefix)/bin
+-	cp -d -r fvwm/* $(prefix)/share/fvwm-crystal/fvwm/
++	cp -r fvwm/* $(prefix)/share/fvwm-crystal/fvwm/
+ 
+-	mkdir -p $(prefix)/share/man/man1
+-	cp -d -r man/* $(prefix)/share/man/man1
++	mkdir -p $(prefix)/man/man1
++	cp -r man/* $(prefix)/man/man1
+ 
+ uninstall:
+ 	@echo "Uninstalling previously installed fvwm-crystal"
+@@ -40,7 +40,7 @@
+ 	mkdir -p "fvwm-crystal-minimal-$(RELEASE)"
+ 	mkdir -p "fvwm-crystal-minimal-$(RELEASE)/fvwm"
+ 	# Copy basic files
+-	cp -r AUTHORS COPYING INSTALL Makefile NEWS README fvwm-crystal-minimal-$(RELEASE)/
++	cp -r AUTHORS INSTALL Makefile NEWS README fvwm-crystal-minimal-$(RELEASE)/
+ 	cp -r fvwm/config fvwm-crystal-minimal-$(RELEASE)/fvwm/
+ 	# Copy addons/
+ 	mkdir -p "fvwm-crystal-minimal-$(RELEASE)/addons"
+@@ -190,8 +190,8 @@
+ 
+ # It is needed to adjust some path inside fvwm-crystal.generate-menu since this file must know the install path
+ correctpath:
+-	sed -i 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
+-	sed -i 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
++	sed 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu > bin/fvwm-crystal.generate-menu.new
++	sed 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu.new > bin/fvwm-crystal.generate-menu
+ 
+ uninstall-doc:
+ 	-rm -rf $(docdir)
+@@ -200,5 +200,5 @@
+ install-doc:
+ 	mkdir -p $(addondir) $(docdir)
+ 	install -m 644 addons/* $(addondir)
+-	install -m 644 AUTHORS COPYING NEWS ChangeLog README INSTALL $(docdir)
++	install -m 644 AUTHORS NEWS ChangeLog README INSTALL $(docdir)
+ 	install -m 644 doc/* $(docdir)
diff --git a/x11-wm/fvwm-crystal/files/patch-Makefile b/x11-wm/fvwm-crystal/files/extra-patch-Makefile_NODOC
index 0d7e54905882..46d253eecb15 100644
--- a/x11-wm/fvwm-crystal/files/patch-Makefile
+++ b/x11-wm/fvwm-crystal/files/extra-patch-Makefile_NODOC
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-05-08 10:22:34.000000000 +0200
-+++ Makefile	2008-05-08 12:24:11.000000000 +0200
+--- Makefile.orig	2008-06-23 12:43:54.000000000 -0800
++++ Makefile	2008-07-05 20:15:41.000000000 -0800
 @@ -1,7 +1,7 @@
  #!/usr/bin/make -f
  .PHONY: all install uninstall dist correctpermissions install-doc uninstall-doc
@@ -9,13 +9,7 @@
  docdir?=$(prefix)/share/doc/fvwm-crystal/
  addondir?=$(prefix)/share/fvwm-crystal/addons
  
-@@ -10,15 +10,15 @@
- all:
- 	@echo "There is nothing to compile."
- 
--install: uninstall correctpermissions correctpath
-+install: uninstall install-doc correctpermissions correctpath
- 	@echo Installing fvwm-crystal $(RELEASE) to $(prefix)
+@@ -15,10 +15,10 @@
  	mkdir -p $(prefix)/bin $(prefix)/share/fvwm-crystal/fvwm 
  
  	install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(prefix)/bin
@@ -29,7 +23,7 @@
  
  uninstall:
  	@echo "Uninstalling previously installed fvwm-crystal"
-@@ -41,7 +41,7 @@
+@@ -40,7 +40,7 @@
  	mkdir -p "fvwm-crystal-minimal-$(RELEASE)"
  	mkdir -p "fvwm-crystal-minimal-$(RELEASE)/fvwm"
  	# Copy basic files
@@ -38,7 +32,7 @@
  	cp -r fvwm/config fvwm-crystal-minimal-$(RELEASE)/fvwm/
  	# Copy addons/
  	mkdir -p "fvwm-crystal-minimal-$(RELEASE)/addons"
-@@ -194,8 +194,8 @@
+@@ -190,15 +190,9 @@
  
  # It is needed to adjust some path inside fvwm-crystal.generate-menu since this file must know the install path
  correctpath:
@@ -49,3 +43,10 @@
  
  uninstall-doc:
  	-rm -rf $(docdir)
+ 	-rm -rf $(addondir)
+-
+-install-doc:
+-	mkdir -p $(addondir) $(docdir)
+-	install -m 644 addons/* $(addondir)
+-	install -m 644 AUTHORS COPYING NEWS ChangeLog README INSTALL $(docdir)
+-	install -m 644 doc/* $(docdir)
diff --git a/x11-wm/fvwm-crystal/pkg-plist b/x11-wm/fvwm-crystal/pkg-plist
index fbfd71ab293c..a181185dcd62 100644
--- a/x11-wm/fvwm-crystal/pkg-plist
+++ b/x11-wm/fvwm-crystal/pkg-plist
@@ -4,29 +4,6 @@ bin/fvwm-crystal.generate-menu
 bin/fvwm-crystal.infoline
 bin/fvwm-crystal.mplayer-wrapper
 bin/fvwm-crystal.wallpaper
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/Application database.txt
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/Crystal ROX! HOWTO.txt
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/Keyboard bindings.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/Mouse bindings.txt
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/Tips.txt
-%%PORTDOCS%%%%DOCSDIR%%/addons/Sytem-documentation-browser.READNE
-%%PORTDOCS%%%%DOCSDIR%%/addons/Xresources
-%%PORTDOCS%%%%DOCSDIR%%/addons/Xsession
-%%PORTDOCS%%%%DOCSDIR%%/addons/fvwm-crystal.desktop
-%%PORTDOCS%%%%DOCSDIR%%/addons/fvwm-crystal.lesspipe.sh
-%%PORTDOCS%%%%DOCSDIR%%/addons/fvwm.vim
-%%PORTDOCS%%%%DOCSDIR%%/addons/session
-%%PORTDOCS%%%%DOCSDIR%%/addons/session-management.README
-%%PORTDOCS%%%%DOCSDIR%%/addons/sudo
 %%DATADIR%%/fvwm/Applications/20~Games/20~Action_Games/15~doom3~DOOM_III
 %%DATADIR%%/fvwm/Applications/20~Games/20~Action_Games/15~quake3~Quake_III_Arena
 %%DATADIR%%/fvwm/Applications/20~Games/20~Action_Games/15~quake4~Quake_IV
@@ -1028,6 +1005,7 @@ bin/fvwm-crystal.wallpaper
 %%DATADIR%%/fvwm/components/styles/CursorStyle
 %%DATADIR%%/fvwm/components/styles/CursorStyle-Border
 %%DATADIR%%/fvwm/components/styles/FVWM
+%%DATADIR%%/fvwm/components/styles/FVWM.orig
 %%DATADIR%%/fvwm/components/styles/FocusPolicy-FVWM-Crystal
 %%DATADIR%%/fvwm/components/styles/FocusPolicy-FVWM-Crystal-Raise
 %%DATADIR%%/fvwm/components/styles/FocusPolicy-MSWindows
@@ -3315,6 +3293,7 @@ bin/fvwm-crystal.wallpaper
 %%DATADIR%%/fvwm/wallpapers/fvwm-crystal-bright1-1024x768.jpg
 %%DATADIR%%/fvwm/wallpapers/fvwm-crystal-dark1-1024x768.jpg
 %%DATADIR%%/fvwm/wallpapers/fvwm-crystal-dark2-1024x768.jpg
+@dirrm share/pixmaps
 @dirrm %%DATADIR%%/fvwm/wallpapers
 @dirrm %%DATADIR%%/fvwm/scripts/FvwmMPD
 @dirrm %%DATADIR%%/fvwm/scripts
@@ -3572,5 +3551,3 @@ bin/fvwm-crystal.wallpaper
 @dirrm %%DATADIR%%/fvwm/Applications
 @dirrm %%DATADIR%%/fvwm
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/addons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%