Tue Jun 3 15:08:53 2014 UTC ()
Update MASTER_SITES. From Thomas Mueller.


(wiz)
diff -r1.207 -r1.208 pkgsrc/print/cups/Makefile
cvs diff -r1.207 -r1.208 pkgsrc/print/cups/Makefile (switch to unified diff)

--- pkgsrc/print/cups/Makefile 2014/06/01 06:19:02 1.207
+++ pkgsrc/print/cups/Makefile 2014/06/03 15:08:52 1.208
@@ -1,194 +1,191 @@ @@ -1,194 +1,191 @@
1# $NetBSD: Makefile,v 1.207 2014/06/01 06:19:02 ryoon Exp $ 1# $NetBSD: Makefile,v 1.208 2014/06/03 15:08:52 wiz 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.5.4 9BASE_VERS= 1.5.4
10DIST_VERS= ${BASE_VERS} 10DIST_VERS= ${BASE_VERS}
11 
12PKGREVISION= 12 11PKGREVISION= 12
13CATEGORIES= print 12CATEGORIES= print
14MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 13MASTER_SITES= http://www.cups.org/software/${BASE_VERS}/
15 ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 
16 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ 
17EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
18 15
19MAINTAINER= sbd@NetBSD.org 16MAINTAINER= sbd@NetBSD.org
20HOMEPAGE= http://www.cups.org/ 17HOMEPAGE= http://www.cups.org/
21COMMENT= Common UNIX Printing System 18COMMENT= Common UNIX Printing System
22LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 19LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
23 20
24CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* 21CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]*
25 22
26#PKG_INSTALLATION_TYPES= overwrite pkgviews 23#PKG_INSTALLATION_TYPES= overwrite pkgviews
27 24
28WRKSRC= ${WRKDIR}/cups-${BASE_VERS} 25WRKSRC= ${WRKDIR}/cups-${BASE_VERS}
29UNLIMIT_RESOURCES= datasize memorysize 26UNLIMIT_RESOURCES= datasize memorysize
30USE_LANGUAGES= c c++ # pdftops is a C++ application 27USE_LANGUAGES= c c++ # pdftops is a C++ application
31USE_PKGLOCALEDIR= yes 28USE_PKGLOCALEDIR= yes
32USE_TOOLS+= aclocal autoconf automake gmake 29USE_TOOLS+= aclocal autoconf automake gmake
33USE_LIBTOOL= yes 30USE_LIBTOOL= yes
34# patch-a[jkl] were added for 2.60 31# patch-a[jkl] were added for 2.60
35AUTOCONF_REQD= 2.60 32AUTOCONF_REQD= 2.60
36 33
37GNU_CONFIGURE= yes 34GNU_CONFIGURE= yes
38CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 35CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
39CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 36CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
40CONFIGURE_ARGS+= --localstatedir=${VARBASE} 37CONFIGURE_ARGS+= --localstatedir=${VARBASE}
41CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 38CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
42CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 39CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
43CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 40CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
44CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} 41CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER}
45CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} 42CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP}
46CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} 43CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
47CONFIGURE_ARGS+= --enable-libpaper 44CONFIGURE_ARGS+= --enable-libpaper
48CONFIGURE_ARGS+= --enable-libtool 45CONFIGURE_ARGS+= --enable-libtool
49CONFIGURE_ARGS+= --enable-jpeg 46CONFIGURE_ARGS+= --enable-jpeg
50CONFIGURE_ARGS+= --enable-png 47CONFIGURE_ARGS+= --enable-png
51CONFIGURE_ARGS+= --enable-tiff 48CONFIGURE_ARGS+= --enable-tiff
52CONFIGURE_ARGS+= --enable-ssl 49CONFIGURE_ARGS+= --enable-ssl
53CONFIGURE_ARGS+= --enable-openssl 50CONFIGURE_ARGS+= --enable-openssl
54CONFIGURE_ARGS+= --enable-bannertops 51CONFIGURE_ARGS+= --enable-bannertops
55CONFIGURE_ARGS+= --enable-texttops 52CONFIGURE_ARGS+= --enable-texttops
56CONFIGURE_ARGS+= --with-manext=bsd 53CONFIGURE_ARGS+= --with-manext=bsd
57CONFIGURE_ARGS+= --without-icondir 54CONFIGURE_ARGS+= --without-icondir
58CONFIGURE_ARGS+= --without-menudir 55CONFIGURE_ARGS+= --without-menudir
59CONFIGURE_ARGS+= --without-perl 56CONFIGURE_ARGS+= --without-perl
60CONFIGURE_ARGS+= --without-php 57CONFIGURE_ARGS+= --without-php
61CONFIGURE_ARGS+= --without-python 58CONFIGURE_ARGS+= --without-python
62CONFIGURE_ARGS+= --without-java 59CONFIGURE_ARGS+= --without-java
63CONFIGURE_ARGS+= --disable-gssapi 60CONFIGURE_ARGS+= --disable-gssapi
64CONFIGURE_ARGS+= --disable-gnutls 61CONFIGURE_ARGS+= --disable-gnutls
65CONFIGURE_ARGS+= --disable-ldap 62CONFIGURE_ARGS+= --disable-ldap
66 63
67CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 64CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
68 65
69.include "../../mk/bsd.prefs.mk" 66.include "../../mk/bsd.prefs.mk"
70.include "options.mk" 67.include "options.mk"
71 68
72.if ${OPSYS} == "SunOS" 69.if ${OPSYS} == "SunOS"
73LIBS_SSP = -lssp_nonshared -lssp 70LIBS_SSP = -lssp_nonshared -lssp
74CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} 71CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q}
75LIBS.SunOS+= -liconv 72LIBS.SunOS+= -liconv
76.endif 73.endif
77 74
78PLIST_VARS+= notmac 75PLIST_VARS+= notmac
79.if ${OPSYS} != "Darwin" 76.if ${OPSYS} != "Darwin"
80PLIST.notmac= yes 77PLIST.notmac= yes
81.endif 78.endif
82 79
83# Avoid the following error when compiling with clang. 80# Avoid the following error when compiling with clang.
84# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC' 81# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
85# can not be used when making a shared object; recompile with -fPIC 82# can not be used when making a shared object; recompile with -fPIC
86.if ${OPSYS} == "FreeBSD" 83.if ${OPSYS} == "FreeBSD"
87BUILDLINK_TRANSFORM+= rm:-Wl,-pie 84BUILDLINK_TRANSFORM+= rm:-Wl,-pie
88.endif 85.endif
89 86
90# CUPS_USER user to run filter and CGI programs as 87# CUPS_USER user to run filter and CGI programs as
91# CUPS_GROUP group to run filter and CGI programs as 88# CUPS_GROUP group to run filter and CGI programs as
92# CUPS_SYSTEM_GROUPS group for system administration 89# CUPS_SYSTEM_GROUPS group for system administration
93# 90#
94CUPS_USER?= lp 91CUPS_USER?= lp
95CUPS_GROUP?= lp 92CUPS_GROUP?= lp
96CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP} 93CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP}
97FILES_SUBST+= CUPS_USER=${CUPS_USER} 94FILES_SUBST+= CUPS_USER=${CUPS_USER}
98FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} 95FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
99FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q} 96FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
100 97
101PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS 98PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS
102PKG_USERS_VARS+= CUPS_USER 99PKG_USERS_VARS+= CUPS_USER
103 100
104BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE 101BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE
105 102
106DOCDIR= ${PREFIX}/share/doc/cups 103DOCDIR= ${PREFIX}/share/doc/cups
107EGDIR= ${PREFIX}/share/examples/cups 104EGDIR= ${PREFIX}/share/examples/cups
108MIMEDIR= ${PREFIX}/share/cups/mime 105MIMEDIR= ${PREFIX}/share/cups/mime
109PKG_SYSCONFSUBDIR= cups 106PKG_SYSCONFSUBDIR= cups
110CUPS_CONFDIR= ${PKG_SYSCONFDIR} 107CUPS_CONFDIR= ${PKG_SYSCONFDIR}
111CUPS_LOGDIR= ${VARBASE}/log/cups 108CUPS_LOGDIR= ${VARBASE}/log/cups
112CUPS_REQUESTS= ${VARBASE}/spool/cups 109CUPS_REQUESTS= ${VARBASE}/spool/cups
113CUPS_CACHE= ${VARBASE}/cache/cups 110CUPS_CACHE= ${VARBASE}/cache/cups
114CUPS_STATEDIR= ${VARBASE}/run/cups 111CUPS_STATEDIR= ${VARBASE}/run/cups
115 112
116PKG_GROUPS= ${CUPS_GROUP} 113PKG_GROUPS= ${CUPS_GROUP}
117PKG_USERS= ${CUPS_USER}:${CUPS_GROUP} 114PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}
118PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user 115PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user
119PKG_SHELL.${CUPS_USER}= ${SH} 116PKG_SHELL.${CUPS_USER}= ${SH}
120 117
121CONF_FILES= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf 118CONF_FILES= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
122CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf 119CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf
123RCD_SCRIPTS= cupsd 120RCD_SCRIPTS= cupsd
124 121
125OWN_DIRS= ${CUPS_CONFDIR} 122OWN_DIRS= ${CUPS_CONFDIR}
126OWN_DIRS+= ${CUPS_CONFDIR}/interfaces 123OWN_DIRS+= ${CUPS_CONFDIR}/interfaces
127OWN_DIRS+= ${CUPS_CONFDIR}/ppd 124OWN_DIRS+= ${CUPS_CONFDIR}/ppd
128OWN_DIRS+= ${PREFIX}/libexec/cups/driver 125OWN_DIRS+= ${PREFIX}/libexec/cups/driver
129OWN_DIRS+= ${CUPS_LOGDIR} 126OWN_DIRS+= ${CUPS_LOGDIR}
130OWN_DIRS+= ${CUPS_STATEDIR} 127OWN_DIRS+= ${CUPS_STATEDIR}
131OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711 128OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711
132OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700 129OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700
133OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710 130OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710
134OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770 131OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770
135OWN_DIRS_PERMS+= ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 132OWN_DIRS_PERMS+= ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
136OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 133OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
137 134
138SUBST_CLASSES+= paths 135SUBST_CLASSES+= paths
139SUBST_FILES.paths= ${WRKDIR}/cups.pam 136SUBST_FILES.paths= ${WRKDIR}/cups.pam
140SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' 137SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g'
141SUBST_STAGE.paths= post-patch 138SUBST_STAGE.paths= post-patch
142 139
143SUBST_CLASSES+= rpathfix 140SUBST_CLASSES+= rpathfix
144SUBST_FILES.rpathfix= cups-config.in 141SUBST_FILES.rpathfix= cups-config.in
145SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. 142SUBST_MESSAGE.rpathfix= Adding rpath to cups-config.
146SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' 143SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
147SUBST_STAGE.rpathfix= post-patch 144SUBST_STAGE.rpathfix= post-patch
148 145
149.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc) 146.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
150SUBST_CLASSES+= piefix 147SUBST_CLASSES+= piefix
151SUBST_FILES.piefix= Makedefs.in 148SUBST_FILES.piefix= Makedefs.in
152SUBST_MESSAGE.piefix= Removing PIE flags 149SUBST_MESSAGE.piefix= Removing PIE flags
153SUBST_SED.piefix= -e 's|@PIEFLAGS@||g' 150SUBST_SED.piefix= -e 's|@PIEFLAGS@||g'
154SUBST_STAGE.piefix= post-patch 151SUBST_STAGE.piefix= post-patch
155.endif 152.endif
156 153
157INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR} 154INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
158INSTALL_ENV+= DSTROOT=${DESTDIR} 155INSTALL_ENV+= DSTROOT=${DESTDIR}
159 156
160pre-configure: 157pre-configure:
161.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) 158.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
162 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" 159 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
163 exit 1 160 exit 1
164.endif 161.endif
165 cd ${WRKSRC} && aclocal && autoconf 162 cd ${WRKSRC} && aclocal && autoconf
166 163
167post-extract: 164post-extract:
168 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 165 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
169 166
170post-install: 167post-install:
171 set -e; for file in LICENSE.txt README.txt; do \ 168 set -e; for file in LICENSE.txt README.txt; do \
172 ${INSTALL_DATA} ${WRKSRC}/$${file} \ 169 ${INSTALL_DATA} ${WRKSRC}/$${file} \
173 ${DESTDIR}${DOCDIR}/$${file}; \ 170 ${DESTDIR}${DOCDIR}/$${file}; \
174 done 171 done
175 ${RUN} for file in cupsd.conf snmp.conf ; do \ 172 ${RUN} for file in cupsd.conf snmp.conf ; do \
176 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ 173 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \
177 ${DESTDIR}${EGDIR}/$${file}; \ 174 ${DESTDIR}${EGDIR}/$${file}; \
178 done 175 done
179.if !empty(PKG_OPTIONS:Mpam) 176.if !empty(PKG_OPTIONS:Mpam)
180 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} 177 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
181.endif 178.endif
182.if !empty(PKG_OPTIONS:Mdnssd) 179.if !empty(PKG_OPTIONS:Mdnssd)
183 ${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns 180 ${LN} -s ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
184.endif 181.endif
185 182
186.include "../../converters/libiconv/buildlink3.mk" 183.include "../../converters/libiconv/buildlink3.mk"
187.include "../../devel/zlib/buildlink3.mk" 184.include "../../devel/zlib/buildlink3.mk"
188.include "../../graphics/png/buildlink3.mk" 185.include "../../graphics/png/buildlink3.mk"
189.include "../../graphics/tiff/buildlink3.mk" 186.include "../../graphics/tiff/buildlink3.mk"
190.include "../../mk/jpeg.buildlink3.mk" 187.include "../../mk/jpeg.buildlink3.mk"
191.include "../../mk/pthread.buildlink3.mk" 188.include "../../mk/pthread.buildlink3.mk"
192.include "../../print/libpaper/buildlink3.mk" 189.include "../../print/libpaper/buildlink3.mk"
193.include "../../security/openssl/buildlink3.mk" 190.include "../../security/openssl/buildlink3.mk"
194.include "../../mk/bsd.pkg.mk" 191.include "../../mk/bsd.pkg.mk"