Updated the port from din-30 to din-35.

fraggerfox · Jun 10, 2018 · 1d8ae02 · 1d8ae02
1 parent 01bacff
commit 1d8ae02
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/multimedia/din/Makefile b/multimedia/din/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: head/multimedia/din/Makefile 472008 2018-06-08 15:06:05Z philip $
 
 PORTNAME=	din
-PORTVERSION=	30
+PORTVERSION=	35
 CATEGORIES=	multimedia
 MASTER_SITES=	https://archive.org/download/dinisnoise_source_code/
 
@@ -23,6 +23,8 @@ USES=		autoreconf tcl:86+
 
 GNU_CONFIGURE=	yes
 
+INSTALLS_ICONS=	yes
+
 OPTIONS_SINGLE=		BACKEND
 OPTIONS_SINGLE_BACKEND=	JACK ALSA
 OPTIONS_DEFAULT=	JACK

diff --git a/multimedia/din/distinfo b/multimedia/din/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519839329
-SHA256 (din-30.tar.gz) = 85cc9b868e2bc5056cf1e868a37c706422c0d1d6d9a125018e14a8a9c2253070
-SIZE (din-30.tar.gz) = 3564787
+TIMESTAMP = 1528552909
+SHA256 (din-35.tar.gz) = bed84fa22c189336ddfbe3aca1b8a08f82c38dfac3627a5ef484a022e476d290
+SIZE (din-35.tar.gz) = 3613126
diff --git a/multimedia/din/files/patch-src_Makefile.am b/multimedia/din/files/patch-src_Makefile.am
@@ -1,10 +1,10 @@
---- src/Makefile.am.orig	2017-12-12 10:40:43 UTC
+--- src/Makefile.am.orig	2018-05-14 07:19:48 UTC
 +++ src/Makefile.am
 @@ -1,5 +1,5 @@
--AM_CXXFLAGS = -I ../include -I /usr/include/tcl -Wall -D_GNU_SOURCE=1 -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -fpermissive
+-AM_CXXFLAGS = -I ../include -I /usr/include/tcl -Wall -DGPL2=1 -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -DPREFIX=\"@prefix@\"
 -LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound -ljack
-+AM_CXXFLAGS = -I ../include -Wall -D_GNU_SOURCE=1 -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -fpermissive
++AM_CXXFLAGS = -I ../include -Wall -DGPL2=1 -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -DPREFIX=\"@prefix@\"
 +LIBS +=  -lSDL -lGL -lpthread -lasound -ljack
 
  AM_CFLAGS = -I ../include
-
+ bin_PROGRAMS = din
diff --git a/multimedia/din/files/patch-src_main.cc b/multimedia/din/files/patch-src_main.cc
@@ -0,0 +1,11 @@
+--- src/main.cc.orig	2018-06-10 01:20:01 UTC
++++ src/main.cc
+@@ -73,7 +73,7 @@ extern const float TWO_PI = 2 * PI;
+ extern const float PI_BY_180 = PI / 180.;
+ extern const int MILLION = 1000000;
+ extern const char SPC = ' ';
+-extern const string tokenizer::DEFAULT_DELIMITER (" ");
++const string tokenizer::DEFAULT_DELIMITER (" ");
+ float widget::R = 0.980392, widget::G = 0.792157, widget::B = 0.509804; // default color for all widgets
+
+ // for attack, decay and deltas [see keyboard-keyboard.cc, mondrian.cc, triggered_note.cc]
diff --git a/multimedia/din/pkg-plist b/multimedia/din/pkg-plist
@@ -1,4 +1,5 @@
 bin/din
+share/applications/din.desktop
 %%DATADIR%%/factory/2600
 %%DATADIR%%/factory/2600.help.tcl
 %%DATADIR%%/factory/2600.patch.tcl
@@ -9,7 +10,9 @@ bin/din
 %%DATADIR%%/factory/attack.ed
 %%DATADIR%%/factory/attack.lib
 %%DATADIR%%/factory/audio_prefs
+%%DATADIR%%/factory/binaural-drone.help.tcl
 %%DATADIR%%/factory/binaural-drones.hlp
+%%DATADIR%%/factory/binaural-drones.tcl
 %%DATADIR%%/factory/binaural_drones
 %%DATADIR%%/factory/blues
 %%DATADIR%%/factory/blues.drone
@@ -432,7 +435,6 @@ bin/din
 %%DATADIR%%/factory/sine_levels
 %%DATADIR%%/factory/sine_mixer_sin.crv
 %%DATADIR%%/factory/sine_mixer_sin.ed
-%%DATADIR%%/factory/sounder.tcl
 %%DATADIR%%/factory/sounding-board.osc
 %%DATADIR%%/factory/spiraler.scr
 %%DATADIR%%/factory/spiraler_cos.crv
@@ -464,3 +466,5 @@ bin/din
 %%DATADIR%%/factory/window
 %%DATADIR%%/factory/word.crv
 %%DATADIR%%/factory/word_space.crv
+share/icons/hicolor/scalable/apps/din.svg
+share/pixmaps/din.png