Date: Tue, 16 Dec 2014 08:58:41 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374789 - in head/audio/jack: . files Message-ID: <201412160858.sBG8wfR8051371@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Tue Dec 16 08:58:40 2014 New Revision: 374789 URL: https://svnweb.freebsd.org/changeset/ports/374789 QAT: https://qat.redports.org/buildarchive/r374789/ Log: Allow jack to be upgraded when already installed. [1] Move doxygen depend and docs out of DOCS option. [2] PR: 195533 [1], 195573 [2] Submitted by: Mikhail T. <mi@ALDAN.algebra.com> [1], amdmi3@ [2] Added: head/audio/jack/files/patch-configure (contents, props changed) Modified: head/audio/jack/Makefile head/audio/jack/pkg-plist Modified: head/audio/jack/Makefile ============================================================================== --- head/audio/jack/Makefile Tue Dec 16 08:56:09 2014 (r374788) +++ head/audio/jack/Makefile Tue Dec 16 08:58:40 2014 (r374789) @@ -35,7 +35,7 @@ INSTALL_TARGET= install-strip LATEST_LINK= jack -OPTIONS_DEFINE= ALSA DOCS READLINE +OPTIONS_DEFINE= ALSA DOXYGEN READLINE OPTIONS_DEFAULT=READLINE OPTIONS_SUB= yes @@ -46,7 +46,7 @@ READLINE_LIB_DEPENDS= libreadline.so:${P .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen .else CONFIGURE_ENV+= ac_cv_prog_HAVE_DOXYGEN="false" Added: head/audio/jack/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/jack/files/patch-configure Tue Dec 16 08:58:40 2014 (r374789) @@ -0,0 +1,51 @@ +--- configure 2014-01-22 15:23:47.000000000 -0500 ++++ configure 2014-11-30 13:05:39.000000000 -0500 +@@ -2608,48 +2608,4 @@ + + +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking existing, conflicting JACK installs" >&5 +-$as_echo_n "checking existing, conflicting JACK installs... " >&6; } +-not_overwriting=0 +-installs= +-for dir in /usr/lib /usr/local/lib /opt/lib ; do +- if test -d $dir ; then +- if test $(find $dir/ -name 'libjack.so.*' 2>/dev/null | wc -l) -gt 0 ; then +- if echo $prefix/lib | grep -vs $dir >/dev/null 2>&1 ; then +- not_overwriting=$(expr $not_overwriting + 1) +- fi +- installs="$installs $dir" +- fi +- fi +-done +- +-if test $not_overwriting -gt 0 ; then +- echo +- echo +- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +- echo "You appear to have at least one existing installation of JACK." +- echo +- echo "Complete or partial JACK installs exist in:$installs" +- echo +- echo "Installing this version will leave at least one of these" +- echo "existing installations installed and this will probably break" +- echo "JACK on your machine. " +- echo +- echo "Before building, you should first remove the existing JACK" +- echo "installation(s). " +- echo +- echo "Alternatively use ./configure --prefix=... to force overwriting" +- echo "the existing install." +- echo +- echo "WARNING: ON ANY DEBIAN-DERIVED DISTRIBUTION (Debian, Ubuntu etc)" +- echo "CHANGING THE INSTALLATION PREFIX WILL NOT PRODUCE A WORKING JACK" +- echo "INSTALL. Please contact the distribution packager for JACK and" +- echo "ask them to fix their packaging." +- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +- exit 1 +-fi +- + ac_aux_dir= + for ac_dir in config "$srcdir"/config; do Modified: head/audio/jack/pkg-plist ============================================================================== --- head/audio/jack/pkg-plist Tue Dec 16 08:56:09 2014 (r374788) +++ head/audio/jack/pkg-plist Tue Dec 16 08:58:40 2014 (r374789) @@ -73,92 +73,92 @@ lib/libjackserver.so.0.0.28 libdata/pkgconfig/jack.pc man/man1/jackd.1.gz man/man1/jackstart.1.gz -%%DOCS%%share/jack-audio-connection-kit/reference/html/annotated.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/classes.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/control_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/control_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/deprecated.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/dir_3e6ff996e0a05d442d13220a8cf7408f.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/dir_d611c2c1e1e252f8153c91ce21a161f9.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/doxygen.css -%%DOCS%%share/jack-audio-connection-kit/reference/html/doxygen.png -%%DOCS%%share/jack-audio-connection-kit/reference/html/files.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/fsm.png -%%DOCS%%share/jack-audio-connection-kit/reference/html/functions.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/functions_vars.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_defs.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_e.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_enum.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_eval.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_func.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_i.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_j.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_m.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_o.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_p.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_type.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_vars.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/globals_w.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientCallbacks.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientFunctions.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ClientThreads.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ControlAPI.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ErrorOutput.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__JackSessionManagerAPI.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__LatencyFunctions.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__MIDIAPI.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__Metadata.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__NonCallbackAPI.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__PortFunctions.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__PortSearching.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__ServerControl.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__SessionClientFunctions.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__TimeFunctions.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__TransportControl.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/group__WeakLinkage.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/index.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/inprocess_8c.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/intclient_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/jack_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/jack_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/mainpage_8dox.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/metadata_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/metadata_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/midiport_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/modules.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/pages.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/porting-guide.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/porting_8dox.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/session_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/session_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/statistics_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__latency__range.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/struct__jack__session__event.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__description__t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__position__t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__property__t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__session__command__t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/structport__pair__t.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/thread_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/thread_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/transport-design.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8dox.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/transport_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/types_8h_source.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/unionjackctl__parameter__value.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/weakjack_8h.html -%%DOCS%%share/jack-audio-connection-kit/reference/html/weakjack_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/annotated.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/classes.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/control_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/control_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/deprecated.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/dir_3e6ff996e0a05d442d13220a8cf7408f.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/dir_d611c2c1e1e252f8153c91ce21a161f9.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/doxygen.css +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/doxygen.png +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/files.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/fsm.png +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/functions.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/functions_vars.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_defs.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_e.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_enum.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_eval.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_func.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_i.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_j.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_m.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_o.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_p.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_type.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_vars.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/globals_w.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__ClientCallbacks.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__ClientFunctions.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__ClientThreads.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__ControlAPI.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__ErrorOutput.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__JackSessionManagerAPI.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__LatencyFunctions.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__MIDIAPI.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__Metadata.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__NonCallbackAPI.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__PortFunctions.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__PortSearching.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__ServerControl.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__SessionClientFunctions.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__TimeFunctions.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__TransportControl.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/group__WeakLinkage.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/index.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/inprocess_8c.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/intclient_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/intclient_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/jack_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/jack_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/mainpage_8dox.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/metadata_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/metadata_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/midiport_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/midiport_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/modules.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/pages.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/porting-guide.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/porting_8dox.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/ringbuffer_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/session_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/session_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/simple__client_8c.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/statistics_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/statistics_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/struct__jack__latency__range.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/struct__jack__midi__event.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/struct__jack__session__event.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/structjack__description__t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/structjack__position__t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/structjack__property__t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__data__t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/structjack__ringbuffer__t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/structjack__session__command__t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/structjack__transport__info__t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/structport__pair__t.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/thread_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/thread_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/transport-design.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/transport_8dox.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/transport_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/transport_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/types_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/types_8h_source.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/unionjackctl__parameter__value.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/weakjack_8h.html +%%DOXYGEN%%share/jack-audio-connection-kit/reference/html/weakjack_8h_source.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412160858.sBG8wfR8051371>