Date: Tue, 15 May 2012 23:40:08 +0900 (JST) From: Masaki TAGAWA <masaki@club.kyutech.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/167926: [maintainer update] www/mod_spdy: Update to 0.9.2.1 Message-ID: <201205151440.q4FEe8B8011012@rosetta.club.kyutech.ac.jp> Resent-Message-ID: <201205151450.q4FEo32S046584@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 167926 >Category: ports >Synopsis: [maintainer update] www/mod_spdy: Update to 0.9.2.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 15 14:50:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Masaki TAGAWA >Release: FreeBSD 9.0-RELEASE amd64 >Organization: Kyushu Institute of Technology >Environment: System: FreeBSD rosetta.club.kyutech.ac.jp 9.0-RELEASE FreeBSD 9.0-RELEASE #6: Sun Apr 22 19:40:14 JST 2012 root@rosetta.club.kyutech.ac.jp:/usr/obj/usr/src/sys/CLUBVMKERNEL amd64 >Description: - Update www/mod_spdy to 0.9.2.1 - Since it synced to latest version of Chromium, we have to change the default compiler as www/chromium - Note that clang is now the default compiler (GCC 4.6 is optionable) - Added DEBUG option >How-To-Repeat: >Fix: --- mod_spdy.patch begins here --- diff -ruN /usr/ports/www/mod_spdy/Makefile /tmp/mod_spdy/Makefile --- /usr/ports/www/mod_spdy/Makefile 2012-05-04 22:37:51.000000000 +0900 +++ /tmp/mod_spdy/Makefile 2012-05-15 23:20:57.672649000 +0900 @@ -6,7 +6,7 @@ # PORTNAME= mod_spdy -PORTVERSION= 0.9.1.5 +PORTVERSION= 0.9.2.1 CATEGORIES= www MASTER_SITES= http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \ ${MASTER_SITE_APACHE_HTTPD}:apache22 \ @@ -28,14 +28,11 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo USE_XZ= yes -USE_BINUTILS= yes USE_APACHE= 22+ USE_PYTHON= 2.6+ USE_GMAKE= yes -MAKE_JOBS_SAFE= yes ONLY_FOR_ARCHS= amd64 i386 LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV+= BUILDTYPE=Release WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src GYP_DEFINES+= \ use_system_apache_dev=1 \ @@ -49,6 +46,49 @@ SUB_LIST= DATADIR=${DATADIR} \ APACHEMODDIR=${PREFIX}/${APACHEMODDIR} +OPTIONS= CLANG "Build with Clang" on \ + GCC46 "Build with GCC 4.6+" off \ + DEBUG "Compile with debug symbols and verbose output" off + +.include <bsd.port.options.mk> + +.if ${OSVERSION} < 900033 || defined(WITH_GCC46) +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +.endif + +.if !defined(WITH_GCC46) && !defined(WITH_CLANG) +IGNORE= does not compile with base gcc +.endif + +.if defined(WITH_GCC46) && defined(WITH_CLANG) +IGNORE= conflicting options (CLANG and GCC46) +.endif + +.if defined(WITH_GCC46) +USE_GCC?= 4.6+ +.endif + +.if defined(WITH_CLANG) +.if ${OSVERSION} < 900033 +BUILD_DEPENDS+= clang:${PORTSDIR}/lang/clang +.endif +CC= clang +CXX= clang++ +GYP_DEFINES+= clang=1 +.endif + +.if !defined(WITH_DEBUG) +BUILDTYPE= Release +.else +MAKE_ENV+= V=1 +BUILDTYPE= Debug +.endif + +MAKE_ENV+= BUILDTYPE=${BUILDTYPE} +MAKE_JOBS_SAFE= yes + .include <bsd.port.pre.mk> post-extract: @@ -64,18 +104,17 @@ @${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \ ${WRKSRC}/build_modssl_with_npn.sh -pre-build: - @cd ${WRKSRC} && \ - BUILDROOT=${WRKSRC}/temp ${WRKSRC}/build_modssl_with_npn.sh - do-configure: @cd ${WRKSRC} && \ GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} \ ../../depot_tools/gclient.py runhooks -do-install: +pre-build: @cd ${WRKSRC} && \ - ${INSTALL} out/Release/libmod_spdy.so ${PREFIX}/${APACHEMODDIR}/mod_spdy.so + BUILDROOT=${WRKSRC}/temp ${WRKSRC}/build_modssl_with_npn.sh + +do-install: + @${INSTALL} ${WRKSRC}/out/${BUILDTYPE}/libmod_spdy.so ${PREFIX}/${APACHEMODDIR}/mod_spdy.so @${MKDIR} ${DATADIR} @${INSTALL} ${WRKSRC}/mod_ssl.so ${DATADIR}/mod_ssl.so diff -ruN /usr/ports/www/mod_spdy/distinfo /tmp/mod_spdy/distinfo --- /usr/ports/www/mod_spdy/distinfo 2012-05-04 22:37:51.000000000 +0900 +++ /tmp/mod_spdy/distinfo 2012-05-15 14:12:00.691650000 +0900 @@ -1,5 +1,5 @@ -SHA256 (mod_spdy/mod_spdy_source_0.9.1.5.tar.xz) = c57d04849519f996b9466290e8f52675510b03abe1a00cf298af14cc8a6f8d0a -SIZE (mod_spdy/mod_spdy_source_0.9.1.5.tar.xz) = 4382188 +SHA256 (mod_spdy/mod_spdy_source_0.9.2.1.tar.xz) = 841725c549bf41caa99232231bb01947a319c7b5ab7c046c919c4a78e24d930f +SIZE (mod_spdy/mod_spdy_source_0.9.2.1.tar.xz) = 4792132 SHA256 (mod_spdy/httpd-2.2.22.tar.gz) = 74c1ffffefe1a502339b004ad6488fbd858eb425a05968cd67c05695dbc0fe7c SIZE (mod_spdy/httpd-2.2.22.tar.gz) = 7200529 SHA256 (mod_spdy/openssl-1.0.1.tar.gz) = 4d9f0a594a9a89b28e1a04a9504c04104f6508ee27ad1e0efdd17a7a6dbbeeee diff -ruN /usr/ports/www/mod_spdy/files/patch-apr.gyp /tmp/mod_spdy/files/patch-apr.gyp --- /usr/ports/www/mod_spdy/files/patch-apr.gyp 1970-01-01 09:00:00.000000000 +0900 +++ /tmp/mod_spdy/files/patch-apr.gyp 2012-05-15 14:11:34.582648000 +0900 @@ -0,0 +1,11 @@ +--- third_party/apache/apr/apr.gyp.old 2012-05-14 20:42:31.000000000 +0900 ++++ third_party/apache/apr/apr.gyp 2012-05-14 21:46:57.000000000 +0900 +@@ -201,7 +201,7 @@ + }, + { + 'target_name': 'apr', +- 'type': 'settings', ++ 'type': '<(library)', + 'dependencies': [ + 'include', + ], diff -ruN /usr/ports/www/mod_spdy/files/patch-aprutil.gyp /tmp/mod_spdy/files/patch-aprutil.gyp --- /usr/ports/www/mod_spdy/files/patch-aprutil.gyp 1970-01-01 09:00:00.000000000 +0900 +++ /tmp/mod_spdy/files/patch-aprutil.gyp 2012-05-15 14:11:34.539648000 +0900 @@ -0,0 +1,11 @@ +--- third_party/apache/aprutil/aprutil.gyp.old 2012-05-14 20:42:31.000000000 +0900 ++++ third_party/apache/aprutil/aprutil.gyp 2012-05-14 21:47:36.000000000 +0900 +@@ -142,7 +142,7 @@ + }, + { + 'target_name': 'aprutil', +- 'type': 'settings', ++ 'type': '<(library)', + 'dependencies': [ + 'include', + ], diff -ruN /usr/ports/www/mod_spdy/files/patch-gyp_chromium /tmp/mod_spdy/files/patch-gyp_chromium --- /usr/ports/www/mod_spdy/files/patch-gyp_chromium 1970-01-01 09:00:00.000000000 +0900 +++ /tmp/mod_spdy/files/patch-gyp_chromium 2012-05-15 14:11:34.495649000 +0900 @@ -0,0 +1,8 @@ +--- build/gyp_chromium.old 2012-05-14 20:42:30.000000000 +0900 ++++ build/gyp_chromium 2012-05-14 22:00:42.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/local/bin/python + + # Copyright 2010 Google Inc. + # diff -ruN /usr/ports/www/mod_spdy/files/patch-spdy_protocol_test.cc /tmp/mod_spdy/files/patch-spdy_protocol_test.cc --- /usr/ports/www/mod_spdy/files/patch-spdy_protocol_test.cc 2012-05-04 22:37:52.000000000 +0900 +++ /tmp/mod_spdy/files/patch-spdy_protocol_test.cc 1970-01-01 09:00:00.000000000 +0900 @@ -1,18 +0,0 @@ ---- net/spdy/spdy_protocol_test.cc.org 2012-03-31 16:28:55.670784000 +0900 -+++ net/spdy/spdy_protocol_test.cc 2012-03-31 20:49:17.303795861 +0900 -@@ -239,13 +239,13 @@ - frame.set_stream_id(0); - // TODO(mbelshe): implement EXPECT_DEBUG_DEATH on windows. - #ifndef WIN32 -- EXPECT_DEBUG_DEATH(frame.set_stream_id(~0), ""); -+ EXPECT_DEATH_IF_SUPPORTED(frame.set_stream_id(~0), ""); - #endif - EXPECT_FALSE(frame.is_control_frame()); - - frame.set_flags(0); - #ifndef WIN32 -- EXPECT_DEBUG_DEATH(frame.set_length(~0), ""); -+ EXPECT_DEATH_IF_SUPPORTED(frame.set_length(~0), ""); - #endif - EXPECT_EQ(0, frame.flags()); - } diff -ruN /usr/ports/www/mod_spdy/files/patch-sys_byteorder.h /tmp/mod_spdy/files/patch-sys_byteorder.h --- /usr/ports/www/mod_spdy/files/patch-sys_byteorder.h 1970-01-01 09:00:00.000000000 +0900 +++ /tmp/mod_spdy/files/patch-sys_byteorder.h 2012-05-15 14:11:34.625649000 +0900 @@ -0,0 +1,40 @@ +--- third_party/chromium/src/base/sys_byteorder.h.org 2012-05-15 13:15:00.000000000 +0900 ++++ third_party/chromium/src/base/sys_byteorder.h 2012-05-15 13:32:03.000000000 +0900 +@@ -25,7 +25,7 @@ + #include <stdlib.h> + #elif defined(OS_MACOSX) + #include <libkern/OSByteOrder.h> +-#elif defined(OS_OPENBSD) ++#elif defined(OS_OPENBSD) || defined(OS_FREEBSD) + #include <sys/endian.h> + #else + #include <byteswap.h> +@@ -42,6 +42,8 @@ + return OSSwapInt16(x); + #elif defined(OS_OPENBSD) + return swap16(x); ++#elif defined(OS_FREEBSD) ++ return bswap16(x); + #else + return bswap_16(x); + #endif +@@ -53,6 +55,8 @@ + return OSSwapInt32(x); + #elif defined(OS_OPENBSD) + return swap32(x); ++#elif defined(OS_FREEBSD) ++ return bswap32(x); + #else + return bswap_32(x); + #endif +@@ -63,7 +67,9 @@ + #elif defined(OS_MACOSX) + return OSSwapInt64(x); + #elif defined(OS_OPENBSD) +- return swap64(x); ++ return swap64(x); ++#elif defined(OS_FREEBSD) ++ return bswap64(x); + #else + return bswap_64(x); + #endif --- mod_spdy.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205151440.q4FEe8B8011012>