Attachment #14018 for bug #26439

View | Details | Raw Unified | Return to bug 26439
Collapse All | Expand All




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

post-patch:
	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1

.include <bsd.port.post.mk>




--- 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 -----------------------------------------------------------------------

Return to bug 26439

Lines 19-24 Link Here

(-)xmp/Makefile (-1 / +14 lines)
19	USE_GMAKE= yes	19	USE_GMAKE= yes
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	CONFIGURE_ARGS= --disable-alsa	21	CONFIGURE_ARGS= --disable-alsa
		22	CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include"
		23	USE_AUTOCONF= yes
		24	WANT_ESOUND= yes
		25
		26	.include <bsd.port.pre.mk>
		27
		28	.if ${OSVERSION} > 500013
		29	USE_ESOUND= yes
		30	CONFIGURE_ARGS+= --disable-oss --enable-esd
		31	.elif defined(HAVE_ESOUND)
		32	USE_ESOUND= yes
		33	CONFIGURE_ARGS+= --enable-esd
		34	.endif
22		35
23	MAN1= xmp.1	36	MAN1= xmp.1
24	MLINKS= xmp.1 xxmp.1	37	MLINKS= xmp.1 xxmp.1
Lines 26-29 Link Here
26	post-patch:	39	post-patch:
27	@${PERL} -pi -e "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/docs/xmp.1	40	@${PERL} -pi -e "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/docs/xmp.1
28		41
29	.include <bsd.port.mk>	42	.include <bsd.port.post.mk>

Line 0 Link Here

(-)xmp/files/patch-configure.in (+31 lines)
	1	--- configure.in.orig Sat Jan 20 02:06:28 2001
	2	+++ configure.in Sun Apr 8 11:32:48 2001
	3	@@ -142,7 +142,7 @@
	4	sys/soundcard.h machine/soundcard.h \
	5	sys/ultrasound.h linux/ultrasound.h machine/ultrasound.h \
	6	awe_voice.h sys/awe_voice.h linux/awe_voice.h \
	7	- sys/asoundlib.h esd.h)
	8	+ sys/asoundlib.h)
	9
	10	dnl -----------------------------------------------------------------------
	11	dnl Check OS/architecture independent drivers
	12	@@ -173,15 +173,10 @@
	13	fi])
	14	fi
	15
	16	-if test "${ac_cv_header_esd_h}" = "yes"; then
	17	- AC_CHECK_LIB(esd, esd_play_stream, [
	18	- if test "${enable_esd}" != no; then
	19	- if test "${enable_dynamic}" != "yes"; then
	20	- LIBS="${LIBS} -lesd"
	21	- fi
	22	- DRIVERS="${DRIVERS} esd.o"
	23	- AC_DEFINE(DRIVER_ESD)
	24	- fi])
	25	+if test "$enable_esd" = yes; then
	26	+ AC_CHECK_LIB(esd, esd_play_stream)
	27	+ DRIVERS="${DRIVERS} esd.o"
	28	+ AC_DEFINE(DRIVER_ESD)
	29	fi
	30
	31	dnl -----------------------------------------------------------------------