gsm: updated to 1.0.18

1.0.18:
Remove the MacOS "quarantine" files that I didn't know I'd shipped.
Remove some trailing spaces.
Bump up the patchlevel in inc/gsm.h (I'd forgotten that in release 17.)

1.0.17:
New email addresses in the README.
Avoid left-shifting signed integers.
Don't print longwords using %d or %ld, cast them to (long) first.
Don't compare longwords as longs in addtest, we only care for the
        lower 32 bits. (The math works, but the test failed.)

1.0.16:
New email addresses in the manual pages (patch 16)
Removed a stray .orig file (in patch 15)

5 files changed, 36 insertions, 48 deletions

diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 9e27bfb5b9d..f91fa087f8b 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.35 2017/08/16 20:45:31 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.36 2019/06/15 08:41:30 adam Exp $
 
-DISTNAME=	gsm-1.0.13
+DISTNAME=	gsm-1.0.18
 CATEGORIES=	audio
-MASTER_SITES=	http://user.cs.tu-berlin.de/~jutta/gsm/
+MASTER_SITES=	http://www.quut.com/gsm/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://kbs.cs.tu-berlin.de/~jutta/toast.html
+HOMEPAGE=	http://www.quut.com/gsm/
 COMMENT=	Audio converter and library for converting u-law to gsm encoding
 LICENSE=	mit
 
-WRKSRC=		${WRKDIR}/gsm-1.0-pl13
+WRKSRC=		${WRKDIR}/gsm-1.0-pl18
 USE_LIBTOOL=	yes
-
 NO_CONFIGURE=	yes
-MAKE_ENV+=	ROOT=${WRKSRC:Q}
-INSTALL_ENV+=	INSTALL_ROOT=${DESTDIR:Q}${PREFIX:Q}
+MAKE_ENV+=	ROOT=${WRKSRC}
+INSTALL_ENV+=	INSTALL_ROOT=${DESTDIR}${PREFIX}
+
 INSTALLATION_DIRS=	bin include/gsm lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
 
 post-install:
diff --git a/audio/gsm/distinfo b/audio/gsm/distinfo
index 5bd1d4aa4cf..01eb90a77e9 100644
--- a/audio/gsm/distinfo
+++ b/audio/gsm/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2018/01/17 12:03:01 wiz Exp $
+$NetBSD: distinfo,v 1.12 2019/06/15 08:41:30 adam Exp $
 
-SHA1 (gsm-1.0.13.tar.gz) = 668b0a180039a50d379b3d5a22e78da4b1d90afc
-RMD160 (gsm-1.0.13.tar.gz) = e44f70d481328038b3b16a25cc99b7855113db61
-SHA512 (gsm-1.0.13.tar.gz) = 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-Size (gsm-1.0.13.tar.gz) = 65318 bytes
-SHA1 (patch-aa) = e50ac3bba1c8a6ccd54d6d035232eca739d3f9fa
-SHA1 (patch-ab) = 453b639aa7dc8196a16a750453c9d1cfd7b652a8
-SHA1 (patch-ac) = 60d0f6cb6b119fdaf8dd23fbadf7cb6a64c95a4e
+SHA1 (gsm-1.0.18.tar.gz) = d36580154ea21c1baa6772193365f31d496624b6
+RMD160 (gsm-1.0.18.tar.gz) = e268a667257aa42d5ddbb76c9a8b519f0a7cdb2d
+SHA512 (gsm-1.0.18.tar.gz) = c5b597f68d4a270e1d588f480dcde66fda8302564c687d753f2bd4fc41d246109243e567568da61eddce170f5232d869984743ddf1eea7696d673014a1a453b7
+Size (gsm-1.0.18.tar.gz) = 64549 bytes
+SHA1 (patch-Makefile) = 4e989df8ea5b9eded47fb8a6cd2f8bb4a1dca30f
+SHA1 (patch-inc_config.h) = b70b380be682bd8a1c8f5e98177776572cacf186
diff --git a/audio/gsm/patches/patch-ab b/audio/gsm/patches/patch-Makefile
index 1bb2890cc52..456228b5d1b 100644
--- a/audio/gsm/patches/patch-ab
+++ b/audio/gsm/patches/patch-Makefile
@@ -1,26 +1,27 @@
-$NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
+$NetBSD: patch-Makefile,v 1.1 2019/06/15 08:41:30 adam Exp $
 
---- Makefile.orig	2006-04-26 19:14:26.000000000 +0000
+Do not overwrite compiler flags.
+Use proper installation tools and paths.
+
+--- Makefile.orig	2018-05-06 02:07:28.000000000 +0000
 +++ Makefile
-@@ -43,7 +43,7 @@ WAV49	= -DWAV49
+@@ -43,7 +43,6 @@ WAV49	= -DWAV49
  # CC		= /usr/lang/acc
  # CCFLAGS 	= -c -O
  
 -CC		= gcc -ansi -pedantic
-+# CC		= gcc -ansi -pedantic
- CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
+ CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
  
  LD 		= $(CC)
-@@ -71,7 +71,7 @@ LD 		= $(CC)
+@@ -71,7 +70,6 @@ LD 		= $(CC)
  # Leave INSTALL_ROOT empty (or just don't execute "make install") to
  # not install gsm and toast outside of this directory.
  
 -INSTALL_ROOT	=
-+# INSTALL_ROOT	=
  
  # Where do you want to install the gsm library, header file, and manpages?
  #
-@@ -80,8 +80,8 @@ INSTALL_ROOT	=
+@@ -80,8 +78,8 @@ INSTALL_ROOT	=
  
  GSM_INSTALL_ROOT = $(INSTALL_ROOT)
  GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
@@ -31,7 +32,7 @@ $NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
  
  
  # Where do you want to install the toast binaries and their manpage?
-@@ -91,13 +91,14 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma
+@@ -91,13 +89,14 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma
  
  TOAST_INSTALL_ROOT	  = $(INSTALL_ROOT)
  TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
@@ -48,16 +49,15 @@ $NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
  AR		= ar
  ARFLAGS		= cr
  RMFLAGS		=
-@@ -114,7 +115,7 @@ RANLIB	 	= ranlib
+@@ -114,7 +113,6 @@ RANLIB	 	= ranlib
  
  # Local Directories
  
 -ROOT	= .
-+#ROOT	= .
  ADDTST	= $(ROOT)/add-test
  TST	= $(ROOT)/tst
  MAN	= $(ROOT)/man
-@@ -129,7 +130,7 @@ INC	= $(ROOT)/inc
+@@ -129,7 +127,7 @@ INC	= $(ROOT)/inc
  # DEBUG	= -DNDEBUG
  ######### Remove -DNDEBUG to enable assertions.
  
@@ -66,7 +66,7 @@ $NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
  	$(WAV49) $(CCINC) -I$(INC)
  ######### It's $(CC) $(CFLAGS)
  
-@@ -139,7 +140,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
+@@ -139,7 +137,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
  
  # Targets
  
@@ -75,7 +75,7 @@ $NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
  
  TOAST	= $(BIN)/toast
  UNTOAST	= $(BIN)/untoast
-@@ -257,7 +258,7 @@ STUFF = 	ChangeLog			\
+@@ -257,7 +255,7 @@ STUFF = 	ChangeLog			\
  # Install targets
  
  GSM_INSTALL_TARGETS =	\
@@ -84,7 +84,7 @@ $NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
  		$(GSM_INSTALL_INC)/gsm.h		\
  		$(GSM_INSTALL_MAN)/gsm.3		\
  		$(GSM_INSTALL_MAN)/gsm_explode.3	\
-@@ -273,10 +274,15 @@ TOAST_INSTALL_TARGETS =	\
+@@ -273,10 +271,15 @@ TOAST_INSTALL_TARGETS =	\
  
  # Default rules
  
@@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
  # Target rules
  
  all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-@@ -299,16 +305,20 @@ install:	toastinstall gsminstall
+@@ -299,16 +302,20 @@ install:	toastinstall gsminstall
  
  # The basic API: libgsm
  
@@ -125,7 +125,7 @@ $NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
  
  $(UNTOAST):	$(BIN) $(TOAST)
  		-rm $(RMFLAGS) $(UNTOAST)
-@@ -332,12 +342,12 @@ $(LIB):
+@@ -332,12 +339,12 @@ $(LIB):
  
  gsminstall:
  		-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\
@@ -140,7 +140,7 @@ $NetBSD: patch-ab,v 1.11 2018/01/17 12:03:01 wiz Exp $
  		fi
  
  gsmuninstall:
-@@ -351,52 +361,34 @@ toastuninstall:
+@@ -351,52 +358,34 @@ toastuninstall:
  		fi
  
  $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
diff --git a/audio/gsm/patches/patch-ac b/audio/gsm/patches/patch-ac
deleted file mode 100644
index 900cf1b4f33..00000000000
--- a/audio/gsm/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2009/02/03 06:09:09 obache Exp $
-
---- src/code.c.orig	2006-04-26 19:16:50.000000000 +0000
-+++ src/code.c
-@@ -11,6 +11,7 @@
- 
- #ifdef	HAS_STDLIB_H
- #include	<stdlib.h>
-+#include	<string.h>
- #else
- #	include "proto.h"
- 	extern char	* memcpy P((char *, char *, int));
diff --git a/audio/gsm/patches/patch-aa b/audio/gsm/patches/patch-inc_config.h
index 7684c512703..33652d5052d 100644
--- a/audio/gsm/patches/patch-aa
+++ b/audio/gsm/patches/patch-inc_config.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2009/02/03 06:09:09 obache Exp $
+$NetBSD: patch-inc_config.h,v 1.1 2019/06/15 08:41:30 adam Exp $
+
+Add support for Interix.
 
 --- inc/config.h.orig	2006-04-26 19:14:26.000000000 +0000
 +++ inc/config.h