Some cleanups, from Brad.

maintainer ok

devel/kdiff3/Makefile

@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.3 2011/09/16 09:24:51 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/21 08:08:18 ajacoutot Exp $
 
 COMMENT =	compares and merges multiple files or directories
+
+DISTNAME =	kdiff3-0.9.96
+REVISION =	1
 CATEGORIES =	devel x11/kde
 HOMEPAGE =	http://kdiff3.sourceforge.net/
 
-DISTNAME =	kdiff3-0.9.96
-REVISION=		0
-
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=kdiff3/}
-MODULES =	x11/qt4
 
 MAINTAINER =	Lawrence Teo <lteo@devio.us>
 
@@ -18,18 +17,21 @@ PERMIT_DISTFILES_FTP =	Yes
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 
-WANTLIB += QtGui c m pthread stdc++
+WANTLIB =	QtGui c m pthread stdc++
 
-LIB_DEPENDS = x11/qt4
+MODULES =	x11/qt4
 
 SEPARATE_BUILD =	simple
 
-FAKE_FLAGS =		INSTALL_ROOT=${WRKINST}
+MAKE_FLAGS =	CXX="${CXX}" CXXFLAGS='${CXXFLAGS} -fno-wrapv -pthread -Wall -W $$(DEFINES)' \
+		LINK="${CXX}"
+
+DESTDIRNAME =	INSTALL_ROOT
 
 pre-configure:
-	@perl -pi -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/src-QT4/kdiff3.pro
+	@${SUBST_CMD} ${WRKSRC}/src-QT4/kdiff3.pro
 
 do-configure:
-	cd ${WRKBUILD} && QTDIR=${WRKDIR}/bin qmake4 ${WRKSRC}/src-QT4/kdiff3.pro #CONFIG+=debug
+	@cd ${WRKBUILD} && QTDIR=${WRKDIR}/bin qmake4 ${WRKSRC}/src-QT4/kdiff3.pro #CONFIG+=debug
 
 .include <bsd.port.mk>

devel/kdiff3/patches/patch-src-QT4_kdiff3_pro

@@ -0,0 +1,17 @@
+$OpenBSD: patch-src-QT4_kdiff3_pro,v 1.1 2011/09/21 08:08:18 ajacoutot Exp $
+--- src-QT4/kdiff3.pro.orig	Thu Sep  1 20:40:51 2011
++++ src-QT4/kdiff3.pro	Thu Sep  1 20:41:55 2011
+@@ -56,11 +56,11 @@ win32 {
+ 
+ 
+ unix {
+-  documentation.path = /usr/local/share/doc/kdiff3
++  documentation.path = ${PREFIX}/share/doc/kdiff3
+   documentation.files = ../doc/*
+ 
+   INSTALLS += documentation
+ 
+-  target.path = /usr/local/bin
++  target.path = ${PREFIX}/bin
+   INSTALLS += target
+ }