ports/71772: [ maintainer ] audio/mpg123: fix build with DEFAULT_RECODE option and without esound or nas

[Roman Bogorodskiy]

>Number:         71772
>Category:       ports
>Synopsis:       [ maintainer ] audio/mpg123: fix build with DEFAULT_RECODE option and without esound or nas
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 15 17:50:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.3-BETA4 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-BETA4 FreeBSD 5.3-BETA4 #6: Sun Sep 12 08:56:36 MSD 2004 root at lame.novel.ru:/usr/obj/usr/home/novel/current/src/sys/NOVEL i386


>Description:
	Fix compilation error when building with DEFAULT_RECODE and 
	without esound or nas support.
>How-To-Repeat:
>Fix:

diff -ruN mpg123.orig/Makefile mpg123/Makefile
--- mpg123.orig/Makefile	Wed Sep 15 21:06:03 2004
+++ mpg123/Makefile	Wed Sep 15 21:16:23 2004
@@ -60,6 +60,7 @@
 ALL_TARGET=	freebsd-nas
 .else
 ALL_TARGET=	freebsd
+CFLAGS+=	 -DWITH_FREEBSD_DSP_ONLY
 .endif
 
 pre-fetch:
diff -ruN mpg123.orig/files/patch-aa mpg123/files/patch-aa
--- mpg123.orig/files/patch-aa	Wed Sep 15 21:06:03 2004
+++ mpg123/files/patch-aa	Wed Sep 15 21:15:50 2004
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Jan 31 13:43:04 2004
-+++ Makefile	Sat Jan 31 13:44:35 2004
+--- Makefile.orig	Wed Sep 15 21:14:24 2004
++++ Makefile	Wed Sep 15 21:14:41 2004
 @@ -4,13 +4,15 @@
  
  # Where to install binary and manpage on "make install":
@@ -28,7 +28,7 @@
  .if defined(WITH_ICONV)
  CFLAGS+=-DWITH_ICONV -I${LOCALBASE}/include
  LDFLAGS+=-L${LOCALBASE}/lib -liconv
-@@ -308,35 +313,63 @@
+@@ -308,35 +313,62 @@
  .endif
  .endif
  
@@ -79,7 +79,6 @@
 -			-DREAD_MMAP \
 -			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
 +	${MAKE}	OBJECTS='${ARCHFILES} audio_oss.o term.o' \
-+		CFLAGS="${CFLAGS} -DWITH_FREEBSD_DSP_ONLY" \
  		mpg123-make
  
  freebsd-esd:
@@ -113,7 +112,7 @@
  		$(FRONTEND)
   
  
-@@ -575,7 +608,7 @@
+@@ -575,7 +607,7 @@
  	@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123
  
  mpg123-make:
>Release-Note:
>Audit-Trail:
>Unformatted: