audio/gsm: update to 1.0.22

Major changes
    * Use $(RMFLAGS) with the rms in the Makefile.
    * add -f to $(RMFLAGS) to avoid spurious error messages during build
    * Use $(LN), not ln, in the Makefile rules for the installed binary
      of untoast and tcat.
    * Remove unused, and occasionally out of date, VERSION variable from
      Makefile.

Port changes:
    * Remove openwrt MASTER_SITE, no distfile available anymore

4 files changed, 85 insertions, 70 deletions

diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index ad816141ed85..853382cbd557 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	gsm
-DISTVERSION=	1.0.19
+DISTVERSION=	1.0.22
 CATEGORIES=	audio
-MASTER_SITES=	http://www.quut.com/gsm/ \
-		http://downloads.openwrt.org/sources/
+MASTER_SITES=	http://www.quut.com/gsm/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio converter and library for converting u-law to gsm encoding
@@ -13,8 +12,8 @@ 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-pl19
-
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/gsm-1.0-pl22
+
 .include <bsd.port.mk>
diff --git a/audio/gsm/distinfo b/audio/gsm/distinfo
index 9710ecace1f4..369b73bb0fe6 100644
--- a/audio/gsm/distinfo
+++ b/audio/gsm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608949399
-SHA256 (gsm-1.0.19.tar.gz) = 4903652f68a8c04d0041f0d19b1eb713ddcd2aa011c5e595b3b8bca2755270f6
-SIZE (gsm-1.0.19.tar.gz) = 64665
+TIMESTAMP = 1699743014
+SHA256 (gsm-1.0.22.tar.gz) = f0072e91f6bb85a878b2f6dbf4a0b7c850c4deb8049d554c65340b3bf69df0ac
+SIZE (gsm-1.0.22.tar.gz) = 66583
diff --git a/audio/gsm/files/patch-Makefile b/audio/gsm/files/patch-Makefile
index 90c147526335..a5840ae76442 100644
--- a/audio/gsm/files/patch-Makefile
+++ b/audio/gsm/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2020-03-27 14:17:15.000000000 -0700
-+++ Makefile	2020-12-26 17:47:37.889939000 -0800
+--- Makefile.orig	2022-08-04 18:46:46 UTC
++++ Makefile
 @@ -43,8 +43,8 @@
  # CC		= /usr/lang/acc
  # CCFLAGS 	= -c -O
@@ -11,7 +11,7 @@
  
  LD 		= $(CC)
  
-@@ -59,11 +59,13 @@
+@@ -59,6 +59,7 @@
  ######### Includes needed by $(CC)
  
  # LDINC	= -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1
@@ -19,13 +19,7 @@
  ######### Library paths needed by $(LD)
  
  # LDLIB	= -lgcc
- ######### Additional libraries needed by $(LD)
- 
-+#PREFIX= /usr/local
- 
- # Where do you want to install libraries, binaries, a header file
- # and the manual pages?
-@@ -71,7 +73,7 @@
+@@ -71,7 +72,7 @@
  # Leave INSTALL_ROOT empty (or just don't execute "make install") to
  # not install gsm and toast outside of this directory.
  
@@ -34,7 +28,7 @@
  
  # Where do you want to install the gsm library, header file, and manpages?
  #
-@@ -80,7 +82,7 @@
+@@ -80,7 +81,7 @@
  
  GSM_INSTALL_ROOT = $(INSTALL_ROOT)
  GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
@@ -43,20 +37,21 @@
  GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
  
  
-@@ -106,6 +108,7 @@
+@@ -106,7 +107,7 @@
  COMPRESSFLAGS 	= 
  # RANLIB 	= true
  RANLIB	 	= ranlib
+-
 +RM		= rm -f
- 
  #
  #    You shouldn't have to configure below this line if you're porting.
-@@ -129,18 +132,19 @@
+ # 
+@@ -129,17 +130,19 @@
  # DEBUG	= -DNDEBUG
  ######### Remove -DNDEBUG to enable assertions.
  
 -CFLAGS	= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
-+CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
++CFLAGS	+= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
  	$(WAV49) $(CCINC) -I$(INC)
  ######### It's $(CC) $(CFLAGS)
  
@@ -68,44 +63,41 @@
  # Targets
  
 -LIBGSM	= $(LIB)/libgsm.a
