From owner-svn-ports-all@freebsd.org  Fri Mar 11 15:39:42 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6738CACC2E8;
 Fri, 11 Mar 2016 15:39:42 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 390901CD4;
 Fri, 11 Mar 2016 15:39:42 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2BFdfhN060945;
 Fri, 11 Mar 2016 15:39:41 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BFdf0t060943;
 Fri, 11 Mar 2016 15:39:41 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201603111539.u2BFdf0t060943@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Fri, 11 Mar 2016 15:39:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r410832 - in head/print/cups: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2016 15:39:42 -0000

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"