Attachment #220972 for bug #252148




# $FreeBSD$

PORTNAME=	gsm
DISTVERSION=	1.0.19
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	GENTOO \
		http://www.quut.com/gsm/ \
		http://downloads.openwrt.org/sources/

MAINTAINER=	neel@neelc.org
COMMENT=	Audio converter and library for converting u-law to gsm encoding

LICENSE=	TU-BERLIN

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


Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (gsm-1.0.13.tar.gz) = 52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad	1	TIMESTAMP = 1608949399
2	SIZE (gsm-1.0.13.tar.gz) = 65318	2	SHA256 (gsm-1.0.19.tar.gz) = 4903652f68a8c04d0041f0d19b1eb713ddcd2aa011c5e595b3b8bca2755270f6
		3	SIZE (gsm-1.0.19.tar.gz) = 64665




--- 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 -Wall -Wno-comment
+#CC		= gcc -ansi -pedantic
+CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -Wall -Wno-comment
 
 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

 
 # Where do you want to install libraries, binaries, a header file
 # and the manual pages?
@@ -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.
 

 
 # Where do you want to install the gsm library, header file, and manpages?
 #
@@ -80,7 +82,7 @@
 
 GSM_INSTALL_ROOT = $(INSTALL_ROOT)
 GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib

 GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
 
 
@@ -106,6 +108,7 @@
 COMPRESSFLAGS 	= 
 # RANLIB 	= true
 RANLIB	 	= ranlib

 
 #
 #    You shouldn't have to configure below this line if you're porting.
@@ -129,18 +132,19 @@
 # DEBUG	= -DNDEBUG
 ######### Remove -DNDEBUG to enable assertions.
 

 TOAST	= $(BIN)/toast
 UNTOAST	= $(BIN)/untoast
 TCAT	= $(BIN)/tcat
@@ -257,13 +261,15 @@
 # Install targets
 
 GSM_INSTALL_TARGETS =	\

 TOAST_INSTALL_TARGETS =	\
 		$(TOAST_INSTALL_BIN)/toast		\
 		$(TOAST_INSTALL_BIN)/tcat		\
@@ -277,9 +283,12 @@
 		$(CC) $(CFLAGS) $?
 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
 

 		@-echo $(ROOT): Done.
 
 tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
@@ -299,24 +308,28 @@
 
 # The basic API: libgsm
 

+$(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)

 
 
 # The local bin and lib directories
@@ -342,62 +355,66 @@
 
 gsmuninstall:
 		-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\

-		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 $@
-		cp $? $@

Line 0 Link Here

(-)files/patch-inc_toast.h (+10 lines)
	1	--- inc/toast.h.orig 2020-12-25 18:27:45.606524000 -0800
	2	+++ inc/toast.h 2020-12-25 18:27:59.726354000 -0800
	3	@@ -15,6 +15,7 @@
	4	#define _POSIX_C_SOURCE 200809L
	5	#endif
	6
	7	+#include <sys/time.h>
	8	#include <sys/types.h>
	9	#include <sys/stat.h>
	10

Return to bug 252148

Lines 2-15 Link Here

(-)Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gsm	4	PORTNAME= gsm
5	PORTVERSION= 1.0.13	5	DISTVERSION= 1.0.19
6	PORTREVISION= 2
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \	7	MASTER_SITES= GENTOO \
9	http://www.quut.com/gsm/ \	8	http://www.quut.com/gsm/ \
10	http://downloads.openwrt.org/sources/	9	http://downloads.openwrt.org/sources/
11		10
12	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= neel@neelc.org
13	COMMENT= Audio converter and library for converting u-law to gsm encoding	12	COMMENT= Audio converter and library for converting u-law to gsm encoding
14		13
15	LICENSE= TU-BERLIN	14	LICENSE= TU-BERLIN
Lines 17-23 Link Here
17	LICENSE_FILE= ${WRKSRC}/COPYRIGHT	16	LICENSE_FILE= ${WRKSRC}/COPYRIGHT
18	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	17	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
19		18
20	WRKSRC= ${WRKDIR}/gsm-1.0-pl13	19	WRKSRC= ${WRKDIR}/gsm-1.0-pl19
21		20
22	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
23		22

