diff options
| author | pav <pav@FreeBSD.org> | 2004-11-21 22:53:51 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-11-21 22:53:51 +0800 |
| commit | c4c34c667b0bce91c4373773d2a8a11346154de6 (patch) | |
| tree | 901f53edb2104475ffb2b1360058a072b071b067 /audio/xmp | |
| parent | 0bb2053faeeb2af17c09357b8b14bc718b86683d (diff) | |
| download | freebsd-ports-graphics-c4c34c667b0bce91c4373773d2a8a11346154de6.tar.gz freebsd-ports-graphics-c4c34c667b0bce91c4373773d2a8a11346154de6.tar.zst freebsd-ports-graphics-c4c34c667b0bce91c4373773d2a8a11346154de6.zip | |
- Fix botched local patch which was breaking compilation with esound
PR: ports/74128
Reported by: Michael C. Shultz <ringworm@inbox.lv>
Diffstat (limited to 'audio/xmp')
| -rw-r--r-- | audio/xmp/Makefile | 6 | ||||
| -rw-r--r-- | audio/xmp/files/patch-configure.in | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile index 0b127536394..71d98ba673f 100644 --- a/audio/xmp/Makefile +++ b/audio/xmp/Makefile @@ -22,17 +22,13 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_AUTOCONF_VER= 213 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-alsa CFLAGS+= -fPIC .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 503000 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - .if ${OSVERSION} > 500013 || ${MACHINE_ARCH} == "alpha" USE_GNOME+= esound CONFIGURE_ARGS+= --disable-oss --enable-esd diff --git a/audio/xmp/files/patch-configure.in b/audio/xmp/files/patch-configure.in index 783105abe24..067941bacf6 100644 --- a/audio/xmp/files/patch-configure.in +++ b/audio/xmp/files/patch-configure.in @@ -1,5 +1,5 @@ --- configure.in.orig Sat Jan 20 02:06:28 2001 -+++ configure.in Sun Apr 8 11:32:48 2001 ++++ configure.in Sun Nov 21 15:34:41 2004 @@ -142,7 +142,7 @@ sys/soundcard.h machine/soundcard.h \ sys/ultrasound.h linux/ultrasound.h machine/ultrasound.h \ @@ -9,7 +9,7 @@ dnl ----------------------------------------------------------------------- dnl Check OS/architecture independent drivers -@@ -173,15 +173,10 @@ +@@ -173,15 +173,13 @@ fi]) fi @@ -24,6 +24,9 @@ - fi]) +if test "$enable_esd" = yes; then + AC_CHECK_LIB(esd, esd_play_stream) ++ if test "${enable_dynamic}" != "yes"; then ++ LIBS="${LIBS} ${LDFLAGS} -lesd" ++ fi + DRIVERS="${DRIVERS} esd.o" + AC_DEFINE(DRIVER_ESD) fi |