Update to latest version.
Fixes a few bugs and clarifies the license. Minor library bump. Update HOMEPAGE and MASTER_SITES. Many thanks to the upstream developers for the quick response. ok naddy@
This commit is contained in:
kili
parent
b051517e1b
commit
3c62593f5a
@ -1,19 +1,18 @@
|
|||||||
# $OpenBSD: Makefile,v 1.34 2008/01/04 17:48:33 espie Exp $
|
# $OpenBSD: Makefile,v 1.35 2009/04/05 19:09:32 kili Exp $
|
||||||
|
|
||||||
COMMENT= u-law to gsm encoding audio converter and library
|
COMMENT= u-law to gsm encoding audio converter and library
|
||||||
|
|
||||||
DISTNAME= gsm-1.0.10
|
DISTNAME= gsm-1.0.13
|
||||||
PKGNAME= ${DISTNAME}p0
|
|
||||||
CATEGORIES= audio
|
CATEGORIES= audio
|
||||||
MASTER_SITES= ftp://ftp.digium.com/pub/gnophone/ \
|
HOMEPAGE= http://user.cs.tu-berlin.de/~jutta/toast.html
|
||||||
ftp://ftp.gbnet.net/pub/digium/telephony/gnophone/
|
MASTER_SITES= http://user.cs.tu-berlin.de/~jutta/gsm/
|
||||||
SHARED_LIBS= gsm 1.0
|
SHARED_LIBS= gsm 1.0
|
||||||
|
|
||||||
# Missing redistribution terms in license
|
# ISC-like
|
||||||
PERMIT_PACKAGE_CDROM= no redistribution
|
PERMIT_PACKAGE_CDROM= Yes
|
||||||
PERMIT_PACKAGE_FTP= no redistribution
|
PERMIT_PACKAGE_FTP= Yes
|
||||||
PERMIT_DISTFILES_CDROM= no redistribution
|
PERMIT_DISTFILES_CDROM= Yes
|
||||||
PERMIT_DISTFILES_FTP= no redistribution
|
PERMIT_DISTFILES_FTP= Yes
|
||||||
WANTLIB= c
|
WANTLIB= c
|
||||||
|
|
||||||
MAKE_FLAGS= CC="${CC}" DEBUG="${CFLAGS}" LDINC='-L$$(LIB)' \
|
MAKE_FLAGS= CC="${CC}" DEBUG="${CFLAGS}" LDINC='-L$$(LIB)' \
|
||||||
@ -21,7 +20,7 @@ MAKE_FLAGS= CC="${CC}" DEBUG="${CFLAGS}" LDINC='-L$$(LIB)' \
|
|||||||
|
|
||||||
FAKE_FLAGS= INSTALL_ROOT="${WRKINST}${PREFIX}"
|
FAKE_FLAGS= INSTALL_ROOT="${WRKINST}${PREFIX}"
|
||||||
|
|
||||||
WRKDIST= ${WRKDIR}/gsm-1.0-pl10
|
WRKDIST= ${WRKDIR}/gsm-1.0-pl13
|
||||||
NO_REGRESS= Yes
|
NO_REGRESS= Yes
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
MD5 (gsm-1.0.10.tar.gz) = SxSEgPgultJ0JI4TiA7Icw==
|
MD5 (gsm-1.0.13.tar.gz) = wbo5LOYdxK/xwp6k6S9t9A==
|
||||||
RMD160 (gsm-1.0.10.tar.gz) = M0+TqyMsC1wbMJD/pVGvDuBFXtA=
|
RMD160 (gsm-1.0.13.tar.gz) = 5E9w1IEygDizsWolzJm3hVET22E=
|
||||||
SHA1 (gsm-1.0.10.tar.gz) = 7keoH0E3vzzpM9xhDLIpMFXOnAI=
|
SHA1 (gsm-1.0.13.tar.gz) = ZosKGAA5pQ03mz1aIueNpLHZCvw=
|
||||||
SHA256 (gsm-1.0.10.tar.gz) = 3atwDbRV4TvPm8BZKzIOYcanxpL7PO94gbFLLfGjkGk=
|
SHA256 (gsm-1.0.13.tar.gz) = UsUYJE1CjC5WxUO5jJE19Kdv94DDJFVYC3k/YKCgkq0=
|
||||||
SIZE (gsm-1.0.10.tar.gz) = 65928
|
SIZE (gsm-1.0.13.tar.gz) = 65318
|
||||||
|
|||||||
@ -1,23 +1,7 @@
|
|||||||
$OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
$OpenBSD: patch-Makefile,v 1.6 2009/04/05 19:09:32 kili Exp $
|
||||||
--- Makefile.orig Tue Jul 2 16:36:06 1996
|
--- Makefile.orig Wed Apr 26 21:14:26 2006
|
||||||
+++ Makefile Thu Dec 22 13:46:49 2005
|
+++ Makefile Sun Apr 5 18:39:44 2009
|
||||||
@@ -7,11 +7,13 @@
|
@@ -44,7 +44,7 @@ WAV49 = -DWAV49
|
||||||
SASR = -DSASR
|
|
||||||
######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1)
|
|
||||||
|
|
||||||
-MULHACK = -DUSE_FLOAT_MUL
|
|
||||||
+#MULHACK = -DUSE_FLOAT_MUL # Don't define it for FreeBSD, cause SIGFPE
|
|
||||||
+MULHACK =
|
|
||||||
######### Define this if your host multiplies floats faster than integers,
|
|
||||||
######### e.g. on a SPARCstation.
|
|
||||||
|
|
||||||
-FAST = -DFAST
|
|
||||||
+#FAST = -DFAST
|
|
||||||
+FAST =
|
|
||||||
######### Define together with USE_FLOAT_MUL to enable the GSM library's
|
|
||||||
######### approximation option for incorrect, but good-enough results.
|
|
||||||
|
|
||||||
@@ -44,7 +46,7 @@ WAV49 =
|
|
||||||
# CCFLAGS = -c -O
|
# CCFLAGS = -c -O
|
||||||
|
|
||||||
CC = gcc -ansi -pedantic
|
CC = gcc -ansi -pedantic
|
||||||
@ -26,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
|
|
||||||
LD = $(CC)
|
LD = $(CC)
|
||||||
|
|
||||||
@@ -80,7 +82,7 @@ INSTALL_ROOT =
|
@@ -80,7 +80,7 @@ INSTALL_ROOT =
|
||||||
|
|
||||||
GSM_INSTALL_ROOT = $(INSTALL_ROOT)
|
GSM_INSTALL_ROOT = $(INSTALL_ROOT)
|
||||||
GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
|
GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
|
||||||
@ -35,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
|
GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
|
||||||
|
|
||||||
|
|
||||||
@@ -106,7 +108,10 @@ COMPRESS = compress
|
@@ -106,7 +106,10 @@ COMPRESS = compress
|
||||||
COMPRESSFLAGS =
|
COMPRESSFLAGS =
|
||||||
# RANLIB = true
|
# RANLIB = true
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
@ -46,7 +30,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
#
|
#
|
||||||
# You shouldn't have to configure below this line if you're porting.
|
# You shouldn't have to configure below this line if you're porting.
|
||||||
#
|
#
|
||||||
@@ -136,11 +141,21 @@ CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(M
|
@@ -136,11 +139,21 @@ CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST
|
||||||
LFLAGS = $(LDFLAGS) $(LDINC)
|
LFLAGS = $(LDFLAGS) $(LDINC)
|
||||||
######### It's $(LD) $(LFLAGS)
|
######### It's $(LD) $(LFLAGS)
|
||||||
|
|
||||||
@ -68,7 +52,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
TOAST = $(BIN)/toast
|
TOAST = $(BIN)/toast
|
||||||
UNTOAST = $(BIN)/untoast
|
UNTOAST = $(BIN)/untoast
|
||||||
TCAT = $(BIN)/tcat
|
TCAT = $(BIN)/tcat
|
||||||
@@ -258,6 +273,7 @@ STUFF = ChangeLog \
|
@@ -258,6 +271,7 @@ STUFF = ChangeLog \
|
||||||
|
|
||||||
GSM_INSTALL_TARGETS = \
|
GSM_INSTALL_TARGETS = \
|
||||||
$(GSM_INSTALL_LIB)/libgsm.a \
|
$(GSM_INSTALL_LIB)/libgsm.a \
|
||||||
@ -76,7 +60,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
$(GSM_INSTALL_INC)/gsm.h \
|
$(GSM_INSTALL_INC)/gsm.h \
|
||||||
$(GSM_INSTALL_MAN)/gsm.3 \
|
$(GSM_INSTALL_MAN)/gsm.3 \
|
||||||
$(GSM_INSTALL_MAN)/gsm_explode.3 \
|
$(GSM_INSTALL_MAN)/gsm_explode.3 \
|
||||||
@@ -277,9 +293,12 @@ TOAST_INSTALL_TARGETS = \
|
@@ -277,9 +291,12 @@ TOAST_INSTALL_TARGETS = \
|
||||||
$(CC) $(CFLAGS) $?
|
$(CC) $(CFLAGS) $?
|
||||||
@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
|
@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
|
||||||
|
|
||||||
@ -90,7 +74,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
@-echo $(ROOT): Done.
|
@-echo $(ROOT): Done.
|
||||||
|
|
||||||
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
|
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
|
||||||
@@ -299,8 +318,11 @@ install: toastinstall gsminstall
|
@@ -299,8 +316,11 @@ install: toastinstall gsminstall
|
||||||
|
|
||||||
# The basic API: libgsm
|
# The basic API: libgsm
|
||||||
|
|
||||||
@ -103,7 +87,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
|
$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
|
||||||
$(RANLIB) $(LIBGSM)
|
$(RANLIB) $(LIBGSM)
|
||||||
|
|
||||||
@@ -308,14 +330,14 @@ $(LIBGSM): $(LIB) $(GSM_OBJECTS)
|
@@ -308,14 +328,14 @@ $(LIBGSM): $(LIB) $(GSM_OBJECTS)
|
||||||
# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
|
# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
|
||||||
|
|
||||||
$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
|
$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
|
||||||
@ -121,7 +105,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
$(LN) $(TOAST) $(TCAT)
|
$(LN) $(TOAST) $(TCAT)
|
||||||
|
|
||||||
|
|
||||||
@@ -342,63 +364,51 @@ toastinstall:
|
@@ -342,63 +362,51 @@ toastinstall:
|
||||||
|
|
||||||
gsmuninstall:
|
gsmuninstall:
|
||||||
-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
|
-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
|
||||||
@ -203,7 +187,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
# Distribution
|
# Distribution
|
||||||
|
|
||||||
dist: gsm-1.0.tar.Z
|
dist: gsm-1.0.tar.Z
|
||||||
@@ -416,16 +426,16 @@ uninstall: toastuninstall gsmuninstall
|
@@ -416,16 +424,16 @@ uninstall: toastuninstall gsmuninstall
|
||||||
@-echo uninstall: Done.
|
@-echo uninstall: Done.
|
||||||
|
|
||||||
semi-clean:
|
semi-clean:
|
||||||
@ -223,7 +207,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
$(TOAST) $(TCAT) $(UNTOAST) \
|
$(TOAST) $(TCAT) $(UNTOAST) \
|
||||||
$(ROOT)/gsm-1.0.tar.Z
|
$(ROOT)/gsm-1.0.tar.Z
|
||||||
|
|
||||||
@@ -434,29 +444,29 @@ clean: semi-clean
|
@@ -434,29 +442,29 @@ clean: semi-clean
|
||||||
# but aren't generally needed to port this.
|
# but aren't generally needed to port this.
|
||||||
|
|
||||||
$(TLS)/sweet: $(TLS)/sweet.o $(TLS)/taste.o
|
$(TLS)/sweet: $(TLS)/sweet.o $(TLS)/taste.o
|
||||||
@ -258,7 +242,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
|
|||||||
|
|
||||||
|
|
||||||
# Various conversion programs between linear, text, .gsm and the code
|
# Various conversion programs between linear, text, .gsm and the code
|
||||||
@@ -474,21 +484,21 @@ $(TST)/test-result: $(TST)/lin2cod $(TST
|
@@ -474,21 +482,21 @@ $(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TO
|
||||||
( cd $(TST); ./run )
|
( cd $(TST); ./run )
|
||||||
|
|
||||||
$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM)
|
$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM)
|
||||||
|
|||||||
@ -1,18 +1,6 @@
|
|||||||
$OpenBSD: patch-inc_config.h,v 1.2 2001/07/29 19:29:48 brad Exp $
|
$OpenBSD: patch-inc_config.h,v 1.3 2009/04/05 19:09:32 kili Exp $
|
||||||
--- inc/config.h.orig Tue Jul 2 10:32:27 1996
|
--- inc/config.h.orig Wed Apr 26 21:14:26 2006
|
||||||
+++ inc/config.h Sun Jul 29 15:24:46 2001
|
+++ inc/config.h Sun Apr 5 18:39:44 2009
|
||||||
@@ -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 @@
|
@@ -28,8 +28,8 @@
|
||||||
/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */
|
/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */
|
||||||
|
|
||||||
@ -22,5 +10,5 @@ $OpenBSD: patch-inc_config.h,v 1.2 2001/07/29 19:29:48 brad Exp $
|
|||||||
+/*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_UTIMES 1 /* use utimes() syscall instead */
|
||||||
#define HAS_UTIME_H 1 /* UTIME header file */
|
#define HAS_UTIME_H 1 /* UTIME header file */
|
||||||
/*efine HAS_UTIMBUF 1 /* struct utimbuf */
|
#define HAS_UTIMBUF 1 /* struct utimbuf */
|
||||||
/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */
|
/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.7 2005/04/17 21:18:29 espie Exp $
|
@comment $OpenBSD: PLIST,v 1.8 2009/04/05 19:09:32 kili Exp $
|
||||||
%%SHARED%%
|
%%SHARED%%
|
||||||
bin/tcat
|
bin/tcat
|
||||||
bin/toast
|
@bin bin/toast
|
||||||
bin/untoast
|
bin/untoast
|
||||||
include/gsm.h
|
include/gsm.h
|
||||||
lib/libgsm.a
|
lib/libgsm.a
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user