Date: Mon, 17 Nov 2014 22:15:04 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1761 - branches/firefox33/audio/linux-f10-alsa-lib branches/firefox33/security/nss branches/firefox33/www/firefox branches/firefox33/www/libxul branches/firefox33/www/xpi-adblock trunk/audio/linux-f10-alsa-lib trunk/security/nss trunk/www/libxul trunk/www/xpi-adblock Message-ID: <201411172215.sAHMF4HB067781@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Nov 17 22:15:04 2014
New Revision: 1761
Log:
sync with ports
Modified:
branches/firefox33/audio/linux-f10-alsa-lib/Makefile
branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist
branches/firefox33/security/nss/Makefile
branches/firefox33/security/nss/pkg-plist
branches/firefox33/www/firefox/Makefile
branches/firefox33/www/libxul/Makefile
branches/firefox33/www/xpi-adblock/Makefile.xpi
trunk/audio/linux-f10-alsa-lib/Makefile
trunk/audio/linux-f10-alsa-lib/pkg-plist
trunk/security/nss/Makefile
trunk/security/nss/pkg-plist
trunk/www/libxul/Makefile
trunk/www/xpi-adblock/Makefile.xpi
Modified: branches/firefox33/audio/linux-f10-alsa-lib/Makefile
==============================================================================
--- branches/firefox33/audio/linux-f10-alsa-lib/Makefile Fri Nov 7 22:14:43 2014 (r1760)
+++ branches/firefox33/audio/linux-f10-alsa-lib/Makefile Mon Nov 17 22:15:04 2014 (r1761)
@@ -28,7 +28,7 @@
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc
- @${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
+ ${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la
${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la
${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la
Modified: branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist
==============================================================================
--- branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist Fri Nov 7 22:14:43 2014 (r1760)
+++ branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist Mon Nov 17 22:15:04 2014 (r1761)
@@ -84,4 +84,3 @@
usr/share/doc/alsa-lib-1.0.21/ChangeLog
usr/share/doc/alsa-lib-1.0.21/TODO
usr/share/doc/alsa-lib-1.0.21/asoundrc.txt
-@comment non-empty directory listing in revers order
Modified: branches/firefox33/security/nss/Makefile
==============================================================================
--- branches/firefox33/security/nss/Makefile Fri Nov 7 22:14:43 2014 (r1760)
+++ branches/firefox33/security/nss/Makefile Mon Nov 17 22:15:04 2014 (r1761)
@@ -1,8 +1,9 @@
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD: head/security/nss/Makefile 370932 2014-10-15 15:48:16Z beat $
+# $FreeBSD: head/security/nss/Makefile 371936 2014-10-31 21:34:25Z rodrigo $
PORTNAME= nss
PORTVERSION= 3.17.2
+PORTREVISION= 1
#DISTVERSIONSUFFIX= .with.ckbi.1.93
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
Modified: branches/firefox33/security/nss/pkg-plist
==============================================================================
--- branches/firefox33/security/nss/pkg-plist Fri Nov 7 22:14:43 2014 (r1760)
+++ branches/firefox33/security/nss/pkg-plist Mon Nov 17 22:15:04 2014 (r1761)
@@ -80,6 +80,7 @@
include/nss/nss/pk11pub.h
include/nss/nss/pk11sdr.h
include/nss/nss/pkcs11.h
+include/nss/nss/pkcs1sig.h
include/nss/nss/pkcs11f.h
include/nss/nss/pkcs11n.h
include/nss/nss/pkcs11p.h
Modified: branches/firefox33/www/firefox/Makefile
==============================================================================
--- branches/firefox33/www/firefox/Makefile Fri Nov 7 22:14:43 2014 (r1760)
+++ branches/firefox33/www/firefox/Makefile Mon Nov 17 22:15:04 2014 (r1761)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox/Makefile 370932 2014-10-15 15:48:16Z beat $
PORTNAME= firefox
-DISTVERSION= 33.1
+DISTVERSION= 33.1.1
DISTVERSIONSUFFIX=.source
PORTEPOCH= 1
CATEGORIES= www ipv6
Modified: branches/firefox33/www/libxul/Makefile
==============================================================================
--- branches/firefox33/www/libxul/Makefile Fri Nov 7 22:14:43 2014 (r1760)
+++ branches/firefox33/www/libxul/Makefile Mon Nov 17 22:15:04 2014 (r1761)
@@ -1,5 +1,5 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD: head/www/libxul/Makefile 370932 2014-10-15 15:48:16Z beat $
+# $FreeBSD: head/www/libxul/Makefile 371388 2014-10-23 11:43:23Z beat $
PORTNAME= libxul
DISTVERSION= 31.2.1
Modified: branches/firefox33/www/xpi-adblock/Makefile.xpi
==============================================================================
--- branches/firefox33/www/xpi-adblock/Makefile.xpi Fri Nov 7 22:14:43 2014 (r1760)
+++ branches/firefox33/www/xpi-adblock/Makefile.xpi Mon Nov 17 22:15:04 2014 (r1761)
@@ -1,5 +1,5 @@
# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 370932 2014-10-15 15:48:16Z beat $
+# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 372585 2014-11-15 08:59:40Z antoine $
# XPI_ID - Extension id, might be in {12345-...} or dev@org format
# XPI_NUM - Extension number, as in addons.mozilla.org URL
@@ -150,6 +150,7 @@
_A= >> ${TMPPLIST}
_Q= 2>/dev/null || true
PLIST_FILES+= ${XPI_FILES:S!^!${_TD}/!}
+PLIST_DIRS+= ${XPI_DIRS:S!^!${_TD}/!}
.for dist in ${XPI_DISTNAMES}
XPI_XPIDIR_${dist}= ${XPI_LIBDIR}/${XPI_ID_${dist}}
@@ -164,7 +165,9 @@
@if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \
then ${INSTALL_DATA} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi
@${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/
- @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A}
+ @for sldir in ${XPI_SLDIRS_ALL}; do \
+ ${ECHO_CMD} "@dir $${sldir}" ${_A}; \
+ done
@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A}
@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A}
.endif
Modified: trunk/audio/linux-f10-alsa-lib/Makefile
==============================================================================
--- trunk/audio/linux-f10-alsa-lib/Makefile Fri Nov 7 22:14:43 2014 (r1760)
+++ trunk/audio/linux-f10-alsa-lib/Makefile Mon Nov 17 22:15:04 2014 (r1761)
@@ -28,7 +28,7 @@
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc
- @${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
+ ${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la
${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la
${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la
Modified: trunk/audio/linux-f10-alsa-lib/pkg-plist
==============================================================================
--- trunk/audio/linux-f10-alsa-lib/pkg-plist Fri Nov 7 22:14:43 2014 (r1760)
+++ trunk/audio/linux-f10-alsa-lib/pkg-plist Mon Nov 17 22:15:04 2014 (r1761)
@@ -84,4 +84,3 @@
usr/share/doc/alsa-lib-1.0.21/ChangeLog
usr/share/doc/alsa-lib-1.0.21/TODO
usr/share/doc/alsa-lib-1.0.21/asoundrc.txt
-@comment non-empty directory listing in revers order
Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile Fri Nov 7 22:14:43 2014 (r1760)
+++ trunk/security/nss/Makefile Mon Nov 17 22:15:04 2014 (r1761)
@@ -1,8 +1,9 @@
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD: head/security/nss/Makefile 370932 2014-10-15 15:48:16Z beat $
+# $FreeBSD: head/security/nss/Makefile 371936 2014-10-31 21:34:25Z rodrigo $
PORTNAME= nss
PORTVERSION= 3.17.2
+PORTREVISION= 1
#DISTVERSIONSUFFIX= .with.ckbi.1.93
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
Modified: trunk/security/nss/pkg-plist
==============================================================================
--- trunk/security/nss/pkg-plist Fri Nov 7 22:14:43 2014 (r1760)
+++ trunk/security/nss/pkg-plist Mon Nov 17 22:15:04 2014 (r1761)
@@ -80,6 +80,7 @@
include/nss/nss/pk11pub.h
include/nss/nss/pk11sdr.h
include/nss/nss/pkcs11.h
+include/nss/nss/pkcs1sig.h
include/nss/nss/pkcs11f.h
include/nss/nss/pkcs11n.h
include/nss/nss/pkcs11p.h
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Fri Nov 7 22:14:43 2014 (r1760)
+++ trunk/www/libxul/Makefile Mon Nov 17 22:15:04 2014 (r1761)
@@ -1,5 +1,5 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD: head/www/libxul/Makefile 370932 2014-10-15 15:48:16Z beat $
+# $FreeBSD: head/www/libxul/Makefile 371388 2014-10-23 11:43:23Z beat $
PORTNAME= libxul
DISTVERSION= 31.2.1
Modified: trunk/www/xpi-adblock/Makefile.xpi
==============================================================================
--- trunk/www/xpi-adblock/Makefile.xpi Fri Nov 7 22:14:43 2014 (r1760)
+++ trunk/www/xpi-adblock/Makefile.xpi Mon Nov 17 22:15:04 2014 (r1761)
@@ -1,5 +1,5 @@
# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 370932 2014-10-15 15:48:16Z beat $
+# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 372585 2014-11-15 08:59:40Z antoine $
# XPI_ID - Extension id, might be in {12345-...} or dev@org format
# XPI_NUM - Extension number, as in addons.mozilla.org URL
@@ -150,6 +150,7 @@
_A= >> ${TMPPLIST}
_Q= 2>/dev/null || true
PLIST_FILES+= ${XPI_FILES:S!^!${_TD}/!}
+PLIST_DIRS+= ${XPI_DIRS:S!^!${_TD}/!}
.for dist in ${XPI_DISTNAMES}
XPI_XPIDIR_${dist}= ${XPI_LIBDIR}/${XPI_ID_${dist}}
@@ -164,7 +165,9 @@
@if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \
then ${INSTALL_DATA} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi
@${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/
- @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A}
+ @for sldir in ${XPI_SLDIRS_ALL}; do \
+ ${ECHO_CMD} "@dir $${sldir}" ${_A}; \
+ done
@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A}
@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A}
.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411172215.sAHMF4HB067781>