ports/147922: [PATCH] audio/aumix: update to 2.9.1

[Bapt]

>Number:         147922
>Category:       ports
>Synopsis:       [PATCH] audio/aumix: update to 2.9.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 16 20:10:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Bapt
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD azathoth.lan 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #5 r208894M: Tue Jun  8 11:03:27
>Description:
- Update to 2.9.1
- Optionify
- Add License

Removed file(s):
- files/patch-src_common.c

Port maintainer (unix4all at gulic.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- aumix-2.9.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/aumix.orig/Makefile /usr/ports/audio/aumix/Makefile
--- /usr/ports/audio/aumix.orig/Makefile	2010-05-31 22:24:23.077774000 +0200
+++ /usr/ports/audio/aumix/Makefile	2010-06-16 22:07:49.798077280 +0200
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	aumix
-PORTVERSION=	2.8
-PORTREVISION=	7
+PORTVERSION=	2.9.1
 CATEGORIES=	audio
 MASTER_SITES=	SF \
 		http://jpj.net/~trevor/aumix/ \
 		http://jpj.net/~trevor/aumix/old/
+
 MAINTAINER=	unix4all at gulic.org
 COMMENT=	Audio mixer for X11, terminal, or command line
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_BZIP2=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -31,40 +34,28 @@
 PLIST_FILES+=	share/aumix/${ii}
 .endfor
 
-.if defined(WITHOUT_NLS) || defined(WITHOUT_ALL)
+OPTIONS=	NLS	"Enable NLS support" on \
+		GTK2	"Enable GTK2 gui" off
+
+.include <bsd.port.pre.mk>
+.if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 .else
 USE_GETTEXT=	yes
-.for ii in de el es fr gl ja nl pl pt_BR ru sv uk zh_CN
+
+.for ii in ca de el es fr gl it ja nl pl pt_BR ru sv uk zh_CN
 PLIST_FILES+=	share/locale/${ii}/LC_MESSAGES/aumix.mo
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-
-pre-extract:
-.if !defined(WITH_GTK2) && !defined(WITHOUT_ALL)
-	@${ECHO_CMD}
-	@${ECHO_CMD} "****** To enable use of GTK+ 2.0, interrupt the   ******"
-	@${ECHO_CMD} "****** build now, set WITH_GTK2, and start again. ******"
-	@${ECHO_CMD}
-	@sleep 3
-.endif
-
 pre-patch:
 	@${REINPLACE_CMD} -e "s:/etc:${PREFIX}/etc:" ${WRKSRC}/src/common.[ch]
 
-.if (${HAVE_GNOME:Mgtk12}!="") && !defined(WITHOUT_ALL) && \
-	!defined(WITHOUT_GTK)&& !defined(WITH_GTK2)
-USE_GNOME=	gtk12
-PKGNAMESUFFIX=	-gtk
-CONFIGURE_ARGS+=--without-gtk
-.elif defined(WITH_GTK2)
+.if defined(WITH_GTK2)
 PKGNAMESUFFIX=	-gtk
 USE_GNOME=	gtk20
-CONFIGURE_ARGS+=--without-gtk1
 .else
-CONFIGURE_ARGS+=--without-gtk --without-gtk1
+CONFIGURE_ARGS+=--without-gtk
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/audio/aumix.orig/distinfo /usr/ports/audio/aumix/distinfo
--- /usr/ports/audio/aumix.orig/distinfo	2006-01-07 20:59:56.000000000 +0100
+++ /usr/ports/audio/aumix/distinfo	2010-06-16 21:49:07.108716134 +0200
@@ -1,3 +1,3 @@
-MD5 (aumix-2.8.tar.bz2) = dc3fc7209752207c23e7c94ab886b340
-SHA256 (aumix-2.8.tar.bz2) = 636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc
-SIZE (aumix-2.8.tar.bz2) = 157503
+MD5 (aumix-2.9.1.tar.bz2) = 34f28ae1c94fc5298e8bb2688c4b3a20
+SHA256 (aumix-2.9.1.tar.bz2) = d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29
+SIZE (aumix-2.9.1.tar.bz2) = 231622
diff -ruN --exclude=CVS /usr/ports/audio/aumix.orig/files/patch-src_common.c /usr/ports/audio/aumix/files/patch-src_common.c
--- /usr/ports/audio/aumix.orig/files/patch-src_common.c	2009-11-02 19:23:57.000000000 +0100
+++ /usr/ports/audio/aumix/files/patch-src_common.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
---- src/common.c.orig	2009-10-17 15:53:40.000000000 +0200
-+++ src/common.c	2009-10-17 15:56:10.000000000 +0200
-@@ -216,6 +216,9 @@ int             main(int argc, char *arg
- #if defined (HAVE_GTK) || defined (HAVE_GTK1)
- /* GTK+ stuff */
- 	if (interactive == IN_GTK) {
-+#if defined (HAVE_GTK) && defined (HAVE_NLS)
-+		bind_textdomain_codeset((char *) PACKAGE, "UTF-8");
-+#endif				/* HAVE_GTK && HAVE_NLS */
- #ifndef DUMMY_MIXER
- 		if ((mixer_fd = open(device_filename, O_RDWR)) < 0)
- 			return EOPENMIX;
--- aumix-2.9.1.patch ends here ---

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