aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2012-03-25 03:55:37 +0000
committerMartin Wilke <miwi@FreeBSD.org>2012-03-25 03:55:37 +0000
commit96c27b6b378de6fe3e7087acb3432e54dd4527df (patch)
tree37fbb840e58f6818fb62f019f1f2a933da029c96
parent8ad83bd55cff74d678f0b89233d02641f1d7a58f (diff)
downloadports-96c27b6b378de6fe3e7087acb3432e54dd4527df.tar.gz
ports-96c27b6b378de6fe3e7087acb3432e54dd4527df.zip
- Update to 0.43.1
PR: 166015 Submitted by: Ports Fury Feature safe: yes
Notes
Notes: svn path=/head/; revision=293784
-rw-r--r--audio/pd/Makefile28
-rw-r--r--audio/pd/distinfo4
-rw-r--r--audio/pd/files/patch-src_s_audio_alsa.c17
-rw-r--r--audio/pd/pkg-plist1
4 files changed, 44 insertions, 6 deletions
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index e8537ff94558..6f00f816d817 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= pd
-DISTVERSION= 0.43-0
+DISTVERSION= 0.43-1
DISTVERSIONSUFFIX= .src
CATEGORIES= audio
MASTER_SITES= http://www-crca.ucsd.edu/~msp/Software/
@@ -16,6 +16,9 @@ COMMENT= MIDI-capable real-time audio processor/synthesizer
LICENSE= BSD
+OPTIONS= ALSA "Enable ALSA support" off \
+ JACK "Enable JACK support" off
+
WRKSRC= ${WRKDIR}/${DISTNAME:S;.src;/src;}
PATCH_WRKSRC= ${WRKSRC}/..
@@ -29,9 +32,25 @@ MAKE_JOBS_UNSAFE= yes
MAN1= pd.1 pdreceive.1 pdsend.1
-CPPFLAGS+= -I${TCL_INCLUDEDIR}
+CPPFLAGS+= -I${TCL_INCLUDEDIR} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.include <bsd.port.options.mk>
+
+.if defined(WITH_ALSA)
+LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
+CONFIGURE_ARGS+= --enable-alsa
+.else
+CONFIGURE_ARGS+= --disable-alsa
+.endif
+
+.if defined(WITH_JACK)
+LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
+CONFIGURE_ARGS+= --enable-jack
+.else
+CONFIGURE_ARGS+= --disable-jack
+.endif
+
post-patch:
@${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
's|__FreeBSD_kernel__|__FreeBSD__|g ; \
@@ -43,6 +62,7 @@ post-patch:
s|-ltcl8[0-9]|-ltcl${USE_TCL}|g ; \
s|-ltk8[0-9]|-ltk${USE_TK}|g ; \
s|s_midi_oss.c ||g ; \
+ /SYSSRC/s|s_midi_alsa.c||g ; \
/uname/s|Linux|${OPSYS}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|$$(WARN_CFLAGS)||g ; \
@@ -80,8 +100,8 @@ do-install:
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
@${FIND} ${DOCSDIR} -type d -exec ${CHMOD} 755 {} \;
@${FIND} ${DOCSDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \;
-.for file in LICENSE.txt README.txt
- ${INSTALL_DATA} ${WRKSRC}/../${file} ${DOCSDIR}
+.for i in LICENSE.txt README.txt
+ ${INSTALL_DATA} ${WRKSRC}/../${i} ${DOCSDIR}
.endfor
@${LN} -sf ${DOCSDIR} ${PREFIX}/lib/pd/doc
.endif
diff --git a/audio/pd/distinfo b/audio/pd/distinfo
index a10db2c91154..26b702f94618 100644
--- a/audio/pd/distinfo
+++ b/audio/pd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pd-0.43-0.src.tar.gz) = e2fbc8f854397368fe428c6dc358a46e00065daf7bd9dc18c85304b9513fd8e1
-SIZE (pd-0.43-0.src.tar.gz) = 2194131
+SHA256 (pd-0.43-1.src.tar.gz) = ecbae559926d4120a8c4d9aee4e441c1a2b4c3120460249e5d9634bcec7a3c2b
+SIZE (pd-0.43-1.src.tar.gz) = 2186998
diff --git a/audio/pd/files/patch-src_s_audio_alsa.c b/audio/pd/files/patch-src_s_audio_alsa.c
new file mode 100644
index 000000000000..29fc3b360a86
--- /dev/null
+++ b/audio/pd/files/patch-src_s_audio_alsa.c
@@ -0,0 +1,17 @@
+--- src/s_audio_alsa.c.orig 2011-11-07 13:06:38.000000000 +0900
++++ src/s_audio_alsa.c 2012-02-26 03:12:50.000000000 +0900
+@@ -25,7 +25,14 @@
+ #include <sched.h>
+ #include <sys/mman.h>
+ #include "s_audio_alsa.h"
++#if defined(__FreeBSD__)
++#include <sys/endian.h>
++#define LITTLE_ENDIAN _LITTLE_ENDIAN
++#define BIG_ENDIAN _BIG_ENDIAN
++#define BYTE_ORDER _BYTE_ORDER
++#else
+ #include <endian.h>
++#endif
+
+ /* Defines */
+ #define DEBUG(x) x
diff --git a/audio/pd/pkg-plist b/audio/pd/pkg-plist
index e1134129e3bb..f4d0fb0193a2 100644
--- a/audio/pd/pkg-plist
+++ b/audio/pd/pkg-plist
@@ -109,6 +109,7 @@ lib/pd/tcl/opt_parser.tcl
lib/pd/tcl/pd-gui.tcl
lib/pd/tcl/pd_bindings.tcl
lib/pd/tcl/pd_connect.tcl
+lib/pd/tcl/pd_guiprefs.tcl
lib/pd/tcl/pd_menucommands.tcl
lib/pd/tcl/pd_menus.tcl
lib/pd/tcl/pdtk_array.tcl