IPv6 patch. (from itojun@)

audio/mpg123/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2000/01/12 15:47:13 ho Exp $
+# $OpenBSD: Makefile,v 1.11 2000/02/18 20:18:00 ho Exp $
 
 DISTNAME=	mpg123-0.59r
 CATEGORIES=	audio
@@ -6,6 +6,12 @@ MASTER_SITES=	http://www.mpg123.de/mpg123/ \
 		http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
 		ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
 		http://ftp.tu-clausthal.de/pub/unix/audio/mpg123
+MASTER_SITES0=	ftp://ftp.kame.net/pub/kame/misc/
+DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} mpg123-059r-v6-20000111.diff.gz:0
+
+PATCHFILES+=	mpg123-059r-v6-20000111.diff.gz
+PATCH_DIST_STRIP=	-p1
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ho@openbsd.org
 
@@ -17,6 +23,11 @@ ALL_TARGET=	openbsd
 ALL_TARGET=	openbsd-i386
 .endif
 
+# wrong way to detect IPv6
+.if exists(/usr/include/netinet6/in6_ifattach.h)
+MAKE_ENV+=     USE_INET6=YES
+.endif
+
 post-patch:
 	@cp ${FILESDIR}/{audio_openbsd.c,term.c} ${WRKSRC}
 

audio/mpg123/files/md5

@@ -1,3 +1,6 @@
 MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7
+MD5 (mpg123-059r-v6-20000111.diff.gz) = e563e5fe1276cc1e8a9b01aef53dda6d
 RMD160 (mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c
+RMD160 (mpg123-059r-v6-20000111.diff.gz) = 688fd0d1f6acd2ba177294f441c775286e9073a9
 SHA1 (mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
+SHA1 (mpg123-059r-v6-20000111.diff.gz) = 77adf1bc6ab97b8813254be283893baa5366bb6e

audio/mpg123/patches/patch-aa

@@ -1,15 +1,28 @@
---- Makefile.orig	Tue Jan 26 09:35:18 1999
-+++ Makefile	Fri Oct 29 21:20:30 1999
-@@ -34,6 +34,7 @@
- 	@echo "make aix            IBM AIX (tested: 4.2)"
+--- Makefile.orig	Fri Feb 18 20:05:47 2000
++++ Makefile	Fri Feb 18 20:07:40 2000
+@@ -9,8 +9,10 @@
+ MANDIR=$(PREFIX)/man
+ SECTION=1
+ 
+-# Enable the below line If your plathome support IPv6
+-#CFLAGS+= -DINET6
++# Enable the below line if your platform supports IPv6
++.if defined(USE_INET6) && ${USE_INET6} == "YES"
++CFLAGS+= -DINET6
++.endif
+ # Additional LIBDIR and libraries if exist
+ IPV6LIBDIR=
+ IPV6LIB=
+@@ -54,6 +56,7 @@
+ 	@echo "make aix-tk3play    IBM AIX"
  	@echo "make os2            IBM OS/2"
  	@echo "make netbsd         NetBSD"
 +	@echo "make openbsd        OpenBSD"
  	@echo "make bsdos          BSDI BSD/OS"
+ 	@echo "make bsdos4         BSDI BSD/OS 4.0"
  	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
- 	@echo "make mint           MiNT on Atari"
-@@ -364,6 +365,21 @@
- 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+@@ -508,6 +511,21 @@
+ 		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' \
 +		mpg123-make
@@ -17,14 +30,14 @@
 +openbsd:
 +	$(MAKE) CC=cc LDFLAGS= \
 +		OBJECTS='decode.o dct64.o audio_openbsd.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 -DTERM_CONTROL \
 +			-DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' mpg123-make
 +
 +openbsd-i386:
 +	$(MAKE) CC=cc LDFLAGS= \
 +		OBJECTS='decode_i386.o dct64_i386.o audio_openbsd.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 -DTERM_CONTROL \
 +			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' \
  		mpg123-make