Index: branches/2019Q1/databases/pgpool-II-40/Makefile
===================================================================
--- branches/2019Q1/databases/pgpool-II-40/Makefile	(revision 490475)
+++ branches/2019Q1/databases/pgpool-II-40/Makefile	(revision 490476)
@@ -1,60 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	pgpool-II
 PORTVERSION=	4.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 PKGNAMESUFFIX=	40
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Connection pool server for PostgreSQL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	limit:^4.0.[0-9]*
 
 USES=		gmake libtool pgsql:9.6+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	pgpool
 CONFLICTS=	pgpool-II-[0-9]*
 
 PORTDOCS=	*
 
 PAM_DESC=	Build with PAM support
 SSL_DESC=	Build with OpenSSL support
 MEMCACHED_DESC =	Use memcached for in memory query cache
 
 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
 	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
 .for f in AUTHORS ChangeLog NEWS TODO
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2019Q1
===================================================================
--- branches/2019Q1	(revision 490475)
+++ branches/2019Q1	(revision 490476)

Property changes on: branches/2019Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r490475