From owner-freebsd-ports Sun Apr 8 12:40: 7 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DB52637B423 for ; Sun, 8 Apr 2001 12:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f38Je1F14028; Sun, 8 Apr 2001 12:40:01 -0700 (PDT) (envelope-from gnats) Received: from totem.fix.no (totem.fix.no [213.142.66.130]) by hub.freebsd.org (Postfix) with ESMTP id 1DFBE37B422 for ; Sun, 8 Apr 2001 12:38:41 -0700 (PDT) (envelope-from anders@totem.fix.no) Received: by totem.fix.no (Postfix, from userid 1000) id 123713CCE; Sun, 8 Apr 2001 21:38:40 +0200 (CEST) Message-Id: <20010408193840.123713CCE@totem.fix.no> Date: Sun, 8 Apr 2001 21:38:40 +0200 (CEST) From: Anders Nordby Reply-To: Anders Nordby To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/26439: Fix port: audio/xmp Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 26439 >Category: ports >Synopsis: Fix port: audio/xmp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Apr 08 12:40:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Anders Nordby >Release: FreeBSD 4.3-STABLE i386 >Organization: Fluxpod Information eXchange >Environment: Tested in: FreeBSD totem.fix.no 4.1.1-STABLE FreeBSD 4.1.1-STABLE #0: Tue Oct 24 01:25:55 CEST 2000 root@totem.fix.no:/usr/obj/usr/src/sys/TOTEM i386 FreeBSD eggsilo.localnet 4.2-STABLE FreeBSD 4.2-STABLE #0: Wed Mar 28 23:40:30 CEST 2001 root@eggsilo.localnet:/space/tmp/obj/usr/src/sys/EGGSILO i386 FreeBSD current.localnet 5.0-20010116-CURRENT FreeBSD 5.0-20010116-CURRENT #0: Tue Jan 16 16:30:03 GMT 2001 root@usw2.freebsd.org:/usr/src/sys/compile/GENERIC i386 FreeBSD lappy 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Dec 31 13:46:25 CET 2000 root@lappy:/home/obj/usr/src/sys/LAPPY i386 >Description: Fix port for -current versions > 500013, include optional/wanted esound support. Adds files/patch-configure.in. >How-To-Repeat: >Fix: diff -Nur xmp.old/Makefile xmp/Makefile --- xmp.old/Makefile Mon Feb 26 05:41:19 2001 +++ xmp/Makefile Sun Apr 8 12:11:12 2001 @@ -19,6 +19,19 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-alsa +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include" +USE_AUTOCONF= yes +WANT_ESOUND= yes + +.include + +.if ${OSVERSION} > 500013 +USE_ESOUND= yes +CONFIGURE_ARGS+= --disable-oss --enable-esd +.elif defined(HAVE_ESOUND) +USE_ESOUND= yes +CONFIGURE_ARGS+= --enable-esd +.endif MAN1= xmp.1 MLINKS= xmp.1 xxmp.1 @@ -26,4 +39,4 @@ post-patch: @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1 -.include +.include diff -Nur xmp.old/files/patch-configure.in xmp/files/patch-configure.in --- xmp.old/files/patch-configure.in Thu Jan 1 01:00:00 1970 +++ xmp/files/patch-configure.in Sun Apr 8 11:47:10 2001 @@ -0,0 +1,31 @@ +--- configure.in.orig Sat Jan 20 02:06:28 2001 ++++ configure.in Sun Apr 8 11:32:48 2001 +@@ -142,7 +142,7 @@ + sys/soundcard.h machine/soundcard.h \ + sys/ultrasound.h linux/ultrasound.h machine/ultrasound.h \ + awe_voice.h sys/awe_voice.h linux/awe_voice.h \ +- sys/asoundlib.h esd.h) ++ sys/asoundlib.h) + + dnl ----------------------------------------------------------------------- + dnl Check OS/architecture independent drivers +@@ -173,15 +173,10 @@ + fi]) + fi + +-if test "${ac_cv_header_esd_h}" = "yes"; then +- AC_CHECK_LIB(esd, esd_play_stream, [ +- if test "${enable_esd}" != no; then +- if test "${enable_dynamic}" != "yes"; then +- LIBS="${LIBS} -lesd" +- fi +- DRIVERS="${DRIVERS} esd.o" +- AC_DEFINE(DRIVER_ESD) +- fi]) ++if test "$enable_esd" = yes; then ++ AC_CHECK_LIB(esd, esd_play_stream) ++ DRIVERS="${DRIVERS} esd.o" ++ AC_DEFINE(DRIVER_ESD) + fi + + dnl ----------------------------------------------------------------------- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message