diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,47 +1,43 @@ # $OpenBSD$ -COMMENT = ??? +COMMENT= audio programming language +DISTNAME= chuck-1.2.1.2 +CATEGORIES= audio +HOMEPAGE= http://chuck.cs.princeton.edu/ +MAINTAINER= Matt Jibson -DISTNAME = chuck-1.2.1.2 +# GPL +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes -CATEGORIES = audio +WANTLIB += c m ossaudio pthread stdc++ -HOMEPAGE = http://chuck.cs.princeton.edu/ +MASTER_SITES= ${HOMEPAGE}release/files/ +EXTRACT_SUFX= .tgz -MAINTAINER = Will Maier +LIB_DEPENDS= sndfile.>=1::audio/libsndfile +BUILD_DEPENDS= ::devel/bison +WRKSRC= ${WRKDIST}/src -# GPLv2+ -PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM =Yes -PERMIT_DISTFILES_FTP = Yes +USE_GMAKE= Yes +MAKE_FILE= makefile.oss +ALL_TARGET= chuck -WANTLIB = c pthread m ossaudio stdc++ - -MASTER_SITES = ${HOMEPAGE}/release/files/ -EXTRACT_SUFX = .tgz - -LIB_DEPENDS = sndfile.>=1::audio/libsndfile - -USE_GMAKE = Yes -CONFIGURE_STYLE = simple -LDFLAGS = -L${PREFIX}/lib -CFLAGS = -I${PREFIX}/include -MAKE_ENV = LDFLAGS="${LDFLAGS}" \ - LIBS="-lpthread -lossaudio" - -WRKBUILD = ${WRKSRC}/src - -MAKE_FILE = makefile.oss -ALL_TARGET = chuck - -do-configure: +EXAMPLES= . analysis analysis/features array basic class ctrl deep \ + event filter func hid midi multi oper osc shred special \ + stereo stk string time type do-install: - ${INSTALL_PROGRAM} ${WRKBUILD}/chuck ${PREFIX}/bin/chuck + ${INSTALL_PROGRAM} ${WRKSRC}/chuck ${PREFIX}/bin/chuck ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/chuck - ${INSTALL_DATA} ${WRKSRC}/doc/ChucK_manual.pdf ${PREFIX}/share/doc/chuck - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chuck - @cd ${WRKSRC}/examples && pax -rw . ${PREFIX}/share/examples/chuck + ${INSTALL_DATA} ${WRKDIST}/doc/ChucK_manual.pdf ${PREFIX}/share/doc/chuck + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chuck/data + ${INSTALL_DATA} ${WRKDIST}/examples/data/* ${PREFIX}/share/examples/chuck/data +.for i in ${EXAMPLES} + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chuck/${i} + ${INSTALL_DATA} ${WRKDIST}/examples/${i}/*.ck ${PREFIX}/share/examples/chuck/${i} +.endfor .include diff --git a/patches/patch-src_chuck_def_h b/patches/patch-src_chuck_def_h --- a/patches/patch-src_chuck_def_h +++ b/patches/patch-src_chuck_def_h @@ -1,6 +1,6 @@ $OpenBSD$ ---- src/chuck_def.h.orig Mon Sep 29 09:51:25 2008 -+++ src/chuck_def.h Mon Sep 29 09:53:40 2008 +--- src/chuck_def.h.orig Wed Aug 13 12:07:13 2008 ++++ src/chuck_def.h Mon Oct 13 05:25:29 2008 @@ -136,6 +136,10 @@ typedef struct { SAMPLE re ; SAMPLE im ; } t_CKCOMPLEX #define __PLATFORM_MACOSX__ #endif diff --git a/patches/patch-src_makefile_oss b/patches/patch-src_makefile_oss --- a/patches/patch-src_makefile_oss +++ b/patches/patch-src_makefile_oss @@ -1,21 +1,17 @@ $OpenBSD$ ---- src/makefile.oss.orig Mon Sep 29 09:26:33 2008 -+++ src/makefile.oss Mon Sep 29 09:29:04 2008 -@@ -6,7 +6,7 @@ YACC=bison - INCLUDES= +--- src/makefile.oss.orig Mon Oct 13 05:48:34 2008 ++++ src/makefile.oss Mon Oct 13 05:49:41 2008 +@@ -3,10 +3,10 @@ CC?=gcc + CXX?=g++ + LEX=flex + YACC=bison +-INCLUDES= ++INCLUDES=-I/usr/local/include CFLAGS?= -O3 - FLAGS= -D__LINUX_OSS__ -c $(CFLAGS) +-FLAGS= -D__LINUX_OSS__ -c $(CFLAGS) -LIBS=-lpthread -lstdc++ -ldl -lm -+#LIBS=-lpthread -lstdc++ -ldl -lm ++FLAGS= -D__LINUX_OSS__ -c $(CFLAGS) ${INCLUDES} ++LIBS=-L/usr/local/lib -lpthread -lossaudio SF_OBJ=util_sndfile.o ifneq ($(CHUCK_DEBUG),) -@@ -38,7 +38,7 @@ OBJS= chuck.tab.o chuck.yy.o chuck_absyn.o chuck_par - util_hid.o uana_xform.o uana_extract.o $(SF_OBJ) - - chuck: $(OBJS) -- $(CXX) -o chuck $(OBJS) $(LIBS) -+ $(CXX) ${LDFLAGS} -o chuck $(OBJS) $(LIBS) - - chuck.tab.o: chuck.tab.c - $(CC) $(FLAGS) chuck.tab.c diff --git a/patches/patch-src_rtaudio_cpp b/patches/patch-src_rtaudio_cpp --- a/patches/patch-src_rtaudio_cpp +++ b/patches/patch-src_rtaudio_cpp @@ -1,6 +1,6 @@ $OpenBSD$ ---- src/rtaudio.cpp.orig Wed Aug 13 13:07:27 2008 -+++ src/rtaudio.cpp Mon Sep 29 09:51:53 2008 +--- src/rtaudio.cpp.orig Wed Aug 13 12:07:27 2008 ++++ src/rtaudio.cpp Mon Oct 13 05:25:33 2008 @@ -507,11 +507,19 @@ bool RtApi :: probeDeviceOpen( int device, StreamMode #include #include diff --git a/patches/patch-src_ugen_stk_h b/patches/patch-src_ugen_stk_h --- a/patches/patch-src_ugen_stk_h +++ b/patches/patch-src_ugen_stk_h @@ -1,6 +1,6 @@ $OpenBSD$ ---- src/ugen_stk.h.orig Wed Aug 13 13:07:14 2008 -+++ src/ugen_stk.h Mon Sep 29 09:52:09 2008 +--- src/ugen_stk.h.orig Wed Aug 13 12:07:14 2008 ++++ src/ugen_stk.h Mon Oct 13 05:25:33 2008 @@ -54,6 +54,12 @@ t_CKBOOL stk_detach( t_CKUINT type, void * data ); #endif diff --git a/patches/patch-src_util_console_cpp b/patches/patch-src_util_console_cpp --- a/patches/patch-src_util_console_cpp +++ b/patches/patch-src_util_console_cpp @@ -1,6 +1,6 @@ $OpenBSD$ ---- src/util_console.cpp.orig Wed Aug 13 13:07:32 2008 -+++ src/util_console.cpp Mon Sep 29 09:54:36 2008 +--- src/util_console.cpp.orig Wed Aug 13 12:07:32 2008 ++++ src/util_console.cpp Mon Oct 13 05:25:33 2008 @@ -92,7 +92,7 @@ void io_addhistory( const char * addme ) // kb hit #ifndef __PLATFORM_WIN32__ diff --git a/patches/patch-src_util_hid_cpp b/patches/patch-src_util_hid_cpp --- a/patches/patch-src_util_hid_cpp +++ b/patches/patch-src_util_hid_cpp @@ -1,6 +1,6 @@ $OpenBSD$ ---- src/util_hid.cpp.orig Wed Aug 13 13:07:32 2008 -+++ src/util_hid.cpp Mon Sep 29 10:56:05 2008 +--- src/util_hid.cpp.orig Mon Oct 13 05:46:37 2008 ++++ src/util_hid.cpp Mon Oct 13 05:25:33 2008 @@ -71,7 +71,151 @@ const t_CKUINT CK_HID_TABLET_MOTION = 15; const t_CKUINT CK_HID_TABLET_ROTATION = 16; const t_CKUINT CK_HID_MSG_COUNT = 17; diff --git a/pkg/DESCR b/pkg/DESCR --- a/pkg/DESCR +++ b/pkg/DESCR @@ -1,9 +1,6 @@ ChucK is an audio programming language for real-time synthesis, -composition, performance, and analysis. ChucK presents a new -time-based, concurrent programming model that's highly precise and -expressive with dynamic control rates, and the ability to add and -modify code on-the-fly. In addition, ChucK supports MIDI, OSC and -multi-channel audio. It's fun and easy to learn, and offers -composers, researchers, and performers a powerful programming tool -for building and experimenting with complex audio synthesis/analysis -programs, and real-time interactive control. +composition, performance, and analysis. ChucK presents a new time-based, +concurrent programming model that's highly precise and strongly-timed, +as well as dynamic control rates, and the ability to add and modify code +on-the-fly. In addition, ChucK supports MIDI, OSC, HID device, and +multi-channel audio. diff --git a/pkg/PLIST b/pkg/PLIST --- a/pkg/PLIST +++ b/pkg/PLIST @@ -3,7 +3,6 @@ share/doc/chuck/ share/doc/chuck/ChucK_manual.pdf share/examples/chuck/ -share/examples/chuck/README share/examples/chuck/analysis/ share/examples/chuck/analysis/dct.ck share/examples/chuck/analysis/features/ @@ -109,7 +108,6 @@ share/examples/chuck/deep/thx.ck share/examples/chuck/deep/unclap.ck share/examples/chuck/event/ -share/examples/chuck/event/ALSO_SEE share/examples/chuck/event/broadcast.ck share/examples/chuck/event/clix.ck share/examples/chuck/event/clix2.ck