From nobody Thu Apr 04 13:16:17 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9MZT2bTxz5H0pb; Thu, 4 Apr 2024 13:16:17 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9MZT22Jbz48d1; Thu, 4 Apr 2024 13:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712236577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+0kXuunke32Y7tw10ThI8phBTkOsesQc4AZxAILPhQ=; b=WnZDnKSAg8tkjTMZ4RbPEPsXqAYgNLVcOf/YAf9x2i9GKbfGnpXLX5XunHiFFUTZrpAhKD n93prKva24+bFVx1gtqz2Fk1hkw8bKkGN7ksaFbf5BYz82XMceOPsYqe6lZ/9GIf6UniV1 YTx3EIikBZp9yFgPUhG5+03iOkQdY6d40Fxof0yIsYP58+5hjzuo9hSIrW1IiFBdX9u+Qi UJEdthM2ghGYx1q6oZGN5QyR6yaJqAtJsuBnoHkZxz2YWIdGCLDGGc3FBUdjmW52lq4NfY 0HSez2Bx6CkO4/mIjbwPf78VDucmH1AFpxi8jXxY3iPL5NSwXPXNkg0ppiSD+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712236577; a=rsa-sha256; cv=none; b=G3YOd6pYgbf34O4kNuENKh7E30L3O06tShiZxdf1RA7zC55LenvdPh3OcaJEKZI/rrXCMU Uko0pwnh5ntBGc3tRnqNYt4JAOSIV7QWVv2QzCtjrcI0a5WBpWR1hBpaXLzIMLnqgKxBDO qBrq5VYJGlKLsgex4eB11v3RJnn3X9ZwL71PJ/QtQANzHz7F+jYsE7VIRKbzOKw/qyKiCW PqYduPzxQkBcXS2qZk6RfgGvlMLKLbsZx1Bxf6+3nTh/GrlowntoXAGpVvSKA/ACprPzn6 tJBjYYqSJYFVOVK/noU1jr72eqbn+DoFsaA+p757I0+dxMFUt6Bw3MWva5I9CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712236577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f+0kXuunke32Y7tw10ThI8phBTkOsesQc4AZxAILPhQ=; b=Ca1qUmTh0jyZEeF9wTlOaT1IYP4dxtEqdwTbWN0Cg6P4Fq+skk5IeWKj+oA558PVVQk7bl V8YW6kcpwaMsJbhZ/9Keh5fg0WGxKbS35avHoh4Ja3C85888xovFcbCb2Syz7zHta1/fHq OvR7iGZQvSqO/gsOcMCufdHv7wtE5TF8CyQwfvrX6Kg8ohzyv03yuYz6Eig5T0inPtuaJL K6NkmIKg+5Aq7HZBYrmUljWOkL4p2k2O0S15zPV9mKGh2mFpZXAZPwmlpsr4dV0qSAQxs/ HN2I+hiXwfsIFXU28G7Rxa7awV5TbGpKM16BtkdkiGvKvAB6YMCMtjxTj0tGnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9MZT1dc1zHZ9; Thu, 4 Apr 2024 13:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434DGHc7029739; Thu, 4 Apr 2024 13:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434DGHFM029736; Thu, 4 Apr 2024 13:16:17 GMT (envelope-from git) Date: Thu, 4 Apr 2024 13:16:17 GMT Message-Id: <202404041316.434DGHFM029736@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Oleksii Samorukov Subject: git: c0aef5b71ad8 - main - mail/exilog: convert to use options and fix errors List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: samm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0aef5b71ad89b405cc3d9cd1224e76a33bd9aeb Auto-Submitted: auto-generated The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0aef5b71ad89b405cc3d9cd1224e76a33bd9aeb commit c0aef5b71ad89b405cc3d9cd1224e76a33bd9aeb Author: Oleksii Samorukov AuthorDate: 2024-04-04 13:14:07 +0000 Commit: Oleksii Samorukov CommitDate: 2024-04-04 13:16:08 +0000 mail/exilog: convert to use options and fix errors - Convert to use OPTS to simplify the config - Add missing CGI dependency - Fix all portlint warnings - Fix CGI script startup --- mail/exilog/Makefile | 50 ++++++++++++++++++++++---------------------------- mail/exilog/pkg-plist | 2 ++ 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/mail/exilog/Makefile b/mail/exilog/Makefile index 09031d6a5ef9..2cdba1a826db 100644 --- a/mail/exilog/Makefile +++ b/mail/exilog/Makefile @@ -1,6 +1,6 @@ PORTNAME= exilog PORTVERSION= 0.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= mail MASTER_SITES= http://duncanthrax.net/exilog/ @@ -11,41 +11,35 @@ WWW= https://duncanthrax.net/exilog/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \ + p5-CGI>0:www/p5-CGI + USES= perl5 shebangfix SHEBANG_GLOB= *.pl -RUN_DEPENDS= p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask - -# Default sql backend -WITH_SQL_BACKEND?= mysql - -.if (${WITH_SQL_BACKEND} == "mysql") -WITH_MYSQL= yes -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql -SERVER= mysql -.elif (${WITH_SQL_BACKEND} == "postgresql") -WITH_POSTGRESQL= yes -RUN_DEPENDS+= p5-DBD-Pg>=0:databases/p5-DBD-Pg -SERVER= postgresql -.else -BROKEN= you should specify sql backend using WITH_SQL_BACKEND -.endif -SUB_LIST+= SERVER=${SERVER} .ifndef WITHOUT_WWWDIR EXILOGDIR?= ${PREFIX}/www/exilog .else EXILOGDIR?= ${PREFIX}/exilog .endif -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS AGENT +OPTIONS_MULTI= SQLBACKEND +OPTIONS_MULTI_SQLBACKEND= MYSQL PGSQL +OPTIONS_DEFAULT= AGENT DOCS MYSQL +OPTIONS_SUB= YES +AGENT_DESC= Include exilog agent -.include +MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_USES= mysql -.if defined(WITHOUT_AGENT) -PLIST_SUB+= AGENT="@comment " -.else -USE_RC_SUBR= exilog -PLIST_SUB+= AGENT="" +PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg +PGSQL_USES= pgsql + +.include + +.if ${PORT_OPTIONS:MAGENT} +USE_RC_SUBR= ${PORTNAME} .endif NO_BUILD= yes @@ -65,22 +59,22 @@ pre-patch: @${REINPLACE_CMD} -e 's,$$RealBin/exilog.conf,${PREFIX}/etc/exilog.conf,' ${WRKSRC}/exilog_config.pm @${REINPLACE_CMD} -e "s,\(use exilog_config\),use lib \'${EXILOGDIR}\'; \1," ${WRKSRC}/exilog_agent.pl @${REINPLACE_CMD} -e "s,\(use exilog_config\),use lib \'${EXILOGDIR}\'; \1," ${WRKSRC}/exilog_cleanup.pl + @${REINPLACE_CMD} -e "s,\(use exilog_config\),use lib \'${EXILOGDIR}\'; \1," ${WRKSRC}/exilog_cgi.pl do-install: ${MKDIR} ${STAGEDIR}${EXILOGDIR} ${STAGEDIR}${EXILOGDIR}/icons ${CP} ${WRKSRC}/*.pm ${WRKSRC}/*.css ${WRKSRC}/*.js ${STAGEDIR}${EXILOGDIR} ${CP} ${WRKSRC}/icons/* ${STAGEDIR}${EXILOGDIR}/icons -.if !defined(WITHOUT_AGENT) +.if ${PORT_OPTIONS:MAGENT} ${INSTALL_SCRIPT} ${WRKSRC}/exilog_agent.pl ${STAGEDIR}${PREFIX}/sbin .endif ${INSTALL_SCRIPT} ${WRKSRC}/exilog_cleanup.pl ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/exilog_cgi.pl ${STAGEDIR}${EXILOGDIR} ${CP} ${WRKSRC}/exilog.conf-example ${STAGEDIR}${PREFIX}/etc/exilog.conf-dist - ${CHMOD} 0600 ${STAGEDIR}${PREFIX}/etc/exilog.conf-dist ${CP} ${FILESDIR}/htaccess ${STAGEDIR}${EXILOGDIR}/.htaccess ${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOC_FILES} ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor -.include +.include diff --git a/mail/exilog/pkg-plist b/mail/exilog/pkg-plist index 7d9afdca2d1c..cbcd54f78225 100644 --- a/mail/exilog/pkg-plist +++ b/mail/exilog/pkg-plist @@ -1,8 +1,10 @@ @owner www @group www +@mode 600 etc/exilog.conf-dist @owner @group +@mode %%AGENT%%sbin/exilog_agent.pl sbin/exilog_cleanup.pl %%PORTDOCS%%%%DOCSDIR%%/Changelog