[SVN-Commit] r1735 - branches/firefox33/Mk branches/firefox33/Mk/Uses branches/firefox33/audio/linux-f10-alsa-lib branches/firefox33/audio/linux-f10-alsa-plugins-oss branches/firefox33/audio/linux-f10-alsa-plugins-pulseaudio branches/firefox33/mail/linux-thunderbird branches/firefox33/mail/thunderbird branches/firefox33/mail/thunderbird-i18n branches/firefox33/multimedia/gmp-api branches/firefox33/multimedia/openh264 branches/firefox33/security/ca_root_nss branches/firefox33/security/nss branches/firefox33/www/firefox branches/firefox33/www/firefox-esr branches/firefox33/www/firefox-esr-i18n branches/firefox33/www/firefox-i18n branches/firefox33/www/libxul branches/firefox33/www/linux-firefox branches/firefox33/www/linux-seamonkey branches/firefox33/www/seamonkey branches/firefox33/www/seamonkey-i18n branches/firefox33/www/xpi-adblock trunk/Mk trunk/Mk/Uses trunk/audio/linux-f10-alsa-lib trunk/audio/linux-f10-alsa-plugins-oss trunk/audio/linux-f10-alsa-plugins-pulse! audio trunk/mail/linux-thunderbird trunk/mail/thunderbird trunk/mail/thunderbird-i18n trunk/multimedia/gmp-api trunk/multimedia/openh264 trunk/security/ca_root_nss trunk/security/nss trunk/www/firefox trunk/www/firefox-esr trunk/www/firefox-esr-i18n trunk/www/firefox-i18n trunk/www/libxul trunk/www/linux-firefox trunk/www/linux-seamonkey trunk/www/seamonkey trunk/www/seamonkey-i18n trunk/www/xpi-adblock

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Sat Oct 18 12:27:56 UTC 2014


Author: jbeich
Date: Sat Oct 18 12:27:40 2014
New Revision: 1735

Log:
sync with ports

Modified:
   branches/firefox33/Mk/Uses/gecko.mk
   branches/firefox33/Mk/bsd.gecko.mk
   branches/firefox33/audio/linux-f10-alsa-lib/Makefile
   branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist
   branches/firefox33/audio/linux-f10-alsa-plugins-oss/Makefile
   branches/firefox33/audio/linux-f10-alsa-plugins-pulseaudio/Makefile
   branches/firefox33/mail/linux-thunderbird/Makefile
   branches/firefox33/mail/thunderbird-i18n/Makefile
   branches/firefox33/mail/thunderbird/Makefile
   branches/firefox33/multimedia/gmp-api/Makefile
   branches/firefox33/multimedia/openh264/Makefile
   branches/firefox33/security/ca_root_nss/Makefile
   branches/firefox33/security/nss/Makefile
   branches/firefox33/www/firefox-esr-i18n/Makefile
   branches/firefox33/www/firefox-esr/Makefile
   branches/firefox33/www/firefox-i18n/Makefile
   branches/firefox33/www/firefox/Makefile
   branches/firefox33/www/libxul/Makefile
   branches/firefox33/www/linux-firefox/Makefile
   branches/firefox33/www/linux-seamonkey/Makefile
   branches/firefox33/www/linux-seamonkey/Makefile.common
   branches/firefox33/www/seamonkey-i18n/Makefile
   branches/firefox33/www/seamonkey/Makefile
   branches/firefox33/www/xpi-adblock/Makefile.xpi
   trunk/Mk/Uses/gecko.mk
   trunk/Mk/bsd.gecko.mk
   trunk/audio/linux-f10-alsa-lib/Makefile
   trunk/audio/linux-f10-alsa-lib/pkg-plist
   trunk/audio/linux-f10-alsa-plugins-oss/Makefile
   trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile
   trunk/mail/linux-thunderbird/Makefile
   trunk/mail/thunderbird-i18n/Makefile
   trunk/mail/thunderbird/Makefile
   trunk/multimedia/gmp-api/Makefile
   trunk/multimedia/openh264/Makefile
   trunk/security/ca_root_nss/Makefile
   trunk/security/nss/Makefile
   trunk/www/firefox-esr-i18n/Makefile
   trunk/www/firefox-esr/Makefile
   trunk/www/firefox-i18n/Makefile
   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/seamonkey-i18n/Makefile
   trunk/www/seamonkey/Makefile
   trunk/www/xpi-adblock/Makefile.xpi

