make the pkgsrc IPv6 ready.

% mpg123 http://www.v6.foo.com/

4 files changed, 22 insertions, 13 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 3be1f026fc0..5a4f3636331 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/10/12 04:43:11 simonb Exp $
+# $NetBSD: Makefile,v 1.19 2000/02/18 11:04:10 itojun Exp $
 #
 
 DISTNAME=       mpg123-0.59r
@@ -6,9 +6,15 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.mpg123.de/mpg123/ \
 		http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/
 
+PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES=	mpg123-059r-v6-20000111.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.mpg123.de/
 
+BUILD_DEFS+=	USE_INET6
+
 # for OBJECT_FMT
 .include "../../mk/bsd.prefs.mk"
 
@@ -30,6 +36,10 @@ ALL_TARGET=	${LOWER_OPSYS}
 MAKE_ENV+=	CPPFLAGS=""
 .endif
 
+.if defined(USE_INET6) && ${USE_INET6} == "YES"
+MAKE_ENV+=	CPPFLAGS="-DINET6"
+.endif
+
 MAKE_FLAGS+=	PREFIX="${PREFIX}"
 
 post-patch:
diff --git a/audio/mpg123/files/md5 b/audio/mpg123/files/md5
index 78dbea263b5..95244e4ede4 100644
--- a/audio/mpg123/files/md5
+++ b/audio/mpg123/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.6 1999/07/10 10:39:03 tron Exp $
+$NetBSD: md5,v 1.7 2000/02/18 11:04:10 itojun Exp $
 
 MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7
+MD5 (mpg123-059r-v6-20000111.diff.gz) = e563e5fe1276cc1e8a9b01aef53dda6d
diff --git a/audio/mpg123/files/patch-sum b/audio/mpg123/files/patch-sum
index bbe70899c1d..913564a5a97 100644
--- a/audio/mpg123/files/patch-sum
+++ b/audio/mpg123/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.5 1999/10/12 04:43:52 simonb Exp $
+$NetBSD: patch-sum,v 1.6 2000/02/18 11:04:10 itojun Exp $
 
-MD5 (patch-aa) = 57c92e8cf4e13c47436c44069333947c
+MD5 (patch-aa) = e5f14dd057b513ae3a173c5275493e02
 MD5 (patch-ab) = d2be05cddc78b15c1dda564dde29d693
 MD5 (patch-ac) = 83eac6fce5e87b1f4dba3fbfc163c01c
 MD5 (patch-ad) = 49bcf488decbcdb509689ac7cab46175
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index 94786db6203..5f288099c85 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.12 1999/10/12 04:43:12 simonb Exp $
-
---- Makefile.orig	Wed Jun 16 06:39:06 1999
-+++ Makefile	Tue Oct 12 13:57:53 1999
-@@ -39,6 +39,10 @@
+--- Makefile.orig	Fri Feb 18 19:45:31 2000
++++ Makefile	Fri Feb 18 19:46:51 2000
+@@ -54,6 +54,10 @@
  	@echo "make aix-tk3play    IBM AIX"
  	@echo "make os2            IBM OS/2"
  	@echo "make netbsd         NetBSD"
@@ -13,7 +11,7 @@ $NetBSD: patch-aa,v 1.12 1999/10/12 04:43:12 simonb Exp $
  	@echo "make bsdos          BSDI BSD/OS"
  	@echo "make bsdos4         BSDI BSD/OS 4.0"
  	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
-@@ -362,6 +366,34 @@
+@@ -377,6 +381,34 @@
  			-funroll-all-loops  -finline-functions' \
  		mpg123-make
  
@@ -48,13 +46,13 @@ $NetBSD: patch-aa,v 1.12 1999/10/12 04:43:12 simonb Exp $
  solaris-gcc-esd:
  	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
  		AUDIO_LIB='-lesd -lresolv' \
-@@ -481,18 +513,18 @@
+@@ -496,18 +528,18 @@
  
  netbsd:
  	$(MAKE) CC=cc LDFLAGS= \
 -		OBJECTS='decode.o dct64.o audio_sun.o' \
 +		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
- 		CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+ 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
  			-funroll-all-loops -ffast-math \
 -			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
 +			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
@@ -64,7 +62,7 @@ $NetBSD: patch-aa,v 1.12 1999/10/12 04:43:12 simonb Exp $
  	$(MAKE) CC=cc LDFLAGS= \
 -		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
 +		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \
- 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+ 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
  			-funroll-all-loops -ffast-math -DROT_I386 \
 -			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
 +			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \