[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Fix building with qt-3.3.5 (based on KDE ...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/184b3d4ad930
branches:  trunk
changeset: 499853:184b3d4ad930
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Sep 28 10:47:18 2005 +0000

description:
Fix building with qt-3.3.5 (based on KDE web-site)

diffstat:

 x11/kdebase3/Makefile |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r c121b664fd4f -r 184b3d4ad930 x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Wed Sep 28 10:39:35 2005 +0000
+++ b/x11/kdebase3/Makefile     Wed Sep 28 10:47:18 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2005/09/22 08:41:18 markd Exp $
+# $NetBSD: Makefile,v 1.92 2005/09/28 10:47:18 adam Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
 PKGREVISION=   2
@@ -19,9 +19,9 @@
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
 UNLIMIT_RESOURCES=     datasize
+USE_DIRS+=             xdg-1.2
+USE_PKGINSTALL=                yes
 USE_TOOLS+=            pkg-config
-USE_DIRS+=             xdg-1.2
-USE_PKGINSTALL=                YES
 
 CONFIGURE_ARGS+=       --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ARGS+=       --with-ldap="${BUILDLINK_PREFIX.openldap}"
@@ -31,8 +31,7 @@
 CONFIGURE_ARGS+=       --without-vorbis
 CONFIGURE_ARGS+=       --without-java
 
-REPLACE_PERL= \
-                       kcontrol/fileshare/fileshareset \
+REPLACE_PERL=          kcontrol/fileshare/fileshareset \
                        kcontrol/keys/convertShortcuts.pl \
                        khelpcenter/searchhandlers/khc_htdig.pl \
                        khelpcenter/searchhandlers/khc_htsearch.pl \
@@ -123,6 +122,14 @@
 .endif
 .endif
 
+# a fix for qt-3.3.5, please remove if qt-3.3.6 (or newer) solves the problem
+SUBST_CLASSES+=                hints
+SUBST_STAGE.hints=     post-patch
+SUBST_MESSAGE.hints=   "Fix includehints."
+SUBST_FILES.hints=     khotkeys/kcontrol/ui/*.ui
+SUBST_FILTER_CMD.hints=        ${GREP} -v includehint
+
+
 pre-configure:
        cd ${WRKSRC};                                                   \
        files="kcontrol/kdm/main.cpp kioslave/info/kde-info2html.conf"; \