From nobody Sun Jan 28 21:53:58 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 4TNQDk3M3wz59N58; Sun, 28 Jan 2024 21:53:58 +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 4TNQDk2ZdFz4PmZ; Sun, 28 Jan 2024 21:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706478838; 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=VYCgUWWztV3ViIR5c8BgHtkNgnLh+KaqpEvezPc1S/4=; b=QEH55N9Ut6ggmj1vGum71c4iFYNmwxhjxpO8E2sdOomMtnUtdmFbvT1y7+O+sDU9PK/nUb IhXSvNnrL5pZ1scRiVwo2ZnoxcgEf2HCitxIxjGQAd5QyH1UB17kFqsOKeWMKxN1xhK6LU 0jC70OwXd6/qMUd26RqQlGk9wUvHRwkaxH5DhOpRo4nQSf6xTaR7+xSX1HUgf7HJ6FekQp jomVkcv2uVv/o5TFTOKz1NGLSWqp0T+ra86PvwnLCBO2fpnCNTe29tsKiobiWST2vjtxhS lUQJU8YcU6Yih04wQQ/kSfJ4ApG8j5kXs7w0YVOW0RTDtNha5ixsyBKlAzztZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706478838; 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=VYCgUWWztV3ViIR5c8BgHtkNgnLh+KaqpEvezPc1S/4=; b=Fnw03uezoBKkdkhoWbJd6d/1OTCh2LzhclCSSwJzYDnRPxOT6i+nDRV45f1DpqxUQDXo+f V/Cs4iLNRvIsnHPtKh7Qucql5n9OuNSL2mKqv0Ug4Q34TytbEfv8yyATEOZXNkFaHcc/5D cSfdJHNkJOtPRhK31uHM2w/rVUyPLaNouZalOtYc/WCMaNxotNamM6qwxW6/IppMM6Iftn y94/y8TGW9HrEEAnPCf/z8+Evg2vYgPRY8PzJPaneZWYPL4T1iUyud9XT9foKWGqwa1rZ5 +Q+/VJhTNe4Fr9K8iWoU43HxEL3z0O9wrNz2bY5wo9VBr6pc7KpR82DQh2WtTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706478838; a=rsa-sha256; cv=none; b=DTY9wQ/HkQr1x1fJ8K34lnHlNxTqf5Wnogb4bjyk/a9CEb5AMYOFQCMf5QG+hDA6ZbJ4ka OKBqPwivPZYCT86c2o7CmXRnLigY41SN9CCuMuL4dALuEEIjrRL3B2o0vfmtrSDyDs1xUk +/o9UO/iha+N14ALZC3xQQneCo0IlSrh9aZS8itaJjikUXIMuo6TrkIrvIystnq0fY3Q4p 4DlrDrzwif2wBg43IamtjYuIcPAgbkr4o/PkXZIeeDGIGKPv3vKFlTLljyi1LTDa+jJDng dihkA1P1xZR9r78ociOA8bi5WNcPWi18X9b4mRgCiHT/4NjWLrVHF0TiLWp3MA== 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 4TNQDk1g3FzPYK; Sun, 28 Jan 2024 21:53:58 +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 40SLrwqX016664; Sun, 28 Jan 2024 21:53:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SLrwdH016661; Sun, 28 Jan 2024 21:53:58 GMT (envelope-from git) Date: Sun, 28 Jan 2024 21:53:58 GMT Message-Id: <202401282153.40SLrwdH016661@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 3e253bc04e48 - main - comms/fldigi: Fix plist and modernize Makefile 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e253bc04e48ca7da20771454b670b19d2f72bf8 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e253bc04e48ca7da20771454b670b19d2f72bf8 commit 3e253bc04e48ca7da20771454b670b19d2f72bf8 Author: Daniel Engberg AuthorDate: 2024-01-27 14:53:39 +0000 Commit: Daniel Engberg CommitDate: 2024-01-28 21:53:04 +0000 comms/fldigi: Fix plist and modernize Makefile * Define LICENSE_FILE * Remove dependency of (lib)Boost, the source code doesn't reference it at all * Rearrange Makefile to closer follow Porters Handbook * Drop native optimization option, rely on framework CPUTYPE variable instead * Use framework _DESC * Fix plist with NLS PR: 276650 Approved by: hamradio (db) --- comms/fldigi/Makefile | 38 +++++++++++++++----------------------- comms/fldigi/pkg-plist | 1 + 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index 06750661b37f..d36f51422fde 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -9,12 +9,12 @@ COMMENT= Digital decoder for psk, cw, psk31, olivia WWW= http://www.w1hkj.com LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= asciidoc:textproc/asciidoc \ docbook-xsl>=1.0:textproc/docbook-xsl \ xsltproc:textproc/libxslt -LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libfltk.so:x11-toolkits/fltk \ +LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ libpng.so:graphics/png \ libportaudio.so:audio/portaudio \ @@ -24,42 +24,34 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ USES= autoreconf compiler:c++11-lib desktop-file-utils gmake jpeg \ perl5 pkgconfig shebangfix xorg +USE_XORG= x11 xcursor xext xfixes xft xinerama xrender USE_CXXSTD= gnu++0x GNU_CONFIGURE= yes -USE_XORG= x11 xcursor xext xfixes xft xinerama xrender + CONFIGURE_ENV= EXTRA_LIBS="-lexecinfo" \ FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" +CONFIGURE_ARGS= --with-asciidoc \ + --with-sndfile \ + --enable-optimizations=none OPTIONS_DEFINE= DOCS FLARQ HAMLIB NLS OSS PULSEAUDIO +OPTIONS_DEFAULT=FLARQ HAMLIB OSS +OPTIONS_SUB= yes -NATIVE_OPT_DESC= Enable Native Optimizations -FLARQ_DESC= Compile flarq -OSS_DESC= Support OSS -PULSEAUDIO_DESC= PulseAudio support -HAMLIB_DESC= Support rig control via hamlib - -OPTIONS_DEFAULT= FLARQ HAMLIB OSS -OPTIONS_SUB= yes +FLARQ_DESC= Compile flarq +HAMLIB_DESC= Support rig control via hamlib -NATIVE_OPT_CONFIGURE_ON= --enable-optimizations=native -NATIVE_OPT_CONFIGURE_OFF= --enable-optimizations=none FLARQ_CONFIGURE_ENABLE= flarq +HAMLIB_LIB_DEPENDS= libhamlib.so:comms/hamlib +HAMLIB_CONFIGURE_WITH= hamlib OSS_CONFIGURE_ENABLE= oss -PULSEAUDIO_CONFIGURE_WITH= pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -HAMLIB_CONFIGURE_WITH= hamlib -HAMLIB_LIB_DEPENDS= libhamlib.so:comms/hamlib -NLS_CONFIGURE_ENABLE= nls +PULSEAUDIO_CONFIGURE_WITH= pulseaudio NLS_USES= gettext - -# Always need asciidoc for man pages -CONFIGURE_ARGS+= --with-asciidoc -# Always need soundfile -CONFIGURE_ARGS+= --with-sndfile +NLS_CONFIGURE_ENABLE= nls post-configure: -# force rebuild of man pages ${RM} ${WRKSRC}/doc/*.1 post-install-DOCS-on: diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist index 745e5a8d0c37..8ffef82afd60 100644 --- a/comms/fldigi/pkg-plist +++ b/comms/fldigi/pkg-plist @@ -4,6 +4,7 @@ bin/fldigi man/man1/fldigi.1.gz %%FLARQ%%share/applications/flarq.desktop share/applications/fldigi.desktop +%%NLS%%share/locale/ca/LC_MESSAGES/fldigi.mo %%NLS%%share/locale/de/LC_MESSAGES/fldigi.mo %%NLS%%share/locale/el/LC_MESSAGES/fldigi.mo %%NLS%%share/locale/es/LC_MESSAGES/fldigi.mo