git: 89314d38c987 - main - audio/spiralsynth: Remove expired port

From: Rene Ladan <rene_at_FreeBSD.org>
Date: Tue, 24 Dec 2024 20:03:12 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=89314d38c987ddbcf1d2d52cc59915731e11abbe

commit 89314d38c987ddbcf1d2d52cc59915731e11abbe
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-12-24 20:03:00 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-12-24 20:03:00 +0000

    audio/spiralsynth: Remove expired port
    
    2024-12-24 audio/spiralsynth: SpiralSynth isn't being supported any more, use audio/spiralsynthmodular
---
 MOVED                                              |  1 +
 audio/Makefile                                     |  1 -
 audio/spiralsynth/Makefile                         | 90 ----------------------
 audio/spiralsynth/distinfo                         |  2 -
 audio/spiralsynth/files/patch-Fl_Knob.H            | 10 ---
 audio/spiralsynth/files/patch-GUI_MixerGUI.C       | 14 ----
 audio/spiralsynth/files/patch-GUI_OutputGUI.C      | 23 ------
 audio/spiralsynth/files/patch-GUI_ScopeGUI.C       | 25 ------
 .../files/patch-GUI_Widgets_Fl_Knob.cxx            | 21 -----
 audio/spiralsynth/files/patch-SpiralInfo.C         | 12 ---
 audio/spiralsynth/files/patch-SpiralSoundMidi_C    | 13 ----
 .../files/patch-SpiralSound_Oscillator.C           | 14 ----
 .../spiralsynth/files/patch-SpiralSound_RiffWav.C  | 10 ---
 .../spiralsynth/files/patch-SpiralSound_RiffWav.h  | 10 ---
 .../files/patch-SpiralSound_Sequencer.h            | 11 ---
 .../files/patch-SpiralSound_SpiralInfo.h           | 10 ---
 audio/spiralsynth/pkg-descr                        | 20 -----
 17 files changed, 1 insertion(+), 286 deletions(-)

diff --git a/MOVED b/MOVED
index e509017a1647..0ef976d3c2d3 100644
--- a/MOVED
+++ b/MOVED
@@ -3756,3 +3756,4 @@ devel/sfml251|devel/sfml|2024-12-09|Removed pinned port because the last user is
 devel/ocaml-seq|lang/ocaml|2024-12-10|Has expired: Seq is provided by lang/ocaml
 textproc/mdocml|textproc/mandoc|2024-12-17|Upstream reanamed
 www/shellinabox|sysutils/ttyd|2024-12-24|Has expired: Abandonware and outdated, last release in 2016. Use sysutils/ttyd instead
+audio/spiralsynth|audio/spiralsynthmodular|2024-12-24|Has expired: SpiralSynth isn't being supported any more, use audio/spiralsynthmodular
diff --git a/audio/Makefile b/audio/Makefile
index 76521d42179a..40a4ee3f03f6 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -760,7 +760,6 @@
     SUBDIR += speexdsp
     SUBDIR += spek
     SUBDIR += spiralloops
-    SUBDIR += spiralsynth
     SUBDIR += spiralsynthmodular
     SUBDIR += spotify-player
     SUBDIR += spotify-qt
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
deleted file mode 100644
index e05603ace6be..000000000000
--- a/audio/spiralsynth/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-PORTNAME=	spiralsynth
-PORTVERSION=	0.1.7
-PORTREVISION=	8
-CATEGORIES=	audio
-MASTER_SITES=	http://www.pawfal.org/Software/SpiralSynth/dload/
-DISTNAME=	SpiralSynth-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	MIDI-capable synthesizer for X
-WWW=		https://www.pawfal.org/Software/SpiralSynth/
-
-DEPRECATED=	SpiralSynth isn't being supported any more, use audio/spiralsynthmodular
-EXPIRATION_DATE=	2024-12-24
-
-LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
-
-GNU_CONFIGURE=	yes
-MAKE_ENV=	PTHREAD_LIBS="-lpthread"
-PLIST=		${WRKDIR}/pkg-plist
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-DOC_FILES=	CHANGES COPYING README
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-.for ii in \
-	Makefile.in \
-	PluginLink.sh \
-	SpiralInfo.C \
-	SpiralSound/Midi.h \
-	SpiralSound/Output.h \
-	SpiralSound/RiffWav.C \
-	SpiralSound/SpiralInfo.h \
-	SpiralSound/Synth.C \
-	SpiralSound/Synth.h \
-	SpiralSound/_SynthInfo.C \
-	Synth.h
-	${MV} ${WRKSRC}/${ii} ${WRKSRC}/${ii}.orig
-	${SED} -e 's|-O3||g ; \
-			s|CC	=|CC?	=|g ; \
-			s|CFLAGS =|CFLAGS +=|g ; \
-			s|CXX	=|CXX?	=|g ; \
-			s|CXXFLAGS=|CXXFLAGS+=|g ; \
-			s|LINK	=	g++|LINK	=	${CXX}|g ; \
-			s|-lm|-lpthread -lm|g ; \
-			s|/usr/X11R6|${LOCALBASE}|g ; \
-			s|iostream.h|iostream|g ;\
-			s|fstream.h|fstream|g ;\
-			s|<strstream>|<sstream>|g ;\
-			s|machine/soundcard|sys/soundcard|g' \
-			< ${WRKSRC}/${ii}.orig \
-			> ${WRKSRC}/${ii}
-.endfor
-# Use as a plugin to SpiralLoops 2.0.0 results in "Can't open audio driver."
-.if defined(PLUGIN)
-	${MV} ${WRKSRC}/Synth.C ${WRKSRC}/Synth.C.orig
-	${SED} -e 's|^//#define PLUGIN|#define PLUGIN|g' \
-		< ${WRKSRC}/Synth.C.orig > ${WRKSRC}/Synth.C
-
-post-build:
-	cd ${WRKSRC}; ${SH} ./PluginLink.sh
-.endif		# defined(PLUGIN)
-
-pre-install:
-.if defined(PLUGIN)
-	${ECHO_CMD} lib/SpiralSynth.so > ${PLIST}
-.else
-	${ECHO_CMD} bin/SpiralSynth > ${PLIST}
-.endif
-pre-install-DOCS-on:
-.for ii in ${DOC_FILES}
-	${ECHO_CMD} share/doc/spiralsynth/${ii} >> ${PLIST}
-.endfor
-
-do-install:
-.if defined(PLUGIN)
-	${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth.so ${STAGEDIR}${PREFIX}/lib
-.else
-	${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${STAGEDIR}${PREFIX}/bin
-.endif
-
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for ii in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${ii} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo
deleted file mode 100644
index c216cb33687d..000000000000
--- a/audio/spiralsynth/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (SpiralSynth-0.1.7.tar.gz) = 2effb0e3ad2d426d3e1448b049711dc5c93223b5fc5a60d775a6856a8f804442
-SIZE (SpiralSynth-0.1.7.tar.gz) = 62393
diff --git a/audio/spiralsynth/files/patch-Fl_Knob.H b/audio/spiralsynth/files/patch-Fl_Knob.H
deleted file mode 100644
index 7e1957f4099d..000000000000
--- a/audio/spiralsynth/files/patch-Fl_Knob.H
+++ /dev/null
@@ -1,10 +0,0 @@
---- GUI/Widgets/Fl_Knob.H.orig	Wed Mar 19 13:57:41 2003
-+++ GUI/Widgets/Fl_Knob.H	Wed Mar 19 13:57:56 2003
-@@ -4,6 +4,7 @@
- #define Fl_Knob_H
- #include <FL/Fl.H>
- #include <FL/Fl_Valuator.H>
-+#include <FL/Fl_Group.H>
- 
- class Fl_Knob : public Fl_Valuator {
- public:
diff --git a/audio/spiralsynth/files/patch-GUI_MixerGUI.C b/audio/spiralsynth/files/patch-GUI_MixerGUI.C
deleted file mode 100644
index bd6a84f1cd2f..000000000000
--- a/audio/spiralsynth/files/patch-GUI_MixerGUI.C
+++ /dev/null
@@ -1,14 +0,0 @@
---- GUI/MixerGUI.C.orig	Sun Nov 26 15:52:40 2000
-+++ GUI/MixerGUI.C	Mon Feb  9 12:08:25 2004
-@@ -24,8 +24,10 @@ MixerGUI::MixerGUI(Mixer *o)
- 	if (!m_mix) cerr<<"WARNING: Mixer not correctly set up"<<endl;
- }
- 		
--void MixerGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
-+void MixerGUI::CreateGUI(int xoff, int yoff, char *name)
- {
-+	 xoff=0;
-+	 yoff=0;
- 	 Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 100, 110, name);
-       o->type(1);
- 	  o->box(FL_UP_BOX);
diff --git a/audio/spiralsynth/files/patch-GUI_OutputGUI.C b/audio/spiralsynth/files/patch-GUI_OutputGUI.C
deleted file mode 100644
index ec7bdb63623e..000000000000
--- a/audio/spiralsynth/files/patch-GUI_OutputGUI.C
+++ /dev/null
@@ -1,23 +0,0 @@
---- GUI/OutputGUI.C.orig	2000-11-26 16:52:39.000000000 +0100
-+++ GUI/OutputGUI.C	2011-11-15 14:11:31.000000000 +0100
-@@ -18,7 +18,7 @@
- 
- #include "OutputGUI.h"
- 
--#include <FL/fl_file_chooser.h>
-+#include <FL/Fl_File_Chooser.H>
- 
- OutputGUI::OutputGUI(Output *o)
- {
-@@ -26,8 +26,10 @@
- 	if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
- }
- 		
--void OutputGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
-+void OutputGUI::CreateGUI(int xoff, int yoff, char *name)
- {
-+	 xoff=0;
-+	 yoff=0;
- 	 Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 85, 110, name);
-       o->type(1);
- 	  o->box(FL_UP_BOX);
diff --git a/audio/spiralsynth/files/patch-GUI_ScopeGUI.C b/audio/spiralsynth/files/patch-GUI_ScopeGUI.C
deleted file mode 100644
index b55e1c04d433..000000000000
--- a/audio/spiralsynth/files/patch-GUI_ScopeGUI.C
+++ /dev/null
@@ -1,25 +0,0 @@
---- GUI/ScopeGUI.C.orig	Sun Nov 26 15:52:39 2000
-+++ GUI/ScopeGUI.C	Mon Feb  9 12:14:00 2004
-@@ -22,8 +22,8 @@
- 
- #include <FL/fl_draw.H>
- 
--ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) :
--Fl_Widget(x,y,w,h,l)
-+ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) :
-+Fl_Widget(x,y,w,h,0)
- {
- }
- 
-@@ -53,8 +53,10 @@ void ScopeGUI::Display(short *data)
- 	if (!m_Bypass) m_Scope->redraw();
- }
- 		
--void ScopeGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
-+void ScopeGUI::CreateGUI(int xoff, int yoff, char *name)
- {
-+	 xoff=0;
-+	 yoff=0;
- 	 Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name);
-       o->type(1);
- 	  o->box(FL_UP_BOX);
diff --git a/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx b/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx
deleted file mode 100644
index 432081e3a342..000000000000
--- a/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
---- GUI/Widgets/Fl_Knob.cxx.orig	Mon Sep 11 19:52:03 2000
-+++ GUI/Widgets/Fl_Knob.cxx	Mon Feb  9 13:22:13 2004
-@@ -4,7 +4,7 @@
- #include <FL/fl_draw.H>
- #include <math.h>
- 
--Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l=0): Fl_Valuator(xx,yy,ww,hh,l) {
-+Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l): Fl_Valuator(xx,yy,ww,hh,0) {
-   a1 = 35;
- 	a2 = 325;
- 	_type = DOTLIN;
-@@ -40,7 +40,8 @@ unsigned char rr,gg,bb;
- 	int dam = damage();
- 	if (dam & FL_DAMAGE_ALL)
- 	{
--		int col = parent()->color();
-+//		int col = parent()->color();
-+		int col = FL_BLACK;
- 		fl_color(col);
- 		fl_rectf(ox,oy,side,side);
- 		Fl::get_color((Fl_Color)col,rr,gg,bb);
diff --git a/audio/spiralsynth/files/patch-SpiralInfo.C b/audio/spiralsynth/files/patch-SpiralInfo.C
deleted file mode 100644
index e0b326f8a759..000000000000
--- a/audio/spiralsynth/files/patch-SpiralInfo.C
+++ /dev/null
@@ -1,12 +0,0 @@
---- SpiralInfo.C.orig	Mon Feb  9 13:26:01 2004
-+++ SpiralInfo.C	Mon Feb  9 13:26:59 2004
-@@ -22,8 +22,8 @@
- 
- #include "SpiralSound/SpiralInfo.h"
- 
--float RandFloat(float s=0.0f, float e=1.0f)
-+float RandFloat(float s, float e)
- {
- 	return s+((rand()%10000/10000.0)*(e-s));
- }
- 
diff --git a/audio/spiralsynth/files/patch-SpiralSoundMidi_C b/audio/spiralsynth/files/patch-SpiralSoundMidi_C
deleted file mode 100644
index 4c29f82a0c23..000000000000
--- a/audio/spiralsynth/files/patch-SpiralSoundMidi_C
+++ /dev/null
@@ -1,13 +0,0 @@
-SpiralSound/Midi.C:54: `O_SYNC' undeclared (first use this function)
-
---- SpiralSound/Midi.C.orig	Sun Nov 26 07:52:41 2000
-+++ SpiralSound/Midi.C	Wed Dec  6 14:22:58 2000
-@@ -51,7 +51,7 @@
- {
- 	if (!SpiralInfo::WANTMIDI) return;
- 	
--	m_MidiFd = open(SpiralInfo::MIDIFILE.c_str(),O_RDONLY|O_SYNC);  
-+	m_MidiFd = open(SpiralInfo::MIDIFILE.c_str(),O_RDONLY);  
- 
- 	pipe(m_Pipefd);
- 	fcntl(m_Pipefd[0],F_SETFL,O_NONBLOCK);
diff --git a/audio/spiralsynth/files/patch-SpiralSound_Oscillator.C b/audio/spiralsynth/files/patch-SpiralSound_Oscillator.C
deleted file mode 100644
index 62b5ebef4fab..000000000000
--- a/audio/spiralsynth/files/patch-SpiralSound_Oscillator.C
+++ /dev/null
@@ -1,14 +0,0 @@
---- SpiralSound/Oscillator.C.orig	2011-11-15 14:22:27.000000000 +0100
-+++ SpiralSound/Oscillator.C	2011-11-15 14:22:21.000000000 +0100
-@@ -30,7 +30,10 @@
- m_PulseWidth(0.5f),
- m_PortmentoSpeed(1),
- m_DesiredFreq(0),
--m_ModAmount(0.01f)
-+m_ModAmount(0.01f),
-+m_FreqModBuf(0),
-+m_PulseWidthModBuf(0),
-+m_SHModBuf(0)
- {
- 	m_CyclePos=new int[SpiralInfo::POLY];
- 	m_InOctave=new int[SpiralInfo::POLY];
diff --git a/audio/spiralsynth/files/patch-SpiralSound_RiffWav.C b/audio/spiralsynth/files/patch-SpiralSound_RiffWav.C
deleted file mode 100644
index 2213b08a812a..000000000000
--- a/audio/spiralsynth/files/patch-SpiralSound_RiffWav.C
+++ /dev/null
@@ -1,10 +0,0 @@
---- SpiralSound/RiffWav.C.orig	2000-11-26 18:52:41.000000000 +0300
-+++ SpiralSound/RiffWav.C	2014-02-13 05:40:18.946204286 +0400
-@@ -143,6 +143,7 @@
- 			m_TotalLength/=2;
- 			
- 			// leave the filepointer on the first sample
-+			return 1;
- 		}
- 		else
- 		{
diff --git a/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h b/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h
deleted file mode 100644
index 28c38ea9a6c8..000000000000
--- a/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- SpiralSound/RiffWav.h.orig	Sun Nov 26 15:52:45 2000
-+++ SpiralSound/RiffWav.h	Mon Feb  9 12:05:58 2004
-@@ -17,6 +17,7 @@
- */ 
- 
- #include <string>
-+using namespace std;
- 
- #ifndef WAVFILE
- #define WAVFILE
diff --git a/audio/spiralsynth/files/patch-SpiralSound_Sequencer.h b/audio/spiralsynth/files/patch-SpiralSound_Sequencer.h
deleted file mode 100644
index 8ece3e185586..000000000000
--- a/audio/spiralsynth/files/patch-SpiralSound_Sequencer.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- SpiralSound/Sequencer.h.orig	Fri Dec 22 18:51:59 2006
-+++ SpiralSound/Sequencer.h	Fri Dec 22 18:52:21 2006
-@@ -40,7 +40,7 @@
- 	void SetLength(int s) {m_Length=s;}
- 	void SetArp(bool s) {m_Arp=s;}
- 	void SetArpNotes(int s) {m_ArpNotes=s;}
--	bool Sequencer::GetSeqNote(float &note, int &oct, int &key);
-+	bool GetSeqNote(float &note, int &oct, int &key);
- 
- private:
- 
diff --git a/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h b/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h
deleted file mode 100644
index f1f6fdef6405..000000000000
--- a/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- SpiralSound/SpiralInfo.h.orig	Sun Nov 26 15:52:46 2000
-+++ SpiralSound/SpiralInfo.h	Mon Feb  9 13:31:38 2004
-@@ -19,6 +19,7 @@
- #include <iostream.h>
- #include <string>
- #include <stdlib.h>
-+using namespace std;
- 
- #ifndef SpiralINFO
- #define SpiralINFO
diff --git a/audio/spiralsynth/pkg-descr b/audio/spiralsynth/pkg-descr
deleted file mode 100644
index e13990316ca5..000000000000
--- a/audio/spiralsynth/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-adapted from the Web page and the README:
-
-Spiral Synth is a physically modelled, monophonic, analogue
-synthesizer.  It is capable of creating the kind of sounds made by
-hardware analogue synths, the noises used in electronic music.
-You can also use it to make stranger sounds.  MIDI is supported,
-including velocity detection, mapped to the volume of the oscillators
-(but you can also use the PC keyboard to play the synth).  Output
-is to /dev/dsp or in Microsoft RIFF (.WAV) format to a file.  You
-can save and recall your sounds using the 100 patch save slots.
-
-The PC keyboard can be used to play the synth, "q" & "z" are C,
-and the keys progress from them:  "2" is C#, "w" is D, etc.  These
-are just the defaults, and can be changed from the .Spiralrc file.
-The function keys change the octave.
-
-Sample output and a detailed list of features can be found on the
-home page.
-
-Trevor Johnson