pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print/cups
Module Name: pkgsrc
Committed By: adam
Date: Fri Dec 30 07:08:34 UTC 2016
Modified Files:
pkgsrc/print/cups: Makefile PLIST buildlink3.mk options.mk
Removed Files:
pkgsrc/print/cups: PLIST.Darwin
Log Message:
Added avahi as an option so ippfind can be build; unified PLIST and cleanup for Darwin
To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 pkgsrc/print/cups/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/print/cups/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/print/cups/PLIST.Darwin
cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/cups/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/cups/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/cups/Makefile
diff -u pkgsrc/print/cups/Makefile:1.236 pkgsrc/print/cups/Makefile:1.237
--- pkgsrc/print/cups/Makefile:1.236 Mon Dec 12 14:26:15 2016
+++ pkgsrc/print/cups/Makefile Fri Dec 30 07:08:34 2016
@@ -1,24 +1,25 @@
-# $NetBSD: Makefile,v 1.236 2016/12/12 14:26:15 wiz Exp $
+# $NetBSD: Makefile,v 1.237 2016/12/30 07:08:34 adam Exp $
DISTNAME= cups-2.2.1-source
PKGNAME= ${DISTNAME:S/-source//}
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
-GITHUB_RELEASE= v${PKGVERSION_NOREV}
MAINTAINER= sbd%NetBSD.org@localhost
HOMEPAGE= http://www.cups.org/
COMMENT= Common UNIX Printing System
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
+GITHUB_RELEASE= v${PKGVERSION_NOREV}
+
CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
UNLIMIT_RESOURCES= datasize memorysize
USE_LANGUAGES= c c++ # pdftops is a C++ application
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= aclocal autoconf automake gmake
USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
+USE_TOOLS+= aclocal autoconf automake gmake pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
@@ -34,6 +35,7 @@ CONFIGURE_ARGS+= --enable-libpaper
CONFIGURE_ARGS+= --enable-libtool
CONFIGURE_ARGS+= --enable-ssl
CONFIGURE_ARGS+= --with-manext=bsd
+CONFIGURE_ARGS+= --without-bundledir
CONFIGURE_ARGS+= --without-icondir
CONFIGURE_ARGS+= --without-menudir
CONFIGURE_ARGS+= --without-perl
@@ -55,11 +57,6 @@ CONFIGURE_ENV+= ac_cv_func_epoll_create
.endif
LIBS+= ${BUILDLINK_LDADD.iconv}
-PLIST_VARS+= notmac
-.if ${OPSYS} != "Darwin"
-PLIST.notmac= yes
-.endif
-
# Avoid the following error when compiling with clang.
# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
# can not be used when making a shared object; recompile with -fPIC
@@ -77,7 +74,7 @@ FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS
-PKG_USERS_VARS+= CUPS_USER
+PKG_USERS_VARS= CUPS_USER
BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE
@@ -133,10 +130,6 @@ SUBST_SED.piefix= -e 's|@PIEFLAGS@||g'
SUBST_STAGE.piefix= post-patch
.endif
-.if ${OPSYS} == "Darwin"
-PLIST_SRC= PLIST.Darwin
-.endif
-
INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
INSTALL_ENV+= DSTROOT=${DESTDIR}
@@ -171,9 +164,9 @@ post-install:
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/libpaper/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../print/libpaper/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/print/cups/PLIST
diff -u pkgsrc/print/cups/PLIST:1.57 pkgsrc/print/cups/PLIST:1.58
--- pkgsrc/print/cups/PLIST:1.57 Sun Oct 9 08:33:16 2016
+++ pkgsrc/print/cups/PLIST Fri Dec 30 07:08:34 2016
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.57 2016/10/09 08:33:16 leot Exp $
+@comment $NetBSD: PLIST,v 1.58 2016/12/30 07:08:34 adam Exp $
bin/cancel
bin/cups-config
bin/cupstestdsc
bin/cupstestppd
+${PLIST.ippfind}bin/ippfind
bin/ipptool
bin/lp
bin/lpoptions
@@ -35,6 +36,10 @@ lib/libcupscgi.la
lib/libcupsimage.la
lib/libcupsmime.la
lib/libcupsppdc.la
+${PLIST.apple}libexec/cups/apple/http
+${PLIST.apple}libexec/cups/apple/https
+${PLIST.apple}libexec/cups/apple/ipp
+${PLIST.apple}libexec/cups/apple/ipps
${PLIST.dnssd}libexec/cups/backend/dnssd
libexec/cups/backend/http
libexec/cups/backend/https
@@ -72,6 +77,7 @@ man/man1/cups-config.1
man/man1/cups.1
man/man1/cupstestdsc.1
man/man1/cupstestppd.1
+${PLIST.ippfind}man/man1/ippfind.1
man/man1/ipptool.1
man/man1/lp.1
man/man1/lpoptions.1
@@ -711,8 +717,8 @@ share/doc/cups/pt_BR/index.html
share/doc/cups/robots.txt
share/doc/cups/ru/index.html
share/examples/cups/cups-files.conf
-share/examples/cups/cupsd.conf
${PLIST.pam}share/examples/cups/cups.pam
+share/examples/cups/cupsd.conf
share/examples/cups/snmp.conf
share/locale/ca/cups_ca.po
share/locale/cs/cups_cs.po
Index: pkgsrc/print/cups/buildlink3.mk
diff -u pkgsrc/print/cups/buildlink3.mk:1.36 pkgsrc/print/cups/buildlink3.mk:1.37
--- pkgsrc/print/cups/buildlink3.mk:1.36 Tue Sep 20 11:12:22 2016
+++ pkgsrc/print/cups/buildlink3.mk Fri Dec 30 07:08:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2016/09/20 11:12:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2016/12/30 07:08:34 adam Exp $
BUILDLINK_TREE+= cups
@@ -20,6 +20,10 @@ pkgbase := cups
.include "../../net/mDNSResponder/buildlink3.mk"
.endif
+.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.cups:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+.endif
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
Index: pkgsrc/print/cups/options.mk
diff -u pkgsrc/print/cups/options.mk:1.18 pkgsrc/print/cups/options.mk:1.19
--- pkgsrc/print/cups/options.mk:1.18 Sat Aug 23 20:02:11 2014
+++ pkgsrc/print/cups/options.mk Fri Dec 30 07:08:34 2016
@@ -1,13 +1,23 @@
-# $NetBSD: options.mk,v 1.18 2014/08/23 20:02:11 schnoebe Exp $
+# $NetBSD: options.mk,v 1.19 2016/12/30 07:08:34 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.cups
-PKG_SUPPORTED_OPTIONS= acl dbus dnssd kerberos pam tcpwrappers
-PKG_SUGGESTED_OPTIONS= dbus dnssd kerberos
+PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers
+PKG_SUGGESTED_OPTIONS= dnssd kerberos
+PLIST_VARS+= apple dbus dnssd ippfind libusb pam
+
+.if ${OPSYS} == "Darwin"
+PLIST.apple= yes
+PLIST.ippfind= yes
+.else
+# CUPS on Darwin does not support DBus and libusb
+PKG_SUPPORTED_OPTIONS+= avahi dbus
+PKG_SUGGESTED_OPTIONS+= dbus
# Neither DragonFly nor SunOS can build libusb1
-.if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS"
-PKG_SUPPORTED_OPTIONS+= libusb
-PKG_SUGGESTED_OPTIONS+= libusb
+. if ${OPSYS} != "DragonFly" && ${OPSYS} != "SunOS"
+PKG_SUPPORTED_OPTIONS+= libusb
+PKG_SUGGESTED_OPTIONS+= libusb
+. endif
.endif
.include "../../mk/bsd.options.mk"
@@ -20,9 +30,15 @@ CONFIGURE_ARGS+= --enable-acl
CONFIGURE_ARGS+= --disable-acl
.endif
-PLIST_VARS+= dbus
+.if !empty(PKG_OPTIONS:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-avahi
+PLIST.ippfind= yes
+.else
+CONFIGURE_ARGS+= --disable-avahi
+.endif
+
.if !empty(PKG_OPTIONS:Mdbus)
-USE_TOOLS+= pkg-config
. include "../../sysutils/dbus/buildlink3.mk"
CONFIGURE_ARGS+= --enable-dbus
PLIST.dbus= yes
@@ -30,7 +46,6 @@ PLIST.dbus= yes
CONFIGURE_ARGS+= --disable-dbus
.endif
-PLIST_VARS+= dnssd
.if !empty(PKG_OPTIONS:Mdnssd)
.include "../../net/mDNSResponder/buildlink3.mk"
CONFIGURE_ARGS+= --enable-dnssd
@@ -46,18 +61,15 @@ CONFIGURE_ARGS+= --enable-gssapi
CONFIGURE_ARGS+= --disable-gssapi
.endif
-PLIST_VARS+= libusb
.if !empty(PKG_OPTIONS:Mlibusb)
.include "../../devel/libusb1/buildlink3.mk"
CONFIGURE_ARGS+= --enable-libusb
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb
-USE_TOOLS+= pkg-config
PLIST.libusb= yes
.else
CONFIGURE_ARGS+= --disable-libusb
.endif
-PLIST_VARS+= pam
.if !empty(PKG_OPTIONS:Mpam)
. include "../../mk/pam.buildlink3.mk"
CONFIGURE_ARGS+= --enable-pam
Home |
Main Index |
Thread Index |
Old Index