Lines 1-17 Link Here

(-)files/patch-Makefile (-19 / +19 lines)
1	--- Makefile.orig 2006-04-26 19:14:26 UTC	1	--- Makefile.orig 2020-03-27 14:17:15.000000000 -0700
2	+++ Makefile	2	+++ Makefile 2020-12-26 17:47:37.889939000 -0800
3	@@ -43,8 +43,8 @@ WAV49 = -DWAV49	3	@@ -43,8 +43,8 @@
4	# CC = /usr/lang/acc	4	# CC = /usr/lang/acc
5	# CCFLAGS = -c -O	5	# CCFLAGS = -c -O
6		6
7	-CC = gcc -ansi -pedantic	7	-CC = gcc -ansi -pedantic
8	-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1	8	-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
9	+#CC = gcc -ansi -pedantic	9	+#CC = gcc -ansi -pedantic
10	+CCFLAGS += -c -DNeedFunctionPrototypes=1	10	+CCFLAGS += -c -DNeedFunctionPrototypes=1 -Wall -Wno-comment
11		11
12	LD = $(CC)	12	LD = $(CC)
13		13
14	@@ -59,11 +59,13 @@ LD = $(CC)	14	@@ -59,11 +59,13 @@
15	######### Includes needed by $(CC)	15	######### Includes needed by $(CC)
16		16
17	# LDINC = -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1	17	# LDINC = -L/usr/gnu/lib/gcc-2.1/gcc-lib/sparc-sun-sunos4.1.2/2.1
Lines 25-31 Link Here
25		25
26	# Where do you want to install libraries, binaries, a header file	26	# Where do you want to install libraries, binaries, a header file
27	# and the manual pages?	27	# and the manual pages?
28	@@ -71,7 +73,7 @@ LD = $(CC)	28	@@ -71,7 +73,7 @@
29	# Leave INSTALL_ROOT empty (or just don't execute "make install") to	29	# Leave INSTALL_ROOT empty (or just don't execute "make install") to
30	# not install gsm and toast outside of this directory.	30	# not install gsm and toast outside of this directory.
31		31
Lines 34-40 Link Here
34		34
35	# Where do you want to install the gsm library, header file, and manpages?	35	# Where do you want to install the gsm library, header file, and manpages?
36	#	36	#
37	@@ -80,7 +82,7 @@ INSTALL_ROOT =	37	@@ -80,7 +82,7 @@
38		38
39	GSM_INSTALL_ROOT = $(INSTALL_ROOT)	39	GSM_INSTALL_ROOT = $(INSTALL_ROOT)
40	GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib	40	GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
Lines 43-49 Link Here
43	GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3	43	GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
44		44
45		45
46	@@ -106,6 +108,7 @@ COMPRESS = compress	46	@@ -106,6 +108,7 @@
47	COMPRESSFLAGS =	47	COMPRESSFLAGS =
48	# RANLIB = true	48	# RANLIB = true
49	RANLIB = ranlib	49	RANLIB = ranlib
Lines 51-57 Link Here
51		51
52	#	52	#
53	# You shouldn't have to configure below this line if you're porting.	53	# You shouldn't have to configure below this line if you're porting.
54	@@ -129,18 +132,19 @@ INC = $(ROOT)/inc	54	@@ -129,18 +132,19 @@
55	# DEBUG = -DNDEBUG	55	# DEBUG = -DNDEBUG
56	######### Remove -DNDEBUG to enable assertions.	56	######### Remove -DNDEBUG to enable assertions.
57		57
Lines 74-80 Link Here
74	TOAST = $(BIN)/toast	74	TOAST = $(BIN)/toast
75	UNTOAST = $(BIN)/untoast	75	UNTOAST = $(BIN)/untoast
76	TCAT = $(BIN)/tcat	76	TCAT = $(BIN)/tcat
77	@@ -257,13 +261,15 @@ STUFF = ChangeLog \	77	@@ -257,13 +261,15 @@
78	# Install targets	78	# Install targets
79		79
80	GSM_INSTALL_TARGETS = \	80	GSM_INSTALL_TARGETS = \
Lines 91-97 Link Here
91	TOAST_INSTALL_TARGETS = \	91	TOAST_INSTALL_TARGETS = \
92	$(TOAST_INSTALL_BIN)/toast \	92	$(TOAST_INSTALL_BIN)/toast \
93	$(TOAST_INSTALL_BIN)/tcat \	93	$(TOAST_INSTALL_BIN)/tcat \
94	@@ -277,9 +283,12 @@ TOAST_INSTALL_TARGETS = \	94	@@ -277,9 +283,12 @@
95	$(CC) $(CFLAGS) $?	95	$(CC) $(CFLAGS) $?
96	@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1	96	@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
97		97
Lines 105-111 Link Here
105	@-echo $(ROOT): Done.	105	@-echo $(ROOT): Done.
106		106
107	tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result	107	tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
108	@@ -299,24 +308,28 @@ install: toastinstall gsminstall	108	@@ -299,24 +308,28 @@
109		109
110	# The basic API: libgsm	110	# The basic API: libgsm
111		111
Lines 116-128 Link Here
116	+$(LIB)/$(SOLIBGSM): $(LIB) $(GSM_OBJECTS:S/o$/so/g)	116	+$(LIB)/$(SOLIBGSM): $(LIB) $(GSM_OBJECTS:S/o$/so/g)
117	+ $(CC) -o $@ -shared -Wl,-soname,$(SOLIBGSM) $(GSM_OBJECTS:S/o$/so/g)	117	+ $(CC) -o $@ -shared -Wl,-soname,$(SOLIBGSM) $(GSM_OBJECTS:S/o$/so/g)
118	+ (cd $(LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) \| sed 's/\.so.*$$/.so/'`)	118	+ (cd $(LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) \| sed 's/\.so.*$$/.so/'`)
119	+	119
120	+$(LIB)/$(LIBGSM): $(LIB) $(GSM_OBJECTS)	120	+$(LIB)/$(LIBGSM): $(LIB) $(GSM_OBJECTS)
121	+ $(RM) $(RMFLAGS) $(LIBGSM)	121	+ $(RM) $(RMFLAGS) $(LIBGSM)
122	+ $(AR) $(ARFLAGS) $(LIB)/$(LIBGSM) $(GSM_OBJECTS)	122	+ $(AR) $(ARFLAGS) $(LIB)/$(LIBGSM) $(GSM_OBJECTS)
123	+ $(RANLIB) $(LIB)/$(LIBGSM)	123	+ $(RANLIB) $(LIB)/$(LIBGSM)
124		124
125		125	+
126	# Toast, Untoast and Tcat -- the compress-like frontends to gsm.	126	# Toast, Untoast and Tcat -- the compress-like frontends to gsm.
127		127
128	-$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)	128	-$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
Lines 144-150 Link Here
144		144
145		145
146	# The local bin and lib directories	146	# The local bin and lib directories
147	@@ -342,62 +355,66 @@ toastinstall:	147	@@ -342,62 +355,66 @@
148		148
149	gsmuninstall:	149	gsmuninstall:
150	-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \	150	-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
Lines 183-189 Link Here
183	- chmod 444 $@	183	- chmod 444 $@
184	+ $(RM) $@	184	+ $(RM) $@
185	+ ${BSD_INSTALL_MAN} $? $@	185	+ ${BSD_INSTALL_MAN} $? $@
186	+	186
187	+$(TOAST_INSTALL_MAN)/untoast.1: $(MAN)/toast.1	187	+$(TOAST_INSTALL_MAN)/untoast.1: $(MAN)/toast.1
188	+ $(RM) $@	188	+ $(RM) $@
189	+ $(LN) -sf toast.1 $@	189	+ $(LN) -sf toast.1 $@
Lines 191-197 Link Here
191	+$(TOAST_INSTALL_MAN)/tcat.1: $(MAN)/toast.1	191	+$(TOAST_INSTALL_MAN)/tcat.1: $(MAN)/toast.1
192	+ $(RM) $@	192	+ $(RM) $@
193	+ $(LN) -sf toast.1 $@	193	+ $(LN) -sf toast.1 $@
194		194	+
195	$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3	195	$(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
196	- -rm $@	196	- -rm $@
197	- cp $? $@	197	- cp $? $@