Fix merge

Makefile

@@ -1,7 +1,8 @@
 # $FreeBSD: head/sysutils/postfix-log-parser/Makefile 517745 2021-02-15 15:10:39Z yo000 $
 
 PORTNAME=	postfix-log-parser
-PORTVERSION=	1.2.1
+PORTVERSION=	1.4.5
+DISTVERSIONPREFIX=v
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
@@ -12,14 +13,32 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
-GO_TARGET=	postfix-log-parser/main.go
+GO_PKGNAME=	github.com/yo000/postfix-log-parser
+GO_TARGET=	postfix-log-parser/main.go:postfix-log-parser
 
 USE_GITHUB=	yes
 GH_ACCOUNT=     yo000
 GH_PROJECT=     postfix-log-parser
 
-GH_TUPLE=	spf13:cobra:v1.1.3:cobra/vendor/github.com/spf13/cobra \
-		tabalt:pidfile:v1.1.0:pidfile/vendor/github.com/tabalt/pidfile
+GH_TUPLE=       \
+                beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+                cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
+                golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
+                golang:sys:59db8d763f22:golang_sys/vendor/golang.org/x/sys \
+                inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
+                matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+                prometheus:client_golang:v1.11.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+                prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
+                prometheus:common:v0.29.0:prometheus_common/vendor/github.com/prometheus/common \
+                prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
+                protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+                spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \
+                spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+                tabalt:pidfile:v1.1.0:tabalt_pidfile/vendor/github.com/tabalt/pidfile
+
+USE_RC_SUBR=    postfix-log-parser
+
+USE_RC_SUBR=    postfix-log-parser
 
 pre-test:
 	${SETENV} GOPATH="${WRKDIR}"

distinfo

@@ -1,7 +1,31 @@
-TIMESTAMP = 1613386017
-SHA256 (yo000-postfix-log-parser-1.2.1_GH0.tar.gz) = b8668fea4d8c64693b7d9f78d34517e3ed9aa21d6236b10372b1cacee37f6022
-SIZE (yo000-postfix-log-parser-1.2.1_GH0.tar.gz) = 9640
+TIMESTAMP = 1713510540
+SHA256 (yo000-postfix-log-parser-v1.4.5_GH0.tar.gz) = 53dc0a21b95b55c53946f80d908b1c96942d54bb28c8e841e5c7fd144343891c
+SIZE (yo000-postfix-log-parser-v1.4.5_GH0.tar.gz) = 35170
+SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
+SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
+SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
+SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
+SHA256 (golang-sys-59db8d763f22_GH0.tar.gz) = 6750e53436faf4b1552ec2ad79f3709b631e6111cc392b4620afd58a34d5f755
+SIZE (golang-sys-59db8d763f22_GH0.tar.gz) = 1201561
+SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
+SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
+SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
+SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
+SHA256 (prometheus-client_golang-v1.11.0_GH0.tar.gz) = a3bc3312bde4182e507042ca0e7ca88aac6656bbf8d516d732e34c3f14bb612a
+SIZE (prometheus-client_golang-v1.11.0_GH0.tar.gz) = 168706
+SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
+SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
+SHA256 (prometheus-common-v0.29.0_GH0.tar.gz) = 61d6756202f3e313ca6e4e1ba1545e8e5def31a03a7bb81fca1ee2db5f3008d5
+SIZE (prometheus-common-v0.29.0_GH0.tar.gz) = 124111
+SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
+SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
+SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
+SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
 SHA256 (spf13-cobra-v1.1.3_GH0.tar.gz) = e5f93c61e1236e61c7fc45882d2a03b81f46ebebdf70628ebb64b0b5fe34f6fa
 SIZE (spf13-cobra-v1.1.3_GH0.tar.gz) = 146580
+SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
+SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
 SHA256 (tabalt-pidfile-v1.1.0_GH0.tar.gz) = 893a2cf199c48fef6f43969db23d987bec8290f080aff59820c851b82ddd3bac
 SIZE (tabalt-pidfile-v1.1.0_GH0.tar.gz) = 2158

files/postfix-log-parser.in

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# postfix_log_parser/files/postfix_log_parser.in 2022-05-13 09:04:03Z yo $
+#
+# PROVIDE: postfix_log_parser
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# postfix_log_parser_enable (bool):         Set to "YES" to enable postfix_log_parser.
+#                             (default: "NO")
+#
+# postfix_log_parser_args (str):            Optional arguments
+#                             (default: "")
+#
+# postfix_log_parser_loglevel (str):        Log level
+#                             (default: "warn")
+#
+# postfix_log_parser_logfile (str):         Postfix-Log-Parser logfile
+#                             (default: "/var/log/postfix_log_parser.log")
+#
+
+. /etc/rc.subr
+
+name=postfix_log_parser
+rcvar=postfix_log_parser_enable
+
+load_rc_config ${name}
+
+: ${postfix_log_parser_enable="NO"}
+: ${postfix_log_parser_loglevel="warn"}
+: ${postfix_log_parser_pidfile="/var/run/postfix_log_parser.pid"}
+: ${postfix_log_parser_logfile="/var/log/postfix_log_parser.log"}
+
+command="/usr/local/bin/postfix-log-parser"
+pidfile="${postfix_log_parser_pidfile}"
+command_args="-p ${pidfile} ${postfix_log_parser_args}"
+
+start_cmd="/usr/sbin/daemon ${command} ${command_args} >> ${postfix_log_parser_logfile} 2>&1"
+
+run_rc_command "$1"
+

pkg-plist

@@ -0,0 +1,2 @@
+bin/postfix-log-parser
+etc/rc.d/postfix-log-parser