Mon Jan 3 05:58:49 2011 UTC ()
PLIST fix: some files are not installed on Mac OS X; pkglint clean-up


(adam)
diff -r1.172 -r1.173 pkgsrc/print/cups/Makefile
diff -r1.33 -r1.34 pkgsrc/print/cups/PLIST
diff -r1.11 -r1.12 pkgsrc/print/cups/options.mk
cvs diff -r1.172 -r1.173 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2010/12/23 11:44:54 1.172
+++ pkgsrc/print/cups/Makefile 2011/01/03 05:58:49 1.173
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.172 2010/12/23 11:44:54 dsainty Exp $ 1# $NetBSD: Makefile,v 1.173 2011/01/03 05:58:49 adam Exp $
2# 2#
3# The CUPS author is very good about taking back changes into the main 3# The CUPS author is very good about taking back changes into the main
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4# CUPS distribution. The correct place to send patches or bug-fixes is:
5# cups-bugs@cups.org. 5# cups-bugs@cups.org.
6 6
7DISTNAME= cups-${DIST_VERS}-source 7DISTNAME= cups-${DIST_VERS}-source
8PKGNAME= cups-${DIST_VERS:S/-/./g} 8PKGNAME= cups-${DIST_VERS:S/-/./g}
9BASE_VERS= 1.4.4 9BASE_VERS= 1.4.4
10DIST_VERS= ${BASE_VERS} 10DIST_VERS= ${BASE_VERS}
11 11
12CATEGORIES= print 12CATEGORIES= print
13MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 13MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
14 ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 14 ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -28,64 +28,69 @@ CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9 @@ -28,64 +28,69 @@ CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9
28 28
29WRKSRC= ${WRKDIR}/cups-${BASE_VERS} 29WRKSRC= ${WRKDIR}/cups-${BASE_VERS}
30UNLIMIT_RESOURCES= datasize memorysize 30UNLIMIT_RESOURCES= datasize memorysize
31USE_LANGUAGES= c c++ # pdftops is a C++ application 31USE_LANGUAGES= c c++ # pdftops is a C++ application
32USE_PKGLOCALEDIR= yes 32USE_PKGLOCALEDIR= yes
33USE_TOOLS+= aclocal autoconf automake gmake 33USE_TOOLS+= aclocal autoconf automake gmake
34USE_LIBTOOL= yes 34USE_LIBTOOL= yes
35INSTALL_TARGET= installcups 35INSTALL_TARGET= installcups
36# patch-a[jkl] were added for 2.60 36# patch-a[jkl] were added for 2.60
37AUTOCONF_REQD= 2.60 37AUTOCONF_REQD= 2.60
38 38
39GNU_CONFIGURE= yes 39GNU_CONFIGURE= yes
40CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 40CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
41CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} 41CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
42CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 42CONFIGURE_ARGS+= --localstatedir=${VARBASE}
43CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 43CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
44CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 44CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
45CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 45CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
46CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER:Q} 46CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER}
47CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q} 47CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP}
48CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} 48CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
49CONFIGURE_ARGS+= --enable-libpaper 49CONFIGURE_ARGS+= --enable-libpaper
50CONFIGURE_ARGS+= --enable-libtool 50CONFIGURE_ARGS+= --enable-libtool
51CONFIGURE_ARGS+= --enable-jpeg 51CONFIGURE_ARGS+= --enable-jpeg
52CONFIGURE_ARGS+= --enable-png 52CONFIGURE_ARGS+= --enable-png
53CONFIGURE_ARGS+= --enable-tiff 53CONFIGURE_ARGS+= --enable-tiff
54CONFIGURE_ARGS+= --enable-ssl 54CONFIGURE_ARGS+= --enable-ssl
55CONFIGURE_ARGS+= --enable-openssl 55CONFIGURE_ARGS+= --enable-openssl
56CONFIGURE_ARGS+= --enable-bannertops 56CONFIGURE_ARGS+= --enable-bannertops
57CONFIGURE_ARGS+= --enable-texttops 57CONFIGURE_ARGS+= --enable-texttops
58CONFIGURE_ARGS+= --with-manext=bsd 58CONFIGURE_ARGS+= --with-manext=bsd
59CONFIGURE_ARGS+= --without-icondir 59CONFIGURE_ARGS+= --without-icondir
60CONFIGURE_ARGS+= --without-menudir 60CONFIGURE_ARGS+= --without-menudir
61CONFIGURE_ARGS+= --without-perl 61CONFIGURE_ARGS+= --without-perl
62CONFIGURE_ARGS+= --without-php 62CONFIGURE_ARGS+= --without-php
63CONFIGURE_ARGS+= --without-python 63CONFIGURE_ARGS+= --without-python
64CONFIGURE_ARGS+= --without-java 64CONFIGURE_ARGS+= --without-java
65 65
66CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 66CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
67 67
68.include "../../mk/bsd.prefs.mk" 68.include "../../mk/bsd.prefs.mk"
69.include "options.mk" 69.include "options.mk"
70 70
 71PLIST_VARS+= notmac
 72.if ${OPSYS} != "Darwin"
 73PLIST.notmac= yes
 74.endif
 75
