Index: databases/Makefile =================================================================== --- databases/Makefile (revision 485015) +++ databases/Makefile (working copy) @@ -612,6 +612,7 @@ SUBDIR += pgpool-II-35 SUBDIR += pgpool-II-36 SUBDIR += pgpool-II-37 + SUBDIR += pgpool-II-40 SUBDIR += pgreplay SUBDIR += pgroonga SUBDIR += pgrouting Index: databases/pgpool-II-40/Makefile =================================================================== --- databases/pgpool-II-40/Makefile (revision 485015) +++ databases/pgpool-II-40/Makefile (working copy) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= pgpool-II -PORTVERSION= 3.7.5 +PORTVERSION= 4.0.1 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ -PKGNAMESUFFIX= 37 +PKGNAMESUFFIX= 40 MAINTAINER= tz@FreeBSD.org COMMENT= Connection pool server for PostgreSQL @@ -12,10 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= library 'ssl' is required for OpenSSL +BROKEN_SSL= openssl-devel +BROKEN_SSL_REASON_openssl-devel= library 'ssl' is required for OpenSSL -PORTSCOUT= limit:^3.7.[0-9]* +PORTSCOUT= limit:^4.0.[0-9]* USES= gmake libtool pgsql:9.6+ GNU_CONFIGURE= yes @@ -26,12 +26,28 @@ PORTDOCS= * -OPTIONS_DEFINE= DOCS SSL +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 +.include + +.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 + post-install: @${MKDIR} ${STAGEDIR}/var/run/pgpool ${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.1.0.0 ${STAGEDIR}${PREFIX}/lib @@ -44,3 +60,4 @@ .endfor .include + Index: databases/pgpool-II-40/distinfo =================================================================== --- databases/pgpool-II-40/distinfo (revision 485015) +++ databases/pgpool-II-40/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533022991 -SHA256 (pgpool-II-3.7.5.tar.gz) = 510ac7cd00e2296dc50ad1ccbc86f9308dfc36cfa98d04066b9a37a5464c47c1 -SIZE (pgpool-II-3.7.5.tar.gz) = 3276279 +TIMESTAMP = 1541251086 +SHA256 (pgpool-II-4.0.1.tar.gz) = 5a50a4078e1556488c6d248bf63b4d752c263d238c844711aa1459c5fbd0f843 +SIZE (pgpool-II-4.0.1.tar.gz) = 3563907 Index: databases/pgpool-II-40/files/patch-src_auth_pool__hba.c =================================================================== Index: databases/pgpool-II-40/files/pgpool.in =================================================================== Index: databases/pgpool-II-40/pkg-descr =================================================================== Index: databases/pgpool-II-40/pkg-message =================================================================== Index: databases/pgpool-II-40/pkg-plist =================================================================== --- databases/pgpool-II-40/pkg-plist (revision 485015) +++ databases/pgpool-II-40/pkg-plist (working copy) @@ -9,9 +9,11 @@ bin/pcp_recovery_node bin/pcp_stop_pgpool bin/pcp_watchdog_info +bin/pg_enc bin/pg_md5 bin/pgpool bin/pgpool_setup +bin/pgproto bin/watchdog_setup @sample etc/pcp.conf.sample @sample etc/pgpool.conf.sample Index: www/nginx/Makefile =================================================================== --- www/nginx/Makefile (revision 485015) +++ www/nginx/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.14.1 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ \ Index: www/nginx/Makefile.extmod =================================================================== --- www/nginx/Makefile.extmod (revision 485015) +++ www/nginx/Makefile.extmod (working copy) @@ -48,7 +48,7 @@ DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit ENCRYPTSESSION_IMPLIES= DEVEL_KIT -ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.07:encryptsession +ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.08:encryptsession ENCRYPTSESSION_VARS= DSO_EXTMODS+=encryptsession FASTDFS_GH_TUPLE= happyfish100:fastdfs-nginx-module:8796a7d:fastdfs Index: www/nginx/distinfo =================================================================== --- www/nginx/distinfo (revision 485015) +++ www/nginx/distinfo (working copy) @@ -1,4 +1,4 @@ -TIMESTAMP = 1541523020 +TIMESTAMP = 1542300703 SHA256 (nginx-1.14.1.tar.gz) = bf09974130c0d41c0a811decc17a96ec2f58cdc8bbacb771de8d38c9ba14a4a4 SIZE (nginx-1.14.1.tar.gz) = 1014040 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -39,8 +39,8 @@ SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = 10921 SHA256 (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = aea1d10d9175a6471b34d436df937b5c97e7ba1ac4b4b2582a2cb6716d7fba4b SIZE (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = 53121 -SHA256 (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = ab7b20be9f32da846f5c380677f7bc1dff0b93ce02c06bf584cd45709896ad66 -SIZE (openresty-encrypted-session-nginx-module-v0.07_GH0.tar.gz) = 11139 +SHA256 (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 6e526ea097c6805ec2cf1d0d3d79ed24326bc2d0babe158c29edd07d8c0d106a +SIZE (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 11802 SHA256 (happyfish100-fastdfs-nginx-module-8796a7d_GH0.tar.gz) = 083fe7ecd484b9adce41c938f0f95b81ebe8336765896107e5864243c9789ef5 SIZE (happyfish100-fastdfs-nginx-module-8796a7d_GH0.tar.gz) = 19872 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106