Index: head/audio/gsm/Makefile =================================================================== --- head/audio/gsm/Makefile (revision 560721) +++ head/audio/gsm/Makefile (revision 560722) @@ -1,24 +1,22 @@ # Created by: pst # $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 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 .include Index: head/audio/gsm/distinfo =================================================================== --- head/audio/gsm/distinfo (revision 560721) +++ head/audio/gsm/distinfo (revision 560722) @@ -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 Index: head/audio/gsm/files/patch-Makefile =================================================================== --- head/audio/gsm/files/patch-Makefile (revision 560721) +++ head/audio/gsm/files/patch-Makefile (revision 560722) @@ -1,244 +1,244 @@ ---- 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 +LDINC = -L$(LIB) ######### 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 @@ 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. -INSTALL_ROOT = +INSTALL_ROOT = $(DESTDIR)$(PREFIX) # 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 -GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc +GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3 -@@ -106,6 +108,7 @@ COMPRESS = compress +@@ -106,6 +108,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 @@ INC = $(ROOT)/inc +@@ -129,18 +132,19 @@ # DEBUG = -DNDEBUG ######### Remove -DNDEBUG to enable assertions. -CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ +CFLAGS += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ $(WAV49) $(CCINC) -I$(INC) ######### It's $(CC) $(CFLAGS) LFLAGS = $(LDFLAGS) $(LDINC) ######### It's $(LD) $(LFLAGS) +.SUFFIXES: .c .so .o # Targets -LIBGSM = $(LIB)/libgsm.a - +LIBGSM = libgsm.a +SOLIBGSM = libgsm.so.1 TOAST = $(BIN)/toast UNTOAST = $(BIN)/untoast TCAT = $(BIN)/tcat -@@ -257,13 +261,15 @@ STUFF = ChangeLog \ +@@ -257,13 +261,15 @@ # Install targets GSM_INSTALL_TARGETS = \ - $(GSM_INSTALL_LIB)/libgsm.a \ + $(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 + 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 +.c.so: + ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} + # Target rules -all: $(LIBGSM) $(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 @@ install: toastinstall gsminstall +@@ -299,24 +308,28 @@ # The basic API: libgsm -$(LIBGSM): $(LIB) $(GSM_OBJECTS) - -rm $(RMFLAGS) $(LIBGSM) - $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) - $(RANLIB) $(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) - $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) +$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIB)/$(LIBGSM) + $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) -lgsm $(LDLIB) $(UNTOAST): $(BIN) $(TOAST) - -rm $(RMFLAGS) $(UNTOAST) - $(LN) $(TOAST) $(UNTOAST) + $(RM) $(RMFLAGS) $(UNTOAST) + $(LN) -sf $(TOAST) $(UNTOAST) $(TCAT): $(BIN) $(TOAST) - -rm $(RMFLAGS) $(TCAT) - $(LN) $(TOAST) $(TCAT) + $(RM) $(RMFLAGS) $(TCAT) + $(LN) -sf $(TOAST) $(TCAT) # The local bin and lib directories -@@ -342,62 +355,66 @@ toastinstall: +@@ -342,62 +355,66 @@ gsmuninstall: -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ - rm $(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \ + $(RM)$(RMFLAGS) $(GSM_INSTALL_TARGETS) ; \ fi toastuninstall: -if [ x"$(TOAST_INSTALL_ROOT)" != x ] ; then \ - rm $(RMFLAGS) $(TOAST_INSTALL_TARGETS); \ + $(RM)$(RMFLAGS) $(TOAST_INSTALL_TARGETS); \ fi $(TOAST_INSTALL_BIN)/toast: $(TOAST) - -rm $@ - cp $(TOAST) $@ - chmod 755 $@ + $(RM) $@ + ${BSD_INSTALL_PROGRAM} $(TOAST) $@ $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast - -rm $@ - ln $? $@ + $(RM) $@ + $(LN) -sf toast $@ $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast - -rm $@ - ln $? $@ + $(RM) $@ + $(LN) -sf toast $@ $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 - -rm $@ - 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 $@ - cp $? $@ - chmod 444 $@ + $(RM) $@ + ${BSD_INSTALL_MAN} $? $@ $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 - -rm $@ - cp $? $@ - chmod 444 $@ + $(RM) $@ + ${BSD_INSTALL_MAN} $? $@ $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 - -rm $@ - cp $? $@ - chmod 444 $@ + $(RM) $@ + ${BSD_INSTALL_MAN} $? $@ $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 - -rm $@ - cp $? $@ - chmod 444 $@ + $(RM) $@ + ${BSD_INSTALL_MAN} $? $@ $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h - -rm $@ - cp $? $@ - chmod 444 $@ + $(RM) $@ + ${BSD_INSTALL_DATA} $? $@ -$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) - -rm $@ - cp $? $@ - chmod 444 $@ +$(GSM_INSTALL_LIB)/$(LIBGSM): $(LIB)/$(LIBGSM) + $(RM) $@ + ${BSD_INSTALL_DATA} $? $@ +$(GSM_INSTALL_LIB)/$(SOLIBGSM): $(LIB)/$(SOLIBGSM) + $(RM) $@ + ${BSD_INSTALL_LIB} $? $@ + (cd $(GSM_INSTALL_LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`) # Distribution Index: head/audio/gsm/files/patch-inc_toast.h =================================================================== --- head/audio/gsm/files/patch-inc_toast.h (nonexistent) +++ head/audio/gsm/files/patch-inc_toast.h (revision 560722) @@ -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 + #include + #include + Property changes on: head/audio/gsm/files/patch-inc_toast.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property