Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print libcups: fix build failure on FreeBSD
details: https://anonhg.NetBSD.org/pkgsrc/rev/b9751d91ace1
branches: trunk
changeset: 432842:b9751d91ace1
user: triaxx <triaxx%pkgsrc.org@localhost>
date: Tue May 26 08:36:55 2020 +0000
description:
libcups: fix build failure on FreeBSD
pkgsrc changes:
---------------
* Add conditional inclusion for FreeBSD.
* Apply some changes to appease pkglint.
* Bump revision.
diffstat:
print/cups-base/Makefile | 17 +---
print/cups-base/buildlink3.mk | 10 +-
print/cups-base/distinfo | 37 +++++----
print/cups-base/patches/patch-af | 6 +-
print/cups-base/patches/patch-ai | 4 +-
print/cups-base/patches/patch-airprint-conf_mime.convs.in | 4 +-
print/cups-base/patches/patch-airprint-scheduler_dirsvc.c | 4 +-
print/cups-base/patches/patch-at | 4 +-
print/cups-base/patches/patch-conf_Makefile | 4 +-
print/cups-base/patches/patch-config-scripts_cups-compiler.m4 | 8 +-
print/cups-base/patches/patch-config-scripts_cups-directories.m4 | 24 +++---
print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 | 4 +-
print/cups-base/patches/patch-config-scripts_cups-libtool.m4 | 4 +-
print/cups-base/patches/patch-cups-tls.c | 4 +-
print/cups-base/patches/patch-cups_getifaddrs-internal.h | 17 ++++
print/cups-base/patches/patch-cups_thread.c | 4 +-
print/cups-base/patches/patch-man-cups-files.conf.man.in | 4 +-
print/cups-base/patches/patch-scheduler-conf.h | 4 +-
print/cups-base/patches/patch-scheduler-main.c | 10 +-
print/cups-base/patches/patch-scheduler_auth.c | 8 +-
print/cups-base/patches/patch-scheduler_dirsvc.c | 4 +-
print/libcups/Makefile | 8 +-
print/libcups/buildlink3.mk | 10 +-
23 files changed, 106 insertions(+), 97 deletions(-)
diffs (truncated from 668 to 300 lines):
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/Makefile
--- a/print/cups-base/Makefile Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/Makefile Tue May 26 08:36:55 2020 +0000
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.35 2020/05/22 10:55:49 adam Exp $
+# $NetBSD: Makefile,v 1.36 2020/05/26 08:36:55 triaxx Exp $
.include "../../print/cups/Makefile.common"
-DISTNAME= cups-${CUPS_VERS}-source
PKGNAME= cups-base-${CUPS_VERS}
-PKGREVISION= 3
-CATEGORIES= print
+PKGREVISION= 4
MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
MAINTAINER= sbd%NetBSD.org@localhost
-HOMEPAGE= https://www.cups.org/
COMMENT= Common UNIX Printing System
-LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
GITHUB_PROJECT= cups
GITHUB_RELEASE= v${PKGVERSION_NOREV}
@@ -56,13 +52,6 @@
# can not be used when making a shared object; recompile with -fPIC
BUILDLINK_TRANSFORM.FreeBSD+= rm:-Wl,-pie
-# CUPS_USER user to run filter and CGI programs as
-# CUPS_GROUP group to run filter and CGI programs as
-# CUPS_SYSTEM_GROUPS group for system administration
-#
-CUPS_USER?= lp
-CUPS_GROUP?= lp
-CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP}
FILES_SUBST+= CUPS_USER=${CUPS_USER}
FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
@@ -116,7 +105,7 @@
SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
SUBST_STAGE.rpathfix= pre-configure
-.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
+.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == powerpc
SUBST_CLASSES+= piefix
SUBST_FILES.piefix= Makedefs.in
SUBST_MESSAGE.piefix= Removing PIE flags
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/buildlink3.mk
--- a/print/cups-base/buildlink3.mk Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/buildlink3.mk Tue May 26 08:36:55 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2020/05/22 10:55:49 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2020/05/26 08:36:55 triaxx Exp $
BUILDLINK_TREE+= cups-base
@@ -6,21 +6,21 @@
CUPS_BASE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cups-base+= cups-base>=1.1.19nb3
-BUILDLINK_ABI_DEPENDS.cups-base+= cups-base>=2.3.3nb3
+BUILDLINK_ABI_DEPENDS.cups-base+= cups-base>=2.3.3nb4
BUILDLINK_PKGSRCDIR.cups-base?= ../../print/cups-base
pkgbase := cups-base
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.cups-base:Mkerberos)
+.if ${PKG_BUILD_OPTIONS.cups-base:Mkerberos}
.include "../../mk/krb5.buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.cups-base:Mdnssd)
+.if ${PKG_BUILD_OPTIONS.cups-base:Mdnssd}
.include "../../net/mDNSResponder/buildlink3.mk"
.endif
-.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.cups-base:Mavahi)
+.if ${OPSYS} != "Darwin" && ${PKG_BUILD_OPTIONS.cups-base:Mdnssd}
.include "../../net/avahi/buildlink3.mk"
.endif
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/distinfo
--- a/print/cups-base/distinfo Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/distinfo Tue May 26 08:36:55 2020 +0000
@@ -1,30 +1,31 @@
-$NetBSD: distinfo,v 1.20 2020/05/14 19:45:50 joerg Exp $
+$NetBSD: distinfo,v 1.21 2020/05/26 08:36:55 triaxx Exp $
SHA1 (cups-2.3.3-source.tar.gz) = 7a01c9fba5d784eb61eda03fd40e513fd2a1b5b8
RMD160 (cups-2.3.3-source.tar.gz) = e08afd09666e79d0416f46e14fb8c6b0a6beebd7
SHA512 (cups-2.3.3-source.tar.gz) = 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
Size (cups-2.3.3-source.tar.gz) = 8140741 bytes
SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
-SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56
-SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
-SHA1 (patch-airprint-conf_mime.convs.in) = 413a5ef448ab42858db804cfbfc1b8ff5b6bbf77
+SHA1 (patch-af) = e72b6089ce1bf0c9bfa2eb60fbf5aa41f53f2ef1
+SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
+SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717
SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4
-SHA1 (patch-airprint-scheduler_dirsvc.c) = bef4ea8e898dffc67c4866baa701e12570eb6fca
+SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d
SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b
-SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
+SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393
SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
-SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
-SHA1 (patch-config-scripts_cups-compiler.m4) = 26f2ed2ef45d922f47e5e0ac87ccc278f35de7f3
-SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e
-SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354
-SHA1 (patch-config-scripts_cups-libtool.m4) = a6139fbbbee7038d11654c0a2387af21f48b7412
-SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511
+SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e
+SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67
+SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d
+SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003
+SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2
+SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df
+SHA1 (patch-cups_getifaddrs-internal.h) = 2e251db9e4d1b01403f3ff8c61a2238a506c12d8
SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241
-SHA1 (patch-cups_thread.c) = e625a2b81f3d831d2a0c02bc0fa9a9d31c1097a7
+SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399
SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
-SHA1 (patch-man-cups-files.conf.man.in) = 08c0322fd233c724b7df238df01988500130d1c6
+SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821
SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57
-SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee
-SHA1 (patch-scheduler-main.c) = cb31fa7427b497108ce7724bbfee1b784b9330ab
-SHA1 (patch-scheduler_auth.c) = 8c9a5338c9eb84336db0d487008795227fa9e7f0
-SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf
+SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a
+SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e
+SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d
+SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/patches/patch-af
--- a/print/cups-base/patches/patch-af Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/patches/patch-af Tue May 26 08:36:55 2020 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-af,v 1.2 2020/05/26 08:36:56 triaxx Exp $
* Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN).
--- backend/Makefile.orig 2014-05-08 22:42:44.000000000 +0000
+++ backend/Makefile
-@@ -126,7 +126,7 @@ install-exec: $(INSTALLXPC)
+@@ -118,7 +118,7 @@ install-exec: $(INSTALLXPC)
echo Installing backends in $(SERVERBIN)/backend
$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
for file in $(RBACKENDS); do \
@@ -13,7 +13,7 @@
done
for file in $(UBACKENDS); do \
$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-@@ -150,7 +150,7 @@ install-exec: $(INSTALLXPC)
+@@ -142,7 +142,7 @@ install-exec: $(INSTALLXPC)
install-xpc: ipp
echo Installing XPC backends in $(SERVERBIN)/apple
$(INSTALL_DIR) -m 755 $(SERVERBIN)/apple
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/patches/patch-ai
--- a/print/cups-base/patches/patch-ai Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/patches/patch-ai Tue May 26 08:36:55 2020 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-ai,v 1.2 2020/05/26 08:36:56 triaxx Exp $
Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
--- notifier/Makefile.orig 2013-05-29 11:51:34.000000000 +0000
+++ notifier/Makefile
-@@ -62,6 +62,8 @@ install: all install-data install-header
+@@ -56,6 +56,8 @@ install: all install-data install-header
#
install-data:
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/patches/patch-airprint-conf_mime.convs.in
--- a/print/cups-base/patches/patch-airprint-conf_mime.convs.in Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/patches/patch-airprint-conf_mime.convs.in Tue May 26 08:36:55 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-airprint-conf_mime.convs.in,v 1.1 2018/07/24 12:19:21 bouyer Exp $
+$NetBSD: patch-airprint-conf_mime.convs.in,v 1.2 2020/05/26 08:36:56 triaxx Exp $
From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter%gmail.com@localhost>
@@ -25,7 +25,7 @@
index bffd04f84..33ce812e3 100644
--- conf/mime.convs.in.orig
+++ conf/mime.convs.in
-@@ -47,6 +47,9 @@ application/postscript application/vnd.cups-postscript 66 pstops
+@@ -44,6 +44,9 @@ application/postscript application/vnd.cups-postscript 66 pstops
application/vnd.cups-raster image/pwg-raster 100 rastertopwg
application/vnd.cups-raster image/urf 100 rastertopwg
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/patches/patch-airprint-scheduler_dirsvc.c
--- a/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c Tue May 26 08:36:55 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-airprint-scheduler_dirsvc.c,v 1.1 2018/07/24 12:19:21 bouyer Exp $
+$NetBSD: patch-airprint-scheduler_dirsvc.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $
From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001
From: Till Kamppeter <till.kamppeter%gmail.com@localhost>
@@ -25,7 +25,7 @@
index 3dab90ca9..f21942af3 100644
--- scheduler/dirsvc.c.orig
+++ scheduler/dirsvc.c
-@@ -443,6 +443,12 @@ dnssdBuildTxtRecord(
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
keyvalue[count ][0] = "pdl";
keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/patches/patch-at
--- a/print/cups-base/patches/patch-at Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/patches/patch-at Tue May 26 08:36:55 2020 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-at,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-at,v 1.2 2020/05/26 08:36:56 triaxx Exp $
Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
--- scheduler/Makefile.orig 2015-02-17 13:10:19.000000000 +0000
+++ scheduler/Makefile
-@@ -145,6 +145,8 @@ install: all install-data install-header
+@@ -138,6 +138,8 @@ install: all install-data install-header
#
install-data:
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/patches/patch-conf_Makefile
--- a/print/cups-base/patches/patch-conf_Makefile Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/patches/patch-conf_Makefile Tue May 26 08:36:55 2020 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-conf_Makefile,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-conf_Makefile,v 1.2 2020/05/26 08:36:56 triaxx Exp $
Don't install the config files (leave it up to pkgsrc).
--- conf/Makefile.orig 2015-02-27 12:30:26.000000000 +0000
+++ conf/Makefile
-@@ -70,22 +70,8 @@ install: all install-data install-header
+@@ -64,22 +64,8 @@ install: all install-data install-header
#
install-data:
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/patches/patch-config-scripts_cups-compiler.m4
--- a/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 Tue May 26 08:36:55 2020 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.2 2018/01/26 17:22:51 jperkin Exp $
+$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.3 2020/05/26 08:36:56 triaxx Exp $
Disable SSP checks, leave pkgsrc to enable/disable it.
PIE needs to be tested with linking.
--- config-scripts/cups-compiler.m4.orig 2017-11-01 14:57:53.000000000 +0000
+++ config-scripts/cups-compiler.m4
-@@ -115,12 +115,13 @@ if test -n "$GCC"; then
+@@ -129,12 +129,13 @@ if test -n "$GCC"; then
AC_MSG_CHECKING(whether compiler supports -fstack-protector)
OLDCFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fstack-protector"
@@ -22,7 +22,7 @@
fi
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
-@@ -137,7 +138,7 @@ if test -n "$GCC"; then
+@@ -151,7 +152,7 @@ if test -n "$GCC"; then
case "$host_os_name" in
darwin*)
CFLAGS="$CFLAGS -fPIE -Wl,-pie"
@@ -31,7 +31,7 @@
PIEFLAGS="-fPIE -Wl,-pie"
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
-@@ -145,7 +146,7 @@ if test -n "$GCC"; then
+@@ -159,7 +160,7 @@ if test -n "$GCC"; then
*)
CFLAGS="$CFLAGS -fPIE -pie"
diff -r eedde96f6d9b -r b9751d91ace1 print/cups-base/patches/patch-config-scripts_cups-directories.m4
--- a/print/cups-base/patches/patch-config-scripts_cups-directories.m4 Tue May 26 07:17:53 2020 +0000
+++ b/print/cups-base/patches/patch-config-scripts_cups-directories.m4 Tue May 26 08:36:55 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-config-scripts_cups-directories.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-config-scripts_cups-directories.m4,v 1.2 2020/05/26 08:36:56 triaxx Exp $
The '$' while loops expand the variables as long as possible so that no
references to other variables occur. This is necessary because fontpath
@@ -11,7 +11,7 @@
--- config-scripts/cups-directories.m4.orig 2017-06-30 15:44:38.000000000 +0000
+++ config-scripts/cups-directories.m4
-@@ -101,7 +101,7 @@ dnl Fix "libdir" variable...
+@@ -97,7 +97,7 @@ dnl Fix "libdir" variable...
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$host_os_name" in
linux*)
@@ -20,7 +20,7 @@
libdir="$exec_prefix/lib64"
fi
;;
Home |
Main Index |
Thread Index |
Old Index