Modified: branches/firefox33/Mk/Uses/gecko.mk
==============================================================================
--- branches/firefox33/Mk/Uses/gecko.mk	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/Mk/Uses/gecko.mk	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/Mk/Uses/gecko.mk 369465 2014-09-28 16:36:31Z tijl $
+# $FreeBSD: head/Mk/Uses/gecko.mk 371110 2014-10-18 10:23:53Z antoine $
 #
 # Handle dependency of different gecko based applications
 #

Modified: branches/firefox33/Mk/bsd.gecko.mk
==============================================================================
--- branches/firefox33/Mk/bsd.gecko.mk	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/Mk/bsd.gecko.mk	Sat Oct 18 12:27:40 2014	(r1735)
@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze at FreeBSD.org>
 #
-# $FreeBSD: head/Mk/bsd.gecko.mk 367712 2014-09-09 06:16:35Z bapt $
+# $FreeBSD: head/Mk/bsd.gecko.mk 370932 2014-10-15 15:48:16Z beat $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 

Modified: branches/firefox33/audio/linux-f10-alsa-lib/Makefile
==============================================================================
--- branches/firefox33/audio/linux-f10-alsa-lib/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/audio/linux-f10-alsa-lib/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,15 +1,13 @@
 # Created by: Boris Samorodov <bsam at FreeBSD.org>
-# $FreeBSD: head/audio/linux-f10-alsa-lib/Makefile 340722 2014-01-22 17:00:46Z mat $
+# $FreeBSD: head/audio/linux-f10-alsa-lib/Makefile 368845 2014-09-22 10:40:00Z xmj $
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.0.21
 PORTREVISION=	4
 CATEGORIES=	audio linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
