Fri Jun 16 23:42:21 2023 UTC ()
libcups: commit forgotten file


(wiz)
diff -r1.24 -r1.25 pkgsrc/print/libcups/Makefile
diff -r1.2 -r1.3 pkgsrc/print/libcups/PLIST
cvs diff -r1.24 -r1.25 pkgsrc/print/libcups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libcups/Makefile 2023/06/16 23:37:13 1.24
+++ pkgsrc/print/libcups/Makefile 2023/06/16 23:42:21 1.25
@@ -1,49 +1,47 @@ @@ -1,49 +1,47 @@
1# $NetBSD: Makefile,v 1.24 2023/06/16 23:37:13 ryoon Exp $ 1# $NetBSD: Makefile,v 1.25 2023/06/16 23:42:21 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
15GITHUB_RELEASE= v${PKGVERSION_NOREV} 15GITHUB_RELEASE= v${PKGVERSION_NOREV}
16 16
17CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 17CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
18 18
19WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 19WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
20UNLIMIT_RESOURCES= datasize memorysize 20UNLIMIT_RESOURCES= datasize memorysize
21USE_LANGUAGES= c c++ # pdftops is a C++ application 21USE_LANGUAGES= c c++ # pdftops is a C++ application
22USE_LIBTOOL= yes 
23USE_PKGLOCALEDIR= yes 22USE_PKGLOCALEDIR= yes
24USE_TOOLS+= aclocal autoconf automake gmake pkg-config 23USE_TOOLS+= aclocal autoconf automake gmake pkg-config
25GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
26CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 25CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
28CONFIGURE_ARGS+= --localstatedir=${VARBASE} 27CONFIGURE_ARGS+= --localstatedir=${VARBASE}
29CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 28CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
30CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 29CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
31CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 30CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
32CONFIGURE_ARGS+= --with-components=libcups 31CONFIGURE_ARGS+= --with-components=libcups
33CONFIGURE_ARGS+= --enable-libpaper 32CONFIGURE_ARGS+= --enable-libpaper
34CONFIGURE_ARGS+= --with-exe-file-perm=0755 33CONFIGURE_ARGS+= --with-exe-file-perm=0755
35CONFIGURE_ARGS+= --with-tls=gnutls 34CONFIGURE_ARGS+= --with-tls=gnutls
36CONFIGURE_ARGS+= --enable-libtool_unsupported=${LIBTOOL} 
37 35
38CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 36CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
39 37
40.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
41.include "options.mk" 39.include "options.mk"
42 40
43BUILD_DEFS+= VARBASE 41BUILD_DEFS+= VARBASE
44 42
45# 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.
46CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no 44CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create=no
47 45
48CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 46CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
49 47
@@ -58,27 +56,27 @@ PKG_SYSCONFSUBDIR= cups @@ -58,27 +56,27 @@ PKG_SYSCONFSUBDIR= cups
58CUPS_CACHE= ${VARBASE}/cache/cups 56CUPS_CACHE= ${VARBASE}/cache/cups
59 57
60.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == powerpc 58.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == powerpc
61SUBST_CLASSES+= piefix 59SUBST_CLASSES+= piefix
62SUBST_FILES.piefix= Makedefs.in 60SUBST_FILES.piefix= Makedefs.in
63SUBST_MESSAGE.piefix= Removing PIE flags 61SUBST_MESSAGE.piefix= Removing PIE flags
64SUBST_SED.piefix= -e 's|@PIEFLAGS@||g' 62SUBST_SED.piefix= -e 's|@PIEFLAGS@||g'
65SUBST_STAGE.piefix= pre-configure 63SUBST_STAGE.piefix= pre-configure
66.endif 64.endif
67 65
68PKGCONFIG_OVERRIDE+= cups.pc 66PKGCONFIG_OVERRIDE+= cups.pc
69PKGCONFIG_OVERRIDE_STAGE= post-configure 67PKGCONFIG_OVERRIDE_STAGE= post-configure
70 68
71AUTOCONF_REQD= 2.71 69AUTOCONF_REQD+= 2.71
72pre-configure: 70pre-configure:
73 cd ${WRKSRC} && aclocal && autoconf 71 cd ${WRKSRC} && aclocal && autoconf
74 72
75.include "../../converters/libiconv/buildlink3.mk" 73.include "../../converters/libiconv/buildlink3.mk"
76.include "../../devel/zlib/buildlink3.mk" 74.include "../../devel/zlib/buildlink3.mk"
77.include "../../graphics/png/buildlink3.mk" 75.include "../../graphics/png/buildlink3.mk"
78.include "../../graphics/tiff/buildlink3.mk" 76.include "../../graphics/tiff/buildlink3.mk"
79.include "../../print/libpaper/buildlink3.mk" 77.include "../../print/libpaper/buildlink3.mk"
80.include "../../security/gnutls/buildlink3.mk" 78.include "../../security/gnutls/buildlink3.mk"
81.include "../../textproc/libunistring/buildlink3.mk" 79.include "../../textproc/libunistring/buildlink3.mk"
82.include "../../mk/curses.buildlink3.mk" 80.include "../../mk/curses.buildlink3.mk"
83.include "../../mk/jpeg.buildlink3.mk" 81.include "../../mk/jpeg.buildlink3.mk"
84.include "../../mk/pthread.buildlink3.mk" 82.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/print/libcups/PLIST (expand / switch to unified diff)