--
-+LIBGSM	= libgsm.a
-+SOLIBGSM	= libgsm.so.1
++LIBGSM = libgsm.a
++SOLIBGSM       = libgsm.so.1
+ 
  TOAST	= $(BIN)/toast
  UNTOAST	= $(BIN)/untoast
- TCAT	= $(BIN)/tcat
-@@ -257,13 +261,15 @@
+@@ -257,7 +260,8 @@
  # Install targets
  
  GSM_INSTALL_TARGETS =	\
 -		$(GSM_INSTALL_LIB)/libgsm.a		\
-+		$(GSM_INSTALL_LIB)/$(LIBGSM)		\
-+		$(GSM_INSTALL_LIB)/$(SOLIBGSM)		\
++		$(GSM_INSTALL_LIB)/$(LIBGSM)            \
++		$(GSM_INSTALL_LIB)/$(SOLIBGSM)          \
  		$(GSM_INSTALL_INC)/gsm.h		\
  		$(GSM_INSTALL_MAN)/gsm.3		\
  		$(GSM_INSTALL_MAN)/gsm_explode.3	\
- 		$(GSM_INSTALL_MAN)/gsm_option.3		\
- 		$(GSM_INSTALL_MAN)/gsm_print.3
+@@ -272,14 +276,16 @@
  
-+
- TOAST_INSTALL_TARGETS =	\
- 		$(TOAST_INSTALL_BIN)/toast		\
- 		$(TOAST_INSTALL_BIN)/tcat		\
-@@ -277,9 +283,12 @@
+ 
+ # Default rules
+-
+ .c.o:
  		$(CC) $(CFLAGS) $?
  		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
  
 +.c.so:
-+		${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
++	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 +
  # Target rules
  
 -all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-+all:            $(LIB)/$(LIBGSM) $(LIB)/$(SOLIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIB)/$(LIBGSM) $(LIB)/$(SOLIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +308,28 @@
+@@ -299,26 +305,30 @@
  
  # The basic API: libgsm
  
@@ -117,17 +109,18 @@
 +		$(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)
++$(LIB)/$(LIBGSM):      $(LIB) $(GSM_OBJECTS)
++		$(RM) $(RMFLAGS) $(LIB)/$(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)
 -		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
 +$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIB)/$(LIBGSM)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIB)/$(LIBGSM) $(LDLIB)
++$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIB)/$(LIBGSM)
 +		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) -lgsm $(LDLIB)
  
  $(UNTOAST):	$(BIN) $(TOAST)
@@ -142,14 +135,16 @@
 +		$(RM) $(RMFLAGS) $(TCAT)
 +		$(LN) -sf $(TOAST) $(TCAT)
  
- 
+-
  # The local bin and lib directories
-@@ -342,62 +355,66 @@
+ 
+ $(BIN):
+@@ -342,62 +352,59 @@
  
  gsmuninstall:
  		-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\
 -			rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ;	\
-+			$(RM)$(RMFLAGS) $(GSM_INSTALL_TARGETS) ;	\
++		$(RM)$(RMFLAGS) $(GSM_INSTALL_TARGETS) ;        \	
  		fi
  
  toastuninstall:
@@ -159,79 +154,72 @@
  		fi
  
  $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
--		-rm $@
+-		-rm $(RMFLAGS) $@
 -		cp $(TOAST) $@
 -		chmod 755 $@
 +		$(RM) $@
 +		${BSD_INSTALL_PROGRAM} $(TOAST) $@
  
  $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
--		-rm $@
--		ln $? $@
-+		$(RM) $@
+-		-rm $(RMFLAGS) $@
+-		$(LN) $? $@
++		-$(RM) $@
 +		$(LN) -sf toast $@
  
  $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTALL_BIN)/toast
--		-rm $@
--		ln $? $@
+-		-rm $(RMFLAGS) $@
+-		$(LN) $? $@
 +		$(RM) $@
 +		$(LN) -sf toast $@
  
  $(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
--		-rm $@
+-		-rm $(RMFLAGS) $@
 -		cp $? $@
 -		chmod 444 $@
 +		$(RM) $@
 +		${BSD_INSTALL_MAN} $? $@
  
-+$(TOAST_INSTALL_MAN)/untoast.1:	$(MAN)/toast.1
-+		$(RM) $@
-+		$(LN) -sf toast.1 $@
-+
-+$(TOAST_INSTALL_MAN)/tcat.1:	$(MAN)/toast.1
-+		$(RM) $@
-+		$(LN) -sf toast.1 $@
-+
  $(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
--		-rm $@
+-		-rm $(RMFLAGS) $@
 -		cp $? $@
 -		chmod 444 $@
 +		$(RM) $@
 +		${BSD_INSTALL_MAN} $? $@
  
  $(GSM_INSTALL_MAN)/gsm_option.3:	$(MAN)/gsm_option.3
--		-rm $@
+-		-rm $(RMFLAGS) $@
 -		cp $? $@
 -		chmod 444 $@
 +		$(RM) $@
 +		${BSD_INSTALL_MAN} $? $@
++		
  
  $(GSM_INSTALL_MAN)/gsm_explode.3:	$(MAN)/gsm_explode.3
--		-rm $@
+-		-rm $(RMFLAGS) $@
 -		cp $? $@
 -		chmod 444 $@
 +		$(RM) $@
 +		${BSD_INSTALL_MAN} $? $@
  
  $(GSM_INSTALL_MAN)/gsm_print.3:	$(MAN)/gsm_print.3
--		-rm $@
+-		-rm $(RMFLAGS) $@
 -		cp $? $@
 -		chmod 444 $@
 +		$(RM) $@
 +		${BSD_INSTALL_MAN} $? $@
  
  $(GSM_INSTALL_INC)/gsm.h:	$(INC)/gsm.h
--		-rm $@
+-		-rm $(RMFLAGS) $@
 -		cp $? $@
 -		chmod 444 $@
 +		$(RM) $@
 +		${BSD_INSTALL_DATA} $? $@
  
 -$(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
--		-rm $@
+-		-rm $(RMFLAGS) $@
 -		cp $? $@
 -		chmod 444 $@
-+$(GSM_INSTALL_LIB)/$(LIBGSM):	$(LIB)/$(LIBGSM)
++$(GSM_INSTALL_LIB)/$(LIBGSM):  $(LIB)/$(LIBGSM)
 +		$(RM) $@
 +		${BSD_INSTALL_DATA} $? $@
  
@@ -242,3 +230,31 @@
  
  # Distribution
  
+@@ -473,22 +480,22 @@
+ $(TST)/test-result:	$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
+ 			( cd $(TST); ./run ) 
+ 
+-$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIBGSM)
++$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIB)/$(LIBGSM)
+ 			$(LD) $(LFLAGS) -o $(TST)/lin2txt \
+ 				$(TST)/lin2txt.o $(LIBGSM) $(LDLIB)
+ 
+-$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIBGSM)
++$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIB)/$(LIBGSM)
+ 			$(LD) $(LFLAGS) -o $(TST)/lin2cod \
+ 				$(TST)/lin2cod.o $(LIBGSM) $(LDLIB)
+ 
+-$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIBGSM)
++$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIB)/$(LIBGSM)
+ 			$(LD) $(LFLAGS) -o $(TST)/gsm2cod \
+ 				$(TST)/gsm2cod.o $(LIBGSM) $(LDLIB)
+ 
+-$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIBGSM)
++$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIB)/$(LIBGSM)
+ 			$(LD) $(LFLAGS) -o $(TST)/cod2txt \
+ 				$(TST)/cod2txt.o $(LIBGSM) $(LDLIB)
+ 
+-$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIBGSM)
++$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIB)/$(LIBGSM)
+ 			$(LD) $(LFLAGS) -o $(TST)/cod2lin \
+ 				$(TST)/cod2lin.o $(LIBGSM) $(LDLIB)
diff --git a/audio/gsm/files/patch-inc_toast.h b/audio/gsm/files/patch-inc_toast.h
index cffb8ee91e25..596dd00d501e 100644
--- a/audio/gsm/files/patch-inc_toast.h
+++ b/audio/gsm/files/patch-inc_toast.h
@@ -1,5 +1,5 @@
---- inc/toast.h.orig	2020-12-25 18:27:45.606524000 -0800
-+++ inc/toast.h	2020-12-25 18:27:59.726354000 -0800
+--- inc/toast.h.orig	2020-12-25 18:27:45 UTC
++++ inc/toast.h
 @@ -15,6 +15,7 @@
  #define _POSIX_C_SOURCE 200809L
  #endif