*/*: sync with upstream

Taken from: HardenedBSD

accessibility/kmag/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591712606
+TIMESTAMP = 1594146928
-SHA256 (KDE/applications/20.04.2/kmag-20.04.2.tar.xz) = ad74e7131f5024e3291760759107923ae86d6c7ec887bcb850ac5e369fa9ee7e
+SHA256 (KDE/release-service/20.04.3/kmag-20.04.3.tar.xz) = f006b2e3b685accc343cdfc8b90d915e7c2647d983b66c2d38565d669ed6d464
-SIZE (KDE/applications/20.04.2/kmag-20.04.2.tar.xz) = 674500
+SIZE (KDE/release-service/20.04.3/kmag-20.04.3.tar.xz) = 674356

accessibility/kmousetool/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591712607
+TIMESTAMP = 1594146929
-SHA256 (KDE/applications/20.04.2/kmousetool-20.04.2.tar.xz) = b175ef353d9957072d7a23846c7b893ef78f327e88921f5dc7f0e3926e1b680d
+SHA256 (KDE/release-service/20.04.3/kmousetool-20.04.3.tar.xz) = acf710dcdc53e58d3a833345f88214b22dfbd5ab9fd26d9e26c883c18441c715
-SIZE (KDE/applications/20.04.2/kmousetool-20.04.2.tar.xz) = 113348
+SIZE (KDE/release-service/20.04.3/kmousetool-20.04.3.tar.xz) = 113316

accessibility/kmouth/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591712608
+TIMESTAMP = 1594146929
-SHA256 (KDE/applications/20.04.2/kmouth-20.04.2.tar.xz) = a2260e2d6b0f30d2aac461c95b9969d75fac2b8901a6d4e3b0705e970a0917af
+SHA256 (KDE/release-service/20.04.3/kmouth-20.04.3.tar.xz) = edc1aab8edd13f3f10f99b79a27dabaffe22ac7048868dd7b66b33a662cc46b2
-SIZE (KDE/applications/20.04.2/kmouth-20.04.2.tar.xz) = 1964676
+SIZE (KDE/release-service/20.04.3/kmouth-20.04.3.tar.xz) = 1964136

accessibility/speech-dispatcher/Makefile

@@ -19,7 +19,7 @@ USES=		alias gettext gmake gnome libtool pathfix pkgconfig
 USE_GNOME=	glib20 intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-espeak-ng
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-fcommon -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

arabic/libreoffice/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1590778599
+TIMESTAMP = 1593834604
-SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_ar.tar.gz) = ed5980590fa9529c9061c6f46cc9c70248b6a631e557149eb3265a1f12eb26b5
+SHA256 (libreoffice/i18n/LibreOffice_6.4.5_Linux_x86-64_deb_langpack_ar.tar.gz) = e6bd0bf927bafbf45539f5093362844e2d738e2fdfd953815c6b7670fa92f4be
-SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_ar.tar.gz) = 1655105
+SIZE (libreoffice/i18n/LibreOffice_6.4.5_Linux_x86-64_deb_langpack_ar.tar.gz) = 1653263
-SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_ar.tar.gz) = 831029269cae67610f5761fb087a86c6e769bfe5532514eee8486a2f510437df
+SHA256 (libreoffice/i18n/LibreOffice_6.4.5_Linux_x86-64_deb_helppack_ar.tar.gz) = 2822c1e072674d20fbf1e21e160cb0c64d6d8cb026e21477110c6641cc0ebc3e
-SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_ar.tar.gz) = 2224552
+SIZE (libreoffice/i18n/LibreOffice_6.4.5_Linux_x86-64_deb_helppack_ar.tar.gz) = 2224253

archivers/ark/Makefile

@@ -41,6 +41,6 @@ ZIP_LIB_DEPENDS=	libzip.so:archivers/libzip
 ZIP_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_LibZip
 
 # Override shared library version
-KDE_APPLICATIONS_SHLIB_VER=20.4.2
+KDE_APPLICATIONS_SHLIB_VER=20.4.3
 
 .include <bsd.port.mk>

archivers/ark/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591712609
+TIMESTAMP = 1594146930
-SHA256 (KDE/applications/20.04.2/ark-20.04.2.tar.xz) = ba2176a5ca3ca5de7bb38ff60d276c6cb85eb1533ae0dc76b3c4095fbde0bb96
+SHA256 (KDE/release-service/20.04.3/ark-20.04.3.tar.xz) = e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc
-SIZE (KDE/applications/20.04.2/ark-20.04.2.tar.xz) = 2587052
+SIZE (KDE/release-service/20.04.3/ark-20.04.3.tar.xz) = 2586436

archivers/laszip/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	laszip
-PORTVERSION=	3.2.9
+PORTVERSION=	3.4.3
-PORTREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	rhurlin@gwdg.de

archivers/laszip/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1546017499
+TIMESTAMP = 1593805343
-SHA256 (laszip-LASzip-3.2.9_GH0.tar.gz) = 8c74cb6cb5dda5a89eaf178f1884f7151536b5c6683778937cc45ddd47eb7018
+SHA256 (laszip-LASzip-3.4.3_GH0.tar.gz) = 862715affa00609b78b4f469ab5529fee659c597efd40b5006b4305dd56c22d3
-SIZE (laszip-LASzip-3.2.9_GH0.tar.gz) = 231854
+SIZE (laszip-LASzip-3.4.3_GH0.tar.gz) = 235628

archivers/laszip/pkg-plist

@@ -2,7 +2,7 @@ include/laszip/laszip_api.h
 include/laszip/laszip_api_version.h
 lib/liblaszip.so
 lib/liblaszip.so.8
-lib/liblaszip.so.8.0.2
+lib/liblaszip.so.8.0.5
 lib/liblaszip_api.so
 lib/liblaszip_api.so.8
-lib/liblaszip_api.so.8.0.2
+lib/liblaszip_api.so.8.0.5

archivers/rar/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rar
-PORTVERSION=	5.9.0
+PORTVERSION=	5.9.1
 PORTEPOCH=	3
 CATEGORIES=	archivers
 MASTER_SITES=	https://rarlab.com/rar/

archivers/rar/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1585752007
+TIMESTAMP = 1594308026
-SHA256 (rarbsd-5.9.0.tar.gz) = 3424b0e7823c52a579cbb67a86835a41c7f3d991b96c0eacebdb821302577ed3
+SHA256 (rarbsd-5.9.1.tar.gz) = e8494e82feb41f424cba701a9f859c4615dbc8ae3f2c48d280f377ec1a0fa48f
-SIZE (rarbsd-5.9.0.tar.gz) = 555525
+SIZE (rarbsd-5.9.1.tar.gz) = 555692
-SHA256 (rarbsd-x64-5.9.0.tar.gz) = 1a311b55ac33544b240577a90586e47e4b94047cc3b689ea040284dab159e52d
+SHA256 (rarbsd-x64-5.9.1.tar.gz) = 3882ccfe5b0467d3f4efec75431b04a04706ac2fba2c664f7945fe74cc791a6f
-SIZE (rarbsd-x64-5.9.0.tar.gz) = 599381
+SIZE (rarbsd-x64-5.9.1.tar.gz) = 599430

archivers/unrar/Makefile

@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	unrar
-PORTVERSION=	5.90
+PORTVERSION=	5.91
 PORTEPOCH=	6
 CATEGORIES+=	archivers
 MASTER_SITES=	https://rarlab.com/rar/ \
 		LOCAL/sunpoet
-DISTNAME=	unrarsrc-5.9.2
+DISTNAME=	unrarsrc-5.9.4
 
 MAINTAINER?=	sunpoet@FreeBSD.org
 COMMENT=	Extract, view & test RAR archives
@@ -21,21 +21,21 @@ USES+=		compiler:c++11-lang
 
 USE_HARDENING=	pie:off safestack
 
-OPTIONS_DEFINE=	OPENSSL_AES
-OPTIONS_DEFAULT=OPENSSL_AES
-OPENSSL_AES_DESC=	Use OpenSSL implementation of AES
-
-CONFLICTS_INSTALL?=	unrar-iconv
-
 LDFLAGS+=	-lpthread
 MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" STRIP="${STRIP_CMD}"
 MAKEFILE=	makefile
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/unrar
 
 PLIST_FILES=	bin/unrar
 
 SLAVEDIRS=	archivers/unrar-iconv
 
+CONFLICTS_INSTALL?=	unrar-iconv
+
+OPTIONS_DEFINE=	OPENSSL_AES
+OPTIONS_DEFAULT=OPENSSL_AES
+OPENSSL_AES_DESC=	Use OpenSSL implementation of AES
+
 OPENSSL_AES_CPPFLAGS=	-DOPENSSL_AES -I${OPENSSLINC}
 OPENSSL_AES_LDFLAGS=	${${OPENSSLLIB} == /usr/lib :? :-L${OPENSSLLIB}} -lcrypto
 OPENSSL_AES_USES=	ssl

archivers/unrar/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1585752009
+TIMESTAMP = 1594117123
-SHA256 (unrarsrc-5.9.2.tar.gz) = 73d3baf18cf0a197976af2794a848893c35e7d42cee0ff364c89d2e476ebdaa6
+SHA256 (unrarsrc-5.9.4.tar.gz) = 3d010d14223e0c7a385ed740e8f046edcbe885e5c22c5ad5733d009596865300
-SIZE (unrarsrc-5.9.2.tar.gz) = 229900
+SIZE (unrarsrc-5.9.4.tar.gz) = 229921

archivers/zoo/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	zoo
 PORTVERSION=	2.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/ \
 		LOCAL/ehaupt

archivers/zoo/files/patch-zoodel.c

@@ -0,0 +1,14 @@
+--- zoodel.c.orig	1991-07-16 15:58:46 UTC
++++ zoodel.c
+@@ -138,7 +138,11 @@ if (*option == 'g') {
+    
+    /* read archive header */
+    frd_zooh (&zoo_header, zoo_file);
++#ifdef __LP64__
++   if ((int)(zoo_header.zoo_start + zoo_header.zoo_minus) != 0)
++#else
+    if ((zoo_header.zoo_start + zoo_header.zoo_minus) != 0L)
++#endif
+       prterror ('f', failed_consistency);
+    if (ver_too_high (&zoo_header))
+       prterror ('f', wrong_version, zoo_header.major_ver, zoo_header.minor_ver);

archivers/zoo/files/patch-zoopack.c

