From trevor@jpj.net Wed Oct 27 06:20:01 1999
Return-Path: <trevor@jpj.net>
Received: from blues.jpj.net (blues.jpj.net [204.97.17.146])
	by hub.freebsd.org (Postfix) with ESMTP id 32398153E3
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Oct 1999 06:19:58 -0700 (PDT)
	(envelope-from trevor@jpj.net)
Received: from localhost (trevor@localhost)
	by blues.jpj.net (right/backatcha) with SMTP id JAA16739
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Oct 1999 09:19:58 -0400 (EDT)
Message-Id: <Pine.BSI.3.95.991027091819.16136D-100000@blues.jpj.net>
Date: Wed, 27 Oct 1999 09:19:58 -0400 (EDT)
From: Trevor Johnson <trevor@jpj.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: new port:  xmixer

>Number:         14555
>Category:       ports
>Synopsis:       New port: xmixer
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 27 06:30:00 PDT 1999
>Closed-Date:    Sat Nov 13 19:20:33 PST 1999
>Last-Modified:  Sat Nov 13 19:20:40 PST 1999
>Originator:     Trevor Johnson (trevor@jpj.net)
>Release:        FreeBSD 3.3-19990924-STABLE i386
>Organization:
myself
>Environment:
only tested on FreeBSD 3.3-19990924-STABLE i386
>Description:
 
 This package includes two programs for adjusting sound mixers:  xmixer,
 which uses the Athena toolkit, and gmixer, based on GTK+. 
 
