summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Koshy <jkoshy@FreeBSD.org>1998-10-03 12:09:54 +0000
committerJoseph Koshy <jkoshy@FreeBSD.org>1998-10-03 12:09:54 +0000
commiteefb5a8dd3a3906781bb98f02e88d1896012ac04 (patch)
treea48f0dff9f43933408ee482bd78ea9623c709823
parentUpgrade to v0.9. (diff)
Unbreak for ELF builds, take over as maintainer.
Notes
Notes: svn path=/head/; revision=13607
-rw-r--r--audio/mpg123/Makefile13
-rw-r--r--audio/mpg123/files/patch-aa53
2 files changed, 42 insertions, 24 deletions
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index ce5fce0a7a54..01cf7b24fe71 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -3,7 +3,7 @@
# Date created: 25 June 1997
# Whom: Carey Jones <mcj@acquiesce.org>
#
-# $Id: Makefile,v 1.6 1998/05/28 13:34:30 torstenb Exp $
+# $Id: Makefile,v 1.7 1998/09/28 01:50:59 steve Exp $
#
DISTNAME= mpg123-0.59o
@@ -11,11 +11,14 @@ CATEGORIES= audio
MASTER_SITES= ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
http://homepages.uni-tuebingen.de/student/michael.hipp/mpg123/
-MAINTAINER= ports@freebsd.org
+MAINTAINER= jkoshy@freebsd.org
-BROKEN_ELF= build
-
-ALL_TARGET= freebsd
MAN1= mpg123.1
.include <bsd.port.mk>
+
+.if ${PORTOBJFORMAT} == "elf"
+ALL_TARGET= freebsd-elf
+.else
+ALL_TARGET= freebsd
+.endif
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index 5f61afb81732..69fda0e4f276 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -1,19 +1,34 @@
-*** Makefile.orig Thu May 28 15:12:56 1998
---- Makefile Thu May 28 15:13:31 1998
-***************
-*** 251,257 ****
- @ $(MAKE) BINNAME=mpg123m mpg123
-
- mpg123-make:
-! @ $(MAKE) 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 \
---- 251,257 ----
- @ $(MAKE) BINNAME=mpg123m mpg123
-
- mpg123-make:
-! @ $(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 \
+--- Makefile.orig Sun Feb 8 18:23:04 1998
++++ Makefile Sat Oct 3 17:37:02 1998
+@@ -21,6 +21,7 @@
+ @echo ""
+ @echo "make linux-help Linux, more help"
+ @echo "make freebsd FreeBSD"
++ @echo "make freebsd-elf FreeBSD ELF"
+ @echo "make solaris Solaris 2.x (tested: 2.5 and 2.5.1) using SparcWorks cc"
+ @echo "make solaris-gcc Solaris 2.x using GNU cc (somewhat slower)"
+ @echo "make sunos SunOS 4.x (tested: 4.1.4)"
+@@ -145,6 +146,14 @@
+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
+ mpg123-make
+
++freebsd-elf:
++ $(MAKE) CC=cc LDFLAGS= \
++ OBJECTS='decode_i386.o dct64_i386.o getbits.o audio_oss.o' \
++ CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
++ -funroll-all-loops -ffast-math -DROT_I386 \
++ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
++ mpg123-make
++
+ solaris:
+ $(MAKE) CC=cc LDFLAGS='-lsocket -lnsl' \
+ OBJECTS='decode.o dct64.o audio_sun.o' \
+@@ -251,7 +260,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 \