diff --git a/audio/gsm/patches/patch-Makefile b/audio/gsm/patches/patch-Makefile index 8baed141a08..1bee0778f93 100644 --- a/audio/gsm/patches/patch-Makefile +++ b/audio/gsm/patches/patch-Makefile @@ -1,5 +1,6 @@ +$OpenBSD: patch-Makefile,v 1.4 2001/07/29 19:29:48 brad Exp $ --- Makefile.orig Tue Jul 2 10:36:06 1996 -+++ Makefile Mon Feb 5 21:12:33 2001 ++++ Makefile Sun Jul 29 15:24:46 2001 @@ -7,11 +7,13 @@ SASR = -DSASR ######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1) @@ -16,7 +17,7 @@ ######### Define together with USE_FLOAT_MUL to enable the GSM library's ######### approximation option for incorrect, but good-enough results. -@@ -44,7 +46,7 @@ +@@ -44,7 +46,7 @@ WAV49 = # CCFLAGS = -c -O CC = gcc -ansi -pedantic @@ -25,7 +26,7 @@ LD = $(CC) -@@ -80,7 +82,7 @@ +@@ -80,7 +82,7 @@ INSTALL_ROOT = GSM_INSTALL_ROOT = $(INSTALL_ROOT) GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib @@ -34,7 +35,7 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 -@@ -106,6 +108,9 @@ +@@ -106,6 +108,9 @@ COMPRESS = compress COMPRESSFLAGS = # RANLIB = true RANLIB = ranlib @@ -44,7 +45,7 @@ # # You shouldn't have to configure below this line if you're porting. -@@ -136,11 +141,20 @@ +@@ -136,11 +141,20 @@ CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(M LFLAGS = $(LDFLAGS) $(LDINC) ######### It's $(LD) $(LFLAGS) @@ -65,7 +66,7 @@ TOAST = $(BIN)/toast UNTOAST = $(BIN)/untoast TCAT = $(BIN)/tcat -@@ -258,6 +272,7 @@ +@@ -258,6 +272,7 @@ STUFF = ChangeLog \ GSM_INSTALL_TARGETS = \ $(GSM_INSTALL_LIB)/libgsm.a \ @@ -73,7 +74,7 @@ $(GSM_INSTALL_INC)/gsm.h \ $(GSM_INSTALL_MAN)/gsm.3 \ $(GSM_INSTALL_MAN)/gsm_explode.3 \ -@@ -277,9 +292,12 @@ +@@ -277,9 +292,12 @@ TOAST_INSTALL_TARGETS = \ $(CC) $(CFLAGS) $? @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 @@ -87,7 +88,7 @@ @-echo $(ROOT): Done. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,8 +317,11 @@ +@@ -299,8 +317,11 @@ install: toastinstall gsminstall # The basic API: libgsm @@ -100,7 +101,7 @@ $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) $(RANLIB) $(LIBGSM) -@@ -308,14 +329,14 @@ +@@ -308,14 +329,14 @@ $(LIBGSM): $(LIB) $(GSM_OBJECTS) # Toast, Untoast and Tcat -- the compress-like frontends to gsm. $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) @@ -118,7 +119,7 @@ $(LN) $(TOAST) $(TCAT) -@@ -342,61 +363,49 @@ +@@ -342,61 +363,49 @@ toastinstall: gsmuninstall: -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ @@ -198,7 +199,7 @@ # Distribution -@@ -416,16 +425,16 @@ +@@ -416,16 +425,16 @@ uninstall: toastuninstall gsmuninstall @-echo uninstall: Done. semi-clean: @@ -218,7 +219,7 @@ $(TOAST) $(TCAT) $(UNTOAST) \ $(ROOT)/gsm-1.0.tar.Z -@@ -434,29 +443,29 @@ +@@ -434,29 +443,29 @@ clean: semi-clean # but aren't generally needed to port this. $(TLS)/sweet: $(TLS)/sweet.o $(TLS)/taste.o @@ -253,7 +254,7 @@ # Various conversion programs between linear, text, .gsm and the code -@@ -474,21 +483,21 @@ +@@ -474,21 +483,21 @@ $(TST)/test-result: $(TST)/lin2cod $(TST ( cd $(TST); ./run ) $(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM) diff --git a/audio/gsm/patches/patch-inc_config.h b/audio/gsm/patches/patch-inc_config.h index 1d48f4bd09c..5e71fb0ad79 100644 --- a/audio/gsm/patches/patch-inc_config.h +++ b/audio/gsm/patches/patch-inc_config.h @@ -1,42 +1,26 @@ -*** inc/config.h.orig Tue Jul 2 18:32:27 1996 ---- inc/config.h Fri Oct 25 17:18:49 1996 -*************** -*** 13,21 **** - /*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ - - #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ -! /*efine HAS_LIMITS_H 1 /* /usr/include/limits.h */ - #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ -! /*efine HAS_ERRNO_DECL 1 /* errno.h declares errno */ - - #define HAS_FSTAT 1 /* fstat syscall */ - #define HAS_FCHMOD 1 /* fchmod syscall */ ---- 13,21 ---- - /*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ - - #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ -! #define HAS_LIMITS_H 1 /* /usr/include/limits.h */ - #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ -! #define HAS_ERRNO_DECL 1 /* errno.h declares errno */ - - #define HAS_FSTAT 1 /* fstat syscall */ - #define HAS_FCHMOD 1 /* fchmod syscall */ -*************** -*** 28,35 **** - /*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ - - #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ -! #define HAS_UTIME 1 /* POSIX utime(path, times) */ -! /*efine HAS_UTIMES 1 /* use utimes() syscall instead */ - #define HAS_UTIME_H 1 /* UTIME header file */ - /*efine HAS_UTIMBUF 1 /* struct utimbuf */ - /*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ ---- 28,35 ---- - /*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ - - #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ -! /*efine HAS_UTIME 1 /* POSIX utime(path, times) */ -! #define HAS_UTIMES 1 /* use utimes() syscall instead */ - #define HAS_UTIME_H 1 /* UTIME header file */ - /*efine HAS_UTIMBUF 1 /* struct utimbuf */ - /*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ +$OpenBSD: patch-inc_config.h,v 1.2 2001/07/29 19:29:48 brad Exp $ +--- inc/config.h.orig Tue Jul 2 10:32:27 1996 ++++ inc/config.h Sun Jul 29 15:24:46 2001 +@@ -13,9 +13,9 @@ + /*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ + + #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ +-/*efine HAS_LIMITS_H 1 /* /usr/include/limits.h */ ++#define HAS_LIMITS_H 1 /* /usr/include/limits.h */ + #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ +-/*efine HAS_ERRNO_DECL 1 /* errno.h declares errno */ ++#define HAS_ERRNO_DECL 1 /* errno.h declares errno */ + + #define HAS_FSTAT 1 /* fstat syscall */ + #define HAS_FCHMOD 1 /* fchmod syscall */ +@@ -28,8 +28,8 @@ + /*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ + + #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ +-#define HAS_UTIME 1 /* POSIX utime(path, times) */ +-/*efine HAS_UTIMES 1 /* use utimes() syscall instead */ ++/*efine HAS_UTIME 1 /* POSIX utime(path, times) */ ++#define HAS_UTIMES 1 /* use utimes() syscall instead */ + #define HAS_UTIME_H 1 /* UTIME header file */ + /*efine HAS_UTIMBUF 1 /* struct utimbuf */ + /*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */