cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Spring clean-up.

Browse Source 
- rename patches to new style.
- bye, bye USE_GMAKE, we have recursive variables now.
- pass COPTS through.
- a few more patches so that we get most prototypes
- integrate COMMENT
This commit is contained in:
espie 2001-04-10 00:51:59 +00:00
parent 5daf604020
commit 6cdfc2731a
16 changed files with 132 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
audio/tracker/Makefile
View File

@ -1,14 +1,15 @@
# $OpenBSD: Makefile,v 1.16 2000/10/22 14:02:57 espie Exp $
# $OpenBSD: Makefile,v 1.17 2001/04/10 00:51:59 espie Exp $
COMMENT= MOD player
DISTNAME= tracker-5.3
CATEGORIES= audio
NEED_VERSION= 1.195
NEED_VERSION= 1.383
MASTER_SITES= ftp://ftp.uni-trier.de/pub/unix/audio/tracker/
EXTRACT_SUFX= .tgz
MAINTAINER= Marc Espie <espie@openbsd.org>
USE_GMAKE= Yes
#USE_GMAKE= Yes
# OpenBSD has a special exemption. Other BSD should contact me (Marc Espie)
# for redistribution on the CD.
@ -18,8 +19,8 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WRKDIST= ${WRKDIR}/tracker
PATCH_STRIP= -p2
MAKE_FLAGS= MACHINE=openbsd CC=$(CC) INSTALL="$(INSTALL)" \
CFLAGS_openbsd='-O3 -funroll-loops -finline-functions ${COPTS}' \
INST_BIN_OPT="-c -s -m $(BINMODE) -o $(BINOWN) -g $(BINGRP)" \
INST_MAN_OPT="-c -m 644 -o $(BINOWN) -g $(BINGRP)" \
COMPRESSION_FILE='$${DESTDIR}/etc/compression_methods' \
@ -29,17 +30,17 @@ FAKE_FLAGS= ${MAKE_FLAGS}
post-extract:
@mkdir -p ${WRKSRC}/Arch/OpenBSD
@cp files/audio.c files/config.h ${WRKSRC}/Arch/OpenBSD
@cp files/{audio.c,config.h} ${WRKSRC}/Arch/OpenBSD
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tracker
@${INSTALL_DATA_DIR} ${PREFIX}/lib/tracker
@cd ${WRKSRC}/Docs && \
makeinfo --no-split tracker.texinfo -o tracker.info && \
makeinfo --no-split tracker.texinfo -o tracker.info && \
$(INSTALL_MAN) tracker.info ${PREFIX}/info && \
rm -f tracker.info *.orig
rm -f tracker.info *.orig
cp -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker
cp ${WRKSRC}/Lib/compression_methods ${PREFIX}/lib/tracker/compression_methods.sample
${INSTALL_DATA} ${WRKSRC}/Lib/compression_methods ${PREFIX}/lib/tracker/compression_methods.sample
# there is a small test module included. This target tests that
# - tracker correctly handles compressed files (only after install),

38
audio/tracker/patches/patch-Arch_Unix_ui_c Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-Arch_Unix_ui_c,v 1.1 2001/04/10 00:51:59 espie Exp $
--- Arch/Unix/ui.c.orig Tue May 7 17:21:34 1996
+++ Arch/Unix/ui.c Tue Apr 10 02:30:14 2001
@@ -169,6 +169,7 @@ typedef struct sgttyb TERM_SETUP;
#ifdef __hpux
#include <sys/bsdtty.h>
#endif
+#include <unistd.h>
LOCAL void nonblocking_io(void);
LOCAL void sane_tty(void);
@@ -271,7 +272,7 @@ LOCAL void if_fg_sane_tty(void)
}
-LOCAL void switch_mode(void)
+LOCAL void switch_mode(int sig)
{
TERM_SETUP zap;
@@ -358,7 +359,7 @@ LOCAL void nonblocking_io(void)
_gs_opt(fileno(stdin), psanity);
#endif
}
- switch_mode();
+ switch_mode(0);
at_end(if_fg_sane_tty);
}
@@ -385,7 +386,7 @@ LOCAL int may_getchar(void)
INIT_ONCE;
if (run_in_fg() && !is_fg)
- switch_mode();
+ switch_mode(0);
#ifdef OSK
if (run_in_fg() && (_gs_rdy(fileno(stdin)) > 0))
{

12
audio/tracker/patches/patch-Docs_Html_Availability_html Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Docs_Html_Availability_html,v 1.1 2001/04/10 00:51:59 espie Exp $
--- Docs/Html/Availability.html.orig Thu Apr 11 19:21:06 1996
+++ Docs/Html/Availability.html Tue Apr 10 02:20:48 2001
@@ -53,7 +53,7 @@ You can also contact me at the following
</P>
<DL><DT><DD>
<PRE>
-Marc.Espie@ens.fr
+Marc.Espie@openbsd.org
</PRE>
</DL>

11
audio/tracker/patches/patch-ab → audio/tracker/patches/patch-Docs_readme
View File

@ -1,7 +1,7 @@
diff -u -r w2/tracker/Docs/readme work/tracker/Docs/readme
--- w2/tracker/Docs/readme Thu Apr 11 19:21:05 1996
+++ work/tracker/Docs/readme Sun Sep 27 17:16:04 1998
@@ -5,6 +5,12 @@
$OpenBSD: patch-Docs_readme,v 1.1 2001/04/10 00:51:59 espie Exp $
--- Docs/readme.orig Thu Apr 11 19:21:05 1996
+++ Docs/readme Tue Apr 10 02:20:48 2001
@@ -5,6 +5,12 @@ See the accompanying TeXinfo documentati
From version 4.29 on, commercial use of tracker is forbidden without
negotiating an agreement with me first.
@ -14,11 +14,10 @@ diff -u -r w2/tracker/Docs/readme work/tracker/Docs/readme
For personal use purposes: I've spent quite some time supporting this
program now. If you use it much, and feel like it, you can send me
some money, or software you've written for the amiga, I won't
@@ -37,5 +43,5 @@
@@ -37,5 +43,5 @@ This said, my postal address is:
I can deal with french francs, or US checks. Anything else you'll
have to try.
- Marc Espie
+ Marc Espie, Marc.Espie@openbsd.org

7
audio/tracker/patches/patch-ac → audio/tracker/patches/patch-Docs_tracker_texinfo
View File

@ -1,5 +1,6 @@
--- work/tracker/Docs/tracker.texinfo.orig Thu Apr 11 19:21:05 1996
+++ work/tracker/Docs/tracker.texinfo Sat Mar 11 02:02:03 2000
$OpenBSD: patch-Docs_tracker_texinfo,v 1.1 2001/04/10 00:51:59 espie Exp $
--- Docs/tracker.texinfo.orig Thu Apr 11 19:21:05 1996
+++ Docs/tracker.texinfo Tue Apr 10 02:20:49 2001
@@ -1,12 +1,17 @@
\input texinfo
@ -20,7 +21,7 @@
@titlepage
@title Tracker @value{VERSION}
@subtitle Documentation rev. 1.0
@@ -979,14 +984,14 @@
@@ -979,14 +984,14 @@ filter for obvious reasons.
* Other Architectures: Porting tracker.
@end menu

15
audio/tracker/patches/patch-ad → audio/tracker/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
diff -u -r w2/tracker/Makefile work/tracker/Makefile
--- w2/tracker/Makefile Tue May 7 17:20:50 1996
+++ work/tracker/Makefile Sun Sep 27 17:20:35 1998
$OpenBSD: patch-Makefile,v 1.1 2001/04/10 00:51:59 espie Exp $
--- Makefile.orig Tue May 7 17:20:50 1996
+++ Makefile Tue Apr 10 02:20:49 2001
@@ -1,5 +1,5 @@
# Makefile for any machine
-# - based on my newer makefile and the GREATE
@ -19,7 +19,7 @@ diff -u -r w2/tracker/Makefile work/tracker/Makefile
#VPATH=..
# The name of your C compiler. For most machines this will be
@@ -20,7 +20,7 @@
@@ -20,7 +20,7 @@ CC = gcc
OPTS=-c
@ -28,7 +28,7 @@ diff -u -r w2/tracker/Makefile work/tracker/Makefile
# Destination directory for tracker binaries and manpage.
#
# If you don't wish to use the 'make install' and 'make install.man'
@@ -175,6 +175,15 @@
@@ -175,6 +175,15 @@ EXE_freebsd =
UI_freebsd = Unix/
SHELL_freebsd = /bin/sh
@ -44,7 +44,7 @@ diff -u -r w2/tracker/Makefile work/tracker/Makefile
CFLAGS_aix = -O
LIBS_aix = -lm
AUDIODIR_aix = Aix/
@@ -250,7 +259,7 @@
@@ -250,7 +259,7 @@ OBJ_SPLITMOD = split$O time$O st_read$O
display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
st_virt$O automaton$O
@ -53,7 +53,7 @@ diff -u -r w2/tracker/Makefile work/tracker/Makefile
config.h: $(CONFIG)config.h
rm -f config.h
@@ -272,9 +281,8 @@
@@ -272,9 +281,8 @@ version.c: Makefile
install:
$(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR)
$(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR)
@ -64,4 +64,3 @@ diff -u -r w2/tracker/Makefile work/tracker/Makefile
# no manpage available, use the texinfo manual.
install.man:

9
audio/tracker/patches/patch-ag → audio/tracker/patches/patch-Modules_Pro_effects_c
View File

@ -1,7 +1,7 @@
diff -u -r w2/tracker/Modules/Pro/effects.c work/tracker/Modules/Pro/effects.c
--- w2/tracker/Modules/Pro/effects.c Sat Apr 13 19:16:54 1996
+++ work/tracker/Modules/Pro/effects.c Sun Sep 27 19:44:20 1998
@@ -207,8 +207,9 @@
$OpenBSD: patch-Modules_Pro_effects_c,v 1.1 2001/04/10 00:52:00 espie Exp $
--- Modules/Pro/effects.c.orig Sat Apr 13 19:16:54 1996
+++ Modules/Pro/effects.c Tue Apr 10 02:20:49 2001
@@ -207,8 +207,9 @@ LOCAL void do_vibrato(struct channel *ch
/* temporary update of only the step value,
* note that we do not change the saved pitch.
*/
@ -13,4 +13,3 @@ diff -u -r w2/tracker/Modules/Pro/effects.c work/tracker/Modules/Pro/effects.c
}
LOCAL void set_vibrato(struct channel *ch, struct event *e)

11
audio/tracker/patches/patch-Modules_Pro_read_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-Modules_Pro_read_c,v 1.1 2001/04/10 00:52:00 espie Exp $
--- Modules/Pro/read.c.orig Tue Apr 10 02:27:08 2001
+++ Modules/Pro/read.c Tue Apr 10 02:27:29 2001
@@ -132,6 +132,7 @@
#include "automaton.h"
#include "empty.h"
#include "resample.h"
+#include "open.h"
LOCAL unsigned int patsize;

13
audio/tracker/patches/patch-aa
View File

@ -1,13 +0,0 @@
diff -u -r w2/tracker/Docs/Html/Availability.html work/tracker/Docs/Html/Availability.html
--- w2/tracker/Docs/Html/Availability.html Thu Apr 11 19:21:06 1996
+++ work/tracker/Docs/Html/Availability.html Sun Sep 27 17:17:37 1998
@@ -53,7 +53,7 @@
</P>
<DL><DT><DD>
<PRE>
-Marc.Espie@ens.fr
+Marc.Espie@openbsd.org
</PRE>
</DL>

15
audio/tracker/patches/patch-ae
View File

@ -1,15 +0,0 @@
diff -u -r w2/tracker/handle_options.c work/tracker/handle_options.c
--- w2/tracker/handle_options.c Tue May 7 17:22:08 1996
+++ work/tracker/handle_options.c Sun Sep 27 16:39:25 1998
@@ -235,7 +235,9 @@
print_usage();
end_all(0);
}
- ask_freq = args[1].scalar * 1000;
+ ask_freq = args[1].scalar;
+ if (ask_freq < 1000)
+ ask_freq *= 1000;
stereo = args[2].scalar;
loop = args[3].scalar;
set_watched_scalar(OVERSAMPLE, args[4].scalar);

13
audio/tracker/patches/patch-ai
View File

@ -1,13 +0,0 @@
diff -u -r w2/tracker/play_list.c work/tracker/play_list.c
--- w2/tracker/play_list.c Mon May 6 23:53:20 1996
+++ work/tracker/play_list.c Sun Sep 27 21:12:12 1998
@@ -243,6 +243,8 @@
ENTRY e;
unsigned i, k;
+ if (idx == 0)
+ return;
for (i = idx-1; i > 0; i--)
{
k = random_range(i+1);

9
audio/tracker/patches/patch-ah → audio/tracker/patches/patch-display_c
View File

@ -1,7 +1,7 @@
diff -u -r w2/tracker/display.c work/tracker/display.c
--- w2/tracker/display.c Mon May 6 16:28:52 1996
+++ work/tracker/display.c Sun Sep 27 21:02:33 1998
@@ -543,7 +543,14 @@
$OpenBSD: patch-display_c,v 1.1 2001/04/10 00:52:01 espie Exp $
--- display.c.orig Mon May 6 16:28:52 1996
+++ display.c Tue Apr 10 02:20:49 2001
@@ -543,7 +543,14 @@ LOCAL void disp_offset(unsigned samp, un
copy3(note2name(note));
copy4(" off");
if (ch->samp->length)
@ -17,4 +17,3 @@ diff -u -r w2/tracker/display.c work/tracker/display.c
else
copy3(empty);
*base++ = '%';

22
audio/tracker/patches/patch-handle_options_c Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-handle_options_c,v 1.1 2001/04/10 00:52:01 espie Exp $
--- handle_options.c.orig Tue May 7 17:22:08 1996
+++ handle_options.c Tue Apr 10 02:29:16 2001
@@ -52,6 +52,7 @@
#include "tags.h"
#include "prefs.h"
#include "autoinit.h"
+#include "open.h"
#ifdef VOLUME_CONTROL
#ifdef __hpux
@@ -235,7 +236,9 @@ void handle_options(int argc, char *argv
print_usage();
end_all(0);
}
- ask_freq = args[1].scalar * 1000;
+ ask_freq = args[1].scalar;
+ if (ask_freq < 1000)
+ ask_freq *= 1000;
stereo = args[2].scalar;
loop = args[3].scalar;
set_watched_scalar(OVERSAMPLE, args[4].scalar);

8
audio/tracker/patches/patch-af → audio/tracker/patches/patch-parse_options_c
View File

@ -1,7 +1,7 @@
diff -u -r w2/tracker/parse_options.c work/tracker/parse_options.c
--- w2/tracker/parse_options.c Tue May 7 00:48:28 1996
+++ work/tracker/parse_options.c Sun Sep 27 16:33:45 1998
@@ -238,10 +238,11 @@
$OpenBSD: patch-parse_options_c,v 1.1 2001/04/10 00:52:01 espie Exp $
--- parse_options.c.orig Tue May 7 00:48:28 1996
+++ parse_options.c Tue Apr 10 02:20:49 2001
@@ -238,10 +238,11 @@ LOCAL int do_option(char *text, char *ar
switch(type)
{
case 's':

12
audio/tracker/patches/patch-play_list_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-play_list_c,v 1.1 2001/04/10 00:52:01 espie Exp $
--- play_list.c.orig Mon May 6 23:53:20 1996
+++ play_list.c Tue Apr 10 02:20:49 2001
@@ -243,6 +243,8 @@ void randomize(void)
ENTRY e;
unsigned i, k;
+ if (idx == 0)
+ return;
for (i = idx-1; i > 0; i--)
{
k = random_range(i+1);

1
audio/tracker/pkg/COMMENT
View File

@ -1 +0,0 @@
MOD player