3 files changed, 51 insertions, 40 deletions

diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index 83ba1a5418ff..8b12bd0242df 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -1,21 +1,24 @@
 # New ports collection makefile for:   qvwm
-# Version required:    1.1.3
+# Version required:    1.1.4
 # Date created:        2 January 1997
 # Whom:                Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qvwm-1.1.3
+DISTNAME=	qvwm-1.1.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://www.qvwm.org/pub/qvwm/
 
 MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
-		Imlib.5:${PORTSDIR}/graphics/imlib
+		Imlib.5:${PORTSDIR}/graphics/imlib \
+		esd.2:${PORTSDIR}/audio/esound
 
-USE_IMAKE=	yes
-MAN1=		qvwm.1
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+
+MAN1=		qvwm.1x
 
 .include <bsd.port.mk>
diff --git a/x11-wm/qvwm/distinfo b/x11-wm/qvwm/distinfo
index 95079a55a011..e7d3e73fe2cf 100644
--- a/x11-wm/qvwm/distinfo
+++ b/x11-wm/qvwm/distinfo
@@ -1 +1 @@
-MD5 (qvwm-1.1.3.tar.gz) = 08c52cc31e4ee5ca05d462dd221f2ab4
+MD5 (qvwm-1.1.4.tar.gz) = 17349e342f017cc4aa1a46e78d1cf9fc
diff --git a/x11-wm/qvwm/pkg-plist b/x11-wm/qvwm/pkg-plist
index 13dac5de2f50..21e83f7ceda3 100644
--- a/x11-wm/qvwm/pkg-plist
+++ b/x11-wm/qvwm/pkg-plist
@@ -1,35 +1,43 @@
 bin/qvwm
-lib/X11/qvwm/default.qvwm-theme
-lib/X11/qvwm/images/clouds.xpm
-lib/X11/qvwm/images/clouds2.xpm
-lib/X11/qvwm/images/def16.ani
-lib/X11/qvwm/images/def32.ani
-lib/X11/qvwm/images/emacs16.ani
-lib/X11/qvwm/images/emacs32.ani
-lib/X11/qvwm/images/exit32.ani
-lib/X11/qvwm/images/find32.ani
-lib/X11/qvwm/images/help32.xpm
-lib/X11/qvwm/images/icon16.ani
-lib/X11/qvwm/images/icon32.ani
-lib/X11/qvwm/images/logo_clouds.xpm
-lib/X11/qvwm/images/logo_os2.xpm
-lib/X11/qvwm/images/netscape16.ani
-lib/X11/qvwm/images/netscape32.ani
-lib/X11/qvwm/images/quit32.ani
-lib/X11/qvwm/images/qvwmdesk.ani
-lib/X11/qvwm/images/run32.ani
-lib/X11/qvwm/images/setting32.ani
-lib/X11/qvwm/images/taskbar16.ani
-lib/X11/qvwm/images/xcalc16.xpm
-lib/X11/qvwm/images/xcalc32.ani
-lib/X11/qvwm/images/xeyes16.ani
-lib/X11/qvwm/images/xeyes32.ani
-lib/X11/qvwm/images/xterm16.xpm
-lib/X11/qvwm/images/xterm32.ani
-lib/X11/qvwm/images/xv16.xpm
-lib/X11/qvwm/images/xv32.xpm
-lib/X11/qvwm/sounds/chimes.wav
-lib/X11/qvwm/system.qvwmrc
-@dirrm lib/X11/qvwm/images
-@dirrm lib/X11/qvwm/sounds
-@dirrm lib/X11/qvwm
+share/qvwm/clouds.qvwm-theme
+share/qvwm/default.qvwm-theme
+share/qvwm/french.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/kanji.qvwmrc
+share/qvwm/korean.qvwmrc
+share/qvwm/light.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