-MAINTAINER=	gecko at FreeBSD.org
+MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	Advanced Linux Sound Architecture libraries (Linux Fedora 10)
 
 RUN_DEPENDS=	${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
@@ -17,8 +15,9 @@
 CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	10
+
 RPMVERSION=	2.fc10
 BRANDELF_FILES=	usr/bin/aserver
 USE_LDCONFIG=	yes
@@ -30,5 +29,8 @@
 post-install:
 	@${MKDIR} ${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
 
 .include <bsd.port.mk>

Modified: branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist
==============================================================================
--- branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/audio/linux-f10-alsa-lib/pkg-plist	Sat Oct 18 12:27:40 2014	(r1735)
@@ -3,11 +3,8 @@
 lib/libasound.so.2
 lib/libasound.so.2.0.0
 usr/bin/aserver
-usr/lib/alsa-lib/smixer/smixer-ac97.la
 usr/lib/alsa-lib/smixer/smixer-ac97.so
-usr/lib/alsa-lib/smixer/smixer-hda.la
 usr/lib/alsa-lib/smixer/smixer-hda.so
-usr/lib/alsa-lib/smixer/smixer-sbase.la
 usr/lib/alsa-lib/smixer/smixer-sbase.so
 usr/share/alsa/alsa.conf
 usr/share/alsa/cards/AACI.conf

Modified: branches/firefox33/audio/linux-f10-alsa-plugins-oss/Makefile
==============================================================================
--- branches/firefox33/audio/linux-f10-alsa-plugins-oss/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/audio/linux-f10-alsa-plugins-oss/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,20 +1,19 @@
 # Created by: hashiz
-# $FreeBSD: head/audio/linux-f10-alsa-plugins-oss/Makefile 327706 2013-09-20 14:36:35Z bapt $
+# $FreeBSD: head/audio/linux-f10-alsa-plugins-oss/Makefile 369031 2014-09-23 11:03:35Z xmj $
 
 PORTNAME=	alsa-plugins-oss
 PORTVERSION=	1.0.21
-PORTREVISION=	4
+PORTREVISION=	3
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
-MAINTAINER=	gecko at FreeBSD.org
+MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	OSS plugin for ALSA (Linux Fedora 10)
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	alsalib
-LINUX_DIST_VER=	10
+
 RPMVERSION=	3.fc10
 SRC_DISTFILES=	${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 USE_LDCONFIG=	yes

Modified: branches/firefox33/audio/linux-f10-alsa-plugins-pulseaudio/Makefile
==============================================================================
--- branches/firefox33/audio/linux-f10-alsa-plugins-pulseaudio/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/audio/linux-f10-alsa-plugins-pulseaudio/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -3,16 +3,17 @@
 PORTNAME=	alsa-plugins-pulseaudio
 PORTVERSION=	1.0.21
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
-MAINTAINER=	gecko at FreeBSD.org
+MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	PulseAudio plugin for ALSA (Linux Fedora 10)
 
+CONFLICTS=	linux-c6-alsa-lib-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	alsalib pulseaudio-libs
-LINUX_DIST_VER=	10
+
 RPMVERSION=	3.fc10
 SRC_DISTFILES=	${PORTNAME:S/-pulseaudio//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 USE_LDCONFIG=	yes

Modified: branches/firefox33/mail/linux-thunderbird/Makefile
==============================================================================
--- branches/firefox33/mail/linux-thunderbird/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/mail/linux-thunderbird/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/mail/linux-thunderbird/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/mail/linux-thunderbird/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	thunderbird
 DISTVERSION=	31.2.0

Modified: branches/firefox33/mail/thunderbird-i18n/Makefile
==============================================================================
--- branches/firefox33/mail/thunderbird-i18n/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/mail/thunderbird-i18n/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/mail/thunderbird-i18n/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/mail/thunderbird-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	thunderbird-i18n
 PORTVERSION=	31.2.0

Modified: branches/firefox33/mail/thunderbird/Makefile
==============================================================================
--- branches/firefox33/mail/thunderbird/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/mail/thunderbird/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
-# $FreeBSD: head/mail/thunderbird/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/mail/thunderbird/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	thunderbird
 DISTVERSION=	31.2.0

Modified: branches/firefox33/multimedia/gmp-api/Makefile
==============================================================================
--- branches/firefox33/multimedia/gmp-api/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/multimedia/gmp-api/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/multimedia/gmp-api/Makefile 370909 2014-10-15 11:56:06Z beat $
 
 PORTNAME=	gmp-api
 PORTVERSION=	33.0

Modified: branches/firefox33/multimedia/openh264/Makefile
==============================================================================
--- branches/firefox33/multimedia/openh264/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/multimedia/openh264/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,8 +1,7 @@
-# $FreeBSD$
+# $FreeBSD: head/multimedia/openh264/Makefile 370910 2014-10-15 12:01:03Z beat $
 
 PORTNAME=	openh264
 PORTVERSION=	1.1
-PORTREVISION=	3
 CATEGORIES=	multimedia
 
 MAINTAINER=	gecko at FreeBSD.org

Modified: branches/firefox33/security/ca_root_nss/Makefile
==============================================================================
--- branches/firefox33/security/ca_root_nss/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/security/ca_root_nss/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/security/ca_root_nss/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/security/ca_root_nss/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}

Modified: branches/firefox33/security/nss/Makefile
==============================================================================
--- branches/firefox33/security/nss/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/security/nss/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Maxim Sobolev <sobomax at FreeBSD.org>
-# $FreeBSD: head/security/nss/Makefile 369218 2014-09-25 07:40:33Z des $
+# $FreeBSD: head/security/nss/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	nss
 PORTVERSION=	3.17.2

Modified: branches/firefox33/www/firefox-esr-i18n/Makefile
==============================================================================
--- branches/firefox33/www/firefox-esr-i18n/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/firefox-esr-i18n/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/firefox-esr-i18n/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/firefox-esr-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox
 PORTVERSION=	31.2.0

Modified: branches/firefox33/www/firefox-esr/Makefile
==============================================================================
--- branches/firefox33/www/firefox-esr/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/firefox-esr/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Alan Eldridge <alane at FreeBSD.org>
-# $FreeBSD: head/www/firefox-esr/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/www/firefox-esr/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox
 DISTVERSION=	31.2.0

Modified: branches/firefox33/www/firefox-i18n/Makefile
==============================================================================
--- branches/firefox33/www/firefox-i18n/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/firefox-i18n/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/firefox-i18n/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/firefox-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox-i18n
 PORTVERSION=	33.0

Modified: branches/firefox33/www/firefox/Makefile
==============================================================================
--- branches/firefox33/www/firefox/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/firefox/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Alan Eldridge <alane at FreeBSD.org>
-# $FreeBSD: head/www/firefox/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/www/firefox/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox
 DISTVERSION=	33.0

Modified: branches/firefox33/www/libxul/Makefile
==============================================================================
--- branches/firefox33/www/libxul/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/libxul/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Michael Johnson <ahze at FreeBSD.org>
-# $FreeBSD: head/www/libxul/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/www/libxul/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	libxul
 DISTVERSION=	31.2.0

Modified: branches/firefox33/www/linux-firefox/Makefile
==============================================================================
--- branches/firefox33/www/linux-firefox/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/linux-firefox/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: voisine
-# $FreeBSD: head/www/linux-firefox/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/linux-firefox/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox
 DISTVERSION=	33.0

Modified: branches/firefox33/www/linux-seamonkey/Makefile
==============================================================================
--- branches/firefox33/www/linux-seamonkey/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/linux-seamonkey/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/linux-seamonkey/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/linux-seamonkey/Makefile 370991 2014-10-16 10:25:47Z beat $
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.30

Modified: branches/firefox33/www/linux-seamonkey/Makefile.common
==============================================================================
--- branches/firefox33/www/linux-seamonkey/Makefile.common	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/linux-seamonkey/Makefile.common	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/linux-seamonkey/Makefile.common 369157 2014-09-24 04:07:08Z xmj $
+# $FreeBSD: head/www/linux-seamonkey/Makefile.common 370932 2014-10-15 15:48:16Z beat $
 .if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \
     ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
 .undef WANT_GTK218

Modified: branches/firefox33/www/seamonkey-i18n/Makefile
==============================================================================
--- branches/firefox33/www/seamonkey-i18n/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/seamonkey-i18n/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/seamonkey-i18n/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/seamonkey-i18n/Makefile 370991 2014-10-16 10:25:47Z beat $
 
 PORTNAME=	seamonkey-i18n
 PORTVERSION=	2.30

Modified: branches/firefox33/www/seamonkey/Makefile
==============================================================================
--- branches/firefox33/www/seamonkey/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/seamonkey/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: eivind/dima/jseger
-# $FreeBSD: head/www/seamonkey/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/www/seamonkey/Makefile 370991 2014-10-16 10:25:47Z beat $
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.30

Modified: branches/firefox33/www/xpi-adblock/Makefile.xpi
==============================================================================
--- branches/firefox33/www/xpi-adblock/Makefile.xpi	Fri Oct 17 21:26:13 2014	(r1734)
+++ branches/firefox33/www/xpi-adblock/Makefile.xpi	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 352986 2014-05-05 09:45:36Z bapt $
+# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 370932 2014-10-15 15:48:16Z beat $
 
 # XPI_ID		- Extension id, might be in {12345-...} or dev at org format
 # XPI_NUM		- Extension number, as in addons.mozilla.org URL

Modified: trunk/Mk/Uses/gecko.mk
==============================================================================
--- trunk/Mk/Uses/gecko.mk	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/Mk/Uses/gecko.mk	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/Mk/Uses/gecko.mk 369465 2014-09-28 16:36:31Z tijl $
+# $FreeBSD: head/Mk/Uses/gecko.mk 371110 2014-10-18 10:23:53Z antoine $
 #
 # Handle dependency of different gecko based applications
 #

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/Mk/bsd.gecko.mk	Sat Oct 18 12:27:40 2014	(r1735)
@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze at FreeBSD.org>
 #
-# $FreeBSD: head/Mk/bsd.gecko.mk 367712 2014-09-09 06:16:35Z bapt $
+# $FreeBSD: head/Mk/bsd.gecko.mk 370932 2014-10-15 15:48:16Z beat $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 

Modified: trunk/audio/linux-f10-alsa-lib/Makefile
==============================================================================
--- trunk/audio/linux-f10-alsa-lib/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/audio/linux-f10-alsa-lib/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,15 +1,13 @@
 # Created by: Boris Samorodov <bsam at FreeBSD.org>
-# $FreeBSD: head/audio/linux-f10-alsa-lib/Makefile 340722 2014-01-22 17:00:46Z mat $
+# $FreeBSD: head/audio/linux-f10-alsa-lib/Makefile 368845 2014-09-22 10:40:00Z xmj $
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.0.21
 PORTREVISION=	4
 CATEGORIES=	audio linux
 MASTER_SITES=	CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
-MAINTAINER=	gecko at FreeBSD.org
+MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	Advanced Linux Sound Architecture libraries (Linux Fedora 10)
 
 RUN_DEPENDS=	${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
@@ -17,8 +15,9 @@
 CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	10
+
 RPMVERSION=	2.fc10
 BRANDELF_FILES=	usr/bin/aserver
 USE_LDCONFIG=	yes
@@ -30,5 +29,8 @@
 post-install:
 	@${MKDIR} ${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
 
 .include <bsd.port.mk>

Modified: trunk/audio/linux-f10-alsa-lib/pkg-plist
==============================================================================
--- trunk/audio/linux-f10-alsa-lib/pkg-plist	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/audio/linux-f10-alsa-lib/pkg-plist	Sat Oct 18 12:27:40 2014	(r1735)
@@ -3,11 +3,8 @@
 lib/libasound.so.2
 lib/libasound.so.2.0.0
 usr/bin/aserver
-usr/lib/alsa-lib/smixer/smixer-ac97.la
 usr/lib/alsa-lib/smixer/smixer-ac97.so
-usr/lib/alsa-lib/smixer/smixer-hda.la
 usr/lib/alsa-lib/smixer/smixer-hda.so
-usr/lib/alsa-lib/smixer/smixer-sbase.la
 usr/lib/alsa-lib/smixer/smixer-sbase.so
 usr/share/alsa/alsa.conf
 usr/share/alsa/cards/AACI.conf

Modified: trunk/audio/linux-f10-alsa-plugins-oss/Makefile
==============================================================================
--- trunk/audio/linux-f10-alsa-plugins-oss/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/audio/linux-f10-alsa-plugins-oss/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,20 +1,19 @@
 # Created by: hashiz
-# $FreeBSD: head/audio/linux-f10-alsa-plugins-oss/Makefile 327706 2013-09-20 14:36:35Z bapt $
+# $FreeBSD: head/audio/linux-f10-alsa-plugins-oss/Makefile 369031 2014-09-23 11:03:35Z xmj $
 
 PORTNAME=	alsa-plugins-oss
 PORTVERSION=	1.0.21
-PORTREVISION=	4
+PORTREVISION=	3
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
-MAINTAINER=	gecko at FreeBSD.org
+MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	OSS plugin for ALSA (Linux Fedora 10)
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	alsalib
-LINUX_DIST_VER=	10
+
 RPMVERSION=	3.fc10
 SRC_DISTFILES=	${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 USE_LDCONFIG=	yes

Modified: trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile
==============================================================================
--- trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/audio/linux-f10-alsa-plugins-pulseaudio/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -3,16 +3,17 @@
 PORTNAME=	alsa-plugins-pulseaudio
 PORTVERSION=	1.0.21
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
-MAINTAINER=	gecko at FreeBSD.org
+MAINTAINER=	emulation at FreeBSD.org
 COMMENT=	PulseAudio plugin for ALSA (Linux Fedora 10)
 
+CONFLICTS=	linux-c6-alsa-lib-[0-9]*
+
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	alsalib pulseaudio-libs
-LINUX_DIST_VER=	10
+
 RPMVERSION=	3.fc10
 SRC_DISTFILES=	${PORTNAME:S/-pulseaudio//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 USE_LDCONFIG=	yes

Modified: trunk/mail/linux-thunderbird/Makefile
==============================================================================
--- trunk/mail/linux-thunderbird/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/mail/linux-thunderbird/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/mail/linux-thunderbird/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/mail/linux-thunderbird/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	thunderbird
 DISTVERSION=	31.2.0

Modified: trunk/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/mail/thunderbird-i18n/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/mail/thunderbird-i18n/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/mail/thunderbird-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	thunderbird-i18n
 PORTVERSION=	31.2.0

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/mail/thunderbird/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
-# $FreeBSD: head/mail/thunderbird/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/mail/thunderbird/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	thunderbird
 DISTVERSION=	31.2.0

Modified: trunk/multimedia/gmp-api/Makefile
==============================================================================
--- trunk/multimedia/gmp-api/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/multimedia/gmp-api/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/multimedia/gmp-api/Makefile 370909 2014-10-15 11:56:06Z beat $
 
 PORTNAME=	gmp-api
 PORTVERSION=	35.0

Modified: trunk/multimedia/openh264/Makefile
==============================================================================
--- trunk/multimedia/openh264/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/multimedia/openh264/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,8 +1,8 @@
-# $FreeBSD$
+# $FreeBSD: head/multimedia/openh264/Makefile 370910 2014-10-15 12:01:03Z beat $
 
 PORTNAME=	openh264
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	gecko at FreeBSD.org

Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/security/ca_root_nss/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/security/ca_root_nss/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/security/ca_root_nss/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/security/nss/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Maxim Sobolev <sobomax at FreeBSD.org>
-# $FreeBSD: head/security/nss/Makefile 369218 2014-09-25 07:40:33Z des $
+# $FreeBSD: head/security/nss/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	nss
 PORTVERSION=	3.17.2

Modified: trunk/www/firefox-esr-i18n/Makefile
==============================================================================
--- trunk/www/firefox-esr-i18n/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/firefox-esr-i18n/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/firefox-esr-i18n/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/firefox-esr-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox
 PORTVERSION=	31.2.0

Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/firefox-esr/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Alan Eldridge <alane at FreeBSD.org>
-# $FreeBSD: head/www/firefox-esr/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/www/firefox-esr/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox
 DISTVERSION=	31.2.0

Modified: trunk/www/firefox-i18n/Makefile
==============================================================================
--- trunk/www/firefox-i18n/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/firefox-i18n/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/firefox-i18n/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/firefox-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox-i18n
 PORTVERSION=	34.0b1

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/firefox/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Alan Eldridge <alane at FreeBSD.org>
-# $FreeBSD: head/www/firefox/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/www/firefox/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox
 DISTVERSION=	34.0b1

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/libxul/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Michael Johnson <ahze at FreeBSD.org>
-# $FreeBSD: head/www/libxul/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/www/libxul/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	libxul
 DISTVERSION=	31.2.0

Modified: trunk/www/linux-firefox/Makefile
==============================================================================
--- trunk/www/linux-firefox/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/linux-firefox/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: voisine
-# $FreeBSD: head/www/linux-firefox/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/linux-firefox/Makefile 370932 2014-10-15 15:48:16Z beat $
 
 PORTNAME=	firefox
 DISTVERSION=	34.0b1

Modified: trunk/www/linux-seamonkey/Makefile
==============================================================================
--- trunk/www/linux-seamonkey/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/linux-seamonkey/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/linux-seamonkey/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/linux-seamonkey/Makefile 370991 2014-10-16 10:25:47Z beat $
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.30

Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/linux-seamonkey/Makefile.common	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/linux-seamonkey/Makefile.common 369157 2014-09-24 04:07:08Z xmj $
+# $FreeBSD: head/www/linux-seamonkey/Makefile.common 370932 2014-10-15 15:48:16Z beat $
 .if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \
     ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
 .undef WANT_GTK218

Modified: trunk/www/seamonkey-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/seamonkey-i18n/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/seamonkey-i18n/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/seamonkey-i18n/Makefile 370991 2014-10-16 10:25:47Z beat $
 
 PORTNAME=	seamonkey-i18n
 PORTVERSION=	2.30

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/seamonkey/Makefile	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: eivind/dima/jseger
-# $FreeBSD: head/www/seamonkey/Makefile 369730 2014-10-01 15:07:31Z tijl $
+# $FreeBSD: head/www/seamonkey/Makefile 370991 2014-10-16 10:25:47Z beat $
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.30

Modified: trunk/www/xpi-adblock/Makefile.xpi
==============================================================================
--- trunk/www/xpi-adblock/Makefile.xpi	Fri Oct 17 21:26:13 2014	(r1734)
+++ trunk/www/xpi-adblock/Makefile.xpi	Sat Oct 18 12:27:40 2014	(r1735)
@@ -1,5 +1,5 @@
 # Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
-# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 352986 2014-05-05 09:45:36Z bapt $
+# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 370932 2014-10-15 15:48:16Z beat $
 
 # XPI_ID		- Extension id, might be in {12345-...} or dev at org format
 # XPI_NUM		- Extension number, as in addons.mozilla.org URL


More information about the freebsd-gecko mailing list