Date: Sun, 28 Jan 2024 21:53:58 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3e253bc04e48 - main - comms/fldigi: Fix plist and modernize Makefile Message-ID: <202401282153.40SLrwdH016661@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e253bc04e48ca7da20771454b670b19d2f72bf8 commit 3e253bc04e48ca7da20771454b670b19d2f72bf8 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2024-01-27 14:53:39 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401282153.40SLrwdH016661>