3 files changed, 40 insertions, 54 deletions
diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index 185d8242733b..96754dba716e 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -8,69 +8,55 @@
 #
 
 PORTNAME=	qlwm
-PORTVERSION=	3.1
-PORTREVISION=	1
+PORTVERSION=	4.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.alinden.mynetcologne.de/qlwm/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt-based window manager
 
-DOCDIR=		share/doc/${PORTNAME}
-DOCS=		CHANGES README
-LIBDIR=		lib/${PORTNAME}
-PLIST=		${WRKDIR}/pkg-plist
-MAN1=		qlwm.1
-USE_QT_VER=	3
-USE_X_PREFIX=	yes
-REINPLACE_ARGS=	-i'' -E
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui moc_build qmake_build
 
-MAKE_ENV=	DEST="${PREFIX}/${LIBDIR}" INCPATH="${QTCPPFLAGS}" \
-		LIBS="${QTCFGLIBS} -lqt-mt -pthread" LINK="${CXX}" MOC="${MOC}"
+MAN1=		qlwm.1
+PORTDOCS=	CHANGES README
+PLIST_FILES=	bin/qlwm \
+		lib/qlwm/biff \
+		lib/qlwm/dclock \
+		lib/qlwm/files/appdefaults \
+		lib/qlwm/files/button_left.xpm \
+		lib/qlwm/files/button_right.xpm \
+		lib/qlwm/files/defaults \
+		lib/qlwm/files/menu.xpm \
+		lib/qlwm/files/menuconfig \
+		lib/qlwm/files/tiled.xpm \
+		lib/qlwm/files/winlist.xpm \
+		lib/qlwm/qlwm
+PLIST_DIRS=	lib/qlwm/files \
+		lib/qlwm
+
+SUB_FILES=	qlwm
 
 post-patch:
-	${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} \
-		's|/usr/local/qlwm|${PREFIX}/${LIBDIR}|g ; \
-		 s|^CXX|#CXX|g ; \
-		 s|^INCPATH|#INCPATH|g ; \
-		 s|^LFLAGS|#LFLAGS|g ; \
-		 s|^LIBS|#LIBS|g ; \
-		 s|^LINK|#LINK|g ; \
-		 s|^MOC|#MOC|g'
-
-pre-install:
-	${ECHO_CMD} bin/qlwm > ${PLIST}
-.for i in biff dclock qlwm
-	${ECHO_CMD} ${LIBDIR}/$i >> ${PLIST}
-.endfor
-	for i in `cd ${WRKSRC}/files; ${ECHO_CMD} *`; do \
-		${ECHO_CMD} ${LIBDIR}/files/$$i >> ${PLIST}; \
-	done
-.if !defined(NOPORTDOCS)
-.for i in ${DOCS}
-	${ECHO_CMD} ${DOCDIR}/$i >> ${PLIST}
-.endfor
-.endif
-.for i in ${LIBDIR}/files ${LIBDIR}
-	${ECHO_CMD} @dirrm $i >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
-.endif
+	@${REINPLACE_CMD} -e 's|/usr/local/qlwm|${PREFIX}/lib/qlwm|g ; \
+		 s|/usr/local/man|${MANPREFIX}/man|g' ${WRKSRC}/Makefile
 
 do-install:
-	${MKDIR} ${PREFIX}/${LIBDIR}/files
-	${INSTALL_DATA} ${WRKSRC}/files/* ${PREFIX}/${LIBDIR}/files
-	${INSTALL_PROGRAM} ${WRKSRC}/src/qlwm ${WRKSRC}/dclock/dclock \
-		${WRKSRC}/mail/biff ${PREFIX}/${LIBDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/qlwm ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/qlwm.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/lib/qlwm
+	${INSTALL_PROGRAM} ${WRKSRC}/dclock/dclock ${PREFIX}/lib/qlwm
+	${INSTALL_PROGRAM} ${WRKSRC}/mail/biff ${PREFIX}/lib/qlwm
+	${INSTALL_PROGRAM} ${WRKSRC}/src/qlwm ${PREFIX}/lib/qlwm
+	@${MKDIR} ${PREFIX}/lib/qlwm/files
+	${INSTALL_DATA} ${WRKSRC}/files/*.xpm ${PREFIX}/lib/qlwm/files
+	${INSTALL_DATA} ${WRKSRC}/files/appdefaults ${PREFIX}/lib/qlwm/files
+	${INSTALL_DATA} ${WRKSRC}/files/defaults ${PREFIX}/lib/qlwm/files
+	${INSTALL_DATA} ${WRKSRC}/files/menuconfig ${PREFIX}/lib/qlwm/files
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${DOCDIR}
-.endfor
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-	${INSTALL_MAN} ${WRKSRC}/qlwm.1 ${PREFIX}/man/man1
-	${SED} -e s,%PREFIX%,${PREFIX},g <${FILESDIR}/qlwm >${WRKSRC}/qlwm
-	${INSTALL_SCRIPT} ${WRKSRC}/qlwm ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11-wm/qlwm/distinfo b/x11-wm/qlwm/distinfo
index a241f4e43722..4d8efcea6494 100644
--- a/x11-wm/qlwm/distinfo
+++ b/x11-wm/qlwm/distinfo
@@ -1,3 +1,3 @@
-MD5 (qlwm-3.1.tar.gz) = 722a08ee0a0382c4123c05d760aed4be
-SHA256 (qlwm-3.1.tar.gz) = 4c9676dd35de562bd79b74b52d92e2b563069bc9fe97afc4a07aadfc7ddb923c
-SIZE (qlwm-3.1.tar.gz) = 50668
+MD5 (qlwm-4.2.tar.gz) = 15742a71e1d7a39bbe99fe3717d0e656
+SHA256 (qlwm-4.2.tar.gz) = c7248f64fcefe26421acca7bfa474b48e7aa9e04743c48bb93d816d49eb5cd17
+SIZE (qlwm-4.2.tar.gz) = 50323
diff --git a/x11-wm/qlwm/files/qlwm b/x11-wm/qlwm/files/qlwm.in
index 6a63dac6adf0..6a63dac6adf0 100644
--- a/x11-wm/qlwm/files/qlwm
+++ b/x11-wm/qlwm/files/qlwm.in