From owner-svn-ports-head@freebsd.org Thu Aug 13 00:58:38 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0D999B7CF3; Thu, 13 Aug 2015 00:58:38 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4BCA77A; Thu, 13 Aug 2015 00:58:38 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7D0wcco031473; Thu, 13 Aug 2015 00:58:38 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7D0wbEm031469; Thu, 13 Aug 2015 00:58:37 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201508130058.t7D0wbEm031469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Thu, 13 Aug 2015 00:58:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394047 - in head/www: nginx nginx-devel nginx-devel/files nginx/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2015 00:58:39 -0000 Author: osa Date: Thu Aug 13 00:58:37 2015 New Revision: 394047 URL: https://svnweb.freebsd.org/changeset/ports/394047 Log: Upgrade third-party clojure module from 0.4.0 to 0.4.1. Deleted: head/www/nginx-devel/files/extra-patch-nginx-clojure-src-c-config head/www/nginx/files/extra-patch-nginx-clojure-src-c-config 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 Thu Aug 13 00:04:33 2015 (r394046) +++ head/www/nginx-devel/Makefile Thu Aug 13 00:58:37 2015 (r394047) @@ -366,12 +366,12 @@ JAVA_VERSION= 1.8 JAVA_VENDOR= openjdk JAVA_BUILD= yes JAVA_RUN= yes -NGINX_CLOJURE_VERSION= 0.4.0 +NGINX_CLOJURE_VERSION= 0.4.1 GH_ACCOUNT+= nginx-clojure:clojure GH_PROJECT+= nginx-clojure:clojure GH_TAGNAME+= v${NGINX_CLOJURE_VERSION}:clojure +CONFIGURE_ENV+= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd" CONFIGURE_ARGS+=--add-module=${WRKSRC_clojure}/src/c -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-clojure-src-c-config .endif .if ${PORT_OPTIONS:MECHO} @@ -965,7 +965,7 @@ post-patch: .endif .if ${PORT_OPTIONS:MCLOJURE} @${REINPLACE_CMD} \ - 's!%%JAVA_HOME%%!${JAVA_HOME}!g' \ + '45,47d' \ ${WRKSRC_clojure}/src/c/config .endif .if ${PORT_OPTIONS:MDRIZZLE} Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Thu Aug 13 00:04:33 2015 (r394046) +++ head/www/nginx-devel/distinfo Thu Aug 13 00:58:37 2015 (r394047) @@ -44,8 +44,8 @@ SHA256 (stnoonan-spnego-http-auth-nginx- SIZE (stnoonan-spnego-http-auth-nginx-module-f76d5d9_GH0.tar.gz) = 18152 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704 -SHA256 (nginx-clojure-nginx-clojure-v0.4.0_GH0.tar.gz) = 1611fb0e82c82a26c2c6c751a597111443705fa4557331296aa0dafae86c5915 -SIZE (nginx-clojure-nginx-clojure-v0.4.0_GH0.tar.gz) = 537138 +SHA256 (nginx-clojure-nginx-clojure-v0.4.1_GH0.tar.gz) = 5d751a2e09c928a2e17f365912fc99fef00bcee4da58c9b7af54700d44668741 +SIZE (nginx-clojure-nginx-clojure-v0.4.1_GH0.tar.gz) = 557736 SHA256 (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 8467237ca0fae74ca7a32fbd34fc6044df307098415d48068214c9c235695a07 SIZE (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 65073 SHA256 (openresty-headers-more-nginx-module-v0.261_GH0.tar.gz) = 03d1f5fbecba8565f247d87a38f5e4b6440b0a56d752bdd2b29af2f1c4aea480 Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Thu Aug 13 00:04:33 2015 (r394046) +++ head/www/nginx/Makefile Thu Aug 13 00:58:37 2015 (r394047) @@ -359,12 +359,12 @@ JAVA_VERSION= 1.8 JAVA_VENDOR= openjdk JAVA_BUILD= yes JAVA_RUN= yes -NGINX_CLOJURE_VERSION= 0.4.0 +NGINX_CLOJURE_VERSION= 0.4.1 GH_ACCOUNT+= nginx-clojure:clojure GH_PROJECT+= nginx-clojure:clojure GH_TAGNAME+= v${NGINX_CLOJURE_VERSION}:clojure +CONFIGURE_ENV+= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd" CONFIGURE_ARGS+=--add-module=${WRKSRC_clojure}/src/c -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-clojure-src-c-config .endif .if ${PORT_OPTIONS:MECHO} @@ -924,7 +924,7 @@ post-patch: .endif .if ${PORT_OPTIONS:MCLOJURE} @${REINPLACE_CMD} \ - 's!%%JAVA_HOME%%!${JAVA_HOME}!g' \ + '45,47d' \ ${WRKSRC_clojure}/src/c/config .endif .if ${PORT_OPTIONS:MDRIZZLE} Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Thu Aug 13 00:04:33 2015 (r394046) +++ head/www/nginx/distinfo Thu Aug 13 00:58:37 2015 (r394047) @@ -44,8 +44,8 @@ SHA256 (stnoonan-spnego-http-auth-nginx- SIZE (stnoonan-spnego-http-auth-nginx-module-f76d5d9_GH0.tar.gz) = 18152 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704 -SHA256 (nginx-clojure-nginx-clojure-v0.4.0_GH0.tar.gz) = 1611fb0e82c82a26c2c6c751a597111443705fa4557331296aa0dafae86c5915 -SIZE (nginx-clojure-nginx-clojure-v0.4.0_GH0.tar.gz) = 537138 +SHA256 (nginx-clojure-nginx-clojure-v0.4.1_GH0.tar.gz) = 5d751a2e09c928a2e17f365912fc99fef00bcee4da58c9b7af54700d44668741 +SIZE (nginx-clojure-nginx-clojure-v0.4.1_GH0.tar.gz) = 557736 SHA256 (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 8467237ca0fae74ca7a32fbd34fc6044df307098415d48068214c9c235695a07 SIZE (openresty-echo-nginx-module-v0.57_GH0.tar.gz) = 65073 SHA256 (openresty-headers-more-nginx-module-v0.261_GH0.tar.gz) = 03d1f5fbecba8565f247d87a38f5e4b6440b0a56d752bdd2b29af2f1c4aea480