diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2001-03-03 00:23:13 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2001-03-03 00:23:13 +0000 |
commit | fd5612a0294e6f9fb74d8d2cbef05b1098553b27 (patch) | |
tree | 9db05fe454e6ec90945a60d1578cc628306f614c /audio/mpg123/Makefile | |
parent | o respect CFLAGS (libao, libogg, libvorbis) (diff) |
Switch the ASM selection code to use CPUTYPE on -current, and hence
automatically select the correct version without needing to set a
non-standard environment variable.
Use random() instead of rand() because I'm sick of getting the same songs
over and over in shuffle play.
Quell a format string warning with -Wnon-const-format
Bump PORTREVISION
Reviewed by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=38999
Diffstat (limited to 'audio/mpg123/Makefile')
-rw-r--r-- | audio/mpg123/Makefile | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 91399a056e8b..50d528def241 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpg123 PORTVERSION= 0.59r -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio ipv6 MASTER_SITES= http://www.mpg123.de/mpg123/ \ http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \ @@ -57,22 +57,24 @@ pre-fetch: @${ECHO_MSG} .endif .if ${MACHINE_ARCH} == "i386" +.if ${OSVERSION} >= 500018 +.if ${MACHINE_CPU:Mk6} +OPT_ARCH= 3dnow +.elif ${MACHINE_CPU:Mi586} +OPT_ARCH= i586 +.elif ${MACHINE_CPU:Mi486} +OPT_ARCH= i486 +.endif +.else .if !defined(OPT_ARCH) || ((${OPT_ARCH} != "i486") && (${OPT_ARCH} != "i586") \ && (${OPT_ARCH} != "3dnow")) - @${ECHO_MSG} - @${ECHO_MSG} "Note: you can set OPT_ARCH to optimize for your hardware" + @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" + @${ECHO_MSG} "Note: you can set OPT_ARCH to optimize for your hardware. @${ECHO_MSG} "(e.g. make OPT_ARCH=i486)." -.if ${PORTOBJFORMAT} == "elf" @${ECHO_MSG} "Valid values are: i486, i586, 3dnow" -.else - @${ECHO_MSG} "Valid values are: i486" -.endif - @${ECHO_MSG} -.endif -.if ${PORTOBJFORMAT} == "elf" + @${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" OPT_ARCH?= i586 -.else -OPT_ARCH?= i486 +.endif .endif .endif |