Mon Jan 4 22:33:48 2021 UTC ()
libcups: remove ~ skip pattern now that it's default


(wiz)
diff -r1.8 -r1.9 pkgsrc/print/libcups/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/print/libcups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libcups/Makefile 2021/01/04 14:32:17 1.8
+++ pkgsrc/print/libcups/Makefile 2021/01/04 22:33:48 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2021/01/04 14:32:17 prlw1 Exp $ 1#$NetBSD: Makefile,v 1.9 2021/01/04 22:33:48 wiz 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}
6MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/}
7 7
8MAINTAINER= sbd@NetBSD.org 8MAINTAINER= sbd@NetBSD.org
9COMMENT= Common UNIX Printing System library 9COMMENT= Common UNIX Printing System library
10 10
11DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo 11DISTINFO_FILE?= ${.CURDIR}/../../print/cups-base/distinfo
12PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches 12PATCHDIR?= ${.CURDIR}/../../print/cups-base/patches
13 13
14GITHUB_PROJECT= cups 14GITHUB_PROJECT= cups
@@ -28,28 +28,26 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC @@ -28,28 +28,26 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC
28CONFIGURE_ARGS+= --localstatedir=${VARBASE} 28CONFIGURE_ARGS+= --localstatedir=${VARBASE}
29CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 29CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
30CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 30CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
31CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 31CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
32CONFIGURE_ARGS+= --with-components=libcups 32CONFIGURE_ARGS+= --with-components=libcups
33CONFIGURE_ARGS+= --enable-libpaper 33CONFIGURE_ARGS+= --enable-libpaper
34CONFIGURE_ARGS+= --enable-ssl 34CONFIGURE_ARGS+= --enable-ssl
35CONFIGURE_ARGS+= --enable-gnutls 35CONFIGURE_ARGS+= --enable-gnutls
36CONFIGURE_ARGS+= --disable-cdsassl 36CONFIGURE_ARGS+= --disable-cdsassl
37CONFIGURE_ARGS+= --with-exe-file-perm=0755 37CONFIGURE_ARGS+= --with-exe-file-perm=0755
38 38
39CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 39CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
40 40
41CHECK_PORTABILITY_SKIP+= configure~ 
42 
43.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
44.include "options.mk" 42.include "options.mk"
45 43
46BUILD_DEFS+= VARBASE 44BUILD_DEFS+= VARBASE
47 45
48# Explicitly disable epoll on illumos, it is provided for Linux compat only. 46# Explicitly disable epoll on illumos, it is provided for Linux compat only.
49CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no 47CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no
50 48
51LIBS+= ${BUILDLINK_LDADD.iconv} 49LIBS+= ${BUILDLINK_LDADD.iconv}
52 50
53# Avoid the following error when compiling with clang. 51# Avoid the following error when compiling with clang.
54# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' 52# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
55# can not be used when making a shared object; recompile with -fPIC 53# can not be used when making a shared object; recompile with -fPIC