diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2009-07-26 06:15:16 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2009-07-26 06:15:16 +0000 |
| commit | 9ce585a6086da0337f05eae6f8e666c572951e18 (patch) | |
| tree | a0c2fdd2329d2a4c87605984e5c7abdb4fe2c7f4 /multimedia/audacious/files | |
| parent | ac37fd14e6e396c1ec809143bbe73e7b11c8fbec (diff) | |
| download | ports-9ce585a6086da0337f05eae6f8e666c572951e18.tar.gz ports-9ce585a6086da0337f05eae6f8e666c572951e18.zip | |
Notes
Diffstat (limited to 'multimedia/audacious/files')
| -rw-r--r-- | multimedia/audacious/files/patch-buildsys.mk.in | 15 | ||||
| -rw-r--r-- | multimedia/audacious/files/patch-src-audacious-Makefile | 27 |
2 files changed, 27 insertions, 15 deletions
diff --git a/multimedia/audacious/files/patch-buildsys.mk.in b/multimedia/audacious/files/patch-buildsys.mk.in index 27ef17ad7202..7e42c0e1c765 100644 --- a/multimedia/audacious/files/patch-buildsys.mk.in +++ b/multimedia/audacious/files/patch-buildsys.mk.in @@ -1,6 +1,6 @@ ---- buildsys.mk.in.orig 2009-05-14 11:22:45.000000000 +0200 -+++ buildsys.mk.in 2009-05-14 11:23:14.000000000 +0200 -@@ -123,7 +123,7 @@ +--- buildsys.mk.in.orig 2009-07-07 00:39:11.000000000 +0200 ++++ buildsys.mk.in 2009-07-18 09:45:43.000000000 +0200 +@@ -124,7 +124,7 @@ done; \ if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \ ${DEPEND_STATUS}; \ @@ -9,3 +9,12 @@ rm -f $$deps; \ ${DEPEND_OK}; \ else \ +@@ -144,7 +144,7 @@ + + ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} + ${LINK_STATUS} +- if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \ ++ if ${LD} -o $@ ${OBJS} ${LIBS} ${LDFLAGS} ; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ diff --git a/multimedia/audacious/files/patch-src-audacious-Makefile b/multimedia/audacious/files/patch-src-audacious-Makefile index 4991d9e30c18..3afc0b9c871d 100644 --- a/multimedia/audacious/files/patch-src-audacious-Makefile +++ b/multimedia/audacious/files/patch-src-audacious-Makefile @@ -1,6 +1,6 @@ ---- src/audacious/Makefile.bak 2009-05-13 10:10:30.000000000 +0200 -+++ src/audacious/Makefile 2009-05-14 11:12:49.000000000 +0200 -@@ -125,15 +125,8 @@ +--- src/audacious/Makefile.orig 2009-07-07 00:39:12.000000000 +0200 ++++ src/audacious/Makefile 2009-07-18 09:41:46.000000000 +0200 +@@ -127,15 +127,8 @@ include ../../buildsys.mk @@ -18,7 +18,7 @@ ${MOWGLI_CFLAGS} \ ${GLIB_CFLAGS} \ ${GTHREAD_CFLAGS} \ -@@ -147,13 +140,12 @@ +@@ -149,13 +142,12 @@ ${SIMD_CFLAGS} \ -D_AUDACIOUS_CORE \ ${EGGSM_CFLAGS} \ @@ -29,14 +29,18 @@ -I../libaudcore -LIBS += ${LDADD} \ -+LIBS = ${LDADD} \ ++LIBS = \ + -L../libaudcore -laudcore \ ${LIBINTL} \ ${SAMPLERATE_LIBS} \ - ../libguess/libguess.a \ -@@ -168,6 +160,14 @@ - ${REGEX_LIBS} \ - -L../libaudcore -laudcore - +@@ -168,7 +160,16 @@ + ${DBUS_LIBS} \ + ${MOWGLI_LIBS} \ + ${LIBMCS_LIBS} \ +- ${REGEX_LIBS} ++ ${REGEX_LIBS} \ ++ ${LDADD} ++ +ifeq ($(USE_DBUS),yes) +CPPFLAGS += -I../libaudclient +DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h @@ -44,7 +48,6 @@ +endif + +pre-depend: ${DBUS_BINDINGS} -+ + LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS} - build_stamp.c: |