Sat Dec 3 18:11:53 2016 UTC ()
kdelibs3: force failure of alsa configure test

Might help PR pkg/51658


(maya)
diff -r1.186 -r1.187 pkgsrc/x11/kdelibs3/Makefile
cvs diff -r1.186 -r1.187 pkgsrc/x11/kdelibs3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs3/Attic/Makefile 2016/07/09 06:39:17 1.186
+++ pkgsrc/x11/kdelibs3/Attic/Makefile 2016/12/03 18:11:53 1.187
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.186 2016/07/09 06:39:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.187 2016/12/03 18:11:53 maya 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]*
@@ -55,26 +55,30 @@ SUBST_SED.kdelibsfix+= -e 's:@PKGLOCALE @@ -55,26 +55,30 @@ SUBST_SED.kdelibsfix+= -e 's:@PKGLOCALE
55SUBST_CLASSES+= kdemagic 55SUBST_CLASSES+= kdemagic
56SUBST_STAGE.kdemagic= pre-configure 56SUBST_STAGE.kdemagic= pre-configure
57SUBST_MESSAGE.kdemagic= Add LOCALBASE paths to magic file. 57SUBST_MESSAGE.kdemagic= Add LOCALBASE paths to magic file.
58SUBST_FILES.kdemagic= kio/magic 58SUBST_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# force failure of ALSA configure test, we're not including alsa-lib
 69# and some linuxes pass it.
 70CONFIGURE_ENV+= ac_cv_header_alsa_asoundlib_h='no'
 71
68# We require use of a recent enough libbz2 to have the BZ2_ prefixes 72# 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 73# so force this as configure gets this wrong on Solaris 9
70CONFIGURE_ENV.SunOS+= ac_cv_lib_bzip2='no' 74CONFIGURE_ENV.SunOS+= ac_cv_lib_bzip2='no'
71 75
72.include "options.mk" 76.include "options.mk"
73 77
74PLIST_VARS+= kded 78PLIST_VARS+= kded
75.if ${OPSYS} == "NetBSD" 79.if ${OPSYS} == "NetBSD"
76. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} 80. if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
77# nothing 81# nothing
78. else 82. else
79PLIST.kded= yes 83PLIST.kded= yes
80. endif 84. endif