On Sun, Apr 05, 2009 at 03:49:22PM +0000, Christian Weisgerber wrote:
> sox is nowadays distributed under the GPL. That is somewhat dubious,
> since the source was originally scrounged together from contributions
> with all sorts of confused licensing, but I don't think we can be
> expected to audit this, and as long as nobody complains...
Agreed.
> The GSM package as originally distributed (audio/gsm) fails to allow
> any redistribution in the terms stated in its COPYRIGHT file. This
> is quite obviously an accidental omission; the authors probably
> thought they automatically permitted redistribution by putting the
> package up on FTP. (Common thinking back then.) Unfortunately,
> this is not good enough for us.
I immediately wrote to the upstream authors and suggested to change
the license. So they did (it's now ISC plus the nonliability addition
from the old license). Diff below.
Be sure to read the changelog in the distfile ;-)
Ciao,
Kili
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.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/gsm/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile 4 Jan 2008 17:48:33 -0000 1.34
+++ Makefile 5 Apr 2009 16:52:41 -0000
@@ -2,18 +2,17 @@
COMMENT= u-law to gsm encoding audio converter and library
-DISTNAME= gsm-1.0.10
-PKGNAME= ${DISTNAME}p0
+DISTNAME= gsm-1.0.13
CATEGORIES= audio
-MASTER_SITES= ftp://ftp.digium.com/pub/gnophone/ \
- ftp://ftp.gbnet.net/pub/digium/telephony/gnophone/
-SHARED_LIBS= gsm 1.0
+HOMEPAGE= http://user.cs.tu-berlin.de/~jutta/toast.html
+MASTER_SITES= http://user.cs.tu-berlin.de/~jutta/gsm/
+SHARED_LIBS= gsm 1.1
-# Missing redistribution terms in license
-PERMIT_PACKAGE_CDROM= no redistribution
-PERMIT_PACKAGE_FTP= no redistribution
-PERMIT_DISTFILES_CDROM= no redistribution
-PERMIT_DISTFILES_FTP= no redistribution
+# ISC-like
+PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE_FTP= Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
MAKE_FLAGS= CC="${CC}" DEBUG="${CFLAGS}" LDINC='-L$$(LIB)' \
@@ -21,7 +20,7 @@ MAKE_FLAGS= CC="${CC}" DEBUG="${CFLAGS}"
FAKE_FLAGS= INSTALL_ROOT="${WRKINST}${PREFIX}"
-WRKDIST= ${WRKDIR}/gsm-1.0-pl10
+WRKDIST= ${WRKDIR}/gsm-1.0-pl13
NO_REGRESS= Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/gsm/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 5 Apr 2007 15:37:42 -0000 1.3
+++ distinfo 5 Apr 2009 16:52:41 -0000
@@ -1,5 +1,5 @@
-MD5 (gsm-1.0.10.tar.gz) = SxSEgPgultJ0JI4TiA7Icw==
-RMD160 (gsm-1.0.10.tar.gz) = M0+TqyMsC1wbMJD/pVGvDuBFXtA=
-SHA1 (gsm-1.0.10.tar.gz) = 7keoH0E3vzzpM9xhDLIpMFXOnAI=
-SHA256 (gsm-1.0.10.tar.gz) = 3atwDbRV4TvPm8BZKzIOYcanxpL7PO94gbFLLfGjkGk=
-SIZE (gsm-1.0.10.tar.gz) = 65928
+MD5 (gsm-1.0.13.tar.gz) = wbo5LOYdxK/xwp6k6S9t9A==
+RMD160 (gsm-1.0.13.tar.gz) = 5E9w1IEygDizsWolzJm3hVET22E=
+SHA1 (gsm-1.0.13.tar.gz) = ZosKGAA5pQ03mz1aIueNpLHZCvw=
+SHA256 (gsm-1.0.13.tar.gz) = UsUYJE1CjC5WxUO5jJE19Kdv94DDJFVYC3k/YKCgkq0=
+SIZE (gsm-1.0.13.tar.gz) = 65318
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/audio/gsm/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 23 Dec 2005 16:59:13 -0000 1.5
+++ patches/patch-Makefile 5 Apr 2009 16:52:41 -0000
@@ -1,23 +1,7 @@
$OpenBSD: patch-Makefile,v 1.5 2005/12/23 16:59:13 espie Exp $
---- Makefile.orig Tue Jul 2 16:36:06 1996
-+++ Makefile Thu Dec 22 13:46:49 2005
-@@ -7,11 +7,13 @@
- 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 =
+--- Makefile.orig Wed Apr 26 21:14:26 2006
++++ Makefile Sun Apr 5 18:39:44 2009
+@@ -44,7 +44,7 @@ WAV49 = -DWAV49
# CCFLAGS = -c -O
CC = gcc -ansi -pedantic
@@ -26,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
LD = $(CC)
-@@ -80,7 +82,7 @@ INSTALL_ROOT =
+@@ -80,7 +80,7 @@ INSTALL_ROOT =
GSM_INSTALL_ROOT = $(INSTALL_ROOT)
GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
@@ -35,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
-@@ -106,7 +108,10 @@ COMPRESS = compress
+@@ -106,7 +106,10 @@ COMPRESS = compress
COMPRESSFLAGS =
# RANLIB = true
RANLIB = ranlib
@@ -46,7 +30,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
#
# 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)
######### It's $(LD) $(LFLAGS)
@@ -68,7 +52,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast
TCAT = $(BIN)/tcat
-@@ -258,6 +273,7 @@ STUFF = ChangeLog \
+@@ -258,6 +271,7 @@ STUFF = ChangeLog \
GSM_INSTALL_TARGETS = \
$(GSM_INSTALL_LIB)/libgsm.a \
@@ -76,7 +60,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
$(GSM_INSTALL_INC)/gsm.h \
$(GSM_INSTALL_MAN)/gsm.3 \
$(GSM_INSTALL_MAN)/gsm_explode.3 \
-@@ -277,9 +293,12 @@ TOAST_INSTALL_TARGETS = \
+@@ -277,9 +291,12 @@ TOAST_INSTALL_TARGETS = \
$(CC) $(CFLAGS) $?
@-mv `$(BASENAME) $...@` $@ > /dev/null 2>&1
@@ -90,7 +74,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
@-echo $(ROOT): Done.
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
@@ -103,7 +87,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
$(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): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
@@ -121,7 +105,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
$(LN) $(TOAST) $(TCAT)
-@@ -342,63 +364,51 @@ toastinstall:
+@@ -342,63 +362,51 @@ toastinstall:
gsmuninstall:
-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
@@ -203,7 +187,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
# Distribution
dist: gsm-1.0.tar.Z
-@@ -416,16 +426,16 @@ uninstall: toastuninstall gsmuninstall
+@@ -416,16 +424,16 @@ uninstall: toastuninstall gsmuninstall
@-echo uninstall: Done.
semi-clean:
@@ -223,7 +207,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
$(TOAST) $(TCAT) $(UNTOAST) \
$(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.
$(TLS)/sweet: $(TLS)/sweet.o $(TLS)/taste.o
@@ -258,7 +242,7 @@ $OpenBSD: patch-Makefile,v 1.5 2005/12/2
# 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 )
$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM)
Index: patches/patch-inc_config.h
===================================================================
RCS file: /cvs/ports/audio/gsm/patches/patch-inc_config.h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-inc_config.h
--- patches/patch-inc_config.h 29 Jul 2001 19:29:48 -0000 1.2
+++ patches/patch-inc_config.h 5 Apr 2009 16:52:41 -0000
@@ -1,18 +1,6 @@
$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
*/
+--- inc/config.h.orig Wed Apr 26 21:14:26 2006
++++ inc/config.h Sun Apr 5 18:39:44 2009
@@ -28,8 +28,8 @@
/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h
*/
@@ -22,5 +10,5 @@ $OpenBSD: patch-inc_config.h,v 1.2 2001/
+/*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
*/
+ #define HAS_UTIMBUF 1 /* struct utimbuf
*/
/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf?
*/
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/gsm/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 17 Apr 2005 21:18:29 -0000 1.7
+++ pkg/PLIST 5 Apr 2009 16:52:41 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.7 2005/04/17 21:18:29 espie Exp $
%%SHARED%%
bin/tcat
-bin/toast
+...@bin bin/toast
bin/untoast
include/gsm.h
lib/libgsm.a
