xmix: Remove, used to update audio/xmix

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: xmix: Remove, used to update audio/xmix
From: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Date: Tue, 16 Jul 2019 11:04:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Tue Jul 16 13:04:42 2019 +0200
Changeset:	3d90a0104590083f2adcf402b8bfe687201b0e95

Modified Files:
	Makefile
Removed Files:
	xmix/COMMIT_MSG
	xmix/DESCR
	xmix/Makefile
	xmix/PLIST
	xmix/distinfo
	xmix/patches/patch-Imakefile
	xmix/patches/patch-xmix.c

Log Message:
xmix: Remove, used to update audio/xmix

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3d90a0104590083f2adcf402b8bfe687201b0e95

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                     |  1 -
 xmix/COMMIT_MSG              |  4 ----
 xmix/DESCR                   |  2 --
 xmix/Makefile                | 30 ------------------------------
 xmix/PLIST                   |  4 ----
 xmix/distinfo                | 12 ------------
 xmix/patches/patch-Imakefile | 31 -------------------------------
 xmix/patches/patch-xmix.c    | 43 -------------------------------------------
 8 files changed, 127 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 181abcde99..3d0bdf5c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -5008,7 +5008,6 @@ SUBDIR+=	xmail
 SUBDIR+=	xmakemol
 SUBDIR+=	xmds
 SUBDIR+=	xmim
-SUBDIR+=	xmix
 SUBDIR+=	xml-light
 SUBDIR+=	xmlformat-docs
 SUBDIR+=	xmlformat-perl
