From naddy@mips.inka.de  Tue Mar 20 06:58:54 2001
Return-Path: <naddy@mips.inka.de>
Received: from mail.inka.de (quechua.inka.de [212.227.14.2])
	by hub.freebsd.org (Postfix) with ESMTP id 169DC37B740
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 20 Mar 2001 06:58:53 -0800 (PST)
	(envelope-from naddy@mips.inka.de)
Received: from kemoauc.mips.inka.de (uucp@)
	by mail.inka.de with local-bsmtp 
	id 14fNaQ-0002Pv-00; Tue, 20 Mar 2001 15:58:14 +0100
Received: (from naddy@localhost)
	by kemoauc.mips.inka.de (8.11.3/8.11.1) id f2KEvak73196;
	Tue, 20 Mar 2001 15:57:36 +0100 (CET)
	(envelope-from naddy)
Message-Id: <200103201457.f2KEvak73196@kemoauc.mips.inka.de>
Date: Tue, 20 Mar 2001 15:57:36 +0100 (CET)
From: Christian Weisgerber <naddy@mips.inka.de>
Reply-To: naddy@mips.inka.de
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: audio/vorbis maintainer change and cleanup
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         25941
>Category:       ports
>Synopsis:       audio/vorbis maintainer change and cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    trevor
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 20 07:00:02 PST 2001
>Closed-Date:    Fri Mar 23 14:22:06 PST 2001
>Last-Modified:  Fri Mar 23 14:24:14 PST 2001
>Originator:     Christian Weisgerber
>Release:        FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Mar 11 05:33:31 CET 2001 naddy@kemoauc.mips.inka.de:/home/obj/usr/src/sys/GENERIC alpha

Theo van Klaveren <t.vanklaveren@student.utwente.nl> asked me to
take over maintainership of the Ogg Vorbis ports.

The appended patch to
- audio/vorbis
- audio/libao
- audio/libogg
- audio/libvorbis
reflects the maintainer change and adds some Makefile cleanup.

I will submit a separate, more extensive patch to audio/vorbis-tools.

>Description:

>How-To-Repeat:

>Fix:

diff -uNr /usr/ports/audio/vorbis/Makefile vorbis/Makefile
--- /usr/ports/audio/vorbis/Makefile	Sun Mar  4 13:43:31 2001
+++ vorbis/Makefile	Tue Mar 20 15:05:17 2001
@@ -13,7 +13,7 @@
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	t.vanklaveren@student.utwente.nl
+MAINTAINER=	naddy@mips.inka.de
 
 LIB_DEPENDS=	ao.1:${PORTSDIR}/audio/libao \
 		ogg.1:${PORTSDIR}/audio/libogg \
diff -uNr /usr/ports/audio/vorbis/pkg-descr vorbis/pkg-descr
--- /usr/ports/audio/vorbis/pkg-descr	Fri Nov  3 19:55:51 2000
+++ vorbis/pkg-descr	Tue Mar 20 15:05:05 2001
@@ -10,6 +10,3 @@
 This is a meta-port for all the vorbis-related ports.
 
 WWW: http://www.vorbis.com
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl
diff -uNr /usr/ports/audio/libao/Makefile libao/Makefile
--- /usr/ports/audio/libao/Makefile	Sun Mar  4 13:43:28 2001
+++ libao/Makefile	Tue Mar 20 14:57:07 2001
@@ -12,14 +12,14 @@
 MASTER_SITES=	http://home.student.utwente.nl/t.vanklaveren/distfiles/ \
 		http://www.vorbis.com/files/beta4/unix/
 
-MAINTAINER=	t.vanklaveren@student.utwente.nl
+MAINTAINER=	naddy@mips.inka.de
 
 WANT_ESOUND=	yes
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_AUTOMAKE=	yes
+AUTOMAKE_ARGS=	--include-deps
 
 INSTALLS_SHLIB=	yes
 
diff -uNr /usr/ports/audio/libao/pkg-descr libao/pkg-descr
--- /usr/ports/audio/libao/pkg-descr	Thu Nov  2 22:09:56 2000
+++ libao/pkg-descr	Tue Mar 20 15:00:52 2001
@@ -4,9 +4,4 @@
    * Open Sound System (Linux, *BSD)
    * ESounD
    * Advanced Linux Sound Architecture
