Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history 
Taken from: HardenedBSD
  • Loading branch information
@fichtner
fichtner committed Jun 22, 2020
1 parent f90785a commit 8ed126f
Show file tree
Hide file tree
Showing 2,433 changed files with 46,252 additions and 18,329 deletions.
6 changes: 3 additions & 3 deletions archivers/kf5-karchive/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1588492985
SHA256 (KDE/frameworks/5.70.0/karchive-5.70.0.tar.xz) = f5f361a2ce857d7e7af49276ab70506c6a2ece45a183971ed9abdd5386d50a7d
SIZE (KDE/frameworks/5.70.0/karchive-5.70.0.tar.xz) = 987844
TIMESTAMP = 1591513835
SHA256 (KDE/frameworks/5.71.0/karchive-5.71.0.tar.xz) = cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624
SIZE (KDE/frameworks/5.71.0/karchive-5.71.0.tar.xz) = 987808
2 changes: 1 addition & 1 deletion archivers/py-zstd/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= zstd
DISTVERSION= 1.4.1.0
DISTVERSION= 1.4.5.1
CATEGORIES= archivers python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Expand Down
6 changes: 3 additions & 3 deletions archivers/py-zstd/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1567264470
SHA256 (zstd-1.4.1.0.tar.gz) = 25a969d339b50c102958e2fd7451b2570422c6920175f22aae7f85a72e785d51
SIZE (zstd-1.4.1.0.tar.gz) = 454482
TIMESTAMP = 1592546883
SHA256 (zstd-1.4.5.1.tar.gz) = 2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6
SIZE (zstd-1.4.5.1.tar.gz) = 483105
2 changes: 1 addition & 1 deletion astro/mkgmap/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= mkgmap
PORTVERSION= r4525
PORTVERSION= r4550
CATEGORIES= astro converters java
MASTER_SITES= http://www.mkgmap.org.uk/download/ \
http://mirror.amdmi3.ru/distfiles/
Expand Down
6 changes: 3 additions & 3 deletions astro/mkgmap/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1591794038
SHA256 (mkgmap-r4525.tar.gz) = 5c4997c9eb769e875f912c865ab6dd5d72a7e956ef7d01f66ca6413e767b95a3
SIZE (mkgmap-r4525.tar.gz) = 3463467
TIMESTAMP = 1592422700
SHA256 (mkgmap-r4550.tar.gz) = a55cd3e0645eca2a7c120352c52d3c28fce761ac7a09e08cb817a22e2a2554b0
SIZE (mkgmap-r4550.tar.gz) = 3465554
7 changes: 3 additions & 4 deletions astro/py-metpy/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# $FreeBSD$

PORTNAME= metpy
PORTVERSION= 0.12.0
PORTREVISION= 1
PORTVERSION= 0.12.1
CATEGORIES= astro python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Expand All @@ -19,11 +18,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.0:math/py-matplotlib@${PY_FLAVOR} \
${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}pandas>=0.22.0:math/py-pandas@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Pint>=0.8:devel/py-Pint@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Pint>=0.10.1:devel/py-Pint@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pooch>=0.1:devel/py-pooch@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}traitlets>=4.3.0:devel/py-traitlets@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}xarray>=0.10.7:devel/py-xarray@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}xarray>=0.13.0:devel/py-xarray@${PY_FLAVOR}

USES= python:3.6+
USE_PYTHON= autoplist distutils
Expand Down
6 changes: 3 additions & 3 deletions astro/py-metpy/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1578401130
SHA256 (MetPy-0.12.0.tar.gz) = 4125fbbc2620e3702961fe012cb52bdaba5f609ec5f5458818617676044b7921
SIZE (MetPy-0.12.0.tar.gz) = 5188288
TIMESTAMP = 1592419263
SHA256 (MetPy-0.12.1.tar.gz) = 2031007f12748c3aedad85694f71ffb3caf9933b72b5a330b59ea454285d0f50
SIZE (MetPy-0.12.1.tar.gz) = 5197000
2 changes: 1 addition & 1 deletion astro/qmapshack/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= qmapshack
PORTVERSION= 1.14.1
PORTVERSION= 1.15.0
DISTVERSIONPREFIX= V_
CATEGORIES= astro

Expand Down
6 changes: 3 additions & 3 deletions astro/qmapshack/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1585556579
SHA256 (Maproom-qmapshack-V_1.14.1_GH0.tar.gz) = 76f64185fc4620da6d9b71998edefcb9091eff1c3486626f87e4f30d444be623
SIZE (Maproom-qmapshack-V_1.14.1_GH0.tar.gz) = 43586361
TIMESTAMP = 1592229502
SHA256 (Maproom-qmapshack-V_1.15.0_GH0.tar.gz) = a3a470657a66a21a59e812dd6f9351845ce3300c00c25622dcb4a3818ed884f2
SIZE (Maproom-qmapshack-V_1.15.0_GH0.tar.gz) = 46097781
3 changes: 1 addition & 2 deletions astro/weather/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# $FreeBSD$

PORTNAME= weather
PORTVERSION= 2.3
PORTREVISION= 1
PORTVERSION= 2.4
CATEGORIES= astro python
MASTER_SITES= http://fungi.yuggoth.org/weather/src/ \
LOCAL/sunpoet
Expand Down
6 changes: 3 additions & 3 deletions astro/weather/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1479551333
SHA256 (weather-2.3.tar.xz) = 86148d2f1d59867f637f52558cc2a6b3280fac94df55c6e5af0ce37cc190d146
SIZE (weather-2.3.tar.xz) = 7056760
TIMESTAMP = 1592846026
SHA256 (weather-2.4.tar.xz) = 6a5bac6110922b584ee635ddfce7594f8a3fea6b0b2763435bd641f6c9a4c420
SIZE (weather-2.4.tar.xz) = 8343344
2 changes: 2 additions & 0 deletions audio/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@
SUBDIR += ladspa
SUBDIR += lame
SUBDIR += lash
SUBDIR += lenticular-lv2
SUBDIR += liba52
SUBDIR += libaacplus
SUBDIR += libadplug
Expand Down Expand Up @@ -450,6 +451,7 @@
SUBDIR += linux-c7-alsa-utils
SUBDIR += linux-c7-audiofile
SUBDIR += linux-c7-flac
SUBDIR += linux-c7-gsm
SUBDIR += linux-c7-libogg
SUBDIR += linux-c7-libsndfile
SUBDIR += linux-c7-libvorbis
Expand Down
153 changes: 73 additions & 80 deletions audio/audacity/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
# $FreeBSD$

PORTNAME= audacity
PORTVERSION= 2.3.3
PORTREVISION= 2
PORTVERSION= 2.4.1
DISTVERSIONPREFIX= Audacity-
CATEGORIES= audio

Expand All @@ -13,131 +12,125 @@ COMMENT= GUI editor for digital audio waveforms
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt

BUILD_DEPENDS= autogen:devel/autogen \
bash:shells/bash \
cmake:devel/cmake
LIB_DEPENDS= libasound.so:audio/alsa-lib \
libexpat.so:textproc/expat2 \
libportaudio.so:audio/portaudio \
libsndfile.so:audio/libsndfile \
libsoxr.so:audio/libsoxr

USES= autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \
gettext-tools gmake gnome iconv libtool localbase pkgconfig \
shared-mime-info shebangfix

GNU_CONFIGURE= yes
NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
OPTIONS_SUB= yes
USE_WX= 3.1+
WX_COMPS= wx
INSTALLS_ICONS= yes
PORTDOCS= README.txt
DOS2UNIX_GLOB= *.c* *.h Makefile.*
SHEBANG_FILES= lib-src/lv2/build
USE_GITHUB= yes

OPTIONS_DEFINE= DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
MAD MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH \
SSE TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD SBSMS SOUNDTOUCH TWOLAME VAMP \
USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext \
gnome libtool python:build pkgconfig shared-mime-info
USE_GITHUB= yes
USE_GNOME= cairo gtk30
USE_WX= 3.1+
WX_COMPS= wx
INSTALLS_ICONS= yes
PORTDOCS= README.txt

CMAKE_ARGS= -Daudacity_lib_preference:STRING=system \
-Daudacity_use_expat:STRING=system \
-Daudacity_use_wxwidgets:STRING=system \
-Daudacity_use_soxr:STRING=system \
-Daudacity_use_sndfile:STRING=system \
-Daudacity_use_portsmf:STRING=local \
-Daudacity_use_portmixer:STRING=local \
-Daudacity_use_portaudio:STRING=system

OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
MIDI NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
VORBIS VST
OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \
SOUNDTOUCH TWOLAME VAMP VORBIS VST

OPTIONS_DEFAULT_amd64= SSE
OPTIONS_DEFAULT_i386= ${MACHINE_CPU:tu:MSSE}

DYNLOAD_DESC= Enable dynamic loading of lame and FFmpeg
LAME_DESC= Use lame for import and export support
LV2_DESC= Add LV2 plug-in support
MAD_DESC= Use libmad for mp2/3 decoding support
MOD_SCRIPT_PIPE_DESC= mod-script-pipe scripting support
MOD_NYQ_BENCH_DESC= Enable Nyquist Workbench
MIDI_DESC= MIDI support
NYQUIST_DESC= Nyquist synthesis and composition support
SBSMS_DESC= Use libsbsms for pitch and tempo changing
SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
TWOLAME_DESC= Use libtwolame for MP2 export support
VAMP_DESC= Vamp plug-in support
VST_DESC= VST plug-in support

CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"

CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} \
--disable-option-checking \
--enable-unicode \
--with-expat=system \
--with-lib-preference="local" \
--with-libsndfile=system \
--with-libsoxr=system \
--with-midi \
--with-portaudio=system \
--with-portmixer=yes \
--with-widgetextra

CONFIGURE_SHELL?= ${LOCALBASE}/bin/bash

DEBUG_CONFIGURE_WITH= debug
DEBUG_CMAKE_ON= wxWidgets_USE_DEBUG

DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \
docbook2man:textproc/docbook-utils

DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame \
${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
DYNLOAD_CONFIGURE_ENABLE= dynamic-loading
# for audio/lame
DYNLOAD_CPPFLAGS= -I${LOCALBASE}/include
# for audio/lame
DYNLOAD_LDFLAGS= -L${LOCALBASE}/lib

FFMPEG_CONFIGURE_WITH= ffmpeg=system
FFMPEG_CMAKE_ON= -Daudacity_use_ffmpeg:STRING=loaded
FFMPEG_CMAKE_OFF= -Daudacity_use_ffmpeg:STRING=off
FFMPEG_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg

FLAC_CONFIGURE_WITH= libflac=system
FLAC_CMAKE_ON= -Daudacity_use_flac:STRING=system
FLAC_CMAKE_OFF= -Daudacity_use_flac:STRING=local
FLAC_LIB_DEPENDS= libFLAC.so:audio/flac

ID3TAG_CONFIGURE_WITH= libid3tag=system
ID3TAG_CMAKE_ON= -Daudacity_use_id3tag:STRING=system
ID3TAG_CMAKE_OFF= -Daudacity_use_id3tag:STRING=off
ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag

LADSPA_CONFIGURE_ENABLE= ladspa
LADSPA_RUN_DEPENDS= listplugins:audio/ladspa
LADSPA_CMAKE_BOOL= audacity_use_ladspa
LADSPA_RUN_DEPENDS= listplugins:audio/ladspa

LAME_CONFIGURE_ON= --with-lame=system
# --without-lame is broken
LAME_CONFIGURE_OFF= --with-lame
LAME_CPPFLAGS= -I${LOCALBASE}/include
LAME_CMAKE_ON= -Daudacity_use_lame:STRING=system
LAME_CMAKE_OFF= -Daudacity_use_lame:STRING=local
LAME_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame
LAME_CPPFLAGS= -I${LOCALBASE}/include/lame
LAME_LDFLAGS= -L${LOCALBASE}/lib
LAME_LIB_DEPENDS= libmp3lame.so:audio/lame

LV2_CONFIGURE_WITH= lv2=system
LV2_CMAKE_ON= -Daudacity_use_lv2:STRING=system
LV2_CMAKE_OFF= -Daudacity_use_lv2:STRING=off
LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \
libserd-0.so:devel/serd \
libsord-0.so:devel/sord \
libsratom-0.so:audio/sratom \
libsuil-0.so:audio/suil

MAD_CONFIGURE_WITH= libmad=system
MAD_CMAKE_ON= -Daudacity_use_mad:STRING=system
MAD_CMAKE_OFF= -Daudacity_use_mad:STRING=off
MAD_LIB_DEPENDS= libmad.so:audio/libmad

MOD_SCRIPT_PIPE_CONFIGURE_WITH= mod-script-pipe
MOD_SCRIPT_PIPE_USES= python:3.6+
MOD_NYQ_BENCH_CONFIGURE_WITH= mod-nyq-bench
MOD_NYQ_BENCH_USES= python:3.6+
MIDI_CMAKE_ON= -Daudacity_use_midi:STRING=local
MIDI_CMAKE_OFF= -Daudacity_use_midi:STRING=off

SBSMS_CONFIGURE_WITH= sbsms
# TODO: fix NLS support properly
PLIST_SUB+= NLS=""

SOUNDTOUCH_CONFIGURE_WITH= soundtouch=system
SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch
NYQUIST_CMAKE_ON= -Daudacity_use_nyquist:STRING=local
NYQUIST_CMAKE_OFF= -Daudacity_use_nyquist:STRING=off

OGG_CMAKE_ON= -Daudacity_use_ogg:STRING=system
OGG_CMAKE_OFF= -Daudacity_use_ogg:STRING=local
OGG_LIB_DEPENDS= libogg.so:audio/libogg

SSE_CONFIGURE_ENABLE= sse
SBSMS_CMAKE_ON= -Daudacity_use_sbsms:STRING=local
SBSMS_CMAKE_OFF= -Daudacity_use_sbsms:STRING=off

TWOLAME_CONFIGURE_WITH= libtwolame=system
SOUNDTOUCH_CMAKE_ON= -Daudacity_use_soundtouch:STRING=system
SOUNDTOUCH_CMAKE_OFF= -Daudacity_use_soundtouch:STRING=off
SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch

TWOLAME_CMAKE_ON= -Daudacity_use_twolame:STRING=system
TWOLAME_CMAKE_OFF= -Daudacity_use_twolame:STRING=off
TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame

VAMP_CONFIGURE_WITH= libvamp=system
VAMP_CMAKE_ON= -Daudacity_use_vamp:STRING=system
VAMP_CMAKE_OFF= -Daudacity_use_vamp:STRING=off
VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk

VORBIS_CONFIGURE_WITH= libvorbis=system
VORBIS_CMAKE_ON= -Daudacity_use_vorbis:STRING=system
VORBIS_CMAKE_OFF= -Daudacity_use_vorbis:STRING=off
VORBIS_LIB_DEPENDS= libogg.so:audio/libogg \
libvorbis.so:audio/libvorbis

VST_CONFIGURE_ENABLE= vst
VST_CMAKE_BOOL= audacity_use_vst

post-patch:
@${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
/CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt

post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
Expand Down
6 changes: 3 additions & 3 deletions audio/audacity/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1579914119
SHA256 (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 404e6c49693dedc94212fc5525974058d848536025e19da31359ae02babe8bd7
SIZE (audacity-audacity-Audacity-2.3.3_GH0.tar.gz) = 62073352
TIMESTAMP = 1589881433
SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461
11 changes: 11 additions & 0 deletions audio/audacity/files/patch-cmake-proxies_CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- cmake-proxies/CMakeLists.txt.orig 2020-05-19 09:43:53 UTC
+++ cmake-proxies/CMakeLists.txt
@@ -150,7 +150,7 @@ addlib( lame lame LAME YES
addlib( lib-widget-extra libextra EXTRA YES YES "" )
addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )
+addlib( portaudio-v19 portaudio PORTAUDIO YES YES "portaudio-2.0 >= 19" )

# Optional libraries
#
10 changes: 10 additions & 0 deletions audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- cmake-proxies/sbsms/CMakeLists.txt.orig 2020-05-19 09:43:53 UTC
+++ cmake-proxies/sbsms/CMakeLists.txt
@@ -28,6 +28,7 @@ list( APPEND INCLUDES
list( APPEND OPTIONS
PRIVATE
$<$<C_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-enum-compare>
+ ${SSE_FLAG}
)

find_package( Threads )
Loading

0 comments on commit 8ed126f

Please sign in to comment.