>Number:         10627
>Category:       pkg
>Synopsis:       simplify audio/aumix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Jul 18 11:07:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Trevor Johnson
>Release:        Wed Mar 15 23:41:54 PST 2000
>Organization:
none
>Environment:
System: ws9 1.4.2 NetBSD 1.4.2 (GENERIC) #3: Wed Mar 15 23:41:54 PST 2000 toddpw@vader.toddpw.net:/usr/src/sys/arch/i386/compile/GENERIC i386
>Description:

This version of the package doesn't involve as much patching.  There is
still room for improvement:  no patches at all are needed when compiling
according to the instructions in the INSTALL file.

I also made a couple of cosmetic changes to the Makefile.

>How-To-Repeat:
N/A
>Fix:
Please apply the diff and remove these files:

 patches/patch-common_h
 patches/patch-src_common.c
 patches/patch-src_curses.c
 patches/patch-src_dummy.c
 patches/patch-src_gpm-xterm.c
 patches/patch-src_gtk.c
 patches/patch-src_interactive.c
 patches/patch-src_mouse.c
 patches/patch-src_mouse.h

diff -ruN aumix.orig/Makefile aumix/Makefile
--- aumix.orig/Makefile	Fri Jul 14 10:37:18 2000
+++ aumix/Makefile	Tue Jul 18 17:06:41 2000
@@ -12,14 +12,13 @@
 HOMEPAGE=	http://jpj.net/~trevor/aumix.html
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/msgfmt:../../devel/gettext
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	ncurses>=4.2:../../devel/ncurses
+DEPENDS+=	gtk+-1.2.*:../../x11/gtk \
+		ncurses>=4.2:../../devel/ncurses
 
 CFLAGS+=        -I${WRKSRC}/src -I${LOCALBASE}/include
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS= --enable-own-labels
-# --libdir="${PREFIX}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff -ruN aumix.orig/patches/patch-src_common_h aumix/patches/patch-src_common_h
--- aumix.orig/patches/patch-src_common_h	Thu Jan  1 00:00:00 1970
+++ aumix/patches/patch-src_common_h	Tue Jul 18 17:11:14 2000
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- src/common.h.orig	Mon Jun 26 22:51:42 2000
++++ src/common.h	Wed Jul 12 06:22:32 2000
+@@ -61,14 +61,14 @@
+  * Our `LOCAL_TEXT(STRING)' macro stands in for gettext (STRING)' when using
+  * NLS, and simply returns STRING otherwise.
+  */
+-#ifdef HAVE_NLS
++#if 1
+ #define LOCAL_TEXT(string) gettext (string)
+ #ifdef gettext_noop
+ #define LOCAL_TEXT_NOOP(string) gettext_noop(string)
+ #else
+ #define LOCAL_TEXT_NOOP(string) (string)
+ #endif				/* gettext_noop */
+-#ifdef HAVE_LIBINTL_H
++#if 1
+ #include <libintl.h>
+ #include <locale.h>
+ #endif				/* HAVE_LIBINTL_H */
diff -ruN aumix.orig/files/patch-sum aumix/files/patch-sum
--- aumix.orig/files/patch-sum	Fri Jul 14 10:37:18 2000
+++ aumix/files/patch-sum	Tue Jul 18 17:33:50 2000
@@ -1,13 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/07/14 10:37:18 rh Exp $
+$NetBSD$
 
-MD5 (patch-common_h) = 149b759ec1cf1508c00dedbbb12d8d82
-MD5 (patch-src_common.c) = 915fa03d2acad8bfba96aaadb353c75e
-MD5 (patch-src_curses.c) = 46edf4445663405553c4d5050703dfab
+MD5 (patch-src_common_h) = 149b759ec1cf1508c00dedbbb12d8d82
 MD5 (patch-src_curses.h) = 67cc8cbaa826f66d537c67b4ced0b684
-MD5 (patch-src_dummy.c) = 9cc223fb864a634c588c3b1c2d2399dd
-MD5 (patch-src_gpm-xterm.c) = 03a5ce0e816be00d54cab9c4a3f88167
 MD5 (patch-src_gpm-xterm.h) = eabcb91a3f8183efa0c02c57cbeff996
-MD5 (patch-src_gtk.c) = a9af995d8b31fde31f7f7768fb38b4d8
-MD5 (patch-src_interactive.c) = dc6a64ff8aeb42f1a425dccea01375a7
-MD5 (patch-src_mouse.c) = 7624b99f8861dad4ed30a182728838c4
-MD5 (patch-src_mouse.h) = 028e63aedabcf95a31f3ad1ef548df10

>Release-Note:
>Audit-Trail:
>Unformatted: