3 files changed, 47 insertions, 47 deletions

diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index 313ac9d04cca..9d60d6c7a348 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	qvwm
 PORTVERSION=	1.1.12
 PORTREVISION=	2
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://www.qvwm.org/pub/qvwm/ \
+MASTER_SITES=	http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
 		ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-wm/qvwm/pkg-descr b/x11-wm/qvwm/pkg-descr
index 118da3787020..8b1f13b4fd6b 100644
--- a/x11-wm/qvwm/pkg-descr
+++ b/x11-wm/qvwm/pkg-descr
@@ -4,4 +4,4 @@ q for qvwm means number 9, v means 5 in roman.
 This is a standalone window manager, not patched ontop of another.
 Qvwm requires the Imlib library and shape extension.
 
-WWW: http://www.qvwm.org/
+WWW: http://www.csg.is.titech.ac.jp/~kourai/qvwm/download-en.html
diff --git a/x11-wm/qvwm/pkg-plist b/x11-wm/qvwm/pkg-plist
index 171b52a26de6..23db8d40676a 100644
--- a/x11-wm/qvwm/pkg-plist
+++ b/x11-wm/qvwm/pkg-plist
@@ -1,46 +1,46 @@
 bin/qvwm
-share/qvwm/clouds.qvwm-theme
-share/qvwm/default.qvwm-theme
-share/qvwm/french.qvwmrc
-share/qvwm/german.qvwmrc
-share/qvwm/images/clouds.xpm
-share/qvwm/images/clouds2.xpm
-share/qvwm/images/def16.ani
-share/qvwm/images/def32.ani
-share/qvwm/images/emacs16.ani
-share/qvwm/images/emacs32.ani
-share/qvwm/images/exit32.ani
-share/qvwm/images/find32.ani
-share/qvwm/images/help32.xpm
-share/qvwm/images/icon16.ani
-share/qvwm/images/icon32.ani
-share/qvwm/images/logo_clouds.xpm
-share/qvwm/images/logo_os2.xpm
-share/qvwm/images/netscape16.ani
-share/qvwm/images/netscape32.ani
-share/qvwm/images/quit32.ani
-share/qvwm/images/qvwmdesk.ani
-share/qvwm/images/run32.ani
-share/qvwm/images/setting32.ani
-share/qvwm/images/space.ani
-share/qvwm/images/space2.ani
-share/qvwm/images/taskbar16.ani
-share/qvwm/images/xcalc16.xpm
-share/qvwm/images/xcalc32.ani
-share/qvwm/images/xeyes16.ani
-share/qvwm/images/xeyes32.ani
-share/qvwm/images/xterm16.xpm
-share/qvwm/images/xterm32.ani
-share/qvwm/images/xv16.xpm
-share/qvwm/images/xv32.xpm
-share/qvwm/italian.qvwmrc
-share/qvwm/kanji.qvwmrc
-share/qvwm/korean.qvwmrc
-share/qvwm/light.qvwmrc
-share/qvwm/portuguese.qvwmrc
-share/qvwm/sounds/chimes.wav
-share/qvwm/space.qvwm-theme
-share/qvwm/system.qvwmrc
-@dirrm share/qvwm/images
-@dirrm share/qvwm/sounds
-@dirrm share/qvwm
+%%DATADIR%%/clouds.qvwm-theme
+%%DATADIR%%/default.qvwm-theme
+%%DATADIR%%/french.qvwmrc
+%%DATADIR%%/german.qvwmrc
+%%DATADIR%%/images/clouds.xpm
+%%DATADIR%%/images/clouds2.xpm
+%%DATADIR%%/images/def16.ani
+%%DATADIR%%/images/def32.ani
+%%DATADIR%%/images/emacs16.ani
+%%DATADIR%%/images/emacs32.ani
+%%DATADIR%%/images/exit32.ani
+%%DATADIR%%/images/find32.ani
+%%DATADIR%%/images/help32.xpm
+%%DATADIR%%/images/icon16.ani
+%%DATADIR%%/images/icon32.ani
+%%DATADIR%%/images/logo_clouds.xpm
+%%DATADIR%%/images/logo_os2.xpm
+%%DATADIR%%/images/netscape16.ani
+%%DATADIR%%/images/netscape32.ani
+%%DATADIR%%/images/quit32.ani
+%%DATADIR%%/images/qvwmdesk.ani
+%%DATADIR%%/images/run32.ani
+%%DATADIR%%/images/setting32.ani
+%%DATADIR%%/images/space.ani
+%%DATADIR%%/images/space2.ani
+%%DATADIR%%/images/taskbar16.ani
+%%DATADIR%%/images/xcalc16.xpm
+%%DATADIR%%/images/xcalc32.ani
+%%DATADIR%%/images/xeyes16.ani
+%%DATADIR%%/images/xeyes32.ani
+%%DATADIR%%/images/xterm16.xpm
+%%DATADIR%%/images/xterm32.ani
+%%DATADIR%%/images/xv16.xpm
+%%DATADIR%%/images/xv32.xpm
+%%DATADIR%%/italian.qvwmrc
+%%DATADIR%%/kanji.qvwmrc
+%%DATADIR%%/korean.qvwmrc
+%%DATADIR%%/light.qvwmrc
+%%DATADIR%%/portuguese.qvwmrc
+%%DATADIR%%/sounds/chimes.wav
+%%DATADIR%%/space.qvwm-theme
+%%DATADIR%%/system.qvwmrc
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%