From owner-svn-ports-all@freebsd.org Tue Jul 28 11:21:27 2015 Return-Path: Delivered-To: svn-ports-all@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 82CF39AD534; Tue, 28 Jul 2015 11:21:27 +0000 (UTC) (envelope-from pi@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 73B011E93; Tue, 28 Jul 2015 11:21:27 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6SBLRhe067891; Tue, 28 Jul 2015 11:21:27 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6SBLQne067230; Tue, 28 Jul 2015 11:21:26 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201507281121.t6SBLQne067230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 28 Jul 2015 11:21:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393066 - in head/www/h2o: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jul 2015 11:21:27 -0000 Author: pi Date: Tue Jul 28 11:21:25 2015 New Revision: 393066 URL: https://svnweb.freebsd.org/changeset/ports/393066 Log: www/h2o: 1.2.0 -> 1.4.2 ChangeLog: https://github.com/h2o/h2o/releases PR: 200998 Submitted by: sean@x-n.su Approved by: Dave Cottlehuber (maintainer) Added: head/www/h2o/files/patch-CMakeLists.txt (contents, props changed) Modified: head/www/h2o/Makefile head/www/h2o/distinfo head/www/h2o/pkg-plist Modified: head/www/h2o/Makefile ============================================================================== --- head/www/h2o/Makefile Tue Jul 28 10:43:20 2015 (r393065) +++ head/www/h2o/Makefile Tue Jul 28 11:21:25 2015 (r393066) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= h2o -PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTVERSION= 1.4.2 DISTVERSIONPREFIX= v CATEGORIES= www @@ -44,7 +43,7 @@ USE_RC_SUBR= ${PORTNAME} BROKEN= fails to compile on 8.x .endif -CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF +CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF USE_OPENSSL_PORT= yes post-install: Modified: head/www/h2o/distinfo ============================================================================== --- head/www/h2o/distinfo Tue Jul 28 10:43:20 2015 (r393065) +++ head/www/h2o/distinfo Tue Jul 28 11:21:25 2015 (r393066) @@ -1,2 +1,2 @@ -SHA256 (h2o-h2o-v1.2.0_GH0.tar.gz) = 09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f -SIZE (h2o-h2o-v1.2.0_GH0.tar.gz) = 4155709 +SHA256 (h2o-h2o-v1.4.2_GH0.tar.gz) = 3024e6a8b704d119570551db2cbca701cb6c2fa7126336239044674ee02ea09c +SIZE (h2o-h2o-v1.4.2_GH0.tar.gz) = 4632490 Added: head/www/h2o/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/h2o/files/patch-CMakeLists.txt Tue Jul 28 11:21:25 2015 (r393066) @@ -0,0 +1,27 @@ +--- CMakeLists.txt.orig 2015-07-22 11:57:16 UTC ++++ CMakeLists.txt +@@ -344,14 +344,12 @@ ENDIF (WITH_BUNDLED_SSL) + TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES}) + + INSTALL(TARGETS h2o +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib) ++ RUNTIME DESTINATION bin) + + ADD_EXECUTABLE(setuidgid src/setuidgid.c) + INSTALL(TARGETS setuidgid RUNTIME DESTINATION share/h2o) + +-INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h") +-INSTALL(TARGETS libh2o-evloop DESTINATION lib) ++INSTALL(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h" EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket") + # only install libh2o if libuv is found + IF (LIBUV_FOUND) + INSTALL(TARGETS libh2o DESTINATION lib) +@@ -360,7 +358,6 @@ ELSE (LIBUV_FOUND) + ENDIF (LIBUV_FOUND) + + INSTALL(PROGRAMS share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response share/h2o/kill-on-close share/h2o/start_server DESTINATION share/h2o) +-INSTALL(DIRECTORY doc/ DESTINATION share/doc/h2o PATTERN "Makefile" EXCLUDE PATTERN "README.md" EXCLUDE) + + # tests + ADD_EXECUTABLE(t-00unit-evloop.t ${UNIT_TEST_SOURCE_FILES}) Modified: head/www/h2o/pkg-plist ============================================================================== --- head/www/h2o/pkg-plist Tue Jul 28 10:43:20 2015 (r393065) +++ head/www/h2o/pkg-plist Tue Jul 28 11:21:25 2015 (r393066) @@ -1,6 +1,9 @@ bin/h2o +share/h2o/annotate-backtrace-symbols share/h2o/fetch-ocsp-response +share/h2o/kill-on-close share/h2o/start_server +%%DATADIR%%/setuidgid @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%% @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_PIDDIR%% @sample %%ETCDIR%%/h2o.conf.sample