Date: Sun, 14 Jun 2015 11:36:55 +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: r389626 - in head/www: nginx nginx-devel nginx-devel/files nginx/files Message-ID: <201506141136.t5EBat8b045216@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sun Jun 14 11:36:55 2015 New Revision: 389626 URL: https://svnweb.freebsd.org/changeset/ports/389626 Log: Add third-party clojure module, version 0.3.0. Added: head/www/nginx-devel/files/extra-patch-nginx-clojure-src-c-config (contents, props changed) head/www/nginx/files/extra-patch-nginx-clojure-src-c-config (contents, props changed) 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 Sun Jun 14 10:38:39 2015 (r389625) +++ head/www/nginx-devel/Makefile Sun Jun 14 11:36:55 2015 (r389626) @@ -58,6 +58,7 @@ OPTIONS_DEFINE= \ WWW \ AJP \ CACHE_PURGE \ + CLOJURE \ ECHO \ HEADERS_MORE \ HTTP_ACCEPT_LANGUAGE \ @@ -150,6 +151,7 @@ THREADS_DESC= Enable threads support WWW_DESC= Enable html sample files AJP_DESC= 3rd party ajp module CACHE_PURGE_DESC= 3rd party cache_purge module +CLOJURE_DESC= 3rd party clojure module ECHO_DESC= 3rd party echo module HEADERS_MORE_DESC= 3rd party headers_more module HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module @@ -355,6 +357,21 @@ DISTFILES+= ngx_cache_purge-${NGINX_CACH CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION} .endif +.if ${PORT_OPTIONS:MCLOJURE} +USE_JAVA= yes +JAVA_OS= native +JAVA_VERSION= 1.8 +JAVA_VENDOR= openjdk +JAVA_BUILD= yes +JAVA_RUN= yes +NGINX_CLOJURE_VERSION= 0.3.0 +GH_ACCOUNT+= nginx-clojure:clojure +GH_PROJECT+= nginx-clojure:clojure +GH_TAGNAME+= v${NGINX_CLOJURE_VERSION}:clojure +CONFIGURE_ARGS+=--add-module=${WRKSRC_clojure}/src/c +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-clojure-src-c-config +.endif + .if ${PORT_OPTIONS:MECHO} NGINX_ECHO_VERSION= 0.57 GH_ACCOUNT+= openresty:echo @@ -928,6 +945,11 @@ post-patch: 's!^inline!static inline!' \ ${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}/ngx_http_zip_parsers.* .endif +.if ${PORT_OPTIONS:MCLOJURE} + @${REINPLACE_CMD} \ + 's!%%JAVA_HOME%%!${JAVA_HOME}!g' \ + ${WRKSRC_clojure}/src/c/config +.endif .if ${PORT_OPTIONS:MDRIZZLE} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Sun Jun 14 10:38:39 2015 (r389625) +++ head/www/nginx-devel/distinfo Sun Jun 14 11:36:55 2015 (r389626) @@ -44,6 +44,8 @@ SHA256 (stnoonan-spnego-http-auth-nginx- SIZE (stnoonan-spnego-http-auth-nginx-module-29cb489_GH0.tar.gz) = 17546 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.3.0_GH0.tar.gz) = 4f706195d358aeabed3a2f9ed0f412542ce3d17d4466cffb75f798e15fd79952 +SIZE (nginx-clojure-nginx-clojure-v0.3.0_GH0.tar.gz) = 472761 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.26_GH0.tar.gz) = d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f Added: head/www/nginx-devel/files/extra-patch-nginx-clojure-src-c-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-nginx-clojure-src-c-config Sun Jun 14 11:36:55 2015 (r389626) @@ -0,0 +1,25 @@ +--- ../nginx-clojure-0.3.0/src/c/config.orig 2014-12-11 16:52:18.000000000 +0300 ++++ ../nginx-clojure-0.3.0/src/c/config 2015-06-14 14:19:27.064234000 +0300 +@@ -13,9 +13,13 @@ + $ngx_addon_dir/ngx_http_clojure_socket.h \ + " + ++#freebsd ++JNI_HEADER_1="%%JAVA_HOME%%/include" ++JNI_HEADER_2="${JNI_HEADER_1}/freebsd" ++ + #linux ubuntu +-JNI_HEADER_1="/usr/lib/jvm/java-7-oracle/include" +-JNI_HEADER_2="${JNI_HEADER_1}/linux" ++#JNI_HEADER_1="/usr/lib/jvm/java-7-oracle/include" ++#JNI_HEADER_2="${JNI_HEADER_1}/linux" + + #linux centos + #JNI_HEADER_1="/usr/java/jdk1.6.0_45/include" +@@ -43,6 +47,3 @@ + #for easy debug on linux or macosx + #CFLAGS="-g -O0 $CFLAGS" + +-if [ "$NGX_PLATFORM" != win32 ]; then +-CORE_LIBS="$CORE_LIBS -ldl"; +-fi Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sun Jun 14 10:38:39 2015 (r389625) +++ head/www/nginx/Makefile Sun Jun 14 11:36:55 2015 (r389626) @@ -57,6 +57,7 @@ OPTIONS_DEFINE= \ WWW \ AJP \ CACHE_PURGE \ + CLOJURE \ ECHO \ HEADERS_MORE \ HTTP_ACCEPT_LANGUAGE \ @@ -146,6 +147,7 @@ THREADS_DESC= Enable threads support WWW_DESC= Enable html sample files AJP_DESC= 3rd party ajp module CACHE_PURGE_DESC= 3rd party cache_purge module +CLOJURE_DESC= 3rd party clojure module ECHO_DESC= 3rd party echo module HEADERS_MORE_DESC= 3rd party headers_more module HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module @@ -350,6 +352,21 @@ DISTFILES+= ngx_cache_purge-${NGINX_CACH CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION} .endif +.if ${PORT_OPTIONS:MCLOJURE} +USE_JAVA= yes +JAVA_OS= native +JAVA_VERSION= 1.8 +JAVA_VENDOR= openjdk +JAVA_BUILD= yes +JAVA_RUN= yes +NGINX_CLOJURE_VERSION= 0.3.0 +GH_ACCOUNT+= nginx-clojure:clojure +GH_PROJECT+= nginx-clojure:clojure +GH_TAGNAME+= v${NGINX_CLOJURE_VERSION}:clojure +CONFIGURE_ARGS+=--add-module=${WRKSRC_clojure}/src/c +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-clojure-src-c-config +.endif + .if ${PORT_OPTIONS:MECHO} NGINX_ECHO_VERSION= 0.57 GH_ACCOUNT+= openresty:echo @@ -904,6 +921,11 @@ post-patch: 's!^inline!static inline!' \ ${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}/ngx_http_zip_parsers.* .endif +.if ${PORT_OPTIONS:MCLOJURE} + @${REINPLACE_CMD} \ + 's!%%JAVA_HOME%%!${JAVA_HOME}!g' \ + ${WRKSRC_clojure}/src/c/config +.endif .if ${PORT_OPTIONS:MDRIZZLE} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Sun Jun 14 10:38:39 2015 (r389625) +++ head/www/nginx/distinfo Sun Jun 14 11:36:55 2015 (r389626) @@ -44,6 +44,8 @@ SHA256 (stnoonan-spnego-http-auth-nginx- SIZE (stnoonan-spnego-http-auth-nginx-module-29cb489_GH0.tar.gz) = 17546 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.3.0_GH0.tar.gz) = 4f706195d358aeabed3a2f9ed0f412542ce3d17d4466cffb75f798e15fd79952 +SIZE (nginx-clojure-nginx-clojure-v0.3.0_GH0.tar.gz) = 472761 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.26_GH0.tar.gz) = d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f Added: head/www/nginx/files/extra-patch-nginx-clojure-src-c-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nginx-clojure-src-c-config Sun Jun 14 11:36:55 2015 (r389626) @@ -0,0 +1,25 @@ +--- ../nginx-clojure-0.3.0/src/c/config.orig 2014-12-11 16:52:18.000000000 +0300 ++++ ../nginx-clojure-0.3.0/src/c/config 2015-06-14 14:19:27.064234000 +0300 +@@ -13,9 +13,13 @@ + $ngx_addon_dir/ngx_http_clojure_socket.h \ + " + ++#freebsd ++JNI_HEADER_1="%%JAVA_HOME%%/include" ++JNI_HEADER_2="${JNI_HEADER_1}/freebsd" ++ + #linux ubuntu +-JNI_HEADER_1="/usr/lib/jvm/java-7-oracle/include" +-JNI_HEADER_2="${JNI_HEADER_1}/linux" ++#JNI_HEADER_1="/usr/lib/jvm/java-7-oracle/include" ++#JNI_HEADER_2="${JNI_HEADER_1}/linux" + + #linux centos + #JNI_HEADER_1="/usr/java/jdk1.6.0_45/include" +@@ -43,6 +47,3 @@ + #for easy debug on linux or macosx + #CFLAGS="-g -O0 $CFLAGS" + +-if [ "$NGX_PLATFORM" != win32 ]; then +-CORE_LIBS="$CORE_LIBS -ldl"; +-fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506141136.t5EBat8b045216>