Sat Dec 17 14:19:27 2016 UTC ()
Help Jasper finding the limit macros.


(joerg)
diff -r1.188 -r1.189 pkgsrc/x11/kdelibs3/Makefile
diff -r1.86 -r1.87 pkgsrc/x11/kdelibs4/Makefile
cvs diff -r1.188 -r1.189 pkgsrc/x11/kdelibs3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs3/Attic/Makefile 2016/12/03 22:05:08 1.188
+++ pkgsrc/x11/kdelibs3/Attic/Makefile 2016/12/17 14:19:27 1.189
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.188 2016/12/03 22:05:08 maya Exp $ 1# $NetBSD: Makefile,v 1.189 2016/12/17 14:19:27 joerg Exp $
2 2
3DISTNAME= kdelibs-${_KDE_VERSION} 3DISTNAME= kdelibs-${_KDE_VERSION}
4PKGREVISION= 40 4PKGREVISION= 40
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# addressbook.h:29:23: fatal error: addressee.h: No such file or directory 8# addressbook.h:29:23: fatal error: addressee.h: No such file or directory
9MAKE_JOBS_SAFE= no 9MAKE_JOBS_SAFE= no
10 10
11.include "../../meta-pkgs/kde3/Makefile.kde3" 11.include "../../meta-pkgs/kde3/Makefile.kde3"
12 12
13CONFLICTS+= koffice3<=1.1.1 13CONFLICTS+= koffice3<=1.1.1
14CONFLICTS= kdelibs4-[0-9]* 14CONFLICTS= kdelibs4-[0-9]*
@@ -59,26 +59,29 @@ SUBST_FILES.kdemagic= kio/magic @@ -59,26 +59,29 @@ SUBST_FILES.kdemagic= kio/magic
59SUBST_SED.kdemagic= -n -e 'p' -e 's:/usr/local/bin:${LOCALBASE}/bin:p' 59SUBST_SED.kdemagic= -n -e 'p' -e 's:/usr/local/bin:${LOCALBASE}/bin:p'
60 60
61SPECIAL_PERMS+= ${PREFIX}/bin/fileshareset ${SETUID_ROOT_PERMS} 61SPECIAL_PERMS+= ${PREFIX}/bin/fileshareset ${SETUID_ROOT_PERMS}
62SPECIAL_PERMS+= ${PREFIX}/bin/kpac_dhcp_helper ${SETUID_ROOT_PERMS} 62SPECIAL_PERMS+= ${PREFIX}/bin/kpac_dhcp_helper ${SETUID_ROOT_PERMS}
63 63
64# ${SETUID_ROOT_PERMS} doesn't work here because the locate() method used to 64# ${SETUID_ROOT_PERMS} doesn't work here because the locate() method used to
65# find the path to the kgrantpty expects it to have read permissions set. 65# find the path to the kgrantpty expects it to have read permissions set.
66SPECIAL_PERMS+= ${PREFIX}/bin/kgrantpty ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4555 66SPECIAL_PERMS+= ${PREFIX}/bin/kgrantpty ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4555
67 67
68# We require use of a recent enough libbz2 to have the BZ2_ prefixes 68# We require use of a recent enough libbz2 to have the BZ2_ prefixes
69# so force this as configure gets this wrong on Solaris 9 69# so force this as configure gets this wrong on Solaris 9
70CONFIGURE_ENV.SunOS+= ac_cv_lib_bzip2='no' 70CONFIGURE_ENV.SunOS+= ac_cv_lib_bzip2='no'
71 71
 72# jasper uses SIZE_MAX and friends in its headers.
 73CPPFLAGS+= -D__STDC_LIMIT_MACROS
 74
