- Fix a minor glitch in the OSS patches

- Provide manual pages

4 files changed, 83 insertions, 8 deletions

diff --git a/audio/stymulator/Makefile b/audio/stymulator/Makefile
index d368c62ec9e1..6382fee8737a 100644
--- a/audio/stymulator/Makefile
+++ b/audio/stymulator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stymulator
 DISTVERSION=	0.21a
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://atariarea.krap.pl/stymulator/files/ \
 		CRITICAL
@@ -19,10 +20,14 @@ USE_DOS2UNIX=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+MAN1=		ymplayer.1 ym2wav.1
 PLIST_FILES=	bin/ym2wav bin/ymplayer
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ym2wav ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/ymplayer ${PREFIX}/bin
+.for f in ${MAN1}
+	${INSTALL_MAN} ${FILESDIR}/${f} ${MAN8PREFIX}/man/man1
+.endfor
 
 .include <bsd.port.mk>
diff --git a/audio/stymulator/files/patch-sound.cpp b/audio/stymulator/files/patch-sound.cpp
index 0836ced5e7f8..b97ef305bf9a 100644
--- a/audio/stymulator/files/patch-sound.cpp
+++ b/audio/stymulator/files/patch-sound.cpp
@@ -1,5 +1,5 @@
---- ./sound.cpp.orig	2010-03-27 16:08:54.000000000 +0100
-+++ ./sound.cpp	2010-03-27 16:10:00.000000000 +0100
+--- ./sound.cpp.orig	2010-03-28 11:47:06.000000000 +0200
++++ ./sound.cpp	2010-03-28 11:50:10.000000000 +0200
 @@ -6,7 +6,6 @@
  	Project Page: http://atariarea.krap.pl/stymulator
  	
@@ -8,12 +8,11 @@
  
  -----------------------------------------------------------------------------
   *   STYMulator is free software; you can redistribute it and/or modify    *
-@@ -25,73 +24,39 @@
+@@ -25,73 +24,38 @@
   *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ---------------------------------------------------------------------------*/
  
 +#include <stdio.h>
-+#include <stdlib.h>
 +#include <unistd.h>
 +#include <fcntl.h>
  #include "sound.h"
@@ -92,18 +91,18 @@
 +    
 +    if (ioctl(audio_fd, SNDCTL_DSP_SETFMT, &format) < 0) {
 +        printf("Cannot set sample format\n");
-+        return EXIT_FAILURE;
++        return -1;
 +    }
 +    
 +    if (ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &channels) < 0) {
 +        printf("Cannot set audio channels\n");
-+        return EXIT_FAILURE;
++        return -1;
 +    }
 +
 +    if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &rate) < 0) {
 +        printf("Cannot set sample rate\n");
-+        return EXIT_FAILURE;
++        return -1;
 +    }
 +
-+    return EXIT_SUCCESS;
++    return 0;
  }
diff --git a/audio/stymulator/files/ym2wav.1 b/audio/stymulator/files/ym2wav.1
new file mode 100644
index 000000000000..ff965b0c3ce2
--- /dev/null
+++ b/audio/stymulator/files/ym2wav.1
@@ -0,0 +1,37 @@
+.TH YM2WAV "1" "March 2007" "0.21" "User Commands"
+
+.SH NAME
+.B ym2wav
+- a commandline YM to WAV audio converter.
+
+.SH DESCRIPTION
+STYMulator is an Open Source (GPL License) player which plays music files in the YM chiptune format.
+.br
+In particular the YM files are Yamaha YM2149 soundchip music datas (registers) dumped from the ATARI 16-bit computers.
+.PP
+.B ym2wav
+(part of STYMulator) is a command line YM to WAV audio converter.
+
+.SH SYNOPSIS
+.B ym2wav
+<input_ym_music_file> <output_wav_file>
+
+.SH OPTIONS
+.B ym2wav
+has no options.
+.PP
+It requires two arguments:
+.TP
+.I <input_ym_music_file>
+Relative or absolute filename path of the input YM file.
+.TP
+.I <output_wav_file>
+Relative or absolute filename path of the output WAV file.
+
+.SH SEE ALSO
+ymplayer(1)
+
+.SH AUTHOR
+This manual page was written by Adam Cecile <gandalf@le-vert.net> and was modified by Emanuel Haupt <ehaupt@FreeBSD.org> for FreeBSD.
+.PP
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.
diff --git a/audio/stymulator/files/ymplayer.1 b/audio/stymulator/files/ymplayer.1
new file mode 100644
index 000000000000..5d5d5bfd2da1
--- /dev/null
+++ b/audio/stymulator/files/ymplayer.1
@@ -0,0 +1,34 @@
+.TH YMPLAYER "1" "March 2007" "0.21" "User Commands"
+
+.SH NAME
+.B ymplayer
+- a curses based player for the YM chiptune format.
+
+.SH DESCRIPTION
+STYMulator is an Open Source (GPL License) player which plays music files in the YM chiptune format.
+In particular the YM files are Yamaha YM2149 soundchip music data (registers) dumped from the ATARI 16-bit computers.
+.PP
+.B ymplayer
+(part of STYMulator) is a console based player for this format. It uses the ncurses library for its user interface.
+It originally came with ALSA for sound rendering, however this port has been patched to use OSS.
+
+.SH SYNOPSIS
+.B ymplayer
+<input_ym_music_file>
+
+.SH OPTIONS
+.B ymplayer
+has no options.
+.PP
+It requires a <input_ym_music_file> argument which is a relative or absolute path to
+.I one
+the YM music file.
+
+.SH SEE ALSO
+ym2wav(1)
+.br
+
+.SH AUTHOR
+This manual page was written by Adam Cecile <gandalf@le-vert.net> and was modified by Emanuel Haupt <ehaupt@FreeBSD.org> for FreeBSD. OSS patches were provided by Pyraniton.
+.PP
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.