Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Dec 2018 16:10:33 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486468 - head/audio/cava
Message-ID:  <201812021610.wB2GAXLF012504@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sun Dec  2 16:10:33 2018
New Revision: 486468
URL: https://svnweb.freebsd.org/changeset/ports/486468

Log:
  audio/cava: Unbreak build when vtfontcvt is missing

Modified:
  head/audio/cava/Makefile

Modified: head/audio/cava/Makefile
==============================================================================
--- head/audio/cava/Makefile	Sun Dec  2 15:41:47 2018	(r486467)
+++ head/audio/cava/Makefile	Sun Dec  2 16:10:33 2018	(r486468)
@@ -11,7 +11,6 @@ COMMENT=	Console-based Audio Visualizer for MPD, Pulse
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	psf2bdf:x11-fonts/psftools
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libiniparser.so:devel/iniparser
 
@@ -25,13 +24,18 @@ CONFIGURE_ENV=	ac_cv_lib_asound_snd_pcm_open=no \
 
 INSTALL_TARGET=	install-strip
 
-PLIST_FILES=	bin/cava ${DATADIR}/cava.fnt
+PLIST_FILES=	bin/cava
 PORTDOCS=	README.md
 PORTEXAMPLES=	config
 
-OPTIONS_DEFINE=	DOCS EXAMPLES PULSEAUDIO SNDIO
-OPTIONS_DEFAULT=PULSEAUDIO SNDIO
+OPTIONS_DEFINE=		DOCS EXAMPLES PULSEAUDIO SNDIO VT
+OPTIONS_DEFAULT=	PULSEAUDIO SNDIO VT
+.if !exists(/usr/bin/vtfontcvt)
+OPTIONS_EXCLUDE=	VT
+.endif
 
+VT_DESC=	Build with vt(4) support (installs custom font)
+
 PULSEAUDIO_CONFIGURE_ENV_OFF=	ac_cv_lib_pulse_simple_pa_simple_new=no
 PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio \
 				libpulse.so:audio/pulseaudio \
@@ -39,10 +43,14 @@ PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/puls
 SNDIO_CONFIGURE_ENV_OFF=	ac_cv_lib_sndio_sio_open=no
 SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
 
+VT_BUILD_DEPENDS=		psf2bdf:x11-fonts/psftools
+VT_MAKE_ARGS_OFF=		cava_font__DATA=""
+VT_PLIST_FILES=			${DATADIR}/cava.fnt
+
 pre-configure:
 	@${ECHO_CMD} ${DISTVERSION} > ${WRKSRC}/version
 
-pre-build:
+pre-build-VT-on:
 	psf2bdf ${WRKSRC}/cava.psf > ${WRKSRC}/cava.bdf
 	vtfontcvt ${WRKSRC}/cava.bdf ${WRKSRC}/cava.fnt
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812021610.wB2GAXLF012504>