Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/devel/kdiff3/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/devel/kdiff3/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- pkgsrc/devel/kdiff3/Makefile	2012/03/03 00:12:56	1.18
+++ pkgsrc/devel/kdiff3/Makefile	2012/03/21 23:10:54	1.19
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.18 2012/03/03 00:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2012/03/21 23:10:54 markd Exp $
+#
 
-DISTNAME=		kdiff3-0.9.91
-PKGREVISION=		14
-CATEGORIES=		devel kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kdiff3/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://kdiff3.sourceforge.net/
-COMMENT=		File and directory diff and merge tool
+DISTNAME=	kdiff3-0.9.96
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdiff3/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://kdiff3.sourceforge.net/
+COMMENT=	File and directory diff and merge tool (KDE4)
+LICENSE=	gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+BUILD_DEPENDS+=	automoc4>=0.9.83:../../devel/automoc4
 
-USE_TOOLS+=		msgfmt
+PKG_DESTDIR_SUPPORT=	user-destdir
+USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-SET_LIBDIR=		yes
-CONFIGURE_ARGS+=	--without-arts
 
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
+USE_TOOLS+=	msgfmt pkg-config
 
+.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/kde-baseapps4/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"