svn commit: r536268 - in head/net/pichi: . files
Hiroki Tagato
tagattie at FreeBSD.org
Sat May 23 06:43:20 UTC 2020
Author: tagattie
Date: Sat May 23 06:43:19 2020
New Revision: 536268
URL: https://svnweb.freebsd.org/changeset/ports/536268
Log:
- Update to 1.3.0
- Switch to options helpers (partially)
PR: 243073
Submitted by: Pichi <pichi at elude.in> (maintainer)
Approved by: mentors (implicit)
Changelog: https://github.com/pichi-router/pichi/releases/tag/1.3.0
Deleted:
head/net/pichi/files/patch-CMakeLists.txt
head/net/pichi/files/patch-cmake_ProcessOptions.cmake
head/net/pichi/files/patch-include_config.h.in
head/net/pichi/files/patch-src_net_asio.cpp
Modified:
head/net/pichi/Makefile
head/net/pichi/distinfo
head/net/pichi/pkg-plist
Modified: head/net/pichi/Makefile
==============================================================================
--- head/net/pichi/Makefile Sat May 23 06:22:07 2020 (r536267)
+++ head/net/pichi/Makefile Sat May 23 06:43:19 2020 (r536268)
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= pichi
-DISTVERSION= 1.2.0
-PORTREVISION= 1
+DISTVERSION= 1.3.0
CATEGORIES= net
MAINTAINER= pichi at elude.in
-COMMENT= Application Layer Proxy controlled via RESTful APIs
+COMMENT= Flexible rule-based proxy
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -22,20 +21,19 @@ USE_RC_SUBR= pichi
PLIST_SUB= DISTVERSION=${DISTVERSION}
CMAKE_BUILD_TYPE= MinSizeRel
-CMAKE_ARGS= -DVERSION=${DISTVERSION}
-CMAKE_ON= BUILD_SERVER BUILD_TEST
-CMAKE_OFF= INSTALL_HEADERS
-INSTALL_TARGET= install/strip
-TEST_TARGET= test
+CMAKE_ARGS= -DVERSION=${DISTVERSION}
+CMAKE_ON= BUILD_SERVER BUILD_TEST
+INSTALL_TARGET= install/strip
+TEST_TARGET= test
-OPTIONS_DEFINE= STATIC TLS
+OPTIONS_DEFINE= DEVEL STATIC TLS
OPTIONS_DEFAULT= TLS
OPTIONS_SUB= yes
TLS_DESC= Enable TLS support ( requiring OpenSSL )
TLS_CMAKE_BOOL= ENABLE_TLS
-STATIC_DESC= Build/Install static library
+STATIC_DESC= Static linking
STATIC_CMAKE_BOOL= STATIC_LINK
STATIC_BUILD_DEPENDS= boost-libs>=1.67.0:devel/boost-libs \
libmaxminddb>=1.3.0:net/libmaxminddb \
@@ -50,13 +48,13 @@ STATIC_LIB_DEPENDS_OFF= libboost_context.so:devel/boos
libmbedtls.so:security/mbedtls \
libmbedx509.so:security/mbedtls \
libsodium.so:security/libsodium
+STATIC_USE_OFF= LDCONFIG=yes
+DEVEL_DESC= Install development files
+DEVEL_CMAKE_BOOL= INSTALL_DEVEL
+
.include <bsd.port.options.mk>
-.if ! ${PORT_OPTIONS:MSTATIC}
-USE_LDCONFIG= yes
-.endif
-
.if ${PORT_OPTIONS:MTLS}
.if ${PORT_OPTIONS:MSTATIC}
USES+= ssl:build
@@ -69,6 +67,8 @@ post-install:
${MKDIR} ${STAGEDIR}${ETCDIR}
${INSTALL_DATA} ${WRKSRC}/test/geo.mmdb ${STAGEDIR}${ETCDIR}/geo.mmdb
${INSTALL_DATA} ${WRKSRC}/server/pichi.json.default ${STAGEDIR}${ETCDIR}/pichi.json.sample
+
+post-install-DEVEL-on:
${MKDIR} ${STAGEDIR}${PREFIX}/include
${INSTALL_DATA} ${WRKSRC}/include/pichi.h ${STAGEDIR}${PREFIX}/include/pichi.h
Modified: head/net/pichi/distinfo
==============================================================================
--- head/net/pichi/distinfo Sat May 23 06:22:07 2020 (r536267)
+++ head/net/pichi/distinfo Sat May 23 06:43:19 2020 (r536268)
@@ -1,3 +1,3 @@
TIMESTAMP = 1554899633
-SHA256 (pichi-router-pichi-1.2.0_GH0.tar.gz) = 8965077371f2dbf49a63659d686470c191c2c21c47a32f44b3b8bb2d72968043
-SIZE (pichi-router-pichi-1.2.0_GH0.tar.gz) = 1841049
+SHA256 (pichi-router-pichi-1.3.0_GH0.tar.gz) = f5686a1e7c98d9c9eca88d88af53b85648ceeff9aa33bf2b1d95a09462d74d1c
+SIZE (pichi-router-pichi-1.3.0_GH0.tar.gz) = 2066723
Modified: head/net/pichi/pkg-plist
==============================================================================
--- head/net/pichi/pkg-plist Sat May 23 06:22:07 2020 (r536267)
+++ head/net/pichi/pkg-plist Sat May 23 06:43:19 2020 (r536268)
@@ -1,7 +1,43 @@
bin/pichi
-include/pichi.h
- at sample etc/pichi/pichi.json.sample
-etc/pichi/geo.mmdb
+%%ETCDIR%%/geo.mmdb
+ at sample %%ETCDIR%%/pichi.json.sample
%%NO_STATIC%%lib/libpichi.so.%%DISTVERSION%%
%%NO_STATIC%%lib/libpichi.so
-%%STATIC%%lib/libpichi.a
+%%STATIC%%%%DEVEL%%lib/libpichi.a
+%%DEVEL%%include/boost/asio/spawn2.hpp
+%%DEVEL%%include/pichi/api/balancer.hpp
+%%DEVEL%%include/pichi/api/egress_manager.hpp
+%%DEVEL%%include/pichi/api/ingress_holder.hpp
+%%DEVEL%%include/pichi/api/ingress_manager.hpp
+%%DEVEL%%include/pichi/api/iterator.hpp
+%%DEVEL%%include/pichi/api/rest.hpp
+%%DEVEL%%include/pichi/api/router.hpp
+%%DEVEL%%include/pichi/api/server.hpp
+%%DEVEL%%include/pichi/api/session.hpp
+%%DEVEL%%include/pichi/api/vos.hpp
+%%DEVEL%%include/pichi/asserts.hpp
+%%DEVEL%%include/pichi/buffer.hpp
+%%DEVEL%%include/pichi/common.hpp
+%%DEVEL%%include/pichi/config.hpp
+%%DEVEL%%include/pichi/crypto/aead.hpp
+%%DEVEL%%include/pichi/crypto/base64.hpp
+%%DEVEL%%include/pichi/crypto/hash.hpp
+%%DEVEL%%include/pichi/crypto/key.hpp
+%%DEVEL%%include/pichi/crypto/method.hpp
+%%DEVEL%%include/pichi/crypto/stream.hpp
+%%DEVEL%%include/pichi/exception.hpp
+%%DEVEL%%include/pichi/net/adapter.hpp
+%%DEVEL%%include/pichi/net/asio.hpp
+%%DEVEL%%include/pichi/net/common.hpp
+%%DEVEL%%include/pichi/net/direct.hpp
+%%DEVEL%%include/pichi/net/helpers.hpp
+%%DEVEL%%include/pichi/net/http.hpp
+%%DEVEL%%include/pichi/net/reject.hpp
+%%DEVEL%%include/pichi/net/socks5.hpp
+%%DEVEL%%include/pichi/net/spawn.hpp
+%%DEVEL%%include/pichi/net/ssaead.hpp
+%%DEVEL%%include/pichi/net/ssstream.hpp
+%%DEVEL%%include/pichi/net/tunnel.hpp
+%%DEVEL%%include/pichi/test/socket.hpp
+%%DEVEL%%include/pichi/uri.hpp
+%%DEVEL%%include/pichi.h
More information about the svn-ports-all
mailing list