Index: head/audio/mpg123/Makefile =================================================================== --- head/audio/mpg123/Makefile (revision 23018) +++ head/audio/mpg123/Makefile (revision 23019) @@ -1,53 +1,70 @@ # New ports collection makefile for: mpg123 # Version required: 0.59r # Date created: 25 June 1997 # Whom: Carey Jones # # $FreeBSD$ # DISTNAME= mpg123-0.59r CATEGORIES= audio 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/ MAINTAINER= jkoshy@freebsd.org +.if defined(OPT_ESOUND) +LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound +.endif + ONLY_FOR_ARCHS= i386 MAN1= mpg123.1 .include +.if defined(OPT_ESOUND) +ALL_TARGET= freebsd-esd +.else ALL_TARGET= freebsd +.endif pre-configure: +.if !defined(OPT_ESOUND) && exists(${PREFIX}/lib/libesd.a) + @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + @${ECHO_MSG} "Note: you can set OPT_ESOUND to \"yes\" to compile mpg123 with esd support." + @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" +.endif .if $(MACHINE_ARCH) == "i386" .if !defined(OPT_ARCH) || (($(OPT_ARCH) != "i486") && ($(OPT_ARCH) != "i586")) @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" @${ECHO_MSG} "Note: you can set OPT_ARCH to optimize for your hardware. (Eg:- make OPT_ARCH=i486)" .if $(PORTOBJFORMAT) == "elf" @${ECHO_MSG} "Valid values are: i486, i586" .else @${ECHO_MSG} "Valid values are: i486" .endif @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" .endif .endif .if $(PORTOBJFORMAT) == "elf" OPT_ARCH?= i586 .else OPT_ARCH?= i486 .endif # Uncomment this line below to optimise for i486 family CPUs on ELF boxes # OPT_ARCH= i486 .if defined(OPT_ARCH) MAKE_ARGS+= OPT_ARCH=$(OPT_ARCH) +.endif + +.if defined(OPT_ESOUND) +MAKE_ARGS+= OPT_ESOUND=$(OPT_ESOUND) .endif .include Property changes on: head/audio/mpg123/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.18 \ No newline at end of property +1.19 \ No newline at end of property Index: head/audio/mpg123/files/patch-aa =================================================================== --- head/audio/mpg123/files/patch-aa (revision 23018) +++ head/audio/mpg123/files/patch-aa (revision 23019) @@ -1,62 +1,85 @@ --- Makefile.orig Wed Jun 16 02:09:06 1999 -+++ Makefile Tue Aug 17 16:05:45 1999 ++++ Makefile Thu Nov 11 10:21:40 1999 @@ -4,7 +4,7 @@ # Where to install binary and manpage on "make install": -PREFIX=/usr/local +#PREFIX=/usr/local BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/man SECTION=1 -@@ -285,14 +285,28 @@ +@@ -285,35 +285,42 @@ #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' +CC ?= cc +LDFLAGS = +CFLAGS ?=-O4 -m486 + +.if defined(OPT_ARCH) +.if (${OPT_ARCH} == "i486") +ARCHOPT = -DI486_OPT +ARCHFILES = decode_i486.o dct64_i486.o +.elif (${OPT_ARCH} == "i586") +ARCHOPT = -DPENTIUM_OPT +ARCHFILES = decode_i586.o +.endif +.endif + +CFLAGS +=-Wall -ansi -pedantic -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DREAD_MMAP \ + -DI386_ASSEM ${ARCHOPT} -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DTERM_CONTROL + ++.if defined(OPT_ESOUND) ++CFLAGS +=-I${PREFIX}/include ++LDFLAGS+=-L${PREFIX}/lib ++.endif ++ freebsd: - $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o 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' \ - mpg123-make + ${MAKE} OBJECTS='decode_i386.o ${ARCHFILES} dct64_i386.o audio_oss.o term.o' \ + mpg123-make freebsd-esd: - $(MAKE) CC=cc LDFLAGS= \ -@@ -307,13 +321,8 @@ +- $(MAKE) CC=cc LDFLAGS= \ +- AUDIO_LIB='-lesd -laudiofile' \ +- OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) 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 \ +- -I/usr/local/include -L/usr/local/lib \ +- $(CFLAGS)' \ ++ $(MAKE) AUDIO_LIB='-lesd -laudiofile' \ ++ OBJECTS='decode_i386.o ${ARCHFILES} dct64_i386.o audio_esd.o term.o' \ mpg123-make freebsd-frontend: - $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \ + $(MAKE) OBJECTS='decode_i386.o ${ARCHFILES} dct64_i386.o 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' \ $(FRONTEND) +@@ -552,7 +559,7 @@ + @ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123 + + mpg123-make: +- @ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123 mpg123 ++ @ $(MAKE) LDFLAGS='$(LDFLAGS)' 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 \ Property changes on: head/audio/mpg123/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/audio/mpg123/files/patch-ac =================================================================== --- head/audio/mpg123/files/patch-ac (nonexistent) +++ head/audio/mpg123/files/patch-ac (revision 23019) @@ -0,0 +1,11 @@ +--- audio_esd.c-- Fri May 28 20:36:29 1999 ++++ audio_esd.c Thu Nov 11 10:14:30 1999 +@@ -75,7 +75,7 @@ + else if (ai->rate > esd_rate) + return -1; + +- ai->fn = esd_play_stream_fallback(format, ai->rate, esdserver, "mpg123"); ++ ai->fn = esd_play_stream_fallback(format, ai->rate, getenv("ESPEAKER"), "mpg123"); + return (ai->fn); + } + Property changes on: head/audio/mpg123/files/patch-ac ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property