From owner-svn-ports-head@freebsd.org Thu Feb 13 22:08:56 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A4F7823799E; Thu, 13 Feb 2020 22:08:56 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48JVyw3Wy0z4f0g; Thu, 13 Feb 2020 22:08:56 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7370C19930; Thu, 13 Feb 2020 22:08:56 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01DM8uO8054011; Thu, 13 Feb 2020 22:08:56 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01DM8udx054010; Thu, 13 Feb 2020 22:08:56 GMT (envelope-from osa@FreeBSD.org) Message-Id: <202002132208.01DM8udx054010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Thu, 13 Feb 2020 22:08:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526068 - head/www/unit X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: head/www/unit X-SVN-Commit-Revision: 526068 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Feb 2020 22:08:56 -0000 Author: osa Date: Thu Feb 13 22:08:56 2020 New Revision: 526068 URL: https://svnweb.freebsd.org/changeset/ports/526068 Log: This commit introduces two new knobs: o) SSL - enable SSL/TLS, disable by default; o) DEVKIT - install unit static library and headers for development. Bump PORTREVISION. Modified: head/www/unit/Makefile Modified: head/www/unit/Makefile ============================================================================== --- head/www/unit/Makefile Thu Feb 13 21:55:01 2020 (r526067) +++ head/www/unit/Makefile Thu Feb 13 22:08:56 2020 (r526068) @@ -3,6 +3,7 @@ PORTNAME= unit PORTVERSION= 1.15.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://unit.nginx.org/download/ @@ -19,11 +20,15 @@ CPE_PRODUCT= unit OPTIONS_DEFINE?= \ DEBUG \ + DEVKIT \ IPV6 \ + SSL \ UNIXSOCK OPTIONS_DEFAULT?=UNIXSOCK DEBUG_DESC= Enable debug logging +DEVKIT_DESC= Install headers and library +SSL_DESC= Enable SSL/TLS UNIXSOCK_DESC= Enable unix sockets .include @@ -57,16 +62,37 @@ SUB_LIST= UNIT_PIDFILE=${UNIT_PIDFILE} \ CONFIGURE_ARGS+=--debug .endif +.if ${PORT_OPTIONS:MDEVKIT} +PLIST_FILES+= include/nxt_unit_field.h \ + include/nxt_unit.h \ + include/nxt_unit_request.h \ + include/nxt_unit_response.h \ + include/nxt_unit_sptr.h \ + include/nxt_unit_typedefs.h \ + include/nxt_unit_websocket.h \ + include/nxt_version.h \ + include/nxt_websocket_header.h \ + lib/libunit.a +.endif + .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--no-ipv6 .endif +.if ${PORT_OPTIONS:MSSL} +CONFIGURE_ARGS+=--openssl +USES+= ssl +.endif + .if empty(PORT_OPTIONS:MUNIXSOCK) CONFIGURE_ARGS+=--no-unix-sockets .else CONFIGURE_ARGS+=--control=unix:${UNIT_SOCK} .endif +post-build-DEVKIT-on: + @cd ${WRKSRC} && ${GMAKE} build/libunit.a + .if !target(post-install) post-install: ${MKDIR} ${STAGEDIR}${UNIT_LOGDIR} @@ -74,6 +100,9 @@ post-install: ${ECHO_CMD} @dir ${UNIT_LOGDIR} >> ${TMPPLIST} ${ECHO_CMD} @dir ${UNIT_RUNDIR} >> ${TMPPLIST} ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/unit/modules + +post-install-DEVKIT-on: + ${GMAKE} -C ${WRKSRC} libunit-install DESTDIR=${STAGEDIR} .endif .include