-   * Solaris (untested)
-   * IRIX (untested)
    * WAV files
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl
diff -uNr /usr/ports/audio/libogg/Makefile libogg/Makefile
--- /usr/ports/audio/libogg/Makefile	Sun Mar  4 13:43:29 2001
+++ libogg/Makefile	Tue Mar 20 15:01:38 2001
@@ -13,10 +13,9 @@
 		http://home.student.utwente.nl/t.vanklaveren/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 
-MAINTAINER=	t.vanklaveren@student.utwente.nl
+MAINTAINER=	naddy@mips.inka.de
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff -uNr /usr/ports/audio/libogg/pkg-descr libogg/pkg-descr
--- /usr/ports/audio/libogg/pkg-descr	Sun Mar  4 13:43:29 2001
+++ libogg/pkg-descr	Tue Mar 20 15:01:25 2001
@@ -5,6 +5,3 @@
 streams into a single physical bitstream.
 
 WWW: http://www.xiph.org/ogg/
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl
diff -uNr /usr/ports/audio/libvorbis/Makefile libvorbis/Makefile
--- /usr/ports/audio/libvorbis/Makefile	Thu Mar 15 18:08:47 2001
+++ libvorbis/Makefile	Tue Mar 20 15:37:33 2001
@@ -13,14 +13,12 @@
 		http://home.student.utwente.nl/t.vanklaveren/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 
-MAINTAINER=	t.vanklaveren@student.utwente.nl
+MAINTAINER=	naddy@mips.inka.de
 
 LIB_DEPENDS=	ogg.1:${PORTSDIR}/audio/libogg
 
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-ogg-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-AUTOCONF_ARGS=	; ${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff -uNr /usr/ports/audio/libvorbis/files/patch-ac libvorbis/files/patch-ac
--- /usr/ports/audio/libvorbis/files/patch-ac	Fri Mar  2 23:07:35 2001
+++ libvorbis/files/patch-ac	Tue Mar 20 15:44:29 2001
@@ -1,11 +1,38 @@
---- configure.orig	Mon Feb 26 22:34:27 2001
-+++ configure	Fri Mar  2 12:44:18 2001
+--- configure.orig	Mon Feb 26 14:34:27 2001
++++ configure	Tue Mar 20 15:44:03 2001
 @@ -1710,7 +1710,7 @@
  		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
  	*)
  		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
 -		CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-+		CFLAGS="-D__NO_MATH_INLINES -fsigned-char $CFLAGS"
++		CFLAGS="$CFLAGS -fsigned-char"
  		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
          esac
  fi
+@@ -1795,14 +1795,14 @@
+ LIBS=""
+ fi
+ 
+-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:1800: checking for pthread_create in -lpthread" >&5
++echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
++echo "configure:1800: checking for pthread_create in -pthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1808 "configure"
+ #include "confdefs.h"
+@@ -1830,7 +1830,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  pthread_lib="-lpthread"
++  pthread_lib="-pthread"
+ else
+   echo "$ac_t""no" 1>&6
+ :
diff -uNr /usr/ports/audio/libvorbis/pkg-descr libvorbis/pkg-descr
--- /usr/ports/audio/libvorbis/pkg-descr	Thu Nov  2 22:15:11 2000
+++ libvorbis/pkg-descr	Tue Mar 20 15:02:58 2001
@@ -12,6 +12,3 @@
 common uses.
 
 WWW: http://www.vorbis.com
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->trevor 
Responsible-Changed-By: trevor 
Responsible-Changed-When: Tue Mar 20 12:29:08 PST 2001 
Responsible-Changed-Why:  
I'll take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=25941 
State-Changed-From-To: open->closed 
State-Changed-By: trevor 
State-Changed-When: Fri Mar 23 14:22:06 PST 2001 
State-Changed-Why:  
This is superseded by Christian's "jumbo patch" which I just committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=25941 
>Unformatted:
