Date: Tue, 26 May 2015 23:10:53 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387517 - in head/www: nginx nginx-devel Message-ID: <201505262310.t4QNAroo045624@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue May 26 23:10:52 2015 New Revision: 387517 URL: https://svnweb.freebsd.org/changeset/ports/387517 Log: Add third-party postgres module back. Based on patch from: Alexander Ushakov <alexander@tauruna.ru> Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx/Makefile head/www/nginx/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue May 26 22:33:59 2015 (r387516) +++ head/www/nginx-devel/Makefile Tue May 26 23:10:52 2015 (r387517) @@ -91,6 +91,7 @@ OPTIONS_DEFINE= \ MODSECURITY \ NAXSI \ PASSENGER \ + POSTGRES \ RDS_CSV \ RDS_JSON \ REDIS2 \ @@ -177,6 +178,7 @@ MEMC_DESC= 3rd party memc (memcached) MODSECURITY_DESC= 3rd party mod_security module NAXSI_DESC= 3rd party naxsi module PASSENGER_DESC= 3rd party passenger module +POSTGRES_DESC= 3rd party postgres module RDS_CSV_DESC= 3rd party rds_csv module RDS_JSON_DESC= 3rd party rds_json module REDIS2_DESC= 3rd party redis2 module @@ -628,6 +630,16 @@ CFLAGS+= -DNDEBUG .endif .endif +.if ${PORT_OPTIONS:MPOSTGRES} +USES+= pgsql +NGINX_POSTGRES_VERSION= 1.0rc5 +GIT_NGINX_POSTGRES_VERSION= 1-g49855a0 +MASTER_SITES+= https://github.com/FRiCKLE/ngx_postgres/tarball/${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/:postgres +DISTFILES+= FRiCKLE-ngx_postgres-${NGINX_POSTGRES_VERSION}-${GIT_NGINX_POSTGRES_VERSION}.tar.gz:postgres +CONFIGURE_ARGS+=--add-module=${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config +.endif + .if ${PORT_OPTIONS:MRDS_CSV} NGINX_RDS_CSV_VERSION= 0.05 GIT_RDS_CSV_VERSION= 0-g607e26b @@ -865,6 +877,11 @@ post-patch: s!-Iext/libeio!!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb .endif +.if ${PORT_OPTIONS:MPOSTGRES} + @${REINPLACE_CMD} \ + 's!%%PREFIX%%!${LOCALBASE}!g' \ + ${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/config +.endif .if ${PORT_OPTIONS:MSFLOW} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue May 26 22:33:59 2015 (r387516) +++ head/www/nginx-devel/distinfo Tue May 26 23:10:52 2015 (r387517) @@ -70,6 +70,8 @@ SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d SIZE (naxsi-core-0.50.tgz) = 49809 SHA256 (passenger-5.0.8.tar.gz) = 4da783986fad73f898a00aa118ada33ea99d83ff065fd11ab3d508a4f63f0920 SIZE (passenger-5.0.8.tar.gz) = 4964167 +SHA256 (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0.tar.gz) = 460d7b1993752e0020397458a7de5fa000e833e03cd98cff5f29a1f52f074991 +SIZE (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0.tar.gz) = 40707 SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416 SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4 Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue May 26 22:33:59 2015 (r387516) +++ head/www/nginx/Makefile Tue May 26 23:10:52 2015 (r387517) @@ -89,6 +89,7 @@ OPTIONS_DEFINE= \ MODSECURITY \ NAXSI \ PASSENGER \ + POSTGRES \ RDS_CSV \ RDS_JSON \ REDIS2 \ @@ -173,6 +174,7 @@ MEMC_DESC= 3rd party memc (memcached) MODSECURITY_DESC= 3rd party mod_security module NAXSI_DESC= 3rd party naxsi module PASSENGER_DESC= 3rd party passenger module +POSTGRES_DESC= 3rd party postgres module RDS_CSV_DESC= 3rd party rds_csv module RDS_JSON_DESC= 3rd party rds_json module REDIS2_DESC= 3rd party redis2 module @@ -624,6 +626,16 @@ CFLAGS+= -DNDEBUG .endif .endif +.if ${PORT_OPTIONS:MPOSTGRES} +USES+= pgsql +NGINX_POSTGRES_VERSION= 1.0rc5 +GIT_NGINX_POSTGRES_VERSION= 1-g49855a0 +MASTER_SITES+= https://github.com/FRiCKLE/ngx_postgres/tarball/${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/:postgres +DISTFILES+= FRiCKLE-ngx_postgres-${NGINX_POSTGRES_VERSION}-${GIT_NGINX_POSTGRES_VERSION}.tar.gz:postgres +CONFIGURE_ARGS+=--add-module=${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config +.endif + .if ${PORT_OPTIONS:MRDS_CSV} NGINX_RDS_CSV_VERSION= 0.05 GIT_RDS_CSV_VERSION= 0-g607e26b @@ -852,6 +864,11 @@ post-patch: s!-Iext/libeio!!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb .endif +.if ${PORT_OPTIONS:MPOSTGRES} + @${REINPLACE_CMD} \ + 's!%%PREFIX%%!${LOCALBASE}!g' \ + ${WRKDIR}/FRiCKLE-ngx_postgres-${GIT_NGINX_POSTGRES_VERSION:S/^1-g//}/config +.endif .if ${PORT_OPTIONS:MSFLOW} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Tue May 26 22:33:59 2015 (r387516) +++ head/www/nginx/distinfo Tue May 26 23:10:52 2015 (r387517) @@ -70,6 +70,8 @@ SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d SIZE (naxsi-core-0.50.tgz) = 49809 SHA256 (passenger-5.0.8.tar.gz) = 4da783986fad73f898a00aa118ada33ea99d83ff065fd11ab3d508a4f63f0920 SIZE (passenger-5.0.8.tar.gz) = 4964167 +SHA256 (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0.tar.gz) = 460d7b1993752e0020397458a7de5fa000e833e03cd98cff5f29a1f52f074991 +SIZE (FRiCKLE-ngx_postgres-1.0rc5-1-g49855a0.tar.gz) = 40707 SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416 SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505262310.t4QNAroo045624>