--- pkgsrc/print/libcups/PLIST 2022/05/10 20:47:38 1.2
+++ pkgsrc/print/libcups/PLIST 2023/06/16 23:42:21 1.3
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1@comment $NetBSD: PLIST,v 1.2 2022/05/10 20:47:38 markd Exp $ 1@comment $NetBSD: PLIST,v 1.3 2023/06/16 23:42:21 wiz Exp $
2bin/cups-config 2bin/cups-config
3include/cups/adminutil.h 3include/cups/adminutil.h
4include/cups/array.h 4include/cups/array.h
5include/cups/backend.h 5include/cups/backend.h
6include/cups/cups.h 6include/cups/cups.h
7include/cups/dir.h 7include/cups/dir.h
8include/cups/file.h 8include/cups/file.h
9include/cups/http.h 9include/cups/http.h
10include/cups/ipp.h 10include/cups/ipp.h
11include/cups/language.h 11include/cups/language.h
12include/cups/ppd.h 12include/cups/ppd.h
13include/cups/pwg.h 13include/cups/pwg.h
14include/cups/raster.h 14include/cups/raster.h
15include/cups/sidechannel.h 15include/cups/sidechannel.h
16include/cups/transcode.h 16include/cups/transcode.h
17include/cups/versioning.h 17include/cups/versioning.h
18lib/libcups.la 18lib/libcups.so
19lib/libcupsimage.la 19lib/libcups.so.2
20lib/pkgconfig/cups.pc 20lib/pkgconfig/cups.pc
21share/locale/ca/cups_ca.po 21share/locale/ca/cups_ca.po
22share/locale/cs/cups_cs.po 22share/locale/cs/cups_cs.po
23share/locale/da/cups_da.po 23share/locale/da/cups_da.po
24share/locale/de/cups_de.po 24share/locale/de/cups_de.po
25share/locale/en/cups_en.po 25share/locale/en/cups_en.po
26share/locale/es/cups_es.po 26share/locale/es/cups_es.po
27share/locale/fr/cups_fr.po 27share/locale/fr/cups_fr.po
28share/locale/it/cups_it.po 28share/locale/it/cups_it.po
29share/locale/ja/cups_ja.po 29share/locale/ja/cups_ja.po
30share/locale/pt_BR/cups_pt_BR.po 30share/locale/pt_BR/cups_pt_BR.po
31share/locale/ru/cups_ru.po 31share/locale/ru/cups_ru.po
32share/locale/zh_CN/cups_zh_CN.po 32share/locale/zh_CN/cups_zh_CN.po