git: 030fe4d66463 - main - net/arataga: improve the port prior to hooking up unit tests (+)

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=030fe4d66463b6f7c638a87cd8c078b5f3df06eb

commit 030fe4d66463b6f7c638a87cd8c078b5f3df06eb
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-05-29 15:29:32 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-05-29 15:29:41 +0000

    net/arataga: improve the port prior to hooking up unit tests (+)
    
    - Move installation recipe to `files/makefile' where it belongs
    - Fix a typo (OBJ -> OBJS) and clean up `files/makefile' a bit
    - Improve wording in the port description (reduce tautology)
---
 net/arataga/Makefile       |  5 +----
 net/arataga/files/makefile | 13 +++++++------
 net/arataga/pkg-descr      |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/net/arataga/Makefile b/net/arataga/Makefile
index 9faf5dfa4c85..237ce2aa02c6 100644
--- a/net/arataga/Makefile
+++ b/net/arataga/Makefile
@@ -53,10 +53,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/#include <sys\/prctl\.h>/d ; \
 		/#include/s,args/,,' ${WRKSRC}/main.cpp
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
-do-install-DOCS-on:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR}
 
diff --git a/net/arataga/files/makefile b/net/arataga/files/makefile
index 33e54199307d..5a25314533f4 100644
--- a/net/arataga/files/makefile
+++ b/net/arataga/files/makefile
@@ -1,12 +1,8 @@
-LOCALBASE?=	/usr/local
 CXXFLAGS+=	-std=c++17 -Wall -Wextra
 CPPFLAGS+=	-I. -I.. -I$(LOCALBASE)/include -DSPDLOG_FMT_EXTERNAL
-
 LDFLAGS+=	-pthread $(LOCALBASE)/lib/libso.$(SO5_LIBVER).so \
 		-L$(LOCALBASE)/lib -lfmt -lhttp_parser
 
-CCACHE?=	$(shell command -v ccache)
-
 oess_OBJS=	oess_2/defs/err_code.o \
 		oess_2/defs/ex.o \
 		oess_2/defs/quantity.o \
@@ -27,7 +23,7 @@ stats_OBJS=	stats/auth/pub.o \
 logging_OBJS=	logging/stats_counters.o \
 		logging/wrap_logging.o
 
-connection_handlers_OBJ=\
+connection_handlers_OBJS=\
 		acl_handler/connection_handler_ifaces.o \
 		acl_handler/handlers/protocol_detection.o \
 		acl_handler/handlers/data_transfer.o \
@@ -55,9 +51,11 @@ misc_OBJS=	admin_http_entry/pub.o \
 		startup_manager/a_manager.o
 
 all_OBJS=	$(oess_OBJS) $(stats_OBJS) config.o $(logging_OBJS) \
-		user_list_auth_data.o $(connection_handlers_OBJ) \
+		user_list_auth_data.o $(connection_handlers_OBJS) \
 		$(misc_OBJS) main.o
 
+CCACHE?=	$(shell command -v ccache)
+
 %.o: %.cpp
 	$(CCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
 
@@ -66,4 +64,7 @@ arataga: $(all_OBJS)
 
 all: arataga
 
+install: arataga
+	$(BSD_INSTALL_PROGRAM) $^ $(DESTDIR)$(PREFIX)/bin
+
 .PHONY: all install
diff --git a/net/arataga/pkg-descr b/net/arataga/pkg-descr
index 6b7afab4b905..da8e62e87a62 100644
--- a/net/arataga/pkg-descr
+++ b/net/arataga/pkg-descr
@@ -1,6 +1,6 @@
 arataga is a high-performance, configurable, authenticating, throttling
 SOCKS5 and HTTP/1.1 proxy server.  It was developed by Stiffstream for
 a customer who then abandoned the project.  So as not to throw away the
-result, the source code of arataga had been opensourced.
+result, the source code of arataga had been released to the public.
 
 WWW: https://github.com/Stiffstream/arataga