- use 02/17/2000 kame patch

- respect CC
- remove kludge and enable IPv6 support by default
This commit is contained in:
brad 2000-03-20 06:51:48 +00:00
parent 84d5c92385
commit f00630efeb
3 changed files with 24 additions and 24 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2000/03/11 01:09:01 espie Exp $ # $OpenBSD: Makefile,v 1.15 2000/03/20 06:51:48 brad Exp $
DISTNAME= mpg123-0.59r DISTNAME= mpg123-0.59r
CATEGORIES= audio CATEGORIES= audio
@ -6,20 +6,27 @@ MASTER_SITES= http://www.mpg123.de/mpg123/ \
http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \ http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \ ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
http://ftp.tu-clausthal.de/pub/unix/audio/mpg123 http://ftp.tu-clausthal.de/pub/unix/audio/mpg123
PATCHFILES= mpg123-059r-v6-20000111.diff.gz:0
MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/ MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/
NEED_VERSION= 1.213
PATCHFILES= mpg123-059r-v6-20000217.diff.gz:0
PATCH_DIST_STRIP= -p1 PATCH_DIST_STRIP= -p1
LICENSE_TYPE= COPY HOMEPAGE= http://www.mpg123.de/
PERMIT_DISTFILES_FTP= yes
PERMIT_DISTFILES_CDROM= yes
PERMIT_PACKAGE_FTP= yes
PERMIT_PACKAGE_CDROM= yes
MAINTAINER= ho@openbsd.org MAINTAINER= ho@openbsd.org
HOMEPAGE= http://www.mpg123.de/ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
FAKE= Yes
MAKE_ENV= USE_INET6=Yes
MAKE_FLAGS= CC="${CC}"
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}
.if (${MACHINE_ARCH} != "i386") .if (${MACHINE_ARCH} != "i386")
ALL_TARGET= openbsd ALL_TARGET= openbsd
@ -27,13 +34,6 @@ ALL_TARGET= openbsd
ALL_TARGET= openbsd-i386 ALL_TARGET= openbsd-i386
.endif .endif
# wrong way to detect IPv6
.if exists(/usr/include/netinet6/in6_ifattach.h)
MAKE_ENV+= USE_INET6=YES
.endif
FAKE=Yes
FAKE_FLAGS=PREFIX=${WRKINST}${PREFIX}
post-patch: post-patch:
@cp ${FILESDIR}/{audio_openbsd.c,term.c} ${WRKSRC} @cp ${FILESDIR}/{audio_openbsd.c,term.c} ${WRKSRC}

View File

@ -1,6 +1,6 @@
MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7 MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7
MD5 (mpg123-059r-v6-20000111.diff.gz) = e563e5fe1276cc1e8a9b01aef53dda6d MD5 (mpg123-059r-v6-20000217.diff.gz) = 2ecb369d4c6d8b99017e86aeb2313220
RMD160 (mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c RMD160 (mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c
RMD160 (mpg123-059r-v6-20000111.diff.gz) = 688fd0d1f6acd2ba177294f441c775286e9073a9 RMD160 (mpg123-059r-v6-20000217.diff.gz) = 3fb48dc7712df8a58bb03bba259428857bdeff91
SHA1 (mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 SHA1 (mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
SHA1 (mpg123-059r-v6-20000111.diff.gz) = 77adf1bc6ab97b8813254be283893baa5366bb6e SHA1 (mpg123-059r-v6-20000217.diff.gz) = 5b7ad3f64a2aececa5499df74f0ce42dccdcae49

View File

@ -1,5 +1,5 @@
--- Makefile.orig Fri Feb 18 20:05:47 2000 --- Makefile.orig Sun Mar 19 20:42:07 2000
+++ Makefile Fri Feb 18 20:07:40 2000 +++ Makefile Sun Mar 19 20:43:52 2000
@@ -9,8 +9,10 @@ @@ -9,8 +9,10 @@
MANDIR=$(PREFIX)/man MANDIR=$(PREFIX)/man
SECTION=1 SECTION=1
@ -7,7 +7,7 @@
-# Enable the below line If your plathome support IPv6 -# Enable the below line If your plathome support IPv6
-#CFLAGS+= -DINET6 -#CFLAGS+= -DINET6
+# Enable the below line if your platform supports IPv6 +# Enable the below line if your platform supports IPv6
+.if defined(USE_INET6) && ${USE_INET6} == "YES" +.if defined(USE_INET6) && ${USE_INET6:U} == YES
+CFLAGS+= -DINET6 +CFLAGS+= -DINET6
+.endif +.endif
# Additional LIBDIR and libraries if exist # Additional LIBDIR and libraries if exist
@ -28,14 +28,14 @@
+ mpg123-make + mpg123-make
+ +
+openbsd: +openbsd:
+ $(MAKE) CC=cc LDFLAGS= \ + $(MAKE) CC="$(CC)" LDFLAGS= \
+ OBJECTS='decode.o dct64.o audio_openbsd.o term.o' \ + OBJECTS='decode.o dct64.o audio_openbsd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+ -funroll-all-loops -ffast-math -DTERM_CONTROL \ + -funroll-all-loops -ffast-math -DTERM_CONTROL \
+ -DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' mpg123-make + -DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' mpg123-make
+ +
+openbsd-i386: +openbsd-i386:
+ $(MAKE) CC=cc LDFLAGS= \ + $(MAKE) CC="$(CC)" LDFLAGS= \
+ OBJECTS='decode_i386.o dct64_i386.o audio_openbsd.o term.o' \ + OBJECTS='decode_i386.o dct64_i386.o audio_openbsd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+ -funroll-all-loops -ffast-math -DROT_I386 -DTERM_CONTROL \ + -funroll-all-loops -ffast-math -DROT_I386 -DTERM_CONTROL \