From owner-ports-jp@jp.freebsd.org  Fri Mar 26 15:08:28 1999
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.2+3.1W/8.7.3) id PAA01959;
	Fri, 26 Mar 1999 15:08:28 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from work.mzaki.nom (151.pool15.tokyo.att.ne.jp [165.76.220.166])
	by jaz.jp.freebsd.org (8.9.2+3.1W/8.7.3) with ESMTP id PAA01951
	for <ports-jp@jp.freebsd.org>; Fri, 26 Mar 1999 15:08:26 +0900 (JST)
	(envelope-from mzaki@e-mail.ne.jp)
Received: from localhost (localhost [127.0.0.1])
	by work.mzaki.nom (8.9.2/8.9.2) with ESMTP id PAA15193
	for <ports-jp@jp.freebsd.org>; Fri, 26 Mar 1999 15:08:41 +0900 (JST)
	(envelope-from mzaki@e-mail.ne.jp)
To: ports-jp@jp.freebsd.org
X-Mailer: Mew version 1.94b7 on XEmacs 21.0 (20 minutes to Nikko)
X-fingerprint: BD 86 CD D9 66 FD 75 B0  A8 43 4B C4 E2 1B F5 B5
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Fri_Mar_26_15:08:38_1999_809)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19990326150840C.mzaki@e-mail.ne.jp>
Date: Fri, 26 Mar 1999 15:08:40 +0900
From: Motomichi Matsuzaki <mzaki@e-mail.ne.jp>
X-Dispatcher: imput version 990212(IM106)
Lines: 114
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+981115
X-Sequence: ports-jp 6105
Subject: [ports-jp 6105] mpg123 with esd
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: mzaki@e-mail.ne.jp

----Next_Part(Fri_Mar_26_15:08:38_1999_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit


$B>>:j$H?=$7$^$9!#(B

 audio/mpg123 $B$K<j$r2C$($F!"(B
ELF $B%U%)!<%^%C%H$N$H$-$K(B Pentium $B%*%W%F%#%^%$%:$rM-8z$K$7$?$N$H!"(B
 esd(EsounD) $B%5%]!<%H$r;H$($k$h$&$K$7$F$_$^$7$?!#(B

$B:G$b(B port $B$K<j$r2C$($?$H$$$&$h$j$O!"(B
mpg123 $B$N(B Makefile $B$K=q$-2C$($?$@$1$J$N$G(B
$BK\2H$KO"Mm$r$H$k$Y$-$J$N$+$bCN$l$^$;$s!#(B

 port $B$N(B Makefile $B$K0J2<$N%Q%C%A$r$"$F!"(B
 patch-aa $B$rE:IU$N$b$N$KF~$l49$($F2<$5$$!#(B

$B$=$N$^$^(B make $B$G(B Pentium $B%*%W%F%#%^%$%:$,M-8z$K$J$j$^$9!#(B
$B$5$i$K(B make ALL_TARGET=freebsd-esd $B$G(B esd $B%5%]!<%H$,M-8z$K$J$j$^$9!#(B

+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-+
|  $B>>:j(B $BAGF;(B (Motomichi Matsuzaki/maki)                                   |
|  mailto:mzaki@e-mail.ne.jp            $BEl5~Bg3XM}3XIt@8J*3X2JF0J*3X2]Dx(B  |
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-+

--- /usr/ports/audio/mpg123/Makefile~	Mon Feb  1 18:01:09 1999
+++ /usr/ports/audio/mpg123/Makefile	Fri Mar 26 14:18:20 1999
@@ -18,6 +18,6 @@
 
 .include <bsd.port.pre.mk>
 
-ALL_TARGET=	freebsd
+ALL_TARGET?=	freebsd
 
 .include <bsd.port.post.mk>


----Next_Part(Fri_Mar_26_15:08:38_1999_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Description: patch-aa
Content-Disposition: attachment; filename=patch-aa
Content-Transfer-Encoding: 7bit

--- Makefile.orig	Tue Jan 26 23:35:18 1999
+++ Makefile	Fri Mar 26 14:52:48 1999
@@ -74,6 +74,7 @@
 	@echo "make freebsd         FreeBSD"
 	@echo "make freebsd-sajber  FreeBSD, build binary for Sajber Jukebox frontend"
 	@echo "make freebsd-tk3play FreeBSD, build binary for tk3play frontend"
+	@echo "make freebsd-esd     FreeBSD, output to EsounD (require libaudiofile)"
 	@echo ""
 	@echo "Please read the file INSTALL for additional information."
 	@echo ""
@@ -247,24 +248,44 @@
 #CFLAGS='-DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
 #CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
 
+.if $(PORTOBJFORMAT) == "elf"
+ELFOBJS=getbits.o decode_i586.o
+ELFCFLAGS=-DPENTIUM_OPT
+.else
+ELFOBJS=getbits_.o
+ELFCFLAGS=
+.endif
+
 freebsd:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o' \
+		OBJECTS='decode_i386.o dct64_i386.o $(ELFOBJS) audio_oss.o' \
 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math -DROT_I386 \
 			-DREAD_MMAP \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
+			$(ELFCFLAGS) $(CFLAGS)' \
 		mpg123-make
 
+freebsd-esd:
+	$(MAKE) CC=cc LDFLAGS='-L/usr/local/lib' \
+		AUDIO_LIB='-lesd -laudiofile' \
+		OBJECTS='decode_i386.o dct64_i386.o $(ELFOBJS) audio_esd.o' \
+		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 \
+			-DREAD_MMAP \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
+			$(ELFCFLAGS) $(CFLAGS) -I/usr/local/include/' \
+		mpg123-make
 
 freebsd-frontend:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o \
+		OBJECTS='decode_i386.o dct64_i386.o $(ELFOBJS) audio_oss.o \
 			control_sajber.o control_tk3play.o' \
 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math -DROT_I386 \
 			-DFRONTEND \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
+			$(ELFCFLAGS) $(CFLAGS)' \
 		$(FRONTEND)
  
 
@@ -414,7 +435,7 @@
 	@ $(MAKE) BINNAME=mpg123m mpg123
 
 mpg123-make:
-	@ $(MAKE) BINNAME=mpg123 mpg123
+	@ $(MAKE) CFLAGS="$(CFLAGS)" BINNAME=mpg123 mpg123
 
 mpg123: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \
 		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \

----Next_Part(Fri_Mar_26_15:08:38_1999_809)----
