Sun Aug 20 23:55:54 2017 UTC ()
print/cups{,15}: Don't make ${CUPS_CONFDIR} with INSTALLATION_DIRS.

${CUPS_CONFDIR} (${PKG_SYSCONFDIR}) may be located outside of
${PREFIX}, which causes a installation failure due to the checks
added in mk/install/install.mk.

Remove ${CUPS_CONFDIR} from INSTALLATION_DIRS since it is created
by the package install script at PRE-INSTALL time.

Fixes pkg/52481 reported by Hauke Fath.


(jlam)
diff -r1.248 -r1.249 pkgsrc/print/cups/Makefile
diff -r1.19 -r1.20 pkgsrc/print/cups15/Makefile
cvs diff -r1.248 -r1.249 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2017/08/01 14:59:04 1.248
+++ pkgsrc/print/cups/Makefile 2017/08/20 23:55:54 1.249
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.248 2017/08/01 14:59:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.249 2017/08/20 23:55:54 jlam Exp $
2 2
3DISTNAME= cups-2.2.3-source 3DISTNAME= cups-2.2.3-source
4PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
8 8
9MAINTAINER= sbd@NetBSD.org 9MAINTAINER= sbd@NetBSD.org
10HOMEPAGE= https://www.cups.org/ 10HOMEPAGE= https://www.cups.org/
11COMMENT= Common UNIX Printing System 11COMMENT= Common UNIX Printing System
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
13 13
14GITHUB_RELEASE= v${PKGVERSION_NOREV} 14GITHUB_RELEASE= v${PKGVERSION_NOREV}
@@ -121,27 +121,27 @@ SUBST_CLASSES+= rpathfix @@ -121,27 +121,27 @@ SUBST_CLASSES+= rpathfix
121SUBST_FILES.rpathfix= cups-config.in 121SUBST_FILES.rpathfix= cups-config.in
122SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. 122SUBST_MESSAGE.rpathfix= Adding rpath to cups-config.
123SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' 123SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
124SUBST_STAGE.rpathfix= post-patch 124SUBST_STAGE.rpathfix= post-patch
125 125
126.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc) 126.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
127SUBST_CLASSES+= piefix 127SUBST_CLASSES+= piefix
128SUBST_FILES.piefix= Makedefs.in 128SUBST_FILES.piefix= Makedefs.in
129SUBST_MESSAGE.piefix= Removing PIE flags 129SUBST_MESSAGE.piefix= Removing PIE flags
130SUBST_SED.piefix= -e 's|@PIEFLAGS@||g' 130SUBST_SED.piefix= -e 's|@PIEFLAGS@||g'
131SUBST_STAGE.piefix= post-patch 131SUBST_STAGE.piefix= post-patch
132.endif 132.endif
133 133
134INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR} 134INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR}
135INSTALL_ENV+= DSTROOT=${DESTDIR} 135INSTALL_ENV+= DSTROOT=${DESTDIR}
136 136
137pre-configure: 137pre-configure:
138.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) 138.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
139 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" 139 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
140 exit 1 140 exit 1
141.endif 141.endif
142 cd ${WRKSRC} && aclocal && autoconf 142 cd ${WRKSRC} && aclocal && autoconf
143 143
144post-extract: 144post-extract:
145 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 145 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
146 146
147post-install: 147post-install:
cvs diff -r1.19 -r1.20 pkgsrc/print/cups15/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups15/Attic/Makefile 2017/08/01 14:59:04 1.19
+++ pkgsrc/print/cups15/Attic/Makefile 2017/08/20 23:55:54 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2017/08/01 14:59:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.20 2017/08/20 23:55:54 jlam 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}
11PKGREVISION= 16 11PKGREVISION= 16
12 12
13# Fix for https://www.cups.org/str.php?L4609 13# Fix for https://www.cups.org/str.php?L4609
14PATCH_SITES= https://www.cups.org/strfiles.php/3482/ 14PATCH_SITES= https://www.cups.org/strfiles.php/3482/
@@ -149,27 +149,27 @@ SUBST_CLASSES+= rpathfix @@ -149,27 +149,27 @@ SUBST_CLASSES+= rpathfix
149SUBST_FILES.rpathfix= cups-config.in 149SUBST_FILES.rpathfix= cups-config.in
150SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. 150SUBST_MESSAGE.rpathfix= Adding rpath to cups-config.
151SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' 151SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
152SUBST_STAGE.rpathfix= post-patch 152SUBST_STAGE.rpathfix= post-patch
153 153
154.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc) 154.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
155SUBST_CLASSES+= piefix 155SUBST_CLASSES+= piefix
156SUBST_FILES.piefix= Makedefs.in 156SUBST_FILES.piefix= Makedefs.in
157SUBST_MESSAGE.piefix= Removing PIE flags 157SUBST_MESSAGE.piefix= Removing PIE flags
158SUBST_SED.piefix= -e 's|@PIEFLAGS@||g' 158SUBST_SED.piefix= -e 's|@PIEFLAGS@||g'
159SUBST_STAGE.piefix= post-patch 159SUBST_STAGE.piefix= post-patch
160.endif 160.endif
161 161
162INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR} 162INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR}
163INSTALL_ENV+= DSTROOT=${DESTDIR} 163INSTALL_ENV+= DSTROOT=${DESTDIR}
164 164
165pre-configure: 165pre-configure:
166.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) 166.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
167 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" 167 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
168 exit 1 168 exit 1
169.endif 169.endif
170 cd ${WRKSRC} && aclocal && autoconf 170 cd ${WRKSRC} && aclocal && autoconf
171 171
172post-extract: 172post-extract:
173 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 173 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
174 174
175post-install: 175post-install: