bulk-medium: Attempt to build fewer deprecated/obsolete packages.

Use logical replacements where possible.

Bump version

1 files changed, 15 insertions, 20 deletions

diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile
index 6530df489a3..0ead3b1e2bb 100644
--- a/meta-pkgs/bulk-medium/Makefile
+++ b/meta-pkgs/bulk-medium/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2020/03/01 11:38:12 nia Exp $
+# $NetBSD: Makefile,v 1.64 2020/03/13 10:36:24 nia Exp $
 
-DISTNAME=	bulk-medium-20200301
+DISTNAME=	bulk-medium-20200313
 CATEGORIES=	meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -48,15 +48,14 @@ BUILD_DEPENDS+=	flac-[0-9]*:../../audio/flac
 BUILD_DEPENDS+=	flac123-[0-9]*:../../audio/flac123
 BUILD_DEPENDS+=	lame-[0-9]*:../../audio/lame
 BUILD_DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
-BUILD_DEPENDS+=	mpg321-[0-9]*:../../audio/mpg321
 BUILD_DEPENDS+=	sox-[0-9]*:../../audio/sox
 BUILD_DEPENDS+=	vorbis-tools-[0-9]*:../../audio/vorbis-tools
 BUILD_DEPENDS+=	jabberd>=2:../../chat/jabberd2
 BUILD_DEPENDS+=	sirc-[0-9]*:../../chat/sirc
 BUILD_DEPENDS+=	hexchat-[0-9]*:../../chat/hexchat
 BUILD_DEPENDS+=	fribidi-[0-9]*:../../converters/fribidi
-BUILD_DEPENDS+=	mysql-client>=5.5<5.6:../../databases/mysql55-client
-BUILD_DEPENDS+=	mysql-client>=5.6:../../databases/mysql56-client
+BUILD_DEPENDS+=	mysql-client>=5.6<5.7:../../databases/mysql56-client
+BUILD_DEPENDS+=	mysql-client>=5.7:../../databases/mysql57-client
 BUILD_DEPENDS+=	openldap-client-[0-9]*:../../databases/openldap-client
 BUILD_DEPENDS+=	git-[0-9]*:../../devel/git
 BUILD_DEPENDS+=	git-base-[0-9]*:../../devel/git-base
@@ -65,7 +64,7 @@ BUILD_DEPENDS+=	mercurial-[0-9]*:../../devel/mercurial
 BUILD_DEPENDS+=	emacs25>=25<26:../../editors/emacs25
 BUILD_DEPENDS+=	emacs-packages-[0-9]*:../../editors/emacs-packages
 BUILD_DEPENDS+=	nvi-[0-9]*:../../editors/nvi
-BUILD_DEPENDS+=	vim-gtk2-[0-9]*:../../editors/vim-gtk2
+BUILD_DEPENDS+=	vim-gtk3-[0-9]*:../../editors/vim-gtk3
 BUILD_DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
 BUILD_DEPENDS+=	qemu-[0-9]*:../../emulators/qemu
 BUILD_DEPENDS+=	simh-[0-9]*:../../emulators/simh
@@ -80,10 +79,8 @@ BUILD_DEPENDS+=	php>=7.3<7.4:../../lang/php73
 BUILD_DEPENDS+=	ruby24-base-[0-9]*:../../lang/ruby24-base
 BUILD_DEPENDS+=	ruby25-base-[0-9]*:../../lang/ruby25-base
 BUILD_DEPENDS+=	ruby26-base-[0-9]*:../../lang/ruby26-base
-BUILD_DEPENDS+=	sun-jdk7-[0-9]*:../../lang/sun-jdk7
-BUILD_DEPENDS+=	sun-jre7-[0-9]*:../../lang/sun-jre7
-BUILD_DEPENDS+=	openjdk7-[0-9]*:../../lang/openjdk7
 BUILD_DEPENDS+=	openjdk8-[0-9]*:../../lang/openjdk8
+BUILD_DEPENDS+=	openjdk11-[0-9]*:../../lang/openjdk11
 BUILD_DEPENDS+=	python37-[0-9]*:../../lang/python37
 BUILD_DEPENDS+=	tcl-[0-9]*:../../lang/tcl
 BUILD_DEPENDS+=	fetchmail-[0-9]*:../../mail/fetchmail
@@ -130,8 +127,8 @@ BUILD_DEPENDS+=	icon-naming-utils-[0-9]*:../../graphics/icon-naming-utils
 #
 # 3. Commonly used libraries
 #
-BUILD_DEPENDS+=	SDL_mixer-[0-9]*:../../audio/SDL_mixer
-BUILD_DEPENDS+=	libmad-[0-9]*:../../audio/libmad
+BUILD_DEPENDS+=	SDL2_mixer-[0-9]*:../../audio/SDL2_mixer
+BUILD_DEPENDS+=	opusfile-[0-9]*:../../audio/opusfile
 BUILD_DEPENDS+=	libvorbis-[0-9]*:../../audio/libvorbis
 BUILD_DEPENDS+=	gdbm-[0-9]*:../../databases/gdbm
 BUILD_DEPENDS+=	p5-BDB-[0-9]*:../../databases/p5-BDB
@@ -144,29 +141,27 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm
 BUILD_DEPENDS+=	${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql
 BUILD_DEPENDS+=	${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-BUILD_DEPENDS+=	SDL-[0-9]*:../../devel/SDL
+BUILD_DEPENDS+=	SDL2-[0-9]*:../../devel/SDL2
 BUILD_DEPENDS+=	atk-[0-9]*:../../devel/atk
 BUILD_DEPENDS+=	boehm-gc-[0-9]*:../../devel/boehm-gc
 BUILD_DEPENDS+=	glib2-[0-9]*:../../devel/glib2
 BUILD_DEPENDS+=	libelf-[0-9]*:../../devel/libelf
 BUILD_DEPENDS+=	libf2c-[0-9]*:../../devel/libf2c
-BUILD_DEPENDS+=	libglade-[0-9]*:../../devel/libglade
-BUILD_DEPENDS+=	libidn-[0-9]*:../../devel/libidn
+BUILD_DEPENDS+=	libidn2-[0-9]*:../../devel/libidn2
 BUILD_DEPENDS+=	libltdl-[0-9]*:../../devel/libltdl
-BUILD_DEPENDS+=	libusb-[0-9]*:../../devel/libusb
+BUILD_DEPENDS+=	libusb1-[0-9]*:../../devel/libusb1
 BUILD_DEPENDS+=	ncurses-[0-9]*:../../devel/ncurses
 BUILD_DEPENDS+=	ncursesw-[0-9]*:../../devel/ncursesw
 BUILD_DEPENDS+=	pango-[0-9]*:../../devel/pango
-BUILD_DEPENDS+=	pangox-compat-[0-9]*:../../devel/pangox-compat
 BUILD_DEPENDS+=	pcre-[0-9]*:../../devel/pcre
 BUILD_DEPENDS+=	popt-[0-9]*:../../devel/popt
 BUILD_DEPENDS+=	fuse-[0-9]*:../../filesystems/fuse
 BUILD_DEPENDS+=	perfuse-[0-9]*:../../filesystems/perfuse
-BUILD_DEPENDS+=	SDL_image-[0-9]*:../../graphics/SDL_image
+BUILD_DEPENDS+=	SDL2_image-[0-9]*:../../graphics/SDL2_image
 BUILD_DEPENDS+=	cairo-[0-9]*:../../graphics/cairo
 BUILD_DEPENDS+=	gdk-pixbuf2-[0-9]*:../../graphics/gdk-pixbuf2
 BUILD_DEPENDS+=	glew-[0-9]*:../../graphics/glew
-BUILD_DEPENDS+=	jasper-[0-9]*:../../graphics/jasper
+BUILD_DEPENDS+=	openjpeg-[0-9]*:../../graphics/openjpeg
 BUILD_DEPENDS+=	lcms-[0-9]*:../../graphics/lcms
 BUILD_DEPENDS+=	lcms2-[0-9]*:../../graphics/lcms2
 .include "../../graphics/librsvg/available.mk"
@@ -178,7 +173,7 @@ BUILD_DEPENDS+=	librsvg-[0-9]*:../../graphics/librsvg-c
 BUILD_DEPENDS+=	blas-[0-9]*:../../math/blas
 BUILD_DEPENDS+=	lapack-[0-9]*:../../math/lapack
 BUILD_DEPENDS+=	boost-[0-9]*:../../meta-pkgs/boost
-BUILD_DEPENDS+=	ffmpeg2-[0-9]*:../../multimedia/ffmpeg2
+BUILD_DEPENDS+=	ffmpeg4-[0-9]*:../../multimedia/ffmpeg4
 BUILD_DEPENDS+=	libogg-[0-9]*:../../multimedia/libogg
 BUILD_DEPENDS+=	libpcap-[0-9]*:../../net/libpcap
 BUILD_DEPENDS+=	libsoup-[0-9]*:../../net/libsoup
@@ -188,7 +183,7 @@ BUILD_DEPENDS+=	cyrus-sasl-[0-9]*:../../security/cyrus-sasl
 BUILD_DEPENDS+=	openssl-[0-9]*:../../security/openssl
 BUILD_DEPENDS+=	tcp_wrappers-[0-9]*:../../security/tcp_wrappers
 BUILD_DEPENDS+=	libnotify-[0-9]*:../../sysutils/libnotify
-BUILD_DEPENDS+=	gtk2+-[0-9]*:../../x11/gtk2
+BUILD_DEPENDS+=	gtk3+-[0-9]*:../../x11/gtk3
 BUILD_DEPENDS+=	motif-[0-9]*:../../x11/motif
 BUILD_DEPENDS+=	tk-[0-9]*:../../x11/tk