@@ -0,0 +1,14 @@
+--- zoopack.c.orig	1993-05-01 03:59:21 UTC
++++ zoopack.c
+@@ -139,7 +139,11 @@ if (zoo_file == NOFILE)
+ /* Read the header of the old archive. */
+ frd_zooh(&old_zoo_header, zoo_file);
+ 
++#ifdef __LP64__
++if ((int)(old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0) {
++#else
+ if ((old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0L) {
++#endif
+    prterror ('w', failed_consistency);
+    ++bad_header;                    /* remember for future error message */
+ }

astro/astrometry/Makefile

@@ -3,12 +3,13 @@
 
 PORTNAME=	astrometry
 PORTVERSION=	0.80
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://astrometry.net/downloads/
 DISTNAME=	${PORTNAME}.net-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	rhurlin@gwdg.de
-COMMENT=	Software for describing astronomical images
+COMMENT=	Astronomic calibration service
 
 LICENSE=	GPLv2
 
@@ -18,22 +19,44 @@ BROKEN_armv7=		fails to link: os-features-test.c:10: undefined symbol 'canonical
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libcfitsio.so:astro/cfitsio \
+		libgsl.so:math/gsl \
 		libpng.so:graphics/png \
-		libnetpbm.so:graphics/netpbm
+		libnetpbm.so:graphics/netpbm \
+		libwcs.so:astro/wcslib
 RUN_DEPENDS=	${PYNUMPY}
 
-USES=		gmake jpeg pkgconfig python shebangfix
+USES=		gmake jpeg localbase pkgconfig python shebangfix
 SHEBANG_FILES=	bin/* blind/*.py sdss/*.py util/[!c]*.py
-USE_LDCONFIG=	${PREFIX}/${PORTNAME}/lib
+USE_LDCONFIG=	yes
+
 ALL_TARGET=	all extra
-MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME} \
+MAKE_ARGS=	NETPBM_INC="-I${LOCALBASE}/include/netpbm" \
+		NETPBM_LIB="-L${LOCALBASE}/lib -lnetpbm" \
+		SYSTEM_GSL=yes
+MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${PREFIX} \
+		DOC_INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}/doc \
+		EXAMPLE_INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}/examples \
+		MAN1_INSTALL_DIR=${STAGEDIR}${PREFIX}/man/man1 \
 		PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD}
 MAKE_JOBS_UNSAFE=	yes
+# Changes search path in astrometry-engine
+DATA_INSTALL_DIR=	${STAGEDIR}${DATADIR}
+# Need this to get gzipped man pages
+MANDIRS=	${MANPREFIX}/man/man1
 SUB_FILES=	pkg-message
 LDFLAGS+=	-lz
 
+# DATA_INSTALL_DIR does not work globally :(
 post-install:
-	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \
+	@${REINPLACE_CMD} -i '' \
-		${STAGEDIR}${PREFIX}/${PORTNAME}/etc/${PORTNAME}.cfg
+		-e 's|${STAGEDIR}/usr/local/data|${DATADIR}|' \
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg
+	@${RMDIR} ${STAGEDIR}${PREFIX}/data
+	@${MKDIR} ${STAGEDIR}${DATADIR}/sdss
+	@${MKDIR} ${STAGEDIR}${DATADIR}/blind
+	@${MKDIR} ${STAGEDIR}${DATADIR}/catalogs
+	${INSTALL_DATA} ${WRKSRC}/sdss/testdata/*.fit* ${STAGEDIR}${DATADIR}/sdss
+	${INSTALL_DATA} ${WRKSRC}/blind/index-9918.fits ${STAGEDIR}${DATADIR}/blind
+	${INSTALL_DATA} ${WRKSRC}/catalogs/*.fit* ${STAGEDIR}${DATADIR}/catalogs
 
 .include <bsd.port.mk>

astro/astrometry/files/os-features-config.h

@@ -2,4 +2,4 @@
 #define NEED_DECLARE_QSORT_R 1
 #define NEED_QSORT_R 0
 #define NEED_SWAP_QSORT_R 0
-#define HAVE_NETPBM 0
+#define HAVE_NETPBM 1

astro/astrometry/files/pkg-message.in

@@ -3,11 +3,14 @@
   message: <<EOM
 Astrometry was successfully installed.
 
-You'll find this distribution in %%PREFIX%%/astrometry
+You'll find this distribution under %%PREFIX%%. Examples are found
+under %%PREFIX%%/astrometry/examples. See %%PREFIX%%/astrometry/doc/
+for some info, more detailed at http://astrometry.net/use.html and
+http://astrometry.net/doc/readme.html.
 
 Although the code is released under a GPL license, you will also need
 to download some data files, and these are distributed under different
-license. See %%PREFIX%%/astrometry/doc/GETTING-INDEXES
+license. Data files (indexes) should be stored under %%DATADIR%%/
 EOM
 }
 ]

astro/astrometry/pkg-plist

@@ -1,59 +1,7 @@
-astrometry/bin/an-fitstopnm
-astrometry/bin/an-pnmtofits
-astrometry/bin/astrometry-engine
-astrometry/bin/build-astrometry-index
-astrometry/bin/degtohms
-astrometry/bin/downsample-fits
-astrometry/bin/fit-wcs
-astrometry/bin/fits-column-merge
-astrometry/bin/fits-flip-endian
-astrometry/bin/fits-guess-scale
-astrometry/bin/fitscopy
-astrometry/bin/fitsgetext
-astrometry/bin/fitsverify
-astrometry/bin/get-healpix
-astrometry/bin/get-wcs
-astrometry/bin/hmstodeg
-astrometry/bin/hpsplit
-astrometry/bin/image2pnm
-astrometry/bin/image2xy
-astrometry/bin/imarith
-astrometry/bin/imcopy
-astrometry/bin/imstat
-astrometry/bin/listhead
-astrometry/bin/liststruc
-astrometry/bin/merge-columns
-astrometry/bin/modhead
-astrometry/bin/new-wcs
-astrometry/bin/pad-file
-astrometry/bin/plot-constellations
-astrometry/bin/plotann.py
-astrometry/bin/plotquad
-astrometry/bin/plotxy
-astrometry/bin/query-starkd
-astrometry/bin/removelines
-astrometry/bin/solve-field
-astrometry/bin/startree
-astrometry/bin/subtable
-astrometry/bin/tablist
-astrometry/bin/tabmerge
-astrometry/bin/tabsort
-astrometry/bin/text2fits
-astrometry/bin/uniformize
-astrometry/bin/votabletofits
-astrometry/bin/wcs-grab
-astrometry/bin/wcs-match
-astrometry/bin/wcs-pv2sip
-astrometry/bin/wcs-rd2xy
-astrometry/bin/wcs-resample
-astrometry/bin/wcs-to-tan
-astrometry/bin/wcs-xy2rd
-astrometry/bin/wcsinfo
 astrometry/doc/CREDITS
 astrometry/doc/LICENSE
 astrometry/doc/README.md
 astrometry/doc/report.txt
-astrometry/etc/astrometry.cfg
 astrometry/examples/CREDITS
 astrometry/examples/apod1.jpg
 astrometry/examples/apod1.xyls
@@ -70,235 +18,301 @@ astrometry/examples/m44-1975-01-18.jpg
 astrometry/examples/sdss.jpg
 astrometry/examples/sdss.xyls
 astrometry/examples/tycho2-mag6.fits
-astrometry/include/astrometry/2mass-fits.h
+bin/an-fitstopnm
-astrometry/include/astrometry/2mass.h
+bin/an-pnmtofits
-astrometry/include/astrometry/allquads.h
+bin/astrometry-engine
-astrometry/include/astrometry/an-bool.h
+bin/build-astrometry-index
-astrometry/include/astrometry/an-endian.h
+bin/degtohms
-astrometry/include/astrometry/an-opts.h
+bin/downsample-fits
-astrometry/include/astrometry/an-thread-pthreads.h
+bin/fit-wcs
-astrometry/include/astrometry/an-thread.h
+bin/fits-column-merge
-astrometry/include/astrometry/anqfits.h
+bin/fits-flip-endian
-astrometry/include/astrometry/anwcs.h
+bin/fits-guess-scale
-astrometry/include/astrometry/augment-xylist.h
+bin/fitscopy
-astrometry/include/astrometry/axyfile.h
+bin/fitsgetext
-astrometry/include/astrometry/bl-nl.h
+bin/fitsverify
-astrometry/include/astrometry/bl-nl.inc
+bin/get-healpix
-astrometry/include/astrometry/bl-nl.ph
+bin/get-wcs
-astrometry/include/astrometry/bl-sort.h
+bin/hmstodeg
-astrometry/include/astrometry/bl.h
+bin/hpsplit
-astrometry/include/astrometry/bl.inc
+bin/image2pnm
-astrometry/include/astrometry/bl.ph
+bin/image2xy
-astrometry/include/astrometry/blind.h
+bin/imarith
-astrometry/include/astrometry/blindutils.h
+bin/imcopy
-astrometry/include/astrometry/brightstars.h
+bin/imstat
-astrometry/include/astrometry/bt.h
+bin/listhead
-astrometry/include/astrometry/build-index.h
+bin/liststruc
-astrometry/include/astrometry/cairoutils.h
+bin/merge-columns
-astrometry/include/astrometry/catalog.h
+bin/modhead
-astrometry/include/astrometry/coadd.h
+bin/new-wcs
-astrometry/include/astrometry/codefile.h
+bin/pad-file
-astrometry/include/astrometry/codekd.h
+bin/plot-constellations
-astrometry/include/astrometry/codetree.h
+bin/plotann.py
-astrometry/include/astrometry/constellation-boundaries.h
+bin/plotquad
-astrometry/include/astrometry/constellations.h
+bin/plotxy
-astrometry/include/astrometry/convolve-image.h
+bin/query-starkd
-astrometry/include/astrometry/ctmf.h
+bin/removelines
-astrometry/include/astrometry/dimage.h
+bin/solve-field
-astrometry/include/astrometry/dualtree.h
+bin/startree
-astrometry/include/astrometry/dualtree_nearestneighbour.h
+bin/subtable
-astrometry/include/astrometry/dualtree_rangesearch.h
+bin/tablist
-astrometry/include/astrometry/engine.h
+bin/tabmerge
-astrometry/include/astrometry/errors.h
+bin/tabsort
-astrometry/include/astrometry/fileutils.h
+bin/text2fits
-astrometry/include/astrometry/fit-wcs.h
+bin/uniformize
-astrometry/include/astrometry/fits-guess-scale.h
+bin/votabletofits
-astrometry/include/astrometry/fitsbin.h
+bin/wcs-grab
-astrometry/include/astrometry/fitsfile.h
+bin/wcs-match
-astrometry/include/astrometry/fitsioutils.h
+bin/wcs-pv2sip
-astrometry/include/astrometry/fitstable.h
+bin/wcs-rd2xy
-astrometry/include/astrometry/gslutils.h
+bin/wcs-resample
-astrometry/include/astrometry/hd.h
+bin/wcs-to-tan
-astrometry/include/astrometry/healpix-utils.h
+bin/wcs-xy2rd
-astrometry/include/astrometry/healpix.h
+bin/wcsinfo
-astrometry/include/astrometry/hpquads.h
+etc/astrometry.cfg
-astrometry/include/astrometry/image2xy-files.h
+include/astrometry/2mass-fits.h
-astrometry/include/astrometry/image2xy.h
+include/astrometry/2mass.h
-astrometry/include/astrometry/index.h
+include/astrometry/allquads.h
-astrometry/include/astrometry/intmap.h
+include/astrometry/an-bool.h
-astrometry/include/astrometry/ioutils.h
+include/astrometry/an-endian.h
-astrometry/include/astrometry/kdtree.h
+include/astrometry/an-opts.h
-astrometry/include/astrometry/kdtree_fits_io.h
+include/astrometry/an-thread-pthreads.h
-astrometry/include/astrometry/keywords.h
+include/astrometry/an-thread.h
-astrometry/include/astrometry/log.h
+include/astrometry/anqfits.h
-astrometry/include/astrometry/matchfile.h
+include/astrometry/anwcs.h
-astrometry/include/astrometry/matchobj.h
+include/astrometry/augment-xylist.h
-astrometry/include/astrometry/mathutil.h
+include/astrometry/axyfile.h
-astrometry/include/astrometry/merge-index.h
+include/astrometry/bl-nl.h
-astrometry/include/astrometry/multiindex.h
+include/astrometry/bl-nl.inc
-astrometry/include/astrometry/new-wcs.h
+include/astrometry/bl-nl.ph
-astrometry/include/astrometry/nomad-fits.h
+include/astrometry/bl-sort.h
-astrometry/include/astrometry/nomad.h
+include/astrometry/bl.h
-astrometry/include/astrometry/openngc.h
+include/astrometry/bl.inc
-astrometry/include/astrometry/os-features-config.h
+include/astrometry/bl.ph
-astrometry/include/astrometry/os-features.h
+include/astrometry/blind.h
-astrometry/include/astrometry/permutedsort.h
+include/astrometry/blindutils.h
-astrometry/include/astrometry/plotannotations.h
+include/astrometry/brightstars.h
-astrometry/include/astrometry/plotfill.h
+include/astrometry/bt.h
-astrometry/include/astrometry/plotgrid.h
+include/astrometry/build-index.h
-astrometry/include/astrometry/plotimage.h
+include/astrometry/cairoutils.h
-astrometry/include/astrometry/plotoutline.h
+include/astrometry/catalog.h
-astrometry/include/astrometry/plotstuff.h
+include/astrometry/coadd.h
-astrometry/include/astrometry/plotxy.h
+include/astrometry/codefile.h
-astrometry/include/astrometry/qfits_byteswap.h
+include/astrometry/codekd.h
-astrometry/include/astrometry/qfits_card.h
+include/astrometry/codetree.h
-astrometry/include/astrometry/qfits_convert.h
+include/astrometry/constellation-boundaries.h
-astrometry/include/astrometry/qfits_error.h
+include/astrometry/constellations.h
-astrometry/include/astrometry/qfits_float.h
+include/astrometry/convolve-image.h
-astrometry/include/astrometry/qfits_header.h
+include/astrometry/ctmf.h
-astrometry/include/astrometry/qfits_image.h
+include/astrometry/dimage.h
-astrometry/include/astrometry/qfits_keywords.h
+include/astrometry/dualtree.h
-astrometry/include/astrometry/qfits_md5.h
+include/astrometry/dualtree_nearestneighbour.h
-astrometry/include/astrometry/qfits_memory.h
+include/astrometry/dualtree_rangesearch.h
-astrometry/include/astrometry/qfits_rw.h
+include/astrometry/engine.h
-astrometry/include/astrometry/qfits_std.h
+include/astrometry/errors.h
-astrometry/include/astrometry/qfits_table.h
+include/astrometry/fileutils.h
-astrometry/include/astrometry/qfits_time.h
+include/astrometry/fit-wcs.h
-astrometry/include/astrometry/qfits_tools.h
+include/astrometry/fits-guess-scale.h
-astrometry/include/astrometry/qidxfile.h
+include/astrometry/fitsbin.h
-astrometry/include/astrometry/quad-builder.h
+include/astrometry/fitsfile.h
-astrometry/include/astrometry/quad-utils.h
+include/astrometry/fitsioutils.h
-astrometry/include/astrometry/quadfile.h
+include/astrometry/fitstable.h
-astrometry/include/astrometry/rdlist.h
+include/astrometry/gslutils.h
-astrometry/include/astrometry/resample.h
+include/astrometry/hd.h
-astrometry/include/astrometry/resort-xylist.h
+include/astrometry/healpix-utils.h
-astrometry/include/astrometry/scamp-catalog.h
+include/astrometry/healpix.h
-astrometry/include/astrometry/scamp.h
+include/astrometry/hpquads.h
-astrometry/include/astrometry/simplexy-common.h
+include/astrometry/image2xy-files.h
-astrometry/include/astrometry/simplexy.h
+include/astrometry/image2xy.h
-astrometry/include/astrometry/sip-utils.h
+include/astrometry/index.h
-astrometry/include/astrometry/sip.h
+include/astrometry/intmap.h
-astrometry/include/astrometry/sip_qfits.h
+include/astrometry/ioutils.h
-astrometry/include/astrometry/solvedfile.h
+include/astrometry/kdtree.h
-astrometry/include/astrometry/solver.h
+include/astrometry/kdtree_fits_io.h
-astrometry/include/astrometry/starkd.h
+include/astrometry/keywords.h
-astrometry/include/astrometry/starutil.h
+include/astrometry/log.h
-astrometry/include/astrometry/starutil.inc
+include/astrometry/matchfile.h
-astrometry/include/astrometry/starxy.h
+include/astrometry/matchobj.h
-astrometry/include/astrometry/tabsort.h
+include/astrometry/mathutil.h
-astrometry/include/astrometry/tic.h
+include/astrometry/merge-index.h
-astrometry/include/astrometry/tweak.h
+include/astrometry/multiindex.h
-astrometry/include/astrometry/tweak2.h
+include/astrometry/new-wcs.h
-astrometry/include/astrometry/tycho2-fits.h
+include/astrometry/nomad-fits.h
-astrometry/include/astrometry/tycho2.h
+include/astrometry/nomad.h
-astrometry/include/astrometry/ucac3.h
+include/astrometry/openngc.h
-astrometry/include/astrometry/ucac4.h
+include/astrometry/os-features-config.h
-astrometry/include/astrometry/uniformize-catalog.h
+include/astrometry/os-features.h
-astrometry/include/astrometry/unpermute-quads.h
+include/astrometry/permutedsort.h
-astrometry/include/astrometry/unpermute-stars.h
+include/astrometry/plotannotations.h
-astrometry/include/astrometry/usnob-fits.h
+include/astrometry/plotfill.h
-astrometry/include/astrometry/usnob.h
+include/astrometry/plotgrid.h
-astrometry/include/astrometry/verify.h
+include/astrometry/plotimage.h
-astrometry/include/astrometry/wcs-pv2sip.h
+include/astrometry/plotoutline.h
-astrometry/include/astrometry/wcs-rd2xy.h
+include/astrometry/plotstuff.h
-astrometry/include/astrometry/wcs-xy2rd.h
+include/astrometry/plotxy.h
-astrometry/include/astrometry/xylist.h
+include/astrometry/qfits_byteswap.h
-astrometry/lib/libanbase.a
+include/astrometry/qfits_card.h
-astrometry/lib/libanfiles.a
+include/astrometry/qfits_convert.h
-astrometry/lib/libanutils.a
+include/astrometry/qfits_error.h
-astrometry/lib/libastrometry.a
+include/astrometry/qfits_float.h
-astrometry/lib/libastrometry.so
+include/astrometry/qfits_header.h
-astrometry/lib/libcatalogs.a
+include/astrometry/qfits_image.h
-astrometry/lib/libgsl-an.a
+include/astrometry/qfits_keywords.h
-astrometry/lib/libkd.a
+include/astrometry/qfits_md5.h
-astrometry/lib/libqfits.a
+include/astrometry/qfits_memory.h
-astrometry/lib/python/astrometry/__init__.py
+include/astrometry/qfits_rw.h
-astrometry/lib/python/astrometry/blind/__init__.py
+include/astrometry/qfits_std.h
-astrometry/lib/python/astrometry/blind/_plotstuff_c.so
+include/astrometry/qfits_table.h
-astrometry/lib/python/astrometry/blind/plotann.py
+include/astrometry/qfits_time.h
-astrometry/lib/python/astrometry/blind/plotstuff.py
+include/astrometry/qfits_tools.h
-astrometry/lib/python/astrometry/blind/plotstuff_c.py
+include/astrometry/qidxfile.h
-astrometry/lib/python/astrometry/catalogs/__init__.py
+include/astrometry/quad-builder.h
-astrometry/lib/python/astrometry/libkd/__init__.py
+include/astrometry/quad-utils.h
-astrometry/lib/python/astrometry/libkd/spherematch.py
+include/astrometry/quadfile.h
-astrometry/lib/python/astrometry/libkd/spherematch_c.so
+include/astrometry/rdlist.h
-astrometry/lib/python/astrometry/net/client/client.py
+include/astrometry/resample.h
-astrometry/lib/python/astrometry/sdss/__init__.py
+include/astrometry/resort-xylist.h
-astrometry/lib/python/astrometry/sdss/_cutils.so
+include/astrometry/scamp-catalog.h
-astrometry/lib/python/astrometry/sdss/common.py
+include/astrometry/scamp.h
-astrometry/lib/python/astrometry/sdss/cutils.py
+include/astrometry/simplexy-common.h
-astrometry/lib/python/astrometry/sdss/cutout.py
+include/astrometry/simplexy.h
-astrometry/lib/python/astrometry/sdss/dr10.py
+include/astrometry/sip-utils.h
-astrometry/lib/python/astrometry/sdss/dr7.py
+include/astrometry/sip.h
-astrometry/lib/python/astrometry/sdss/dr8.py
+include/astrometry/sip_qfits.h
-astrometry/lib/python/astrometry/sdss/dr9.py
+include/astrometry/solvedfile.h
-astrometry/lib/python/astrometry/sdss/fields.py
+include/astrometry/solver.h
-astrometry/lib/python/astrometry/sdss/runList-dr10.par
+include/astrometry/starkd.h
-astrometry/lib/python/astrometry/sdss/runList-dr8.par
+include/astrometry/starutil.h
-astrometry/lib/python/astrometry/sdss/runList-dr9.par
+include/astrometry/starutil.inc
-astrometry/lib/python/astrometry/sdss/sdss_das.py
+include/astrometry/starxy.h
-astrometry/lib/python/astrometry/sdss/sdss_name.py
+include/astrometry/tabsort.h
-astrometry/lib/python/astrometry/sdss/yanny.py
+include/astrometry/tic.h
-astrometry/lib/python/astrometry/util/EXIF.py
+include/astrometry/tweak.h
-astrometry/lib/python/astrometry/util/__init__.py
+include/astrometry/tweak2.h
-astrometry/lib/python/astrometry/util/_util.so
+include/astrometry/tycho2-fits.h
-astrometry/lib/python/astrometry/util/addpath.py
+include/astrometry/tycho2.h
-astrometry/lib/python/astrometry/util/file.py
+include/astrometry/ucac3.h
-astrometry/lib/python/astrometry/util/filetype.py
+include/astrometry/ucac4.h
-astrometry/lib/python/astrometry/util/find_data_file.py
+include/astrometry/uniformize-catalog.h
-astrometry/lib/python/astrometry/util/fits.py
+include/astrometry/unpermute-quads.h
-astrometry/lib/python/astrometry/util/fix_sdss_idr.py
+include/astrometry/unpermute-stars.h
-astrometry/lib/python/astrometry/util/horizons.py
+include/astrometry/usnob-fits.h
-astrometry/lib/python/astrometry/util/image2pnm.py
+include/astrometry/usnob.h
-astrometry/lib/python/astrometry/util/imageutils.py
+include/astrometry/verify.h
-astrometry/lib/python/astrometry/util/miscutils.py
+include/astrometry/wcs-pv2sip.h
-astrometry/lib/python/astrometry/util/multiproc.py
+include/astrometry/wcs-rd2xy.h
-astrometry/lib/python/astrometry/util/plotshift.py
+include/astrometry/wcs-xy2rd.h
-astrometry/lib/python/astrometry/util/plotutils.py
+include/astrometry/xylist.h
-astrometry/lib/python/astrometry/util/removelines.py
+lib/libanbase.a
-astrometry/lib/python/astrometry/util/resample.py
+lib/libanfiles.a
-astrometry/lib/python/astrometry/util/run_command.py
+lib/libanutils.a
-astrometry/lib/python/astrometry/util/shell.py
+lib/libastrometry.a
-astrometry/lib/python/astrometry/util/siap.py
+lib/libastrometry.so
-astrometry/lib/python/astrometry/util/stages.py
+lib/libcatalogs.a
-astrometry/lib/python/astrometry/util/starutil.py
+lib/libkd.a
-astrometry/lib/python/astrometry/util/starutil_numpy.py
+lib/libqfits.a
-astrometry/lib/python/astrometry/util/timingpool.py
+lib/python/astrometry/__init__.py
-astrometry/lib/python/astrometry/util/ttime.py
+lib/python/astrometry/blind/__init__.py
-astrometry/lib/python/astrometry/util/uniformize.py
+lib/python/astrometry/blind/_plotstuff_c.so
-astrometry/lib/python/astrometry/util/usnob_catalog.py
+lib/python/astrometry/blind/plotann.py
-astrometry/lib/python/astrometry/util/usnob_get_image.py
+lib/python/astrometry/blind/plotstuff.py
-astrometry/lib/python/astrometry/util/usnob_get_region.py
+lib/python/astrometry/blind/plotstuff_c.py
-astrometry/lib/python/astrometry/util/util.py
+lib/python/astrometry/catalogs/__init__.py
-astrometry/share/man/man1/an-fitstopnm.1
+lib/python/astrometry/libkd/__init__.py
-astrometry/share/man/man1/an-pnmtofits.1
+lib/python/astrometry/libkd/spherematch.py
-astrometry/share/man/man1/astrometry-engine.1
+lib/python/astrometry/libkd/spherematch_c.so
-astrometry/share/man/man1/build-astrometry-index.1
+lib/python/astrometry/net/client/client.py
-astrometry/share/man/man1/coadd.1
+lib/python/astrometry/sdss/__init__.py
-astrometry/share/man/man1/downsample-fits.1
+lib/python/astrometry/sdss/_cutils.so
-astrometry/share/man/man1/fit-wcs.1
+lib/python/astrometry/sdss/common.py
-astrometry/share/man/man1/fits-flip-endian.1
+lib/python/astrometry/sdss/cutils.py
-astrometry/share/man/man1/fits-guess-scale.1
+lib/python/astrometry/sdss/cutout.py
-astrometry/share/man/man1/fitsgetext.1
+lib/python/astrometry/sdss/dr10.py
-astrometry/share/man/man1/get-healpix.1
+lib/python/astrometry/sdss/dr7.py
-astrometry/share/man/man1/get-wcs.1
+lib/python/astrometry/sdss/dr8.py
-astrometry/share/man/man1/hpsplit.1
+lib/python/astrometry/sdss/dr9.py
-astrometry/share/man/man1/image2xy.1
+lib/python/astrometry/sdss/fields.py
-astrometry/share/man/man1/new-wcs.1
+lib/python/astrometry/sdss/runList-dr10.par
-astrometry/share/man/man1/pad-file.1
+lib/python/astrometry/sdss/runList-dr8.par
-astrometry/share/man/man1/plot-constellations.1
+lib/python/astrometry/sdss/runList-dr9.par
-astrometry/share/man/man1/plotquad.1
+lib/python/astrometry/sdss/sdss_das.py
-astrometry/share/man/man1/plotxy.1
+lib/python/astrometry/sdss/sdss_name.py
-astrometry/share/man/man1/query-starkd.1
+lib/python/astrometry/sdss/yanny.py
-astrometry/share/man/man1/solve-field.1
+lib/python/astrometry/util/EXIF.py
-astrometry/share/man/man1/subtable.1
+lib/python/astrometry/util/__init__.py
-astrometry/share/man/man1/tabsort.1
+lib/python/astrometry/util/_util.so
-astrometry/share/man/man1/wcs-grab.1
+lib/python/astrometry/util/addpath.py
-astrometry/share/man/man1/wcs-match.1
+lib/python/astrometry/util/file.py
-astrometry/share/man/man1/wcs-pv2sip.1
+lib/python/astrometry/util/filetype.py
-astrometry/share/man/man1/wcs-rd2xy.1
+lib/python/astrometry/util/find_data_file.py
-astrometry/share/man/man1/wcs-resample.1
+lib/python/astrometry/util/fits.py
-astrometry/share/man/man1/wcs-to-tan.1
+lib/python/astrometry/util/fix_sdss_idr.py
-astrometry/share/man/man1/wcs-xy2rd.1
+lib/python/astrometry/util/horizons.py
-astrometry/share/man/man1/wcsinfo.1
+lib/python/astrometry/util/image2pnm.py
-@dir astrometry/data
+lib/python/astrometry/util/imageutils.py
+lib/python/astrometry/util/miscutils.py
+lib/python/astrometry/util/multiproc.py
+lib/python/astrometry/util/plotshift.py
+lib/python/astrometry/util/plotutils.py
+lib/python/astrometry/util/removelines.py
+lib/python/astrometry/util/resample.py
+lib/python/astrometry/util/run_command.py
+lib/python/astrometry/util/shell.py
+lib/python/astrometry/util/siap.py
+lib/python/astrometry/util/stages.py
+lib/python/astrometry/util/starutil.py
+lib/python/astrometry/util/starutil_numpy.py
+lib/python/astrometry/util/timingpool.py
+lib/python/astrometry/util/ttime.py
+lib/python/astrometry/util/uniformize.py
+lib/python/astrometry/util/usnob_catalog.py
+lib/python/astrometry/util/usnob_get_image.py
+lib/python/astrometry/util/usnob_get_region.py
+lib/python/astrometry/util/util.py
+man/man1/an-fitstopnm.1.gz
+man/man1/an-pnmtofits.1.gz
+man/man1/astrometry-engine.1.gz
+man/man1/build-astrometry-index.1.gz
+man/man1/coadd.1.gz
+man/man1/downsample-fits.1.gz
+man/man1/fit-wcs.1.gz
+man/man1/fits-flip-endian.1.gz
+man/man1/fits-guess-scale.1.gz
+man/man1/fitsgetext.1.gz
+man/man1/get-healpix.1.gz
+man/man1/get-wcs.1.gz
+man/man1/hpsplit.1.gz
+man/man1/image2xy.1.gz
+man/man1/new-wcs.1.gz
+man/man1/pad-file.1.gz
+man/man1/plot-constellations.1.gz
+man/man1/plotquad.1.gz
+man/man1/plotxy.1.gz
+man/man1/query-starkd.1.gz
+man/man1/solve-field.1.gz
+man/man1/subtable.1.gz
+man/man1/tabsort.1.gz
+man/man1/wcs-grab.1.gz
+man/man1/wcs-match.1.gz
+man/man1/wcs-pv2sip.1.gz
+man/man1/wcs-rd2xy.1.gz
+man/man1/wcs-resample.1.gz
+man/man1/wcs-to-tan.1.gz
+man/man1/wcs-xy2rd.1.gz
+man/man1/wcsinfo.1.gz
+%%DATADIR%%/blind/index-9918.fits
+%%DATADIR%%/catalogs/abell-all.fits
+%%DATADIR%%/catalogs/brightstars.fits
+%%DATADIR%%/catalogs/openngc-ic.fits
+%%DATADIR%%/catalogs/openngc-names.fits
+%%DATADIR%%/catalogs/openngc-ngc.fits
+%%DATADIR%%/catalogs/ugc.fits
+%%DATADIR%%/catalogs/uzc2000.fits
+%%DATADIR%%/sdss/cut-tsObj-002830-6-0-0398.fit
+%%DATADIR%%/sdss/psf.fits
+%%DATADIR%%/sdss/psf00.fits
+%%DATADIR%%/sdss/psf01k.fits
+%%DATADIR%%/sdss/psf02k.fits
+%%DATADIR%%/sdss/psf1k0.fits
+%%DATADIR%%/sdss/psf2k0.fits
+%%DATADIR%%/sdss/tsField-002830-6-0398.fit

astro/gpsbabel/Makefile

@@ -3,8 +3,7 @@
 
 PORTNAME=	gpsbabel
 DISTVERSIONPREFIX=	${PORTNAME}_
-DISTVERSION=	1_5_4
+DISTVERSION=	1_6_0
-PORTREVISION=	4
 CATEGORIES=	astro geography
 
 MAINTAINER=	dev2@heesakkers.info
@@ -13,15 +12,12 @@ COMMENT=	GPS file translating tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-# Unbundle libminizip
+USES=		compiler:c++11-lang gmake localbase qt:5
-LIB_DEPENDS=	libminizip.so:archivers/minizip
+USE_QT=		core qmake_build
-
-USE_GITHUB=	yes
 
 CONFLICTS=	gpsbabel14-[0-9]*
 
-USES=		compiler:c++11-lang localbase qt:5
+USE_GITHUB=	yes
-USE_QT=		core qmake_build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-zlib=system
 
@@ -29,9 +25,15 @@ OPTIONS_DEFINE=	GUI
 OPTIONS_SUB=	yes
 
 GUI_ALL_TARGET=	gui
-GUI_USE=	QT=gui,xml,network,webkit
+GUI_USE=	QT=qmake_build,gui,xml,network,webkit
 GUI_USE+=	QT=linguisttools_build,webengine,buildtools
 GUI_VARS=	MAKE_JOBS_UNSAFE=yes
+GUI_QMAKE_SOURCE_PATH=	${WRKSRC}/gui
+
+do-build:
+	(cd ${WRKSRC}; ${CONFIGURE_CMD} --with-zlib-system; ${GMAKE})
+do-build-GUI-on:
+	(cd ${WRKSRC}/gui; ${QMAKE} USE_GUI=qt5; ${LRELEASE} *.ts; ${GMAKE})
 
 post-patch:
 	@${REINPLACE_CMD} '/langPath_ = / \
@@ -43,7 +45,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/
 
 do-install-GUI-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe-bin \
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/objects/gpsbabelfe \
 		${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/

astro/gpsbabel/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1523450580
+TIMESTAMP = 1559490562
-SHA256 (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 8cd740db0b92610abff71e942e8a987df58cd6ca5f25cca86e15f2b00e190704
+SHA256 (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = ad56796f725dcdb7f52d9a9509d4922f11198c382fe10fc2d6c9efa8159f2090
-SIZE (gpsbabel-gpsbabel-gpsbabel_1_5_4_GH0.tar.gz) = 9121510
+SIZE (gpsbabel-gpsbabel-gpsbabel_1_6_0_GH0.tar.gz) = 14098867

astro/gpsbabel/files/patch-Makefile.in

@@ -1,15 +0,0 @@
---- Makefile.in.orig	2016-01-03 02:09:17 UTC
-+++ Makefile.in
-@@ -148,10 +148,10 @@ toolinfo
- all: gpsbabel$(EXEEXT)
- 
- gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ 
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -lminizip @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
- 
- gpsbabel-debug: $(OBJS)
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -lminizip @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
- 
- Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
- 	  gbversion.h.in gui/setup.iss.in

astro/gpsbabel/files/patch-bushnell.cc

@@ -1,22 +0,0 @@
-https://github.com/gpsbabel/gpsbabel/issues/62
-
---- bushnell.cc.orig	2017-01-24 13:08:41 UTC
-+++ bushnell.cc
-@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name
-     name = "Waypoint";
-   }
- 
--  for (t = bushnell_icons; t->icon > 0; t++) {
-+  for (t = bushnell_icons; t->icon != NULL; t++) {
-     if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {
-       return t->symbol;
-     }
-@@ -147,7 +147,7 @@ static const char*
- bushnell_get_name_from_symbol(signed int s)
- {
-   icon_mapping_t* t;
--  for (t = bushnell_icons; t->icon > 0; t++) {
-+  for (t = bushnell_icons; t->icon != NULL; t++) {
-     if (s == t->symbol) {
-       return t->icon;
-     }

astro/gpsbabel/files/patch-garmin__device__xml.cc

@@ -1,11 +0,0 @@
---- garmin_device_xml.cc.orig	2018-04-11 18:10:39 UTC
-+++ garmin_device_xml.cc
-@@ -41,7 +41,7 @@ jmp_buf gdx_jmp_buf;
- 
- void type_s(xg_string args, const QXmlStreamAttributes*)
- {
--  type = args.compare("GPSData");
-+  type = args.compare(QLatin1String("GPSData"));
- }
- 
- void device_s(xg_string args, const QXmlStreamAttributes*)

astro/gpsbabel/files/patch-gpx.cc

@@ -1,50 +0,0 @@
---- gpx.cc.orig	2018-04-11 18:10:39 UTC
-+++ gpx.cc
-@@ -494,7 +494,7 @@
- {
-   cache_descr_is_html = 0;
-   if (attr.hasAttribute("html")) {
--    if (attr.value("html").toString().compare("True") == 0) {
-+    if (attr.value("html").compare(QLatin1String("True")) == 0) {
-       cache_descr_is_html = 1;
-     }
-   }
-@@ -509,16 +509,16 @@
-     gc_data->id = attr.value("id").toString().toInt();
-   }
-   if (attr.hasAttribute("available")) {
--    if (attr.value("available").toString().compare("True", Qt::CaseInsensitive) == 0) {
-+    if (attr.value("available").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
-       gc_data->is_available = status_true;
--    } else if (attr.value("available").toString().compare("False", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.value("available").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
-       gc_data->is_available = status_false;
-     }
-   }
-   if (attr.hasAttribute("archived")) {
--    if (attr.value("archived").toString().compare("True", Qt::CaseInsensitive) == 0) {
-+    if (attr.value("archived").compare(QLatin1String("True"), Qt::CaseInsensitive) == 0) {
-       gc_data->is_archived = status_true;
--    } else if (attr.value("archived").toString().compare("False", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.value("archived").compare(QLatin1String("False"), Qt::CaseInsensitive) == 0) {
-       gc_data->is_archived = status_false;
-     }
-   }
-@@ -972,7 +972,7 @@
-      * last date we saw in this log.
-      */
-   case tt_cache_log_type:
--    if ((cdatastr.compare("Found it") == 0) &&
-+    if ((cdatastr.compare(QLatin1String("Found it")) == 0) &&
-         (0 == wpt_tmp->gc_data->last_found.toTime_t())) {
-       wpt_tmp->AllocGCData()->last_found = gc_log_date;
-     }
-@@ -1423,7 +1423,7 @@
-         fprint_xml_chain(tag->child, wpt);
-       }
-       if (wpt && wpt->gc_data->exported.isValid() &&
--          tag->tagname.compare("groundspeak:cache") == 0) {
-+          tag->tagname.compare(QLatin1String("groundspeak:cache")) == 0) {
-         writer->writeTextElement("time",
-                                  wpt->gc_data->exported.toPrettyString());
-       }

astro/gpsbabel/files/patch-gui_gpsbabel.desktop

@@ -0,0 +1,10 @@
+--- gui/gpsbabel.desktop.orig	2020-07-06 17:33:15 UTC
++++ gui/gpsbabel.desktop
+@@ -4,6 +4,6 @@ Name=GPSBabel
+ Comment=Qt GUI interface for GPSBabel
+ GenericName=GPSBabel
+ Icon=gpsbabel
+-Exec=gpsbabelfe-bin
++Exec=gpsbabelfe
+ Terminal=false
+ Categories=Geography;Education;Utility;

astro/gpsbabel/files/patch-jeeps_gpslibusb.cc

@@ -1,13 +0,0 @@
---- jeeps/gpslibusb.cc.orig	2016-01-03 02:09:17 UTC
-+++ jeeps/gpslibusb.cc
-@@ -20,8 +20,8 @@
-  */
- 
- 
--#include <stdio.h>
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
- #include <ctype.h>
- #if HAVE_CONFIG_H
- #include "config.h"

astro/gpsbabel/files/patch-lowranceusr.cc

@@ -1,11 +0,0 @@
---- lowranceusr.cc.orig	2018-04-11 18:16:00 UTC
-+++ lowranceusr.cc
-@@ -767,7 +767,7 @@ lowranceusr_waypt_disp(const Waypoint* w
- 
-   gbfputint32(Time, file_out);
- 
--  if (get_cache_icon(wpt) && wpt->icon_descr.compare("Geocache Found") == 0) {
-+  if (get_cache_icon(wpt) && wpt->icon_descr.compare(QLatin1String("Geocache Found")) == 0) {
-     SymbolId = lowranceusr_find_icon_number_from_desc(get_cache_icon(wpt));
-   } else {
-     SymbolId = lowranceusr_find_icon_number_from_desc(wpt->icon_descr);

astro/gpsbabel/files/patch-magproto.cc

@@ -1,17 +0,0 @@
---- magproto.cc.orig	2018-04-11 18:16:46 UTC
-+++ magproto.cc
-@@ -819,11 +819,11 @@ mag_rd_init_common(const QString& portna
-    */
-   QString exten = QFileInfo(curfname).suffix();
-   if (exten.length() > 0) {
--    if (0 == exten.compare("upt", Qt::CaseInsensitive)) {
-+    if (0 == exten.compare(QLatin1String("upt"), Qt::CaseInsensitive)) {
-       extension_hint = WPTDATAMASK;
--    } else if (0 == exten.compare("log", Qt::CaseInsensitive)) {
-+    } else if (0 == exten.compare(QLatin1String("log"), Qt::CaseInsensitive)) {
-       extension_hint = TRKDATAMASK;
--    } else if (0 == exten.compare("rte", Qt::CaseInsensitive)) {
-+    } else if (0 == exten.compare(QLatin1String("rte"), Qt::CaseInsensitive)) {
-       extension_hint = RTEDATAMASK;
-     }
-   }

astro/gpsbabel/files/patch-psitrex.cc

@@ -1,11 +0,0 @@
---- psitrex.cc.orig	2018-04-11 18:17:53 UTC
-+++ psitrex.cc
-@@ -363,7 +363,7 @@ psit_waypoint_w(gbfile* psit_file, const
- 
-   icon = gt_find_icon_number_from_desc(wpt->icon_descr, PCX);
- 
--  if (get_cache_icon(wpt) && wpt->icon_descr.compare("Geocache Found") != 0) {
-+  if (get_cache_icon(wpt) && wpt->icon_descr.compare(QLatin1String("Geocache Found")) != 0) {
-     icon = gt_find_icon_number_from_desc(get_cache_icon(wpt), PCX);
-   }
- 

astro/gpsbabel/files/patch-src_core_ziparchive.cc

@@ -1,11 +0,0 @@
---- src/core/ziparchive.cc.orig	2016-01-03 02:09:17 UTC
-+++ src/core/ziparchive.cc
-@@ -23,7 +23,7 @@
- 
- #include "defs.h"
- #include "src/core/logging.h"
--#include "zlib/contrib/minizip/zip.h"
-+#include <minizip/zip.h>
- 
- #include <QtCore/QFile>
- #include <QtCore/QDebug>

astro/gpsbabel/files/patch-src_core_ziparchive.h

@@ -1,11 +0,0 @@
---- src/core/ziparchive.h.orig	2016-01-03 02:09:17 UTC
-+++ src/core/ziparchive.h
-@@ -21,7 +21,7 @@
- 
- #include <QtCore/QString>
- #include <QtCore/QStringList>
--#include "zlib/contrib/minizip/zip.h"
-+#include <minizip/zip.h>
- 
- class  ZipArchive
- {

astro/gpsbabel/files/patch-tef_xml.cc

@@ -1,57 +0,0 @@
---- tef_xml.cc.orig	2018-04-11 18:10:39 UTC
-+++ tef_xml.cc
-@@ -72,11 +72,11 @@
-   bool valid = false;
- 
-   foreach(QXmlStreamAttribute attr, *attrv) {
--    if (attr.name().compare("Comment", Qt::CaseInsensitive) == 0) {
--      if (attr.value().compare("TourExchangeFormat", Qt::CaseInsensitive) == 0) {
-+    if (attr.name().compare(QLatin1String("Comment"), Qt::CaseInsensitive) == 0) {
-+      if (attr.value().compare(QLatin1String("TourExchangeFormat"), Qt::CaseInsensitive) == 0) {
-         valid = true;
-       }
--    } else if (attr.name().compare("Version", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare(QLatin1String("Version"), Qt::CaseInsensitive) == 0) {
-       version = attr.value().toString().toDouble();
-     }
-   }
-@@ -95,9 +95,9 @@
- {
-   route = route_head_alloc();
-   foreach(QXmlStreamAttribute attr, *attrv) {
--    if (attr.name().compare("Name", Qt::CaseInsensitive) == 0) {
-+    if (attr.name().compare(QLatin1String("Name"), Qt::CaseInsensitive) == 0) {
-       route->rte_name = attr.value().toString().trimmed();
--    } else if (attr.name().compare("Software", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare(QLatin1String("Software"), Qt::CaseInsensitive) == 0) {
-       route->rte_desc = attr.value().toString().trimmed();
-     }
-   }
-@@ -248,20 +248,20 @@
-     QString attrstr = attr.value().toString();
-     QByteArray attrtext = attrstr.toUtf8();
- 
--    if (attr.name().compare("SegDescription", Qt::CaseInsensitive) == 0) {
-+    if (attr.name().compare(QLatin1String("SegDescription"), Qt::CaseInsensitive) == 0) {
-       wpt_tmp->shortname = attrstr.trimmed();
--    } else if (attr.name().compare("PointDescription", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare(QLatin1String("PointDescription"), Qt::CaseInsensitive) == 0) {
-       wpt_tmp->description = attrstr.trimmed();
--    } else if (attr.name().compare("ViaStation", Qt::CaseInsensitive) == 0 &&
--               attr.value().compare("true", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare(QLatin1String("ViaStation"), Qt::CaseInsensitive) == 0 &&
-+               attr.value().compare(QLatin1String("true"), Qt::CaseInsensitive) == 0) {
-       wpt_tmp->wpt_flags.fmt_use = 1;  /* only a flag */
- 
-       /* new in TEF V2 */
--    } else if (attr.name().compare("Instruction", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare(QLatin1String("Instruction"), Qt::CaseInsensitive) == 0) {
-       wpt_tmp->description = attrstr.trimmed();
--    } else if (attr.name().compare("Altitude", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare(QLatin1String("Altitude"), Qt::CaseInsensitive) == 0) {
-       wpt_tmp->altitude = attrstr.toDouble();
--    } else if (attr.name().compare("TimeStamp", Qt::CaseInsensitive) == 0) {
-+    } else if (attr.name().compare(QLatin1String("TimeStamp"), Qt::CaseInsensitive) == 0) {
-       /* nothing for the moment */
-     }
-   }

astro/gpsbabel/files/patch-unicsv.cc

@@ -1,20 +0,0 @@
---- unicsv.cc.orig	2018-04-11 18:21:19 UTC
-+++ unicsv.cc
-@@ -430,13 +430,13 @@ unicsv_parse_time(const QString& str, in
- static status_type
- unicsv_parse_status(const QString& str)
- {
--  if (str.compare("true", Qt::CaseInsensitive) == 0 ||
--      str.compare("yes", Qt::CaseInsensitive) == 0 ||
-+  if (str.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0 ||
-+      str.compare(QLatin1String("yes"), Qt::CaseInsensitive) == 0 ||
-       str == "1") {
-     return status_true;
-   }
--  if (str.compare("false", Qt::CaseInsensitive) == 0 ||
--      str.compare("no", Qt::CaseInsensitive) == 0 ||
-+  if (str.compare(QLatin1String("false"), Qt::CaseInsensitive) == 0 ||
-+      str.compare(QLatin1String("no"), Qt::CaseInsensitive) == 0 ||
-       str == "0") {
-     return status_false;
-   }

astro/gpsbabel/pkg-plist

@@ -1,8 +1,6 @@
 bin/gpsbabel
-%%GUI%%bin/gpsbabelfe-bin
+%%GUI%%bin/gpsbabelfe
 %%GUI%%share/applications/gpsbabel.desktop
-%%GUI%%%%DATADIR%%/translations/gpsbabel.qm
-%%GUI%%%%DATADIR%%/translations/gpsbabelfe.qm
 %%GUI%%%%DATADIR%%/translations/gpsbabelfe_de.qm
 %%GUI%%%%DATADIR%%/translations/gpsbabelfe_es.qm
 %%GUI%%%%DATADIR%%/translations/gpsbabelfe_fr.qm

astro/josm/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	josm
-PORTVERSION=	16538
+PORTVERSION=	16731
 CATEGORIES=	astro java
 MASTER_SITES=	http://josm.openstreetmap.de/download/ \
 		http://mirror.amdmi3.ru/distfiles/

astro/josm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591285964
+TIMESTAMP = 1594156009
-SHA256 (josm-snapshot-16538.jar) = 486c6f29db2dac43da0d79b41faae4a652062cbd4a9a0a28d2832e6725e31f1e
+SHA256 (josm-snapshot-16731.jar) = e61a299db7773742f8ad29170c49829b99ae03aa0397efbae4f2bdc830932465
-SIZE (josm-snapshot-16538.jar) = 14813680
+SIZE (josm-snapshot-16731.jar) = 14922113

astro/libkgeomap/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591712609
+TIMESTAMP = 1594146931
-SHA256 (KDE/applications/20.04.2/libkgeomap-20.04.2.tar.xz) = 8a32b23942c7fa670dd0e8024340e0c28a9d326b8dc44f8453412ffa8748168a
+SHA256 (KDE/release-service/20.04.3/libkgeomap-20.04.3.tar.xz) = 34e41b2505a34355a31a548bb8f94955b3dc4391c71201164574ff45b532818d
-SIZE (KDE/applications/20.04.2/libkgeomap-20.04.2.tar.xz) = 150952
+SIZE (KDE/release-service/20.04.3/libkgeomap-20.04.3.tar.xz) = 150940

astro/libosmium/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libosmium
-PORTVERSION=	2.15.5
+PORTVERSION=	2.15.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	astro geography devel
 

astro/libosmium/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1588285492
+TIMESTAMP = 1593721588
-SHA256 (osmcode-libosmium-v2.15.5_GH0.tar.gz) = b32ab1f3c75c229806d90c087872064050d2f22e1afa70eed8dea32360cde358
+SHA256 (osmcode-libosmium-v2.15.6_GH0.tar.gz) = 55879b9da0f3756f3216f9fb857f35afb3b01294b5f18e0d1719334e7d4f5ac9
-SIZE (osmcode-libosmium-v2.15.5_GH0.tar.gz) = 503952
+SIZE (osmcode-libosmium-v2.15.6_GH0.tar.gz) = 504679

astro/marble/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591712611
+TIMESTAMP = 1594146932
-SHA256 (KDE/applications/20.04.2/marble-20.04.2.tar.xz) = dbd31b0d81e8414db30278948a95f87a23730da0aa5b96cbf3088ec67c450714
+SHA256 (KDE/release-service/20.04.3/marble-20.04.3.tar.xz) = 9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b
-SIZE (KDE/applications/20.04.2/marble-20.04.2.tar.xz) = 52206460
+SIZE (KDE/release-service/20.04.3/marble-20.04.3.tar.xz) = 52200548

astro/marble/pkg-plist

@@ -280,86 +280,70 @@ share/locale/ar/LC_MESSAGES/marble.mo
 share/locale/ar/LC_MESSAGES/marble_qt.qm
 share/locale/bg/LC_MESSAGES/marble.mo
 share/locale/bg/LC_MESSAGES/marble_qt.qm
-share/locale/bg/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/bs/LC_MESSAGES/marble.mo
 share/locale/bs/LC_MESSAGES/marble_qt.qm
-share/locale/bs/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/bs/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ca/LC_MESSAGES/marble.mo
 share/locale/ca/LC_MESSAGES/marble_qt.qm
-share/locale/ca/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/ca/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ca/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ca/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/ca@valencia/LC_MESSAGES/marble.mo
 share/locale/ca@valencia/LC_MESSAGES/marble_qt.qm
-share/locale/ca@valencia/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/ca@valencia/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ca@valencia/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ca@valencia/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/cs/LC_MESSAGES/marble.mo
 share/locale/cs/LC_MESSAGES/marble_qt.qm
-share/locale/cs/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/cs/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/cs/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/cs/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/da/LC_MESSAGES/marble.mo
 share/locale/da/LC_MESSAGES/marble_qt.qm
-share/locale/da/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/da/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/de/LC_MESSAGES/marble.mo
 share/locale/de/LC_MESSAGES/marble_qt.qm
-share/locale/de/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/de/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/de/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/de/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/el/LC_MESSAGES/marble.mo
 share/locale/el/LC_MESSAGES/marble_qt.qm
-share/locale/el/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/el/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/el/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/el/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/en_GB/LC_MESSAGES/marble.mo
 share/locale/en_GB/LC_MESSAGES/marble_qt.qm
-share/locale/en_GB/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/en_GB/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/en_GB/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/en_GB/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/eo/LC_MESSAGES/marble.mo
 share/locale/eo/LC_MESSAGES/marble_qt.qm
-share/locale/eo/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/eo/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/es/LC_MESSAGES/marble.mo
 share/locale/es/LC_MESSAGES/marble_qt.qm
-share/locale/es/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/es/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/es/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/es/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/et/LC_MESSAGES/marble.mo
 share/locale/et/LC_MESSAGES/marble_qt.qm
-share/locale/et/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/et/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/et/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/et/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/fi/LC_MESSAGES/marble.mo
 share/locale/fi/LC_MESSAGES/marble_qt.qm
-share/locale/fi/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/fi/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/fi/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/fi/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/fr/LC_MESSAGES/marble.mo
 share/locale/fr/LC_MESSAGES/marble_qt.qm
-share/locale/fr/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/fr/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/fr/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/fr/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/ga/LC_MESSAGES/marble.mo
 share/locale/ga/LC_MESSAGES/marble_qt.qm
-share/locale/ga/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/ga/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/gl/LC_MESSAGES/marble.mo
 share/locale/gl/LC_MESSAGES/marble_qt.qm
-share/locale/gl/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/gl/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/gl/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/gl/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
@@ -371,69 +355,56 @@ share/locale/hr/LC_MESSAGES/marble.mo
 share/locale/hr/LC_MESSAGES/marble_qt.qm
 share/locale/hu/LC_MESSAGES/marble.mo
 share/locale/hu/LC_MESSAGES/marble_qt.qm
-share/locale/hu/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/hu/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/is/LC_MESSAGES/marble.mo
 share/locale/is/LC_MESSAGES/marble_qt.qm
 share/locale/it/LC_MESSAGES/marble.mo
 share/locale/it/LC_MESSAGES/marble_qt.qm
-share/locale/it/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/it/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/it/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/it/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/ja/LC_MESSAGES/marble.mo
 share/locale/ja/LC_MESSAGES/marble_qt.qm
-share/locale/ja/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/ja/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ja/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ja/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/kk/LC_MESSAGES/marble.mo
 share/locale/kk/LC_MESSAGES/marble_qt.qm
-share/locale/kk/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/kk/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/km/LC_MESSAGES/marble.mo
 share/locale/km/LC_MESSAGES/marble_qt.qm
 share/locale/ko/LC_MESSAGES/marble.mo
 share/locale/ko/LC_MESSAGES/marble_qt.qm
-share/locale/ko/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/ko/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/lt/LC_MESSAGES/marble.mo
 share/locale/lt/LC_MESSAGES/marble_qt.qm
-share/locale/lt/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/lt/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/lt/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/lt/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/lv/LC_MESSAGES/marble.mo
 share/locale/lv/LC_MESSAGES/marble_qt.qm
-share/locale/lv/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/lv/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ml/LC_MESSAGES/marble.mo
 share/locale/ml/LC_MESSAGES/marble_qt.qm
-share/locale/ml/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/ml/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ml/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ml/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/mr/LC_MESSAGES/marble.mo
 share/locale/mr/LC_MESSAGES/marble_qt.qm
-share/locale/mr/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/mr/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/nb/LC_MESSAGES/marble.mo
 share/locale/nb/LC_MESSAGES/marble_qt.qm
-share/locale/nb/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/nb/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/nds/LC_MESSAGES/marble.mo
 share/locale/nds/LC_MESSAGES/marble_qt.qm
-share/locale/nds/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/nds/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/nl/LC_MESSAGES/marble.mo
 share/locale/nl/LC_MESSAGES/marble_qt.qm
-share/locale/nl/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/nl/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/nl/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/nl/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/nn/LC_MESSAGES/marble.mo
 share/locale/nn/LC_MESSAGES/marble_qt.qm
-share/locale/nn/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/nn/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/nn/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/nn/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
@@ -441,19 +412,16 @@ share/locale/pa/LC_MESSAGES/marble.mo
 share/locale/pa/LC_MESSAGES/marble_qt.qm
 share/locale/pl/LC_MESSAGES/marble.mo
 share/locale/pl/LC_MESSAGES/marble_qt.qm
-share/locale/pl/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/pl/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/pl/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/pl/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/pt/LC_MESSAGES/marble.mo
 share/locale/pt/LC_MESSAGES/marble_qt.qm
-share/locale/pt/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/pt/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/pt/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/pt/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/pt_BR/LC_MESSAGES/marble.mo
 share/locale/pt_BR/LC_MESSAGES/marble_qt.qm
-share/locale/pt_BR/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/pt_BR/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/pt_BR/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/pt_BR/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
@@ -461,41 +429,34 @@ share/locale/ro/LC_MESSAGES/marble.mo
 share/locale/ro/LC_MESSAGES/marble_qt.qm
 share/locale/ru/LC_MESSAGES/marble.mo
 share/locale/ru/LC_MESSAGES/marble_qt.qm
-share/locale/ru/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/ru/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ru/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ru/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/sk/LC_MESSAGES/marble.mo
 share/locale/sk/LC_MESSAGES/marble_qt.qm
-share/locale/sk/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/sk/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/sk/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/sk/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/sl/LC_MESSAGES/marble.mo
 share/locale/sl/LC_MESSAGES/marble_qt.qm
-share/locale/sl/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/sl/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/sl/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/sl/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/sv/LC_MESSAGES/marble.mo
 share/locale/sv/LC_MESSAGES/marble_qt.qm
-share/locale/sv/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/sv/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/sv/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/sv/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/tr/LC_MESSAGES/marble.mo
 share/locale/tr/LC_MESSAGES/marble_qt.qm
-share/locale/tr/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/tr/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/tr/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/tr/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/ug/LC_MESSAGES/marble.mo
 share/locale/ug/LC_MESSAGES/marble_qt.qm
-share/locale/ug/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/ug/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/uk/LC_MESSAGES/marble.mo
 share/locale/uk/LC_MESSAGES/marble_qt.qm
-share/locale/uk/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/uk/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/uk/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/uk/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
@@ -503,13 +464,11 @@ share/locale/wa/LC_MESSAGES/marble.mo
 share/locale/wa/LC_MESSAGES/marble_qt.qm
 share/locale/zh_CN/LC_MESSAGES/marble.mo
 share/locale/zh_CN/LC_MESSAGES/marble_qt.qm
-share/locale/zh_CN/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/zh_TW/LC_MESSAGES/marble.mo
 share/locale/zh_TW/LC_MESSAGES/marble_qt.qm
-share/locale/zh_TW/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo

astro/mkgmap/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mkgmap
-PORTVERSION=	r4550
+PORTVERSION=	r4562
 CATEGORIES=	astro converters java
 MASTER_SITES=	http://www.mkgmap.org.uk/download/ \
 		http://mirror.amdmi3.ru/distfiles/

astro/mkgmap/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1592422700
+TIMESTAMP = 1594664011
-SHA256 (mkgmap-r4550.tar.gz) = a55cd3e0645eca2a7c120352c52d3c28fce761ac7a09e08cb817a22e2a2554b0
+SHA256 (mkgmap-r4562.tar.gz) = d8557fccfe3aa75aef5679fe0568df023da504712bb439d86998b5075c24af9e
-SIZE (mkgmap-r4550.tar.gz) = 3465554
+SIZE (mkgmap-r4562.tar.gz) = 3472009

astro/opencpn/Makefile

@@ -10,6 +10,7 @@ MAINTAINER=	ml@netfence.it
 COMMENT=	Concise ChartPlotter/Navigator
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING.gplv2
 
 LIB_DEPENDS=	libportaudio.so:audio/portaudio \
 		libcurl.so:ftp/curl \

astro/opencpn/pkg-descr

@@ -3,4 +3,4 @@ navigation software, for use underway or as a planning tool. OpenCPN is
 developed by a team of active sailors using real world conditions for
 program testing and refinement.
 
-WWW: http://opencpn.org/
+WWW: https://opencpn.org/

astro/osmosis/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	osmosis
-PORTVERSION=	0.48.0
+PORTVERSION=	0.48.2
 CATEGORIES=	astro java
 MASTER_SITES=	https://github.com/openstreetmap/osmosis/releases/download/${PORTVERSION}/
 

astro/osmosis/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1589041277
+TIMESTAMP = 1594816516
-SHA256 (osmosis-0.48.0.tgz) = 0690c0685b8f1db23a9bbf4ee54e145333d16fde68dd2bee955634dab8f0fbb5
+SHA256 (osmosis-0.48.2.tgz) = 15b199615ea9c10483468550ca5710db363141294eb6b2cc4d7f75597e9c4614
-SIZE (osmosis-0.48.0.tgz) = 13750812
+SIZE (osmosis-0.48.2.tgz) = 15168902

astro/py-RO/Makefile

@@ -16,16 +16,17 @@ LICENSE_FILE=	${WRKSRC}/docs/License.txt
 
 RUN_DEPENDS=	${PYNUMPY}
 
+USES=		python:3.5+
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
 OPTIONS_DEFINE=	ASTROPY MATPLOTLIB PYGAME
 OPTIONS_DEFAULT=ASTROPY
 ASTROPY_DESC=	Add Support for Astropy
 MATPLOTLIB_DESC=Add support for Matplotlib
 PYGAME_DESC=	Add Support for PyGame
 
-NO_ARCH=	yes
-USES=		python:3.5+
-USE_PYTHON=	autoplist distutils
-
 ASTROPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR}
 MATPLOTLIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR}
 PYGAME_RUN_DEPENDS=	${PYGAME}

astro/py-ephem/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ephem
-PORTVERSION=	3.7.7.0
+PORTVERSION=	3.7.7.1
 CATEGORIES=	astro math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

astro/py-ephem/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1576382931
+TIMESTAMP = 1593676422
-SHA256 (ephem-3.7.7.0.tar.gz) = 607148429f85412915e32265779c0cf6d09f73aa97cf1ff0d101ac22c69c4436
+SHA256 (ephem-3.7.7.1.tar.gz) = 36b51a8dc7cfdeb456dd6b8ab811accab8341b2d562ee3c6f4c86f6d3dbb984e
-SIZE (ephem-3.7.7.0.tar.gz) = 745041
+SIZE (ephem-3.7.7.1.tar.gz) = 745839

astro/py-metpy/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	metpy
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,14 +19,14 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.22.0:math/py-pandas@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Pint>=0.10.1:devel/py-Pint@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pint>=0.10.1:devel/py-pint@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pooch>=0.1:devel/py-pooch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=4.3.0:devel/py-traitlets@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xarray>=0.13.0:devel/py-xarray@${PY_FLAVOR}
 
 USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 

astro/pyephem/Makefile

@@ -14,6 +14,11 @@ COMMENT=	Scientific-grade astronomical computations for Python
 
 LICENSE=	LGPL3
 
+DEPRECATED=	Use py-ephem instead.
+EXPIRATION_DATE=	2020-08-04
+
+BROKEN=		fails to compile
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ephem==${PORTVERSION}:astro/py-ephem@${PY_FLAVOR}
 
 USES=		python

astro/tclgeomap/pkg-descr

@@ -13,4 +13,4 @@ It provides four packages:
 
 This port contains the Tcl part.
 
-WWW: http://www.tkgeomap.org/
+WWW: https://web.archive.org/web/20130807000308/http://www.tkgeomap.org/

astro/tkgeomap/Makefile

@@ -11,11 +11,11 @@ COMMENT=	Read, manipulate, and display geo data
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtclgeomap.so:astro/tclgeomap
-
 BROKEN_armv6=	fails to configure: shared build specified but could not find shared tclgeomap library
 BROKEN_armv7=	fails to configure: shared build specified but could not find shared tclgeomap library
 
+LIB_DEPENDS=	libtclgeomap.so:astro/tclgeomap
+
 USES+=		tk:tea
 CONFIGURE_ARGS=	--with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \
 		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include

astro/tkgeomap/pkg-descr

@@ -13,4 +13,4 @@ It provides four packages:
 
 This port contains the Tk part.
 
-WWW: http://www.tkgeomap.org/
+WWW: https://web.archive.org/web/20130807000308/http://www.tkgeomap.org/

astro/xearth/files/freebsd.committers.markers

@@ -285,7 +285,7 @@
  48.400,	-89.233,	"tabthorpe"			# Thunder Bay, ON, Canada
  43.19,		-89.38,		"jlemon"			# Madison, WI, USA
  43.02,		-89.41,		"feld"				# Madison, WI, USA
- 43.063,	-89.452,	"nwhitehorn"			# Madison, WI, USA
+ 42.737,	-84.484,	"nwhitehorn"			# East Lansing, MI, USA
  46.012,	-92.373,	"jpaetzel"			# Danbury, WI, USA
  38.92,		-92.40,		"stephen"			# Columbia, MO, USA
  45.0676,	-92.8234,	"xride"				# Stillwater, MN, USA

audio/Makefile

@@ -39,7 +39,6 @@
     SUBDIR += asunder
     SUBDIR += atunes
     SUBDIR += aubio
-    SUBDIR += aucatctl
     SUBDIR += audacity
     SUBDIR += audiere
     SUBDIR += audiocd-kio
@@ -142,6 +141,7 @@
     SUBDIR += eteroj-lv2
     SUBDIR += etktab
     SUBDIR += exaile
+    SUBDIR += exhale
     SUBDIR += ezstream
     SUBDIR += faac
     SUBDIR += faad

audio/adplay/Makefile

@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libadplug.so:audio/libadplug \
 		libbinio.so:devel/libbinio
 
-USES=		autoreconf libtool pkgconfig
+USES=		autoreconf compiler:c++11-lang libtool pkgconfig
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	adplug

audio/alsa-sndio/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	alsa-sndio
 DISTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	tobik@FreeBSD.org

audio/aqualung/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	aqualung
 PORTVERSION=	1.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	SF
 

audio/asunder/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	asunder
-PORTVERSION=	2.8
+PORTVERSION=	2.9.6
 CATEGORIES=	audio
 MASTER_SITES=	http://littlesvr.ca/asunder/releases/
 
@@ -12,19 +12,21 @@ COMMENT=	Lightweight GTK+ CD ripper
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcddb.so:audio/libcddb
+LIB_DEPENDS=	libcddb.so:audio/libcddb \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/bin/cdparanoia:audio/cdparanoia
 
+USES=		desktop-file-utils gettext gmake gnome pkgconfig tar:bzip2
+USE_GNOME=	cairo gdkpixbuf2 gtk20 glib20 intltool intlhack
+GNU_CONFIGURE=	yes
+
 OPTIONS_DEFINE=	LAME OGG FLAC OPUS WAVPACK APE WINDOWS_CHARS NLS DOCS
 OPTIONS_DEFAULT=	OGG FLAC
 OPTIONS_SUB=	yes
 
 WINDOWS_CHARS_DESC=	Allow Windows special chars in filenames
 
-GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gettext gmake gnome pkgconfig tar:bzip2
-USE_GNOME=	gtk20 glib20 intltool intlhack
-
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
 
 LAME_RUN_DEPENDS=	lame:audio/lame

audio/asunder/distinfo

@@ -1,2 +1,3 @@
-SHA256 (asunder-2.8.tar.bz2) = d8c7014b87ab3c5467876def4d8650fd09fe415ded9de2569c629296499b09db
+TIMESTAMP = 1593022171
-SIZE (asunder-2.8.tar.bz2) = 269472
+SHA256 (asunder-2.9.6.tar.bz2) = ea3c7fa65b2373461eb3d9f929aa85499aa00359a43dbbd80d1e1f48056a96f9
+SIZE (asunder-2.9.6.tar.bz2) = 283568

audio/asunder/files/patch-Makefile.in

@@ -1,15 +1,15 @@
---- Makefile.in.orig	2015-10-03 03:58:31 UTC
+--- Makefile.in.orig	2020-05-28 16:32:57 UTC
 +++ Makefile.in
-@@ -345,7 +345,7 @@ top_srcdir = @top_srcdir@
+@@ -358,7 +358,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = src po
  pixdir = $(datadir)/pixmaps
- pix_DATA = pixmaps/asunder.png
+ pix_DATA = pixmaps/asunder.png pixmaps/asunder.svg
--EXTRA_DIST = asunder.desktop pixmaps/asunder.png syslogng
+-EXTRA_DIST = asunder.desktop pixmaps/asunder.png pixmaps/asunder.svg syslogng
-+EXTRA_DIST = asunder.desktop pixmaps/asunder.png
++EXTRA_DIST = asunder.desktop pixmaps/asunder.png pixmaps/asunder.svg
  ACLOCAL_AMFLAGS = -I m4
  desktopdir = $(datadir)/applications
  desktop_DATA = asunder.desktop
-@@ -800,7 +800,6 @@ info-am:
+@@ -812,7 +812,6 @@ info-am:
  
  install-data-am: install-desktopDATA install-pixDATA
  	@$(NORMAL_INSTALL)
@@ -17,7 +17,7 @@
  install-dvi: install-dvi-recursive
  
  install-dvi-am:
-@@ -858,7 +857,7 @@ uninstall-am: uninstall-desktopDATA unin
+@@ -870,7 +869,7 @@ uninstall-am: uninstall-desktopDATA uninstall-pixDATA
  	distcheck distclean distclean-generic distclean-hdr \
  	distclean-tags distcleancheck distdir distuninstallcheck dvi \
  	dvi-am html html-am info info-am install install-am \
@@ -26,13 +26,13 @@
  	install-desktopDATA install-dvi install-dvi-am install-exec \
  	install-exec-am install-html install-html-am install-info \
  	install-info-am install-man install-pdf install-pdf-am \
-@@ -870,9 +869,6 @@ uninstall-am: uninstall-desktopDATA unin
+@@ -883,9 +882,6 @@ uninstall-am: uninstall-desktopDATA uninstall-pixDATA
- 	uninstall-pixDATA
  
+ .PRECIOUS: Makefile
  
+-
 -install-data-hook:
 -	cd syslogng && $(MAKE) install
--
+ 
  uninstall-hook: 
  	cd syslogng && $(MAKE) uninstall
- 

audio/asunder/pkg-plist

@@ -104,3 +104,4 @@ share/applications/asunder.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/asunder.mo
 %%NLS%%share/locale/zu/LC_MESSAGES/asunder.mo
 share/pixmaps/asunder.png
+share/pixmaps/asunder.svg

audio/aucatctl/Makefile

@@ -1,30 +0,0 @@
-# Created by: Tobias Kortkamp <t@tobik.me>
-# $FreeBSD$
-
-# Based on the OpenBSD port audio/aucatctl
-# $OpenBSD: Makefile,v 1.3 2014/07/13 11:40:23 armani Exp $
-
-PORTNAME=	aucatctl
-PORTVERSION=	0.1
-PORTREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	http://www.sndio.org/
-
-MAINTAINER=	tobik@FreeBSD.org
-COMMENT=	Control sndiod and/or aucat volumes
-
-LICENSE=	ISCL
-
-LIB_DEPENDS=	libsndio.so:audio/sndio
-
-MAKE_ARGS=	INCLUDE="-I${LOCALBASE}/include" \
-		LIB="-L${LOCALBASE}/lib"
-
-PLIST_FILES=	bin/aucatctl \
-		man/man1/aucatctl.1.gz
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/aucatctl ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/aucatctl.1 ${STAGEDIR}${PREFIX}/man/man1
-
-.include <bsd.port.mk>

audio/aucatctl/distinfo

@@ -1,3 +0,0 @@
-TIMESTAMP = 1469051487
-SHA256 (aucatctl-0.1.tar.gz) = 524f2fae47db785234f166551520d9605b9a27551ca438bd807e3509ce246cf0
-SIZE (aucatctl-0.1.tar.gz) = 4364

audio/aucatctl/files/patch-aucatctl.c

@@ -1,10 +0,0 @@
---- aucatctl.c.orig	2016-12-22 19:50:06 UTC
-+++ aucatctl.c
-@@ -69,6 +69,7 @@ setmaster(unsigned vol)
- 
- 	msg.start = SYSEX_START;
- 	msg.type = SYSEX_TYPE_RT;
-+	msg.dev = 0;
- 	msg.id0 = SYSEX_CONTROL;
- 	msg.id1 = SYSEX_MASTER;
- 	msg.u.master.fine = 0;

audio/aucatctl/pkg-descr

@@ -1,4 +0,0 @@
-The aucatctl utility sends MIDI messages to control sndiod and/or
-aucat volumes.
-
-WWW: http://www.sndio.org/

audio/audacity/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 DISTVERSIONPREFIX=	Audacity-
 CATEGORIES=	audio
 
@@ -35,18 +35,19 @@ CMAKE_ARGS=	-Daudacity_lib_preference:STRING=system \
 		-Daudacity_use_portsmf:STRING=local \
 		-Daudacity_use_portmixer:STRING=local \
 		-Daudacity_use_portaudio:STRING=system
+CMAKE_OFF=	audacity_use_pch
 
 OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
-			MIDI NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
+			MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
 			VORBIS VST
-OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \
+OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI OGG SBSMS \
 			SOUNDTOUCH TWOLAME VAMP VORBIS VST
+OPTIONS_EXCLUDE_i386=	SBSMS
 
 LAME_DESC=		Use lame for import and export support
 LV2_DESC=		Add LV2 plug-in support
 MAD_DESC=		Use libmad for mp2/3 decoding support
 MIDI_DESC=		MIDI support
-NYQUIST_DESC=		Nyquist synthesis and composition support
 SBSMS_DESC=		Use libsbsms for pitch and tempo changing
 SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
 TWOLAME_DESC=		Use libtwolame for MP2 export support
@@ -99,9 +100,6 @@ MIDI_CMAKE_OFF=		-Daudacity_use_midi:STRING=off
 # TODO: fix NLS support properly
 PLIST_SUB+=		NLS=""
 
-NYQUIST_CMAKE_ON=	-Daudacity_use_nyquist:STRING=local
-NYQUIST_CMAKE_OFF=	-Daudacity_use_nyquist:STRING=off
-
 OGG_CMAKE_ON=		-Daudacity_use_ogg:STRING=system
 OGG_CMAKE_OFF=		-Daudacity_use_ogg:STRING=local
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg

audio/audacity/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1589881433
+TIMESTAMP = 1593304211
-SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
+SHA256 (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099
-SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461
+SIZE (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = 61248430

audio/audacity/files/patch-cmake-proxies_CMakeLists.txt

@@ -1,7 +1,7 @@
---- cmake-proxies/CMakeLists.txt.orig	2020-05-19 09:43:53 UTC
+--- cmake-proxies/CMakeLists.txt.orig	2020-06-19 15:16:47 UTC
 +++ cmake-proxies/CMakeLists.txt
-@@ -150,7 +150,7 @@ addlib( lame               lame        LAME        YES
+@@ -132,7 +132,7 @@ addlib( expat              expat       EXPAT       YES
- addlib( lib-widget-extra   libextra    EXTRA       YES   YES   "" )
+ addlib( lame               lame        LAME        YES   YES   "lame >= 3.100" )
  addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
  addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
 -addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )

audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt

@@ -1,10 +0,0 @@
---- cmake-proxies/sbsms/CMakeLists.txt.orig	2020-05-19 09:43:53 UTC
-+++ cmake-proxies/sbsms/CMakeLists.txt
-@@ -28,6 +28,7 @@ list( APPEND INCLUDES
- list( APPEND OPTIONS
-    PRIVATE
-       $<$<C_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-enum-compare>
-+      ${SSE_FLAG}
- )
- 
- find_package( Threads )

audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h

@@ -1,6 +1,6 @@
 --- lib-src/libnyquist/nyquist/cmt/cext.h.orig	2018-10-01 14:07:33 UTC
 +++ lib-src/libnyquist/nyquist/cmt/cext.h
-@@ -58,7 +58,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
+@@ -61,7 +61,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
  #include <malloc.h>
  #endif
  

audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h

@@ -1,6 +1,6 @@
 --- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig	2016-07-26 13:34:06 UTC
 +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
-@@ -160,6 +160,15 @@ extern long ptrtoabs();
+@@ -161,6 +161,15 @@ extern long ptrtoabs();
  #endif
  #endif
  

audio/audacity/files/patch-src_AboutDialog.cpp

@@ -0,0 +1,11 @@
+--- src/AboutDialog.cpp.orig	2020-06-28 06:25:54 UTC
++++ src/AboutDialog.cpp
+@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.
+ // RevisionIdent.h may contain #defines like these ones:
+ //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
+ //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
+-#include <RevisionIdent.h>
++//#include <RevisionIdent.h>
+ 
+ #ifndef REV_TIME
+ #define REV_TIME "unknown date and time"

audio/audacity/files/patch-src_AudioIO.cpp

@@ -1,6 +1,6 @@
---- src/AudioIO.cpp.orig	2018-10-01 14:07:33 UTC
+--- src/AudioIO.cpp.orig	2020-06-19 15:16:47 UTC
 +++ src/AudioIO.cpp
-@@ -480,7 +480,6 @@ TimeTrack and AudioIOListener and whether the playback
+@@ -491,7 +491,6 @@ time warp info and AudioIOListener and whether the pla
     #define ROUND(x) (int) ((x)+0.5)
     //#include <string.h>
  //   #include "../lib-src/portmidi/pm_common/portmidi.h"
@@ -8,7 +8,7 @@
     #include "NoteTrack.h"
  #endif
  
-@@ -793,13 +797,22 @@ struct AudioIO::ScrubState (private)
+@@ -815,13 +814,22 @@ struct AudioIoCallback::ScrubState (private)
  // return the system time as a double
  static double streamStartTime = 0; // bias system time to small number
  

audio/audacity/files/patch-src_FFmpeg.h

@@ -1,6 +1,6 @@
 --- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
 +++ src/FFmpeg.h
-@@ -667,7 +667,7 @@ extern "C" {
+@@ -685,7 +685,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVOutputFormat*,
        av_oformat_next,
@@ -9,7 +9,7 @@
        (f)
     );
  #endif
-@@ -748,7 +748,7 @@ extern "C" {
+@@ -766,7 +766,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        int,
        av_fifo_size,
@@ -18,7 +18,7 @@
        (f)
     );
  #endif
-@@ -810,7 +810,7 @@ extern "C" {
+@@ -828,7 +828,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVDictionaryEntry *,
        av_dict_get,

audio/audacity/pkg-plist

@@ -3,6 +3,7 @@ man/man1/audacity.1.gz
 share/appdata/audacity.appdata.xml
 share/applications/audacity.desktop
 %%DATADIR%%/EQDefaultCurves.xml
+%%DATADIR%%/modules/mod-script-pipe.so
 %%DATADIR%%/nyquist/aud-do-support.lsp
 %%DATADIR%%/nyquist/dspprims.lsp
 %%DATADIR%%/nyquist/envelopes.lsp

audio/audiocd-kio/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591712611
+TIMESTAMP = 1594146933
-SHA256 (KDE/applications/20.04.2/audiocd-kio-20.04.2.tar.xz) = 99664af57b6bd0d51c28ff666323e6deb4959ae0b83e7061d517bbdfb211c894
+SHA256 (KDE/release-service/20.04.3/audiocd-kio-20.04.3.tar.xz) = af8782771a5d48fb2e3ba9703f8b8e542f5fddd418ca293d23a6eb83ebe86929
-SIZE (KDE/applications/20.04.2/audiocd-kio-20.04.2.tar.xz) = 489304
+SIZE (KDE/release-service/20.04.3/audiocd-kio-20.04.3.tar.xz) = 489356

audio/bambootracker/Makefile

@@ -3,7 +3,8 @@
 
 PORTNAME=	bambootracker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.3
+DISTVERSION=	0.4.3-11
+DISTVERSIONSUFFIX=	-g5e0e6ef
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/ehaupt:extras
 DISTFILES=	${PORTNAME}-extras-${EXTRASVERSION}${EXTRACT_SUFX}:extras
@@ -30,9 +31,37 @@ PORTEXAMPLES=	*
 
 EXTRASVERSION=	2
 
-OPTIONS_DEFINE=	EXAMPLES NLS
+OPTIONS_DEFINE=	ALSA EXAMPLES JACK NLS PULSEAUDIO
+OPTIONS_DEFAULT=PULSEAUDIO
+
+ALSA_DESC=	ALSA audio architecture support (EXPERIMENTAL)
+JACK_DESC=	JACK audio server support (EXPERIMENTAL)
+
 OPTIONS_SUB=	yes
 
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MALSA}
+QMAKE_ARGS+=	CONFIG+="use_alsa"
+.endif
+
+.if ${PORT_OPTIONS:MJACK}
+QMAKE_ARGS+=	CONFIG+="use_jack" \
+		CONFIG+="jack_has_rename"
+.endif
+
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+QMAKE_ARGS+=	CONFIG+="use_pulse"
+.endif
+
+.if (${OSVERSION} >= 1300096)
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-BambooTracker_BambooTracker.pro
+.endif
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons \
 		${STAGEDIR}${MANPREFIX}/man/fr.UTF-8/man1

audio/bambootracker/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1593364584
+TIMESTAMP = 1594033552
 SHA256 (bambootracker-extras-2.tar.gz) = 72f9994ea329bc6bd3f8855262209aa827b66f880e5734fc1486e9709546c9ce
 SIZE (bambootracker-extras-2.tar.gz) = 8321
-SHA256 (rerrahkr-BambooTracker-v0.4.3_GH0.tar.gz) = 4ae472ca130841cd0e2b8f89651d96f29a749c9fcda5573b687ff36cc8f3a164
+SHA256 (rerrahkr-BambooTracker-v0.4.3-11-g5e0e6ef_GH0.tar.gz) = 4bfa04e4239b785b4c8797ec33d63fd577b524ccaa6b4ae6374df80995a9f4e4
-SIZE (rerrahkr-BambooTracker-v0.4.3_GH0.tar.gz) = 3115081
+SIZE (rerrahkr-BambooTracker-v0.4.3-11-g5e0e6ef_GH0.tar.gz) = 3116086

audio/bambootracker/files/extrapatch-BambooTracker_BambooTracker.pro

@@ -0,0 +1,11 @@
+--- BambooTracker/BambooTracker.pro.orig	2020-06-28 12:11:07 UTC
++++ BambooTracker/BambooTracker.pro
+@@ -47,7 +47,7 @@ msvc {
+ }
+ else:if(gcc|clang) {
+   # Pedantic settings, warning -> error escalation and C standard specification
+-  CPPFLAGS += -Wall -Wextra -Werror -pedantic -pedantic-errors
++  CPPFLAGS += -Wall
+   QMAKE_CFLAGS += -std=gnu11
+ 
+   # Attempt to get the compiler version for version-specific handling

audio/bambootracker/files/patch-BambooTracker_midi_RtMidi_RtMidi.pri

@@ -1,8 +0,0 @@
---- BambooTracker/midi/RtMidi/RtMidi.pri.orig	2020-06-28 12:11:07 UTC
-+++ BambooTracker/midi/RtMidi/RtMidi.pri
-@@ -30,5 +30,3 @@ macx {
-     DEFINES += __MACOSX_CORE__
-     LIBS += -framework CoreMIDI -framework CoreAudio -framework CoreFoundation
- }
--
--DEFINES += __RTMIDI_DUMMY__

audio/beets/Makefile

@@ -25,7 +25,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}confuse>=1.0.0:devel/py-confuse@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 		${PY_ENUM34}
 
-USES=		python
+USES=		python:3.6+
 USE_PYTHON=	autoplist distutils optsuffix
 
 PLIST_FILES=	man/man1/beet.1.gz man/man5/beetsconfig.5.gz

audio/bsequencer-lv2/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bsequencer
-DISTVERSION=	1.4.2
+DISTVERSION=	1.6.0
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 

audio/bsequencer-lv2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1589707367
+TIMESTAMP = 1594111154
-SHA256 (sjaehn-BSEQuencer-1.4.2_GH0.tar.gz) = 8390a65d9cd6bfca8387c77d56a3c9190c6a535d0570c7027c742a7805a1ca9e
+SHA256 (sjaehn-BSEQuencer-1.6.0_GH0.tar.gz) = 60de4547e4718b089e99318c137dbfaa1771212ade879ed8e8cfda16a4c32891
-SIZE (sjaehn-BSEQuencer-1.4.2_GH0.tar.gz) = 1369792
+SIZE (sjaehn-BSEQuencer-1.6.0_GH0.tar.gz) = 1379994

audio/bsequencer-lv2/pkg-plist

@@ -16,6 +16,24 @@ lib/lv2/BSEQuencer.lv2/BSEQuencer_Arp_Basic_Up_Down_6.ttl
 lib/lv2/BSEQuencer.lv2/BSEQuencer_Arp_Basic_Up_Down_8.ttl
 lib/lv2/BSEQuencer.lv2/BSEQuencer_Arp_Moonlight.ttl
 lib/lv2/BSEQuencer.lv2/BSEQuencer_Arp_Pachelbels_Canon.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Disco_01.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Disco_02.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Disco_03.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Disco_04.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Disco_05.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Jazz_Swing_Cymbal_Beat_01.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_(1_16)_01.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_(1_4)_01.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_01.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_02.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_03.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_04.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_05.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_06.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Standard_Rock_07.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Techno_01.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Techno_02.ttl
+lib/lv2/BSEQuencer.lv2/BSEQuencer_DR_GM_Techno_03.ttl
 lib/lv2/BSEQuencer.lv2/BSEQuencer_GUI.so
 lib/lv2/BSEQuencer.lv2/DrumSymbol.png
 lib/lv2/BSEQuencer.lv2/EditSymbol.png

audio/cava/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	cava
 DISTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	tobik@FreeBSD.org

audio/chromaprint/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromaprint
-PORTVERSION=	1.4.3
+PORTVERSION=	1.5.0
-PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/acoustid/${PORTNAME}/releases/download/v${PORTVERSION}/
 
@@ -19,6 +18,7 @@ USES=		cmake compiler:c++11-lib pathfix
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_TOOLS:BOOL=true \
+		-DAUDIO_PROCESSOR_LIB=swresample \
 		-DFFT_LIB:STRING=avfft
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${PORTVERSION}
@@ -32,7 +32,7 @@ DOXYGEN_IMPLIES=	DOCS
 
 TEST_BUILD_DEPENDS=	${NONEXISTENT}:devel/googletest:patch
 TEST_CMAKE_BOOL=	BUILD_TESTS
-TEST_CMAKE_ON=		-DGTEST_ROOT:PATH=`${MAKE} -C ${PORTSDIR}/devel/googletest -VWRKSRC`
+TEST_CMAKE_ON=		-DGTEST_ROOT:PATH=`${MAKE} -C ${PORTSDIR}/devel/googletest -VWRKSRC`/googletest
 TEST_TARGET=		check
 
 do-build-DOXYGEN-on:

audio/chromaprint/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1518010171
+TIMESTAMP = 1593746197
-SHA256 (chromaprint-1.4.3.tar.gz) = ea18608b76fb88e0203b7d3e1833fb125ce9bb61efe22c6e169a50c52c457f82
+SHA256 (chromaprint-1.5.0.tar.gz) = 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a
-SIZE (chromaprint-1.4.3.tar.gz) = 613741
+SIZE (chromaprint-1.5.0.tar.gz) = 615217

audio/chromaprint/pkg-plist

@@ -2,5 +2,5 @@ bin/fpcalc
 include/chromaprint.h
 lib/libchromaprint.so
 lib/libchromaprint.so.1
-lib/libchromaprint.so.1.4.3
+lib/libchromaprint.so.1.5.0
 libdata/pkgconfig/libchromaprint.pc

audio/cmus/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	cmus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 
 MAINTAINER=	tobik@FreeBSD.org

audio/darkice/Makefile

@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	darkice
-PORTVERSION=	1.3
+PORTVERSION=	1.4
-PORTREVISION=	2
 CATEGORIES=	audio net
-MASTER_SITES=	SF
+MASTER_SITES=	https://github.com/rafael2k/darkice/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IceCast, IceCast2, and ShoutCast live audio streamer
@@ -14,17 +13,17 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig
+USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_prog_acx_pthread_config=no
 CONFIGURE_ARGS=	--without-alsa
+CONFIGURE_ENV=	ac_cv_prog_acx_pthread_config=no
 
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=		JACK PULSEAUDIO
+OPTIONS_DEFAULT=	VORBIS
 OPTIONS_MULTI=		CODEC
 OPTIONS_MULTI_CODEC=	AACPLUS FAAC LAME OPUS TWOLAME VORBIS
-OPTIONS_DEFAULT=	VORBIS
 
 AACPLUS_DESC=		AAC HEv2 and libsamplerate support
 AACPLUS_LIB_DEPENDS=	libaacplus.so:audio/libaacplus \

audio/darkice/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1475029544
+TIMESTAMP = 1592166243
-SHA256 (darkice-1.3.tar.gz) = 2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6
+SHA256 (darkice-1.4.tar.gz) = e6a8ec2b447cf5b4ffaf9b62700502b6bdacebf00b476f4e9bf9f9fe1e3dd817
-SIZE (darkice-1.3.tar.gz) = 371411
+SIZE (darkice-1.4.tar.gz) = 364782

audio/darkice/files/patch-darkice.cfg

@@ -0,0 +1,35 @@
+--- darkice.cfg.orig	2015-05-18 17:38:07 UTC
++++ darkice.cfg
+@@ -26,7 +26,9 @@ bitrate         = 96        # bitrate of the stream se
+ server          = yp.yourserver.com
+                             # host name of the server
+ port            = 8000      # port of the IceCast2 server, usually 8000
+-password        = hackme    # source password to the IceCast2 server
++# source password to the IceCast2 server
++password        = hackme
++# there must not be a comment following the password
+ mountPoint      = sample96  # mount point of this stream on the IceCast2 server
+ name            = DarkIce trial
+                             # name of the stream
+@@ -48,7 +50,9 @@ quality         = 0.8       # encoding quality
+ server          = yp.yourserver.com
+                             # host name of the server
+ port            = 8000      # port of the IceCast server, usually 8000
+-password        = hackme    # source password to the IceCast server
++# source password to the IceCast2 server
++password        = hackme
++# there must not be a comment following the password
+ mountPoint      = sample96  # mount point of this stream on the IceCast server
+ name            = DarkIce trial
+                             # name of the stream
+@@ -68,7 +72,9 @@ quality         = 0.5       # encoding quality
+ server          = yp.yourserver.com
+                             # host name of the server
+ port            = 8001      # source port of the ShoutCast server, usually 8001
+-password        = hackme    # source password to the ShoutCast server
++# source password to the IceCast2 server
++password        = hackme
++# there must not be a comment following the password
+ name            = DarkIce trial
+                             # name of the stream
+ url             = http://www.yourserver.com

audio/darkice/files/patch-src_FaacEncoder.cpp

@@ -1,13 +0,0 @@
---- src/FaacEncoder.cpp.orig	2015-05-18 17:38:07 UTC
-+++ src/FaacEncoder.cpp
-@@ -95,7 +95,9 @@ FaacEncoder :: open ( void )
-     faacConfig->useTns        = 1;
-     faacConfig->shortctl      = SHORTCTL_NORMAL;
-     faacConfig->useLfe        = 0;
--    faacConfig->allowMidside  = 1;
-+    //Do not set allowMidside for API compatibility with faac,
-+    //see https://github.com/knik0/faac/issues/8 for details
-+    //faacConfig->allowMidside  = 1;
-     faacConfig->bitRate       = getOutBitrate() * 1000 / getOutChannel();
-     faacConfig->bandWidth     = lowpass;
-     faacConfig->quantqual     = (unsigned long) (getOutQuality() * 1000.0);

audio/darkice/files/pkg-message.in

@@ -17,7 +17,7 @@ Then, it will be started on the next boot. If this line is already
 present, the client will be started now.  Otherwise, edit
 /etc/rc.conf and execute this command:
 
-    %%ETCDIR%%/rc.d/darkice start
+    %%PREFIX%%/etc/rc.d/darkice start
 EOM
 }
 ]