CVS commit: pkgsrc/ham/fldigi

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Sun Dec  6 20:40:59 UTC 2020

Modified Files:
        pkgsrc/ham/fldigi: Makefile PLIST.Darwin

Log Message:
ham/fldigi: avoid hard coding bundled dylib versions in PLIST.Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/ham/fldigi/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/fldigi/PLIST.Darwin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/ham/fldigi/Makefile
diff -u pkgsrc/ham/fldigi/Makefile:1.123 pkgsrc/ham/fldigi/Makefile:1.124
--- pkgsrc/ham/fldigi/Makefile:1.123    Sun Dec  6 00:22:04 2020
+++ pkgsrc/ham/fldigi/Makefile  Sun Dec  6 20:40:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2020/12/06 00:22:04 dbj Exp $
+# $NetBSD: Makefile,v 1.124 2020/12/06 20:40:59 dbj Exp $
 
 DISTNAME=      fldigi-4.1.01
 PKGREVISION=   12
@@ -45,8 +45,9 @@ CXXFLAGS+=    -Wno-error=c++11-narrowing
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-PLIST_SUBST+=  FLDIGI_VERSION=${PKGVERSION_NOREV}
-PLIST_SUBST+=  FLARQ_VERSION="4.3.7"
+
+FLDIGI_VERSION=        ${PKGVERSION_NOREV}
+FLARQ_VERSION= 4.3.7
 
 post-build:
        @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} appbundle
@@ -62,8 +63,16 @@ post-install:
        cd ${WRKSRC}/src/${DISTNAME} && \
                pax -rw -pp -pm *.app ${DESTDIR}${PREFIX}/Applications
 
-CHECK_SHLIBS_SKIP+=    Applications/*/Contents/Frameworks/*.dylib
-CHECK_WRKREF_SKIP+=    Applications/*/Contents/MacOS/*
+PLIST_SUBST+=  FLDIGI_VERSION=${FLDIGI_VERSION}
+PLIST_SUBST+=  FLARQ_VERSION=${FLARQ_VERSION}
+GENERATE_PLIST+= (cd ${DESTDIR}${PREFIX} && ${LS} \
+               Applications/flarq-${FLARQ_VERSION}.app/Contents/Frameworks/lib*.dylib \
+               Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/lib*.dylib);
+
+CHECK_SHLIBS_SKIP+=    Applications/flarq-${FLARQ_VERSION}.app/Contents/Frameworks/lib*.dylib
+CHECK_SHLIBS_SKIP+=    Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/lib*.dylib
+CHECK_WRKREF_SKIP+=    Applications/flarq-${FLARQ_VERSION}.app/Contents/MacOS/flarq
+CHECK_WRKREF_SKIP+=    Applications/fldigi-${FLDIGI_VERSION}.app/Contents/MacOS/fldigi
 .endif
 
 .include "../../audio/libsamplerate/buildlink3.mk"

Index: pkgsrc/ham/fldigi/PLIST.Darwin
diff -u pkgsrc/ham/fldigi/PLIST.Darwin:1.1 pkgsrc/ham/fldigi/PLIST.Darwin:1.2
--- pkgsrc/ham/fldigi/PLIST.Darwin:1.1  Sun Dec  6 00:22:04 2020
+++ pkgsrc/ham/fldigi/PLIST.Darwin      Sun Dec  6 20:40:59 2020
@@ -1,35 +1,8 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2020/12/06 00:22:04 dbj Exp $
-Applications/flarq-${FLARQ_VERSION}.app/Contents/Frameworks/libfltk.1.dylib
-Applications/flarq-${FLARQ_VERSION}.app/Contents/Frameworks/libfltk_images.1.dylib
-Applications/flarq-${FLARQ_VERSION}.app/Contents/Frameworks/libflxmlrpc.1.dylib
-Applications/flarq-${FLARQ_VERSION}.app/Contents/Frameworks/libintl.8.dylib
-Applications/flarq-${FLARQ_VERSION}.app/Contents/Frameworks/libjpeg.9.dylib
-Applications/flarq-${FLARQ_VERSION}.app/Contents/Frameworks/libpng16.16.dylib
+@comment $NetBSD: PLIST.Darwin,v 1.2 2020/12/06 20:40:59 dbj Exp $
 Applications/flarq-${FLARQ_VERSION}.app/Contents/Info.plist
 Applications/flarq-${FLARQ_VERSION}.app/Contents/MacOS/flarq
 Applications/flarq-${FLARQ_VERSION}.app/Contents/PkgInfo
 Applications/flarq-${FLARQ_VERSION}.app/Contents/Resources/flarq.icns
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libFLAC.8.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libdbus-1.3.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libfltk.1.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libfltk_images.1.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libflxmlrpc.1.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libgdbm.6.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libhamlib.2.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libintl.8.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libjpeg.9.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libogg.0.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libopus.0.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libpng16.16.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libportaudio.2.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libpulse-simple.0.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libpulse.0.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libpulsecommon-13.0.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libsamplerate.0.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libsndfile.1.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libusb-1.0.0.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libvorbis.0.dylib
-Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Frameworks/libvorbisenc.2.dylib
 Applications/fldigi-${FLDIGI_VERSION}.app/Contents/Info.plist
 Applications/fldigi-${FLDIGI_VERSION}.app/Contents/MacOS/fldigi
 Applications/fldigi-${FLDIGI_VERSION}.app/Contents/PkgInfo