Date: Wed, 16 Jan 2019 12:03:14 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490475 - head/databases/pgpool-II-40 Message-ID: <201901161203.x0GC3EMU019039@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Jan 16 12:03:14 2019 New Revision: 490475 URL: https://svnweb.freebsd.org/changeset/ports/490475 Log: 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) Modified: head/databases/pgpool-II-40/Makefile Modified: head/databases/pgpool-II-40/Makefile ============================================================================== --- head/databases/pgpool-II-40/Makefile Wed Jan 16 12:02:11 2019 (r490474) +++ head/databases/pgpool-II-40/Makefile Wed Jan 16 12:03:14 2019 (r490475) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901161203.x0GC3EMU019039>