diff --git a/xmix/COMMIT_MSG b/xmix/COMMIT_MSG
deleted file mode 100644
index 676d9d53f9..0000000000
--- a/xmix/COMMIT_MSG
+++ /dev/null
@@ -1,4 +0,0 @@
-Failed to build with RELRO option
-
-- Honor LDFLAGS
-- Bump PKGREVISION
diff --git a/xmix/DESCR b/xmix/DESCR
deleted file mode 100644
index 2b93da2efc..0000000000
--- a/xmix/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the xmix sound mixer for the sound drivers in the FreeBSD
-It was originally written for Linux by Hal Brand (brand%netcom.com@localhost).
diff --git a/xmix/Makefile b/xmix/Makefile
deleted file mode 100644
index 6e9d044458..0000000000
--- a/xmix/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD$
-
-DISTNAME=		xmix-2.1
-PKGREVISION=		4
-CATEGORIES=		audio
-MASTER_SITES=		${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
-
-PATCH_SITES=		${MASTER_SITES}
-PATCHFILES=		xmix-2.1.mixers.patch
-
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-COMMENT=		Mixer for X Window System
-LICENSE=		gnu-gpl-v1
-
-NOT_FOR_PLATFORM=	Interix-*-*
-
-WRKSRC=			${WRKDIR}/xmix
-USE_IMAKE=		yes
-INSTALLATION_DIRS=	lib/X11/app-defaults
-
-pre-configure:
-	${CP} ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man
-
-pre-install:
-	${INSTALL_DATA} ${WRKSRC}/XMix ${DESTDIR}${PREFIX}/lib/X11/app-defaults
-
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/xmix/PLIST b/xmix/PLIST
deleted file mode 100644
index bcf439ff6a..0000000000
--- a/xmix/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD$
-bin/xmix
-lib/X11/app-defaults/XMix
-${IMAKE_MAN_DIR}/xmix.1
diff --git a/xmix/distinfo b/xmix/distinfo
deleted file mode 100644
index 5809718b24..0000000000
--- a/xmix/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-SHA1 (xmix-2.1.mixers.patch) = 86b423774a6afcd56a8f8931108823d702db1ea5
-RMD160 (xmix-2.1.mixers.patch) = bbbc4b44ed603e54044fc1c71fa20f4373cae81a
-SHA512 (xmix-2.1.mixers.patch) = c5f72de9d0f28208269fcf6a2e2db6ed6b5c40c94c82effeef1b9c2d5ffc086c92c0a55f28d674ae9be9d592f7969046701f664325338d9f45506326d0aa9a7a
-Size (xmix-2.1.mixers.patch) = 1684 bytes
-SHA1 (xmix-2.1.tar.gz) = 390096a541a41ffb47c9b57ee6029211d31393d3
-RMD160 (xmix-2.1.tar.gz) = 0f1bc15b89bfc657ade9b12cb9decb248d780925
-SHA512 (xmix-2.1.tar.gz) = 1acdb835ed5791b7642910909ea932c9750935d795e14dcc88da011ece8e303e20610945f8f7382b4e141311de42c16df2626d8b313bf187ee08f7bfcfa1b988
-Size (xmix-2.1.tar.gz) = 34835 bytes
-SHA1 (patch-Imakefile) = ddaa95bd48632bff826d1da484d0360a6b3e720e
-SHA1 (patch-xmix.c) = 449734b8de82dda37c61d8703ecafcf1d8921607
diff --git a/xmix/patches/patch-Imakefile b/xmix/patches/patch-Imakefile
deleted file mode 100644
index 0689c02ab6..0000000000
--- a/xmix/patches/patch-Imakefile
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-Remove CDEBUGFLAGS.
-Honor LDFLAGS from environment.
-Add local libraries.
-
---- Imakefile.orig	1994-02-02 04:54:35.000000000 +0000
-+++ Imakefile
-@@ -2,7 +2,7 @@
- # xmix Imakefile.
- #
- #CDEBUGFLAGS=-gstabs
--CDEBUGFLAGS=-O
-+#CDEBUGFLAGS=-O
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
- 
- SRCS1=	xmix.c
-@@ -12,6 +12,11 @@ PROGRAMS = xmix
- 
- all::  $(PROGRAMS)
- 
--LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-+# Honor LDFLAGS from environment
-+LOCAL_LDFLAGS = $(LDFLAGS)
- 
--NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),)
-+LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(LIBOSSAUDIO)
-+
-+PROGRAM = $(PROGRAMS)
-+
-+ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),)
diff --git a/xmix/patches/patch-xmix.c b/xmix/patches/patch-xmix.c
deleted file mode 100644
index 607bc1ece3..0000000000
--- a/xmix/patches/patch-xmix.c
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-- support more OSes (is the first hunk actually correct?)
-- fix void main
-- remove debug printout
-
---- xmix.c.orig	2019-07-03 12:47:36.000000000 +0000
-+++ xmix.c
-@@ -77,7 +77,16 @@ to Rick! I'll call this version V2.1
- #include "square_empty.bit"
- #include "square_with_x.bit"
- 
-+#if defined(__linux__)
- #include <linux/soundcard.h>
-+#elif defined(__NetBSD__)
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
-+#elif defined(__sun)
-+#include <sys/soundcard.h>
-+#else
-+#include <machine/soundcard.h>
-+#endif
- 
- #define SOUND_FULL_SCALE 100.0
- #define MAX_SOUND_VOL 95
-@@ -450,7 +459,7 @@ static void set_supported(VolumeControl 
- }
- 
- 
--void main (int argc, char **argv)
-+int main (int argc, char **argv)
- {
-   XtAppContext app_context;
-   int scroll_sep, longway;
-@@ -742,7 +751,7 @@ void main (int argc, char **argv)
-   mic.locked = 0;
-   reclvl.locked = 0;
- 
--  printf("supported = 0x%x\n",supported);
-+  /*printf("supported = 0x%x\n",supported);*/
-   set_supported(&master,(supported & SOUND_MASK_VOLUME) != 0);
-   set_supported(&bass,(supported & SOUND_MASK_BASS) != 0);
-   set_supported(&treble,(supported & SOUND_MASK_TREBLE) != 0);
Prev by Date: crust-firmware: amend paths after wip change.
Next by Date: fltk13: Remove, used to update x11/fltk13
Previous by Thread: crust-firmware: amend paths after wip change.
Next by Thread: fltk13: Remove, used to update x11/fltk13
Indexes:
Home | Main Index | Thread Index | Old Index