audio/din: Updates to 48

Changes since 47.1:

DIN Is Noise 48:

  /*  create drone pendulum based on number of drones instead of spacing

  /* convert selected pitched drones to noising drones and vice-versa.
    + CTRL + . to convert selected pitched drones to noising drones
      or Menu >> Drone Tools >> Drone > Noise
    + CTRL + , to convert selected noising drones to pitched drones
      or Menu >> Drone Tools >> Noise > Drone

  /* mute and unmute selected drones
    + SHIFT + , to mute selected drones or Menu > Drone tools > Mute
    + SHIFT + . to unmute selected drones or Menu > Drone tools > Unmute

  /* Zero and Reset gravity from Gravity widget

  /* Zero velocity of drones

  /* Start and End angles for geometry > sound plugins on curve editor
    + ie., Circler, Rose_Milker and Lissajous
      + you can now turn a part - an arc - of rose and lissajous curves into waveforms/envelopes/modulators!
    + Phase for Spiraler
      + End angle found from Turns

  /* Start, End points in Countries plugin on curve editors

    + turn 'arc' of a 'country polygon' into waveform/envelope/modulator

  /* set Phase of each harmonic in Sine_Mixer

    + press g to toggle between harmonics and phase 'levels'
    + Phase levels is blue
      + goes from 0 deg (bottom) to 360 deg (top)

  /* press f to toggle paint harmonics (or phase) in Sine_Mixer

  /* overlay last screen (instrument or editor) on curve editor

  /* !EXPERIMENTAL! mouse slider increment scaling

    When using mouse slider:

      press , to set increment to 1/N of original increment
      press . to set increment to Nx of original increment
      press 1,2,3...9 sets N = 1,2,3...9
      press 0 to set N = 10
      default N = 10

  /* if selected drones exist, set initial menu tab to Drone Params on microtonal keyboard

  * ` to flip to last screen
      * flip between editors
      * flip between instruments

  * improved curve editor
    * curve samples display, curve component picker, cursor display

  * improved auto splitting 'box that has a ball' in Mondrian
    * results in better trapping of ball(s) in box(es) :)

  ! fixed dont warp mouse when mouse slider activation aborted !
  ! fixed add/remove gravity widget on menu toggle !
  ! fixed load/save of launched drones !
  ! fixed reset velocity & gravity !
  ! fixed crash when clearing all harmonic bookmarks and moving sine mixer !
  ! fixed name of radius curve in spiraler plugin !
  ! fixed drones per minute as float instead of int !
  ! removed release location from the title bar as COVID-19 has grounded me in Chennai, India :( !

4 files changed, 19 insertions, 17 deletions

diff --git a/audio/din/Makefile b/audio/din/Makefile
index 5e339f2a6bc..0c8ef4d25f5 100644
--- a/audio/din/Makefile
+++ b/audio/din/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2020/08/18 17:57:35 leot Exp $
+# $NetBSD: Makefile,v 1.23 2020/09/04 13:02:57 fox Exp $
 
-DISTNAME=	din-47.1
-PKGREVISION=	1
+DISTNAME=	din-48
 CATEGORIES=	audio
 MASTER_SITES=	https://archive.org/download/dinisnoise_source_code/
 
diff --git a/audio/din/PLIST b/audio/din/PLIST
index d956d0b7248..bf144e714c3 100644
--- a/audio/din/PLIST
+++ b/audio/din/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/05/23 17:42:32 fox Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/09/04 13:02:57 fox Exp $
 bin/din
 share/applications/din.desktop
 share/din/factory/2600
@@ -356,6 +356,7 @@ share/din/factory/get-selection.help.tcl
 share/din/factory/get-style.help.tcl
 share/din/factory/get-var.help.tcl
 share/din/factory/globals
+share/din/factory/harmonics
 share/din/factory/harmonics.help.tcl
 share/din/factory/harmonics.patch.tcl
 share/din/factory/help.tcl
@@ -415,6 +416,7 @@ share/din/factory/p_Sine_Mixer
 share/din/factory/p_Spiraler
 share/din/factory/p_Starrer
 share/din/factory/p_Superformula
+share/din/factory/phases
 share/din/factory/pitch-vol.ed
 share/din/factory/pitch.crv
 share/din/factory/point-modulation.ed
@@ -460,7 +462,6 @@ share/din/factory/set-var.help.tcl
 share/din/factory/settings.tcl
 share/din/factory/setup-user-dir.tcl
 share/din/factory/sin.lib
-share/din/factory/sine_levels
 share/din/factory/sine_mixer_sin.crv
 share/din/factory/sine_mixer_sin.ed
 share/din/factory/sounding-board.osc
diff --git a/audio/din/distinfo b/audio/din/distinfo
index 1f6915a7ccd..fd172496544 100644
--- a/audio/din/distinfo
+++ b/audio/din/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2020/06/09 15:33:52 fox Exp $
+$NetBSD: distinfo,v 1.15 2020/09/04 13:02:57 fox Exp $
 
-SHA1 (din-47.1.tar.gz) = e3de23c7fd65d77b9052f0d433955ba0820b103f
-RMD160 (din-47.1.tar.gz) = 2a075656caea406999545852fce5c318f1e33a7c
-SHA512 (din-47.1.tar.gz) = 883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17
-Size (din-47.1.tar.gz) = 3667502 bytes
-SHA1 (patch-src_Makefile.am) = 0959b506b5ff6b2cf525fbde0bd1169f1b5c6401
+SHA1 (din-48.tar.gz) = 4ee00ac258069553c0cda9991abb8fded6858d0e
+RMD160 (din-48.tar.gz) = fa0b80d0b361d98337fe35e14a9aa9f9d4f811f5
+SHA512 (din-48.tar.gz) = 3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940
+Size (din-48.tar.gz) = 3673917 bytes
+SHA1 (patch-src_Makefile.am) = 54764da3df0a4ec664eac019d3565cd644c899b8
 SHA1 (patch-src_Makefile.in) = e4f93496379202ac25ae1909351fea6532989078
diff --git a/audio/din/patches/patch-src_Makefile.am b/audio/din/patches/patch-src_Makefile.am
index 406a21d9485..41f36bf23fb 100644
--- a/audio/din/patches/patch-src_Makefile.am
+++ b/audio/din/patches/patch-src_Makefile.am
@@ -1,15 +1,17 @@
-$NetBSD: patch-src_Makefile.am,v 1.7 2020/05/23 17:42:32 fox Exp $
+$NetBSD: patch-src_Makefile.am,v 1.8 2020/09/04 13:02:57 fox Exp $
 
 Removed tcl8.6, asound and jack flags, this is now handled in the pkgsrc
 script.
 
---- src/Makefile.am.orig	2020-05-19 18:46:10.000000000 +0000
+--- src/Makefile.am.orig	2020-08-28 08:17:04.000000000 +0000
 +++ src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = -I ../include -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
+@@ -1,7 +1,7 @@
+ #dinincludedir = $(pkgsrcdir)
+ 
+-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
 -LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
 +LIBS +=  -lSDL -lGL -lpthread -lasound
  
- AM_CFLAGS = -I ../include
  bin_PROGRAMS = din
+ din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drone.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp