6 files changed, 17 insertions, 53 deletions

diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index 237b6815370e..7ab1087c6a3a 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -8,28 +8,32 @@
 #
 
 PORTNAME=	qlwm
-PORTVERSION=	2.3
+PORTVERSION=	2.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.netcologne.de/~nc-lindenal/qlwm/
 
 MAINTAINER=	trevor@FreeBSD.org
 
-DOCDIR=		share/doc/qlwm
+DOCDIR=		share/doc/${PORTNAME}
 DOCS=		CHANGES README
-LIBDIR=		lib/qlwm
+LIBDIR=		lib/${PORTNAME}
 PLIST=		${WRKDIR}/pkg-plist
 MAN1=		qlwm.1
 USE_QT_VER=	2
 USE_X_PREFIX=	yes
 
-MAKE_ENV=	LFLAGS="-L${X11BASE}/lib -L${X11BASE}/lib/qt2" \
-		QTDIR=${X11BASE} \
-		DEST=${PREFIX}/${LIBDIR}
+MAKE_ENV=	DEST="${PREFIX}/${LIBDIR}" INCPATH="${QTCPPFLAGS}" \
+		LIBS="${QTCFGLIBS} -l${QTNAME}" LINK="${CXX}" MOC="${MOC}"
 
 post-patch:
-	${PERL} -pi -e "s:/usr/local/qlwm:${PREFIX}/${LIBDIR}:g" ${WRKSRC}/Makefile
-	${PERL} -pi -e "s:-lqt:-lqt2:g ; s:bin/moc:bin/moc2:g" \
-		${WRKSRC}/*/Makefile
+	find ${WRKSRC} -name "Makefile" | xargs ${PERL} -pi -e \
+        	'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} bin/qlwm > ${PLIST}
diff --git a/x11-wm/qlwm/distinfo b/x11-wm/qlwm/distinfo
index a8d92aa88492..de16d998572f 100644
--- a/x11-wm/qlwm/distinfo
+++ b/x11-wm/qlwm/distinfo
@@ -1 +1 @@
-MD5 (qlwm-2.3.tar.gz) = 8932b8d98cf8554dc7016dfbe26a22f9
+MD5 (qlwm-2.6.tar.gz) = 535344b6c165679c77b6d9d45dbc6e31
diff --git a/x11-wm/qlwm/files/patch-dclock_Makefile b/x11-wm/qlwm/files/patch-dclock_Makefile
deleted file mode 100644
index a9078c1c3087..000000000000
--- a/x11-wm/qlwm/files/patch-dclock_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- dclock/Makefile.orig	Tue Oct 17 05:05:22 2000
-+++ dclock/Makefile	Thu Jan 25 16:52:37 2001
-@@ -6,7 +6,7 @@
- #CXXFLAGS	= -Wall -pipe
- 
- # include files
--INCPATH		= -I$(QTDIR)/include
-+INCPATH		= -I$(QTDIR)/include -I${X11BASE}/include/qt2
- 
- # libraries
- LFLAGS		= -L$(QTDIR)/lib
diff --git a/x11-wm/qlwm/files/patch-mail_Makefile b/x11-wm/qlwm/files/patch-mail_Makefile
deleted file mode 100644
index bbabd1b7fd36..000000000000
--- a/x11-wm/qlwm/files/patch-mail_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- mail/Makefile.orig	Tue Oct 17 05:05:20 2000
-+++ mail/Makefile	Thu Jan 25 16:52:45 2001
-@@ -8,7 +8,7 @@
- #CXXFLAGS	= -Wall -pipe
- 
- # include files
--INCPATH		= -I$(QTDIR)/include
-+INCPATH		= -I${X11BASE}/include/qt2 -I${X11BASE}/include
- 
- # libraries
- LFLAGS		= -L$(QTDIR)/lib
diff --git a/x11-wm/qlwm/files/patch-src_Makefile b/x11-wm/qlwm/files/patch-src_Makefile
deleted file mode 100644
index 69e19afc14fe..000000000000
--- a/x11-wm/qlwm/files/patch-src_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.orig	Tue Oct 17 05:05:22 2000
-+++ src/Makefile	Thu Jan 25 16:54:44 2001
-@@ -7,7 +7,7 @@
- #CXXFLAGS	= -pipe -DDEBUGMSG
- 
- # include files
--INCPATH		= -I/usr/X11R6/include -I$(QTDIR)/include
-+INCPATH=		-I${X11BASE}/include/qt2 -I${X11BASE}/include
- 
- # libraries
- LFLAGS		= -L/usr/X11R6/lib -L$(QTDIR)/lib
-@@ -30,7 +30,7 @@
- .SUFFIXES: .cpp
- 
- .cpp.o:
--	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-+	$(CXX) $(CXXFLAGS) $(INCPATH) -o $@ -c $<
- 	
- ####### Build rules
- 
diff --git a/x11-wm/qlwm/files/qlwm b/x11-wm/qlwm/files/qlwm
index d404fd766b4c..6a63dac6adf0 100644
--- a/x11-wm/qlwm/files/qlwm
+++ b/x11-wm/qlwm/files/qlwm
@@ -3,6 +3,8 @@ PREFIX=%PREFIX%
 if ! test -e $HOME/.qlwm
 then
 	mkdir -p $HOME/.qlwm
-	cp ${PREFIX}/lib/qlwm/files/{defaults,appdefaults,menuconfig} $HOME/.qlwm
+	for i in defaults appdefaults menuconfig; \
+		do cp -v ${PREFIX}/lib/qlwm/files/$i $HOME/.qlwm; \
+	done
 fi
 exec ${PREFIX}/lib/qlwm/qlwm "$@"