From owner-svn-ports-branches@freebsd.org  Wed Jan 16 12:06:26 2019
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65E45148606F;
 Wed, 16 Jan 2019 12:06:26 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id D5DA46AC84;
 Wed, 16 Jan 2019 12:06:25 +0000 (UTC)
 (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C45651ECA;
 Wed, 16 Jan 2019 12:06:25 +0000 (UTC)
 (envelope-from tobik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0GC6PZQ019391;
 Wed, 16 Jan 2019 12:06:25 GMT (envelope-from tobik@FreeBSD.org)
Received: (from tobik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0GC6PC5019390;
 Wed, 16 Jan 2019 12:06:25 GMT (envelope-from tobik@FreeBSD.org)
Message-Id: <201901161206.x0GC6PC5019390@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tobik set sender to
 tobik@FreeBSD.org using -f
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Wed, 16 Jan 2019 12:06:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r490476 - branches/2019Q1/databases/pgpool-II-40
X-SVN-Group: ports-branches
X-SVN-Commit-Author: tobik
X-SVN-Commit-Paths: branches/2019Q1/databases/pgpool-II-40
X-SVN-Commit-Revision: 490476
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: D5DA46AC84
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_SHORT(-0.96)[-0.965,0];
 NEURAL_HAM_LONG(-1.00)[-0.999,0]
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jan 2019 12:06:26 -0000

Author: tobik
Date: Wed Jan 16 12:06:25 2019
New Revision: 490476
URL: https://svnweb.freebsd.org/changeset/ports/490476

Log:
  MFH: r490475
  
  databases/pgpool-II-40: Unbreak PAM option
  
  The PAM option is tangled up with the SSL option in a weird way.
  SSL_CONFIGURE_WITH is set once before bsd.port.options.mk for
  enabling SSL support and overwritten again after including
  bsd.port.options.mk but only when PAM=on.
  
  Setting options helper after this point is not really supported,
  but --with-pam actually makes it to CONFIGURE_ARGS.  When options
  helpers are processed the results are only realized later by make(1).
  SSL_CONFIGURE_WITH has been defined before including bsd.port.options.mk,
  so this sort of "works".
  
  This, however, is presumably an implementation detail and enabling
  the PAM option breaks SSL support since SSL_CONFIGURE_WITH is
  overwritten with a new value: CONFIGURE_ARGS only has --with-pam
  left and is missing --with-openssl.
  
  PAM support does not depend on SSL support.  Just switch everything
  to options helpers to fix this.
  
  PR:		234817
  Submitted by:	tobik
  Approved by:	tz (maintainer)
  
  Approved by:	ports-secteam build fix blanket

Modified:
  branches/2019Q1/databases/pgpool-II-40/Makefile
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/databases/pgpool-II-40/Makefile
==============================================================================
--- branches/2019Q1/databases/pgpool-II-40/Makefile	Wed Jan 16 12:03:14 2019	(r490475)
+++ branches/2019Q1/databases/pgpool-II-40/Makefile	Wed Jan 16 12:06:25 2019	(r490476)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pgpool-II
 PORTVERSION=	4.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 PKGNAMESUFFIX=	40
@@ -31,20 +31,13 @@ MEMCACHED_DESC =	Use memcached for in memory query cac
 OPTIONS_DEFINE=	DOCS SSL PAM MEMCACHED
 OPTIONS_DEFAULT=	SSL
 
-SSL_CONFIGURE_WITH=	openssl
-SSL_USES=		ssl
+MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
+MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
-.include <bsd.port.options.mk>
+PAM_CONFIGURE_WITH=	pam
 
-.if ${PORT_OPTIONS:MPAM}
-#CONFIGURE_ARGS+=	--with-pam
-SSL_CONFIGURE_WITH=	pam
-.endif
-
-.if ${PORT_OPTIONS:MMEMCACHED}
-CONFIGURE_ARGS+=--with-memcached=${LOCALBASE}/include
-LIB_DEPENDS+=	libmemcached.so:databases/libmemcached
-.endif
+SSL_CONFIGURE_WITH=	openssl
+SSL_USES=		ssl
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/pgpool