Convert to buildlink2. Share distinfo between mpg123 and mpg123-esound.

This commit is contained in:
wiz 2002-09-06 11:51:58 +00:00
parent 3a2c948956
commit 5a65f07e96
5 changed files with 23 additions and 42 deletions

View file

@ -1,13 +1,14 @@
# $NetBSD: Makefile,v 1.2 2002/06/23 08:45:09 kent Exp $ # $NetBSD: Makefile,v 1.3 2002/09/06 11:51:59 wiz Exp $
PKGNAME= mpg123-esound-${MPG123_VERSION} PKGNAME= mpg123-esound-${MPG123_VERSION}
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
TARGET_SUFFIX= -esd TARGET_SUFFIX= -esd
.include "../mpg123/Makefile.common" .include "../mpg123/Makefile.common"
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound ${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound
.include "../esound/buildlink.mk" .include "../../audio/esound/buildlink2.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,21 +0,0 @@
$NetBSD: distinfo,v 1.4 2002/06/23 08:45:09 kent Exp $
SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
SHA1 (patch-aa) = ac0daa7156f6125e8988431fba52964696af4b61
SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
SHA1 (patch-ae) = 9ac13c978bdf498cbd5e9fa0777a51559fdb2403
SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452
SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b
SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43
SHA1 (patch-ai) = 021c5bb2baa56327d486bf134b537ac5c6aa8fba
SHA1 (patch-aj) = b828a5e35a03b307d46cd07356624d19b9d56777
SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8
SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222
SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822
SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef
SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.1 2002/06/23 08:45:09 kent Exp $ -*- Makefile -*- # $NetBSD: Makefile.common,v 1.2 2002/09/06 11:51:58 wiz Exp $ -*- Makefile -*-
DISTNAME= mpg123-0.59r DISTNAME= mpg123-0.59r
MPG123_VERSION= 0.59.18 MPG123_VERSION= 0.59.18
CATEGORIES= audio CATEGORIES= audio
@ -12,10 +12,11 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.mpg123.de/ HOMEPAGE= http://www.mpg123.de/
BUILD_DEFS+= USE_INET6 BUILD_DEFS+= USE_INET6
DIST_SUBDIR= mpg123 DIST_SUBDIR= mpg123
PATCHDIR= ../mpg123/patches PATCHDIR= ${.CURDIR}/../../audio/mpg123/patches
FILESDIR= ../mpg123/files FILESDIR= ${.CURDIR}/../../audio/mpg123/files
DISTINFO_FILE= ${.CURDIR}/../../audio/mpg123/distinfo
USE_BUILDLINK_ONLY= # defined USE_BUILDLINK2= # defined
# for OBJECT_FMT # for OBJECT_FMT
.include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.prefs.mk"

View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.12 2002/06/23 08:45:09 kent Exp $ $NetBSD: distinfo,v 1.13 2002/09/06 11:51:58 wiz Exp $
SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
SHA1 (patch-aa) = ac0daa7156f6125e8988431fba52964696af4b61 SHA1 (patch-aa) = 6535af4383fc242d04b4c4cc0d3f84ef66a3df8b
SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.21 2002/06/23 08:45:09 kent Exp $ $NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $
--- Makefile.orig Sun Jun 23 16:56:17 2002 --- Makefile.orig Sun Jun 23 16:56:17 2002
+++ Makefile +++ Makefile
@ -83,27 +83,27 @@ $NetBSD: patch-aa,v 1.21 2002/06/23 08:45:09 kent Exp $
+ +
+netbsd-esd: +netbsd-esd:
+ $(MAKE) CC=cc LDFLAGS= \ + $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + AUDIO_LIB="`esd-config --libs`" \
+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + OBJECTS='decode.o dct64.o audio_esd.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 -DREAD_MMAP \ + -funroll-all-loops -ffast-math -DREAD_MMAP \
+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ + -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+ `$(ESD_CONFIG) --cflags`' \ + `esd-config --cflags`' \
+ mpg123-make + mpg123-make
+ +
+netbsd-i386-esd: +netbsd-i386-esd:
+ $(MAKE) CC=cc LDFLAGS= \ + $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + AUDIO_LIB="`esd-config --libs`" \
+ OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \ + OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+ -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ + -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+ `$(ESD_CONFIG) --cflags`' \ + `esd-config --cflags`' \
+ mpg123-make + mpg123-make
+ +
+netbsd-i386-elf-esd: +netbsd-i386-elf-esd:
+ $(MAKE) CC=cc LDFLAGS= \ + $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + AUDIO_LIB="`esd-config --libs`" \
+ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ audio_esd.o term.o' \ + audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
@ -111,39 +111,39 @@ $NetBSD: patch-aa,v 1.21 2002/06/23 08:45:09 kent Exp $
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ + -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+ -DREAD_MMAP -DNETBSD -DTERM_CONTROL \ + -DREAD_MMAP -DNETBSD -DTERM_CONTROL \
+ `$(ESD_CONFIG) --cflags`' \ + `esd-config --cflags`' \
+ mpg123-make + mpg123-make
+ +
+netbsd-m68k-esd: +netbsd-m68k-esd:
+ $(MAKE) CC=cc LDFLAGS= \ + $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + AUDIO_LIB="`esd-config --libs`" \
+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+ -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \ + -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+ -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \ + -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
+ `$(ESD_CONFIG) --cflags`' \ + `esd-config --cflags`' \
+ mpg123-make + mpg123-make
+ +
+netbsd-arm-esd: +netbsd-arm-esd:
+ $(MAKE) CC=cc LDFLAGS= \ + $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + AUDIO_LIB="`esd-config --libs`" \
+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+ -funroll-all-loops -finline-functions -ffast-math \ + -funroll-all-loops -finline-functions -ffast-math \
+ -march=armv4 -mtune=strongarm -mcpu=strongarm \ + -march=armv4 -mtune=strongarm -mcpu=strongarm \
+ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ + -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+ -DNETBSD `$(ESD_CONFIG) --cflags`' \ + -DNETBSD `esd-config --cflags`' \
+ mpg123-make + mpg123-make
+ +
+netbsd-arm-64-esd: +netbsd-arm-64-esd:
+ $(MAKE) CC=cc LDFLAGS= \ + $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + AUDIO_LIB="`esd-config --libs`" \
+ OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+ -funroll-all-loops -finline-functions -ffast-math \ + -funroll-all-loops -finline-functions -ffast-math \
+ -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \ + -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+ -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \ + -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+ -DTERM_CONTROL -DNETBSD `$(ESD_CONFIG) --cflags`' \ + -DTERM_CONTROL -DNETBSD `esd-config --cflags`' \
mpg123-make mpg123-make
bsdos: bsdos: