Author: jbeich Date: Sat Aug 30 21:43:53 2014 New Revision: 1681 Log: sync with ports and linux-ports pull request
Deleted: trunk/audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf trunk/audio/linux-f10-alsa-plugins-pulseaudio/files/patch-pcm-oss.conf Modified: trunk/Mk/Uses/gecko.mk trunk/Mk/Uses/webplugin.mk trunk/Mk/bsd.gecko.mk trunk/audio/linux-f10-alsa-lib/Makefile trunk/audio/linux-f10-alsa-plugins-oss/Makefile trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile trunk/audio/linux-f10-alsa-plugins-pulseaudio/pkg-plist trunk/devel/nspr/Makefile trunk/mail/linux-thunderbird/Makefile trunk/mail/thunderbird-i18n/Makefile trunk/mail/thunderbird/Makefile trunk/security/nss/Makefile trunk/www/firefox-esr-i18n/Makefile trunk/www/firefox-esr-i18n/Makefile.option trunk/www/firefox-esr/Makefile trunk/www/firefox-i18n/Makefile trunk/www/firefox-i18n/Makefile.lang trunk/www/firefox-i18n/Makefile.option trunk/www/firefox/Makefile trunk/www/libxul/Makefile trunk/www/linux-firefox/Makefile trunk/www/linux-seamonkey/Makefile trunk/www/linux-seamonkey/Makefile.common trunk/www/xpi-adblock/Makefile trunk/www/xpi-adblock/Makefile.xpi Modified: trunk/Mk/Uses/gecko.mk ============================================================================== --- trunk/Mk/Uses/gecko.mk Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/Mk/Uses/gecko.mk Sat Aug 30 21:43:53 2014 (r1681) @@ -1,4 +1,4 @@ -# $FreeBSD: head/Mk/Uses/gecko.mk 352640 2014-04-29 20:35:24Z beat $ +# $FreeBSD: head/Mk/Uses/gecko.mk 363978 2014-08-04 09:11:25Z bapt $ # # Handle dependency of different gecko based applications # Modified: trunk/Mk/Uses/webplugin.mk ============================================================================== --- trunk/Mk/Uses/webplugin.mk Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/Mk/Uses/webplugin.mk Sat Aug 30 21:43:53 2014 (r1681) @@ -1,6 +1,4 @@ -# $FreeBSD: head/Mk/Uses/webplugin.mk 333595 2013-11-12 18:01:39Z bapt $ -# -# MAINTAINER= [email protected] +# $FreeBSD: head/Mk/Uses/webplugin.mk 348308 2014-03-15 10:31:54Z gerald $ # # Documentation and examples: # @@ -104,6 +102,8 @@ # /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/application/fooplugin.so # /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi # ------------------------------------------------------ +# +# MAINTAINER= [email protected] .if !defined(_INCLUDE_USES_WEBPLUGIN_MK) _INCLUDE_USES_WEBPLUGIN_MK= yes @@ -166,14 +166,12 @@ PLIST_SUB+= WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}" -_LNWF= ${WEBPLUGIN_FILES:S,^,${WEBPLUGIN_DIR}/,} - webplugin-post-install: @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} .for d in ${_WEBPLUGIN_LINKFARMS} ${INSTALL} -d ${STAGEDIR}${d} -.for l in ${_LNWF} - ${LN} -sf ${l} ${STAGEDIR}${d}/ +.for l in ${WEBPLUGIN_FILES} + ${LN} -sf ${l:S,^,${WEBPLUGIN_DIR}/,} ${STAGEDIR}${d}/ @${ECHO_CMD} "${d:S,^${LOCALBASE}/,,}/${l:T}" >> ${TMPPLIST} .endfor @${ECHO_CMD} "@unexec rmdir ${d:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} @@ -181,6 +179,4 @@ @${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_SLDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} -post-install: webplugin-post-install - .endif Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/Mk/bsd.gecko.mk Sat Aug 30 21:43:53 2014 (r1681) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson <[email protected]> # -# $FreeBSD: head/Mk/bsd.gecko.mk 362796 2014-07-24 13:32:58Z bapt $ +# $FreeBSD: head/Mk/bsd.gecko.mk 363978 2014-08-04 09:11:25Z bapt $ # # 4 column tabs prevent hair loss and tooth decay! Modified: trunk/audio/linux-f10-alsa-lib/Makefile ============================================================================== --- trunk/audio/linux-f10-alsa-lib/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/audio/linux-f10-alsa-lib/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Boris Samorodov <[email protected]> -# $FreeBSD: head/audio/linux-f10-alsa-lib/Makefile 329390 2013-10-04 21:35:35Z rene $ +# $FreeBSD: head/audio/linux-f10-alsa-lib/Makefile 340722 2014-01-22 17:00:46Z mat $ PORTNAME= alsa-lib PORTVERSION= 1.0.21 Modified: trunk/audio/linux-f10-alsa-plugins-oss/Makefile ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-oss/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/audio/linux-f10-alsa-plugins-oss/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -19,4 +19,8 @@ SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX} USE_LDCONFIG= yes +# We will use native configuration file, so delete a linux one +post-extract: + @${RM} -r ${WRKSRC}/etc + .include <bsd.port.mk> Deleted: trunk/audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf Sat Aug 30 21:43:53 2014 (r1680) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- etc/alsa/pcm/pcm-oss.conf.orig 2010-03-23 10:56:41.000000000 +0900 -+++ etc/alsa/pcm/pcm-oss.conf 2010-03-23 10:57:30.000000000 +0900 -@@ -7,3 +7,11 @@ - description "Open Sound System" - } - } -+ -+ctl.oss { -+ type oss -+ device /dev/mixer -+ hint { -+ description "Open Sound System" -+ } -+} Modified: trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist Sat Aug 30 21:43:53 2014 (r1681) @@ -1,4 +1,3 @@ -etc/alsa/pcm/pcm-oss.conf usr/lib/alsa-lib/libasound_module_ctl_oss.so usr/lib/alsa-lib/libasound_module_pcm_oss.so usr/share/doc/alsa-plugins-oss-1.0.21/COPYING Modified: trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,4 @@ -# Created by: hashiz -# $FreeBSD: head/audio/linux-f10-alsa-plugins-oss/Makefile 327706 2013-09-20 14:36:35Z bapt $ +# $FreeBSD$ PORTNAME= alsa-plugins-pulseaudio PORTVERSION= 1.0.21 @@ -21,4 +20,8 @@ # XXX move to audio/linux-f10-pulseaudio-libs USE_LINUX_APPS+=libasyncns xorglibs +# We will use native configuration file, so delete a linux one +post-extract: + @${RM} -r ${WRKSRC}/etc + .include <bsd.port.mk> Deleted: trunk/audio/linux-f10-alsa-plugins-pulseaudio/files/patch-pcm-oss.conf ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-pulseaudio/files/patch-pcm-oss.conf Sat Aug 30 21:43:53 2014 (r1680) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- etc/alsa/pcm/pcm-oss.conf.orig 2010-03-23 10:56:41.000000000 +0900 -+++ etc/alsa/pcm/pcm-oss.conf 2010-03-23 10:57:30.000000000 +0900 -@@ -7,3 +7,11 @@ - description "Open Sound System" - } - } -+ -+ctl.oss { -+ type oss -+ device /dev/mixer -+ hint { -+ description "Open Sound System" -+ } -+} Modified: trunk/audio/linux-f10-alsa-plugins-pulseaudio/pkg-plist ============================================================================== --- trunk/audio/linux-f10-alsa-plugins-pulseaudio/pkg-plist Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/audio/linux-f10-alsa-plugins-pulseaudio/pkg-plist Sat Aug 30 21:43:53 2014 (r1681) @@ -1,4 +1,3 @@ -etc/alsa/pulse-default.conf usr/lib/alsa-lib/libasound_module_conf_pulse.so usr/lib/alsa-lib/libasound_module_ctl_pulse.so usr/lib/alsa-lib/libasound_module_pcm_pulse.so Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/devel/nspr/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <[email protected]> -# $FreeBSD: head/devel/nspr/Makefile 359185 2014-06-25 05:35:31Z bapt $ +# $FreeBSD: head/devel/nspr/Makefile 363976 2014-08-04 09:03:53Z bapt $ PORTNAME= nspr DISTVERSION= 4.10.7 Modified: trunk/mail/linux-thunderbird/Makefile ============================================================================== --- trunk/mail/linux-thunderbird/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/mail/linux-thunderbird/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/mail/linux-thunderbird/Makefile 357413 2014-06-11 03:42:55Z beat $ +# $FreeBSD: head/mail/linux-thunderbird/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= thunderbird DISTVERSION= 31.1.0 Modified: trunk/mail/thunderbird-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird-i18n/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/mail/thunderbird-i18n/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/mail/thunderbird-i18n/Makefile 357413 2014-06-11 03:42:55Z beat $ +# $FreeBSD: head/mail/thunderbird-i18n/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= thunderbird-i18n PORTVERSION= 31.1.0 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/mail/thunderbird/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Joe Marcus Clarke <[email protected]> -# $FreeBSD: head/mail/thunderbird/Makefile 362796 2014-07-24 13:32:58Z bapt $ +# $FreeBSD: head/mail/thunderbird/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= thunderbird DISTVERSION= 31.1.0 Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/security/nss/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <[email protected]> -# $FreeBSD: head/security/nss/Makefile 362631 2014-07-23 07:49:43Z delphij $ +# $FreeBSD: head/security/nss/Makefile 363977 2014-08-04 09:06:06Z bapt $ PORTNAME= nss PORTVERSION= 3.17 Modified: trunk/www/firefox-esr-i18n/Makefile ============================================================================== --- trunk/www/firefox-esr-i18n/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/firefox-esr-i18n/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/firefox-esr-i18n/Makefile 357413 2014-06-11 03:42:55Z beat $ +# $FreeBSD: head/www/firefox-esr-i18n/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= firefox PORTVERSION= 31.1.0 Modified: trunk/www/firefox-esr-i18n/Makefile.option ============================================================================== --- trunk/www/firefox-esr-i18n/Makefile.option Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/firefox-esr-i18n/Makefile.option Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Koji Yokota <[email protected]> -# $FreeBSD: head/www/firefox-i18n/Makefile.option 342632 2014-02-05 05:23:30Z beat $ +# $FreeBSD: head/www/firefox-esr-i18n/Makefile.option 363978 2014-08-04 09:11:25Z bapt $ OPTIONS_DEFINE= LANG_ACH \ LANG_AF \ Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/firefox-esr/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Alan Eldridge <[email protected]> -# $FreeBSD: head/www/firefox-esr/Makefile 362796 2014-07-24 13:32:58Z bapt $ +# $FreeBSD: head/www/firefox-esr/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= firefox DISTVERSION= 31.1.0 Modified: trunk/www/firefox-i18n/Makefile ============================================================================== --- trunk/www/firefox-i18n/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/firefox-i18n/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/firefox-i18n/Makefile 357413 2014-06-11 03:42:55Z beat $ +# $FreeBSD: head/www/firefox-i18n/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= firefox-i18n PORTVERSION= 32.0 Modified: trunk/www/firefox-i18n/Makefile.lang ============================================================================== --- trunk/www/firefox-i18n/Makefile.lang Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/firefox-i18n/Makefile.lang Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Koji Yokota <[email protected]> -# $FreeBSD: head/www/firefox-i18n/Makefile.lang 342632 2014-02-05 05:23:30Z beat $ +# $FreeBSD: head/www/firefox-i18n/Makefile.lang 363978 2014-08-04 09:11:25Z bapt $ FIREFOX_I18N_ALL_= ach af an ar as ast be bg bn-BD bn-IN br bs ca cs \ csb cy da de el en-GB en-US en-ZA eo es-AR es-CL \ Modified: trunk/www/firefox-i18n/Makefile.option ============================================================================== --- trunk/www/firefox-i18n/Makefile.option Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/firefox-i18n/Makefile.option Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Koji Yokota <[email protected]> -# $FreeBSD: head/www/firefox-i18n/Makefile.option 342632 2014-02-05 05:23:30Z beat $ +# $FreeBSD: head/www/firefox-i18n/Makefile.option 363978 2014-08-04 09:11:25Z bapt $ OPTIONS_DEFINE= LANG_ACH \ LANG_AF \ Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/firefox/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Alan Eldridge <[email protected]> -# $FreeBSD: head/www/firefox/Makefile 362796 2014-07-24 13:32:58Z bapt $ +# $FreeBSD: head/www/firefox/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= firefox DISTVERSION= 32.0 Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/libxul/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Michael Johnson <[email protected]> -# $FreeBSD: head/www/libxul/Makefile 359586 2014-06-27 17:21:06Z miwi $ +# $FreeBSD: head/www/libxul/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= libxul DISTVERSION= 31.1.0 Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/linux-firefox/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: voisine -# $FreeBSD: head/www/linux-firefox/Makefile 357413 2014-06-11 03:42:55Z beat $ +# $FreeBSD: head/www/linux-firefox/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= firefox DISTVERSION= 32.0 Modified: trunk/www/linux-seamonkey/Makefile ============================================================================== --- trunk/www/linux-seamonkey/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/linux-seamonkey/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/linux-seamonkey/Makefile 362322 2014-07-20 14:44:10Z rene $ +# $FreeBSD: head/www/linux-seamonkey/Makefile 363978 2014-08-04 09:11:25Z bapt $ PORTNAME= seamonkey DISTVERSION= 2.29b2 Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/linux-seamonkey/Makefile.common Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/linux-seamonkey/Makefile.common 310165 2013-01-09 23:28:19Z flo $ +# $FreeBSD: head/www/linux-seamonkey/Makefile.common 363978 2014-08-04 09:11:25Z bapt $ .if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \ ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10" Modified: trunk/www/xpi-adblock/Makefile ============================================================================== --- trunk/www/xpi-adblock/Makefile Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/xpi-adblock/Makefile Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/xpi-adblock/Makefile 341198 2014-01-26 15:07:21Z miwi $ +# $FreeBSD: head/www/xpi-adblock/Makefile 364158 2014-08-06 09:11:57Z olgeni $ PORTNAME= adblock PORTVERSION= 0.5.3.043 @@ -7,7 +7,7 @@ CATEGORIES= www MAINTAINER= [email protected] -COMMENT= A content filtering extension +COMMENT= Content filtering extension XPI_NUM= 10 XPI_ID= {34274bf4-1d97-a289-e984-17e546307e4f} Modified: trunk/www/xpi-adblock/Makefile.xpi ============================================================================== --- trunk/www/xpi-adblock/Makefile.xpi Sat Aug 30 19:27:17 2014 (r1680) +++ trunk/www/xpi-adblock/Makefile.xpi Sat Aug 30 21:43:53 2014 (r1681) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 352071 2014-04-24 21:49:07Z antoine $ +# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 352986 2014-05-05 09:45:36Z bapt $ # XPI_ID - Extension id, might be in {12345-...} or dev@org format # XPI_NUM - Extension number, as in addons.mozilla.org URL @@ -119,7 +119,7 @@ USE_XPI= ${WITH_XPI_APPS} .endif -.if !defined(USE_XPI) || ${USE_XPI:U} == "YES" || ${USE_XPI} == "*" +.if !defined(USE_XPI) || ${USE_XPI:tu} == "YES" || ${USE_XPI} == "*" USE_XPI= ${XPI_APPS_ALL_WC} .endif _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
