Tue Nov 29 18:12:12 2011 UTC ()
Fix build on SunOS.


(hans)
diff -r1.30 -r1.31 pkgsrc/x11/kdelibs4/Makefile
diff -r1.7 -r1.8 pkgsrc/x11/kdelibs4/PLIST
cvs diff -r1.30 -r1.31 pkgsrc/x11/kdelibs4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/Makefile 2011/11/20 02:08:10 1.30
+++ pkgsrc/x11/kdelibs4/Makefile 2011/11/29 18:12:12 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2011/11/20 02:08:10 markd Exp $ 1# $NetBSD: Makefile,v 1.31 2011/11/29 18:12:12 hans Exp $
2 2
3DISTNAME= kdelibs-${_KDE_VERSION} 3DISTNAME= kdelibs-${_KDE_VERSION}
4PKGREVISION= 8 4PKGREVISION= 8
5CATEGORIES= x11 5CATEGORIES= x11
6COMMENT= Support libraries for the KDE integrated X11 desktop 6COMMENT= Support libraries for the KDE integrated X11 desktop
7 7
8#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 8#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
9# http://mirrors.isc.org/pub/kde/security_patches/ 9# http://mirrors.isc.org/pub/kde/security_patches/
10#PATCHFILES= post-kde-4.0.3-khtml.diff 10#PATCHFILES= post-kde-4.0.3-khtml.diff
11 11
12.include "../../meta-pkgs/kde4/Makefile.kde4" 12.include "../../meta-pkgs/kde4/Makefile.kde4"
13 13
14CONFLICTS= kdelibs-[0-9]* 14CONFLICTS= kdelibs-[0-9]*
@@ -45,34 +45,41 @@ REPLACE_PERL+= \ @@ -45,34 +45,41 @@ REPLACE_PERL+= \
45 45
46CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh 46CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh
47 47
48SUBST_CLASSES+= kdelibsfix 48SUBST_CLASSES+= kdelibsfix
49SUBST_STAGE.kdelibsfix= pre-configure 49SUBST_STAGE.kdelibsfix= pre-configure
50SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths. 50SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths.
51SUBST_FILES.kdelibsfix= \ 51SUBST_FILES.kdelibsfix= \
52 kde3support/kdeui/k3sconfig.cpp \ 52 kde3support/kdeui/k3sconfig.cpp \
53 kdeui/colors/kcolordialog.cpp \ 53 kdeui/colors/kcolordialog.cpp \
54 kio/kssl/kopenssl.cpp 54 kio/kssl/kopenssl.cpp
55SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' -e 's:@X11BASE@:${X11BASE}:g' 55SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' -e 's:@X11BASE@:${X11BASE}:g'
56 56
57USE_TOOLS+= flex gmake 57USE_TOOLS+= flex gmake
 58PLIST_VARS+= PLIST.kgrantpty
58 59
59.include "../../mk/bsd.prefs.mk" 60.include "../../mk/bsd.prefs.mk"
60 61
61.if ${OPSYS} == "NetBSD" 62.if ${OPSYS} == "NetBSD"
62# make sure zone.tab is installed 63# make sure zone.tab is installed
63DEPENDS+= zonetab-[0-9]*:../../time/zonetab 64DEPENDS+= zonetab-[0-9]*:../../time/zonetab
64.endif 65.endif
65 66
 67.if ${OPSYS} == "SunOS"
 68PLIST.kgrantpty= yes
 69.endif
 70
 71LDFLAGS.SunOS+= -lintl
 72
66BUILDLINK_DEPMETHOD.qt4-tools= full 73BUILDLINK_DEPMETHOD.qt4-tools= full
67.include "../../meta-pkgs/kde4/kde4.mk" 74.include "../../meta-pkgs/kde4/kde4.mk"
68 75
69BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11 76BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
70BUILDLINK_API_DEPENDS.soprano+= soprano>=2.3.0 77BUILDLINK_API_DEPENDS.soprano+= soprano>=2.3.0
71BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4 78BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4
72 79
73.include "../../archivers/bzip2/buildlink3.mk" 80.include "../../archivers/bzip2/buildlink3.mk"
74.include "../../archivers/xz/buildlink3.mk" 81.include "../../archivers/xz/buildlink3.mk"
75.include "../../sysutils/strigi/buildlink3.mk" 82.include "../../sysutils/strigi/buildlink3.mk"
76.include "../../textproc/soprano/buildlink3.mk" 83.include "../../textproc/soprano/buildlink3.mk"
77.include "../../databases/shared-mime-info/buildlink3.mk" 84.include "../../databases/shared-mime-info/buildlink3.mk"
78.include "../../devel/pcre/buildlink3.mk" 85.include "../../devel/pcre/buildlink3.mk"
cvs diff -r1.7 -r1.8 pkgsrc/x11/kdelibs4/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/PLIST 2010/10/25 20:55:28 1.7
+++ pkgsrc/x11/kdelibs4/PLIST 2011/11/29 18:12:12 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.7 2010/10/25 20:55:28 markd Exp $ 1@comment $NetBSD: PLIST,v 1.8 2011/11/29 18:12:12 hans Exp $
2bin/checkXML 2bin/checkXML
3bin/kbuildsycoca4 3bin/kbuildsycoca4
4bin/kconfig_compiler 4bin/kconfig_compiler
5bin/kcookiejar4 5bin/kcookiejar4
6bin/kde4-config 6bin/kde4-config
7bin/kded4 7bin/kded4
8bin/kdeinit4 8bin/kdeinit4
9bin/kdeinit4_shutdown 9bin/kdeinit4_shutdown
10bin/kdeinit4_wrapper 10bin/kdeinit4_wrapper
11bin/kjs 11bin/kjs
12bin/kjscmd 12bin/kjscmd
13bin/kross 13bin/kross
14bin/kshell4 14bin/kshell4
@@ -1831,26 +1831,27 @@ lib/kde4/kspell_aspell.so @@ -1831,26 +1831,27 @@ lib/kde4/kspell_aspell.so
1831lib/kde4/kspell_enchant.so 1831lib/kde4/kspell_enchant.so
1832lib/kde4/ktexteditor_autobrace.so 1832lib/kde4/ktexteditor_autobrace.so
1833lib/kde4/ktexteditor_exporter.so 1833lib/kde4/ktexteditor_exporter.so
1834lib/kde4/ktexteditor_iconinserter.so 1834lib/kde4/ktexteditor_iconinserter.so
1835lib/kde4/ktexteditor_insanehtml_le.so 1835lib/kde4/ktexteditor_insanehtml_le.so
1836lib/kde4/ktexteditor_insertfile.so 1836lib/kde4/ktexteditor_insertfile.so
1837lib/kde4/ktexteditor_kdatatool.so 1837lib/kde4/ktexteditor_kdatatool.so
1838lib/kde4/ktranscript.so 1838lib/kde4/ktranscript.so
1839lib/kde4/libexec/filesharelist 1839lib/kde4/libexec/filesharelist
1840lib/kde4/libexec/fileshareset 1840lib/kde4/libexec/fileshareset
1841lib/kde4/libexec/kauth-policy-gen 1841lib/kde4/libexec/kauth-policy-gen
1842lib/kde4/libexec/kconf_update 1842lib/kde4/libexec/kconf_update
1843lib/kde4/libexec/kdesu_stub 1843lib/kde4/libexec/kdesu_stub
 1844${PLIST.kgrantpty}lib/kde4/libexec/kgrantpty
1844lib/kde4/libexec/kio_http_cache_cleaner 1845lib/kde4/libexec/kio_http_cache_cleaner
1845lib/kde4/libexec/kioslave 1846lib/kde4/libexec/kioslave
1846lib/kde4/libexec/klauncher 1847lib/kde4/libexec/klauncher
1847lib/kde4/libexec/kmailservice 1848lib/kde4/libexec/kmailservice
1848lib/kde4/libexec/kpac_dhcp_helper 1849lib/kde4/libexec/kpac_dhcp_helper
1849lib/kde4/libexec/ksendbugmail 1850lib/kde4/libexec/ksendbugmail
1850lib/kde4/libexec/ktelnetservice 1851lib/kde4/libexec/ktelnetservice
1851lib/kde4/libexec/lnusertemp 1852lib/kde4/libexec/lnusertemp
1852lib/kde4/libexec/start_kdeinit 1853lib/kde4/libexec/start_kdeinit
1853lib/kde4/libexec/start_kdeinit_wrapper 1854lib/kde4/libexec/start_kdeinit_wrapper
1854lib/kde4/libkhtmlpart.so 1855lib/kde4/libkhtmlpart.so
1855lib/kde4/libkmultipart.so 1856lib/kde4/libkmultipart.so
1856lib/kde4/notepadpart.so 1857lib/kde4/notepadpart.so