From nobody Sat Aug 05 19:34:49 2023 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 4RJCTQ01Bnz4mSVS; Sat, 5 Aug 2023 19:34:50 +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 4RJCTP6V8nz3CwY; Sat, 5 Aug 2023 19:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691264089; 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=GMncT0q7bhkQggNIT0uIglIa6Bkjoy+Cnk0LWF1Vt8A=; b=p3Nmuh7GNLkHjhudjSBfyym5hGo3z7eZ4/nJFvCJIRz0AVNK4oDcII6b7P31A+o89LC1lx KgxeIEjqKMViLFMNuG3OvMlE7FcrJ5Iiam0l4iGTM/WjMFzCvGUpErVc5mXkhsMBLG6fN/ 0DLXvQBvzfn2+UMfZ2x1cKwv11IlEjkwBvNVFWpY4fh6NMVsWQG/+r+uFbu3nAJb/BLo4b EKP/8nviN1I1nJ8A8AJ9HDhDvIy4qs0qd29yQLtvxrg9s6wcvV7MKip7PhS6MkgIuZ4tX7 LoZuZUJVIqm9oZj6wDi6sPZzHo6tfe7pzShJohNhcvPPmJqO5HmY2VezEnwZPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691264089; 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=GMncT0q7bhkQggNIT0uIglIa6Bkjoy+Cnk0LWF1Vt8A=; b=YiDy3FgCxnsbQq5WZ0hHUZuZLGl5INkmNUa5KMg2bxrlqShzV3ktHekgdXd2KNIhoIdGxA TQx1b1em5TwPwgW2ImSk7yz5sKjaEucaXTVHoISiQRzV7K/MnA418/A2X2VC13aopIQpGi 9Igu4HZxDUCCCeg0xiag5uzFRGsMoB7rRKKDBU8fm9uDLJpu4l3kCK414h8VV/+/riQwkI xXkPvntEl6BCpkIOK0M0yW+WkfDXGrFNuFQ53r4rtxloI5WbJNsRgW32Q+ngnPBiM49VAL zt8vRbQ2I+qK7mIxhB8MR+NMhaB1vUUtaC7ihXC01vSy1WpN+xSqIBuVfg/JjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691264089; a=rsa-sha256; cv=none; b=yvF+k7eDMK+diZN8AQsceZ8UgwLzRj2w7JN5oSnhgpp9fyohMqBqIPKMPgu+n3IzVbbPxz yBg/Bd4PF5e6ee14y9aY7lMxh5Fv8Cv4BIf26qb+2X/2mEByzKfcTCmb+8gwdMYeYcjp4/ UDkaeSojHrGCdfyYEAUl3LBNxAiQ5jLXkjW/NxwdEq+vmeGFO8ny3f7aRH4hEPX5/a9rwV i6fvRSjwBXQAh2wKPyo3sjV9nYmIWveuQGgeQaUM/YqZ9wTA5QFq66BoaDou55uM9YUnDu iO4rlJ+vxIK8kyjVl/YccMvT0D8MUTA4EjuehaDLeGhBu/bYFHpqYCNDaQK6dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RJCTP5ZfnzhNP; Sat, 5 Aug 2023 19:34:49 +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 375JYn7L042905; Sat, 5 Aug 2023 19:34:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375JYn3M042904; Sat, 5 Aug 2023 19:34:49 GMT (envelope-from git) Date: Sat, 5 Aug 2023 19:34:49 GMT Message-Id: <202308051934.375JYn3M042904@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 07902a1172a1 - main - comms/qico: Fix build with llvm16 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07902a1172a1f729af65dd0e115d09683b2b01c1 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=07902a1172a1f729af65dd0e115d09683b2b01c1 commit 07902a1172a1f729af65dd0e115d09683b2b01c1 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-05 18:59:33 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-05 19:34:41 +0000 comms/qico: Fix build with llvm16 - Utilize OPTIONSNG where applicable - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- comms/qico/Makefile | 50 ++++++++++++++++++++++++-------------------------- comms/qico/pkg-plist | 3 +++ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/comms/qico/Makefile b/comms/qico/Makefile index 7676ce58d1f5..153128c9eb1e 100644 --- a/comms/qico/Makefile +++ b/comms/qico/Makefile @@ -9,52 +9,50 @@ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= autoreconf -GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= kosfango GH_TAGNAME= 15673bf +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-config=${CONFDIR}/qico.conf \ + --with-default-speed=115200 +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} + +CONFLICTS_INSTALL= qcc # bin/qcc + +PLIST_SUB= QBASEDIR=${QBASEDIR} QLOGDIR=${QLOGDIR} + CONFDIR?= ${PREFIX}/etc/fido/qico QBASEDIR?= /var/spool/fido/qico QLOGDIR?= /var/log/fido/qico -PLIST_SUB= QBASEDIR=${QBASEDIR} QLOGDIR=${QLOGDIR} .if defined(WITH_OPENLOCK) CONFIGURE_ARGS+= --with-lock-style=open .endif -CONFIGURE_ARGS+= --with-config=${CONFDIR}/qico.conf \ - --with-default-speed=115200 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - -CONFLICTS_INSTALL= qcc # bin/qcc DOCS= Changes FAQ README EXAMPLES= koi8r_866.cp onchat qhistory qico.xpm qlinks sfreq \ stat.run synctime test.pl tossing MANS= qcc.8 qctl.8 qico.8 + OPTIONS_DEFINE= QCC PERL HYDRA -QCC_DESC= Build Qico control center (qcc) -PERL_DESC= Enable Perl-hooks support -HYDRA_DESC= Enable Hydra 4K/8K/16K protocol extensions OPTIONS_DEFAULT= PERL QCC +OPTIONS_SUB= yes -.include +HYDRA_DESC= Enable Hydra 4K/8K/16K protocol extensions +PERL_DESC= Enable Perl-hooks support +QCC_DESC= Build Qico control center (qcc) -.if !${PORT_OPTIONS:MQCC} -CONFIGURE_ARGS+=--disable-qcc -PLIST_SUB+= QCC="@comment " -.else -PLIST_SUB+= QCC="" -.endif +HYDRA_CONFIGURE_ON=--enable-hydra8k +PERL_CONFIGURE_ON=--enable-perl +PERL_USES= perl5 +QCC_CONFIGURE_OFF=--disable-qcc -.if ${PORT_OPTIONS:MPERL} -CONFIGURE_ARGS+=--enable-perl -USES+= perl5 -.endif +.include -.if ${PORT_OPTIONS:MHYDRA} -CONFIGURE_ARGS+=--enable-hydra8k +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif do-install: @@ -65,9 +63,6 @@ do-install: ${MKDIR} ${STAGEDIR}${CONFDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/qico ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_PROGRAM} ${WRKSRC}/src/qctl ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MQCC} - ${INSTALL_PROGRAM} ${WRKSRC}/src/qcc ${STAGEDIR}${PREFIX}/bin/ -.endif ${INSTALL_DATA} ${WRKSRC}/qico.conf.sample ${STAGEDIR}${CONFDIR}/qico.conf.sample ${INSTALL_DATA} ${WRKSRC}/qico.substs.sample ${STAGEDIR}${CONFDIR}/qico.substs.sample ${INSTALL_DATA} ${WRKSRC}/qico.passwd.sample ${STAGEDIR}${CONFDIR}/qico.passwd.sample @@ -83,4 +78,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/${i} ${STAGEDIR}${PREFIX}/man/man8/${i} .endfor +do-install-QCC-on: + ${INSTALL_PROGRAM} ${WRKSRC}/src/qcc ${STAGEDIR}${PREFIX}/bin/ + .include diff --git a/comms/qico/pkg-plist b/comms/qico/pkg-plist index fb6a4f569d90..ecf7a48dd11b 100644 --- a/comms/qico/pkg-plist +++ b/comms/qico/pkg-plist @@ -29,3 +29,6 @@ bin/qctl man/man8/qctl.8.gz man/man8/qico.8.gz sbin/qico +@dir /var/log/fido +@dir %%QBASEDIR%% +@dir /var/spool/fido