Attachment 14018 Details for Bug 26439 – file.diff

[patch] file.diff

file.diff (text/plain), 1.89 KB, created by anders on 2001-04-08 20:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: anders

Created: 2001-04-08 20:40:01 UTC

Size: 1.89 KB

patch

obsolete

>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 <bsd.port.pre.mk>
>+
>+.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 <bsd.port.mk>
>+.include <bsd.port.post.mk>
>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 -----------------------------------------------------------------------

Actions: View | Diff

Attachments on bug 26439: 14018