diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1996-10-25 13:32:42 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1996-10-25 13:32:42 +0000 |
commit | cd367bb995b4ecc640249732d1e3b131315a32b6 (patch) | |
tree | 29a21b73e3c71369e779d2e11ca4ac35804bdc74 /audio/gsm | |
parent | Update from the port maintainer: (diff) |
Upgrade to 1.0.10
Notes
Notes:
svn path=/head/; revision=4158
Diffstat (limited to 'audio/gsm')
-rw-r--r-- | audio/gsm/Makefile | 8 | ||||
-rw-r--r-- | audio/gsm/distinfo | 2 | ||||
-rw-r--r-- | audio/gsm/files/patch-aa | 31 | ||||
-rw-r--r-- | audio/gsm/files/patch-ab | 78 | ||||
-rw-r--r-- | audio/gsm/pkg-plist | 10 |
5 files changed, 86 insertions, 43 deletions
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile index 4b560850773b..e8b21846e9fa 100644 --- a/audio/gsm/Makefile +++ b/audio/gsm/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gsm -# Version required: gsm-1.0.7 +# Version required: gsm-1.0.10 # Date created: 5 January 1995 # Whom: pst # -# $Id: Makefile,v 1.4 1995/08/17 05:10:20 pst Exp $ +# $Id: Makefile,v 1.5 1996/04/18 16:31:59 ache Exp $ # -DISTNAME= gsm-1.0.7 +DISTNAME= gsm-1.0.10 CATEGORIES+= audio MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/ -WRKSRC= ${WRKDIR}/gsm-1.0-pl7 +WRKSRC= ${WRKDIR}/gsm-1.0-pl10 post-install: /sbin/ldconfig -m ${PREFIX}/lib diff --git a/audio/gsm/distinfo b/audio/gsm/distinfo index ee7f50f92e0e..74f583166edb 100644 --- a/audio/gsm/distinfo +++ b/audio/gsm/distinfo @@ -1 +1 @@ -MD5 (gsm-1.0.7.tar.gz) = bfe0567fbd39e7675a03ad08da0da293 +MD5 (gsm-1.0.10.tar.gz) = 4b148480f82e96d274248e13880ec873 diff --git a/audio/gsm/files/patch-aa b/audio/gsm/files/patch-aa index 244eb8ef13dc..1d48f4bd09cd 100644 --- a/audio/gsm/files/patch-aa +++ b/audio/gsm/files/patch-aa @@ -1,7 +1,28 @@ -*** inc/config.h Fri Jan 6 01:35:41 1995 ---- inc/config.h Fri Jan 6 01:35:51 1995 +*** inc/config.h.orig Tue Jul 2 18:32:27 1996 +--- inc/config.h Fri Oct 25 17:18:49 1996 *************** -*** 25,32 **** +*** 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 */ @@ -10,11 +31,11 @@ #define HAS_UTIME_H 1 /* UTIME header file */ /*efine HAS_UTIMBUF 1 /* struct utimbuf */ /*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ ---- 25,32 ---- +--- 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) */ +! /*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 */ diff --git a/audio/gsm/files/patch-ab b/audio/gsm/files/patch-ab index 6d8d274e9a08..f2f9d78e4d42 100644 --- a/audio/gsm/files/patch-ab +++ b/audio/gsm/files/patch-ab @@ -1,5 +1,5 @@ -*** Makefile.orig Wed Mar 8 01:22:16 1995 ---- Makefile Thu Apr 18 20:03:21 1996 +*** Makefile.orig Tue Jul 2 18:36:06 1996 +--- Makefile Fri Oct 25 17:15:42 1996 *************** *** 7,17 **** SASR = -DSASR @@ -28,25 +28,27 @@ ######### approximation option for incorrect, but good-enough results. *************** -*** 35,41 **** +*** 43,50 **** # CC = /usr/lang/acc # CCFLAGS = -c -O ! CC = gcc -ansi -pedantic - CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 +! CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 LD = $(CC) ---- 37,43 ---- + +--- 45,52 ---- # CC = /usr/lang/acc # CCFLAGS = -c -O ! #CC = gcc -ansi -pedantic - CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 +! CCFLAGS = -c -DNeedFunctionPrototypes=1 LD = $(CC) + *************** -*** 51,61 **** ---- 53,65 ---- +*** 59,69 **** +--- 61,73 ---- ######### Includes needed by $(CC) # LDINC = -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1 @@ -61,7 +63,7 @@ # Where do you want to install libraries, binaries, a header file # and the manual pages? *************** -*** 63,69 **** +*** 71,77 **** # Leave INSTALL_ROOT empty (or just don't execute "make install") to # not install gsm and toast outside of this directory. @@ -69,7 +71,7 @@ # Where do you want to install the gsm library, header file, and manpages? # ---- 67,73 ---- +--- 75,81 ---- # Leave INSTALL_ROOT empty (or just don't execute "make install") to # not install gsm and toast outside of this directory. @@ -78,7 +80,7 @@ # Where do you want to install the gsm library, header file, and manpages? # *************** -*** 72,78 **** +*** 80,86 **** GSM_INSTALL_ROOT = $(INSTALL_ROOT) GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib @@ -86,7 +88,7 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 ---- 76,82 ---- +--- 84,90 ---- GSM_INSTALL_ROOT = $(INSTALL_ROOT) GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib @@ -95,8 +97,28 @@ *************** -*** 128,133 **** ---- 132,138 ---- +*** 129,141 **** + # DEBUG = -DNDEBUG + ######### Remove -DNDEBUG to enable assertions. + +! CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ + $(WAV49) $(CCINC) -I$(INC) + ######### It's $(CC) $(CFLAGS) + + LFLAGS = $(LDFLAGS) $(LDINC) + ######### It's $(LD) $(LFLAGS) + + + # Targets + +--- 133,146 ---- + # DEBUG = -DNDEBUG + ######### Remove -DNDEBUG to enable assertions. + +! CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ + $(WAV49) $(CCINC) -I$(INC) + ######### It's $(CC) $(CFLAGS) + LFLAGS = $(LDFLAGS) $(LDINC) ######### It's $(LD) $(LFLAGS) @@ -105,17 +127,17 @@ # Targets *************** -*** 246,251 **** ---- 251,257 ---- +*** 258,263 **** +--- 263,269 ---- GSM_INSTALL_TARGETS = \ $(GSM_INSTALL_LIB)/libgsm.a \ -+ $(GSM_INSTALL_LIB)/libgsm.so.1.0 \ ++ $(GSM_INSTALL_LIB)/libgsm.so.1.0.10 \ $(GSM_INSTALL_INC)/gsm.h \ $(GSM_INSTALL_MAN)/gsm.3 \ $(GSM_INSTALL_MAN)/gsm_explode.3 \ *************** -*** 265,273 **** +*** 277,285 **** $(CC) $(CFLAGS) $? @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 @@ -125,7 +147,7 @@ @-echo $(ROOT): Done. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result ---- 271,282 ---- +--- 283,294 ---- $(CC) $(CFLAGS) $? @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 @@ -134,24 +156,24 @@ + # Target rules -! all: $(LIBGSM) $(LIB)/libgsm.so.1.0 $(TOAST) $(TCAT) $(UNTOAST) +! all: $(LIBGSM) $(LIB)/libgsm.so.1.0.10 $(TOAST) $(TCAT) $(UNTOAST) @-echo $(ROOT): Done. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result *************** -*** 287,292 **** ---- 296,304 ---- +*** 299,304 **** +--- 308,316 ---- # The basic API: libgsm -+ $(LIB)/libgsm.so.1.0: $(LIB) $(GSM_OBJECTS:S/o$/so/g) ++ $(LIB)/libgsm.so.1.0.10: $(LIB) $(GSM_OBJECTS:S/o$/so/g) + ld -Bshareable -o $@ $(GSM_OBJECTS:S/o$/so/g) + $(LIBGSM): $(LIB) $(GSM_OBJECTS) -rm $(RMFLAGS) $(LIBGSM) $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) *************** -*** 296,302 **** +*** 308,314 **** # Toast, Untoast and Tcat -- the compress-like frontends to gsm. $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) @@ -159,7 +181,7 @@ $(UNTOAST): $(BIN) $(TOAST) -rm $(RMFLAGS) $(UNTOAST) ---- 308,314 ---- +--- 320,326 ---- # Toast, Untoast and Tcat -- the compress-like frontends to gsm. $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) @@ -168,8 +190,8 @@ $(UNTOAST): $(BIN) $(TOAST) -rm $(RMFLAGS) $(UNTOAST) *************** -*** 382,387 **** ---- 394,405 ---- +*** 394,399 **** +--- 406,417 ---- chmod 444 $@ $(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) @@ -178,7 +200,7 @@ + chmod 444 $@ + ranlib $@ + -+ $(GSM_INSTALL_LIB)/libgsm.so.1.0: $(LIB)/libgsm.so.1.0 ++ $(GSM_INSTALL_LIB)/libgsm.so.1.0.10: $(LIB)/libgsm.so.1.0.10 -rm $@ cp $? $@ chmod 444 $@ diff --git a/audio/gsm/pkg-plist b/audio/gsm/pkg-plist index c534c699f0da..d76b762d41d0 100644 --- a/audio/gsm/pkg-plist +++ b/audio/gsm/pkg-plist @@ -1,14 +1,14 @@ bin/toast -@exec ln -s %f %B/untoast -@exec ln -s %f %B/untoastt +@exec ln -fs %f %B/untoast +@exec ln -fs %f %B/untoastt man/man1/toast.1 -@exec ln -s %f %B/untoast.1 -@exec ln -s %f %B/tcat.1 +@exec ln -fs %f %B/untoast.1 +@exec ln -fs %f %B/tcat.1 man/man3/gsm.3 man/man3/gsm_explode.3 man/man3/gsm_option.3 man/man3/gsm_print.3 -lib/libgsm.so.1.0 +lib/libgsm.so.1.0.10 @exec /sbin/ldconfig -m %B lib/libgsm.a @exec ranlib %D/%F |