aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/cups/Makefile2
-rw-r--r--print/cups/files/patch-configure15
2 files changed, 16 insertions, 1 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 978b5c69564b..c0bb5f8e9394 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
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 \
diff --git a/print/cups/files/patch-configure b/print/cups/files/patch-configure
index e667eebbc89c..fc6c8a79888c 100644
--- a/print/cups/files/patch-configure
+++ b/print/cups/files/patch-configure
@@ -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"