Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Sep 2015 19:29:11 +0000 (UTC)
From:      Grzegorz Blach <gblach@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396229 - in head/www/h2o: . files
Message-ID:  <201509061929.t86JTB1P004427@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gblach
Date: Sun Sep  6 19:29:10 2015
New Revision: 396229
URL: https://svnweb.freebsd.org/changeset/ports/396229

Log:
  - Update to 1.4.4 [1]
  - Drop 8.x support [2]
  
  PR:		202818 [1]
  Submitted by:	Dave Cottlehuber (dch <at> skunkwerks <dot> at) [1]
  Approved by:	portmgr blanket [2]

Modified:
  head/www/h2o/Makefile
  head/www/h2o/distinfo
  head/www/h2o/files/patch-CMakeLists.txt

Modified: head/www/h2o/Makefile
==============================================================================
--- head/www/h2o/Makefile	Sun Sep  6 17:15:42 2015	(r396228)
+++ head/www/h2o/Makefile	Sun Sep  6 19:29:10 2015	(r396229)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -39,10 +39,6 @@ USE_RC_SUBR=	${PORTNAME}
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 900000
-BROKEN=		fails to compile on 8.x
-.endif
-
 CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF
 USE_OPENSSL_PORT=	yes
 

Modified: head/www/h2o/distinfo
==============================================================================
--- head/www/h2o/distinfo	Sun Sep  6 17:15:42 2015	(r396228)
+++ head/www/h2o/distinfo	Sun Sep  6 19:29:10 2015	(r396229)
@@ -1,2 +1,2 @@
-SHA256 (h2o-h2o-v1.4.3_GH0.tar.gz) = b41cdbadd2a345bc4a91295fd6faf39923c83beb00ad795f87fde69e2ba66f43
-SIZE (h2o-h2o-v1.4.3_GH0.tar.gz) = 4736127
+SHA256 (h2o-h2o-v1.4.4_GH0.tar.gz) = 0297ca73dba460653c6edb14dab17095f60616baf7c51e45ac9f8a6d54b9ba55
+SIZE (h2o-h2o-v1.4.4_GH0.tar.gz) = 4736114

Modified: head/www/h2o/files/patch-CMakeLists.txt
==============================================================================
--- head/www/h2o/files/patch-CMakeLists.txt	Sun Sep  6 17:15:42 2015	(r396228)
+++ head/www/h2o/files/patch-CMakeLists.txt	Sun Sep  6 19:29:10 2015	(r396229)
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig	2015-07-22 11:57:16 UTC
+--- CMakeLists.txt.orig	2015-09-01 19:56:02 UTC
 +++ CMakeLists.txt
-@@ -344,14 +344,12 @@ ENDIF (WITH_BUNDLED_SSL)
+@@ -285,7 +285,6 @@ IF (OPENSSL_FOUND)
+     ELSE (LIBUV_FOUND)
+         SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
+     ENDIF (LIBUV_FOUND)
+-    INSTALL(TARGETS libh2o-evloop DESTINATION lib)
+ ELSE (OPENSSL_FOUND)
+     SET_TARGET_PROPERTIES(libh2o PROPERTIES EXCLUDE_FROM_ALL 1)
+     SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES EXCLUDE_FROM_ALL 1)
+@@ -353,16 +352,15 @@ ENDIF (WITH_BUNDLED_SSL)
  TARGET_LINK_LIBRARIES(h2o ${EXTRA_LIBRARIES})
  
  INSTALL(TARGETS h2o
@@ -12,13 +20,8 @@
  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(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h"
++    EXCLUDE PATTERN "h2o" EXCLUDE PATTERN "h2o/socket")
  
  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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509061929.t86JTB1P004427>