audio/gsm: Update to 1.0.19 and adopt port

While we're here:

 - Remove dead MASTER_SITES

PR:			252148
Reviewed by:		0mp (mentor)
Approved by:		0mp (mentor)
Differential Revision:	https://reviews.freebsd.org/D28013

4 files changed, 36 insertions, 27 deletions

diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index a243a8db18e5..f534ca66a0e2 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -2,14 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	gsm
-PORTVERSION=	1.0.13
-PORTREVISION=	2
+DISTVERSION=	1.0.19
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \
-		http://www.quut.com/gsm/ \
+MASTER_SITES=	http://www.quut.com/gsm/ \
 		http://downloads.openwrt.org/sources/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	neel@neelc.org
 COMMENT=	Audio converter and library for converting u-law to gsm encoding
 
 LICENSE=	TU-BERLIN
@@ -17,7 +15,7 @@ LICENSE_NAME=	Technische Universitaet Berlin copyright
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-WRKSRC=		${WRKDIR}/gsm-1.0-pl13
+WRKSRC=		${WRKDIR}/gsm-1.0-pl19
 
 USE_LDCONFIG=	yes
 
diff --git a/audio/gsm/distinfo b/audio/gsm/distinfo
index c09150101b65..9710ecace1f4 100644
--- a/audio/gsm/distinfo
+++ b/audio/gsm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gsm-1.0.13.tar.gz) = 52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad
-SIZE (gsm-1.0.13.tar.gz) = 65318
+TIMESTAMP = 1608949399
+SHA256 (gsm-1.0.19.tar.gz) = 4903652f68a8c04d0041f0d19b1eb713ddcd2aa011c5e595b3b8bca2755270f6
+SIZE (gsm-1.0.19.tar.gz) = 64665
diff --git a/audio/gsm/files/patch-Makefile b/audio/gsm/files/patch-Makefile
index d11b2443772a..90c147526335 100644
--- a/audio/gsm/files/patch-Makefile
+++ b/audio/gsm/files/patch-Makefile
@@ -1,17 +1,17 @@
---- Makefile.orig	2006-04-26 19:14:26 UTC
-+++ Makefile
-@@ -43,8 +43,8 @@ WAV49	= -DWAV49
+--- Makefile.orig	2020-03-27 14:17:15.000000000 -0700
++++ Makefile	2020-12-26 17:47:37.889939000 -0800
+@@ -43,8 +43,8 @@
  # CC		= /usr/lang/acc
  # CCFLAGS 	= -c -O
  
 -CC		= gcc -ansi -pedantic
--CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
-+#CC              = gcc -ansi -pedantic
-+CCFLAGS         += -c -DNeedFunctionPrototypes=1
+-CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
++#CC		= gcc -ansi -pedantic
++CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -Wall -Wno-comment
  
  LD 		= $(CC)
  
-@@ -59,11 +59,13 @@ LD 		= $(CC)
+@@ -59,11 +59,13 @@
  ######### Includes needed by $(CC)
  
  # LDINC	= -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1
@@ -25,7 +25,7 @@
  
  # Where do you want to install libraries, binaries, a header file
  # and the manual pages?
-@@ -71,7 +73,7 @@ LD 		= $(CC)
+@@ -71,7 +73,7 @@
  # Leave INSTALL_ROOT empty (or just don't execute "make install") to
  # not install gsm and toast outside of this directory.
  
@@ -34,7 +34,7 @@
  
  # Where do you want to install the gsm library, header file, and manpages?
  #
-@@ -80,7 +82,7 @@ INSTALL_ROOT	=
+@@ -80,7 +82,7 @@
  
  GSM_INSTALL_ROOT = $(INSTALL_ROOT)
  GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
@@ -43,7 +43,7 @@
  GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
  
  
-@@ -106,6 +108,7 @@ COMPRESS 	= compress
+@@ -106,6 +108,7 @@
  COMPRESSFLAGS 	= 
  # RANLIB 	= true
  RANLIB	 	= ranlib
@@ -51,7 +51,7 @@
  
  #
  #    You shouldn't have to configure below this line if you're porting.
-@@ -129,18 +132,19 @@ INC	= $(ROOT)/inc
+@@ -129,18 +132,19 @@
  # DEBUG	= -DNDEBUG
  ######### Remove -DNDEBUG to enable assertions.
  
@@ -74,7 +74,7 @@
  TOAST	= $(BIN)/toast
  UNTOAST	= $(BIN)/untoast
  TCAT	= $(BIN)/tcat
-@@ -257,13 +261,15 @@ STUFF = 	ChangeLog			\
+@@ -257,13 +261,15 @@
  # Install targets
  
  GSM_INSTALL_TARGETS =	\
@@ -91,7 +91,7 @@
  TOAST_INSTALL_TARGETS =	\
  		$(TOAST_INSTALL_BIN)/toast		\
  		$(TOAST_INSTALL_BIN)/tcat		\
-@@ -277,9 +283,12 @@ TOAST_INSTALL_TARGETS =	\
+@@ -277,9 +283,12 @@
  		$(CC) $(CFLAGS) $?
  		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
  
@@ -105,7 +105,7 @@
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +308,28 @@ install:	toastinstall gsminstall
+@@ -299,24 +308,28 @@
  
  # The basic API: libgsm
  
@@ -116,13 +116,13 @@
 +$(LIB)/$(SOLIBGSM): $(LIB) $(GSM_OBJECTS:S/o$/so/g)
 +		$(CC) -o $@ -shared -Wl,-soname,$(SOLIBGSM) $(GSM_OBJECTS:S/o$/so/g)
 +		(cd $(LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`)
-+
+ 
 +$(LIB)/$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
 +		$(RM) $(RMFLAGS) $(LIBGSM)
 +		$(AR) $(ARFLAGS) $(LIB)/$(LIBGSM) $(GSM_OBJECTS)
 +		$(RANLIB) $(LIB)/$(LIBGSM)
  
- 
++
  # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
  
 -$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
@@ -144,7 +144,7 @@
  
  
  # The local bin and lib directories
-@@ -342,62 +355,66 @@ toastinstall:
+@@ -342,62 +355,66 @@
  
  gsmuninstall:
  		-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\
@@ -183,7 +183,7 @@
 -		chmod 444 $@
 +		$(RM) $@
 +		${BSD_INSTALL_MAN} $? $@
-+
+ 
 +$(TOAST_INSTALL_MAN)/untoast.1:	$(MAN)/toast.1
 +		$(RM) $@
 +		$(LN) -sf toast.1 $@
@@ -191,7 +191,7 @@
 +$(TOAST_INSTALL_MAN)/tcat.1:	$(MAN)/toast.1
 +		$(RM) $@
 +		$(LN) -sf toast.1 $@
- 
++
  $(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
 -		-rm $@
 -		cp $? $@
diff --git a/audio/gsm/files/patch-inc_toast.h b/audio/gsm/files/patch-inc_toast.h
new file mode 100644
index 000000000000..cffb8ee91e25
--- /dev/null
+++ b/audio/gsm/files/patch-inc_toast.h
@@ -0,0 +1,10 @@
+--- inc/toast.h.orig	2020-12-25 18:27:45.606524000 -0800
++++ inc/toast.h	2020-12-25 18:27:59.726354000 -0800
+@@ -15,6 +15,7 @@
+ #define _POSIX_C_SOURCE 200809L
+ #endif
+ 
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+