71# CUPS_USER username of the CUPS administrator 76# CUPS_USER username of the CUPS administrator
72# CUPS_GROUP group of the CUPS administrator 77# CUPS_GROUP group of the CUPS administrator
73# 78#
74CUPS_USER?= lp 79CUPS_USER?= lp
75CUPS_GROUP?= lp 80CUPS_GROUP?= lp
76CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP} 81CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP}
77FILES_SUBST+= CUPS_USER=${CUPS_USER:Q} 82FILES_SUBST+= CUPS_USER=${CUPS_USER}
78FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP:Q} 83FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
79FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q} 84FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
80 85
81PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS 86PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS
82PKG_USERS_VARS+= CUPS_USER 87PKG_USERS_VARS+= CUPS_USER
83 88
84BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE 89BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE
85 90
86DOCDIR= ${PREFIX}/share/doc/cups 91DOCDIR= ${PREFIX}/share/doc/cups
87EGDIR= ${PREFIX}/share/examples/cups 92EGDIR= ${PREFIX}/share/examples/cups
88MIMEDIR= ${PREFIX}/share/cups/mime 93MIMEDIR= ${PREFIX}/share/cups/mime
89PKG_SYSCONFSUBDIR= cups 94PKG_SYSCONFSUBDIR= cups
90CUPS_CONFDIR= ${PKG_SYSCONFDIR} 95CUPS_CONFDIR= ${PKG_SYSCONFDIR}
91CUPS_LOGDIR= ${VARBASE}/log/cups 96CUPS_LOGDIR= ${VARBASE}/log/cups
@@ -123,27 +128,27 @@ OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REA @@ -123,27 +128,27 @@ OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REA
123 128
124SUBST_CLASSES+= paths 129SUBST_CLASSES+= paths
125SUBST_FILES.paths= ${WRKDIR}/cups.pam 130SUBST_FILES.paths= ${WRKDIR}/cups.pam
126SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' 131SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g'
127SUBST_STAGE.paths= post-patch 132SUBST_STAGE.paths= post-patch
128 133
129SUBST_CLASSES+= rpathfix 134SUBST_CLASSES+= rpathfix
130SUBST_FILES.rpathfix= cups-config.in 135SUBST_FILES.rpathfix= cups-config.in
131SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. 136SUBST_MESSAGE.rpathfix= Adding rpath to cups-config.
132SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' 137SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
133SUBST_STAGE.rpathfix= post-patch 138SUBST_STAGE.rpathfix= post-patch
134 139
135INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} 140INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR}
136INSTALL_ENV+= DSTROOT=${DESTDIR:Q} 141INSTALL_ENV+= DSTROOT=${DESTDIR}
137 142
138pre-configure: 143pre-configure:
139.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) 144.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
140 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" 145 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
141 exit 1 146 exit 1
142.endif 147.endif
143 cd ${WRKSRC} && aclocal && autoconf 148 cd ${WRKSRC} && aclocal && autoconf
144 149
145post-extract: 150post-extract:
146 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 151 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
147 152
148post-install: 153post-install:
149 set -e; for file in LICENSE.txt README.txt; do \ 154 set -e; for file in LICENSE.txt README.txt; do \
cvs diff -r1.33 -r1.34 pkgsrc/print/cups/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/PLIST 2010/07/20 00:01:22 1.33
+++ pkgsrc/print/cups/Attic/PLIST 2011/01/03 05:58:49 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.33 2010/07/20 00:01:22 sbd Exp $ 1@comment $NetBSD: PLIST,v 1.34 2011/01/03 05:58:49 adam Exp $
2bin/cancel 2bin/cancel
3bin/cups-config 3bin/cups-config
4bin/cupstestdsc 4bin/cupstestdsc
5bin/cupstestppd 5bin/cupstestppd
6bin/lp 6bin/lp
7bin/lpoptions 7bin/lpoptions
8bin/lppasswd 8bin/lppasswd
9bin/lpq 9bin/lpq
10bin/lpr 10bin/lpr
11bin/lprm 11bin/lprm
12bin/lpstat 12bin/lpstat
13bin/ppdc 13bin/ppdc
14bin/ppdhtml 14bin/ppdhtml
@@ -36,49 +36,49 @@ include/cups/sidechannel.h @@ -36,49 +36,49 @@ include/cups/sidechannel.h
36include/cups/transcode.h 36include/cups/transcode.h
37include/cups/versioning.h 37include/cups/versioning.h
38lib/libcups.la 38lib/libcups.la
39lib/libcupscgi.la 39lib/libcupscgi.la
40lib/libcupsdriver.la 40lib/libcupsdriver.la
41lib/libcupsimage.la 41lib/libcupsimage.la
42lib/libcupsmime.la 42lib/libcupsmime.la
43lib/libcupsppdc.la 43lib/libcupsppdc.la
44${PLIST.dnssd}libexec/cups/backend/dnssd 44${PLIST.dnssd}libexec/cups/backend/dnssd
45libexec/cups/backend/http 45libexec/cups/backend/http
46libexec/cups/backend/ipp 46libexec/cups/backend/ipp
47libexec/cups/backend/lpd 47libexec/cups/backend/lpd
48${PLIST.dnssd}libexec/cups/backend/mdns 48${PLIST.dnssd}libexec/cups/backend/mdns
49libexec/cups/backend/parallel 49${PLIST.notmac}libexec/cups/backend/parallel
50libexec/cups/backend/scsi 50${PLIST.notmac}libexec/cups/backend/scsi
51libexec/cups/backend/serial 51libexec/cups/backend/serial
52libexec/cups/backend/snmp 52libexec/cups/backend/snmp
53libexec/cups/backend/socket 53libexec/cups/backend/socket
54libexec/cups/backend/usb 54libexec/cups/backend/usb
55libexec/cups/cgi-bin/admin.cgi 55libexec/cups/cgi-bin/admin.cgi
56libexec/cups/cgi-bin/classes.cgi 56libexec/cups/cgi-bin/classes.cgi
57libexec/cups/cgi-bin/help.cgi 57libexec/cups/cgi-bin/help.cgi
58libexec/cups/cgi-bin/jobs.cgi 58libexec/cups/cgi-bin/jobs.cgi
59libexec/cups/cgi-bin/printers.cgi 59libexec/cups/cgi-bin/printers.cgi
60libexec/cups/daemon/cups-deviced 60libexec/cups/daemon/cups-deviced
61libexec/cups/daemon/cups-driverd 61libexec/cups/daemon/cups-driverd
62libexec/cups/daemon/cups-lpd 62libexec/cups/daemon/cups-lpd
63libexec/cups/daemon/cups-polld 63libexec/cups/daemon/cups-polld
64libexec/cups/filter/bannertops 64libexec/cups/filter/bannertops
65libexec/cups/filter/commandtoescpx 65libexec/cups/filter/commandtoescpx
66libexec/cups/filter/commandtopclx 66libexec/cups/filter/commandtopclx
67libexec/cups/filter/commandtops 67libexec/cups/filter/commandtops
68libexec/cups/filter/gziptoany 68libexec/cups/filter/gziptoany
69libexec/cups/filter/hpgltops 69libexec/cups/filter/hpgltops
70libexec/cups/filter/imagetops 70${PLIST.notmac}libexec/cups/filter/imagetops
71libexec/cups/filter/imagetoraster 71${PLIST.notmac}libexec/cups/filter/imagetoraster
72libexec/cups/filter/pdftops 72libexec/cups/filter/pdftops
73libexec/cups/filter/pstops 73libexec/cups/filter/pstops
74libexec/cups/filter/rastertodymo 74libexec/cups/filter/rastertodymo
75libexec/cups/filter/rastertoepson 75libexec/cups/filter/rastertoepson
76libexec/cups/filter/rastertoescpx 76libexec/cups/filter/rastertoescpx
77libexec/cups/filter/rastertohp 77libexec/cups/filter/rastertohp
78libexec/cups/filter/rastertolabel 78libexec/cups/filter/rastertolabel
79libexec/cups/filter/rastertopclx 79libexec/cups/filter/rastertopclx
80libexec/cups/filter/texttops 80libexec/cups/filter/texttops
81libexec/cups/monitor/bcp 81libexec/cups/monitor/bcp
82libexec/cups/monitor/tbcp 82libexec/cups/monitor/tbcp
83${PLIST.dbus}libexec/cups/notifier/dbus 83${PLIST.dbus}libexec/cups/notifier/dbus
84libexec/cups/notifier/mailto 84libexec/cups/notifier/mailto
cvs diff -r1.11 -r1.12 pkgsrc/print/cups/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/options.mk 2010/07/14 11:25:19 1.11
+++ pkgsrc/print/cups/Attic/options.mk 2011/01/03 05:58:49 1.12
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: options.mk,v 1.11 2010/07/14 11:25:19 sbd Exp $ 1# $NetBSD: options.mk,v 1.12 2011/01/03 05:58:49 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cups 3PKG_OPTIONS_VAR= PKG_OPTIONS.cups
4PKG_OPTIONS_REQUIRED_GROUPS= pdftops 4PKG_OPTIONS_REQUIRED_GROUPS= pdftops
5PKG_OPTIONS_GROUP.pdftops= ghostscript poppler 5PKG_OPTIONS_GROUP.pdftops= ghostscript poppler
6PKG_SUPPORTED_OPTIONS= acl dbus dnssd kerberos libusb pam slp tcpwrappers threads 6PKG_SUPPORTED_OPTIONS= acl dbus dnssd kerberos libusb pam slp tcpwrappers threads
7PKG_SUGGESTED_OPTIONS= dbus dnssd kerberos libusb poppler slp 7PKG_SUGGESTED_OPTIONS= dbus dnssd kerberos libusb poppler slp
8PKG_OPTIONS_LEGACY_OPTS+= xpdf:poppler gs:ghostscript 8PKG_OPTIONS_LEGACY_OPTS+= xpdf:poppler gs:ghostscript
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12MESSAGE_SRC= ${PKGDIR}/MESSAGE 12MESSAGE_SRC= ${PKGDIR}/MESSAGE
13 13
14.if !empty(PKG_OPTIONS:Macl) 14.if !empty(PKG_OPTIONS:Macl)
15CONFIGURE_ARGS+= --enable-acl 15CONFIGURE_ARGS+= --enable-acl
16.else 16.else
17CONFIGURE_ARGS+= --disable-acl 17CONFIGURE_ARGS+= --disable-acl
18.endif 18.endif
19 19
20PLIST_VARS+= dbus 20PLIST_VARS+= dbus
21.if !empty(PKG_OPTIONS:Mdbus) 21.if !empty(PKG_OPTIONS:Mdbus)
22USE_TOOLS+= pkg-config 22USE_TOOLS+= pkg-config
23. include "../../sysutils/dbus/buildlink3.mk" 23. include "../../sysutils/dbus/buildlink3.mk"
24CONFIGURE_ARGS+= --enable-dbus 24CONFIGURE_ARGS+= --enable-dbus
25PLIST.dbus= yes 25PLIST.dbus= yes
26.else 26.else
27CONFIGURE_ARGS+= --disable-dbus 27CONFIGURE_ARGS+= --disable-dbus
28.endif 28.endif
29 29
30PLIST_VARS+= dnssd 30PLIST_VARS+= dnssd
31.if !empty(PKG_OPTIONS:Mdnssd) 31.if !empty(PKG_OPTIONS:Mdnssd)
32.include "../../net/mDNSResponder/buildlink3.mk" 32.include "../../net/mDNSResponder/buildlink3.mk"
33CONFIGURE_ARGS+= --enable-dnssd 33CONFIGURE_ARGS+= --enable-dnssd