aboutsummaryrefslogtreecommitdiff
path: root/audio/xmixer
diff options
context:
space:
mode:
authorTrevor Johnson <trevor@FreeBSD.org>2001-02-19 22:58:22 +0000
committerTrevor Johnson <trevor@FreeBSD.org>2001-02-19 22:58:22 +0000
commit8054aa8ba184b916d64baa581d746ad23918347a (patch)
tree5fda22fb71e2ccab89ce812f65010808f1492ca4 /audio/xmixer
parent834910eb6170c9c167479626e3a3eb449adc67e9 (diff)
downloadports-8054aa8ba184b916d64baa581d746ad23918347a.tar.gz
ports-8054aa8ba184b916d64baa581d746ad23918347a.zip
Notes
Diffstat (limited to 'audio/xmixer')
-rw-r--r--audio/xmixer/Makefile11
-rw-r--r--audio/xmixer/distinfo2
-rw-r--r--audio/xmixer/files/patch-aa28
-rw-r--r--audio/xmixer/files/patch-ab6
-rw-r--r--audio/xmixer/files/patch-af17
-rw-r--r--audio/xmixer/pkg-comment2
-rw-r--r--audio/xmixer/pkg-descr4
-rw-r--r--audio/xmixer/pkg-plist2
8 files changed, 37 insertions, 35 deletions
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index 57dedcf14aa5..ff399baf0824 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -6,24 +6,21 @@
#
PORTNAME= xmixer
-PORTVERSION= 0.9.3
+PORTVERSION= 0.9.4
CATEGORIES= audio
MASTER_SITES= http://www.hdk-berlin.de/~rasca/
-MASTER_SITE_SUBDIR= apps/sound/mixers
MAINTAINER= ports@FreeBSD.org
-BROKEN= seems incompatible with newpcm
-
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GMAKE= yes
USE_GTK= yes
USE_AUTOCONF= yes
MAN1= xmixer.1
+MLINKS= xmixer.1 xgmixer.1
-post-extract:
- @${RM} ${WRKSRC}/config.cache
+pre-patch:
+ @find ${WRKSRC} -type f | xargs ${PERL} -pi -e 's|rxvt -e|xterm -e|g'
.include <bsd.port.mk>
diff --git a/audio/xmixer/distinfo b/audio/xmixer/distinfo
index 9ce0d1292ff2..f71c1fea1574 100644
--- a/audio/xmixer/distinfo
+++ b/audio/xmixer/distinfo
@@ -1 +1 @@
-MD5 (xmixer-0.9.3.tar.gz) = 61afafb8604bf1bbbd050df990a0e387
+MD5 (xmixer-0.9.4.tar.gz) = 0cf839f996c8506d386a2bf04259bf44
diff --git a/audio/xmixer/files/patch-aa b/audio/xmixer/files/patch-aa
index 1f753385bb25..6139566d9078 100644
--- a/audio/xmixer/files/patch-aa
+++ b/audio/xmixer/files/patch-aa
@@ -1,30 +1,38 @@
---- Makefile.in.orig Sun Aug 22 07:25:07 1999
-+++ Makefile.in Sat Jul 1 15:58:55 2000
+--- Makefile.in.orig Thu Nov 16 17:12:29 2000
++++ Makefile.in Tue Feb 20 02:03:56 2001
@@ -13,7 +13,7 @@
DEF_MIXER = /dev/mixer
- VERSION = 0.9.3
+ VERSION = 0.9.4
-CFLAGS = -O -Wall @CFLAGS@ @X_CFLAGS@ -DDEFAULT_MIXER=\"$(DEF_MIXER)\" \
+CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDEFAULT_MIXER=\"$(DEF_MIXER)\" \
-DOSS -I$(top_srcdir) -I$(top_srcdir)/icons \
-DVERSION=\"$(VERSION)\"
LDFLAGS = @LDFLAGS@
-@@ -33,27 +33,29 @@
+@@ -25,7 +25,7 @@
+ OBJS = main.o mixer.o gui_xaw.o chglbl.o scf.o
+ G_OBJS = main.o mixer.o gui_gtk.o scf.o
+
+-default: $(PROGS) README
++all: $(PROGS)
+
+ gui_xaw.o: fallback.h
+
+@@ -33,27 +33,27 @@
mkfb.pl < XMixer.ad > fallback.h
gui_gtk.o: gui_gtk.c
- $(CC) $(CFLAGS) $(INCS) `gtk-config --cflags` -c $<
+ $(CC) $(CFLAGS) $(INCS) `$(GTK_CONFIG) --cflags` -c $<
- %.o: %.c
+-%.o: %.c
++.c.o:
$(CC) $(CFLAGS) $(INCS) -c $<
-+all: gmixer xmixer
-+
xmixer: Xw/libXw.a $(OBJS)
$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- gmixer: $(G_OBJS)
+ xgmixer: $(G_OBJS)
- $(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk-config --libs`
+ $(LD) $(LDFLAGS) -o $@ $(G_OBJS) `$(GTK_CONFIG) --libs`
@@ -38,10 +46,10 @@
install: $(PROGS)
- install -o bin xmixer $(bindir)
- install xmixer.man $(mandir)/xmixer.1
-- install -o bin gmixer $(bindir)
+- install -o bin xgmixer $(bindir)
+ ${BSD_INSTALL_PROGRAM} xmixer $(bindir)
+ ${BSD_INSTALL_MAN} xmixer.man $(mandir)/xmixer.1
-+ ${BSD_INSTALL_PROGRAM} gmixer $(bindir)
++ ${BSD_INSTALL_PROGRAM} xgmixer $(bindir)
install.lib: libmixer.a
install libsmixer.a $(LIBDIR)
diff --git a/audio/xmixer/files/patch-ab b/audio/xmixer/files/patch-ab
index 32a6ffcd799e..71805804f34f 100644
--- a/audio/xmixer/files/patch-ab
+++ b/audio/xmixer/files/patch-ab
@@ -1,5 +1,5 @@
---- configure.in.orig Sat Aug 21 21:46:55 1999
-+++ configure.in Sat Jul 1 15:47:39 2000
+--- configure.in.orig Thu Nov 16 17:13:39 2000
++++ configure.in Tue Feb 20 02:04:19 2001
@@ -23,15 +23,15 @@
AC_CHECK_LIB(Xaw, XawPanedGetNumSub)
@@ -18,4 +18,4 @@
+__gtk=`$GTK_CONFIG --version`
case "$__gtk" in
1.2*)
- x_progs="xmixer gmixer"
+ x_progs="xmixer xgmixer"
diff --git a/audio/xmixer/files/patch-af b/audio/xmixer/files/patch-af
index 8587fbcd70d1..4589d54cc581 100644
--- a/audio/xmixer/files/patch-af
+++ b/audio/xmixer/files/patch-af
@@ -1,16 +1,15 @@
---- xmixer.man.orig Sat Aug 21 13:57:37 1999
-+++ xmixer.man Wed Oct 27 06:07:12 1999
-@@ -4,9 +4,11 @@
+--- xmixer.man.orig Thu Nov 16 17:32:10 2000
++++ xmixer.man Tue Feb 20 02:05:12 2001
+@@ -4,9 +4,10 @@
.\"
.TH XMIXER 1 "Aug 1999" "GNU" "Version 0.9"
.SH NAME
-xmixer - Xaw-based soundcard mixer program for Linux/X11
-+
+.Sh NAME
-+.Nm xmixer, gmixer
-+.Nd Xaw- and GTK+-based soundcard mixer programs for X11
++.Nm xmixer, xgmixer
++.Nd Xaw- and GTK+-based soundcard mixer program for X11
.br
--gmixer - Gtk+-based soundcard mixer program for Linux/X11
+-xgmixer - Gtk+-based soundcard mixer program for Linux/X11
.SH SYNOPSIS
- .BI "xmixer [-h?qnVD] [-m "<device> "] [-d "<display> "] [-g "<geom> "]
-
+ .BI "xmixer [-h?qnVD] [-m "<device> "] [-d "<display> "]
+ .br
diff --git a/audio/xmixer/pkg-comment b/audio/xmixer/pkg-comment
index 1939307ba95b..beab6c554b69 100644
--- a/audio/xmixer/pkg-comment
+++ b/audio/xmixer/pkg-comment
@@ -1 +1 @@
-Audio mixer (gtk and Xlib) for X11R6 (conflicts with audio/gmixer)
+Audio mixer (gtk and Xlib) for X11R6
diff --git a/audio/xmixer/pkg-descr b/audio/xmixer/pkg-descr
index d07d6185f006..74cab102b0e2 100644
--- a/audio/xmixer/pkg-descr
+++ b/audio/xmixer/pkg-descr
@@ -1,5 +1,5 @@
This package includes two programs for adjusting sound mixers: xmixer, which
-uses the Athena toolkit, and gmixer, based on GTK+. From the README:
+uses the Athena toolkit, and xgmixer, based on GTK+. From the README:
Features:
* For every device which is supported by the soundcard you can
@@ -13,6 +13,4 @@ uses the Athena toolkit, and gmixer, based on GTK+. From the README:
* Batch support - just read and evaluate the settings in the
configuration file.
-Note: this conflicts with audio/gmixer.
-
WWW: http://www.hdk-berlin.de/~rasca/xmixer/
diff --git a/audio/xmixer/pkg-plist b/audio/xmixer/pkg-plist
index 76d537bdd1bc..0b7887afddb8 100644
--- a/audio/xmixer/pkg-plist
+++ b/audio/xmixer/pkg-plist
@@ -1,2 +1,2 @@
bin/xmixer
-bin/gmixer
+bin/xgmixer