diff --git a/arabic/libreoffice/distinfo b/arabic/libreoffice/distinfo index 279a9623f0f..63a2bf32334 100644 --- a/arabic/libreoffice/distinfo +++ b/arabic/libreoffice/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1648747262 -SHA256 (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_langpack_ar.tar.gz) = dc66382d09c83a98987cb60fa784b77fae5f9e20db7fc0afdfc72dc69b23ed86 -SIZE (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_langpack_ar.tar.gz) = 1736388 -SHA256 (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_helppack_ar.tar.gz) = e067b68d5d68f6f6b64790c92cd95ae40336fdd5f5fb68560213a0b755023606 -SIZE (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_helppack_ar.tar.gz) = 2887174 +TIMESTAMP = 1651919824 +SHA256 (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_langpack_ar.tar.gz) = 9e043f747b614ca9bc76c2e07cafc56e6ced9377bd79cca7de2599257eea33b3 +SIZE (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_langpack_ar.tar.gz) = 1744456 +SHA256 (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_helppack_ar.tar.gz) = 4eebc23c03755c3a794fcd77f0e905bf1ec1a4381a18250384b49c7193e5cdef +SIZE (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_helppack_ar.tar.gz) = 2887194 diff --git a/astro/mkgmap/Makefile b/astro/mkgmap/Makefile index 0e98aba9881..418cf5638bd 100644 --- a/astro/mkgmap/Makefile +++ b/astro/mkgmap/Makefile @@ -1,5 +1,5 @@ PORTNAME= mkgmap -PORTVERSION= r4899 +PORTVERSION= r4900 CATEGORIES= astro converters java MASTER_SITES= https://www.mkgmap.org.uk/download/ diff --git a/astro/mkgmap/distinfo b/astro/mkgmap/distinfo index 6954ce4b715..53105591d7d 100644 --- a/astro/mkgmap/distinfo +++ b/astro/mkgmap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649679609 -SHA256 (mkgmap-r4899.tar.gz) = 28e869b0e4b9ef32b2f930a0f252397365657e9d70d2643fbd920d6d3797ecd6 -SIZE (mkgmap-r4899.tar.gz) = 3523071 +TIMESTAMP = 1651835702 +SHA256 (mkgmap-r4900.tar.gz) = c1749b65e779e6fc70df21c25b4f596b8b5b1bbf7797c533aa5134b76a657500 +SIZE (mkgmap-r4900.tar.gz) = 3523037 diff --git a/astro/siril/Makefile b/astro/siril/Makefile index c553aab720f..0253faae9c9 100644 --- a/astro/siril/Makefile +++ b/astro/siril/Makefile @@ -1,6 +1,5 @@ PORTNAME= siril -DISTVERSION= 0.99.10.1 -PORTREVISION= 7 +DISTVERSION= 1.0.1 CATEGORIES= astro graphics MASTER_SITES= https://free-astro.org/download/ @@ -35,7 +34,7 @@ USES= compiler:c++11-lang desktop-file-utils gettext \ gnome meson pkgconfig jpeg shared-mime-info tar:bz2 USE_GNOME= atk cairo gdkpixbuf2 gtk30 intltool pango -WRKSRC= ${WRKDIR}/${PORTNAME} +NO_WRKSUBDIR= yes BINARY_ALIAS= git=false diff --git a/astro/siril/distinfo b/astro/siril/distinfo index 6e25b403764..8ef2696086f 100644 --- a/astro/siril/distinfo +++ b/astro/siril/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625466648 -SHA256 (siril-0.99.10.1.tar.bz2) = a0b3debc1efb313a84958fb1819b3a5d0a1395b096db54cce7e3e34a463a5c79 -SIZE (siril-0.99.10.1.tar.bz2) = 2901634 +TIMESTAMP = 1651984466 +SHA256 (siril-1.0.1.tar.bz2) = 88bd69dfef04a61a38a9a5a1b0d7e69e2f45321ce6d9ef61a617d8a1a52671cc +SIZE (siril-1.0.1.tar.bz2) = 3486586 diff --git a/astro/siril/files/patch-meson.build b/astro/siril/files/patch-meson.build index 9318f2816d7..7880538b54e 100644 --- a/astro/siril/files/patch-meson.build +++ b/astro/siril/files/patch-meson.build @@ -1,10 +1,10 @@ ---- meson.build.orig 2020-09-22 20:01:48 UTC +--- meson.build.orig 2022-04-05 08:15:46 UTC +++ meson.build -@@ -123,6 +123,7 @@ if platform_linux - elif platform_bsd - siril_link_arg += '-rdynamic' - siril_link_arg += '-lexecinfo' -+ siril_link_arg += '-Wl,--no-as-needed' # workaround for https://gitlab.com/free-astro/siril/-/issues/614 (Bug#251206) - elif platform_windows - #TODO: Do Meson provide more elegant way? - siril_link_arg += '-Wl,--export-all-symbols' +@@ -138,6 +138,7 @@ elif platform_bsd + siril_link_arg += '-Wl,--no-as-needed' # workaround for https://gitlab.com/free-astro/siril/-/issues/614 (Bug#251206) + siril_link_arg += '-rdynamic' + siril_link_arg += '-lexecinfo' ++ siril_link_arg += '-Wl,--no-as-needed' # workaround for https://gitlab.com/free-astro/siril/-/issues/614 (Bug#251206) + elif platform_windows + #TODO: Do Meson provide more elegant way? + siril_link_arg += '-Wl,--export-all-symbols' diff --git a/astro/siril/pkg-plist b/astro/siril/pkg-plist index f37418282ea..ca9762314c4 100644 --- a/astro/siril/pkg-plist +++ b/astro/siril/pkg-plist @@ -29,7 +29,6 @@ share/mime/packages/siril.xml %%DATADIR%%/pixmaps/astrometry.svg %%DATADIR%%/pixmaps/astrometry_dark.svg %%DATADIR%%/pixmaps/b.svg -%%DATADIR%%/pixmaps/chain.svg %%DATADIR%%/pixmaps/cm.svg %%DATADIR%%/pixmaps/curve.svg %%DATADIR%%/pixmaps/export.svg @@ -47,6 +46,8 @@ share/mime/packages/siril.xml %%DATADIR%%/pixmaps/mtf.svg %%DATADIR%%/pixmaps/mtf_dark.svg %%DATADIR%%/pixmaps/neg.svg +%%DATADIR%%/pixmaps/photometry.svg +%%DATADIR%%/pixmaps/photometry_dark.svg %%DATADIR%%/pixmaps/r.svg %%DATADIR%%/pixmaps/rotate-acw.svg %%DATADIR%%/pixmaps/rotate-acw_dark.svg @@ -57,6 +58,10 @@ share/mime/packages/siril.xml %%DATADIR%%/pixmaps/starfinder_dark.svg %%DATADIR%%/pixmaps/sum.svg %%DATADIR%%/pixmaps/sum_dark.svg +%%DATADIR%%/pixmaps/tilt.svg +%%DATADIR%%/pixmaps/tilt_dark.svg +%%DATADIR%%/pixmaps/wcs-grid.svg +%%DATADIR%%/pixmaps/wcs-grid_dark.svg %%DATADIR%%/scripts/Mono_Preprocessing.ssf %%DATADIR%%/scripts/OSC_Extract_Ha.ssf %%DATADIR%%/scripts/OSC_Extract_HaOIII.ssf diff --git a/audio/aqualung/files/patch-configure b/audio/aqualung/files/patch-configure new file mode 100644 index 00000000000..9868a1bc3b4 --- /dev/null +++ b/audio/aqualung/files/patch-configure @@ -0,0 +1,46 @@ +--- configure.orig 2022-05-07 20:29:57 UTC ++++ configure +@@ -9665,12 +9665,12 @@ if test -n "$mad_CFLAGS"; then + pkg_cv_mad_CFLAGS="$mad_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mad") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "mad" 2>/dev/null` ++ pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "libmad" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -9682,12 +9682,12 @@ if test -n "$mad_LIBS"; then + pkg_cv_mad_LIBS="$mad_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mad") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "mad" 2>/dev/null` ++ pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "libmad" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -9708,9 +9708,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mad" 2>&1` ++ mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmad" 2>&1` + else +- mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mad" 2>&1` ++ mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmad" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$mad_PKG_ERRORS" >&5 diff --git a/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt b/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt new file mode 100644 index 00000000000..292e44f38c0 --- /dev/null +++ b/audio/audacity/files/patch-cmake-proxies_CMakeLists.txt @@ -0,0 +1,11 @@ +--- cmake-proxies/CMakeLists.txt.orig 2022-05-07 05:25:37 UTC ++++ cmake-proxies/CMakeLists.txt +@@ -103,7 +103,7 @@ add_conan_lib( + libmad + libmad/0.15.2b@audacity/stable + OPTION_NAME libmad +- PKG_CONFIG "mad >= 0.15.0b" # Ubuntu has broken PC file ++ PKG_CONFIG "libmad >= 0.15.0b" # Ubuntu has broken PC file + ) + + add_conan_lib( diff --git a/audio/cmus/files/patch-configure b/audio/cmus/files/patch-configure new file mode 100644 index 00000000000..ee957c751f7 --- /dev/null +++ b/audio/cmus/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2022-05-09 00:59:25 UTC ++++ configure +@@ -229,7 +229,7 @@ check_flac() + + check_mad() + { +- pkg_config MAD "mad" "" "-lmad -lm" ++ pkg_config MAD "libmad" "" "-lmad -lm" + return $? + } + diff --git a/audio/din/Makefile b/audio/din/Makefile index b32f9f06139..4890c11a5f4 100644 --- a/audio/din/Makefile +++ b/audio/din/Makefile @@ -1,5 +1,5 @@ PORTNAME= din -PORTVERSION= 53.1 +PORTVERSION= 54 CATEGORIES= audio MASTER_SITES= https://archive.org/download/dinisnoise_source_code/ diff --git a/audio/din/distinfo b/audio/din/distinfo index 85a9d9f02fa..9cf9d3d6d5b 100644 --- a/audio/din/distinfo +++ b/audio/din/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645857009 -SHA256 (din-53.1.tar.gz) = 5dfcecd490a7df8e4cc18ff0f4eabaf2b596d3b636621249be86dc5c52f07b0a -SIZE (din-53.1.tar.gz) = 3708022 +TIMESTAMP = 1651912709 +SHA256 (din-54.tar.gz) = b56ea9f45e206b8bb9f1451870c9a410872d93b47ac17652651fbaf1708df0b7 +SIZE (din-54.tar.gz) = 3710611 diff --git a/audio/ft2play/Makefile b/audio/ft2play/Makefile index f73c31d2d83..672e2b2ec5a 100644 --- a/audio/ft2play/Makefile +++ b/audio/ft2play/Makefile @@ -1,7 +1,7 @@ # Created by: Emanuel Haupt PORTNAME= ft2play -DISTVERSION= g20210124 +DISTVERSION= g20220407 CATEGORIES= audio MAINTAINER= ehaupt@FreeBSD.org @@ -14,7 +14,7 @@ USES= sdl USE_CSTD= c99 USE_GITHUB= yes GH_ACCOUNT= 8bitbubsy -GH_TAGNAME= 5730b16 +GH_TAGNAME= c2b7df5 USE_SDL= sdl2 CFLAGS+= -DAUDIODRIVER_SDL -DNDEBUG `sdl2-config --cflags` diff --git a/audio/ft2play/distinfo b/audio/ft2play/distinfo index 48924fc8035..39ec6cb4a73 100644 --- a/audio/ft2play/distinfo +++ b/audio/ft2play/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614426519 -SHA256 (8bitbubsy-ft2play-g20210124-5730b16_GH0.tar.gz) = ff6d4c8346e05037fcc5d6eac2613afa5dec1aa51bc3eabb81b8af22a648c9a1 -SIZE (8bitbubsy-ft2play-g20210124-5730b16_GH0.tar.gz) = 49574 +TIMESTAMP = 1651907003 +SHA256 (8bitbubsy-ft2play-g20220407-c2b7df5_GH0.tar.gz) = 69785a91c41eb2728a80464b92af2dc0e3968103c0ec137cacacee1f51740cde +SIZE (8bitbubsy-ft2play-g20220407-c2b7df5_GH0.tar.gz) = 49493 diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile index 0dcd86caca4..315c9a3f6cc 100644 --- a/audio/libid3tag/Makefile +++ b/audio/libid3tag/Makefile @@ -1,11 +1,8 @@ # Created by: Sergey Akifyev PORTNAME= libid3tag -PORTVERSION= 0.15.1b -PORTREVISION= 2 +DISTVERSION= 0.16.2 CATEGORIES= audio -MASTER_SITES= SF/mad/${PORTNAME}/${PORTVERSION} \ - ftp://ftp.mars.org/pub/mpeg/ MAINTAINER= ports@FreeBSD.org COMMENT= ID3 tags library (part of MAD project) @@ -13,25 +10,12 @@ COMMENT= ID3 tags library (part of MAD project) LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= cpe libtool pkgconfig -USE_LDCONFIG= yes - +USES= cmake cpe pathfix CPE_VENDOR= libid3tag_project -BUILD_DEPENDS= gsed:textproc/gsed +USE_GITHUB= yes +GH_ACCOUNT= tenacityteam -post-patch: - @${REINPLACE_CMD} -e '/genre.dat.in/s/sed -/g&/g' ${WRKSRC}/Makefile.in - -pre-build: - cd ${WRKSRC} && ${MAKE} ./genre.dat - -post-build: - cd ${WRKSRC} && CONFIG_FILES=id3tag.pc CONFIG_HEADERS= ${SH} ./config.status - -post-install: - ${INSTALL_DATA} ${WRKSRC}/id3tag.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ +USE_LDCONFIG= yes .include diff --git a/audio/libid3tag/distinfo b/audio/libid3tag/distinfo index 05610aed86a..3a4949dacec 100644 --- a/audio/libid3tag/distinfo +++ b/audio/libid3tag/distinfo @@ -1,2 +1,3 @@ -SHA256 (libid3tag-0.15.1b.tar.gz) = 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 -SIZE (libid3tag-0.15.1b.tar.gz) = 338143 +TIMESTAMP = 1651831328 +SHA256 (tenacityteam-libid3tag-0.16.2_GH0.tar.gz) = 96198b7c8803bcda44e299615e1929a85bd5a5da02e67ebc442735bc50018190 +SIZE (tenacityteam-libid3tag-0.16.2_GH0.tar.gz) = 53065 diff --git a/audio/libid3tag/files/patch-genre.dat b/audio/libid3tag/files/patch-genre.dat new file mode 100644 index 00000000000..3a7bda973d5 --- /dev/null +++ b/audio/libid3tag/files/patch-genre.dat @@ -0,0 +1,219 @@ +--- genre.dat.orig 2022-03-31 19:30:06 UTC ++++ genre.dat +@@ -23,7 +23,7 @@ + /* + * These are the ID3 genre names, taken as a combination of names from ID3v1 + * (listed in Appendix A of the ID3 tag version 2.4.0 informal standard) and +- * the extensions made by Winamp as of version 2.80. ++ * the extensions made by Winamp as of version 5.6. + */ + + /* ID3v1 names (0-79) */ +@@ -201,8 +201,8 @@ static id3_ucs4_t const genre_SWING[] = + { 'S', 'w', 'i', 'n', 'g', 0 }; + static id3_ucs4_t const genre_FAST_FUSION[] = + { 'F', 'a', 's', 't', '-', 'F', 'u', 's', 'i', 'o', 'n', 0 }; +-static id3_ucs4_t const genre_BEBOB[] = +- { 'B', 'e', 'b', 'o', 'b', 0 }; ++static id3_ucs4_t const genre_BEBOP[] = ++ { 'B', 'e', 'b', 'o', 'p', 0 }; + static id3_ucs4_t const genre_LATIN[] = + { 'L', 'a', 't', 'i', 'n', 0 }; + static id3_ucs4_t const genre_REVIVAL[] = +@@ -277,8 +277,8 @@ static id3_ucs4_t const genre_PUNK_ROCK[] = + { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 }; + static id3_ucs4_t const genre_DRUM_SOLO[] = + { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 }; +-static id3_ucs4_t const genre_A_CAPELLA[] = +- { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 }; ++static id3_ucs4_t const genre_A_CAPPELLA[] = ++ { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 }; + static id3_ucs4_t const genre_EURO_HOUSE[] = + { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 }; + static id3_ucs4_t const genre_DANCE_HALL[] = +@@ -289,8 +289,8 @@ static id3_ucs4_t const genre_DRUM___BASS[] = + { 'D', 'r', 'u', 'm', ' ', '&', ' ', 'B', 'a', 's', 's', 0 }; + static id3_ucs4_t const genre_CLUB_HOUSE[] = + { 'C', 'l', 'u', 'b', '-', 'H', 'o', 'u', 's', 'e', 0 }; +-static id3_ucs4_t const genre_HARDCORE[] = +- { 'H', 'a', 'r', 'd', 'c', 'o', 'r', 'e', 0 }; ++static id3_ucs4_t const genre_HARDCORE_TECHNO[] = ++ { 'H', 'a', 'r', 'd', 'c', 'o', 'r', 'e', ' ', 'T', 'e', 'c', 'h', 'n', 'o', 0 }; + static id3_ucs4_t const genre_TERROR[] = + { 'T', 'e', 'r', 'r', 'o', 'r', 0 }; + static id3_ucs4_t const genre_INDIE[] = +@@ -324,9 +324,97 @@ static id3_ucs4_t const genre_THRASH_METAL[] = + static id3_ucs4_t const genre_ANIME[] = + { 'A', 'n', 'i', 'm', 'e', 0 }; + static id3_ucs4_t const genre_JPOP[] = +- { 'J', 'P', 'o', 'p', 0 }; ++ { 'J', 'p', 'o', 'p', 0 }; + static id3_ucs4_t const genre_SYNTHPOP[] = + { 'S', 'y', 'n', 't', 'h', 'p', 'o', 'p', 0 }; ++static id3_ucs4_t const genre_ABSTRACT[] = ++ { 'A', 'b', 's', 't', 'r', 'a', 'c', 't', 0 }; ++static id3_ucs4_t const genre_ART_ROCK[] = ++ { 'A', 'r', 't', ' ', 'R', 'o', 'c', 'k', 0 }; ++static id3_ucs4_t const genre_BAROQUE[] = ++ { 'B', 'a', 'r', 'o', 'q', 'u', 'e', 0 }; ++static id3_ucs4_t const genre_BHANGRA[] = ++ { 'B', 'h', 'a', 'n', 'g', 'r', 'a', 0 }; ++static id3_ucs4_t const genre_BIG_BEAT[] = ++ { 'B', 'i', 'g', ' ', 'B', 'e', 'a', 't', 0 }; ++static id3_ucs4_t const genre_BREAKBEAT[] = ++ { 'B', 'r', 'e', 'a', 'k', 'b', 'e', 'a', 't', 0 }; ++static id3_ucs4_t const genre_CHILLOUT[] = ++ { 'C', 'h', 'i', 'l', 'l', 'o', 'u', 't', 0 }; ++static id3_ucs4_t const genre_DOWNTEMPO[] = ++ { 'D', 'o', 'w', 'n', 't', 'e', 'm', 'p', 'o', 0 }; ++static id3_ucs4_t const genre_DUB[] = ++ { 'D', 'u', 'b', 0 }; ++static id3_ucs4_t const genre_EBM[] = ++ { 'E', 'B', 'M', 0 }; ++static id3_ucs4_t const genre_ECLECTIC[] = ++ { 'E', 'c', 'l', 'e', 'c', 't', 'i', 'c', 0 }; ++static id3_ucs4_t const genre_ELECTRO[] = ++ { 'E', 'l', 'e', 'c', 't', 'r', 'o', 0 }; ++static id3_ucs4_t const genre_ELECTROCLASH[] = ++ { 'E', 'l', 'e', 'c', 't', 'r', 'o', 'c', 'l', 'a', 's', 'h', 0 }; ++static id3_ucs4_t const genre_EMO[] = ++ { 'E', 'm', 'o', 0 }; ++static id3_ucs4_t const genre_EXPERIMENTAL[] = ++ { 'E', 'x', 'p', 'e', 'r', 'i', 'm', 'e', 'n', 't', 'a', 'l', 0 }; ++static id3_ucs4_t const genre_GARAGE[] = ++ { 'G', 'a', 'r', 'a', 'g', 'e', 0 }; ++static id3_ucs4_t const genre_GLOBAL[] = ++ { 'G', 'l', 'o', 'b', 'a', 'l', 0 }; ++static id3_ucs4_t const genre_IDM[] = ++ { 'I', 'D', 'M', 0 }; ++static id3_ucs4_t const genre_ILLBIENT[] = ++ { 'I', 'l', 'l', 'b', 'i', 'e', 'n', 't', 0 }; ++static id3_ucs4_t const genre_INDUSTRO_GOTH[] = ++ { 'I', 'n', 'd', 'u', 's', 't', 'r', 'o', '-', 'G', 'o', 't', 'h', 0 }; ++static id3_ucs4_t const genre_JAM_BAND[] = ++ { 'J', 'a', 'm', ' ', 'B', 'a', 'n', 'd', 0 }; ++static id3_ucs4_t const genre_KRAUTROCK[] = ++ { 'K', 'r', 'a', 'u', 't', 'r', 'o', 'c', 'k', 0 }; ++static id3_ucs4_t const genre_LEFTFIELD[] = ++ { 'L', 'e', 'f', 't', 'f', 'i', 'e', 'l', 'd', 0 }; ++static id3_ucs4_t const genre_LOUNGE[] = ++ { 'L', 'o', 'u', 'n', 'g', 'e', 0 }; ++static id3_ucs4_t const genre_MATH_ROCK[] = ++ { 'M', 'a', 't', 'h', ' ', 'R', 'o', 'c', 'k', 0 }; ++static id3_ucs4_t const genre_NEW_ROMANTIC[] = ++ { 'N', 'e', 'w', ' ', 'R', 'o', 'm', 'a', 'n', 't', 'i', 'c', 0 }; ++static id3_ucs4_t const genre_NU_BREAKZ[] = ++ { 'N', 'u', '-', 'B', 'r', 'e', 'a', 'k', 'z', 0 }; ++static id3_ucs4_t const genre_POST_PUNK[] = ++ { 'P', 'o', 's', 't', '-', 'P', 'u', 'n', 'k', 0 }; ++static id3_ucs4_t const genre_POST_ROCK[] = ++ { 'P', 'o', 's', 't', '-', 'R', 'o', 'c', 'k', 0 }; ++static id3_ucs4_t const genre_PSYTRANCE[] = ++ { 'P', 's', 'y', 't', 'r', 'a', 'n', 'c', 'e', 0 }; ++static id3_ucs4_t const genre_SHOEGAZE[] = ++ { 'S', 'h', 'o', 'e', 'g', 'a', 'z', 'e', 0 }; ++static id3_ucs4_t const genre_SPACE_ROCK[] = ++ { 'S', 'p', 'a', 'c', 'e', ' ', 'R', 'o', 'c', 'k', 0 }; ++static id3_ucs4_t const genre_TROP_ROCK[] = ++ { 'T', 'r', 'o', 'p', ' ', 'R', 'o', 'c', 'k', 0 }; ++static id3_ucs4_t const genre_WORLD_MUSIC[] = ++ { 'W', 'o', 'r', 'l', 'd', ' ', 'M', 'u', 's', 'i', 'c', 0 }; ++static id3_ucs4_t const genre_NEOCLASSICAL[] = ++ { 'N', 'e', 'o', 'c', 'l', 'a', 's', 's', 'i', 'c', 'a', 'l', 0 }; ++static id3_ucs4_t const genre_AUDIOBOOK[] = ++ { 'A', 'u', 'd', 'i', 'o', 'b', 'o', 'o', 'k', 0 }; ++static id3_ucs4_t const genre_AUDIO_THEATRE[] = ++ { 'A', 'u', 'd', 'i', 'o', ' ', 'T', 'h', 'e', 'a', 't', 'r', 'e', 0 }; ++static id3_ucs4_t const genre_NEUE_DEUTSCHE_WELLE[] = ++ { 'N', 'e', 'u', 'e', ' ', 'D', 'e', 'u', 't', 's', 'c', 'h', 'e', ' ', 'W', 'e', 'l', 'l', 'e', 0 }; ++static id3_ucs4_t const genre_PODCAST[] = ++ { 'P', 'o', 'd', 'c', 'a', 's', 't', 0 }; ++static id3_ucs4_t const genre_INDIE_ROCK[] = ++ { 'I', 'n', 'd', 'i', 'e', '-', 'R', 'o', 'c', 'k', 0 }; ++static id3_ucs4_t const genre_G_FUNK[] = ++ { 'G', '-', 'F', 'u', 'n', 'k', 0 }; ++static id3_ucs4_t const genre_DUBSTEP[] = ++ { 'D', 'u', 'b', 's', 't', 'e', 'p', 0 }; ++static id3_ucs4_t const genre_GARAGE_ROCK[] = ++ { 'G', 'a', 'r', 'a', 'g', 'e', ' ', 'R', 'o', 'c', 'k', 0 }; ++static id3_ucs4_t const genre_PSYBIENT[] = ++ { 'P', 's', 'y', 'b', 'i', 'e', 'n', 't', 0 }; + + static id3_ucs4_t const *const genre_table[] = { + genre_BLUES, +@@ -414,7 +502,7 @@ static id3_ucs4_t const *const genre_table[] = { + genre_NATIONAL_FOLK, + genre_SWING, + genre_FAST_FUSION, +- genre_BEBOB, ++ genre_BEBOP, + genre_LATIN, + genre_REVIVAL, + genre_CELTIC, +@@ -452,13 +540,13 @@ static id3_ucs4_t const *const genre_table[] = { + genre_DUET, + genre_PUNK_ROCK, + genre_DRUM_SOLO, +- genre_A_CAPELLA, ++ genre_A_CAPPELLA, + genre_EURO_HOUSE, + genre_DANCE_HALL, + genre_GOA, + genre_DRUM___BASS, + genre_CLUB_HOUSE, +- genre_HARDCORE, ++ genre_HARDCORE_TECHNO, + genre_TERROR, + genre_INDIE, + genre_BRITPOP, +@@ -476,5 +564,49 @@ static id3_ucs4_t const *const genre_table[] = { + genre_THRASH_METAL, + genre_ANIME, + genre_JPOP, +- genre_SYNTHPOP ++ genre_SYNTHPOP, ++ genre_ABSTRACT, ++ genre_ART_ROCK, ++ genre_BAROQUE, ++ genre_BHANGRA, ++ genre_BIG_BEAT, ++ genre_BREAKBEAT, ++ genre_CHILLOUT, ++ genre_DOWNTEMPO, ++ genre_DUB, ++ genre_EBM, ++ genre_ECLECTIC, ++ genre_ELECTRO, ++ genre_ELECTROCLASH, ++ genre_EMO, ++ genre_EXPERIMENTAL, ++ genre_GARAGE, ++ genre_GLOBAL, ++ genre_IDM, ++ genre_ILLBIENT, ++ genre_INDUSTRO_GOTH, ++ genre_JAM_BAND, ++ genre_KRAUTROCK, ++ genre_LEFTFIELD, ++ genre_LOUNGE, ++ genre_MATH_ROCK, ++ genre_NEW_ROMANTIC, ++ genre_NU_BREAKZ, ++ genre_POST_PUNK, ++ genre_POST_ROCK, ++ genre_PSYTRANCE, ++ genre_SHOEGAZE, ++ genre_SPACE_ROCK, ++ genre_TROP_ROCK, ++ genre_WORLD_MUSIC, ++ genre_NEOCLASSICAL, ++ genre_AUDIOBOOK, ++ genre_AUDIO_THEATRE, ++ genre_NEUE_DEUTSCHE_WELLE, ++ genre_PODCAST, ++ genre_INDIE_ROCK, ++ genre_G_FUNK, ++ genre_DUBSTEP, ++ genre_GARAGE_ROCK, ++ genre_PSYBIENT + }; diff --git a/audio/libid3tag/files/patch-genre.dat.in b/audio/libid3tag/files/patch-genre.dat.in deleted file mode 100644 index abf2842ff90..00000000000 --- a/audio/libid3tag/files/patch-genre.dat.in +++ /dev/null @@ -1,80 +0,0 @@ ---- genre.dat.in.orig 2004-01-23 10:41:32.000000000 +0100 -+++ genre.dat.in 2020-01-12 22:50:01.267560000 +0100 -@@ -22,7 +22,7 @@ - /* - * These are the ID3 genre names, taken as a combination of names from ID3v1 - * (listed in Appendix A of the ID3 tag version 2.4.0 informal standard) and -- * the extensions made by Winamp as of version 2.80. -+ * the extensions made by Winamp as of version 5.6. - */ - - /* ID3v1 names (0-79) */ -@@ -115,7 +115,7 @@ - National Folk - Swing - Fast-Fusion --Bebob -+Bebop - Latin - Revival - Celtic -@@ -159,7 +159,7 @@ - Goa - Drum & Bass - Club-House --Hardcore -+Hardcore Techno - Terror - Indie - BritPop -@@ -176,5 +176,49 @@ - Salsa - Thrash Metal - Anime --JPop -+Jpop - Synthpop -+Abstract -+Art Rock -+Baroque -+Bhangra -+Big Beat -+Breakbeat -+Chillout -+Downtempo -+Dub -+EBM -+Eclectic -+Electro -+Electroclash -+Emo -+Experimental -+Garage -+Global -+IDM -+Illbient -+Industro-Goth -+Jam Band -+Krautrock -+Leftfield -+Lounge -+Math Rock -+New Romantic -+Nu-Breakz -+Post-Punk -+Post-Rock -+Psytrance -+Shoegaze -+Space Rock -+Trop Rock -+World Music -+Neoclassical -+Audiobook -+Audio Theatre -+Neue Deutsche Welle -+Podcast -+Indie-Rock -+G-Funk -+Dubstep -+Garage Rock -+Psybient diff --git a/audio/libid3tag/files/patch-id3tag.pc.in b/audio/libid3tag/files/patch-id3tag.pc.in deleted file mode 100644 index f89fa4b7dfd..00000000000 --- a/audio/libid3tag/files/patch-id3tag.pc.in +++ /dev/null @@ -1,13 +0,0 @@ ---- id3tag.pc.in.orig 2016-07-26 15:08:54 UTC -+++ id3tag.pc.in -@@ -0,0 +1,10 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: ID3TAG -+Description: libid3tag - ID3 tag manipulation library -+Version: @VERSION@ -+Libs: -L${libdir} -lid3tag -lz -+Cflags: diff --git a/audio/libid3tag/pkg-plist b/audio/libid3tag/pkg-plist index f87705bdce1..5e600520f61 100644 --- a/audio/libid3tag/pkg-plist +++ b/audio/libid3tag/pkg-plist @@ -1,6 +1,8 @@ include/id3tag.h -lib/libid3tag.a +lib/cmake/id3tag/id3tagConfig.cmake +lib/cmake/id3tag/id3tagConfigVersion.cmake +lib/cmake/id3tag/id3tagTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/id3tag/id3tagTargets.cmake lib/libid3tag.so -lib/libid3tag.so.0 -lib/libid3tag.so.0.3.0 +lib/libid3tag.so.0.16.2 libdata/pkgconfig/id3tag.pc diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile index 8eec6b24bf3..9d5d6fe91a5 100644 --- a/audio/libmad/Makefile +++ b/audio/libmad/Makefile @@ -1,35 +1,25 @@ # Created by: Sergey Akifyev PORTNAME= libmad -PORTVERSION= 0.15.1b -PORTREVISION= 7 +DISTVERSION= 0.16.0 CATEGORIES= audio -MASTER_SITES= SF/mad/${PORTNAME}/${PORTVERSION} + +PATCH_SITES= https://github.com/tenacityteam/libmad/commit/ +PATCHFILES= c2eb5e1a728c973ea3f957d4cb6e04d77f745568.patch:-p1 \ + a8ca654e3666f442805d93722290bb218b633428.patch:-p1 MAINTAINER= sunpoet@FreeBSD.org COMMENT= Libmad library (part of MAD project) LICENSE= GPLv2 -USES= cpe libtool - -CONFIGURE_ARGS= --disable-debugging --enable-sso -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes - -SUB_LIST= VERSION=${PORTVERSION} -SUB_FILES= mad.pc - +USES= cmake cpe pathfix CPE_VENDOR= underbit -OPTIONS_DEFINE= SPEED -SPEED_DESC= Optimize for speed over accuracy +USE_GITHUB= yes +GH_ACCOUNT= tenacityteam +GH_TAGNAME= 15d1ef05 -SPEED_CONFIGURE_ON= --enable-speed -SPEED_CONFIGURE_OFF= --enable-accuracy - -post-install: - ${INSTALL_DATA} ${WRKDIR}/mad.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ +USE_LDCONFIG= yes .include diff --git a/audio/libmad/distinfo b/audio/libmad/distinfo index 45ba3689d2e..72b5f612ddc 100644 --- a/audio/libmad/distinfo +++ b/audio/libmad/distinfo @@ -1,2 +1,7 @@ -SHA256 (libmad-0.15.1b.tar.gz) = bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 -SIZE (libmad-0.15.1b.tar.gz) = 502379 +TIMESTAMP = 1648676242 +SHA256 (tenacityteam-libmad-0.16.0-15d1ef05_GH0.tar.gz) = e380ee75784732cbf619c44df10418d652a30134f24e40b41d44b59b0a9f5579 +SIZE (tenacityteam-libmad-0.16.0-15d1ef05_GH0.tar.gz) = 213534 +SHA256 (c2eb5e1a728c973ea3f957d4cb6e04d77f745568.patch) = 6bc3b4656686801cbc526554226594361ddf97a6334eaadcb4765efd1c0ed916 +SIZE (c2eb5e1a728c973ea3f957d4cb6e04d77f745568.patch) = 972 +SHA256 (a8ca654e3666f442805d93722290bb218b633428.patch) = c15bf57d20090bd13a1749454ca987f47262136c4ae4781914062247b376a7df +SIZE (a8ca654e3666f442805d93722290bb218b633428.patch) = 814 diff --git a/audio/libmad/files/mad.pc.in b/audio/libmad/files/mad.pc.in deleted file mode 100644 index a7689a62dee..00000000000 --- a/audio/libmad/files/mad.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%%PREFIX%% -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: mad -Description: MPEG Audio Decoder -Requires: -Version: %%VERSION%% -Libs: -L${libdir} -lmad -lm -Cflags: -I${includedir} diff --git a/audio/libmad/files/patch-configure b/audio/libmad/files/patch-configure deleted file mode 100644 index 5d5c3f1563f..00000000000 --- a/audio/libmad/files/patch-configure +++ /dev/null @@ -1,40 +0,0 @@ ---- configure.orig 2004-02-05 09:34:07 UTC -+++ configure -@@ -19096,24 +19096,30 @@ then - esac - fi - -+ if $CC -v 2>&1 | grep clang > /dev/null; then -+ CLANG=yes -+ else -+ CLANG=no -+ fi -+ - case "$optimize" in - -O|"-O "*) - optimize="-O" -- optimize="$optimize -fforce-mem" -- optimize="$optimize -fforce-addr" -+ optimize="$optimize" -+ test $CLANG = no && optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" -- optimize="$optimize -fthread-jumps" -- optimize="$optimize -fcse-follow-jumps" -- optimize="$optimize -fcse-skip-blocks" -+ test $CLANG = no && optimize="$optimize -fthread-jumps" -+ test $CLANG = no && optimize="$optimize -fcse-follow-jumps" -+ test $CLANG = no && optimize="$optimize -fcse-skip-blocks" - : #x optimize="$optimize -frerun-cse-after-loop" - : #x optimize="$optimize -frerun-loop-opt" - : #x optimize="$optimize -fgcse" - optimize="$optimize -fexpensive-optimizations" -- optimize="$optimize -fregmove" -+ test $CLANG = no && optimize="$optimize -fregmove" - : #* optimize="$optimize -fdelayed-branch" - : #x optimize="$optimize -fschedule-insns" -- optimize="$optimize -fschedule-insns2" -+ test $CLANG = no && optimize="$optimize -fschedule-insns2" - : #? optimize="$optimize -ffunction-sections" - : #? optimize="$optimize -fcaller-saves" - : #> optimize="$optimize -funroll-loops" diff --git a/audio/libmad/files/patch-layer12.c b/audio/libmad/files/patch-layer12.c deleted file mode 100644 index 27e572259ff..00000000000 --- a/audio/libmad/files/patch-layer12.c +++ /dev/null @@ -1,175 +0,0 @@ -Obtained from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=508133#15 - ---- layer12.c.orig 2004-02-05 09:02:39 UTC -+++ layer12.c -@@ -134,6 +134,12 @@ int mad_layer_I(struct mad_stream *strea - for (sb = 0; sb < bound; ++sb) { - for (ch = 0; ch < nch; ++ch) { - nb = mad_bit_read(&stream->ptr, 4); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - - if (nb == 15) { - stream->error = MAD_ERROR_BADBITALLOC; -@@ -146,6 +152,12 @@ int mad_layer_I(struct mad_stream *strea - - for (sb = bound; sb < 32; ++sb) { - nb = mad_bit_read(&stream->ptr, 4); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - - if (nb == 15) { - stream->error = MAD_ERROR_BADBITALLOC; -@@ -162,6 +174,12 @@ int mad_layer_I(struct mad_stream *strea - for (ch = 0; ch < nch; ++ch) { - if (allocation[ch][sb]) { - scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - - # if defined(OPT_STRICT) - /* -@@ -187,6 +205,12 @@ int mad_layer_I(struct mad_stream *strea - frame->sbsample[ch][s][sb] = nb ? - mad_f_mul(I_sample(&stream->ptr, nb), - sf_table[scalefactor[ch][sb]]) : 0; -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - } - } - -@@ -195,6 +219,12 @@ int mad_layer_I(struct mad_stream *strea - mad_fixed_t sample; - - sample = I_sample(&stream->ptr, nb); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - - for (ch = 0; ch < nch; ++ch) { - frame->sbsample[ch][s][sb] = -@@ -403,7 +433,15 @@ int mad_layer_II(struct mad_stream *stre - nbal = bitalloc_table[offsets[sb]].nbal; - - for (ch = 0; ch < nch; ++ch) -+ { - allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } -+ } - } - - for (sb = bound; sb < sblimit; ++sb) { -@@ -411,6 +449,13 @@ int mad_layer_II(struct mad_stream *stre - - allocation[0][sb] = - allocation[1][sb] = mad_bit_read(&stream->ptr, nbal); -+ -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - } - - /* decode scalefactor selection info */ -@@ -419,6 +464,12 @@ int mad_layer_II(struct mad_stream *stre - for (ch = 0; ch < nch; ++ch) { - if (allocation[ch][sb]) - scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - } - } - -@@ -442,6 +493,12 @@ int mad_layer_II(struct mad_stream *stre - for (ch = 0; ch < nch; ++ch) { - if (allocation[ch][sb]) { - scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - - switch (scfsi[ch][sb]) { - case 2: -@@ -452,11 +509,23 @@ int mad_layer_II(struct mad_stream *stre - - case 0: - scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - /* fall through */ - - case 1: - case 3: - scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - } - - if (scfsi[ch][sb] & 1) -@@ -488,6 +557,12 @@ int mad_layer_II(struct mad_stream *stre - index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1]; - - II_samples(&stream->ptr, &qc_table[index], samples); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - - for (s = 0; s < 3; ++s) { - frame->sbsample[ch][3 * gr + s][sb] = -@@ -506,6 +581,12 @@ int mad_layer_II(struct mad_stream *stre - index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1]; - - II_samples(&stream->ptr, &qc_table[index], samples); -+ if (mad_bit_nextbyte(&stream->ptr) > stream->next_frame) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - - for (ch = 0; ch < nch; ++ch) { - for (s = 0; s < 3; ++s) { diff --git a/audio/libmad/files/patch-layer3.c b/audio/libmad/files/patch-layer3.c deleted file mode 100644 index 5f7455f5382..00000000000 --- a/audio/libmad/files/patch-layer3.c +++ /dev/null @@ -1,17 +0,0 @@ -Obtained from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=508133#15 - ---- layer3.c.orig 2004-01-23 09:41:32 UTC -+++ layer3.c -@@ -2608,6 +2608,12 @@ int mad_layer_III(struct mad_stream *str - next_md_begin = 0; - - md_len = si.main_data_begin + frame_space - next_md_begin; -+ if (md_len + MAD_BUFFER_GUARD > MAD_BUFFER_MDLEN) -+ { -+ stream->error = MAD_ERROR_LOSTSYNC; -+ stream->sync = 0; -+ return -1; -+ } - - frame_used = 0; - diff --git a/audio/libmad/pkg-plist b/audio/libmad/pkg-plist index 5df894177e6..bd16846cadd 100644 --- a/audio/libmad/pkg-plist +++ b/audio/libmad/pkg-plist @@ -1,6 +1,8 @@ include/mad.h -lib/libmad.a +lib/cmake/mad/madConfig.cmake +lib/cmake/mad/madConfigVersion.cmake +lib/cmake/mad/madTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/mad/madTargets.cmake lib/libmad.so -lib/libmad.so.0 -lib/libmad.so.0.2.1 -libdata/pkgconfig/mad.pc +lib/libmad.so.0.16.0 +libdata/pkgconfig/libmad.pc diff --git a/audio/ocp/files/patch-configure b/audio/ocp/files/patch-configure new file mode 100644 index 00000000000..95716fbbddf --- /dev/null +++ b/audio/ocp/files/patch-configure @@ -0,0 +1,46 @@ +--- configure.orig 2022-05-08 19:20:04 UTC ++++ configure +@@ -8815,12 +8815,12 @@ if test -n "$MAD_CFLAGS"; then + pkg_cv_MAD_CFLAGS="$MAD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mad") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_MAD_CFLAGS=`$PKG_CONFIG --cflags "mad" 2>/dev/null` ++ pkg_cv_MAD_CFLAGS=`$PKG_CONFIG --cflags "libmad" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -8832,12 +8832,12 @@ if test -n "$MAD_LIBS"; then + pkg_cv_MAD_LIBS="$MAD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mad") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmad") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_MAD_LIBS=`$PKG_CONFIG --libs "mad" 2>/dev/null` ++ pkg_cv_MAD_LIBS=`$PKG_CONFIG --libs "libmad" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -8858,9 +8858,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mad" 2>&1` ++ MAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmad" 2>&1` + else +- MAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mad" 2>&1` ++ MAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmad" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MAD_PKG_ERRORS" >&5 diff --git a/audio/py-music21/Makefile b/audio/py-music21/Makefile index d387272f1a3..7f70b546a17 100644 --- a/audio/py-music21/Makefile +++ b/audio/py-music21/Makefile @@ -1,5 +1,5 @@ PORTNAME= music21 -DISTVERSION= 7.1.0 +DISTVERSION= 7.3.3 CATEGORIES= audio python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +17,6 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}jsonpickle>0:devel/py-jsonpickle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webcolors>=1.5:graphics/py-webcolors@${PY_FLAVOR} \ lilypond:print/lilypond \ mscore:audio/musescore \ diff --git a/audio/py-music21/distinfo b/audio/py-music21/distinfo index 9074b23aac4..8a88dd867f3 100644 --- a/audio/py-music21/distinfo +++ b/audio/py-music21/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631607228 -SHA256 (music21-7.1.0.tar.gz) = 06315c8f2a34b52011842a81c089826d55374ec09f358dabc73da58a518b629f -SIZE (music21-7.1.0.tar.gz) = 19218411 +TIMESTAMP = 1652160264 +SHA256 (music21-7.3.3.tar.gz) = b081132c61c6895854dd62e0eb838d6eae392b2f22f66c9f5d96f44e6a1a1d01 +SIZE (music21-7.3.3.tar.gz) = 19272318 diff --git a/audio/qtractor/files/patch-CMakeLists.txt b/audio/qtractor/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..09b05e59d8d --- /dev/null +++ b/audio/qtractor/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2022-05-08 05:23:35 UTC ++++ CMakeLists.txt +@@ -378,7 +378,7 @@ endif () + + # Check for MAD libraries. + if (CONFIG_LIBMAD) +- pkg_check_modules (MAD IMPORTED_TARGET mad) ++ pkg_check_modules (MAD IMPORTED_TARGET libmad) + if (NOT MAD_FOUND) + message (WARNING "*** MAD library not found.") + set (CONFIG_LIBMAD 0) diff --git a/audio/schismtracker/Makefile b/audio/schismtracker/Makefile index fa33cc47b35..89336c123af 100644 --- a/audio/schismtracker/Makefile +++ b/audio/schismtracker/Makefile @@ -1,7 +1,7 @@ # Created by: Emanuel Haupt PORTNAME= schismtracker -PORTVERSION= 20220125 +PORTVERSION= 20220506 CATEGORIES= audio MAINTAINER= ehaupt@FreeBSD.org diff --git a/audio/schismtracker/distinfo b/audio/schismtracker/distinfo index c072f48e8d3..587d34fe44e 100644 --- a/audio/schismtracker/distinfo +++ b/audio/schismtracker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643138605 -SHA256 (schismtracker-schismtracker-20220125_GH0.tar.gz) = c803e1680d86a7eeb84c50488d20a143d3bf105cea04e0460ef9376d96618810 -SIZE (schismtracker-schismtracker-20220125_GH0.tar.gz) = 1309919 +TIMESTAMP = 1651867534 +SHA256 (schismtracker-schismtracker-20220506_GH0.tar.gz) = 1a537a8db2ec15f289946dbbb61b7509e3a72e10777de0f5fc7ca3591b36b238 +SIZE (schismtracker-schismtracker-20220506_GH0.tar.gz) = 1310121 diff --git a/audio/sonic-visualiser/files/patch-configure.ac b/audio/sonic-visualiser/files/patch-configure.ac index ff972828244..3efda3765b3 100644 --- a/audio/sonic-visualiser/files/patch-configure.ac +++ b/audio/sonic-visualiser/files/patch-configure.ac @@ -1,6 +1,11 @@ --- configure.ac.orig 2019-12-10 09:29:11 UTC +++ configure.ac -@@ -127,8 +127,8 @@ SV_MODULE_REQUIRED([mad],[mad >= 0.15.0],[mad.h],[mad] +@@ -123,12 +123,12 @@ SV_MODULE_OPTIONAL([libpulse],[libpulse >= 0.9],[pulse + SV_MODULE_REQUIRED([lrdf],[lrdf >= 0.2],[lrdf.h],[lrdf],[lrdf_init]) + SV_MODULE_REQUIRED([oggz],[oggz >= 1.0.0],[oggz/oggz.h],[oggz],[oggz_run]) + SV_MODULE_REQUIRED([fishsound],[fishsound >= 1.0.0],[fishsound/fishsound.h],[fishsound],[fish_sound_new]) +-SV_MODULE_REQUIRED([mad],[mad >= 0.15.0],[mad.h],[mad],[mad_decoder_init]) ++SV_MODULE_REQUIRED([mad],[libmad >= 0.15.0],[mad.h],[mad],[mad_decoder_init]) SV_MODULE_REQUIRED([id3tag],[id3tag >= 0.15.0],[id3tag.h],[id3tag],[id3_tag_new]) SV_MODULE_REQUIRED([opus],[opusfile],[opus/opusfile.h],[opusfile],[op_read_float]) diff --git a/audio/surge-synthesizer-lv2/Makefile b/audio/surge-synthesizer-lv2/Makefile index 67640befb2e..e9ba05a6239 100644 --- a/audio/surge-synthesizer-lv2/Makefile +++ b/audio/surge-synthesizer-lv2/Makefile @@ -52,7 +52,7 @@ LDFLAGS+= -lexecinfo BINARY_ALIAS= python=${PYTHON_CMD} # git=false -PORTSCOUT= limit:^\d+\. # prevent alpha-numeric strings +PORTSCOUT= ignore:1 post-patch: @${REINPLACE_CMD} -e 's|"/usr/share/Surge/"|"${DATADIR}/"|' ${WRKSRC}/src/common/SurgeStorage.cpp diff --git a/audio/surge-synthesizer-xt-lv2/Makefile b/audio/surge-synthesizer-xt-lv2/Makefile index 40fafeb79fc..cbe2e152c3c 100644 --- a/audio/surge-synthesizer-xt-lv2/Makefile +++ b/audio/surge-synthesizer-xt-lv2/Makefile @@ -58,4 +58,6 @@ GH_TUPLE= surge-synthesizer:tuning-library:bdb107f58ea22720bfa2a6d7a910fc77e69d7 BINARY_ALIAS= python=${PYTHON_CMD} +PORTSCOUT= ignore:1 # conflicts with old-gen audio/surge-synthesizer-lv2 + .include diff --git a/benchmarks/inferno/Makefile b/benchmarks/inferno/Makefile index 92f4c79a726..79d8decb6ff 100644 --- a/benchmarks/inferno/Makefile +++ b/benchmarks/inferno/Makefile @@ -1,7 +1,6 @@ PORTNAME= inferno DISTVERSIONPREFIX= v -DISTVERSION= 0.11.2 -PORTREVISION= 1 +DISTVERSION= 0.11.3 CATEGORIES= benchmarks MAINTAINER= yuri@FreeBSD.org @@ -29,9 +28,9 @@ CARGO_CRATES= adler32-1.2.0 \ cast-0.2.7 \ cfg-if-1.0.0 \ clap-2.34.0 \ - clap-3.1.12 \ + clap-3.1.17 \ clap_derive-3.1.7 \ - clap_lex-0.1.1 \ + clap_lex-0.2.0 \ crc32fast-1.3.2 \ criterion-0.3.5 \ criterion-plot-0.4.4 \ @@ -42,7 +41,7 @@ CARGO_CRATES= adler32-1.2.0 \ csv-1.1.6 \ csv-core-0.1.10 \ ctor-0.1.22 \ - dashmap-5.2.0 \ + dashmap-5.3.3 \ diff-0.1.12 \ difflib-0.4.0 \ doc-comment-0.3.3 \ @@ -51,6 +50,7 @@ CARGO_CRATES= adler32-1.2.0 \ getrandom-0.2.6 \ half-1.8.2 \ hashbrown-0.11.2 \ + hashbrown-0.12.1 \ heck-0.4.0 \ hermit-abi-0.1.19 \ indexmap-1.8.1 \ @@ -59,24 +59,22 @@ CARGO_CRATES= adler32-1.2.0 \ itoa-1.0.1 \ js-sys-0.3.57 \ lazy_static-1.4.0 \ - libc-0.2.124 \ + libc-0.2.125 \ libflate-1.2.0 \ libflate_lz77-1.1.0 \ lock_api-0.4.7 \ - log-0.4.16 \ + log-0.4.17 \ maplit-1.0.2 \ - memchr-2.4.1 \ + memchr-2.5.0 \ memoffset-0.6.5 \ nodrop-0.1.14 \ num-format-0.4.0 \ - num-traits-0.2.14 \ + num-traits-0.2.15 \ num_cpus-1.13.1 \ once_cell-1.10.0 \ oorandom-11.1.3 \ os_str_bytes-6.0.0 \ output_vt100-0.1.3 \ - parking_lot-0.12.0 \ - parking_lot_core-0.9.2 \ plotters-0.3.1 \ plotters-backend-0.3.2 \ plotters-svg-0.3.1 \ @@ -87,7 +85,7 @@ CARGO_CRATES= adler32-1.2.0 \ pretty_assertions-1.2.1 \ proc-macro-error-1.0.4 \ proc-macro-error-attr-1.0.4 \ - proc-macro2-1.0.37 \ + proc-macro2-1.0.38 \ quick-xml-0.22.0 \ quote-1.0.18 \ rand-0.8.5 \ @@ -95,7 +93,6 @@ CARGO_CRATES= adler32-1.2.0 \ rand_core-0.6.3 \ rayon-1.5.2 \ rayon-core-1.9.2 \ - redox_syscall-0.2.13 \ regex-1.5.5 \ regex-automata-0.1.10 \ regex-syntax-0.6.25 \ @@ -105,15 +102,14 @@ CARGO_CRATES= adler32-1.2.0 \ ryu-1.0.9 \ same-file-1.0.6 \ scopeguard-1.1.0 \ - semver-1.0.7 \ - serde-1.0.136 \ + semver-1.0.9 \ + serde-1.0.137 \ serde_cbor-0.11.2 \ - serde_derive-1.0.136 \ - serde_json-1.0.79 \ - smallvec-1.8.0 \ + serde_derive-1.0.137 \ + serde_json-1.0.81 \ str_stack-0.1.0 \ strsim-0.10.0 \ - syn-1.0.91 \ + syn-1.0.92 \ termcolor-1.1.3 \ termtree-0.2.4 \ testing_logger-0.1.1 \ @@ -121,7 +117,7 @@ CARGO_CRATES= adler32-1.2.0 \ textwrap-0.15.0 \ tinytemplate-1.2.1 \ unicode-width-0.1.9 \ - unicode-xid-0.2.2 \ + unicode-xid-0.2.3 \ version_check-0.9.4 \ wait-timeout-0.2.0 \ walkdir-2.3.2 \ @@ -135,13 +131,7 @@ CARGO_CRATES= adler32-1.2.0 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.5 \ - winapi-x86_64-pc-windows-gnu-0.4.0 \ - windows-sys-0.34.0 \ - windows_aarch64_msvc-0.34.0 \ - windows_i686_gnu-0.34.0 \ - windows_i686_msvc-0.34.0 \ - windows_x86_64_gnu-0.34.0 \ - windows_x86_64_msvc-0.34.0 + winapi-x86_64-pc-windows-gnu-0.4.0 EXECUTABLES= inferno-collapse-dtrace \ inferno-collapse-guess \ inferno-collapse-perf \ diff --git a/benchmarks/inferno/distinfo b/benchmarks/inferno/distinfo index 94bd592e8f6..833ea018a0c 100644 --- a/benchmarks/inferno/distinfo +++ b/benchmarks/inferno/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1650914024 +TIMESTAMP = 1652132491 SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234 SIZE (rust/crates/adler32-1.2.0.crate) = 6411 SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 @@ -27,12 +27,12 @@ SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582eb SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 SHA256 (rust/crates/clap-2.34.0.crate) = a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c SIZE (rust/crates/clap-2.34.0.crate) = 202210 -SHA256 (rust/crates/clap-3.1.12.crate) = 7c167e37342afc5f33fd87bbc870cedd020d2a6dffa05d45ccd9241fbdd146db -SIZE (rust/crates/clap-3.1.12.crate) = 206752 +SHA256 (rust/crates/clap-3.1.17.crate) = 47582c09be7c8b32c0ab3a6181825ababb713fde6fff20fc573a3870dd45c6a0 +SIZE (rust/crates/clap-3.1.17.crate) = 209176 SHA256 (rust/crates/clap_derive-3.1.7.crate) = a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1 SIZE (rust/crates/clap_derive-3.1.7.crate) = 25363 -SHA256 (rust/crates/clap_lex-0.1.1.crate) = 189ddd3b5d32a70b35e7686054371742a937b0d99128e76dde6340210e966669 -SIZE (rust/crates/clap_lex-0.1.1.crate) = 9603 +SHA256 (rust/crates/clap_lex-0.2.0.crate) = a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213 +SIZE (rust/crates/clap_lex-0.2.0.crate) = 9581 SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661 SHA256 (rust/crates/criterion-0.3.5.crate) = 1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10 @@ -53,8 +53,8 @@ SHA256 (rust/crates/csv-core-0.1.10.crate) = 2b2466559f260f48ad25fe6317b3c8dac77 SIZE (rust/crates/csv-core-0.1.10.crate) = 25668 SHA256 (rust/crates/ctor-0.1.22.crate) = f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c SIZE (rust/crates/ctor-0.1.22.crate) = 9311 -SHA256 (rust/crates/dashmap-5.2.0.crate) = 4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c -SIZE (rust/crates/dashmap-5.2.0.crate) = 20221 +SHA256 (rust/crates/dashmap-5.3.3.crate) = 391b56fbd302e585b7a9494fb70e40949567b1cf9003a8e4a6041a1687c26573 +SIZE (rust/crates/dashmap-5.3.3.crate) = 21183 SHA256 (rust/crates/diff-0.1.12.crate) = 0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499 SIZE (rust/crates/diff-0.1.12.crate) = 10223 SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8 @@ -71,6 +71,8 @@ SHA256 (rust/crates/half-1.8.2.crate) = eabb4a44450da02c90444cf74558da904edde8fb SIZE (rust/crates/half-1.8.2.crate) = 41874 SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713 +SHA256 (rust/crates/hashbrown-0.12.1.crate) = db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3 +SIZE (rust/crates/hashbrown-0.12.1.crate) = 90855 SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9 SIZE (rust/crates/heck-0.4.0.crate) = 11161 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 @@ -87,28 +89,28 @@ SHA256 (rust/crates/js-sys-0.3.57.crate) = 671a26f820db17c2a2750743f1dd03bafd15b SIZE (rust/crates/js-sys-0.3.57.crate) = 78605 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 -SHA256 (rust/crates/libc-0.2.124.crate) = 21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50 -SIZE (rust/crates/libc-0.2.124.crate) = 577742 +SHA256 (rust/crates/libc-0.2.125.crate) = 5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b +SIZE (rust/crates/libc-0.2.125.crate) = 589236 SHA256 (rust/crates/libflate-1.2.0.crate) = 05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093 SIZE (rust/crates/libflate-1.2.0.crate) = 40864 SHA256 (rust/crates/libflate_lz77-1.1.0.crate) = 39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a SIZE (rust/crates/libflate_lz77-1.1.0.crate) = 5729 SHA256 (rust/crates/lock_api-0.4.7.crate) = 327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53 SIZE (rust/crates/lock_api-0.4.7.crate) = 25371 -SHA256 (rust/crates/log-0.4.16.crate) = 6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8 -SIZE (rust/crates/log-0.4.16.crate) = 37758 +SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e +SIZE (rust/crates/log-0.4.17.crate) = 38028 SHA256 (rust/crates/maplit-1.0.2.crate) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d SIZE (rust/crates/maplit-1.0.2.crate) = 8871 -SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a -SIZE (rust/crates/memchr-2.4.1.crate) = 64977 +SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d +SIZE (rust/crates/memchr-2.5.0.crate) = 65812 SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce SIZE (rust/crates/memoffset-0.6.5.crate) = 7686 SHA256 (rust/crates/nodrop-0.1.14.crate) = 72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb SIZE (rust/crates/nodrop-0.1.14.crate) = 7667 SHA256 (rust/crates/num-format-0.4.0.crate) = bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465 SIZE (rust/crates/num-format-0.4.0.crate) = 59791 -SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290 -SIZE (rust/crates/num-traits-0.2.14.crate) = 45476 +SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd +SIZE (rust/crates/num-traits-0.2.15.crate) = 49262 SHA256 (rust/crates/num_cpus-1.13.1.crate) = 19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1 SIZE (rust/crates/num_cpus-1.13.1.crate) = 14752 SHA256 (rust/crates/once_cell-1.10.0.crate) = 87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9 @@ -119,10 +121,6 @@ SHA256 (rust/crates/os_str_bytes-6.0.0.crate) = 8e22443d1643a904602595ba1cd8f7d8 SIZE (rust/crates/os_str_bytes-6.0.0.crate) = 21046 SHA256 (rust/crates/output_vt100-0.1.3.crate) = 628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66 SIZE (rust/crates/output_vt100-0.1.3.crate) = 4473 -SHA256 (rust/crates/parking_lot-0.12.0.crate) = 87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58 -SIZE (rust/crates/parking_lot-0.12.0.crate) = 39761 -SHA256 (rust/crates/parking_lot_core-0.9.2.crate) = 995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37 -SIZE (rust/crates/parking_lot_core-0.9.2.crate) = 32254 SHA256 (rust/crates/plotters-0.3.1.crate) = 32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a SIZE (rust/crates/plotters-0.3.1.crate) = 8595577 SHA256 (rust/crates/plotters-backend-0.3.2.crate) = d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c @@ -143,8 +141,8 @@ SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08c SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293 SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971 -SHA256 (rust/crates/proc-macro2-1.0.37.crate) = ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1 -SIZE (rust/crates/proc-macro2-1.0.37.crate) = 41378 +SHA256 (rust/crates/proc-macro2-1.0.38.crate) = 9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa +SIZE (rust/crates/proc-macro2-1.0.38.crate) = 41687 SHA256 (rust/crates/quick-xml-0.22.0.crate) = 8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b SIZE (rust/crates/quick-xml-0.22.0.crate) = 132066 SHA256 (rust/crates/quote-1.0.18.crate) = a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1 @@ -159,8 +157,6 @@ SHA256 (rust/crates/rayon-1.5.2.crate) = fd249e82c21598a9a426a4e00dd7adc1d640b22 SIZE (rust/crates/rayon-1.5.2.crate) = 165456 SHA256 (rust/crates/rayon-core-1.9.2.crate) = 9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4 SIZE (rust/crates/rayon-core-1.9.2.crate) = 65221 -SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42 -SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759 SHA256 (rust/crates/regex-1.5.5.crate) = 1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286 SIZE (rust/crates/regex-1.5.5.crate) = 238119 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132 @@ -179,24 +175,22 @@ SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e SIZE (rust/crates/same-file-1.0.6.crate) = 10183 SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 -SHA256 (rust/crates/semver-1.0.7.crate) = d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4 -SIZE (rust/crates/semver-1.0.7.crate) = 30064 -SHA256 (rust/crates/serde-1.0.136.crate) = ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789 -SIZE (rust/crates/serde-1.0.136.crate) = 76158 +SHA256 (rust/crates/semver-1.0.9.crate) = 8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd +SIZE (rust/crates/semver-1.0.9.crate) = 30843 +SHA256 (rust/crates/serde-1.0.137.crate) = 61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1 +SIZE (rust/crates/serde-1.0.137.crate) = 76182 SHA256 (rust/crates/serde_cbor-0.11.2.crate) = 2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5 SIZE (rust/crates/serde_cbor-0.11.2.crate) = 44570 -SHA256 (rust/crates/serde_derive-1.0.136.crate) = 08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9 -SIZE (rust/crates/serde_derive-1.0.136.crate) = 54776 -SHA256 (rust/crates/serde_json-1.0.79.crate) = 8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95 -SIZE (rust/crates/serde_json-1.0.79.crate) = 144451 -SHA256 (rust/crates/smallvec-1.8.0.crate) = f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83 -SIZE (rust/crates/smallvec-1.8.0.crate) = 27992 +SHA256 (rust/crates/serde_derive-1.0.137.crate) = 1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be +SIZE (rust/crates/serde_derive-1.0.137.crate) = 54831 +SHA256 (rust/crates/serde_json-1.0.81.crate) = 9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c +SIZE (rust/crates/serde_json-1.0.81.crate) = 144480 SHA256 (rust/crates/str_stack-0.1.0.crate) = 9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb SIZE (rust/crates/str_stack-0.1.0.crate) = 7977 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 SIZE (rust/crates/strsim-0.10.0.crate) = 11355 -SHA256 (rust/crates/syn-1.0.91.crate) = b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d -SIZE (rust/crates/syn-1.0.91.crate) = 235996 +SHA256 (rust/crates/syn-1.0.92.crate) = 7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52 +SIZE (rust/crates/syn-1.0.92.crate) = 236605 SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755 SIZE (rust/crates/termcolor-1.1.3.crate) = 17242 SHA256 (rust/crates/termtree-0.2.4.crate) = 507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b @@ -211,8 +205,8 @@ SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb5 SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490 SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973 SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745 -SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3 -SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955 +SHA256 (rust/crates/unicode-xid-0.2.3.crate) = 957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04 +SIZE (rust/crates/unicode-xid-0.2.3.crate) = 15174 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f SIZE (rust/crates/version_check-0.9.4.crate) = 14895 SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6 @@ -241,17 +235,5 @@ SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e9 SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 -SHA256 (rust/crates/windows-sys-0.34.0.crate) = 5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825 -SIZE (rust/crates/windows-sys-0.34.0.crate) = 3369228 -SHA256 (rust/crates/windows_aarch64_msvc-0.34.0.crate) = 17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d -SIZE (rust/crates/windows_aarch64_msvc-0.34.0.crate) = 674445 -SHA256 (rust/crates/windows_i686_gnu-0.34.0.crate) = 2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed -SIZE (rust/crates/windows_i686_gnu-0.34.0.crate) = 772343 -SHA256 (rust/crates/windows_i686_msvc-0.34.0.crate) = 9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956 -SIZE (rust/crates/windows_i686_msvc-0.34.0.crate) = 733497 -SHA256 (rust/crates/windows_x86_64_gnu-0.34.0.crate) = cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4 -SIZE (rust/crates/windows_x86_64_gnu-0.34.0.crate) = 744301 -SHA256 (rust/crates/windows_x86_64_msvc-0.34.0.crate) = d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9 -SIZE (rust/crates/windows_x86_64_msvc-0.34.0.crate) = 669900 -SHA256 (jonhoo-inferno-v0.11.2_GH0.tar.gz) = 965677f3a7d3b7030164e26479d8e5b990d8023ab1df446edd4b0fb38f900f40 -SIZE (jonhoo-inferno-v0.11.2_GH0.tar.gz) = 605505 +SHA256 (jonhoo-inferno-v0.11.3_GH0.tar.gz) = d032d8aefc95b6c753095ea2b3851f79e8bc66d790dcb829cd8c8602d0f2aac1 +SIZE (jonhoo-inferno-v0.11.3_GH0.tar.gz) = 608380 diff --git a/biology/abyss/Makefile b/biology/abyss/Makefile index 91d52df097a..fcfdebd8cc9 100644 --- a/biology/abyss/Makefile +++ b/biology/abyss/Makefile @@ -1,5 +1,6 @@ PORTNAME= abyss DISTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org diff --git a/biology/py-dna-features-viewer/Makefile b/biology/py-dna-features-viewer/Makefile index 4df57a7218e..851cde8f7f4 100644 --- a/biology/py-dna-features-viewer/Makefile +++ b/biology/py-dna-features-viewer/Makefile @@ -1,6 +1,5 @@ PORTNAME= dna-features-viewer -DISTVERSION= 3.1.0 -PORTREVISION= 2 +DISTVERSION= 3.1.1 CATEGORIES= biology python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/biology/py-dna-features-viewer/distinfo b/biology/py-dna-features-viewer/distinfo index 8131a2c7de9..dd127f59881 100644 --- a/biology/py-dna-features-viewer/distinfo +++ b/biology/py-dna-features-viewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643841661 -SHA256 (dna_features_viewer-3.1.0.tar.gz) = 1430bbd861b4fa4a1855fb9554577bc1b2e969a6d1921882bb2de56902cd63ca -SIZE (dna_features_viewer-3.1.0.tar.gz) = 34795 +TIMESTAMP = 1651931490 +SHA256 (dna_features_viewer-3.1.1.tar.gz) = 8b61bfb1bf3aab818b42391a607bfb420a9bc3c3f22344ab7bedea7160bd4581 +SIZE (dna_features_viewer-3.1.1.tar.gz) = 37766 diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile index d2ec67470f8..32b9f386943 100644 --- a/cad/horizon-eda/Makefile +++ b/cad/horizon-eda/Makefile @@ -1,7 +1,6 @@ PORTNAME= horizon-eda DISTVERSIONPREFIX= v -DISTVERSION= 2.2.0 -PORTREVISION= 2 +DISTVERSION= 2.3.0 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -24,7 +23,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libzip.so:archivers/libzip \ libzmq.so:net/libzmq4 -USES= gmake gnome localbase pkgconfig python:build sqlite # compiler:c++17-lang +USES= gmake gnome libarchive localbase pkgconfig python:build sqlite # compiler:c++17-lang USE_GNOME= atkmm gdkpixbuf2 gtkmm30 librsvg2 USE_GITHUB= yes @@ -34,13 +33,13 @@ MAKE_ARGS= DEBUGFLAGS= OPTIMIZE= BINARY_ALIAS= python3=${PYTHON_CMD} -LLVM_VER= 12 # workaround for bug#253551 +LLVM_VER= 12 # workaround for bug#263870 BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CPP= clang-cpp${LLVM_VER} CC= clang${LLVM_VER} CXX= clang++${LLVM_VER} post-install: # https://github.com/horizon-eda/horizon/issues/558 - @cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} horizon-imp + @cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} horizon-eda horizon-imp .include diff --git a/cad/horizon-eda/distinfo b/cad/horizon-eda/distinfo index 58696cfe824..94fb39f8fa2 100644 --- a/cad/horizon-eda/distinfo +++ b/cad/horizon-eda/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642101212 -SHA256 (horizon-eda-horizon-v2.2.0_GH0.tar.gz) = 6c04f2fe8a9e1ee148cd1aaf9d418eec2ebce1bdda1741c7a54fb53c95798f91 -SIZE (horizon-eda-horizon-v2.2.0_GH0.tar.gz) = 3211560 +TIMESTAMP = 1651802807 +SHA256 (horizon-eda-horizon-v2.3.0_GH0.tar.gz) = 32045e46ad54469cce926508c09d0d1701dc49fb6ab613be2bc99b0e0a0662b3 +SIZE (horizon-eda-horizon-v2.3.0_GH0.tar.gz) = 3287979 diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 5ef818579d2..028c5aa600f 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -2,6 +2,7 @@ PORTNAME= kicad PORTVERSION= 6.0.5 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= cad MASTER_SITES= https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}/ @@ -30,7 +31,7 @@ USES= cmake:noninja compiler:c++11-lib desktop-file-utils gl \ SHEBANG_FILES= pcbnew/python/plugins/touch_slider_wizard.py USE_XORG= ice x11 xext -USE_GL= gl glew glu glut +USE_GL= gl glu glut USE_WX= 3.1 WX_COMPS= python:lib wx USE_GNOME= atk cairo gdkpixbuf2 gtk30 pango @@ -41,7 +42,7 @@ CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} \ -DKICAD_SCRIPTING_WXPYTHON=ON \ -DKICAD_USE_OCC=ON \ -DKICAD_USE_EGL=ON \ - -DKICAD_USE_BUNDLED_GLEW=OFF \ + -DKICAD_USE_BUNDLED_GLEW=ON \ -DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE USE_LDCONFIG= yes diff --git a/cad/kicad/files/patch-3d-viewer_3d__cache_3d__cache.cpp b/cad/kicad/files/patch-3d-viewer_3d__cache_3d__cache.cpp new file mode 100644 index 00000000000..d33fb562097 --- /dev/null +++ b/cad/kicad/files/patch-3d-viewer_3d__cache_3d__cache.cpp @@ -0,0 +1,12 @@ +--- 3d-viewer/3d_cache/3d_cache.cpp.orig 2022-05-06 18:57:13 +0200 ++++ 3d-viewer/3d_cache/3d_cache.cpp +@@ -199,7 +199,8 @@ + FlushCache(); + + // We'll delete ".3dc" cache files older than this many days +- int clearCacheInterval = commonSettings->m_System.clear_3d_cache_interval; ++ int clearCacheInterval = 0; ++ if(commonSettings) clearCacheInterval = commonSettings->m_System.clear_3d_cache_interval; + + // An interval of zero means the user doesn't want to ever clear the cache + diff --git a/cad/kicad/files/patch-thirdparty_glew_CMakeLists.txt b/cad/kicad/files/patch-thirdparty_glew_CMakeLists.txt new file mode 100644 index 00000000000..18c5a496dd6 --- /dev/null +++ b/cad/kicad/files/patch-thirdparty_glew_CMakeLists.txt @@ -0,0 +1,10 @@ +--- thirdparty/glew/CMakeLists.txt.orig 2022-05-07 15:44:23 +0200 ++++ thirdparty/glew/CMakeLists.txt +@@ -5,6 +5,7 @@ + # The actual include directories will be added to the global include paths as + # system headers + target_include_directories( glew PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" ) ++target_include_directories( glew SYSTEM PRIVATE "${CMAKE_INSTALL_PREFIX}/include" ) + + # Definitions for compiling GLEW staticly for EGL (extracted from the main GLEW CMakeLists.txt file) + add_definitions( -DGLEW_STATIC ) diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile index 3c3b860e4ea..3bccce59ed5 100644 --- a/cad/klayout/Makefile +++ b/cad/klayout/Makefile @@ -1,6 +1,5 @@ PORTNAME= klayout -PORTVERSION= 0.27.3 -PORTREVISION= 1 +PORTVERSION= 0.27.9 DISTVERSIONPREFIX= v CATEGORIES= cad @@ -11,7 +10,7 @@ LICENSE= GPLv2 BROKEN_i386= type 'hash' does not provide a call operator BROKEN_powerpc= type 'hash' does not provide a call operator -BROKEN_sparc64= Does not compile on sparc64: gcc bug +BROKEN_sparc64= does not compile on sparc64: gcc bug USES= compiler:c++0x gmake gl python qt:5 USE_GITHUB= yes @@ -26,7 +25,6 @@ CXXFLAGS+= -fdeclspec -fPIC -I${LOCALBASE}/include/qt5 \ ${QT5MODULES:S,^,-I${LOCALBASE}/include/qt5/Qt,} LDFLAGS+= ${LIBS} ${QT5MODULES:S,^,-lQt5,} \ -L${LOCALBASE}/lib/qt5 -lpthread -LDFLAGS+= -L${BUILD_WRKSRC} # workaround for the error: unable to find library -lklayout_lib: https://github.com/KLayout/klayout/issues/955 QT5MODULES= Core Designer Gui Multimedia MultimediaWidgets \ Network PrintSupport Sql Svg Test Widgets Xml XmlPatterns MAKE_ENV= INSTALLROOT=${STAGEDIR} \ diff --git a/cad/klayout/distinfo b/cad/klayout/distinfo index 3e03d3a59f2..5aadd8a09da 100644 --- a/cad/klayout/distinfo +++ b/cad/klayout/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629922499 -SHA256 (KLayout-klayout-v0.27.3_GH0.tar.gz) = 8c21e6898db5285bf75e65f9a74724564e3419cd76a35bfc53dde3944827017a -SIZE (KLayout-klayout-v0.27.3_GH0.tar.gz) = 57274694 +TIMESTAMP = 1651843460 +SHA256 (KLayout-klayout-v0.27.9_GH0.tar.gz) = e51fffb0df0f3756d395ae1a9ecc5211dec703bb3187861874177fd3d01218ec +SIZE (KLayout-klayout-v0.27.9_GH0.tar.gz) = 57400341 diff --git a/cad/klayout/files/patch-src-db-db-db.pro b/cad/klayout/files/patch-src-db-db-db.pro index c1a123f3482..d8f8cb9bafd 100644 --- a/cad/klayout/files/patch-src-db-db-db.pro +++ b/cad/klayout/files/patch-src-db-db-db.pro @@ -1,6 +1,6 @@ ---- src/db/db/db.pro.orig 2021-08-28 16:45:43 UTC +--- src/db/db/db.pro.orig 2022-04-24 08:12:38 UTC +++ src/db/db/db.pro -@@ -395,5 +395,5 @@ HEADERS = \ +@@ -403,5 +403,5 @@ HEADERS = \ INCLUDEPATH += $$TL_INC $$GSI_INC DEPENDPATH += $$TL_INC $$GSI_INC diff --git a/cad/klayout/files/patch-src-klayout_main-klayout_main-klayout_main.pro b/cad/klayout/files/patch-src-klayout_main-klayout_main-klayout_main.pro index 72ca7bb4c37..3906e5c8480 100644 --- a/cad/klayout/files/patch-src-klayout_main-klayout_main-klayout_main.pro +++ b/cad/klayout/files/patch-src-klayout_main-klayout_main-klayout_main.pro @@ -1,4 +1,4 @@ ---- src/klayout_main/klayout_main/klayout_main.pro.orig 2021-08-28 16:11:14 UTC +--- src/klayout_main/klayout_main/klayout_main.pro.orig 2022-04-24 08:12:38 UTC +++ src/klayout_main/klayout_main/klayout_main.pro @@ -27,39 +27,39 @@ DEPENDPATH += $$QTBASIC_INC @@ -28,7 +28,7 @@ + LIBS += $$DESTDIR/libklayout_QtUiTools.so } - equals(HAVE_QT5, "1") { + greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lklayout_QtWidgets + LIBS += $$DESTDIR/libklayout_QtWidgets.so diff --git a/cad/klayout/files/patch-src-lay-lay-lay.pro b/cad/klayout/files/patch-src-lay-lay-lay.pro index 160a781f3e3..326ebc49cc3 100644 --- a/cad/klayout/files/patch-src-lay-lay-lay.pro +++ b/cad/klayout/files/patch-src-lay-lay-lay.pro @@ -1,4 +1,4 @@ ---- src/lay/lay/lay.pro.orig 2021-07-23 08:00:26 UTC +--- src/lay/lay/lay.pro.orig 2022-04-24 08:12:38 UTC +++ src/lay/lay/lay.pro @@ -181,13 +181,13 @@ RESOURCES = layBuildInMacros.qrc \ @@ -26,7 +26,7 @@ - LIBS += -lklayout_QtXml + LIBS += $$DESTDIR/libklayout_QtXml.so } - equals(HAVE_QT5, "1") { + greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lklayout_QtWidgets + LIBS += $$DESTDIR/libklayout_QtWidgets.so } diff --git a/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro b/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro index b5bb0d8be09..f356bfbdb84 100644 --- a/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro +++ b/cad/klayout/files/patch-src-laybasic-laybasic-laybasic.pro @@ -1,6 +1,6 @@ ---- src/laybasic/laybasic/laybasic.pro.orig 2021-08-28 16:13:49 UTC +--- src/laybasic/laybasic/laybasic.pro.orig 2022-04-24 08:12:38 UTC +++ src/laybasic/laybasic/laybasic.pro -@@ -303,15 +303,15 @@ HEADERS = \ +@@ -305,15 +305,15 @@ HEADERS = \ INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC @@ -13,7 +13,7 @@ equals(HAVE_QTBINDINGS, "1") { - LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore + LIBS += $$DESTDIR/libklayout_qtbasic.so $$DESTDIR/libklayout_QtGui.so $$DESTDIR/libklayout_QtCore.so - equals(HAVE_QT5, "1") { + greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lklayout_QtWidgets + LIBS += $$DESTDIR/libklayout_QtWidgets.so } diff --git a/cad/klayout/files/patch-src-plugins-streamers-dxf-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-plugins-streamers-dxf-unit_tests-unit_tests.pro index cc8582618a2..58e618acedf 100644 --- a/cad/klayout/files/patch-src-plugins-streamers-dxf-unit_tests-unit_tests.pro +++ b/cad/klayout/files/patch-src-plugins-streamers-dxf-unit_tests-unit_tests.pro @@ -1,6 +1,6 @@ ---- src/plugins/streamers/dxf/unit_tests/unit_tests.pro.orig 2021-08-28 17:08:02 UTC +--- src/plugins/streamers/dxf/unit_tests/unit_tests.pro.orig 2022-04-24 08:12:38 UTC +++ src/plugins/streamers/dxf/unit_tests/unit_tests.pro -@@ -11,9 +11,9 @@ SOURCES = \ +@@ -12,9 +12,9 @@ SOURCES = \ INCLUDEPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common DEPENDPATH += $$LAY_INC $$TL_INC $$DB_INC $$GSI_INC $$PWD/../db_plugin $$PWD/../../../common diff --git a/cad/klayout/files/patch-src-pymod-QtCore-QtCore.pro b/cad/klayout/files/patch-src-pymod-QtCore-QtCore.pro index 67259450047..d9dbfe21086 100644 --- a/cad/klayout/files/patch-src-pymod-QtCore-QtCore.pro +++ b/cad/klayout/files/patch-src-pymod-QtCore-QtCore.pro @@ -1,13 +1,13 @@ ---- src/pymod/QtCore/QtCore.pro.orig 2021-08-28 19:54:37 UTC +--- src/pymod/QtCore/QtCore.pro.orig 2022-04-24 08:12:38 UTC +++ src/pymod/QtCore/QtCore.pro @@ -8,8 +8,8 @@ SOURCES = \ HEADERS += \ -LIBS += -lklayout_QtCore -lklayout_QtGui -+LIBS += $$LIBDIR/libklayout_QtCore.so $$LIBDIR/libklayout_QtGui.so ++LIBS += $$DESTDIR/../libklayout_QtCore.so $$DESTDIR/../libklayout_QtGui.so - equals(HAVE_QT5, "1") { + greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lklayout_QtWidgets -+ LIBS += $$LIBDIR/libklayout_QtWidgets.so ++ LIBS += $$DESTDIR/../libklayout_QtWidgets.so } diff --git a/cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro b/cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro index 3e1b4e3784e..2a6daa1cb12 100644 --- a/cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro +++ b/cad/klayout/files/patch-src-pymod-QtGui-QtGui.pro @@ -1,14 +1,14 @@ ---- src/pymod/QtGui/QtGui.pro.orig 2021-07-23 08:00:26 UTC +--- src/pymod/QtGui/QtGui.pro.orig 2022-04-24 08:12:38 UTC +++ src/pymod/QtGui/QtGui.pro @@ -8,9 +8,9 @@ SOURCES = \ HEADERS += \ -LIBS += -lklayout_QtGui -lklayout_QtCore -+LIBS += $$LIBDIR/libklayout_QtGui.so $$LIBDIR/libklayout_QtCore.so ++LIBS += $$DESTDIR/../libklayout_QtGui.so $$DESTDIR/../libklayout_QtCore.so - equals(HAVE_QT5, "1") { + greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lklayout_QtWidgets -+ LIBS += $$LIBDIR/libklayout_QtWidgets.so ++ LIBS += $$DESTDIR/../libklayout_QtWidgets.so } diff --git a/cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro b/cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro index d10ea20e80a..f1672caeddf 100644 --- a/cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro +++ b/cad/klayout/files/patch-src-pymod-QtXml-QtXml.pro @@ -1,17 +1,17 @@ ---- src/pymod/QtXml/QtXml.pro.orig 2021-08-28 20:00:46 UTC +--- src/pymod/QtXml/QtXml.pro.orig 2022-04-24 08:12:38 UTC +++ src/pymod/QtXml/QtXml.pro @@ -8,11 +8,11 @@ SOURCES = \ HEADERS += \ -LIBS += -lklayout_QtCore -lklayout_QtXml -+LIBS += $$LIBDIR/libklayout_QtCore.so $$LIBDIR/libklayout_QtXml.so ++LIBS += $$DESTDIR/../libklayout_QtCore.so $$DESTDIR/../libklayout_QtXml.so # Because of stupid dependency of QtCore on QtGui and this on QtWidgets: -LIBS += -lklayout_QtGui -+LIBS += $$LIBDIR/libklayout_QtGui.so ++LIBS += $$DESTDIR/../libklayout_QtGui.so - equals(HAVE_QT5, "1") { + greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lklayout_QtWidgets -+ LIBS += $$LIBDIR/libklayout_QtWidgets.so ++ LIBS += $$DESTDIR/../libklayout_QtWidgets.so } diff --git a/cad/klayout/files/patch-src-pymod-lib-lib.pro b/cad/klayout/files/patch-src-pymod-lib-lib.pro new file mode 100644 index 00000000000..065a4d45f0e --- /dev/null +++ b/cad/klayout/files/patch-src-pymod-lib-lib.pro @@ -0,0 +1,9 @@ +--- src/pymod/lib/lib.pro.orig 2022-04-24 08:12:38 UTC ++++ src/pymod/lib/lib.pro +@@ -9,5 +9,5 @@ SOURCES = \ + + HEADERS += \ + +-LIBS += -lklayout_lib ++LIBS += $$DESTDIR/../libklayout_lib.so + diff --git a/cad/klayout/files/patch-src-unit_tests-unit_tests.pro b/cad/klayout/files/patch-src-unit_tests-unit_tests.pro index 963dafd1049..21a39647354 100644 --- a/cad/klayout/files/patch-src-unit_tests-unit_tests.pro +++ b/cad/klayout/files/patch-src-unit_tests-unit_tests.pro @@ -1,4 +1,4 @@ ---- src/unit_tests/unit_tests.pro.orig 2021-07-23 08:00:26 UTC +--- src/unit_tests/unit_tests.pro.orig 2022-04-24 08:12:38 UTC +++ src/unit_tests/unit_tests.pro @@ -23,10 +23,10 @@ HEADERS += \ !win32 { @@ -20,7 +20,7 @@ - LIBS += -lklayout_QtXml + LIBS += $$DESTDIR/libklayout_QtXml.so } - equals(HAVE_QT5, "1") { + greaterThan(QT_MAJOR_VERSION, 4) { - LIBS += -lklayout_QtWidgets + LIBS += $$DESTDIR/libklayout_QtWidgets.so } diff --git a/cad/klayout/pkg-plist b/cad/klayout/pkg-plist index c0dfa72a9b5..fb4d2f36a47 100644 --- a/cad/klayout/pkg-plist +++ b/cad/klayout/pkg-plist @@ -13,139 +13,139 @@ bin/strmxor lib/klayout/db_plugins/libcif.so lib/klayout/db_plugins/libcif.so.0 lib/klayout/db_plugins/libcif.so.0.27 -lib/klayout/db_plugins/libcif.so.0.27.3 +lib/klayout/db_plugins/libcif.so.0.27.9 lib/klayout/db_plugins/libdxf.so lib/klayout/db_plugins/libdxf.so.0 lib/klayout/db_plugins/libdxf.so.0.27 -lib/klayout/db_plugins/libdxf.so.0.27.3 +lib/klayout/db_plugins/libdxf.so.0.27.9 lib/klayout/db_plugins/libgds2.so lib/klayout/db_plugins/libgds2.so.0 lib/klayout/db_plugins/libgds2.so.0.27 -lib/klayout/db_plugins/libgds2.so.0.27.3 +lib/klayout/db_plugins/libgds2.so.0.27.9 lib/klayout/db_plugins/liblefdef.so lib/klayout/db_plugins/liblefdef.so.0 lib/klayout/db_plugins/liblefdef.so.0.27 -lib/klayout/db_plugins/liblefdef.so.0.27.3 +lib/klayout/db_plugins/liblefdef.so.0.27.9 lib/klayout/db_plugins/libmag.so lib/klayout/db_plugins/libmag.so.0 lib/klayout/db_plugins/libmag.so.0.27 -lib/klayout/db_plugins/libmag.so.0.27.3 +lib/klayout/db_plugins/libmag.so.0.27.9 lib/klayout/db_plugins/libnet_tracer.so lib/klayout/db_plugins/libnet_tracer.so.0 lib/klayout/db_plugins/libnet_tracer.so.0.27 -lib/klayout/db_plugins/libnet_tracer.so.0.27.3 +lib/klayout/db_plugins/libnet_tracer.so.0.27.9 lib/klayout/db_plugins/liboasis.so lib/klayout/db_plugins/liboasis.so.0 lib/klayout/db_plugins/liboasis.so.0.27 -lib/klayout/db_plugins/liboasis.so.0.27.3 +lib/klayout/db_plugins/liboasis.so.0.27.9 lib/klayout/db_plugins/libpcb.so lib/klayout/db_plugins/libpcb.so.0 lib/klayout/db_plugins/libpcb.so.0.27 -lib/klayout/db_plugins/libpcb.so.0.27.3 +lib/klayout/db_plugins/libpcb.so.0.27.9 lib/klayout/lay_plugins/libbool_ui.so lib/klayout/lay_plugins/libbool_ui.so.0 lib/klayout/lay_plugins/libbool_ui.so.0.27 -lib/klayout/lay_plugins/libbool_ui.so.0.27.3 +lib/klayout/lay_plugins/libbool_ui.so.0.27.9 lib/klayout/lay_plugins/libcif_ui.so lib/klayout/lay_plugins/libcif_ui.so.0 lib/klayout/lay_plugins/libcif_ui.so.0.27 -lib/klayout/lay_plugins/libcif_ui.so.0.27.3 +lib/klayout/lay_plugins/libcif_ui.so.0.27.9 lib/klayout/lay_plugins/libcommon_ui.so lib/klayout/lay_plugins/libcommon_ui.so.0 lib/klayout/lay_plugins/libcommon_ui.so.0.27 -lib/klayout/lay_plugins/libcommon_ui.so.0.27.3 +lib/klayout/lay_plugins/libcommon_ui.so.0.27.9 lib/klayout/lay_plugins/libd25_ui.so lib/klayout/lay_plugins/libd25_ui.so.0 lib/klayout/lay_plugins/libd25_ui.so.0.27 -lib/klayout/lay_plugins/libd25_ui.so.0.27.3 +lib/klayout/lay_plugins/libd25_ui.so.0.27.9 lib/klayout/lay_plugins/libdiff_ui.so lib/klayout/lay_plugins/libdiff_ui.so.0 lib/klayout/lay_plugins/libdiff_ui.so.0.27 -lib/klayout/lay_plugins/libdiff_ui.so.0.27.3 +lib/klayout/lay_plugins/libdiff_ui.so.0.27.9 lib/klayout/lay_plugins/libdxf_ui.so lib/klayout/lay_plugins/libdxf_ui.so.0 lib/klayout/lay_plugins/libdxf_ui.so.0.27 -lib/klayout/lay_plugins/libdxf_ui.so.0.27.3 +lib/klayout/lay_plugins/libdxf_ui.so.0.27.9 lib/klayout/lay_plugins/libgds2_ui.so lib/klayout/lay_plugins/libgds2_ui.so.0 lib/klayout/lay_plugins/libgds2_ui.so.0.27 -lib/klayout/lay_plugins/libgds2_ui.so.0.27.3 +lib/klayout/lay_plugins/libgds2_ui.so.0.27.9 lib/klayout/lay_plugins/libimport_ui.so lib/klayout/lay_plugins/libimport_ui.so.0 lib/klayout/lay_plugins/libimport_ui.so.0.27 -lib/klayout/lay_plugins/libimport_ui.so.0.27.3 +lib/klayout/lay_plugins/libimport_ui.so.0.27.9 lib/klayout/lay_plugins/liblefdef_ui.so lib/klayout/lay_plugins/liblefdef_ui.so.0 lib/klayout/lay_plugins/liblefdef_ui.so.0.27 -lib/klayout/lay_plugins/liblefdef_ui.so.0.27.3 +lib/klayout/lay_plugins/liblefdef_ui.so.0.27.9 lib/klayout/lay_plugins/libmag_ui.so lib/klayout/lay_plugins/libmag_ui.so.0 lib/klayout/lay_plugins/libmag_ui.so.0.27 -lib/klayout/lay_plugins/libmag_ui.so.0.27.3 +lib/klayout/lay_plugins/libmag_ui.so.0.27.9 lib/klayout/lay_plugins/libnet_tracer_ui.so lib/klayout/lay_plugins/libnet_tracer_ui.so.0 lib/klayout/lay_plugins/libnet_tracer_ui.so.0.27 -lib/klayout/lay_plugins/libnet_tracer_ui.so.0.27.3 +lib/klayout/lay_plugins/libnet_tracer_ui.so.0.27.9 lib/klayout/lay_plugins/liboasis_ui.so lib/klayout/lay_plugins/liboasis_ui.so.0 lib/klayout/lay_plugins/liboasis_ui.so.0.27 -lib/klayout/lay_plugins/liboasis_ui.so.0.27.3 +lib/klayout/lay_plugins/liboasis_ui.so.0.27.9 lib/klayout/lay_plugins/libpcb_ui.so lib/klayout/lay_plugins/libpcb_ui.so.0 lib/klayout/lay_plugins/libpcb_ui.so.0.27 -lib/klayout/lay_plugins/libpcb_ui.so.0.27.3 +lib/klayout/lay_plugins/libpcb_ui.so.0.27.9 lib/klayout/lay_plugins/libxor_ui.so lib/klayout/lay_plugins/libxor_ui.so.0 lib/klayout/lay_plugins/libxor_ui.so.0.27 -lib/klayout/lay_plugins/libxor_ui.so.0.27.3 +lib/klayout/lay_plugins/libxor_ui.so.0.27.9 lib/klayout/libQtCore.so lib/klayout/libQtCore.so.0 lib/klayout/libQtCore.so.0.27 -lib/klayout/libQtCore.so.0.27.3 +lib/klayout/libQtCore.so.0.27.9 lib/klayout/libQtDesigner.so lib/klayout/libQtDesigner.so.0 lib/klayout/libQtDesigner.so.0.27 -lib/klayout/libQtDesigner.so.0.27.3 +lib/klayout/libQtDesigner.so.0.27.9 lib/klayout/libQtGui.so lib/klayout/libQtGui.so.0 lib/klayout/libQtGui.so.0.27 -lib/klayout/libQtGui.so.0.27.3 +lib/klayout/libQtGui.so.0.27.9 lib/klayout/libQtMultimedia.so lib/klayout/libQtMultimedia.so.0 lib/klayout/libQtMultimedia.so.0.27 -lib/klayout/libQtMultimedia.so.0.27.3 +lib/klayout/libQtMultimedia.so.0.27.9 lib/klayout/libQtNetwork.so lib/klayout/libQtNetwork.so.0 lib/klayout/libQtNetwork.so.0.27 -lib/klayout/libQtNetwork.so.0.27.3 +lib/klayout/libQtNetwork.so.0.27.9 lib/klayout/libQtPrintSupport.so lib/klayout/libQtPrintSupport.so.0 lib/klayout/libQtPrintSupport.so.0.27 -lib/klayout/libQtPrintSupport.so.0.27.3 +lib/klayout/libQtPrintSupport.so.0.27.9 lib/klayout/libQtSql.so lib/klayout/libQtSql.so.0 lib/klayout/libQtSql.so.0.27 -lib/klayout/libQtSql.so.0.27.3 +lib/klayout/libQtSql.so.0.27.9 lib/klayout/libQtSvg.so lib/klayout/libQtSvg.so.0 lib/klayout/libQtSvg.so.0.27 -lib/klayout/libQtSvg.so.0.27.3 +lib/klayout/libQtSvg.so.0.27.9 lib/klayout/libQtUiTools.so lib/klayout/libQtUiTools.so.0 lib/klayout/libQtUiTools.so.0.27 -lib/klayout/libQtUiTools.so.0.27.3 +lib/klayout/libQtUiTools.so.0.27.9 lib/klayout/libQtWidgets.so lib/klayout/libQtWidgets.so.0 lib/klayout/libQtWidgets.so.0.27 -lib/klayout/libQtWidgets.so.0.27.3 +lib/klayout/libQtWidgets.so.0.27.9 lib/klayout/libQtXml.so lib/klayout/libQtXml.so.0 lib/klayout/libQtXml.so.0.27 -lib/klayout/libQtXml.so.0.27.3 +lib/klayout/libQtXml.so.0.27.9 lib/klayout/libQtXmlPatterns.so lib/klayout/libQtXmlPatterns.so.0 lib/klayout/libQtXmlPatterns.so.0.27 -lib/klayout/libQtXmlPatterns.so.0.27.3 +lib/klayout/libQtXmlPatterns.so.0.27.9 lib/klayout/libbridge_mod.so lib/klayout/libbridge_mod.so.1 lib/klayout/libbridge_mod.so.1.0 @@ -153,143 +153,143 @@ lib/klayout/libbridge_mod.so.1.0.0 lib/klayout/libdbcore.so lib/klayout/libdbcore.so.0 lib/klayout/libdbcore.so.0.27 -lib/klayout/libdbcore.so.0.27.3 +lib/klayout/libdbcore.so.0.27.9 lib/klayout/libklayout_QtCore.so lib/klayout/libklayout_QtCore.so.0 lib/klayout/libklayout_QtCore.so.0.27 -lib/klayout/libklayout_QtCore.so.0.27.3 +lib/klayout/libklayout_QtCore.so.0.27.9 lib/klayout/libklayout_QtDesigner.so lib/klayout/libklayout_QtDesigner.so.0 lib/klayout/libklayout_QtDesigner.so.0.27 -lib/klayout/libklayout_QtDesigner.so.0.27.3 +lib/klayout/libklayout_QtDesigner.so.0.27.9 lib/klayout/libklayout_QtGui.so lib/klayout/libklayout_QtGui.so.0 lib/klayout/libklayout_QtGui.so.0.27 -lib/klayout/libklayout_QtGui.so.0.27.3 +lib/klayout/libklayout_QtGui.so.0.27.9 lib/klayout/libklayout_QtMultimedia.so lib/klayout/libklayout_QtMultimedia.so.0 lib/klayout/libklayout_QtMultimedia.so.0.27 -lib/klayout/libklayout_QtMultimedia.so.0.27.3 +lib/klayout/libklayout_QtMultimedia.so.0.27.9 lib/klayout/libklayout_QtNetwork.so lib/klayout/libklayout_QtNetwork.so.0 lib/klayout/libklayout_QtNetwork.so.0.27 -lib/klayout/libklayout_QtNetwork.so.0.27.3 +lib/klayout/libklayout_QtNetwork.so.0.27.9 lib/klayout/libklayout_QtPrintSupport.so lib/klayout/libklayout_QtPrintSupport.so.0 lib/klayout/libklayout_QtPrintSupport.so.0.27 -lib/klayout/libklayout_QtPrintSupport.so.0.27.3 +lib/klayout/libklayout_QtPrintSupport.so.0.27.9 lib/klayout/libklayout_QtSql.so lib/klayout/libklayout_QtSql.so.0 lib/klayout/libklayout_QtSql.so.0.27 -lib/klayout/libklayout_QtSql.so.0.27.3 +lib/klayout/libklayout_QtSql.so.0.27.9 lib/klayout/libklayout_QtSvg.so lib/klayout/libklayout_QtSvg.so.0 lib/klayout/libklayout_QtSvg.so.0.27 -lib/klayout/libklayout_QtSvg.so.0.27.3 +lib/klayout/libklayout_QtSvg.so.0.27.9 lib/klayout/libklayout_QtUiTools.so lib/klayout/libklayout_QtUiTools.so.0 lib/klayout/libklayout_QtUiTools.so.0.27 -lib/klayout/libklayout_QtUiTools.so.0.27.3 +lib/klayout/libklayout_QtUiTools.so.0.27.9 lib/klayout/libklayout_QtWidgets.so lib/klayout/libklayout_QtWidgets.so.0 lib/klayout/libklayout_QtWidgets.so.0.27 -lib/klayout/libklayout_QtWidgets.so.0.27.3 +lib/klayout/libklayout_QtWidgets.so.0.27.9 lib/klayout/libklayout_QtXml.so lib/klayout/libklayout_QtXml.so.0 lib/klayout/libklayout_QtXml.so.0.27 -lib/klayout/libklayout_QtXml.so.0.27.3 +lib/klayout/libklayout_QtXml.so.0.27.9 lib/klayout/libklayout_QtXmlPatterns.so lib/klayout/libklayout_QtXmlPatterns.so.0 lib/klayout/libklayout_QtXmlPatterns.so.0.27 -lib/klayout/libklayout_QtXmlPatterns.so.0.27.3 +lib/klayout/libklayout_QtXmlPatterns.so.0.27.9 lib/klayout/libklayout_ant.so lib/klayout/libklayout_ant.so.0 lib/klayout/libklayout_ant.so.0.27 -lib/klayout/libklayout_ant.so.0.27.3 +lib/klayout/libklayout_ant.so.0.27.9 lib/klayout/libklayout_bd.so lib/klayout/libklayout_bd.so.0 lib/klayout/libklayout_bd.so.0.27 -lib/klayout/libklayout_bd.so.0.27.3 +lib/klayout/libklayout_bd.so.0.27.9 lib/klayout/libklayout_db.so lib/klayout/libklayout_db.so.0 lib/klayout/libklayout_db.so.0.27 -lib/klayout/libklayout_db.so.0.27.3 +lib/klayout/libklayout_db.so.0.27.9 lib/klayout/libklayout_drc.so lib/klayout/libklayout_drc.so.0 lib/klayout/libklayout_drc.so.0.27 -lib/klayout/libklayout_drc.so.0.27.3 +lib/klayout/libklayout_drc.so.0.27.9 lib/klayout/libklayout_edt.so lib/klayout/libklayout_edt.so.0 lib/klayout/libklayout_edt.so.0.27 -lib/klayout/libklayout_edt.so.0.27.3 +lib/klayout/libklayout_edt.so.0.27.9 lib/klayout/libklayout_gsi.so lib/klayout/libklayout_gsi.so.0 lib/klayout/libklayout_gsi.so.0.27 -lib/klayout/libklayout_gsi.so.0.27.3 +lib/klayout/libklayout_gsi.so.0.27.9 lib/klayout/libklayout_gsi_test.so lib/klayout/libklayout_gsi_test.so.0 lib/klayout/libklayout_gsi_test.so.0.27 -lib/klayout/libklayout_gsi_test.so.0.27.3 +lib/klayout/libklayout_gsi_test.so.0.27.9 lib/klayout/libklayout_img.so lib/klayout/libklayout_img.so.0 lib/klayout/libklayout_img.so.0.27 -lib/klayout/libklayout_img.so.0.27.3 +lib/klayout/libklayout_img.so.0.27.9 lib/klayout/libklayout_lay.so lib/klayout/libklayout_lay.so.0 lib/klayout/libklayout_lay.so.0.27 -lib/klayout/libklayout_lay.so.0.27.3 +lib/klayout/libklayout_lay.so.0.27.9 lib/klayout/libklayout_laybasic.so lib/klayout/libklayout_laybasic.so.0 lib/klayout/libklayout_laybasic.so.0.27 -lib/klayout/libklayout_laybasic.so.0.27.3 +lib/klayout/libklayout_laybasic.so.0.27.9 lib/klayout/libklayout_lib.so lib/klayout/libklayout_lib.so.0 lib/klayout/libklayout_lib.so.0.27 -lib/klayout/libklayout_lib.so.0.27.3 +lib/klayout/libklayout_lib.so.0.27.9 lib/klayout/libklayout_lvs.so lib/klayout/libklayout_lvs.so.0 lib/klayout/libklayout_lvs.so.0.27 -lib/klayout/libklayout_lvs.so.0.27.3 +lib/klayout/libklayout_lvs.so.0.27.9 lib/klayout/libklayout_lym.so lib/klayout/libklayout_lym.so.0 lib/klayout/libklayout_lym.so.0.27 -lib/klayout/libklayout_lym.so.0.27.3 +lib/klayout/libklayout_lym.so.0.27.9 lib/klayout/libklayout_pya.so lib/klayout/libklayout_pya.so.0 lib/klayout/libklayout_pya.so.0.27 -lib/klayout/libklayout_pya.so.0.27.3 +lib/klayout/libklayout_pya.so.0.27.9 lib/klayout/libklayout_qtbasic.so lib/klayout/libklayout_qtbasic.so.0 lib/klayout/libklayout_qtbasic.so.0.27 -lib/klayout/libklayout_qtbasic.so.0.27.3 +lib/klayout/libklayout_qtbasic.so.0.27.9 lib/klayout/libklayout_rba.so lib/klayout/libklayout_rba.so.0 lib/klayout/libklayout_rba.so.0.27 -lib/klayout/libklayout_rba.so.0.27.3 +lib/klayout/libklayout_rba.so.0.27.9 lib/klayout/libklayout_rdb.so lib/klayout/libklayout_rdb.so.0 lib/klayout/libklayout_rdb.so.0.27 -lib/klayout/libklayout_rdb.so.0.27.3 +lib/klayout/libklayout_rdb.so.0.27.9 lib/klayout/libklayout_tl.so lib/klayout/libklayout_tl.so.0 lib/klayout/libklayout_tl.so.0.27 -lib/klayout/libklayout_tl.so.0.27.3 +lib/klayout/libklayout_tl.so.0.27.9 lib/klayout/liblay.so lib/klayout/liblay.so.0 lib/klayout/liblay.so.0.27 -lib/klayout/liblay.so.0.27.3 +lib/klayout/liblay.so.0.27.9 lib/klayout/liblibcore.so lib/klayout/liblibcore.so.0 lib/klayout/liblibcore.so.0.27 -lib/klayout/liblibcore.so.0.27.3 +lib/klayout/liblibcore.so.0.27.9 lib/klayout/librdbcore.so lib/klayout/librdbcore.so.0 lib/klayout/librdbcore.so.0.27 -lib/klayout/librdbcore.so.0.27.3 +lib/klayout/librdbcore.so.0.27.9 lib/klayout/libtlcore.so lib/klayout/libtlcore.so.0 lib/klayout/libtlcore.so.0.27 -lib/klayout/libtlcore.so.0.27.3 +lib/klayout/libtlcore.so.0.27.9 %%PYTHON_SITELIBDIR%%/klayout/QtCore%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtDesigner%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/klayout/QtGui%%PYTHON_EXT_SUFFIX%%.so diff --git a/cad/lepton-eda/Makefile b/cad/lepton-eda/Makefile index 6083f780df7..c4d8239e892 100644 --- a/cad/lepton-eda/Makefile +++ b/cad/lepton-eda/Makefile @@ -1,5 +1,6 @@ PORTNAME= lepton-eda PORTVERSION= 1.9.17 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= https://github.com/lepton-eda/lepton-eda/releases/download/${PORTVERSION}-20211219/ diff --git a/cad/nvc/Makefile b/cad/nvc/Makefile index a217d797808..ef004c944c1 100644 --- a/cad/nvc/Makefile +++ b/cad/nvc/Makefile @@ -9,8 +9,7 @@ COMMENT= VHDL compiler and simulator LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} \ - ${LOCALBASE}/include/unwind.h:devel/libunwind +BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} RUN_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} TEST_DEPENDS= check>0:devel/check @@ -31,6 +30,12 @@ MAKE_ARGS= CFLAGS="${CFLAGS}" # only for tests LLVM_VERSION= ${LLVM_DEFAULT} +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400052 # devel/libunwind installs include/unwind.h only before that version, after which it probably exists in the base +BUILD_DEPENDS+= ${LOCALBASE}/include/unwind.h:devel/libunwind +.endif + post-install: ${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD} diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index c087eefe0b8..29bf7a6099a 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -2,7 +2,7 @@ PORTNAME= opencascade PORTVERSION= 7.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry diff --git a/cad/py-pymtl/Makefile b/cad/py-pymtl/Makefile index 045cf3be012..5258cdfc467 100644 --- a/cad/py-pymtl/Makefile +++ b/cad/py-pymtl/Makefile @@ -1,5 +1,5 @@ PORTNAME= pymtl -DISTVERSION= 3.1.11 +DISTVERSION= 3.1.13 CATEGORIES= cad python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/cad/py-pymtl/distinfo b/cad/py-pymtl/distinfo index 757ce081fd4..251ce06f9ee 100644 --- a/cad/py-pymtl/distinfo +++ b/cad/py-pymtl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651602303 -SHA256 (pymtl3-3.1.11.tar.gz) = 899d27afa8e139dc01b053cad21ab116ee08b171a2b4a5faa6de062d759c7cf3 -SIZE (pymtl3-3.1.11.tar.gz) = 349052 +TIMESTAMP = 1652145402 +SHA256 (pymtl3-3.1.13.tar.gz) = b5c80a92798f8f74820f7f25226cac1f9dbfa455786a00466362059e5489b127 +SIZE (pymtl3-3.1.13.tar.gz) = 349880 diff --git a/cad/yosys/Makefile b/cad/yosys/Makefile index 39b094c86f3..904ee6f6779 100644 --- a/cad/yosys/Makefile +++ b/cad/yosys/Makefile @@ -2,7 +2,7 @@ PORTNAME= yosys DISTVERSIONPREFIX= yosys- -DISTVERSION= 0.16 +DISTVERSION= 0.17 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org diff --git a/cad/yosys/distinfo b/cad/yosys/distinfo index e83cbac32fd..d5a18e9b2ad 100644 --- a/cad/yosys/distinfo +++ b/cad/yosys/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649399821 -SHA256 (YosysHQ-yosys-yosys-0.16_GH0.tar.gz) = c7a161e5f567b853a18be8417b60d31ce77804994dafc93306b897ddc335aa3c -SIZE (YosysHQ-yosys-yosys-0.16_GH0.tar.gz) = 2254856 +TIMESTAMP = 1652131201 +SHA256 (YosysHQ-yosys-yosys-0.17_GH0.tar.gz) = 37db450d08884a7c411f44ddf639284967ed1a39e11cd6b78d816186113d0173 +SIZE (YosysHQ-yosys-yosys-0.17_GH0.tar.gz) = 2260241 diff --git a/chinese/libreoffice-zh_CN/distinfo b/chinese/libreoffice-zh_CN/distinfo index 9ac5023eb82..342f962f30f 100644 --- a/chinese/libreoffice-zh_CN/distinfo +++ b/chinese/libreoffice-zh_CN/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1648748194 -SHA256 (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 56d89cb502555fe479d024e8c3a8279953e4e64f6a51fbaa20be86fc0941d75a -SIZE (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 791674 -SHA256 (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 43fe4f7f0f5572fc3631589c43f4909ee68747a152d56a1b65b42c7af1a6df7c -SIZE (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 3288068 +TIMESTAMP = 1651920460 +SHA256 (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 4d69e14cb3038de1c026ec1a83339fc1155f2b9864af9708a0cf070f6f116486 +SIZE (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 791548 +SHA256 (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 01c64f567586c5bf71914ddd90d7217c2367067c726ee381706755b6a74542f8 +SIZE (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 3288149 diff --git a/chinese/libreoffice-zh_TW/distinfo b/chinese/libreoffice-zh_TW/distinfo index 8bf132586c1..b53fc413ad2 100644 --- a/chinese/libreoffice-zh_TW/distinfo +++ b/chinese/libreoffice-zh_TW/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1648748206 -SHA256 (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = d25301e9a0f912932c9bae8a4a8987ac1e155a4eefda0fc87f4a87f7913e8553 -SIZE (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 805826 -SHA256 (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = c24af49a35bab0435798e84906a91df917182b5cc3b1a6205fcad7a8e0e7cdb2 -SIZE (libreoffice/i18n/LibreOffice_7.3.2_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 3375337 +TIMESTAMP = 1651920465 +SHA256 (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 225f2c8ec18ffac2ac6e6190e05eaf61bea3cb24f109b9f9f4d9c0dac743def4 +SIZE (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 805602 +SHA256 (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = b38d57f22a8cc02d86a00154eabc77d294b7bfe46849d547620fd20e8e23e88c +SIZE (libreoffice/i18n/LibreOffice_7.3.3_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 3375369 diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index 85e68ad4f05..3d7ba2c92ef 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -1,5 +1,5 @@ PORTNAME= fldigi -DISTVERSION= 4.1.21 +DISTVERSION= 4.1.22 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/files/fldigi/ diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo index 2463e37321c..488e1531c2b 100644 --- a/comms/fldigi/distinfo +++ b/comms/fldigi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651702389 -SHA256 (fldigi-4.1.21.tar.gz) = 43a8768c0f8fcffe5509eede1f7e95f18ed6290de3e46573424019a8fb8f8d70 -SIZE (fldigi-4.1.21.tar.gz) = 4931218 +TIMESTAMP = 1651941496 +SHA256 (fldigi-4.1.22.tar.gz) = 0b146f3cec9d51b0c3000edda416041b49d6de4216a331a3a008a91ec2c731fe +SIZE (fldigi-4.1.22.tar.gz) = 4934496 diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile index ec9fb1be07d..0ceab78f746 100644 --- a/converters/hs-aeson-pretty/Makefile +++ b/converters/hs-aeson-pretty/Makefile @@ -1,6 +1,6 @@ PORTNAME= aeson-pretty PORTVERSION= 0.8.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index 1fcf89474f3..3672d2c530d 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -1,6 +1,6 @@ PORTNAME= pdf2djvu DISTVERSION= 0.9.18.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= converters MASTER_SITES= https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/databases/R-cran-RSQLite/Makefile b/databases/R-cran-RSQLite/Makefile index d8fef063aa8..21a007646fb 100644 --- a/databases/R-cran-RSQLite/Makefile +++ b/databases/R-cran-RSQLite/Makefile @@ -1,8 +1,7 @@ # Created by: Steven Kreuzer PORTNAME= RSQLite -PORTVERSION= 1.0.0 -PORTREVISION= 5 +PORTVERSION= 2.2.14 CATEGORIES= databases DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -11,8 +10,15 @@ COMMENT= Database Interface R driver for SQLite LICENSE= LGPL20 -BUILD_DEPENDS= R-cran-DBI>=0.2.5:databases/R-cran-DBI -RUN_DEPENDS= R-cran-DBI>=0.2.5:databases/R-cran-DBI +CRAN_DEPENDS= R-cran-DBI>=1.1.0:databases/R-cran-DBI \ + R-cran-bit64>0:devel/R-cran-bit64 \ + R-cran-blob>0:devel/R-cran-blob \ + R-cran-memoise>0:devel/R-cran-memoise \ + R-cran-Rcpp>0:devel/R-cran-Rcpp \ + R-cran-pkgconfig>0:devel/R-cran-pkgconfig \ + R-cran-plogr>0:devel/R-cran-plogr +BUILD_DEPENDS= ${CRAN_DEPENDS} +RUN_DEPENDS= ${CRAN_DEPENDS} USES= cran:auto-plist,compiles diff --git a/databases/R-cran-RSQLite/distinfo b/databases/R-cran-RSQLite/distinfo index d70c2e1ac8f..aac2c02ef0c 100644 --- a/databases/R-cran-RSQLite/distinfo +++ b/databases/R-cran-RSQLite/distinfo @@ -1,2 +1,3 @@ -SHA256 (RSQLite_1.0.0.tar.gz) = 8e0cfca19afbc61f40c6d86018cd723a7e00f16d0944c4637f07a18fb6d76121 -SIZE (RSQLite_1.0.0.tar.gz) = 1745731 +TIMESTAMP = 1651944164 +SHA256 (RSQLite_2.2.14.tar.gz) = 2ae36a875ebc02497985b2ad9ddc6a5434f576e2ab25769580749d9e4f3b607c +SIZE (RSQLite_2.2.14.tar.gz) = 3683851 diff --git a/databases/R-cran-sqldf/Makefile b/databases/R-cran-sqldf/Makefile index 5ecdaaf7bfb..3df9401fd0c 100644 --- a/databases/R-cran-sqldf/Makefile +++ b/databases/R-cran-sqldf/Makefile @@ -1,8 +1,7 @@ # Created by: Steven Kreuzer PORTNAME= sqldf -DISTVERSION= 0.4-7.1 -PORTREVISION= 5 +DISTVERSION= 0.4-11 CATEGORIES= databases DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -11,13 +10,13 @@ COMMENT= SQL select on R data frames LICENSE= GPLv2 -BUILD_DEPENDS= R-cran-proto>=0.3.9.2_6:devel/R-cran-proto \ +CRAN_DEPENDS= R-cran-proto>=0.3.9.2_6:devel/R-cran-proto \ R-cran-chron>=2.3.42:devel/R-cran-chron \ R-cran-gsubfn>=0.6.4:devel/R-cran-gsubfn \ - R-cran-DBI>=0.2.5_6:databases/R-cran-DBI \ - R-cran-RSQLite>=0.11.1:databases/R-cran-RSQLite \ - R-cran-RSQLite.extfuns>=0.0.1:databases/R-cran-RSQLite.extfuns -RUN_DEPENDS:= ${BUILD_DEPENDS} + R-cran-DBI>=1.1.0:databases/R-cran-DBI \ + R-cran-RSQLite>=2.2.14:databases/R-cran-RSQLite +BUILD_DEPENDS= ${CRAN_DEPENDS} +RUN_DEPENDS= ${CRAN_DEPENDS} USES= cran:auto-plist diff --git a/databases/R-cran-sqldf/distinfo b/databases/R-cran-sqldf/distinfo index 2e2b13a698d..57ecd339915 100644 --- a/databases/R-cran-sqldf/distinfo +++ b/databases/R-cran-sqldf/distinfo @@ -1,2 +1,3 @@ -SHA256 (sqldf_0.4-7.1.tar.gz) = e2b3d1eaf61fb4b7eda72a83f2718f1f683a4d52c565924ef406c235330fef0e -SIZE (sqldf_0.4-7.1.tar.gz) = 28418 +TIMESTAMP = 1651944475 +SHA256 (sqldf_0.4-11.tar.gz) = cee979d4e8c67b4924655365d925a8d67104e62adf71741f645cdc5196de2260 +SIZE (sqldf_0.4-11.tar.gz) = 63097 diff --git a/databases/R-cran-sqldf/pkg-descr b/databases/R-cran-sqldf/pkg-descr index 2378ae63cdc..e2eef6f9d5b 100644 --- a/databases/R-cran-sqldf/pkg-descr +++ b/databases/R-cran-sqldf/pkg-descr @@ -1,10 +1,10 @@ -sqldf is an R package for runing SQL statements on R data frames, optimized for -convenience. The user simply specifies an SQL statement in R using data frame -names in place of table names and a database with appropriate table -layouts/schema is automatically created, the data frames are automatically -loaded into the database, the specified SQL statement is performed, the result -is read back into R and the database is deleted all automatically behind the -scenes making the database's existence transparent to the user who only -specifies the SQL statement. +The sqldf() function is typically passed a single argument which is an SQL +select statement where the table names are ordinary R data frame names. sqldf() +transparently sets up a database, imports the data frames into that database, +performs the SQL select or other statement and returns the result using a +heuristic to determine which class to assign to each column of the returned +data frame. The sqldf() or read.csv.sql() functions can also be used to read +filtered files into R even if the original files are larger than R itself can +handle. 'RSQLite', 'RH2', 'RMySQL' and 'RPostgreSQL' backends are supported. -WWW: https://code.google.com/p/sqldf +WWW: https://cran.r-project.org/web/packages/sqldf/ diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index ebfedb65401..c1ccb0344e8 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -2,7 +2,7 @@ PORTNAME= kbibtex DISTVERSION= 0.9.2 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= databases kde MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION} diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile index 7d92f2eb636..54e4ac625b9 100644 --- a/databases/mroonga/Makefile +++ b/databases/mroonga/Makefile @@ -1,7 +1,7 @@ # Created by: Muhammad Moinur Rahman PORTNAME= mroonga -PORTVERSION= 12.02 +PORTVERSION= 12.03 CATEGORIES= databases textproc MASTER_SITES= http://packages.groonga.org/source/mroonga/ diff --git a/databases/mroonga/distinfo b/databases/mroonga/distinfo index 5073f4f31f1..f3ce0b5791c 100644 --- a/databases/mroonga/distinfo +++ b/databases/mroonga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648661282 -SHA256 (mroonga-12.02.tar.gz) = d67ae8f1b294ca2803daf480d3a880466c7e6de648def542e0fba31e17d047be -SIZE (mroonga-12.02.tar.gz) = 2840481 +TIMESTAMP = 1651930956 +SHA256 (mroonga-12.03.tar.gz) = 7f3ec8801e81995ed81877622035b07b35aa64bcf1fab5296b88d6390411e407 +SIZE (mroonga-12.03.tar.gz) = 2831937 diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile index 16fa97ace19..a25f0f2af3e 100644 --- a/databases/mysql-connector-java/Makefile +++ b/databases/mysql-connector-java/Makefile @@ -1,7 +1,7 @@ # Created by: Matthew Seaman PORTNAME= mysql-connector-java -PORTVERSION= 8.0.28 +PORTVERSION= 8.0.29 CATEGORIES= databases java MASTER_SITES= MYSQL/Connector-J diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo index 04acc6ab900..f70b6b4067f 100644 --- a/databases/mysql-connector-java/distinfo +++ b/databases/mysql-connector-java/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642788632 -SHA256 (mysql-connector-java-8.0.28.tar.gz) = 859afba47f1fd99eb7c010bfa101ed7c0f8bb278f6f62430adc8012ea82fb454 -SIZE (mysql-connector-java-8.0.28.tar.gz) = 4225242 +TIMESTAMP = 1651867670 +SHA256 (mysql-connector-java-8.0.29.tar.gz) = 8ecf96a7254e0aa53e179b2efd549fc51908e7ebe34d0176dc87c9e6eb67aa30 +SIZE (mysql-connector-java-8.0.29.tar.gz) = 4273713 diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile index 6a10cf22df2..c44f8140cd9 100644 --- a/databases/phppgadmin/Makefile +++ b/databases/phppgadmin/Makefile @@ -3,7 +3,7 @@ PORTNAME= phppgadmin DISTVERSIONPREFIX= REL_ DISTVERSION= 7-13-0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/databases/phppgadmin/files/patch-adodb-postgres64.inc.php b/databases/phppgadmin/files/patch-adodb-postgres64.inc.php new file mode 100644 index 00000000000..0c62e353ce1 --- /dev/null +++ b/databases/phppgadmin/files/patch-adodb-postgres64.inc.php @@ -0,0 +1,14 @@ +--- libraries/adodb/drivers/adodb-postgres64.inc.php.orig 2020-11-07 06:09:12 UTC ++++ libraries/adodb/drivers/adodb-postgres64.inc.php +@@ -122,6 +122,11 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.re + // changes the metaColumnsSQL, adds columns: attnum[6] + } + ++ function __construct() ++ { ++ // changes the metaColumnsSQL, adds columns: attnum[6] ++ } ++ + function ServerInfo() + { + if (isset($this->version)) return $this->version; diff --git a/databases/phppgadmin/files/patch-all_db.php b/databases/phppgadmin/files/patch-all_db.php new file mode 100644 index 00000000000..a2f8dbd5259 --- /dev/null +++ b/databases/phppgadmin/files/patch-all_db.php @@ -0,0 +1,11 @@ +--- all_db.php.orig 2020-11-07 06:09:12 UTC ++++ all_db.php +@@ -199,7 +199,7 @@ + echo "\t\t\n"; + echo "\t\t\t