diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 327d887b4e51..ceaa779a09fe 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -53,12 +53,7 @@ OPTIONS= DBUS "Enable D-BUS support" on \ .include -.if ${OSVERSION} < 700000 -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio -.else EXTRA_PATCHES= ${FILESDIR}/libsydney_oss -.endif .if ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 diff --git a/www/firefox36/files/releng6_pulseaudio b/www/firefox36/files/releng6_pulseaudio deleted file mode 100644 index 2d83f3c1c441..000000000000 --- a/www/firefox36/files/releng6_pulseaudio +++ /dev/null @@ -1,32 +0,0 @@ ---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-11 17:22:08.000000000 +0200 -+++ media/libsydneyaudio/src/Makefile.in 2009-08-11 17:22:36.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ ---- toolkit/library/Makefile.in.orig 2009-08-11 17:22:45.000000000 +0200 -+++ toolkit/library/Makefile.in 2009-08-11 17:23:22.000000000 +0200 -@@ -231,12 +231,12 @@ - endif - - ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif -