pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gsm: remove, pkgsrc version is newer
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Sun Mar 1 12:40:02 2020 +0100
Changeset: cd9e6be4d1329338c9681311cc455f681144c6cf
Modified Files:
Makefile
Removed Files:
gsm/DESCR
gsm/Makefile
gsm/PLIST
gsm/buildlink3.mk
gsm/distinfo
gsm/patches/patch-aa
gsm/patches/patch-ab
Log Message:
gsm: remove, pkgsrc version is newer
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd9e6be4d1329338c9681311cc455f681144c6cf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 6 +-
gsm/DESCR | 2 -
gsm/Makefile | 26 -------
gsm/PLIST | 14 ----
gsm/buildlink3.mk | 13 ----
gsm/distinfo | 8 --
gsm/patches/patch-aa | 35 ---------
gsm/patches/patch-ab | 207 ---------------------------------------------------
8 files changed, 5 insertions(+), 306 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 4a0a2f4d2b..705561c470 100644
--- a/Makefile
+++ b/Makefile
@@ -1241,7 +1241,6 @@ SUBDIR+= grub2-current
SUBDIR+= gsdpdf
SUBDIR+= gsegrafix
SUBDIR+= gsettings-desktop-schemas
-SUBDIR+= gsm
SUBDIR+= gsmartcontrol
SUBDIR+= gst-inspector
SUBDIR+= gst-plugins0.10-farsight
@@ -2457,6 +2456,7 @@ SUBDIR+= ocaml-yojson
SUBDIR+= ocaml-zed
SUBDIR+= ocamlweb
SUBDIR+= ocserv
+SUBDIR+= oggfwd
SUBDIR+= ogmrip
SUBDIR+= ogre
SUBDIR+= olsrd
@@ -3949,6 +3949,7 @@ SUBDIR+= py-rpncalc
SUBDIR+= py-rpyc
SUBDIR+= py-rql
SUBDIR+= py-ruffus
+SUBDIR+= py-sabyenc
SUBDIR+= py-safersympify
SUBDIR+= py-safety
SUBDIR+= py-sage
@@ -4071,6 +4072,7 @@ SUBDIR+= py-tasphyne
SUBDIR+= py-tatsu
SUBDIR+= py-teafiles
SUBDIR+= py-technicolor
+SUBDIR+= py-telegram-bot
SUBDIR+= py-telepathy
SUBDIR+= py-teng
SUBDIR+= py-teradata
@@ -4425,6 +4427,7 @@ SUBDIR+= s3funnel
SUBDIR+= s6
SUBDIR+= s6-dns
SUBDIR+= s6-portable-utils
+SUBDIR+= sabnzbd
SUBDIR+= sabnzbdplus
SUBDIR+= sacc-git
SUBDIR+= safekeep
@@ -4636,6 +4639,7 @@ SUBDIR+= supercat
SUBDIR+= superchic
SUBDIR+= supercollider
SUBDIR+= superlfv
+SUBDIR+= superlu
SUBDIR+= supermodel
SUBDIR+= surf
SUBDIR+= surf-git
diff --git a/gsm/DESCR b/gsm/DESCR
deleted file mode 100644
index 1436934430..0000000000
--- a/gsm/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-gsm is a conversion package and library for converting u-law audio to
-gsm encoding (which is much more efficient) and back again.
diff --git a/gsm/Makefile b/gsm/Makefile
deleted file mode 100644
index 396654bc16..0000000000
--- a/gsm/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2012/09/12 00:24:36 asau Exp $
-#
-
-DISTNAME= gsm-1.0.14
-CATEGORIES= audio
-MASTER_SITES= http://www.quut.com/gsm/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-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-pl14
-USE_LIBTOOL= yes
-
-NO_CONFIGURE= yes
-MAKE_ENV+= ROOT=${WRKSRC}
-INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}${PREFIX}
-INSTALLATION_DIRS= bin include/gsm lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/inc/private.h ${DESTDIR}${PREFIX}/include/gsm
- ${INSTALL_DATA} ${WRKSRC}/inc/proto.h ${DESTDIR}${PREFIX}/include/gsm
- ${INSTALL_DATA} ${WRKSRC}/inc/unproto.h ${DESTDIR}${PREFIX}/include/gsm
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/gsm/PLIST b/gsm/PLIST
deleted file mode 100644
index 9a5fe56c1e..0000000000
--- a/gsm/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:10 joerg Exp $
-bin/tcat
-bin/toast
-bin/untoast
-include/gsm.h
-include/gsm/private.h
-include/gsm/proto.h
-include/gsm/unproto.h
-lib/libgsm.la
-man/man1/toast.1
-man/man3/gsm.3
-man/man3/gsm_explode.3
-man/man3/gsm_option.3
-man/man3/gsm_print.3
diff --git a/gsm/buildlink3.mk b/gsm/buildlink3.mk
deleted file mode 100644
index e779e7401f..0000000000
--- a/gsm/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:53 joerg Exp $
-
-BUILDLINK_TREE+= gsm
-
-.if !defined(GSM_BUILDLINK3_MK)
-GSM_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10
-BUILDLINK_ABI_DEPENDS.gsm+= gsm>=1.0.12
-BUILDLINK_PKGSRCDIR.gsm?= ../../wip/gsm
-.endif # GSM_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -gsm
diff --git a/gsm/distinfo b/gsm/distinfo
deleted file mode 100644
index a4d8386e27..0000000000
--- a/gsm/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 01:12:34 agc Exp $
-
-SHA1 (gsm-1.0.14.tar.gz) = e02ca2b69e974271d2e713f5f4433ae4b6a03ae0
-RMD160 (gsm-1.0.14.tar.gz) = 0508d3d9f31c82661df086df390d0ed52d087854
-SHA512 (gsm-1.0.14.tar.gz) = eefe19bdbc1fd3bc7499db664067b997c57d718e40598d6d330be971d9d2b0a744fc92b135acb5bbad83aacea59bdb061b4230dc0ebcf063bf4afede0e4a2827
-Size (gsm-1.0.14.tar.gz) = 62372 bytes
-SHA1 (patch-aa) = e50ac3bba1c8a6ccd54d6d035232eca739d3f9fa
-SHA1 (patch-ab) = b9af8e40884aeac19e7e5b11df27819408465b65
diff --git a/gsm/patches/patch-aa b/gsm/patches/patch-aa
deleted file mode 100644
index 7684c51270..0000000000
--- a/gsm/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/02/03 06:09:09 obache Exp $
-
---- inc/config.h.orig 2006-04-26 19:14:26.000000000 +0000
-+++ inc/config.h
-@@ -10,7 +10,10 @@
- #define CONFIG_H
-
- /*efine SIGHANDLER_T int /* signal handlers are void */
--/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */
-+
-+#if defined(__INTERIX)
-+#define HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */
-+#endif
-
- #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */
- #define HAS_LIMITS_H 1 /* /usr/include/limits.h */
-@@ -28,10 +31,17 @@
- /*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */
-
- #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */
-+
-+#if defined(__INTERIX)
- #define HAS_UTIME 1 /* POSIX utime(path, times) */
--/*efine HAS_UTIMES 1 /* use utimes() syscall instead */
-+#else
-+#define HAS_UTIMES 1 /* use utimes() syscall instead */
-+#endif
- #define HAS_UTIME_H 1 /* UTIME header file */
-+
-+#if defined(__INTERIX)
- #define HAS_UTIMBUF 1 /* struct utimbuf */
-+#endif
- /*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */
-
- #endif /* CONFIG_H */
diff --git a/gsm/patches/patch-ab b/gsm/patches/patch-ab
deleted file mode 100644
index df4dce7dc7..0000000000
--- a/gsm/patches/patch-ab
+++ /dev/null
@@ -1,207 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2009/02/03 06:09:09 obache Exp $
-
---- Makefile.orig 2006-04-26 19:14:26.000000000 +0000
-+++ Makefile
-@@ -43,7 +43,7 @@ WAV49 = -DWAV49
- # CC = /usr/lang/acc
- # CCFLAGS = -c -O
-
--CC = gcc -ansi -pedantic
-+# CC = gcc -ansi -pedantic
- CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
-
- LD = $(CC)
-@@ -71,7 +71,7 @@ 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 =
-
- GSM_INSTALL_ROOT = $(INSTALL_ROOT)
- GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
--GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
--GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
-+GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
-+GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/${PKGMANDIR}/man3
-
-
- # Where do you want to install the toast binaries and their manpage?
-@@ -91,13 +91,14 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma
-
- TOAST_INSTALL_ROOT = $(INSTALL_ROOT)
- TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
--TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
-+TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/${PKGMANDIR}/man1
-
- # Other tools
-
- SHELL = /bin/sh
--LN = ln
-+LN = ln -s
- BASENAME = basename
-+DIRNAME = dirname
- AR = ar
- ARFLAGS = cr
- RMFLAGS =
-@@ -114,7 +115,7 @@ RANLIB = ranlib
-
- # Local Directories
-
--ROOT = .
-+#ROOT = .
- ADDTST = $(ROOT)/add-test
- TST = $(ROOT)/tst
- MAN = $(ROOT)/man
-@@ -129,7 +130,7 @@ INC = $(ROOT)/inc
- # 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)
-
-@@ -139,7 +140,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
-
- # Targets
-
--LIBGSM = $(LIB)/libgsm.a
-+LIBGSM = $(LIB)/libgsm.la
-
- TOAST = $(BIN)/toast
- UNTOAST = $(BIN)/untoast
-@@ -257,7 +258,7 @@ STUFF = ChangeLog \
- # Install targets
-
- GSM_INSTALL_TARGETS = \
-- $(GSM_INSTALL_LIB)/libgsm.a \
-+ $(GSM_INSTALL_LIB)/libgsm.la \
- $(GSM_INSTALL_INC)/gsm.h \
- $(GSM_INSTALL_MAN)/gsm.3 \
- $(GSM_INSTALL_MAN)/gsm_explode.3 \
-@@ -273,10 +274,15 @@ TOAST_INSTALL_TARGETS = \
-
- # Default rules
-
-+.SUFFIXES: .o .lo
-+
- .c.o:
- $(CC) $(CFLAGS) $?
- @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
-
-+.c.lo:
-+ cd `${DIRNAME} $@` && ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $?
-+
- # Target rules
-
- all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-@@ -299,16 +305,20 @@ install: toastinstall gsminstall
-
- # The basic API: libgsm
-
--$(LIBGSM): $(LIB) $(GSM_OBJECTS)
-+$(LIBGSM): $(LIB) $(GSM_OBJECTS:.o=.lo)
- -rm $(RMFLAGS) $(LIBGSM)
-- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
-- $(RANLIB) $(LIBGSM)
-+ cd $(LIB) && \
-+ $(LIBTOOL) --mode=link $(CC) -o `$(BASENAME) $@` \
-+ $(GSM_OBJECTS:.o=.lo) \
-+ -rpath $(PREFIX)/lib -version-info 1:12
-
-
- # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
-
- $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
-- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
-+ cd $(BIN) && \
-+ $(LIBTOOL) --mode=link $(LD) $(LFLAGS) -o `$(BASENAME) $@` \
-+ $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
-
- $(UNTOAST): $(BIN) $(TOAST)
- -rm $(RMFLAGS) $(UNTOAST)
-@@ -332,12 +342,12 @@ $(LIB):
-
- gsminstall:
- -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
-- make $(GSM_INSTALL_TARGETS) ; \
-+ $(MAKE) $(GSM_INSTALL_TARGETS) ; \
- fi
-
- toastinstall:
- -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \
-- make $(TOAST_INSTALL_TARGETS); \
-+ $(MAKE) $(TOAST_INSTALL_TARGETS); \
- fi
-
- gsmuninstall:
-@@ -351,52 +361,34 @@ toastuninstall:
- fi
-
- $(TOAST_INSTALL_BIN)/toast: $(TOAST)
-- -rm $@
-- cp $(TOAST) $@
-- chmod 755 $@
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $? $(TOAST_INSTALL_BIN)
-
- $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
-- -rm $@
-- ln $? $@
-+ ${LN} -f toast $@
-
- $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast
-- -rm $@
-- ln $? $@
-+ ${LN} -f toast $@
-
- $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(TOAST_INSTALL_MAN)
-
- $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
-
- $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
-
- $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
-
- $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
-
- $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h
-- -rm $@
-- cp $? $@
-- chmod 444 $@
--
--$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM)
-- -rm $@
-- cp $? $@
-- chmod 444 $@
-+ ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_INC)
-+
-+$(GSM_INSTALL_LIB)/libgsm.la: $(LIBGSM)
-+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $? $(GSM_INSTALL_LIB)
-
-
- # Distribution
Home |
Main Index |
Thread Index |
Old Index