72.include "options.mk" 75.include "options.mk"
73 76
74PLIST_VARS+= kded 77PLIST_VARS+= kded
75.if ${OPSYS} == "NetBSD" 78.if ${OPSYS} == "NetBSD"
76. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} 79. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
77# nothing 80# nothing
78. else 81. else
79PLIST.kded= yes 82PLIST.kded= yes
80. endif 83. endif
81# make sure zone.tab is installed 84# make sure zone.tab is installed
82DEPENDS+= zonetab-[0-9]*:../../time/zonetab 85DEPENDS+= zonetab-[0-9]*:../../time/zonetab
83.else 86.else
84PLIST.kded= yes 87PLIST.kded= yes
cvs diff -r1.86 -r1.87 pkgsrc/x11/kdelibs4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/Makefile 2016/10/07 18:25:36 1.86
+++ pkgsrc/x11/kdelibs4/Makefile 2016/12/17 14:19:27 1.87
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.86 2016/10/07 18:25:36 adam Exp $ 1# $NetBSD: Makefile,v 1.87 2016/12/17 14:19:27 joerg Exp $
2 2
3DISTNAME= kdelibs-4.14.15 3DISTNAME= kdelibs-4.14.15
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= x11 6CATEGORIES= x11
7COMMENT= Support libraries for the KDE integrated X11 desktop 7COMMENT= Support libraries for the KDE integrated X11 desktop
8MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.12.0/src/} 8MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.12.0/src/}
9 9
10#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 10#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
11# http://mirrors.isc.org/pub/kde/security_patches/ 11# http://mirrors.isc.org/pub/kde/security_patches/
12#PATCHFILES= post-kde-4.0.3-khtml.diff 12#PATCHFILES= post-kde-4.0.3-khtml.diff
13 13
14.include "../../meta-pkgs/kde4/Makefile.kde4" 14.include "../../meta-pkgs/kde4/Makefile.kde4"
@@ -79,26 +79,29 @@ PLIST.notmac= yes @@ -79,26 +79,29 @@ PLIST.notmac= yes
79 79
80.if ${OPSYS} == "NetBSD" 80.if ${OPSYS} == "NetBSD"
81# make sure zone.tab is installed 81# make sure zone.tab is installed
82DEPENDS+= zonetab-[0-9]*:../../time/zonetab 82DEPENDS+= zonetab-[0-9]*:../../time/zonetab
83.endif 83.endif
84 84
85.if ${OPSYS} == "SunOS" 85.if ${OPSYS} == "SunOS"
86PLIST.kgrantpty= yes 86PLIST.kgrantpty= yes
87.endif 87.endif
88 88
89CFLAGS.SunOS+= -D__EXTENSIONS__ 89CFLAGS.SunOS+= -D__EXTENSIONS__
90LDFLAGS.SunOS+= -lintl 90LDFLAGS.SunOS+= -lintl
91 91
 92# jasper uses SIZE_MAX and friends in its headers.
 93CXXFLAGS+= -D__STDC_LIMIT_MACROS
 94
92BUILDLINK_DEPMETHOD.qt4-tools= full 95BUILDLINK_DEPMETHOD.qt4-tools= full
93.include "../../meta-pkgs/kde4/kde4.mk" 96.include "../../meta-pkgs/kde4/kde4.mk"
94 97
95BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11 98BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
96#BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60 99#BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60
97#BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.10.0 100#BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.10.0
98 101
99.include "../../archivers/bzip2/buildlink3.mk" 102.include "../../archivers/bzip2/buildlink3.mk"
100.include "../../archivers/xz/buildlink3.mk" 103.include "../../archivers/xz/buildlink3.mk"
101.include "../../sysutils/strigi/buildlink3.mk" 104.include "../../sysutils/strigi/buildlink3.mk"
102#.include "../../textproc/soprano/buildlink3.mk" 105#.include "../../textproc/soprano/buildlink3.mk"
103.include "../../databases/shared-mime-info/buildlink3.mk" 106.include "../../databases/shared-mime-info/buildlink3.mk"
104.include "../../devel/grantlee/buildlink3.mk" 107.include "../../devel/grantlee/buildlink3.mk"