head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.54
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.52
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.50
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.48
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.46
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.44
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.42
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.40
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.38
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.36
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.34
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.32
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.30
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.28
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.26
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.24
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.22
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.20
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.18
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.16
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.14
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.12
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.10
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.8
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.6
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.4
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6:1.1.1.1.0.4
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.1.1.0.6
	pkgviews-base:1.1
	buildlink2-base:1.1.1.1
	buildlink2:1.1.1.1.0.2
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2002.11.28.12.25.27;	author markd;	state dead;
branches;
next	1.1;

1.1
date	2002.05.25.06.28.00;	author rh;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2002.05.25.06.28.00;	author rh;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2002.05.25.06.28.00;	author jlam;	state dead;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2002.06.23.18.38.45;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.2
log
@These should have been deleted in the last check in.
@
text
@$NetBSD: patch-aa,v 1.1 2002/05/25 06:28:00 rh Exp $

--- Makefile.orig	Mon Feb 26 10:58:56 2001
+++ Makefile
@@@@ -54,6 +54,10 @@@@
 	@@echo "make aix-tk3play    IBM AIX"
 	@@echo "make os2            IBM OS/2"
 	@@echo "make netbsd         NetBSD"
+	@@echo "make netbsd-arm32   NetBSD for strongarm"
+	@@echo "make netbsd-i386    NetBSD optimized for i386"
+	@@echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format"
+	@@echo "make netbsd-m68k    NetBSD optimized for m68k"
 	@@echo "make bsdos          BSDI BSD/OS"
 	@@echo "make bsdos4         BSDI BSD/OS 4.0"
 	@@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
@@@@ -377,6 +381,34 @@@@
 			-funroll-all-loops  -finline-functions' \
 		mpg123-make
 
+netbsd-i386-elf:
+	$(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \
+		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+			audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 \
+			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+			-DREAD_MMAP -DNAS -DNETBSD -DTERM_CONTROL' \
+		mpg123-make
+
+netbsd-m68k:
+	$(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-ffast-math -DREAL_IS_FLOAT \
+			-DUSE_MMAP -DNAS -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \
+		mpg123-make
+
+netbsd-arm32:
+	$(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm -mcpu=strongarm \
+			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+			-DNAS -DNETBSD' \
+		mpg123-make
+
 solaris-gcc-esd:
 	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
 		AUDIO_LIB='-lesd -lresolv' \
@@@@ -496,18 +528,18 @@@@
 
 netbsd:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sun.o' \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' AUDIO_LIB='-laudio -lXt' \
 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math \
-			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNAS -DNETBSD' \
 		mpg123-make
 
 netbsd-i386:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' AUDIO_LIB='-laudio -lXt' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNAS -DNETBSD' \
 		mpg123-make
 
 bsdos:
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.15 2001/02/26 16:30:19 jlam Exp $
@


1.1.1.1
log
@Initial import of mpg123-nas-0.59.18, an mpg123 (mp3 player) variant with
an NAS backend.  This closes PR pkg/14317.
@
text
@@


1.1.1.1.2.1
log
@file patch-aa was added on branch buildlink2 on 2002-06-23 18:38:45 +0000
@
text
@d1 74
@


1.1.1.1.2.2
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@a0 74
$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 18:38:45 jlam Exp $

--- Makefile.orig	Mon Feb 26 10:58:56 2001
+++ Makefile
@@@@ -54,6 +54,10 @@@@
 	@@echo "make aix-tk3play    IBM AIX"
 	@@echo "make os2            IBM OS/2"
 	@@echo "make netbsd         NetBSD"
+	@@echo "make netbsd-arm32   NetBSD for strongarm"
+	@@echo "make netbsd-i386    NetBSD optimized for i386"
+	@@echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format"
+	@@echo "make netbsd-m68k    NetBSD optimized for m68k"
 	@@echo "make bsdos          BSDI BSD/OS"
 	@@echo "make bsdos4         BSDI BSD/OS 4.0"
 	@@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
@@@@ -377,6 +381,34 @@@@
 			-funroll-all-loops  -finline-functions' \
 		mpg123-make
 
+netbsd-i386-elf:
+	$(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \
+		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+			audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+			-funroll-all-loops -ffast-math -DROT_I386 \
+			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+			-DREAD_MMAP -DNAS -DNETBSD -DTERM_CONTROL' \
+		mpg123-make
+
+netbsd-m68k:
+	$(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+			-ffast-math -DREAL_IS_FLOAT \
+			-DUSE_MMAP -DNAS -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \
+		mpg123-make
+
+netbsd-arm32:
+	$(MAKE) CC=cc AUDIO_LIB='-laudio -lXt' \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+			-funroll-all-loops -finline-functions -ffast-math \
+			-march=armv4 -mtune=strongarm -mcpu=strongarm \
+			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+			-DNAS -DNETBSD' \
+		mpg123-make
+
 solaris-gcc-esd:
 	$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
 		AUDIO_LIB='-lesd -lresolv' \
@@@@ -496,18 +528,18 @@@@
 
 netbsd:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode.o dct64.o audio_sun.o' \
+		OBJECTS='decode.o dct64.o audio_nas.o term.o' AUDIO_LIB='-laudio -lXt' \
 		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math \
-			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNAS -DNETBSD' \
 		mpg123-make
 
 netbsd-i386:
 	$(MAKE) CC=cc LDFLAGS= \
-		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+		OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' AUDIO_LIB='-laudio -lXt' \
+		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
 			-funroll-all-loops -ffast-math -DROT_I386 \
-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNAS -DNETBSD' \
 		mpg123-make
 
 bsdos:
@
