- Update to version 0.9.4

PR:		170134
Submitted by:	Ports Fury

audio/denemo/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	denemo
-PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTVERSION=	0.9.6
 CATEGORIES=	audio
 MASTER_SITES=	GNU
 
@@ -11,53 +10,50 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Graphical score editor
 
 BUILD_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
-LIB_DEPENDS=	aubio.3:${PORTSDIR}/audio/aubio \
-		fluidsynth.1:${PORTSDIR}/audio/fluidsynth \
-		jack.0:${PORTSDIR}/audio/jack \
-		guile.21:${PORTSDIR}/lang/guile \
-		fftw3:${PORTSDIR}/math/fftw3 \
-		smf.0:${PORTSDIR}/audio/libsmf
+LIB_DEPENDS=	aubio:${PORTSDIR}/audio/aubio \
+		fluidsynth:${PORTSDIR}/audio/fluidsynth \
+		jack:${PORTSDIR}/audio/jack \
+		smf:${PORTSDIR}/audio/libsmf \
+		sndfile:${PORTSDIR}/audio/libsndfile \
+		evview:${PORTSDIR}/graphics/evince \
+		guile:${PORTSDIR}/lang/guile \
+		fftw3:${PORTSDIR}/math/fftw3
 RUN_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 
-OPTIONS+=	LILYPOND "Install LilyPond (Printing)" off
+LICENSE=	GPLv3
+
+OPTIONS_DEFINE=	LILYPOND DOCS EXAMPLES
+LILYPOND_DESC=	Install LilyPond (Printing)
 
 USE_GNOME=	gtk20 gtksourceview2 librsvg2 libxml2
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-jack \
+		--disable-portmidi \
 		--sysconfdir=${PREFIX}/etc
+MAKE_JOBS_SAFE=	yes
 
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 \
+		-I${LOCALBASE}/include
+LDFLAGS+=	${LOCALBASE}/lib/portaudio2/libportaudio.so \
+		-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
 
-.if defined(WITH_LILYPOND)
+.if ${PORT_OPTIONS:MLILYPOND}
 RUN_DEPENDS+=	lilypond:${PORTSDIR}/print/lilypond
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.else
-USE_GETTEXT=		yes
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS=""
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|m4 doc actions|m4 actions| ; \
-		 s|examples templates|templates|' \
-		 -e "/\/examples/d"  ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/<malloc.h>/d' ${WRKSRC}/ltmain.sh
+	@${REINPLACE_CMD} -e \
+		's|evince-view-2.30|evince-view-2.32|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|doc|| ; \
+		 /\/examples/d' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${LN} -sf ${DOCSDIR}/manual ${DATADIR}/manual
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in AUTHORS ChangeLog NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -70,9 +66,9 @@ post-install:
 	@${MKDIR} ${DOCSDIR}/manual/images
 	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/manual/images
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.denemo ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

audio/denemo/distinfo

@@ -1,2 +1,2 @@
-SHA256 (denemo-0.9.2.tar.gz) = 4853b831495a732d4dc2cd1dc0ad8c7a9bfc5bd87386e7cf387554bcdbb0deda
-SIZE (denemo-0.9.2.tar.gz) = 12305392
+SHA256 (denemo-0.9.6.tar.gz) = b04299fbf2f3207438da043b1a6d3748c86e48e9ee8af00de8bb2dec7795b6d4
+SIZE (denemo-0.9.6.tar.gz) = 13273412

audio/denemo/files/patch-src__alsabackend.h

@@ -0,0 +1,26 @@
+--- src/alsabackend.h
++++ src/alsabackend.h
+@@ -0,0 +1,23 @@
++/*
++ * alsabackend.h
++ * ALSA sequencer MIDI backend.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef ALSABACKEND_H
++#define ALSABACKEND_H
++
++#include "audiointerface.h"
++
++extern backend_t alsa_seq_midi_backend;
++
++
++#endif // ALSABACKEND_H
++

audio/denemo/files/patch-src__audiointerface.c

@@ -0,0 +1,10 @@
+--- src/audiointerface.c.orig	2012-09-20 22:44:28.771017000 +0900
++++ src/audiointerface.c	2012-10-05 06:05:30.000000000 +0900
+@@ -14,6 +14,7 @@
+ #include "audiointerface.h"
+ #include "eventqueue.h"
+ #include "dummybackend.h"
++#include "sourceaudio.h"
+ 
+ #ifdef _HAVE_JACK_
+   #include "jackbackend.h"

audio/denemo/files/patch-src__audiointerface.h

@@ -0,0 +1,12 @@
+--- src/audiointerface.h.orig	2012-09-20 22:44:28.775017000 +0900
++++ src/audiointerface.h	2012-10-05 06:05:30.000000000 +0900
+@@ -228,6 +228,9 @@
+ gboolean read_event_from_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
+                                double *event_time, double until_time);
+ 
++gboolean read_event_from_mixer_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
++                               double *event_time, double until_time);
++
+ /**
+  * Called by a backend to notify the audio subsystem that the current playback
+  * time changed. Usually this is called once per period during playback.

audio/denemo/files/patch-src__eventqueue.c

@@ -0,0 +1,10 @@
+--- src/eventqueue.c.orig	2012-09-20 22:44:28.795017000 +0900
++++ src/eventqueue.c	2012-10-05 06:05:30.000000000 +0900
+@@ -13,6 +13,7 @@
+ 
+ #include "eventqueue.h"
+ #include "midi.h"
++#include "moveviewport.h"
+ 
+ #include <glib.h>
+ #include <string.h>

audio/denemo/files/patch-src__jackbackend.h

@@ -0,0 +1,26 @@
+--- src/jackbackend.h
++++ src/jackbackend.h
+@@ -0,0 +1,23 @@
++/*
++ * jackbackend.h
++ * JACK audio and MIDI backends.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef JACKBACKEND_H
++#define JACKBACKEND_H
++
++#include "audiointerface.h"
++
++extern backend_t jack_audio_backend;
++extern backend_t jack_midi_backend;
++
++
++#endif // JACKBACKEND_H

audio/denemo/files/patch-src__jackmidi.c

@@ -1,10 +0,0 @@
---- src/jackmidi.c.orig	2011-04-27 19:59:45.083923000 +0200
-+++ src/jackmidi.c	2011-05-07 10:44:07.000000000 +0200
-@@ -7,6 +7,7 @@
- #include <math.h>
- #include <string.h>
- #include <assert.h>
-+#include <sys/time.h>
- #include "exportmidi.h"
- #include "jackmidi.h"
- #include "pitchentry.h"

audio/denemo/files/patch-src__jackutil.h

@@ -0,0 +1,40 @@
+--- src/jackutil.h
++++ src/jackutil.h
+@@ -0,0 +1,37 @@
++/*
++ * jackutil.h
++ * JACK utility functions.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef JACKUTIL_H
++#define JACKUTIL_H
++
++#include <glib.h>
++
++/**
++ * Returns a list of available JACK port names, that is, ports to which our
++ * own input/output ports can be connected.
++ *
++ * If the JACK server is not running or there are no available ports, this
++ * function returns NULL.
++ *
++ * @param midi    if TRUE returns MIDI ports, otherwise audio ports.
++ * @param output  if TRUE returns output ports, otherwise input ports.
++ */
++GList *get_jack_ports(gboolean midi, gboolean output);
++
++/**
++ * Frees a list returned by get_jack_ports()
++ */
++void free_jack_ports(GList *list);
++
++
++#endif // JACKUTIL_H

audio/denemo/files/patch-src__portaudiobackend.c

@@ -0,0 +1,10 @@
+--- src/portaudiobackend.c.orig	2012-09-20 22:44:28.823018000 +0900
++++ src/portaudiobackend.c	2012-10-05 06:05:30.000000000 +0900
+@@ -16,6 +16,7 @@
+ #include "portaudioutil.h"
+ #include "midi.h"
+ #include "fluid.h"
++#include "audiointerface.h"
+ 
+ #include <portaudio.h>
+ #include <glib.h>

audio/denemo/pkg-descr

@@ -1,8 +1,4 @@
-from the README:
-
-GNU Denemo is a graphical music notation program.  It is intended
-to be used in conjunction with GNU Lilypond.
+GNU Denemo is a graphical music notation program. It is intended to be
+used in conjunction with GNU Lilypond.
 
 WWW:  http://www.denemo.org/
-
-Trevor Johnson