Date: Mon, 10 Feb 2014 07:08:22 GMT From: Andrey Alcheev <buddy@k66.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/186618: [PATCH] www/nginx-devel: recover building with ngx_postgres module Message-ID: <201402100708.s1A78M3j000322@cgiserv.freebsd.org> Resent-Message-ID: <201402100710.s1A7A0rs093929@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186618
>Category: ports
>Synopsis: [PATCH] www/nginx-devel: recover building with ngx_postgres module
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 10 07:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Andrey Alcheev
>Release: 9.2-RELEASE-p3 amd64
>Organization:
>Environment:
FreeBSD server.hsh 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #0 r260701: Thu Jan 16 17:36:20 YEKT 2014 bud@server.hsh:/usr/obj/usr/src/sys/GENERIC-NODEBUG amd64
>Description:
There is a patch to revive a building of nginx with the latest version of ngx_postgres module.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ur nginx-devel.orig/Makefile nginx-devel/Makefile
--- nginx-devel.orig/Makefile 2014-02-05 18:56:07.000000000 +0600
+++ nginx-devel/Makefile 2014-02-10 12:05:57.792208162 +0600
@@ -657,12 +657,13 @@
.endif
.if ${PORT_OPTIONS:MPOSTGRES}
-IGNORE= POSTGRES: update require
USE_PGSQL= yes
-NGINX_POSTGRES_VERSION= 0.9
-MASTER_SITES+= http://labs.frickle.com/files/:postgres
-DISTFILES+= ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}
+NGINX_POSTGRES_VERSION= 1.0rc3
+GIT_POSTGRES_VERSION= 0-ga9b4dd6
+MASTER_SITES+= https://github.com/FRiCKLE/ngx_postgres/tarball/${NGINX_POSTGRES_VERSION}/:postgres
+NGINX_POSTGRES_DIR= FRiCKLE-ngx_postgres
+DISTFILES+= ${NGINX_POSTGRES_DIR}-${NGINX_POSTGRES_VERSION}-${GIT_POSTGRES_VERSION}.tar.gz:postgres
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/${NGINX_POSTGRES_DIR}-${GIT_POSTGRES_VERSION:S/^0-g//}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config
.endif
@@ -918,7 +919,7 @@
.if ${PORT_OPTIONS:MPOSTGRES}
@${REINPLACE_CMD} \
's!%%PREFIX%%!${LOCALBASE}!g' \
- ${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}/config
+ ${WRKDIR}/${NGINX_POSTGRES_DIR}-${GIT_POSTGRES_VERSION:S/^0-g//}/config
.endif
.if ${PORT_OPTIONS:MSFLOW}
@${REINPLACE_CMD} \
diff -ur nginx-devel.orig/distinfo nginx-devel/distinfo
--- nginx-devel.orig/distinfo 2014-02-05 18:56:07.000000000 +0600
+++ nginx-devel/distinfo 2014-02-10 11:36:12.111209077 +0600
@@ -74,8 +74,8 @@
SIZE (naxsi-core-0.50.tgz) = 49809
SHA256 (passenger-4.0.35.tar.gz) = a8b7eeed2ef12e8137d36418a11c928969aaf6b13a91e81445de2a156245f774
SIZE (passenger-4.0.35.tar.gz) = 4039531
-SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec
-SIZE (ngx_postgres-0.9.tar.gz) = 41022
+SHA256 (FRiCKLE-ngx_postgres-1.0rc3-0-ga9b4dd6.tar.gz) = 373b54387d0a3e56f48ac76fb0e2cac5b6ab719010b6c739cea941a7b07707f7
+SIZE (FRiCKLE-ngx_postgres-1.0rc3-0-ga9b4dd6.tar.gz) = 40597
SHA256 (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 3fa9cb3960a97f505c9ad0cc8683c8fe17ba98aa98d003e255bf214e5144751c
SIZE (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18423
SHA256 (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 9e59b90d84f9bc814eba85bfcf126e3fd6406ddc771702c096a657c17354c302
diff -ur nginx-devel.orig/files/extra-patch-ngx_postgres-config nginx-devel/files/extra-patch-ngx_postgres-config
--- nginx-devel.orig/files/extra-patch-ngx_postgres-config 2014-02-10 12:53:12.832212115 +0600
+++ nginx-devel/files/extra-patch-ngx_postgres-config 2014-02-10 12:54:09.343428000 +0600
@@ -1,5 +1,5 @@
---- ../ngx_postgres-0.9/config.orig 2011-12-29 11:17:24.000000000 +0400
-+++ ../ngx_postgres-0.9/config 2011-12-29 11:18:47.000000000 +0400
+--- ../FRiCKLE-ngx_postgres-a9b4dd6/config.orig 2013-08-01 01:31:50.000000000 +0600
++++ ../FRiCKLE-ngx_postgres-a9b4dd6/config 2014-02-10 11:38:14.917210937 +0600
@@ -48,12 +48,12 @@
if [ $ngx_found = no ]; then
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402100708.s1A78M3j000322>