Sun May 17 00:25:42 2020 UTC ()
libcups: don't install binaries with mode 555

Need to use 755, else we get ENOPERM when it's time to strip(1).


(tnn)
diff -r1.1 -r1.2 pkgsrc/print/libcups/Makefile

cvs diff -r1.1 -r1.2 pkgsrc/print/libcups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libcups/Makefile 2020/05/16 18:07:56 1.1
+++ pkgsrc/print/libcups/Makefile 2020/05/17 00:25:42 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.1 2020/05/16 18:07:56 maya Exp $ 1# $NetBSD: Makefile,v 1.2 2020/05/17 00:25:42 tnn Exp $
2 2
3.include "../../print/cups/Makefile.common" 3.include "../../print/cups/Makefile.common"
4 4
5PKGNAME= libcups-${CUPS_VERS} 5PKGNAME= libcups-${CUPS_VERS}
 6PKGREVISION= 1
6MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
7 8
8MAINTAINER= sbd@NetBSD.org 9MAINTAINER= sbd@NetBSD.org
9COMMENT= Common UNIX Printing System library 10COMMENT= Common UNIX Printing System library
10 11
11DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo 12DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo
12PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches 13PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches
13 14
14GITHUB_PROJECT= cups 15GITHUB_PROJECT= cups
15GITHUB_RELEASE= v${PKGVERSION_NOREV} 16GITHUB_RELEASE= v${PKGVERSION_NOREV}
16 17
17CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 18CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
18 19
@@ -22,26 +23,27 @@ USE_LANGUAGES= c c++ # pdftops is a C++ @@ -22,26 +23,27 @@ USE_LANGUAGES= c c++ # pdftops is a C++
22USE_LIBTOOL= yes 23USE_LIBTOOL= yes
23USE_PKGLOCALEDIR= yes 24USE_PKGLOCALEDIR= yes
24USE_TOOLS+= aclocal autoconf automake gmake pkg-config 25USE_TOOLS+= aclocal autoconf automake gmake pkg-config
25GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
26CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 27CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
28CONFIGURE_ARGS+= --localstatedir=${VARBASE} 29CONFIGURE_ARGS+= --localstatedir=${VARBASE}
29CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 30CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
30CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 31CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
31CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 32CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
32CONFIGURE_ARGS+= --with-components=libcups 33CONFIGURE_ARGS+= --with-components=libcups
33CONFIGURE_ARGS+= --enable-libpaper 34CONFIGURE_ARGS+= --enable-libpaper
34CONFIGURE_ARGS+= --enable-ssl 35CONFIGURE_ARGS+= --enable-ssl
 36CONFIGURE_ARGS+= --with-exe-file-perm=0755
35 37
36CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 38CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
37 39
38.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
39.include "options.mk" 41.include "options.mk"
40 42
41# Explicitly disable epoll on illumos, it is provided for Linux compat only. 43# Explicitly disable epoll on illumos, it is provided for Linux compat only.
42CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no 44CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no
43 45
44LIBS+= ${BUILDLINK_LDADD.iconv} 46LIBS+= ${BUILDLINK_LDADD.iconv}
45 47
46# Avoid the following error when compiling with clang. 48# Avoid the following error when compiling with clang.
47# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' 49# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'