diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2002-08-23 15:23:17 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2002-08-23 15:23:17 +0000 |
| commit | 2a0e767c9fcfc3f26c88a5daa60c6087dec4b7f7 (patch) | |
| tree | 89706d4d3f1c7a673045781b21d0f72996811bdb /audio | |
| parent | Upgrade to 2.13. (diff) | |
* Use GNOMENG for ESounD.
* Kill .la files.
Notes
Notes:
svn path=/head/; revision=64888
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/libao/Makefile | 15 | ||||
| -rw-r--r-- | audio/libao/files/patch-configure | 20 | ||||
| -rw-r--r-- | audio/libao/pkg-plist | 4 |
3 files changed, 22 insertions, 17 deletions
diff --git a/audio/libao/Makefile b/audio/libao/Makefile index 3579208865b6..42a7e0803632 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -17,9 +17,9 @@ MASTER_SITES= ftp://ftp.linuxpowered.com/pub/Vorbis/unix/ \ MAINTAINER= naddy@FreeBSD.org -WANT_ESOUND= yes - -GNU_CONFIGURE= yes +USE_GNOMENG= yes +WANT_GNOME= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes .if defined(NOPORTDOCS) @@ -32,12 +32,13 @@ MAN5= libao.conf.5 .include <bsd.port.pre.mk> -.if defined(HAVE_ESOUND) -USE_ESOUND= yes -PLIST_SUB= ESOUND="" +.if ${HAVE_GNOME:Mesound} +USE_GNOME+= esound +PLIST_SUB+= ESOUND="" +PKGNAMESUFFIX= -esound .else -PLIST_SUB= ESOUND="@comment " CONFIGURE_ARGS+= --disable-esd +PLIST_SUB+= ESOUND="@comment " .endif # XXX This needs a better check. diff --git a/audio/libao/files/patch-configure b/audio/libao/files/patch-configure index 1fbaa4386df7..94f865122e5d 100644 --- a/audio/libao/files/patch-configure +++ b/audio/libao/files/patch-configure @@ -1,9 +1,17 @@ $FreeBSD$ ---- configure.orig Mon Aug 13 13:39:05 2001 -+++ configure Tue Aug 14 17:40:12 2001 -@@ -1510,7 +1510,7 @@ +--- configure.orig Fri Jul 19 16:16:55 2002 ++++ configure Fri Aug 23 16:47:25 2002 +@@ -5386,6 +5386,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -5412,7 +5413,7 @@ PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; *) DEBUG="-g" @@ -12,9 +20,9 @@ $FreeBSD$ PROFILE="-g -p" ;; esac else -@@ -1525,9 +1525,9 @@ - CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8" - PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;; +@@ -5432,9 +5433,9 @@ + CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char $SILLY_CARBON_PATH" + PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char $SILLY_CARBON_PATH" ;; *) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist index 3be5938c73e4..686a5c7d4037 100644 --- a/audio/libao/pkg-plist +++ b/audio/libao/pkg-plist @@ -2,14 +2,10 @@ include/ao/ao.h include/ao/os_types.h include/ao/plugin.h -lib/libao.la lib/libao.so lib/libao.so.3 -%%ARTS%%lib/ao/plugins-2/libarts.la %%ARTS%%lib/ao/plugins-2/libarts.so -lib/ao/plugins-2/liboss.la lib/ao/plugins-2/liboss.so -%%ESOUND%%lib/ao/plugins-2/libesd.la %%ESOUND%%lib/ao/plugins-2/libesd.so share/aclocal/ao.m4 %%PORTDOCS%%share/doc/libao/ao_append_option.html |