Date: Fri, 11 Mar 2016 15:39:41 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410832 - in head/print/cups: . files Message-ID: <201603111539.u2BFdf0t060943@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Mar 11 15:39:40 2016 New Revision: 410832 URL: https://svnweb.freebsd.org/changeset/ports/410832 Log: Fix make check-plist when ${LOCALBASE}/etc/pam.d does not exist. Reported by: rakuco Modified: head/print/cups/Makefile head/print/cups/files/patch-configure Modified: head/print/cups/Makefile ============================================================================== --- head/print/cups/Makefile Fri Mar 11 15:17:48 2016 (r410831) +++ head/print/cups/Makefile Fri Mar 11 15:39:40 2016 (r410832) @@ -85,7 +85,7 @@ CONFIGURE_ARGS+=ac_cv_search_libiconv_op post-patch: @${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in - @${REINPLACE_CMD} -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \ + @${REINPLACE_CMD} -e 's|/usr/local/etc/pam.d|${LOCALBASE}/etc/pam.d|' \ -e 's/-fstack-protector//' ${WRKSRC}/configure @${REINPLACE_CMD} 's|http://www.cups.org|https://cups.org|' \ ${WRKSRC}/doc/index.html.in \ Modified: head/print/cups/files/patch-configure ============================================================================== --- head/print/cups/files/patch-configure Fri Mar 11 15:17:48 2016 (r410831) +++ head/print/cups/files/patch-configure Fri Mar 11 15:39:40 2016 (r410832) @@ -22,3 +22,18 @@ DBUS_NOTIFIER="" DBUS_NOTIFIERLIBS="" +@@ -8684,13 +8690,7 @@ fi + PAMLIBS="-lpam" + fi + +- # Find the PAM configuration directory, if any... +- for dir in /private/etc/pam.d /etc/pam.d; do +- if test -d $dir; then +- PAMDIR=$dir +- break; +- fi +- done ++ PAMDIR=/usr/local/etc/pam.d + fi + + LIBS="$SAVELIBS"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603111539.u2BFdf0t060943>