>How-To-Repeat:
>Fix:
 
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	xmixer
#	xmixer/files
#	xmixer/files/md5
#	xmixer/patches
#	xmixer/patches/patch-aa
#	xmixer/patches/patch-ab
#	xmixer/patches/patch-ac
#	xmixer/patches/patch-ad
#	xmixer/patches/patch-ae
#	xmixer/patches/patch-af
#	xmixer/pkg
#	xmixer/pkg/COMMENT
#	xmixer/pkg/DESCR
#	xmixer/pkg/PLIST
#	xmixer/Makefile
#	xmixer/README.html
#
echo c - xmixer
mkdir -p xmixer > /dev/null 2>&1
echo c - xmixer/files
mkdir -p xmixer/files > /dev/null 2>&1
echo x - xmixer/files/md5
sed 's/^X//' >xmixer/files/md5 << 'END-of-xmixer/files/md5'
XMD5 (xmixer-0.9.3.tar.gz) = 61afafb8604bf1bbbd050df990a0e387
END-of-xmixer/files/md5
echo c - xmixer/patches
mkdir -p xmixer/patches > /dev/null 2>&1
echo x - xmixer/patches/patch-aa
sed 's/^X//' >xmixer/patches/patch-aa << 'END-of-xmixer/patches/patch-aa'
X--- Makefile.in.orig	Sat Aug 21 15:25:07 1999
X+++ Makefile.in	Wed Oct 27 06:02:28 1999
X@@ -33,16 +33,18 @@
X 	mkfb.pl < XMixer.ad > fallback.h
X 
X gui_gtk.o: gui_gtk.c
X-	$(CC) $(CFLAGS) $(INCS) `gtk-config --cflags` -c $<
X+	$(CC) $(CFLAGS) $(INCS) `gtk12-config --cflags` -c $<
X 
X %.o:	%.c
X 	$(CC) $(CFLAGS) $(INCS) -c $<
X 
X+all:	gmixer xmixer
X+
X xmixer: Xw/libXw.a $(OBJS)
X 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
X 
X gmixer: $(G_OBJS)
X-	$(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk-config --libs`
X+	$(LD) $(LDFLAGS) -o $@ $(G_OBJS) `gtk12-config --libs`
X 
X Xw/libXw.a:
X 	cd Xw && make libXw.a
X@@ -51,9 +53,9 @@
X 	lynx -dump http://www/~rasca/xmixer/index.html | sed "s%//www/%//home.pages.de/%" > README
X 
X install: $(PROGS)
X-	install -o bin xmixer $(bindir)
X-	install xmixer.man $(mandir)/xmixer.1
X-	install -o bin gmixer $(bindir)
X+	install -c -o bin xmixer $(bindir)
X+	install -c xmixer.man $(mandir)/xmixer.1
X+	install -c -o bin gmixer $(bindir)
X 
X install.lib: libmixer.a
X 	install libsmixer.a $(LIBDIR)
END-of-xmixer/patches/patch-aa
echo x - xmixer/patches/patch-ab
sed 's/^X//' >xmixer/patches/patch-ab << 'END-of-xmixer/patches/patch-ab'
X--- configure.in.orig	Sat Aug 21 05:46:55 1999
X+++ configure.in	Tue Oct 26 23:48:36 1999
X@@ -17,21 +17,21 @@
X AC_PATH_X
X AC_PATH_XTRA
X LDFLAGS="$LDFLAGS -L$x_libraries/"
X-CFLAGS="$CFLAGS -I$x_includes/"
X+CFLAGS="$CFLAGS -I$x_includes/ -I/usr/X11R6/include/gtk12/"
X 
X AC_CHECK_LIB(Xt, XtVaSetValues)
X AC_CHECK_LIB(Xaw, XawPanedGetNumSub)
X 
X __cflags=$CFLAGS
X-CFLAGS="$CFLAGS `gtk-config --cflags`"
X+CFLAGS="$CFLAGS `gtk12-config --cflags`"
X __libs=$LIBS
X-LIBS="$LIBS `gtk-config --libs`"
X+LIBS="$LIBS `gtk12-config --libs`"
X AC_CHECK_LIB(gdk, gdk_init)
X AC_CHECK_LIB(gtk, gtk_main)
X CFLAGS=$__cflags
X LIBS=$__libs
X 
X-__gtk=`gtk-config --version`
X+__gtk=`gtk12-config --version`
X case "$__gtk" in
X 	1.2*)
X 	x_progs="xmixer gmixer"
END-of-xmixer/patches/patch-ab
echo x - xmixer/patches/patch-ac
sed 's/^X//' >xmixer/patches/patch-ac << 'END-of-xmixer/patches/patch-ac'
X--- gui_gtk.c.orig	Sat Aug 21 15:20:15 1999
X+++ gui_gtk.c	Tue Oct 26 23:47:37 1999
X@@ -23,8 +23,8 @@
X #include <stdlib.h>
X #include <limits.h>
X #include <string.h>
X-#include <gtk/gtk.h>
X-#include <gdk/gdk.h>
X+#include <gtk12/gtk/gtk.h>
X+#include <gtk12/gdk/gdk.h>
X /**/
X #include "gui.h"
X #include "about.h"
END-of-xmixer/patches/patch-ac
echo x - xmixer/patches/patch-ad
sed 's/^X//' >xmixer/patches/patch-ad << 'END-of-xmixer/patches/patch-ad'
X--- main.c.orig	Sat Aug 21 15:26:37 1999
X+++ main.c	Tue Oct 26 23:47:37 1999
X@@ -22,7 +22,13 @@
X 
X #include <stdio.h>
X #include <stdlib.h>		/* free() */
X+#if HAVE_GETOPT_H
X #include <getopt.h>
X+#else
X+extern  int     getopt();
X+extern  char    *optarg;
X+extern  int     optind;
X+#endif
X #include <limits.h>
X #include "gui.h"
X #include "mixer.h"
END-of-xmixer/patches/patch-ad
echo x - xmixer/patches/patch-ae
sed 's/^X//' >xmixer/patches/patch-ae << 'END-of-xmixer/patches/patch-ae'
X--- mixer.c.orig	Sat Aug 21 15:26:41 1999
X+++ mixer.c	Tue Oct 26 23:47:37 1999
X@@ -46,7 +46,18 @@
X #	include <sys/asound.h>
X #endif
X #ifdef OSS
X-#	include <sys/soundcard.h>
X+/* "The nice thing about standards..." */
X+#if defined (__linux__) || defined (__bsdi__)
X+#include <sys/soundcard.h>
X+#else
X+#if defined (__FreeBSD__)
X+#include <machine/soundcard.h>
X+#else
X+#if defined (__NetBSD__) || defined (__OpenBSD__)
X+#include <soundcard.h> /* OSS emulation */
X+#endif
X+#endif
X+#endif
X #endif
X #include "mixer.h"
X 
END-of-xmixer/patches/patch-ae
echo x - xmixer/patches/patch-af
sed 's/^X//' >xmixer/patches/patch-af << 'END-of-xmixer/patches/patch-af'
X--- xmixer.man.orig	Sat Aug 21 13:57:37 1999
X+++ xmixer.man	Wed Oct 27 06:07:12 1999
X@@ -4,9 +4,11 @@
X .\"
X .TH XMIXER 1 "Aug 1999" "GNU" "Version 0.9"
X .SH NAME
X-xmixer - Xaw-based soundcard mixer program for Linux/X11
X+
X+.Sh NAME
X+.Nm xmixer, gmixer
X+.Nd Xaw- and GTK+-based soundcard mixer programs for X11
X .br
X-gmixer - Gtk+-based soundcard mixer program for Linux/X11
X .SH SYNOPSIS
X .BI "xmixer [-h?qnVD] [-m "<device> "] [-d "<display> "] [-g "<geom> "]
X 
END-of-xmixer/patches/patch-af
echo c - xmixer/pkg
mkdir -p xmixer/pkg > /dev/null 2>&1
echo x - xmixer/pkg/COMMENT
sed 's/^X//' >xmixer/pkg/COMMENT << 'END-of-xmixer/pkg/COMMENT'
Xmixer for X Window System
END-of-xmixer/pkg/COMMENT
echo x - xmixer/pkg/DESCR
sed 's/^X//' >xmixer/pkg/DESCR << 'END-of-xmixer/pkg/DESCR'
XThis package includes two programs for adjusting sound mixers:  xmixer, which
Xuses the Athena toolkit, and gmixer, based on GTK+.  From the README:
X
X    Features:
X     * For every device which is supported by the soundcard you can
X       change the volume via a slider. Unsupported devices are not shown.
X     * Select the input device(s) for recording.
X     * On startup a configuration file is read which restores device
X       settings.
X     * With a menu option you can save the current settings for the next
X       start up.
X     * Hide devices which you don't want to see.
X     * Batch support - just read and evaluate the settings in the
X       configuration file.
X
XWWW:  http://home.pages.de/~rasca/xmixer/
X
XTrevor Johnson
Xtrevor@jpj.net
END-of-xmixer/pkg/DESCR
echo x - xmixer/pkg/PLIST
sed 's/^X//' >xmixer/pkg/PLIST << 'END-of-xmixer/pkg/PLIST'
Xbin/xmixer
Xbin/gmixer
Xman/man1/xmixer.1
END-of-xmixer/pkg/PLIST
echo x - xmixer/Makefile
sed 's/^X//' >xmixer/Makefile << 'END-of-xmixer/Makefile'
X# New ports collection makefile for:	xmixer
X# Version required:	0.9.3
X# Date created:		27 October 1999
X# Whom:			trevor@jpj.net
X#
X# $FreeBSD: ports/audio/xmixer/Makefile,v 1.0 1999/10/27 06:11:50 trevor Exp $
X#
X
XDISTNAME=	xmixer-0.9.3
XCATEGORIES=	audio
XMASTER_SITES=	http://www.hdk-berlin.de/~rasca/
XMASTER_SITE_SUBDIR=	apps/sound/mixers
X
XMAINTAINER=	trevor@jpj.net
X
XWRKSRC=		$(WRKDIR)/xmixer
X
XGNU_CONFIGURE=	yes
XUSE_GMAKE=	yes
X
X.include <bsd.port.mk>
END-of-xmixer/Makefile
echo x - xmixer/README.html
sed 's/^X//' >xmixer/README.html << 'END-of-xmixer/README.html'
X<html>
X<title> The FreeBSD Ports Collection (audio/xmixer)</title>
X<head><h1> The FreeBSD Ports Collection ("audio/xmixer")</h1> </head> <hr>
X<body>
X
X<p>You are now in the directory for the port "audio/xmixer" (package name "xmixer-0.9.3").
X
X<p>This is the one-line description for this port:
X
X<p><hr><p>
Xmixer for X Window System
X<p><hr>
X
X<p>Please read the file "<a href="pkg/DESCR">pkg/DESCR</a>" for a
Xlonger description.
X
X<p>Go to the <a href="../../README.html">top of the ports tree</a> for
Xa summary on how to use the ports collection.
X
X<p>
XThis port requires package(s) "XFree86-3.3.5 gtk-1.2.6" to build.
X<p>
XThis port requires package(s) "XFree86-3.3.5 gtk-1.2.6" to run.
X
X<p><hr><p>
X<a href="../README.html"> Go up one level</a>
X|
X<a href="../../README.html"> Go to top of ports tree</a>
X</body>
X</html>
END-of-xmixer/README.html
exit
 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: steve 
Responsible-Changed-When: Wed Oct 27 07:41:57 PDT 1999 
Responsible-Changed-Why:  
Misfiled PR. 
State-Changed-From-To: open->closed  
State-Changed-By: cpiazza 
State-Changed-When: Sat Nov 13 19:20:33 PST 1999 
State-Changed-Why:  
New port committed, thanks! 
>Unformatted:
