svn commit: r397062 - in head/www/h2o: . files

[Grzegorz Blach]

Author: gblach
Date: Wed Sep 16 12:29:56 2015
New Revision: 397062
URL: https://svnweb.freebsd.org/changeset/ports/397062

Log:
  - Fix rc.d issues introduced with recent perl changes [1]
  - Update to 1.4.5 [2]
  
  PR:		203147 [1], 203096 [2]
  Submitted by:	Dave Cottlehuber (maintainer)

Modified:
  head/www/h2o/Makefile
  head/www/h2o/distinfo
  head/www/h2o/files/h2o.in

Modified: head/www/h2o/Makefile
==============================================================================
--- head/www/h2o/Makefile	Wed Sep 16 12:17:44 2015	(r397061)
+++ head/www/h2o/Makefile	Wed Sep 16 12:29:56 2015	(r397062)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	h2o
-PORTVERSION=	1.4.4
+PORTVERSION=	1.4.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	dch at skunkwerks.at
@@ -14,7 +13,8 @@ LICENSE=	MIT
 
 USE_GITHUB=	yes
 
-USES=		cmake compiler:c11 shebangfix
+USES=		cmake compiler:c11 perl5 shebangfix
+USE_PERL5=	run
 SHEBANG_FILES=	share/h2o/start_server
 
 PORTDOCS=	README.md
@@ -40,6 +40,13 @@ USE_RC_SUBR=	${PORTNAME}
 CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF
 USE_OPENSSL_PORT=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \
+			${WRKSRC}/share/h2o/annotate-backtrace-symbols \
+			${WRKSRC}/share/h2o/fetch-ocsp-response \
+			${WRKSRC}/share/h2o/kill-on-close \
+			${WRKSRC}/share/h2o/start_server
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${ETCDIR} \

Modified: head/www/h2o/distinfo
==============================================================================
--- head/www/h2o/distinfo	Wed Sep 16 12:17:44 2015	(r397061)
+++ head/www/h2o/distinfo	Wed Sep 16 12:29:56 2015	(r397062)
@@ -1,2 +1,2 @@
-SHA256 (h2o-h2o-v1.4.4_GH0.tar.gz) = 0297ca73dba460653c6edb14dab17095f60616baf7c51e45ac9f8a6d54b9ba55
-SIZE (h2o-h2o-v1.4.4_GH0.tar.gz) = 4736114
+SHA256 (h2o-h2o-v1.4.5_GH0.tar.gz) = 0f60e8d35afad61afc284a7abfa9c9a3b976e8f9faed3f0966fb34056e2e138d
+SIZE (h2o-h2o-v1.4.5_GH0.tar.gz) = 4736984

Modified: head/www/h2o/files/h2o.in
==============================================================================
--- head/www/h2o/files/h2o.in	Wed Sep 16 12:17:44 2015	(r397061)
+++ head/www/h2o/files/h2o.in	Wed Sep 16 12:29:56 2015	(r397062)
@@ -28,7 +28,7 @@ rcvar=h2o_enable
 pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2`
 command="%%PREFIX%%/bin/${name}"
 command_args="-m daemon -c ${h2o_config}"
-procname="perl"
+procname="%%LOCALBASE%%/bin/perl"
 
 load_rc_config $name
 run_rc_command "$1"