CVS commit: pkgsrc/print

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sun Aug 20 23:55:54 UTC 2017

Modified Files:
        pkgsrc/print/cups: Makefile
        pkgsrc/print/cups15: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 pkgsrc/print/cups/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/cups15/Makefile

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.248 pkgsrc/print/cups/Makefile:1.249
--- pkgsrc/print/cups/Makefile:1.248    Tue Aug  1 14:59:04 2017
+++ pkgsrc/print/cups/Makefile  Sun Aug 20 23:55:54 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.248 2017/08/01 14:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.249 2017/08/20 23:55:54 jlam Exp $
 
 DISTNAME=      cups-2.2.3-source
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -131,7 +131,7 @@ SUBST_SED.piefix=   -e 's|@PIEFLAGS@||g'
 SUBST_STAGE.piefix=    post-patch
 .endif
 
-INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
+INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR}
 INSTALL_ENV+=          DSTROOT=${DESTDIR}
 
 pre-configure:

Index: pkgsrc/print/cups15/Makefile
diff -u pkgsrc/print/cups15/Makefile:1.19 pkgsrc/print/cups15/Makefile:1.20
--- pkgsrc/print/cups15/Makefile:1.19   Tue Aug  1 14:59:04 2017
+++ pkgsrc/print/cups15/Makefile        Sun Aug 20 23:55:54 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/08/01 14:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2017/08/20 23:55:54 jlam Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -159,7 +159,7 @@ SUBST_SED.piefix=   -e 's|@PIEFLAGS@||g'
 SUBST_STAGE.piefix=    post-patch
 .endif
 
-INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
+INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR}
 INSTALL_ENV+=          DSTROOT=${DESTDIR}
 
 pre-configure: