10 files changed, 12 insertions, 246 deletions

diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index dac1fbdebc28..1cca8102522b 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -2,24 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	pd
-DISTVERSION=	0.44-2
+DISTVERSION=	0.44-3
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	audio
-MASTER_SITES=	SF/pure-data/pure-data/${PORTVERSION} \
-		http://www-crca.ucsd.edu/~msp/Software/
+#MASTER_SITES=	SF/pure-data/pure-data/${PORTVERSION}
+MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIDI-capable real-time audio processor/synthesizer
 
 LICENSE=	BSD
 
+RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
+		dejavu>0:${PORTSDIR}/x11-fonts/dejavu
+
 OPTIONS_DEFINE=	ALSA FFTW JACK DOCS
+OPTIONS_DEFAULT=FFTW
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}
 
-USES=		pkgconfig
+USES=		gettext pkgconfig
 USE_TK_WRAPPER=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal libtoolize autoconf automake
 ACLOCAL_ARGS=	-I m4/generated -I m4
@@ -74,11 +77,7 @@ post-patch:
 		 /^libpddir/s|=.*|= $$(pkglibdir)| ; \
 		 s|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e \
-		'/^pd_LDADD/s| =.*| = $$(LIBM)| ; \
-		 s| x_midi.c|| ; \
-		 s| s_midi.c|| ; \
-		 s| s_midi_alsa.c|| ; \
-		 s| s_midi_oss.c||g' ${WRKSRC}/src/Makefile.am
+		'/^pd_LDADD/s| =.*| = $$(LIBM)|' ${WRKSRC}/src/Makefile.am
 	@${REINPLACE_CMD} -e \
 		's|PD_BASEDIR/LICENSE|${DOCSDIR}/LICENSE|g ; \
 		 s|PD_BASEDIR/doc/1|${DOCSDIR}/1|g' \
diff --git a/audio/pd/distinfo b/audio/pd/distinfo
index f5d543d5d575..3f8a0b9aff83 100644
--- a/audio/pd/distinfo
+++ b/audio/pd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pd-0.44-2.src.tar.gz) = 595908d7d5678e3f80ed1b6b37b41c9b5e22472893b1f489decfc805f56ee804
-SIZE (pd-0.44-2.src.tar.gz) = 2201154
+SHA256 (pd-0.44-3.src.tar.gz) = 242745f16bf27838150120022a8f5b63ea5c69441c305dcf637242686f615317
+SIZE (pd-0.44-3.src.tar.gz) = 2200542
diff --git a/audio/pd/files/patch-src_m_conf.c b/audio/pd/files/patch-src_m_conf.c
deleted file mode 100644
index 49e17cdbe38e..000000000000
--- a/audio/pd/files/patch-src_m_conf.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- src/m_conf.c.orig	Fri Mar 21 04:46:29 2003
-+++ src/m_conf.c	Tue Nov 11 22:42:47 2003
-@@ -32,7 +32,7 @@ void x_interface_setup(void);
- void x_connective_setup(void);
- void x_time_setup(void);
- void x_arithmetic_setup(void);
--void x_midi_setup(void);
-+//void x_midi_setup(void);
- void x_misc_setup(void);
- void x_net_setup(void);
- void x_qlist_setup(void);
-@@ -79,7 +79,7 @@ void conf_init(void)
-     x_connective_setup();
-     x_time_setup();
-     x_arithmetic_setup();
--    x_midi_setup();
-+//    x_midi_setup();
-     x_misc_setup();
-     x_net_setup();
-     x_qlist_setup();
diff --git a/audio/pd/files/patch-src_m_glob.c b/audio/pd/files/patch-src_m_glob.c
deleted file mode 100644
index 4860dfa6c5f0..000000000000
--- a/audio/pd/files/patch-src_m_glob.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$FreeBSD$
-
---- src/m_glob.c.orig	Sun Mar 25 00:37:25 2007
-+++ src/m_glob.c	Sun Mar 25 00:38:40 2007
-@@ -21,9 +21,9 @@
- void glob_audio_properties(t_pd *dummy, t_floatarg flongform);
- void glob_audio_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
- void glob_audio_setapi(t_pd *dummy, t_floatarg f);
--void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
--void glob_midi_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
--void glob_midi_setapi(t_pd *dummy, t_floatarg f);
-+//void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
-+//void glob_midi_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
-+//void glob_midi_setapi(t_pd *dummy, t_floatarg f);
- void glob_start_path_dialog(t_pd *dummy, t_floatarg flongform);
- void glob_path_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
- void glob_start_startup_dialog(t_pd *dummy, t_floatarg flongform);
-@@ -96,12 +96,12 @@
-         gensym("audio-dialog"), A_GIMME, 0);
-     class_addmethod(glob_pdobject, (t_method)glob_audio_setapi,
-         gensym("audio-setapi"), A_FLOAT, 0);
--    class_addmethod(glob_pdobject, (t_method)glob_midi_setapi,
--        gensym("midi-setapi"), A_FLOAT, 0);
--    class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
--        gensym("midi-properties"), A_DEFFLOAT, 0);
--    class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
--        gensym("midi-dialog"), A_GIMME, 0);
-+    //    class_addmethod(glob_pdobject, (t_method)glob_midi_setapi,
-+    //        gensym("midi-setapi"), A_FLOAT, 0);
-+    //    class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
-+    //        gensym("midi-properties"), A_DEFFLOAT, 0);
-+    //    class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
-+    //        gensym("midi-dialog"), A_GIMME, 0);
-     class_addmethod(glob_pdobject, (t_method)glob_start_path_dialog,
-         gensym("start-path-dialog"), 0);
-     class_addmethod(glob_pdobject, (t_method)glob_path_dialog,
diff --git a/audio/pd/files/patch-src_m_sched.c b/audio/pd/files/patch-src_m_sched.c
deleted file mode 100644
index 98d0e6dde2f9..000000000000
--- a/audio/pd/files/patch-src_m_sched.c
+++ /dev/null
@@ -1,69 +0,0 @@
---- src/m_sched.c.orig	2011-03-10 15:02:41.000000000 +0900
-+++ src/m_sched.c	2011-04-06 19:40:16.000000000 +0900
-@@ -394,8 +394,10 @@
- the audio I/O system is still busy with previous transfers.
- */
- 
-+#if !defined(__FreeBSD__)
- void sys_pollmidiqueue( void);
- void sys_initmidiqueue( void);
-+#endif
- 
-  /* sys_idlehook is a hook the user can fill in to grab idle time.  Return
- nonzero if you actually used the time; otherwise we're really really idle and
-@@ -419,7 +421,9 @@
-         sys_sleepgrain = 100;
-     else if (sys_sleepgrain > 5000)
-         sys_sleepgrain = 5000;
-+#if !defined(__FreeBSD__)
-     sys_initmidiqueue();
-+#endif
-     while (!sys_quit)
-     {
-         int didsomething = 0;
-@@ -476,7 +480,9 @@
-                     timeforward = SENDDACS_YES;
-             else timeforward = SENDDACS_NO;
-         }
-+#if !defined(__FreeBSD__)
-         sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
-+#endif
-         sys_addhist(1);
-         if (timeforward != SENDDACS_NO)
-             sched_tick(sys_time + sys_time_per_dsp_tick);
-@@ -484,7 +490,9 @@
-             didsomething = 1;
- 
-         sys_addhist(2);
-+#if !defined(__FreeBSD__)
-         sys_pollmidiqueue();
-+#endif
-         if (sys_pollgui())
-         {
-             if (!didsomething)
-@@ -523,11 +531,15 @@
- void sched_audio_callbackfn(void)
- {
-     sys_lock();
-+#if !defined(__FreeBSD__)
-     sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
-+#endif
-     sys_addhist(1);
-     sched_tick(sys_time + sys_time_per_dsp_tick);
-     sys_addhist(2);
-+#if !defined(__FreeBSD__)
-     sys_pollmidiqueue();
-+#endif
-     sys_addhist(3);
-     sys_pollgui();
-     sys_addhist(5);
-@@ -538,7 +550,9 @@
- 
- static void m_callbackscheduler(void)
- {
-+#if !defined(__FreeBSD__)
-     sys_initmidiqueue();
-+#endif
-     while (!sys_quit)
-     {
-         double timewas = sys_time;
diff --git a/audio/pd/files/patch-src_s_audio.c b/audio/pd/files/patch-src_s_audio.c
deleted file mode 100644
index 2417abf6ef3d..000000000000
--- a/audio/pd/files/patch-src_s_audio.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- src/s_audio.c.orig	Sat Oct 18 05:32:24 2003
-+++ src/s_audio.c	Tue Nov 11 22:46:57 2003
-@@ -716,7 +716,7 @@ void sys_listdevs(void )
- #endif
-     post("unknown API");    
- 
--    sys_listmididevs();
-+//    sys_listmididevs();
- }
- 
- void sys_setblocksize(int n)
diff --git a/audio/pd/files/patch-src_s_file.c b/audio/pd/files/patch-src_s_file.c
deleted file mode 100644
index 2af6bb91d9f3..000000000000
--- a/audio/pd/files/patch-src_s_file.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/s_file.c.orig	Sat Dec 31 21:08:37 2005
-+++ src/s_file.c	Sun Mar 25 01:47:57 2007
-@@ -339,7 +339,7 @@
-             break;
-         nmidioutdev++;
-     }
--    sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
-+//    sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
- 
-         /* search path */
-     if (sys_getpreference("npath", prefbuf, MAXPDSTRING))
-@@ -397,8 +397,8 @@
-     int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV];
-     int i, rate, advance;
-     char buf1[MAXPDSTRING], buf2[MAXPDSTRING];
--    int nmidiindev, midiindev[MAXMIDIINDEV];
--    int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
-+//    int nmidiindev, midiindev[MAXMIDIINDEV];
-+//    int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
- 
-     sys_initsavepreferences();
- 
-@@ -431,7 +431,7 @@
-     sprintf(buf1, "%d", rate);
-     sys_putpreference("rate", buf1);
- 
--        /* MIDI settings */
-+        /* MIDI settings
-     sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
-     sys_putpreference("nomidiin", (nmidiindev <= 0 ? "True" : "False"));
-     for (i = 0; i < nmidiindev; i++)
-@@ -447,6 +447,7 @@
-         sprintf(buf2, "%d", midioutdev[i]);
-         sys_putpreference(buf1, buf2);
-     }
-+    */
-         /* file search path */
- 
-     for (i = 0; 1; i++)
diff --git a/audio/pd/files/patch-src_s_inter.c b/audio/pd/files/patch-src_s_inter.c
deleted file mode 100644
index aab53df78ba8..000000000000
--- a/audio/pd/files/patch-src_s_inter.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/s_inter.c.orig	2011-03-20 07:22:27.000000000 +0900
-+++ src/s_inter.c	2011-04-06 20:20:35.000000000 +0900
-@@ -1251,7 +1251,11 @@
-              sys_gui("pdtk_watchdog\n");
- #endif
-          sys_get_audio_apis(buf);
-+#if defined(__FreeBSD__)
-+         strcpy(buf2, "{}");
-+#else
-          sys_get_midi_apis(buf2);
-+#endif
-          sys_set_searchpath();     /* tell GUI about path and startup flags */
-          sys_set_extrapath();
-          sys_set_startup();
diff --git a/audio/pd/files/patch-src_s_main.c b/audio/pd/files/patch-src_s_main.c
index 09eadc1b4fcb..952a7ed0694e 100644
--- a/audio/pd/files/patch-src_s_main.c
+++ b/audio/pd/files/patch-src_s_main.c
@@ -1,25 +1,5 @@
 --- src/s_main.c.orig	2011-03-07 10:11:02.000000000 +0900
 +++ src/s_main.c	2011-04-06 19:30:04.000000000 +0900
-@@ -300,7 +300,9 @@
-     else
-     {
-             /* open audio and MIDI */
-+#if !defined(__FreeBSD__)
-         sys_reopen_midi();
-+#endif
-         sys_reopen_audio();
-             /* run scheduler until it quits */
-         return (m_mainloop());
-@@ -628,7 +630,9 @@
-         }
-         else if (!strcmp(*argv, "-alsamidi"))
-         {
-+#if !defined(__FreeBSD__)
-           sys_set_midi_api(API_ALSA);
-+#endif
-             argc--; argv++;
-         }
- #endif
 @@ -936,7 +940,11 @@
              /* add "doc/5.reference" library to helppath */
      strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);
@@ -32,23 +12,3 @@
      sys_helppath = namelist_append_files(sys_helppath, sbuf);
          /* correct to make audio and MIDI device lists zero based.  On
          MMIO, however, "1" really means the second device (the first one
-@@ -990,7 +998,9 @@
-         for (i = 0; i < naudiooutdev; i++)
-             audiooutdev[i] = sys_soundoutdevlist[i];
-     }
-+#if !defined(__FreeBSD__)
-     sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
-+#endif
-     if (sys_nmidiin >= 0)
-     {
-         post("sys_nmidiin %d, nmidiindev %d", sys_nmidiin, nmidiindev);
-@@ -1015,7 +1025,9 @@
-     sys_set_audio_settings(naudioindev, audioindev, nchindev, chindev,
-         naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, advance, 
-         callback, blocksize);
-+#if !defined(__FreeBSD__)
-     sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
-+#endif
- }
- 
- static void sys_addreferencepath(void)
diff --git a/audio/pd/pkg-plist b/audio/pd/pkg-plist
index b72ceea97382..18d75392e313 100644
--- a/audio/pd/pkg-plist
+++ b/audio/pd/pkg-plist
@@ -392,8 +392,8 @@ libdata/pkgconfig/pd.pc
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/graph-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/hdial-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/help-intro.pd
-%%PORTDOCS%%%%DOCSDIR%%/5.reference/hradio-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/hip~-help.pd
+%%PORTDOCS%%%%DOCSDIR%%/5.reference/hradio-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/hslider-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/int-help.pd
 %%PORTDOCS%%%%DOCSDIR%%/5.reference/key-help.pd