From owner-svn-ports-branches@FreeBSD.ORG Sun Feb 23 06:51:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DEAFBE23; Sun, 23 Feb 2014 06:51:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF2EF1FCE; Sun, 23 Feb 2014 06:51:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1N6pv3p083816; Sun, 23 Feb 2014 06:51:57 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1N6pvAN083813; Sun, 23 Feb 2014 06:51:57 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201402230651.s1N6pvAN083813@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Sun, 23 Feb 2014 06:51:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r345691 - in branches/2014Q1/graphics/gimp-gmic-plugin: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2014 06:51:57 -0000 Author: rm Date: Sun Feb 23 06:51:56 2014 New Revision: 345691 URL: http://svnweb.freebsd.org/changeset/ports/345691 QAT: https://qat.redports.org/buildarchive/r345691/ Log: MFH: r345676 - update to 1.5.8.3 - remove BASH option description - it's already in bsd.options.desc.mk - switch to gcc, because clang produces unusable binary - it's crashing all the way. This is the reason for MFH - install examples Changelog: http://www.flickr.com/groups/gmic/discuss/72157639728004585/ Approved by: portmgr (miwi) Modified: branches/2014Q1/graphics/gimp-gmic-plugin/Makefile branches/2014Q1/graphics/gimp-gmic-plugin/distinfo branches/2014Q1/graphics/gimp-gmic-plugin/files/patch-Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- branches/2014Q1/graphics/gimp-gmic-plugin/Makefile Sun Feb 23 02:20:02 2014 (r345690) +++ branches/2014Q1/graphics/gimp-gmic-plugin/Makefile Sun Feb 23 06:51:56 2014 (r345691) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gmic -PORTVERSION= 1.5.8.1 +PORTVERSION= 1.5.8.3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/old @@ -21,13 +21,12 @@ LIB_DEPENDS= libGraphicsMagick++.so:${PO OPTIONS_DEFINE= BASH OPTIONS_SUB= yes -BASH_DESC= Install programmable completions for Bash BASH_RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash -OPTIONS_EXCLUDE=NLS DOCS WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src USES= gmake +USE_GCC= yes USE_GNOME= gtk20 USE_XORG= x11 xext xrandr @@ -45,6 +44,9 @@ PLIST_FILES= bin/gmic \ %%PLUGIN_DIR%%/gmic_gimp PLIST_DIRSTRY= %%PLUGIN_DIR%% +EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} +PORTEXAMPLES= gmic_in_script.scm gmic_use_lib.cpp + .include post-patch: @@ -56,6 +58,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gmic_gimp ${STAGEDIR}${PREFIX}/${PLUGIN_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/gmic ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MBASH} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_SCRIPT} ${WRKSRC}/gmic_bashcompletion.sh \ Modified: branches/2014Q1/graphics/gimp-gmic-plugin/distinfo ============================================================================== --- branches/2014Q1/graphics/gimp-gmic-plugin/distinfo Sun Feb 23 02:20:02 2014 (r345690) +++ branches/2014Q1/graphics/gimp-gmic-plugin/distinfo Sun Feb 23 06:51:56 2014 (r345691) @@ -1,2 +1,2 @@ -SHA256 (gmic_1.5.8.1.tar.gz) = 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea -SIZE (gmic_1.5.8.1.tar.gz) = 2265467 +SHA256 (gmic_1.5.8.3.tar.gz) = ed200f839c6b7cfa7df37a5b286d6dc106708a4466fe8d5e316b0a92681ad983 +SIZE (gmic_1.5.8.3.tar.gz) = 2341936 Modified: branches/2014Q1/graphics/gimp-gmic-plugin/files/patch-Makefile ============================================================================== --- branches/2014Q1/graphics/gimp-gmic-plugin/files/patch-Makefile Sun Feb 23 02:20:02 2014 (r345690) +++ branches/2014Q1/graphics/gimp-gmic-plugin/files/patch-Makefile Sun Feb 23 06:51:56 2014 (r345691) @@ -1,11 +1,11 @@ ---- ./Makefile.orig 2013-09-18 14:58:08.000000000 +0400 -+++ ./Makefile 2013-09-20 17:26:01.000000000 +0400 +--- ./Makefile.orig 2014-02-10 12:56:33.000000000 +0400 ++++ ./Makefile 2014-02-23 00:09:24.000000000 +0400 @@ -47,7 +47,7 @@ # Set correct variables and paths. #---------------------------------- OS := $(shell uname) -CC = g++ -+CC = c++ ++CC = $(CXX) ifeq ($(OS),Linux) OS = Unix endif @@ -18,7 +18,7 @@ endif ifeq ($(OSTYPE),msys) EXE = .exe -@@ -117,7 +117,7 @@ +@@ -125,7 +125,7 @@ # This requires the presence of the X11 extension include and library files. # (package 'libx11-dev' on Debian). XSHM_CFLAGS = -Dcimg_use_xshm @@ -27,9 +27,9 @@ # Flags to enable image display, using GDI32. # This requires the presence of the GDI32 include and library files. -@@ -282,6 +282,13 @@ +@@ -294,6 +294,13 @@ $(MAKE) lib - $(MAKE) zart + # $(MAKE) zart else +ifeq ($(OS),FreeBSD) + @echo "**" @@ -41,7 +41,7 @@ ifeq ($(OS),Darwin) @echo "**" @echo "** MacOSX configuration." -@@ -297,9 +304,10 @@ +@@ -309,9 +316,10 @@ $(MAKE) gimp endif endif @@ -53,7 +53,7 @@ lib: $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib -@@ -324,6 +332,9 @@ +@@ -336,6 +344,9 @@ linux: $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic From owner-svn-ports-branches@FreeBSD.ORG Sun Feb 23 14:13:41 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F9ACA03; Sun, 23 Feb 2014 14:13:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 88A381115; Sun, 23 Feb 2014 14:13:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1NEDfJw062989; Sun, 23 Feb 2014 14:13:41 GMT (envelope-from girgen@svn.freebsd.org) Received: (from girgen@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1NEDcRm062966; Sun, 23 Feb 2014 14:13:38 GMT (envelope-from girgen@svn.freebsd.org) Message-Id: <201402231413.s1NEDcRm062966@svn.freebsd.org> From: Palle Girgensohn Date: Sun, 23 Feb 2014 14:13:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r345723 - in branches/2014Q1/databases: postgresql84-server postgresql84-server/files postgresql90-server postgresql90-server/files postgresql91-server postgresql92-server postgresql93-... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2014 14:13:41 -0000 Author: girgen Date: Sun Feb 23 14:13:37 2014 New Revision: 345723 URL: http://svnweb.freebsd.org/changeset/ports/345723 QAT: https://qat.redports.org/buildarchive/r345723/ Log: MFH: r343650,r345257,r345542 Approved by: portmgr The PostgreSQL Global Development Group has released an important update to all supported versions of the PostgreSQL database system, which includes minor versions 9.3.3, 9.2.7, 9.1.12, 9.0.16, and 8.4.20. This update contains fixes for multiple security issues, as well as several fixes for replication and data integrity issues. All users are urged to update their installations at the earliest opportunity, especially those using binary replication or running a high-security application. This update fixes CVE-2014-0060, in which PostgreSQL did not properly enforce the WITH ADMIN OPTION permission for ROLE management. Before this fix, any member of a ROLE was able to grant others access to the same ROLE regardless if the member was given the WITH ADMIN OPTION permission. It also fixes multiple privilege escalation issues, including: CVE-2014-0061, CVE-2014-0062, CVE-2014-0063, CVE-2014-0064, CVE-2014-0065, and CVE-2014-0066. More information on these issues can be found on our security page and the security issue detail wiki page. Security: CVE-2014-0060,CVE-2014-0061,CVE-2014-0062,CVE-2014-0063 CVE-2014-0064,CVE-2014-0065,CVE-2014-0066,CVE-2014-0067 Deleted: branches/2014Q1/databases/postgresql84-server/files/extra-patch-icu4 branches/2014Q1/databases/postgresql90-server/files/extra-patch-icu4 Modified: branches/2014Q1/databases/postgresql84-server/Makefile branches/2014Q1/databases/postgresql84-server/distinfo branches/2014Q1/databases/postgresql84-server/pkg-plist-server branches/2014Q1/databases/postgresql90-server/Makefile branches/2014Q1/databases/postgresql90-server/distinfo branches/2014Q1/databases/postgresql90-server/pkg-plist-server branches/2014Q1/databases/postgresql91-server/Makefile branches/2014Q1/databases/postgresql91-server/distinfo branches/2014Q1/databases/postgresql91-server/pkg-plist-server branches/2014Q1/databases/postgresql92-server/Makefile branches/2014Q1/databases/postgresql92-server/distinfo branches/2014Q1/databases/postgresql92-server/pkg-plist-server branches/2014Q1/databases/postgresql93-server/Makefile branches/2014Q1/databases/postgresql93-server/distinfo branches/2014Q1/databases/postgresql93-server/files/patch-src:backend:utils:misc:postgresql.conf.sample branches/2014Q1/databases/postgresql93-server/pkg-plist-server Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/postgresql84-server/Makefile ============================================================================== --- branches/2014Q1/databases/postgresql84-server/Makefile Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql84-server/Makefile Sun Feb 23 14:13:37 2014 (r345723) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= postgresql -DISTVERSION?= 8.4.19 +DISTVERSION?= 8.4.20 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL @@ -20,7 +20,7 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql -ICU_PATCHFILE?= pg-840-icu-2009-09-15.diff.gz +ICU_PATCHFILE?= pg-8419-icu-2014-02-10.diff.gz UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} @@ -125,10 +125,9 @@ CONFIGURE_ARGS+=--with-openssl . if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu -PATCH_SITES+= http://people.freebsd.org/~crees/postgresql-icu/:icu +PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= ${ICU_PATCHFILE}:icu LIB_DEPENDS+= libicudata.so:${PORTSDIR}/devel/icu -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . endif .endif # !SLAVE_ONLY Modified: branches/2014Q1/databases/postgresql84-server/distinfo ============================================================================== --- branches/2014Q1/databases/postgresql84-server/distinfo Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql84-server/distinfo Sun Feb 23 14:13:37 2014 (r345723) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-8.4.19.tar.bz2) = f744d04a5d9feeea516fa57fea92be5568527bab03a84cf660a06ce90f90dcea -SIZE (postgresql/postgresql-8.4.19.tar.bz2) = 14825794 -SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e -SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321 +SHA256 (postgresql/postgresql-8.4.20.tar.bz2) = e84e46083a6accd2bf37f0bd7253415649afcafc49f2564bc8481c10ed90d7c1 +SIZE (postgresql/postgresql-8.4.20.tar.bz2) = 14642312 +SHA256 (postgresql/pg-8419-icu-2014-02-10.diff.gz) = a67fc17ef9985200cd25d6d534338305978496ea13d86fc6d1f6125d36ecf78f +SIZE (postgresql/pg-8419-icu-2014-02-10.diff.gz) = 4440 Modified: branches/2014Q1/databases/postgresql84-server/pkg-plist-server ============================================================================== --- branches/2014Q1/databases/postgresql84-server/pkg-plist-server Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql84-server/pkg-plist-server Sun Feb 23 14:13:37 2014 (r345723) @@ -426,9 +426,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Asia/Qyzylorda %%TZDATA%%share/postgresql/timezone/Asia/Rangoon %%TZDATA%%share/postgresql/timezone/Asia/Riyadh -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh89 %%TZDATA%%share/postgresql/timezone/Asia/Saigon %%TZDATA%%share/postgresql/timezone/Asia/Sakhalin %%TZDATA%%share/postgresql/timezone/Asia/Samarkand @@ -639,9 +636,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Mexico/BajaNorte %%TZDATA%%share/postgresql/timezone/Mexico/BajaSur %%TZDATA%%share/postgresql/timezone/Mexico/General -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh89 %%TZDATA%%share/postgresql/timezone/NZ %%TZDATA%%share/postgresql/timezone/NZ-CHAT %%TZDATA%%share/postgresql/timezone/Navajo @@ -746,7 +740,6 @@ share/postgresql/timezonesets/Pacific.tx %%TZDATA%%@dirrm share/postgresql/timezone/Europe %%TZDATA%%@dirrm share/postgresql/timezone/Indian %%TZDATA%%@dirrm share/postgresql/timezone/Mexico -%%TZDATA%%@dirrm share/postgresql/timezone/Mideast %%TZDATA%%@dirrm share/postgresql/timezone/Pacific %%TZDATA%%@dirrm share/postgresql/timezone/US %%TZDATA%%@dirrm share/postgresql/timezone Modified: branches/2014Q1/databases/postgresql90-server/Makefile ============================================================================== --- branches/2014Q1/databases/postgresql90-server/Makefile Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql90-server/Makefile Sun Feb 23 14:13:37 2014 (r345723) @@ -1,14 +1,13 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.0.15 +DISTVERSION?= 9.0.16 PORTREVISION= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org -ICU_PATCHFILE?= pg-900-icu-2010-09-19.diff.gz -ICU_EXTRAPATCH= ${FILESDIR}/extra-patch-icu4 +ICU_PATCHFILE?= pg-9015-icu-2014-02-10.diff.gz BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ Modified: branches/2014Q1/databases/postgresql90-server/distinfo ============================================================================== --- branches/2014Q1/databases/postgresql90-server/distinfo Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql90-server/distinfo Sun Feb 23 14:13:37 2014 (r345723) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.0.15.tar.bz2) = a45acd27d546e425911ecd371247066be5dafd96304e50e0708c84b918c28f9d -SIZE (postgresql/postgresql-9.0.15.tar.bz2) = 15169745 -SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9 -SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349 +SHA256 (postgresql/postgresql-9.0.16.tar.bz2) = 900f6ab00fc36c94b17430e7cb22499708025da1e34d7a70aefaf9a875f0fabf +SIZE (postgresql/postgresql-9.0.16.tar.bz2) = 14956681 +SHA256 (postgresql/pg-9015-icu-2014-02-10.diff.gz) = ee4a9a9cac56842ed532597f3e9e52ca2363f809a9283c01b2514df19173763a +SIZE (postgresql/pg-9015-icu-2014-02-10.diff.gz) = 4386 Modified: branches/2014Q1/databases/postgresql90-server/pkg-plist-server ============================================================================== --- branches/2014Q1/databases/postgresql90-server/pkg-plist-server Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql90-server/pkg-plist-server Sun Feb 23 14:13:37 2014 (r345723) @@ -434,9 +434,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Asia/Qyzylorda %%TZDATA%%share/postgresql/timezone/Asia/Rangoon %%TZDATA%%share/postgresql/timezone/Asia/Riyadh -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh89 %%TZDATA%%share/postgresql/timezone/Asia/Saigon %%TZDATA%%share/postgresql/timezone/Asia/Sakhalin %%TZDATA%%share/postgresql/timezone/Asia/Samarkand @@ -647,9 +644,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Mexico/BajaNorte %%TZDATA%%share/postgresql/timezone/Mexico/BajaSur %%TZDATA%%share/postgresql/timezone/Mexico/General -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh89 %%TZDATA%%share/postgresql/timezone/NZ %%TZDATA%%share/postgresql/timezone/NZ-CHAT %%TZDATA%%share/postgresql/timezone/Navajo @@ -754,7 +748,6 @@ share/postgresql/timezonesets/Pacific.tx %%TZDATA%%@dirrm share/postgresql/timezone/Europe %%TZDATA%%@dirrm share/postgresql/timezone/Indian %%TZDATA%%@dirrm share/postgresql/timezone/Mexico -%%TZDATA%%@dirrm share/postgresql/timezone/Mideast %%TZDATA%%@dirrm share/postgresql/timezone/Pacific %%TZDATA%%@dirrm share/postgresql/timezone/US %%TZDATA%%@dirrm share/postgresql/timezone Modified: branches/2014Q1/databases/postgresql91-server/Makefile ============================================================================== --- branches/2014Q1/databases/postgresql91-server/Makefile Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql91-server/Makefile Sun Feb 23 14:13:37 2014 (r345723) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= postgresql -DISTVERSION?= 9.1.11 +DISTVERSION?= 9.1.12 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL @@ -20,7 +20,7 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql -ICU_PATCHFILE?= pg-910-icu-2012-12-19.diff.gz +ICU_PATCHFILE?= pg-923-icu-2014-02-10.diff.gz .if !defined(SLAVE_ONLY) UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} @@ -123,9 +123,6 @@ USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= ${ICU_PATCHFILE}:icu -. if defined(ICU_EXTRAPATCH) -EXTRA_PATCHES+= ${ICU_EXTRAPATCH} -. endif LIB_DEPENDS+= libicudata.so:${PORTSDIR}/devel/icu . endif .endif # !SLAVE_ONLY Modified: branches/2014Q1/databases/postgresql91-server/distinfo ============================================================================== --- branches/2014Q1/databases/postgresql91-server/distinfo Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql91-server/distinfo Sun Feb 23 14:13:37 2014 (r345723) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.1.11.tar.bz2) = ccbc35aae1490ee5878b97a6aea48dad7465cdad296b380542e4303b68cc6f74 -SIZE (postgresql/postgresql-9.1.11.tar.bz2) = 15861805 -SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611 -SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386 +SHA256 (postgresql/postgresql-9.1.12.tar.bz2) = 0b267ebab5feb39ad6ef945b9588787886e7f7e5284467921d18cc7b76bcb383 +SIZE (postgresql/postgresql-9.1.12.tar.bz2) = 15638909 +SHA256 (postgresql/pg-923-icu-2014-02-10.diff.gz) = c7ca70433c819cea5fef0a9448da236b175d910177b18a8cb2ed9012a949aeb1 +SIZE (postgresql/pg-923-icu-2014-02-10.diff.gz) = 4374 Modified: branches/2014Q1/databases/postgresql91-server/pkg-plist-server ============================================================================== --- branches/2014Q1/databases/postgresql91-server/pkg-plist-server Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql91-server/pkg-plist-server Sun Feb 23 14:13:37 2014 (r345723) @@ -654,9 +654,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Mexico/BajaNorte %%TZDATA%%share/postgresql/timezone/Mexico/BajaSur %%TZDATA%%share/postgresql/timezone/Mexico/General -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh89 %%TZDATA%%share/postgresql/timezone/NZ %%TZDATA%%share/postgresql/timezone/NZ-CHAT %%TZDATA%%share/postgresql/timezone/Navajo @@ -761,7 +758,6 @@ share/postgresql/timezonesets/Pacific.tx %%TZDATA%%@dirrm share/postgresql/timezone/Europe %%TZDATA%%@dirrm share/postgresql/timezone/Indian %%TZDATA%%@dirrm share/postgresql/timezone/Mexico -%%TZDATA%%@dirrm share/postgresql/timezone/Mideast %%TZDATA%%@dirrm share/postgresql/timezone/Pacific %%TZDATA%%@dirrm share/postgresql/timezone/US %%TZDATA%%@dirrm share/postgresql/timezone Modified: branches/2014Q1/databases/postgresql92-server/Makefile ============================================================================== --- branches/2014Q1/databases/postgresql92-server/Makefile Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql92-server/Makefile Sun Feb 23 14:13:37 2014 (r345723) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= postgresql -DISTVERSION?= 9.2.6 +DISTVERSION?= 9.2.7 PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL @@ -20,7 +20,7 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql -ICU_PATCHFILE?= pg-910-icu-2012-12-19.diff.gz +ICU_PATCHFILE?= pg-923-icu-2014-02-10.diff.gz .if !defined(SLAVE_ONLY) UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} @@ -122,9 +122,6 @@ USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= ${ICU_PATCHFILE}:icu -. if defined(ICU_EXTRAPATCH) -EXTRA_PATCHES+= ${ICU_EXTRAPATCH} -. endif LIB_DEPENDS+= libicudata.so:${PORTSDIR}/devel/icu . endif .endif # !SLAVE_ONLY Modified: branches/2014Q1/databases/postgresql92-server/distinfo ============================================================================== --- branches/2014Q1/databases/postgresql92-server/distinfo Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql92-server/distinfo Sun Feb 23 14:13:37 2014 (r345723) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.2.6.tar.bz2) = 4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886 -SIZE (postgresql/postgresql-9.2.6.tar.bz2) = 16491820 -SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611 -SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386 +SHA256 (postgresql/postgresql-9.2.7.tar.bz2) = 83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86 +SIZE (postgresql/postgresql-9.2.7.tar.bz2) = 16248445 +SHA256 (postgresql/pg-923-icu-2014-02-10.diff.gz) = c7ca70433c819cea5fef0a9448da236b175d910177b18a8cb2ed9012a949aeb1 +SIZE (postgresql/pg-923-icu-2014-02-10.diff.gz) = 4374 Modified: branches/2014Q1/databases/postgresql92-server/pkg-plist-server ============================================================================== --- branches/2014Q1/databases/postgresql92-server/pkg-plist-server Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql92-server/pkg-plist-server Sun Feb 23 14:13:37 2014 (r345723) @@ -438,9 +438,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Asia/Qyzylorda %%TZDATA%%share/postgresql/timezone/Asia/Rangoon %%TZDATA%%share/postgresql/timezone/Asia/Riyadh -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh89 %%TZDATA%%share/postgresql/timezone/Asia/Saigon %%TZDATA%%share/postgresql/timezone/Asia/Sakhalin %%TZDATA%%share/postgresql/timezone/Asia/Samarkand @@ -651,9 +648,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Mexico/BajaNorte %%TZDATA%%share/postgresql/timezone/Mexico/BajaSur %%TZDATA%%share/postgresql/timezone/Mexico/General -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh89 %%TZDATA%%share/postgresql/timezone/NZ %%TZDATA%%share/postgresql/timezone/NZ-CHAT %%TZDATA%%share/postgresql/timezone/Navajo @@ -758,7 +752,6 @@ share/postgresql/timezonesets/Pacific.tx %%TZDATA%%@dirrm share/postgresql/timezone/Europe %%TZDATA%%@dirrm share/postgresql/timezone/Indian %%TZDATA%%@dirrm share/postgresql/timezone/Mexico -%%TZDATA%%@dirrm share/postgresql/timezone/Mideast %%TZDATA%%@dirrm share/postgresql/timezone/Pacific %%TZDATA%%@dirrm share/postgresql/timezone/US %%TZDATA%%@dirrm share/postgresql/timezone Modified: branches/2014Q1/databases/postgresql93-server/Makefile ============================================================================== --- branches/2014Q1/databases/postgresql93-server/Makefile Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql93-server/Makefile Sun Feb 23 14:13:37 2014 (r345723) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.3.2 +DISTVERSION?= 9.3.3 PORTREVISION?= 0 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} Modified: branches/2014Q1/databases/postgresql93-server/distinfo ============================================================================== --- branches/2014Q1/databases/postgresql93-server/distinfo Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql93-server/distinfo Sun Feb 23 14:13:37 2014 (r345723) @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-9.3.2.tar.bz2) = 700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7 -SIZE (postgresql/postgresql-9.3.2.tar.bz2) = 16878364 -SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611 -SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386 +SHA256 (postgresql/postgresql-9.3.3.tar.bz2) = e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879 +SIZE (postgresql/postgresql-9.3.3.tar.bz2) = 16665845 +SHA256 (postgresql/pg-923-icu-2014-02-10.diff.gz) = c7ca70433c819cea5fef0a9448da236b175d910177b18a8cb2ed9012a949aeb1 +SIZE (postgresql/pg-923-icu-2014-02-10.diff.gz) = 4374 Modified: branches/2014Q1/databases/postgresql93-server/files/patch-src:backend:utils:misc:postgresql.conf.sample ============================================================================== --- branches/2014Q1/databases/postgresql93-server/files/patch-src:backend:utils:misc:postgresql.conf.sample Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql93-server/files/patch-src:backend:utils:misc:postgresql.conf.sample Sun Feb 23 14:13:37 2014 (r345723) @@ -1,6 +1,6 @@ ---- src/backend/utils/misc/postgresql.conf.sample.orig 2010-10-01 16:25:44.000000000 +0200 -+++ src/backend/utils/misc/postgresql.conf.sample 2010-10-05 07:37:35.626282933 +0200 -@@ -256,6 +256,7 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2014-02-17 20:29:55.000000000 +0100 ++++ src/backend/utils/misc/postgresql.conf.sample 2014-02-20 18:01:37.000000000 +0100 +@@ -295,6 +295,7 @@ # - Where to Log - @@ -8,10 +8,10 @@ #log_destination = 'stderr' # Valid values are combinations of # stderr, csvlog, syslog, and eventlog, # depending on platform. csvlog -@@ -394,6 +396,9 @@ - #track_counts = on +@@ -432,6 +433,9 @@ + #track_io_timing = off #track_functions = none # none, pl, all - #track_activity_query_size = 1024 # (change requires restart) + #track_activity_query_size = 1024 # (change requires restart) + +# On FreeBSD, this is a performance hog, so keep it off if you need speed +update_process_title = off Modified: branches/2014Q1/databases/postgresql93-server/pkg-plist-server ============================================================================== --- branches/2014Q1/databases/postgresql93-server/pkg-plist-server Sun Feb 23 13:47:04 2014 (r345722) +++ branches/2014Q1/databases/postgresql93-server/pkg-plist-server Sun Feb 23 14:13:37 2014 (r345723) @@ -427,9 +427,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Asia/Qyzylorda %%TZDATA%%share/postgresql/timezone/Asia/Rangoon %%TZDATA%%share/postgresql/timezone/Asia/Riyadh -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Asia/Riyadh89 %%TZDATA%%share/postgresql/timezone/Asia/Saigon %%TZDATA%%share/postgresql/timezone/Asia/Sakhalin %%TZDATA%%share/postgresql/timezone/Asia/Samarkand @@ -640,9 +637,6 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Mexico/BajaNorte %%TZDATA%%share/postgresql/timezone/Mexico/BajaSur %%TZDATA%%share/postgresql/timezone/Mexico/General -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh87 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh88 -%%TZDATA%%share/postgresql/timezone/Mideast/Riyadh89 %%TZDATA%%share/postgresql/timezone/NZ %%TZDATA%%share/postgresql/timezone/NZ-CHAT %%TZDATA%%share/postgresql/timezone/Navajo @@ -747,7 +741,6 @@ share/postgresql/timezonesets/Pacific.tx %%TZDATA%%@dirrm share/postgresql/timezone/Europe %%TZDATA%%@dirrm share/postgresql/timezone/Indian %%TZDATA%%@dirrm share/postgresql/timezone/Mexico -%%TZDATA%%@dirrm share/postgresql/timezone/Mideast %%TZDATA%%@dirrm share/postgresql/timezone/Pacific %%TZDATA%%@dirrm share/postgresql/timezone/US %%TZDATA%%@dirrm share/postgresql/timezone From owner-svn-ports-branches@FreeBSD.ORG Mon Feb 24 13:32:32 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A36FC10F; Mon, 24 Feb 2014 13:32:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8DC8E1666; Mon, 24 Feb 2014 13:32:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ODWWSf032305; Mon, 24 Feb 2014 13:32:32 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ODWWaj032304; Mon, 24 Feb 2014 13:32:32 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402241332.s1ODWWaj032304@svn.freebsd.org> From: Rene Ladan Date: Mon, 24 Feb 2014 13:32:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r345840 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 13:32:32 -0000 Author: rene Date: Mon Feb 24 13:32:31 2014 New Revision: 345840 URL: http://svnweb.freebsd.org/changeset/ports/345840 QAT: https://qat.redports.org/buildarchive/r345840/ Log: MFH: r345835 Document new vulnerabilities in www/chromium < 33.0.1750.117 Obtained from: http://googlechromereleases.blogspot.nl/ MFH r345256 (postgresql) MFH r344371 (phpmyadmin) Approved by: portmgr (antoine/bapt) Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Mon Feb 24 13:31:31 2014 (r345839) +++ branches/2014Q1/security/vuxml/vuln.xml Mon Feb 24 13:32:31 2014 (r345840) @@ -51,6 +51,148 @@ Note: Please add new entries to the beg --> + + chromium -- multiple vulnerabilities + + + chromium + 33.0.1750.117 + + + + +

Google Chrome Releases reports:

+
+

28 security fixes in this release, including:

+
    +
  • [334897] High CVE-2013-6652: Issue with relative paths in + Windows sandbox named pipe policy. Credit to tyranid.
  • +
  • [331790] High CVE-2013-6653: Use-after-free related to web + contents. Credit to Khalil Zhani.
  • +
  • [333176] High CVE-2013-6654: Bad cast in SVG. Credit to + TheShow3511.
  • +
  • [293534] High CVE-2013-6655: Use-after-free in layout. Credit + to cloudfuzzer.
  • +
  • [331725] High CVE-2013-6656: Information leak in XSS auditor. + Credit to NeexEmil.
  • +
  • [331060] Medium CVE-2013-6657: Information leak in XSS auditor. + Credit to NeexEmil.
  • +
  • [322891] Medium CVE-2013-6658: Use-after-free in layout. Credit + to cloudfuzzer.
  • +
  • [306959] Medium CVE-2013-6659: Issue with certificates + validation in TLS handshake. Credit to Antoine Delignat-Lavaud + and Karthikeyan Bhargavan from Prosecco, Inria Paris.
  • +
  • [332579] Low CVE-2013-6660: Information leak in drag and drop. + Credit to bishopjeffreys.
  • +
  • [344876] Low-High CVE-2013-6661: Various fixes from internal + audits, fuzzing and other initiatives. Of these, seven are fixes + for issues that could have allowed for sandbox escapes from + compromised renderers.
  • +
+
+ +
+ + CVE-2013-6652 + CVE-2013-6653 + CVE-2013-6654 + CVE-2013-6655 + CVE-2013-6656 + CVE-2013-6657 + CVE-2013-6658 + CVE-2013-6659 + CVE-2013-6660 + CVE-2013-6661 + http://googlechromereleases.blogspot.nl/ + + + 2014-02-20 + 2014-02-24 + +
+ + + PostgreSQL -- multiple privilege issues + + + postgresql-server + 8.4.20 + 9.0.09.0.16 + 9.1.09.1.12 + 9.2.09.2.7 + 9.3.09.3.3 + + + + +

PostgreSQL Project reports:

+
+

This update fixes CVE-2014-0060, in which PostgreSQL did not + properly enforce the WITH ADMIN OPTION permission for ROLE management. + Before this fix, any member of a ROLE was able to grant others access + to the same ROLE regardless if the member was given the WITH ADMIN + OPTION permission. It also fixes multiple privilege escalation issues, + including: CVE-2014-0061, CVE-2014-0062, CVE-2014-0063, CVE-2014-0064, + CVE-2014-0065, and CVE-2014-0066. More information on these issues can + be found on our security page and the security issue detail wiki page. +

+

+ With this release, we are also alerting users to a known security hole + that allows other users on the same machine to gain access to an + operating system account while it is doing "make check": + CVE-2014-0067. "Make check" is normally part of building PostgreSQL + from source code. As it is not possible to fix this issue without + causing significant issues to our testing infrastructure, a patch will + be released separately and publicly. Until then, users are strongly + advised not to run "make check" on machines where untrusted users have + accounts.

+
+ +
+ + CVE-2014-0060 + CVE-2014-0061 + CVE-2014-0062 + CVE-2014-0063 + CVE-2014-0064 + CVE-2014-0065 + CVE-2014-0066 + CVE-2014-0067 + + + 2014-02-20 + 2014-02-20 + +
+ + + phpMyAdmin -- Self-XSS due to unescaped HTML output in import. + + + phpMyAdmin + 3.3.14.1.7 + + + + +

The phpMyAdmin development team reports:

+
+

When importing a file with crafted filename, it is + possible to trigger an XSS. We consider this vulnerability + to be non critical.

+
+ +
+ + http://www.phpmyadmin.net/home_page/security/PMASA-2014-1.php + CVE-2014-1879 + + + 2014-02-15 + 2014-02-15 + +
+ jenkins -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 25 20:07:20 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A979991; Tue, 25 Feb 2014 20:07:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0CB36132B; Tue, 25 Feb 2014 20:07:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PK7JuG091111; Tue, 25 Feb 2014 20:07:19 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PK7J3Q091109; Tue, 25 Feb 2014 20:07:19 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402252007.s1PK7J3Q091109@svn.freebsd.org> From: Rene Ladan Date: Tue, 25 Feb 2014 20:07:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346067 - branches/2014Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 20:07:20 -0000 Author: rene Date: Tue Feb 25 20:07:19 2014 New Revision: 346067 URL: http://svnweb.freebsd.org/changeset/ports/346067 QAT: https://qat.redports.org/buildarchive/r346067/ Log: MFH: r342604 to prepare for r346060 Update to 32.0.1700.107 Approved by: portmgr (erwin) Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Tue Feb 25 20:01:59 2014 (r346066) +++ branches/2014Q1/www/chromium/Makefile Tue Feb 25 20:07:19 2014 (r346067) @@ -5,7 +5,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 32.0.1700.102 +DISTVERSION= 32.0.1700.107 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ http://download.goodking.org/downloads/:browser \ Modified: branches/2014Q1/www/chromium/distinfo ============================================================================== --- branches/2014Q1/www/chromium/distinfo Tue Feb 25 20:01:59 2014 (r346066) +++ branches/2014Q1/www/chromium/distinfo Tue Feb 25 20:07:19 2014 (r346067) @@ -1,4 +1,4 @@ -SHA256 (chromium-courgette-redacted-32.0.1700.102.tar.xz) = 8caa05f6040ce4f41f8b8ce778340df920e92a1e30ef8991004088124ca55348 -SIZE (chromium-courgette-redacted-32.0.1700.102.tar.xz) = 186247120 -SHA256 (chromium-32.0.1700.102-testdata.tar.xz) = 48d53cd2e8eae62b1a4bbf1aaefc8c53ca26351487d27f326910a1a22d94b643 -SIZE (chromium-32.0.1700.102-testdata.tar.xz) = 112146500 +SHA256 (chromium-courgette-redacted-32.0.1700.107.tar.xz) = df8de4dc47310b93db28f4b6acf588882eed34f1aadf928cd5bcb6e68fd4173d +SIZE (chromium-courgette-redacted-32.0.1700.107.tar.xz) = 186232440 +SHA256 (chromium-32.0.1700.107-testdata.tar.xz) = 5e3bdecf7d42f7ad7cb1ab3d993d3a2e0f70bd9918c2805b9ac6b5c233fef73d +SIZE (chromium-32.0.1700.107-testdata.tar.xz) = 112141556 From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 25 20:08:59 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73775B0A; Tue, 25 Feb 2014 20:08:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 53C72133E; Tue, 25 Feb 2014 20:08:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PK8x7o091423; Tue, 25 Feb 2014 20:08:59 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PK8wLd091419; Tue, 25 Feb 2014 20:08:58 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402252008.s1PK8wLd091419@svn.freebsd.org> From: Rene Ladan Date: Tue, 25 Feb 2014 20:08:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346068 - branches/2014Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 20:08:59 -0000 Author: rene Date: Tue Feb 25 20:08:58 2014 New Revision: 346068 URL: http://svnweb.freebsd.org/changeset/ports/346068 QAT: https://qat.redports.org/buildarchive/r346068/ Log: MFH: r344585 to prepare for r346060 - Move test-related targets to their own file, Makefile.tests - Remove a post-patch target already handled by files/ Approved by: portmgr (erwin) Added: branches/2014Q1/www/chromium/Makefile.tests - copied unchanged from r344585, head/www/chromium/Makefile.tests Modified: branches/2014Q1/www/chromium/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Tue Feb 25 20:07:19 2014 (r346067) +++ branches/2014Q1/www/chromium/Makefile Tue Feb 25 20:08:58 2014 (r346068) @@ -130,17 +130,7 @@ LIB_DEPENDS+= libexecinfo.so:${PORTSDIR} .endif .if ${PORT_OPTIONS:MTEST} -TEST_TARGETS= base_unittests \ - crypto_unittests \ - cacheinvalidation_unittests \ - gpu_unittests \ - sync_unit_tests \ - media_unittests \ - printing_unittests \ - sql_unittests \ - net_unittests \ - content_unittests -EXCLUDED_TESTS= GpuDriverBugListTest.CurrentDriverBugListValidation +.include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} DISTFILES+= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata .endif @@ -205,8 +195,6 @@ post-patch: ${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi @${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \ ${WRKSRC}/chrome/chrome_tests_unit.gypi - @${REINPLACE_CMD} -e "s|linux|freebsd|" \ - ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py @${REINPLACE_CMD} -e "s|is_linux|(is_linux or is_bsd)|" \ ${WRKSRC}/chrome/browser/browser_resources.grd \ ${WRKSRC}/chrome/app/theme/theme_resources.grd \ @@ -226,7 +214,7 @@ do-configure: test regression-test: build .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ - ./${t} --gtest_filter=-${EXCLUDED_TESTS} + ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor do-install: Copied: branches/2014Q1/www/chromium/Makefile.tests (from r344585, head/www/chromium/Makefile.tests) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/Makefile.tests Tue Feb 25 20:08:58 2014 (r346068, copy of r344585, head/www/chromium/Makefile.tests) @@ -0,0 +1,23 @@ +$FreeBSD$ + +TEST_TARGETS= base_unittests \ + crypto_unittests \ + cacheinvalidation_unittests \ + gpu_unittests \ + sync_unit_tests \ + printing_unittests \ + sql_unittests \ + content_unittests \ + cc_unittests \ + ui_unittests \ + url_unittests \ + compositor_unittests \ + ipc_tests \ + dbus_unittests \ + net_unittests \ + media_unittests +# browser_tests: missing test file? +# unit_tests: missing test file? +# chromedriver_unittests: does not build +# chromedriver_tests: does not build +# telemetry_unittests: unknown ninja target From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 25 20:10:24 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 026D5C01; Tue, 25 Feb 2014 20:10:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D723A1353; Tue, 25 Feb 2014 20:10:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PKANxF092182; Tue, 25 Feb 2014 20:10:23 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PKAIIi092146; Tue, 25 Feb 2014 20:10:18 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402252010.s1PKAIIi092146@svn.freebsd.org> From: Rene Ladan Date: Tue, 25 Feb 2014 20:10:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346069 - in branches/2014Q1/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 20:10:24 -0000 Author: rene Date: Tue Feb 25 20:10:17 2014 New Revision: 346069 URL: http://svnweb.freebsd.org/changeset/ports/346069 QAT: https://qat.redports.org/buildarchive/r346069/ Log: MFH: r346060 www/chromium: Update to 33.0.1750.117 [0] Fix the crash when closing the history/settings tab [1] Submitted by: John Carr via freebsd-chromium [1] Security: http://vuxml.org/freebsd/9dd47fa3-9d53-11e3-b20f-00262d5ed8ee.html [0] Approved by: portmgr (erwin) Added: branches/2014Q1/www/chromium/files/patch-build__gyp_chromium - copied unchanged from r346060, head/www/chromium/files/patch-build__gyp_chromium branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.h - copied unchanged from r346060, head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc - copied unchanged from r346060, head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc branches/2014Q1/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc - copied unchanged from r346060, head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc branches/2014Q1/www/chromium/files/patch-components__policy__resources__policy_templates.json - copied unchanged from r346060, head/www/chromium/files/patch-components__policy__resources__policy_templates.json branches/2014Q1/www/chromium/files/patch-components__policy__tools__generate_policy_source.py - copied unchanged from r346060, head/www/chromium/files/patch-components__policy__tools__generate_policy_source.py branches/2014Q1/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc - copied unchanged from r346060, head/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp - copied unchanged from r346060, head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp - copied unchanged from r346060, head/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp Deleted: branches/2014Q1/www/chromium/files/patch-chrome__app__policy__policy_templates.json branches/2014Q1/www/chromium/files/patch-chrome__tools__build__generate_policy_source.py branches/2014Q1/www/chromium/files/patch-content__browser__geolocation__empty_wifi_data_provider.cc branches/2014Q1/www/chromium/files/patch-media__audio__audio_low_latency_input_output_unittest.cc branches/2014Q1/www/chromium/files/patch-media__audio__audio_manager_unittest.cc branches/2014Q1/www/chromium/files/patch-media__audio__linux__audio_manager_linux.cc branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__V8NPUtils.cpp branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__V8PerContextData.cpp branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__bindings__v8__npruntime.cpp branches/2014Q1/www/chromium/files/patch-third_party__webrtc__video_engine__stream_synchronization.cc branches/2014Q1/www/chromium/files/patch-v8__src__platform-freebsd.cc Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/Makefile.tests branches/2014Q1/www/chromium/files/patch-base__file_util_posix.cc branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc branches/2014Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc branches/2014Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2014Q1/www/chromium/files/patch-content__browser__browser_main_loop.cc branches/2014Q1/www/chromium/files/patch-content__content_browser.gypi branches/2014Q1/www/chromium/files/patch-content__content_common.gypi branches/2014Q1/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp branches/2014Q1/www/chromium/files/patch-third_party__libjingle__libjingle.gyp branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.h branches/2014Q1/www/chromium/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/Makefile Tue Feb 25 20:10:17 2014 (r346069) @@ -5,7 +5,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 32.0.1700.107 +DISTVERSION= 33.0.1750.117 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ http://download.goodking.org/downloads/:browser \ Modified: branches/2014Q1/www/chromium/Makefile.tests ============================================================================== --- branches/2014Q1/www/chromium/Makefile.tests Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/Makefile.tests Tue Feb 25 20:10:17 2014 (r346069) @@ -1,4 +1,4 @@ -$FreeBSD$ +#$FreeBSD$ TEST_TARGETS= base_unittests \ crypto_unittests \ Modified: branches/2014Q1/www/chromium/files/patch-base__file_util_posix.cc ============================================================================== --- branches/2014Q1/www/chromium/files/patch-base__file_util_posix.cc Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-base__file_util_posix.cc Tue Feb 25 20:10:17 2014 (r346069) @@ -1,11 +1,11 @@ ---- base/file_util_posix.cc.orig 2013-08-19 01:53:01.000000000 +0200 -+++ base/file_util_posix.cc 2013-08-28 10:18:48.000000000 +0200 -@@ -592,7 +592,7 @@ - return false; +--- base/file_util_posix.cc.orig 2014-02-20 21:28:47.000000000 +0100 ++++ base/file_util_posix.cc 2014-02-24 15:44:01.000000000 +0100 +@@ -673,7 +673,7 @@ + #endif // defined(OS_ANDROID) results->is_directory = S_ISDIR(file_info.st_mode); results->size = file_info.st_size; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || (defined(OS_FREEBSD) && __FreeBSD_version < 900000) - results->last_modified = base::Time::FromTimeSpec(file_info.st_mtimespec); - results->last_accessed = base::Time::FromTimeSpec(file_info.st_atimespec); - results->creation_time = base::Time::FromTimeSpec(file_info.st_ctimespec); + results->last_modified = Time::FromTimeSpec(file_info.st_mtimespec); + results->last_accessed = Time::FromTimeSpec(file_info.st_atimespec); + results->creation_time = Time::FromTimeSpec(file_info.st_ctimespec); Copied: branches/2014Q1/www/chromium/files/patch-build__gyp_chromium (from r346060, head/www/chromium/files/patch-build__gyp_chromium) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-build__gyp_chromium Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-build__gyp_chromium) @@ -0,0 +1,14 @@ +--- build/gyp_chromium.orig 2014-02-20 21:28:44.000000000 +0100 ++++ build/gyp_chromium 2014-02-24 17:26:04.000000000 +0100 +@@ -245,8 +245,8 @@ + + supplemental_includes = GetSupplementalFiles() + +- if not RunGN(supplemental_includes): +- sys.exit(1) ++ #TODO port GN to FreeBSD ++ #if not RunGN(supplemental_includes): ++ # sys.exit(1) + + args.extend( + ['-I' + i for i in additional_include_files(supplemental_includes, args)]) Modified: branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Tue Feb 25 20:10:17 2014 (r346069) @@ -1,5 +1,5 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2014-01-07 21:01:39.000000000 +0100 -+++ chrome/app/chrome_main_delegate.cc 2014-01-13 16:53:27.000000000 +0100 +--- chrome/app/chrome_main_delegate.cc.orig 2014-02-20 21:27:29.000000000 +0100 ++++ chrome/app/chrome_main_delegate.cc 2014-02-25 01:39:55.000000000 +0100 @@ -97,7 +97,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -54,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -701,7 +701,7 @@ +@@ -703,7 +703,7 @@ #endif } @@ -63,8 +63,8 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -713,7 +713,7 @@ - breakpad::InitCrashReporter(); +@@ -715,7 +715,7 @@ + breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) @@ -72,12 +72,12 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -814,7 +814,7 @@ - SetUpProfilingShutdownHandler(); - } - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets - // this up for the browser process in a different manner. - breakpad::InitCrashReporter(); +@@ -800,7 +800,7 @@ + return process_type == switches::kNaClLoaderProcess || + process_type == switches::kRelauncherProcess; + } +-#elif defined(OS_POSIX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) + content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() { + #if defined(DISABLE_NACL) + return NULL; Copied: branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.h (from r346060, head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h) @@ -0,0 +1,11 @@ +--- chrome/app/chrome_main_delegate.h.orig 2014-02-20 21:27:29.000000000 +0100 ++++ chrome/app/chrome_main_delegate.h 2014-02-25 01:45:34.000000000 +0100 +@@ -31,7 +31,7 @@ + virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; + virtual bool DelaySandboxInitialization( + const std::string& process_type) OVERRIDE; +-#elif defined(OS_POSIX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) + virtual content::ZygoteForkDelegate* ZygoteStarting() OVERRIDE; + virtual void ZygoteForked() OVERRIDE; + #endif Modified: branches/2014Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- branches/2014Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Tue Feb 25 20:10:17 2014 (r346069) @@ -1,6 +1,6 @@ --- chrome/browser/chrome_content_browser_client.cc.orig 2014-01-07 21:01:57.000000000 +0100 +++ chrome/browser/chrome_content_browser_client.cc 2014-01-11 01:50:13.000000000 +0100 -@@ -492,7 +492,7 @@ +@@ -486,7 +486,7 @@ } } @@ -9,16 +9,16 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -548,7 +548,7 @@ +@@ -543,7 +543,7 @@ return -1; } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - + #endif // !defined(OS_ANDROID) + #if !defined(OS_CHROMEOS) - GURL GetEffectiveURLForSignin(const GURL& url) { -@@ -1397,7 +1397,7 @@ +@@ -1389,7 +1389,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,7 +27,7 @@ if (breakpad::IsCrashReporterEnabled()) { std::string enable_crash_reporter; GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2529,7 +2529,7 @@ +@@ -2525,7 +2525,7 @@ Profile::FromBrowserContext(browser_context))); } @@ -36,7 +36,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2584,7 +2584,7 @@ +@@ -2580,7 +2580,7 @@ } #endif // defined(OS_ANDROID) } Copied: branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc (from r346060, head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc) @@ -0,0 +1,66 @@ +--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-02-20 21:27:39.000000000 +0100 ++++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-02-25 00:17:02.000000000 +0100 +@@ -4,6 +4,10 @@ + + #include "chrome/browser/extensions/api/music_manager_private/device_id.h" + ++#if defined(OS_FREEBSD) ++#include ++#include ++#endif + #include // Must be included before ifaddrs.h. + #include + #include +@@ -100,11 +104,33 @@ + const char* prefixes[], + size_t prefixes_count) { + const int MAC_LENGTH = 6; ++#if defined(OS_FREEBSD) ++ struct ifaddrs *ifap, *ifinfo; ++#else + struct ifreq ifinfo; ++#endif + + memset(&ifinfo, 0, sizeof(ifinfo)); +- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); + ++#if defined(OS_FREEBSD) ++ int result = getifaddrs(&ifap); ++ if (result != 0) ++ return true; ++ result = 1; // no MAC found yet ++ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) { ++ struct sockaddr* sa = ifinfo->ifa_addr; ++ if (sa->sa_family == AF_LINK && ++ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name, ++ sizeof(ifinfo->ifa_name) - 1)) { ++ result = 0; ++ break; ++ } ++ } ++ ++ char* mac_address = nullptr; ++ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), 6); ++#else ++ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); + int sd = socket(AF_INET, SOCK_DGRAM, 0); + int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); + close(sd); +@@ -114,11 +140,17 @@ + + const char* mac_address = + static_cast(ifinfo.ifr_hwaddr.sa_data); ++#endif + if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH)) + return true; + ++#if defined(OS_FREEBSD) ++ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count)) ++ return true; ++#else + if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count)) + return true; ++#endif + + // Got one! + found_mac_address_ = Modified: branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc ============================================================================== --- branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Tue Feb 25 20:10:17 2014 (r346069) @@ -1,11 +1,20 @@ ---- chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2013-05-07 23:41:27.000000000 +0300 -+++ chrome/browser/extensions/api/serial/serial_connection_posix.cc 2013-05-08 00:08:36.000000000 +0300 -@@ -67,7 +67,7 @@ - return B19200; - case 38400: - return B38400; +--- chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-02-20 21:27:38.000000000 +0100 ++++ chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-02-24 16:10:53.000000000 +0100 +@@ -36,7 +36,7 @@ + BITRATE_TO_SPEED_CASE(9600) + BITRATE_TO_SPEED_CASE(19200) + BITRATE_TO_SPEED_CASE(38400) -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - case 57600: - return B57600; - case 115200: + BITRATE_TO_SPEED_CASE(57600) + BITRATE_TO_SPEED_CASE(115200) + BITRATE_TO_SPEED_CASE(230400) +@@ -71,7 +71,7 @@ + SPEED_TO_BITRATE_CASE(9600) + SPEED_TO_BITRATE_CASE(19200) + SPEED_TO_BITRATE_CASE(38400) +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + SPEED_TO_BITRATE_CASE(57600) + SPEED_TO_BITRATE_CASE(115200) + SPEED_TO_BITRATE_CASE(230400) Copied: branches/2014Q1/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc (from r346060, head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc) @@ -0,0 +1,14 @@ +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-02-03 15:15:11.000000000 -0500 ++++ chrome/browser/media_galleries/media_file_system_registry.cc 2014-02-24 20:57:03.060309366 -0500 +@@ -591,7 +591,10 @@ + // Constructor in 'private' section because depends on private class definition. + MediaFileSystemRegistry::MediaFileSystemRegistry() + : file_system_context_(new MediaFileSystemContextImpl(this)) { +- StorageMonitor::GetInstance()->AddObserver(this); ++ /* This conditional is needed for shutdown. Destructors ++ try to get the media file system registry. */ ++ if (StorageMonitor::GetInstance()) ++ StorageMonitor::GetInstance()->AddObserver(this); + } + + MediaFileSystemRegistry::~MediaFileSystemRegistry() { Modified: branches/2014Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc ============================================================================== --- branches/2014Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Tue Feb 25 20:10:17 2014 (r346069) @@ -1,6 +1,6 @@ --- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2013-08-30 06:46:19.000000000 +0300 +++ chrome/browser/ui/webui/options/browser_options_handler.cc 2013-09-03 21:15:44.092633766 +0300 -@@ -338,7 +338,8 @@ +@@ -322,7 +322,8 @@ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, Copied: branches/2014Q1/www/chromium/files/patch-components__policy__resources__policy_templates.json (from r346060, head/www/chromium/files/patch-components__policy__resources__policy_templates.json) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-components__policy__resources__policy_templates.json Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-components__policy__resources__policy_templates.json) @@ -0,0 +1,29 @@ +--- components/policy/resources/policy_templates.json.orig 2013-09-24 21:57:03.000000000 +0300 ++++ components/policy/resources/policy_templates.json 2013-09-24 21:59:32.000000000 +0300 +@@ -1366,7 +1366,7 @@ + 'name': 'GSSAPILibraryName', + 'type': 'string', + 'schema': { 'type': 'string' }, +- 'supported_on': ['chrome.linux:9-'], ++ 'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'], + 'features': { + 'dynamic_refresh': False, + 'per_profile': False, +@@ -3339,7 +3339,7 @@ + 'name': 'RequireOnlineRevocationChecksForLocalAnchors', + 'type': 'main', + 'schema': { 'type': 'boolean' }, +- 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], ++ 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'], + 'features': { + 'dynamic_refresh': True, + 'per_profile': False, +@@ -3976,7 +3976,7 @@ + 'name': 'BackgroundModeEnabled', + 'type': 'main', + 'schema': { 'type': 'boolean' }, +- 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'], ++ 'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'], + 'features': { + 'can_be_recommended': True, + 'dynamic_refresh': True, Copied: branches/2014Q1/www/chromium/files/patch-components__policy__tools__generate_policy_source.py (from r346060, head/www/chromium/files/patch-components__policy__tools__generate_policy_source.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-components__policy__tools__generate_policy_source.py Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-components__policy__tools__generate_policy_source.py) @@ -0,0 +1,11 @@ +--- components/policy/tools/generate_policy_source.py.orig 2013-09-24 21:55:28.000000000 +0300 ++++ components/policy/tools/generate_policy_source.py 2013-09-24 21:56:43.000000000 +0300 +@@ -64,7 +64,7 @@ + if platform.startswith('chrome.'): + platform_sub = platform[7:] + if platform_sub == '*': +- self.platforms.extend(['win', 'mac', 'linux']) ++ self.platforms.extend(['win', 'mac', 'linux', 'freebsd']) + else: + self.platforms.append(platform_sub) + else: Modified: branches/2014Q1/www/chromium/files/patch-content__browser__browser_main_loop.cc ============================================================================== --- branches/2014Q1/www/chromium/files/patch-content__browser__browser_main_loop.cc Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-content__browser__browser_main_loop.cc Tue Feb 25 20:10:17 2014 (r346069) @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2013-02-28 10:14:31.000000000 +0200 -+++ content/browser/browser_main_loop.cc 2013-03-06 21:28:00.000000000 +0200 -@@ -87,7 +87,7 @@ +--- content/browser/browser_main_loop.cc.orig 2014-02-20 21:28:24.000000000 +0100 ++++ content/browser/browser_main_loop.cc 2014-02-24 20:28:45.000000000 +0100 +@@ -102,7 +102,7 @@ #include "ui/gfx/gtk_util.h" #endif @@ -8,22 +8,31 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #include - #include "base/process_util.h" -@@ -111,7 +111,7 @@ + #include "content/browser/renderer_host/render_sandbox_host_linux.h" +@@ -125,7 +125,7 @@ namespace content { namespace { -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) void SetupSandbox(const CommandLine& parsed_command_line) { + TRACE_EVENT0("startup", "SetupSandbox"); // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this - // code en masse out of chrome_main for now. -@@ -311,7 +311,7 @@ - crypto::EnsureNSPRInit(); - #endif // !defined(USE_OPENSSL) +@@ -346,7 +346,7 @@ + void BrowserMainLoop::EarlyInitialization() { + TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + // No thread should be created before this call, as SetupSandbox() + // will end-up using fork(). SetupSandbox(parsed_command_line_); +@@ -784,7 +784,7 @@ + } #endif +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + ZygoteHostImpl::GetInstance()->TearDownAfterLastChild(); + #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) + Copied: branches/2014Q1/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc (from r346060, head/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc) @@ -0,0 +1,19 @@ +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2014-02-20 21:28:22.000000000 +0100 ++++ content/browser/renderer_host/pepper/pepper_file_io_host.cc 2014-02-24 22:13:44.000000000 +0100 +@@ -308,10 +308,12 @@ + int64_t actual_offset = + (open_flags_ & PP_FILEOPENFLAG_APPEND) ? max_written_offset_ : offset; + +- uint64_t max_offset = actual_offset + buffer.size(); +- if (max_offset > static_cast(std::numeric_limits::max())) +- return PP_ERROR_FAILED; // max_offset overflows. +- int64_t amount = static_cast(max_offset) - max_written_offset_; ++ // (rene) rename 'max_offset' to '_max_offset' to avoid a conflict with ++ // /usr/include/vm/vm_map.h on FreeBSD 10.0 ++ uint64_t _max_offset = actual_offset + buffer.size(); ++ if (_max_offset > static_cast(std::numeric_limits::max())) ++ return PP_ERROR_FAILED; // _max_offset overflows. ++ int64_t amount = static_cast(_max_offset) - max_written_offset_; + + // Quota request amounts are restricted to 32 bits so we can use atomics + // when we move this code to the plugin side of the proxy. Modified: branches/2014Q1/www/chromium/files/patch-content__content_browser.gypi ============================================================================== --- branches/2014Q1/www/chromium/files/patch-content__content_browser.gypi Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-content__content_browser.gypi Tue Feb 25 20:10:17 2014 (r346069) @@ -1,6 +1,6 @@ ---- content/content_browser.gypi.orig 2012-11-27 10:01:27.000000000 +0200 -+++ content/content_browser.gypi 2012-12-10 22:21:14.000000000 +0200 -@@ -409,6 +409,8 @@ +--- content/content_browser.gypi.orig 2014-02-20 21:28:25.000000000 +0100 ++++ content/content_browser.gypi 2014-02-24 22:56:37.000000000 +0100 +@@ -586,6 +586,8 @@ 'browser/geolocation/wifi_data_provider_common_win.cc', 'browser/geolocation/wifi_data_provider_common_win.h', 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', @@ -9,13 +9,12 @@ 'browser/geolocation/wifi_data_provider_linux.cc', 'browser/geolocation/wifi_data_provider_linux.h', 'browser/geolocation/wifi_data_provider_mac.cc', -@@ -1056,9 +1056,18 @@ +@@ -1543,8 +1545,18 @@ ], }], ['os_bsd==1', { - 'sources/': [ - ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], -- ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'], + 'sources!': [ + 'public/browser/zygote_host_linux.h', + 'browser/zygote_host/zygote_host_impl_linux.cc', Modified: branches/2014Q1/www/chromium/files/patch-content__content_common.gypi ============================================================================== --- branches/2014Q1/www/chromium/files/patch-content__content_common.gypi Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-content__content_common.gypi Tue Feb 25 20:10:17 2014 (r346069) @@ -1,6 +1,6 @@ ---- content/content_common.gypi.orig 2013-08-09 22:07:06.000000000 +0300 -+++ content/content_common.gypi 2013-08-17 20:29:03.000000000 +0300 -@@ -391,6 +391,15 @@ +--- content/content_common.gypi.orig 2014-02-20 21:28:25.000000000 +0100 ++++ content/content_common.gypi 2014-02-24 20:59:04.000000000 +0100 +@@ -482,6 +482,21 @@ 'content.gyp:common_aidl', ], }], @@ -11,6 +11,12 @@ + 'common/sandbox_init_linux.cc', + 'common/sandbox_seccomp_bpf_linux.cc', + 'common/sandbox_seccomp_bpf_linux.h', ++ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc', ++ 'common/sandbox_linux/bpf_gpu_policy_linux.cc', ++ 'common/sandbox_linux/bpf_ppapi_policy_linux.cc', ++ 'common/sandbox_linux/bpf_renderer_policy_linux.cc', ++ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', ++ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc', + ], + }], ['toolkit_uses_gtk == 1', { Modified: branches/2014Q1/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc ============================================================================== --- branches/2014Q1/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc Tue Feb 25 20:10:17 2014 (r346069) @@ -1,7 +1,7 @@ --- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2013-04-30 10:20:40.000000000 +0300 +++ content/renderer/renderer_webkitplatformsupport_impl.cc 2013-05-07 21:11:09.000000000 +0300 -@@ -67,7 +67,7 @@ - #include "third_party/WebKit/Source/Platform/chromium/public/mac/WebSandboxSupport.h" +@@ -87,7 +87,7 @@ + #include "third_party/WebKit/public/platform/mac/WebSandboxSupport.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -9,8 +9,8 @@ #include #include -@@ -146,7 +146,7 @@ - DISALLOW_COPY_AND_ASSIGN(Hyphenator); +@@ -164,7 +164,7 @@ + scoped_refptr thread_safe_sender_; }; -#if defined(OS_ANDROID) @@ -18,16 +18,16 @@ // WebKit doesn't use WebSandboxSupport on android so we don't need to // implement anything here. class RendererWebKitPlatformSupportImpl::SandboxSupport { -@@ -237,7 +237,7 @@ +@@ -256,7 +256,7 @@ } - WebKit::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { + blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) || defined(OS_BSD) // WebKit doesn't use WebSandboxSupport on android. return NULL; #else -@@ -534,7 +534,7 @@ +@@ -541,7 +541,7 @@ return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } Modified: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp ============================================================================== --- branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp Tue Feb 25 20:10:17 2014 (r346069) @@ -1,32 +1,14 @@ --- third_party/WebKit/Source/core/core.gyp.orig 2013-08-09 19:15:52.000000000 +0000 +++ third_party/WebKit/Source/core/core.gyp 2013-08-12 21:31:28.000000000 +0000 -@@ -644,7 +644,7 @@ - ['exclude', 'platform/graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'], +@@ -593,7 +593,7 @@ + ['exclude', 'platform/Theme\\.cpp$'], ], 'conditions': [ -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or os_bsd==1', { - 'sources/': [ - # Cherry-pick files excluded by the broader regular expressions above. - ['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'], -@@ -665,7 +665,7 @@ - ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], - ], - }], - ['OS!="linux"', { + ['OS!="linux" and os_bsd!=1', { 'sources/': [ ['exclude', 'Linux\\.cpp$'], ], -@@ -775,7 +775,7 @@ - ['exclude', 'platform/graphics/FontPlatformData\\.cpp$'], - ], - }], -- ['OS != "linux" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', { -+ ['OS != "linux" and OS != "mac" and os_bsd != 1 and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', { - 'sources/': [ - ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], - ], @@ -946,7 +946,7 @@ # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. 'cflags': ['-Wno-uninitialized'], Copied: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp (from r346060, head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp) @@ -0,0 +1,20 @@ +--- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-02-20 21:32:30.000000000 +0100 ++++ third_party/WebKit/Source/platform/blink_platform.gyp 2014-02-25 01:06:25.000000000 +0100 +@@ -196,7 +196,7 @@ + # compiler optimizations, see crbug.com/237063 + 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], + 'conditions': [ +- ['OS=="linux" or OS=="android"', { ++ ['OS=="linux" or OS=="android" or OS=="freebsd"', { + 'sources/': [ + # Cherry-pick files excluded by the broader regular expressions above. + ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], +@@ -304,7 +304,7 @@ + ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], + ], + }], +- ['OS != "linux" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', { ++ ['OS != "linux" and OS != "freebsd" and OS != "mac" and (OS != "win" or (OS == "win" and "ENABLE_GDI_FONTS_ON_WINDOWS=1" in feature_defines))', { + 'sources/': [ + ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], + ], Modified: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp ============================================================================== --- branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp Tue Feb 25 20:10:17 2014 (r346069) @@ -1,13 +1,13 @@ --- third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp.orig 2014-01-07 21:06:22.000000000 +0100 +++ third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp 2014-01-13 13:22:53.000000000 +0100 -@@ -37,6 +37,10 @@ +@@ -36,6 +36,10 @@ + #include "public/platform/WebRect.h" #include "public/platform/WebString.h" - #include "public/web/WebAXObject.h" +#if defined(OS_FREEBSD) +#include // atoi() +#endif + - using namespace WebKit; + using namespace blink; using namespace std; Copied: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp (from r346060, head/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp Tue Feb 25 20:10:17 2014 (r346069, copy of r346060, head/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp) @@ -0,0 +1,20 @@ +--- third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-02-20 21:32:26.000000000 +0100 ++++ third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-02-25 00:44:05.000000000 +0100 +@@ -34,7 +34,7 @@ + #include "platform/fonts/FontDescription.h" + #include "platform/fonts/FontPlatformData.h" + +-#if OS(LINUX) ++#if OS(LINUX) || OS(FREEBSD) + #include "public/platform/linux/WebFontInfo.h" + #endif + +@@ -77,7 +77,7 @@ + void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning) + { + FontDescription::setSubpixelPositioning(useSubpixelPositioning); +-#if OS(LINUX) ++#if OS(LINUX) || OS(FREEBSD) + WebFontInfo::setSubpixelPositioning(useSubpixelPositioning); + #endif + } Modified: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h ============================================================================== --- branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h Tue Feb 25 20:10:17 2014 (r346069) @@ -1,21 +1,20 @@ ---- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-01-07 21:06:25.000000000 +0100 -+++ third_party/WebKit/Source/wtf/ByteSwap.h 2014-01-13 01:21:42.000000000 +0100 -@@ -52,8 +52,13 @@ +--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-02-20 21:32:28.000000000 +0100 ++++ third_party/WebKit/Source/wtf/ByteSwap.h 2014-02-24 17:55:43.000000000 +0100 +@@ -52,14 +52,20 @@ #else +#ifndef bswap64 - inline uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); } + ALWAYS_INLINE uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); } +#endif +#ifndef bswap32 - inline uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); } + ALWAYS_INLINE uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); } +#endif + // GCC 4.6 lacks __builtin_bswap16. Newer versions have it but we support 4.6. +#ifndef bswap16 - // GCC lacks bswap16. #if COMPILER(CLANG) - inline uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); } -@@ -61,6 +66,7 @@ - // GCC lacks __builtin_bswap16. + ALWAYS_INLINE uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); } + #else inline uint16_t bswap16(uint16_t x) { return ((x & 0xff00) >> 8) | ((x & 0x00ff) << 8); } #endif +#endif Modified: branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp ============================================================================== --- branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp Tue Feb 25 20:10:17 2014 (r346069) @@ -1,24 +1,14 @@ --- third_party/WebKit/Source/wtf/DateMath.cpp.orig 2013-11-08 07:50:10.000000000 +0100 +++ third_party/WebKit/Source/wtf/DateMath.cpp 2013-11-15 12:55:05.000000000 +0100 -@@ -80,6 +80,8 @@ +@@ -80,6 +80,7 @@ #include "StringExtras.h" #include +#include -+#include #include #include - #include -@@ -665,7 +667,7 @@ - return 0; - if (*postParsePosition != ':' || (postParsePosition - currentPosition) != 2) - return 0; -- tzHoursAbs = labs(tzHours); -+ tzHoursAbs = std::labs(tzHours); - currentPosition = postParsePosition + 1; - - if (!isASCIIDigit(*currentPosition)) -@@ -979,7 +981,7 @@ + #include +@@ -785,7 +786,7 @@ return std::numeric_limits::quiet_NaN(); int sgn = (o < 0) ? -1 : 1; @@ -27,7 +17,7 @@ if (*dateString != ':') { if (o >= 24) offset = ((o / 100) * 60 + (o % 100)) * sgn; -@@ -1077,7 +1079,7 @@ +@@ -874,7 +875,7 @@ stringBuilder.append(' '); stringBuilder.append(utcOffset > 0 ? '+' : '-'); Modified: branches/2014Q1/www/chromium/files/patch-third_party__libjingle__libjingle.gyp ============================================================================== --- branches/2014Q1/www/chromium/files/patch-third_party__libjingle__libjingle.gyp Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-third_party__libjingle__libjingle.gyp Tue Feb 25 20:10:17 2014 (r346069) @@ -12,9 +12,9 @@ @@ -772,7 +772,7 @@ ], }], - # TODO(mallinath) - Enable SCTP for Android and iOS platforms. -- ['OS!="android" and OS!="ios"', { -+ ['OS!="android" and OS!="ios" and os_bsd!=1', { + # TODO(mallinath) - Enable SCTP for iOS. +- ['OS!="ios"', { ++ ['OS!="ios" and os_bsd!=1', { 'defines': [ ['HAVE_SCTP', ], Modified: branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.h ============================================================================== --- branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.h Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/files/patch-ui__events__event_switches.h Tue Feb 25 20:10:17 2014 (r346069) @@ -1,11 +1,11 @@ --- ui/events/event_switches.h.orig 2014-01-07 21:02:04.000000000 +0100 +++ ui/events/event_switches.h 2014-01-13 11:38:59.000000000 +0100 @@ -16,7 +16,7 @@ - EVENTS_EXPORT extern const char kTouchEventsEnabled[]; - EVENTS_EXPORT extern const char kTouchEventsDisabled[]; + EVENTS_BASE_EXPORT extern const char kTouchEventsEnabled[]; + EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) - EVENTS_EXPORT extern const char kTouchDevices[]; + EVENTS_BASE_EXPORT extern const char kTouchDevices[]; #endif Modified: branches/2014Q1/www/chromium/pkg-plist ============================================================================== --- branches/2014Q1/www/chromium/pkg-plist Tue Feb 25 20:08:58 2014 (r346068) +++ branches/2014Q1/www/chromium/pkg-plist Tue Feb 25 20:10:17 2014 (r346069) @@ -64,6 +64,7 @@ share/applications/chromium-browser.desk %%DATADIR%%/protoc %%DATADIR%%/resources.pak %%DATADIR%%/resources/extension/demo/library.js +%%DATADIR%%/resources/inspector/accelerometer.css %%DATADIR%%/resources/inspector/breakpointsList.css %%DATADIR%%/resources/inspector/buildSystemOnly.js %%DATADIR%%/resources/inspector/flameChart.css @@ -145,10 +146,6 @@ share/applications/chromium-browser.desk %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png -%%DATADIR%%/resources/inspector/Images/searchSmallBlue.png -%%DATADIR%%/resources/inspector/Images/searchSmallBrightBlue.png -%%DATADIR%%/resources/inspector/Images/searchSmallGray.png -%%DATADIR%%/resources/inspector/Images/searchSmallWhite.png %%DATADIR%%/resources/inspector/Images/sessionStorage.png %%DATADIR%%/resources/inspector/Images/settingsListRemove.png %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 25 20:11:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9367CE3; Tue, 25 Feb 2014 20:11:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D4D9C13BF; Tue, 25 Feb 2014 20:11:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PKBCjM094578; Tue, 25 Feb 2014 20:11:12 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PKBC63094576; Tue, 25 Feb 2014 20:11:12 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402252011.s1PKBC63094576@svn.freebsd.org> From: Rene Ladan Date: Tue, 25 Feb 2014 20:11:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346070 - branches/2014Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 20:11:13 -0000 Author: rene Date: Tue Feb 25 20:11:12 2014 New Revision: 346070 URL: http://svnweb.freebsd.org/changeset/ports/346070 QAT: https://qat.redports.org/buildarchive/r346070/ Log: MFH: r346063 Update distinfo for r346060 Noticed by: antoine Approved by: portmgr (erwin) Modified: branches/2014Q1/www/chromium/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/distinfo ============================================================================== --- branches/2014Q1/www/chromium/distinfo Tue Feb 25 20:10:17 2014 (r346069) +++ branches/2014Q1/www/chromium/distinfo Tue Feb 25 20:11:12 2014 (r346070) @@ -1,4 +1,4 @@ -SHA256 (chromium-courgette-redacted-32.0.1700.107.tar.xz) = df8de4dc47310b93db28f4b6acf588882eed34f1aadf928cd5bcb6e68fd4173d -SIZE (chromium-courgette-redacted-32.0.1700.107.tar.xz) = 186232440 -SHA256 (chromium-32.0.1700.107-testdata.tar.xz) = 5e3bdecf7d42f7ad7cb1ab3d993d3a2e0f70bd9918c2805b9ac6b5c233fef73d -SIZE (chromium-32.0.1700.107-testdata.tar.xz) = 112141556 +SHA256 (chromium-courgette-redacted-33.0.1750.117.tar.xz) = a014a02b432f79d548d9d426a5506af827f7d8e436b2eeff7a481118b0ba5669 +SIZE (chromium-courgette-redacted-33.0.1750.117.tar.xz) = 197160536 +SHA256 (chromium-33.0.1750.117-testdata.tar.xz) = 45a7c3e8c1a21f117af9da279b7b7083c49cd808fcd6efdecf6845e96b7abb5f +SIZE (chromium-33.0.1750.117-testdata.tar.xz) = 112416232 From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 25 20:55:47 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3F71DC0; Tue, 25 Feb 2014 20:55:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DB6BC1861; Tue, 25 Feb 2014 20:55:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PKtkk7012263; Tue, 25 Feb 2014 20:55:46 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PKtk10012262; Tue, 25 Feb 2014 20:55:46 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402252055.s1PKtk10012262@svn.freebsd.org> From: Rene Ladan Date: Tue, 25 Feb 2014 20:55:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346076 - branches/2014Q1/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 20:55:47 -0000 Author: rene Date: Tue Feb 25 20:55:46 2014 New Revision: 346076 URL: http://svnweb.freebsd.org/changeset/ports/346076 QAT: https://qat.redports.org/buildarchive/r346076/ Log: MFH: r346075 Fix manual patch editing. Pointy hat: rene Submitted by: Thomas Hoffmann via freebsd-chromium Approved by: portmgr (erwin, implicit) Modified: branches/2014Q1/www/chromium/files/patch-build__gyp_chromium Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/files/patch-build__gyp_chromium ============================================================================== --- branches/2014Q1/www/chromium/files/patch-build__gyp_chromium Tue Feb 25 20:50:50 2014 (r346075) +++ branches/2014Q1/www/chromium/files/patch-build__gyp_chromium Tue Feb 25 20:55:46 2014 (r346076) @@ -1,6 +1,6 @@ --- build/gyp_chromium.orig 2014-02-20 21:28:44.000000000 +0100 -+++ build/gyp_chromium 2014-02-24 17:26:04.000000000 +0100 -@@ -245,8 +245,8 @@ ++++ build/gyp_chromium 2014-02-25 21:48:32.000000000 +0100 +@@ -245,8 +245,9 @@ supplemental_includes = GetSupplementalFiles() From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 26 08:27:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4AFFFA9; Wed, 26 Feb 2014 08:27:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 969F81A2A; Wed, 26 Feb 2014 08:27:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q8RvrI097437; Wed, 26 Feb 2014 08:27:57 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q8Rvb9097436; Wed, 26 Feb 2014 08:27:57 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402260827.s1Q8Rvb9097436@svn.freebsd.org> From: Rene Ladan Date: Wed, 26 Feb 2014 08:27:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346138 - branches/2014Q1/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 08:27:57 -0000 Author: rene Date: Wed Feb 26 08:27:57 2014 New Revision: 346138 URL: http://svnweb.freebsd.org/changeset/ports/346138 QAT: https://qat.redports.org/buildarchive/r346138/ Log: MFH: r346081 Add a patch that slipped through first to try to fix the build once more ... Noticed by: John Carr, nox Approved by: portmgr (erwin, implicit) Modified: branches/2014Q1/www/chromium/files/patch-build__common.gypi Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2014Q1/www/chromium/files/patch-build__common.gypi Wed Feb 26 08:25:59 2014 (r346137) +++ branches/2014Q1/www/chromium/files/patch-build__common.gypi Wed Feb 26 08:27:57 2014 (r346138) @@ -1,6 +1,15 @@ ---- build/common.gypi.orig 2012-05-30 10:01:43.000000000 +0300 -+++ build/common.gypi 2012-06-05 23:01:25.000000000 +0300 -@@ -575,6 +575,10 @@ +--- build/common.gypi.orig 2014-02-20 21:28:44.000000000 +0100 ++++ build/common.gypi 2014-02-24 23:02:26.000000000 +0100 +@@ -573,7 +573,7 @@ + }], + + # DBus usage. +- ['OS=="linux" and embedded==0', { ++ ['(OS=="linux" or OS=="freebsd") and embedded==0', { + 'use_dbus%': 1, + }, { + 'use_dbus%': 0, +@@ -1008,6 +1008,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -11,16 +20,16 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -806,7 +810,7 @@ - # This is used to tweak build flags for gcc 4.4. - 'gcc_version%': ' Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85932FEF; Wed, 26 Feb 2014 08:29:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F3971A33; Wed, 26 Feb 2014 08:29:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q8T9mn097661; Wed, 26 Feb 2014 08:29:09 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q8T9b6097660; Wed, 26 Feb 2014 08:29:09 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402260829.s1Q8T9b6097660@svn.freebsd.org> From: Rene Ladan Date: Wed, 26 Feb 2014 08:29:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346139 - branches/2014Q1/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 08:29:09 -0000 Author: rene Date: Wed Feb 26 08:29:08 2014 New Revision: 346139 URL: http://svnweb.freebsd.org/changeset/ports/346139 QAT: https://qat.redports.org/buildarchive/r346139/ Log: MFH: r346082 Add one more forgotten patch to fix the build. Submitted by: nox Approved by: portmgr (erwin, implicit) Modified: branches/2014Q1/www/chromium/files/patch-content__content_browser.gypi Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/files/patch-content__content_browser.gypi ============================================================================== --- branches/2014Q1/www/chromium/files/patch-content__content_browser.gypi Wed Feb 26 08:27:57 2014 (r346138) +++ branches/2014Q1/www/chromium/files/patch-content__content_browser.gypi Wed Feb 26 08:29:08 2014 (r346139) @@ -1,5 +1,5 @@ ---- content/content_browser.gypi.orig 2014-02-20 21:28:25.000000000 +0100 -+++ content/content_browser.gypi 2014-02-24 22:56:37.000000000 +0100 +--- ./content/content_browser.gypi.orig 2014-02-20 21:28:25.000000000 +0100 ++++ ./content/content_browser.gypi 2014-02-24 23:00:37.000000000 +0100 @@ -586,6 +586,8 @@ 'browser/geolocation/wifi_data_provider_common_win.cc', 'browser/geolocation/wifi_data_provider_common_win.h', @@ -30,3 +30,12 @@ ], }], ['use_aura!=1 and OS!="win"', { +@@ -1635,7 +1647,7 @@ + 'browser/geolocation/empty_wifi_data_provider.cc', + ], + }], +- ['OS == "linux" and use_dbus==1', { ++ ['(OS == "linux" or OS=="freebsd") and use_dbus==1', { + 'sources!': [ + 'browser/geolocation/empty_wifi_data_provider.cc', + ], From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 28 08:09:39 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E954F9C; Fri, 28 Feb 2014 08:09:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6A8E31CC2; Fri, 28 Feb 2014 08:09:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1S89dkF063229; Fri, 28 Feb 2014 08:09:39 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1S89d9W063227; Fri, 28 Feb 2014 08:09:39 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201402280809.s1S89d9W063227@svn.freebsd.org> From: Warner Losh Date: Fri, 28 Feb 2014 08:09:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346452 - in branches/2014Q1/emulators/gxemul: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 08:09:39 -0000 Author: imp Date: Fri Feb 28 08:09:38 2014 New Revision: 346452 URL: http://svnweb.freebsd.org/changeset/ports/346452 QAT: https://qat.redports.org/buildarchive/r346452/ Log: MFH: r346073 Force gcc, since gxemul isn't clang ready yet. Fix for building with gcc 4.6 due to slight differences in namespace pollution. Approved by: portmgr (bapt) Added: branches/2014Q1/emulators/gxemul/files/patch-ab - copied unchanged from r346073, head/emulators/gxemul/files/patch-ab Modified: branches/2014Q1/emulators/gxemul/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/emulators/gxemul/Makefile ============================================================================== --- branches/2014Q1/emulators/gxemul/Makefile Fri Feb 28 07:59:41 2014 (r346451) +++ branches/2014Q1/emulators/gxemul/Makefile Fri Feb 28 08:09:38 2014 (r346452) @@ -22,6 +22,8 @@ MAN1= gxemul.1 PORTDOCS= * PLIST_FILES= bin/gxemul +USE_GCC= yes + # svgalib installs vga.h, which conflicts with gxemul when building with # a virtual VGA adaptor. CONFLICTS= svgalib-[0-9]* Copied: branches/2014Q1/emulators/gxemul/files/patch-ab (from r346073, head/emulators/gxemul/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/emulators/gxemul/files/patch-ab Fri Feb 28 08:09:38 2014 (r346452, copy of r346073, head/emulators/gxemul/files/patch-ab) @@ -0,0 +1,11 @@ +--- src/include/refcount_ptr.h 2010-02-14 02:33:54.000000000 -0700 ++++ src/include/refcount_ptr.h 2014-02-24 03:48:14.000000000 -0700 +@@ -28,6 +28,8 @@ + * SUCH DAMAGE. + */ + ++#include ++ + /** + * \brief Base class for reference countable objects. + * From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 28 08:15:52 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 27626225; Fri, 28 Feb 2014 08:15:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 06D121D58; Fri, 28 Feb 2014 08:15:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1S8Fp6j068699; Fri, 28 Feb 2014 08:15:51 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1S8FpqG068694; Fri, 28 Feb 2014 08:15:51 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201402280815.s1S8FpqG068694@svn.freebsd.org> From: Warner Losh Date: Fri, 28 Feb 2014 08:15:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346454 - branches/2014Q1/games/seahaven/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 08:15:52 -0000 Author: imp Date: Fri Feb 28 08:15:51 2014 New Revision: 346454 URL: http://svnweb.freebsd.org/changeset/ports/346454 QAT: https://qat.redports.org/buildarchive/r346454/ Log: MFH: r346232 Tighten up C++ to work with clang. Approved by: portmgr (bapt) Added: branches/2014Q1/games/seahaven/files/patch-auto-C - copied unchanged from r346232, head/games/seahaven/files/patch-auto-C branches/2014Q1/games/seahaven/files/patch-main-C - copied unchanged from r346232, head/games/seahaven/files/patch-main-C branches/2014Q1/games/seahaven/files/patch-seahaven-h - copied unchanged from r346232, head/games/seahaven/files/patch-seahaven-h Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/games/seahaven/files/patch-auto-C (from r346232, head/games/seahaven/files/patch-auto-C) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/seahaven/files/patch-auto-C Fri Feb 28 08:15:51 2014 (r346454, copy of r346232, head/games/seahaven/files/patch-auto-C) @@ -0,0 +1,18 @@ +diff -ru work/seahaven-1.60/auto.C work.new/seahaven-1.60/auto.C +--- auto.C 2011-07-10 00:23:59.000000000 -0600 ++++ auto.C 2014-02-25 15:10:30.000000000 -0700 +@@ -486,12 +486,10 @@ + + class MoveCard : public Move { + Card& from; +- MoveCardToMemberFunction mcmf; + public: +- MoveCard(Card& f, Dest& d, MoveCardToMemberFunction mf) +- : Move(d), from(f), mcmf(mf) { } ++ MoveCard(Card& f, Dest& d) ++ : Move(d), from(f) { } + void DoIt() { dest.MoveTo(from); } +-// void DoIt() { dest.*mcmf(from); } + }; + + class MoveCardRange : public Move { Copied: branches/2014Q1/games/seahaven/files/patch-main-C (from r346232, head/games/seahaven/files/patch-main-C) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/seahaven/files/patch-main-C Fri Feb 28 08:15:51 2014 (r346454, copy of r346232, head/games/seahaven/files/patch-main-C) @@ -0,0 +1,11 @@ +diff -ru work/seahaven-1.60/main.C work.new/seahaven-1.60/main.C +--- main.C 2011-07-10 19:35:12.000000000 -0600 ++++ main.C 2014-02-25 15:07:08.000000000 -0700 +@@ -31,6 +31,7 @@ + exit(0); + } + ++int + main(int argc, char **argv) { + const char *displayname = NULL; + const char *name = NULL; Copied: branches/2014Q1/games/seahaven/files/patch-seahaven-h (from r346232, head/games/seahaven/files/patch-seahaven-h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/games/seahaven/files/patch-seahaven-h Fri Feb 28 08:15:51 2014 (r346454, copy of r346232, head/games/seahaven/files/patch-seahaven-h) @@ -0,0 +1,12 @@ +diff -ru work/seahaven-1.60/seahaven.h work.new/seahaven-1.60/seahaven.h +--- seahaven.h 2011-07-10 18:42:44.000000000 -0600 ++++ seahaven.h 2014-02-25 15:07:22.000000000 -0700 +@@ -117,7 +117,7 @@ + const char *message; + }; + +-typedef struct ScoreRec *Score; ++typedef class ScoreRec *Score; + + class UndoListRec { + public: From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 28 10:41:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34D0DDCC; Fri, 28 Feb 2014 10:41:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 151201BC6; Fri, 28 Feb 2014 10:41:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1SAfat7031685; Fri, 28 Feb 2014 10:41:36 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1SAfajn031682; Fri, 28 Feb 2014 10:41:36 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402281041.s1SAfajn031682@svn.freebsd.org> From: Rene Ladan Date: Fri, 28 Feb 2014 10:41:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346489 - in branches/2014Q1/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 10:41:37 -0000 Author: rene Date: Fri Feb 28 10:41:36 2014 New Revision: 346489 URL: http://svnweb.freebsd.org/changeset/ports/346489 QAT: https://qat.redports.org/buildarchive/r346489/ Log: MFH: r346486 - Fix build on FreeBSD < 10, which need a C++11 library. - Fix a strncpy() in a patch I wrote by actually allocating storage space fo - Bump PORTREVISION Approved by: portmgr (erwin) Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Fri Feb 28 10:37:48 2014 (r346488) +++ branches/2014Q1/www/chromium/Makefile Fri Feb 28 10:41:36 2014 (r346489) @@ -6,6 +6,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- DISTVERSION= 33.0.1750.117 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ http://download.goodking.org/downloads/:browser \ @@ -45,7 +46,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l ONLY_FOR_ARCHS= i386 amd64 USE_XZ= yes -USES= bison compiler:c++11-lang desktop-file-utils pkgconfig \ +USES= bison compiler:c++11-lib desktop-file-utils pkgconfig \ perl5 shebangfix ninja USE_PERL5= build USE_PYTHON_BUILD= 2.6-2.7 Modified: branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc ============================================================================== --- branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Fri Feb 28 10:37:48 2014 (r346488) +++ branches/2014Q1/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Fri Feb 28 10:41:36 2014 (r346489) @@ -1,5 +1,5 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-02-20 21:27:39.000000000 +0100 -+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-02-25 00:17:02.000000000 +0100 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-02-20 21:27:39.000000000 +0100 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-02-28 11:05:01.000000000 +0100 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" @@ -39,8 +39,8 @@ + } + } + -+ char* mac_address = nullptr; -+ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), 6); ++ char mac_address[6]; ++ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address)); +#else + strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); int sd = socket(AF_INET, SOCK_DGRAM, 0); From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 28 18:18:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 926829A1; Fri, 28 Feb 2014 18:18:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 640801739; Fri, 28 Feb 2014 18:18:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1SIIaUC015124; Fri, 28 Feb 2014 18:18:36 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1SIIZ6N015120; Fri, 28 Feb 2014 18:18:35 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201402281818.s1SIIZ6N015120@svn.freebsd.org> From: Antoine Brodin Date: Fri, 28 Feb 2014 18:18:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346561 - in branches/2014Q1: audio/amp converters/ytnef devel/libytnef sysutils/gdmap X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2014 18:18:36 -0000 Author: antoine Date: Fri Feb 28 18:18:35 2014 New Revision: 346561 URL: http://svnweb.freebsd.org/changeset/ports/346561 QAT: https://qat.redports.org/buildarchive/r346561/ Log: MFH: r346559 Reset maintainer: email bounces Approved by: portmgr (self) Modified: branches/2014Q1/audio/amp/Makefile branches/2014Q1/converters/ytnef/Makefile branches/2014Q1/devel/libytnef/Makefile branches/2014Q1/sysutils/gdmap/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/amp/Makefile ============================================================================== --- branches/2014Q1/audio/amp/Makefile Fri Feb 28 17:58:09 2014 (r346560) +++ branches/2014Q1/audio/amp/Makefile Fri Feb 28 18:18:35 2014 (r346561) @@ -7,7 +7,7 @@ PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= http://www-users.cs.umn.edu/~wburdick/ftp/ -MAINTAINER= delphus@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Another mp3 player GNU_CONFIGURE= yes Modified: branches/2014Q1/converters/ytnef/Makefile ============================================================================== --- branches/2014Q1/converters/ytnef/Makefile Fri Feb 28 17:58:09 2014 (r346560) +++ branches/2014Q1/converters/ytnef/Makefile Fri Feb 28 18:18:35 2014 (r346561) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= converters mail MASTER_SITES= SF -MAINTAINER= delphus@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Unpack data in MS Outlook TNEF format LIB_DEPENDS= libytnef.so:${PORTSDIR}/devel/libytnef Modified: branches/2014Q1/devel/libytnef/Makefile ============================================================================== --- branches/2014Q1/devel/libytnef/Makefile Fri Feb 28 17:58:09 2014 (r346560) +++ branches/2014Q1/devel/libytnef/Makefile Fri Feb 28 18:18:35 2014 (r346561) @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= devel mail MASTER_SITES= SF/ytnef/${PORTNAME}/${PORTVERSION} -MAINTAINER= delphus@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Unpack data in MS Outlook TNEF format GNU_CONFIGURE= yes Modified: branches/2014Q1/sysutils/gdmap/Makefile ============================================================================== --- branches/2014Q1/sysutils/gdmap/Makefile Fri Feb 28 17:58:09 2014 (r346560) +++ branches/2014Q1/sysutils/gdmap/Makefile Fri Feb 28 18:18:35 2014 (r346561) @@ -7,7 +7,7 @@ PORTREVISION= 7 CATEGORIES= sysutils gnome MASTER_SITES= SF -MAINTAINER= delphus@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Graphical disk map Utility BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 11:56:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03553B07; Sun, 2 Mar 2014 11:56:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C943D18D2; Sun, 2 Mar 2014 11:56:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22BuDqB046217; Sun, 2 Mar 2014 11:56:13 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22BuDiF046215; Sun, 2 Mar 2014 11:56:13 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201403021156.s22BuDiF046215@svn.freebsd.org> From: Thomas Zander Date: Sun, 2 Mar 2014 11:56:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346757 - in branches/2014Q1/audio/sox: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 11:56:14 -0000 Author: riggs Date: Sun Mar 2 11:56:13 2014 New Revision: 346757 URL: http://svnweb.freebsd.org/changeset/ports/346757 QAT: https://qat.redports.org/buildarchive/r346757/ Log: MFH: r346756 - Fix symlink pointing to non-existing manpage - Bump PORTREVISION PR: ports/186540 Submitted by: Tsurutani Naoki Approved by: portmgr (erwin), thierry (mentor), Dan Nelson (maintainer) Added: branches/2014Q1/audio/sox/files/patch-Makefile.am - copied unchanged from r346756, head/audio/sox/files/patch-Makefile.am Modified: branches/2014Q1/audio/sox/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/sox/Makefile ============================================================================== --- branches/2014Q1/audio/sox/Makefile Sun Mar 2 11:29:25 2014 (r346756) +++ branches/2014Q1/audio/sox/Makefile Sun Mar 2 11:56:13 2014 (r346757) @@ -3,7 +3,7 @@ PORTNAME= sox PORTVERSION= 14.4.1 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= SF Copied: branches/2014Q1/audio/sox/files/patch-Makefile.am (from r346756, head/audio/sox/files/patch-Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/sox/files/patch-Makefile.am Sun Mar 2 11:56:13 2014 (r346757, copy of r346756, head/audio/sox/files/patch-Makefile.am) @@ -0,0 +1,14 @@ +Work around a ports bug wrt symlinking manpages in different +categories, by copying the manpage instead. + +--- Makefile.am.orig 2013-01-30 11:40:06.000000000 +0900 ++++ Makefile.am 2014-02-08 01:46:11.000000000 +0900 +@@ -118,7 +118,7 @@ + install-data-hook: + cd $(DESTDIR)$(mandir)/man1 && $(RM) play.1 && $(LN_S) sox.1 play.1 + cd $(DESTDIR)$(mandir)/man1 && $(RM) rec.1 && $(LN_S) sox.1 rec.1 +- cd $(DESTDIR)$(mandir)/man7 && $(RM) soxeffect.7 && $(LN_S) ../man1/sox.1 soxeffect.7 ++ cd $(DESTDIR)$(mandir)/man7 && $(RM) soxeffect.7 && cp ../man1/sox.1 soxeffect.7 + + uninstall-hook: + $(RM) $(DESTDIR)$(mandir)/man1/play.1 From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 15:29:24 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 64FCFE75; Sun, 2 Mar 2014 15:29:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4D7571ACD; Sun, 2 Mar 2014 15:29:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22FTOZk030126; Sun, 2 Mar 2014 15:29:24 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22FTNXw030124; Sun, 2 Mar 2014 15:29:23 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403021529.s22FTNXw030124@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 2 Mar 2014 15:29:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346773 - in branches/2014Q1/databases/kyotocabinet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 15:29:24 -0000 Author: sunpoet Date: Sun Mar 2 15:29:23 2014 New Revision: 346773 URL: http://svnweb.freebsd.org/changeset/ports/346773 QAT: https://qat.redports.org/buildarchive/r346773/ Log: MFH: r337638 - Use USE_GCC=any - Change -lpthread to -pthread - Strip binary executable and shared library - Use NOT_FOR_ARCHS - Remove outdated ARCH check and pkg-message - Support STAGEDIR Approved by: portmgr (bapt, via IRC) Deleted: branches/2014Q1/databases/kyotocabinet/files/ Modified: branches/2014Q1/databases/kyotocabinet/Makefile branches/2014Q1/databases/kyotocabinet/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/kyotocabinet/Makefile ============================================================================== --- branches/2014Q1/databases/kyotocabinet/Makefile Sun Mar 2 15:26:53 2014 (r346772) +++ branches/2014Q1/databases/kyotocabinet/Makefile Sun Mar 2 15:29:23 2014 (r346773) @@ -14,57 +14,36 @@ LICENSE= GPLv3 OPTIONS_DEFINE= DOCS +CPPFLAGS+= -fPIC GNU_CONFIGURE= yes -MAKE_ARGS= PCDIR="${PREFIX}/libdata/pkgconfig" +MAKE_ARGS= PCDIR=${PREFIX}/libdata/pkgconfig +REINPLACE_ARGS= -i '' +USE_GCC= any USE_LDCONFIG= yes USES= gmake -MAN1= kccachetest.1 \ - kcdirmgr.1 \ - kcdirtest.1 \ - kcforestmgr.1 \ - kcforesttest.1 \ - kcgrasstest.1 \ - kchashmgr.1 \ - kchashtest.1 \ - kclangctest.1 \ - kcpolymgr.1 \ - kcpolytest.1 \ - kcprototest.1 \ - kcstashtest.1 \ - kctreemgr.1 \ - kctreetest.1 \ - kcutilmgr.1 \ - kcutiltest.1 +NOT_FOR_ARCHS= powerpc +NOT_FOR_ARCHS_REASON= does not link -NO_STAGE= yes .include -.if ${ARCH} == "i386" && !defined(CPUTYPE) -CONFIGURE_TARGET= i586-portbld-freebsd${OSREL} -CPUTYPE= i586 -PKGMESSAGE= ${FILESDIR}/pkg-message.${ARCH} -# _CPUCFLAGS will somehow show up twice in CFLAGS but who cares.. -.include -.endif - -.if ${ARCH} == "powerpc" -BROKEN= Does not link on powerpc -.endif - post-patch: .if !${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/DOCDIR/d' ${WRKSRC}/Makefile.in .endif +post-build: + @cd ${WRKSRC}/ && ${STRIP_CMD} libkyotocabinet.so.16.13.0 kccachetest \ + kcdirmgr kcdirtest kcforestmgr kcforesttest kcgrasstest \ + kchashmgr kchashtest kclangctest kcpolymgr kcpolytest \ + kcprototest kcstashtest kctreemgr kctreetest kcutilmgr \ + kcutiltest + post-install: .if ${PORT_OPTIONS:MDOCS} - ${FIND} ${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \; - ${FIND} ${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \; - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/ -.endif -.if exists(${PKGMESSAGE}) - @${CAT} ${PKGMESSAGE} + ${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \; + ${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \; + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}/ .endif .include Modified: branches/2014Q1/databases/kyotocabinet/pkg-plist ============================================================================== --- branches/2014Q1/databases/kyotocabinet/pkg-plist Sun Mar 2 15:26:53 2014 (r346772) +++ branches/2014Q1/databases/kyotocabinet/pkg-plist Sun Mar 2 15:29:23 2014 (r346773) @@ -39,6 +39,23 @@ lib/libkyotocabinet.so lib/libkyotocabinet.so.16 lib/libkyotocabinet.so.16.13.0 libdata/pkgconfig/kyotocabinet.pc +man/man1/kccachetest.1.gz +man/man1/kcdirmgr.1.gz +man/man1/kcdirtest.1.gz +man/man1/kcforestmgr.1.gz +man/man1/kcforesttest.1.gz +man/man1/kcgrasstest.1.gz +man/man1/kchashmgr.1.gz +man/man1/kchashtest.1.gz +man/man1/kclangctest.1.gz +man/man1/kcpolymgr.1.gz +man/man1/kcpolytest.1.gz +man/man1/kcprototest.1.gz +man/man1/kcstashtest.1.gz +man/man1/kctreemgr.1.gz +man/man1/kctreetest.1.gz +man/man1/kcutilmgr.1.gz +man/man1/kcutiltest.1.gz %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/FOSSEXCEPTION From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 15:30:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9DA0F67; Sun, 2 Mar 2014 15:30:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A4B961ADD; Sun, 2 Mar 2014 15:30:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22FUoDN030830; Sun, 2 Mar 2014 15:30:50 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22FUosB030829; Sun, 2 Mar 2014 15:30:50 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403021530.s22FUosB030829@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 2 Mar 2014 15:30:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346774 - in branches/2014Q1/databases/kyotocabinet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 15:30:50 -0000 Author: sunpoet Date: Sun Mar 2 15:30:50 2014 New Revision: 346774 URL: http://svnweb.freebsd.org/changeset/ports/346774 QAT: https://qat.redports.org/buildarchive/r346774/ Log: MFH: r338063 - Allow build with clang [1] - Remove explicit -lstdc++ - Bump PORTREVISION for package change Submitted by: vanilla [1] Approved by: portmgr (bapt, via IRC) Added: branches/2014Q1/databases/kyotocabinet/files/ - copied from r338063, head/databases/kyotocabinet/files/ Modified: branches/2014Q1/databases/kyotocabinet/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/kyotocabinet/Makefile ============================================================================== --- branches/2014Q1/databases/kyotocabinet/Makefile Sun Mar 2 15:29:23 2014 (r346773) +++ branches/2014Q1/databases/kyotocabinet/Makefile Sun Mar 2 15:30:50 2014 (r346774) @@ -3,6 +3,7 @@ PORTNAME= kyotocabinet PORTVERSION= 1.2.76 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://fallabs.com/${PORTNAME}/pkg/ \ LOCAL/sunpoet @@ -18,7 +19,6 @@ CPPFLAGS+= -fPIC GNU_CONFIGURE= yes MAKE_ARGS= PCDIR=${PREFIX}/libdata/pkgconfig REINPLACE_ARGS= -i '' -USE_GCC= any USE_LDCONFIG= yes USES= gmake @@ -28,6 +28,7 @@ NOT_FOR_ARCHS_REASON= does not link .include post-patch: + @${REINPLACE_CMD} -e 's|-lstdc++ ||g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile ${WRKSRC}/lab/kcdict/Makefile .if !${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/DOCDIR/d' ${WRKSRC}/Makefile.in .endif From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 15:32:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B136E6; Sun, 2 Mar 2014 15:32:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 76A4D1B6C; Sun, 2 Mar 2014 15:32:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22FWE70033588; Sun, 2 Mar 2014 15:32:14 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22FWEjx033587; Sun, 2 Mar 2014 15:32:14 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403021532.s22FWEjx033587@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 2 Mar 2014 15:32:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346775 - branches/2014Q1/databases/kyotocabinet X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 15:32:14 -0000 Author: sunpoet Date: Sun Mar 2 15:32:13 2014 New Revision: 346775 URL: http://svnweb.freebsd.org/changeset/ports/346775 QAT: https://qat.redports.org/buildarchive/r346775/ Log: MFH: r346598 - Allow "make package" as user - Use BINMODE and DOCMODE - Simplify Makefile Approved by: portmgr (bapt, via IRC) Modified: branches/2014Q1/databases/kyotocabinet/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/kyotocabinet/Makefile ============================================================================== --- branches/2014Q1/databases/kyotocabinet/Makefile Sun Mar 2 15:30:50 2014 (r346774) +++ branches/2014Q1/databases/kyotocabinet/Makefile Sun Mar 2 15:32:13 2014 (r346775) @@ -25,13 +25,8 @@ USES= gmake NOT_FOR_ARCHS= powerpc NOT_FOR_ARCHS_REASON= does not link -.include - post-patch: @${REINPLACE_CMD} -e 's|-lstdc++ ||g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile ${WRKSRC}/lab/kcdict/Makefile -.if !${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/DOCDIR/d' ${WRKSRC}/Makefile.in -.endif post-build: @cd ${WRKSRC}/ && ${STRIP_CMD} libkyotocabinet.so.16.13.0 kccachetest \ @@ -41,10 +36,7 @@ post-build: kcutiltest post-install: -.if ${PORT_OPTIONS:MDOCS} - ${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \; - ${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \; - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}/ -.endif + ${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} ${BINMODE} '{}' \; + ${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} ${DOCMODE} '{}' \; -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 20:04:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A770B1B4; Sun, 2 Mar 2014 20:04:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 87A3D1363; Sun, 2 Mar 2014 20:04:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22K4r5c044625; Sun, 2 Mar 2014 20:04:53 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22K4rfT044623; Sun, 2 Mar 2014 20:04:53 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403022004.s22K4rfT044623@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 2 Mar 2014 20:04:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346795 - branches/2014Q1/shells/ksh93/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 20:04:53 -0000 Author: sunpoet Date: Sun Mar 2 20:04:52 2014 New Revision: 346795 URL: http://svnweb.freebsd.org/changeset/ports/346795 QAT: https://qat.redports.org/buildarchive/r346795/ Log: MFH: r346423 - Fix build on i386 PR: ports/185256 Submitted by: Christoph Moench-Tegeder Approved by: portmgr (bdrewery, via IRC) Added: branches/2014Q1/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c - copied unchanged from r346423, head/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c branches/2014Q1/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c - copied unchanged from r346423, head/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c (from r346423, head/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c Sun Mar 2 20:04:52 2014 (r346795, copy of r346423, head/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c) @@ -0,0 +1,20 @@ +--- src/lib/libast/hash/hashalloc.c.orig 2013-12-28 22:09:43.000000000 +0100 ++++ src/lib/libast/hash/hashalloc.c 2013-12-28 22:43:14.000000000 +0100 +@@ -49,6 +49,7 @@ + va_list* vp = va; + Hash_region_f region = 0; + void* handle; ++ va_listarg tmpval; + + va_start(ap, ref); + +@@ -151,7 +152,8 @@ + va_copy(*vp, ap); + vp++; + } +- va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++ tmpval = va_listval(va_arg(ap, va_listarg)); ++ va_copy(ap, tmpval); + break; + case 0: + if (vp > va) Copied: branches/2014Q1/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c (from r346423, head/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c Sun Mar 2 20:04:52 2014 (r346795, copy of r346423, head/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c) @@ -0,0 +1,20 @@ +--- ./src/lib/libast/string/tokscan.c.orig 2013-12-28 22:16:20.000000000 +0100 ++++ ./src/lib/libast/string/tokscan.c 2013-12-28 22:43:28.000000000 +0100 +@@ -188,6 +188,7 @@ + char** p_string; + char* prv_f = 0; + va_list prv_ap; ++ va_listarg tmpval; + + va_start(ap, fmt); + if (!*s || *s == '\n') +@@ -233,7 +234,8 @@ + prv_f = f; + f = va_arg(ap, char*); + va_copy(prv_ap, ap); +- va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++ tmpval = va_listval(va_arg(ap, va_listarg)); ++ va_copy(ap, tmpval); + continue; + case 'c': + p_char = va_arg(ap, char*); From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 20:30:16 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCBBFBD7; Sun, 2 Mar 2014 20:30:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E5EC159A; Sun, 2 Mar 2014 20:30:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22KUGsZ053865; Sun, 2 Mar 2014 20:30:16 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22KUGOZ053862; Sun, 2 Mar 2014 20:30:16 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403022030.s22KUGOZ053862@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 2 Mar 2014 20:30:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346797 - branches/2014Q1/shells/ksh93 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 20:30:16 -0000 Author: sunpoet Date: Sun Mar 2 20:30:15 2014 New Revision: 346797 URL: http://svnweb.freebsd.org/changeset/ports/346797 QAT: https://qat.redports.org/buildarchive/r346797/ Log: MFH: r337651 Support stage Approved by: portmgr (bapt, via IRC) Modified: branches/2014Q1/shells/ksh93/Makefile branches/2014Q1/shells/ksh93/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/shells/ksh93/Makefile ============================================================================== --- branches/2014Q1/shells/ksh93/Makefile Sun Mar 2 20:29:18 2014 (r346796) +++ branches/2014Q1/shells/ksh93/Makefile Sun Mar 2 20:30:15 2014 (r346797) @@ -31,12 +31,9 @@ LDFLAGS+= -lm MAKE_ENV= CCFLAGS="${CFLAGS}" NO_WRKSUBDIR= yes -MAN1= ksh93.1 - INITVERSION= 2013-05-24 KSHVERSION= 2012-08-01 -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSTATIC} @@ -51,17 +48,10 @@ do-build: @cd ${WRKSRC}/ && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${PREFIX}/bin/ksh93 - ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${MAN1PREFIX}/man/man1/ksh93.1 -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR}/ - cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${EXAMPLESDIR}/ -.endif - -post-install: - @${ECHO} "Updating /etc/shells" - @${SED} -i '' '\|${PREFIX}/bin/ksh93|d' /etc/shells - @${ECHO} ${PREFIX}/bin/ksh93 >> /etc/shells + ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/ksh93 + ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ksh93.1 + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ + cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}/ test: build @cd ${WRKSRC}/src/cmd/ksh93/tests/ && \ Modified: branches/2014Q1/shells/ksh93/pkg-plist ============================================================================== --- branches/2014Q1/shells/ksh93/pkg-plist Sun Mar 2 20:29:18 2014 (r346796) +++ branches/2014Q1/shells/ksh93/pkg-plist Sun Mar 2 20:30:15 2014 (r346797) @@ -1,4 +1,5 @@ bin/ksh93 +man/man1/ksh93.1.gz @exec echo "Updating /etc/shells"; sed -i "" "\|%D/%F|d" /etc/shells; echo %D/%F >> /etc/shells @unexec echo "Updating /etc/shells"; sed -i "" "\|%D/%F|d" /etc/shells %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirs From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 20:51:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5A4CF71; Sun, 2 Mar 2014 20:51:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A16B117B7; Sun, 2 Mar 2014 20:51:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22Kp2Cc062640; Sun, 2 Mar 2014 20:51:02 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22Kp25A062639; Sun, 2 Mar 2014 20:51:02 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403022051.s22Kp25A062639@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 2 Mar 2014 20:51:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346798 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 20:51:02 -0000 Author: bapt Date: Sun Mar 2 20:51:02 2014 New Revision: 346798 URL: http://svnweb.freebsd.org/changeset/ports/346798 QAT: https://qat.redports.org/buildarchive/r346798/ Log: MFH: r346065 Report new vulnerability in otrs to vuxml Security: CVE-2014-1695 Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:30:15 2014 (r346797) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:51:02 2014 (r346798) @@ -51,6 +51,36 @@ Note: Please add new entries to the beg --> + + otrs -- XSS Issue + + + otrs + 3.1.20 + 3.2.*3.2.15 + 3.3.*3.3.5 + + + + +

The OTRS Project reports:

+
+

An attacker could send a specially prepared HTML email to OTRS. If +he can then trick an agent into following a special link to display this email, +JavaScript code would be executed.

+
+ +
+ + https://www.otrs.com/security-advisory-2014-03-xss-issue/ + CVE-2014-1695 + + + 2014-02-25 + 2014-02-25 + +
+ chromium -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 20:52:05 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2FC3E1; Sun, 2 Mar 2014 20:52:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84BFB17C5; Sun, 2 Mar 2014 20:52:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22Kq5Rk065041; Sun, 2 Mar 2014 20:52:05 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22Kq5fq065040; Sun, 2 Mar 2014 20:52:05 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403022052.s22Kq5fq065040@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 2 Mar 2014 20:52:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346799 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 20:52:05 -0000 Author: bapt Date: Sun Mar 2 20:52:04 2014 New Revision: 346799 URL: http://svnweb.freebsd.org/changeset/ports/346799 QAT: https://qat.redports.org/buildarchive/r346799/ Log: MFH: r346229 - add entry for subversion CVE-2014-0032 Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:51:02 2014 (r346798) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:52:04 2014 (r346799) @@ -51,6 +51,38 @@ Note: Please add new entries to the beg --> + + subversion -- mod_dav_svn vulnerability + + + subversion + 1.8.01.8.8 + 1.3.01.7.16 + + + + +

Subversion Project reports:

+
+

Subversion's mod_dav_svn Apache HTTPD server module will crash when it + receives an OPTIONS request against the server root and Subversion is + configured to handle the server root and SVNListParentPath is on. + This can lead to a DoS. There are no known instances of this + problem being exploited in the wild, but the details of how to exploit + it have been disclosed on the Subversion development mailing list.

+
+ +
+ + CVE-2014-0032 + https://subversion.apache.org/security/CVE-2014-0032-advisory.txt + + + 2014-01-10 + 2014-02-26 + +
+ otrs -- XSS Issue From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 20:54:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6335B1E5; Sun, 2 Mar 2014 20:54:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 35CC917E2; Sun, 2 Mar 2014 20:54:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22Ks2D5065384; Sun, 2 Mar 2014 20:54:02 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22Ks1X9065382; Sun, 2 Mar 2014 20:54:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403022054.s22Ks1X9065382@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 2 Mar 2014 20:54:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346800 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 20:54:02 -0000 Author: bapt Date: Sun Mar 2 20:54:01 2014 New Revision: 346800 URL: http://svnweb.freebsd.org/changeset/ports/346800 QAT: https://qat.redports.org/buildarchive/r346800/ Log: MFH: r346613 security/vuxml: Document CVE-2014-1912 for Python 2.7 - 3.3 Python: buffer overflow in socket.recvfrom_into() Security: CVE-2014-1912 Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:52:04 2014 (r346799) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:54:01 2014 (r346800) @@ -51,6 +51,55 @@ Note: Please add new entries to the beg --> + + Python -- buffer overflow in socket.recvfrom_into() + + + python27 + 2.7.6_3 + + + python31 + 3.1.5_10 + + + python32 + 3.2.5_7 + + + python33 + 3.3.3_3 + + + + +

Vincent Danen via Red Hat Issue Tracker reports:

+
+

A vulnerability was reported in Python's socket module, due to a + boundary error within the sock_recvfrom_into() function, which could be + exploited to cause a buffer overflow. This could be used to crash a + Python application that uses the socket.recvfrom_info() function or, + possibly, execute arbitrary code with the permissions of the user + running vulnerable Python code.

+ +

This vulnerable function, socket.recvfrom_into(), was introduced in + Python 2.5. Earlier versions are not affected by this flaw.

+
+ +
+ + CVE-2014-1912 + 65379 + https://mail.python.org/pipermail/python-dev/2014-February/132758.html + http://bugs.python.org/issue20246 + https://bugzilla.redhat.com/show_bug.cgi?id=1062370 + + + 2014-01-14 + 2014-03-01 + +
+ subversion -- mod_dav_svn vulnerability From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 20:54:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5ACE82C6; Sun, 2 Mar 2014 20:54:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 45F2717ED; Sun, 2 Mar 2014 20:54:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22Ksw8l065583; Sun, 2 Mar 2014 20:54:58 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22KsvJG065582; Sun, 2 Mar 2014 20:54:57 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403022054.s22KsvJG065582@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 2 Mar 2014 20:54:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346801 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 20:54:58 -0000 Author: bapt Date: Sun Mar 2 20:54:57 2014 New Revision: 346801 URL: http://svnweb.freebsd.org/changeset/ports/346801 QAT: https://qat.redports.org/buildarchive/r346801/ Log: MFH: r346618 security/vuxml: Sort Python entry references alphabetically Reported by: remko Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:54:01 2014 (r346800) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:54:57 2014 (r346801) @@ -88,8 +88,8 @@ Note: Please add new entries to the beg - CVE-2014-1912 65379 + CVE-2014-1912 https://mail.python.org/pipermail/python-dev/2014-February/132758.html http://bugs.python.org/issue20246 https://bugzilla.redhat.com/show_bug.cgi?id=1062370 From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 20:55:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5212C3A6; Sun, 2 Mar 2014 20:55:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3DF5717FD; Sun, 2 Mar 2014 20:55:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22Ktwfg065866; Sun, 2 Mar 2014 20:55:58 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22KtvOA065865; Sun, 2 Mar 2014 20:55:57 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403022055.s22KtvOA065865@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 2 Mar 2014 20:55:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346802 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 20:55:58 -0000 Author: bapt Date: Sun Mar 2 20:55:57 2014 New Revision: 346802 URL: http://svnweb.freebsd.org/changeset/ports/346802 QAT: https://qat.redports.org/buildarchive/r346802/ Log: MFH: r346772 Use correct PORTREVISION for python33's CVE. Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:54:57 2014 (r346801) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 2 20:55:57 2014 (r346802) @@ -68,7 +68,7 @@ Note: Please add new entries to the beg python33 - 3.3.3_3 + 3.3.3_2 From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 2 21:13:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E861C8C5; Sun, 2 Mar 2014 21:13:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D3BF41991; Sun, 2 Mar 2014 21:13:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s22LDEkJ073944; Sun, 2 Mar 2014 21:13:14 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s22LDEvq073939; Sun, 2 Mar 2014 21:13:14 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403022113.s22LDEvq073939@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 2 Mar 2014 21:13:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346805 - branches/2014Q1/math/p5-Math-GSL X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2014 21:13:15 -0000 Author: sunpoet Date: Sun Mar 2 21:13:13 2014 New Revision: 346805 URL: http://svnweb.freebsd.org/changeset/ports/346805 QAT: https://qat.redports.org/buildarchive/r346805/ Log: MFH: r343788 - Update to 0.28 - Convert to new LIB_DEPENDS format - Use BROKEN_sparc64 - Remove outdated post-patch: - Support STAGEDIR - Take maintainership Changes: http://search.cpan.org/dist/Math-GSL/Changes Approved by: portmgr (bapt, via IRC) Modified: branches/2014Q1/math/p5-Math-GSL/Makefile branches/2014Q1/math/p5-Math-GSL/distinfo branches/2014Q1/math/p5-Math-GSL/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/math/p5-Math-GSL/Makefile ============================================================================== --- branches/2014Q1/math/p5-Math-GSL/Makefile Sun Mar 2 21:10:39 2014 (r346804) +++ branches/2014Q1/math/p5-Math-GSL/Makefile Sun Mar 2 21:13:13 2014 (r346805) @@ -2,92 +2,26 @@ # $FreeBSD$ PORTNAME= Math-GSL -PORTVERSION= 0.27 -PORTREVISION= 1 +PORTVERSION= 0.28 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Perl interface to GNU Scientific Library LICENSE= ART10 GPLv1 LICENSE_COMB= dual BUILD_DEPENDS= p5-ExtUtils-PkgConfig>=1.03:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig -LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl +LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl TEST_DEPENDS= p5-Test-Class>=0.12:${PORTSDIR}/devel/p5-Test-Class \ - p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception \ - p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most + p5-Test-Most>=0.31:${PORTSDIR}/devel/p5-Test-Most \ + p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception -CFLAGS+= -I${LOCALBASE}/include -USES= perl5 USE_PERL5= modbuild +USES= perl5 -MAN1= smolder_smoke_signal.1 -MAN3= Math::GSL.3 \ - Math::GSL::BLAS.3 \ - Math::GSL::BSpline.3 \ - Math::GSL::CBLAS.3 \ - Math::GSL::CDF.3 \ - Math::GSL::Chebyshev.3 \ - Math::GSL::Combination.3 \ - Math::GSL::Complex.3 \ - Math::GSL::Const.3 \ - Math::GSL::DHT.3 \ - Math::GSL::Deriv.3 \ - Math::GSL::Diff.3 \ - Math::GSL::Eigen.3 \ - Math::GSL::Errno.3 \ - Math::GSL::FFT.3 \ - Math::GSL::Fit.3 \ - Math::GSL::Heapsort.3 \ - Math::GSL::Histogram.3 \ - Math::GSL::Histogram2D.3 \ - Math::GSL::Integration.3 \ - Math::GSL::Interp.3 \ - Math::GSL::Linalg.3 \ - Math::GSL::Machine.3 \ - Math::GSL::Matrix.3 \ - Math::GSL::MatrixComplex.3 \ - Math::GSL::Min.3 \ - Math::GSL::Monte.3 \ - Math::GSL::Multifit.3 \ - Math::GSL::Multimin.3 \ - Math::GSL::Multiroots.3 \ - Math::GSL::NTuple.3 \ - Math::GSL::ODEIV.3 \ - Math::GSL::Permutation.3 \ - Math::GSL::Poly.3 \ - Math::GSL::PowInt.3 \ - Math::GSL::QRNG.3 \ - Math::GSL::RNG.3 \ - Math::GSL::Randist.3 \ - Math::GSL::Roots.3 \ - Math::GSL::SF.3 \ - Math::GSL::Siman.3 \ - Math::GSL::Sort.3 \ - Math::GSL::Spline.3 \ - Math::GSL::Statistics.3 \ - Math::GSL::Sum.3 \ - Math::GSL::Sys.3 \ - Math::GSL::Test.3 \ - Math::GSL::Vector.3 \ - Math::GSL::VectorComplex.3 \ - Math::GSL::Wavelet.3 \ - Math::GSL::Wavelet2D.3 - -NO_STAGE= yes -.include - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.endif - -post-patch: - @${REINPLACE_CMD} -Ee 's/(\()(back|for)(ward\))/\1gsl_fft_\2\3/' \ - ${WRKSRC}/xs/FFT_wrap.1.15.c - @${REINPLACE_CMD} -Ee 's/(\()(back|for)(ward\))/\1gsl_wavelet_\2\3/' \ - ${WRKSRC}/xs/Wavelet_wrap.1.15.c +BROKEN_sparc64= Does not compile on sparc64 -.include +.include Modified: branches/2014Q1/math/p5-Math-GSL/distinfo ============================================================================== --- branches/2014Q1/math/p5-Math-GSL/distinfo Sun Mar 2 21:10:39 2014 (r346804) +++ branches/2014Q1/math/p5-Math-GSL/distinfo Sun Mar 2 21:13:13 2014 (r346805) @@ -1,2 +1,2 @@ -SHA256 (Math-GSL-0.27.tar.gz) = 48e95b96cf3d79ce61c06226218de16c1d26999f1b5144124a600fcfa7c53828 -SIZE (Math-GSL-0.27.tar.gz) = 9273965 +SHA256 (Math-GSL-0.28.tar.gz) = 57ca3c8570f5abe536569e3dff6f562cd1c31bdf116d7730290b87aa95bcece6 +SIZE (Math-GSL-0.28.tar.gz) = 10898661 Modified: branches/2014Q1/math/p5-Math-GSL/pkg-plist ============================================================================== --- branches/2014Q1/math/p5-Math-GSL/pkg-plist Sun Mar 2 21:10:39 2014 (r346804) +++ branches/2014Q1/math/p5-Math-GSL/pkg-plist Sun Mar 2 21:13:13 2014 (r346805) @@ -105,6 +105,58 @@ bin/smolder_smoke_signal %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Version/Version.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet/Wavelet.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet2D/Wavelet2D.so +%%PERL5_MAN3%%/Math::GSL.3.gz +%%PERL5_MAN3%%/Math::GSL::BLAS.3.gz +%%PERL5_MAN3%%/Math::GSL::BSpline.3.gz +%%PERL5_MAN3%%/Math::GSL::CBLAS.3.gz +%%PERL5_MAN3%%/Math::GSL::CDF.3.gz +%%PERL5_MAN3%%/Math::GSL::Chebyshev.3.gz +%%PERL5_MAN3%%/Math::GSL::Combination.3.gz +%%PERL5_MAN3%%/Math::GSL::Complex.3.gz +%%PERL5_MAN3%%/Math::GSL::Const.3.gz +%%PERL5_MAN3%%/Math::GSL::DHT.3.gz +%%PERL5_MAN3%%/Math::GSL::Deriv.3.gz +%%PERL5_MAN3%%/Math::GSL::Diff.3.gz +%%PERL5_MAN3%%/Math::GSL::Eigen.3.gz +%%PERL5_MAN3%%/Math::GSL::Errno.3.gz +%%PERL5_MAN3%%/Math::GSL::FFT.3.gz +%%PERL5_MAN3%%/Math::GSL::Fit.3.gz +%%PERL5_MAN3%%/Math::GSL::Heapsort.3.gz +%%PERL5_MAN3%%/Math::GSL::Histogram.3.gz +%%PERL5_MAN3%%/Math::GSL::Histogram2D.3.gz +%%PERL5_MAN3%%/Math::GSL::Integration.3.gz +%%PERL5_MAN3%%/Math::GSL::Interp.3.gz +%%PERL5_MAN3%%/Math::GSL::Linalg.3.gz +%%PERL5_MAN3%%/Math::GSL::Machine.3.gz +%%PERL5_MAN3%%/Math::GSL::Matrix.3.gz +%%PERL5_MAN3%%/Math::GSL::MatrixComplex.3.gz +%%PERL5_MAN3%%/Math::GSL::Min.3.gz +%%PERL5_MAN3%%/Math::GSL::Monte.3.gz +%%PERL5_MAN3%%/Math::GSL::Multifit.3.gz +%%PERL5_MAN3%%/Math::GSL::Multimin.3.gz +%%PERL5_MAN3%%/Math::GSL::Multiroots.3.gz +%%PERL5_MAN3%%/Math::GSL::NTuple.3.gz +%%PERL5_MAN3%%/Math::GSL::ODEIV.3.gz +%%PERL5_MAN3%%/Math::GSL::Permutation.3.gz +%%PERL5_MAN3%%/Math::GSL::Poly.3.gz +%%PERL5_MAN3%%/Math::GSL::PowInt.3.gz +%%PERL5_MAN3%%/Math::GSL::QRNG.3.gz +%%PERL5_MAN3%%/Math::GSL::RNG.3.gz +%%PERL5_MAN3%%/Math::GSL::Randist.3.gz +%%PERL5_MAN3%%/Math::GSL::Roots.3.gz +%%PERL5_MAN3%%/Math::GSL::SF.3.gz +%%PERL5_MAN3%%/Math::GSL::Siman.3.gz +%%PERL5_MAN3%%/Math::GSL::Sort.3.gz +%%PERL5_MAN3%%/Math::GSL::Spline.3.gz +%%PERL5_MAN3%%/Math::GSL::Statistics.3.gz +%%PERL5_MAN3%%/Math::GSL::Sum.3.gz +%%PERL5_MAN3%%/Math::GSL::Sys.3.gz +%%PERL5_MAN3%%/Math::GSL::Test.3.gz +%%PERL5_MAN3%%/Math::GSL::Vector.3.gz +%%PERL5_MAN3%%/Math::GSL::VectorComplex.3.gz +%%PERL5_MAN3%%/Math::GSL::Wavelet.3.gz +%%PERL5_MAN3%%/Math::GSL::Wavelet2D.3.gz +man/man1/smolder_smoke_signal.1.gz @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet2D @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Wavelet @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GSL/Version From owner-svn-ports-branches@FreeBSD.ORG Mon Mar 3 12:33:45 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C619C511; Mon, 3 Mar 2014 12:33:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B0023369; Mon, 3 Mar 2014 12:33:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23CXjbq004175; Mon, 3 Mar 2014 12:33:45 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23CXi1P004167; Mon, 3 Mar 2014 12:33:44 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201403031233.s23CXi1P004167@svn.freebsd.org> From: Kubilay Kocak Date: Mon, 3 Mar 2014 12:33:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r346888 - in branches/2014Q1/lang: python27 python27/files python31 python31/files python32 python32/files python33 python33/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Mar 2014 12:33:45 -0000 Author: koobs Date: Mon Mar 3 12:33:43 2014 New Revision: 346888 URL: http://svnweb.freebsd.org/changeset/ports/346888 QAT: https://qat.redports.org/buildarchive/r346888/ Log: MFH: r346614 lang/python*: Backport security fix for CVE-2014-1912 A vulnerability was reported [1] in Python's socket module, due to a boundary error within the sock_recvfrom_into() function, which could be exploited to cause a buffer overflow. This could be used to crash a Python application that uses the socket.recvfrom_info() function or, possibly, execute arbitrary code with the permissions of the user running vulnerable Python code. This vulnerable function, socket.recvfrom_into(), was introduced in Python 2.5. Earlier versions are not affected by this flaw. This is fixed in upstream branches for version 2.7, 3.1, 3.2 and 3.3. [1] http://bugs.python.org/issue20246 Merge support: mat (thanks!) Approved by: portmgr (erwin) Security: 8e5e6d42-a0fa-11e3-b09a-080027f2d077 Added: branches/2014Q1/lang/python27/files/patch-CVE-2014-1912 - copied unchanged from r346614, head/lang/python27/files/patch-CVE-2014-1912 branches/2014Q1/lang/python31/files/patch-CVE-2014-1912 - copied unchanged from r346614, head/lang/python31/files/patch-CVE-2014-1912 branches/2014Q1/lang/python32/files/patch-CVE-2014-1912 - copied unchanged from r346614, head/lang/python32/files/patch-CVE-2014-1912 branches/2014Q1/lang/python33/files/patch-CVE-2014-1912 - copied unchanged from r346614, head/lang/python33/files/patch-CVE-2014-1912 Modified: branches/2014Q1/lang/python27/Makefile branches/2014Q1/lang/python31/Makefile branches/2014Q1/lang/python32/Makefile branches/2014Q1/lang/python33/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/lang/python27/Makefile ============================================================================== --- branches/2014Q1/lang/python27/Makefile Mon Mar 3 12:29:44 2014 (r346887) +++ branches/2014Q1/lang/python27/Makefile Mon Mar 3 12:33:43 2014 (r346888) @@ -3,7 +3,7 @@ PORTNAME= python27 PORTVERSION= 2.7.6 -PORTREVISION= 1 +PORTREVISION= 4 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} Copied: branches/2014Q1/lang/python27/files/patch-CVE-2014-1912 (from r346614, head/lang/python27/files/patch-CVE-2014-1912) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/python27/files/patch-CVE-2014-1912 Mon Mar 3 12:33:43 2014 (r346888, copy of r346614, head/lang/python27/files/patch-CVE-2014-1912) @@ -0,0 +1,50 @@ +# HG changeset patch +# User Benjamin Peterson +# Date 1389671978 18000 +# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9 +# Parent 2631d33ee7fbd5f0288931ef37872218d511d2e8 +complain when nbytes > buflen to fix possible buffer overflow (closes #20246) + +# HG changeset patch +# User Stefan Krah +# Date 1390341952 -3600 +# Node ID b6c5a37b221f5c617125faa363d1b460b0b61b42 +# Parent d55d1cbf5f9a9efa7908fc9412bae676a6b675ef +Issue #20246: Fix test failures on FreeBSD. Patch by Ryan Smith-Roberts. + +diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py +--- Lib/test/test_socket.py ++++ Lib/test/test_socket.py +@@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest): + + _testRecvFromIntoMemoryview = _testRecvFromIntoArray + ++ def testRecvFromIntoSmallBuffer(self): ++ # See issue #20246. ++ buf = bytearray(8) ++ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) ++ ++ def _testRecvFromIntoSmallBuffer(self): ++ with test_support.check_py3k_warnings(): ++ buf = buffer(MSG) ++ self.serv_conn.send(buf) ++ + + TIPC_STYPE = 2000 + TIPC_LOWER = 200 + +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +--- Modules/socketmodule.c ++++ Modules/socketmodule.c +@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s + if (recvlen == 0) { + /* If nbytes was not specified, use the buffer's length */ + recvlen = buflen; ++ } else if (recvlen > buflen) { ++ PyErr_SetString(PyExc_ValueError, ++ "nbytes is greater than the length of the buffer"); ++ goto error; + } + + readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr); + Modified: branches/2014Q1/lang/python31/Makefile ============================================================================== --- branches/2014Q1/lang/python31/Makefile Mon Mar 3 12:29:44 2014 (r346887) +++ branches/2014Q1/lang/python31/Makefile Mon Mar 3 12:33:43 2014 (r346888) @@ -2,7 +2,7 @@ PORTNAME= python31 PORTVERSION= 3.1.5 -PORTREVISION= 8 +PORTREVISION= 11 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} Copied: branches/2014Q1/lang/python31/files/patch-CVE-2014-1912 (from r346614, head/lang/python31/files/patch-CVE-2014-1912) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/python31/files/patch-CVE-2014-1912 Mon Mar 3 12:33:43 2014 (r346888, copy of r346614, head/lang/python31/files/patch-CVE-2014-1912) @@ -0,0 +1,50 @@ +# HG changeset patch +# User Benjamin Peterson +# Date 1389672374 18000 +# Node ID 715fd3d8ac93878e49a072474a4706a449720d9b +# Parent b1ddcb220a7f375146c090a854438cf31fa3a388# Parent 87673659d8f7ba1623cd4914f09ad3d2ade034e9 +complain when nbytes > buflen to fix possible buffer overflow (closes #20246) + +# HG changeset patch +# User Stefan Krah +# Date 1390341520 -3600 +# Node ID c25e1442529f16ba5fb9df8786a019866b0686e9 +# Parent fbb4d48046e564dd89511598dbbf04422ac6da35 +Issue #20246: Fix test failures on FreeBSD. Patch by Ryan Smith-Roberts. + +diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py +--- Lib/test/test_socket.py ++++ Lib/test/test_socket.py +@@ -1424,6 +1424,14 @@ class BufferIOTest(SocketConnectedTest): + buf = bytes(MSG) + self.serv_conn.send(buf) + ++ def testRecvFromIntoSmallBuffer(self): ++ # See issue #20246. ++ buf = bytearray(8) ++ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) ++ ++ def _testRecvFromIntoSmallBuffer(self): ++ self.serv_conn.send(MSG) ++ + + TIPC_STYPE = 2000 + TIPC_LOWER = 200 + +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +--- Modules/socketmodule.c ++++ Modules/socketmodule.c +@@ -2494,6 +2494,12 @@ sock_recvfrom_into(PySocketSockObject *s + if (recvlen == 0) { + /* If nbytes was not specified, use the buffer's length */ + recvlen = buflen; ++ } else if (recvlen > buflen) { ++ PyBuffer_Release(&pbuf); ++ Py_XDECREF(addr); ++ PyErr_SetString(PyExc_ValueError, ++ "nbytes is greater than the length of the buffer"); ++ return NULL; + } + + readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr); + Modified: branches/2014Q1/lang/python32/Makefile ============================================================================== --- branches/2014Q1/lang/python32/Makefile Mon Mar 3 12:29:44 2014 (r346887) +++ branches/2014Q1/lang/python32/Makefile Mon Mar 3 12:33:43 2014 (r346888) @@ -2,7 +2,7 @@ PORTNAME= python32 PORTVERSION= 3.2.5 -PORTREVISION= 6 +PORTREVISION= 8 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} Copied: branches/2014Q1/lang/python32/files/patch-CVE-2014-1912 (from r346614, head/lang/python32/files/patch-CVE-2014-1912) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/python32/files/patch-CVE-2014-1912 Mon Mar 3 12:33:43 2014 (r346888, copy of r346614, head/lang/python32/files/patch-CVE-2014-1912) @@ -0,0 +1,49 @@ +# HG changeset patch +# User Benjamin Peterson +# Date 1389671978 18000 +# Node ID 9c56217e5c793685eeaf0ee224848c402bdf1e4c +# Parent 2b5cd6d4d149dea6c6941b7e07ada248b29fc9f6 +complain when nbytes > buflen to fix possible buffer overflow (closes #20246) + +# HG changeset patch +# User Stefan Krah +# Date 1390341520 -3600 +# Node ID e82dcd700e8cfb174d6bf6031fd6666627b20f5f +# Parent 29b1eebecb8ed946e1db8e4bb86310d681cf4a91 +Issue #20246: Fix test failures on FreeBSD. Patch by Ryan Smith-Roberts. + +diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py +--- Lib/test/test_socket.py ++++ Lib/test/test_socket.py +@@ -1968,6 +1968,14 @@ class BufferIOTest(SocketConnectedTest): + + _testRecvFromIntoMemoryview = _testRecvFromIntoArray + ++ def testRecvFromIntoSmallBuffer(self): ++ # See issue #20246. ++ buf = bytearray(8) ++ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) ++ ++ def _testRecvFromIntoSmallBuffer(self): ++ self.serv_conn.send(MSG) ++ + + TIPC_STYPE = 2000 + TIPC_LOWER = 200 + +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +--- Modules/socketmodule.c ++++ Modules/socketmodule.c +@@ -2598,6 +2598,11 @@ sock_recvfrom_into(PySocketSockObject *s + if (recvlen == 0) { + /* If nbytes was not specified, use the buffer's length */ + recvlen = buflen; ++ } else if (recvlen > buflen) { ++ PyBuffer_Release(&pbuf); ++ PyErr_SetString(PyExc_ValueError, ++ "nbytes is greater than the length of the buffer"); ++ return NULL; + } + + readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr); + Modified: branches/2014Q1/lang/python33/Makefile ============================================================================== --- branches/2014Q1/lang/python33/Makefile Mon Mar 3 12:29:44 2014 (r346887) +++ branches/2014Q1/lang/python33/Makefile Mon Mar 3 12:33:43 2014 (r346888) @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= 3.3.3 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} Copied: branches/2014Q1/lang/python33/files/patch-CVE-2014-1912 (from r346614, head/lang/python33/files/patch-CVE-2014-1912) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/lang/python33/files/patch-CVE-2014-1912 Mon Mar 3 12:33:43 2014 (r346888, copy of r346614, head/lang/python33/files/patch-CVE-2014-1912) @@ -0,0 +1,49 @@ +# HG changeset patch +# User Benjamin Peterson +# Date 1389672775 18000 +# Node ID 7f176a45211ff3cb85a2fbdc75f7979d642bb563 +# Parent ed1c27b68068c942c6e845bdf8e987e963d50920# Parent 9c56217e5c793685eeaf0ee224848c402bdf1e4c +merge 3.2 (#20246) + +# HG changeset patch +# User Stefan Krah +# Date 1390341520 -3600 +# Node ID 5c4f4db8107cc7b99e0a4e9c7b760c816dafa034 +# Parent 2fe0b2dcc98cd9013642fb9642365de80ff0dc30 +Issue #20246: Fix test failures on FreeBSD. Patch by Ryan Smith-Roberts. + +diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py +--- Lib/test/test_socket.py ++++ Lib/test/test_socket.py +@@ -4538,6 +4538,14 @@ class BufferIOTest(SocketConnectedTest): + + _testRecvFromIntoMemoryview = _testRecvFromIntoArray + ++ def testRecvFromIntoSmallBuffer(self): ++ # See issue #20246. ++ buf = bytearray(8) ++ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) ++ ++ def _testRecvFromIntoSmallBuffer(self): ++ self.serv_conn.send(MSG) ++ + + TIPC_STYPE = 2000 + TIPC_LOWER = 200 + +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +--- Modules/socketmodule.c ++++ Modules/socketmodule.c +@@ -2935,6 +2935,11 @@ sock_recvfrom_into(PySocketSockObject *s + if (recvlen == 0) { + /* If nbytes was not specified, use the buffer's length */ + recvlen = buflen; ++ } else if (recvlen > buflen) { ++ PyBuffer_Release(&pbuf); ++ PyErr_SetString(PyExc_ValueError, ++ "nbytes is greater than the length of the buffer"); ++ return NULL; + } + + readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr); + From owner-svn-ports-branches@FreeBSD.ORG Tue Mar 4 22:47:16 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0EE91DD4; Tue, 4 Mar 2014 22:47:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EEDFA7C2; Tue, 4 Mar 2014 22:47:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s24MlFZE052869; Tue, 4 Mar 2014 22:47:15 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s24MlFXi052868; Tue, 4 Mar 2014 22:47:15 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201403042247.s24MlFXi052868@svn.freebsd.org> From: Bryan Drewery Date: Tue, 4 Mar 2014 22:47:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347079 - branches/2014Q1/security/gnutls-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 22:47:16 -0000 Author: bdrewery Date: Tue Mar 4 22:47:15 2014 New Revision: 347079 URL: http://svnweb.freebsd.org/changeset/ports/347079 QAT: https://qat.redports.org/buildarchive/r347079/ Log: MFH: r347077 - Mark FORBIDDEN and deprecate With hat: portmgr Modified: branches/2014Q1/security/gnutls-devel/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/gnutls-devel/Makefile ============================================================================== --- branches/2014Q1/security/gnutls-devel/Makefile Tue Mar 4 22:46:55 2014 (r347078) +++ branches/2014Q1/security/gnutls-devel/Makefile Tue Mar 4 22:47:15 2014 (r347079) @@ -12,6 +12,11 @@ PKGNAMESUFFIX= -devel MAINTAINER= novel@FreeBSD.org COMMENT= GNU Transport Layer Security library +BROKEN= Does not build +FORBIDDEN= Vulnerable to CVE-2014-0092 +DEPRECATED= Stale, broken and vulnerable +EXPIRATION_DATE= 2014-04-01 + LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error \ nettle.4:${PORTSDIR}/security/nettle \ p11-kit.0:${PORTSDIR}/security/p11-kit From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 5 18:57:05 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 193E5178; Wed, 5 Mar 2014 18:57:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 06032E89; Wed, 5 Mar 2014 18:57:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25Iv4NT048920; Wed, 5 Mar 2014 18:57:04 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25Iv4bl048919; Wed, 5 Mar 2014 18:57:04 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201403051857.s25Iv4bl048919@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Wed, 5 Mar 2014 18:57:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347133 - branches/2014Q1/databases/slony1/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 18:57:05 -0000 Author: rm Date: Wed Mar 5 18:57:04 2014 New Revision: 347133 URL: http://svnweb.freebsd.org/changeset/ports/347133 QAT: https://qat.redports.org/buildarchive/r347133/ Log: MFH: r340895 Fix databases/slony1 to compile on FreeBSD 10. PR: ports/186048 Submitted by: maintainer Approved by: portmgr (miwi) Added: branches/2014Q1/databases/slony1/files/patch-slonik-Makefile.patch - copied unchanged from r340895, head/databases/slony1/files/patch-slonik-Makefile.patch Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/databases/slony1/files/patch-slonik-Makefile.patch (from r340895, head/databases/slony1/files/patch-slonik-Makefile.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/databases/slony1/files/patch-slonik-Makefile.patch Wed Mar 5 18:57:04 2014 (r347133, copy of r340895, head/databases/slony1/files/patch-slonik-Makefile.patch) @@ -0,0 +1,11 @@ +--- src/slonik/Makefile.orig 2014-01-23 14:14:12.352062131 -0500 ++++ src/slonik/Makefile 2014-01-23 14:14:12.352750379 -0500 +@@ -18,7 +18,7 @@ + + CFLAGS += -I$(slony_top_builddir) -DPGSHARE="\"$(pgsharedir)\"" -DPG_VERSION_MAJOR=$(PG_VERSION_MAJOR) + ifneq ($(PG_VERSION_MAJOR), 7) +-LDFLAGS += -lpgport ++LDFLAGS += `$(pgbindir)/pg_config --libs` + endif + + PROG = slonik From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 5 19:00:06 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF90C383; Wed, 5 Mar 2014 19:00:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B04A0EB9; Wed, 5 Mar 2014 19:00:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25J06Kr049592; Wed, 5 Mar 2014 19:00:06 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25J06Gl049590; Wed, 5 Mar 2014 19:00:06 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201403051900.s25J06Gl049590@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Wed, 5 Mar 2014 19:00:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347134 - branches/2014Q1/mail/p5-Mail-OpenDKIM X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 19:00:07 -0000 Author: rm Date: Wed Mar 5 19:00:06 2014 New Revision: 347134 URL: http://svnweb.freebsd.org/changeset/ports/347134 QAT: https://qat.redports.org/buildarchive/r347134/ Log: MFH: r342288 - Update to version 4201 fixes compile and core-dump errors on FreeBSD 10 using clang While I'm here: - add stage support - add p5-Error in RUN_DEPENDS PR: ports/186039 Submitted by: maintainer Approved by: portmgr (miwi) Modified: branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile branches/2014Q1/mail/p5-Mail-OpenDKIM/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile ============================================================================== --- branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile Wed Mar 5 18:57:04 2014 (r347133) +++ branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile Wed Mar 5 19:00:06 2014 (r347134) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Mail-OpenDKIM -PORTVERSION= 4040 +PORTVERSION= 4201 CATEGORIES= mail perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,16 +15,12 @@ LICENSE_COMB= dual BUILD_DEPENDS= opendkim>=2.5.0:${PORTSDIR}/mail/opendkim LIB_DEPENDS= opendkim:${PORTSDIR}/mail/opendkim -RUN_DEPENDS= opendkim>=2.5.0:${PORTSDIR}/mail/opendkim -TEST_DEPENDS= p5-Error>=0:${PORTSDIR}/lang/p5-Error \ - p5-Test-Kwalitee>=0:${PORTSDIR}/devel/p5-Test-Kwalitee +RUN_DEPENDS= opendkim>=2.5.0:${PORTSDIR}/mail/opendkim \ + p5-Error>=0:${PORTSDIR}/lang/p5-Error USES= perl5 USE_PERL5= configure -MAN3= Mail::OpenDKIM.3 Mail::OpenDKIM::DKIM.3 \ - Mail::OpenDKIM::PrivateKey.3 Mail::OpenDKIM::Signature.3 \ - Mail::OpenDKIM::Signer.3 PLIST_FILES= %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM.pm \ %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/DKIM.pm \ %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/PrivateKey.pm \ @@ -32,11 +28,13 @@ PLIST_FILES= %%SITE_PERL%%/%%PERL_ARCH%% %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM/Signer.pm \ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/.packlist \ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.bs \ - %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.so + %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.so \ + %%PERL5_MAN3%%/Mail::OpenDKIM.3 Mail::OpenDKIM::DKIM.3.gz \ + %%PERL5_MAN3%%/Mail::OpenDKIM::PrivateKey.3 Mail::OpenDKIM::Signature.3.gz \ + %%PERL5_MAN3%%/Mail::OpenDKIM::Signer.3.gz PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM \ %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM PLIST_DIRSTRY= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail \ %%SITE_PERL%%/%%PERL_ARCH%%/Mail -NO_STAGE= yes .include Modified: branches/2014Q1/mail/p5-Mail-OpenDKIM/distinfo ============================================================================== --- branches/2014Q1/mail/p5-Mail-OpenDKIM/distinfo Wed Mar 5 18:57:04 2014 (r347133) +++ branches/2014Q1/mail/p5-Mail-OpenDKIM/distinfo Wed Mar 5 19:00:06 2014 (r347134) @@ -1,2 +1,2 @@ -SHA256 (Mail-OpenDKIM-4040.tar.gz) = e95895313895aa7b65bd65a1be7148ac539bb08a8749d60fe8159ca486baed00 -SIZE (Mail-OpenDKIM-4040.tar.gz) = 31534 +SHA256 (Mail-OpenDKIM-4201.tar.gz) = 04cc1b42167fbd55f0db2676d4f6748d090aaf023e816393eb7bb81e8a6cbd91 +SIZE (Mail-OpenDKIM-4201.tar.gz) = 32447 From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 5 19:02:09 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7002050A; Wed, 5 Mar 2014 19:02:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C5A1F4B; Wed, 5 Mar 2014 19:02:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25J29BS052768; Wed, 5 Mar 2014 19:02:09 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25J29TM052767; Wed, 5 Mar 2014 19:02:09 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201403051902.s25J29TM052767@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Wed, 5 Mar 2014 19:02:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347135 - branches/2014Q1/mail/p5-Mail-OpenDKIM X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 19:02:09 -0000 Author: rm Date: Wed Mar 5 19:02:08 2014 New Revision: 347135 URL: http://svnweb.freebsd.org/changeset/ports/347135 QAT: https://qat.redports.org/buildarchive/r347135/ Log: MFH: r342293 - Fix typos Approved by: portmgr (miwi) Modified: branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile ============================================================================== --- branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile Wed Mar 5 19:00:06 2014 (r347134) +++ branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile Wed Mar 5 19:02:08 2014 (r347135) @@ -29,8 +29,10 @@ PLIST_FILES= %%SITE_PERL%%/%%PERL_ARCH%% %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/.packlist \ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.bs \ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.so \ - %%PERL5_MAN3%%/Mail::OpenDKIM.3 Mail::OpenDKIM::DKIM.3.gz \ - %%PERL5_MAN3%%/Mail::OpenDKIM::PrivateKey.3 Mail::OpenDKIM::Signature.3.gz \ + %%PERL5_MAN3%%/Mail::OpenDKIM.3.gz \ + %%PERL5_MAN3%%/Mail::OpenDKIM::DKIM.3.gz \ + %%PERL5_MAN3%%/Mail::OpenDKIM::PrivateKey.3 \ + %%PERL5_MAN3%%/Mail::OpenDKIM::Signature.3.gz \ %%PERL5_MAN3%%/Mail::OpenDKIM::Signer.3.gz PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM \ %%SITE_PERL%%/%%PERL_ARCH%%/Mail/OpenDKIM From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 5 19:04:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E5BC6CB; Wed, 5 Mar 2014 19:04:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5B377F98; Wed, 5 Mar 2014 19:04:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25J47Aw053079; Wed, 5 Mar 2014 19:04:07 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25J475v053078; Wed, 5 Mar 2014 19:04:07 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201403051904.s25J475v053078@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Wed, 5 Mar 2014 19:04:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347136 - branches/2014Q1/mail/p5-Mail-OpenDKIM X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 19:04:07 -0000 Author: rm Date: Wed Mar 5 19:04:06 2014 New Revision: 347136 URL: http://svnweb.freebsd.org/changeset/ports/347136 QAT: https://qat.redports.org/buildarchive/r347136/ Log: MFH: r342299 - Fix after stage support Approved by: portmgr (miwi) Modified: branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile ============================================================================== --- branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile Wed Mar 5 19:02:08 2014 (r347135) +++ branches/2014Q1/mail/p5-Mail-OpenDKIM/Makefile Wed Mar 5 19:04:06 2014 (r347136) @@ -31,7 +31,7 @@ PLIST_FILES= %%SITE_PERL%%/%%PERL_ARCH%% %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM/OpenDKIM.so \ %%PERL5_MAN3%%/Mail::OpenDKIM.3.gz \ %%PERL5_MAN3%%/Mail::OpenDKIM::DKIM.3.gz \ - %%PERL5_MAN3%%/Mail::OpenDKIM::PrivateKey.3 \ + %%PERL5_MAN3%%/Mail::OpenDKIM::PrivateKey.3.gz \ %%PERL5_MAN3%%/Mail::OpenDKIM::Signature.3.gz \ %%PERL5_MAN3%%/Mail::OpenDKIM::Signer.3.gz PLIST_DIRS= %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/OpenDKIM \ From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 11:22:03 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0DE87D7B; Thu, 6 Mar 2014 11:22:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D6A51386; Thu, 6 Mar 2014 11:22:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26BM2fD055409; Thu, 6 Mar 2014 11:22:02 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26BM2Lw055407; Thu, 6 Mar 2014 11:22:02 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403061122.s26BM2Lw055407@svn.freebsd.org> From: Rene Ladan Date: Thu, 6 Mar 2014 11:22:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347181 - branches/2014Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 11:22:03 -0000 Author: rene Date: Thu Mar 6 11:22:02 2014 New Revision: 347181 URL: http://svnweb.freebsd.org/changeset/ports/347181 QAT: https://qat.redports.org/buildarchive/r347181/ Log: MFH: r347165 www/chromium: Update to 33.0.1750.146 Security: http://vuxml.org/freebsd/b4023753-a4ba-11e3-bec2-00262d5ed8ee.html Approved by: portmgr (erwin) Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Thu Mar 6 11:11:03 2014 (r347180) +++ branches/2014Q1/www/chromium/Makefile Thu Mar 6 11:22:02 2014 (r347181) @@ -5,8 +5,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 33.0.1750.117 -PORTREVISION= 1 +DISTVERSION= 33.0.1750.146 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ http://download.goodking.org/downloads/:browser \ Modified: branches/2014Q1/www/chromium/distinfo ============================================================================== --- branches/2014Q1/www/chromium/distinfo Thu Mar 6 11:11:03 2014 (r347180) +++ branches/2014Q1/www/chromium/distinfo Thu Mar 6 11:22:02 2014 (r347181) @@ -1,4 +1,4 @@ -SHA256 (chromium-courgette-redacted-33.0.1750.117.tar.xz) = a014a02b432f79d548d9d426a5506af827f7d8e436b2eeff7a481118b0ba5669 -SIZE (chromium-courgette-redacted-33.0.1750.117.tar.xz) = 197160536 -SHA256 (chromium-33.0.1750.117-testdata.tar.xz) = 45a7c3e8c1a21f117af9da279b7b7083c49cd808fcd6efdecf6845e96b7abb5f -SIZE (chromium-33.0.1750.117-testdata.tar.xz) = 112416232 +SHA256 (chromium-courgette-redacted-33.0.1750.146.tar.xz) = 8030316421e197de8ce7a0fa7dcb3809e3abff5c87dbd599531cc254ec527e6f +SIZE (chromium-courgette-redacted-33.0.1750.146.tar.xz) = 197160536 +SHA256 (chromium-33.0.1750.146-testdata.tar.xz) = 918ccc080788ea9b8eba2e479b521c22b37b14c62d4bc0906d7f15a88f12c84c +SIZE (chromium-33.0.1750.146-testdata.tar.xz) = 112429020 From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 11:35:20 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1B8876; Thu, 6 Mar 2014 11:35:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 82BF66C5; Thu, 6 Mar 2014 11:35:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26BZKBV059816; Thu, 6 Mar 2014 11:35:20 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26BZKfT059814; Thu, 6 Mar 2014 11:35:20 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403061135.s26BZKfT059814@svn.freebsd.org> From: Rene Ladan Date: Thu, 6 Mar 2014 11:35:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347182 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 11:35:20 -0000 Author: rene Date: Thu Mar 6 11:35:19 2014 New Revision: 347182 URL: http://svnweb.freebsd.org/changeset/ports/347182 QAT: https://qat.redports.org/buildarchive/r347182/ Log: MFH: r347154 Document new vulnerabilities in www/chromium < 33.0.1750.146 Obtained from: http://googlechromereleases.blogspot.nl/ MFH: r347080 MFH: r347076 security/gnutls for CVE-2014-0092 and CVE-2014-1959 MFH: r346908 Add an entry for the file DOS vulnerability, CVE-2014-1943 Approved by: portmgr (bapt) Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Thu Mar 6 11:22:02 2014 (r347181) +++ branches/2014Q1/security/vuxml/vuln.xml Thu Mar 6 11:35:19 2014 (r347182) @@ -51,6 +51,127 @@ Note: Please add new entries to the beg --> + + chromium -- multiple vulnerabilities + + + chromium + 33.0.1750.146 + + + + +

Google Chrome Releases reports:

+
+

19 vulnerabilities fixed in this release, including:

+
    +
  • [344492] High CVE-2013-6663: Use-after-free in svg images. + Credit to Atte Kettunen of OUSPG.
  • +
  • [326854] High CVE-2013-6664: Use-after-free in speech + recognition. Credit to Khalil Zhani.
  • +
  • [337882] High CVE-2013-6665: Heap buffer overflow in software + rendering. Credit to cloudfuzzer.
  • +
  • [332023] Medium CVE-2013-6666: Chrome allows requests in flash + header request. Credit to netfuzzerr.
  • +
  • [348175] CVE-2013-6667: Various fixes from internal audits, + fuzzing and other initiatives.
  • +
  • [343964, 344186, 347909] CVE-2013-6668: Multiple + vulnerabilities in V8 fixed in version 3.24.35.10.
  • +
+
+ +
+ + CVE-2013-6663 + CVE-2013-6664 + CVE-2013-6665 + CVE-2013-6666 + CVE-2013-6667 + CVE-2013-6668 + http://googlechromereleases.blogspot.nl/ + + + 2014-03-03 + 2014-03-05 + +
+ + + gnutls -- multiple certificate verification issues + + + gnutls + 2.12.23_4 + + + gnutls-devel + gnutls3 + 3.1.22 + 3.2.03.2.12 + + + + +

GnuTLS project reports:

+
+

A vulnerability was discovered that affects the + certificate verification functions of all gnutls + versions. A specially crafted certificate could + bypass certificate validation checks. The + vulnerability was discovered during an audit of + GnuTLS for Red Hat.

+
+
+

Suman Jana reported a vulnerability that affects + the certificate verification functions of + gnutls 2.11.5 and later versions. A version 1 + intermediate certificate will be considered as + a CA certificate by default (something that + deviates from the documented behavior).

+
+ +
+ + CVE-2014-0092 + CVE-2014-1959 + http://www.gnutls.org/security.html#GNUTLS-SA-2014-1 + http://www.gnutls.org/security.html#GNUTLS-SA-2014-2 + + + 2014-03-03 + 2014-03-04 + 2014-03-04 + +
+ + + file -- denial of service + + + file + 5.17 + + + + +

The Fine Free file project reports:

+
+

... file before 5.17 allows context-dependent attackers to + cause a denial of service (infinite recursion, CPU consumption, and + crash) via a crafted indirect offset value in the magic of a file.

+
+ +
+ + CVE-2014-1943 + http://mx.gw.com/pipermail/file/2014/001327.html + + + 2014-02-16 + 2014-03-03 + +
+ Python -- buffer overflow in socket.recvfrom_into() From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 13:14:21 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC09E4C3; Thu, 6 Mar 2014 13:14:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E6C1100; Thu, 6 Mar 2014 13:14:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26DELl8000955; Thu, 6 Mar 2014 13:14:21 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26DELUt000954; Thu, 6 Mar 2014 13:14:21 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403061314.s26DELUt000954@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 6 Mar 2014 13:14:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347195 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 13:14:21 -0000 Author: bapt Date: Thu Mar 6 13:14:20 2014 New Revision: 347195 URL: http://svnweb.freebsd.org/changeset/ports/347195 QAT: https://qat.redports.org/buildarchive/r347195/ Log: MFH: r347158 Add security advisory for nginx-1.5.10. Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Thu Mar 6 13:11:12 2014 (r347194) +++ branches/2014Q1/security/vuxml/vuln.xml Thu Mar 6 13:14:20 2014 (r347195) @@ -51,6 +51,40 @@ Note: Please add new entries to the beg --> + + nginx -- SPDY memory corruption + + + nginx-devel + 1.5.10 + + + + +

The nginx project reports:

+
+

A bug in the experimental SPDY implementation in nginx 1.5.10 was found, + which might allow an attacker to corrupt worker process memory by using + a specially crafted request, potentially resulting in arbitrary code + execution (CVE-2014-0088).

+ +

The problem only affects nginx 1.5.10 on 32-bit platforms, compiled with + the ngx_http_spdy_module module (which is not compiled by default), if + the "spdy" option of the "listen" directive is used in a configuration + file.

+
+ +
+ + CVE-2014-0088 + http://mailman.nginx.org/pipermail/nginx-announce/2014/000132.html + + + 2014-03-04 + 2014-03-06 + +
+ chromium -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 13:25:29 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A538EF6; Thu, 6 Mar 2014 13:25:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2EF8D239; Thu, 6 Mar 2014 13:25:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26DPTbQ005509; Thu, 6 Mar 2014 13:25:29 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26DPSiQ005507; Thu, 6 Mar 2014 13:25:28 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403061325.s26DPSiQ005507@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 6 Mar 2014 13:25:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347197 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 13:25:29 -0000 Author: bapt Date: Thu Mar 6 13:25:28 2014 New Revision: 347197 URL: http://svnweb.freebsd.org/changeset/ports/347197 QAT: https://qat.redports.org/buildarchive/r347197/ Log: MFH: r347193 Reference xmms vulnerabilities: CVE-2007-0653 and CVE-2007-0654 Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Thu Mar 6 13:17:49 2014 (r347196) +++ branches/2014Q1/security/vuxml/vuln.xml Thu Mar 6 13:25:28 2014 (r347197) @@ -51,6 +51,46 @@ Note: Please add new entries to the beg --> + + xmms -- Integer Overflow And Underflow Vulnerabilities + + + xmms + 1.2.11_20 + + + + +

Secunia reports:

+
+

Secunia Research has discovered two vulnerabilities in XMMS, which can + be exploited by malicious people to compromise a user's system.

+ +

1) An integer underflow error exists in the processing of skin bitmap + images. This can be exploited to cause a stack-based buffer overflow + via specially crafted skin images containing manipulated header + information.

+ +

Successful exploitation allows execution of arbitrary code.

+ +

2) An integer overflow error exists in the processing of skin bitmap + images. This can be exploited to cause memory corruption via specially + crafted skin images containing manipulated header information.

+ +

Successful exploitation may allow the execution of arbitrary code.

+
+ +
+ + CVE-2007-0653 + CVE-2007-0654 + + + 2007-02-06 + 2014-03-06 + +
+ nginx -- SPDY memory corruption From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 13:52:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62269EC3; Thu, 6 Mar 2014 13:52:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 41C26776; Thu, 6 Mar 2014 13:52:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26DqbCh017616; Thu, 6 Mar 2014 13:52:37 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26DqacA017614; Thu, 6 Mar 2014 13:52:36 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403061352.s26DqacA017614@svn.freebsd.org> From: Rene Ladan Date: Thu, 6 Mar 2014 13:52:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347199 - in branches/2014Q1/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 13:52:37 -0000 Author: rene Date: Thu Mar 6 13:52:36 2014 New Revision: 347199 URL: http://svnweb.freebsd.org/changeset/ports/347199 QAT: https://qat.redports.org/buildarchive/r347199/ Log: MFH: r347055 Fix build on 8.4 (which uses GCC now because of c++11-lib) Instead of removing the -Wno-unknown-warning-option, split this out in a Clang specific version and a GCC specific version (yay). Submitted by: George Mitchell via freebsd-ports Approved by: portmgr (erwin, miwi) Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/files/extra-patch-gcc Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Thu Mar 6 13:34:59 2014 (r347198) +++ branches/2014Q1/www/chromium/Makefile Thu Mar 6 13:52:36 2014 (r347199) @@ -20,7 +20,7 @@ LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} -CFLAGS+= -fno-stack-protector -Wno-unknown-warning-option +CFLAGS+= -fno-stack-protector BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ @@ -148,12 +148,6 @@ CONFIGURE_ENV+= CC=${CC} \ CXX=${CXX} \ GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" -# according to portlint the below is passed via bsd.port.mk, -# but 'make -V CONFIGURE_ENV' does not show it: -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF=${LOCALBASE}/bin/gperf MAKE_ARGS+= -C out/${BUILDTYPE} @@ -162,13 +156,22 @@ MAKE_ARGS+= -C out/${BUILDTYPE} .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} +CFLAGS+= -Wno-unknown-warning EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc .else GYP_DEFINES+= clang=1 +CFLAGS+= -Wno-unknown-warning-option EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang CONFIGURE_ENV+= AR=/usr/bin/ar .endif +# according to portlint the below is passed via bsd.port.mk, +# but 'make -V CONFIGURE_ENV' does not show it: +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory" Modified: branches/2014Q1/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2014Q1/www/chromium/files/extra-patch-gcc Thu Mar 6 13:34:59 2014 (r347198) +++ branches/2014Q1/www/chromium/files/extra-patch-gcc Thu Mar 6 13:52:36 2014 (r347199) @@ -50,3 +50,15 @@ #if HAVE_SCHED_GETAFFINITY #ifndef _GNU_SOURCE # define _GNU_SOURCE +--- content/browser/browser_shutdown_profile_dumper.cc.orig 2014-02-20 15:28:24.000000000 -0500 ++++ content/browser/browser_shutdown_profile_dumper.cc 2014-03-03 15:36:33.000000000 -0500 +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "content/browser/browser_shutdown_profile_dumper.h" + + #include "base/base_switches.h" + From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 13:54:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73EDEFE5; Thu, 6 Mar 2014 13:54:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 609B9791; Thu, 6 Mar 2014 13:54:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26DsS47017902; Thu, 6 Mar 2014 13:54:28 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26DsSQN017901; Thu, 6 Mar 2014 13:54:28 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403061354.s26DsSQN017901@svn.freebsd.org> From: Rene Ladan Date: Thu, 6 Mar 2014 13:54:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347200 - branches/2014Q1/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 13:54:28 -0000 Author: rene Date: Thu Mar 6 13:54:27 2014 New Revision: 347200 URL: http://svnweb.freebsd.org/changeset/ports/347200 QAT: https://qat.redports.org/buildarchive/r347200/ Log: MFH: r347098 Forgot to commit a chunk for extra-patch-gcc in r347055 Approved by: portmgr (erwin, miwi) Modified: branches/2014Q1/www/chromium/files/extra-patch-gcc Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2014Q1/www/chromium/files/extra-patch-gcc Thu Mar 6 13:52:36 2014 (r347199) +++ branches/2014Q1/www/chromium/files/extra-patch-gcc Thu Mar 6 13:54:27 2014 (r347200) @@ -61,4 +61,28 @@ #include "content/browser/browser_shutdown_profile_dumper.h" #include "base/base_switches.h" - +--- testing/perf/perf_test.cc 2014-03-03 12:59:30.000000000 -0500 ++++ testing/perf/perf_test.cc.orig 2014-02-20 15:28:27.000000000 -0500 +@@ -2,10 +2,10 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "testing/perf/perf_test.h" + +-#include +- + #include "base/logging.h" + #include "base/strings/string_number_conversions.h" + #include "base/strings/stringprintf.h" +--- ui/gfx/codec/jpeg_codec.cc.orig 2014-02-20 15:27:56.000000000 -0500 ++++ ui/gfx/codec/jpeg_codec.cc 2014-03-03 14:33:42.000000000 -0500 +@@ -15,6 +15,7 @@ + #if defined(USE_SYSTEM_LIBJPEG) + #include + #elif defined(USE_LIBJPEG_TURBO) ++#include + #include "third_party/libjpeg_turbo/jpeglib.h" + #else + #include "third_party/libjpeg/jpeglib.h" From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 16:43:24 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF3FB66B; Thu, 6 Mar 2014 16:43:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D022BBE3; Thu, 6 Mar 2014 16:43:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26GhNbE092347; Thu, 6 Mar 2014 16:43:23 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26GhN1F092345; Thu, 6 Mar 2014 16:43:23 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403061643.s26GhN1F092345@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Thu, 6 Mar 2014 16:43:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347275 - branches/2014Q1/databases/kyototycoon X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 16:43:24 -0000 Author: sunpoet Date: Thu Mar 6 16:43:23 2014 New Revision: 347275 URL: http://svnweb.freebsd.org/changeset/ports/347275 QAT: https://qat.redports.org/buildarchive/r347275/ Log: MFH: r337639 - Use USE_GCC=any - Add missing USES=pkgconfig - Remove deprecated PTHREAD_* - Strip binary executable and shared library - Support STAGEDIR Approved by: portmgr (mat, via IRC) Modified: branches/2014Q1/databases/kyototycoon/Makefile branches/2014Q1/databases/kyototycoon/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/kyototycoon/Makefile ============================================================================== --- branches/2014Q1/databases/kyototycoon/Makefile Thu Mar 6 16:40:56 2014 (r347274) +++ branches/2014Q1/databases/kyototycoon/Makefile Thu Mar 6 16:43:23 2014 (r347275) @@ -17,39 +17,35 @@ LIB_DEPENDS= libkyotocabinet.so:${PORTSD OPTIONS_DEFINE= DOCS CONFIGURE_ARGS= --enable-profile --enable-uyield +CPPFLAGS+= -fPIC GNU_CONFIGURE= yes -MAKE_ARGS= PCDIR="${PREFIX}/libdata/pkgconfig" +MAKE_ARGS= PCDIR=${PREFIX}/libdata/pkgconfig +REINPLACE_ARGS= -i '' +USE_GCC= any USE_LDCONFIG= yes -USES= gmake +USES= gmake pkgconfig -MAN1= ktremotemgr.1 \ - ktremotetest.1 \ - ktserver.1 \ - kttimedmgr.1 \ - kttimedtest.1 \ - ktutilmgr.1 \ - ktutilserv.1 \ - ktutiltest.1 - -NO_STAGE= yes -.include +.include post-patch: + @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile .if !${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/DOCDIR/d' ${WRKSRC}/Makefile.in .endif -post-configure: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile +post-build: + @cd ${WRKSRC}/ && ${STRIP_CMD} ktplugdbvoid.so ktplugservmemc.so \ + ktremotemgr ktremotetest ktserver kttimedmgr kttimedtest \ + ktutilmgr ktutilserv ktutiltest post-install: .if ${PORT_OPTIONS:MDOCS} - ${FIND} ${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \; - ${FIND} ${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \; - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/ + ${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \; + ${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \; + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}/ .endif regression-test test: build cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE} check -.include +.include Modified: branches/2014Q1/databases/kyototycoon/pkg-plist ============================================================================== --- branches/2014Q1/databases/kyototycoon/pkg-plist Thu Mar 6 16:40:56 2014 (r347274) +++ branches/2014Q1/databases/kyototycoon/pkg-plist Thu Mar 6 16:43:23 2014 (r347275) @@ -23,6 +23,14 @@ lib/libkyototycoon.a libdata/pkgconfig/kyototycoon.pc libexec/ktplugdbvoid.so libexec/ktplugservmemc.so +man/man1/ktremotemgr.1.gz +man/man1/ktremotetest.1.gz +man/man1/ktserver.1.gz +man/man1/kttimedmgr.1.gz +man/man1/kttimedtest.1.gz +man/man1/ktutilmgr.1.gz +man/man1/ktutilserv.1.gz +man/man1/ktutiltest.1.gz %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/doc/api/annotated.html From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 16:44:34 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 959A1784; Thu, 6 Mar 2014 16:44:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 81D8EBF8; Thu, 6 Mar 2014 16:44:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26GiYb8092634; Thu, 6 Mar 2014 16:44:34 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26GiYnA092633; Thu, 6 Mar 2014 16:44:34 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403061644.s26GiYnA092633@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Thu, 6 Mar 2014 16:44:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347276 - in branches/2014Q1/databases/kyototycoon: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 16:44:34 -0000 Author: sunpoet Date: Thu Mar 6 16:44:34 2014 New Revision: 347276 URL: http://svnweb.freebsd.org/changeset/ports/347276 QAT: https://qat.redports.org/buildarchive/r347276/ Log: MFH: r338064 - Allow build with clang [1] - Remove explicit -lstdc++ - Bump PORTREVISION for package change Submitted by: vanilla [1] Approved by: portmgr (mat, via IRC) Added: branches/2014Q1/databases/kyototycoon/files/ - copied from r338064, head/databases/kyototycoon/files/ Modified: branches/2014Q1/databases/kyototycoon/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/kyototycoon/Makefile ============================================================================== --- branches/2014Q1/databases/kyototycoon/Makefile Thu Mar 6 16:43:23 2014 (r347275) +++ branches/2014Q1/databases/kyototycoon/Makefile Thu Mar 6 16:44:34 2014 (r347276) @@ -3,6 +3,7 @@ PORTNAME= kyototycoon PORTVERSION= 0.9.56 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://fallabs.com/${PORTNAME}/pkg/ \ LOCAL/sunpoet @@ -16,19 +17,18 @@ LIB_DEPENDS= libkyotocabinet.so:${PORTSD OPTIONS_DEFINE= DOCS -CONFIGURE_ARGS= --enable-profile --enable-uyield +CONFIGURE_ARGS= --enable-uyield CPPFLAGS+= -fPIC GNU_CONFIGURE= yes MAKE_ARGS= PCDIR=${PREFIX}/libdata/pkgconfig REINPLACE_ARGS= -i '' -USE_GCC= any USE_LDCONFIG= yes USES= gmake pkgconfig .include post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile + @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g; s|-lstdc++ ||g' ${WRKSRC}/configure ${WRKSRC}/doc/spex.html ${WRKSRC}/example/Makefile .if !${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/DOCDIR/d' ${WRKSRC}/Makefile.in .endif From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 6 16:45:34 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4953879; Thu, 6 Mar 2014 16:45:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A0A99C00; Thu, 6 Mar 2014 16:45:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26GjYku092913; Thu, 6 Mar 2014 16:45:34 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26GjYCS092910; Thu, 6 Mar 2014 16:45:34 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403061645.s26GjYCS092910@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Thu, 6 Mar 2014 16:45:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347277 - branches/2014Q1/databases/kyototycoon X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 16:45:34 -0000 Author: sunpoet Date: Thu Mar 6 16:45:33 2014 New Revision: 347277 URL: http://svnweb.freebsd.org/changeset/ports/347277 QAT: https://qat.redports.org/buildarchive/r347277/ Log: MFH: r343496 - Fix plist - Allow packaging as a regular user Approved by: portmgr (mat, via IRC) Modified: branches/2014Q1/databases/kyototycoon/Makefile branches/2014Q1/databases/kyototycoon/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/databases/kyototycoon/Makefile ============================================================================== --- branches/2014Q1/databases/kyototycoon/Makefile Thu Mar 6 16:44:34 2014 (r347276) +++ branches/2014Q1/databases/kyototycoon/Makefile Thu Mar 6 16:45:33 2014 (r347277) @@ -3,7 +3,7 @@ PORTNAME= kyototycoon PORTVERSION= 0.9.56 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://fallabs.com/${PORTNAME}/pkg/ \ LOCAL/sunpoet @@ -42,7 +42,6 @@ post-install: .if ${PORT_OPTIONS:MDOCS} ${FIND} ${STAGEDIR}${DOCSDIR}/ -type d -exec ${CHMOD} 755 '{}' \; ${FIND} ${STAGEDIR}${DOCSDIR}/ -type f -exec ${CHMOD} 444 '{}' \; - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}/ .endif regression-test test: build Modified: branches/2014Q1/databases/kyototycoon/pkg-plist ============================================================================== --- branches/2014Q1/databases/kyototycoon/pkg-plist Thu Mar 6 16:44:34 2014 (r347276) +++ branches/2014Q1/databases/kyototycoon/pkg-plist Thu Mar 6 16:45:33 2014 (r347277) @@ -20,6 +20,9 @@ include/kttimeddb.h include/ktulog.h include/ktutil.h lib/libkyototycoon.a +lib/libkyototycoon.so +lib/libkyototycoon.so.2 +lib/libkyototycoon.so.2.19.0 libdata/pkgconfig/kyototycoon.pc libexec/ktplugdbvoid.so libexec/ktplugservmemc.so From owner-svn-ports-branches@FreeBSD.ORG Fri Mar 7 21:25:18 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57A6FA8B; Fri, 7 Mar 2014 21:25:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 43AF9FDF; Fri, 7 Mar 2014 21:25:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27LPIUU056013; Fri, 7 Mar 2014 21:25:18 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27LPH0V056011; Fri, 7 Mar 2014 21:25:17 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403072125.s27LPH0V056011@svn.freebsd.org> From: Rene Ladan Date: Fri, 7 Mar 2014 21:25:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347424 - branches/2014Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 21:25:18 -0000 Author: rene Date: Fri Mar 7 21:25:17 2014 New Revision: 347424 URL: http://svnweb.freebsd.org/changeset/ports/347424 QAT: https://qat.redports.org/buildarchive/r347424/ Log: MFH: r347413 Switch to using Google's tarball for both the browser and the test data. This removes one chain in the link of trust since the tarball is no longer modified and rerolled locally. This means the Courgette code is now included, but it is only compiled and used on Windows platforms to distribute binary updates. Legal documentation: http://law.justia.com/cases/federal/district-courts/massachusetts/madce/1:2009cv11813/125212/47/ Discussed with: portmgr/core (tabthorpe), FreeBSD Foundation (gnn) Approved by: portmgr (tabthorpe) Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Fri Mar 7 20:55:45 2014 (r347423) +++ branches/2014Q1/www/chromium/Makefile Fri Mar 7 21:25:17 2014 (r347424) @@ -4,14 +4,10 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -DISTVERSIONPREFIX= courgette-redacted- DISTVERSION= 33.0.1750.146 CATEGORIES= www -MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \ - http://download.goodking.org/downloads/:browser \ - LOCAL/rene:browser \ - http://files.etoilebsd.net/goodking/:browser -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:browser +MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org COMMENT= Mostly BSD-licensed web browser based on WebKit and Gtk+ @@ -19,7 +15,6 @@ COMMENT= Mostly BSD-licensed web browser LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} CFLAGS+= -fno-stack-protector BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ @@ -98,6 +93,8 @@ OPTIONS_DEFAULT= CODECS GCONF GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} + .include .if ${PORT_OPTIONS:MCODECS} @@ -132,7 +129,6 @@ LIB_DEPENDS+= libexecinfo.so:${PORTSDIR} .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} -DISTFILES+= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:testdata .endif DEBUG_MAKE_ENV= V=1 Modified: branches/2014Q1/www/chromium/distinfo ============================================================================== --- branches/2014Q1/www/chromium/distinfo Fri Mar 7 20:55:45 2014 (r347423) +++ branches/2014Q1/www/chromium/distinfo Fri Mar 7 21:25:17 2014 (r347424) @@ -1,4 +1,4 @@ -SHA256 (chromium-courgette-redacted-33.0.1750.146.tar.xz) = 8030316421e197de8ce7a0fa7dcb3809e3abff5c87dbd599531cc254ec527e6f -SIZE (chromium-courgette-redacted-33.0.1750.146.tar.xz) = 197160536 +SHA256 (chromium-33.0.1750.146.tar.xz) = d5b0e7a0f086aac200493fe4e5849ca84e9e21f7770c5d5830060da9fc2c4a74 +SIZE (chromium-33.0.1750.146.tar.xz) = 185394896 SHA256 (chromium-33.0.1750.146-testdata.tar.xz) = 918ccc080788ea9b8eba2e479b521c22b37b14c62d4bc0906d7f15a88f12c84c SIZE (chromium-33.0.1750.146-testdata.tar.xz) = 112429020 From owner-svn-ports-branches@FreeBSD.ORG Fri Mar 7 21:26:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3E2BB7F; Fri, 7 Mar 2014 21:26:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B0527FF1; Fri, 7 Mar 2014 21:26:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27LQXB6056239; Fri, 7 Mar 2014 21:26:33 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27LQXi1056238; Fri, 7 Mar 2014 21:26:33 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403072126.s27LQXi1056238@svn.freebsd.org> From: Rene Ladan Date: Fri, 7 Mar 2014 21:26:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347425 - branches/2014Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 21:26:33 -0000 Author: rene Date: Fri Mar 7 21:26:33 2014 New Revision: 347425 URL: http://svnweb.freebsd.org/changeset/ports/347425 QAT: https://qat.redports.org/buildarchive/r347425/ Log: MFH: r347414 Bump PORTREVISION to prevent checksum failures when downloading the non-rerolled distribution file. Use PORTVERSION instead of DISTVERSION while here. Approved by: portmgr (tabthorpe) Modified: branches/2014Q1/www/chromium/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Fri Mar 7 21:25:17 2014 (r347424) +++ branches/2014Q1/www/chromium/Makefile Fri Mar 7 21:26:33 2014 (r347425) @@ -4,7 +4,8 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -DISTVERSION= 33.0.1750.146 +PORTVERSION= 33.0.1750.146 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} From owner-svn-ports-branches@FreeBSD.ORG Fri Mar 7 21:27:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99BFBC6B; Fri, 7 Mar 2014 21:27:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 867AD1000; Fri, 7 Mar 2014 21:27:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27LRUTp056427; Fri, 7 Mar 2014 21:27:30 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27LRUUA056426; Fri, 7 Mar 2014 21:27:30 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403072127.s27LRUUA056426@svn.freebsd.org> From: Rene Ladan Date: Fri, 7 Mar 2014 21:27:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347426 - branches/2014Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 21:27:30 -0000 Author: rene Date: Fri Mar 7 21:27:30 2014 New Revision: 347426 URL: http://svnweb.freebsd.org/changeset/ports/347426 QAT: https://qat.redports.org/buildarchive/r347426/ Log: MFH: r347418 No need any longer to remove the Courgette tests from the unit tests. Approved by: portmgr (tabthorpe) Modified: branches/2014Q1/www/chromium/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Fri Mar 7 21:26:33 2014 (r347425) +++ branches/2014Q1/www/chromium/Makefile Fri Mar 7 21:27:30 2014 (r347426) @@ -193,8 +193,6 @@ post-patch: @${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \ ${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \ ${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi - @${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \ - ${WRKSRC}/chrome/chrome_tests_unit.gypi @${REINPLACE_CMD} -e "s|is_linux|(is_linux or is_bsd)|" \ ${WRKSRC}/chrome/browser/browser_resources.grd \ ${WRKSRC}/chrome/app/theme/theme_resources.grd \ From owner-svn-ports-branches@FreeBSD.ORG Sat Mar 8 23:35:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 17134B0F; Sat, 8 Mar 2014 23:35:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0153285A; Sat, 8 Mar 2014 23:35:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s28NZDHt013424; Sat, 8 Mar 2014 23:35:13 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s28NZD45013422; Sat, 8 Mar 2014 23:35:13 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201403082335.s28NZD45013422@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 8 Mar 2014 23:35:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347543 - in branches/2014Q1/devel/cmake: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Mar 2014 23:35:14 -0000 Author: rakuco Date: Sat Mar 8 23:35:13 2014 New Revision: 347543 URL: http://svnweb.freebsd.org/changeset/ports/347543 QAT: https://qat.redports.org/buildarchive/r347543/ Log: MFH: r347541 Enable use of OpenSSL in the bundled copy of libcurl. The default is off, which makes calls such as FILE(DOWNLOAD ...) from HTTPS locations fail. PR: ports/187374 Approved by: portmgr (miwi) Modified: branches/2014Q1/devel/cmake/Makefile branches/2014Q1/devel/cmake/files/InitialCache.cmake Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/cmake/Makefile ============================================================================== --- branches/2014Q1/devel/cmake/Makefile Sat Mar 8 23:24:34 2014 (r347542) +++ branches/2014Q1/devel/cmake/Makefile Sat Mar 8 23:35:13 2014 (r347543) @@ -3,6 +3,7 @@ PORTNAME= cmake PORTVERSION= 2.8.12.1 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= http://downloads.cmake.org/files/v2.8/ Modified: branches/2014Q1/devel/cmake/files/InitialCache.cmake ============================================================================== --- branches/2014Q1/devel/cmake/files/InitialCache.cmake Sat Mar 8 23:24:34 2014 (r347542) +++ branches/2014Q1/devel/cmake/files/InitialCache.cmake Sat Mar 8 23:35:13 2014 (r347543) @@ -4,3 +4,7 @@ # devel/qt4-corelib is not). # See https://mail.kde.org/pipermail/kde-freebsd/2013-July/015703.html set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") + +# Explicitly enable use of OpenSSL in the bundled copy of libcurl, as it +# defaults to off. See ports/187374. +set(CMAKE_USE_OPENSSL ON CACHE BOOL "Use OpenSSL code with curl.") From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 9 08:33:40 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5AE48A66; Sun, 9 Mar 2014 08:33:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4729B25D; Sun, 9 Mar 2014 08:33:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s298XeeK042308; Sun, 9 Mar 2014 08:33:40 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s298XddY042307; Sun, 9 Mar 2014 08:33:39 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201403090833.s298XddY042307@svn.freebsd.org> From: Koop Mast Date: Sun, 9 Mar 2014 08:33:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347556 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 08:33:40 -0000 Author: kwm Date: Sun Mar 9 08:33:39 2014 New Revision: 347556 URL: http://svnweb.freebsd.org/changeset/ports/347556 QAT: https://qat.redports.org/buildarchive/r347556/ Log: MFH: r347554 Document freetype2 vuln. Approved by: portmgr (erwin@) Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 9 08:20:31 2014 (r347555) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 9 08:33:39 2014 (r347556) @@ -51,6 +51,35 @@ Note: Please add new entries to the beg --> + + freetype2 -- Out of bounds read/write + + + freetype2 + 2.5.3 + + + + +

Mateusz Jurczyk reports:

+
+

Out of bounds stack-based read/write in cf2_hintmap_build.
+ This is a critical vulnerability in the CFF Rasterizer code + recently contributed by Adobe, leading to potential arbitrary + code execution in the context of the FreeType2 library client. +

+
+ +
+ + http://savannah.nongnu.org/bugs/?41697 + + + 2014-02-25 + 2014-03-09 + +
+ xmms -- Integer Overflow And Underflow Vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 9 09:15:19 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A281E44; Sun, 9 Mar 2014 09:15:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 465A28BD; Sun, 9 Mar 2014 09:15:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s299FJZw058754; Sun, 9 Mar 2014 09:15:19 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s299FIqt058753; Sun, 9 Mar 2014 09:15:18 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201403090915.s299FIqt058753@svn.freebsd.org> From: Koop Mast Date: Sun, 9 Mar 2014 09:15:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347558 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 09:15:19 -0000 Author: kwm Date: Sun Mar 9 09:15:18 2014 New Revision: 347558 URL: http://svnweb.freebsd.org/changeset/ports/347558 QAT: https://qat.redports.org/buildarchive/r347558/ Log: MFH: r347557 Unbreak vuxml. Submitted by: battlez Approved by: portmgr (erwin@) Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 9 08:43:48 2014 (r347557) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 9 09:15:18 2014 (r347558) @@ -63,7 +63,7 @@ Note: Please add new entries to the beg

Mateusz Jurczyk reports:

-

Out of bounds stack-based read/write in cf2_hintmap_build.
+

Out of bounds stack-based read/write in cf2_hintmap_build. This is a critical vulnerability in the CFF Rasterizer code recently contributed by Adobe, leading to potential arbitrary code execution in the context of the FreeType2 library client. From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 9 10:23:41 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBFA1EA2; Sun, 9 Mar 2014 10:23:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9D398623; Sun, 9 Mar 2014 10:23:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29ANfsS086580; Sun, 9 Mar 2014 10:23:41 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29ANeRY086577; Sun, 9 Mar 2014 10:23:40 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201403091023.s29ANeRY086577@svn.freebsd.org> From: Koop Mast Date: Sun, 9 Mar 2014 10:23:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347562 - in branches/2014Q1: print/freetype2 print/freetype2/files security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 10:23:41 -0000 Author: kwm Date: Sun Mar 9 10:23:40 2014 New Revision: 347562 URL: http://svnweb.freebsd.org/changeset/ports/347562 QAT: https://qat.redports.org/buildarchive/r347562/ Log: Add patches to fix security issue. This is done via direct commit, because the freetype2 update to 2.5.3 isn't mergeable due to freetype header shuffle which happend in 2.5.1. Tweak the freetype2 version in the vuxml to point to the fix version. Approved by: portmgr (antoine@, erwin@) Obtained from: freetype2 upstream Security: 1a0de610-a761-11e3-95fe-bcaec565249c Added: branches/2014Q1/print/freetype2/files/patch-41697 (contents, props changed) Modified: branches/2014Q1/print/freetype2/Makefile branches/2014Q1/security/vuxml/vuln.xml Modified: branches/2014Q1/print/freetype2/Makefile ============================================================================== --- branches/2014Q1/print/freetype2/Makefile Sun Mar 9 09:51:32 2014 (r347561) +++ branches/2014Q1/print/freetype2/Makefile Sun Mar 9 10:23:40 2014 (r347562) @@ -4,6 +4,7 @@ PORTNAME= freetype2 PORTVERSION= 2.5.0.1 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \ Added: branches/2014Q1/print/freetype2/files/patch-41697 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/print/freetype2/files/patch-41697 Sun Mar 9 10:23:40 2014 (r347562) @@ -0,0 +1,113 @@ +From 0eae6eb0645264c98812f0095e0f5df4541830e6 Mon Sep 17 00:00:00 2001 +From: Dave Arnold +Date: Fri, 28 Feb 2014 06:40:01 +0000 +Subject: Fix Savannah bug #41697, part 1. + +* src/cff/cf2hints.c (cf2_hintmap_build): Return when `hintMask' is +invalid. In this case, it is not safe to use the length of +`hStemHintArray'; the exception has already been recorded in +`hintMask'. +--- +diff --git a/ChangeLog b/ChangeLog +index 2010fda..1f48e24 100644 +--- ChangeLog ++++ ChangeLog +@@ -1,3 +1,12 @@ ++2014-02-28 Dave Arnold ++ ++ [cff] Fix Savannah bug #41697, part 1. ++ ++ * src/cff/cf2hints.c (cf2_hintmap_build): Return when `hintMask' is ++ invalid. In this case, it is not safe to use the length of ++ `hStemHintArray'; the exception has already been recorded in ++ `hintMask'. ++ + 2014-02-26 Werner Lemberg + + [sfnt] Fix Savannah bug #41696. +diff --git a/src/cff/cf2hints.c b/src/cff/cf2hints.c +index 5f44161..79f84fc 100644 +--- src/cff/cf2hints.c ++++ src/cff/cf2hints.c +@@ -781,6 +781,8 @@ + cf2_hintmask_setAll( hintMask, + cf2_arrstack_size( hStemHintArray ) + + cf2_arrstack_size( vStemHintArray ) ); ++ if ( !cf2_hintmask_isValid( hintMask ) ) ++ return; /* too many stem hints */ + } + + /* begin by clearing the map */ +-- +cgit v0.9.0.2 +From 135c3faebb96f8f550bd4f318716f2e1e095a969 Mon Sep 17 00:00:00 2001 +From: Dave Arnold +Date: Fri, 28 Feb 2014 06:42:42 +0000 +Subject: Fix Savannah bug #41697, part 2. + +* src/cff/cf2ft.c (cf2_initLocalRegionBuffer, +cf2_initGlobalRegionBuffer): It is possible for a charstring to call +a subroutine if no subroutines exist. This is an error but should +not trigger an assert. Split the assert to account for this. +--- +diff --git a/ChangeLog b/ChangeLog +index 1f48e24..164aa6b 100644 +--- ChangeLog ++++ ChangeLog +@@ -1,5 +1,14 @@ + 2014-02-28 Dave Arnold + ++ [cff] Fix Savannah bug #41697, part 2. ++ ++ * src/cff/cf2ft.c (cf2_initLocalRegionBuffer, ++ cf2_initGlobalRegionBuffer): It is possible for a charstring to call ++ a subroutine if no subroutines exist. This is an error but should ++ not trigger an assert. Split the assert to account for this. ++ ++2014-02-28 Dave Arnold ++ + [cff] Fix Savannah bug #41697, part 1. + + * src/cff/cf2hints.c (cf2_hintmap_build): Return when `hintMask' is +diff --git a/src/cff/cf2ft.c b/src/cff/cf2ft.c +index df5f8fb..82bac75 100644 +--- src/cff/cf2ft.c ++++ src/cff/cf2ft.c +@@ -521,7 +521,7 @@ + CF2_UInt idx, + CF2_Buffer buf ) + { +- FT_ASSERT( decoder && decoder->globals ); ++ FT_ASSERT( decoder ); + + FT_ZERO( buf ); + +@@ -529,6 +529,8 @@ + if ( idx >= decoder->num_globals ) + return TRUE; /* error */ + ++ FT_ASSERT( decoder->globals ); ++ + buf->start = + buf->ptr = decoder->globals[idx]; + buf->end = decoder->globals[idx + 1]; +@@ -594,7 +596,7 @@ + CF2_UInt idx, + CF2_Buffer buf ) + { +- FT_ASSERT( decoder && decoder->locals ); ++ FT_ASSERT( decoder ); + + FT_ZERO( buf ); + +@@ -602,6 +604,8 @@ + if ( idx >= decoder->num_locals ) + return TRUE; /* error */ + ++ FT_ASSERT( decoder->locals ); ++ + buf->start = + buf->ptr = decoder->locals[idx]; + buf->end = decoder->locals[idx + 1]; +-- +cgit v0.9.0.2 Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 9 09:51:32 2014 (r347561) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 9 10:23:40 2014 (r347562) @@ -56,7 +56,7 @@ Note: Please add new entries to the beg freetype2 - 2.5.3 + 2.5.0.1_1 From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 9 18:42:17 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1378FA6F; Sun, 9 Mar 2014 18:42:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F06F08C0; Sun, 9 Mar 2014 18:42:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29IgG1k096722; Sun, 9 Mar 2014 18:42:16 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29IgGDh096720; Sun, 9 Mar 2014 18:42:16 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201403091842.s29IgGDh096720@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 9 Mar 2014 18:42:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347682 - in branches/2014Q1/devel/cmake: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 18:42:17 -0000 Author: rakuco Date: Sun Mar 9 18:42:16 2014 New Revision: 347682 URL: http://svnweb.freebsd.org/changeset/ports/347682 QAT: https://qat.redports.org/buildarchive/r347682/ Log: MFH: r347674 Make the port build with security/openssl installed after r347541. Add a patch sent upstream that makes sure the bundled curl's include paths are passed to the compiler before any other ones, since they could include the system's curl include directory. One way to trigger this was to build the port with security/openssl installed: CMake would detect OpenSSL's include path (${LOCALBASE}/include) and pass it to the compiler. If ftp/curl is also installed, the compiler would end up picking its headers instead of the ones in cmcurl's own directory. Reported by: Terry Kennedy Approved by: portmgr (miwi) Added: branches/2014Q1/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt - copied unchanged from r347674, head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt Modified: branches/2014Q1/devel/cmake/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/cmake/Makefile ============================================================================== --- branches/2014Q1/devel/cmake/Makefile Sun Mar 9 18:42:11 2014 (r347681) +++ branches/2014Q1/devel/cmake/Makefile Sun Mar 9 18:42:16 2014 (r347682) @@ -3,7 +3,7 @@ PORTNAME= cmake PORTVERSION= 2.8.12.1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= devel MASTER_SITES= http://downloads.cmake.org/files/v2.8/ Copied: branches/2014Q1/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt (from r347674, head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt Sun Mar 9 18:42:16 2014 (r347682, copy of r347674, head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt) @@ -0,0 +1,36 @@ +cmcurl: Include the local curl directories before all others. + +In some cases, it was possible for the include directory of the system-wide +libcurl to be added to the include path before cmcurl's, which would result +in them being picked up and causing the build to fail if the curl versions +differ too much. + +One way to trigger this is to have OpenSSL installed into a non-default +location together with libcurl (/usr/local, for example). If cmcurl is built +with CMAKE_USE_OPENSSL on, -I/usr/local/include would end up being added +before -I${PATH_TO_CMCURL}. + +Sent upstream: http://public.kitware.com/pipermail/cmake-developers/2014-March/010000.html +--- Utilities/cmcurl/CMakeLists.txt ++++ Utilities/cmcurl/CMakeLists.txt +@@ -172,6 +172,11 @@ IF(NOT CURL_SPECIAL_LIBZ) + CHECK_LIBRARY_EXISTS_CONCAT("z" inflateEnd HAVE_LIBZ) + ENDIF(NOT CURL_SPECIAL_LIBZ) + ++# Include the local directories before any others so that we do not end up ++# including system curl's include directory first by mistake. ++INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}) ++INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR}) ++ + OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code with curl." OFF) + MARK_AS_ADVANCED(CMAKE_USE_OPENSSL) + IF(CMAKE_USE_OPENSSL) +@@ -679,8 +684,6 @@ INCLUDE(CMake/OtherTests.cmake) + + # The rest of the build + +-INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}) +-INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR}) + OPTION(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" TRUE) + IF(CMAKE_BUILD_CURL_SHARED) + SET(LIBRARY_TYPE SHARED) From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 9 21:38:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1383CFC1; Sun, 9 Mar 2014 21:38:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F41848EC; Sun, 9 Mar 2014 21:38:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29LcreQ068750; Sun, 9 Mar 2014 21:38:53 GMT (envelope-from remko@svn.freebsd.org) Received: (from remko@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29LcrQR068749; Sun, 9 Mar 2014 21:38:53 GMT (envelope-from remko@svn.freebsd.org) Message-Id: <201403092138.s29LcrQR068749@svn.freebsd.org> From: Remko Lodder Date: Sun, 9 Mar 2014 21:38:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347694 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 21:38:54 -0000 Author: remko (src,doc committer) Date: Sun Mar 9 21:38:53 2014 New Revision: 347694 URL: http://svnweb.freebsd.org/changeset/ports/347694 QAT: https://qat.redports.org/buildarchive/r347694/ Log: MFH: r347684 Properly indent the last entry. Discussed with: kwm Approved by: portmgr(erwin) Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Sun Mar 9 21:37:59 2014 (r347693) +++ branches/2014Q1/security/vuxml/vuln.xml Sun Mar 9 21:38:53 2014 (r347694) @@ -63,11 +63,12 @@ Note: Please add new entries to the beg

Mateusz Jurczyk reports:

-

Out of bounds stack-based read/write in cf2_hintmap_build. - This is a critical vulnerability in the CFF Rasterizer code - recently contributed by Adobe, leading to potential arbitrary - code execution in the context of the FreeType2 library client. -

+

Out of bounds stack-based read/write in + cf2_hintmap_build.

+

This is a critical vulnerability in the CFF Rasterizer + code recently contributed by Adobe, leading to potential + arbitrary code execution in the context of the FreeType2 + library client.

From owner-svn-ports-branches@FreeBSD.ORG Mon Mar 10 10:02:49 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65852D03; Mon, 10 Mar 2014 10:02:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 531E1F3B; Mon, 10 Mar 2014 10:02:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2AA2nWr074649; Mon, 10 Mar 2014 10:02:49 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2AA2nZa074648; Mon, 10 Mar 2014 10:02:49 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201403101002.s2AA2nZa074648@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 10 Mar 2014 10:02:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347733 - branches/2014Q1/mail/ftrack X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Mar 2014 10:02:49 -0000 Author: mat Date: Mon Mar 10 10:02:48 2014 New Revision: 347733 URL: http://svnweb.freebsd.org/changeset/ports/347733 QAT: https://qat.redports.org/buildarchive/r347733/ Log: MFH: r343625 Reset maintainership due to mail bouncing Reported by: pkg-fallout Modified: branches/2014Q1/mail/ftrack/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/mail/ftrack/Makefile ============================================================================== --- branches/2014Q1/mail/ftrack/Makefile Mon Mar 10 09:53:36 2014 (r347732) +++ branches/2014Q1/mail/ftrack/Makefile Mon Mar 10 10:02:48 2014 (r347733) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.ibch.ru/forsite http://forsite.ibch.ru/ports/ DISTNAME= ftr${PORTVERSION:S/.//g}sr -MAINTAINER= forsite@spamtest.ru +MAINTAINER= ports@FreeBSD.org COMMENT= FTN Messages tracker LIB_DEPENDS= smapi.2:${PORTSDIR}/news/husky-smapi From owner-svn-ports-branches@FreeBSD.ORG Mon Mar 10 10:03:56 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 062A6DEE; Mon, 10 Mar 2014 10:03:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CCAA1F45; Mon, 10 Mar 2014 10:03:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2AA3t1o075305; Mon, 10 Mar 2014 10:03:55 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2AA3pdX075277; Mon, 10 Mar 2014 10:03:51 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201403101003.s2AA3pdX075277@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 10 Mar 2014 10:03:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347734 - in branches/2014Q1: chinese/scim-array emulators/cygne-sdl emulators/hugo games/54321 games/noegnud-addons games/noegnud-data games/noegnud-littlehack games/noegnud-nethack ga... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Mar 2014 10:03:56 -0000 Author: mat Date: Mon Mar 10 10:03:50 2014 New Revision: 347734 URL: http://svnweb.freebsd.org/changeset/ports/347734 QAT: https://qat.redports.org/buildarchive/r347734/ Log: MFH: r336813 Reset maintainer for llwang@infor.org Reset maintainership for llwang@infor.org due to multiple timeouts and email address permanent failure. Return all ports to the free pool except py-numpy, which is taken under the wing of the python@ team. We thank you for your contribution to the FreeBSD project Approved by: portmgr Modified: branches/2014Q1/chinese/scim-array/Makefile branches/2014Q1/emulators/cygne-sdl/Makefile (contents, props changed) branches/2014Q1/emulators/hugo/Makefile (contents, props changed) branches/2014Q1/games/54321/Makefile (contents, props changed) branches/2014Q1/games/noegnud-addons/Makefile (contents, props changed) branches/2014Q1/games/noegnud-data/Makefile (contents, props changed) branches/2014Q1/games/noegnud-littlehack/Makefile (contents, props changed) branches/2014Q1/games/noegnud-nethack-deet/Makefile (contents, props changed) branches/2014Q1/games/noegnud-nethack/Makefile (contents, props changed) branches/2014Q1/games/noegnud-slashem/Makefile (contents, props changed) branches/2014Q1/games/py-sgfsummary/Makefile (contents, props changed) branches/2014Q1/games/vultures-eye/Makefile (contents, props changed) branches/2014Q1/lang/fbbi/Makefile (contents, props changed) branches/2014Q1/lang/whitespace/Makefile branches/2014Q1/math/py-numpy/Makefile branches/2014Q1/math/py-symeig/Makefile (contents, props changed) branches/2014Q1/misc/dvorak7min/Makefile (contents, props changed) branches/2014Q1/science/buddy/Makefile (contents, props changed) branches/2014Q1/science/py-mdp/Makefile branches/2014Q1/textproc/words/Makefile (contents, props changed) branches/2014Q1/www/ump/Makefile (contents, props changed) branches/2014Q1/x11-fonts/proggy_fonts/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/chinese/scim-array/Makefile ============================================================================== --- branches/2014Q1/chinese/scim-array/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/chinese/scim-array/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -7,7 +7,7 @@ PORTREVISION= 4 CATEGORIES= chinese MASTER_SITES= http://of.openfoundry.org/download/scimarray/${PORTVERSION}/ -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= Array 30 SCIM IMEngine module BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim Modified: branches/2014Q1/emulators/cygne-sdl/Makefile ============================================================================== --- branches/2014Q1/emulators/cygne-sdl/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/emulators/cygne-sdl/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -8,7 +8,7 @@ CATEGORIES= emulators MASTER_SITES= http://sdlemu.ngemu.com/OpenProjects/ DISTNAME= Cygne-SDL-${PORTVERSION}-src -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= The SDL port of Cygne, a free Bandai Wonderswan emulator USE_SDL= sdl Modified: branches/2014Q1/emulators/hugo/Makefile ============================================================================== --- branches/2014Q1/emulators/hugo/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/emulators/hugo/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -7,7 +7,7 @@ PORTREVISION= 12 CATEGORIES= emulators MASTER_SITES= http://www.zeograd.com/download/ -MAINTAINER= llwang@infor.org +MAINTAINER= portsw@FreeBSD.org COMMENT= A PC Engine (TurboGrafx 16) emulator BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone Modified: branches/2014Q1/games/54321/Makefile ============================================================================== --- branches/2014Q1/games/54321/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/54321/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.nklein.com/prod DISTNAME= ${PORTNAME} EXTRACT_SUFX= .tgz -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= 54321 is five games in four-, three-, or two-dimensions for one player LIB_DEPENDS= png15:${PORTSDIR}/graphics/png Modified: branches/2014Q1/games/noegnud-addons/Makefile ============================================================================== --- branches/2014Q1/games/noegnud-addons/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/noegnud-addons/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -8,7 +8,7 @@ MASTER_SITES= http://www.darkarts.co.za/ PKGNAMESUFFIX= -addons DISTFILES= ${DISTNAME}_data-tileset-absurd${EXTRACT_SUFX} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= Addons (tilesets and sound themes) for noeGNUd USE_BZIP2= yes Modified: branches/2014Q1/games/noegnud-data/Makefile ============================================================================== --- branches/2014Q1/games/noegnud-data/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/noegnud-data/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -8,7 +8,7 @@ MASTER_SITES= http://www.darkarts.co.za/ PKGNAMESUFFIX= -data DISTFILES= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= The noeGNUd Data Files NOEGNUDVERSION= ${PORTNAME}-0.8.0 Modified: branches/2014Q1/games/noegnud-littlehack/Makefile ============================================================================== --- branches/2014Q1/games/noegnud-littlehack/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/noegnud-littlehack/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}_linux_src-minimal nethack-342.tgz:nethack EXTRACT_ONLY= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= The noeGNUd UI for the LittleHack variation of Nethack RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data Modified: branches/2014Q1/games/noegnud-nethack-deet/Makefile ============================================================================== --- branches/2014Q1/games/noegnud-nethack-deet/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/noegnud-nethack-deet/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}_linux_src-minimal nethack-342.tgz:nethack EXTRACT_ONLY= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= The noeGNUd UI for Nethack with DeeT's hack font patch RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data Modified: branches/2014Q1/games/noegnud-nethack/Makefile ============================================================================== --- branches/2014Q1/games/noegnud-nethack/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/noegnud-nethack/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}_linux_src-minimal nethack-343-src.tgz:nethack EXTRACT_ONLY= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= The noeGNUd UI for the vanilla Nethack RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data Modified: branches/2014Q1/games/noegnud-slashem/Makefile ============================================================================== --- branches/2014Q1/games/noegnud-slashem/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/noegnud-slashem/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}_linux_src-minimal se006e4f8.tar.gz:slashem EXTRACT_ONLY= ${DISTNAME}_linux_src-minimal${EXTRACT_SUFX} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= The noeGNUd UI for the SLASH'EM variant of Nethack RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data Modified: branches/2014Q1/games/py-sgfsummary/Makefile ============================================================================== --- branches/2014Q1/games/py-sgfsummary/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/py-sgfsummary/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME} EXTRACT_SUFX= .tgz -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= SGF Summarizer RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sgflib.py:${PORTSDIR}/games/py-sgflib Modified: branches/2014Q1/games/vultures-eye/Makefile ============================================================================== --- branches/2014Q1/games/vultures-eye/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/games/vultures-eye/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.darkarts.co.za/ PKGNAMESUFFIX= -eye DISTFILES= ${DISTNAME}-full${EXTRACT_SUFX}?format=raw -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= A graphical interface for NetHack 3.4.3 forked from Falcon's Eye LIB_DEPENDS= png15:${PORTSDIR}/graphics/png Modified: branches/2014Q1/lang/fbbi/Makefile ============================================================================== --- branches/2014Q1/lang/fbbi/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/lang/fbbi/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -8,7 +8,7 @@ CATEGORIES= lang MASTER_SITES= http://www3.telus.net/public/cpressey/distfiles/ EXTRACT_SUFX= .tgz -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= An interpreter for the Befunge-98 language PLIST_FILES= bin/fbbi Modified: branches/2014Q1/lang/whitespace/Makefile ============================================================================== --- branches/2014Q1/lang/whitespace/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/lang/whitespace/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -9,7 +9,7 @@ MASTER_SITES= http://compsoc.dur.ac.uk/w DISTNAME= wspace-${PORTVERSION} EXTRACT_SUFX= .tgz -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= Interpreter for the Whitespace programming language LICENSE= GPLv2 Modified: branches/2014Q1/math/py-numpy/Makefile ============================================================================== --- branches/2014Q1/math/py-numpy/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/math/py-numpy/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -14,7 +14,7 @@ DISTFILES= numpy-${PORTVERSION:S/r/rc/}$ numpy-user-${PORTVERSION}.pdf:doc EXTRACT_ONLY= numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX} -MAINTAINER= llwang@infor.org +MAINTAINER= python@FreeBSD.org COMMENT= The New Numeric Extension to Python LICENSE= BSD Modified: branches/2014Q1/math/py-symeig/Makefile ============================================================================== --- branches/2014Q1/math/py-symeig/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/math/py-symeig/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -8,7 +8,7 @@ CATEGORIES= math python MASTER_SITES= SF/mdp-toolkit/mdp-toolkit/2.3 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= Symmetrical eigenvalue routines for NumPy BUILD_DEPENDS+= ${PYNUMPY} Modified: branches/2014Q1/misc/dvorak7min/Makefile ============================================================================== --- branches/2014Q1/misc/dvorak7min/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/misc/dvorak7min/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -6,7 +6,7 @@ PORTVERSION= 1.6.1 CATEGORIES= misc MASTER_SITES= http://www.linalco.com/ragnar/ -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= An ncurses-based Dvorak typing tutor NO_STAGE= yes Modified: branches/2014Q1/science/buddy/Makefile ============================================================================== --- branches/2014Q1/science/buddy/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/science/buddy/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= science MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BuDDy%20${PORTVERSION} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= A Binary Decision Diagram library USE_AUTOTOOLS= libtool Modified: branches/2014Q1/science/py-mdp/Makefile ============================================================================== --- branches/2014Q1/science/py-mdp/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/science/py-mdp/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}-toolkit/${P PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME:U}-${PORTVERSION} -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= Modular toolkit for Data Processing LICENSE= BSD Modified: branches/2014Q1/textproc/words/Makefile ============================================================================== --- branches/2014Q1/textproc/words/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/textproc/words/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -8,7 +8,7 @@ CATEGORIES= textproc MASTER_SITES= http://archives.nd.edu/whitaker/ DISTNAME= ${PORTNAME}all -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= A Latin-English Dictionary Program USES= ada Modified: branches/2014Q1/www/ump/Makefile ============================================================================== --- branches/2014Q1/www/ump/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/www/ump/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -15,7 +15,7 @@ EXTRACT_ONLY= ${BZ2DIST:C/:.*$//} PATCH_SITES= http://www.onicos.com/staff/iz/timidity/dist/ PATCHFILES= ump-patch-1.gz ump-patch-2.gz ump-patch-3.gz ump-patch-4.gz -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= Unix MIDI Plugin based on TiMidity++ LIB_DEPENDS= libarc.so:${PORTSDIR}/archivers/libarc Modified: branches/2014Q1/x11-fonts/proggy_fonts/Makefile ============================================================================== --- branches/2014Q1/x11-fonts/proggy_fonts/Makefile Mon Mar 10 10:02:48 2014 (r347733) +++ branches/2014Q1/x11-fonts/proggy_fonts/Makefile Mon Mar 10 10:03:50 2014 (r347734) @@ -22,7 +22,7 @@ EXTRACT_ONLY= ProggyClean.pcf.zip Proggy SpeedyPCF.zip WebbySmall.pcf.zip \ WebbyCaps.pcf.zip -MAINTAINER= llwang@infor.org +MAINTAINER= ports@FreeBSD.org COMMENT= The perfect monospaced bitmap programming fonts RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ From owner-svn-ports-branches@FreeBSD.ORG Mon Mar 10 14:59:29 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 768FFC79; Mon, 10 Mar 2014 14:59:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6367B2AE; Mon, 10 Mar 2014 14:59:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2AExTa8097951; Mon, 10 Mar 2014 14:59:29 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2AExTxh097949; Mon, 10 Mar 2014 14:59:29 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201403101459.s2AExTxh097949@svn.freebsd.org> From: TAKATSU Tomonari Date: Mon, 10 Mar 2014 14:59:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347765 - branches/2014Q1/math/R-cran-xts X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Mar 2014 14:59:29 -0000 Author: tota Date: Mon Mar 10 14:59:28 2014 New Revision: 347765 URL: http://svnweb.freebsd.org/changeset/ports/347765 QAT: https://qat.redports.org/buildarchive/r347765/ Log: MFH: r341099 - Upstream rerolled tarball Reported by: pkg-fallout PR: ports/187369 Submitted by: tota (myself) Approved by: portmgr (antoine) Modified: branches/2014Q1/math/R-cran-xts/Makefile branches/2014Q1/math/R-cran-xts/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/math/R-cran-xts/Makefile ============================================================================== --- branches/2014Q1/math/R-cran-xts/Makefile Mon Mar 10 14:57:36 2014 (r347764) +++ branches/2014Q1/math/R-cran-xts/Makefile Mon Mar 10 14:59:28 2014 (r347765) @@ -3,7 +3,7 @@ PORTNAME= xts DISTVERSION= 0.9-7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} Modified: branches/2014Q1/math/R-cran-xts/distinfo ============================================================================== --- branches/2014Q1/math/R-cran-xts/distinfo Mon Mar 10 14:57:36 2014 (r347764) +++ branches/2014Q1/math/R-cran-xts/distinfo Mon Mar 10 14:59:28 2014 (r347765) @@ -1,2 +1,2 @@ -SHA256 (xts_0.9-7.tar.gz) = 6d065b2a50e30d3bfccdc0624d2a4c7975e59f7f7276b179c9323701fa3028f5 -SIZE (xts_0.9-7.tar.gz) = 470813 +SHA256 (xts_0.9-7.tar.gz) = f11f7cb98f4b92b7f6632a2151257914130880c267736ef5a264b5dc2dfb7098 +SIZE (xts_0.9-7.tar.gz) = 470815 From owner-svn-ports-branches@FreeBSD.ORG Mon Mar 10 15:04:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E81BE76; Mon, 10 Mar 2014 15:04:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0B449366; Mon, 10 Mar 2014 15:04:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2AF4r8k001794; Mon, 10 Mar 2014 15:04:53 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2AF4rjb001791; Mon, 10 Mar 2014 15:04:53 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201403101504.s2AF4rjb001791@svn.freebsd.org> From: TAKATSU Tomonari Date: Mon, 10 Mar 2014 15:04:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347766 - branches/2014Q1/math/R-cran-RcppArmadillo X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Mar 2014 15:04:54 -0000 Author: tota Date: Mon Mar 10 15:04:53 2014 New Revision: 347766 URL: http://svnweb.freebsd.org/changeset/ports/347766 QAT: https://qat.redports.org/buildarchive/r347766/ Log: MFH: r338263 - Upstream rerolled tarball PR: ports/185192 Submitted by: marino@ PR: ports/187368 Submitted by: tota (myself) Approved by: portmgr (antoine) Modified: branches/2014Q1/math/R-cran-RcppArmadillo/Makefile branches/2014Q1/math/R-cran-RcppArmadillo/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/math/R-cran-RcppArmadillo/Makefile ============================================================================== --- branches/2014Q1/math/R-cran-RcppArmadillo/Makefile Mon Mar 10 14:59:28 2014 (r347765) +++ branches/2014Q1/math/R-cran-RcppArmadillo/Makefile Mon Mar 10 15:04:53 2014 (r347766) @@ -3,6 +3,7 @@ PORTNAME= RcppArmadillo PORTVERSION= 0.3.920.3 +PORTREVISION= 1 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: branches/2014Q1/math/R-cran-RcppArmadillo/distinfo ============================================================================== --- branches/2014Q1/math/R-cran-RcppArmadillo/distinfo Mon Mar 10 14:59:28 2014 (r347765) +++ branches/2014Q1/math/R-cran-RcppArmadillo/distinfo Mon Mar 10 15:04:53 2014 (r347766) @@ -1,2 +1,2 @@ -SHA256 (RcppArmadillo_0.3.920.3.tar.gz) = 4466a53da619356dca63c3ff9eb7169de83994d55bc3431ed6797a964695df24 -SIZE (RcppArmadillo_0.3.920.3.tar.gz) = 866795 +SHA256 (RcppArmadillo_0.3.920.3.tar.gz) = dd6e6edb8ad24bc9834f6cbebcb43d71a3417514224bc525ae0bd24adce93c97 +SIZE (RcppArmadillo_0.3.920.3.tar.gz) = 866815 From owner-svn-ports-branches@FreeBSD.ORG Tue Mar 11 17:24:29 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D0F7B10; Tue, 11 Mar 2014 17:24:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E623F15F; Tue, 11 Mar 2014 17:24:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BHOSJJ095581; Tue, 11 Mar 2014 17:24:28 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BHOSf1095579; Tue, 11 Mar 2014 17:24:28 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403111724.s2BHOSf1095579@svn.freebsd.org> From: Rene Ladan Date: Tue, 11 Mar 2014 17:24:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347894 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2014 17:24:29 -0000 Author: rene Date: Tue Mar 11 17:24:28 2014 New Revision: 347894 URL: http://svnweb.freebsd.org/changeset/ports/347894 QAT: https://qat.redports.org/buildarchive/r347894/ Log: MFH: r347892 Document new vulnerabilities in www/chromium < 33.0.1750.149 Obtained from: http://googlechromereleases.blogspot.nl/ Approved by: portmgr (erwin) Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Tue Mar 11 17:18:02 2014 (r347893) +++ branches/2014Q1/security/vuxml/vuln.xml Tue Mar 11 17:24:28 2014 (r347894) @@ -51,6 +51,48 @@ Note: Please add new entries to the beg --> + + www/chromium --multiple vulnerabilities + + + chromium + 33.0.1750.149 + + + + +

Google Chrome Releases reports:

+
+

7 vulnerabilities fixed in this release, including:

+
    +
  • [344881] High CVE-2014-1700: Use-after-free in speech. Credit + to Chamal de Silva.
  • +
  • [342618] High CVE-2014-1701: UXSS in events. Credit to + aidanhs.
  • +
  • [333058] High CVE-2014-1702: Use-after-free in web database. + Credit to Collin Payne.
  • +
  • [338354] High CVE-2014-1703: Potential sandbox escape due to a + use-after-free in web sockets.
  • +
  • [328202, 349079, 345715] CVE-2014-1704: Multiple + vulnerabilities in V8 fixed in version 3.23.17.18.
  • +
+
+ +
+ + CVE-2014-1700 + CVE-2014-1701 + CVE-2014-1702 + CVE-2014-1703 + CVE-2014-1704 + http://googlechromereleases.blogspot.nl/ + + + 2014-03-11 + 2014-03-11 + +
+ freetype2 -- Out of bounds read/write From owner-svn-ports-branches@FreeBSD.ORG Tue Mar 11 22:03:51 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33F4C7A4; Tue, 11 Mar 2014 22:03:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 141E1983; Tue, 11 Mar 2014 22:03:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BM3oGg013814; Tue, 11 Mar 2014 22:03:50 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BM3otC013813; Tue, 11 Mar 2014 22:03:50 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201403112203.s2BM3otC013813@svn.freebsd.org> From: Florian Smeets Date: Tue, 11 Mar 2014 22:03:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347938 - branches/2014Q1/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2014 22:03:51 -0000 Author: flo Date: Tue Mar 11 22:03:50 2014 New Revision: 347938 URL: http://svnweb.freebsd.org/changeset/ports/347938 QAT: https://qat.redports.org/buildarchive/r347938/ Log: MFH: r347911 Document asterisk vulnerabilities Approved by: portmgr (erwin) Modified: branches/2014Q1/security/vuxml/vuln.xml Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q1/security/vuxml/vuln.xml Tue Mar 11 21:53:39 2014 (r347937) +++ branches/2014Q1/security/vuxml/vuln.xml Tue Mar 11 22:03:50 2014 (r347938) @@ -51,6 +51,59 @@ Note: Please add new entries to the beg --> + + asterisk -- multiple vulnerabilities + + + asterisk11 + 11.8.1 + + + asterisk18 + 1.8.26.1 + + + + +

The Asterisk project reports:

+
+

Stack Overflow in HTTP Processing of Cookie Headers. Sending a HTTP + request that is handled by Asterisk with a large number of Cookie + headers could overflow the stack. You could even exhaust memory if you + sent an unlimited number of headers in the request.

+

Denial of Service Through File Descriptor Exhaustion with chan_sip + Session-Timers. An attacker can use all available file descriptors + using SIP INVITE requests. Asterisk will respond with code 400, 420, + or 422 for INVITEs meeting this criteria. + Each INVITE meeting these conditions will leak a channel and several + file descriptors. The file descriptors cannot be released without + restarting Asterisk which may allow intrusion detection systems to be + bypassed by sending the requests slowly.

+

Remote Crash Vulnerability in PJSIP channel driver. A remotely + exploitable crash vulnerability exists in the PJSIP channel driver if + the "qualify_frequency" configuration option is enabled on an AOR and + the remote SIP server challenges for authentication of the resulting + OPTIONS request. The response handling code wrongly assumes that a + PJSIP endpoint will always be associated with an outgoing request which + is incorrect.

+
+ +
+ + CVE-2014-2286 + CVE-2014-2287 + CVE-2014-2288 + http://downloads.asterisk.org/pub/security/AST-2014-001.pdf + http://downloads.asterisk.org/pub/security/AST-2014-002.pdf + http://downloads.asterisk.org/pub/security/AST-2014-003.pdf + https://www.asterisk.org/security + + + 2014-03-10 + 2014-03-10 + +
+ www/chromium --multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Tue Mar 11 22:06:15 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0E7519AA; Tue, 11 Mar 2014 22:06:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E258699D; Tue, 11 Mar 2014 22:06:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BM6Ekj014279; Tue, 11 Mar 2014 22:06:14 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BM6EiF014273; Tue, 11 Mar 2014 22:06:14 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201403112206.s2BM6EiF014273@svn.freebsd.org> From: Florian Smeets Date: Tue, 11 Mar 2014 22:06:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347939 - branches/2014Q1/net/asterisk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2014 22:06:15 -0000 Author: flo Date: Tue Mar 11 22:06:13 2014 New Revision: 347939 URL: http://svnweb.freebsd.org/changeset/ports/347939 QAT: https://qat.redports.org/buildarchive/r347939/ Log: MFH: r347917 - Update to 1.8.26.1 - set USE_GCC as asterisk uses gcc extensions (STAGE support will follow soon, just wanted to get the new version out now) Security: 03159886-a8a3-11e3-8f36-0025905a4771 Approved by: portmgr (erwin) Modified: branches/2014Q1/net/asterisk/Makefile branches/2014Q1/net/asterisk/distinfo branches/2014Q1/net/asterisk/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/asterisk/Makefile ============================================================================== --- branches/2014Q1/net/asterisk/Makefile Tue Mar 11 22:03:50 2014 (r347938) +++ branches/2014Q1/net/asterisk/Makefile Tue Mar 11 22:06:13 2014 (r347939) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.25.0 +PORTVERSION= 1.8.26.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gsm=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 -USE_CSTD= gnu89 +USE_GCC= yes USE_GNOME= libxml2 USES= bison gmake USE_RC_SUBR= asterisk Modified: branches/2014Q1/net/asterisk/distinfo ============================================================================== --- branches/2014Q1/net/asterisk/distinfo Tue Mar 11 22:03:50 2014 (r347938) +++ branches/2014Q1/net/asterisk/distinfo Tue Mar 11 22:06:13 2014 (r347939) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.25.0.tar.gz) = b218de8a7db9af370890b12c63863343f5459ae7a4ce23d386ec159c10241670 -SIZE (asterisk-1.8.25.0.tar.gz) = 29473304 +SHA256 (asterisk-1.8.26.1.tar.gz) = f7e61845c5f5f79a46a81139000c7e6b17f05fe5c97ab5cd1a40f5d81ec1b1cb +SIZE (asterisk-1.8.26.1.tar.gz) = 29484354 Modified: branches/2014Q1/net/asterisk/pkg-plist ============================================================================== --- branches/2014Q1/net/asterisk/pkg-plist Tue Mar 11 22:03:50 2014 (r347938) +++ branches/2014Q1/net/asterisk/pkg-plist Tue Mar 11 22:06:13 2014 (r347939) @@ -545,7 +545,6 @@ lib/asterisk/modules/chan_agent.so %%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so lib/asterisk/modules/chan_multicast_rtp.so %%WITH_OOH323%%lib/asterisk/modules/chan_ooh323.so lib/asterisk/modules/chan_oss.so @@ -654,9 +653,9 @@ share/asterisk/phoneprov/000000000000.cf share/asterisk/phoneprov/polycom.xml share/asterisk/phoneprov/polycom_line.xml share/asterisk/phoneprov/snom-mac.xml -share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.24 -share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24 -share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24 +share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.25 +share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.25 +share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.25 share/asterisk/sounds/en/ascending-2tone.gsm share/asterisk/sounds/en/conf-adminmenu-18.gsm share/asterisk/sounds/en/conf-adminmenu-162.gsm @@ -966,6 +965,7 @@ share/asterisk/sounds/en/letters/x.gsm share/asterisk/sounds/en/letters/y.gsm share/asterisk/sounds/en/letters/z.gsm share/asterisk/sounds/en/letters/zed.gsm +share/asterisk/sounds/en/lowercase.gsm share/asterisk/sounds/en/minutes.gsm share/asterisk/sounds/en/pbx-invalid.gsm share/asterisk/sounds/en/pbx-invalidpark.gsm @@ -1054,6 +1054,7 @@ share/asterisk/sounds/en/tt-monkeys.gsm share/asterisk/sounds/en/tt-monkeysintro.gsm share/asterisk/sounds/en/tt-somethingwrong.gsm share/asterisk/sounds/en/tt-weasels.gsm +share/asterisk/sounds/en/uppercase.gsm share/asterisk/sounds/en/vm-Cust1.gsm share/asterisk/sounds/en/vm-Cust2.gsm share/asterisk/sounds/en/vm-Cust3.gsm @@ -1096,6 +1097,7 @@ share/asterisk/sounds/en/vm-login.gsm share/asterisk/sounds/en/vm-mailboxfull.gsm share/asterisk/sounds/en/vm-message.gsm share/asterisk/sounds/en/vm-messages.gsm +share/asterisk/sounds/en/vm-msgforwarded.gsm share/asterisk/sounds/en/vm-minutes.gsm share/asterisk/sounds/en/vm-mismatch.gsm share/asterisk/sounds/en/vm-msginstruct.gsm @@ -1158,7 +1160,7 @@ share/asterisk/sounds/en/vm-undeleted.gs share/asterisk/sounds/en/vm-unknown-caller.gsm share/asterisk/sounds/en/vm-whichbox.gsm share/asterisk/sounds/en/vm-youhave.gsm -share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.24 +share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.25 share/asterisk/static-http/ajamdemo.html share/asterisk/static-http/astman.css share/asterisk/static-http/astman.js From owner-svn-ports-branches@FreeBSD.ORG Tue Mar 11 22:07:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9C54ACF; Tue, 11 Mar 2014 22:07:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A54269D2; Tue, 11 Mar 2014 22:07:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BM7tDC014621; Tue, 11 Mar 2014 22:07:55 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BM7tZd014618; Tue, 11 Mar 2014 22:07:55 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201403112207.s2BM7tZd014618@svn.freebsd.org> From: Florian Smeets Date: Tue, 11 Mar 2014 22:07:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347940 - branches/2014Q1/net/asterisk11 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2014 22:07:55 -0000 Author: flo Date: Tue Mar 11 22:07:54 2014 New Revision: 347940 URL: http://svnweb.freebsd.org/changeset/ports/347940 QAT: https://qat.redports.org/buildarchive/r347940/ Log: MFH: r347920 - Update to 11.8.1 - set USE_GCC as asterisk uses gcc extensions (STAGE support will follow soon, just wanted to get the new version out now) Security: 03159886-a8a3-11e3-8f36-0025905a4771 Approved by: portmgr (erwin) Modified: branches/2014Q1/net/asterisk11/Makefile branches/2014Q1/net/asterisk11/distinfo branches/2014Q1/net/asterisk11/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/asterisk11/Makefile ============================================================================== --- branches/2014Q1/net/asterisk11/Makefile Tue Mar 11 22:06:13 2014 (r347939) +++ branches/2014Q1/net/asterisk11/Makefile Tue Mar 11 22:07:54 2014 (r347940) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.7.0 +PORTVERSION= 11.8.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-gsm=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 CFLAGS+= -I${LOCALBASE}/include -USE_CSTD= gnu89 +USE_GCC= yes USE_GNOME= libxml2 USES= bison gmake USE_RC_SUBR= asterisk Modified: branches/2014Q1/net/asterisk11/distinfo ============================================================================== --- branches/2014Q1/net/asterisk11/distinfo Tue Mar 11 22:06:13 2014 (r347939) +++ branches/2014Q1/net/asterisk11/distinfo Tue Mar 11 22:07:54 2014 (r347940) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.7.0.tar.gz) = 4fb283b96447f5d871632a14069f35643c8c34d08d6ec5fedf0ae3df30e0c397 -SIZE (asterisk-11.7.0.tar.gz) = 34779538 +SHA256 (asterisk-11.8.1.tar.gz) = 216eaf3af703ef08cf18fb996e5a7da4082c1883e5b74ec15ab609f2d4a0f818 +SIZE (asterisk-11.8.1.tar.gz) = 34794750 Modified: branches/2014Q1/net/asterisk11/pkg-plist ============================================================================== --- branches/2014Q1/net/asterisk11/pkg-plist Tue Mar 11 22:06:13 2014 (r347939) +++ branches/2014Q1/net/asterisk11/pkg-plist Tue Mar 11 22:07:54 2014 (r347940) @@ -585,7 +585,6 @@ lib/asterisk/modules/cel_sqlite3_custom. lib/asterisk/modules/chan_agent.so lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so lib/asterisk/modules/chan_multicast_rtp.so %%WITH_OOH323%%lib/asterisk/modules/chan_ooh323.so lib/asterisk/modules/chan_oss.so @@ -698,10 +697,10 @@ share/asterisk/phoneprov/000000000000.cf share/asterisk/phoneprov/polycom.xml share/asterisk/phoneprov/polycom_line.xml share/asterisk/phoneprov/snom-mac.xml -share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.24 -share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.24 -share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24 -share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24 +share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.25 +share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.25 +share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.25 +share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.25 share/asterisk/sounds/en/ascending-2tone.gsm share/asterisk/sounds/en/conf-adminmenu-162.gsm share/asterisk/sounds/en/conf-adminmenu-18.gsm @@ -1011,6 +1010,7 @@ share/asterisk/sounds/en/letters/x.gsm share/asterisk/sounds/en/letters/y.gsm share/asterisk/sounds/en/letters/z.gsm share/asterisk/sounds/en/letters/zed.gsm +share/asterisk/sounds/en/lowercase.gsm share/asterisk/sounds/en/minutes.gsm share/asterisk/sounds/en/pbx-invalid.gsm share/asterisk/sounds/en/pbx-invalidpark.gsm @@ -1099,6 +1099,7 @@ share/asterisk/sounds/en/tt-monkeys.gsm share/asterisk/sounds/en/tt-monkeysintro.gsm share/asterisk/sounds/en/tt-somethingwrong.gsm share/asterisk/sounds/en/tt-weasels.gsm +share/asterisk/sounds/en/vm-msgforwarded.gsm share/asterisk/sounds/en/vm-Cust1.gsm share/asterisk/sounds/en/vm-Cust2.gsm share/asterisk/sounds/en/vm-Cust3.gsm @@ -1141,6 +1142,7 @@ share/asterisk/sounds/en/vm-login.gsm share/asterisk/sounds/en/vm-mailboxfull.gsm share/asterisk/sounds/en/vm-message.gsm share/asterisk/sounds/en/vm-messages.gsm +share/asterisk/sounds/en/uppercase.gsm share/asterisk/sounds/en/vm-minutes.gsm share/asterisk/sounds/en/vm-mismatch.gsm share/asterisk/sounds/en/vm-msginstruct.gsm From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 12 07:06:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 494B2355; Wed, 12 Mar 2014 07:06:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 34CECF13; Wed, 12 Mar 2014 07:06:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2C76wQ4034948; Wed, 12 Mar 2014 07:06:58 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2C76v3F034945; Wed, 12 Mar 2014 07:06:57 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403120706.s2C76v3F034945@svn.freebsd.org> From: Rene Ladan Date: Wed, 12 Mar 2014 07:06:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347962 - in branches/2014Q1/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 07:06:58 -0000 Author: rene Date: Wed Mar 12 07:06:57 2014 New Revision: 347962 URL: http://svnweb.freebsd.org/changeset/ports/347962 QAT: https://qat.redports.org/buildarchive/r347962/ Log: MFH: r347937 - Update to 33.0.1750.149 [1] - Add a patch to fix build on FreeBSD < 10 [2] Obtained from: http://crbug.com/347123 [2] Security: http://vuxml.org/freebsd/24cefa4b-a940-11e3-91f2-00262d5ed8ee.html [1] Approved by: portmgr (erwin) Added: branches/2014Q1/www/chromium/files/patch-base__strings__safe_sprintf.cc - copied unchanged from r347937, head/www/chromium/files/patch-base__strings__safe_sprintf.cc Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Wed Mar 12 05:46:33 2014 (r347961) +++ branches/2014Q1/www/chromium/Makefile Wed Mar 12 07:06:57 2014 (r347962) @@ -4,8 +4,7 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -PORTVERSION= 33.0.1750.146 -PORTREVISION= 1 +PORTVERSION= 33.0.1750.149 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2014Q1/www/chromium/distinfo ============================================================================== --- branches/2014Q1/www/chromium/distinfo Wed Mar 12 05:46:33 2014 (r347961) +++ branches/2014Q1/www/chromium/distinfo Wed Mar 12 07:06:57 2014 (r347962) @@ -1,4 +1,4 @@ -SHA256 (chromium-33.0.1750.146.tar.xz) = d5b0e7a0f086aac200493fe4e5849ca84e9e21f7770c5d5830060da9fc2c4a74 -SIZE (chromium-33.0.1750.146.tar.xz) = 185394896 -SHA256 (chromium-33.0.1750.146-testdata.tar.xz) = 918ccc080788ea9b8eba2e479b521c22b37b14c62d4bc0906d7f15a88f12c84c -SIZE (chromium-33.0.1750.146-testdata.tar.xz) = 112429020 +SHA256 (chromium-33.0.1750.149.tar.xz) = 165f6d3dd4cf936faf615f743baf2e668a259f970ceed654d2f73b390dad3084 +SIZE (chromium-33.0.1750.149.tar.xz) = 185397612 +SHA256 (chromium-33.0.1750.149-testdata.tar.xz) = f18a5f3199f2e370ffdc1e49b2860e3653341c64d30c7e42268835cde7458354 +SIZE (chromium-33.0.1750.149-testdata.tar.xz) = 112422500 Copied: branches/2014Q1/www/chromium/files/patch-base__strings__safe_sprintf.cc (from r347937, head/www/chromium/files/patch-base__strings__safe_sprintf.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed Mar 12 07:06:57 2014 (r347962, copy of r347937, head/www/chromium/files/patch-base__strings__safe_sprintf.cc) @@ -0,0 +1,19 @@ +--- ./base/strings/safe_sprintf.cc.orig 2014-03-04 03:16:26.000000000 +0100 ++++ ./base/strings/safe_sprintf.cc 2014-03-07 14:14:55.000000000 +0100 +@@ -107,11 +107,11 @@ + : buffer_(buffer), + size_(size - 1), // Account for trailing NUL byte + count_(0) { +-// The following assertion does not build on Mac and Android. This is because +-// static_assert only works with compile-time constants, but mac uses +-// libstdc++4.2 and android uses stlport, which both don't mark +-// numeric_limits::max() as constexp. +-#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) ++// The following assertion does not build on Mac and Android and older FreeBSD. ++// This is because static_assert only works with compile-time constants, but ++// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both ++// don't mark numeric_limits::max() as constexp. ++#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) + COMPILE_ASSERT(kSSizeMaxConst == \ + static_cast(std::numeric_limits::max()), + kSSizeMax_is_the_max_value_of_an_ssize_t); From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 12 15:01:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 203F5737; Wed, 12 Mar 2014 15:01:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0D62C811; Wed, 12 Mar 2014 15:01:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2CF1nrE054146; Wed, 12 Mar 2014 15:01:49 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2CF1nbd054145; Wed, 12 Mar 2014 15:01:49 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201403121501.s2CF1nbd054145@svn.freebsd.org> From: Mathieu Arnold Date: Wed, 12 Mar 2014 15:01:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r347980 - branches/2014Q1/print/pdflib X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 15:01:50 -0000 Author: mat Date: Wed Mar 12 15:01:49 2014 New Revision: 347980 URL: http://svnweb.freebsd.org/changeset/ports/347980 QAT: https://qat.redports.org/buildarchive/r347980/ Log: MFH: r347979 Fix build when WITH=PERL. Sponsored by: Absolight Modified: branches/2014Q1/print/pdflib/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/print/pdflib/Makefile ============================================================================== --- branches/2014Q1/print/pdflib/Makefile Wed Mar 12 14:48:13 2014 (r347979) +++ branches/2014Q1/print/pdflib/Makefile Wed Mar 12 15:01:49 2014 (r347980) @@ -25,6 +25,8 @@ CONFIGURE_ARGS= --with-py=no --with-ruby PORTDOCS= * NO_STAGE= yes +PERL_USES= perl5 + .include .if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64" @@ -32,7 +34,6 @@ CONFIGURE_ARGS+=--enable-64bit .endif .if ${PORT_OPTIONS:MPERL} -USES+= perl5 PLIST_SUB= PERL="" CONFIGURE_ARGS+=--with-perl=${PERL} .else From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 16 12:02:16 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 801DABFF; Sun, 16 Mar 2014 12:02:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 53496F4F; Sun, 16 Mar 2014 12:02:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2GC2Gvn044053; Sun, 16 Mar 2014 12:02:16 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2GC2Ff1044051; Sun, 16 Mar 2014 12:02:15 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201403161202.s2GC2Ff1044051@svn.freebsd.org> From: Rene Ladan Date: Sun, 16 Mar 2014 12:02:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r348404 - branches/2014Q1/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Mar 2014 12:02:16 -0000 Author: rene Date: Sun Mar 16 12:02:15 2014 New Revision: 348404 URL: http://svnweb.freebsd.org/changeset/ports/348404 QAT: https://qat.redports.org/buildarchive/r348404/ Log: MFH: r348303 Update to 33.0.1750.152 Security: http://vuxml.org/freebsd/a70966a1-ac22-11e3-8d04-00262d5ed8ee.html Approved by: portmgr (miwi) Modified: branches/2014Q1/www/chromium/Makefile branches/2014Q1/www/chromium/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/www/chromium/Makefile ============================================================================== --- branches/2014Q1/www/chromium/Makefile Sun Mar 16 10:59:17 2014 (r348403) +++ branches/2014Q1/www/chromium/Makefile Sun Mar 16 12:02:15 2014 (r348404) @@ -4,7 +4,7 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -PORTVERSION= 33.0.1750.149 +PORTVERSION= 33.0.1750.152 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -39,9 +39,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf ONLY_FOR_ARCHS= i386 amd64 -USE_XZ= yes USES= bison compiler:c++11-lib desktop-file-utils pkgconfig \ - perl5 shebangfix ninja + perl5 shebangfix ninja tar:xz USE_PERL5= build USE_PYTHON_BUILD= 2.6-2.7 USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst Modified: branches/2014Q1/www/chromium/distinfo ============================================================================== --- branches/2014Q1/www/chromium/distinfo Sun Mar 16 10:59:17 2014 (r348403) +++ branches/2014Q1/www/chromium/distinfo Sun Mar 16 12:02:15 2014 (r348404) @@ -1,4 +1,4 @@ -SHA256 (chromium-33.0.1750.149.tar.xz) = 165f6d3dd4cf936faf615f743baf2e668a259f970ceed654d2f73b390dad3084 -SIZE (chromium-33.0.1750.149.tar.xz) = 185397612 -SHA256 (chromium-33.0.1750.149-testdata.tar.xz) = f18a5f3199f2e370ffdc1e49b2860e3653341c64d30c7e42268835cde7458354 -SIZE (chromium-33.0.1750.149-testdata.tar.xz) = 112422500 +SHA256 (chromium-33.0.1750.152.tar.xz) = 9fd462840bee3ae205b0548e8a483f7589beecdb7c6309d4d65425cbf710cc2f +SIZE (chromium-33.0.1750.152.tar.xz) = 185396116 +SHA256 (chromium-33.0.1750.152-testdata.tar.xz) = 0367fba6100a0538769955bad02cc17d3a6919d3dd391777283fb5a2fe4f56b0 +SIZE (chromium-33.0.1750.152-testdata.tar.xz) = 112419292 From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 19 01:12:01 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47BA361B; Wed, 19 Mar 2014 01:12:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 264C49F1; Wed, 19 Mar 2014 01:12:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2J1C1DQ051241; Wed, 19 Mar 2014 01:12:01 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2J1C0Fw051238; Wed, 19 Mar 2014 01:12:00 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201403190112.s2J1C0Fw051238@svn.freebsd.org> From: Steve Wills Date: Wed, 19 Mar 2014 01:12:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r348605 - in branches/2014Q1/archivers/quazip: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Mar 2014 01:12:01 -0000 Author: swills Date: Wed Mar 19 01:12:00 2014 New Revision: 348605 URL: http://svnweb.freebsd.org/changeset/ports/348605 QAT: https://qat.redports.org/buildarchive/r348605/ Log: MFH: r348485 - Update to 0.6.2 - Fixes build on 11-CURRENT PR: ports/186611 Submitted by: rakuco Approved by: maintainer timeout (nivit, >4 weeks) Approved by: portmgr (bdrewery) Deleted: branches/2014Q1/archivers/quazip/files/ Modified: branches/2014Q1/archivers/quazip/Makefile branches/2014Q1/archivers/quazip/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/archivers/quazip/Makefile ============================================================================== --- branches/2014Q1/archivers/quazip/Makefile Wed Mar 19 01:10:38 2014 (r348604) +++ branches/2014Q1/archivers/quazip/Makefile Wed Mar 19 01:12:00 2014 (r348605) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= quazip -PORTVERSION= 0.5.1 -#PORTREVISION= 0 +PORTVERSION= 0.6.2 CATEGORIES= archivers MASTER_SITES= SF Modified: branches/2014Q1/archivers/quazip/distinfo ============================================================================== --- branches/2014Q1/archivers/quazip/distinfo Wed Mar 19 01:10:38 2014 (r348604) +++ branches/2014Q1/archivers/quazip/distinfo Wed Mar 19 01:12:00 2014 (r348605) @@ -1,2 +1,2 @@ -SHA256 (quazip-0.5.1.tar.gz) = 078176a72288983f78b45c15f7d245131d9d5fc36a22f2757d75a78658c33268 -SIZE (quazip-0.5.1.tar.gz) = 354658 +SHA256 (quazip-0.6.2.tar.gz) = adf4047213662a0362090edaaee4283216df2034ab5923697f9aa81d081c0b43 +SIZE (quazip-0.6.2.tar.gz) = 423027 From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 19 01:15:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD95485B for ; Wed, 19 Mar 2014 01:15:08 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BD703A0E for ; Wed, 19 Mar 2014 01:15:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2J1F87G065726 for ; Wed, 19 Mar 2014 01:15:08 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2J1F8vi065720 for svn-ports-branches@freebsd.org; Wed, 19 Mar 2014 01:15:08 GMT (envelope-from bdrewery) Received: (qmail 94029 invoked from network); 18 Mar 2014 20:15:06 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 18 Mar 2014 20:15:06 -0500 Message-ID: <5328EF98.1000700@FreeBSD.org> Date: Tue, 18 Mar 2014 20:15:04 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Rene Ladan , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r348404 - branches/2014Q1/www/chromium References: <201403161202.s2GC2Ff1044051@svn.freebsd.org> In-Reply-To: <201403161202.s2GC2Ff1044051@svn.freebsd.org> X-Enigmail-Version: 1.6 OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="HE2fBWqJqGWP2J5BtRPMPiSWJIsEMIe1V" X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Mar 2014 01:15:08 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HE2fBWqJqGWP2J5BtRPMPiSWJIsEMIe1V Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 3/16/2014 7:02 AM, Rene Ladan wrote: > Author: rene > Date: Sun Mar 16 12:02:15 2014 > New Revision: 348404 > URL: http://svnweb.freebsd.org/changeset/ports/348404 > QAT: https://qat.redports.org/buildarchive/r348404/ >=20 > Log: > MFH: r348303 > =20 > Update to 33.0.1750.152 > =20 > Security: http://vuxml.org/freebsd/a70966a1-ac22-11e3-8d04-00262d5ed8= ee.html > =20 > Approved by: portmgr (miwi) >=20 > Modified: > branches/2014Q1/www/chromium/Makefile > branches/2014Q1/www/chromium/distinfo > Directory Properties: > branches/2014Q1/ (props changed) >=20 > Modified: branches/2014Q1/www/chromium/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2014Q1/www/chromium/Makefile Sun Mar 16 10:59:17 2014 (r34= 8403) > +++ branches/2014Q1/www/chromium/Makefile Sun Mar 16 12:02:15 2014 (r34= 8404) > @@ -4,7 +4,7 @@ > #TODO eadler: s/python/python2/g on a number of files, chromium does n= ot build with python3 > =20 > PORTNAME=3D chromium > -PORTVERSION=3D 33.0.1750.149 > +PORTVERSION=3D 33.0.1750.152 > CATEGORIES=3D www > MASTER_SITES=3D http://commondatastorage.googleapis.com/chromium-brows= er-official/ > DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} > @@ -39,9 +39,8 @@ RUN_DEPENDS=3D ${LOCALBASE}/lib/alsa-lib/l > ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/dro= id-fonts-ttf > =20 > ONLY_FOR_ARCHS=3D i386 amd64 > -USE_XZ=3D yes > USES=3D bison compiler:c++11-lib desktop-file-utils pkgconfig \ > - perl5 shebangfix ninja > + perl5 shebangfix ninja tar:xz ----------------------------------------^ This branch does not have USES=3Dtar. > USE_PERL5=3D build > USE_PYTHON_BUILD=3D 2.6-2.7 > USE_XORG=3D scrnsaverproto x11 xproto xscrnsaver xtst >=20 > Modified: branches/2014Q1/www/chromium/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2014Q1/www/chromium/distinfo Sun Mar 16 10:59:17 2014 (r34= 8403) > +++ branches/2014Q1/www/chromium/distinfo Sun Mar 16 12:02:15 2014 (r34= 8404) > @@ -1,4 +1,4 @@ > -SHA256 (chromium-33.0.1750.149.tar.xz) =3D 165f6d3dd4cf936faf615f743ba= f2e668a259f970ceed654d2f73b390dad3084 > -SIZE (chromium-33.0.1750.149.tar.xz) =3D 185397612 > -SHA256 (chromium-33.0.1750.149-testdata.tar.xz) =3D f18a5f3199f2e370ff= dc1e49b2860e3653341c64d30c7e42268835cde7458354 > -SIZE (chromium-33.0.1750.149-testdata.tar.xz) =3D 112422500 > +SHA256 (chromium-33.0.1750.152.tar.xz) =3D 9fd462840bee3ae205b0548e8a4= 83f7589beecdb7c6309d4d65425cbf710cc2f > +SIZE (chromium-33.0.1750.152.tar.xz) =3D 185396116 > +SHA256 (chromium-33.0.1750.152-testdata.tar.xz) =3D 0367fba6100a053876= 9955bad02cc17d3a6919d3dd391777283fb5a2fe4f56b0 > +SIZE (chromium-33.0.1750.152-testdata.tar.xz) =3D 112419292 >=20 --=20 Regards, Bryan Drewery --HE2fBWqJqGWP2J5BtRPMPiSWJIsEMIe1V Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJTKO+ZAAoJEDXXcbtuRpfPcRYH/16y3xcs5AzlXDBT2WS7/mI6 ldY9T0+Zxg/UxOM2xhnF3TE9JkWo15jDiz91e2Z90vhATPsg8nXW7RANiW7YMuTe xZHudySfv1ayJKI9am2isjBtGjYOVMMwehUGo/vuXDYpi322zYRNdPoHFyJwjpb/ BYqWfRuCdM91VBS7lxcJOkNGCIXmehDjIBlp9D0eW697WoAyKt1hmqD55Wk7RGo8 s0rFUY3aUZOQ6RBsxsBMtFTNlOPOz2pyPh0vU6UjbCbqrvpT2547NNgLngpjQU4U wcgcFxA1Ys0kWVu0ap7Ji7GcxB3TNAkNUAj9955uRKBwx5h9FKsKrwIFyOgJLFM= =AYsz -----END PGP SIGNATURE----- --HE2fBWqJqGWP2J5BtRPMPiSWJIsEMIe1V-- From owner-svn-ports-branches@FreeBSD.ORG Tue Mar 25 09:44:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B669189; Tue, 25 Mar 2014 09:44:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 07FA823E; Tue, 25 Mar 2014 09:44:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2P9iuJU010319; Tue, 25 Mar 2014 09:44:56 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2P9iuoH010318; Tue, 25 Mar 2014 09:44:56 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201403250944.s2P9iuoH010318@svn.freebsd.org> From: Kubilay Kocak Date: Tue, 25 Mar 2014 09:44:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r349118 - branches/2014Q1/net/libzmq2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Mar 2014 09:44:57 -0000 Author: koobs Date: Tue Mar 25 09:44:56 2014 New Revision: 349118 URL: http://svnweb.freebsd.org/changeset/ports/349118 QAT: https://qat.redports.org/buildarchive/r349118/ Log: MFH: r348754 net/libzmq2: Fix PKGNAME (PORTNAME: zmq -> libzmq2) Correctly set PORTNAME to "libzmq2" after moving it from devel/zmq to net/libzmq2, which was missed in r335619 [1]. This fixes the PKGNAME for this port. [1] http://svnweb.freebsd.org/ports?view=revision&revision=335619 Reported by: Franco Fichtner (via twitter: @fitchitis) Approved by: portmgr (mat) Modified: branches/2014Q1/net/libzmq2/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net/libzmq2/Makefile ============================================================================== --- branches/2014Q1/net/libzmq2/Makefile Tue Mar 25 09:40:16 2014 (r349117) +++ branches/2014Q1/net/libzmq2/Makefile Tue Mar 25 09:44:56 2014 (r349118) @@ -1,9 +1,9 @@ # Created by: Gea-Suan Lin # $FreeBSD$ -PORTNAME= zmq +PORTNAME= libzmq2 PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.zeromq.org/ DISTNAME= zeromq-${DISTVERSION} From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 26 13:35:56 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B89655D5; Wed, 26 Mar 2014 13:35:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A280CEE4; Wed, 26 Mar 2014 13:35:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2QDZuCq002381; Wed, 26 Mar 2014 13:35:56 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2QDZuhe002380; Wed, 26 Mar 2014 13:35:56 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201403261335.s2QDZuhe002380@svn.freebsd.org> From: Pawel Pekala Date: Wed, 26 Mar 2014 13:35:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r349253 - branches/2014Q1/deskutils/xrolo X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2014 13:35:56 -0000 Author: pawel Date: Wed Mar 26 13:35:56 2014 New Revision: 349253 URL: http://svnweb.freebsd.org/changeset/ports/349253 QAT: https://qat.redports.org/buildarchive/r349253/ Log: MFH: r349239 - Fix build with clang - Add staging support Approved by: portmgr Modified: branches/2014Q1/deskutils/xrolo/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/deskutils/xrolo/Makefile ============================================================================== --- branches/2014Q1/deskutils/xrolo/Makefile Wed Mar 26 13:31:42 2014 (r349252) +++ branches/2014Q1/deskutils/xrolo/Makefile Wed Mar 26 13:35:56 2014 (r349253) @@ -19,8 +19,11 @@ WRKSRC= ${WRKDIR}/xrolo USES= imake USE_XORG= x11 xext -MAN1= xrolo.1 -PLIST_FILES= bin/xrolo +PLIST_FILES= bin/xrolo man/man1/xrolo.1.gz + +CFLAGS+= -Wno-return-type + +post-configure: + @${REINPLACE_CMD} 's|DESTDIR) |DESTDIR)|g' ${WRKSRC}/Makefile -NO_STAGE= yes .include From owner-svn-ports-branches@FreeBSD.ORG Sat Mar 29 12:14:27 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C19973A; Sat, 29 Mar 2014 12:14:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28AA6ABE; Sat, 29 Mar 2014 12:14:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2TCERJ2058985; Sat, 29 Mar 2014 12:14:27 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2TCEQ3T058983; Sat, 29 Mar 2014 12:14:26 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201403291214.s2TCEQ3T058983@svn.freebsd.org> From: Lars Engels Date: Sat, 29 Mar 2014 12:14:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r349500 - branches/2014Q1/net-mgmt/icinga X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Mar 2014 12:14:27 -0000 Author: lme Date: Sat Mar 29 12:14:26 2014 New Revision: 349500 URL: http://svnweb.freebsd.org/changeset/ports/349500 QAT: https://qat.redports.org/buildarchive/r349500/ Log: MFH: r349499 Security update to 1.11.1 Approved by: portmgr (bdrewery) Modified: branches/2014Q1/net-mgmt/icinga/Makefile branches/2014Q1/net-mgmt/icinga/distinfo Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/net-mgmt/icinga/Makefile ============================================================================== --- branches/2014Q1/net-mgmt/icinga/Makefile Sat Mar 29 12:03:46 2014 (r349499) +++ branches/2014Q1/net-mgmt/icinga/Makefile Sat Mar 29 12:14:26 2014 (r349500) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= icinga -PORTVERSION= 1.9.3 -PORTREVISION= 2 +PORTVERSION= 1.11.1 CATEGORIES= net-mgmt MASTER_SITES= SF Modified: branches/2014Q1/net-mgmt/icinga/distinfo ============================================================================== --- branches/2014Q1/net-mgmt/icinga/distinfo Sat Mar 29 12:03:46 2014 (r349499) +++ branches/2014Q1/net-mgmt/icinga/distinfo Sat Mar 29 12:14:26 2014 (r349500) @@ -1,2 +1,2 @@ -SHA256 (icinga-1.9.3.tar.gz) = 2dfef14225e8b671145d4816999bf57842d379b2e5e18d2af69cf0c5b93376db -SIZE (icinga-1.9.3.tar.gz) = 17082275 +SHA256 (icinga-1.11.1.tar.gz) = 7dca7d6193fe9de1d5d044e3eefd9dfca5a24485a60d332edac68c5cc4838c95 +SIZE (icinga-1.11.1.tar.gz) = 18699628 From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 1 12:20:20 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 98743E00; Tue, 1 Apr 2014 12:20:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6BEEBADE; Tue, 1 Apr 2014 12:20:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31CKKx3062257; Tue, 1 Apr 2014 12:20:20 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31CKKF5062256; Tue, 1 Apr 2014 12:20:20 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404011220.s31CKKF5062256@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 1 Apr 2014 12:20:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r349845 - branches/2014Q2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2014 12:20:20 -0000 Author: bapt Date: Tue Apr 1 12:20:19 2014 New Revision: 349845 URL: http://svnweb.freebsd.org/changeset/ports/349845 QAT: https://qat.redports.org/buildarchive/r349845/ Log: Branch 2014Q2 Added: branches/2014Q2/ - copied from r349844, head/ From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 2 19:53:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7545866A; Wed, 2 Apr 2014 19:53:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 61C503A7; Wed, 2 Apr 2014 19:53:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s32JrwYE047886; Wed, 2 Apr 2014 19:53:58 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s32JrwLQ047882; Wed, 2 Apr 2014 19:53:58 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201404021953.s32JrwLQ047882@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Wed, 2 Apr 2014 19:53:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r349953 - in branches/2014Q2/ftp/pure-ftpd: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Apr 2014 19:53:58 -0000 Author: sunpoet Date: Wed Apr 2 19:53:57 2014 New Revision: 349953 URL: http://svnweb.freebsd.org/changeset/ports/349953 QAT: https://qat.redports.org/buildarchive/r349953/ Log: MFH: r349947 - Fix rc script: - Reorder variables - Assign default value for - pureftpd_authd_enable - pureftpd_authsocket: remove detection via pure-config.pl - pureftpd_upload_enable - Remove duplicate pidfile_authd - Simplify script - Bump PORTREVISION for package change Approved by: portmgr (erwin) Modified: branches/2014Q2/ftp/pure-ftpd/Makefile branches/2014Q2/ftp/pure-ftpd/files/pure-ftpd.in Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/ftp/pure-ftpd/Makefile ============================================================================== --- branches/2014Q2/ftp/pure-ftpd/Makefile Wed Apr 2 19:46:27 2014 (r349952) +++ branches/2014Q2/ftp/pure-ftpd/Makefile Wed Apr 2 19:53:57 2014 (r349953) @@ -3,7 +3,7 @@ PORTNAME= pure-ftpd PORTVERSION= 1.0.36 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp ipv6 MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/releases/ \ ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \ Modified: branches/2014Q2/ftp/pure-ftpd/files/pure-ftpd.in ============================================================================== --- branches/2014Q2/ftp/pure-ftpd/files/pure-ftpd.in Wed Apr 2 19:46:27 2014 (r349952) +++ branches/2014Q2/ftp/pure-ftpd/files/pure-ftpd.in Wed Apr 2 19:53:57 2014 (r349953) @@ -16,6 +16,7 @@ # # pureftpd_authd_enable="yes" # pureftpd_authdscript="/full/path/to/auth_script" +# pureftpd_authsocket="/var/run/ftpd.sock" # # Add the following lines to /etc/rc.conf to enable uploadscript daemon: # @@ -30,7 +31,6 @@ rcvar=pureftpd_enable load_rc_config $name command=%%PREFIX%%/sbin/pure-config.pl -command_args="${pureftpd_config} -g${pidfile}" pidfile=/var/run/pure-ftpd.pid procname=pure-ftpd pureftpd_config=${pureftpd_config:-"%%PREFIX%%/etc/pure-ftpd.conf"} @@ -38,15 +38,19 @@ pureftpd_enable=${pureftpd_enable:-"no"} required_files=${pureftpd_config} # authd command_authd=%%PREFIX%%/sbin/pure-authd -command_authd_args="-B -r ${pureftpd_authdscript} -s ${pureftpd_authsocket}" pidfile_authd=/var/run/pure-authd.pid +pureftpd_authd_enable=${pureftpd_authd_enable:-"no"} pureftpd_authdscript=${pureftpd_authdscript:-"%%PREFIX%%/sbin/pure-alwaysfail"} -pureftpd_authsocket=`%%PREFIX%%/sbin/pure-config.pl ${pureftpd_config} | grep -o ' -lextauth:[^ ]*' | cut -d: -f2` +pureftpd_authsocket=${pureftpd_authsocket:-"/var/run/ftpd.sock"} # uploadscript command_upload=%%PREFIX%%/sbin/pure-uploadscript -command_upload_args="-B -r ${pureftpd_uploadscript}" pidfile_uploadscript=/var/run/pure-uploadscript.pid +pureftpd_upload_enable=${pureftpd_upload_enable:-"no"} pureftpd_uploadscript=${pureftpd_uploadscript:-"/usr/bin/touch"} +# command_args +command_args="${pureftpd_config} -g${pidfile}" +command_authd_args="-B -r ${pureftpd_authdscript} -s ${pureftpd_authsocket}" +command_upload_args="-B -r ${pureftpd_uploadscript}" start_precmd=start_precmd start_postcmd=start_postcmd @@ -54,7 +58,7 @@ stop_postcmd=stop_postcmd start_precmd() { - if test -n ${pureftpd_authd_enable:-""} && checkyesno pureftpd_authd_enable && test -x ${pureftpd_authdscript}; then + if checkyesno pureftpd_authd_enable && test -x ${pureftpd_authdscript}; then echo "Starting ${command_authd}." ${command_authd} ${command_authd_args} fi @@ -62,7 +66,7 @@ start_precmd() start_postcmd() { - if test -n ${pureftpd_upload_enable:-""} && checkyesno pureftpd_upload_enable; then + if checkyesno pureftpd_upload_enable; then echo "Starting ${command_upload}." ${command_upload} ${command_upload_args} fi @@ -70,8 +74,8 @@ start_postcmd() stop_postcmd() { - if test -n ${pureftpd_authd_enable:-""} && checkyesno pureftpd_authd_enable; then - pid=$(check_pidfile ${pidfile_authd} ${pidfile_authd} ${command_authd}) + if checkyesno pureftpd_authd_enable; then + pid=$(check_pidfile ${pidfile_authd} ${command_authd}) if [ -z ${pid} ]; then echo "pure-authd not running? (check ${pidfile_authd})." return 1 @@ -81,7 +85,7 @@ stop_postcmd() [ $? -ne 0 ] && [ -z "$rc_force" ] && return 1 wait_for_pids ${pid} fi - if test -n ${pureftpd_upload_enable:-""} && checkyesno pureftpd_upload_enable; then + if checkyesno pureftpd_upload_enable; then pid=$(check_pidfile ${pidfile_uploadscript} ${command_upload}) if [ -z ${pid} ]; then echo "Upload script not running? (check ${pidfile_uploadscript})." From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 12:19:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E483DC3; Thu, 3 Apr 2014 12:19:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40CB4633; Thu, 3 Apr 2014 12:19:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33CJsJ7064057; Thu, 3 Apr 2014 12:19:54 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33CJrQ1064055; Thu, 3 Apr 2014 12:19:53 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404031219.s33CJrQ1064055@svn.freebsd.org> From: Pietro Cerutti Date: Thu, 3 Apr 2014 12:19:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350004 - branches/2014Q2/x11/thingylaunch X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 12:19:54 -0000 Author: gahr Date: Thu Apr 3 12:19:53 2014 New Revision: 350004 URL: http://svnweb.freebsd.org/changeset/ports/350004 QAT: https://qat.redports.org/buildarchive/r350004/ Log: MFH: r350003 - Update to 1.1.6 * Fix a bug where the command line wasn't always '\0'-terminated * Fix style here and there * Update COPYRIGHT years to include 2014 - Fix LICENSE (BSD -> BSD2CLAUSE) - Add another repo to MASTER_SITES Approved by: portmgr Modified: branches/2014Q2/x11/thingylaunch/Makefile branches/2014Q2/x11/thingylaunch/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/x11/thingylaunch/Makefile ============================================================================== --- branches/2014Q2/x11/thingylaunch/Makefile Thu Apr 3 11:57:50 2014 (r350003) +++ branches/2014Q2/x11/thingylaunch/Makefile Thu Apr 3 12:19:53 2014 (r350004) @@ -2,13 +2,14 @@ # $FreeBSD$ PORTNAME= thingylaunch -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.6 CATEGORIES= x11 +MASTER_SITES= http://gahr.ch/thingylaunch/ MAINTAINER= gahr@FreeBSD.org COMMENT= Lightweight tab-completing launcher for X -LICENSE= MIT BSD +LICENSE= MIT BSD2CLAUSE LICENSE_COMB= multi USE_XORG= x11 xproto @@ -17,7 +18,7 @@ USES= cmake:outsource USE_GITHUB= yes GH_ACCOUNT= gahr GH_TAGNAME= ${PORTVERSION} -GH_COMMIT= 8acab93 +GH_COMMIT= caa7e02 PLIST_FILES= bin/${PORTNAME} Modified: branches/2014Q2/x11/thingylaunch/distinfo ============================================================================== --- branches/2014Q2/x11/thingylaunch/distinfo Thu Apr 3 11:57:50 2014 (r350003) +++ branches/2014Q2/x11/thingylaunch/distinfo Thu Apr 3 12:19:53 2014 (r350004) @@ -1,2 +1,2 @@ -SHA256 (thingylaunch-1.1.5.tar.gz) = 60893e05c1dd2d4a0ed6a23a0675727254b9dc52c45c511e4f9064ff4893356a -SIZE (thingylaunch-1.1.5.tar.gz) = 7936 +SHA256 (thingylaunch-1.1.6.tar.gz) = 118283137f334e75e7a1c6567a45a59686000669e78c1e054cc6689d0166df3b +SIZE (thingylaunch-1.1.6.tar.gz) = 7977 From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 14:38:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 694E9BAB; Thu, 3 Apr 2014 14:38:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 54A673EC; Thu, 3 Apr 2014 14:38:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33Eci6b022732; Thu, 3 Apr 2014 14:38:44 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33Echi5022730; Thu, 3 Apr 2014 14:38:43 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201404031438.s33Echi5022730@svn.freebsd.org> From: Steve Wills Date: Thu, 3 Apr 2014 14:38:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350014 - in branches/2014Q2/textproc/rubygem-sass32: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 14:38:44 -0000 Author: swills Date: Thu Apr 3 14:38:43 2014 New Revision: 350014 URL: http://svnweb.freebsd.org/changeset/ports/350014 QAT: https://qat.redports.org/buildarchive/r350014/ Log: MFH: r349966 - Update to 3.2.18 Approved by: portmgr (mat) Added: branches/2014Q2/textproc/rubygem-sass32/files/ - copied from r349966, head/textproc/rubygem-sass32/files/ Modified: branches/2014Q2/textproc/rubygem-sass32/Makefile branches/2014Q2/textproc/rubygem-sass32/distinfo (contents, props changed) Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/textproc/rubygem-sass32/Makefile ============================================================================== --- branches/2014Q2/textproc/rubygem-sass32/Makefile Thu Apr 3 14:09:00 2014 (r350013) +++ branches/2014Q2/textproc/rubygem-sass32/Makefile Thu Apr 3 14:38:43 2014 (r350014) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sass -PORTVERSION= 3.2.17 +PORTVERSION= 3.2.18 CATEGORIES= textproc ruby MASTER_SITES= RG PKGNAMESUFFIX= 32 @@ -16,6 +16,4 @@ USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -PLIST_FILES= bin/sass bin/sass-convert bin/scss - .include Modified: branches/2014Q2/textproc/rubygem-sass32/distinfo ============================================================================== --- branches/2014Q2/textproc/rubygem-sass32/distinfo Thu Apr 3 14:09:00 2014 (r350013) +++ branches/2014Q2/textproc/rubygem-sass32/distinfo Thu Apr 3 14:38:43 2014 (r350014) @@ -1,2 +1,2 @@ -SHA256 (rubygem/sass-3.2.17.gem) = 20cd7bdfcd1d7996d001c341c9b359ab8711ea36d2e2a4cfc79df9059a0dab79 -SIZE (rubygem/sass-3.2.17.gem) = 260608 +SHA256 (rubygem/sass-3.2.18.gem) = 750e0d9fcd6d0c7c005a04b5d7d9b7a05cd5afbdcc3ac7ace2cca9e0910349e1 +SIZE (rubygem/sass-3.2.18.gem) = 261632 From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 14:39:25 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D345EC94; Thu, 3 Apr 2014 14:39:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C025F3F7; Thu, 3 Apr 2014 14:39:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33EdPl5022958; Thu, 3 Apr 2014 14:39:25 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33EdPI9022954; Thu, 3 Apr 2014 14:39:25 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201404031439.s33EdPI9022954@svn.freebsd.org> From: Steve Wills Date: Thu, 3 Apr 2014 14:39:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350015 - branches/2014Q2/textproc/rubygem-compass X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 14:39:25 -0000 Author: swills Date: Thu Apr 3 14:39:25 2014 New Revision: 350015 URL: http://svnweb.freebsd.org/changeset/ports/350015 QAT: https://qat.redports.org/buildarchive/r350015/ Log: MFH: r349967 - Update to 0.12.4 Approved by: portmgr (mat) Modified: branches/2014Q2/textproc/rubygem-compass/Makefile branches/2014Q2/textproc/rubygem-compass/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/textproc/rubygem-compass/Makefile ============================================================================== --- branches/2014Q2/textproc/rubygem-compass/Makefile Thu Apr 3 14:38:43 2014 (r350014) +++ branches/2014Q2/textproc/rubygem-compass/Makefile Thu Apr 3 14:39:25 2014 (r350015) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= compass -PORTVERSION= 0.12.2 -PORTREVISION= 1 +PORTVERSION= 0.12.4 CATEGORIES= textproc ruby MASTER_SITES= RG Modified: branches/2014Q2/textproc/rubygem-compass/distinfo ============================================================================== --- branches/2014Q2/textproc/rubygem-compass/distinfo Thu Apr 3 14:38:43 2014 (r350014) +++ branches/2014Q2/textproc/rubygem-compass/distinfo Thu Apr 3 14:39:25 2014 (r350015) @@ -1,2 +1,2 @@ -SHA256 (rubygem/compass-0.12.2.gem) = 5f9784fcc40e1535b81e66e57d2e0d898f1a00099dd455a35dbb21fbb40f4a3b -SIZE (rubygem/compass-0.12.2.gem) = 1441280 +SHA256 (rubygem/compass-0.12.4.gem) = e1e9f4de51f82bfec019aa4488c60a9fb65a8b513d2aa4a49ba998a6a8a47c8a +SIZE (rubygem/compass-0.12.4.gem) = 1083392 From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 14:43:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89CA4DDA; Thu, 3 Apr 2014 14:43:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75D5A681; Thu, 3 Apr 2014 14:43:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33EhEPJ026481; Thu, 3 Apr 2014 14:43:14 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33EhEDd026479; Thu, 3 Apr 2014 14:43:14 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201404031443.s33EhEDd026479@svn.freebsd.org> From: Steve Wills Date: Thu, 3 Apr 2014 14:43:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350016 - branches/2014Q2/textproc/rubygem-compass-rails X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 14:43:14 -0000 Author: swills Date: Thu Apr 3 14:43:13 2014 New Revision: 350016 URL: http://svnweb.freebsd.org/changeset/ports/350016 QAT: https://qat.redports.org/buildarchive/r350016/ Log: MFH: r349968 - Update to 1.1.7 Approved by: portmgr (mat) Modified: branches/2014Q2/textproc/rubygem-compass-rails/Makefile branches/2014Q2/textproc/rubygem-compass-rails/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/textproc/rubygem-compass-rails/Makefile ============================================================================== --- branches/2014Q2/textproc/rubygem-compass-rails/Makefile Thu Apr 3 14:39:25 2014 (r350015) +++ branches/2014Q2/textproc/rubygem-compass-rails/Makefile Thu Apr 3 14:43:13 2014 (r350016) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= compass-rails -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.7 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -10,7 +10,7 @@ COMMENT= Integrate Compass into Rails 2. LICENSE= MIT -RUN_DEPENDS= rubygem-compass>=0.12.2:${PORTSDIR}/textproc/rubygem-compass +RUN_DEPENDS= rubygem-compass>=0.12.4:${PORTSDIR}/textproc/rubygem-compass USE_RUBY= yes USE_RUBYGEMS= yes Modified: branches/2014Q2/textproc/rubygem-compass-rails/distinfo ============================================================================== --- branches/2014Q2/textproc/rubygem-compass-rails/distinfo Thu Apr 3 14:39:25 2014 (r350015) +++ branches/2014Q2/textproc/rubygem-compass-rails/distinfo Thu Apr 3 14:43:13 2014 (r350016) @@ -1,2 +1,2 @@ -SHA256 (rubygem/compass-rails-1.1.2.gem) = 6a4e316e3e18195768d4252aca47bf08d3eedc8b6988b1774b659cb10c487f63 -SIZE (rubygem/compass-rails-1.1.2.gem) = 18432 +SHA256 (rubygem/compass-rails-1.1.7.gem) = 4ac64056ed7239d29ff77ac9c6cddb0990a4f2cf232ca2c0f4a165bd5cb60d2d +SIZE (rubygem/compass-rails-1.1.7.gem) = 17408 From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 14:43:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CAE2EC9; Thu, 3 Apr 2014 14:43:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28E27692; Thu, 3 Apr 2014 14:43:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33Eht0W026678; Thu, 3 Apr 2014 14:43:55 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33Ehsi6026676; Thu, 3 Apr 2014 14:43:54 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201404031443.s33Ehsi6026676@svn.freebsd.org> From: Steve Wills Date: Thu, 3 Apr 2014 14:43:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350017 - branches/2014Q2/www/rubygem-chosen-rails X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 14:43:55 -0000 Author: swills Date: Thu Apr 3 14:43:54 2014 New Revision: 350017 URL: http://svnweb.freebsd.org/changeset/ports/350017 QAT: https://qat.redports.org/buildarchive/r350017/ Log: MFH: r349969 - Update to 1.1.0 Approved by: portmgr (mat) Modified: branches/2014Q2/www/rubygem-chosen-rails/Makefile branches/2014Q2/www/rubygem-chosen-rails/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/rubygem-chosen-rails/Makefile ============================================================================== --- branches/2014Q2/www/rubygem-chosen-rails/Makefile Thu Apr 3 14:43:13 2014 (r350016) +++ branches/2014Q2/www/rubygem-chosen-rails/Makefile Thu Apr 3 14:43:54 2014 (r350017) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= chosen-rails -PORTVERSION= 1.0.1 +PORTVERSION= 1.1.0 CATEGORIES= www rubygems MASTER_SITES= RG @@ -11,7 +11,7 @@ COMMENT= Box enhancer for jQuery and Pro LICENSE= MIT RUN_DEPENDS= rubygem-coffee-rails>=3.2:${PORTSDIR}/devel/rubygem-coffee-rails \ - rubygem-compass-rails>=1.0:${PORTSDIR}/textproc/rubygem-compass-rails \ + rubygem-compass-rails>=1.1.2:${PORTSDIR}/textproc/rubygem-compass-rails \ rubygem-railties>=3.0:${PORTSDIR}/www/rubygem-railties \ rubygem-sass-rails>=3.2:${PORTSDIR}/textproc/rubygem-sass-rails Modified: branches/2014Q2/www/rubygem-chosen-rails/distinfo ============================================================================== --- branches/2014Q2/www/rubygem-chosen-rails/distinfo Thu Apr 3 14:43:13 2014 (r350016) +++ branches/2014Q2/www/rubygem-chosen-rails/distinfo Thu Apr 3 14:43:54 2014 (r350017) @@ -1,2 +1,2 @@ -SHA256 (rubygem/chosen-rails-1.0.1.gem) = 2abe2a9fb99a4005115d0195147dd89514dc4f91b54481a9242ff91271c3380e -SIZE (rubygem/chosen-rails-1.0.1.gem) = 20480 +SHA256 (rubygem/chosen-rails-1.1.0.gem) = 0e7e9d705188713368792c74d450378921fcc2ed47dba0d26cbc5ae216568cbb +SIZE (rubygem/chosen-rails-1.1.0.gem) = 20480 From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 15:49:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61D27B10; Thu, 3 Apr 2014 15:49:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E6BACD6; Thu, 3 Apr 2014 15:49:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33FniSx052765; Thu, 3 Apr 2014 15:49:44 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33Fnitt052764; Thu, 3 Apr 2014 15:49:44 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201404031549.s33Fnitt052764@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Thu, 3 Apr 2014 15:49:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350025 - branches/2014Q2/ftp/curl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 15:49:44 -0000 Author: sunpoet Date: Thu Apr 3 15:49:43 2014 New Revision: 350025 URL: http://svnweb.freebsd.org/changeset/ports/350025 QAT: https://qat.redports.org/buildarchive/r350025/ Log: MFH: r349946 - Fix build failure when SPNEGO option is on Approved by: portmgr (antoine) Modified: branches/2014Q2/ftp/curl/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/ftp/curl/Makefile ============================================================================== --- branches/2014Q2/ftp/curl/Makefile Thu Apr 3 15:28:56 2014 (r350024) +++ branches/2014Q2/ftp/curl/Makefile Thu Apr 3 15:49:43 2014 (r350025) @@ -76,7 +76,7 @@ GNUTLS_CONFIGURE_OFF= --without-gnutls GNUTLS_CONFIGURE_ON= --with-gnutls=${LOCALBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=/usr -GSSAPI_BASE_CPPFLAGS= -I${INCLUDEDIR}/gssapi +GSSAPI_BASE_CPPFLAGS= -I${INCLUDEDIR} HEIMDAL_PORT_CONFIGURE_ON= --with-gssapi=${HEIMDAL_HOME} HEIMDAL_PORT_CPPFLAGS= -I${HEIMDAL_HOME}/include HEIMDAL_PORT_LDFLAGS= -L${HEIMDAL_HOME}/lib @@ -159,6 +159,7 @@ CONFIGURE_ARGS+=--without-gssapi post-patch: @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|; s|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|include |include |' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h post-install: .if !defined(BUILDING_HIPHOP) From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 18:00:06 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C847C87C; Thu, 3 Apr 2014 18:00:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B5409B95; Thu, 3 Apr 2014 18:00:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33I06PA006510; Thu, 3 Apr 2014 18:00:06 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33I06to006508; Thu, 3 Apr 2014 18:00:06 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404031800.s33I06to006508@svn.freebsd.org> From: Antoine Brodin Date: Thu, 3 Apr 2014 18:00:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350031 - in branches/2014Q2/audio/hawkvoice: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 18:00:06 -0000 Author: antoine Date: Thu Apr 3 18:00:06 2014 New Revision: 350031 URL: http://svnweb.freebsd.org/changeset/ports/350031 QAT: https://qat.redports.org/buildarchive/r350031/ Log: MFH: r349959 Fix stage symlinks Reported by: stage-qa and poudriere With hat: portmgr Modified: branches/2014Q2/audio/hawkvoice/Makefile branches/2014Q2/audio/hawkvoice/files/patch-src_makefile.linux Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/audio/hawkvoice/Makefile ============================================================================== --- branches/2014Q2/audio/hawkvoice/Makefile Thu Apr 3 17:25:22 2014 (r350030) +++ branches/2014Q2/audio/hawkvoice/Makefile Thu Apr 3 18:00:06 2014 (r350031) @@ -3,6 +3,7 @@ PORTNAME= hawkvoice PORTVERSION= 0.91 +PORTREVISION= 1 CATEGORIES= audio devel MASTER_SITES= http://www.hawksoft.com/download/files/ DISTNAME= HawkVoiceDI091src Modified: branches/2014Q2/audio/hawkvoice/files/patch-src_makefile.linux ============================================================================== --- branches/2014Q2/audio/hawkvoice/files/patch-src_makefile.linux Thu Apr 3 17:25:22 2014 (r350030) +++ branches/2014Q2/audio/hawkvoice/files/patch-src_makefile.linux Thu Apr 3 18:00:06 2014 (r350031) @@ -38,8 +38,8 @@ - ln -s $(LIBDIR)/$(OUTPUT) lib$(LIBNAME).so.$(MAJOR_VERSION).$(MINOR_VERSION) - ln -s $(LIBDIR)/$(OUTPUT) lib$(LIBNAME).so.$(MAJOR_VERSION) - ln -s $(LIBDIR)/$(OUTPUT) lib$(LIBNAME).so -+ ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION) -+ ln -s $(LIBDIR)/$(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so ++ ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so.$(MAJOR_VERSION) ++ ln -s $(OUTPUT) $(LIBDIR)/lib$(LIBNAME).so cp hvdi.h $(INCDIR)/hvdi.h chmod 644 $(INCDIR)/hvdi.h - @echo "" From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 18:13:32 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 562F2F11; Thu, 3 Apr 2014 18:13:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28E49D3B; Thu, 3 Apr 2014 18:13:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33IDWFO014179; Thu, 3 Apr 2014 18:13:32 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33IDVSv014177; Thu, 3 Apr 2014 18:13:31 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404031813.s33IDVSv014177@svn.freebsd.org> From: Antoine Brodin Date: Thu, 3 Apr 2014 18:13:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350035 - branches/2014Q2/print/gtklp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 18:13:32 -0000 Author: antoine Date: Thu Apr 3 18:13:31 2014 New Revision: 350035 URL: http://svnweb.freebsd.org/changeset/ports/350035 QAT: https://qat.redports.org/buildarchive/r350035/ Log: MFH: r350033 - Stage support - Fix build with new cups - NLS is not optional, doesn't build if disabled Reported by: pkg-fallout With hat: portmgr Modified: branches/2014Q2/print/gtklp/Makefile branches/2014Q2/print/gtklp/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/gtklp/Makefile ============================================================================== --- branches/2014Q2/print/gtklp/Makefile Thu Apr 3 18:07:48 2014 (r350034) +++ branches/2014Q2/print/gtklp/Makefile Thu Apr 3 18:13:31 2014 (r350035) @@ -11,29 +11,16 @@ MASTER_SITES= SF MAINTAINER= sylvio@FreeBSD.org COMMENT= GTK interface to cups -LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= pkgconfig +USES= gettext pkgconfig USE_GNOME= gtk20 USE_OPENSSL= yes USE_AUTOTOOLS= automake:env GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES LDFLAGS+= -L${LOCALBASE}/lib -MAN1= gtklp.1 gtklpq.1 - -NO_STAGE= yes - -OPTIONS_DEFINE= NLS - -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.endif - .include Modified: branches/2014Q2/print/gtklp/pkg-plist ============================================================================== --- branches/2014Q2/print/gtklp/pkg-plist Thu Apr 3 18:07:48 2014 (r350034) +++ branches/2014Q2/print/gtklp/pkg-plist Thu Apr 3 18:13:31 2014 (r350035) @@ -1,5 +1,7 @@ bin/gtklp bin/gtklpq +man/man1/gtklp.1.gz +man/man1/gtklpq.1.gz share/locale/ca/LC_MESSAGES/gtklp.mo share/locale/ca_ES/LC_MESSAGES/gtklp.mo share/locale/chs/LC_MESSAGES/gtklp.mo From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 18:33:51 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DF62589; Thu, 3 Apr 2014 18:33:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59139F08; Thu, 3 Apr 2014 18:33:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33IXpqL022522; Thu, 3 Apr 2014 18:33:51 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33IXpWN022521; Thu, 3 Apr 2014 18:33:51 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404031833.s33IXpWN022521@svn.freebsd.org> From: Antoine Brodin Date: Thu, 3 Apr 2014 18:33:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350038 - branches/2014Q2/print/gnome-cups-manager X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 18:33:51 -0000 Author: antoine Date: Thu Apr 3 18:33:50 2014 New Revision: 350038 URL: http://svnweb.freebsd.org/changeset/ports/350038 QAT: https://qat.redports.org/buildarchive/r350038/ Log: MFH: r350037 - Fix build with new cups (still broken on 10/head) - Stage support - desktop-file-utils not needed as the .desktop file has no MimeType Reported by: pkg-fallout With hat: portmgr Modified: branches/2014Q2/print/gnome-cups-manager/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/gnome-cups-manager/Makefile ============================================================================== --- branches/2014Q2/print/gnome-cups-manager/Makefile Thu Apr 3 18:32:18 2014 (r350037) +++ branches/2014Q2/print/gnome-cups-manager/Makefile Thu Apr 3 18:33:50 2014 (r350038) @@ -13,21 +13,18 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Administration tool for cups -LIB_DEPENDS= gnomecups-1.0.1:${PORTSDIR}/print/libgnomecups +LIB_DEPENDS= libgnomecups-1.0.so:${PORTSDIR}/print/libgnomecups RUN_DEPENDS= gnomesu:${PORTSDIR}/security/libgnomesu USE_AUTOTOOLS= libtool -USE_BZIP2= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \ - desktopfileutils -USES= gettext gmake pkgconfig +USE_GNOME= gnomeprefix intlhack libgnomeprintui libgnomeui +USES= gettext gmake pathfix pkgconfig tar:bzip2 INSTALLS_ICONS= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes post-patch: @${SED} -e 's|%%PREFIX%%|${PREFIX}|' \ < ${FILESDIR}/gnome-cups-manager.desktop \ @@ -45,6 +42,6 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-cups-manager.desktop \ - ${PREFIX}/share/applications + ${STAGEDIR}${PREFIX}/share/applications .include From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 3 19:09:41 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7FA28E3B; Thu, 3 Apr 2014 19:09:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CD79202; Thu, 3 Apr 2014 19:09:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33J9fAK035627; Thu, 3 Apr 2014 19:09:41 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33J9faB035626; Thu, 3 Apr 2014 19:09:41 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404031909.s33J9faB035626@svn.freebsd.org> From: Antoine Brodin Date: Thu, 3 Apr 2014 19:09:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350042 - branches/2014Q2/print/xpp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 19:09:41 -0000 Author: antoine Date: Thu Apr 3 19:09:40 2014 New Revision: 350042 URL: http://svnweb.freebsd.org/changeset/ports/350042 QAT: https://qat.redports.org/buildarchive/r350042/ Log: MFH: r350041 - Fix build with new cups - Stage support Reported by: pkg-fallout With hat: portmgr Modified: branches/2014Q2/print/xpp/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/xpp/Makefile ============================================================================== --- branches/2014Q2/print/xpp/Makefile Thu Apr 3 19:03:00 2014 (r350041) +++ branches/2014Q2/print/xpp/Makefile Thu Apr 3 19:09:40 2014 (r350042) @@ -10,18 +10,17 @@ MASTER_SITES= SF/cups/${PORTNAME}/${PORT MAINTAINER= cy@FreeBSD.org COMMENT= X11-based printer manager for CUPS -LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client \ - fltk.1:${PORTSDIR}/x11-toolkits/fltk +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client \ + libfltk.so.1:${PORTSDIR}/x11-toolkits/fltk BUILD_DEPENDS= ${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base -USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake tar:bzip2 GNU_CONFIGURE= yes +CFLAGS+= -D_IPP_PRIVATE_STRUCTURES PLIST_FILES= bin/xpp share/doc/xpp/README PLIST_DIRS= share/doc/xpp -NO_STAGE= yes post-configure: @${REINPLACE_CMD} -e 's|$$(all_includes)|-I ${PREFIX}/include|' \ ${WRKSRC}/Makefile @@ -29,7 +28,7 @@ post-configure: @${REINPLACE_CMD} -e 's|printFiles::get|get|' ${WRKSRC}/xpp.h post-install: - ${MKDIR} ${PREFIX}/share/doc/xpp - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xpp + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xpp + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/xpp .include From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 4 05:53:48 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37DBEDAC; Fri, 4 Apr 2014 05:53:48 +0000 (UTC) Received: from smtp-out-02.shaw.ca (smtp-out-03.shaw.ca [64.59.136.139]) by mx1.freebsd.org (Postfix) with ESMTP id DA69DE71; Fri, 4 Apr 2014 05:53:47 +0000 (UTC) X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=tLeJwtg1FCvAouMblIYY1Z5/U6XdMrtw4y2B9g+QINc= c=1 sm=1 a=iiUmYHE-ycYA:10 a=QrugwKR0C_UA:10 a=wAGQQ9Az6v0A:10 a=BLceEmwcHowA:10 a=ICAaq7hcmGcA:10 a=kj9zAlcOel0A:10 a=IbtKDeXwb2+SRU442/pi3A==:17 a=6I5d2MoRAAAA:8 a=KC9ug_Y4AAAA:8 a=BWvPGDcYAAAA:8 a=E05VYvo5Oh31MQ7G0bUA:9 a=CjuIK1q_8ugA:10 a=SV7veod9ZcQA:10 a=V7tsTZBp22UA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO spqr.komquats.com) ([96.50.7.119]) by smtp-out-02.shaw.ca with ESMTP; 03 Apr 2014 23:53:40 -0600 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id BE5E29BE7; Thu, 3 Apr 2014 22:53:39 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.14.8/8.14.8) with ESMTP id s345rcu7076591; Thu, 3 Apr 2014 22:53:38 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.14.8/8.13.1/Submit) with ESMTP id s345rcjx076588; Thu, 3 Apr 2014 22:53:38 -0700 (PDT) (envelope-from Cy.Schubert@komquats.com) Message-Id: <201404040553.s345rcjx076588@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.5 From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.komquats.com/ To: Antoine Brodin Subject: Re: svn commit: r350042 - branches/2014Q2/print/xpp In-Reply-To: Message from Antoine Brodin of "Thu, 03 Apr 2014 19:09:41 -0000." <201404031909.s33J9faB035626@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 03 Apr 2014 22:53:38 -0700 Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Cy Schubert List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2014 05:53:48 -0000 In message <201404031909.s33J9faB035626@svn.freebsd.org>, Antoine Brodin writes : > Author: antoine > Date: Thu Apr 3 19:09:40 2014 > New Revision: 350042 > URL: http://svnweb.freebsd.org/changeset/ports/350042 > QAT: https://qat.redports.org/buildarchive/r350042/ > > Log: > MFH: r350041 > > - Fix build with new cups > - Stage support > > Reported by: pkg-fallout > With hat: portmgr > > Modified: > branches/2014Q2/print/xpp/Makefile > Directory Properties: > branches/2014Q2/ (props changed) > > Modified: branches/2014Q2/print/xpp/Makefile > ============================================================================= > = > --- branches/2014Q2/print/xpp/Makefile Thu Apr 3 19:03:00 2014 > (r350041) > +++ branches/2014Q2/print/xpp/Makefile Thu Apr 3 19:09:40 2014 > (r350042) > @@ -10,18 +10,17 @@ MASTER_SITES= SF/cups/${PORTNAME}/${PORT > MAINTAINER= cy@FreeBSD.org > COMMENT= X11-based printer manager for CUPS > > -LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client \ > - fltk.1:${PORTSDIR}/x11-toolkits/fltk > +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client \ > + libfltk.so.1:${PORTSDIR}/x11-toolkits/fltk > BUILD_DEPENDS= ${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base > > -USE_BZIP2= yes > -USE_GMAKE= yes > +USES= gmake tar:bzip2 > GNU_CONFIGURE= yes > +CFLAGS+= -D_IPP_PRIVATE_STRUCTURES > > PLIST_FILES= bin/xpp share/doc/xpp/README > PLIST_DIRS= share/doc/xpp > > -NO_STAGE= yes > post-configure: > @${REINPLACE_CMD} -e 's|$$(all_includes)|-I ${PREFIX}/include|' \ > ${WRKSRC}/Makefile > @@ -29,7 +28,7 @@ post-configure: > @${REINPLACE_CMD} -e 's|printFiles::get|get|' ${WRKSRC}/xpp.h > > post-install: > - ${MKDIR} ${PREFIX}/share/doc/xpp > - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xpp > + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xpp > + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/xpp > > .include > > Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 4 10:07:38 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9A8F79D; Fri, 4 Apr 2014 10:07:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6C608EE; Fri, 4 Apr 2014 10:07:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34A7cxu016665; Fri, 4 Apr 2014 10:07:38 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34A7cvJ016664; Fri, 4 Apr 2014 10:07:38 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404041007.s34A7cvJ016664@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 4 Apr 2014 10:07:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350084 - branches/2014Q2/net/libtnl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2014 10:07:38 -0000 Author: bapt Date: Fri Apr 4 10:07:38 2014 New Revision: 350084 URL: http://svnweb.freebsd.org/changeset/ports/350084 QAT: https://qat.redports.org/buildarchive/r350084/ Log: MFH: r350083 Support stage Enforce usage of gcc as this is bad c++ code that only g++ accept when it should not see http://clang.debian.net/status.php?version=3.0&key=USE_OF_UNDECLARED_IDENTIFIER for details Modified: branches/2014Q2/net/libtnl/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/net/libtnl/Makefile ============================================================================== --- branches/2014Q2/net/libtnl/Makefile Fri Apr 4 10:06:40 2014 (r350083) +++ branches/2014Q2/net/libtnl/Makefile Fri Apr 4 10:07:38 2014 (r350084) @@ -8,13 +8,13 @@ MASTER_SITES= SF/opentnl/TNL%20Source/${ DISTNAME= tnl-${PORTVERSION}-source MAINTAINER= ports@FreeBSD.org -COMMENT= A robust, secure, easy to use cross-platform C++ networking API +COMMENT= Robust, secure, easy to use cross-platform C++ networking API +USES= uidfix +USE_GCC= any WRKSRC= ${WRKDIR}/tnl/tnl USE_LDCONFIG= yes MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ARGS= -j`${SYSCTL} -n hw.ncpu` -NO_STAGE= yes # Other arches can be added easily, provided there is hardware to test: ONLY_FOR_ARCHS= i386 amd64 .if defined(NO_PROFILE) || defined(NOPROFILE) @@ -29,7 +29,7 @@ PLIST_SUB+= PROFILE='' # #EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude tnl/libtomcrypt -pre-su-install: - ${MKDIR} ${PREFIX}/include/tnl +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/include/tnl .include From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 4 10:48:45 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE89C577; Fri, 4 Apr 2014 10:48:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA548C27; Fri, 4 Apr 2014 10:48:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34AmjrK034250; Fri, 4 Apr 2014 10:48:45 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34Amj3T034249; Fri, 4 Apr 2014 10:48:45 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404041048.s34Amj3T034249@svn.freebsd.org> From: Mathieu Arnold Date: Fri, 4 Apr 2014 10:48:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350091 - in branches/2014Q2/security/softhsm: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2014 10:48:45 -0000 Author: mat Date: Fri Apr 4 10:48:45 2014 New Revision: 350091 URL: http://svnweb.freebsd.org/changeset/ports/350091 QAT: https://qat.redports.org/buildarchive/r350091/ Log: MFH: r350089 Fix SoftHSM's umask handling (upstream patch) Approved by: maintainer Obtained from: https://github.com/opendnssec/SoftHSMv1/pull/11 Sponsored by: Absolight Added: branches/2014Q2/security/softhsm/files/ - copied from r350089, head/security/softhsm/files/ Modified: branches/2014Q2/security/softhsm/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/softhsm/Makefile ============================================================================== --- branches/2014Q2/security/softhsm/Makefile Fri Apr 4 10:33:38 2014 (r350090) +++ branches/2014Q2/security/softhsm/Makefile Fri Apr 4 10:48:45 2014 (r350091) @@ -3,6 +3,7 @@ PORTNAME= softhsm PORTVERSION= 1.3.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://dist.opendnssec.org/source/ From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 4 11:11:59 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9CB78E43; Fri, 4 Apr 2014 11:11:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 87F92EAA; Fri, 4 Apr 2014 11:11:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34BBxbB046038; Fri, 4 Apr 2014 11:11:59 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34BBxtw046037; Fri, 4 Apr 2014 11:11:59 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404041111.s34BBxtw046037@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 4 Apr 2014 11:11:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350096 - in branches/2014Q2/news/sn: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2014 11:11:59 -0000 Author: bapt Date: Fri Apr 4 11:11:59 2014 New Revision: 350096 URL: http://svnweb.freebsd.org/changeset/ports/350096 QAT: https://qat.redports.org/buildarchive/r350096/ Log: MFH: r350093 Do not leak stagedir in the generated binary Remove now useless pre-su target Added: branches/2014Q2/news/sn/files/ - copied from r350093, head/news/sn/files/ Modified: branches/2014Q2/news/sn/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/news/sn/Makefile ============================================================================== --- branches/2014Q2/news/sn/Makefile Fri Apr 4 11:08:17 2014 (r350095) +++ branches/2014Q2/news/sn/Makefile Fri Apr 4 11:11:59 2014 (r350096) @@ -3,6 +3,7 @@ PORTNAME= sn PORTVERSION= 0.3.8 +PORTREVISION= 1 CATEGORIES= news MASTER_SITES= http://www.infa.abo.fi/~patrik/sn/files/ \ http://home.arcor.de/teambushido/fbsd_ports/ \ @@ -13,9 +14,8 @@ COMMENT= Small news system for small sit LICENSE= GPLv2 -USES= gmake -USE_BZIP2= yes -MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" LD="${CC}" CC="${CC}" +USES= gmake tar:bzip2 +MAKE_ARGS+= PREFIX="${PREFIX}" LD="${CC}" CC="${CC}" PORTDOCS= README CHANGES FAQ INSTALL INTERNALS \ THANKS TODO INSTALL.notes INSTALL.notes2 \ @@ -30,7 +30,7 @@ post-patch: s|-g -Wall -pedantic -O|${CFLAGS} -Wall -pedantic|' \ ${WRKSRC}/Makefile -pre-su-install: +pre-install: @${MKDIR} ${STAGEDIR}/var/spool/news post-install: From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 5 07:13:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA612DF6; Sat, 5 Apr 2014 07:13:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9709A9AC; Sat, 5 Apr 2014 07:13:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s357D7Be045508; Sat, 5 Apr 2014 07:13:07 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s357D7FB045507; Sat, 5 Apr 2014 07:13:07 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404050713.s357D7FB045507@svn.freebsd.org> From: Boris Samorodov Date: Sat, 5 Apr 2014 07:13:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350199 - branches/2014Q2/print/cups-base X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2014 07:13:07 -0000 Author: bsam Date: Sat Apr 5 07:13:07 2014 New Revision: 350199 URL: http://svnweb.freebsd.org/changeset/ports/350199 QAT: https://qat.redports.org/buildarchive/r350199/ Log: MFH: r350154 Use CFLAGS+=-fno-blocks to unbreak systems with default gcc compiler. This is a band-aid that should be reworked for systems with blocks and libdispatch support. Reported by: Anton Shterenlikht Discussed at: freebsd-ports@ Approved by: portmgr (bapt) Modified: branches/2014Q2/print/cups-base/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/cups-base/Makefile ============================================================================== --- branches/2014Q2/print/cups-base/Makefile Sat Apr 5 06:34:54 2014 (r350198) +++ branches/2014Q2/print/cups-base/Makefile Sat Apr 5 07:13:07 2014 (r350199) @@ -299,4 +299,12 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${STAGEDIR}${PREFIX}/sbin/ .endif -.include +# This is just a band-aid to unbreak print/cups-client at systems with default gcc compiler, +# should be reworked to build with blocks and libdispatch support (via options). +# +.include +.if defined(CUPS_CLIENT) && ${OPSYS} == "FreeBSD" && ${OSVERSION} > 1000000 +CFLAGS+= -fno-blocks +.endif + +.include From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 5 10:40:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29149884; Sat, 5 Apr 2014 10:40:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1606CBCC; Sat, 5 Apr 2014 10:40:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35AehTd028587; Sat, 5 Apr 2014 10:40:43 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35AehFm028586; Sat, 5 Apr 2014 10:40:43 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404051040.s35AehFm028586@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 5 Apr 2014 10:40:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350212 - branches/2014Q2/www/mohawk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2014 10:40:44 -0000 Author: mat Date: Sat Apr 5 10:40:43 2014 New Revision: 350212 URL: http://svnweb.freebsd.org/changeset/ports/350212 QAT: https://qat.redports.org/buildarchive/r350212/ Log: MFH: r350211 MAINTAINER bounces. : host mx2.bsdsx.fr[2a02:27d0:100:f205:a642::9] said: 550 Invalid recipient (in reply to RCPT TO command) Obtained from: pkg-fallout Sponsored by: Absolight Modified: branches/2014Q2/www/mohawk/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/mohawk/Makefile ============================================================================== --- branches/2014Q2/www/mohawk/Makefile Sat Apr 5 10:38:41 2014 (r350211) +++ branches/2014Q2/www/mohawk/Makefile Sat Apr 5 10:40:43 2014 (r350212) @@ -7,7 +7,7 @@ MASTER_SITES= http://fossil.etoilebsd.ne http://fossil.bsdsx.fr/mohawk/tarball/ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz?uuid=${PORTVERSION} -MAINTAINER= mohawk@bsdsx.fr +MAINTAINER= ports@freebsd.org COMMENT= Simple and lightweight HTTP daemon LICENSE= BSD2CLAUSE From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 5 18:41:34 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7837C8E8; Sat, 5 Apr 2014 18:41:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A677F75; Sat, 5 Apr 2014 18:41:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35IfY0t028003; Sat, 5 Apr 2014 18:41:34 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35IfXG3027880; Sat, 5 Apr 2014 18:41:33 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404051841.s35IfXG3027880@svn.freebsd.org> From: Boris Samorodov Date: Sat, 5 Apr 2014 18:41:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350257 - in branches/2014Q2/print/cups-filters: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2014 18:41:34 -0000 Author: bsam Date: Sat Apr 5 18:41:33 2014 New Revision: 350257 URL: http://svnweb.freebsd.org/changeset/ports/350257 QAT: https://qat.redports.org/buildarchive/r350257/ Log: MFH: r350243 print/cups-filters: update to version 1.0.50. This should fix a reported regression (I managed to reproduce it with HP laser printers) when a job is printed but remains in a job query. Reported by: Dr. Peter Voigt Tested by: Dr. Peter Voigt Discussed at: freebsd-ports@ Approved by: portmgr (erwin) Modified: branches/2014Q2/print/cups-filters/Makefile branches/2014Q2/print/cups-filters/distinfo branches/2014Q2/print/cups-filters/files/patch-utils_cups-browsed.c branches/2014Q2/print/cups-filters/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/cups-filters/Makefile ============================================================================== --- branches/2014Q2/print/cups-filters/Makefile Sat Apr 5 18:31:59 2014 (r350256) +++ branches/2014Q2/print/cups-filters/Makefile Sat Apr 5 18:41:33 2014 (r350257) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cups-filters -PORTVERSION= 1.0.42 +PORTVERSION= 1.0.50 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/cups-filters/ @@ -20,7 +20,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libpoppler.so:${PORTSDIR}/graphics/poppler -USES= compiler:c++11-lib pathfix pkgconfig tar:xz +USES= compiler:c++11-lib pathfix pkgconfig shebangfix tar:xz +SHEBANG_FILES= filter/textonly USE_GNOME= glib20 USE_GHOSTSCRIPT= yes GNU_CONFIGURE= yes @@ -45,5 +46,7 @@ post-patch: post-install: @${RM} -rf ${STAGEDIR}${PREFIX}/libexec/cups/filter/foomatic-rip \ ${STAGEDIR}${PREFIX}/man/man1/foomatic-rip.1 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcupsfilters.so.1 \ + ${STAGEDIR}${PREFIX}/lib/libfontembed.so.1 .include Modified: branches/2014Q2/print/cups-filters/distinfo ============================================================================== --- branches/2014Q2/print/cups-filters/distinfo Sat Apr 5 18:31:59 2014 (r350256) +++ branches/2014Q2/print/cups-filters/distinfo Sat Apr 5 18:41:33 2014 (r350257) @@ -1,2 +1,2 @@ -SHA256 (cups-filters-1.0.42.tar.xz) = 3df524207ab24472430cffba7f01407b8adc094ec40094c5f6682d5a88a70dd6 -SIZE (cups-filters-1.0.42.tar.xz) = 1097860 +SHA256 (cups-filters-1.0.50.tar.xz) = 771bdaeaa171cfb3850b229d5d167bde2abcd40b900075ae72d4867acc8adbe7 +SIZE (cups-filters-1.0.50.tar.xz) = 1309912 Modified: branches/2014Q2/print/cups-filters/files/patch-utils_cups-browsed.c ============================================================================== --- branches/2014Q2/print/cups-filters/files/patch-utils_cups-browsed.c Sat Apr 5 18:31:59 2014 (r350256) +++ branches/2014Q2/print/cups-filters/files/patch-utils_cups-browsed.c Sat Apr 5 18:41:33 2014 (r350257) @@ -1,13 +1,15 @@ ---- utils/cups-browsed.c.orig 2013-12-27 20:45:55.188455147 +0400 -+++ utils/cups-browsed.c 2013-12-27 20:46:23.397446686 +0400 -@@ -23,7 +23,6 @@ +--- utils/cups-browsed.c.orig 2014-04-05 16:31:42.635763683 +0400 ++++ utils/cups-browsed.c 2014-04-05 16:37:07.384740688 +0400 +@@ -23,8 +23,7 @@ #include #include -#include - #if defined(__OpenBSD__) +-#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__FreeBSD__) #include #endif /* __OpenBSD__ */ + #include @@ -33,6 +32,7 @@ #include #include Modified: branches/2014Q2/print/cups-filters/pkg-plist ============================================================================== --- branches/2014Q2/print/cups-filters/pkg-plist Sat Apr 5 18:31:59 2014 (r350256) +++ branches/2014Q2/print/cups-filters/pkg-plist Sat Apr 5 18:41:33 2014 (r350257) @@ -48,6 +48,7 @@ man/man8/cups-browsed.8.gz sbin/cups-browsed share/cups/banners/classified share/cups/banners/confidential +share/cups/banners/form share/cups/banners/secret share/cups/banners/standard share/cups/banners/topsecret @@ -57,6 +58,10 @@ share/cups/charsets/pdf.utf-8.heavy share/cups/charsets/pdf.utf-8.simple share/cups/data/default-testpage.pdf share/cups/data/default.pdf +share/cups/data/form_english.pdf +share/cups/data/form_english_in.odt +share/cups/data/form_russian.pdf +share/cups/data/form_russian_in.odt share/cups/data/testprint share/cups/drv/cupsfilters.drv share/cups/mime/cupsfilters.convs @@ -68,6 +73,7 @@ share/cups/ppdc/pcl.h %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd share/ppd/cupsfilters/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 5 23:32:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DF067B8; Sat, 5 Apr 2014 23:32:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1AB35B3D; Sat, 5 Apr 2014 23:32:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35NWsRv054235; Sat, 5 Apr 2014 23:32:54 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35NWsTK054234; Sat, 5 Apr 2014 23:32:54 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404052332.s35NWsTK054234@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 5 Apr 2014 23:32:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350280 - branches/2014Q2/sysutils/mcron X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2014 23:32:55 -0000 Author: mat Date: Sat Apr 5 23:32:54 2014 New Revision: 350280 URL: http://svnweb.freebsd.org/changeset/ports/350280 QAT: https://qat.redports.org/buildarchive/r350280/ Log: MFH: r350278 Reset MAINTAINER. : host srv-eml-pmva-02.fh-mainz.de[143.93.114.189] said: 550 5.1.1 : Recipient address rejected: undeliverable address: host 143.93.114.70[143.93.114.70] said: 550 5.1.1 : Recipient address rejected: User unknown in virtual mailbox table (in reply to RCPT TO command) (in reply to RCPT TO command) Approved by: portmgr (implicit) Obtained from: pkg-fallout Sponsored by: Absolight Modified: branches/2014Q2/sysutils/mcron/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/sysutils/mcron/Makefile ============================================================================== --- branches/2014Q2/sysutils/mcron/Makefile Sat Apr 5 23:32:39 2014 (r350279) +++ branches/2014Q2/sysutils/mcron/Makefile Sat Apr 5 23:32:54 2014 (r350280) @@ -8,7 +8,7 @@ CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= mcron -MAINTAINER= stefan@fh-mainz.de +MAINTAINER= ports@FreeBSD.org COMMENT= A 100% compatible replacement for Vixie cron BUILD_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 6 09:58:29 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D415F286; Sun, 6 Apr 2014 09:58:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6B2DC88; Sun, 6 Apr 2014 09:58:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s369wTh8012652; Sun, 6 Apr 2014 09:58:29 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s369wTcX012651; Sun, 6 Apr 2014 09:58:29 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404060958.s369wTcX012651@svn.freebsd.org> From: Pawel Pekala Date: Sun, 6 Apr 2014 09:58:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350345 - branches/2014Q2/graphics/pvmpov X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2014 09:58:29 -0000 Author: pawel Date: Sun Apr 6 09:58:29 2014 New Revision: 350345 URL: http://svnweb.freebsd.org/changeset/ports/350345 QAT: https://qat.redports.org/buildarchive/r350345/ Log: MFH: r350342 - Fix build with clang by respecting CC, CXXFLAGS - Add staging support - Convert to new LIB_DEPENDS format - Define DOCS option Approved by: portmgr (erwin) Modified: branches/2014Q2/graphics/pvmpov/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/pvmpov/Makefile ============================================================================== --- branches/2014Q2/graphics/pvmpov/Makefile Sun Apr 6 09:58:09 2014 (r350344) +++ branches/2014Q2/graphics/pvmpov/Makefile Sun Apr 6 09:58:29 2014 (r350345) @@ -14,7 +14,7 @@ COMMENT= Distributed rendering package f BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/povray31:configure \ aimk:${PORTSDIR}/net/pvm -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png RUN_DEPENDS= povray31:${PORTSDIR}/graphics/povray31 \ pvmd:${PORTSDIR}/net/pvm @@ -26,33 +26,30 @@ WRKSRC= ${WRKDIR}/pvmpov3_1g_2 BUILDBASE= ${WRKSRC}/povray31/source/pvm PVM_ROOT= ${LOCALBASE}/lib/pvm -.if !defined(NOPORTDOCS) -PORTDOCS= * -.endif - PLIST_FILES= bin/x-pvmpov \ lib/pvm/bin/FREEBSD/x-pvmpov +PORTDOCS= * + +OPTIONS_DEFINE= DOCS -NO_STAGE= yes pre-configure: - @ (cd ${WRKDIRPREFIX}${.CURDIR}/../../graphics/povray31/work && \ - ${TAR} -c -f - povray31 ) \ - | (cd ${WRKSRC} && ${TAR} --unlink -x -f -) - @ cd ${WRKSRC} && ${PATCH} -p0 -s < pvmpov.patch - @${REINPLACE_CMD} -i '' -e 's|%LOCALBASE%|${LOCALBASE}|' \ + @ (cd ${WRKDIRPREFIX}${.CURDIR}/../../graphics/povray31/work && \ + ${TAR} -c -f - povray31 ) \ + | (cd ${WRKSRC} && ${TAR} --unlink -x -f -) + @ cd ${WRKSRC} && ${PATCH} -p0 -s < pvmpov.patch + @${REINPLACE_CMD} -i '' -e 's|%LOCALBASE%|${LOCALBASE}|' \ + -e '/^CC/ s|gcc|${CC}|' -e '/^CFLAGS/ s|-O6|${CXXFLAGS}|' \ ${BUILDBASE}/Makefile.aimk do-build: - @ cd ${BUILDBASE} && \ - ${SETENV} PVM_ROOT=${PVM_ROOT} aimk newxwin + @cd ${BUILDBASE} && ${SETENV} PVM_ROOT=${PVM_ROOT} aimk newxwin do-install: - @ ${MKDIR} ${PVM_ROOT}/bin/FREEBSD - @ ${INSTALL_PROGRAM} ${BUILDBASE}/FREEBSD/x-pvmpov ${PVM_ROOT}/bin/FREEBSD - @ ${LN} -sf ${PVM_ROOT}/bin/FREEBSD/x-pvmpov ${PREFIX}/bin/x-pvmpov -.if !defined(NOPORTDOCS) - @ ${MKDIR} ${DOCSDIR} - @ ${INSTALL_DATA} ${WRKSRC}/doc/PVMPOV-HOWTO.html ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD + ${INSTALL_PROGRAM} ${BUILDBASE}/FREEBSD/x-pvmpov \ + ${STAGEDIR}${PVM_ROOT}/bin/FREEBSD + ${LN} -sf ${PVM_ROOT}/bin/FREEBSD/x-pvmpov ${STAGEDIR}${PREFIX}/bin/x-pvmpov + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/PVMPOV-HOWTO.html ${STAGEDIR}${DOCSDIR} .include From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 6 19:36:17 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6872AC58; Sun, 6 Apr 2014 19:36:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5405325A; Sun, 6 Apr 2014 19:36:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s36JaHCf051210; Sun, 6 Apr 2014 19:36:17 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s36JaHK7051209; Sun, 6 Apr 2014 19:36:17 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404061936.s36JaHK7051209@svn.freebsd.org> From: Antoine Brodin Date: Sun, 6 Apr 2014 19:36:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350403 - branches/2014Q2/multimedia/gnome-mplayer X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2014 19:36:17 -0000 Author: antoine Date: Sun Apr 6 19:36:16 2014 New Revision: 350403 URL: http://svnweb.freebsd.org/changeset/ports/350403 QAT: https://qat.redports.org/buildarchive/r350403/ Log: MFH: r350279 Unbreak, for some reasons the glib schema files are not installed Reported by: pkg-fallout PR: ports/187568 Approved by: portmgr (self) Modified: branches/2014Q2/multimedia/gnome-mplayer/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/multimedia/gnome-mplayer/Makefile ============================================================================== --- branches/2014Q2/multimedia/gnome-mplayer/Makefile Sun Apr 6 19:21:34 2014 (r350402) +++ branches/2014Q2/multimedia/gnome-mplayer/Makefile Sun Apr 6 19:36:16 2014 (r350403) @@ -34,9 +34,9 @@ CONFIGURE_ARGS= --disable-nautilus PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README \ dbus.txt keyboard_shortcuts.txt plugin-interaction.txt -GLIB_SCHEMAS= apps.gecko-mediaplayer.preferences.gschema.xml \ - apps.gnome-mplayer.preferences.enums.xml \ - apps.gnome-mplayer.preferences.gschema.xml +#GLIB_SCHEMAS= apps.gecko-mediaplayer.preferences.gschema.xml \ +# apps.gnome-mplayer.preferences.enums.xml \ +# apps.gnome-mplayer.preferences.gschema.xml .include From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 6 19:37:35 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D4ED2D49; Sun, 6 Apr 2014 19:37:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0FD2266; Sun, 6 Apr 2014 19:37:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s36JbZ6Y051434; Sun, 6 Apr 2014 19:37:35 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s36JbZRw051433; Sun, 6 Apr 2014 19:37:35 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404061937.s36JbZRw051433@svn.freebsd.org> From: Antoine Brodin Date: Sun, 6 Apr 2014 19:37:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350404 - branches/2014Q2/editors/openoffice-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2014 19:37:35 -0000 Author: antoine Date: Sun Apr 6 19:37:35 2014 New Revision: 350404 URL: http://svnweb.freebsd.org/changeset/ports/350404 QAT: https://qat.redports.org/buildarchive/r350404/ Log: MFH: r350251 Possibly unbreak Reported by: pkg-fallout With hat: portmgr Modified: branches/2014Q2/editors/openoffice-devel/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/editors/openoffice-devel/Makefile ============================================================================== --- branches/2014Q2/editors/openoffice-devel/Makefile Sun Apr 6 19:36:16 2014 (r350403) +++ branches/2014Q2/editors/openoffice-devel/Makefile Sun Apr 6 19:37:35 2014 (r350404) @@ -323,12 +323,14 @@ post-install: @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for iconfile in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${iconfile} \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \ From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 6 19:43:48 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF572F62; Sun, 6 Apr 2014 19:43:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8EF0530F; Sun, 6 Apr 2014 19:43:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s36JhmDS055089; Sun, 6 Apr 2014 19:43:48 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s36JhmDs055086; Sun, 6 Apr 2014 19:43:48 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404061943.s36JhmDs055086@svn.freebsd.org> From: Antoine Brodin Date: Sun, 6 Apr 2014 19:43:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350405 - in branches/2014Q2/comms/gqrx: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2014 19:43:48 -0000 Author: antoine Date: Sun Apr 6 19:43:47 2014 New Revision: 350405 URL: http://svnweb.freebsd.org/changeset/ports/350405 QAT: https://qat.redports.org/buildarchive/r350405/ Log: MFH: r349975 - Update to 20140313 (and use QT5) - Update WWW Approved by: portmgr (self) Added: branches/2014Q2/comms/gqrx/files/ - copied from r349975, head/comms/gqrx/files/ Modified: branches/2014Q2/comms/gqrx/Makefile branches/2014Q2/comms/gqrx/distinfo branches/2014Q2/comms/gqrx/pkg-descr Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/comms/gqrx/Makefile ============================================================================== --- branches/2014Q2/comms/gqrx/Makefile Sun Apr 6 19:37:35 2014 (r350404) +++ branches/2014Q2/comms/gqrx/Makefile Sun Apr 6 19:43:47 2014 (r350405) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gqrx -PORTVERSION= 20130504 -PORTREVISION= 4 +PORTVERSION= 20140313 CATEGORIES= comms hamradio MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac @@ -14,7 +13,11 @@ COMMENT= Qt-based software defined radio LICENSE= GPLv3 -LIB_DEPENDS= libgnuradio-core.so:${PORTSDIR}/comms/gnuradio \ +LIB_DEPENDS= libgnuradio-runtime.so:${PORTSDIR}/comms/gnuradio \ + libgnuradio-analog.so:${PORTSDIR}/comms/gnuradio \ + libgnuradio-blocks.so:${PORTSDIR}/comms/gnuradio \ + libgnuradio-filter.so:${PORTSDIR}/comms/gnuradio \ + libgnuradio-fft.so:${PORTSDIR}/comms/gnuradio \ libgnuradio-audio.so:${PORTSDIR}/comms/gnuradio \ libgnuradio-osmosdr.so:${PORTSDIR}/comms/gr-osmosdr \ libpulse.so:${PORTSDIR}/audio/pulseaudio \ @@ -23,7 +26,9 @@ LIB_DEPENDS= libgnuradio-core.so:${PORTS libboost_program_options.so:${PORTSDIR}/devel/boost-libs USES= pkgconfig qmake -USE_QT4= moc_build rcc_build uic_build corelib gui svg +USE_QT5= buildtools core gui svg network widgets + +QMAKE_ARGS+= VER="${PORTVERSION}" PLIST_FILES= bin/gqrx Modified: branches/2014Q2/comms/gqrx/distinfo ============================================================================== --- branches/2014Q2/comms/gqrx/distinfo Sun Apr 6 19:37:35 2014 (r350404) +++ branches/2014Q2/comms/gqrx/distinfo Sun Apr 6 19:43:47 2014 (r350405) @@ -1,2 +1,2 @@ -SHA256 (gqrx-20130504.tgz) = 6f432a8e7828cd84232728bc6640968403145488dadcb47186b79eb59d96ffe0 -SIZE (gqrx-20130504.tgz) = 891521 +SHA256 (gqrx-20140313.tgz) = a5c0da6243d8216966082ded75a45e0168415bf28878c4c0a1839bcf22737297 +SIZE (gqrx-20140313.tgz) = 1113769 Modified: branches/2014Q2/comms/gqrx/pkg-descr ============================================================================== --- branches/2014Q2/comms/gqrx/pkg-descr Sun Apr 6 19:37:35 2014 (r350404) +++ branches/2014Q2/comms/gqrx/pkg-descr Sun Apr 6 19:43:47 2014 (r350405) @@ -4,4 +4,4 @@ Radio and the Qt GUI toolkit. It can use the Funcube Dongle, RTL2832U-based DVB-T dongles, OsmoSDR devices and USRP devices as input source. -WWW: https://github.com/csete/gqrx +WWW: http://gqrx.dk From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 6 19:44:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18BABD7; Sun, 6 Apr 2014 19:44:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0519631F; Sun, 6 Apr 2014 19:44:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s36Jis7h055337; Sun, 6 Apr 2014 19:44:54 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s36JisMb055336; Sun, 6 Apr 2014 19:44:54 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404061944.s36JisMb055336@svn.freebsd.org> From: Antoine Brodin Date: Sun, 6 Apr 2014 19:44:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350406 - branches/2014Q2/comms/gqrx X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2014 19:44:55 -0000 Author: antoine Date: Sun Apr 6 19:44:54 2014 New Revision: 350406 URL: http://svnweb.freebsd.org/changeset/ports/350406 QAT: https://qat.redports.org/buildarchive/r350406/ Log: MFH: r349985 Avoid runtime dependency on buildtools (use buildtools_build instead of buildtools) Submitted by: makc Approved by: portmgr (self) Modified: branches/2014Q2/comms/gqrx/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/comms/gqrx/Makefile ============================================================================== --- branches/2014Q2/comms/gqrx/Makefile Sun Apr 6 19:43:47 2014 (r350405) +++ branches/2014Q2/comms/gqrx/Makefile Sun Apr 6 19:44:54 2014 (r350406) @@ -26,7 +26,7 @@ LIB_DEPENDS= libgnuradio-runtime.so:${PO libboost_program_options.so:${PORTSDIR}/devel/boost-libs USES= pkgconfig qmake -USE_QT5= buildtools core gui svg network widgets +USE_QT5= buildtools_build core gui svg network widgets QMAKE_ARGS+= VER="${PORTVERSION}" From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 6 21:12:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E897A2B; Sun, 6 Apr 2014 21:12:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20858D4D; Sun, 6 Apr 2014 21:12:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s36LCnUO092278; Sun, 6 Apr 2014 21:12:49 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s36LCnZZ092274; Sun, 6 Apr 2014 21:12:49 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404062112.s36LCnZZ092274@svn.freebsd.org> From: Pawel Pekala Date: Sun, 6 Apr 2014 21:12:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350414 - branches/2014Q2/devel/clanlib22/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2014 21:12:50 -0000 Author: pawel Date: Sun Apr 6 21:12:49 2014 New Revision: 350414 URL: http://svnweb.freebsd.org/changeset/ports/350414 QAT: https://qat.redports.org/buildarchive/r350414/ Log: MFH: r350410 Fix build with clang Approved by: portmgr (antoine) Added: branches/2014Q2/devel/clanlib22/files/patch-Sources__Core__precomp.h - copied unchanged from r350410, head/devel/clanlib22/files/patch-Sources__Core__precomp.h branches/2014Q2/devel/clanlib22/files/patch-Sources__Network__Socket__socket_name.cpp - copied unchanged from r350410, head/devel/clanlib22/files/patch-Sources__Network__Socket__socket_name.cpp Modified: Directory Properties: branches/2014Q2/ (props changed) Copied: branches/2014Q2/devel/clanlib22/files/patch-Sources__Core__precomp.h (from r350410, head/devel/clanlib22/files/patch-Sources__Core__precomp.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/devel/clanlib22/files/patch-Sources__Core__precomp.h Sun Apr 6 21:12:49 2014 (r350414, copy of r350410, head/devel/clanlib22/files/patch-Sources__Core__precomp.h) @@ -0,0 +1,8 @@ +--- Sources/Core/precomp.h.orig 2014-04-05 12:54:07.000000000 +0200 ++++ Sources/Core/precomp.h 2014-04-05 12:29:52.000000000 +0200 +@@ -61,4 +61,5 @@ + #define BREAKPOINT asm("int $03"); + #endif + ++#include + Copied: branches/2014Q2/devel/clanlib22/files/patch-Sources__Network__Socket__socket_name.cpp (from r350410, head/devel/clanlib22/files/patch-Sources__Network__Socket__socket_name.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/devel/clanlib22/files/patch-Sources__Network__Socket__socket_name.cpp Sun Apr 6 21:12:49 2014 (r350414, copy of r350410, head/devel/clanlib22/files/patch-Sources__Network__Socket__socket_name.cpp) @@ -0,0 +1,10 @@ +--- Sources/Network/Socket/socket_name.cpp.orig 2014-04-05 12:47:48.000000000 +0200 ++++ Sources/Network/Socket/socket_name.cpp 2014-04-05 12:50:09.000000000 +0200 +@@ -34,6 +34,7 @@ + #ifdef WIN32 + typedef unsigned long in_addr_t; + #else ++#include + #include + #include + #include From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 08:17:35 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5F8377B; Mon, 7 Apr 2014 08:17:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 86DC784A; Mon, 7 Apr 2014 08:17:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s378HZ03024661; Mon, 7 Apr 2014 08:17:35 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s378HYbx024654; Mon, 7 Apr 2014 08:17:34 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404070817.s378HYbx024654@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 7 Apr 2014 08:17:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350430 - in branches/2014Q2/audio/taglookup: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 08:17:35 -0000 Author: bapt Date: Mon Apr 7 08:17:34 2014 New Revision: 350430 URL: http://svnweb.freebsd.org/changeset/ports/350430 QAT: https://qat.redports.org/buildarchive/r350430/ Log: MFH: r350429 Support stage Fix build with clang Added: branches/2014Q2/audio/taglookup/files/patch-command_line.cpp - copied unchanged from r350429, head/audio/taglookup/files/patch-command_line.cpp Modified: branches/2014Q2/audio/taglookup/Makefile branches/2014Q2/audio/taglookup/files/patch-Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/audio/taglookup/Makefile ============================================================================== --- branches/2014Q2/audio/taglookup/Makefile Mon Apr 7 08:16:47 2014 (r350429) +++ branches/2014Q2/audio/taglookup/Makefile Mon Apr 7 08:17:34 2014 (r350430) @@ -15,9 +15,8 @@ LIB_DEPENDS= libcddb.so:${PORTSDIR}/audi libtag.so:${PORTSDIR}/audio/taglib USES= pkgconfig -NO_STAGE= yes -MAN1= taglookup.1 -PLIST_FILES= bin/taglookup +PLIST_FILES= bin/taglookup \ + man/man1/taglookup.1.gz .include Modified: branches/2014Q2/audio/taglookup/files/patch-Makefile ============================================================================== --- branches/2014Q2/audio/taglookup/files/patch-Makefile Mon Apr 7 08:16:47 2014 (r350429) +++ branches/2014Q2/audio/taglookup/files/patch-Makefile Mon Apr 7 08:17:34 2014 (r350430) @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2007-10-29 08:02:54.000000000 -0400 -+++ ./Makefile 2011-03-18 18:59:23.000000000 -0400 +--- ./Makefile.orig 2007-10-29 13:02:54.000000000 +0100 ++++ ./Makefile 2014-04-07 10:15:45.329720325 +0200 @@ -4,7 +4,7 @@ TAGLIB_INCLUDE = `taglib-config --cflags` TAGLIB_LIBRARY = `taglib-config --libs` @@ -9,3 +9,14 @@ CPPFLAGS = -Wall $(TAGLIB_INCLUDE) $(LIBCDDB_INCLUDE) -c LDFLAGS = $(TAGLIB_LIBRARY) $(LIBCDDB_LIBRARY) +@@ -18,8 +18,8 @@ + all: $(EXE) + + install: $(EXE) +- $(INSTALL) -c -o root -g wheel -m 644 taglookup.1 $(PREFIX)/man/man1/taglookup.1 +- $(INSTALL) -c -o root -g wheel -m 755 $(EXE) $(PREFIX)/bin/taglookup ++ $(INSTALL) -c -m 644 taglookup.1 $(DESTDIR)$(PREFIX)/man/man1/taglookup.1 ++ $(INSTALL) -c -m 755 $(EXE) $(DESTDIR)$(PREFIX)/bin/taglookup + + $(EXE): $(OBJ) + $(CPP) $(LDFLAGS) $(OBJ) -o $(EXE) Copied: branches/2014Q2/audio/taglookup/files/patch-command_line.cpp (from r350429, head/audio/taglookup/files/patch-command_line.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/audio/taglookup/files/patch-command_line.cpp Mon Apr 7 08:17:34 2014 (r350430, copy of r350429, head/audio/taglookup/files/patch-command_line.cpp) @@ -0,0 +1,11 @@ +--- ./command_line.cpp.orig 2007-10-01 21:09:46.000000000 +0200 ++++ ./command_line.cpp 2014-04-07 10:14:49.462722923 +0200 +@@ -105,7 +105,7 @@ + + bool CommandLineArgumentsParser::parsePort() + { +- int port = (int)std::strtol(ct_.c_str(), (char**)NULL, 10); ++ int port = (int)strtol(ct_.c_str(), (char**)NULL, 10); + + if(port > 32767 || port <= 0) + { From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 08:21:24 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39FEC9C2; Mon, 7 Apr 2014 08:21:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21D72915; Mon, 7 Apr 2014 08:21:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s378LO3n026488; Mon, 7 Apr 2014 08:21:24 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s378LNrv026487; Mon, 7 Apr 2014 08:21:23 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404070821.s378LNrv026487@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 7 Apr 2014 08:21:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350432 - branches/2014Q2/www/mohawk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 08:21:24 -0000 Author: bapt Date: Mon Apr 7 08:21:23 2014 New Revision: 350432 URL: http://svnweb.freebsd.org/changeset/ports/350432 QAT: https://qat.redports.org/buildarchive/r350432/ Log: MFH: r350431 Bounce have been fixed, give back maintainership Submitted by: maintainer (irc) Modified: branches/2014Q2/www/mohawk/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/mohawk/Makefile ============================================================================== --- branches/2014Q2/www/mohawk/Makefile Mon Apr 7 08:20:45 2014 (r350431) +++ branches/2014Q2/www/mohawk/Makefile Mon Apr 7 08:21:23 2014 (r350432) @@ -7,7 +7,7 @@ MASTER_SITES= http://fossil.etoilebsd.ne http://fossil.bsdsx.fr/mohawk/tarball/ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz?uuid=${PORTVERSION} -MAINTAINER= ports@freebsd.org +MAINTAINER= mohawk@bsdsx.fr COMMENT= Simple and lightweight HTTP daemon LICENSE= BSD2CLAUSE From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 09:34:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6516A98D; Mon, 7 Apr 2014 09:34:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51F021D9; Mon, 7 Apr 2014 09:34:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s379Y2sw058044; Mon, 7 Apr 2014 09:34:02 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s379Y2of058043; Mon, 7 Apr 2014 09:34:02 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404070934.s379Y2of058043@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 7 Apr 2014 09:34:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350438 - branches/2014Q2/devel/tcllib X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 09:34:02 -0000 Author: gahr Date: Mon Apr 7 09:34:01 2014 New Revision: 350438 URL: http://svnweb.freebsd.org/changeset/ports/350438 QAT: https://qat.redports.org/buildarchive/r350438/ Log: MFH: r350435 - Fix shebang lines of installed binaries (needed to UNBREAK print/pdf4tcl) Approved by: portmgr Modified: branches/2014Q2/devel/tcllib/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/tcllib/Makefile ============================================================================== --- branches/2014Q2/devel/tcllib/Makefile Mon Apr 7 09:17:06 2014 (r350437) +++ branches/2014Q2/devel/tcllib/Makefile Mon Apr 7 09:34:01 2014 (r350438) @@ -65,7 +65,7 @@ post-patch: -e 's,$$(libdir)/@PACKAGE@@VERSION@,$$(libdir)/@PACKAGE@,' \ ${WRKSRC}/Makefile.in ${FIND} ${WRKSRC}/apps -type f ! -name "*.man" | ${XARGS} \ - ${REINPLACE_CMD} -e 's,exec tclsh,exec ${TCLSH},' + ${REINPLACE_CMD} -e 's,exec tclsh,exec ${TCLSH},' -e 's,/usr/bin/env tclsh,${TCLSH},' # # patch(1) adds a newline at eof, so we need to remove it here # From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 09:35:05 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3FC04A71; Mon, 7 Apr 2014 09:35:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D2531E3; Mon, 7 Apr 2014 09:35:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s379Z5rK058295; Mon, 7 Apr 2014 09:35:05 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s379Z5OB058294; Mon, 7 Apr 2014 09:35:05 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404070935.s379Z5OB058294@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 7 Apr 2014 09:35:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350439 - branches/2014Q2/print/pdf4tcl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 09:35:05 -0000 Author: gahr Date: Mon Apr 7 09:35:04 2014 New Revision: 350439 URL: http://svnweb.freebsd.org/changeset/ports/350439 QAT: https://qat.redports.org/buildarchive/r350439/ Log: MFH: r350436 - Unbreak after r350435 Approved by: portmgr Modified: branches/2014Q2/print/pdf4tcl/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/pdf4tcl/Makefile ============================================================================== --- branches/2014Q2/print/pdf4tcl/Makefile Mon Apr 7 09:34:01 2014 (r350438) +++ branches/2014Q2/print/pdf4tcl/Makefile Mon Apr 7 09:35:04 2014 (r350439) @@ -19,7 +19,6 @@ OPTIONS_DEFINE= DOCS BUILD_DEPENDS= dtplite:${PORTSDIR}/devel/tcllib RUN_DEPENDS= ${LOCALBASE}/lib/tcllib/snit/snit.tcl:${PORTSDIR}/devel/tcllib -BROKEN= Does not build WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//} PORTDOCS= * From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 16:04:38 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1466E4F; Mon, 7 Apr 2014 16:04:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CDD37180; Mon, 7 Apr 2014 16:04:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37G4cpC022299; Mon, 7 Apr 2014 16:04:38 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37G4cwP022297; Mon, 7 Apr 2014 16:04:38 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404071604.s37G4cwP022297@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 7 Apr 2014 16:04:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350515 - in branches/2014Q2: . games games/f1lt X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 16:04:39 -0000 Author: mat Date: Mon Apr 7 16:04:38 2014 New Revision: 350515 URL: http://svnweb.freebsd.org/changeset/ports/350515 QAT: https://qat.redports.org/buildarchive/r350515/ Log: MFH: r350425 - Trademark violation requires tree removal. Sad way to start off new season! WWW: http://www.formula1.com/trademarkguidelines.html Deleted: branches/2014Q2/games/f1lt/ Modified: branches/2014Q2/MOVED branches/2014Q2/games/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/MOVED ============================================================================== --- branches/2014Q2/MOVED Mon Apr 7 16:03:21 2014 (r350514) +++ branches/2014Q2/MOVED Mon Apr 7 16:04:38 2014 (r350515) @@ -5853,3 +5853,4 @@ www/trac-macropost||2014-03-30|Has expir mail/vexim||2014-03-30|Has expired: No more public distfiles lang/rscheme||2014-03-30|Has expired: No more public distfiles emulators/xmame||2014-03-30|Has expired: No more public distfiles +games/f1lt||2014-04-06|Trademark violation: http://www.formula1.com/trademarkguidelines.html Modified: branches/2014Q2/games/Makefile ============================================================================== --- branches/2014Q2/games/Makefile Mon Apr 7 16:03:21 2014 (r350514) +++ branches/2014Q2/games/Makefile Mon Apr 7 16:04:38 2014 (r350515) @@ -246,7 +246,6 @@ SUBDIR += exmars SUBDIR += exult SUBDIR += ezquake - SUBDIR += f1lt SUBDIR += f1spirit-remake SUBDIR += fairymax SUBDIR += falconseye From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 17:10:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABEE0969; Mon, 7 Apr 2014 17:10:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7FF94A68; Mon, 7 Apr 2014 17:10:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37HAsLR051645; Mon, 7 Apr 2014 17:10:54 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37HAsNl051642; Mon, 7 Apr 2014 17:10:54 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404071710.s37HAsNl051642@svn.freebsd.org> From: Antoine Brodin Date: Mon, 7 Apr 2014 17:10:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350528 - branches/2014Q2/security/py-cybox X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 17:10:54 -0000 Author: antoine Date: Mon Apr 7 17:10:53 2014 New Revision: 350528 URL: http://svnweb.freebsd.org/changeset/ports/350528 QAT: https://qat.redports.org/buildarchive/r350528/ Log: MFH: r350421 Distfile rerolled with a license file and some examples Approved by: portmgr (self) Modified: branches/2014Q2/security/py-cybox/Makefile branches/2014Q2/security/py-cybox/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/py-cybox/Makefile ============================================================================== --- branches/2014Q2/security/py-cybox/Makefile Mon Apr 7 16:51:53 2014 (r350527) +++ branches/2014Q2/security/py-cybox/Makefile Mon Apr 7 17:10:53 2014 (r350528) @@ -3,6 +3,7 @@ PORTNAME= cybox PORTVERSION= 2.1.0.2 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,6 +12,7 @@ MAINTAINER= antoine@FreeBSD.org COMMENT= Python library for parsing, manipulating, and generating CybOX content LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}lxml>=3.1:${PORTSDIR}/devel/py-lxml @@ -20,11 +22,14 @@ USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST=yes PORTDOCS= README.rst +PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS EXAMPLES post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} .include Modified: branches/2014Q2/security/py-cybox/distinfo ============================================================================== --- branches/2014Q2/security/py-cybox/distinfo Mon Apr 7 16:51:53 2014 (r350527) +++ branches/2014Q2/security/py-cybox/distinfo Mon Apr 7 17:10:53 2014 (r350528) @@ -1,2 +1,2 @@ -SHA256 (cybox-2.1.0.2.tar.gz) = 2c4a765bb9bf75915f65953f1ad9e4732da0586e1eaf45dbd69ed7644ad42b29 -SIZE (cybox-2.1.0.2.tar.gz) = 862124 +SHA256 (cybox-2.1.0.2.tar.gz) = 02bb2e4c79b7d94ed15ff4818ad684d1d8173fb4b31890a00939766cb8152d67 +SIZE (cybox-2.1.0.2.tar.gz) = 868546 From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 20:00:11 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9BF0F11D; Mon, 7 Apr 2014 20:00:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 896E4C42; Mon, 7 Apr 2014 20:00:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37K0BV8019578; Mon, 7 Apr 2014 20:00:11 GMT (envelope-from olivierd@svn.freebsd.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37K0BQQ019577; Mon, 7 Apr 2014 20:00:11 GMT (envelope-from olivierd@svn.freebsd.org) Message-Id: <201404072000.s37K0BQQ019577@svn.freebsd.org> From: Olivier Duchateau Date: Mon, 7 Apr 2014 20:00:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350539 - branches/2014Q2/www/midori X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 20:00:11 -0000 Author: olivierd Date: Mon Apr 7 20:00:11 2014 New Revision: 350539 URL: http://svnweb.freebsd.org/changeset/ports/350539 QAT: https://qat.redports.org/buildarchive/r350539/ Log: - Unbreak fetch Approved by: portmgr (mat@) Modified: branches/2014Q2/www/midori/Makefile Modified: branches/2014Q2/www/midori/Makefile ============================================================================== --- branches/2014Q2/www/midori/Makefile Mon Apr 7 19:49:18 2014 (r350538) +++ branches/2014Q2/www/midori/Makefile Mon Apr 7 20:00:11 2014 (r350539) @@ -4,7 +4,8 @@ PORTNAME= midori PORTVERSION= 0.5.7 CATEGORIES= www xfce -MASTER_SITES= http://www.midori-browser.org/downloads/ +MASTER_SITES= https://launchpadlibrarian.net/162576097/ \ + https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ DISTNAME= ${PORTNAME}_${PORTVERSION}_all_ DIST_SUBDIR= xfce4 From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 21:48:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF6FA5AF; Mon, 7 Apr 2014 21:48:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB588931; Mon, 7 Apr 2014 21:48:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37Lm7dr064542; Mon, 7 Apr 2014 21:48:07 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37Lm7Yn064540; Mon, 7 Apr 2014 21:48:07 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404072148.s37Lm7Yn064540@svn.freebsd.org> From: Bryan Drewery Date: Mon, 7 Apr 2014 21:48:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350549 - branches/2014Q2/security/openssl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 21:48:08 -0000 Author: bdrewery Date: Mon Apr 7 21:48:07 2014 New Revision: 350549 URL: http://svnweb.freebsd.org/changeset/ports/350549 QAT: https://qat.redports.org/buildarchive/r350549/ Log: MFH: r350548 - Update to 1.0.1g Changes: - Fix for CVE-2014-0160 - Add TLS padding extension workaround for broken servers. - Fix for CVE-2014-0076 Security: CVE-2014-0160 Security: CVE-2014-0076 Security: https://www.openssl.org/news/secadv_20140407.txt With hat: portmgr Modified: branches/2014Q2/security/openssl/Makefile branches/2014Q2/security/openssl/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/openssl/Makefile ============================================================================== --- branches/2014Q2/security/openssl/Makefile Mon Apr 7 21:46:40 2014 (r350548) +++ branches/2014Q2/security/openssl/Makefile Mon Apr 7 21:48:07 2014 (r350549) @@ -3,8 +3,8 @@ PORTNAME= openssl PORTVERSION= 1.0.1 -DISTVERSIONSUFFIX= f -PORTREVISION= 9 +DISTVERSIONSUFFIX= g +PORTREVISION= 10 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ Modified: branches/2014Q2/security/openssl/distinfo ============================================================================== --- branches/2014Q2/security/openssl/distinfo Mon Apr 7 21:46:40 2014 (r350548) +++ branches/2014Q2/security/openssl/distinfo Mon Apr 7 21:48:07 2014 (r350549) @@ -1,10 +1,10 @@ -SHA256 (openssl-1.0.1f/openssl-1.0.1f.tar.gz) = 6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a -SIZE (openssl-1.0.1f/openssl-1.0.1f.tar.gz) = 4509212 -SHA256 (openssl-1.0.1f/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae -SIZE (openssl-1.0.1f/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 -SHA256 (openssl-1.0.1f/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 -SIZE (openssl-1.0.1f/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867 -SHA256 (openssl-1.0.1f/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b -SIZE (openssl-1.0.1f/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 -SHA256 (openssl-1.0.1f/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f -SIZE (openssl-1.0.1f/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 +SHA256 (openssl-1.0.1g/openssl-1.0.1g.tar.gz) = 53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 +SIZE (openssl-1.0.1g/openssl-1.0.1g.tar.gz) = 4509047 +SHA256 (openssl-1.0.1g/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae +SIZE (openssl-1.0.1g/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 +SHA256 (openssl-1.0.1g/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 +SIZE (openssl-1.0.1g/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867 +SHA256 (openssl-1.0.1g/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b +SIZE (openssl-1.0.1g/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 +SHA256 (openssl-1.0.1g/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f +SIZE (openssl-1.0.1g/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 7 22:08:13 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 706B2906; Mon, 7 Apr 2014 22:08:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42943AB7; Mon, 7 Apr 2014 22:08:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37M8DWR072781; Mon, 7 Apr 2014 22:08:13 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37M8CPK072780; Mon, 7 Apr 2014 22:08:12 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404072208.s37M8CPK072780@svn.freebsd.org> From: Bryan Drewery Date: Mon, 7 Apr 2014 22:08:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350551 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2014 22:08:13 -0000 Author: bdrewery Date: Mon Apr 7 22:08:12 2014 New Revision: 350551 URL: http://svnweb.freebsd.org/changeset/ports/350551 QAT: https://qat.redports.org/buildarchive/r350551/ Log: MFH: r350550 - Document Openssl vulnerabilities Security: CVE-2014-0160 Security: CVE-2014-0076 Security: https://www.openssl.org/news/secadv_20140407.txt Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Mon Apr 7 22:05:06 2014 (r350550) +++ branches/2014Q2/security/vuxml/vuln.xml Mon Apr 7 22:08:12 2014 (r350551) @@ -51,6 +51,42 @@ Note: Please add new entries to the beg --> + + OpenSSL -- Multiple vulnerabilities - private data exposure + + + openssl + 1.0.11.0.1_10 + + + + +

OpenSSL Reports:

+
+

A missing bounds check in the handling of the TLS heartbeat extension can be + used to reveal up to 64k of memory to a connected client or server.

+

Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately + upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS.

+
+

This also covers:

+
+

Fix for the attack described in the paper "Recovering OpenSSL + ECDSA Nonces Using the FLUSH+RELOAD Cache Side-channel Attack"

+
+ +
+ + https://www.openssl.org/news/secadv_20140407.txt + https://www.openssl.org/news/vulnerabilities.html#2014-0076 + CVE-2014-0160 + CVE-2014-0076 + + + 2014-04-07 + 2014-04-07 + +
+ Icinga -- buffer overflow in classic web interface From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 8 02:27:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49387108; Tue, 8 Apr 2014 02:27:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36BFA142F; Tue, 8 Apr 2014 02:27:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s382RiWk053203; Tue, 8 Apr 2014 02:27:44 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s382RhrR053202; Tue, 8 Apr 2014 02:27:43 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404080227.s382RhrR053202@svn.freebsd.org> From: Bryan Drewery Date: Tue, 8 Apr 2014 02:27:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350561 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 02:27:44 -0000 Author: bdrewery Date: Tue Apr 8 02:27:43 2014 New Revision: 350561 URL: http://svnweb.freebsd.org/changeset/ports/350561 QAT: https://qat.redports.org/buildarchive/r350561/ Log: MFH: r350559 - Sort references - Add link to heartbleed.com that has a lot of useful information Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Tue Apr 8 02:26:45 2014 (r350560) +++ branches/2014Q2/security/vuxml/vuln.xml Tue Apr 8 02:27:43 2014 (r350561) @@ -76,10 +76,11 @@ Note: Please add new entries to the beg - https://www.openssl.org/news/secadv_20140407.txt - https://www.openssl.org/news/vulnerabilities.html#2014-0076 CVE-2014-0160 CVE-2014-0076 + https://www.openssl.org/news/secadv_20140407.txt + https://www.openssl.org/news/vulnerabilities.html#2014-0076 + http://www.heartbleed.com 2014-04-07 From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 8 02:28:26 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4CFCD1F5; Tue, 8 Apr 2014 02:28:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38FEC144C; Tue, 8 Apr 2014 02:28:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s382SQg5053382; Tue, 8 Apr 2014 02:28:26 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s382SPjm053381; Tue, 8 Apr 2014 02:28:25 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404080228.s382SPjm053381@svn.freebsd.org> From: Bryan Drewery Date: Tue, 8 Apr 2014 02:28:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350562 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 02:28:26 -0000 Author: bdrewery Date: Tue Apr 8 02:28:25 2014 New Revision: 350562 URL: http://svnweb.freebsd.org/changeset/ports/350562 QAT: https://qat.redports.org/buildarchive/r350562/ Log: MFH: r350560 Add more information for OpenSSL bug Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Tue Apr 8 02:27:43 2014 (r350561) +++ branches/2014Q2/security/vuxml/vuln.xml Tue Apr 8 02:28:25 2014 (r350562) @@ -68,6 +68,15 @@ Note: Please add new entries to the beg

Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS.

+
+

The bug allows anyone on the Internet to read the memory of the + systems protected by the vulnerable versions of the OpenSSL software. + This compromises the secret keys used to identify the service + providers and to encrypt the traffic, the names and passwords of the + users and the actual content. This allows attackers to eavesdrop + communications, steal data directly from the services and users and + to impersonate services and users.

+

This also covers:

Fix for the attack described in the paper "Recovering OpenSSL From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 8 14:03:43 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E6BEE36; Tue, 8 Apr 2014 14:03:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E2314153E; Tue, 8 Apr 2014 14:03:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38E3ghL040861; Tue, 8 Apr 2014 14:03:42 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38E3gth040859; Tue, 8 Apr 2014 14:03:42 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404081403.s38E3gth040859@svn.freebsd.org> From: Bryan Drewery Date: Tue, 8 Apr 2014 14:03:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350616 - branches/2014Q2/devel/mingw32-openssl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 14:03:43 -0000 Author: bdrewery Date: Tue Apr 8 14:03:42 2014 New Revision: 350616 URL: http://svnweb.freebsd.org/changeset/ports/350616 QAT: https://qat.redports.org/buildarchive/r350616/ Log: MFH: r350614 Update to 1.0.1g and remove NO_STAGE. Modified: branches/2014Q2/devel/mingw32-openssl/Makefile branches/2014Q2/devel/mingw32-openssl/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/mingw32-openssl/Makefile ============================================================================== --- branches/2014Q2/devel/mingw32-openssl/Makefile Tue Apr 8 13:52:16 2014 (r350615) +++ branches/2014Q2/devel/mingw32-openssl/Makefile Tue Apr 8 14:03:42 2014 (r350616) @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= openssl -PORTVERSION= 1.0.1f +PORTVERSION= 1.0.1g CATEGORIES= devel security MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/ MASTER_SITE_SUBDIR= source PKGNAMEPREFIX= mingw32- -DIST_SUBDIR= ${DISTNAME}2 +DIST_SUBDIR= ${DISTNAME} MAINTAINER= knu@FreeBSD.org COMMENT= The OpenSSL library cross-compiled for MinGW32 @@ -26,13 +26,13 @@ CONFIGURE_PREFIX= ${PREFIX}/mingw32 OPENSSLDIR= ${CONFIGURE_PREFIX}/openssl INSTALL_TARGET= install_sw -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \ ${WRKSRC}/crypto/des/Makefile do-configure: cd ${WRKSRC} && ${SETENV} PERL="${PERL}" CROSS_COMPILE="${PKGNAMEPREFIX}" \ - ./Configure mingw --prefix="${CONFIGURE_PREFIX}" --openssldir="${OPENSSLDIR}" + ./Configure mingw --prefix="${CONFIGURE_PREFIX}" --install_prefix=${STAGEDIR} \ + --openssldir="${OPENSSLDIR}" .include Modified: branches/2014Q2/devel/mingw32-openssl/distinfo ============================================================================== --- branches/2014Q2/devel/mingw32-openssl/distinfo Tue Apr 8 13:52:16 2014 (r350615) +++ branches/2014Q2/devel/mingw32-openssl/distinfo Tue Apr 8 14:03:42 2014 (r350616) @@ -1,2 +1,2 @@ -SHA256 (openssl-1.0.1f2/openssl-1.0.1f.tar.gz) = 6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a -SIZE (openssl-1.0.1f2/openssl-1.0.1f.tar.gz) = 4509212 +SHA256 (openssl-1.0.1g/openssl-1.0.1g.tar.gz) = 53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 +SIZE (openssl-1.0.1g/openssl-1.0.1g.tar.gz) = 4509047 From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 8 14:04:17 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2813F1A; Tue, 8 Apr 2014 14:04:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E7CE154E; Tue, 8 Apr 2014 14:04:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38E4H5x041020; Tue, 8 Apr 2014 14:04:17 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38E4HHK041019; Tue, 8 Apr 2014 14:04:17 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404081404.s38E4HHK041019@svn.freebsd.org> From: Bryan Drewery Date: Tue, 8 Apr 2014 14:04:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350617 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 14:04:17 -0000 Author: bdrewery Date: Tue Apr 8 14:04:16 2014 New Revision: 350617 URL: http://svnweb.freebsd.org/changeset/ports/350617 QAT: https://qat.redports.org/buildarchive/r350617/ Log: MFH: r350612 Add mingw32-openssl. Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Tue Apr 8 14:03:42 2014 (r350616) +++ branches/2014Q2/security/vuxml/vuln.xml Tue Apr 8 14:04:16 2014 (r350617) @@ -58,6 +58,10 @@ Note: Please add new entries to the beg openssl 1.0.11.0.1_10 + + mingw32-openssl + 1.0.11.0.1g + From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 8 14:08:13 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E210BD; Tue, 8 Apr 2014 14:08:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DE2B157C; Tue, 8 Apr 2014 14:08:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38E8DTh041567; Tue, 8 Apr 2014 14:08:13 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38E8C9m041565; Tue, 8 Apr 2014 14:08:12 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404081408.s38E8C9m041565@svn.freebsd.org> From: Bryan Drewery Date: Tue, 8 Apr 2014 14:08:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350618 - branches/2014Q2/security/keybase X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 14:08:13 -0000 Author: bdrewery Date: Tue Apr 8 14:08:12 2014 New Revision: 350618 URL: http://svnweb.freebsd.org/changeset/ports/350618 QAT: https://qat.redports.org/buildarchive/r350618/ Log: MFH: r350191 - Update to 0.2.18 [1] - Remove need for npm at install time [2] - No longer bundle deps [2] - Add big warning on how little this project should be trusted 4 versions since previous 0.2.0 had security fixes, some of which were regresions from the chain. Non-security-marked fixes not listed here, see changelog [1]. 0.2.4 (2014-03-29) SECURITY NOTICE This release was flawed since it did not pull it dependencies with it. 0.2.7 (2014-03-29) SECURITY BUGFIX The previous releases, v0.2.5 and v0.2.6, had broken verification for website proofs. Fixed with an upgrade to proofs v0.0.15 0.2.13 (2014-04-01) SECURITY BUGFIX Don't show the GPG script used to generated keys when specifying -d, since it contains the users's password 0.2.14 (2014-04-02) SECURITY BUGFIX Sanity-check the server's proof text, in case it's cheating. Check to make sure that the only plausible proof is the one that we made, and that others aren't coming along for the ride. This check comes via keybase-proofs @v0.0.20. Changelog [1]: https://github.com/keybase/node-client/compare/v0.2.0...v0.2.18#diff-2 Submitted by: thierry [2] Modified: branches/2014Q2/security/keybase/Makefile branches/2014Q2/security/keybase/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/keybase/Makefile ============================================================================== --- branches/2014Q2/security/keybase/Makefile Tue Apr 8 14:04:16 2014 (r350617) +++ branches/2014Q2/security/keybase/Makefile Tue Apr 8 14:08:12 2014 (r350618) @@ -1,60 +1,29 @@ # $FreeBSD$ PORTNAME= keybase -DISTVERSION= v0.2.0 +PORTVERSION= 0.2.18 CATEGORIES= security -MASTER_SITES= GH \ +MASTER_SITES= https://dist.keybase.io/pkg/files/ \ LOCAL/bdrewery/${PORTNAME}/:DEFAULT,deps \ http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,deps -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${DEP_DIST}:deps +EXTRACT_SUFX= .tgz MAINTAINER= bdrewery@freebsd.org COMMENT= Keybase.io client LICENSE= BSD3CLAUSE -BUILD_DEPENDS= npm>=0:${PORTSDIR}/www/npm RUN_DEPENDS= node>=0:${PORTSDIR}/www/node \ gpg:${PORTSDIR}/security/gnupg -# Must bundle deps. -# 1. They are not in ports and doing so creates a large complex task with little -# benefit requiring a lot of maintenance. Hopefully someday we will have -# an npm wrapper similar to BSDPAN. -# 2. npm has absolutely no way to fetch dependencies without installing at the -# same time so this would not build on poudriere due to network restrictions -# outside of 'fetch' phase. See https://github.com/npm/npm/issues/2817 -# 3. A date is used as dependencies can upgrade even without keybase changing -# anything due to dependency patterns not binding to specific versions in -# package.json. I.e., even if the problem of fetching dependencies is -# solved, we want this package to be reproducible. -DEP_DIST_DATE= 20140327 -DEP_DIST_DFMT= %Y%m%d -DEP_DIST_PRE= ${PORTNAME}-deps-${PORTVERSION}-${GH_COMMIT}- -DEP_DIST_POST= .txz -DEP_DIST= ${DEP_DIST_PRE}${DEP_DIST_DATE}${DEP_DIST_POST} - -USE_GITHUB= yes -GH_ACCOUNT= keybase -GH_PROJECT= node-client -GH_COMMIT= 9509986 +WRKSRC= ${WRKDIR}/package +NO_ARCH= yes +NO_BUILD= yes +# Install it a private place instead of polluting lib/node_modules +# which npm(1) owns and will upgrade beneath pkg(8) control. KEYBASE_PREFIX= ${PREFIX}/libexec/${PORTNAME} -# Generate dependency distfile. This is only used by maintainer. -makedeps: patch - cd ${WRKSRC} && \ - ${RM} -rf node_modules && \ - dep_fname="${DEP_DIST_PRE}`/bin/date '+${DEP_DIST_DFMT}'`${DEP_DIST_POST}" && \ - tar -cJf $${dep_fname} node_modules/ && \ - ${MV} -f $${dep_fname} ${_DISTDIR}/ && \ - cd ${.CURDIR} && \ - ${MAKE} makesum - -post-extract: - @${MV} ${WRKDIR}/node_modules ${WRKSRC}/node_modules - add-plist-post: npm-auto-plist npm-auto-plist: @@ -66,8 +35,10 @@ npm-auto-plist: do-install: @${MKDIR} ${WRKDIR}/tmp ${STAGEDIR}${KEYBASE_PREFIX}/lib - cd ${STAGEDIR}${KEYBASE_PREFIX}/lib && ${SETENV} HOME=${WRKDIR}/tmp \ - ${LOCALBASE}/bin/npm install ${WRKSRC} + (cd ${WRKSRC} && \ + ${COPYTREE_SHARE} \* \ + ${STAGEDIR}${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME}) + ${CHMOD} +x ${STAGEDIR}${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME}/bin/main.js ${LN} -s ${KEYBASE_PREFIX}/lib/node_modules/${PORTNAME}/bin/main.js \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: branches/2014Q2/security/keybase/distinfo ============================================================================== --- branches/2014Q2/security/keybase/distinfo Tue Apr 8 14:04:16 2014 (r350617) +++ branches/2014Q2/security/keybase/distinfo Tue Apr 8 14:08:12 2014 (r350618) @@ -1,4 +1,2 @@ -SHA256 (keybase-v0.2.0.tar.gz) = 4ca20da5e5f371e63521a838416da73ff54deeae7c71a1441670f9322ddbe723 -SIZE (keybase-v0.2.0.tar.gz) = 594085 -SHA256 (keybase-deps-v0.2.0-9509986-20140327.txz) = 886220149b109ac1face08976837259f7a021f08c02e663d637327b546adbb08 -SIZE (keybase-deps-v0.2.0-9509986-20140327.txz) = 1946868 +SHA256 (keybase-0.2.18.tgz) = fd89326a60274b64401247f2b13d5b17ca8432eb4b458a7cec997d59ccdf6ce0 +SIZE (keybase-0.2.18.tgz) = 3727320 From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 8 14:09:20 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9713119D; Tue, 8 Apr 2014 14:09:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 837641586; Tue, 8 Apr 2014 14:09:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38E9Kof041781; Tue, 8 Apr 2014 14:09:20 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38E9KQv041779; Tue, 8 Apr 2014 14:09:20 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404081409.s38E9KQv041779@svn.freebsd.org> From: Bryan Drewery Date: Tue, 8 Apr 2014 14:09:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350619 - branches/2014Q2/security/keybase X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 14:09:20 -0000 Author: bdrewery Date: Tue Apr 8 14:09:19 2014 New Revision: 350619 URL: http://svnweb.freebsd.org/changeset/ports/350619 QAT: https://qat.redports.org/buildarchive/r350619/ Log: MFH: r350192 Add missed warning from r350191 Added: branches/2014Q2/security/keybase/pkg-plist - copied unchanged from r350192, head/security/keybase/pkg-plist Modified: branches/2014Q2/security/keybase/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/keybase/Makefile ============================================================================== --- branches/2014Q2/security/keybase/Makefile Tue Apr 8 14:08:12 2014 (r350618) +++ branches/2014Q2/security/keybase/Makefile Tue Apr 8 14:09:19 2014 (r350619) @@ -2,6 +2,7 @@ PORTNAME= keybase PORTVERSION= 0.2.18 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://dist.keybase.io/pkg/files/ \ LOCAL/bdrewery/${PORTNAME}/:DEFAULT,deps \ Copied: branches/2014Q2/security/keybase/pkg-plist (from r350192, head/security/keybase/pkg-plist) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/security/keybase/pkg-plist Tue Apr 8 14:09:19 2014 (r350619, copy of r350192, head/security/keybase/pkg-plist) @@ -0,0 +1 @@ +@exec echo; echo '######################################################################'; echo ' \!/ WARNING \!/'; echo ' \!/ WARNING \!/'; echo; echo 'Keybase is alpha, has a bad security and bug track record, and is written by e-dating site OkCupid.com. Extreme caution should be used.' | /usr/bin/fmt -w 79; echo; echo 'Uploading any private key is strongly discouraged.'; echo; echo ' \!/ WARNING \!/';echo '######################################################################' From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 8 14:10:01 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 803CC280; Tue, 8 Apr 2014 14:10:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6D0E01591; Tue, 8 Apr 2014 14:10:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38EA1YJ042027; Tue, 8 Apr 2014 14:10:01 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38EA1du042026; Tue, 8 Apr 2014 14:10:01 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404081410.s38EA1du042026@svn.freebsd.org> From: Bryan Drewery Date: Tue, 8 Apr 2014 14:10:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350620 - in branches/2014Q2/security/keybase: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 14:10:01 -0000 Author: bdrewery Date: Tue Apr 8 14:10:00 2014 New Revision: 350620 URL: http://svnweb.freebsd.org/changeset/ports/350620 QAT: https://qat.redports.org/buildarchive/r350620/ Log: MFH: r350193 Move message to pkg-message Added: branches/2014Q2/security/keybase/files/ - copied from r350193, head/security/keybase/files/ Deleted: branches/2014Q2/security/keybase/pkg-plist Modified: branches/2014Q2/security/keybase/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/keybase/Makefile ============================================================================== --- branches/2014Q2/security/keybase/Makefile Tue Apr 8 14:09:19 2014 (r350619) +++ branches/2014Q2/security/keybase/Makefile Tue Apr 8 14:10:00 2014 (r350620) @@ -2,7 +2,7 @@ PORTNAME= keybase PORTVERSION= 0.2.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= https://dist.keybase.io/pkg/files/ \ LOCAL/bdrewery/${PORTNAME}/:DEFAULT,deps \ @@ -20,6 +20,7 @@ RUN_DEPENDS= node>=0:${PORTSDIR}/www/nod WRKSRC= ${WRKDIR}/package NO_ARCH= yes NO_BUILD= yes +SUB_FILES= pkg-message # Install it a private place instead of polluting lib/node_modules # which npm(1) owns and will upgrade beneath pkg(8) control. From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 9 18:20:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A5E7E6C; Wed, 9 Apr 2014 18:20:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 175EC1BDD; Wed, 9 Apr 2014 18:20:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s39IK6Qx068281; Wed, 9 Apr 2014 18:20:06 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s39IK6Nk068280; Wed, 9 Apr 2014 18:20:06 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404091820.s39IK6Nk068280@svn.freebsd.org> From: Bryan Drewery Date: Wed, 9 Apr 2014 18:20:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350733 - branches/2014Q2/devel/gdb X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2014 18:20:07 -0000 Author: bdrewery Date: Wed Apr 9 18:20:06 2014 New Revision: 350733 URL: http://svnweb.freebsd.org/changeset/ports/350733 QAT: https://qat.redports.org/buildarchive/r350733/ Log: MFH: r350732 - Fix build with clang34 This has many unused functions and variables and uses -Werror. Don't consider those as warnings for now. Discussed with: jhb Approved by: maintainer (they approved -no-werror, let's keep other warnings) Modified: branches/2014Q2/devel/gdb/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/gdb/Makefile ============================================================================== --- branches/2014Q2/devel/gdb/Makefile Wed Apr 9 18:17:33 2014 (r350732) +++ branches/2014Q2/devel/gdb/Makefile Wed Apr 9 18:20:06 2014 (r350733) @@ -23,7 +23,7 @@ CONFIGURE_ARGS= --program-suffix=${PORTV --without-libunwind-ia64 \ --enable-targets=all CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes -CFLAGS+= -DRL_NO_COMPAT +CFLAGS+= -DRL_NO_COMPAT -Wno-unused-function -Wno-unused-variable EXCLUDE= dejagnu expect sim texinfo intl EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /} From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 10 11:51:15 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71EA1683; Thu, 10 Apr 2014 11:51:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 458CB188D; Thu, 10 Apr 2014 11:51:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ABpFhP006446; Thu, 10 Apr 2014 11:51:15 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ABpFvh006445; Thu, 10 Apr 2014 11:51:15 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404101151.s3ABpFvh006445@svn.freebsd.org> From: Pawel Pekala Date: Thu, 10 Apr 2014 11:51:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350799 - branches/2014Q2/emulators/tme X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 11:51:15 -0000 Author: pawel Date: Thu Apr 10 11:51:14 2014 New Revision: 350799 URL: http://svnweb.freebsd.org/changeset/ports/350799 QAT: https://qat.redports.org/buildarchive/r350799/ Log: MFH: r350792 - Add staging support - More precise LICENSE - Remove some dependencies pulled in automatically by others - Fix build with clang Approved by: portmgr (bapt) Modified: branches/2014Q2/emulators/tme/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/emulators/tme/Makefile ============================================================================== --- branches/2014Q2/emulators/tme/Makefile Thu Apr 10 11:44:51 2014 (r350798) +++ branches/2014Q2/emulators/tme/Makefile Thu Apr 10 11:51:14 2014 (r350799) @@ -10,24 +10,14 @@ MASTER_SITES= http://people.csail.mit.ed MAINTAINER= ports@FreeBSD.org COMMENT= Emulator for Sun 2/120, 3/150, and SPARCstation 2 machines -LICENSE= BSD +LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - pcre:${PORTSDIR}/devel/pcre \ - cairo:${PORTSDIR}/graphics/cairo \ - png15:${PORTSDIR}/graphics/png \ - freetype:${PORTSDIR}/print/freetype2 \ - expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig - -USES= pkgconfig gettext gmake iconv perl5 +USES= compiler gmake gettext iconv perl5 pkgconfig USE_GNOME= gdkpixbuf2 gtk20 USE_AUTOTOOLS= libtool libltdl CONFIGURE_ENV= ac_cv_have_isinff=no -CONFIGURE_ARGS= --datadir=${WRKDIR}/tmproot --disable-warnings -USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ - xi xinerama xrandr xrender +CONFIGURE_ARGS= --disable-warnings USE_LDCONFIG= yes MAKE_ENV= LANG=C MAKE_JOBS_UNSAFE=yes @@ -36,11 +26,13 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${WRKSRC}/ic/ieee754/.libs LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes - OPTIONS_DEFINE= EXAMPLES -.include +.include + +.if ${COMPILER_TYPE} == clang +CFLAGS+= -fbracket-depth=1024 +.endif post-patch: @${REINPLACE_CMD} -e '/misc_hosts/s|= no|= xno|' \ @@ -54,11 +46,4 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/libtme/module.c -post-install: -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKDIR}/tmproot/examples/tme \ - && ${COPYTREE_SHARE} . ${EXAMPLESDIR}) -.endif - -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 10 18:52:04 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4555E885; Thu, 10 Apr 2014 18:52:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 329B716AF; Thu, 10 Apr 2014 18:52:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3AIq4Qd081619; Thu, 10 Apr 2014 18:52:04 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3AIq41i081618; Thu, 10 Apr 2014 18:52:04 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404101852.s3AIq41i081618@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 10 Apr 2014 18:52:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350826 - branches/2014Q2/net/xorp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 18:52:04 -0000 Author: amdmi3 Date: Thu Apr 10 18:52:03 2014 New Revision: 350826 URL: http://svnweb.freebsd.org/changeset/ports/350826 QAT: https://qat.redports.org/buildarchive/r350826/ Log: MFH: r349971 - Fix build with clang Approved by: portmgr Modified: branches/2014Q2/net/xorp/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/net/xorp/Makefile ============================================================================== --- branches/2014Q2/net/xorp/Makefile Thu Apr 10 18:38:13 2014 (r350825) +++ branches/2014Q2/net/xorp/Makefile Thu Apr 10 18:52:03 2014 (r350826) @@ -19,8 +19,7 @@ CONFLICTS_INSTALL= xorp-devel-* EXTRACT_AFTER_ARGS= --no-same-owner --no-same-permissions -s /^xorp/${DISTNAME}/ GROUPS= xorp -USES= ncurses scons shebangfix -USE_BZIP2= yes +USES= tar:bzip2 ncurses scons shebangfix compiler:env USE_OPENSSL= yes USE_PYTHON_BUILD= 2 USE_RC_SUBR= xorp @@ -41,7 +40,7 @@ TCP_RPC_DESC= Use TCP as RPC transport ( MAKE_ARGS= prefix=${PREFIX} enable_boost=1 -.include +.include .if ${PORT_OPTIONS:MOPTIMIZE} MAKE_ARGS+= optimize=highest @@ -77,8 +76,11 @@ MAKE_ARGS+= transport=local post-patch: ${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/SConstruct +.if ${COMPILER_TYPE} == "clang" + ${REINPLACE_CMD} 's,-Werror,& -Wno-unused-function,' ${WRKSRC}/SConstruct +.endif post-install: ${CP} -p ${WRKSRC}/${XORP_SAMPLECONF} ${STAGEDIR}${PREFIX}/etc/xorp.conf.sample -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 10 21:23:39 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C79E7AE8; Thu, 10 Apr 2014 21:23:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B442F166C; Thu, 10 Apr 2014 21:23:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ALNdwH045985; Thu, 10 Apr 2014 21:23:39 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ALNdhL045983; Thu, 10 Apr 2014 21:23:39 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201404102123.s3ALNdhL045983@svn.freebsd.org> From: Lars Engels Date: Thu, 10 Apr 2014 21:23:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350855 - in branches/2014Q2/net-mgmt/icinga: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 21:23:39 -0000 Author: lme Date: Thu Apr 10 21:23:38 2014 New Revision: 350855 URL: http://svnweb.freebsd.org/changeset/ports/350855 QAT: https://qat.redports.org/buildarchive/r350855/ Log: MFH: r350854 - Fix creation of log directories in icinga's rc script - Bump PORTREVISION Approved by: portmgr (mat) Modified: branches/2014Q2/net-mgmt/icinga/Makefile branches/2014Q2/net-mgmt/icinga/files/icinga.in Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/net-mgmt/icinga/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/icinga/Makefile Thu Apr 10 21:08:03 2014 (r350854) +++ branches/2014Q2/net-mgmt/icinga/Makefile Thu Apr 10 21:23:38 2014 (r350855) @@ -3,6 +3,7 @@ PORTNAME= icinga PORTVERSION= 1.11.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/ Modified: branches/2014Q2/net-mgmt/icinga/files/icinga.in ============================================================================== --- branches/2014Q2/net-mgmt/icinga/files/icinga.in Thu Apr 10 21:08:03 2014 (r350854) +++ branches/2014Q2/net-mgmt/icinga/files/icinga.in Thu Apr 10 21:23:38 2014 (r350855) @@ -105,7 +105,7 @@ start_precmd() { "${icinga_logdir}" \ "${icinga_logdir}/archives"; do if [ ! -d "${d}" ]; then - install -d -o "${icinga_user}" -g "${icinga_group}" "${icinga_dir}"/checkresults + install -d -o "${icinga_user}" -g "${icinga_group}" "${d}" fi done From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 10 21:25:01 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25369BDA; Thu, 10 Apr 2014 21:25:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ECC7A1687; Thu, 10 Apr 2014 21:25:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ALP0hT046281; Thu, 10 Apr 2014 21:25:00 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ALP0Ft046274; Thu, 10 Apr 2014 21:25:00 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201404102125.s3ALP0Ft046274@svn.freebsd.org> From: Lars Engels Date: Thu, 10 Apr 2014 21:25:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350856 - branches/2014Q2/games/scummvm-tools X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 21:25:01 -0000 Author: lme Date: Thu Apr 10 21:25:00 2014 New Revision: 350856 URL: http://svnweb.freebsd.org/changeset/ports/350856 QAT: https://qat.redports.org/buildarchive/r350856/ Log: MFH: r350853 - Switch back to wx-2.8, the GUI did not build with 3.0 - Add LICENSE - Strip binaries - Add missing "decompile" binary - Bump PORTREVISION Approved by: portmgr (mat) Modified: branches/2014Q2/games/scummvm-tools/Makefile branches/2014Q2/games/scummvm-tools/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/scummvm-tools/Makefile ============================================================================== --- branches/2014Q2/games/scummvm-tools/Makefile Thu Apr 10 21:23:38 2014 (r350855) +++ branches/2014Q2/games/scummvm-tools/Makefile Thu Apr 10 21:25:00 2014 (r350856) @@ -3,13 +3,15 @@ PORTNAME= scummvm-tools DISTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games emulators MASTER_SITES= SF/scummvm/${PORTNAME}/${DISTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Tools for use with the SCUMMVM game emulator +LICENSE= GPLv2 + RUN_DEPENDS= scummvm:${PORTSDIR}/games/scummvm BUILD_DEPENDS= lame:${PORTSDIR}/audio/lame \ flac:${PORTSDIR}/audio/flac \ @@ -24,6 +26,10 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= +STRIP_FILES= construct_mohawk create_sjisfnt decine decompile degob dekyra \ + deriven descumm desword2 extract_mohawk gob_loadcalc \ + scummvm-tools-cli + OPTIONS_DEFINE= WXGTK OPTIONS_DEFAULT= WXGTK @@ -31,16 +37,27 @@ OPTIONS_DEFAULT= WXGTK .include .if ${PORT_OPTIONS:MWXGTK} -USE_WX= 3.0 +USE_WX= 2.8 WX_COMP= wx:lib:build WX_UNICODE= yes +WX_CONFIG_ARGS= absolute GUI_BIN= tools_gui PLIST_SUB= WX="" +STRIP_FILES+= scummvm-tools .else CONFIGURE_ARGS+= --disable-wxwidgets PLIST_SUB= WX="@comment " .endif +pre-patch: + @${REINPLACE_CMD} -e 's|wxgtk2-2.8-config|${WX_CONFIG:C/.*\///}|' \ + ${WRKSRC}/configure + +pre-install: +.for f in ${STRIP_FILES} + @${STRIP_CMD} ${WRKSRC}/$f +.endfor + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} Modified: branches/2014Q2/games/scummvm-tools/pkg-plist ============================================================================== --- branches/2014Q2/games/scummvm-tools/pkg-plist Thu Apr 10 21:23:38 2014 (r350855) +++ branches/2014Q2/games/scummvm-tools/pkg-plist Thu Apr 10 21:25:00 2014 (r350856) @@ -1,6 +1,7 @@ bin/construct_mohawk bin/create_sjisfnt bin/decine +bin/decompile bin/degob bin/dekyra bin/deriven @@ -18,4 +19,4 @@ bin/scummvm-tools-cli %%DATADIR%%/scummvmtools_128.png %%DATADIR%%/tile.gif @dirrmtry %%DATADIR%% -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 10 21:32:34 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 77ADCD77; Thu, 10 Apr 2014 21:32:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 58F27173B; Thu, 10 Apr 2014 21:32:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ALWYWd050251; Thu, 10 Apr 2014 21:32:34 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ALWXSg050246; Thu, 10 Apr 2014 21:32:33 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404102132.s3ALWXSg050246@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 10 Apr 2014 21:32:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350857 - in branches/2014Q2/dns: bind-tools bind99 bind99/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 21:32:34 -0000 Author: mat Date: Thu Apr 10 21:32:33 2014 New Revision: 350857 URL: http://svnweb.freebsd.org/changeset/ports/350857 QAT: https://qat.redports.org/buildarchive/r350857/ Log: MFH: r350710 - Add a patch to install missing man page - Add dnssec-* tools to bind-tools[1] Requested by: many [1] Sponsored by: Absolight Added: branches/2014Q2/dns/bind99/files/patch-bin__dnssec__Makefile.in - copied unchanged from r350710, head/dns/bind99/files/patch-bin__dnssec__Makefile.in Modified: branches/2014Q2/dns/bind-tools/Makefile branches/2014Q2/dns/bind-tools/pkg-plist branches/2014Q2/dns/bind99/Makefile branches/2014Q2/dns/bind99/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/dns/bind-tools/Makefile ============================================================================== --- branches/2014Q2/dns/bind-tools/Makefile Thu Apr 10 21:25:00 2014 (r350856) +++ branches/2014Q2/dns/bind-tools/Makefile Thu Apr 10 21:32:33 2014 (r350857) @@ -17,21 +17,25 @@ PKGINSTALL= /nonexistent BIND_TOOLS_SLAVE= YES post-patch: - @${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.presed - @${SED} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ -e 's#isc-config.sh installdirs#installdirs#' \ -e 's#.*INSTALL.*isc-config.*##' \ -e 's#.*INSTALL.*bind.keys.*##' \ - ${WRKSRC}/Makefile.in.presed > ${WRKSRC}/Makefile.in - @${MV} ${WRKSRC}/bin/Makefile.in ${WRKSRC}/bin/Makefile.in.presed - @${SED} -e 's#^SUBDIRS.*#SUBDIRS = dig#' \ + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = dig dnssec#' \ -e 's#^ .*check confgen ##' \ - ${WRKSRC}/bin/Makefile.in.presed > ${WRKSRC}/bin/Makefile.in + ${WRKSRC}/bin/Makefile.in do-install: .for file in dig host nslookup ${INSTALL_PROGRAM} ${WRKSRC}/bin/dig/${file} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/bin/dig/${file}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .endfor +.for file in dnssec-dsfromkey dnssec-importkey dnssec-keyfromlabel \ + dnssec-keygen dnssec-revoke dnssec-settime dnssec-signzone \ + dnssec-verify + ${INSTALL_PROGRAM} ${WRKSRC}/bin/dnssec/${file} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/bin/dnssec/${file}.8 ${STAGEDIR}${MANPREFIX}/man/man8 +.endfor .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/dns/bind-tools/pkg-plist ============================================================================== --- branches/2014Q2/dns/bind-tools/pkg-plist Thu Apr 10 21:25:00 2014 (r350856) +++ branches/2014Q2/dns/bind-tools/pkg-plist Thu Apr 10 21:32:33 2014 (r350857) @@ -4,3 +4,19 @@ bin/nslookup %%SHARE_MAN%%man/man1/dig.1.gz %%SHARE_MAN%%man/man1/host.1.gz %%SHARE_MAN%%man/man1/nslookup.1.gz +%%SHARE_MAN%%man/man8/dnssec-dsfromkey.8.gz +%%SHARE_MAN%%man/man8/dnssec-importkey.8.gz +%%SHARE_MAN%%man/man8/dnssec-keyfromlabel.8.gz +%%SHARE_MAN%%man/man8/dnssec-keygen.8.gz +%%SHARE_MAN%%man/man8/dnssec-revoke.8.gz +%%SHARE_MAN%%man/man8/dnssec-settime.8.gz +%%SHARE_MAN%%man/man8/dnssec-signzone.8.gz +%%SHARE_MAN%%man/man8/dnssec-verify.8.gz +sbin/dnssec-dsfromkey +sbin/dnssec-importkey +sbin/dnssec-keyfromlabel +sbin/dnssec-keygen +sbin/dnssec-revoke +sbin/dnssec-settime +sbin/dnssec-signzone +sbin/dnssec-verify Modified: branches/2014Q2/dns/bind99/Makefile ============================================================================== --- branches/2014Q2/dns/bind99/Makefile Thu Apr 10 21:25:00 2014 (r350856) +++ branches/2014Q2/dns/bind99/Makefile Thu Apr 10 21:32:33 2014 (r350857) @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= 9.9.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Copied: branches/2014Q2/dns/bind99/files/patch-bin__dnssec__Makefile.in (from r350710, head/dns/bind99/files/patch-bin__dnssec__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/dns/bind99/files/patch-bin__dnssec__Makefile.in Thu Apr 10 21:32:33 2014 (r350857, copy of r350710, head/dns/bind99/files/patch-bin__dnssec__Makefile.in) @@ -0,0 +1,17 @@ +--- ./bin/dnssec/Makefile.in.orig 2014-01-27 19:58:24.000000000 +0100 ++++ ./bin/dnssec/Makefile.in 2014-04-09 15:42:28.000000000 +0200 +@@ -55,12 +55,12 @@ + + MANPAGES = dnssec-dsfromkey.8 dnssec-keyfromlabel.8 dnssec-keygen.8 \ + dnssec-revoke.8 dnssec-settime.8 dnssec-signzone.8 \ +- dnssec-verify.8 ++ dnssec-verify.8 dnssec-importkey.8 + + HTMLPAGES = dnssec-dsfromkey.html dnssec-keyfromlabel.html \ + dnssec-keygen.html dnssec-revoke.html \ + dnssec-settime.html dnssec-signzone.html \ +- dnssec-verify.html ++ dnssec-verify.html dnssec-importkey.html + + MANOBJS = ${MANPAGES} ${HTMLPAGES} + Modified: branches/2014Q2/dns/bind99/pkg-plist ============================================================================== --- branches/2014Q2/dns/bind99/pkg-plist Thu Apr 10 21:25:00 2014 (r350856) +++ branches/2014Q2/dns/bind99/pkg-plist Thu Apr 10 21:32:33 2014 (r350857) @@ -303,6 +303,7 @@ lib/liblwres.a %%SHARE_MAN%%man/man5/rndc.conf.5.gz %%SHARE_MAN%%man/man8/ddns-confgen.8.gz %%SHARE_MAN%%man/man8/dnssec-dsfromkey.8.gz +%%SHARE_MAN%%man/man8/dnssec-importkey.8.gz %%SHARE_MAN%%man/man8/dnssec-keyfromlabel.8.gz %%SHARE_MAN%%man/man8/dnssec-keygen.8.gz %%SHARE_MAN%%man/man8/dnssec-revoke.8.gz From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 10 21:33:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D4CBEE5C; Thu, 10 Apr 2014 21:33:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A76861745; Thu, 10 Apr 2014 21:33:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ALXXBW050540; Thu, 10 Apr 2014 21:33:33 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ALXXR8050539; Thu, 10 Apr 2014 21:33:33 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404102133.s3ALXXR8050539@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 10 Apr 2014 21:33:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350858 - in branches/2014Q2/dns: bind98/files bind99/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 21:33:33 -0000 Author: mat Date: Thu Apr 10 21:33:33 2014 New Revision: 350858 URL: http://svnweb.freebsd.org/changeset/ports/350858 QAT: https://qat.redports.org/buildarchive/r350858/ Log: MFH: r350817 Remove noop patch. Sponsored by: Absolight Deleted: branches/2014Q2/dns/bind98/files/patch-lib__isc__include__isc__file.h branches/2014Q2/dns/bind99/files/patch-lib__isc__include__isc__file.h Modified: Directory Properties: branches/2014Q2/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 10 21:52:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB719433; Thu, 10 Apr 2014 21:52:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC5B818EF; Thu, 10 Apr 2014 21:52:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ALq7eg059059; Thu, 10 Apr 2014 21:52:07 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ALq6jv059055; Thu, 10 Apr 2014 21:52:06 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404102152.s3ALq6jv059055@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 10 Apr 2014 21:52:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r350861 - in branches/2014Q2/dns: bind98 bind98/files bind99 bind99/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 21:52:08 -0000 Author: mat Date: Thu Apr 10 21:52:06 2014 New Revision: 350861 URL: http://svnweb.freebsd.org/changeset/ports/350861 QAT: https://qat.redports.org/buildarchive/r350861/ Log: MFH: r350848 Two changes to the RC script - Add a dependency on ldconfig - Allow people to change the pidfile PR: 188439 Submitted by: Oliver Lehmann Sponsored by: Absolight Modified: branches/2014Q2/dns/bind98/Makefile branches/2014Q2/dns/bind98/files/named.in branches/2014Q2/dns/bind99/Makefile branches/2014Q2/dns/bind99/files/named.in Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/dns/bind98/Makefile ============================================================================== --- branches/2014Q2/dns/bind98/Makefile Thu Apr 10 21:48:42 2014 (r350860) +++ branches/2014Q2/dns/bind98/Makefile Thu Apr 10 21:52:06 2014 (r350861) @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= 9.8.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: branches/2014Q2/dns/bind98/files/named.in ============================================================================== --- branches/2014Q2/dns/bind98/files/named.in Thu Apr 10 21:48:42 2014 (r350860) +++ branches/2014Q2/dns/bind98/files/named.in Thu Apr 10 21:52:06 2014 (r350861) @@ -4,7 +4,7 @@ # # PROVIDE: named -# REQUIRE: FILESYSTEMS defaultroute +# REQUIRE: FILESYSTEMS defaultroute ldconfig # BEFORE: NETWORKING # KEYWORD: shutdown @@ -91,9 +91,9 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi - echo ${pidfile%/pid} - if [ ! -d ${pidfile%/pid} ]; then - install -d -o ${named_uid} -g ${named_uid} ${pidfile%/pid} + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} fi command_args="-u ${named_uid:=root} -c $named_conf $command_args" Modified: branches/2014Q2/dns/bind99/Makefile ============================================================================== --- branches/2014Q2/dns/bind99/Makefile Thu Apr 10 21:48:42 2014 (r350860) +++ branches/2014Q2/dns/bind99/Makefile Thu Apr 10 21:52:06 2014 (r350861) @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= 9.9.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: branches/2014Q2/dns/bind99/files/named.in ============================================================================== --- branches/2014Q2/dns/bind99/files/named.in Thu Apr 10 21:48:42 2014 (r350860) +++ branches/2014Q2/dns/bind99/files/named.in Thu Apr 10 21:52:06 2014 (r350861) @@ -4,7 +4,7 @@ # # PROVIDE: named -# REQUIRE: FILESYSTEMS defaultroute +# REQUIRE: FILESYSTEMS defaultroute ldconfig # BEFORE: NETWORKING # KEYWORD: shutdown @@ -91,9 +91,9 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi - echo ${pidfile%/pid} - if [ ! -d ${pidfile%/pid} ]; then - install -d -o ${named_uid} -g ${named_uid} ${pidfile%/pid} + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} fi command_args="-u ${named_uid:=root} -c $named_conf $command_args" From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 12 14:20:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94331372; Sat, 12 Apr 2014 14:20:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80FFB1B60; Sat, 12 Apr 2014 14:20:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CEKCud072896; Sat, 12 Apr 2014 14:20:12 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CEKCDU072895; Sat, 12 Apr 2014 14:20:12 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404121420.s3CEKCDU072895@svn.freebsd.org> From: Antoine Brodin Date: Sat, 12 Apr 2014 14:20:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351095 - in branches/2014Q2/devel: . libzookeeper X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2014 14:20:12 -0000 Author: antoine Date: Sat Apr 12 14:20:11 2014 New Revision: 351095 URL: http://svnweb.freebsd.org/changeset/ports/351095 QAT: https://qat.redports.org/buildarchive/r351095/ Log: MFH r350808 Development files for the C ZooKeeper binding WWW: http://zookeeper.apache.org/ Approved by: portmgr (self) Added: branches/2014Q2/devel/libzookeeper/ - copied from r350808, head/devel/libzookeeper/ Modified: branches/2014Q2/devel/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/Makefile ============================================================================== --- branches/2014Q2/devel/Makefile Sat Apr 12 13:57:57 2014 (r351094) +++ branches/2014Q2/devel/Makefile Sat Apr 12 14:20:11 2014 (r351095) @@ -1148,6 +1148,7 @@ SUBDIR += libxalloc SUBDIR += libxs SUBDIR += libytnef + SUBDIR += libzookeeper SUBDIR += libzrtpcpp SUBDIR += libzvbi SUBDIR += lightning From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 12 14:22:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 07AA2576; Sat, 12 Apr 2014 14:22:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE36B1C15; Sat, 12 Apr 2014 14:22:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CEMavU076256; Sat, 12 Apr 2014 14:22:36 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CEMaVM076254; Sat, 12 Apr 2014 14:22:36 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404121422.s3CEMaVM076254@svn.freebsd.org> From: Antoine Brodin Date: Sat, 12 Apr 2014 14:22:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351097 - branches/2014Q2/devel/p5-Net-ZooKeeper X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2014 14:22:37 -0000 Author: antoine Date: Sat Apr 12 14:22:36 2014 New Revision: 351097 URL: http://svnweb.freebsd.org/changeset/ports/351097 QAT: https://qat.redports.org/buildarchive/r351097/ Log: MFH: r350811 Fix build issues by changing LIB_DEPENDS to devel/libzookeeper Strip ZooKeeper.so on install Remove duplicate @dirrm entries from pkg-plist Approved by: portmgr (self) Modified: branches/2014Q2/devel/p5-Net-ZooKeeper/Makefile branches/2014Q2/devel/p5-Net-ZooKeeper/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/p5-Net-ZooKeeper/Makefile ============================================================================== --- branches/2014Q2/devel/p5-Net-ZooKeeper/Makefile Sat Apr 12 14:21:48 2014 (r351096) +++ branches/2014Q2/devel/p5-Net-ZooKeeper/Makefile Sat Apr 12 14:22:36 2014 (r351097) @@ -3,6 +3,7 @@ PORTNAME= Net-ZooKeeper PORTVERSION= 0.35 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -10,13 +11,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= skreuzer@FreeBSD.org COMMENT= Perl extension for Apache ZooKeeper -BUILD_DEPENDS= zookeeper>=3.3.5:${PORTSDIR}/devel/zookeeper -RUN_DEPENDS:= ${BUILD_DEPEND} +LIB_DEPENDS= libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper USES= perl5 USE_PERL5= configure -CONFIGURE_ARGS+= --zookeeper-include ${PREFIX}/include/c-client-src \ - --zookeeper-include ${PREFIX}/include/zookeeper \ +CONFIGURE_ARGS+= --zookeeper-include ${PREFIX}/include/zookeeper \ --zookeeper-lib ${PREFIX}/libs +post-install: + ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Net/ZooKeeper/ZooKeeper.so + .include Modified: branches/2014Q2/devel/p5-Net-ZooKeeper/pkg-plist ============================================================================== --- branches/2014Q2/devel/p5-Net-ZooKeeper/pkg-plist Sat Apr 12 14:21:48 2014 (r351096) +++ branches/2014Q2/devel/p5-Net-ZooKeeper/pkg-plist Sat Apr 12 14:22:36 2014 (r351097) @@ -3,8 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ZooKeeper/ZooKeeper.bs %%SITE_PERL%%/%%PERL_ARCH%%/Net/ZooKeeper.pm %%PERL5_MAN3%%/Net::ZooKeeper.3.gz -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ZooKeeper +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ZooKeeper @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ZooKeeper -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 12 14:23:34 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6F7766E; Sat, 12 Apr 2014 14:23:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 934921C20; Sat, 12 Apr 2014 14:23:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CENYuo076453; Sat, 12 Apr 2014 14:23:34 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CENYZ0076451; Sat, 12 Apr 2014 14:23:34 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404121423.s3CENYZ0076451@svn.freebsd.org> From: Antoine Brodin Date: Sat, 12 Apr 2014 14:23:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351098 - branches/2014Q2/devel/p5-Net-ZooKeeper X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2014 14:23:34 -0000 Author: antoine Date: Sat Apr 12 14:23:33 2014 New Revision: 351098 URL: http://svnweb.freebsd.org/changeset/ports/351098 QAT: https://qat.redports.org/buildarchive/r351098/ Log: MFH: r350815 Fix pkg-plist Approved by: portmgr (self) Modified: branches/2014Q2/devel/p5-Net-ZooKeeper/Makefile branches/2014Q2/devel/p5-Net-ZooKeeper/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/p5-Net-ZooKeeper/Makefile ============================================================================== --- branches/2014Q2/devel/p5-Net-ZooKeeper/Makefile Sat Apr 12 14:22:36 2014 (r351097) +++ branches/2014Q2/devel/p5-Net-ZooKeeper/Makefile Sat Apr 12 14:23:33 2014 (r351098) @@ -3,7 +3,7 @@ PORTNAME= Net-ZooKeeper PORTVERSION= 0.35 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: branches/2014Q2/devel/p5-Net-ZooKeeper/pkg-plist ============================================================================== --- branches/2014Q2/devel/p5-Net-ZooKeeper/pkg-plist Sat Apr 12 14:22:36 2014 (r351097) +++ branches/2014Q2/devel/p5-Net-ZooKeeper/pkg-plist Sat Apr 12 14:23:33 2014 (r351098) @@ -5,3 +5,4 @@ %%PERL5_MAN3%%/Net::ZooKeeper.3.gz @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ZooKeeper @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/mach/Net From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 12 21:25:21 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5CE88206; Sat, 12 Apr 2014 21:25:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2F179113D; Sat, 12 Apr 2014 21:25:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CLPLp6051544; Sat, 12 Apr 2014 21:25:21 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CLPLE7051543; Sat, 12 Apr 2014 21:25:21 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404122125.s3CLPLE7051543@svn.freebsd.org> From: Pawel Pekala Date: Sat, 12 Apr 2014 21:25:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351140 - branches/2014Q2/games/xrick X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2014 21:25:21 -0000 Author: pawel Date: Sat Apr 12 21:25:20 2014 New Revision: 351140 URL: http://svnweb.freebsd.org/changeset/ports/351140 QAT: https://qat.redports.org/buildarchive/r351140/ Log: MFH: r351130 - Fix build with clang by respecting CC, CFLAGS - Add staging support - Remove leading article from COMMENT - Convert to new LIB_DEPENDS format, USES=gmake - Switch to PLIST_FILES Approved by: portmgr (erwin) Deleted: branches/2014Q2/games/xrick/pkg-plist Modified: branches/2014Q2/games/xrick/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/xrick/Makefile ============================================================================== --- branches/2014Q2/games/xrick/Makefile Sat Apr 12 21:23:13 2014 (r351139) +++ branches/2014Q2/games/xrick/Makefile Sat Apr 12 21:25:20 2014 (r351140) @@ -9,25 +9,26 @@ MASTER_SITES= http://www.bigorno.net/xri EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A clone of Rick Dangerous +COMMENT= Clone of Rick Dangerous -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RESTRICTED= Copyright status of the graphics and sounds is uncertain -USE_GMAKE= yes +USES= gmake USE_SDL= sdl -MAN6= xrick.6 -MANCOMPRESSED= yes +PLIST_FILES= bin/xrick man/man6/xrick.6.gz share/xrick/data.zip +PLIST_DIRS= share/xrick -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|sysarg_args_data = NULL|sysarg_args_data = "${PREFIX}/share/xrick/data.zip"|' ${WRKSRC}/src/sysarg.c + @${REINPLACE_CMD} 's|gcc|${CC}|; s|-g||; s|-O2|${CFLAGS}|' \ + ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xrick.6.gz ${PREFIX}/man/man6/xrick.6.gz - ${MKDIR} ${PREFIX}/share/xrick - ${INSTALL_DATA} ${WRKSRC}/data.zip ${PREFIX}/share/xrick/data.zip + ${INSTALL_PROGRAM} ${WRKSRC}/xrick ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/xrick.6.gz ${STAGEDIR}${PREFIX}/man/man6 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/xrick + ${INSTALL_DATA} ${WRKSRC}/data.zip ${STAGEDIR}${PREFIX}/share/xrick .include From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 12 22:19:40 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 10AF5617; Sat, 12 Apr 2014 22:19:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F150A15B8; Sat, 12 Apr 2014 22:19:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CMJd1F073611; Sat, 12 Apr 2014 22:19:39 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CMJdw7073610; Sat, 12 Apr 2014 22:19:39 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404122219.s3CMJdw7073610@svn.freebsd.org> From: Antoine Brodin Date: Sat, 12 Apr 2014 22:19:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351153 - branches/2014Q2/devel/pecl-zookeeper X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2014 22:19:40 -0000 Author: antoine Date: Sat Apr 12 22:19:39 2014 New Revision: 351153 URL: http://svnweb.freebsd.org/changeset/ports/351153 QAT: https://qat.redports.org/buildarchive/r351153/ Log: MFH: r351151 Unbreak Reported by: pkg-fallout Approved by: portmgr (self) Modified: branches/2014Q2/devel/pecl-zookeeper/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/pecl-zookeeper/Makefile ============================================================================== --- branches/2014Q2/devel/pecl-zookeeper/Makefile Sat Apr 12 22:19:04 2014 (r351152) +++ branches/2014Q2/devel/pecl-zookeeper/Makefile Sat Apr 12 22:19:39 2014 (r351153) @@ -3,6 +3,7 @@ PORTNAME= zookeeper PORTVERSION= 0.2.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- @@ -14,7 +15,7 @@ COMMENT= PHP extension for interfacing w LICENSE= PHP301 -LIB_DEPENDS= libzookeeper_mt.so:${PORTSDIR}/devel/zookeeper +LIB_DEPENDS= libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper USE_PHP= session USE_PHP_BUILD= session From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 13 10:20:15 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB3DCCA3; Sun, 13 Apr 2014 10:20:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7AFA1D9C; Sun, 13 Apr 2014 10:20:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DAKFIT072582; Sun, 13 Apr 2014 10:20:15 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3DAKFpS072581; Sun, 13 Apr 2014 10:20:15 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201404131020.s3DAKFpS072581@svn.freebsd.org> From: Guido Falsi Date: Sun, 13 Apr 2014 10:20:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351198 - branches/2014Q2/audio/xmms2/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2014 10:20:15 -0000 Author: madpilot Date: Sun Apr 13 10:20:15 2014 New Revision: 351198 URL: http://svnweb.freebsd.org/changeset/ports/351198 QAT: https://qat.redports.org/buildarchive/r351198/ Log: MFH: r350720 - Fix build when MODPLUG option is enabled (disabled by default) PR: ports/188377 Submitted by: Volodymyr Kostyrko Approved by: portmgr (bapt) Added: branches/2014Q2/audio/xmms2/files/patch-src-plugins-modplug-modplug.c - copied unchanged from r350720, head/audio/xmms2/files/patch-src-plugins-modplug-modplug.c Modified: Directory Properties: branches/2014Q2/ (props changed) Copied: branches/2014Q2/audio/xmms2/files/patch-src-plugins-modplug-modplug.c (from r350720, head/audio/xmms2/files/patch-src-plugins-modplug-modplug.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/audio/xmms2/files/patch-src-plugins-modplug-modplug.c Sun Apr 13 10:20:15 2014 (r351198, copy of r350720, head/audio/xmms2/files/patch-src-plugins-modplug-modplug.c) @@ -0,0 +1,11 @@ +--- src/plugins/modplug/modplug.c.orig 2011-10-20 21:26:08.000000000 +0200 ++++ src/plugins/modplug/modplug.c 2014-04-09 15:05:29.232679291 +0200 +@@ -9,7 +9,7 @@ + #include "xmms/xmms_sample.h" + #include "xmms/xmms_medialib.h" + #include "xmms/xmms_log.h" +-#include ++#include + + #include + #include From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 13 12:57:32 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 620CB19F; Sun, 13 Apr 2014 12:57:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DFEE1B9C; Sun, 13 Apr 2014 12:57:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DCvWhQ039494; Sun, 13 Apr 2014 12:57:32 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3DCvVoL039490; Sun, 13 Apr 2014 12:57:31 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201404131257.s3DCvVoL039490@svn.freebsd.org> From: Rene Ladan Date: Sun, 13 Apr 2014 12:57:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351215 - in branches/2014Q2/japanese: chasen chasen-base X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2014 12:57:32 -0000 Author: rene Date: Sun Apr 13 12:57:31 2014 New Revision: 351215 URL: http://svnweb.freebsd.org/changeset/ports/351215 QAT: https://qat.redports.org/buildarchive/r351215/ Log: MFH: r351212 - Update to 2.4.5 [1] - Stage support - Install libchasen.la Note that japanese/chasen remains expired. PR: ports/183764 [1] Submitted by: Akira Noda Security: http://vuxml.org/freebsd/972837fc-c304-11e3-8758-00262d5ed8ee.html Approved by: portmgr (antoine) Modified: branches/2014Q2/japanese/chasen-base/Makefile branches/2014Q2/japanese/chasen-base/distinfo branches/2014Q2/japanese/chasen-base/pkg-plist branches/2014Q2/japanese/chasen/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/japanese/chasen-base/Makefile ============================================================================== --- branches/2014Q2/japanese/chasen-base/Makefile Sun Apr 13 12:47:12 2014 (r351214) +++ branches/2014Q2/japanese/chasen-base/Makefile Sun Apr 13 12:57:31 2014 (r351215) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= chasen -PORTVERSION= 2.4.4 +PORTVERSION= 2.4.5 CATEGORIES= japanese textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR= chasen-legacy/32224 +MASTER_SITE_SUBDIR= chasen-legacy/56305 PKGNAMESUFFIX= -base MAINTAINER= ports@FreeBSD.org @@ -19,13 +19,9 @@ CONFIGURE_ARGS= --with-darts=${LOCALBASE USES= iconv USE_LDCONFIG= yes -NO_STAGE= yes post-install: - ${RM} -f ${PREFIX}/lib/libchasen.la - ${MKDIR} ${PREFIX}/share/chasen/dic -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/manual* ${DOCSDIR} -.endif + ${MKDIR} ${STAGEDIR}${PREFIX}/share/chasen/dic + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/manual* ${STAGEDIR}${DOCSDIR} .include Modified: branches/2014Q2/japanese/chasen-base/distinfo ============================================================================== --- branches/2014Q2/japanese/chasen-base/distinfo Sun Apr 13 12:47:12 2014 (r351214) +++ branches/2014Q2/japanese/chasen-base/distinfo Sun Apr 13 12:57:31 2014 (r351215) @@ -1,2 +1,2 @@ -SHA256 (chasen-2.4.4.tar.gz) = 09e41f681097f87ba6c953d3724c34c1826c3cfa590898a2166fb310a006f932 -SIZE (chasen-2.4.4.tar.gz) = 845720 +SHA256 (chasen-2.4.5.tar.gz) = fd1a7afd73ed14e18b0fe82965c00a6baae383070360a4220fde01338611416a +SIZE (chasen-2.4.5.tar.gz) = 830940 Modified: branches/2014Q2/japanese/chasen-base/pkg-plist ============================================================================== --- branches/2014Q2/japanese/chasen-base/pkg-plist Sun Apr 13 12:47:12 2014 (r351214) +++ branches/2014Q2/japanese/chasen-base/pkg-plist Sun Apr 13 12:57:31 2014 (r351215) @@ -3,6 +3,7 @@ bin/chasen bin/chasen-config include/chasen.h lib/libchasen.a +lib/libchasen.la lib/libchasen.so lib/libchasen.so.2 libexec/chasen/makeda Modified: branches/2014Q2/japanese/chasen/Makefile ============================================================================== --- branches/2014Q2/japanese/chasen/Makefile Sun Apr 13 12:47:12 2014 (r351214) +++ branches/2014Q2/japanese/chasen/Makefile Sun Apr 13 12:57:31 2014 (r351215) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chasen -PORTVERSION= 2.4.4 +PORTVERSION= 2.4.5 CATEGORIES= japanese textproc MASTER_SITES= # empty DISTFILES= # empty @@ -18,7 +18,6 @@ DEPRECATED= Unmaintained since 2001 EXPIRATION_DATE= 2014-04-12 NO_BUILD= YES -NO_STAGE= yes do-install: .include From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 13 13:03:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAE8B2EF; Sun, 13 Apr 2014 13:03:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C69391C3B; Sun, 13 Apr 2014 13:03:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3DD3orO043308; Sun, 13 Apr 2014 13:03:50 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3DD3o7b043302; Sun, 13 Apr 2014 13:03:50 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404131303.s3DD3o7b043302@svn.freebsd.org> From: Pawel Pekala Date: Sun, 13 Apr 2014 13:03:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351216 - in branches/2014Q2/games/ezquake: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Apr 2014 13:03:50 -0000 Author: pawel Date: Sun Apr 13 13:03:49 2014 New Revision: 351216 URL: http://svnweb.freebsd.org/changeset/ports/351216 QAT: https://qat.redports.org/buildarchive/r351216/ Log: MFH: r351214 - Add staging support - Convert to new LIB_DEPENDS format - Use options helpers, subs - Fix linking with clang (fixes build on 10+) Approved by: portmgr (antoine) Modified: branches/2014Q2/games/ezquake/Makefile branches/2014Q2/games/ezquake/files/patch-Makefile branches/2014Q2/games/ezquake/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/ezquake/Makefile ============================================================================== --- branches/2014Q2/games/ezquake/Makefile Sun Apr 13 12:57:31 2014 (r351215) +++ branches/2014Q2/games/ezquake/Makefile Sun Apr 13 13:03:49 2014 (r351216) @@ -18,9 +18,9 @@ COMMENT= Modern QuakeWorld client EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \ 7z:${PORTSDIR}/archivers/p7zip -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - pcre.3:${PORTSDIR}/devel/pcre \ - png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ + libpcre.so:${PORTSDIR}/devel/pcre \ + libpng15.so:${PORTSDIR}/graphics/png USES= gmake tcl dos2unix DOS2UNIX_GLOB= *.[ch] Makefile* @@ -35,31 +35,25 @@ OPTIONS_MULTI= OUTPUT OPTIONS_MULTI_OUTPUT= X11 OPENGL OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPTIONS_DEFAULT= OPENGL X11 OPTIMIZED_CFLAGS +OPTIONS_SUB= yes + +OPENGL_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +OPENGL_USE= GL=yes + +X11_USE= XORG=xxf86dga + +BROKEN_powerpc= Does not install on powerpc: signal 2 -NO_STAGE= yes .include "${.CURDIR}/../quake-data/Makefile.include" .include -.if ${ARCH} == "powerpc" -BROKEN= Does not install on powerpc: signal 2 -.endif - .if ${PORT_OPTIONS:MOPENGL} -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -USE_GL= yes ALL_TARGET+= glx -PLIST_SUB+= GLX="" -.else -PLIST_SUB+= GLX="@comment " .endif .if ${PORT_OPTIONS:MX11} -USE_XORG= xxf86dga ALL_TARGET+= x11 -PLIST_SUB+= X11="" -.else -PLIST_SUB+= X11="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} @@ -81,17 +75,15 @@ post-patch: ${WRKSRC}/embed_tcl.h do-install: -.for dir in ezquake qw - ${MKDIR} ${DATADIR}/${dir} - ${CP} -r ${WRKDIR}/${dir}/* ${DATADIR}/${dir} -.endfor + @${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKDIR} && ${COPYTREE_SHARE} "ezquake qw" ${STAGEDIR}${DATADIR}) .if ${PORT_OPTIONS:MOPENGL} ${INSTALL_PROGRAM} ${WRKSRC}/release/ezquake-gl.glx \ - ${PREFIX}/bin/ezquake-glx + ${STAGEDIR}${PREFIX}/bin/ezquake-glx .endif .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${WRKSRC}/release/ezquake.x11 \ - ${PREFIX}/bin/ezquake-x11 + ${STAGEDIR}${PREFIX}/bin/ezquake-x11 .endif .include Modified: branches/2014Q2/games/ezquake/files/patch-Makefile ============================================================================== --- branches/2014Q2/games/ezquake/files/patch-Makefile Sun Apr 13 12:57:31 2014 (r351215) +++ branches/2014Q2/games/ezquake/files/patch-Makefile Sun Apr 13 13:03:49 2014 (r351216) @@ -1,5 +1,5 @@ ---- Makefile.orig 2008-04-27 17:51:52.000000000 -0300 -+++ Makefile 2008-04-29 22:27:42.000000000 -0300 +--- Makefile.orig 2014-04-13 13:48:18.000000000 +0200 ++++ Makefile 2014-04-13 13:49:38.000000000 +0200 @@ -6,7 +6,7 @@ # compilation tool and detection of targets/achitecture @@ -93,3 +93,12 @@ ifeq ($(OS),freebsd) X11BASE ?= /usr/X11R6 +@@ -149,7 +141,7 @@ + GLX_C_OBJS = $(addprefix $(GLX_DIR)/, $(addsuffix .o, $(GLX_C_FILES))) + GLX_S_OBJS = $(addprefix $(GLX_DIR)/, $(addsuffix .o, $(GLX_S_FILES))) + GLX_CFLAGS = $(CFLAGS) $(GLCFLAGS) +-GLX_LDFLAGS = $(LDFLAGS) -lGL -lXxf86dga -lXxf86vm ++GLX_LDFLAGS = $(LDFLAGS) -lGL -lXxf86dga -lXxf86vm -lX11 + + glx: _DIR = $(GLX_DIR) + glx: _OBJS = $(GLX_C_OBJS) $(GLX_S_OBJS) $(COMMON_LIBS) $(GL_LIBS) Modified: branches/2014Q2/games/ezquake/pkg-plist ============================================================================== --- branches/2014Q2/games/ezquake/pkg-plist Sun Apr 13 12:57:31 2014 (r351215) +++ branches/2014Q2/games/ezquake/pkg-plist Sun Apr 13 13:03:49 2014 (r351216) @@ -1,4 +1,4 @@ -%%GLX%%bin/ezquake-glx +%%OPENGL%%bin/ezquake-glx %%X11%%bin/ezquake-x11 %%DATADIR%%/ezquake/cfg/cams.cfg %%DATADIR%%/ezquake/cfg/cams.tcl From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 16 15:26:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7C8D84F; Wed, 16 Apr 2014 15:26:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3D3B1B47; Wed, 16 Apr 2014 15:26:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3GFQ8JX084655; Wed, 16 Apr 2014 15:26:08 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3GFQ7tZ084648; Wed, 16 Apr 2014 15:26:07 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404161526.s3GFQ7tZ084648@svn.freebsd.org> From: Pawel Pekala Date: Wed, 16 Apr 2014 15:26:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351397 - in branches/2014Q2/games/noegnud-littlehack: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2014 15:26:08 -0000 Author: pawel Date: Wed Apr 16 15:26:07 2014 New Revision: 351397 URL: http://svnweb.freebsd.org/changeset/ports/351397 QAT: https://qat.redports.org/buildarchive/r351397/ Log: MFH: r351386 - Add staging support - Fix build on 10+, bmake does not support -E option - Convert to USES=tar:bzip2 - Remove Author tag from pkg-descr, info available on homepage Approved by: portmgr (erwin) Modified: branches/2014Q2/games/noegnud-littlehack/Makefile branches/2014Q2/games/noegnud-littlehack/files/patch-variants::Makefile branches/2014Q2/games/noegnud-littlehack/pkg-descr branches/2014Q2/games/noegnud-littlehack/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/noegnud-littlehack/Makefile ============================================================================== --- branches/2014Q2/games/noegnud-littlehack/Makefile Wed Apr 16 15:23:10 2014 (r351396) +++ branches/2014Q2/games/noegnud-littlehack/Makefile Wed Apr 16 15:26:07 2014 (r351397) @@ -18,18 +18,16 @@ COMMENT= The noeGNUd UI for the LittleHa RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data NOEGNUDVERSION= ${PORTNAME}-0.8.0 -USES= bison +USES= bison tar:bzip2 USE_GL= yes WANT_SDL= yes USE_SDL= sdl image mixer -USE_BZIP2= yes WRKSRC= ${WRKDIR}/${DISTNAME}/variants PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} ALL_TARGET= lh001 INSTALL_TARGET= install_lh001 MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include pre-everything:: @@ -46,7 +44,11 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-littlehack-0.0.1) @(${PATCH} ${PATCH_ARGS} < ${FILESDIR}/noegnud-littlehack.patch) - + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E -e 's,ch(grp|own),true,' \ + -e '/(^VARDIR|ln -s|sed)/! s,(GAME|SHELL|VAR)DIR),DESTDIR)$$(&,g' \ + -e '/ln -s/ s,SHELLDIR,DESTDIR)$$(&,2' \ + ${WRKSRC}/${NOEGNUDVERSION}-littlehack-0.0.1/sys/unix/Makefile.top do-configure: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-littlehack-0.0.1/Makefile) Modified: branches/2014Q2/games/noegnud-littlehack/files/patch-variants::Makefile ============================================================================== --- branches/2014Q2/games/noegnud-littlehack/files/patch-variants::Makefile Wed Apr 16 15:23:10 2014 (r351396) +++ branches/2014Q2/games/noegnud-littlehack/files/patch-variants::Makefile Wed Apr 16 15:26:07 2014 (r351397) @@ -1,55 +1,24 @@ ---- variants/Makefile.orig Mon Aug 23 12:13:51 2004 -+++ variants/Makefile Sun Nov 21 00:49:21 2004 -@@ -1,7 +1,6 @@ +--- variants/Makefile.orig 2004-08-23 19:13:51.000000000 +0200 ++++ variants/Makefile 2014-04-15 14:55:14.044062891 +0200 +@@ -1,7 +1,7 @@ NOEGNUDVERSION=noegnud-0.8.0 # you __MUST__ change this if you change the prefix for any variants' install !!!!!!!!!!!!! # although ..... " make -e foo " also works :O ;) -PREFIX = /usr/local ++PREFIX = %%PREFIX%% GAMEUID = games GAMEGRP = bin CHOWN = chown -@@ -62,31 +61,31 @@ - install: install_all - - install_nh342: nh342 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2 install - - install_nh343: nh343 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.3 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.3 install - - install_se006e4f8: se006e4f8 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install - - install_se007e2: se007e2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install - - install_se007e5: se007e5 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install - - install_se007e6: se007e6 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install - - install_se007e6f2: se007e6f2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install +@@ -83,7 +83,7 @@ + make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install install_lh001: lh001 - make -e -C $(NOEGNUDVERSION)-littlehack-0.0.1 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-littlehack-0.0.1 install ++ make -C $(NOEGNUDVERSION)-littlehack-0.0.1 install install_nh342-dt: nh342-dt -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install - - # data - -@@ -204,7 +203,7 @@ + make -e -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install +@@ -204,7 +204,7 @@ patch -p0 Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35116581; Wed, 16 Apr 2014 16:39:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 081C81489; Wed, 16 Apr 2014 16:39:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3GGd3qP013930; Wed, 16 Apr 2014 16:39:03 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3GGd3eH013928; Wed, 16 Apr 2014 16:39:03 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404161639.s3GGd3eH013928@svn.freebsd.org> From: Antoine Brodin Date: Wed, 16 Apr 2014 16:39:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351402 - branches/2014Q2/japanese/p5-Text-ChaSen X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2014 16:39:04 -0000 Author: antoine Date: Wed Apr 16 16:39:03 2014 New Revision: 351402 URL: http://svnweb.freebsd.org/changeset/ports/351402 QAT: https://qat.redports.org/buildarchive/r351402/ Log: MFH: r350569 Support stage Approved by: portmgr (self) Modified: branches/2014Q2/japanese/p5-Text-ChaSen/Makefile branches/2014Q2/japanese/p5-Text-ChaSen/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/japanese/p5-Text-ChaSen/Makefile ============================================================================== --- branches/2014Q2/japanese/p5-Text-ChaSen/Makefile Wed Apr 16 16:35:54 2014 (r351401) +++ branches/2014Q2/japanese/p5-Text-ChaSen/Makefile Wed Apr 16 16:39:03 2014 (r351402) @@ -12,7 +12,7 @@ DISTNAME= chasen-${CHASEN_VERSION} MAINTAINER= ports@FreeBSD.org COMMENT= ChaSen library module for Perl5 -LIB_DEPENDS= chasen.2:${PORTSDIR}/japanese/chasen-base +LIB_DEPENDS= libchasen.so:${PORTSDIR}/japanese/chasen-base DISTINFO_FILE= ${.CURDIR}/../chasen-base/distinfo @@ -22,18 +22,16 @@ WRKSRC= ${WRKDIR}/chasen-${CHASEN_VERSI USES= perl5 USE_PERL5= configure CONFIGURE_ENV= PREFIX="${PREFIX}" -MAN3= Text::ChaSen.3 DOCSDIR= ${PREFIX}/share/doc/chasen -NO_STAGE= yes .include PKGNAMEPREFIX:= ${PKGNAMEPREFIX}p5- post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README.perl +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README.perl .endif .include Modified: branches/2014Q2/japanese/p5-Text-ChaSen/pkg-plist ============================================================================== --- branches/2014Q2/japanese/p5-Text-ChaSen/pkg-plist Wed Apr 16 16:35:54 2014 (r351401) +++ branches/2014Q2/japanese/p5-Text-ChaSen/pkg-plist Wed Apr 16 16:39:03 2014 (r351402) @@ -1,10 +1,10 @@ +%%PERL5_MAN3%%/Text::ChaSen.3.gz %%SITE_PERL%%/%%PERL_ARCH%%/Text/ChaSen.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text %%PORTDOCS%%%%DOCSDIR%%/README.perl %%PORTDOCS%%@dirrmtry %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 16 16:40:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C8A3466F; Wed, 16 Apr 2014 16:40:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B5A4A14A2; Wed, 16 Apr 2014 16:40:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3GGe2AQ014175; Wed, 16 Apr 2014 16:40:02 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3GGe2GJ014174; Wed, 16 Apr 2014 16:40:02 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404161640.s3GGe2GJ014174@svn.freebsd.org> From: Antoine Brodin Date: Wed, 16 Apr 2014 16:40:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351403 - branches/2014Q2/japanese/p5-Text-ChaSen X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2014 16:40:02 -0000 Author: antoine Date: Wed Apr 16 16:40:02 2014 New Revision: 351403 URL: http://svnweb.freebsd.org/changeset/ports/351403 QAT: https://qat.redports.org/buildarchive/r351403/ Log: MFH: r351401 Chase chasen-base update Reported by: pkg-fallout Approved by: portmgr (self) Modified: branches/2014Q2/japanese/p5-Text-ChaSen/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/japanese/p5-Text-ChaSen/Makefile ============================================================================== --- branches/2014Q2/japanese/p5-Text-ChaSen/Makefile Wed Apr 16 16:39:03 2014 (r351402) +++ branches/2014Q2/japanese/p5-Text-ChaSen/Makefile Wed Apr 16 16:40:02 2014 (r351403) @@ -3,7 +3,7 @@ PORTNAME= Text-ChaSen PORTVERSION= 1.03 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese textproc perl5 MASTER_SITES= SFJP MASTER_SITE_SUBDIR= chasen-legacy/32224 @@ -16,7 +16,7 @@ LIB_DEPENDS= libchasen.so:${PORTSDIR}/ja DISTINFO_FILE= ${.CURDIR}/../chasen-base/distinfo -CHASEN_VERSION= 2.4.4 +CHASEN_VERSION= 2.4.5 WRKSRC= ${WRKDIR}/chasen-${CHASEN_VERSION}/perl USES= perl5 From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 18 10:24:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD28532D; Fri, 18 Apr 2014 10:24:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DD511E03; Fri, 18 Apr 2014 10:24:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3IAO8sf084845; Fri, 18 Apr 2014 10:24:08 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3IAO8a9084842; Fri, 18 Apr 2014 10:24:08 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404181024.s3IAO8a9084842@svn.freebsd.org> From: Pawel Pekala Date: Fri, 18 Apr 2014 10:24:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351528 - in branches/2014Q2/games/q3cellshading: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2014 10:24:08 -0000 Author: pawel Date: Fri Apr 18 10:24:07 2014 New Revision: 351528 URL: http://svnweb.freebsd.org/changeset/ports/351528 QAT: https://qat.redports.org/buildarchive/r351528/ Log: MFH: r351523 - Fix build with clang (global var defined as static, unrecognized compiler arguments) - Add staging support - Use options subs Approved by: portmgr (erwin) Added: branches/2014Q2/games/q3cellshading/files/patch-code-qcommon-vm_x86.c - copied unchanged from r351523, head/games/q3cellshading/files/patch-code-qcommon-vm_x86.c Modified: branches/2014Q2/games/q3cellshading/Makefile branches/2014Q2/games/q3cellshading/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/q3cellshading/Makefile ============================================================================== --- branches/2014Q2/games/q3cellshading/Makefile Fri Apr 18 09:40:35 2014 (r351527) +++ branches/2014Q2/games/q3cellshading/Makefile Fri Apr 18 10:24:07 2014 (r351528) @@ -14,9 +14,10 @@ COMMENT= Quake III engine with Cell Shad ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= does not run properly; try games/ioquake3 with option -USES= gmake dos2unix zip +USES= compiler dos2unix gmake zip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/code/unix +MAKE_JOBS_UNSAFE= yes LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV= LIBDIR="${LIBDIR}" @@ -28,13 +29,13 @@ OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAG OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED SMP_CLIENT OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT +OPTIONS_SUB= yes CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server GAMELIBS_DESC= Force building game libraries SMP_CLIENT_DESC= Build SMP (threaded) client -NO_STAGE= yes .include .if ${ARCH} == "i386" @@ -58,25 +59,16 @@ USE_XORG= xxf86dga .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= CLIENT=YES -PLIST_SUB+= CLIENT="" Q3BIN+= quake3 -.else -PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= DEDICATED=YES -PLIST_SUB+= DEDICATED="" Q3BIN+= q3ded -.else -PLIST_SUB+= DEDICATED="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= GAMELIBS=YES -PLIST_SUB+= GAMELIBS="" -.else -PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} @@ -85,10 +77,7 @@ MAKE_ENV+= OPTIMIZED_CFLAGS=YES .if ${PORT_OPTIONS:MSMP_CLIENT} MAKE_ENV+= SMP=YES PTHREAD_LIBS="${PTHREAD_LIBS}" -PLIST_SUB+= SMP="" Q3BIN+= quake3-smp -.else -PLIST_SUB+= SMP="@comment " .endif post-patch: @@ -98,17 +87,22 @@ post-patch: 's|//[[:blank:]]*\(Swap_Init[[:blank:]]*();\)|\1|' \ ${WRKSRC}/code/botlib/be_interface.c \ ${WRKSRC}/code/renderer/tr_init.c +.if ${COMPILER_TYPE} == clang + @${REINPLACE_CMD} -E 's,-falign-(jumps|loops)=2,,g; s|-O6||' \ + ${WRKSRC}/code/unix/Makefile +.endif do-install: .for bin in ${Q3BIN} # Adjust program names to avoid conflicts with other Quake3 ports ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \ - ${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/} + ${STAGEDIR}${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/} .endfor .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) .for dir in baseq3 missionpack - @${MKDIR} ${LIBDIR}/${dir} - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir} + @${MKDIR} ${STAGEDIR}${LIBDIR}/${dir} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so \ + ${STAGEDIR}${LIBDIR}/${dir} .endfor .endif Copied: branches/2014Q2/games/q3cellshading/files/patch-code-qcommon-vm_x86.c (from r351523, head/games/q3cellshading/files/patch-code-qcommon-vm_x86.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/games/q3cellshading/files/patch-code-qcommon-vm_x86.c Fri Apr 18 10:24:07 2014 (r351528, copy of r351523, head/games/q3cellshading/files/patch-code-qcommon-vm_x86.c) @@ -0,0 +1,11 @@ +--- code/qcommon/vm_x86.c.orig 2014-04-17 13:05:34.157088687 +0200 ++++ code/qcommon/vm_x86.c 2014-04-17 12:58:45.706901862 +0200 +@@ -84,7 +84,7 @@ + #endif // !_WIN32 + + +-static int callMask = 0; // bk001213 - init ++ int callMask = 0; // bk001213 - init + + static int instruction, pass; + static int lastConst = 0; Modified: branches/2014Q2/games/q3cellshading/pkg-plist ============================================================================== --- branches/2014Q2/games/q3cellshading/pkg-plist Fri Apr 18 09:40:35 2014 (r351527) +++ branches/2014Q2/games/q3cellshading/pkg-plist Fri Apr 18 10:24:07 2014 (r351528) @@ -1,6 +1,6 @@ %%DEDICATED%%bin/q3celded %%CLIENT%%bin/quake3cel -%%SMP%%bin/quake3cel-smp +%%SMP_CLIENT%%bin/quake3cel-smp %%GAMELIBS%%%%LIBDIR%%/baseq3/cgame.so %%GAMELIBS%%%%LIBDIR%%/baseq3/qagame.so %%GAMELIBS%%%%LIBDIR%%/baseq3/ui.so From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 18 17:28:41 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A404E76; Fri, 18 Apr 2014 17:28:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 660311907; Fri, 18 Apr 2014 17:28:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3IHSfjA059681; Fri, 18 Apr 2014 17:28:41 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3IHSeK3059675; Fri, 18 Apr 2014 17:28:40 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404181728.s3IHSeK3059675@svn.freebsd.org> From: Pawel Pekala Date: Fri, 18 Apr 2014 17:28:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351553 - in branches/2014Q2/games/noegnud-nethack-deet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2014 17:28:41 -0000 Author: pawel Date: Fri Apr 18 17:28:40 2014 New Revision: 351553 URL: http://svnweb.freebsd.org/changeset/ports/351553 QAT: https://qat.redports.org/buildarchive/r351553/ Log: MFH: r351540 - Fix build on 10+ (bmake does not support -E option) - Add staging support - Convert to USES=tar:bzip2 - Remove Author tag from pkg-descr, info available on homepage Approved by: portmgr (bdrewery) Modified: branches/2014Q2/games/noegnud-nethack-deet/Makefile branches/2014Q2/games/noegnud-nethack-deet/files/patch-variants::Makefile branches/2014Q2/games/noegnud-nethack-deet/pkg-descr branches/2014Q2/games/noegnud-nethack-deet/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/noegnud-nethack-deet/Makefile ============================================================================== --- branches/2014Q2/games/noegnud-nethack-deet/Makefile Fri Apr 18 17:24:46 2014 (r351552) +++ branches/2014Q2/games/noegnud-nethack-deet/Makefile Fri Apr 18 17:28:40 2014 (r351553) @@ -18,18 +18,16 @@ COMMENT= The noeGNUd UI for Nethack with RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data NOEGNUDVERSION= ${PORTNAME}-0.8.0 -USES= bison fmake +USES= bison tar:bzip2 USE_GL= yes WANT_SDL= yes USE_SDL= sdl image mixer -USE_BZIP2= yes WRKSRC= ${WRKDIR}/${DISTNAME}/variants PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} ALL_TARGET= nh342-dt INSTALL_TARGET= install_nh342-dt MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include pre-everything:: @@ -46,6 +44,11 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.2-deet) @(${PATCH} ${PATCH_ARGS} < ${FILESDIR}/noegnud-nethack-deet.patch) + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E -e 's,ch(grp|own),true,' \ + -e '/(^VARDIR|ln -s|sed)/! s,(GAME|SHELL|VAR)DIR),DESTDIR)$$(&,g' \ + -e '/ln -s/ s,SHELLDIR,DESTDIR)$$(&,2' \ + ${WRKSRC}/${NOEGNUDVERSION}-nethack-3.4.2-deet/sys/unix/Makefile.top do-configure: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.2-deet/Makefile) Modified: branches/2014Q2/games/noegnud-nethack-deet/files/patch-variants::Makefile ============================================================================== --- branches/2014Q2/games/noegnud-nethack-deet/files/patch-variants::Makefile Fri Apr 18 17:24:46 2014 (r351552) +++ branches/2014Q2/games/noegnud-nethack-deet/files/patch-variants::Makefile Fri Apr 18 17:28:40 2014 (r351553) @@ -1,51 +1,20 @@ ---- variants/Makefile.orig Mon Nov 15 03:02:30 2004 -+++ variants/Makefile Mon Nov 15 03:03:25 2004 -@@ -1,7 +1,6 @@ +--- variants/Makefile.orig 2004-08-23 19:13:51.000000000 +0200 ++++ variants/Makefile 2014-04-17 11:03:58.205085570 +0200 +@@ -1,7 +1,7 @@ NOEGNUDVERSION=noegnud-0.8.0 # you __MUST__ change this if you change the prefix for any variants' install !!!!!!!!!!!!! # although ..... " make -e foo " also works :O ;) -PREFIX = /usr/local ++PREFIX = %%PREFIX%% GAMEUID = games GAMEGRP = bin CHOWN = chown -@@ -62,31 +61,31 @@ - install: install_all - - install_nh342: nh342 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2 install - - install_nh343: nh343 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.3 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.3 install - - install_se006e4f8: se006e4f8 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install - - install_se007e2: se007e2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install - - install_se007e5: se007e5 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install - - install_se007e6: se007e6 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install - - install_se007e6f2: se007e6f2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install - - install_lh001: lh001 -- make -e -C $(NOEGNUDVERSION)-littlehack-0.0.1 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-littlehack-0.0.1 install +@@ -86,7 +86,7 @@ + make -e -C $(NOEGNUDVERSION)-littlehack-0.0.1 install install_nh342-dt: nh342-dt - make -e -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install ++ make -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install # data Modified: branches/2014Q2/games/noegnud-nethack-deet/pkg-descr ============================================================================== --- branches/2014Q2/games/noegnud-nethack-deet/pkg-descr Fri Apr 18 17:24:46 2014 (r351552) +++ branches/2014Q2/games/noegnud-nethack-deet/pkg-descr Fri Apr 18 17:28:40 2014 (r351553) @@ -6,5 +6,4 @@ and an outstanding 3D-Mode. This port installs noeGNUd for NetHack with DeeT's hack font patch. -Author: Clive Crous WWW: http://noegnud.sourceforge.net/ Modified: branches/2014Q2/games/noegnud-nethack-deet/pkg-plist ============================================================================== --- branches/2014Q2/games/noegnud-nethack-deet/pkg-plist Fri Apr 18 17:24:46 2014 (r351552) +++ branches/2014Q2/games/noegnud-nethack-deet/pkg-plist Fri Apr 18 17:28:40 2014 (r351553) @@ -1,5 +1,7 @@ bin/noegnud-0.8.0-nethack-3.4.2-deet bin/noegnud-nethack-3.4.2-deet +@owner games +@group bin share/noegnud-0.8.0/nethack-3.4.2-deet/license share/noegnud-0.8.0/nethack-3.4.2-deet/logfile share/noegnud-0.8.0/nethack-3.4.2-deet/nhdat @@ -7,7 +9,7 @@ share/noegnud-0.8.0/nethack-3.4.2-deet/n share/noegnud-0.8.0/nethack-3.4.2-deet/perm share/noegnud-0.8.0/nethack-3.4.2-deet/record share/noegnud-0.8.0/nethack-3.4.2-deet/recover -@exec chown games:bin %D/share/noegnud-0.8.0/nethack-3.4.2-deet +@exec chown root:wheel %D/share/noegnud-0.8.0 @exec chmod 775 %D/share/noegnud-0.8.0/nethack-3.4.2-deet @dirrmtry share/noegnud-0.8.0/nethack-3.4.2-deet/save @dirrmtry share/noegnud-0.8.0/nethack-3.4.2-deet From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 20 19:07:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB5B98E1; Sun, 20 Apr 2014 19:07:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7EC01A70; Sun, 20 Apr 2014 19:07:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3KJ7ilU091830; Sun, 20 Apr 2014 19:07:44 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3KJ7iue091829; Sun, 20 Apr 2014 19:07:44 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404201907.s3KJ7iue091829@svn.freebsd.org> From: Antoine Brodin Date: Sun, 20 Apr 2014 19:07:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351631 - branches/2014Q2/textproc/htmlc X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Apr 2014 19:07:44 -0000 Author: antoine Date: Sun Apr 20 19:07:44 2014 New Revision: 351631 URL: http://svnweb.freebsd.org/changeset/ports/351631 QAT: https://qat.redports.org/buildarchive/r351631/ Log: MFH: r351628 Fix build PR: ports/188387 Submitted by: maintainer Reported by: pkg-fallout Approved by: portmgr (self) Modified: branches/2014Q2/textproc/htmlc/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/textproc/htmlc/Makefile ============================================================================== --- branches/2014Q2/textproc/htmlc/Makefile Sun Apr 20 19:06:04 2014 (r351630) +++ branches/2014Q2/textproc/htmlc/Makefile Sun Apr 20 19:07:44 2014 (r351631) @@ -6,14 +6,13 @@ PORTVERSION= 2.21.0 CATEGORIES= textproc MASTER_SITES= http://htmlc.inria.fr/ \ http://caml.inria.fr/distrib/bazar-ocaml/htmlc/ -EXTRACT_SUFX= .tgz MAINTAINER= beyert@cs.ucr.edu -COMMENT= A text file generator +COMMENT= Text file generator BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml -USES= gmake +USES= gmake tar:tgz PLIST_FILES= bin/htmlc bin/htmlc.byt share/htmlc/env PLIST_DIRS= share/htmlc @@ -23,12 +22,11 @@ PORTDOCS= LICENSE INSTALL README JoeCaml HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix ${LOCALBASE} -.include - post-patch: ${RM} -f ${WRKSRC}/doc/Makefile ${TOUCH} ${WRKSRC}/doc/Makefile ${ECHO} "all:" > ${WRKSRC}/doc/Makefile + ${REINPLACE_CMD} 's|-warn-error A||g' ${WRKSRC}/config/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/compiler/htmlc ${STAGEDIR}${PREFIX}/bin @@ -47,4 +45,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/fra.htm ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/index.htm ${STAGEDIR}${DOCSDIR} -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 20 20:12:21 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73935194; Sun, 20 Apr 2014 20:12:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 604F11122; Sun, 20 Apr 2014 20:12:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3KKCLvV020251; Sun, 20 Apr 2014 20:12:21 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3KKCLDd020250; Sun, 20 Apr 2014 20:12:21 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404202012.s3KKCLDd020250@svn.freebsd.org> From: Antoine Brodin Date: Sun, 20 Apr 2014 20:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351640 - in branches/2014Q2/print/p5-Net-CUPS: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Apr 2014 20:12:21 -0000 Author: antoine Date: Sun Apr 20 20:12:20 2014 New Revision: 351640 URL: http://svnweb.freebsd.org/changeset/ports/351640 QAT: https://qat.redports.org/buildarchive/r351640/ Log: MFH: r351638 Unbreak with new cups PR: ports/188451 Obtained from: https://rt.cpan.org/Public/Bug/Display.html?id=78583 With hat: portmgr Approved by: portmgr (self) Added: branches/2014Q2/print/p5-Net-CUPS/files/ - copied from r351638, head/print/p5-Net-CUPS/files/ Modified: branches/2014Q2/print/p5-Net-CUPS/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/p5-Net-CUPS/Makefile ============================================================================== --- branches/2014Q2/print/p5-Net-CUPS/Makefile Sun Apr 20 20:10:43 2014 (r351639) +++ branches/2014Q2/print/p5-Net-CUPS/Makefile Sun Apr 20 20:12:20 2014 (r351640) @@ -12,7 +12,8 @@ MAINTAINER= vg@FreeBSD.org COMMENT= Interface to the CUPS API BUILD_DEPENDS= cups-config:${PORTSDIR}/print/cups-client -LIB_DEPENDS= libcupsimage.so:${PORTSDIR}/print/cups-image +LIB_DEPENDS= libcupsimage.so:${PORTSDIR}/print/cups-image \ + libcupsfilters.so:${PORTSDIR}/print/cups-filters USES= perl5 USE_PERL5= configure From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 21 20:13:51 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 780FAB50; Mon, 21 Apr 2014 20:13:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 633EB123A; Mon, 21 Apr 2014 20:13:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LKDpLm010126; Mon, 21 Apr 2014 20:13:51 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LKDoSA010120; Mon, 21 Apr 2014 20:13:50 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201404212013.s3LKDoSA010120@svn.freebsd.org> From: John Marino Date: Mon, 21 Apr 2014 20:13:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351705 - in branches/2014Q2/graphics/povray37: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 20:13:51 -0000 Author: marino Date: Mon Apr 21 20:13:49 2014 New Revision: 351705 URL: http://svnweb.freebsd.org/changeset/ports/351705 QAT: https://qat.redports.org/buildarchive/r351705/ Log: MFH: r351680 graphics/povray37: Fix build on clang, support stage The main problem with building this port with clang was the use of shared_ptr without the boost namespace which clashes with libc++. This occurs in numerous places but luckly sed can fix most of them save for a few files that inconsistently used boost names. It was also missing an explicit link to libboost_system [1] PR: ports/176172 Submitted by: Oliver Hartmann Approved by: Maintainer timeout Stage support: blanket approval Approved by: portmgr Added: branches/2014Q2/graphics/povray37/files/patch-vfe_vfe.cpp - copied unchanged from r351680, head/graphics/povray37/files/patch-vfe_vfe.cpp branches/2014Q2/graphics/povray37/files/patch-vfe_vfe.h - copied unchanged from r351680, head/graphics/povray37/files/patch-vfe_vfe.h branches/2014Q2/graphics/povray37/files/patch-vfe_vfesession.cpp - copied unchanged from r351680, head/graphics/povray37/files/patch-vfe_vfesession.cpp branches/2014Q2/graphics/povray37/files/patch-vfe_vfesession.h - copied unchanged from r351680, head/graphics/povray37/files/patch-vfe_vfesession.h Modified: branches/2014Q2/graphics/povray37/Makefile branches/2014Q2/graphics/povray37/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/povray37/Makefile ============================================================================== --- branches/2014Q2/graphics/povray37/Makefile Mon Apr 21 19:35:01 2014 (r351704) +++ branches/2014Q2/graphics/povray37/Makefile Mon Apr 21 20:13:49 2014 (r351705) @@ -14,12 +14,13 @@ COMMENT= Persistence of Vision Ray Trace LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs OPTIONS_DEFINE= X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS -OPTIONS_DEFAULT= PNG JPEG EXAMPLES DOCS +OPTIONS_DEFAULT=PNG JPEG EXAMPLES DOCS +OPTIONS_SUB= yes IO_DESC= Without I/O restrictions (security risk) EXAMPLES_DESC= Install example scenes DOCS_DESC= Install HTML documentation -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes VERSION_BASE= ${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/} @@ -30,22 +31,20 @@ DATADIR= ${PREFIX}/share/${PORTNAME}-${V ETCDIR= ${PREFIX}/etc/${PORTNAME}/${VERSION_BASE} INCLUDES= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lboost_system CONFIGURE_ARGS= COMPILED_BY=${MAINTAINER} --prefix=${PREFIX} \ --program-transform-name='s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/' \ --disable-optimiz -NO_STAGE= yes .include .if ${PORT_OPTIONS:MX11} USE_XORG= xpm sm ice x11 USE_SDL= sdl CONFIGURE_ARGS+= --x-include=${LOCALBASE}/include --x-libraries=${LOCALBASE}/libs -PLIST_SUB+= X11="" .else CONFIGURE_ARGS+= --without-x -PLIST_SUB+= X11="@comment " .endif .if ${PORT_OPTIONS:MSTATIC} @@ -118,12 +117,16 @@ PORTDOCS= * PORTEXAMPLES= * post-patch: -# Fix with boost 1.52 +# Fix with boost 1.52 and now boost 1.55 @${REINPLACE_CMD} -e 's/TIME_UTC/TIME_UTC_/g' ${WRKSRC}/source/backend/scene/view.cpp \ ${WRKSRC}/source/base/timer.cpp \ ${WRKSRC}/vfe/vfepovms.cpp \ ${WRKSRC}/vfe/unix/platformbase.cpp \ ${WRKSRC}/vfe/vfesession.cpp + ${FIND} ${WRKSRC}/source/*end \( -name \*.h -o -name \*.cpp \) | \ + ${XARGS} ${GREP} -l shared_ptr | ${SED} '/shellout/d' | \ + ${XARGS} ${REINPLACE_CMD} -e 's|shared_ptr|boost::shared_ptr|g' + pre-build: .if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF} # graphics/tiff adds dependencies on libjpeg and libjbig @@ -131,27 +134,27 @@ pre-build: .endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/${MAN1} - @${MKDIR} ${ETCDIR} - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${ETCDIR} - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${ETCDIR} + @${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} + @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${MAN1} + @${MKDIR} ${STAGEDIR}${ETCDIR} + @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR} + @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${ETCDIR} .for i in include ini scripts - ${MKDIR} ${DATADIR}/$i - cd ${WRKSRC}/$i && ${COPYTREE_SHARE} . ${DATADIR}/$i + ${MKDIR} ${STAGEDIR}${DATADIR}/$i + cd ${WRKSRC}/$i && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/$i .endfor .if ${PORT_OPTIONS:MX11} - @${MKDIR} ${DATADIR}/icons - cd ${WRKSRC}/icons && ${COPYTREE_SHARE} . ${DATADIR}/icons + @${MKDIR} ${STAGEDIR}${DATADIR}/icons + cd ${WRKSRC}/icons && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/icons .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/scenes && ${COPYTREE_SHARE} . ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/scenes && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .endif .include Copied: branches/2014Q2/graphics/povray37/files/patch-vfe_vfe.cpp (from r351680, head/graphics/povray37/files/patch-vfe_vfe.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/povray37/files/patch-vfe_vfe.cpp Mon Apr 21 20:13:49 2014 (r351705, copy of r351680, head/graphics/povray37/files/patch-vfe_vfe.cpp) @@ -0,0 +1,40 @@ +--- vfe/vfe.cpp.orig 2012-06-19 11:29:39.000000000 -0500 ++++ vfe/vfe.cpp +@@ -640,7 +640,7 @@ void vfeProcessRenderOptions::WriteError + // + //////////////////////////////////////////////////////////////////////////////////////// + +-VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr& console) : ++VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr& console) : + m_Session(&session), m_PlatformBase(session), renderFrontend (ctx) + { + backendAddress = addr ; +@@ -747,7 +747,7 @@ bool VirtualFrontEnd::Start(POVMS_Object + + if (m_Session->OutputToFileSet()) + { +- imageProcessing = shared_ptr (new ImageProcessing (opts)); ++ imageProcessing = boost::shared_ptr (new ImageProcessing (opts)); + UCS2String filename = imageProcessing->GetOutputFilename (opts, 0, 0); + options.SetUCS2String (kPOVAttrib_OutputFile, filename.c_str()); + +@@ -774,8 +774,8 @@ bool VirtualFrontEnd::Start(POVMS_Object + opts.Set(kPOVAttrib_Declare, declares); + imageProcessing.reset(); + if (m_Session->OutputToFileSet()) +- imageProcessing = shared_ptr (new ImageProcessing (opts)) ; +- animationProcessing = shared_ptr (new AnimationProcessing (opts)) ; ++ imageProcessing = boost::shared_ptr (new ImageProcessing (opts)) ; ++ animationProcessing = boost::shared_ptr (new AnimationProcessing (opts)) ; + options = animationProcessing->GetFrameRenderOptions () ; + } + +@@ -1151,7 +1151,7 @@ State VirtualFrontEnd::Process() + } + + // now we display the render window, if enabled +- shared_ptr display(GetDisplay()); ++ boost::shared_ptr display(GetDisplay()); + if (display != NULL) + { + vfeDisplay *disp = dynamic_cast(display.get()); Copied: branches/2014Q2/graphics/povray37/files/patch-vfe_vfe.h (from r351680, head/graphics/povray37/files/patch-vfe_vfe.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/povray37/files/patch-vfe_vfe.h Mon Apr 21 20:13:49 2014 (r351705, copy of r351680, head/graphics/povray37/files/patch-vfe_vfe.h) @@ -0,0 +1,24 @@ +--- vfe/vfe.h.orig 2012-06-19 11:29:39.000000000 -0500 ++++ vfe/vfe.h +@@ -267,7 +267,7 @@ namespace vfe + class VirtualFrontEnd + { + public: +- VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr& console) ; ++ VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, boost::shared_ptr& console) ; + virtual ~VirtualFrontEnd() ; + + virtual bool Start(POVMS_Object& opts) ; +@@ -298,9 +298,9 @@ namespace vfe + POVMS_Object options; + RenderFrontendBase::SceneId sceneId; + RenderFrontendBase::ViewId viewId; +- shared_ptr animationProcessing ; +- shared_ptr imageProcessing ; +- shared_ptr shelloutProcessing; ++ boost::shared_ptr animationProcessing ; ++ boost::shared_ptr imageProcessing ; ++ boost::shared_ptr shelloutProcessing; + Console **consoleResult; + Display **displayResult; + vfeSession* m_Session; Copied: branches/2014Q2/graphics/povray37/files/patch-vfe_vfesession.cpp (from r351680, head/graphics/povray37/files/patch-vfe_vfesession.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/povray37/files/patch-vfe_vfesession.cpp Mon Apr 21 20:13:49 2014 (r351705, copy of r351680, head/graphics/povray37/files/patch-vfe_vfesession.cpp) @@ -0,0 +1,20 @@ +--- vfe/vfesession.cpp.orig 2014-04-21 07:36:50.000000000 -0500 ++++ vfe/vfesession.cpp +@@ -602,7 +602,7 @@ const char *vfeSession::GetBackendStateN + boost::shared_ptr vfeSession::GetDisplay() const + { + if (m_Frontend == NULL) +- return (shared_ptr()); ++ return (boost::shared_ptr()); + return m_Frontend->GetDisplay(); + } + +@@ -640,7 +640,7 @@ void vfeSession::WorkerThread() + m_BackendThread = povray_init (boost::bind(&vfeSession::BackendThreadNotify, this), const_cast(&pov::RenderThreadAddr)) ; + POVMS_Output_Context = pov::POVMS_GUI_Context ; + +- m_Console = shared_ptr (new vfeConsole(this, m_ConsoleWidth)) ; ++ m_Console = boost::shared_ptr (new vfeConsole(this, m_ConsoleWidth)) ; + + POVMS_Object obj ; + m_Frontend = new VirtualFrontEnd (*this, POVMS_Output_Context, (POVMSAddress) pov::RenderThreadAddr, obj, NULL, m_Console) ; Copied: branches/2014Q2/graphics/povray37/files/patch-vfe_vfesession.h (from r351680, head/graphics/povray37/files/patch-vfe_vfesession.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/povray37/files/patch-vfe_vfesession.h Mon Apr 21 20:13:49 2014 (r351705, copy of r351680, head/graphics/povray37/files/patch-vfe_vfesession.h) @@ -0,0 +1,11 @@ +--- vfe/vfesession.h.orig 2012-06-19 11:29:40.000000000 -0500 ++++ vfe/vfesession.h +@@ -1294,7 +1294,7 @@ namespace vfe + + static bool m_Initialized; + static vfeSession *m_CurrentSessionTemporaryHack; +- shared_ptr m_Console; ++ boost::shared_ptr m_Console; + + virtual vfeDisplay *DefaultDisplayCreator (unsigned int width, unsigned int height, GammaCurvePtr gamma, vfeSession *session, bool visible); + DisplayCreator m_DisplayCreator; Modified: branches/2014Q2/graphics/povray37/pkg-plist ============================================================================== --- branches/2014Q2/graphics/povray37/pkg-plist Mon Apr 21 19:35:01 2014 (r351704) +++ branches/2014Q2/graphics/povray37/pkg-plist Mon Apr 21 20:13:49 2014 (r351705) @@ -1,4 +1,5 @@ bin/povray37 +man/man1/povray37.1.gz %%ETCDIR%%/povray.conf %%ETCDIR%%/povray.ini %%X11%%%%DATADIR%%/icons/file_inc_classic_16.png From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 21 20:16:05 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FBE3C42; Mon, 21 Apr 2014 20:16:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7090F124C; Mon, 21 Apr 2014 20:16:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LKG5N3010556; Mon, 21 Apr 2014 20:16:05 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LKG4wo010553; Mon, 21 Apr 2014 20:16:04 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201404212016.s3LKG4wo010553@svn.freebsd.org> From: Thomas Zander Date: Mon, 21 Apr 2014 20:16:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351706 - in branches/2014Q2/multimedia: mencoder mplayer mplayer/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 20:16:05 -0000 Author: riggs Date: Mon Apr 21 20:16:04 2014 New Revision: 351706 URL: http://svnweb.freebsd.org/changeset/ports/351706 QAT: https://qat.redports.org/buildarchive/r351706/ Log: MFH: r351544 - Bring back VPX option, thus fixing potential (de-)install dependencies - Handle UTF-8 charset properly in libvo - Bump PORTREVISION PR: ports/188657, ports/188697 Submitted by: anonymous Approved by: portmgr (antoine), jadawin (co-mentor) Added: branches/2014Q2/multimedia/mplayer/files/patch-libvo-x11_common.c - copied unchanged from r351544, head/multimedia/mplayer/files/patch-libvo-x11_common.c Modified: branches/2014Q2/multimedia/mencoder/Makefile branches/2014Q2/multimedia/mplayer/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/multimedia/mencoder/Makefile ============================================================================== --- branches/2014Q2/multimedia/mencoder/Makefile Mon Apr 21 20:13:49 2014 (r351705) +++ branches/2014Q2/multimedia/mencoder/Makefile Mon Apr 21 20:16:04 2014 (r351706) @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Convenient video file and movie encoder Modified: branches/2014Q2/multimedia/mplayer/Makefile ============================================================================== --- branches/2014Q2/multimedia/mplayer/Makefile Mon Apr 21 20:13:49 2014 (r351705) +++ branches/2014Q2/multimedia/mplayer/Makefile Mon Apr 21 20:16:04 2014 (r351706) @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= High performance media player supporting many formats @@ -14,7 +14,7 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLUR LADSPA LIBMNG LIRC LZO NAS OCFLAGS \ OPENAL OPENGL OPENJPEG OPUS OTCHAIN \ PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \ - SKINS SMB SVGALIB V4L VDPAU WIN32 \ + SKINS SMB SVGALIB V4L VDPAU VPX WIN32 \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC OPTIONS_RADIO= RGCD Copied: branches/2014Q2/multimedia/mplayer/files/patch-libvo-x11_common.c (from r351544, head/multimedia/mplayer/files/patch-libvo-x11_common.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/multimedia/mplayer/files/patch-libvo-x11_common.c Mon Apr 21 20:16:04 2014 (r351706, copy of r351544, head/multimedia/mplayer/files/patch-libvo-x11_common.c) @@ -0,0 +1,10 @@ +--- libvo/x11_common.c 2013-10-16 17:07:12.000000000 -0700 ++++ libvo/x11_common.c 2014-04-16 09:15:27.888658589 -0700 +@@ -430,7 +430,7 @@ + } + + // Required so that XLookupString returns UTF-8 +- if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) ++ if (!setlocale(LC_CTYPE, "en_US.UTF-8")) + mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will not be handled.\n"); + XSetErrorHandler(x11_errorhandler); From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 21 20:25:16 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3423810C; Mon, 21 Apr 2014 20:25:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 130DC1323; Mon, 21 Apr 2014 20:25:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LKPFIm014825; Mon, 21 Apr 2014 20:25:15 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LKPFU8014820; Mon, 21 Apr 2014 20:25:15 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404212025.s3LKPFU8014820@svn.freebsd.org> From: Pawel Pekala Date: Mon, 21 Apr 2014 20:25:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351709 - in branches/2014Q2/games/noegnud-nethack: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 20:25:16 -0000 Author: pawel Date: Mon Apr 21 20:25:14 2014 New Revision: 351709 URL: http://svnweb.freebsd.org/changeset/ports/351709 QAT: https://qat.redports.org/buildarchive/r351709/ Log: MFH: r351543 - Fix build on 10+ (use gmake during build) - Add staging support - Convert to USES=tar:bzip2 - Remove Author tag from pkg-descr, info available on homepage Approved by: portmgr (antoine) Modified: branches/2014Q2/games/noegnud-nethack/Makefile branches/2014Q2/games/noegnud-nethack/files/patch-variants::Makefile branches/2014Q2/games/noegnud-nethack/pkg-descr branches/2014Q2/games/noegnud-nethack/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/noegnud-nethack/Makefile ============================================================================== --- branches/2014Q2/games/noegnud-nethack/Makefile Mon Apr 21 20:21:57 2014 (r351708) +++ branches/2014Q2/games/noegnud-nethack/Makefile Mon Apr 21 20:25:14 2014 (r351709) @@ -18,18 +18,16 @@ COMMENT= The noeGNUd UI for the vanilla RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data NOEGNUDVERSION= ${PORTNAME}-0.8.0 -USES= bison gmake +USES= bison gmake tar:bzip2 USE_GL= yes WANT_SDL= yes USE_SDL= sdl image mixer -USE_BZIP2= yes WRKSRC= ${WRKDIR}/${DISTNAME}/variants PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} ALL_TARGET= nh343 INSTALL_TARGET= install_nh343 MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include pre-everything:: @@ -46,6 +44,12 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.3) @(${PATCH} ${PATCH_ARGS} < ${FILESDIR}/noegnud-nethack.patch) + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ + -e 's|make|${MAKE_CMD}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E -e 's,ch(grp|own),true,' \ + -e '/(^VARDIR|ln -s|sed)/! s,(GAME|SHELL|VAR)DIR),DESTDIR)$$(&,g' \ + -e '/ln -s/ s,SHELLDIR,DESTDIR)$$(&,2' \ + ${WRKSRC}/${NOEGNUDVERSION}-nethack-3.4.3/sys/unix/Makefile.top do-configure: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.3/Makefile) Modified: branches/2014Q2/games/noegnud-nethack/files/patch-variants::Makefile ============================================================================== --- branches/2014Q2/games/noegnud-nethack/files/patch-variants::Makefile Mon Apr 21 20:21:57 2014 (r351708) +++ branches/2014Q2/games/noegnud-nethack/files/patch-variants::Makefile Mon Apr 21 20:25:14 2014 (r351709) @@ -1,51 +1,20 @@ ---- variants/Makefile.orig Mon Nov 15 03:02:30 2004 -+++ variants/Makefile Mon Nov 15 03:03:25 2004 -@@ -1,7 +1,6 @@ +--- variants/Makefile.orig 2004-08-23 19:13:51.000000000 +0200 ++++ variants/Makefile 2014-04-17 11:20:10.067045121 +0200 +@@ -1,7 +1,7 @@ NOEGNUDVERSION=noegnud-0.8.0 # you __MUST__ change this if you change the prefix for any variants' install !!!!!!!!!!!!! # although ..... " make -e foo " also works :O ;) -PREFIX = /usr/local ++PREFIX = %%PREFIX%% GAMEUID = games GAMEGRP = bin CHOWN = chown -@@ -62,31 +61,31 @@ - install: install_all - - install_nh342: nh342 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2 install +@@ -65,7 +65,7 @@ + make -e -C $(NOEGNUDVERSION)-nethack-3.4.2 install install_nh343: nh343 - make -e -C $(NOEGNUDVERSION)-nethack-3.4.3 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.3 install ++ make -C $(NOEGNUDVERSION)-nethack-3.4.3 install install_se006e4f8: se006e4f8 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install - - install_se007e2: se007e2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install - - install_se007e5: se007e5 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install - - install_se007e6: se007e6 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install - - install_se007e6f2: se007e6f2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install - - install_lh001: lh001 -- make -e -C $(NOEGNUDVERSION)-littlehack-0.0.1 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-littlehack-0.0.1 install - - install_nh342-dt: nh342-dt -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install - - # data - + make -e -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install Modified: branches/2014Q2/games/noegnud-nethack/pkg-descr ============================================================================== --- branches/2014Q2/games/noegnud-nethack/pkg-descr Mon Apr 21 20:21:57 2014 (r351708) +++ branches/2014Q2/games/noegnud-nethack/pkg-descr Mon Apr 21 20:25:14 2014 (r351709) @@ -6,5 +6,4 @@ and an outstanding 3D-Mode. This port installs noeGNUd for the vanilla NetHack. -Author: Clive Crous WWW: http://noegnud.sourceforge.net/ Modified: branches/2014Q2/games/noegnud-nethack/pkg-plist ============================================================================== --- branches/2014Q2/games/noegnud-nethack/pkg-plist Mon Apr 21 20:21:57 2014 (r351708) +++ branches/2014Q2/games/noegnud-nethack/pkg-plist Mon Apr 21 20:25:14 2014 (r351709) @@ -1,5 +1,7 @@ bin/noegnud-0.8.0-nethack-3.4.3 bin/noegnud-nethack-3.4.3 +@owner games +@group bin share/noegnud-0.8.0/nethack-3.4.3/license share/noegnud-0.8.0/nethack-3.4.3/logfile share/noegnud-0.8.0/nethack-3.4.3/nhdat @@ -7,7 +9,7 @@ share/noegnud-0.8.0/nethack-3.4.3/noegnu share/noegnud-0.8.0/nethack-3.4.3/perm share/noegnud-0.8.0/nethack-3.4.3/record share/noegnud-0.8.0/nethack-3.4.3/recover -@exec chown games:bin %D/share/noegnud-0.8.0/nethack-3.4.3 +@exec chown root:wheel %D/share/noegnud-0.8.0 @exec chmod 775 %D/share/noegnud-0.8.0/nethack-3.4.3 @dirrmtry share/noegnud-0.8.0/nethack-3.4.3/save @dirrmtry share/noegnud-0.8.0/nethack-3.4.3 From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 21 20:26:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79DF11F6; Mon, 21 Apr 2014 20:26:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65B6C1333; Mon, 21 Apr 2014 20:26:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LKQr9n015131; Mon, 21 Apr 2014 20:26:53 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LKQquU015124; Mon, 21 Apr 2014 20:26:52 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404212026.s3LKQquU015124@svn.freebsd.org> From: Pawel Pekala Date: Mon, 21 Apr 2014 20:26:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351710 - in branches/2014Q2/games/noegnud-slashem: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 20:26:53 -0000 Author: pawel Date: Mon Apr 21 20:26:52 2014 New Revision: 351710 URL: http://svnweb.freebsd.org/changeset/ports/351710 QAT: https://qat.redports.org/buildarchive/r351710/ Log: MFH: r351546 - Fix build on 10+ (use gmake during build) - Add staging support - Convert to USES=tar:bzip2 - Remove Author tag from pkg-descr, info available on hompage Approved by: portmgr (antoine) Modified: branches/2014Q2/games/noegnud-slashem/Makefile branches/2014Q2/games/noegnud-slashem/files/patch-variants::Makefile branches/2014Q2/games/noegnud-slashem/pkg-descr branches/2014Q2/games/noegnud-slashem/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/noegnud-slashem/Makefile ============================================================================== --- branches/2014Q2/games/noegnud-slashem/Makefile Mon Apr 21 20:25:14 2014 (r351709) +++ branches/2014Q2/games/noegnud-slashem/Makefile Mon Apr 21 20:26:52 2014 (r351710) @@ -18,18 +18,16 @@ COMMENT= The noeGNUd UI for the SLASH'EM RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data NOEGNUDVERSION= ${PORTNAME}-0.8.0 -USES= bison gmake +USES= bison gmake tar:bzip2 USE_GL= yes WANT_SDL= yes USE_SDL= sdl image mixer -USE_BZIP2= yes WRKSRC= ${WRKDIR}/${DISTNAME}/variants PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} ALL_TARGET= se006e4f8 INSTALL_TARGET= install_se006e4f8 MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include pre-everything:: @@ -46,6 +44,13 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-slashem-0.0.6E4F8) @(${PATCH} ${PATCH_ARGS} < ${FILESDIR}/noegnud-slashem.patch) + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ + -e 's|make|${MAKE_CMD}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E -e 's,ch(grp|own),true,' \ + -e '/(^FILE_AREA|^VARDIR|ln -s|sed)/! s,(GAME|SHELL|VAR)DIR),DESTDIR)$$(&,g' \ + -e '/sed/! s,FILE_AREA_(BONES|DOC|LEVL|SAVE|SHARE|UNSHARE|VAR)),DESTDIR)$$(&,g' \ + -e '/ln -s/ s,SHELLDIR,DESTDIR)$$(&,2' \ + ${WRKSRC}/${NOEGNUDVERSION}-slashem-0.0.6E4F8/sys/unix/Makefile.top do-configure: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-slashem-0.0.6E4F8/Makefile) Modified: branches/2014Q2/games/noegnud-slashem/files/patch-variants::Makefile ============================================================================== --- branches/2014Q2/games/noegnud-slashem/files/patch-variants::Makefile Mon Apr 21 20:25:14 2014 (r351709) +++ branches/2014Q2/games/noegnud-slashem/files/patch-variants::Makefile Mon Apr 21 20:26:52 2014 (r351710) @@ -1,51 +1,20 @@ ---- variants/Makefile.orig Mon Nov 15 03:02:30 2004 -+++ variants/Makefile Mon Nov 15 03:03:25 2004 -@@ -1,7 +1,6 @@ +--- variants/Makefile.orig 2004-08-23 19:13:51.000000000 +0200 ++++ variants/Makefile 2014-04-17 11:49:09.027549877 +0200 +@@ -1,7 +1,7 @@ NOEGNUDVERSION=noegnud-0.8.0 # you __MUST__ change this if you change the prefix for any variants' install !!!!!!!!!!!!! # although ..... " make -e foo " also works :O ;) -PREFIX = /usr/local ++PREFIX = %%PREFIX%% GAMEUID = games GAMEGRP = bin CHOWN = chown -@@ -62,31 +61,31 @@ - install: install_all - - install_nh342: nh342 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2 install - - install_nh343: nh343 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.3 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.3 install +@@ -68,7 +68,7 @@ + make -e -C $(NOEGNUDVERSION)-nethack-3.4.3 install install_se006e4f8: se006e4f8 - make -e -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install ++ make -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install install_se007e2: se007e2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install - - install_se007e5: se007e5 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install - - install_se007e6: se007e6 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install - - install_se007e6f2: se007e6f2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install - - install_lh001: lh001 -- make -e -C $(NOEGNUDVERSION)-littlehack-0.0.1 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-littlehack-0.0.1 install - - install_nh342-dt: nh342-dt -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install - - # data - + make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install Modified: branches/2014Q2/games/noegnud-slashem/pkg-descr ============================================================================== --- branches/2014Q2/games/noegnud-slashem/pkg-descr Mon Apr 21 20:25:14 2014 (r351709) +++ branches/2014Q2/games/noegnud-slashem/pkg-descr Mon Apr 21 20:26:52 2014 (r351710) @@ -6,5 +6,4 @@ and an outstanding 3D-Mode. This port installs noeGNUd for the SLASH'EM variant of Nethack. -Author: Clive Crous WWW: http://noegnud.sourceforge.net/ Modified: branches/2014Q2/games/noegnud-slashem/pkg-plist ============================================================================== --- branches/2014Q2/games/noegnud-slashem/pkg-plist Mon Apr 21 20:25:14 2014 (r351709) +++ branches/2014Q2/games/noegnud-slashem/pkg-plist Mon Apr 21 20:26:52 2014 (r351710) @@ -1,5 +1,7 @@ bin/noegnud-0.8.0-slashem-0.0.6E4F8 bin/noegnud-slashem-0.0.6E4F8 +@owner games +@group bin share/noegnud-0.8.0/slashem-0.0.6E4F8/Arc-fila.lev share/noegnud-0.8.0/slashem-0.0.6E4F8/Arc-filb.lev share/noegnud-0.8.0/slashem-0.0.6E4F8/Arc-goal.lev @@ -179,7 +181,7 @@ share/noegnud-0.8.0/slashem-0.0.6E4F8/wi share/noegnud-0.8.0/slashem-0.0.6E4F8/wizard3.lev share/noegnud-0.8.0/slashem-0.0.6E4F8/wizhelp share/noegnud-0.8.0/slashem-0.0.6E4F8/yeenoghu.lev -@exec chown games:bin %D/share/noegnud-0.8.0/slashem-0.0.6E4F8 +@exec chown root:wheel %D/share/noegnud-0.8.0 @exec chmod 775 %D/share/noegnud-0.8.0/slashem-0.0.6E4F8 @dirrmtry share/noegnud-0.8.0/slashem-0.0.6E4F8/save @dirrmtry share/noegnud-0.8.0/slashem-0.0.6E4F8 From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 21 20:47:51 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E65754B5; Mon, 21 Apr 2014 20:47:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C695D1502; Mon, 21 Apr 2014 20:47:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LKlp0J023848; Mon, 21 Apr 2014 20:47:51 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LKloxq023838; Mon, 21 Apr 2014 20:47:50 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201404212047.s3LKloxq023838@svn.freebsd.org> From: John Marino Date: Mon, 21 Apr 2014 20:47:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351712 - in branches/2014Q2/net/ss5: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 20:47:52 -0000 Author: marino Date: Mon Apr 21 20:47:50 2014 New Revision: 351712 URL: http://svnweb.freebsd.org/changeset/ports/351712 QAT: https://qat.redports.org/buildarchive/r351712/ Log: MFH: r351699 net/ss5: Fix on clang, DragonFly, and support stage I estimated it would take me 15 minutes to incorporate the PR, but boy was I wrong. After several HOURS I finally got this port staged, building on FreeBSD 10+, DragonFly too, and fix accomplished the intent of the PR (don't clobber conf files, less noisy). Staging revealed the original port was installing undocumented files. Clang was having issues with the "inline" directives and I could only get it to build on clang by removing them (this doesn't mean the functions won't be inlined, nor does the directive mean that it will.) Anyway -- a gift. I wouldn't have done this had I know how much work it was going to be. I also should have overwritten the install target instead of patch the vendor Makefile, that would have been a lot easier and faster. PR: ports/176676 Submitted by: Lawrence Chen Approved by: maintainer (Raffaele DeLorenzo) Other work by: marino Approved by: portmgr (Antoine) Added: branches/2014Q2/net/ss5/files/patch-configure - copied unchanged from r351699, head/net/ss5/files/patch-configure branches/2014Q2/net/ss5/files/patch-include_SS5Debug.h - copied unchanged from r351699, head/net/ss5/files/patch-include_SS5Debug.h branches/2014Q2/net/ss5/files/patch-include_SS5Server.h - copied unchanged from r351699, head/net/ss5/files/patch-include_SS5Server.h branches/2014Q2/net/ss5/files/patch-src-SS5Server.c - copied unchanged from r351699, head/net/ss5/files/patch-src-SS5Server.c Modified: branches/2014Q2/net/ss5/Makefile branches/2014Q2/net/ss5/files/patch-Makefile.in branches/2014Q2/net/ss5/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/net/ss5/Makefile ============================================================================== --- branches/2014Q2/net/ss5/Makefile Mon Apr 21 20:27:38 2014 (r351711) +++ branches/2014Q2/net/ss5/Makefile Mon Apr 21 20:47:50 2014 (r351712) @@ -3,6 +3,7 @@ PORTNAME= ss5 PORTVERSION= 3.8.5 +PORTREVISION= 1 CATEGORIES= net security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-1 DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -22,26 +23,20 @@ CONFIGURE_ARGS= --with-binpathbase=${PRE --with-libpath=${PREFIX}/lib MAKE_ENV= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR} +MAKE_ARGS+= CC=${CC} CFLAGS+= -DLDAP_DEPRECATED -MAN1= ss5.1 ss5srv.1 -MAN5= ss5.conf.5 ss5.pam.5 ss5.passwd.5 ss5.ha.5 ss5_gss.5 ss5_supa.5 -MANCOMPRESSED= yes - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's,/usr/local/etc/opt/ss5,${PREFIX}/etc/ss5,' \ ${WRKSRC}/include/config.h.in post-install: -# ${TOUCH} ${PREFIX}/etc/ss5/ss5.ha.default -#.if !exists(${PREFIX}/etc/ss5/ss5.ha) -# ${TOUCH} ${PREFIX}/etc/ss5/ss5.ha -#.endif - ${INSTALL_DATA} ${WRKSRC}/conf/examples/ss5.ha ${PREFIX}/etc/${PORTNAME}/ss5.ha.default - if [ ! -f ${PREFIX}/etc/${PORTNAME}.ha ]; then \ - ${INSTALL_DATA} ${WRKSRC}/conf/examples/ss5.ha ${PREFIX}/etc/${PORTNAME}/ss5.ha ; \ - fi + ${INSTALL_DATA} ${WRKSRC}/conf/ss5.conf \ + ${STAGEDIR}${PREFIX}/etc/ss5/ss5.conf.sample + ${INSTALL_DATA} ${WRKSRC}/conf/ss5.ha \ + ${STAGEDIR}${PREFIX}/etc/ss5/ss5.ha.sample + ${INSTALL_DATA} ${WRKSRC}/conf/ss5.passwd \ + ${STAGEDIR}${PREFIX}/etc/ss5/ss5.passwd.sample .include Modified: branches/2014Q2/net/ss5/files/patch-Makefile.in ============================================================================== --- branches/2014Q2/net/ss5/files/patch-Makefile.in Mon Apr 21 20:27:38 2014 (r351711) +++ branches/2014Q2/net/ss5/files/patch-Makefile.in Mon Apr 21 20:47:50 2014 (r351712) @@ -1,33 +1,54 @@ ---- Makefile.in.orig 2009-07-17 18:03:01.000000000 -0300 -+++ Makefile.in 2011-05-11 15:16:05.000000000 -0300 -@@ -10,6 +10,11 @@ +--- Makefile.in.orig 2009-07-17 16:03:01.000000000 -0500 ++++ Makefile.in +@@ -1,7 +1,7 @@ + SUBDIRS=src modules + +-dst_dir = ${prefix} +-OS = @OS@ ++dst_dir = ${DESTDIR}${prefix} ++OS = FreeBSD + lib_path_base = @lib_path_base@ + conf_path_base = @conf_path_base@ + bin_path_base = @bin_path_base@ +@@ -10,7 +10,9 @@ man_path_base = @man_path_base@ log_path_base = @log_path_base@ trc_path_base = @trc_path_base@ -+ss5_pam = ${PREFIX}/etc/pam.d/ss5 -+ss5_share = ${DATADIR} -+ss5_examples = ${EXAMPLESDIR} -+ss5_man = ${MANPREFIX}/man -+ - CC = gcc +-CC = gcc ++ss5_share = ${DESTDIR}${DATADIR} ++ss5_examples = ${DESTDIR}${EXAMPLESDIR} ++ss5_man = ${DESTDIR}${MANPREFIX}/man CFLAGS=@CFLAGS@ -I . @EXTRA_CFLAGS@ -@@ -41,10 +46,21 @@ + +@@ -32,19 +34,26 @@ src :: + + .PHONY : install + install: +- @( if [ ! -d $(dst_dir)$(log_path_base) ]; then mkdir -p $(dst_dir)$(log_path_base); fi ) +- @( if [ ! -d $(dst_dir)$(trc_path_base) ]; then mkdir -p $(dst_dir)$(trc_path_base); fi ) +- +- @( if [ ! -d $(dst_dir)$(bin_path_base) ]; then mkdir -p $(dst_dir)$(bin_path_base); fi ) +- @( cp src/ss5 $(dst_dir)$(bin_path_base)/ ) +- @( cp src/ss5srv $(dst_dir)$(bin_path_base)/ ) ++ cp src/ss5 $(dst_dir)$(bin_path_base)/ ++ cp src/ss5srv $(dst_dir)$(bin_path_base)/ @( if [ ! -d $(dst_dir)$(lib_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(lib_path_base)/ss5; fi ) - @( find modules -name *.so -exec cp {} $(dst_dir)$(lib_path_base)/ss5/ \; ) +- @( find modules -name *.so -exec cp {} $(dst_dir)$(lib_path_base)/ss5/ \; ) - @( cp modules/mod_statistics/statmgr.cgi $(dst_dir)$(lib_path_base)/ss5/ ) - @( cp modules/mod_balance/balamgr.cgi $(dst_dir)$(lib_path_base)/ss5/ ) - @( cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) - @( cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) ++ find modules -name *.so -exec cp {} $(dst_dir)$(lib_path_base)/ss5/ \; + + @( if [ ! -d $(ss5_share) ] && [ $(OS) = "FreeBSD" ]; then mkdir -p $(ss5_share); fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then \ ++ if [ $(OS) = "FreeBSD" ]; then \ + cp modules/mod_statistics/statmgr.cgi $(ss5_share)/ ; \ + cp modules/mod_balance/balamgr.cgi $(ss5_share)/ ; \ + cp modules/mod_statistics/SS5Logo.jpg $(ss5_share)/ ; \ + cp modules/mod_balance/SS5Logo.jpg $(ss5_share)/ ; \ -+ fi ) ++ fi + + @( if [ $(OS) = "Linux" ] || [ $(OS) = "SunOS" ]; then \ + cp modules/mod_statistics/statmgr.cgi $(dst_dir)$(lib_path_base)/ss5/ ; \ @@ -38,7 +59,7 @@ @( if [ $(OS) = "Linux" ]; then \ if [ ! -d $(dst_dir)/etc/rc.d/init.d ]; then mkdir -p $(dst_dir)/etc/rc.d/init.d; fi ; \ -@@ -67,10 +83,6 @@ +@@ -67,47 +76,52 @@ install: if [ ! -f $(dst_dir)/etc/init.d/ss5 ]; then cp conf/ss5.init $(dst_dir)/etc/init.d/ss5; \ else cp conf/ss5.init $(dst_dir)/etc/init.d/ss5.rpmnew ; fi ; \ fi ) @@ -48,11 +69,13 @@ - fi ) @( if [ ! -d $(dst_dir)$(doc_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(doc_path_base)/ss5; fi ) - @( cp License $(dst_dir)$(doc_path_base)/ss5 ) -@@ -80,32 +92,47 @@ - @( cp modules/mod_balance/README.balamgr $(dst_dir)$(doc_path_base)/ss5 ) - - @( if [ ! -d $(dst_dir)$(man_path_base)/man1 ]; then mkdir -p $(dst_dir)$(man_path_base)/man1; fi ) +- @( cp License $(dst_dir)$(doc_path_base)/ss5 ) +- @( cp -r doc/ldap/* $(dst_dir)$(doc_path_base)/ss5 ) +- @( cp -r doc/pam/* $(dst_dir)$(doc_path_base)/ss5 ) +- @( cp modules/mod_statistics/README.statmgr $(dst_dir)$(doc_path_base)/ss5 ) +- @( cp modules/mod_balance/README.balamgr $(dst_dir)$(doc_path_base)/ss5 ) +- +- @( if [ ! -d $(dst_dir)$(man_path_base)/man1 ]; then mkdir -p $(dst_dir)$(man_path_base)/man1; fi ) - @( cp man/$(OS)/ss5.1* $(dst_dir)$(man_path_base)/man1 ) - @( cp man/$(OS)/ss5srv.1* $(dst_dir)$(man_path_base)/man1 ) - @( if [ ! -d $(dst_dir)$(man_path_base)/man5 ]; then mkdir -p $(dst_dir)$(man_path_base)/man5; fi ) @@ -62,36 +85,46 @@ - @( cp man/$(OS)/ss5.conf.5* $(dst_dir)$(man_path_base)/man5 ) - @( cp man/$(OS)/ss5_gss.5* $(dst_dir)$(man_path_base)/man5 ) - @( cp man/$(OS)/ss5_supa.5* $(dst_dir)$(man_path_base)/man5 ) -+ @( if [ $(OS) = "FreeBSD" ] && [ ! -d $(ss5_man)/man1 ]; then mkdir -p $(ss5_man)/man1; fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.1* $(ss5_man)/man1/; \ -+ else cp man/$(OS)/ss5.1* $(dst_dir)$(man_path_base)/man1/; fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5srv.1* $(ss5_man)/man1/; \ -+ else cp man/$(OS)/ss5srv.1* $(dst_dir)$(man_path_base)/man1/; fi ) -+ @( if [ ! -d $(dst_dir)$(man_path_base)/man5 ]; then mkdir -p $(dst_dir)$(man_path_base)/man5/; fi ) -+ @( if [ $(OS) = "FreeBSD" ] && [ ! -d $(ss5_man)/man5 ]; then mkdir -p $(ss5_man)/man5; fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.passwd.5* $(ss5_man)/man5/; \ -+ else cp man/$(OS)/ss5.passwd.5* $(dst_dir)$(man_path_base)/man5/; fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.ha.5* $(ss5_man)/man5/; \ -+ else cp man/$(OS)/ss5.ha.5* $(dst_dir)$(man_path_base)/man5/; fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.pam.5* $(ss5_man)/man5/; \ -+ else cp man/$(OS)/ss5.pam.5* $(dst_dir)$(man_path_base)/man5/; fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.conf.5* $(ss5_man)/man5/; \ -+ else cp man/$(OS)/ss5.conf.5* $(dst_dir)$(man_path_base)/man5/; fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5_gss.5* $(ss5_man)/man5/; \ -+ else cp man/$(OS)/ss5_gss.5* $(dst_dir)$(man_path_base)/man5/; fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5_supa.5* $(ss5_man)/man5/; \ -+ else cp man/$(OS)/ss5_supa.5* $(dst_dir)$(man_path_base)/man5/; fi ) - - @( if [ ! -d $(dst_dir)$(conf_path_base) ]; then mkdir -p $(dst_dir)$(conf_path_base); fi ) - @( if [ ! -d $(dst_dir)$(conf_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(conf_path_base)/ss5; fi ) - @( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.conf ]; then cp conf/ss5.conf $(dst_dir)$(conf_path_base)/ss5; \ - else cp conf/ss5.conf $(dst_dir)$(conf_path_base)/ss5/ss5.conf.rpmnew ; fi ) +- +- @( if [ ! -d $(dst_dir)$(conf_path_base) ]; then mkdir -p $(dst_dir)$(conf_path_base); fi ) +- @( if [ ! -d $(dst_dir)$(conf_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(conf_path_base)/ss5; fi ) +- @( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.conf ]; then cp conf/ss5.conf $(dst_dir)$(conf_path_base)/ss5; \ +- else cp conf/ss5.conf $(dst_dir)$(conf_path_base)/ss5/ss5.conf.rpmnew ; fi ) - @( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.ha ]; then cp conf/ss5.ha $(dst_dir)$(conf_path_base)/ss5; \ - else cp conf/ss5.ha $(dst_dir)$(conf_path_base)/ss5/ss5.ha.rpmnew ; fi ) - @( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.passwd ]; then cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5; \ - else cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5/ss5.passwd.rpmnew ; fi ) -+ @( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.ha ]; then cp conf/ss5.ha $(dst_dir)$(conf_path_base)/ss5; fi ) -+ @( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.passwd ]; then cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5; fi ) ++ cp License $(dst_dir)$(doc_path_base)/ss5 ++ cp -r doc/ldap/README.ldap $(dst_dir)$(doc_path_base)/ss5 ++ cp -r doc/pam/README.pam $(dst_dir)$(doc_path_base)/ss5 ++ cp modules/mod_statistics/README.statmgr $(dst_dir)$(doc_path_base)/ss5 ++ cp modules/mod_balance/README.balamgr $(dst_dir)$(doc_path_base)/ss5 ++ ++ if [ $(OS) = "FreeBSD" ]; then \ ++ cp man/$(OS)/ss5.1* $(ss5_man)/man1/; \ ++ cp man/$(OS)/ss5srv.1* $(ss5_man)/man1/; \ ++ cp man/$(OS)/ss5.passwd.5* $(ss5_man)/man5/; \ ++ cp man/$(OS)/ss5.ha.5* $(ss5_man)/man5/; \ ++ cp man/$(OS)/ss5.pam.5* $(ss5_man)/man5/; \ ++ cp man/$(OS)/ss5.conf.5* $(ss5_man)/man5/; \ ++ cp man/$(OS)/ss5_gss.5* $(ss5_man)/man5/; \ ++ cp man/$(OS)/ss5_supa.5* $(ss5_man)/man5/; \ ++ else \ ++ cp man/$(OS)/ss5.1* $(dst_dir)$(man_path_base)/man1/; \ ++ cp man/$(OS)/ss5srv.1* $(dst_dir)$(man_path_base)/man1/; \ ++ cp man/$(OS)/ss5.passwd.5* $(dst_dir)$(man_path_base)/man5/; \ ++ cp man/$(OS)/ss5.ha.5* $(dst_dir)$(man_path_base)/man5/; \ ++ cp man/$(OS)/ss5.pam.5* $(dst_dir)$(man_path_base)/man5/; \ ++ cp man/$(OS)/ss5.conf.5* $(dst_dir)$(man_path_base)/man5/; \ ++ cp man/$(OS)/ss5_gss.5* $(dst_dir)$(man_path_base)/man5/; \ ++ cp man/$(OS)/ss5_supa.5* $(dst_dir)$(man_path_base)/man5/; \ ++ fi ++ ++ if [ ! -d $(dst_dir)$(conf_path_base) ]; then mkdir -p $(dst_dir)$(conf_path_base); fi ++ if [ ! -d $(dst_dir)$(conf_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(conf_path_base)/ss5; fi ++ if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.conf ]; then cp conf/ss5.conf $(dst_dir)$(conf_path_base)/ss5; fi ++ if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.ha ]; then cp conf/ss5.ha $(dst_dir)$(conf_path_base)/ss5; fi ++ if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.passwd ]; then cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5; fi - @( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \ + @( if [ $(OS) = "Linux" ]; then \ @@ -102,84 +135,12 @@ if [ ! -f $(dst_dir)/etc/pam.d/ss5 ]; then cp doc/pam/examples/ss5.pam $(dst_dir)/etc/pam.d/ss5; \ else cp doc/pam/examples/ss5.pam $(dst_dir)/etc/pam.d/ss5.rpmnew ; fi ; \ fi ) -+ @( if [ $(OS) = "FreeBSD" ]; then \ -+ if [ ! -d $(ss5_examples) ]; then mkdir -p $(ss5_examples); fi; \ -+ if [ ! -f $(ss5_examples) ]; then cp doc/pam/examples/ss5.pam $(ss5_examples); \ -+ cp doc/ldap/examples/* $(ss5_examples); \ -+ rm -rf /usr/local/share/doc/ss5/examples/; \ -+ fi; \ -+ fi ) - - @( if [ ! -d $(dst_dir)/var/run/ss5 ]; then mkdir -p $(dst_dir)/var/run/ss5; fi ) - -@@ -122,40 +149,68 @@ - @( if [ -d $(dst_dir)$(doc_path_base)/ss5 ]; then rm -rf $(dst_dir)$(doc_path_base)/ss5; fi ) ++ if [ $(OS) = "FreeBSD" ]; then \ ++ mkdir -p $(ss5_examples); \ ++ cp doc/ldap/examples/* doc/pam/examples/ss5.pam $(ss5_examples); \ ++ fi - @( if [ -f $(dst_dir)$(man_path_base)/man1/ss5.1 ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5.1; fi ) -+ @( if [ -f $(ss5_man)/man1/ss5.1 ]; then rm -f $(ss5_man)/man1/ss5.1; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man1/ss5srv.1 ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5srv.1; fi ) -+ @( if [ -f $(ss5_man)/man1/ss5srv.1 ]; then rm -f $(ss5_man)/man1/ss5srv.1; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.passwd.5 ]; then rm -f $(ss5_man)/man5/ss5.passwd.5; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.ha.5 ]; then rm -f $(ss5_man)/man5/ss5.ha.5; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.conf.5 ]; then rm -f $(ss5_man)/man5/ss5.conf.5; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.pam.5 ]; then rm -f $(ss5_man)/man5/ss5.pam.5; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5_gss.5 ]; then rm -f $(ss5_man)/man5/ss5_gss.5; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5_supa.5 ]; then rm -f $(ss5_man)/man5/ss5_supa.5; fi ) - - @( if [ -f $(dst_dir)$(man_path_base)/man1/ss5.1.gz ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5.1.gz; fi ) -+ @( if [ -f $(ss5_man)/man1/ss5.1.gz ]; then rm -f $(ss5_man)/man1/ss5.1.gz; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man1/ss5srv.1.gz ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5srv.1.gz; fi ) -+ @( if [ -f $(ss5_man)/man1/ss5srv.1.gz ]; then rm -f $(ss5_man)/man1/ss5srv.1.gz; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5.gz; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.passwd.5.gz ]; then rm -f $(ss5_man)/man5/ss5.passwd.5.gz; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5.gz; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.ha.5.gz ]; then rm -f $(ss5_man)/man5/ss5.ha.5.gz; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5.gz; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.conf.5.gz ]; then rm -f $(ss5_man)/man5/ss5.conf.5.gz; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.gz; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.pam.5.gz ]; then rm -f $(ss5_man)/man5/ss5.pam.5.gz; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5.gz; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5_gss.5.gz ]; then rm -f $(ss5_man)/man5/ss5_gss.5.gz; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5.gz; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5_supa.5.gz ]; then rm -f $(ss5_man)/man5/ss5_supa.5.gz; fi ) - - @( if [ -f $(dst_dir)$(man_path_base)/man1/ss5.1.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5.1.bz2; fi ) -+ @( if [ -f $(ss5_man)/man1/ss5.1.bz2 ]; then rm -f $(ss5_man)/man1/ss5.1.bz2; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man1/ss5srv.1.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5srv.1.bz2; fi ) -+ @( if [ -f $(ss5_man)/man1/ss5srv.1.bz2 ]; then rm -f $(ss5_man)/man1/ss5srv.1.bz2; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5.bz2; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.passwd.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.passwd.5.bz2; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5.bz2; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.ha.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.ha.5.bz2; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5.bz2; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.conf.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.conf.5.bz2; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.bz2; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5.pam.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.pam.5.bz2; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5.bz2; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5_gss.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5_gss.5.bz2; fi ) - @( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5.bz2; fi ) -+ @( if [ -f $(ss5_man)/man5/ss5_supa.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5_supa.5.bz2; fi ) +- @( if [ ! -d $(dst_dir)/var/run/ss5 ]; then mkdir -p $(dst_dir)/var/run/ss5; fi ) - @( if [ -d $(dst_dir)$(conf_path_base)/ss5 ]; then rm -rf $(dst_dir)$(conf_path_base)/ss5; fi ) -- @( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \ -+ @( if [ $(OS) = "Linux" ]; then \ - if [ -f $(dst_dir)/etc/pam.d/ss5 ]; then rm -f $(dst_dir)/etc/pam.d/ss5; fi ; \ - fi ) - -+ @( if [ $(OS) = "FreeBSD" ]; then \ -+ if [ -d $(ss5_examples) ]; then rm -rf $(ss5_examples); fi ; \ -+ fi ) -+ - @( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \ -- if [ -f $(dst_dir)$(boot_path_base)/ss5 ]; then rm -f $(dst_dir)$(boot_path_base)/ss5; fi; \ -+ if [ -f $(dst_dir)$(boot_path_base)/ss5 ]; then rm -rf $(dst_dir)$(boot_path_base)/ss5; fi; \ - fi ) - - @( if [ $(OS) = "Linux" ]; then \ + .PHONY : uninstall Copied: branches/2014Q2/net/ss5/files/patch-configure (from r351699, head/net/ss5/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/net/ss5/files/patch-configure Mon Apr 21 20:47:50 2014 (r351712, copy of r351699, head/net/ss5/files/patch-configure) @@ -0,0 +1,22 @@ +--- configure.orig 2009-07-17 16:03:06.000000000 -0500 ++++ configure +@@ -1843,7 +1843,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers include/config.h" + + +-OS=`uname -s` ++OS=FreeBSD + + if test "$OS" = "FreeBSD"; then + lib_path_base="/usr/local/lib" +@@ -6430,8 +6430,8 @@ if test "$OS" = "SunOS"; then + LIBS="-lsocket -lnsl -lssl -ldl -lldap -lpam" + fi; + if test "$OS" = "FreeBSD"; then +- CFLAGS="$CFLAGS -DFREEBSD -pthread -export-dynamic -I/usr/local/include" +- LIBS="-lpam -lldap -lc -L /usr/local/lib" ++ CFLAGS="$CFLAGS -DFREEBSD -pthread -I/usr/local/include" ++ LIBS="-lpam -lcrypto -lldap -lc -L /usr/local/lib -Wl,-export-dynamic" + CPP="g++" + fi; + Copied: branches/2014Q2/net/ss5/files/patch-include_SS5Debug.h (from r351699, head/net/ss5/files/patch-include_SS5Debug.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/net/ss5/files/patch-include_SS5Debug.h Mon Apr 21 20:47:50 2014 (r351712, copy of r351699, head/net/ss5/files/patch-include_SS5Debug.h) @@ -0,0 +1,47 @@ +--- include/SS5Debug.h.orig 2009-08-02 01:58:07.000000000 -0500 ++++ include/SS5Debug.h +@@ -19,37 +19,37 @@ + #ifndef SS5DEBUG_H + #define SS5DEBUG_H 1 + +-inline void ++void + S5DebugMethodInfo( pid_t pid, + struct _SS5ClientInfo ci + ); + +-inline void ++void + S5DebugAuthInfo( pid_t pid, + struct _SS5ClientInfo ci + ); + +-inline void ++void + S5DebugRequestInfo( pid_t pid, + struct _SS5RequestInfo ri + ); + +-inline void ++void + S5DebugUdpRequestInfo( pid_t pid, + struct _SS5RequestInfo ri + ); + +-inline void ++void + S5DebugUpstreamInfo( pid_t pid, + struct _SS5RequestInfo ri + ); + +-inline void ++void + S5DebugFacilities( pid_t pid, + struct _SS5Facilities fa + ); + +-inline void ++void + S5DebugStatistics( pid_t pid + ); + Copied: branches/2014Q2/net/ss5/files/patch-include_SS5Server.h (from r351699, head/net/ss5/files/patch-include_SS5Server.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/net/ss5/files/patch-include_SS5Server.h Mon Apr 21 20:47:50 2014 (r351712, copy of r351699, head/net/ss5/files/patch-include_SS5Server.h) @@ -0,0 +1,11 @@ +--- include/SS5Server.h.orig 2009-08-02 01:58:07.000000000 -0500 ++++ include/SS5Server.h +@@ -31,7 +31,7 @@ UINT + S5ServerClose( int exitcode + ); + +-inline UINT ++UINT + S5ChildClose( int exitcode, + UINT childSocket, + struct _SS5ClientInfo *ci Copied: branches/2014Q2/net/ss5/files/patch-src-SS5Server.c (from r351699, head/net/ss5/files/patch-src-SS5Server.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/net/ss5/files/patch-src-SS5Server.c Mon Apr 21 20:47:50 2014 (r351712, copy of r351699, head/net/ss5/files/patch-src-SS5Server.c) @@ -0,0 +1,11 @@ +--- src/SS5Server.c.orig 2009-08-02 01:57:19.000000000 -0500 ++++ src/SS5Server.c 2013-03-05 19:49:44.744425659 -0600 +@@ -44,6 +44,8 @@ + SS5SocksOpt.PreforkProcesses = 1; + SS5SocksOpt.PropagateKey = 0; + SS5SocksOpt.Role = ALONE; ++ SS5SocksOpt.SyslogFa = LOG_LOCAL6; ++ SS5SocksOpt.SyslogLe = LOG_ERR; + S5Radius.AuthPort = RADIUS_AUTH_PORT; + S5Radius.AcctPort = RADIUS_ACCT_PORT; + Modified: branches/2014Q2/net/ss5/pkg-plist ============================================================================== --- branches/2014Q2/net/ss5/pkg-plist Mon Apr 21 20:27:38 2014 (r351711) +++ branches/2014Q2/net/ss5/pkg-plist Mon Apr 21 20:47:50 2014 (r351712) @@ -1,8 +1,6 @@ -@unexec if cmp -s %D/etc/ss5/ss5.ha %D/etc/ss5/ss5.ha.default; then rm -f %D/etc/ss5/ss5.ha; fi -etc/ss5/ss5.ha.default -@exec if [ ! -f %D/etc/ss5/ss5.ha ]; then cp %B/%f %D/etc/ss5/ss5.ha; fi -etc/ss5/ss5.conf -etc/ss5/ss5.passwd +@sample etc/ss5/ss5.ha.sample +@sample etc/ss5/ss5.conf.sample +@sample etc/ss5/ss5.passwd.sample lib/ss5/mod_authentication.so lib/ss5/mod_authorization.so lib/ss5/mod_balance.so @@ -14,6 +12,14 @@ lib/ss5/mod_proxy.so lib/ss5/mod_socks4.so lib/ss5/mod_socks5.so lib/ss5/mod_statistics.so +man/man1/ss5.1.gz +man/man1/ss5srv.1.gz +man/man5/ss5.conf.5.gz +man/man5/ss5.pam.5.gz +man/man5/ss5.passwd.5.gz +man/man5/ss5.ha.5.gz +man/man5/ss5_gss.5.gz +man/man5/ss5_supa.5.gz sbin/ss5 sbin/ss5srv %%DATADIR%%/SS5Logo.jpg @@ -27,6 +33,8 @@ sbin/ss5srv %%DOCSDIR%%/README.ldap %%DOCSDIR%%/README.pam %%DOCSDIR%%/README.statmgr +@exec mkdir -p /var/run/ss5 +@unexec rmdir >/dev/null 2>&1 /var/log/ss5 || : @dirrm %%DATADIR%% @dirrm %%DOCSDIR%% @dirrm %%EXAMPLESDIR%% From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 21 20:53:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5C16863; Mon, 21 Apr 2014 20:53:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A816D15F8; Mon, 21 Apr 2014 20:53:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LKrstt027476; Mon, 21 Apr 2014 20:53:54 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LKrsGG027475; Mon, 21 Apr 2014 20:53:54 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201404212053.s3LKrsGG027475@svn.freebsd.org> From: John Marino Date: Mon, 21 Apr 2014 20:53:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351713 - branches/2014Q2/databases/sqlbuddy X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Apr 2014 20:53:54 -0000 Author: marino Date: Mon Apr 21 20:53:54 2014 New Revision: 351713 URL: http://svnweb.freebsd.org/changeset/ports/351713 QAT: https://qat.redports.org/buildarchive/r351713/ Log: MFH: r351703 databases/sqlbuddy: Unbreak and stage The maintainer actually provided a PR to address the breakage long before it was marked broken. itetcu asked him a valid question: Why is sqlbuddy defaulting to sqlite when it is primarily a mysql tool? The question was never answered and the PR got thrown back on the heap. The SQLite component is what is missing. Let's remove sqlite as an option to restore the build and stage while here. It's bumped because of the change in default options. PR: ports/181708 submitted by: maintainer (Chenguang Li) modified by: marino Approved by: portmgr (antoine) Modified: branches/2014Q2/databases/sqlbuddy/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/sqlbuddy/Makefile ============================================================================== --- branches/2014Q2/databases/sqlbuddy/Makefile Mon Apr 21 20:47:50 2014 (r351712) +++ branches/2014Q2/databases/sqlbuddy/Makefile Mon Apr 21 20:53:54 2014 (r351713) @@ -3,6 +3,7 @@ PORTNAME= sqlbuddy PORTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= databases www MASTER_SITES= http://www.sqlbuddy.com/download/ DISTNAME= ${PORTNAME}_1_3_3 @@ -10,35 +11,20 @@ DISTNAME= ${PORTNAME}_1_3_3 MAINTAINER= horus.li@gmail.com COMMENT= Web based MySQL administration with a set of PHP scripts -BROKEN= Fails to check-sanity - USES= zip NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} -USE_PHP= ctype pcre session +USE_PHP= ctype pcre session mysql WANT_PHP_WEB= yes -OPTIONS_DEFINE= MYSQL SQLITE -OPTIONS_DEFAULT= SQLITE - SUB_FILES= pkg-message -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -.endif -.if ${PORT_OPTIONS:MSQLITE} -USE_PHP+= sqlite -.endif - pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "NOTE:" - @${ECHO_MSG} "This port suppose you have already installed one or both of these databases supported, " + @${ECHO_MSG} "This port assumes you have already installed a mysql database, " @${ECHO_MSG} "and you want to use SQL Buddy to manage the server." @${ECHO_MSG} "If you are planning to install it/them on this machine later, " @${ECHO_MSG} "you can find it/them at ${PORTSDIR}/databases." @@ -47,9 +33,8 @@ pre-everything:: do-install: @${ECHO_MSG} "" @${ECHO_MSG} "Installing SQL Buddy under ${WWWDIR}/" - @${MKDIR} ${WWWDIR} - @cd ${WRKSRC} && ${CP} -R * ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC} && ${CP} -R * ${STAGEDIR}${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} .include From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 22 00:37:31 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4B5F989; Tue, 22 Apr 2014 00:37:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0ADE1A93; Tue, 22 Apr 2014 00:37:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M0bVxY019693; Tue, 22 Apr 2014 00:37:31 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M0bVUv019691; Tue, 22 Apr 2014 00:37:31 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404220037.s3M0bVUv019691@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 22 Apr 2014 00:37:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351736 - branches/2014Q2/audio/calf X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 00:37:31 -0000 Author: amdmi3 Date: Tue Apr 22 00:37:31 2014 New Revision: 351736 URL: http://svnweb.freebsd.org/changeset/ports/351736 QAT: https://qat.redports.org/buildarchive/r351736/ Log: MFH: r349995 - Fix build on HEAD (unknown clang options -finline-*) Approved by: portmgr Modified: branches/2014Q2/audio/calf/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/audio/calf/Makefile ============================================================================== --- branches/2014Q2/audio/calf/Makefile Mon Apr 21 23:49:17 2014 (r351735) +++ branches/2014Q2/audio/calf/Makefile Tue Apr 22 00:37:31 2014 (r351736) @@ -23,7 +23,7 @@ OPTIONS_DEFAULT=LASH LV2 OPTIONS_SUB= yes LV2_DESC= LV2 audio plugin -USES= gmake pkgconfig +USES= gmake pkgconfig compiler:env USE_GNOME= gtk20 GNU_CONFIGURE= yes INSTALLS_ICONS= yes @@ -37,7 +37,7 @@ LV2_BUILD_DEPENDS= lv2core>0:${PORTSDIR} LV2_RUN_DEPENDS= lv2core>0:${PORTSDIR}/audio/lv2core LV2_CONFIGURE_WITH= lv2 -.include +.include post-patch: @${FIND} ${BUILD_WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} -e \ @@ -49,6 +49,11 @@ post-patch: ${WRKSRC}/src/calf/buffer.h @${REINPLACE_CMD} -e 's|data\[(1< +.include From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 22 00:41:51 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F34DA84; Tue, 22 Apr 2014 00:41:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6226A1B15; Tue, 22 Apr 2014 00:41:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M0fptr023274; Tue, 22 Apr 2014 00:41:51 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M0fpoC023273; Tue, 22 Apr 2014 00:41:51 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404220041.s3M0fpoC023273@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 22 Apr 2014 00:41:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351737 - branches/2014Q2/converters/ytnef/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 00:41:51 -0000 Author: amdmi3 Date: Tue Apr 22 00:41:50 2014 New Revision: 351737 URL: http://svnweb.freebsd.org/changeset/ports/351737 QAT: https://qat.redports.org/buildarchive/r351737/ Log: MFH: r349997 - Fix build with clang Approved by: portmgr Added: branches/2014Q2/converters/ytnef/files/ - copied from r349997, head/converters/ytnef/files/ Modified: Directory Properties: branches/2014Q2/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 22 00:44:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 05B91B76; Tue, 22 Apr 2014 00:44:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E70DE1B28; Tue, 22 Apr 2014 00:44:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M0i6OX023717; Tue, 22 Apr 2014 00:44:06 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M0i6vd023716; Tue, 22 Apr 2014 00:44:06 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404220044.s3M0i6vd023716@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 22 Apr 2014 00:44:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351738 - branches/2014Q2/games/widelands X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 00:44:07 -0000 Author: amdmi3 Date: Tue Apr 22 00:44:06 2014 New Revision: 351738 URL: http://svnweb.freebsd.org/changeset/ports/351738 QAT: https://qat.redports.org/buildarchive/r351738/ Log: MFH: r350026 - Mark IGNORE in 8.x Approved by: portmgr Modified: branches/2014Q2/games/widelands/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/widelands/Makefile ============================================================================== --- branches/2014Q2/games/widelands/Makefile Tue Apr 22 00:41:50 2014 (r351737) +++ branches/2014Q2/games/widelands/Makefile Tue Apr 22 00:44:06 2014 (r351738) @@ -36,6 +36,12 @@ DESKTOP_ENTRIES="Widelands" \ "Game;StrategyGame;" \ "" +.include + +.if ${OSVERSION} < 900000 +IGNORE= doesn't build on 8.x +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/cmake/Modules/*.cmake From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 22 00:45:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DFF0C67; Tue, 22 Apr 2014 00:45:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A8CE1B39; Tue, 22 Apr 2014 00:45:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M0jaSR024023; Tue, 22 Apr 2014 00:45:36 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M0ja9O024022; Tue, 22 Apr 2014 00:45:36 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404220045.s3M0ja9O024022@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 22 Apr 2014 00:45:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351739 - branches/2014Q2/games/brikx X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 00:45:36 -0000 Author: amdmi3 Date: Tue Apr 22 00:45:35 2014 New Revision: 351739 URL: http://svnweb.freebsd.org/changeset/ports/351739 QAT: https://qat.redports.org/buildarchive/r351739/ Log: MFH: r350086 - Fix build in HEAD (unknown clang option -R) - Convert USE_BZIP to USES Approved by: portmgr Modified: branches/2014Q2/games/brikx/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/brikx/Makefile ============================================================================== --- branches/2014Q2/games/brikx/Makefile Tue Apr 22 00:44:06 2014 (r351738) +++ branches/2014Q2/games/brikx/Makefile Tue Apr 22 00:45:35 2014 (r351739) @@ -7,12 +7,12 @@ PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ # SF/brikx/Brikx/${PORTVERSION} -EXTRACT_SUFX= -src.tar.bz2 +DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Puzzle game - remove all tiles from the table -USE_BZIP2= yes +USES= tar:bzip2 GNU_CONFIGURE= yes USE_SDL= sdl mixer image ttf @@ -29,6 +29,7 @@ DESKTOP_ENTRIES="Brikx" \ false post-patch: + @${REINPLACE_CMD} -e '/\/-L\/-R\// d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/DIR_DATA/ s|data/|${DATADIR}/|' \ ${WRKSRC}/src/brikx.h From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 22 00:46:35 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D5F9D48; Tue, 22 Apr 2014 00:46:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49F241B47; Tue, 22 Apr 2014 00:46:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M0kZfD024250; Tue, 22 Apr 2014 00:46:35 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M0kZwa024249; Tue, 22 Apr 2014 00:46:35 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404220046.s3M0kZwa024249@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 22 Apr 2014 00:46:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351740 - branches/2014Q2/x11/dxpc X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 00:46:35 -0000 Author: amdmi3 Date: Tue Apr 22 00:46:34 2014 New Revision: 351740 URL: http://svnweb.freebsd.org/changeset/ports/351740 QAT: https://qat.redports.org/buildarchive/r351740/ Log: MFH: r349996 - Fix build on HEAD (unknown clang option -R) Approved by: portmgr Modified: branches/2014Q2/x11/dxpc/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/x11/dxpc/Makefile ============================================================================== --- branches/2014Q2/x11/dxpc/Makefile Tue Apr 22 00:45:35 2014 (r351739) +++ branches/2014Q2/x11/dxpc/Makefile Tue Apr 22 00:46:34 2014 (r351740) @@ -25,4 +25,7 @@ MAKE_ARGS= INSTALL="${INSTALL_PROGRAM}" PLIST_FILES= bin/dxpc \ man/man1/dxpc.1.gz +post-patch: + @${REINPLACE_CMD} -e 's|-R$$withval/lib||' ${WRKSRC}/configure + .include From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 22 00:47:41 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 292A2E2C; Tue, 22 Apr 2014 00:47:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 14BF41B55; Tue, 22 Apr 2014 00:47:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M0leQ3024522; Tue, 22 Apr 2014 00:47:40 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M0leBk024519; Tue, 22 Apr 2014 00:47:40 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404220047.s3M0leBk024519@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 22 Apr 2014 00:47:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351741 - branches/2014Q2/graphics/makehuman/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 00:47:41 -0000 Author: amdmi3 Date: Tue Apr 22 00:47:40 2014 New Revision: 351741 URL: http://svnweb.freebsd.org/changeset/ports/351741 QAT: https://qat.redports.org/buildarchive/r351741/ Log: MFH: r350087 - Fix build on 10.x - Use canonical filenames for patches Approved by: portmgr Added: branches/2014Q2/graphics/makehuman/files/patch-src__ComponentID.h - copied unchanged from r350087, head/graphics/makehuman/files/patch-src__ComponentID.h branches/2014Q2/graphics/makehuman/files/patch-src__FileTools.cpp - copied unchanged from r350087, head/graphics/makehuman/files/patch-src__FileTools.cpp branches/2014Q2/graphics/makehuman/files/patch-src__FileTools.h - copied unchanged from r350087, head/graphics/makehuman/files/patch-src__FileTools.h Deleted: branches/2014Q2/graphics/makehuman/files/patch-src-ComponentID.h branches/2014Q2/graphics/makehuman/files/patch-src-FileTools.cpp Modified: Directory Properties: branches/2014Q2/ (props changed) Copied: branches/2014Q2/graphics/makehuman/files/patch-src__ComponentID.h (from r350087, head/graphics/makehuman/files/patch-src__ComponentID.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/makehuman/files/patch-src__ComponentID.h Tue Apr 22 00:47:40 2014 (r351741, copy of r350087, head/graphics/makehuman/files/patch-src__ComponentID.h) @@ -0,0 +1,11 @@ +--- src/ComponentID.h.orig 2007-12-03 01:30:18.000000000 +0300 ++++ src/ComponentID.h 2013-09-14 14:26:25.451226331 +0400 +@@ -27,6 +27,8 @@ + #ifndef COMPONENTID_H + #define COMPONENTID_H 1 + ++#include // for for_each in *Panel.cpp ++ + #ifdef HAVE_CONFIG_H + #include + #endif Copied: branches/2014Q2/graphics/makehuman/files/patch-src__FileTools.cpp (from r350087, head/graphics/makehuman/files/patch-src__FileTools.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/makehuman/files/patch-src__FileTools.cpp Tue Apr 22 00:47:40 2014 (r351741, copy of r350087, head/graphics/makehuman/files/patch-src__FileTools.cpp) @@ -0,0 +1,11 @@ +--- src/FileTools.cpp.orig 2007-11-25 12:28:07.000000000 +0300 ++++ src/FileTools.cpp 2013-09-17 06:11:17.036227572 +0400 +@@ -45,6 +45,8 @@ + #include + #include + #include ++#include ++#include + + /* ========================================================================== * + * FileTools - Implementation Copied: branches/2014Q2/graphics/makehuman/files/patch-src__FileTools.h (from r350087, head/graphics/makehuman/files/patch-src__FileTools.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/makehuman/files/patch-src__FileTools.h Tue Apr 22 00:47:40 2014 (r351741, copy of r350087, head/graphics/makehuman/files/patch-src__FileTools.h) @@ -0,0 +1,12 @@ +--- src/FileTools.h.orig 2007-11-25 12:28:06.000000000 +0300 ++++ src/FileTools.h 2014-03-29 06:24:08.329334425 +0400 +@@ -35,6 +35,9 @@ + #include + #include + #include ++#include ++#include ++#include + + using std::string; + using std::list; From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 22 00:48:52 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9B7FF0F; Tue, 22 Apr 2014 00:48:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D667F1B66; Tue, 22 Apr 2014 00:48:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3M0mqxM024755; Tue, 22 Apr 2014 00:48:52 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3M0mq2L024754; Tue, 22 Apr 2014 00:48:52 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404220048.s3M0mq2L024754@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 22 Apr 2014 00:48:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351742 - branches/2014Q2/games/quantumminigolf X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 00:48:53 -0000 Author: amdmi3 Date: Tue Apr 22 00:48:52 2014 New Revision: 351742 URL: http://svnweb.freebsd.org/changeset/ports/351742 QAT: https://qat.redports.org/buildarchive/r351742/ Log: MFH: r350088 - Fix build on HEAD (unknown clang option -malign-double) Approved by: portmgr Modified: branches/2014Q2/games/quantumminigolf/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/quantumminigolf/Makefile ============================================================================== --- branches/2014Q2/games/quantumminigolf/Makefile Tue Apr 22 00:47:40 2014 (r351741) +++ branches/2014Q2/games/quantumminigolf/Makefile Tue Apr 22 00:48:52 2014 (r351742) @@ -14,7 +14,7 @@ COMMENT= A computer game visualizing qua LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libfftw3.so:${PORTSDIR}/math/fftw3 -USES= gmake +USES= gmake compiler:env USE_SDL= sdl ttf PLIST_FILES= bin/${PORTNAME} @@ -31,11 +31,11 @@ DESKTOP_ENTRIES="Quantum Minigolf" \ OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS OPTIONS_DEFAULT=OPTIMIZED_CFLAGS -.include +.include .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CXXFLAGS+= -O3 -fomit-frame-pointer -finline-functions -funroll-all-loops -. if ${ARCH} == "i386" +. if ${ARCH} == "i386" && ${COMPILER_TYPE} != "clang" CXXFLAGS+= -malign-double . endif .endif @@ -54,12 +54,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${STAGEDIR}${DATADIR}/fonts ${INSTALL_DATA} ${WRKSRC}/tracks/*.bmp ${WRKSRC}/tracks/*.cfg \ ${STAGEDIR}${DATADIR}/tracks - -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif -.include +.include From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 01:42:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 141B9740; Wed, 23 Apr 2014 01:42:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBE2F1758; Wed, 23 Apr 2014 01:42:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3N1gB6j048807; Wed, 23 Apr 2014 01:42:11 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3N1gBmi048805; Wed, 23 Apr 2014 01:42:11 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201404230142.s3N1gBmi048805@svn.freebsd.org> From: Bryan Drewery Date: Wed, 23 Apr 2014 01:42:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351906 - in branches/2014Q2/security/openssl: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 01:42:12 -0000 Author: bdrewery Date: Wed Apr 23 01:42:11 2014 New Revision: 351906 URL: http://svnweb.freebsd.org/changeset/ports/351906 QAT: https://qat.redports.org/buildarchive/r351906/ Log: MFH: r351191 - fix a 4 year old "use-after-free" problem https://rt.openssl.org/Ticket/Display.html?id=2167&user=guest&pass=guest http://www.tedunangst.com/flak/post/analysis-of-openssl-freelist-reuse http://ftp.openbsd.org/pub/OpenBSD/patches/5.4/common/008_openssl.patch Obtained from: OpenBSD Added: branches/2014Q2/security/openssl/files/patch-ssl-s3_pkt.c - copied unchanged from r351191, head/security/openssl/files/patch-ssl-s3_pkt.c Modified: branches/2014Q2/security/openssl/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/openssl/Makefile ============================================================================== --- branches/2014Q2/security/openssl/Makefile Wed Apr 23 01:29:25 2014 (r351905) +++ branches/2014Q2/security/openssl/Makefile Wed Apr 23 01:42:11 2014 (r351906) @@ -4,7 +4,7 @@ PORTNAME= openssl PORTVERSION= 1.0.1 DISTVERSIONSUFFIX= g -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ Copied: branches/2014Q2/security/openssl/files/patch-ssl-s3_pkt.c (from r351191, head/security/openssl/files/patch-ssl-s3_pkt.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/security/openssl/files/patch-ssl-s3_pkt.c Wed Apr 23 01:42:11 2014 (r351906, copy of r351191, head/security/openssl/files/patch-ssl-s3_pkt.c) @@ -0,0 +1,13 @@ +Index: crypto/openssl/ssl/s3_pkt.c +=================================================================== +--- ssl/s3_pkt.c (revision 264309) ++++ ssl/s3_pkt.c (working copy) +@@ -1055,7 +1055,7 @@ start: + { + s->rstate=SSL_ST_READ_HEADER; + rr->off=0; +- if (s->mode & SSL_MODE_RELEASE_BUFFERS) ++ if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0) + ssl3_release_read_buffer(s); + } + } From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 12:12:40 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99E733A2; Wed, 23 Apr 2014 12:12:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A3EC1D72; Wed, 23 Apr 2014 12:12:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NCCe78009865; Wed, 23 Apr 2014 12:12:40 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NCCeAV009863; Wed, 23 Apr 2014 12:12:40 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404231212.s3NCCeAV009863@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 23 Apr 2014 12:12:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351926 - in branches/2014Q2/security/py-pow: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 12:12:40 -0000 Author: gahr Date: Wed Apr 23 12:12:39 2014 New Revision: 351926 URL: http://svnweb.freebsd.org/changeset/ports/351926 QAT: https://qat.redports.org/buildarchive/r351926/ Log: MFH: r351375 - Unbreak by disabling MD2 and RC5 Reported by: pkg-fallout Approved by: portmgr Modified: branches/2014Q2/security/py-pow/Makefile branches/2014Q2/security/py-pow/files/patch-POW.c Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/py-pow/Makefile ============================================================================== --- branches/2014Q2/security/py-pow/Makefile Wed Apr 23 11:49:08 2014 (r351925) +++ branches/2014Q2/security/py-pow/Makefile Wed Apr 23 12:12:39 2014 (r351926) @@ -24,7 +24,7 @@ post-patch: ${REINPLACE_CMD} -e 's|licence|license|' ${WRKSRC}/setup.py do-build: - cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext -D NO_IDEA ${PYDISTUTILS_BUILD_TARGET} + cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext -D NO_IDEA -D NO_RC5_32_12_16 ${PYDISTUTILS_BUILD_TARGET} post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: branches/2014Q2/security/py-pow/files/patch-POW.c ============================================================================== --- branches/2014Q2/security/py-pow/files/patch-POW.c Wed Apr 23 11:49:08 2014 (r351925) +++ branches/2014Q2/security/py-pow/files/patch-POW.c Wed Apr 23 12:12:39 2014 (r351926) @@ -1,9 +1,10 @@ --- POW.c.orig 2002-09-18 05:54:28.000000000 +0200 -+++ POW.c 2007-12-20 21:31:49.000000000 +0100 -@@ -47,8 +47,10 @@ ++++ POW.c 2014-04-16 10:32:11.000000000 +0200 +@@ -46,9 +46,10 @@ + #include #include #include - #include +-#include +#include #include #include @@ -11,7 +12,15 @@ #include -@@ -304,54 +306,54 @@ +@@ -124,7 +125,6 @@ + #define NO_DH + + // digests +-#define MD2_DIGEST 1 + #define MD5_DIGEST 2 + #define SHA_DIGEST 3 + #define SHA1_DIGEST 4 +@@ -304,54 +304,54 @@ switch(cipher_type) { #ifndef NO_DES @@ -102,7 +111,7 @@ #endif default: return NULL; } -@@ -580,7 +582,7 @@ +@@ -580,7 +580,7 @@ X509_object_der_read(char *src, int len) { x509_object *self; @@ -111,7 +120,28 @@ if ( !(self = PyObject_New( x509_object, &x509type ) ) ) goto error; -@@ -2050,7 +2052,7 @@ +@@ -767,7 +767,6 @@ + " signed, it should be one of the following:\n" + " \n" + " \n" +-" MD2_DIGEST\n" + " MD5_DIGEST\n" + " SHA_DIGEST\n" + " SHA1_DIGEST\n" +@@ -805,12 +804,6 @@ + { PyErr_SetString( SSLErrorObject, "could not sign certificate" ); goto error; } + break; + } +- case MD2_DIGEST: +- { +- if (!X509_sign(self->x509, pkey, EVP_md2() ) ) +- { PyErr_SetString( SSLErrorObject, "could not sign certificate" ); goto error; } +- break; +- } + case SHA_DIGEST: + { + if (!X509_sign(self->x509, pkey, EVP_sha() ) ) +@@ -2050,7 +2043,7 @@ x509_crl_object_der_read(char *src, int len) { x509_crl_object *self; @@ -120,7 +150,7 @@ if ( !(self = PyObject_New( x509_crl_object, &x509_crltype ) ) ) goto error; -@@ -2435,7 +2437,7 @@ +@@ -2435,7 +2428,7 @@ X509_REVOKED_dup(X509_REVOKED *rev) { return((X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, @@ -129,7 +159,28 @@ } static PyObject * -@@ -4576,7 +4578,7 @@ +@@ -2815,7 +2808,6 @@ + " signed, it should be one of the following:\n" + " \n" + " \n" +-" MD2_DIGEST\n" + " MD5_DIGEST\n" + " SHA_DIGEST\n" + " SHA1_DIGEST\n" +@@ -2852,12 +2844,6 @@ + { PyErr_SetString( SSLErrorObject, "could not sign certificate" ); goto error; } + break; + } +- case MD2_DIGEST: +- { +- if (!X509_CRL_sign(self->crl, pkey, EVP_md2() ) ) +- { PyErr_SetString( SSLErrorObject, "could not sign certificate" ); goto error; } +- break; +- } + case SHA_DIGEST: + { + if (!X509_CRL_sign(self->crl, pkey, EVP_sha() ) ) +@@ -4576,7 +4562,7 @@ asymmetric_object_der_read(int key_type, char *src, int len) { asymmetric_object *self=NULL; @@ -138,7 +189,50 @@ self = PyObject_New( asymmetric_object, &asymmetrictype ); if (self == NULL) -@@ -5777,7 +5779,7 @@ +@@ -5031,7 +5017,6 @@ + " following:\n" + " \n" + " \n" +-" MD2_DIGEST\n" + " MD5_DIGEST\n" + " SHA_DIGEST\n" + " SHA1_DIGEST\n" +@@ -5063,8 +5048,6 @@ + + switch(digest_type) + { +- case MD2_DIGEST: +- { digest_nid = NID_md2; digest_len = MD2_DIGEST_LENGTH; break; } + case MD5_DIGEST: + { digest_nid = NID_md5; digest_len = MD5_DIGEST_LENGTH; break; } + case SHA_DIGEST: +@@ -5141,7 +5124,6 @@ + " following:\n" + " \n" + " \n" +-" MD2_DIGEST\n" + " MD5_DIGEST\n" + " SHA_DIGEST\n" + " SHA1_DIGEST\n" +@@ -5165,8 +5147,6 @@ + + switch(digest_type) + { +- case MD2_DIGEST: +- { digest_len = MD2_DIGEST_LENGTH; digest_nid = NID_md2; break; } + case MD5_DIGEST: + { digest_len = MD5_DIGEST_LENGTH; digest_nid = NID_md5; break; } + case SHA_DIGEST: +@@ -5567,8 +5547,6 @@ + + switch(digest_type) + { +- case MD2_DIGEST: +- { self->digest_type = MD2_DIGEST; EVP_DigestInit( &self->digest_ctx, EVP_md2() ); break; } + case MD5_DIGEST: + { self->digest_type = MD5_DIGEST; EVP_DigestInit( &self->digest_ctx, EVP_md5() ); break; } + case SHA_DIGEST: +@@ -5777,7 +5755,7 @@ hmac_object_new(int digest_type, char *key, int key_len) { hmac_object *self=NULL; @@ -147,3 +241,36 @@ self = PyObject_New( hmac_object, &hmactype ); if (self == NULL) +@@ -5785,8 +5763,6 @@ + + switch(digest_type) + { +- case MD2_DIGEST: +- { md = EVP_md2(); break; } + case MD5_DIGEST: + { md = EVP_md5(); break; } + case SHA_DIGEST: +@@ -6137,7 +6113,6 @@ + " of digest to create and should be one of the following: \n" + " \n" + " \n" +-" MD2_DIGEST\n" + " MD5_DIGEST\n" + " SHA_DIGEST\n" + " SHA1_DIGEST\n" +@@ -6176,7 +6151,6 @@ + " string and type should be one of the following: \n" + " \n" + " \n" +-" MD2_DIGEST\n" + " MD5_DIGEST\n" + " SHA_DIGEST\n" + " SHA1_DIGEST\n" +@@ -7078,7 +7052,6 @@ + #endif + + // message digests +- install_int_const( d, "MD2_DIGEST", MD2_DIGEST ); + install_int_const( d, "MD5_DIGEST", MD5_DIGEST ); + install_int_const( d, "SHA_DIGEST", SHA_DIGEST ); + install_int_const( d, "SHA1_DIGEST", SHA1_DIGEST ); From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 12:13:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E95A848B; Wed, 23 Apr 2014 12:13:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D61E91D7D; Wed, 23 Apr 2014 12:13:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NCDrQL010097; Wed, 23 Apr 2014 12:13:53 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NCDreu010096; Wed, 23 Apr 2014 12:13:53 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404231213.s3NCDreu010096@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 23 Apr 2014 12:13:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351927 - branches/2014Q2/lang/nbfc/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 12:13:54 -0000 Author: gahr Date: Wed Apr 23 12:13:53 2014 New Revision: 351927 URL: http://svnweb.freebsd.org/changeset/ports/351927 QAT: https://qat.redports.org/buildarchive/r351927/ Log: MFH: r351924 - Fix build on < 8000000 (yacc doesn't have a -y option) Reported by: pkg-fallout Approved by: portmgr Modified: branches/2014Q2/lang/nbfc/files/patch-Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/lang/nbfc/files/patch-Makefile ============================================================================== --- branches/2014Q2/lang/nbfc/files/patch-Makefile Wed Apr 23 12:12:39 2014 (r351926) +++ branches/2014Q2/lang/nbfc/files/patch-Makefile Wed Apr 23 12:13:53 2014 (r351927) @@ -14,7 +14,7 @@ y.tab.o: bf.y - bison -yd bf.y - gcc -c y.tab.c -+ ${YACC} -yd bf.y ++ ${YACC} -d bf.y + ${CC} ${CFLAGS} -c y.tab.c compiler.o: compiler.c From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 12:15:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5089570; Wed, 23 Apr 2014 12:15:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7A6F1D8A; Wed, 23 Apr 2014 12:15:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NCFBTK010435; Wed, 23 Apr 2014 12:15:11 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NCFBIM010430; Wed, 23 Apr 2014 12:15:11 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404231215.s3NCFBIM010430@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 23 Apr 2014 12:15:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351928 - in branches/2014Q2/databases/mysql-connector-c: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 12:15:12 -0000 Author: gahr Date: Wed Apr 23 12:15:10 2014 New Revision: 351928 URL: http://svnweb.freebsd.org/changeset/ports/351928 QAT: https://qat.redports.org/buildarchive/r351928/ Log: MFH: r351376 - Unbreak by depending on OpenSSL from ports - Bump PORTREVISION (dependencies changed) Reported by: pkg-fallout Approved by: portmgr Added: branches/2014Q2/databases/mysql-connector-c/files/patch-CMakeLists.txt - copied unchanged from r351376, head/databases/mysql-connector-c/files/patch-CMakeLists.txt Modified: branches/2014Q2/databases/mysql-connector-c/Makefile branches/2014Q2/databases/mysql-connector-c/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/mysql-connector-c/Makefile ============================================================================== --- branches/2014Q2/databases/mysql-connector-c/Makefile Wed Apr 23 12:13:53 2014 (r351927) +++ branches/2014Q2/databases/mysql-connector-c/Makefile Wed Apr 23 12:15:10 2014 (r351928) @@ -3,6 +3,7 @@ PORTNAME= mysql-connector-c PORTVERSION= 6.1.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= Connector-C @@ -14,7 +15,13 @@ COMMENT= MySQL database connector for C LICENSE= GPLv2 USE_MYSQL= 51+ +USE_OPENSSL= yes +WITH_OPENSSL_PORT=yes USES= cmake:outsource +CMAKE_ARGS+= -DWITH_SSL=system \ + -DOPENSSL_INCLUDE_DIR=${LOCALBASE}/include \ + -DOPENSSL_LIBRARY=${LOCALBASE}/lib/libssl.so \ + -DCRYPTO_LIBRARY=${LOCALBASE}/lib/libcrypto.so USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} PLIST_SUB+= PORTVERSION=${PORTVERSION} Copied: branches/2014Q2/databases/mysql-connector-c/files/patch-CMakeLists.txt (from r351376, head/databases/mysql-connector-c/files/patch-CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/databases/mysql-connector-c/files/patch-CMakeLists.txt Wed Apr 23 12:15:10 2014 (r351928, copy of r351376, head/databases/mysql-connector-c/files/patch-CMakeLists.txt) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2014-01-31 15:10:13.000000000 +0100 ++++ CMakeLists.txt 2014-01-31 15:10:39.000000000 +0100 +@@ -535,7 +535,7 @@ + # + # RPM installs documentation directly from the source tree + # +-IF(NOT INSTALL_LAYOUT MATCHES "RPM") ++IF(NOT INSTALL_LAYOUT MATCHES "RPM" AND 0) + INSTALL(FILES COPYING LICENSE.mysql + DESTINATION ${INSTALL_DOCREADMEDIR} + COMPONENT Readme Modified: branches/2014Q2/databases/mysql-connector-c/pkg-plist ============================================================================== --- branches/2014Q2/databases/mysql-connector-c/pkg-plist Wed Apr 23 12:13:53 2014 (r351927) +++ branches/2014Q2/databases/mysql-connector-c/pkg-plist Wed Apr 23 12:15:10 2014 (r351928) @@ -66,7 +66,6 @@ lib/mysql-connector-c/libmysqlclient.so. lib/mysql-connector-c/libmysqlclient_r.a lib/mysql-connector-c/libmysqlclient_r.so lib/mysql-connector-c/libmysqlclient_r.so.18 -libdata/ldconfig/mysql-connector-c @dirrm lib/mysql-connector-c @dirrm bin/mysql-connector-c @dirrm include/mysql-connector-c/mysql/psi From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 12:16:17 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF710808; Wed, 23 Apr 2014 12:16:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 829321DB0; Wed, 23 Apr 2014 12:16:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NCGHnw010726; Wed, 23 Apr 2014 12:16:17 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NCGH7d010724; Wed, 23 Apr 2014 12:16:17 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404231216.s3NCGH7d010724@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 23 Apr 2014 12:16:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351929 - branches/2014Q2/x11-wm/jewel/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 12:16:17 -0000 Author: gahr Date: Wed Apr 23 12:16:16 2014 New Revision: 351929 URL: http://svnweb.freebsd.org/changeset/ports/351929 QAT: https://qat.redports.org/buildarchive/r351929/ Log: MFH: r351333 - Fix build Reported by: pkg-fallout Approved by: portmgr Modified: branches/2014Q2/x11-wm/jewel/files/patch-goodies-fspanel_Makefile branches/2014Q2/x11-wm/jewel/files/patch-goodies-xsession_Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/x11-wm/jewel/files/patch-goodies-fspanel_Makefile ============================================================================== --- branches/2014Q2/x11-wm/jewel/files/patch-goodies-fspanel_Makefile Wed Apr 23 12:15:10 2014 (r351928) +++ branches/2014Q2/x11-wm/jewel/files/patch-goodies-fspanel_Makefile Wed Apr 23 12:16:16 2014 (r351929) @@ -4,7 +4,7 @@ -CC = gcc -C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -m386 -malign-loops=2 -malign-jumps=2 -malign-functions=2 +CC ?= gcc -+C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -falign-loops=2 -falign-jumps=2 -falign-functions=2 ++C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -falign-functions=2 L_FLAGS = -O1 -Xlinker -s -L$(XROOT)/lib -lX11 -lXpm PROGNAME = fspanel Modified: branches/2014Q2/x11-wm/jewel/files/patch-goodies-xsession_Makefile ============================================================================== --- branches/2014Q2/x11-wm/jewel/files/patch-goodies-xsession_Makefile Wed Apr 23 12:15:10 2014 (r351928) +++ branches/2014Q2/x11-wm/jewel/files/patch-goodies-xsession_Makefile Wed Apr 23 12:16:16 2014 (r351929) @@ -5,7 +5,7 @@ CC = gcc -C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -m386 -malign-loops=2 -malign-jumps=2 -malign-functions=2 -+C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -falign-loops=2 -falign-jumps=2 -falign-functions=2 ++C_FLAGS = -DNOSTDLIB -DHAVE_XPM -Wall -I$(XROOT)/include -falign-functions=2 L_FLAGS = -O1 -Xlinker -s -L$(XROOT)/lib -lX11 -lXpm PROGNAME = xsession From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 12:28:04 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5265CD6B; Wed, 23 Apr 2014 12:28:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D3311040; Wed, 23 Apr 2014 12:28:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NCS4jE015229; Wed, 23 Apr 2014 12:28:04 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NCS3dO015226; Wed, 23 Apr 2014 12:28:03 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404231228.s3NCS3dO015226@svn.freebsd.org> From: Mathieu Arnold Date: Wed, 23 Apr 2014 12:28:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351930 - branches/2014Q2/dns/bind10 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 12:28:04 -0000 Author: mat Date: Wed Apr 23 12:28:03 2014 New Revision: 351930 URL: http://svnweb.freebsd.org/changeset/ports/351930 QAT: https://qat.redports.org/buildarchive/r351930/ Log: MFH: r351676, r351694 Update to 1.2.0. (and unbreak build.) Add IGNORE if the default python is not the right one. Changes: https://lists.isc.org/pipermail/bind10-announce/2014-April/Submitted000033.html Sponsored by: Absolight Modified: branches/2014Q2/dns/bind10/Makefile branches/2014Q2/dns/bind10/distinfo branches/2014Q2/dns/bind10/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/dns/bind10/Makefile ============================================================================== --- branches/2014Q2/dns/bind10/Makefile Wed Apr 23 12:16:16 2014 (r351929) +++ branches/2014Q2/dns/bind10/Makefile Wed Apr 23 12:28:03 2014 (r351930) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bind10 -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.0 CATEGORIES= dns MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} @@ -18,7 +18,8 @@ LICENSE_PERMS= dist-mirror dist-sell pkg BUILD_DEPENDS= ${LOCALBASE}/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp:${PORTSDIR}/devel/boost-libs \ ${LOCALBASE}/include/log4cplus/logger.h:${PORTSDIR}/devel/log4cplus \ - sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 + sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 \ + ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR}/security/botan110 \ liblog4cplus.so:${PORTSDIR}/devel/log4cplus \ libicuuc.so:${PORTSDIR}/devel/icu \ @@ -26,7 +27,7 @@ LIB_DEPENDS= libbotan-1.10.so:${PORTSDIR libsqlite3.so:${PORTSDIR}/databases/sqlite3 RUN_DEPENDS= ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 -USE_PYTHON= 3.3 +USE_PYTHON= 3 USE_OPENSSL= yes USE_LDCONFIG= yes USES= compiler:c++11-lang pathfix pkgconfig @@ -48,5 +49,13 @@ post-install: ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/cmdctl-certfile.pem.sample ${INSTALL_DATA} -m 640 ${WRKSRC}/src/bin/cmdctl/cmdctl-keyfile.pem \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/cmdctl-keyfile.pem.sample + ${MV} ${STAGEDIR}${ETCDIR}/cmdctl-certfile.pem ${STAGEDIR}${ETCDIR}/cmdctl-certfile.pem.sample + ${MV} ${STAGEDIR}${ETCDIR}/cmdctl-keyfile.pem ${STAGEDIR}${ETCDIR}/cmdctl-keyfile.pem.sample -.include +.include + +.if ${PYTHON_VER} != ${PYTHON_DEFAULT} +IGNORE= You have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} +.endif + +.include Modified: branches/2014Q2/dns/bind10/distinfo ============================================================================== --- branches/2014Q2/dns/bind10/distinfo Wed Apr 23 12:16:16 2014 (r351929) +++ branches/2014Q2/dns/bind10/distinfo Wed Apr 23 12:28:03 2014 (r351930) @@ -1,2 +1,2 @@ -SHA256 (bind10-1.1.0.tar.gz) = 643f74d0013c6c3fc85f95d438be493639256f83e63d0aea5c8071e0fa606550 -SIZE (bind10-1.1.0.tar.gz) = 4822269 +SHA256 (bind10-1.2.0.tar.gz) = 4b73895de10ecddfa68e5d71d7f322ddcc449af6574d0e4c70bbf092f2ceb5d7 +SIZE (bind10-1.2.0.tar.gz) = 6007328 Modified: branches/2014Q2/dns/bind10/pkg-plist ============================================================================== --- branches/2014Q2/dns/bind10/pkg-plist Wed Apr 23 12:16:16 2014 (r351929) +++ branches/2014Q2/dns/bind10/pkg-plist Wed Apr 23 12:28:03 2014 (r351930) @@ -1,6 +1,6 @@ +bin/b10-certgen bin/b10-dbutil bin/b10-loadzone -bin/b10-certgen bin/bindctl bin/isc-sysinfo bin/perfdhcp @@ -10,33 +10,376 @@ etc/%%PORTNAME%%/cmdctl-certfile.pem.sam @unexec if cmp -s %D/etc/%%PORTNAME%%/cmdctl-keyfile.pem.sample %D/etc/%%PORTNAME%%/cmdctl-keyfile.pem; then rm -f %D/etc/%%PORTNAME%%/cmdctl-keyfile.pem; fi etc/%%PORTNAME%%/cmdctl-keyfile.pem.sample @exec if [ ! -f %D/etc/%%PORTNAME%%/cmdctl-keyfile.pem ] ; then cp -p %D/%F %B/cmdctl-keyfile.pem; fi -include/%%PORTNAME%%/dns/dns_fwd.h -include/%%PORTNAME%%/dns/edns.h -include/%%PORTNAME%%/dns/exceptions.h -include/%%PORTNAME%%/dns/labelsequence.h -include/%%PORTNAME%%/dns/master_lexer.h -include/%%PORTNAME%%/dns/master_loader.h -include/%%PORTNAME%%/dns/master_loader_callbacks.h -include/%%PORTNAME%%/dns/masterload.h -include/%%PORTNAME%%/dns/message.h -include/%%PORTNAME%%/dns/messagerenderer.h -include/%%PORTNAME%%/dns/name.h -include/%%PORTNAME%%/dns/opcode.h -include/%%PORTNAME%%/dns/question.h -include/%%PORTNAME%%/dns/rcode.h -include/%%PORTNAME%%/dns/rdata.h -include/%%PORTNAME%%/dns/rdataclass.h -include/%%PORTNAME%%/dns/rrclass.h -include/%%PORTNAME%%/dns/rrparamregistry.h -include/%%PORTNAME%%/dns/rrset.h -include/%%PORTNAME%%/dns/rrset_collection.h -include/%%PORTNAME%%/dns/rrset_collection_base.h -include/%%PORTNAME%%/dns/rrttl.h -include/%%PORTNAME%%/dns/rrtype.h -include/%%PORTNAME%%/dns/tsigkey.h -include/%%PORTNAME%%/dns/zone_checker.h -include/%%PORTNAME%%/exceptions/exceptions.h -include/%%PORTNAME%%/util/buffer.h +include/bind10/asio/LICENSE_1_0.txt +include/bind10/asio/README +include/bind10/asio/basic_datagram_socket.hpp +include/bind10/asio/basic_deadline_timer.hpp +include/bind10/asio/basic_io_object.hpp +include/bind10/asio/basic_raw_socket.hpp +include/bind10/asio/basic_serial_port.hpp +include/bind10/asio/basic_socket.hpp +include/bind10/asio/basic_socket_acceptor.hpp +include/bind10/asio/basic_socket_iostream.hpp +include/bind10/asio/basic_socket_streambuf.hpp +include/bind10/asio/basic_stream_socket.hpp +include/bind10/asio/basic_streambuf.hpp +include/bind10/asio/basic_streambuf_fwd.hpp +include/bind10/asio/buffer.hpp +include/bind10/asio/buffered_read_stream.hpp +include/bind10/asio/buffered_read_stream_fwd.hpp +include/bind10/asio/buffered_stream.hpp +include/bind10/asio/buffered_stream_fwd.hpp +include/bind10/asio/buffered_write_stream.hpp +include/bind10/asio/buffered_write_stream_fwd.hpp +include/bind10/asio/buffers_iterator.hpp +include/bind10/asio/completion_condition.hpp +include/bind10/asio/datagram_socket_service.hpp +include/bind10/asio/deadline_timer.hpp +include/bind10/asio/deadline_timer_service.hpp +include/bind10/asio/detail/array_fwd.hpp +include/bind10/asio/detail/base_from_completion_cond.hpp +include/bind10/asio/detail/bind_handler.hpp +include/bind10/asio/detail/buffer_resize_guard.hpp +include/bind10/asio/detail/buffer_sequence_adapter.hpp +include/bind10/asio/detail/buffered_stream_storage.hpp +include/bind10/asio/detail/call_stack.hpp +include/bind10/asio/detail/completion_handler.hpp +include/bind10/asio/detail/config.hpp +include/bind10/asio/detail/consuming_buffers.hpp +include/bind10/asio/detail/deadline_timer_service.hpp +include/bind10/asio/detail/descriptor_ops.hpp +include/bind10/asio/detail/descriptor_read_op.hpp +include/bind10/asio/detail/descriptor_write_op.hpp +include/bind10/asio/detail/dev_poll_reactor.hpp +include/bind10/asio/detail/dev_poll_reactor_fwd.hpp +include/bind10/asio/detail/epoll_reactor.hpp +include/bind10/asio/detail/epoll_reactor_fwd.hpp +include/bind10/asio/detail/event.hpp +include/bind10/asio/detail/eventfd_select_interrupter.hpp +include/bind10/asio/detail/fd_set_adapter.hpp +include/bind10/asio/detail/fenced_block.hpp +include/bind10/asio/detail/gcc_arm_fenced_block.hpp +include/bind10/asio/detail/gcc_fenced_block.hpp +include/bind10/asio/detail/gcc_hppa_fenced_block.hpp +include/bind10/asio/detail/gcc_sync_fenced_block.hpp +include/bind10/asio/detail/gcc_x86_fenced_block.hpp +include/bind10/asio/detail/handler_alloc_helpers.hpp +include/bind10/asio/detail/handler_invoke_helpers.hpp +include/bind10/asio/detail/hash_map.hpp +include/bind10/asio/detail/impl/descriptor_ops.ipp +include/bind10/asio/detail/impl/dev_poll_reactor.hpp +include/bind10/asio/detail/impl/dev_poll_reactor.ipp +include/bind10/asio/detail/impl/epoll_reactor.hpp +include/bind10/asio/detail/impl/epoll_reactor.ipp +include/bind10/asio/detail/impl/eventfd_select_interrupter.ipp +include/bind10/asio/detail/impl/kqueue_reactor.hpp +include/bind10/asio/detail/impl/kqueue_reactor.ipp +include/bind10/asio/detail/impl/pipe_select_interrupter.ipp +include/bind10/asio/detail/impl/posix_event.ipp +include/bind10/asio/detail/impl/posix_mutex.ipp +include/bind10/asio/detail/impl/posix_thread.ipp +include/bind10/asio/detail/impl/posix_tss_ptr.ipp +include/bind10/asio/detail/impl/reactive_descriptor_service.ipp +include/bind10/asio/detail/impl/reactive_serial_port_service.ipp +include/bind10/asio/detail/impl/reactive_socket_service_base.ipp +include/bind10/asio/detail/impl/resolver_service_base.ipp +include/bind10/asio/detail/impl/select_reactor.hpp +include/bind10/asio/detail/impl/select_reactor.ipp +include/bind10/asio/detail/impl/service_registry.hpp +include/bind10/asio/detail/impl/service_registry.ipp +include/bind10/asio/detail/impl/socket_ops.ipp +include/bind10/asio/detail/impl/socket_select_interrupter.ipp +include/bind10/asio/detail/impl/strand_service.hpp +include/bind10/asio/detail/impl/strand_service.ipp +include/bind10/asio/detail/impl/task_io_service.hpp +include/bind10/asio/detail/impl/task_io_service.ipp +include/bind10/asio/detail/impl/throw_error.ipp +include/bind10/asio/detail/impl/timer_queue.ipp +include/bind10/asio/detail/impl/timer_queue_set.ipp +include/bind10/asio/detail/impl/win_event.ipp +include/bind10/asio/detail/impl/win_iocp_handle_service.ipp +include/bind10/asio/detail/impl/win_iocp_io_service.hpp +include/bind10/asio/detail/impl/win_iocp_io_service.ipp +include/bind10/asio/detail/impl/win_iocp_serial_port_service.ipp +include/bind10/asio/detail/impl/win_iocp_socket_service_base.ipp +include/bind10/asio/detail/impl/win_mutex.ipp +include/bind10/asio/detail/impl/win_thread.ipp +include/bind10/asio/detail/impl/win_tss_ptr.ipp +include/bind10/asio/detail/impl/winsock_init.ipp +include/bind10/asio/detail/io_control.hpp +include/bind10/asio/detail/kqueue_reactor.hpp +include/bind10/asio/detail/kqueue_reactor_fwd.hpp +include/bind10/asio/detail/local_free_on_block_exit.hpp +include/bind10/asio/detail/macos_fenced_block.hpp +include/bind10/asio/detail/mutex.hpp +include/bind10/asio/detail/noncopyable.hpp +include/bind10/asio/detail/null_buffers_op.hpp +include/bind10/asio/detail/null_event.hpp +include/bind10/asio/detail/null_fenced_block.hpp +include/bind10/asio/detail/null_mutex.hpp +include/bind10/asio/detail/null_signal_blocker.hpp +include/bind10/asio/detail/null_thread.hpp +include/bind10/asio/detail/null_tss_ptr.hpp +include/bind10/asio/detail/object_pool.hpp +include/bind10/asio/detail/old_win_sdk_compat.hpp +include/bind10/asio/detail/op_queue.hpp +include/bind10/asio/detail/operation.hpp +include/bind10/asio/detail/pipe_select_interrupter.hpp +include/bind10/asio/detail/pop_options.hpp +include/bind10/asio/detail/posix_event.hpp +include/bind10/asio/detail/posix_fd_set_adapter.hpp +include/bind10/asio/detail/posix_mutex.hpp +include/bind10/asio/detail/posix_signal_blocker.hpp +include/bind10/asio/detail/posix_thread.hpp +include/bind10/asio/detail/posix_tss_ptr.hpp +include/bind10/asio/detail/push_options.hpp +include/bind10/asio/detail/reactive_descriptor_service.hpp +include/bind10/asio/detail/reactive_null_buffers_op.hpp +include/bind10/asio/detail/reactive_serial_port_service.hpp +include/bind10/asio/detail/reactive_socket_accept_op.hpp +include/bind10/asio/detail/reactive_socket_connect_op.hpp +include/bind10/asio/detail/reactive_socket_recv_op.hpp +include/bind10/asio/detail/reactive_socket_recvfrom_op.hpp +include/bind10/asio/detail/reactive_socket_send_op.hpp +include/bind10/asio/detail/reactive_socket_sendto_op.hpp +include/bind10/asio/detail/reactive_socket_service.hpp +include/bind10/asio/detail/reactive_socket_service_base.hpp +include/bind10/asio/detail/reactor.hpp +include/bind10/asio/detail/reactor_fwd.hpp +include/bind10/asio/detail/reactor_op.hpp +include/bind10/asio/detail/reactor_op_queue.hpp +include/bind10/asio/detail/regex_fwd.hpp +include/bind10/asio/detail/resolve_endpoint_op.hpp +include/bind10/asio/detail/resolve_op.hpp +include/bind10/asio/detail/resolver_service.hpp +include/bind10/asio/detail/resolver_service_base.hpp +include/bind10/asio/detail/scoped_lock.hpp +include/bind10/asio/detail/select_interrupter.hpp +include/bind10/asio/detail/select_reactor.hpp +include/bind10/asio/detail/select_reactor_fwd.hpp +include/bind10/asio/detail/service_base.hpp +include/bind10/asio/detail/service_id.hpp +include/bind10/asio/detail/service_registry.hpp +include/bind10/asio/detail/service_registry_fwd.hpp +include/bind10/asio/detail/shared_ptr.hpp +include/bind10/asio/detail/signal_blocker.hpp +include/bind10/asio/detail/signal_init.hpp +include/bind10/asio/detail/socket_holder.hpp +include/bind10/asio/detail/socket_ops.hpp +include/bind10/asio/detail/socket_option.hpp +include/bind10/asio/detail/socket_select_interrupter.hpp +include/bind10/asio/detail/socket_types.hpp +include/bind10/asio/detail/solaris_fenced_block.hpp +include/bind10/asio/detail/strand_service.hpp +include/bind10/asio/detail/task_io_service.hpp +include/bind10/asio/detail/task_io_service_fwd.hpp +include/bind10/asio/detail/task_io_service_operation.hpp +include/bind10/asio/detail/thread.hpp +include/bind10/asio/detail/throw_error.hpp +include/bind10/asio/detail/timer_op.hpp +include/bind10/asio/detail/timer_queue.hpp +include/bind10/asio/detail/timer_queue_base.hpp +include/bind10/asio/detail/timer_queue_fwd.hpp +include/bind10/asio/detail/timer_queue_set.hpp +include/bind10/asio/detail/timer_scheduler.hpp +include/bind10/asio/detail/timer_scheduler_fwd.hpp +include/bind10/asio/detail/tss_ptr.hpp +include/bind10/asio/detail/wait_handler.hpp +include/bind10/asio/detail/weak_ptr.hpp +include/bind10/asio/detail/win_event.hpp +include/bind10/asio/detail/win_fd_set_adapter.hpp +include/bind10/asio/detail/win_fenced_block.hpp +include/bind10/asio/detail/win_iocp_handle_read_op.hpp +include/bind10/asio/detail/win_iocp_handle_service.hpp +include/bind10/asio/detail/win_iocp_handle_write_op.hpp +include/bind10/asio/detail/win_iocp_io_service.hpp +include/bind10/asio/detail/win_iocp_io_service_fwd.hpp +include/bind10/asio/detail/win_iocp_null_buffers_op.hpp +include/bind10/asio/detail/win_iocp_operation.hpp +include/bind10/asio/detail/win_iocp_overlapped_op.hpp +include/bind10/asio/detail/win_iocp_overlapped_ptr.hpp +include/bind10/asio/detail/win_iocp_serial_port_service.hpp +include/bind10/asio/detail/win_iocp_socket_accept_op.hpp +include/bind10/asio/detail/win_iocp_socket_recv_op.hpp +include/bind10/asio/detail/win_iocp_socket_recvfrom_op.hpp +include/bind10/asio/detail/win_iocp_socket_send_op.hpp +include/bind10/asio/detail/win_iocp_socket_service.hpp +include/bind10/asio/detail/win_iocp_socket_service_base.hpp +include/bind10/asio/detail/win_mutex.hpp +include/bind10/asio/detail/win_signal_blocker.hpp +include/bind10/asio/detail/win_thread.hpp +include/bind10/asio/detail/win_tss_ptr.hpp +include/bind10/asio/detail/wince_thread.hpp +include/bind10/asio/detail/winsock_init.hpp +include/bind10/asio/detail/wrapped_handler.hpp +include/bind10/asio/error.hpp +include/bind10/asio/error_code.hpp +include/bind10/asio/handler_alloc_hook.hpp +include/bind10/asio/handler_invoke_hook.hpp +include/bind10/asio/impl/error.ipp +include/bind10/asio/impl/error_code.ipp +include/bind10/asio/impl/io_service.hpp +include/bind10/asio/impl/io_service.ipp +include/bind10/asio/impl/read.hpp +include/bind10/asio/impl/read.ipp +include/bind10/asio/impl/read_at.hpp +include/bind10/asio/impl/read_at.ipp +include/bind10/asio/impl/read_until.hpp +include/bind10/asio/impl/read_until.ipp +include/bind10/asio/impl/serial_port_base.hpp +include/bind10/asio/impl/serial_port_base.ipp +include/bind10/asio/impl/src.cpp +include/bind10/asio/impl/src.hpp +include/bind10/asio/impl/write.hpp +include/bind10/asio/impl/write.ipp +include/bind10/asio/impl/write_at.hpp +include/bind10/asio/impl/write_at.ipp +include/bind10/asio/io_service.hpp +include/bind10/asio/ip/address.hpp +include/bind10/asio/ip/address_v4.hpp +include/bind10/asio/ip/address_v6.hpp +include/bind10/asio/ip/basic_endpoint.hpp +include/bind10/asio/ip/basic_resolver.hpp +include/bind10/asio/ip/basic_resolver_entry.hpp +include/bind10/asio/ip/basic_resolver_iterator.hpp +include/bind10/asio/ip/basic_resolver_query.hpp +include/bind10/asio/ip/detail/endpoint.hpp +include/bind10/asio/ip/detail/impl/endpoint.ipp +include/bind10/asio/ip/detail/socket_option.hpp +include/bind10/asio/ip/host_name.hpp +include/bind10/asio/ip/icmp.hpp +include/bind10/asio/ip/impl/address.hpp +include/bind10/asio/ip/impl/address.ipp +include/bind10/asio/ip/impl/address_v4.hpp +include/bind10/asio/ip/impl/address_v4.ipp +include/bind10/asio/ip/impl/address_v6.hpp +include/bind10/asio/ip/impl/address_v6.ipp +include/bind10/asio/ip/impl/basic_endpoint.hpp +include/bind10/asio/ip/impl/host_name.ipp +include/bind10/asio/ip/multicast.hpp +include/bind10/asio/ip/resolver_query_base.hpp +include/bind10/asio/ip/resolver_service.hpp +include/bind10/asio/ip/tcp.hpp +include/bind10/asio/ip/udp.hpp +include/bind10/asio/ip/unicast.hpp +include/bind10/asio/ip/v6_only.hpp +include/bind10/asio/is_read_buffered.hpp +include/bind10/asio/is_write_buffered.hpp +include/bind10/asio/local/basic_endpoint.hpp +include/bind10/asio/local/connect_pair.hpp +include/bind10/asio/local/datagram_protocol.hpp +include/bind10/asio/local/detail/endpoint.hpp +include/bind10/asio/local/detail/impl/endpoint.ipp +include/bind10/asio/local/stream_protocol.hpp +include/bind10/asio/placeholders.hpp +include/bind10/asio/posix/basic_descriptor.hpp +include/bind10/asio/posix/basic_stream_descriptor.hpp +include/bind10/asio/posix/descriptor_base.hpp +include/bind10/asio/posix/stream_descriptor.hpp +include/bind10/asio/posix/stream_descriptor_service.hpp +include/bind10/asio/raw_socket_service.hpp +include/bind10/asio/read.hpp +include/bind10/asio/read_at.hpp +include/bind10/asio/read_until.hpp +include/bind10/asio/serial_port.hpp +include/bind10/asio/serial_port_base.hpp +include/bind10/asio/serial_port_service.hpp +include/bind10/asio/socket_acceptor_service.hpp +include/bind10/asio/socket_base.hpp +include/bind10/asio/ssl.hpp +include/bind10/asio/ssl/basic_context.hpp +include/bind10/asio/ssl/context.hpp +include/bind10/asio/ssl/context_base.hpp +include/bind10/asio/ssl/context_service.hpp +include/bind10/asio/ssl/detail/openssl_context_service.hpp +include/bind10/asio/ssl/detail/openssl_init.hpp +include/bind10/asio/ssl/detail/openssl_operation.hpp +include/bind10/asio/ssl/detail/openssl_stream_service.hpp +include/bind10/asio/ssl/detail/openssl_types.hpp +include/bind10/asio/ssl/stream.hpp +include/bind10/asio/ssl/stream_base.hpp +include/bind10/asio/ssl/stream_service.hpp +include/bind10/asio/strand.hpp +include/bind10/asio/stream_socket_service.hpp +include/bind10/asio/streambuf.hpp +include/bind10/asio/system_error.hpp +include/bind10/asio/thread.hpp +include/bind10/asio/time_traits.hpp +include/bind10/asio/version.hpp +include/bind10/asio/windows/basic_handle.hpp +include/bind10/asio/windows/basic_random_access_handle.hpp +include/bind10/asio/windows/basic_stream_handle.hpp +include/bind10/asio/windows/overlapped_ptr.hpp +include/bind10/asio/windows/random_access_handle.hpp +include/bind10/asio/windows/random_access_handle_service.hpp +include/bind10/asio/windows/stream_handle.hpp +include/bind10/asio/windows/stream_handle_service.hpp +include/bind10/asio/write.hpp +include/bind10/asio/write_at.hpp +include/bind10/asiolink/io_address.h +include/bind10/config.h +include/bind10/dhcp/classify.h +include/bind10/dhcp/dhcp4.h +include/bind10/dhcp/dhcp6.h +include/bind10/dhcp/duid.h +include/bind10/dhcp/hwaddr.h +include/bind10/dhcp/iface_mgr.h +include/bind10/dhcp/libdhcp++.h +include/bind10/dhcp/option.h +include/bind10/dhcp/option4_addrlst.h +include/bind10/dhcp/option6_addrlst.h +include/bind10/dhcp/option6_ia.h +include/bind10/dhcp/option6_iaaddr.h +include/bind10/dhcp/option_custom.h +include/bind10/dhcp/option_data_types.h +include/bind10/dhcp/option_definition.h +include/bind10/dhcp/option_int.h +include/bind10/dhcp/option_int_array.h +include/bind10/dhcp/option_space.h +include/bind10/dhcp/option_string.h +include/bind10/dhcp/pkt4.h +include/bind10/dhcp/pkt6.h +include/bind10/dhcp/pkt_filter.h +include/bind10/dhcp/pkt_filter_inet.h +include/bind10/dhcp/pkt_filter_lpf.h +include/bind10/dhcp/protocol_util.h +include/bind10/dhcp/std_option_defs.h +include/bind10/dns/dns_fwd.h +include/bind10/dns/edns.h +include/bind10/dns/exceptions.h +include/bind10/dns/labelsequence.h +include/bind10/dns/master_lexer.h +include/bind10/dns/master_loader.h +include/bind10/dns/master_loader_callbacks.h +include/bind10/dns/masterload.h +include/bind10/dns/message.h +include/bind10/dns/messagerenderer.h +include/bind10/dns/name.h +include/bind10/dns/opcode.h +include/bind10/dns/question.h +include/bind10/dns/rcode.h +include/bind10/dns/rdata.h +include/bind10/dns/rdataclass.h +include/bind10/dns/rrclass.h +include/bind10/dns/rrparamregistry.h +include/bind10/dns/rrset.h +include/bind10/dns/rrset_collection.h +include/bind10/dns/rrset_collection_base.h +include/bind10/dns/rrttl.h +include/bind10/dns/rrtype.h +include/bind10/dns/tsigkey.h +include/bind10/dns/zone_checker.h +include/bind10/exceptions/exceptions.h +include/bind10/hooks/callout_handle.h +include/bind10/hooks/hooks.h +include/bind10/hooks/library_handle.h +include/bind10/log/log_formatter.h +include/bind10/log/logger.h +include/bind10/log/logger_level.h +include/bind10/log/macros.h +include/bind10/log/message_types.h +include/bind10/util/buffer.h +include/bind10/util/io_utilities.h lib/libb10-acl.a lib/libb10-acl.la lib/libb10-acl.so @@ -49,10 +392,6 @@ lib/libb10-asiolink.a lib/libb10-asiolink.la lib/libb10-asiolink.so lib/libb10-asiolink.so.1 -lib/libb10-cache.a -lib/libb10-cache.la -lib/libb10-cache.so -lib/libb10-cache.so.0 lib/libb10-cc.a lib/libb10-cc.la lib/libb10-cc.so @@ -73,6 +412,10 @@ lib/libb10-dhcp++.a lib/libb10-dhcp++.la lib/libb10-dhcp++.so lib/libb10-dhcp++.so.2 +lib/libb10-dhcp_ddns.a +lib/libb10-dhcp_ddns.la +lib/libb10-dhcp_ddns.so +lib/libb10-dhcp_ddns.so.0 lib/libb10-dhcpsrv.a lib/libb10-dhcpsrv.la lib/libb10-dhcpsrv.so @@ -89,6 +432,10 @@ lib/libb10-exceptions.a lib/libb10-exceptions.la lib/libb10-exceptions.so lib/libb10-exceptions.so.0 +lib/libb10-hooks.a +lib/libb10-hooks.la +lib/libb10-hooks.so +lib/libb10-hooks.so.0 lib/libb10-log.a lib/libb10-log.la lib/libb10-log.so @@ -101,10 +448,6 @@ lib/libb10-pydnspp.a lib/libb10-pydnspp.la lib/libb10-pydnspp.so lib/libb10-pydnspp.so.0 -lib/libb10-resolve.a -lib/libb10-resolve.la -lib/libb10-resolve.so -lib/libb10-resolve.so.0 lib/libb10-server-common.a lib/libb10-server-common.la lib/libb10-server-common.so @@ -125,29 +468,6 @@ lib/libb10-xfr.a lib/libb10-xfr.la lib/libb10-xfr.so lib/libb10-xfr.so.0 -libdata/pkgconfig/dns++.pc -man/man1/b10-certgen.1.gz -man/man1/bindctl.1.gz -man/man1/isc-sysinfo.1.gz -man/man8/b10-auth.8.gz -man/man8/b10-cfgmgr.8.gz -man/man8/b10-cmdctl-usermgr.8.gz -man/man8/b10-cmdctl.8.gz -man/man8/b10-dbutil.8.gz -man/man8/b10-ddns.8.gz -man/man8/b10-dhcp4.8.gz -man/man8/b10-dhcp6.8.gz -man/man8/b10-init.8.gz -man/man8/b10-loadzone.8.gz -man/man8/b10-msgq.8.gz -man/man8/b10-resolver.8.gz -man/man8/b10-sockcreator.8.gz -man/man8/b10-stats-httpd.8.gz -man/man8/b10-stats.8.gz -man/man8/b10-xfrin.8.gz -man/man8/b10-xfrout.8.gz -man/man8/b10-zonemgr.8.gz -man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/bind10_config.py %%PYTHON_SITELIBDIR%%/bind10_config.pyc %%PYTHON_SITELIBDIR%%/bind10_config.pyo @@ -172,21 +492,6 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/bindctl/mycollections.py %%PYTHON_SITELIBDIR%%/bindctl/mycollections.pyc %%PYTHON_SITELIBDIR%%/bindctl/mycollections.pyo -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/__init__.py -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/__init__.pyc -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/__init__.pyo -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/component.py -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/component.pyc -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/component.pyo -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/sockcreator.py -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/sockcreator.pyc -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/sockcreator.pyo -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/socket_cache.py -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/socket_cache.pyc -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/socket_cache.pyo -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/special_component.py -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/special_component.pyc -%%PYTHON_SITELIBDIR%%/isc/%%PORTNAME%%/special_component.pyo %%PYTHON_SITELIBDIR%%/isc/__init__.py %%PYTHON_SITELIBDIR%%/isc/__init__.pyc %%PYTHON_SITELIBDIR%%/isc/__init__.pyo @@ -202,6 +507,21 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/isc/acl/dns.py %%PYTHON_SITELIBDIR%%/isc/acl/dns.pyc %%PYTHON_SITELIBDIR%%/isc/acl/dns.pyo +%%PYTHON_SITELIBDIR%%/isc/bind10/__init__.py +%%PYTHON_SITELIBDIR%%/isc/bind10/__init__.pyc +%%PYTHON_SITELIBDIR%%/isc/bind10/__init__.pyo +%%PYTHON_SITELIBDIR%%/isc/bind10/component.py +%%PYTHON_SITELIBDIR%%/isc/bind10/component.pyc +%%PYTHON_SITELIBDIR%%/isc/bind10/component.pyo +%%PYTHON_SITELIBDIR%%/isc/bind10/sockcreator.py +%%PYTHON_SITELIBDIR%%/isc/bind10/sockcreator.pyc +%%PYTHON_SITELIBDIR%%/isc/bind10/sockcreator.pyo +%%PYTHON_SITELIBDIR%%/isc/bind10/socket_cache.py +%%PYTHON_SITELIBDIR%%/isc/bind10/socket_cache.pyc +%%PYTHON_SITELIBDIR%%/isc/bind10/socket_cache.pyo +%%PYTHON_SITELIBDIR%%/isc/bind10/special_component.py +%%PYTHON_SITELIBDIR%%/isc/bind10/special_component.pyc +%%PYTHON_SITELIBDIR%%/isc/bind10/special_component.pyo %%PYTHON_SITELIBDIR%%/isc/cc/__init__.py %%PYTHON_SITELIBDIR%%/isc/cc/__init__.pyc %%PYTHON_SITELIBDIR%%/isc/cc/__init__.pyo @@ -286,12 +606,18 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/isc/log_messages/libddns_messages.py %%PYTHON_SITELIBDIR%%/isc/log_messages/libddns_messages.pyc %%PYTHON_SITELIBDIR%%/isc/log_messages/libddns_messages.pyo +%%PYTHON_SITELIBDIR%%/isc/log_messages/libmemmgr_messages.py +%%PYTHON_SITELIBDIR%%/isc/log_messages/libmemmgr_messages.pyc +%%PYTHON_SITELIBDIR%%/isc/log_messages/libmemmgr_messages.pyo %%PYTHON_SITELIBDIR%%/isc/log_messages/libxfrin_messages.py %%PYTHON_SITELIBDIR%%/isc/log_messages/libxfrin_messages.pyc %%PYTHON_SITELIBDIR%%/isc/log_messages/libxfrin_messages.pyo %%PYTHON_SITELIBDIR%%/isc/log_messages/loadzone_messages.py %%PYTHON_SITELIBDIR%%/isc/log_messages/loadzone_messages.pyc %%PYTHON_SITELIBDIR%%/isc/log_messages/loadzone_messages.pyo +%%PYTHON_SITELIBDIR%%/isc/log_messages/memmgr_messages.py +%%PYTHON_SITELIBDIR%%/isc/log_messages/memmgr_messages.pyc +%%PYTHON_SITELIBDIR%%/isc/log_messages/memmgr_messages.pyo %%PYTHON_SITELIBDIR%%/isc/log_messages/msgq_messages.py %%PYTHON_SITELIBDIR%%/isc/log_messages/msgq_messages.pyc %%PYTHON_SITELIBDIR%%/isc/log_messages/msgq_messages.pyo @@ -310,6 +636,9 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/isc/log_messages/stats_messages.py %%PYTHON_SITELIBDIR%%/isc/log_messages/stats_messages.pyc %%PYTHON_SITELIBDIR%%/isc/log_messages/stats_messages.pyo +%%PYTHON_SITELIBDIR%%/isc/log_messages/util_messages.py +%%PYTHON_SITELIBDIR%%/isc/log_messages/util_messages.pyc +%%PYTHON_SITELIBDIR%%/isc/log_messages/util_messages.pyo %%PYTHON_SITELIBDIR%%/isc/log_messages/xfrin_messages.py %%PYTHON_SITELIBDIR%%/isc/log_messages/xfrin_messages.pyc %%PYTHON_SITELIBDIR%%/isc/log_messages/xfrin_messages.pyo @@ -319,6 +648,18 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/isc/log_messages/zonemgr_messages.py %%PYTHON_SITELIBDIR%%/isc/log_messages/zonemgr_messages.pyc %%PYTHON_SITELIBDIR%%/isc/log_messages/zonemgr_messages.pyo +%%PYTHON_SITELIBDIR%%/isc/memmgr/__init__.py +%%PYTHON_SITELIBDIR%%/isc/memmgr/__init__.pyc +%%PYTHON_SITELIBDIR%%/isc/memmgr/__init__.pyo +%%PYTHON_SITELIBDIR%%/isc/memmgr/builder.py +%%PYTHON_SITELIBDIR%%/isc/memmgr/builder.pyc +%%PYTHON_SITELIBDIR%%/isc/memmgr/builder.pyo +%%PYTHON_SITELIBDIR%%/isc/memmgr/datasrc_info.py +%%PYTHON_SITELIBDIR%%/isc/memmgr/datasrc_info.pyc +%%PYTHON_SITELIBDIR%%/isc/memmgr/datasrc_info.pyo +%%PYTHON_SITELIBDIR%%/isc/memmgr/logger.py +%%PYTHON_SITELIBDIR%%/isc/memmgr/logger.pyc +%%PYTHON_SITELIBDIR%%/isc/memmgr/logger.pyo %%PYTHON_SITELIBDIR%%/isc/net/__init__.py %%PYTHON_SITELIBDIR%%/isc/net/__init__.pyc %%PYTHON_SITELIBDIR%%/isc/net/__init__.pyo @@ -340,6 +681,12 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/isc/server_common/auth_command.py %%PYTHON_SITELIBDIR%%/isc/server_common/auth_command.pyc %%PYTHON_SITELIBDIR%%/isc/server_common/auth_command.pyo +%%PYTHON_SITELIBDIR%%/isc/server_common/bind10_server.py +%%PYTHON_SITELIBDIR%%/isc/server_common/bind10_server.pyc +%%PYTHON_SITELIBDIR%%/isc/server_common/bind10_server.pyo +%%PYTHON_SITELIBDIR%%/isc/server_common/datasrc_clients_mgr.py +%%PYTHON_SITELIBDIR%%/isc/server_common/datasrc_clients_mgr.pyc +%%PYTHON_SITELIBDIR%%/isc/server_common/datasrc_clients_mgr.pyo %%PYTHON_SITELIBDIR%%/isc/server_common/dns_tcp.py %%PYTHON_SITELIBDIR%%/isc/server_common/dns_tcp.pyc %%PYTHON_SITELIBDIR%%/isc/server_common/dns_tcp.pyo @@ -355,6 +702,9 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/isc/statistics/counters.py %%PYTHON_SITELIBDIR%%/isc/statistics/counters.pyc %%PYTHON_SITELIBDIR%%/isc/statistics/counters.pyo +%%PYTHON_SITELIBDIR%%/isc/statistics/dns.py +%%PYTHON_SITELIBDIR%%/isc/statistics/dns.pyc +%%PYTHON_SITELIBDIR%%/isc/statistics/dns.pyo %%PYTHON_SITELIBDIR%%/isc/sysinfo/__init__.py %%PYTHON_SITELIBDIR%%/isc/sysinfo/__init__.pyc %%PYTHON_SITELIBDIR%%/isc/sysinfo/__init__.pyo @@ -382,6 +732,9 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/isc/util/socketserver_mixin.py %%PYTHON_SITELIBDIR%%/isc/util/socketserver_mixin.pyc %%PYTHON_SITELIBDIR%%/isc/util/socketserver_mixin.pyo +%%PYTHON_SITELIBDIR%%/isc/util/traceback_handler.py +%%PYTHON_SITELIBDIR%%/isc/util/traceback_handler.pyc +%%PYTHON_SITELIBDIR%%/isc/util/traceback_handler.pyo %%PYTHON_SITELIBDIR%%/isc/xfrin/__init__.py %%PYTHON_SITELIBDIR%%/isc/xfrin/__init__.pyc %%PYTHON_SITELIBDIR%%/isc/xfrin/__init__.pyo @@ -394,80 +747,139 @@ man/man8/bind10.8.gz %%PYTHON_SITELIBDIR%%/pydnspp.a %%PYTHON_SITELIBDIR%%/pydnspp.la %%PYTHON_SITELIBDIR%%/pydnspp.so -libexec/%%PORTNAME%%/b10-auth -libexec/%%PORTNAME%%/b10-cfgmgr -libexec/%%PORTNAME%%/b10-cmdctl -libexec/%%PORTNAME%%/b10-ddns -libexec/%%PORTNAME%%/b10-dhcp4 -libexec/%%PORTNAME%%/b10-dhcp6 -libexec/%%PORTNAME%%/b10-init -libexec/%%PORTNAME%%/b10-msgq -libexec/%%PORTNAME%%/b10-resolver -libexec/%%PORTNAME%%/b10-sockcreator -libexec/%%PORTNAME%%/b10-stats -libexec/%%PORTNAME%%/b10-stats-httpd -libexec/%%PORTNAME%%/b10-xfrin -libexec/%%PORTNAME%%/b10-xfrout -libexec/%%PORTNAME%%/b10-zonemgr -libexec/%%PORTNAME%%/backends/sqlite3_ds.a -libexec/%%PORTNAME%%/backends/sqlite3_ds.la -libexec/%%PORTNAME%%/backends/sqlite3_ds.so +libdata/pkgconfig/dns++.pc +libexec/bind10/b10-auth +libexec/bind10/b10-cfgmgr +libexec/bind10/b10-cmdctl +libexec/bind10/b10-ddns +libexec/bind10/b10-dhcp-ddns +libexec/bind10/b10-dhcp4 +libexec/bind10/b10-dhcp6 +libexec/bind10/b10-init +libexec/bind10/b10-memmgr +libexec/bind10/b10-msgq +libexec/bind10/b10-sockcreator +libexec/bind10/b10-stats +libexec/bind10/b10-stats-httpd +libexec/bind10/b10-xfrin +libexec/bind10/b10-xfrout +libexec/bind10/b10-zonemgr +libexec/bind10/backends/sqlite3_ds.a +libexec/bind10/backends/sqlite3_ds.la +libexec/bind10/backends/sqlite3_ds.so +man/man1/b10-certgen.1.gz +man/man1/bindctl.1.gz +man/man1/isc-sysinfo.1.gz +man/man1/perfdhcp.1.gz +man/man8/b10-auth.8.gz +man/man8/b10-cfgmgr.8.gz +man/man8/b10-cmdctl-usermgr.8.gz +man/man8/b10-cmdctl.8.gz +man/man8/b10-dbutil.8.gz +man/man8/b10-ddns.8.gz +man/man8/b10-dhcp-ddns.8.gz +man/man8/b10-dhcp4.8.gz +man/man8/b10-dhcp6.8.gz +man/man8/b10-init.8.gz +man/man8/b10-loadzone.8.gz +man/man8/b10-memmgr.8.gz +man/man8/b10-msgq.8.gz +man/man8/b10-sockcreator.8.gz +man/man8/b10-stats-httpd.8.gz +man/man8/b10-stats.8.gz +man/man8/b10-xfrin.8.gz +man/man8/b10-xfrout.8.gz +man/man8/b10-zonemgr.8.gz +man/man8/bind10.8.gz sbin/b10-cmdctl-usermgr sbin/bind10 -share/%%PORTNAME%%/auth.spec -share/%%PORTNAME%%/cmdctl.spec -share/%%PORTNAME%%/config_plugins/b10logging.py -share/%%PORTNAME%%/config_plugins/b10logging.pyc -share/%%PORTNAME%%/config_plugins/b10logging.pyo -share/%%PORTNAME%%/config_plugins/datasrc.spec -share/%%PORTNAME%%/config_plugins/datasrc_config_plugin.py -share/%%PORTNAME%%/config_plugins/datasrc_config_plugin.pyc -share/%%PORTNAME%%/config_plugins/datasrc_config_plugin.pyo -share/%%PORTNAME%%/config_plugins/logging.spec -share/%%PORTNAME%%/config_plugins/tsig_keys.py -share/%%PORTNAME%%/config_plugins/tsig_keys.pyc -share/%%PORTNAME%%/config_plugins/tsig_keys.pyo -share/%%PORTNAME%%/config_plugins/tsig_keys.spec -share/%%PORTNAME%%/ddns.spec -share/%%PORTNAME%%/dhcp4.spec -share/%%PORTNAME%%/dhcp6.spec -share/%%PORTNAME%%/dhcpdb_create.mysql -share/%%PORTNAME%%/init.spec -share/%%PORTNAME%%/msgq.spec -share/%%PORTNAME%%/resolver.spec -share/%%PORTNAME%%/static.zone -share/%%PORTNAME%%/stats-httpd-xml.tpl -share/%%PORTNAME%%/stats-httpd-xsd.tpl -share/%%PORTNAME%%/stats-httpd-xsl.tpl -share/%%PORTNAME%%/stats-httpd.spec -share/%%PORTNAME%%/stats.spec -share/%%PORTNAME%%/xfrin.spec -share/%%PORTNAME%%/xfrout.spec -share/%%PORTNAME%%/zonemgr.spec -@dirrm share/%%PORTNAME%%/config_plugins -@dirrm share/%%PORTNAME%% -@dirrm libexec/%%PORTNAME%%/backends -@dirrm libexec/%%PORTNAME%% -@dirrm %%PYTHON_SITELIBDIR%%/isc/xfrin -@dirrm %%PYTHON_SITELIBDIR%%/isc/util/cio -@dirrm %%PYTHON_SITELIBDIR%%/isc/util -@dirrm %%PYTHON_SITELIBDIR%%/isc/sysinfo -@dirrm %%PYTHON_SITELIBDIR%%/isc/statistics -@dirrm %%PYTHON_SITELIBDIR%%/isc/server_common -@dirrm %%PYTHON_SITELIBDIR%%/isc/notify -@dirrm %%PYTHON_SITELIBDIR%%/isc/net -@dirrm %%PYTHON_SITELIBDIR%%/isc/log_messages -@dirrm %%PYTHON_SITELIBDIR%%/isc/dns -@dirrm %%PYTHON_SITELIBDIR%%/isc/ddns -@dirrm %%PYTHON_SITELIBDIR%%/isc/datasrc -@dirrm %%PYTHON_SITELIBDIR%%/isc/config -@dirrm %%PYTHON_SITELIBDIR%%/isc/cc -@dirrm %%PYTHON_SITELIBDIR%%/isc/bind10 -@dirrm %%PYTHON_SITELIBDIR%%/isc/acl -@dirrm %%PYTHON_SITELIBDIR%%/isc -@dirrm %%PYTHON_SITELIBDIR%%/bindctl -@dirrm include/%%PORTNAME%%/util -@dirrm include/%%PORTNAME%%/exceptions -@dirrm include/%%PORTNAME%%/dns -@dirrm include/%%PORTNAME%% +%%DATADIR%%/auth.spec +%%DATADIR%%/cmdctl.spec +%%DATADIR%%/config_plugins/b10logging.py +%%DATADIR%%/config_plugins/b10logging.pyc +%%DATADIR%%/config_plugins/b10logging.pyo +%%DATADIR%%/config_plugins/datasrc.spec +%%DATADIR%%/config_plugins/datasrc_config_plugin.py +%%DATADIR%%/config_plugins/datasrc_config_plugin.pyc +%%DATADIR%%/config_plugins/datasrc_config_plugin.pyo +%%DATADIR%%/config_plugins/logging.spec +%%DATADIR%%/config_plugins/tsig_keys.py +%%DATADIR%%/config_plugins/tsig_keys.pyc +%%DATADIR%%/config_plugins/tsig_keys.pyo +%%DATADIR%%/config_plugins/tsig_keys.spec +%%DATADIR%%/ddns.spec +%%DATADIR%%/dhcp-ddns.spec +%%DATADIR%%/dhcp4.spec +%%DATADIR%%/dhcp6.spec +%%DATADIR%%/dhcpdb_create.mysql +%%DATADIR%%/dhcpdb_create.pgsql +%%DATADIR%%/init.spec +%%DATADIR%%/memmgr.spec +%%DATADIR%%/msgq.spec +%%DATADIR%%/static.zone +%%DATADIR%%/stats-httpd-xml.tpl +%%DATADIR%%/stats-httpd-xsd.tpl +%%DATADIR%%/stats-httpd-xsl.tpl +%%DATADIR%%/stats-httpd.spec +%%DATADIR%%/stats.spec +%%DATADIR%%/xfrin.spec +%%DATADIR%%/xfrout.spec +%%DATADIR%%/zonemgr.spec +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/bind10-guide.css +%%PORTDOCS%%%%DOCSDIR%%/bind10-guide.html +%%PORTDOCS%%%%DOCSDIR%%/bind10-guide.txt +%%PORTDOCS%%%%DOCSDIR%%/bind10-messages.html +@unexec rmdir "/var/bind10/mapped_files" >/dev/null 2>&1 || : +@unexec rmdir "/var/bind10" >/dev/null 2>&1 || : +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrmtry %%DATADIR%%/config_plugins +@dirrmtry %%DATADIR%% +@dirrmtry libexec/bind10/backends +@dirrmtry libexec/bind10 +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/xfrin +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/util/cio +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/util +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/sysinfo +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/statistics +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/server_common +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/notify +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/net +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/memmgr +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/log_messages +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/dns +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/ddns +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/datasrc +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/config +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/cc +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/bind10 +@dirrmtry %%PYTHON_SITELIBDIR%%/isc/acl +@dirrmtry %%PYTHON_SITELIBDIR%%/isc +@dirrmtry %%PYTHON_SITELIBDIR%%/bindctl +@dirrmtry include/bind10/util +@dirrmtry include/bind10/log +@dirrmtry include/bind10/hooks +@dirrmtry include/bind10/exceptions +@dirrmtry include/bind10/dns +@dirrmtry include/bind10/dhcp +@dirrmtry include/bind10/asiolink +@dirrmtry include/bind10/asio/windows +@dirrmtry include/bind10/asio/ssl/detail +@dirrmtry include/bind10/asio/ssl +@dirrmtry include/bind10/asio/posix +@dirrmtry include/bind10/asio/local/detail/impl +@dirrmtry include/bind10/asio/local/detail +@dirrmtry include/bind10/asio/local +@dirrmtry include/bind10/asio/ip/impl +@dirrmtry include/bind10/asio/ip/detail/impl +@dirrmtry include/bind10/asio/ip/detail +@dirrmtry include/bind10/asio/ip +@dirrmtry include/bind10/asio/impl +@dirrmtry include/bind10/asio/detail/impl +@dirrmtry include/bind10/asio/detail +@dirrmtry include/bind10/asio +@dirrmtry include/bind10 @dirrmtry etc/%%PORTNAME%% From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 13:46:32 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32B8EA6F; Wed, 23 Apr 2014 13:46:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1CEFD1860; Wed, 23 Apr 2014 13:46:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NDkWxX054429; Wed, 23 Apr 2014 13:46:32 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NDkUu6054416; Wed, 23 Apr 2014 13:46:30 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404231346.s3NDkUu6054416@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 23 Apr 2014 13:46:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351941 - in branches/2014Q2/graphics/tulip: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 13:46:32 -0000 Author: gahr Date: Wed Apr 23 13:46:29 2014 New Revision: 351941 URL: http://svnweb.freebsd.org/changeset/ports/351941 QAT: https://qat.redports.org/buildarchive/r351941/ Log: MFH: r351810 graphics/tulip -- depend on graphics/png Approved by: portmgr Added: branches/2014Q2/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp - copied unchanged from r351810, head/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp branches/2014Q2/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h - copied unchanged from r351810, head/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h branches/2014Q2/graphics/tulip/files/patch-software-tulip-src_main.cpp - copied unchanged from r351810, head/graphics/tulip/files/patch-software-tulip-src_main.cpp branches/2014Q2/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp - copied unchanged from r351810, head/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp branches/2014Q2/graphics/tulip/files/patch-thirdparty_CMakeLists.txt - copied unchanged from r351810, head/graphics/tulip/files/patch-thirdparty_CMakeLists.txt Deleted: branches/2014Q2/graphics/tulip/files/patch-CMakeLists.txt branches/2014Q2/graphics/tulip/files/patch-UseTulip.cmake branches/2014Q2/graphics/tulip/files/patch-library-tulip-include-tulip_ConsoleUtils.h branches/2014Q2/graphics/tulip/files/patch-library-tulip-src_CMakeLists.txt branches/2014Q2/graphics/tulip/files/patch-opengl branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_StackWalker.h branches/2014Q2/graphics/tulip/files/patch-thirdparty-OGDF-ogdf-basic_basic.h branches/2014Q2/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp branches/2014Q2/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt Modified: branches/2014Q2/graphics/tulip/Makefile branches/2014Q2/graphics/tulip/distinfo branches/2014Q2/graphics/tulip/files/patch-dirent branches/2014Q2/graphics/tulip/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/tulip/Makefile ============================================================================== --- branches/2014Q2/graphics/tulip/Makefile Wed Apr 23 13:38:53 2014 (r351940) +++ branches/2014Q2/graphics/tulip/Makefile Wed Apr 23 13:46:29 2014 (r351941) @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= tulip -PORTVERSION= 3.8.0 -PORTREVISION= 2 +PORTVERSION= 4.5.0 CATEGORIES= graphics MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION} -DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} +DISTNAME= ${PORTNAME}-${PORTVERSION}_src MAINTAINER= gahr@FreeBSD.org -COMMENT= A system dedicated to the visualization of huge graphs +COMMENT= System dedicated to the visualization of huge graphs LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ gzstream.0:${PORTSDIR}/devel/gzstream \ @@ -17,38 +16,40 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/prin qscintilla2:${PORTSDIR}/devel/qscintilla2 \ jpeg.11:${PORTSDIR}/graphics/jpeg -USE_QT4= corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \ - designer assistant assistantclient +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libQxtCore.so:${PORTSDIR}/devel/libqxt \ + libOGDF.so:${PORTSDIR}/math/ogdf \ + libpng.so:${PORTSDIR}/graphics/png + +USES= cmake:outsource compiler:c++11-lib shebangfix dos2unix +SHEBANG_FILES= tulip-config.in +DOS2UNIX_FILES= software/tulip/src/main.cpp +USE_CXXSTD= c++11 USE_GL= glew glut USE_GNOME= libxml2 USE_PYTHON= yes -USES= cmake:outsource -CMAKE_ARGS+= -DLOCALBASE:PATH=${LOCALBASE} \ - -DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR} -USE_LDCONFIG= ${PREFIX}/lib/tlp +USE_QT4= corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \ + designer assistant assistantclient +CXXFLAGS+= -fPIC -I${LOCALBASE}/include -DNDEBUG -g -O0 +LDFLAGS+= -L${LOCALBASE}/lib +CMAKE_ARGS+= -DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR} \ + -DLOCALBASE:PATH=${LOCALBASE} \ + -DOGDFLibrary=${LOCALBASE}/lib/libOGDF.so \ + -DOGDFInclude=${LOCALBASE}/include +USE_LDCONFIG= ${PREFIX}/lib/tulip -WRKSRC= ${WRKDIR}/${DISTNAME}-src +WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_SUB+= TULIP_VERSION=${PORTVERSION} \ TULIP_VERS=${PORTVERSION:R} -NO_STAGE= yes -.include - -.if ${ARCH} == "amd64" || ${ARCH} == "ia64" -CFLAGS+= -fPIC -.endif - -.if ${OSVERSION} < 800000 -BROKEN= does not compile on FreeBSD 7.X -.endif +.include -.if !defined(NOPORTDOCS) -DISTFILES+= ${PORTNAME}-${PORTVERSION}-html.tar.bz2 +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= * post-install: - ${INSTALL} -d ${DOCSDIR} - (cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}-html && ${COPYTREE_SHARE} \* ${DOCSDIR}) + ${INSTALL} -d ${STAGEDIR}${DOCSDIR} + (cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}-html && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) .endif -.include +.include Modified: branches/2014Q2/graphics/tulip/distinfo ============================================================================== --- branches/2014Q2/graphics/tulip/distinfo Wed Apr 23 13:38:53 2014 (r351940) +++ branches/2014Q2/graphics/tulip/distinfo Wed Apr 23 13:46:29 2014 (r351941) @@ -1,4 +1,2 @@ -SHA256 (tulip-3.8.0-src.tar.gz) = 2b938ec1894b81bdd798d04d172a853dbd99b8660895c1dc3e8e2019fb1e42d4 -SIZE (tulip-3.8.0-src.tar.gz) = 23052697 -SHA256 (tulip-3.8.0-html.tar.bz2) = fcc9d7db32cb4d8a0c4f27693bae54a5c5482ca513d652effcbae21687ea75a0 -SIZE (tulip-3.8.0-html.tar.bz2) = 48553953 +SHA256 (tulip-4.5.0_src.tar.gz) = b3c776e2f029765749b93ea0b396faea7922341d2b57fc83024d21a1df5abfa5 +SIZE (tulip-4.5.0_src.tar.gz) = 78391448 Modified: branches/2014Q2/graphics/tulip/files/patch-dirent ============================================================================== --- branches/2014Q2/graphics/tulip/files/patch-dirent Wed Apr 23 13:38:53 2014 (r351940) +++ branches/2014Q2/graphics/tulip/files/patch-dirent Wed Apr 23 13:46:29 2014 (r351941) @@ -1,6 +1,6 @@ ---- library/tulip/src/PluginLibraryLoader.cpp.orig 2012-06-11 09:46:14.000000000 +0200 -+++ library/tulip/src/PluginLibraryLoader.cpp 2012-06-13 09:50:05.000000000 +0200 -@@ -191,7 +191,14 @@ +--- library/tulip-core/src/PluginLibraryLoader.cpp.orig 2014-03-25 10:10:30.000000000 +0100 ++++ library/tulip-core/src/PluginLibraryLoader.cpp 2014-04-01 13:50:00.000000000 +0200 +@@ -130,7 +130,14 @@ } // accepts only file whose name matches *.so or *.dylib @@ -15,12 +15,3 @@ #if !defined(__APPLE__) const char *suffix = ".so"; const unsigned long suffix_len = 3; -@@ -216,7 +223,7 @@ - struct dirent **namelist; - n = scandir((const char *) _pluginPath.c_str(), - &namelist, --#if !(defined(__APPLE__) || defined(__FreeBSD__)) -+#if !defined(__APPLE__) - (int (*) (const dirent *)) - #endif - __tulip_select_libs, Copied: branches/2014Q2/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp (from r351810, head/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp Wed Apr 23 13:46:29 2014 (r351941, copy of r351810, head/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp) @@ -0,0 +1,11 @@ +--- plugins/view/HistogramView/HistogramStatistics.cpp.orig 2014-04-18 12:05:56.000000000 +0200 ++++ plugins/view/HistogramView/HistogramStatistics.cpp 2014-04-18 12:07:56.000000000 +0200 +@@ -30,7 +30,7 @@ + #include "HistoStatsConfigWidget.h" + #include "HistogramView.h" + +-#if defined(_MSC_VER) || (defined(__clang_major__) && __clang_major__ > 4) ++#if defined(_MSC_VER) || (defined(__clang_major__) && __clang_major__ > 4) || defined(__FreeBSD__) + + #include + Copied: branches/2014Q2/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h (from r351810, head/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h Wed Apr 23 13:46:29 2014 (r351941, copy of r351810, head/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h) @@ -0,0 +1,11 @@ +--- software/tulip/include/TulipPerspectiveProcessHandler.h.orig 2014-04-18 11:41:35.000000000 +0200 ++++ software/tulip/include/TulipPerspectiveProcessHandler.h 2014-04-18 11:47:38.000000000 +0200 +@@ -27,6 +27,8 @@ + + #include + ++#include ++ + // Some utility class used in crash handler dialog designer form + + class SelectionButton: public QPushButton { Copied: branches/2014Q2/graphics/tulip/files/patch-software-tulip-src_main.cpp (from r351810, head/graphics/tulip/files/patch-software-tulip-src_main.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-software-tulip-src_main.cpp Wed Apr 23 13:46:29 2014 (r351941, copy of r351810, head/graphics/tulip/files/patch-software-tulip-src_main.cpp) @@ -0,0 +1,12 @@ +--- software/tulip/src/main.cpp.orig 2014-04-18 11:56:26.000000000 +0200 ++++ software/tulip/src/main.cpp 2014-04-18 11:56:38.000000000 +0200 +@@ -119,7 +119,9 @@ + } + + int main(int argc, char **argv) { ++#ifndef __FreeBSD__ + start_crash_handler(); ++#endif + + + Copied: branches/2014Q2/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp (from r351810, head/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp Wed Apr 23 13:46:29 2014 (r351941, copy of r351810, head/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp) @@ -0,0 +1,12 @@ +--- software/tulip_perspective/src/main.cpp.orig 2014-04-18 11:58:12.000000000 +0200 ++++ software/tulip_perspective/src/main.cpp 2014-04-18 11:58:27.000000000 +0200 +@@ -129,7 +129,9 @@ + } + + int main(int argc,char **argv) { ++#ifndef __FreeBSD__ + start_crash_handler(); ++#endif + + QString appName("Tulip "); + QString iconPath; Copied: branches/2014Q2/graphics/tulip/files/patch-thirdparty_CMakeLists.txt (from r351810, head/graphics/tulip/files/patch-thirdparty_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-thirdparty_CMakeLists.txt Wed Apr 23 13:46:29 2014 (r351941, copy of r351810, head/graphics/tulip/files/patch-thirdparty_CMakeLists.txt) @@ -0,0 +1,11 @@ +--- thirdparty/CMakeLists.txt.orig 2014-04-18 10:22:25.000000000 +0200 ++++ thirdparty/CMakeLists.txt 2014-04-18 10:22:30.000000000 +0200 +@@ -2,7 +2,7 @@ + + ADD_SUBDIRECTORY(gzstream) + ADD_SUBDIRECTORY(ftgl) +-ADD_SUBDIRECTORY(OGDF) ++#ADD_SUBDIRECTORY(OGDF) + ADD_SUBDIRECTORY(quazip) + ADD_SUBDIRECTORY(yajl) + ADD_SUBDIRECTORY(qxt) Modified: branches/2014Q2/graphics/tulip/pkg-plist ============================================================================== --- branches/2014Q2/graphics/tulip/pkg-plist Wed Apr 23 13:38:53 2014 (r351940) +++ branches/2014Q2/graphics/tulip/pkg-plist Wed Apr 23 13:46:29 2014 (r351941) @@ -1,85 +1,64 @@ bin/tulip bin/tulip-config -bin/tulip_app -bin/tulip_need_restart +bin/tulip_perspective +include/tulip/APIDataBase.h include/tulip/AbstractGlCurve.h include/tulip/AbstractProperty.h -include/tulip/AbstractView.h include/tulip/AcyclicTest.h include/tulip/Algorithm.h +include/tulip/Animation.h include/tulip/Array.h -include/tulip/AugmentedDisplayDialog.h -include/tulip/AugmentedDisplayDialogData.h -include/tulip/BaseGraphicsViewComponent.h -include/tulip/BaseGraphicsViewComponentMacro.h +include/tulip/AutoCompletionDataBase.h include/tulip/Bfs.h include/tulip/BiconnectedTest.h -include/tulip/BooleanAlgorithm.h include/tulip/BooleanProperty.h include/tulip/BoundingBox.h include/tulip/CSVContentHandler.h include/tulip/CSVGraphImport.h include/tulip/CSVGraphMappingConfigurationWidget.h -include/tulip/CSVGraphMappingConfigurationWidgetData.h include/tulip/CSVImportConfigurationWidget.h -include/tulip/CSVImportConfigurationWidgetData.h include/tulip/CSVImportWizard.h -include/tulip/CSVImportWizardData.h include/tulip/CSVParser.h include/tulip/CSVParserConfigurationWidget.h -include/tulip/CSVParserConfigurationWidgetData.h +include/tulip/CachedPropertyAnimation.h include/tulip/Camera.h -include/tulip/ChooseFileNameDialogData.h +include/tulip/CaptionGraphicsItem.h +include/tulip/CaptionGraphicsSubItems.h +include/tulip/CaptionItem.h include/tulip/Circle.h +include/tulip/ClearableLineEdit.h include/tulip/Color.h -include/tulip/ColorAlgorithm.h include/tulip/ColorButton.h include/tulip/ColorProperty.h +include/tulip/ColorPropertyAnimation.h include/tulip/ColorScale.h +include/tulip/ColorScaleButton.h include/tulip/ColorScaleConfigDialog.h -include/tulip/ColorScaleConfigDialogData.h include/tulip/ColorScaleWidget.h include/tulip/ConcatIterator.h include/tulip/ConnectedTest.h include/tulip/ConsoleUtils.h -include/tulip/Controller.h -include/tulip/ControllerAlgorithmTools.h -include/tulip/ControllerPluginsManager.h -include/tulip/ControllerViewsManager.h -include/tulip/ControllerViewsTools.h include/tulip/ConvexHull.h include/tulip/Coord.h -include/tulip/CoordWidget.h -include/tulip/CoordWidgetData.h +include/tulip/CoordEditor.h include/tulip/CopyPropertyDialog.h -include/tulip/CopyPropertyDialogData.h include/tulip/Curves.h include/tulip/DataSet.h include/tulip/Delaunay.h -include/tulip/DoubleAlgorithm.h include/tulip/DoubleProperty.h +include/tulip/DoublePropertyAnimation.h include/tulip/DoubleStringsListSelectionWidget.h -include/tulip/DoubleStringsListSelectionWidgetData.h +include/tulip/DownloadManager.h +include/tulip/DragHandle.h include/tulip/DrawingTools.h include/tulip/Edge.h include/tulip/EdgeExtremityGlyph.h include/tulip/EdgeExtremityGlyphManager.h -include/tulip/ElementPropertiesWidget.h -include/tulip/ElementPropertiesWidgetPlugin.h -include/tulip/ElementPropertiesWidgetUI.h include/tulip/ExportModule.h -include/tulip/ExtendedClusterOperation.h include/tulip/Face.h include/tulip/FaceIterator.h -include/tulip/FileNameEditorWidget.h -include/tulip/FileNameEditorWidgetData.h -include/tulip/FindSelectionData.h -include/tulip/FindSelectionWidget.h include/tulip/ForEach.h -include/tulip/ForegroundEntity.h -include/tulip/GWOverviewWidget.h -include/tulip/GWOverviewWidgetData.h -include/tulip/GWOverviewWidgetPlugin.h +include/tulip/GLInteractor.h include/tulip/Gl2DRect.h include/tulip/GlAbstractPolygon.h include/tulip/GlAxis.h @@ -98,14 +77,17 @@ include/tulip/GlConvexGraphHull.h include/tulip/GlConvexHull.h include/tulip/GlCubicBSplineInterpolation.h include/tulip/GlCurve.h -include/tulip/GlCylinder.h include/tulip/GlDisplayListManager.h include/tulip/GlEdge.h include/tulip/GlEntity.h include/tulip/GlFeedBackBuilder.h include/tulip/GlFeedBackRecorder.h +include/tulip/GlGlyphRenderer.h include/tulip/GlGraphComposite.h +include/tulip/GlGraphHighDetailsRenderer.h include/tulip/GlGraphInputData.h +include/tulip/GlGraphLowDetailsRenderer.h +include/tulip/GlGraphRenderer.h include/tulip/GlGraphRenderingParameters.h include/tulip/GlGraphStaticData.h include/tulip/GlGrid.h @@ -118,16 +100,13 @@ include/tulip/GlLine.h include/tulip/GlLines.h include/tulip/GlMainView.h include/tulip/GlMainWidget.h -include/tulip/GlMainWidgetGraphicsView.h -include/tulip/GlMainWidgetItem.h -include/tulip/GlMainWidgetPlugin.h -include/tulip/GlMetaNode.h +include/tulip/GlMainWidgetGraphicsItem.h include/tulip/GlMetaNodeRenderer.h -include/tulip/GlMetaNodeTrueRenderer.h include/tulip/GlNode.h include/tulip/GlNominativeAxis.h include/tulip/GlOffscreenRenderer.h include/tulip/GlOpenUniformCubicBSpline.h +include/tulip/GlOverviewGraphicsItem.h include/tulip/GlPentagon.h include/tulip/GlPolyQuad.h include/tulip/GlPolygon.h @@ -136,7 +115,6 @@ include/tulip/GlQuad.h include/tulip/GlQuadTreeLODCalculator.h include/tulip/GlQuantitativeAxis.h include/tulip/GlRect.h -include/tulip/GlRectTextured.h include/tulip/GlRegularPolygon.h include/tulip/GlScene.h include/tulip/GlSceneObserver.h @@ -145,7 +123,9 @@ include/tulip/GlSceneZoomAndPan.h include/tulip/GlSelectSceneVisitor.h include/tulip/GlShaderProgram.h include/tulip/GlSimpleEntity.h +include/tulip/GlSimpleEntityItemModel.h include/tulip/GlSphere.h +include/tulip/GlStar.h include/tulip/GlTLPFeedBackBuilder.h include/tulip/GlTextureManager.h include/tulip/GlTools.h @@ -155,35 +135,31 @@ include/tulip/GlVertexArrayVisitor.h include/tulip/GlXMLTools.h include/tulip/Glyph.h include/tulip/GlyphManager.h +include/tulip/GlyphRenderer.h include/tulip/Graph.h +include/tulip/GraphAbstract.h include/tulip/GraphDecorator.h +include/tulip/GraphElementModel.h +include/tulip/GraphHierarchiesModel.h include/tulip/GraphMeasure.h +include/tulip/GraphModel.h +include/tulip/GraphNeedsSavingObserver.h +include/tulip/GraphPropertiesModel.h include/tulip/GraphPropertiesSelectionWidget.h -include/tulip/GraphPropertiesTableWidget.h include/tulip/GraphProperty.h +include/tulip/GraphTableItemDelegate.h +include/tulip/GraphTest.h include/tulip/GraphTools.h -include/tulip/GraphicsWidgetBase.h -include/tulip/GridOptionsData.h -include/tulip/GridOptionsWidget.h include/tulip/ImportModule.h -include/tulip/IntegerAlgorithm.h include/tulip/IntegerProperty.h include/tulip/Interactor.h -include/tulip/InteractorChainOfResponsibility.h -include/tulip/InteractorComponent.h -include/tulip/InteractorManager.h +include/tulip/InteractorComposite.h include/tulip/ItemsListWidget.h include/tulip/Iterator.h -include/tulip/LayerManagerWidget.h -include/tulip/LayerManagerWidgetData.h -include/tulip/LayoutAlgorithm.h include/tulip/LayoutProperty.h -include/tulip/ListPropertyWidgetData.h -include/tulip/MainController.h +include/tulip/LayoutPropertyAnimation.h include/tulip/MapIterator.h include/tulip/Matrix.h -include/tulip/MethodFactory.h -include/tulip/Morphing.h include/tulip/MouseBoxZoomer.h include/tulip/MouseEdgeBendEditor.h include/tulip/MouseEdgeBuilder.h @@ -196,254 +172,324 @@ include/tulip/MouseShowElementInfos.h include/tulip/MutableContainer.h include/tulip/Node.h include/tulip/NodeLinkDiagramComponent.h +include/tulip/NodeLinkDiagramComponentInteractor.h +include/tulip/NumericProperty.h include/tulip/Observable.h -include/tulip/ObservableGraph.h -include/tulip/ObservableProperty.h include/tulip/OcclusionTest.h include/tulip/OpenGlConfigManager.h -include/tulip/OpenGlErrorViewer.h include/tulip/Ordering.h include/tulip/OuterPlanarTest.h +include/tulip/ParameterListModel.h include/tulip/ParametricCurves.h +include/tulip/Perspective.h +include/tulip/PlaceHolderWidget.h include/tulip/PlanarConMap.h include/tulip/PlanarityTest.h include/tulip/Plugin.h include/tulip/PluginContext.h include/tulip/PluginLibraryLoader.h +include/tulip/PluginLister.h include/tulip/PluginLoader.h include/tulip/PluginLoaderTxt.h +include/tulip/PluginModel.h include/tulip/PluginProgress.h -include/tulip/PluginProgressWidget.h -include/tulip/PluginProgressWidgetData.h -include/tulip/PreferenceManager.h +include/tulip/ProcessingAnimationItem.h +include/tulip/PropertyAlgorithm.h +include/tulip/PropertyAnimation.h include/tulip/PropertyCreationDialog.h -include/tulip/PropertyCreationDialogData.h -include/tulip/PropertyDialog.h -include/tulip/PropertyDialogData.h include/tulip/PropertyInterface.h include/tulip/PropertyTypes.h -include/tulip/PropertyWidget.h -include/tulip/PropertyWidgetPlugin.h +include/tulip/PropertyWrapper.h +include/tulip/PythonCodeEditor.h +include/tulip/PythonCppTypesConverter.h +include/tulip/PythonEditorsTabWidget.h +include/tulip/PythonInterpreter.cxx +include/tulip/PythonInterpreter.h +include/tulip/PythonShellWidget.h +include/tulip/PythonVersionChecker.h include/tulip/QGlBufferManager.h include/tulip/QGlPixelBufferManager.h include/tulip/QtGlSceneZoomAndPanAnimator.h -include/tulip/QtOpenGlErrorViewer.h -include/tulip/QtOpenGlErrorViewerWithAskAgainDialogData.h -include/tulip/QtProgress.h +include/tulip/QuaZIPFacade.h include/tulip/QuadTree.h +include/tulip/QuickAccessBar.h include/tulip/Rectangle.h -include/tulip/Reflect.h -include/tulip/RenderingParametersDialog.h -include/tulip/RenderingParametersDialogData.h -include/tulip/SGHierarchyWidget.h -include/tulip/SGHierarchyWidgetPlugin.h +include/tulip/RenamePropertyDialog.h +include/tulip/SceneConfigWidget.h +include/tulip/SceneLayersConfigWidget.h +include/tulip/ScrollPopupButton.h +include/tulip/SerializableType.h include/tulip/SimplePluginProgress.h +include/tulip/SimplePluginProgressWidget.h include/tulip/SimpleStringsListSelectionWidget.h -include/tulip/SimpleStringsListSelectionWidgetData.h include/tulip/SimpleTest.h include/tulip/Size.h -include/tulip/SizeAlgorithm.h include/tulip/SizeProperty.h -include/tulip/SizeWidget.h -include/tulip/SizeWidgetData.h -include/tulip/SmallMultiplesNavigatorComponent.h -include/tulip/SmallMultiplesView.h +include/tulip/SizePropertyAnimation.h include/tulip/SnapshotDialog.h -include/tulip/SnapshotDialogData.h include/tulip/SortIterator.h include/tulip/StableIterator.h include/tulip/StlFunctions.h include/tulip/StlIterator.h include/tulip/StoredType.h -include/tulip/StringAlgorithm.h include/tulip/StringCollection.h include/tulip/StringProperty.h include/tulip/StringsListSelectionWidget.h include/tulip/StringsListSelectionWidgetInterface.h -include/tulip/TabWidget.h -include/tulip/TabWidgetData.h -include/tulip/TabWidgetHidableMenuGraphicsProxy.h -include/tulip/TemplateFactory.h -include/tulip/TextEditDialog.h -include/tulip/TextEditDialogData.h -include/tulip/TextRenderer.h -include/tulip/ThreadedComputeProperty.h -include/tulip/TlpNetworkAccess.h +include/tulip/SystemDefinition.h +include/tulip/TemplateAlgorithm.h include/tulip/TlpQtTools.h include/tulip/TlpTools.h include/tulip/TreeTest.h +include/tulip/TreeViewComboBox.h include/tulip/TriconnectedTest.h include/tulip/TulipException.h -include/tulip/TulipPlugin.h +include/tulip/TulipFileDescriptorWidget.h +include/tulip/TulipFont.h +include/tulip/TulipFontDialog.h +include/tulip/TulipItemDelegate.h +include/tulip/TulipItemEditorCreators.h +include/tulip/TulipMetaTypes.h +include/tulip/TulipMimes.h +include/tulip/TulipModel.h +include/tulip/TulipParallelAnimationGroup.h +include/tulip/TulipPluginHeaders.h +include/tulip/TulipProject.h include/tulip/TulipRelease.h include/tulip/TulipSettings.h -include/tulip/TulipTableWidget.h +include/tulip/TulipViewSettings.h +include/tulip/TypeInterface.h include/tulip/Vector.h include/tulip/VectorCast.h +include/tulip/VectorEditionWidget.h +include/tulip/VectorPropertyAnimation.h include/tulip/View.h -include/tulip/ViewPluginsManager.h +include/tulip/ViewWidget.h include/tulip/WithDependency.h include/tulip/WithParameter.h +include/tulip/Workspace.h +include/tulip/WorkspaceExposeWidget.h +include/tulip/WorkspacePanel.h +include/tulip/YajlFacade.h include/tulip/conversioniterator.h include/tulip/cxx/AbstractProperty.cxx include/tulip/cxx/Array.cxx +include/tulip/cxx/CachedPropertyAnimation.cxx include/tulip/cxx/Circle.cxx +include/tulip/cxx/DataSet.cxx include/tulip/cxx/Graph.cxx +include/tulip/cxx/GraphPropertiesModel.cxx include/tulip/cxx/Matrix.cxx -include/tulip/cxx/Reflect.cxx -include/tulip/cxx/TemplateFactory.cxx +include/tulip/cxx/MutableContainer.cxx +include/tulip/cxx/PropertyAnimation.cxx +include/tulip/cxx/TulipItemDelegate.cxx +include/tulip/cxx/TulipItemEditorCreators.cxx include/tulip/cxx/Vector.cxx +include/tulip/cxx/VectorPropertyAnimation.cxx +include/tulip/cxx/minmaxproperty.cxx include/tulip/filteriterator.h include/tulip/memorypool.h -include/tulip/stlfilteriterator.h +include/tulip/minmaxproperty.h include/tulip/tulipconf.h include/tulip/tuliphash.h include/tulip/uniqueiterator.h include/tulip/vectorgraph.h include/tulip/vectorgraphproperty.h -lib/tlp/glyphs/libBillboard-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libChristmasTree-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCircle-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCone-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCross-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCube-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCubeOutlinedTransparent-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libDiamond-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libGlowSphere-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libHexagone-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libPentagone-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libRing-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libRoundedBox-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libSphere-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libSquare-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libTriangle-%%TULIP_VERSION%%.so -lib/tlp/glyphs/libWindow-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorAddEdge-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorAddNode-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorDeleteElement-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorEditEdgeBends-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorGetInformation-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorMagicSelection-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorNavigation-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorRectangleZoom-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorSelection-%%TULIP_VERSION%%.so -lib/tlp/interactors/libInteractorSelectionModifier-%%TULIP_VERSION%%.so -lib/tlp/libAdjacencyMatrixImport-%%TULIP_VERSION%%.so -lib/tlp/libAutoSize-%%TULIP_VERSION%%.so -lib/tlp/libBetweennessCentrality-%%TULIP_VERSION%%.so -lib/tlp/libBiconnectedComponent-%%TULIP_VERSION%%.so -lib/tlp/libBubbleTree-%%TULIP_VERSION%%.so -lib/tlp/libCircular-%%TULIP_VERSION%%.so -lib/tlp/libClusterMetric-%%TULIP_VERSION%%.so -lib/tlp/libColorMapping-%%TULIP_VERSION%%.so -lib/tlp/libCompleteGraph-%%TULIP_VERSION%%.so -lib/tlp/libCompleteTree-%%TULIP_VERSION%%.so -lib/tlp/libConeTreeExtended-%%TULIP_VERSION%%.so -lib/tlp/libConnectedComponent-%%TULIP_VERSION%%.so -lib/tlp/libConnectedComponentPacking-%%TULIP_VERSION%%.so -lib/tlp/libConvolutionClustering-%%TULIP_VERSION%%.so -lib/tlp/libDagLevelMetric-%%TULIP_VERSION%%.so -lib/tlp/libDegreeMetric-%%TULIP_VERSION%%.so -lib/tlp/libDendrogram-%%TULIP_VERSION%%.so -lib/tlp/libDepthMetric-%%TULIP_VERSION%%.so -lib/tlp/libDotImport-%%TULIP_VERSION%%.so -lib/tlp/libEccentricity-%%TULIP_VERSION%%.so -lib/tlp/libEqualValueClustering-%%TULIP_VERSION%%.so -lib/tlp/libFileSystem-%%TULIP_VERSION%%.so -lib/tlp/libFitToLabels-%%TULIP_VERSION%%.so -lib/tlp/libGMLExport-%%TULIP_VERSION%%.so -lib/tlp/libGMLImport-%%TULIP_VERSION%%.so -lib/tlp/libGemLayout-%%TULIP_VERSION%%.so -lib/tlp/libGrid-%%TULIP_VERSION%%.so -lib/tlp/libHierarchicalClustering-%%TULIP_VERSION%%.so -lib/tlp/libHierarchicalGraph-%%TULIP_VERSION%%.so -lib/tlp/libIdMetric-%%TULIP_VERSION%%.so -lib/tlp/libImportPajek-%%TULIP_VERSION%%.so -lib/tlp/libImportUCINET-%%TULIP_VERSION%%.so -lib/tlp/libImprovedWalker-%%TULIP_VERSION%%.so -lib/tlp/libInducedSubGraphSelection-%%TULIP_VERSION%%.so -lib/tlp/libKruskal-%%TULIP_VERSION%%.so -lib/tlp/libLeafMetric-%%TULIP_VERSION%%.so -lib/tlp/libLoopSelection-%%TULIP_VERSION%%.so -lib/tlp/libMetricSizeMapping-%%TULIP_VERSION%%.so -lib/tlp/libMixedModel-%%TULIP_VERSION%%.so -lib/tlp/libMultipleSelection-%%TULIP_VERSION%%.so -lib/tlp/libNodeMetric-%%TULIP_VERSION%%.so -lib/tlp/libOGDF.so -lib/tlp/libPathLengthMetric-%%TULIP_VERSION%%.so -lib/tlp/libPlanarGraph-%%TULIP_VERSION%%.so -lib/tlp/libQuotientClustering-%%TULIP_VERSION%%.so -lib/tlp/libRandom-%%TULIP_VERSION%%.so -lib/tlp/libRandomGraph-%%TULIP_VERSION%%.so -lib/tlp/libRandomMetric-%%TULIP_VERSION%%.so -lib/tlp/libRandomSimpleGraph-%%TULIP_VERSION%%.so -lib/tlp/libRandomTree-%%TULIP_VERSION%%.so -lib/tlp/libRandomTreeGeneral-%%TULIP_VERSION%%.so -lib/tlp/libReachableSubGraphSelection-%%TULIP_VERSION%%.so -lib/tlp/libSmallWorldGraph-%%TULIP_VERSION%%.so -lib/tlp/libSpanningDagSelection-%%TULIP_VERSION%%.so -lib/tlp/libSpanningTreeSelection-%%TULIP_VERSION%%.so -lib/tlp/libSquarifiedTreeMap-%%TULIP_VERSION%%.so -lib/tlp/libStrahlerMetric-%%TULIP_VERSION%%.so -lib/tlp/libStrengthClustering-%%TULIP_VERSION%%.so -lib/tlp/libStrengthMetric-%%TULIP_VERSION%%.so -lib/tlp/libStrongComponent-%%TULIP_VERSION%%.so -lib/tlp/libTreeLeaf-%%TULIP_VERSION%%.so -lib/tlp/libTreeRadial-%%TULIP_VERSION%%.so -lib/tlp/libTreeReingoldAndTilforExtended-%%TULIP_VERSION%%.so -lib/tlp/libTutte-%%TULIP_VERSION%%.so -lib/tlp/libWebImport-%%TULIP_VERSION%%.so -lib/tlp/libDelaunay-%%TULIP_VERSION%%.so -lib/tlp/libVoronoi-%%TULIP_VERSION%%.so -lib/tlp/libGEXFImport-%%TULIP_VERSION%%.so -lib/tlp/libftgl.so -lib/tlp/libgzstream.so -lib/tlp/libogdfballoon-%%TULIP_VERSION%%.so -lib/tlp/libogdfcircular-%%TULIP_VERSION%%.so -lib/tlp/libogdfdavidsonharel-%%TULIP_VERSION%%.so -lib/tlp/libogdfdominance-%%TULIP_VERSION%%.so -lib/tlp/libogdffastmultipoleembedder-%%TULIP_VERSION%%.so -lib/tlp/libogdffastmultipolemultilevelembedder-%%TULIP_VERSION%%.so -lib/tlp/libogdffm3-%%TULIP_VERSION%%.so -lib/tlp/libogdffrutchermanreingold-%%TULIP_VERSION%%.so -lib/tlp/libogdfgemfrick-%%TULIP_VERSION%%.so -lib/tlp/libogdfkamadakawai-%%TULIP_VERSION%%.so -lib/tlp/libogdfmmmexamplefastlayout-%%TULIP_VERSION%%.so -lib/tlp/libogdfmmmexamplenicelayout-%%TULIP_VERSION%%.so -lib/tlp/libogdfmmmexamplenotwistlayout-%%TULIP_VERSION%%.so -lib/tlp/libogdfplanarizationgrid-%%TULIP_VERSION%%.so -lib/tlp/libogdfstressmajorization-%%TULIP_VERSION%%.so -lib/tlp/libogdfsugiyama-%%TULIP_VERSION%%.so -lib/tlp/libogdftree-%%TULIP_VERSION%%.so -lib/tlp/libogdfupwardplanarization-%%TULIP_VERSION%%.so -lib/tlp/libogdfvisibility-%%TULIP_VERSION%%.so -lib/tlp/libtulip-%%TULIP_VERS%%.so -lib/tlp/libtulip-ogdf-%%TULIP_VERS%%.so -lib/tlp/libtulip-ogl-%%TULIP_VERS%%.so -lib/tlp/libtulip-qt4-%%TULIP_VERS%%.so -lib/tlp/python/sip.so -lib/tlp/python/stl.so -lib/tlp/python/tulip.so -lib/tlp/python/tulipplugins.py -lib/tlp/python/tulipogl.so -lib/tlp/python/tulipgui.so -lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.so -lib/tlp/view/libpythonscriptview-%%TULIP_VERSION%%.so +include/tulip2ogdf/OGDFLayoutPluginBase.h +include/tulip2ogdf/TulipToOGDF.h +lib/libftgl-tulip-%%TULIP_VERS%%.so +lib/libftgl-tulip-%%TULIP_VERS%%.so.2 +lib/libftgl-tulip-%%TULIP_VERS%%.so.2.1 +lib/libgzstream-tulip-%%TULIP_VERS%%.so +lib/libgzstream-tulip-%%TULIP_VERS%%.so.0 +lib/libquazip-tulip-%%TULIP_VERS%%.so +lib/libquazip-tulip-%%TULIP_VERS%%.so.1 +lib/libquazip-tulip-%%TULIP_VERS%%.so.1.0.0 +lib/libqxt-tulip-%%TULIP_VERS%%.so +lib/libqxt-tulip-%%TULIP_VERS%%.so.0 +lib/libtulip-core-%%TULIP_VERS%%.so +lib/libtulip-gui-%%TULIP_VERS%%.so +lib/libtulip-ogdf-%%TULIP_VERS%%.so +lib/libtulip-ogl-%%TULIP_VERS%%.so +lib/libtulip-python-%%TULIP_VERS%%.so +lib/libyajl-tulip-%%TULIP_VERS%%.so +lib/libyajl-tulip-%%TULIP_VERS%%.so.2 +lib/libyajl-tulip-%%TULIP_VERS%%.so.2.0.1 +lib/python/facebook.py +lib/python/sip.so +lib/python/stl.so +lib/python/tulip.so +lib/python/tulip_facebook.py +lib/python/tulipgui.so +lib/python/tulipogl.so +lib/python/tulipplugins.py +lib/tulip/glyph/libBillboard-%%TULIP_VERSION%%.so +lib/tulip/glyph/libChristmasTree-%%TULIP_VERSION%%.so +lib/tulip/glyph/libCircle-%%TULIP_VERSION%%.so +lib/tulip/glyph/libCone-%%TULIP_VERSION%%.so +lib/tulip/glyph/libCross-%%TULIP_VERSION%%.so +lib/tulip/glyph/libCube-%%TULIP_VERSION%%.so +lib/tulip/glyph/libCubeOutlinedTransparent-%%TULIP_VERSION%%.so +lib/tulip/glyph/libCylinder-%%TULIP_VERSION%%.so +lib/tulip/glyph/libDiamond-%%TULIP_VERSION%%.so +lib/tulip/glyph/libGlowSphere-%%TULIP_VERSION%%.so +lib/tulip/glyph/libHalfCylinder-%%TULIP_VERSION%%.so +lib/tulip/glyph/libHexagone-%%TULIP_VERSION%%.so +lib/tulip/glyph/libPentagone-%%TULIP_VERSION%%.so +lib/tulip/glyph/libRing-%%TULIP_VERSION%%.so +lib/tulip/glyph/libRoundedBox-%%TULIP_VERSION%%.so +lib/tulip/glyph/libSphere-%%TULIP_VERSION%%.so +lib/tulip/glyph/libSquare-%%TULIP_VERSION%%.so +lib/tulip/glyph/libStar-%%TULIP_VERSION%%.so +lib/tulip/glyph/libTriangle-%%TULIP_VERSION%%.so +lib/tulip/glyph/libWindow-%%TULIP_VERSION%%.so +lib/tulip/interactor/libFishEyeInteractor-%%TULIP_VERSION%%.so +lib/tulip/interactor/libInteractorAddNodeEdge-%%TULIP_VERSION%%.so +lib/tulip/interactor/libInteractorDeleteElement-%%TULIP_VERSION%%.so +lib/tulip/interactor/libInteractorEditEdgeBends-%%TULIP_VERSION%%.so +lib/tulip/interactor/libInteractorGetInformation-%%TULIP_VERSION%%.so +lib/tulip/interactor/libInteractorNavigation-%%TULIP_VERSION%%.so +lib/tulip/interactor/libInteractorRectangleZoom-%%TULIP_VERSION%%.so +lib/tulip/interactor/libInteractorSelection-%%TULIP_VERSION%%.so +lib/tulip/interactor/libInteractorSelectionModifier-%%TULIP_VERSION%%.so +lib/tulip/interactor/libMouseLassoNodesSelector-%%TULIP_VERSION%%.so +lib/tulip/interactor/libMouseMagnifyingGlass-%%TULIP_VERSION%%.so +lib/tulip/interactor/libNeighborhoodHighlighter-%%TULIP_VERSION%%.so +lib/tulip/interactor/libPathFinder-%%TULIP_VERSION%%.so +lib/tulip/libAcyclic-%%TULIP_VERSION%%.so +lib/tulip/libAdjacencyMatrixImport-%%TULIP_VERSION%%.so +lib/tulip/libAutoSize-%%TULIP_VERSION%%.so +lib/tulip/libBetweennessCentrality-%%TULIP_VERSION%%.so +lib/tulip/libBiconnected-%%TULIP_VERSION%%.so +lib/tulip/libBiconnectedComponent-%%TULIP_VERSION%%.so +lib/tulip/libBubbleTree-%%TULIP_VERSION%%.so +lib/tulip/libCircular-%%TULIP_VERSION%%.so +lib/tulip/libClusterMetric-%%TULIP_VERSION%%.so +lib/tulip/libColorMapping-%%TULIP_VERSION%%.so +lib/tulip/libCompleteGraph-%%TULIP_VERSION%%.so +lib/tulip/libCompleteTree-%%TULIP_VERSION%%.so +lib/tulip/libConeTreeExtended-%%TULIP_VERSION%%.so +lib/tulip/libConnected-%%TULIP_VERSION%%.so +lib/tulip/libConnectedComponent-%%TULIP_VERSION%%.so +lib/tulip/libConnectedComponentPacking-%%TULIP_VERSION%%.so +lib/tulip/libConvolutionClustering-%%TULIP_VERSION%%.so +lib/tulip/libDagLevelMetric-%%TULIP_VERSION%%.so +lib/tulip/libDegreeMetric-%%TULIP_VERSION%%.so +lib/tulip/libDelaunay-%%TULIP_VERSION%%.so +lib/tulip/libDendrogram-%%TULIP_VERSION%%.so +lib/tulip/libDepthMetric-%%TULIP_VERSION%%.so +lib/tulip/libDotImport-%%TULIP_VERSION%%.so +lib/tulip/libEccentricity-%%TULIP_VERSION%%.so +lib/tulip/libEdgeBundling-%%TULIP_VERSION%%.so +lib/tulip/libEmptyGraph-%%TULIP_VERSION%%.so +lib/tulip/libEqualValueClustering-%%TULIP_VERSION%%.so +lib/tulip/libFacebookImport-%%TULIP_VERSION%%.so +lib/tulip/libFastOverlapRemoval-%%TULIP_VERSION%%.so +lib/tulip/libFileSystem-%%TULIP_VERSION%%.so +lib/tulip/libGEXFImport-%%TULIP_VERSION%%.so +lib/tulip/libGMLExport-%%TULIP_VERSION%%.so +lib/tulip/libGMLImport-%%TULIP_VERSION%%.so +lib/tulip/libGemLayout-%%TULIP_VERSION%%.so +lib/tulip/libGrid-%%TULIP_VERSION%%.so +lib/tulip/libGrip-%%TULIP_VERSION%%.so +lib/tulip/libHierarchicalClustering-%%TULIP_VERSION%%.so +lib/tulip/libHierarchicalGraph-%%TULIP_VERSION%%.so +lib/tulip/libIdMetric-%%TULIP_VERSION%%.so +lib/tulip/libImportPajek-%%TULIP_VERSION%%.so +lib/tulip/libImportUCINET-%%TULIP_VERSION%%.so +lib/tulip/libImprovedWalker-%%TULIP_VERSION%%.so +lib/tulip/libInducedSubGraphSelection-%%TULIP_VERSION%%.so +lib/tulip/libKCores-%%TULIP_VERSION%%.so +lib/tulip/libKruskal-%%TULIP_VERSION%%.so +lib/tulip/libLeafMetric-%%TULIP_VERSION%%.so +lib/tulip/libLinLog-%%TULIP_VERSION%%.so +lib/tulip/libLinkCommunities-%%TULIP_VERSION%%.so +lib/tulip/libLoopSelection-%%TULIP_VERSION%%.so +lib/tulip/libLouvainClustering-%%TULIP_VERSION%%.so +lib/tulip/libMCLClustering-%%TULIP_VERSION%%.so +lib/tulip/libMetricSizeMapping-%%TULIP_VERSION%%.so +lib/tulip/libMixedModel-%%TULIP_VERSION%%.so +lib/tulip/libMultipleSelection-%%TULIP_VERSION%%.so +lib/tulip/libNodeMetric-%%TULIP_VERSION%%.so +lib/tulip/libOuterplanar-%%TULIP_VERSION%%.so +lib/tulip/libPageRank-%%TULIP_VERSION%%.so +lib/tulip/libPathLengthMetric-%%TULIP_VERSION%%.so +lib/tulip/libPerfectLayout-%%TULIP_VERSION%%.so +lib/tulip/libPlanarGraph-%%TULIP_VERSION%%.so +lib/tulip/libPlanarity-%%TULIP_VERSION%%.so +lib/tulip/libPolyominoPacking-%%TULIP_VERSION%%.so +lib/tulip/libQuotientClustering-%%TULIP_VERSION%%.so +lib/tulip/libRandom-%%TULIP_VERSION%%.so +lib/tulip/libRandomGraph-%%TULIP_VERSION%%.so +lib/tulip/libRandomMetric-%%TULIP_VERSION%%.so +lib/tulip/libRandomSimpleGraph-%%TULIP_VERSION%%.so +lib/tulip/libRandomTree-%%TULIP_VERSION%%.so +lib/tulip/libRandomTreeGeneral-%%TULIP_VERSION%%.so +lib/tulip/libReachableSubGraphSelection-%%TULIP_VERSION%%.so +lib/tulip/libSVGExport-%%TULIP_VERSION%%.so +lib/tulip/libSimple-%%TULIP_VERSION%%.so +lib/tulip/libSmallWorldGraph-%%TULIP_VERSION%%.so +lib/tulip/libSpanningDagSelection-%%TULIP_VERSION%%.so +lib/tulip/libSpanningTreeSelection-%%TULIP_VERSION%%.so +lib/tulip/libSquarifiedTreeMap-%%TULIP_VERSION%%.so +lib/tulip/libStrahlerMetric-%%TULIP_VERSION%%.so +lib/tulip/libStrengthClustering-%%TULIP_VERSION%%.so +lib/tulip/libStrengthMetric-%%TULIP_VERSION%%.so +lib/tulip/libStrongComponent-%%TULIP_VERSION%%.so +lib/tulip/libToLabels-%%TULIP_VERSION%%.so +lib/tulip/libTree-%%TULIP_VERSION%%.so +lib/tulip/libTreeLeaf-%%TULIP_VERSION%%.so +lib/tulip/libTreeRadial-%%TULIP_VERSION%%.so +lib/tulip/libTreeReingoldAndTilforExtended-%%TULIP_VERSION%%.so +lib/tulip/libTriconnected-%%TULIP_VERSION%%.so +lib/tulip/libTutte-%%TULIP_VERSION%%.so +lib/tulip/libVoronoi-%%TULIP_VERSION%%.so +lib/tulip/libWebImport-%%TULIP_VERSION%%.so +lib/tulip/libWelshPowell-%%TULIP_VERSION%%.so +lib/tulip/libogdfballoon-%%TULIP_VERSION%%.so +lib/tulip/libogdfcircular-%%TULIP_VERSION%%.so +lib/tulip/libogdfdavidsonharel-%%TULIP_VERSION%%.so +lib/tulip/libogdfdominance-%%TULIP_VERSION%%.so +lib/tulip/libogdffastmultipoleembedder-%%TULIP_VERSION%%.so +lib/tulip/libogdffastmultipolemultilevelembedder-%%TULIP_VERSION%%.so +lib/tulip/libogdffm3-%%TULIP_VERSION%%.so +lib/tulip/libogdffrutchermanreingold-%%TULIP_VERSION%%.so +lib/tulip/libogdfgemfrick-%%TULIP_VERSION%%.so +lib/tulip/libogdfkamadakawai-%%TULIP_VERSION%%.so +lib/tulip/libogdfmmmexamplefastlayout-%%TULIP_VERSION%%.so +lib/tulip/libogdfmmmexamplenicelayout-%%TULIP_VERSION%%.so +lib/tulip/libogdfmmmexamplenotwistlayout-%%TULIP_VERSION%%.so +lib/tulip/libogdfplanarizationgrid-%%TULIP_VERSION%%.so +lib/tulip/libogdfstressmajorization-%%TULIP_VERSION%%.so +lib/tulip/libogdfsugiyama-%%TULIP_VERSION%%.so +lib/tulip/libogdftree-%%TULIP_VERSION%%.so +lib/tulip/libogdfupwardplanarization-%%TULIP_VERSION%%.so +lib/tulip/libogdfvisibility-%%TULIP_VERSION%%.so +lib/tulip/libreverseedges-%%TULIP_VERSION%%.so +lib/tulip/perspective/libGraphPerspective-%%TULIP_VERSION%%.so +lib/tulip/view/libGeographicView-%%TULIP_VERSION%%.so +lib/tulip/view/libHistogramView-%%TULIP_VERSION%%.so +lib/tulip/view/libMatrixView-%%TULIP_VERSION%%.so +lib/tulip/view/libParallelCoordinatesView-%%TULIP_VERSION%%.so +lib/tulip/view/libPixelOrientedView-%%TULIP_VERSION%%.so +lib/tulip/view/libSOMView-%%TULIP_VERSION%%.so +lib/tulip/view/libScatterPlot2DView-%%TULIP_VERSION%%.so +lib/tulip/view/libTableView-%%TULIP_VERSION%%.so +lib/tulip/view/libpythonscriptview-%%TULIP_VERSION%%.so %%DATADIR%%/FindGLEW.cmake -%%DATADIR%%/FindTULIP3.cmake -%%DATADIR%%/FindXML2.cmake +%%DATADIR%%/FindTULIP.cmake +%%DATADIR%%/TulipUseFile.cmake +%%DATADIR%%/apiFiles/PyQt4.api %%DATADIR%%/apiFiles/Python-2.4.api %%DATADIR%%/apiFiles/Python-2.5.api %%DATADIR%%/apiFiles/Python-2.6.api %%DATADIR%%/apiFiles/Python-2.7.api %%DATADIR%%/apiFiles/Python-3.1.api %%DATADIR%%/apiFiles/Python-3.2.api -%%DATADIR%%/apiFiles/PyQt4.api +%%DATADIR%%/apiFiles/Python-3.3.api +%%DATADIR%%/apiFiles/tulip.api %%DATADIR%%/apiFiles/tulipgui.api %%DATADIR%%/apiFiles/tulipogl.api -%%DATADIR%%/apiFiles/tulip.api %%DATADIR%%/bitmaps/arrowSprite.png %%DATADIR%%/bitmaps/candiSprite.png %%DATADIR%%/bitmaps/colorscales/BiologicalHeatMap.png @@ -468,28 +514,170 @@ lib/tlp/view/libpythonscriptview-%%TULIP %%DATADIR%%/bitmaps/edgeSpring.png %%DATADIR%%/bitmaps/font.ttf %%DATADIR%%/bitmaps/fontb.ttf +%%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono.ttf +%%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono_Bold.ttf +%%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono_Italic.ttf +%%DATADIR%%/bitmaps/fonts/FreeSans/FreeSans.ttf +%%DATADIR%%/bitmaps/fonts/FreeSans/FreeSans_Bold.ttf +%%DATADIR%%/bitmaps/fonts/FreeSans/FreeSans_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/FreeSans/FreeSans_Italic.ttf +%%DATADIR%%/bitmaps/fonts/FreeSerif/FreeSerif.ttf +%%DATADIR%%/bitmaps/fonts/FreeSerif/FreeSerif_Bold.ttf +%%DATADIR%%/bitmaps/fonts/FreeSerif/FreeSerif_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/FreeSerif/FreeSerif_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Garuda/Garuda.ttf +%%DATADIR%%/bitmaps/fonts/Garuda/Garuda_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Garuda/Garuda_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Garuda/Garuda_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Kinnari/Kinnari.ttf +%%DATADIR%%/bitmaps/fonts/Kinnari/Kinnari_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Kinnari/Kinnari_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Kinnari/Kinnari_Italic.ttf +%%DATADIR%%/bitmaps/fonts/LiberationMono/LiberationMono.ttf +%%DATADIR%%/bitmaps/fonts/LiberationMono/LiberationMono_Bold.ttf +%%DATADIR%%/bitmaps/fonts/LiberationMono/LiberationMono_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/LiberationMono/LiberationMono_Italic.ttf +%%DATADIR%%/bitmaps/fonts/LiberationSans/LiberationSans.ttf +%%DATADIR%%/bitmaps/fonts/LiberationSans/LiberationSans_Bold.ttf +%%DATADIR%%/bitmaps/fonts/LiberationSans/LiberationSans_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/LiberationSans/LiberationSans_Italic.ttf +%%DATADIR%%/bitmaps/fonts/LiberationSerif/LiberationSerif.ttf +%%DATADIR%%/bitmaps/fonts/LiberationSerif/LiberationSerif_Bold.ttf +%%DATADIR%%/bitmaps/fonts/LiberationSerif/LiberationSerif_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/LiberationSerif/LiberationSerif_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Loma/Loma.ttf +%%DATADIR%%/bitmaps/fonts/Loma/Loma_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Loma/Loma_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Loma/Loma_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Norasi/Norasi.ttf +%%DATADIR%%/bitmaps/fonts/Norasi/Norasi_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Norasi/Norasi_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Norasi/Norasi_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Purisa/Purisa.ttf +%%DATADIR%%/bitmaps/fonts/Purisa/Purisa_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Purisa/Purisa_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Purisa/Purisa_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Sawasdee/Sawasdee.ttf +%%DATADIR%%/bitmaps/fonts/Sawasdee/Sawasdee_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Sawasdee/Sawasdee_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Sawasdee/Sawasdee_Italic.ttf +%%DATADIR%%/bitmaps/fonts/TlwgMono/TlwgMono.ttf +%%DATADIR%%/bitmaps/fonts/TlwgMono/TlwgMono_Bold.ttf +%%DATADIR%%/bitmaps/fonts/TlwgMono/TlwgMono_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/TlwgMono/TlwgMono_Italic.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypewriter/TlwgTypewriter.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypewriter/TlwgTypewriter_Bold.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypewriter/TlwgTypewriter_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypewriter/TlwgTypewriter_Italic.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypist/TlwgTypist.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypist/TlwgTypist_Bold.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypist/TlwgTypist_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypist/TlwgTypist_Italic.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypo/TlwgTypo.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypo/TlwgTypo_Bold.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypo/TlwgTypo_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/TlwgTypo/TlwgTypo_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Ubuntu/Ubuntu.ttf +%%DATADIR%%/bitmaps/fonts/Ubuntu/Ubuntu_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Ubuntu/Ubuntu_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Ubuntu/Ubuntu_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Umpush/Umpush.ttf +%%DATADIR%%/bitmaps/fonts/Umpush/Umpush_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Umpush/Umpush_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Umpush/Umpush_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Waree/Waree.ttf +%%DATADIR%%/bitmaps/fonts/Waree/Waree_Bold.ttf +%%DATADIR%%/bitmaps/fonts/Waree/Waree_Bold_Italic.ttf +%%DATADIR%%/bitmaps/fonts/Waree/Waree_Italic.ttf %%DATADIR%%/bitmaps/halfCylinderTexture.png -%%DATADIR%%/bitmaps/headerlogo.bmp %%DATADIR%%/bitmaps/logo.bmp -%%DATADIR%%/bitmaps/logo32x32.bmp %%DATADIR%%/bitmaps/logo32x32.ico %%DATADIR%%/bitmaps/logolabri.jpg -%%DATADIR%%/bitmaps/logotulip.jpg %%DATADIR%%/bitmaps/radialGradientTexture.png %%DATADIR%%/bitmaps/roundTexture.png -%%DATADIR%%/bitmaps/tex_back.png +%%DATADIR%%/bitmaps/samplePictures/1221.png +%%DATADIR%%/bitmaps/samplePictures/1291.png +%%DATADIR%%/bitmaps/samplePictures/1531.png +%%DATADIR%%/bitmaps/samplePictures/1861.jpg +%%DATADIR%%/bitmaps/samplePictures/741.png +%%DATADIR%%/bitmaps/samplePictures/891.png %%DATADIR%%/bitmaps/titlebarGradient.png %%DATADIR%%/bitmaps/welcomelogo.bmp -%%DATADIR%%/tulip380.qch -%%DATADIR%%/tulip380.qhc +%%DATADIR%%/wizards/README.txt +%%DATADIR%%/wizards/tlpalgorithm/algorithm.cmake +%%DATADIR%%/wizards/tlpalgorithm/algorithmplugin.cpp *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 13:47:51 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3FBB2C4A; Wed, 23 Apr 2014 13:47:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1FB07187B; Wed, 23 Apr 2014 13:47:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NDlobN054719; Wed, 23 Apr 2014 13:47:50 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NDloOm054715; Wed, 23 Apr 2014 13:47:50 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404231347.s3NDloOm054715@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 23 Apr 2014 13:47:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351942 - in branches/2014Q2/graphics/tulip: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 13:47:51 -0000 Author: gahr Date: Wed Apr 23 13:47:49 2014 New Revision: 351942 URL: http://svnweb.freebsd.org/changeset/ports/351942 QAT: https://qat.redports.org/buildarchive/r351942/ Log: MFH: r351833 - Add a couple of missing patches - Explicitely depend on graphics/jpeg - Remove DOCS Approved by: portmgr Added: branches/2014Q2/graphics/tulip/files/patch-CMakeLists.txt - copied unchanged from r351833, head/graphics/tulip/files/patch-CMakeLists.txt branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt - copied unchanged from r351833, head/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp - copied unchanged from r351833, head/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp Modified: branches/2014Q2/graphics/tulip/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/tulip/Makefile ============================================================================== --- branches/2014Q2/graphics/tulip/Makefile Wed Apr 23 13:46:29 2014 (r351941) +++ branches/2014Q2/graphics/tulip/Makefile Wed Apr 23 13:47:49 2014 (r351942) @@ -19,7 +19,8 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/prin LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libQxtCore.so:${PORTSDIR}/devel/libqxt \ libOGDF.so:${PORTSDIR}/math/ogdf \ - libpng.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg USES= cmake:outsource compiler:c++11-lib shebangfix dos2unix SHEBANG_FILES= tulip-config.in @@ -43,13 +44,4 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_SUB+= TULIP_VERSION=${PORTVERSION} \ TULIP_VERS=${PORTVERSION:R} -.include - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -post-install: - ${INSTALL} -d ${STAGEDIR}${DOCSDIR} - (cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}-html && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) -.endif - .include Copied: branches/2014Q2/graphics/tulip/files/patch-CMakeLists.txt (from r351833, head/graphics/tulip/files/patch-CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-CMakeLists.txt Wed Apr 23 13:47:49 2014 (r351942, copy of r351833, head/graphics/tulip/files/patch-CMakeLists.txt) @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2014-04-18 10:21:16.000000000 +0200 ++++ CMakeLists.txt 2014-04-18 10:22:19.000000000 +0200 +@@ -274,8 +274,8 @@ + SET(FTGLInclude ${PROJECT_SOURCE_DIR}/thirdparty/ftgl/) + SET(FTGLLibrary ftgl-tulip-${TulipMMVersion}) + SET(qscintilla2Include ${PROJECT_SOURCE_DIR}/thirdparty/QScintilla-gpl-2.5.1/Qt4/) +-SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) +-SET(OGDFLibrary OGDF-tulip-${TulipMMVersion}) ++#SET(OGDFInclude ${PROJECT_SOURCE_DIR}/thirdparty/OGDF) ++#SET(OGDFLibrary OGDF-tulip-${TulipMMVersion}) + SET(QHULLInclude ${PROJECT_SOURCE_DIR}/thirdparty) + SET(YajlLibrary yajl-tulip-${TulipMMVersion}) + SET(TulipCoreInclude ${PROJECT_SOURCE_DIR}/library/tulip-core/include/) Copied: branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt (from r351833, head/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt Wed Apr 23 13:47:49 2014 (r351942, copy of r351833, head/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt) @@ -0,0 +1,11 @@ +--- software/crash_handling/CMakeLists.txt.orig 2014-04-18 11:54:11.000000000 +0200 ++++ software/crash_handling/CMakeLists.txt 2014-04-18 11:54:21.000000000 +0200 +@@ -39,7 +39,7 @@ + ADD_LIBRARY(crash_handling STATIC ${LIB_SRCS}) + + IF(UNIX) +- TARGET_LINK_LIBRARIES(crash_handling dl) ++ TARGET_LINK_LIBRARIES(crash_handling) + ENDIF(UNIX) + + IF(HAVE_BFD) Copied: branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp (from r351833, head/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp Wed Apr 23 13:47:49 2014 (r351942, copy of r351833, head/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp) @@ -0,0 +1,11 @@ +--- software/crash_handling/CrashHandling.cpp.orig 2014-04-18 10:33:31.000000000 +0200 ++++ software/crash_handling/CrashHandling.cpp 2014-04-18 10:34:25.000000000 +0200 +@@ -38,7 +38,7 @@ + /* + Linux/MacOS-specific handling + */ +-#if defined(__unix__) || defined(__APPLE__) ++#if (defined(__unix__) || defined(__APPLE__)) && !defined(__FreeBSD__) + + # if defined(__i386__) || defined(__amd64__) + From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 23 13:48:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E68AD3A; Wed, 23 Apr 2014 13:48:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A7FE1889; Wed, 23 Apr 2014 13:48:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NDmwiY054953; Wed, 23 Apr 2014 13:48:58 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NDmwAT054952; Wed, 23 Apr 2014 13:48:58 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201404231348.s3NDmwAT054952@svn.freebsd.org> From: Pietro Cerutti Date: Wed, 23 Apr 2014 13:48:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351943 - branches/2014Q2/graphics/tulip/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 13:48:58 -0000 Author: gahr Date: Wed Apr 23 13:48:57 2014 New Revision: 351943 URL: http://svnweb.freebsd.org/changeset/ports/351943 QAT: https://qat.redports.org/buildarchive/r351943/ Log: MFH: r351915 - Fix build on < 9.0 Approved by: portmgr Added: branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp - copied unchanged from r351915, head/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp Modified: Directory Properties: branches/2014Q2/ (props changed) Copied: branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp (from r351915, head/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp Wed Apr 23 13:48:57 2014 (r351943, copy of r351915, head/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp) @@ -0,0 +1,16 @@ +--- software/crash_handling/StackWalker.cpp.orig 2014-04-22 16:44:05.000000000 +0200 ++++ software/crash_handling/StackWalker.cpp 2014-04-22 16:46:01.000000000 +0200 +@@ -255,8 +255,13 @@ + char * real_name = abi::__cxa_demangle(mangled_name, 0, 0, &status); + + char *end; ++#if defined(__FreeBSD__) && __FreeBSD_version < 9000000 ++ int64_t runtimeAddr = static_cast(strtol(runtime_addr, &end, 16)); ++ int64_t runtimeOffset = static_cast(strtol(runtime_offset, &end, 0)); ++#else + int64_t runtimeAddr = static_cast(strtoll(runtime_addr, &end, 16)); + int64_t runtimeOffset = static_cast(strtoll(runtime_offset, &end, 0)); ++#endif + + if (runtimeAddr == 1 && i == (size - 1)) + break; From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 24 16:20:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 50CFEAC8; Thu, 24 Apr 2014 16:20:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 318561E5E; Thu, 24 Apr 2014 16:20:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OGKX6r016335; Thu, 24 Apr 2014 16:20:33 GMT (envelope-from lwhsu@svn.freebsd.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OGKVux016139; Thu, 24 Apr 2014 16:20:31 GMT (envelope-from lwhsu@svn.freebsd.org) Message-Id: <201404241620.s3OGKVux016139@svn.freebsd.org> From: Li-Wen Hsu Date: Thu, 24 Apr 2014 16:20:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352014 - in branches/2014Q2: security/vuxml www/py-django www/py-django-devel www/py-django14 www/py-django15 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Apr 2014 16:20:33 -0000 Author: lwhsu Date: Thu Apr 24 16:20:30 2014 New Revision: 352014 URL: http://svnweb.freebsd.org/changeset/ports/352014 QAT: https://qat.redports.org/buildarchive/r352014/ Log: MFH: r351931 Document Django 2014-04-21 vulnerabilty MFH: r351932 - Update to 1.6.3 Security: 59e72db2-cae6-11e3-8420-00e0814cab4e MFH: r351933 - Update to 1.5.6 Security: 59e72db2-cae6-11e3-8420-00e0814cab4e MFH: r351934 - Update to 1.4.11 Security: 59e72db2-cae6-11e3-8420-00e0814cab4e MFH: r351935 - Update to 20140423 snapshot Security: 59e72db2-cae6-11e3-8420-00e0814cab4e MFH: r351938 Fix Django package names Submitted by: mat MFH: r351944 - Add missing distinfo [1] - Trim unneeded PYDISTUTILS_PKGNAME Notified by: swills [1] MFH: r352013 Add back pakcage ranges for people have ancient packages Notified by: mat Approved by: portmgr (mat) Deleted: branches/2014Q2/www/py-django-devel/pkg-plist branches/2014Q2/www/py-django14/pkg-plist branches/2014Q2/www/py-django15/pkg-plist Modified: branches/2014Q2/security/vuxml/vuln.xml branches/2014Q2/www/py-django-devel/Makefile branches/2014Q2/www/py-django-devel/distinfo branches/2014Q2/www/py-django/Makefile branches/2014Q2/www/py-django/distinfo branches/2014Q2/www/py-django14/Makefile branches/2014Q2/www/py-django14/distinfo branches/2014Q2/www/py-django15/Makefile branches/2014Q2/www/py-django15/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/security/vuxml/vuln.xml Thu Apr 24 16:20:30 2014 (r352014) @@ -51,6 +51,86 @@ Note: Please add new entries to the beg --> + + django -- multiple vulnerabilities + + + py26-django + py27-django + py31-django + py32-django + py33-django + py34-django + 1.61.6.3 + 1.51.5.6 + 1.41.4.11 + + + py26-django15 + py27-django15 + py31-django15 + py32-django15 + py33-django15 + py34-django15 + 1.51.5.6 + + + py26-django14 + py27-django14 + py31-django14 + py32-django14 + py33-django14 + py34-django14 + 1.41.4.11 + + + py26-django15 + py27-django15 + py31-django15 + py32-django15 + py33-django15 + py34-django15 + 1.51.5.6 + + + py26-django14 + py27-django14 + py31-django14 + py32-django14 + py33-django14 + py34-django14 + 1.41.4.11 + + + py26-django-devel + py27-django-devel + 20140423,1 + + + + +

The Django project reports:

+
+

These releases address an unexpected code-execution issue, a + caching issue which can expose CSRF tokens and a MySQL typecasting + issue. While these issues present limited risk and may not affect + all Django users, we encourage all users to evaluate their own + risk and upgrade as soon as possible.

+
+ + + + https://www.djangoproject.com/weblog/2014/apr/21/security/ + CVE-2014-0472 + CVE-2014-0473 + CVE-2014-0474 + + + 2014-04-21 + 2014-04-23 + 2014-04-24 + + OpenSSL -- Multiple vulnerabilities - private data exposure Modified: branches/2014Q2/www/py-django-devel/Makefile ============================================================================== --- branches/2014Q2/www/py-django-devel/Makefile Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/www/py-django-devel/Makefile Thu Apr 24 16:20:30 2014 (r352014) @@ -14,16 +14,14 @@ DIST_SUBDIR= python MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level Python Web framework -LICENSE= BSD +LICENSE= BSD3CLAUSE -SNAPSHOTDATE= 20131025 +SNAPSHOTDATE= 20140423 -USE_XZ= yes -USES= gettext +USES= gettext tar:xz USE_PYTHON= yes USE_PYDISTUTILS= yes -PYTHON_PY3K_PLIST_HACK= yes -PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGVERSION= 1.7 CONFLICTS= py2[0-9]-django-[0-9]* @@ -38,6 +36,9 @@ OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) +PLIST_FILES= man/man1/django-admin.1.gz \ + man/man1/gather_profile_stats.1.gz + .include .if ${PORT_OPTIONS:MPGSQL} @@ -57,7 +58,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flu .endif .if ${PORT_OPTIONS:MHTMLDOCS} -. if empty(PORT_OPTIONS:MDOCS) +. if ! ${PORT_OPTIONS:MDOCS} IGNORE= you cannot build documentation while setting NOPORTDOCS . endif BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx Modified: branches/2014Q2/www/py-django-devel/distinfo ============================================================================== --- branches/2014Q2/www/py-django-devel/distinfo Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/www/py-django-devel/distinfo Thu Apr 24 16:20:30 2014 (r352014) @@ -1,2 +1,2 @@ -SHA256 (python/Django-20131025.tar.xz) = 56393be35977e9f106f085bb4a0025da5c4a4de3908eb40b22aef45c29c74cbe -SIZE (python/Django-20131025.tar.xz) = 4618532 +SHA256 (python/Django-20140423.tar.xz) = d40b8d98cac40d40844c552953aa7a6d1faba10b21aebffd765684d54f85cc29 +SIZE (python/Django-20140423.tar.xz) = 4540492 Modified: branches/2014Q2/www/py-django/Makefile ============================================================================== --- branches/2014Q2/www/py-django/Makefile Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/www/py-django/Makefile Thu Apr 24 16:20:30 2014 (r352014) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.6.2 +PORTVERSION= 1.6.3 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \ CHEESESHOP @@ -18,7 +18,6 @@ LICENSE= BSD3CLAUSE USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes -PYDISTUTILS_PKGNAME= Django CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-57-9].* Modified: branches/2014Q2/www/py-django/distinfo ============================================================================== --- branches/2014Q2/www/py-django/distinfo Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/www/py-django/distinfo Thu Apr 24 16:20:30 2014 (r352014) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.6.2.tar.gz) = d1b3f8460e936f47846e7c4f80af951eda82a41c253c3a51ff3389863ff1c03a -SIZE (python/Django-1.6.2.tar.gz) = 6615116 +SHA256 (python/Django-1.6.3.tar.gz) = 6d9d3c468f9a09470d00e85fe492ba35edfc72cee7fb65ad0281010eba58b8f1 +SIZE (python/Django-1.6.3.tar.gz) = 6628812 Modified: branches/2014Q2/www/py-django14/Makefile ============================================================================== --- branches/2014Q2/www/py-django14/Makefile Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/www/py-django14/Makefile Thu Apr 24 16:20:30 2014 (r352014) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.4.10 +PORTVERSION= 1.4.11 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \ CHEESESHOP @@ -14,11 +14,11 @@ DIST_SUBDIR= python MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level Python Web framework -LICENSE= BSD +LICENSE= BSD3CLAUSE USE_PYTHON= 2 USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_AUTOPLIST= yes CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-35-9].* @@ -32,6 +32,10 @@ OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) +PLIST_FILES= man/man1/daily_cleanup.1.gz \ + man/man1/django-admin.1.gz \ + man/man1/gather_profile_stats.1.gz + .include .if ${PORT_OPTIONS:MPGSQL} Modified: branches/2014Q2/www/py-django14/distinfo ============================================================================== --- branches/2014Q2/www/py-django14/distinfo Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/www/py-django14/distinfo Thu Apr 24 16:20:30 2014 (r352014) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.4.10.tar.gz) = 3d1f083c039fdab1400c32b5406a60891c9dd16f880999c4a53d054742ac29de -SIZE (python/Django-1.4.10.tar.gz) = 7745002 +SHA256 (python/Django-1.4.11.tar.gz) = 4819d8b37405b33f4f0d156f60918094d566249f52137c5e6e0dbaa12995c201 +SIZE (python/Django-1.4.11.tar.gz) = 7752172 Modified: branches/2014Q2/www/py-django15/Makefile ============================================================================== --- branches/2014Q2/www/py-django15/Makefile Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/www/py-django15/Makefile Thu Apr 24 16:20:30 2014 (r352014) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.5.5 -PORTREVISION= 2 +PORTVERSION= 1.5.6 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \ CHEESESHOP @@ -15,12 +14,11 @@ DIST_SUBDIR= python MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level Python Web framework -LICENSE= BSD +LICENSE= BSD3CLAUSE USE_PYTHON= yes USE_PYDISTUTILS= yes -PYTHON_PY3K_PLIST_HACK= yes -PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_AUTOPLIST= yes CONFLICTS= py[23][0-9]-django-devel-[0-9]* py[23][0-9]-django-1.[0-46-9].* @@ -34,6 +32,10 @@ OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE HTMLDOCS_DESC= Install the HTML documentation (requires Sphinx) +PLIST_FILES= man/man1/daily_cleanup.1.gz \ + man/man1/django-admin.1.gz \ + man/man1/gather_profile_stats.1.gz + .include .if ${PORT_OPTIONS:MPGSQL} Modified: branches/2014Q2/www/py-django15/distinfo ============================================================================== --- branches/2014Q2/www/py-django15/distinfo Thu Apr 24 15:54:50 2014 (r352013) +++ branches/2014Q2/www/py-django15/distinfo Thu Apr 24 16:20:30 2014 (r352014) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.5.5.tar.gz) = 6ae69c1dfbfc9d0c44ae80e2fbe48e59bbbbb70e8df66ad2b7029bd39947d71d -SIZE (python/Django-1.5.5.tar.gz) = 8060441 +SHA256 (python/Django-1.5.6.tar.gz) = 9b7fcb99d20289189ec0f1e06d1d2bed3b4772e3a393fddbfb006ea7c3f9bfaf +SIZE (python/Django-1.5.6.tar.gz) = 8068359 From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 24 17:58:56 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85D1C3F0; Thu, 24 Apr 2014 17:58:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 582DE19F2; Thu, 24 Apr 2014 17:58:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OHwuTA057972; Thu, 24 Apr 2014 17:58:56 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OHwtDH057970; Thu, 24 Apr 2014 17:58:55 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201404241758.s3OHwtDH057970@svn.freebsd.org> From: Guido Falsi Date: Thu, 24 Apr 2014 17:58:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352035 - branches/2014Q2/www/squidguard X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Apr 2014 17:58:56 -0000 Author: madpilot Date: Thu Apr 24 17:58:55 2014 New Revision: 352035 URL: http://svnweb.freebsd.org/changeset/ports/352035 QAT: https://qat.redports.org/buildarchive/r352035/ Log: MFH: r351965 - Fix port when SQUID_UID != squid [1] While here fix a mistake I introduced in the plist. Submitted by: garga@ (via irc) [1] Approved by: portmgr (miwi) Modified: branches/2014Q2/www/squidguard/Makefile branches/2014Q2/www/squidguard/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/squidguard/Makefile ============================================================================== --- branches/2014Q2/www/squidguard/Makefile Thu Apr 24 17:48:57 2014 (r352034) +++ branches/2014Q2/www/squidguard/Makefile Thu Apr 24 17:58:55 2014 (r352035) @@ -2,7 +2,7 @@ PORTNAME= squidGuard PORTVERSION= 1.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www MASTER_SITES= http://www.squidguard.org/Downloads/:a \ http://www.squidguard.org/Downloads/Contrib/:b @@ -24,6 +24,7 @@ CONFIGURE_ARGS= --with-db-inc=${BDB_INCL --with-sg-config=${ETCDIR}/${PORTNAME}.conf \ --with-sg-dbhome=${DATADIR} \ --with-sg-logdir=${LOGDIR} \ + --with-squiduser=${SQUID_UID} \ --exec-prefix=${PREFIX} CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include Modified: branches/2014Q2/www/squidguard/pkg-plist ============================================================================== --- branches/2014Q2/www/squidguard/pkg-plist Thu Apr 24 17:48:57 2014 (r352034) +++ branches/2014Q2/www/squidguard/pkg-plist Thu Apr 24 17:58:55 2014 (r352035) @@ -75,5 +75,5 @@ etc/squid/squidGuard.conf.sample @exec mkdir -p %%DATADIR%% || true @exec mkdir -p %%LOGDIR%% || true %%PORTEXAMPLES%%@exec chown -R %%SQUID_UID%%:%%SQUID_GID%% %%LOGDIR%% -@exec rmdir %%DATADIR%% 2>/dev/null || true -@exec rmdir %%LOGDIR%% 2>/dev/null || true +@unexec rmdir %%DATADIR%% 2>/dev/null || true +@unexec rmdir %%LOGDIR%% 2>/dev/null || true From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 24 18:56:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 961C0525; Thu, 24 Apr 2014 18:56:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6902A113D; Thu, 24 Apr 2014 18:56:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OIuXa9083844; Thu, 24 Apr 2014 18:56:33 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OIuXWM083843; Thu, 24 Apr 2014 18:56:33 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404241856.s3OIuXWM083843@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 24 Apr 2014 18:56:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352052 - branches/2014Q2/lang/t3x/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Apr 2014 18:56:33 -0000 Author: amdmi3 Date: Thu Apr 24 18:56:32 2014 New Revision: 352052 URL: http://svnweb.freebsd.org/changeset/ports/352052 QAT: https://qat.redports.org/buildarchive/r352052/ Log: MFH: r352025 - Fix build w/clang Approved by: portmgr Added: branches/2014Q2/lang/t3x/files/ - copied from r352025, head/lang/t3x/files/ Modified: Directory Properties: branches/2014Q2/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 24 21:13:40 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C120A56B; Thu, 24 Apr 2014 21:13:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 93A7510AE; Thu, 24 Apr 2014 21:13:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OLDeUi042092; Thu, 24 Apr 2014 21:13:40 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OLDeec042091; Thu, 24 Apr 2014 21:13:40 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201404242113.s3OLDeec042091@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 24 Apr 2014 21:13:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352068 - branches/2014Q2/net/ohphone X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Apr 2014 21:13:40 -0000 Author: amdmi3 Date: Thu Apr 24 21:13:40 2014 New Revision: 352068 URL: http://svnweb.freebsd.org/changeset/ports/352068 QAT: https://qat.redports.org/buildarchive/r352068/ Log: MFH: r352009 - Unbreak on 10.x+ by using gcc - Support staging - Switch USE_GMAKE to USES - Use mew LIB_DEPENDS syntax - Optionize Approved by: portmgr Deleted: branches/2014Q2/net/ohphone/pkg-plist Modified: branches/2014Q2/net/ohphone/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/net/ohphone/Makefile ============================================================================== --- branches/2014Q2/net/ohphone/Makefile Thu Apr 24 21:00:29 2014 (r352067) +++ branches/2014Q2/net/ohphone/Makefile Thu Apr 24 21:13:40 2014 (r352068) @@ -10,34 +10,36 @@ MASTER_SITES= ftp://ftp.frm2.tum.de/pub/ MAINTAINER= ports@FreeBSD.org COMMENT= H323 Video Conferencing Program, compatible with NetMeeting -LIB_DEPENDS= h323_r.1:${PORTSDIR}/net/openh323 +LIB_DEPENDS= libh323_r.so:${PORTSDIR}/net/openh323 -USES= bison -USE_GMAKE= yes +USES= bison gmake ALL_TARGET= optshared MAKE_ENV= PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ SYSLIBDIR=${LOCALBASE}/lib MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \ OSRELEASE=${OSVERSION} CPLUS=${CXX} - -MAN1= ohphone.1 +USE_GCC= any PLIST_SUB= PORTNAME=${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/openh323 EXAMPLESDIR= ${PREFIX}/share/examples/openh323 -NO_STAGE= yes +PLIST_FILES= bin/${PORTNAME} \ + man/man1/${PORTNAME}.1.gz +PORTDOCS= * +PORTEXAMPLES= * + +OPTIONS_DEFINE= DOCS EXAMPLES + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME} -.endif - ${MKDIR} ${EXAMPLESDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${EXAMPLESDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/regtest ${EXAMPLESDIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/stresstest ${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${STAGEDIR}${PREFIX}/man/man1 + ${MKDIR} ${STAGEDIR}${DOCSDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${STAGEDIR}${DOCSDIR}/${PORTNAME} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/regtest ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/stresstest ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME} .include From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 25 12:22:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29A846C3; Fri, 25 Apr 2014 12:22:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 161CD1BB6; Fri, 25 Apr 2014 12:22:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PCMsOC018740; Fri, 25 Apr 2014 12:22:54 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PCMsve018738; Fri, 25 Apr 2014 12:22:54 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404251222.s3PCMsve018738@svn.freebsd.org> From: Boris Samorodov Date: Fri, 25 Apr 2014 12:22:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352116 - branches/2014Q2/print/foo2zjs X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Apr 2014 12:22:55 -0000 Author: bsam Date: Fri Apr 25 12:22:54 2014 New Revision: 352116 URL: http://svnweb.freebsd.org/changeset/ports/352116 QAT: https://qat.redports.org/buildarchive/r352116/ Log: MFH: r352107 print/foo2zjs: add run time dependency upon textproc/gsed . assumig the following code is intended, add a run time dependency upon textproc/gsed: ----- foo2zjs-pstops.sh ----- case `uname -s` in FreeBSD) sed=gsed;; ----- . bump PORTREVISION. Reported by: stb@ (at freebsd-ports@) Approved by: portmgr (miwi) Modified: branches/2014Q2/print/foo2zjs/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/foo2zjs/Makefile ============================================================================== --- branches/2014Q2/print/foo2zjs/Makefile Fri Apr 25 12:20:48 2014 (r352115) +++ branches/2014Q2/print/foo2zjs/Makefile Fri Apr 25 12:22:54 2014 (r352116) @@ -3,7 +3,7 @@ PORTNAME= foo2zjs PORTVERSION= 20140330 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL:S,$,bsam/${PORTNAME}/,} \ @@ -14,7 +14,8 @@ COMMENT= Driver for printers that use th LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client RUN_DEPENDS= ${LOCALBASE}/share/foomatic/db/oldprinterids:${PORTSDIR}/print/foomatic-db \ - foomatic-rip:${PORTSDIR}/print/foomatic-filters + foomatic-rip:${PORTSDIR}/print/foomatic-filters \ + gsed:${PORTSDIR}/textproc/gsed PROJECTHOST= bsdistfiles USE_GHOSTSCRIPT=yes From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 25 14:14:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1526D5D8; Fri, 25 Apr 2014 14:14:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0160C1926; Fri, 25 Apr 2014 14:14:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PEEBM4065867; Fri, 25 Apr 2014 14:14:11 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PEEBsk065865; Fri, 25 Apr 2014 14:14:11 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404251414.s3PEEBsk065865@svn.freebsd.org> From: Pawel Pekala Date: Fri, 25 Apr 2014 14:14:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352130 - branches/2014Q2/games/worldofpadman X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Apr 2014 14:14:12 -0000 Author: pawel Date: Fri Apr 25 14:14:11 2014 New Revision: 352130 URL: http://svnweb.freebsd.org/changeset/ports/352130 QAT: https://qat.redports.org/buildarchive/r352130/ Log: MFH: r352066 - Fix build with clang (global variable defined as static) - Add staging support - Use options subs Approved by: portmgr (erwin) Modified: branches/2014Q2/games/worldofpadman/Makefile branches/2014Q2/games/worldofpadman/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/worldofpadman/Makefile ============================================================================== --- branches/2014Q2/games/worldofpadman/Makefile Fri Apr 25 14:13:06 2014 (r352129) +++ branches/2014Q2/games/worldofpadman/Makefile Fri Apr 25 14:14:11 2014 (r352130) @@ -31,6 +31,7 @@ OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT SERVER SMP_CLIENT OPTIONS_DEFAULT= CLIENT CURL CURL_DLOPEN SERVER OPTIMIZED_CFLAGS \ VORBIS SMP_CLIENT +OPTIONS_SUB= yes FLAVOR_DESC= Clients and servers CLIENT_DESC= Build client @@ -40,7 +41,6 @@ GAMELIBS_DESC= Force building game libr OPENAL_DLOPEN_DESC= Enable dynamic loading of OpenAL SMP_CLIENT_DESC= Build SMP (threaded) client -NO_STAGE= yes .include .for arch in ${ARCH} @@ -82,25 +82,16 @@ MAKE_ENV+= USE_CODEC_VORBIS=1 .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= BUILD_CLIENT=1 -PLIST_SUB+= CLIENT="" WOPBIN+= wop -.else -PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MSERVER} MAKE_ENV+= BUILD_SERVER=1 -PLIST_SUB+= SERVER="" WOPBIN+= wopded -.else -PLIST_SUB+= SERVER="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= BUILD_GAME_SO=1 -PLIST_SUB+= GAMELIBS="" -.else -PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MMP3} @@ -114,10 +105,7 @@ MAKE_ENV+= USE_OPTIMIZED_CFLAGS=1 .if ${PORT_OPTIONS:MSMP_CLIENT} MAKE_ENV+= BUILD_CLIENT_SMP=1 -PLIST_SUB+= SMPCLIENT="" WOPBIN+= wop-smp -.else -PLIST_SUB+= SMPCLIENT="@comment " .endif post-extract: @@ -132,25 +120,25 @@ post-patch: # Do not log debug output of bots (can be enabled with "homedir"/"gamedir") @${REINPLACE_CMD} -e 's|"botlib\.log"|"/dev/null"|' \ ${WRKSRC}/code/botlib/be_interface.c + @${REINPLACE_CMD} '/callMask/ s|static||' \ + ${WRKSRC}/code/qcommon/vm_x86.c do-install: - @${MKDIR} ${DATADIR}/wop - ${CP} -a ${WRKDIR}/wop/* ${DATADIR}/wop + @${MKDIR} ${STAGEDIR}${DATADIR}/wop + ${CP} -a ${WRKDIR}/wop/* ${STAGEDIR}${DATADIR}/wop ${INSTALL_DATA} ${WRKDIR}/wop.png \ - ${PREFIX}/share/pixmaps/${PORTNAME}.png + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .for bin in ${WOPBIN} # Rename wop* -> worldofpadman* to avoid conflicts with `games/wop' ${INSTALL_PROGRAM} ${WRKSRC}/build/release/${bin} \ - ${PREFIX}/bin/${bin:S/wop/${PORTNAME}/} + ${STAGEDIR}${PREFIX}/bin/${bin:S/wop/${PORTNAME}/} .endfor .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) - ${INSTALL_PROGRAM} ${WRKSRC}/build/release/baseq3/*.so ${DATADIR}/wop + ${INSTALL_PROGRAM} ${WRKSRC}/build/release/baseq3/*.so \ + ${STAGEDIR}${DATADIR}/wop .endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${CP} -a ${WRKDIR}/readme/* ${DOCSDIR} -.endif - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${CP} -a ${WRKDIR}/readme/* ${STAGEDIR}${DOCSDIR} generate-distfile: @if [ -f ${DISTDIR}/${SRC_FILE}.tar.bz2 ]; then \ Modified: branches/2014Q2/games/worldofpadman/pkg-plist ============================================================================== --- branches/2014Q2/games/worldofpadman/pkg-plist Fri Apr 25 14:13:06 2014 (r352129) +++ branches/2014Q2/games/worldofpadman/pkg-plist Fri Apr 25 14:14:11 2014 (r352130) @@ -1,5 +1,5 @@ %%CLIENT%%bin/worldofpadman -%%SMPCLIENT%%bin/worldofpadman-smp +%%SMP_CLIENT%%bin/worldofpadman-smp %%SERVER%%bin/worldofpadmanded %%PORTDOCS%%%%DOCSDIR%%/banner.html %%PORTDOCS%%%%DOCSDIR%%/copyright_de.html From owner-svn-ports-branches@FreeBSD.ORG Fri Apr 25 14:52:26 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73193B6; Fri, 25 Apr 2014 14:52:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F7ED1D06; Fri, 25 Apr 2014 14:52:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PEqQMC081999; Fri, 25 Apr 2014 14:52:26 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PEqQsO081998; Fri, 25 Apr 2014 14:52:26 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404251452.s3PEqQsO081998@svn.freebsd.org> From: Boris Samorodov Date: Fri, 25 Apr 2014 14:52:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352132 - branches/2014Q2/print/foo2zjs X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Apr 2014 14:52:26 -0000 Author: bsam Date: Fri Apr 25 14:52:25 2014 New Revision: 352132 URL: http://svnweb.freebsd.org/changeset/ports/352132 QAT: https://qat.redports.org/buildarchive/r352132/ Log: MFH: r352131 ports/foo2zjs: mark the port as MAKE_JOBS_UNSAFE Error log: ----- chmod -w osx-hplj-hotplug.1 chmod: osx-hplj-hotplug.1: No such file or directory ----- Full log is here: https://jenkins.freebsd.org/pci/100-amd64/logs/bulk/100amd64-default/569/logs/errors/foo2zjs-20140401_1.log Reported by: jenkins (swills) Approved by: portmgr (erwin) Modified: branches/2014Q2/print/foo2zjs/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/foo2zjs/Makefile ============================================================================== --- branches/2014Q2/print/foo2zjs/Makefile Fri Apr 25 14:22:53 2014 (r352131) +++ branches/2014Q2/print/foo2zjs/Makefile Fri Apr 25 14:52:25 2014 (r352132) @@ -24,6 +24,8 @@ SHEBANG_FILES= msexpand SUB_FILES= pkg-message EXTRAFILES= msexpand getweb +MAKE_JOBS_UNSAFE= YES + OPTIONS_DEFINE= DOCS post-patch: From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 26 01:12:23 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93D66D07; Sat, 26 Apr 2014 01:12:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 667E01FD9; Sat, 26 Apr 2014 01:12:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3Q1CN0U049381; Sat, 26 Apr 2014 01:12:23 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3Q1CN6e049378; Sat, 26 Apr 2014 01:12:23 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201404260112.s3Q1CN6e049378@svn.freebsd.org> From: John Marino Date: Sat, 26 Apr 2014 01:12:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352203 - in branches/2014Q2/devel/florist-gpl: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 01:12:23 -0000 Author: marino Date: Sat Apr 26 01:12:22 2014 New Revision: 352203 URL: http://svnweb.freebsd.org/changeset/ports/352203 QAT: https://qat.redports.org/buildarchive/r352203/ Log: MFH: r352172 devel/florist-gpl: Don't strip static library Static libraries need to be installed with BSD_INSTALL_DATA macro rather than BSD_INSTALL_LIB macro because the former will strip the symbols from the library by default. PR: ports/188993 Submitted by: Natacha Porte Approved by: maintainer (self) Approved by: portmgr (bapt) Modified: branches/2014Q2/devel/florist-gpl/Makefile branches/2014Q2/devel/florist-gpl/files/patch-Makefile.in Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/florist-gpl/Makefile ============================================================================== --- branches/2014Q2/devel/florist-gpl/Makefile Sat Apr 26 00:39:39 2014 (r352202) +++ branches/2014Q2/devel/florist-gpl/Makefile Sat Apr 26 01:12:22 2014 (r352203) @@ -3,17 +3,17 @@ PORTNAME= florist-gpl PORTVERSION= 2012 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src -EXTRACT_SUFX= .tgz MAINTAINER= marino@FreeBSD.org COMMENT= POSIX Ada binding, IEEE Standards 1003.5(b,c) LICENSE= GPLv3 -USES= ada +USES= ada tar:tgz GNU_CONFIGURE= yes post-extract: Modified: branches/2014Q2/devel/florist-gpl/files/patch-Makefile.in ============================================================================== --- branches/2014Q2/devel/florist-gpl/files/patch-Makefile.in Sat Apr 26 00:39:39 2014 (r352202) +++ branches/2014Q2/devel/florist-gpl/files/patch-Makefile.in Sat Apr 26 01:12:22 2014 (r352203) @@ -12,7 +12,7 @@ + $(DESTDIR)$(PREFIX)/include/florist + $(BSD_INSTALL_DATA) floristlib/*.ad[bs] $(DESTDIR)$(PREFIX)/include/florist + $(BSD_INSTALL_DATA) floristlib/*.ali $(DESTDIR)$(PREFIX)/lib/florist -+ $(BSD_INSTALL_LIB) floristlib/*.a $(DESTDIR)$(PREFIX)/lib/florist ++ $(BSD_INSTALL_DATA) floristlib/*.a $(DESTDIR)$(PREFIX)/lib/florist + $(BSD_INSTALL_DATA) florist.gpr $(DESTDIR)$(PREFIX)/lib/gnat .PHONY: install clean distclean regen From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 26 08:23:13 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92D788A0; Sat, 26 Apr 2014 08:23:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F4C31272; Sat, 26 Apr 2014 08:23:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3Q8NDBN027218; Sat, 26 Apr 2014 08:23:13 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3Q8NDG0027217; Sat, 26 Apr 2014 08:23:13 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404260823.s3Q8NDG0027217@svn.freebsd.org> From: Boris Samorodov Date: Sat, 26 Apr 2014 08:23:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352230 - in branches/2014Q2/print/foomatic-filters: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 08:23:13 -0000 Author: bsam Date: Sat Apr 26 08:23:13 2014 New Revision: 352230 URL: http://svnweb.freebsd.org/changeset/ports/352230 QAT: https://qat.redports.org/buildarchive/r352230/ Log: MFH: r352227 print/foomatic-filters: fix segfault when creating log file Reported by: stb@ (at freebsd-ports@) Patch found by: Robert Backhaus Obtained from: http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7196#filter/foomatic-rip/foomaticrip.c Approved by: portmgr (miwi) Added: branches/2014Q2/print/foomatic-filters/files/ - copied from r352227, head/print/foomatic-filters/files/ Modified: branches/2014Q2/print/foomatic-filters/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/foomatic-filters/Makefile ============================================================================== --- branches/2014Q2/print/foomatic-filters/Makefile Sat Apr 26 08:21:33 2014 (r352229) +++ branches/2014Q2/print/foomatic-filters/Makefile Sat Apr 26 08:23:13 2014 (r352230) @@ -3,6 +3,7 @@ PORTNAME= foomatic-filters PORTVERSION= 4.0.17 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/foomatic/ From owner-svn-ports-branches@FreeBSD.ORG Sat Apr 26 18:43:45 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 463E6932; Sat, 26 Apr 2014 18:43:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31FC9189C; Sat, 26 Apr 2014 18:43:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3QIhjWt090707; Sat, 26 Apr 2014 18:43:45 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3QIhiq7090705; Sat, 26 Apr 2014 18:43:44 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404261843.s3QIhiq7090705@svn.freebsd.org> From: Boris Samorodov Date: Sat, 26 Apr 2014 18:43:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352366 - in branches/2014Q2/print/cups-base: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 18:43:45 -0000 Author: bsam Date: Sat Apr 26 18:43:44 2014 New Revision: 352366 URL: http://svnweb.freebsd.org/changeset/ports/352366 QAT: https://qat.redports.org/buildarchive/r352366/ Log: MFH: r351878 print/cups-base: remove BLOCKS detection from cups/cups.h It appears to be the best option here, i.e. just remove BLOCKS detection from cups/cups.h: there are some other ports which use cups/cups.h and get broken by a BLOCKS detection. So: . patch cups/cups.h to remove the offending code; . remove traces of previous attempts to fix cups-* ports; . bump PORTREVISION; . at PORTNAME block add a note that PORTREVISION is defined later for all ports. Discussed at: freebsd-ports Suggested by: tijl Approved by: portmgr (bapt) Added: branches/2014Q2/print/cups-base/files/patch-cups-cups.h - copied unchanged from r351878, head/print/cups-base/files/patch-cups-cups.h Modified: branches/2014Q2/print/cups-base/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/cups-base/Makefile ============================================================================== --- branches/2014Q2/print/cups-base/Makefile Sat Apr 26 18:38:50 2014 (r352365) +++ branches/2014Q2/print/cups-base/Makefile Sat Apr 26 18:43:44 2014 (r352366) @@ -4,7 +4,7 @@ PORTNAME= cups PORTVERSION= 1.7.1 DISTVERSIONSUFFIX= -source -PORTREVISION= 1 +#PORTREVISION= defined further CATEGORIES= print MASTER_SITES= http://www.cups.org/software/${DISTVERSION}/ \ EASYSW/${PORTNAME}/${DISTVERSION} @@ -54,18 +54,18 @@ USERS= cups # UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included .if defined(CUPS_CLIENT) -PORTREVISION= 0 +PORTREVISION= 1 LICENSE= LGPL21 CUPS_SUFFIX= -client OPTIONS_DEFINE= GNUTLS .elif defined(CUPS_IMAGE) -PORTREVISION= 0 +PORTREVISION= 1 CUPS_SUFFIX= -image LICENSE= LGPL21 OPTIONS_DEFINE= GNUTLS .else INSTALLS_ICONS= yes -PORTREVISION= 0 +PORTREVISION= 1 CUPS_SUFFIX= -base OPTIONS_DEFINE= GNUTLS LIBPAPER PHP PYTHON PAM DBUS LIBUSB XDG_OPEN AVAHI MDNSRESPONDER OPTIONS_DEFAULT= LIBPAPER @@ -299,12 +299,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${STAGEDIR}${PREFIX}/sbin/ .endif -# This is just a band-aid to unbreak print/cups-client at systems with default gcc compiler, -# should be reworked to build with blocks and libdispatch support (via options). -# -.include -.if defined(CUPS_CLIENT) && ${OPSYS} == "FreeBSD" && ${OSVERSION} > 1000000 -CFLAGS+= -fno-blocks -.endif - -.include +.include Copied: branches/2014Q2/print/cups-base/files/patch-cups-cups.h (from r351878, head/print/cups-base/files/patch-cups-cups.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/print/cups-base/files/patch-cups-cups.h Sat Apr 26 18:43:44 2014 (r352366, copy of r351878, head/print/cups-base/files/patch-cups-cups.h) @@ -0,0 +1,16 @@ +# This is to workaround a CUPS bug. Should be fixed by 1.7.3. +# pfg@ filed a bug report upstream: https://www.cups.org/str.php?L4397 +# +--- cups/cups.h.orig 2014-04-04 14:02:34.056258164 +0400 ++++ cups/cups.h 2014-04-04 14:02:46.828258878 +0400 +@@ -30,10 +30,6 @@ + typedef off_t ssize_t; /* @private@ */ + # endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */ + +-# ifdef __BLOCKS__ +-# include +-# endif /* __BLOCKS__ */ +- + # include "file.h" + # include "ipp.h" + # include "language.h" From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 29 03:59:27 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D70F43C5; Tue, 29 Apr 2014 03:59:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C4674B0F; Tue, 29 Apr 2014 03:59:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3T3xRUR012187; Tue, 29 Apr 2014 03:59:27 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3T3xRha012186; Tue, 29 Apr 2014 03:59:27 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201404290359.s3T3xRha012186@svn.freebsd.org> From: Boris Samorodov Date: Tue, 29 Apr 2014 03:59:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352567 - branches/2014Q2/print/hplip X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 03:59:27 -0000 Author: bsam Date: Tue Apr 29 03:59:27 2014 New Revision: 352567 URL: http://svnweb.freebsd.org/changeset/ports/352567 QAT: https://qat.redports.org/buildarchive/r352567/ Log: MFH: r352549 Use foomatic-rip (from print/foomatic-filters) as foomatic-rip-hplip. Discussed at: freebsd-ports@ Tested by: O. Hartmann Approved by: makc (maintainer) Approved by: portmgr (miwi) Modified: branches/2014Q2/print/hplip/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/print/hplip/Makefile ============================================================================== --- branches/2014Q2/print/hplip/Makefile Tue Apr 29 03:09:22 2014 (r352566) +++ branches/2014Q2/print/hplip/Makefile Tue Apr 29 03:59:27 2014 (r352567) @@ -3,6 +3,7 @@ PORTNAME= hplip PORTVERSION= 3.14.1 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SF @@ -28,7 +29,6 @@ USES= dos2unix pkgconfig shebangfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-foomatic-ppd-install \ - --enable-foomatic-rip-hplip-install \ --enable-hpijs-install \ --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \ --with-cupsfilterdir=${PREFIX}/libexec/cups/filter \ @@ -161,5 +161,6 @@ post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/hp ${INSTALL_DATA} ${WRKSRC}/hplip.conf ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} + ${LN} -sf ${LOCALBASE}/bin/foomatic-rip ${STAGEDIR}${PREFIX}/libexec/cups/filter/foomatic-rip-hplip .include From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 29 10:52:39 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F345C76; Tue, 29 Apr 2014 10:52:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B1D513DA; Tue, 29 Apr 2014 10:52:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3TAqd06084619; Tue, 29 Apr 2014 10:52:39 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3TAqcxu084616; Tue, 29 Apr 2014 10:52:38 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404291052.s3TAqcxu084616@svn.freebsd.org> From: Pawel Pekala Date: Tue, 29 Apr 2014 10:52:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352590 - in branches/2014Q2/graphics/yafray: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 10:52:39 -0000 Author: pawel Date: Tue Apr 29 10:52:38 2014 New Revision: 352590 URL: http://svnweb.freebsd.org/changeset/ports/352590 QAT: https://qat.redports.org/buildarchive/r352590/ Log: MFH: r352589 - Fix build on 10+, make it PREFIX safe, respect CXXFLAGS - Add staging support - Remove leading article from COMMENT - Convert to new LIB_DEPENDS format - Strip binaries Approved by: portmgr (erwin) Modified: branches/2014Q2/graphics/yafray/Makefile branches/2014Q2/graphics/yafray/files/patch-SConstruct branches/2014Q2/graphics/yafray/files/patch-freebsd-settings.py Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/yafray/Makefile ============================================================================== --- branches/2014Q2/graphics/yafray/Makefile Tue Apr 29 09:32:53 2014 (r352589) +++ branches/2014Q2/graphics/yafray/Makefile Tue Apr 29 10:52:38 2014 (r352590) @@ -9,23 +9,26 @@ MASTER_SITES= http://freebsd.nsu.ru/dist #http://www.yafaray.org/sites/default/files/download/builds/ MAINTAINER= ports@FreeBSD.org -COMMENT= A fast XML based raytracer +COMMENT= Fast XML based raytracer -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg USES= scons USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes pre-patch: @${MV} ${WRKSRC}/linux-settings.py ${WRKSRC}/freebsd-settings.py -.include +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + -e 's|%%CXXFLAGS%%|${CXXFLAGS}|' \ + ${WRKSRC}/freebsd-settings.py + +do-install: + (cd ${WRKSRC} && ${MAKE_CMD} prefix=${STAGEDIR}${PREFIX} install) + (cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/${PORTNAME} \ + lib/*.so lib/yafray/*.so) -.if ${OSVERSION} >= 1000000 -BROKEN= does not build -.endif - -.include +.include Modified: branches/2014Q2/graphics/yafray/files/patch-SConstruct ============================================================================== --- branches/2014Q2/graphics/yafray/files/patch-SConstruct Tue Apr 29 09:32:53 2014 (r352589) +++ branches/2014Q2/graphics/yafray/files/patch-SConstruct Tue Apr 29 10:52:38 2014 (r352590) @@ -1,6 +1,6 @@ ---- SConstruct.orig 2006-06-20 21:24:00.000000000 +0400 -+++ SConstruct 2009-11-04 20:56:07.000000000 +0300 -@@ -8,6 +8,11 @@ +--- SConstruct.orig 2006-06-20 19:24:00.000000000 +0200 ++++ SConstruct 2014-04-28 22:26:00.000000000 +0200 +@@ -8,6 +8,13 @@ ficheros = { 'darwin' : 'darwin-settings', 'linux2' : 'linux-settings', @@ -9,6 +9,8 @@ +'freebsd7' : 'freebsd-settings', +'freebsd8' : 'freebsd-settings', +'freebsd9' : 'freebsd-settings', ++'freebsd10' : 'freebsd-settings', ++'freebsd11' : 'freebsd-settings', 'win32' : 'win32-settings', 'sunos5' : 'sunos5-settings' } Modified: branches/2014Q2/graphics/yafray/files/patch-freebsd-settings.py ============================================================================== --- branches/2014Q2/graphics/yafray/files/patch-freebsd-settings.py Tue Apr 29 09:32:53 2014 (r352589) +++ branches/2014Q2/graphics/yafray/files/patch-freebsd-settings.py Tue Apr 29 10:52:38 2014 (r352590) @@ -1,13 +1,22 @@ ---- freebsd-settings.py.orig Sat Sep 23 00:21:17 2006 -+++ freebsd-settings.py Sat Sep 23 00:21:29 2006 +--- freebsd-settings.py.orig 2006-07-14 12:14:52.000000000 +0200 ++++ freebsd-settings.py 2014-04-29 10:49:21.918250680 +0200 @@ -10,6 +10,7 @@ global prefix prefix = args.get('prefix','/usr/local') -+def get_include(args): return prefix+"/usr/local/include" ++def get_include(args): return "%%LOCALBASE%%/include" def get_libpath(args): return prefix+"/lib" def get_pluginpath(args): return prefix+"/lib/yafray" def get_binpath(args): return prefix+"/bin" +@@ -22,7 +23,7 @@ + if debug: + flags+=' -O3 -ffast-math -ggdb' + else: +- flags+=' -O3 -ffast-math -fomit-frame-pointer' ++ flags+=' %%CXXFLAGS%%' + if arch!='': + flags+=' -march='+arch + if tune!='': @@ -46,9 +47,9 @@ class jpeg(globalinfo.library): C_ID = 'JPEG' @@ -15,9 +24,9 @@ - def present(args): return os.path.exists("/usr/include/jpeglib.h") - def get_include(args): return [] - def get_libpath(args): return [] -+ def present(args): return os.path.exists("/usr/local/include/jpeglib.h") -+ def get_include(args): return ['/usr/local/include'] -+ def get_libpath(args): return ['/usr/local/lib'] ++ def present(args): return os.path.exists("%%LOCALBASE%%/include/jpeglib.h") ++ def get_include(args): return ['%%LOCALBASE%%/include'] ++ def get_libpath(args): return ['%%LOCALBASE%%/lib'] def get_libs(args): return ['jpeg'] class pthread(globalinfo.library): From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 29 20:57:47 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A657A8C6; Tue, 29 Apr 2014 20:57:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 78F0818C4; Tue, 29 Apr 2014 20:57:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3TKvlV8035432; Tue, 29 Apr 2014 20:57:47 GMT (envelope-from rodrigo@svn.freebsd.org) Received: (from rodrigo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3TKvlAD035430; Tue, 29 Apr 2014 20:57:47 GMT (envelope-from rodrigo@svn.freebsd.org) Message-Id: <201404292057.s3TKvlAD035430@svn.freebsd.org> From: Rodrigo Osorio Date: Tue, 29 Apr 2014 20:57:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352642 - in branches/2014Q2/graphics/ufraw: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 20:57:47 -0000 Author: rodrigo Date: Tue Apr 29 20:57:46 2014 New Revision: 352642 URL: http://svnweb.freebsd.org/changeset/ports/352642 QAT: https://qat.redports.org/buildarchive/r352642/ Log: - fix clang issue caused by incorrect namespacing - add dependency - bump portrevision PR: ports/188044 Submitted by: Chris Rees Approved by: bapt (mentor) Approved by: portmgr (bapt) Obtained from: Macports Added: branches/2014Q2/graphics/ufraw/files/patch-ufraw.h - copied unchanged from r351834, head/graphics/ufraw/files/patch-ufraw.h Modified: branches/2014Q2/graphics/ufraw/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/ufraw/Makefile ============================================================================== --- branches/2014Q2/graphics/ufraw/Makefile Tue Apr 29 20:53:20 2014 (r352641) +++ branches/2014Q2/graphics/ufraw/Makefile Tue Apr 29 20:57:46 2014 (r352642) @@ -3,7 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.19.2 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --enable-extras -USES= gettext pkgconfig gmake +USES= gettext pkgconfig gmake desktop-file-utils CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} Copied: branches/2014Q2/graphics/ufraw/files/patch-ufraw.h (from r351834, head/graphics/ufraw/files/patch-ufraw.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/ufraw/files/patch-ufraw.h Tue Apr 29 20:57:46 2014 (r352642, copy of r351834, head/graphics/ufraw/files/patch-ufraw.h) @@ -0,0 +1,24 @@ +--- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800 ++++ ufraw.h 2014-01-11 11:04:54.000000000 -0800 +@@ -41,6 +41,10 @@ + /* An impossible value for conf float values */ + #define NULLF -10000.0 + ++#ifdef __cplusplus ++extern "C" { ++#endif // __cplusplus ++ + /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled + * are obvious. Apply means that the option was selected and some function + * has to act accourdingly, before changing to one of the first two states */ +@@ -78,10 +82,6 @@ extern UFName ufRawImage; + extern UFName ufRawResources; + extern UFName ufCommandLine; + +-#ifdef __cplusplus +-extern "C" { +-#endif // __cplusplus +- + UFObject *ufraw_image_new(); + #ifdef HAVE_LENSFUN + UFObject *ufraw_lensfun_new(); From owner-svn-ports-branches@FreeBSD.ORG Fri May 2 17:57:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 265B3A3D; Fri, 2 May 2014 17:57:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1294417EB; Fri, 2 May 2014 17:57:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s42HvnqG073580; Fri, 2 May 2014 17:57:49 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s42HvnmK073573; Fri, 2 May 2014 17:57:49 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201405021757.s42HvnmK073573@svn.freebsd.org> From: Florian Smeets Date: Fri, 2 May 2014 17:57:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352832 - in branches/2014Q2/lang: php53 php53-extensions php53/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 May 2014 17:57:50 -0000 Author: flo Date: Fri May 2 17:57:48 2014 New Revision: 352832 URL: http://svnweb.freebsd.org/changeset/ports/352832 QAT: https://qat.redports.org/buildarchive/r352832/ Log: MFH: r352831 - Fix CVE-2014-0185 via patch until 5.3.29 is released - Use DEFAULT_VERSIONS [1] PR: ports/188061 [1] Submitted by: Spil [1] Approved by: portmgr (bdrewery) Added: branches/2014Q2/lang/php53/files/patch-cve-2014-0185 - copied unchanged from r352831, head/lang/php53/files/patch-cve-2014-0185 Modified: branches/2014Q2/lang/php53-extensions/Makefile branches/2014Q2/lang/php53/Makefile branches/2014Q2/lang/php53/Makefile.ext Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/lang/php53-extensions/Makefile ============================================================================== --- branches/2014Q2/lang/php53-extensions/Makefile Fri May 2 17:48:14 2014 (r352831) +++ branches/2014Q2/lang/php53-extensions/Makefile Fri May 2 17:57:48 2014 (r352832) @@ -11,8 +11,8 @@ EXTRACT_ONLY= # none MAINTAINER= flo@FreeBSD.org COMMENT= A "meta-port" to install PHP extensions -DEFAULT_PHP_VER=53 -IGNORE_WITH_PHP=5 52 +PHP_DEFAULT= 53 +IGNORE_WITH_PHP=5 52 55 USE_PHP_BUILD= yes NO_BUILD= yes Modified: branches/2014Q2/lang/php53/Makefile ============================================================================== --- branches/2014Q2/lang/php53/Makefile Fri May 2 17:48:14 2014 (r352831) +++ branches/2014Q2/lang/php53/Makefile Fri May 2 17:57:48 2014 (r352832) @@ -3,7 +3,7 @@ PORTNAME= php53 PORTVERSION= 5.3.28 -PORTREVISION?= 0 +PORTREVISION?= 2 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions @@ -14,7 +14,7 @@ COMMENT= PHP Scripting Language LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} -USE_BZIP2= yes +USES=tar:bzip2 .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf Modified: branches/2014Q2/lang/php53/Makefile.ext ============================================================================== --- branches/2014Q2/lang/php53/Makefile.ext Fri May 2 17:48:14 2014 (r352831) +++ branches/2014Q2/lang/php53/Makefile.ext Fri May 2 17:57:48 2014 (r352832) @@ -3,8 +3,8 @@ COMMENT= The ${PHP_MODNAME} shared exten USE_PHP= yes USE_PHPEXT= yes PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -DEFAULT_PHP_VER=53 -IGNORE_WITH_PHP=52 5 +PHP_DEFAULT= 53 +IGNORE_WITH_PHP=52 5 55 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} Copied: branches/2014Q2/lang/php53/files/patch-cve-2014-0185 (from r352831, head/lang/php53/files/patch-cve-2014-0185) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/lang/php53/files/patch-cve-2014-0185 Fri May 2 17:57:48 2014 (r352832, copy of r352831, head/lang/php53/files/patch-cve-2014-0185) @@ -0,0 +1,26 @@ +--- sapi/fpm/fpm/fpm_unix.c.orig 2014-05-02 19:01:53.759889551 +0200 ++++ sapi/fpm/fpm/fpm_unix.c 2014-05-02 19:02:05.029888255 +0200 +@@ -35,7 +35,7 @@ + /* uninitialized */ + wp->socket_uid = -1; + wp->socket_gid = -1; +- wp->socket_mode = 0666; ++ wp->socket_mode = 0660; + + if (!c) { + return 0; +--- sapi/fpm/php-fpm.conf.in.orig 2014-05-02 19:03:03.746956989 +0200 ++++ sapi/fpm/php-fpm.conf.in 2014-05-02 19:02:37.651887275 +0200 +@@ -158,10 +158,10 @@ + ; permissions must be set in order to allow connections from a web server. Many + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user +-; mode is set to 0666 ++; mode is set to 0660 + ;listen.owner = @php_fpm_user@ + ;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++;listen.mode = 0660 + + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. + ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original From owner-svn-ports-branches@FreeBSD.ORG Sat May 3 10:02:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 843A0E5A; Sat, 3 May 2014 10:02:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6974A1B48; Sat, 3 May 2014 10:02:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s43A2i8h084928; Sat, 3 May 2014 10:02:44 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s43A2ZwW084873; Sat, 3 May 2014 10:02:35 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405031002.s43A2ZwW084873@svn.freebsd.org> From: Rene Ladan Date: Sat, 3 May 2014 10:02:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352898 - in branches/2014Q2/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 May 2014 10:02:44 -0000 Author: rene Date: Sat May 3 10:02:35 2014 New Revision: 352898 URL: http://svnweb.freebsd.org/changeset/ports/352898 QAT: https://qat.redports.org/buildarchive/r352898/ Log: MFH: r352803 Update to 34.0.1847.132 Obtained from: https://github.com/gliaskos/freebsd-chromium/ Security: http://vuxml.org/freebsd/7cf25a0c-d031-11e3-947b-00262d5ed8ee.html http://vuxml.org/freebsd/963413a5-bf50-11e3-a2d6-00262d5ed8ee.html Approved by: portmgr (erwin) Added: branches/2014Q2/www/chromium/files/patch-cc__layers__layer.cc - copied unchanged from r352803, head/www/chromium/files/patch-cc__layers__layer.cc branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc - copied unchanged from r352803, head/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc - copied unchanged from r352803, head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc - copied unchanged from r352803, head/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_paths.h - copied unchanged from r352803, head/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2014Q2/www/chromium/files/patch-components__storage_monitor.gypi - copied unchanged from r352803, head/www/chromium/files/patch-components__storage_monitor.gypi branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc - copied unchanged from r352803, head/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc - copied unchanged from r352803, head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h - copied unchanged from r352803, head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h branches/2014Q2/www/chromium/files/patch-crypto__nss_util.cc - copied unchanged from r352803, head/www/chromium/files/patch-crypto__nss_util.cc branches/2014Q2/www/chromium/files/patch-device__hid__hid.gyp - copied unchanged from r352803, head/www/chromium/files/patch-device__hid__hid.gyp branches/2014Q2/www/chromium/files/patch-device__serial__serial.gyp - copied unchanged from r352803, head/www/chromium/files/patch-device__serial__serial.gyp branches/2014Q2/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc - copied unchanged from r352803, head/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc branches/2014Q2/www/chromium/files/patch-printing__printing.gyp - copied unchanged from r352803, head/www/chromium/files/patch-printing__printing.gyp branches/2014Q2/www/chromium/files/patch-skia__skia_common.gypi - copied unchanged from r352803, head/www/chromium/files/patch-skia__skia_common.gypi branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp - copied unchanged from r352803, head/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp Deleted: branches/2014Q2/www/chromium/files/patch-breakpad__breakpad.gyp branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h branches/2014Q2/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc branches/2014Q2/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc branches/2014Q2/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc branches/2014Q2/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc branches/2014Q2/www/chromium/files/patch-net__spdy__spdy_priority_forest.h branches/2014Q2/www/chromium/files/patch-remoting__remoting.gyp branches/2014Q2/www/chromium/files/patch-skia__skia_library.gypi branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp branches/2014Q2/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh branches/2014Q2/www/chromium/files/patch-tools__grit__grit__node__base.py branches/2014Q2/www/chromium/files/patch-v8__src__checks.cc Modified: branches/2014Q2/www/chromium/Makefile branches/2014Q2/www/chromium/distinfo branches/2014Q2/www/chromium/files/extra-patch-clang branches/2014Q2/www/chromium/files/extra-patch-fixup-execinfo branches/2014Q2/www/chromium/files/extra-patch-gcc branches/2014Q2/www/chromium/files/patch-base__base.gyp branches/2014Q2/www/chromium/files/patch-base__base.gypi branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc branches/2014Q2/www/chromium/files/patch-build__common.gypi branches/2014Q2/www/chromium/files/patch-build__gyp_chromium branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__memory_details.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__net__connection_tester.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h branches/2014Q2/www/chromium/files/patch-chrome__browser__usb__usb_context.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.h branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_paths.cc branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_switches.cc branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_switches.h branches/2014Q2/www/chromium/files/patch-chrome__common__pref_names.cc branches/2014Q2/www/chromium/files/patch-chrome__common__pref_names.h branches/2014Q2/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc branches/2014Q2/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h branches/2014Q2/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc branches/2014Q2/www/chromium/files/patch-chrome__test__base__testing_browser_process.h branches/2014Q2/www/chromium/files/patch-chrome__test__perf__perf_test.cc branches/2014Q2/www/chromium/files/patch-chrome__test__ui__ui_test.cc branches/2014Q2/www/chromium/files/patch-chrome__tools__build__linux__sed.sh branches/2014Q2/www/chromium/files/patch-components__policy__resources__policy_templates.json branches/2014Q2/www/chromium/files/patch-components__policy__tools__generate_policy_source.py branches/2014Q2/www/chromium/files/patch-content__app__content_main_runner.cc branches/2014Q2/www/chromium/files/patch-content__browser__browser_main_loop.cc branches/2014Q2/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2014Q2/www/chromium/files/patch-content__browser__download__base_file.cc branches/2014Q2/www/chromium/files/patch-content__browser__download__base_file_linux.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h branches/2014Q2/www/chromium/files/patch-content__common__set_process_title_linux.cc branches/2014Q2/www/chromium/files/patch-content__common__set_process_title_linux.h branches/2014Q2/www/chromium/files/patch-content__content_browser.gypi branches/2014Q2/www/chromium/files/patch-content__content_common.gypi branches/2014Q2/www/chromium/files/patch-content__content_tests.gypi branches/2014Q2/www/chromium/files/patch-content__plugin__plugin_main_linux.cc branches/2014Q2/www/chromium/files/patch-content__public__test__browser_test_base.cc branches/2014Q2/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc branches/2014Q2/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc branches/2014Q2/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc branches/2014Q2/www/chromium/files/patch-content__renderer__render_process_impl.cc branches/2014Q2/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc branches/2014Q2/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_control_list.cc branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_test_config.cc branches/2014Q2/www/chromium/files/patch-gpu__gpu_config.gypi branches/2014Q2/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc branches/2014Q2/www/chromium/files/patch-media__base__audio_splicer.cc branches/2014Q2/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc branches/2014Q2/www/chromium/files/patch-media__media.gyp branches/2014Q2/www/chromium/files/patch-native_client__build__common.gypi branches/2014Q2/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp branches/2014Q2/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp branches/2014Q2/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp branches/2014Q2/www/chromium/files/patch-net__base__dns_reloader.cc branches/2014Q2/www/chromium/files/patch-net__base__mime_util_unittest.cc branches/2014Q2/www/chromium/files/patch-net__base__net_util.h branches/2014Q2/www/chromium/files/patch-net__base__network_change_notifier.cc branches/2014Q2/www/chromium/files/patch-net__dns__address_sorter_posix.cc branches/2014Q2/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc branches/2014Q2/www/chromium/files/patch-net__dns__dns_session.cc branches/2014Q2/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc branches/2014Q2/www/chromium/files/patch-net__net.gyp branches/2014Q2/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2014Q2/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2014Q2/www/chromium/files/patch-net__socket__socks5_client_socket.cc branches/2014Q2/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h branches/2014Q2/www/chromium/files/patch-net__udp__udp_socket_unittest.cc branches/2014Q2/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc branches/2014Q2/www/chromium/files/patch-sync__util__get_session_name.cc branches/2014Q2/www/chromium/files/patch-sync__util__get_session_name_linux.cc branches/2014Q2/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h branches/2014Q2/www/chromium/files/patch-testing__gtest__src__gtest.cc branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__config.h branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp branches/2014Q2/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c branches/2014Q2/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp branches/2014Q2/www/chromium/files/patch-third_party__libjingle__libjingle.gyp branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc branches/2014Q2/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp branches/2014Q2/www/chromium/files/patch-third_party__libusb__libusb.gyp branches/2014Q2/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh branches/2014Q2/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h branches/2014Q2/www/chromium/files/patch-third_party__webrtc__build__common.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h branches/2014Q2/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py branches/2014Q2/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp branches/2014Q2/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp branches/2014Q2/www/chromium/files/patch-ui__events__event_switches.cc branches/2014Q2/www/chromium/files/patch-ui__events__event_switches.h branches/2014Q2/www/chromium/files/patch-ui__gl__gl.gyp branches/2014Q2/www/chromium/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/chromium/Makefile ============================================================================== --- branches/2014Q2/www/chromium/Makefile Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/Makefile Sat May 3 10:02:35 2014 (r352898) @@ -4,7 +4,7 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -PORTVERSION= 33.0.1750.152 +PORTVERSION= 34.0.1847.132 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ bash:${PORTSDIR}/shells/bash \ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ - v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat + ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ @@ -133,7 +133,6 @@ ALL_TARGET+= ${TEST_TARGETS} DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug -GYP_DEFINES+= remove_webcore_debug_symbols=1 .else BUILDTYPE= Release GYP_DEFINES+= buildtype=Official @@ -179,11 +178,7 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ - ${WRKSRC}/base/base.gypi \ - ${WRKSRC}/build/common.gypi \ ${WRKSRC}/crypto/crypto.gyp \ - ${WRKSRC}/third_party/libvpx/libvpx.gyp \ - ${WRKSRC}/third_party/WebKit/Source/testing/testing.gyp \ ${WRKSRC}/v8/tools/gyp/v8.gyp \ ${WRKSRC}/v8/build/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ @@ -191,17 +186,6 @@ post-patch: @${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \ ${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \ ${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi - @${REINPLACE_CMD} -e "s|is_linux|(is_linux or is_bsd)|" \ - ${WRKSRC}/chrome/browser/browser_resources.grd \ - ${WRKSRC}/chrome/app/theme/theme_resources.grd \ - ${WRKSRC}/chrome/browser/resources/task_manager/defines.js \ - ${WRKSRC}/tools/grit/grit/xtb_reader_unittest.py \ - ${WRKSRC}/ui/base/strings/app_locale_settings.grd \ - ${WRKSRC}/ui/base/strings/app_locale_settings_bn.xtb \ - ${WRKSRC}/ui/base/strings/app_locale_settings_ja.xtb \ - ${WRKSRC}/ui/base/strings/app_locale_settings_ko.xtb \ - ${WRKSRC}/ui/base/strings/app_locale_settings_ml.xtb \ - ${WRKSRC}/ui/base/strings/app_locale_settings_th.xtb do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ @@ -219,7 +203,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \ ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${STAGEDIR}${DATADIR} -.for p in chrome chrome_100_percent content_resources resources +.for p in chrome_100_percent content_resources resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} .endfor .for f in chrome libffmpegsumo.so protoc Modified: branches/2014Q2/www/chromium/distinfo ============================================================================== --- branches/2014Q2/www/chromium/distinfo Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/distinfo Sat May 3 10:02:35 2014 (r352898) @@ -1,4 +1,4 @@ -SHA256 (chromium-33.0.1750.152.tar.xz) = 9fd462840bee3ae205b0548e8a483f7589beecdb7c6309d4d65425cbf710cc2f -SIZE (chromium-33.0.1750.152.tar.xz) = 185396116 -SHA256 (chromium-33.0.1750.152-testdata.tar.xz) = 0367fba6100a0538769955bad02cc17d3a6919d3dd391777283fb5a2fe4f56b0 -SIZE (chromium-33.0.1750.152-testdata.tar.xz) = 112419292 +SHA256 (chromium-34.0.1847.132.tar.xz) = e8930a43d2cff3cd98d4772f6b7a527b363fa9567afbe86a4c0574dc25886038 +SIZE (chromium-34.0.1847.132.tar.xz) = 190164176 +SHA256 (chromium-34.0.1847.132-testdata.tar.xz) = 0c3c9894cd1a16bfcfc122d40d38bf1c6986087e17d22d86de9d3624c404eb32 +SIZE (chromium-34.0.1847.132-testdata.tar.xz) = 108476892 Modified: branches/2014Q2/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2014Q2/www/chromium/files/extra-patch-clang Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/extra-patch-clang Sat May 3 10:02:35 2014 (r352898) @@ -48,7 +48,7 @@ ASSERT_LT(kFinalTlsValue, *ptr); --- base/tracked_objects.cc 2013-07-03 23:39:54.000000000 -0400 +++ base/tracked_objects.cc 2013-07-19 00:42:10.000000000 -0400 -@@ -346,7 +346,7 @@ +@@ -378,7 +378,7 @@ } // We must NOT do any allocations during this callback. // Using the simple linked lists avoids all allocations. @@ -59,7 +59,7 @@ } --- base/tracked_objects_unittest.cc.orig 2013-08-30 23:09:01.000000000 +0300 +++ base/tracked_objects_unittest.cc 2013-08-30 23:10:14.000000000 +0300 -@@ -50,9 +50,9 @@ +@@ -53,9 +53,9 @@ Births* birth = ThreadData::TallyABirthIfActive(location); if (ThreadData::status() == ThreadData::DEACTIVATED) @@ -71,7 +71,7 @@ } // Helper function to verify the most common test expectations. -@@ -231,7 +231,7 @@ +@@ -234,7 +234,7 @@ return; scoped_ptr data(new DeathData()); @@ -80,7 +80,7 @@ EXPECT_EQ(data->run_duration_sum(), 0); EXPECT_EQ(data->run_duration_sample(), 0); EXPECT_EQ(data->queue_duration_sum(), 0); -@@ -432,7 +432,7 @@ +@@ -435,7 +435,7 @@ Location location(kFunction, kFile, kLineNumber, NULL); // Do not delete |birth|. We don't own it. Births* birth = ThreadData::TallyABirthIfActive(location); @@ -91,7 +91,7 @@ const TrackedTime kStartOfRun = TrackedTime() + --- chrome/browser/metrics/thread_watcher.cc 2013-07-03 23:45:55.000000000 -0400 +++ chrome/browser/metrics/thread_watcher.cc 2013-07-19 01:38:45.000000000 -0400 -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ MSVC_PUSH_DISABLE_WARNING(4748) int* NullPointer() { @@ -102,7 +102,7 @@ void NullPointerCrash(int line_number) { --- chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-03 23:46:07.000000000 -0400 +++ chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-19 01:50:13.000000000 -0400 -@@ -232,7 +232,7 @@ +@@ -260,7 +260,7 @@ } DCHECK(window_ptr); DCHECK_EQ(window_ptr->window_id.id(), window_id); @@ -113,7 +113,7 @@ } --- media/audio/audio_output_proxy_unittest.cc.orig 2013-08-30 23:23:03.000000000 +0300 +++ media/audio/audio_output_proxy_unittest.cc 2013-08-30 23:23:54.000000000 +0300 -@@ -427,7 +427,7 @@ +@@ -392,7 +392,7 @@ // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) .Times(2) @@ -124,7 +124,7 @@ .Times(2); --- media/filters/decrypting_video_decoder_unittest.cc.orig 2013-08-30 23:27:39.000000000 +0300 +++ media/filters/decrypting_video_decoder_unittest.cc 2013-08-30 23:28:27.000000000 +0300 -@@ -482,7 +482,7 @@ +@@ -417,7 +417,7 @@ // callback to cancel the |decryptor_ready_cb|. EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())) .WillOnce(ResetAndRunCallback(&decryptor_ready_cb, @@ -224,7 +224,7 @@ --- v8/src/runtime.cc.orig 2013-11-08 08:01:04.000000000 +0100 +++ v8/src/runtime.cc 2013-11-15 13:17:39.000000000 +0100 -@@ -14028,7 +14028,7 @@ +@@ -14043,7 +14043,7 @@ local_object->SetInternalField(0, reinterpret_cast(break_iterator)); // Make sure that the pointer to adopted text is NULL. @@ -235,7 +235,7 @@ JSObject::SetLocalPropertyIgnoreAttributes( --- base/strings/safe_sprintf_unittest.cc.orig 2013-11-08 07:42:08.000000000 +0100 +++ base/strings/safe_sprintf_unittest.cc 2013-11-15 15:04:45.000000000 +0100 -@@ -733,12 +733,14 @@ +@@ -721,12 +721,14 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wconversion-null" #endif @@ -261,14 +261,20 @@ } static Unique CreateImmovable(Handle handle) { ---- content/browser/renderer_host/render_widget_host_view_guest.cc.orig 2014-01-07 21:02:28.000000000 +0100 -+++ content/browser/renderer_host/render_widget_host_view_guest.cc 2014-01-13 13:48:52.000000000 +0100 -@@ -254,7 +254,7 @@ +--- content/browser/frame_host/render_widget_host_view_guest.cc.orig 2014-03-05 22:24:07.000000000 +0100 ++++ content/browser/frame_host/render_widget_host_view_guest.cc 2014-03-09 20:01:20.000000000 +0100 +@@ -258,11 +258,11 @@ + gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { - if (guest_->GetEmbedderRenderWidgetHostView()) - return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId(); -- return static_cast(NULL); -+ return reinterpret_cast(NULL); + if (!guest_) +- return static_cast(NULL); ++ return reinterpret_cast(NULL); + + RenderWidgetHostView* rwhv = guest_->GetEmbedderRenderWidgetHostView(); + if (!rwhv) +- return static_cast(NULL); ++ return reinterpret_cast(NULL); + return rwhv->GetNativeViewId(); } - gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() { +- Modified: branches/2014Q2/www/chromium/files/extra-patch-fixup-execinfo ============================================================================== --- branches/2014Q2/www/chromium/files/extra-patch-fixup-execinfo Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/extra-patch-fixup-execinfo Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- v8/src/checks.cc.orig 2014-01-07 21:03:55.000000000 +0100 -+++ v8/src/checks.cc 2014-01-08 01:14:20.000000000 +0100 -@@ -41,7 +41,7 @@ +--- v8/src/checks.cc.orig 2014-03-07 23:57:27.000000000 +0100 ++++ v8/src/checks.cc 2014-03-08 00:04:14.000000000 +0100 +@@ -44,7 +44,7 @@ static V8_INLINE void DumpBacktrace() { #if V8_LIBC_GLIBC || V8_OS_BSD void* trace[100]; Modified: branches/2014Q2/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2014Q2/www/chromium/files/extra-patch-gcc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/extra-patch-gcc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ --- base/memory/shared_memory.h.orig 2011-04-01 21:54:26.066717848 +0300 +++ base/memory/shared_memory.h 2011-04-01 21:55:14.292717813 +0300 -@@ -10,6 +10,7 @@ +@@ -12,6 +12,7 @@ #if defined(OS_POSIX) #include @@ -10,7 +10,7 @@ #endif --- third_party/libjingle/source/talk/base/stream.h.orig 2011-04-01 22:16:30.129717654 +0300 +++ third_party/libjingle/source/talk/base/stream.h 2011-04-01 22:16:48.245715495 +0300 -@@ -28,6 +28,7 @@ +@@ -30,6 +30,7 @@ #ifndef TALK_BASE_STREAM_H__ #define TALK_BASE_STREAM_H__ @@ -40,7 +40,7 @@ --- third_party/ffmpeg/libavutil/cpu.c.orig 2013-11-16 01:26:14.000000000 +0100 +++ third_party/ffmpeg/libavutil/cpu.c 2013-11-19 00:24:53.000000000 +0100 -@@ -21,6 +21,9 @@ +@@ -24,6 +24,9 @@ #include "opt.h" #include "common.h" Modified: branches/2014Q2/www/chromium/files/patch-base__base.gyp ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__base.gyp Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__base.gyp Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/base.gyp.orig 2013-09-26 02:17:34.000000000 +0300 -+++ base/base.gyp 2013-09-26 03:00:53.000000000 +0300 -@@ -823,6 +823,11 @@ +--- ./base/base.gyp.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/base.gyp 2014-04-24 23:23:41.000000000 +0200 +@@ -820,6 +820,11 @@ ['include', '^debug/proc_maps_linux_unittest\\.cc$'], ], }], Modified: branches/2014Q2/www/chromium/files/patch-base__base.gypi ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__base.gypi Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__base.gypi Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/base.gypi.orig 2013-09-28 20:09:58.000000000 +0300 -+++ base/base.gypi 2013-09-26 02:24:27.000000000 +0300 -@@ -872,11 +872,15 @@ +--- ./base/base.gypi.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/base.gypi 2014-04-24 23:23:41.000000000 +0200 +@@ -918,11 +918,15 @@ 'process/memory_stubs.cc', ], 'sources/': [ @@ -15,4 +15,4 @@ + ['exclude', '^process/process_metrics_linux\\.cc$'], ], }], - ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', { + # Remove all unnecessary files for build_nexe.py to avoid exceeding Modified: branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,28 +1,11 @@ ---- base/debug/stack_trace_posix.cc.orig 2013-02-05 10:02:11.000000000 +0200 -+++ base/debug/stack_trace_posix.cc 2013-02-13 20:27:44.000000000 +0200 -@@ -14,6 +14,9 @@ - #include - #include - #include -+#if defined(OS_FREEBSD) -+#include -+#endif +--- ./base/debug/stack_trace_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -471,7 +471,7 @@ - #include - -@@ -326,9 +329,15 @@ - // NOTE: This code MUST be async-signal safe (it's used by in-process - // stack dumping signal handler). NO malloc or stdio is allowed here. - -+#if defined(OS_FREEBSD) -+ // Disable backtrace for now, libexecinfo crashes in getframeaddr -+ // in release build / i386. -+ count_ = 0; -+#else // Though the backtrace API man page does not list any possible negative // return values, we take no chance. - count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); -+#endif +- count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); ++ count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); } - void StackTrace::PrintBacktrace() const { + void StackTrace::Print() const { Modified: branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/file_util_posix.cc.orig 2014-02-20 21:28:47.000000000 +0100 -+++ base/file_util_posix.cc 2014-02-24 15:44:01.000000000 +0100 -@@ -673,7 +673,7 @@ +--- ./base/file_util_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/file_util_posix.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -672,7 +672,7 @@ #endif // defined(OS_ANDROID) results->is_directory = S_ISDIR(file_info.st_mode); results->size = file_info.st_size; Modified: branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2013-08-19 02:53:00.000000000 +0300 -+++ base/posix/unix_domain_socket_linux_unittest.cc 2013-08-30 19:34:24.000000000 +0300 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-04-24 23:23:41.000000000 +0200 @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. Modified: branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h Sat May 3 10:02:35 2014 (r352898) @@ -1,11 +1,11 @@ ---- ./base/process/internal_linux.h.orig 2013-09-03 09:09:03.000000000 +0200 -+++ ./base/process/internal_linux.h 2013-09-07 21:29:08.000000000 +0200 -@@ -10,6 +10,8 @@ +--- ./base/process/internal_linux.h.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-04-24 23:23:41.000000000 +0200 +@@ -12,6 +12,8 @@ #include "base/files/file_path.h" +#include /* pid_t */ + namespace base { - namespace internal { + class Time; Modified: branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/process/memory_unittest.cc.orig 2013-09-24 23:49:53.000000000 +0300 -+++ base/process/memory_unittest.cc 2013-09-24 23:50:57.000000000 +0300 -@@ -153,12 +153,12 @@ +--- ./base/process/memory_unittest.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -151,12 +151,12 @@ // Android doesn't implement set_new_handler, so we can't use the // OutOfMemoryTest cases. @@ -15,7 +15,7 @@ !defined(OS_WIN) && \ !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) -@@ -375,5 +375,5 @@ +@@ -372,5 +372,5 @@ #endif // !ARCH_CPU_64_BITS #endif // OS_MACOSX Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/process/process_handle_freebsd.cc.orig 2013-09-20 05:35:17.000000000 +0300 -+++ base/process/process_handle_freebsd.cc 2013-09-24 20:41:45.000000000 +0300 +--- ./base/process/process_handle_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_handle_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 @@ -6,33 +6,35 @@ #include Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/process/process_iterator.h.orig 2013-08-16 22:08:02.000000000 +0300 -+++ base/process/process_iterator.h 2013-08-16 22:08:08.000000000 +0300 +--- ./base/process/process_iterator.h.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_iterator.h 2014-04-24 23:23:41.000000000 +0200 @@ -21,6 +21,11 @@ #include #include Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2013-09-03 09:09:03.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2013-09-07 21:31:37.000000000 +0200 +--- ./base/process/process_iterator_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 @@ -6,6 +6,10 @@ #include Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h Sat May 3 10:02:35 2014 (r352898) @@ -1,8 +1,8 @@ ---- base/process/process_metrics.h.orig 2013-08-16 22:01:16.000000000 +0300 -+++ base/process/process_metrics.h 2013-08-16 22:04:12.000000000 +0300 -@@ -15,6 +15,13 @@ - #include "base/process.h" - #include "base/time.h" +--- ./base/process/process_metrics.h.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-04-24 23:23:41.000000000 +0200 +@@ -17,6 +17,13 @@ + #include "base/time/time.h" + #include "base/values.h" +#if defined(OS_BSD) +#include Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2013-09-03 09:09:03.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2013-09-07 21:30:29.000000000 +0200 +--- ./base/process/process_metrics_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 @@ -4,6 +4,10 @@ #include "base/process/process_metrics.h" Modified: branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/security_unittest.cc.orig 2013-09-01 01:12:36.000000000 +0300 -+++ base/security_unittest.cc 2013-09-01 01:13:35.000000000 +0300 -@@ -161,7 +161,7 @@ +--- ./base/security_unittest.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/security_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -159,7 +159,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { Modified: branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-03-04 03:16:26.000000000 +0100 -+++ ./base/strings/safe_sprintf.cc 2014-03-07 14:14:55.000000000 +0100 +--- ./base/strings/safe_sprintf.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-04-24 23:23:41.000000000 +0200 @@ -107,11 +107,11 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte Modified: branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/sys_info_freebsd.cc.orig 2013-09-28 19:09:58.000000000 +0200 -+++ base/sys_info_freebsd.cc 2013-10-09 17:13:04.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 @@ -4,6 +4,7 @@ #include "base/sys_info.h" Modified: branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,11 +1,11 @@ ---- base/sys_info_posix.cc.orig 2011-02-07 00:36:57.000000000 +0100 -+++ base/sys_info_posix.cc 2011-02-07 00:21:53.000000000 +0100 -@@ -23,7 +23,7 @@ +--- ./base/sys_info_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -49,7 +49,7 @@ namespace base { -#if !defined(OS_OPENBSD) +#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD) int SysInfo::NumberOfProcessors() { - // It seems that sysconf returns the number of "logical" processors on both - // Mac and Linux. So we get the number of "online logical" processors. + return g_lazy_number_of_processors.Get().value(); + } Modified: branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/test/expectations/expectation.cc.orig 2013-08-31 23:17:45.000000000 +0300 -+++ base/test/expectations/expectation.cc 2013-08-31 23:18:59.000000000 +0300 -@@ -58,6 +58,7 @@ +--- ./base/test/expectations/expectation.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -59,6 +59,7 @@ variant != "64") { return false; } @@ -8,7 +8,7 @@ } else if (name == "ChromeOS") { // TODO(rsesek): Figure out what ChromeOS needs. } else if (name == "iOS") { -@@ -119,6 +120,8 @@ +@@ -122,6 +123,8 @@ platform.variant = "32"; else if (arch == "x86_64") platform.variant = "64"; Modified: branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2014-01-07 21:01:10.000000000 +0100 -+++ base/test/launcher/test_launcher.cc 2014-01-13 01:36:07.000000000 +0100 -@@ -36,6 +36,10 @@ +--- ./base/test/launcher/test_launcher.cc.orig 2014-04-24 22:36:09.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-04-24 23:23:41.000000000 +0200 +@@ -39,6 +39,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif Modified: branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- base/threading/platform_thread_linux.cc.orig 2013-08-17 20:52:20.000000000 +0300 -+++ base/threading/platform_thread_linux.cc 2013-08-17 20:56:34.000000000 +0300 +--- ./base/threading/platform_thread_linux.cc.orig 2014-04-24 22:36:10.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-04-24 23:23:41.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" @@ -10,7 +10,7 @@ #include #include #include -@@ -52,7 +54,7 @@ +@@ -48,7 +50,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); Modified: branches/2014Q2/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2014Q2/www/chromium/files/patch-build__common.gypi Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-build__common.gypi Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- build/common.gypi.orig 2014-02-20 21:28:44.000000000 +0100 -+++ build/common.gypi 2014-02-24 23:02:26.000000000 +0100 -@@ -573,7 +573,7 @@ +--- ./build/common.gypi.orig 2014-04-24 22:36:09.000000000 +0200 ++++ ./build/common.gypi 2014-04-24 23:23:42.000000000 +0200 +@@ -565,7 +565,7 @@ }], # DBus usage. @@ -9,7 +9,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -1008,6 +1008,10 @@ +@@ -1002,6 +1002,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -20,16 +20,16 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -1283,7 +1287,7 @@ - }], - ['os_posix==1 and OS!="mac" and OS!="ios"', { - # Figure out the python architecture to decide if we build pyauto. -- 'python_arch%': 'id() == scroll_clip_layer_id_); + +- gfx::Vector2dF max_offset( ++ // (rene) prevent name collission with /usr/include/vm/vm_map.h on FreeBSD ++ // which also defines max_offset ++ gfx::Vector2dF _max_offset( + scaled_scroll_bounds.width() - current_layer->bounds().width(), + scaled_scroll_bounds.height() - current_layer->bounds().height()); + // We need the final scroll offset to be in CSS coords. +- max_offset.Scale(1.f / scale_factor); +- max_offset.SetToMax(gfx::Vector2dF()); +- return gfx::ToFlooredVector2d(max_offset); ++ _max_offset.Scale(1.f / scale_factor); ++ _max_offset.SetToMax(gfx::Vector2dF()); ++ return gfx::ToFlooredVector2d(_max_offset); + } + + void Layer::SetScrollClipLayerId(int clip_layer_id) { Copied: branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc (from r352803, head/www/chromium/files/patch-cc__layers__layer_impl.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc Sat May 3 10:02:35 2014 (r352898, copy of r352803, head/www/chromium/files/patch-cc__layers__layer_impl.cc) @@ -0,0 +1,32 @@ +--- ./cc/layers/layer_impl.cc.orig 2014-04-24 22:35:51.000000000 +0200 ++++ ./cc/layers/layer_impl.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -1222,21 +1222,23 @@ + scaled_scroll_bounds.SetSize(scale_factor * scaled_scroll_bounds.width(), + scale_factor * scaled_scroll_bounds.height()); + +- gfx::Vector2dF max_offset( ++ // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD ++ // which also defines max_offset ++ gfx::Vector2dF _max_offset( + scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(), + scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height()); + // We need the final scroll offset to be in CSS coords. +- max_offset.Scale(1 / scale_factor); +- max_offset.SetToMax(gfx::Vector2dF()); +- return gfx::ToFlooredVector2d(max_offset); ++ _max_offset.Scale(1 / scale_factor); ++ _max_offset.SetToMax(gfx::Vector2dF()); ++ return gfx::ToFlooredVector2d(_max_offset); + } + + gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() { +- gfx::Vector2dF max_offset = MaxScrollOffset(); ++ gfx::Vector2dF _max_offset = MaxScrollOffset(); + gfx::Vector2dF old_offset = TotalScrollOffset(); + gfx::Vector2dF clamped_offset = old_offset; + +- clamped_offset.SetToMin(max_offset); ++ clamped_offset.SetToMin(_max_offset); + clamped_offset.SetToMax(gfx::Vector2d()); + gfx::Vector2dF delta = clamped_offset - old_offset; + if (!delta.IsZero()) Modified: branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2014-02-20 21:27:29.000000000 +0100 -+++ chrome/app/chrome_main_delegate.cc 2014-02-25 01:39:55.000000000 +0100 -@@ -97,7 +97,7 @@ +--- ./chrome/app/chrome_main_delegate.cc.orig 2014-04-24 22:34:55.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -95,7 +95,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -9,7 +9,7 @@ #include "components/breakpad/app/breakpad_linux.h" #endif -@@ -115,7 +115,7 @@ +@@ -121,7 +121,7 @@ g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; #endif @@ -18,16 +18,16 @@ base::LazyInstance::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -235,7 +235,7 @@ - // Mac needs them for the plugin process name. - process_type == switches::kPluginProcess || +@@ -243,7 +243,7 @@ + // Needed for scrollbar related images. + process_type == switches::kWorkerProcess || #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -392,7 +392,7 @@ +@@ -457,7 +457,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +36,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -433,7 +433,7 @@ +@@ -498,7 +498,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -564,7 +564,7 @@ +@@ -629,7 +629,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -703,7 +703,7 @@ +@@ -747,7 +747,7 @@ #endif } @@ -63,7 +63,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -715,7 +715,7 @@ +@@ -759,7 +759,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -800,7 +800,7 @@ +@@ -844,7 +844,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } Modified: branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- chrome/app/chrome_main_delegate.h.orig 2014-02-20 21:27:29.000000000 +0100 -+++ chrome/app/chrome_main_delegate.h 2014-02-25 01:45:34.000000000 +0100 +--- ./chrome/app/chrome_main_delegate.h.orig 2014-04-24 22:34:55.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-04-24 23:23:42.000000000 +0200 @@ -31,7 +31,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,11 +1,11 @@ ---- chrome/browser/about_flags.cc.orig 2012-01-18 11:12:44.000000000 +0200 -+++ chrome/browser/about_flags.cc 2012-01-29 14:51:40.000000000 +0200 -@@ -674,7 +674,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -2320,7 +2320,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) return kOsLinux; - #else - #error Unknown platform + #elif defined(OS_ANDROID) + return kOsAndroid; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,38 +1,11 @@ ---- chrome/browser/browser_process_impl.cc.orig 2013-09-25 23:32:28.000000000 +0300 -+++ chrome/browser/browser_process_impl.cc 2013-09-25 23:34:24.000000000 +0300 -@@ -244,7 +244,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -261,7 +261,7 @@ ExtensionRendererState::GetInstance()->Shutdown(); -#if !defined(OS_ANDROID) && !defined(OS_IOS) +#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD) media_file_system_registry_.reset(); - // Delete |storage_monitor_| now. Otherwise the FILE thread would be gone - // when we try to release it in the dtor and Valgrind would report a -@@ -618,7 +618,7 @@ - } - - StorageMonitor* BrowserProcessImpl::storage_monitor() { --#if defined(OS_ANDROID) || defined(OS_IOS) -+#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_BSD) - return NULL; - #else - return storage_monitor_.get(); -@@ -627,7 +627,7 @@ - - void BrowserProcessImpl::set_storage_monitor_for_test( - scoped_ptr monitor) { --#if !defined(OS_ANDROID) && !defined(OS_IOS) -+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD) - storage_monitor_ = monitor.Pass(); - #endif - } -@@ -923,7 +923,7 @@ - } - #endif - --#if !defined(OS_ANDROID) && !defined(OS_IOS) -+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD) - storage_monitor_.reset(StorageMonitor::Create()); - #endif - + // Remove the global instance of the Storage Monitor now. Otherwise the + // FILE thread would be gone when we try to release it in the dtor and Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2012-05-19 23:45:48.797106216 +0300 -+++ chrome/browser/chrome_browser_main.cc 2012-05-19 23:45:56.878106198 +0300 -@@ -1298,7 +1298,7 @@ - // just changed it to include experiments. - child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess()); +--- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -973,7 +973,7 @@ + } + #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) // Set the product channel for crash reports. - child_process_logging::SetChannel( + base::debug::SetCrashKeyValue(crash_keys::kChannel, chrome::VersionInfo::GetVersionStringModifier()); Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2013-02-28 10:15:23.000000000 +0200 -+++ chrome/browser/chrome_browser_main_posix.cc 2013-03-06 20:31:24.000000000 +0200 -@@ -310,6 +310,11 @@ +--- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main_posix.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -314,6 +314,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -10,9 +10,9 @@ + const size_t kShutdownDetectorThreadStackSize = 0; +#else #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN; + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -318,6 +323,7 @@ +@@ -322,6 +327,7 @@ // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; #endif Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2014-01-07 21:01:57.000000000 +0100 -+++ chrome/browser/chrome_content_browser_client.cc 2014-01-11 01:50:13.000000000 +0100 -@@ -486,7 +486,7 @@ +--- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -493,7 +493,7 @@ } } @@ -9,16 +9,16 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -543,7 +543,7 @@ +@@ -549,7 +549,7 @@ return -1; } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #endif // !defined(OS_ANDROID) - + #if !defined(OS_CHROMEOS) -@@ -1389,7 +1389,7 @@ +@@ -1449,7 +1449,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,8 +27,8 @@ if (breakpad::IsCrashReporterEnabled()) { std::string enable_crash_reporter; GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2525,7 +2525,7 @@ - Profile::FromBrowserContext(browser_context))); +@@ -2587,7 +2587,7 @@ + } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -36,7 +36,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2580,7 +2580,7 @@ +@@ -2642,7 +2642,7 @@ } #endif // defined(OS_ANDROID) } Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2013-09-25 22:20:01.000000000 +0300 -+++ chrome/browser/chrome_content_browser_client.h 2013-09-25 22:20:17.000000000 +0300 -@@ -248,7 +248,7 @@ +--- ./chrome/browser/chrome_content_browser_client.h.orig 2014-04-24 22:35:13.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.h 2014-04-24 23:23:42.000000000 +0200 +@@ -255,7 +255,7 @@ const base::FilePath& storage_partition_path, ScopedVector* additional_backends) OVERRIDE; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,8 +1,8 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2013-11-08 07:40:50.000000000 +0100 -+++ chrome/browser/diagnostics/diagnostics_writer.cc 2013-11-16 11:31:52.000000000 +0100 +--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-04-24 22:35:10.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-04-24 23:23:42.000000000 +0200 @@ -268,7 +268,7 @@ console_->SetColor(color); - console_->Write(ASCIIToUTF16(result)); + console_->Write(base::ASCIIToUTF16(result)); } - if (format_ == MACHINE) { + if (format_ == THEMACHINE) { Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2013-11-08 07:40:50.000000000 +0100 -+++ chrome/browser/diagnostics/diagnostics_writer.h 2013-11-16 11:29:16.000000000 +0100 +--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-04-24 22:35:10.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-04-24 23:23:42.000000000 +0200 @@ -18,7 +18,7 @@ public: // The type of formatting done by this writer. Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2013-11-16 01:16:39.000000000 +0100 -+++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2013-11-17 23:32:59.000000000 +0100 -@@ -149,10 +149,12 @@ +--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-04-24 22:35:08.000000000 +0200 ++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -166,10 +166,12 @@ } bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() { Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Sat May 3 09:44:29 2014 (r352897) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Sat May 3 10:02:35 2014 (r352898) @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-02-20 21:27:39.000000000 +0100 -+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-02-28 11:05:01.000000000 +0100 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-04-24 22:35:09.000000000 +0200 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-04-24 23:23:42.000000000 +0200 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" @@ -11,7 +11,7 @@ #include // Must be included before ifaddrs.h. #include #include -@@ -100,11 +104,33 @@ +@@ -102,11 +106,33 @@ const char* prefixes[], size_t prefixes_count) { const int MAC_LENGTH = 6; @@ -46,7 +46,7 @@ int sd = socket(AF_INET, SOCK_DGRAM, 0); int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); close(sd); -@@ -114,11 +140,17 @@ +@@ -116,11 +142,17 @@ const char* mac_address = static_cast(ifinfo.ifr_hwaddr.sa_data); Copied: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc (from r352803, head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc Sat May 3 10:02:35 2014 (r352898, copy of r352803, head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc) @@ -0,0 +1,19 @@ +--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-04-24 22:35:08.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-04-24 23:23:42.000000000 +0200 +@@ -83,7 +83,7 @@ + + void SerialGetDevicesFunction::Work() { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); +- *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Sat May 3 10:03:46 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9258F54; Sat, 3 May 2014 10:03:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7CA9A1B60; Sat, 3 May 2014 10:03:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s43A3kKf085156; Sat, 3 May 2014 10:03:46 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s43A3kah085155; Sat, 3 May 2014 10:03:46 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405031003.s43A3kah085155@svn.freebsd.org> From: Rene Ladan Date: Sat, 3 May 2014 10:03:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352899 - branches/2014Q2/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 May 2014 10:03:46 -0000 Author: rene Date: Sat May 3 10:03:45 2014 New Revision: 352899 URL: http://svnweb.freebsd.org/changeset/ports/352899 QAT: https://qat.redports.org/buildarchive/r352899/ Log: MFH: r352849 Fix build when depot_tools is not present locally (which is usually the case on non-development machines). PR: ports/189230 Submitted by: Jia-Shiun Li Obtained from: https://codereview.chromium.org/171513010/ Tested by: gjb Approved by: portmgr (erwin) Modified: branches/2014Q2/www/chromium/files/patch-build__gyp_chromium Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/chromium/files/patch-build__gyp_chromium ============================================================================== --- branches/2014Q2/www/chromium/files/patch-build__gyp_chromium Sat May 3 10:02:35 2014 (r352898) +++ branches/2014Q2/www/chromium/files/patch-build__gyp_chromium Sat May 3 10:03:45 2014 (r352899) @@ -1,5 +1,30 @@ --- ./build/gyp_chromium.orig 2014-04-24 22:36:09.000000000 +0200 +++ ./build/gyp_chromium 2014-04-24 23:23:42.000000000 +0200 +@@ -39,8 +39,6 @@ + sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', + 'Source', 'build', 'scripts')) + +-import find_depot_tools +- + # On Windows, Psyco shortens warm runs of build/gyp_chromium by about + # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70 + # seconds. Conversely, memory usage of build/gyp_chromium with Psyco +@@ -376,6 +374,7 @@ + # TODO(bradnelson): take this out once this issue is fixed: + # http://code.google.com/p/gyp/issues/detail?id=177 + if sys.platform == 'cygwin': ++ import find_depot_tools + depot_tools_path = find_depot_tools.add_depot_tools_to_path() + python_dir = sorted(glob.glob(os.path.join(depot_tools_path, + 'python2*_bin')))[-1] +@@ -441,6 +440,7 @@ + # don't use the automatic toolchain, as it currently only supports VS2013. + msvs_version = os.environ.get('GYP_MSVS_VERSION', '2013') + if sys.platform in ('win32', 'cygwin') and msvs_version.startswith('2013'): ++ import find_depot_tools + depot_tools_path = find_depot_tools.add_depot_tools_to_path() + toolchain = os.path.normpath(os.path.join( + depot_tools_path, 'win_toolchain', 'vs2013_files')) @@ -477,8 +477,9 @@ args.append('--check') From owner-svn-ports-branches@FreeBSD.ORG Sat May 3 18:58:39 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 275564FF; Sat, 3 May 2014 18:58:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13DCB18FA; Sat, 3 May 2014 18:58:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s43Iwcwo007726; Sat, 3 May 2014 18:58:38 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s43IwcW4007725; Sat, 3 May 2014 18:58:38 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405031858.s43IwcW4007725@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 3 May 2014 18:58:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352932 - branches/2014Q2/net-p2p/verlihub/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 May 2014 18:58:39 -0000 Author: rakuco Date: Sat May 3 18:58:38 2014 New Revision: 352932 URL: http://svnweb.freebsd.org/changeset/ports/352932 QAT: https://qat.redports.org/buildarchive/r352932/ Log: MFH: r352923 Import upstream commit to fix the build with recent versions of GCC. getcwd(3) needs unistd.h. Approved by: portmgr (erwin) Added: branches/2014Q2/net-p2p/verlihub/files/patch-src__stringutils.cpp - copied unchanged from r352923, head/net-p2p/verlihub/files/patch-src__stringutils.cpp Modified: Directory Properties: branches/2014Q2/ (props changed) Copied: branches/2014Q2/net-p2p/verlihub/files/patch-src__stringutils.cpp (from r352923, head/net-p2p/verlihub/files/patch-src__stringutils.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/net-p2p/verlihub/files/patch-src__stringutils.cpp Sat May 3 18:58:38 2014 (r352932, copy of r352923, head/net-p2p/verlihub/files/patch-src__stringutils.cpp) @@ -0,0 +1,19 @@ +commit 4d6a2ebf7e47b2854fdf4a9cc7daec625b035b3c +Author: Nimesh Ghelani +Date: Sat Nov 10 01:47:07 2012 +0530 + + added unistd.h to stringutils.cpp causing compilation error + +diff --git a/src/stringutils.cpp b/src/stringutils.cpp +index 35d7d46..b020a79 100755 +--- src/stringutils.cpp ++++ src/stringutils.cpp +@@ -32,6 +32,8 @@ + #include + #ifdef _WIN32 + #include ++#else ++#include + #endif + + namespace nVerliHub { From owner-svn-ports-branches@FreeBSD.ORG Sat May 3 19:00:11 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E5C56C5; Sat, 3 May 2014 19:00:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F08F1909; Sat, 3 May 2014 19:00:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s43J0Bur008600; Sat, 3 May 2014 19:00:11 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s43J0ABs008595; Sat, 3 May 2014 19:00:10 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405031900.s43J0ABs008595@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 3 May 2014 19:00:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352934 - in branches/2014Q2/databases/qdbm: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 May 2014 19:00:11 -0000 Author: rakuco Date: Sat May 3 19:00:10 2014 New Revision: 352934 URL: http://svnweb.freebsd.org/changeset/ports/352934 QAT: https://qat.redports.org/buildarchive/r352934/ Log: MFH: r352922 Prevent the port from hardcoding its own CFLAGS/CXXFLAGS. This should fix the build with clang 3.4, which refuses to accept options such as -fforce-addr and -fno-force-addr. While here, update the port's website in pkg-descr as well. Approved by: portmgr (erwin) Added: branches/2014Q2/databases/qdbm/files/patch-java__Makefile.in - copied unchanged from r352922, head/databases/qdbm/files/patch-java__Makefile.in branches/2014Q2/databases/qdbm/files/patch-plus__Makefile.in - copied unchanged from r352922, head/databases/qdbm/files/patch-plus__Makefile.in Modified: branches/2014Q2/databases/qdbm/Makefile branches/2014Q2/databases/qdbm/files/patch-Makefile.in branches/2014Q2/databases/qdbm/pkg-descr Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/qdbm/Makefile ============================================================================== --- branches/2014Q2/databases/qdbm/Makefile Sat May 3 18:58:57 2014 (r352933) +++ branches/2014Q2/databases/qdbm/Makefile Sat May 3 19:00:10 2014 (r352934) @@ -4,6 +4,7 @@ PORTNAME= qdbm PORTVERSION= 1.8.78 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://fallabs.com/qdbm/ @@ -12,6 +13,7 @@ COMMENT?= Quick Database Manager GNU_CONFIGURE= yes USE_LDCONFIG= yes +CFLAGS+= -fPIC .if !defined(SLAVEPORT) USES+= iconv Modified: branches/2014Q2/databases/qdbm/files/patch-Makefile.in ============================================================================== --- branches/2014Q2/databases/qdbm/files/patch-Makefile.in Sat May 3 18:58:57 2014 (r352933) +++ branches/2014Q2/databases/qdbm/files/patch-Makefile.in Sat May 3 19:00:10 2014 (r352934) @@ -1,11 +1,30 @@ ---- Makefile.in.orig Wed Feb 21 16:44:56 2007 -+++ Makefile.in Sun Jul 8 18:19:52 2007 -@@ -169,8 +169,10 @@ - cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR) - mkdir -p $(DESTDIR)$(MYMAN3DIR) - cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR) +--- Makefile.in.orig 2010-08-04 20:14:34.000000000 +0300 ++++ Makefile.in 2014-05-03 18:41:01.000000000 +0300 +@@ -46,7 +46,7 @@ + MYMAN1DIR = @mandir@/man1 + MYMAN3DIR = @mandir@/man3 + MYDATADIR = @datadir@/$(PACKAGE) +-MYPCDIR = @libdir@/pkgconfig ++MYPCDIR = /usr/local/libdata/pkgconfig + DESTDIR = + + # Building binaries +@@ -56,7 +56,6 @@ + -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ + -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG +-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@ + LD = @LD@ + LIBS = -lqdbm @LIBS@ + LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ +@@ -170,8 +169,10 @@ + cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR) + mkdir -p $(DESTDIR)$(MYMAN3DIR) + cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR) +.if $(MYDOCS) != "" - mkdir -p $(DESTDIR)$(MYDATADIR) - cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR) + mkdir -p $(DESTDIR)$(MYDATADIR) + cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR) +.endif - mkdir -p $(DESTDIR)$(MYPCDIR) + mkdir -p $(DESTDIR)$(MYPCDIR) + cd $(srcdir) && cp -Rf $(MYPCS) $(DESTDIR)$(MYPCDIR) + @printf '\n' Copied: branches/2014Q2/databases/qdbm/files/patch-java__Makefile.in (from r352922, head/databases/qdbm/files/patch-java__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/databases/qdbm/files/patch-java__Makefile.in Sat May 3 19:00:10 2014 (r352934, copy of r352922, head/databases/qdbm/files/patch-java__Makefile.in) @@ -0,0 +1,10 @@ +--- java/Makefile.in.orig 2014-05-03 18:41:15.000000000 +0300 ++++ java/Makefile.in 2014-05-03 18:41:21.000000000 +0300 +@@ -56,7 +56,6 @@ + @MYDEFS@ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ + -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG +-CFLAGS = -Wall -fPIC -fsigned-char -O2 @MYOPTS@ + LD = @LD@ + LIBS = -lqdbm @LIBS@ + LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS) Copied: branches/2014Q2/databases/qdbm/files/patch-plus__Makefile.in (from r352922, head/databases/qdbm/files/patch-plus__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/databases/qdbm/files/patch-plus__Makefile.in Sat May 3 19:00:10 2014 (r352934, copy of r352922, head/databases/qdbm/files/patch-plus__Makefile.in) @@ -0,0 +1,10 @@ +--- plus/Makefile.in.orig 2014-05-03 18:41:29.000000000 +0300 ++++ plus/Makefile.in 2014-05-03 18:41:32.000000000 +0300 +@@ -44,7 +44,6 @@ + -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \ + -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \ + -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG +-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@ + LD = @LD@ + LIBS = -lqdbm @LIBS@ + LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \ Modified: branches/2014Q2/databases/qdbm/pkg-descr ============================================================================== --- branches/2014Q2/databases/qdbm/pkg-descr Sat May 3 18:58:57 2014 (r352933) +++ branches/2014Q2/databases/qdbm/pkg-descr Sat May 3 19:00:10 2014 (r352934) @@ -5,4 +5,4 @@ Both binary data and character string ca value. There is neither concept of data tables nor data types. Records are organized in hash table or B+ tree. -WWW: http://qdbm.sourceforge.net/ +WWW: http://fallabs.com/qdbm/ From owner-svn-ports-branches@FreeBSD.ORG Sun May 4 13:04:49 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C50D8551; Sun, 4 May 2014 13:04:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AFEB512DF; Sun, 4 May 2014 13:04:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s44D4n0R081196; Sun, 4 May 2014 13:04:49 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s44D4nj9081195; Sun, 4 May 2014 13:04:49 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405041304.s44D4nj9081195@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 4 May 2014 13:04:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352955 - branches/2014Q2/devel/qtcreator/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2014 13:04:49 -0000 Author: rakuco Date: Sun May 4 13:04:49 2014 New Revision: 352955 URL: http://svnweb.freebsd.org/changeset/ports/352955 QAT: https://qat.redports.org/buildarchive/r352955/ Log: MFH: r352943 Add upstream patch that fixes the build on -CURRENT. In file included from ../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/language/itemreader.cpp:36: ../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses] if (! d.kind == DiagnosticMessage::Warning) ^ ~~ ../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17: note: add parentheses after the '!' to evaluate the comparison first if (! d.kind == DiagnosticMessage::Warning) ^ ( ) ../../../../../../qt-creator-2.8.0-src/src/shared/qbs/src/lib/parser/qmljsparser_p.h:156:17: note: add parentheses around left hand side expression to silence this warning if (! d.kind == DiagnosticMessage::Warning) ^ ( ) 1 error generated. Approved by: portmgr (erwin) Added: branches/2014Q2/devel/qtcreator/files/ - copied from r352943, head/devel/qtcreator/files/ Modified: Directory Properties: branches/2014Q2/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Sun May 4 15:54:10 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7707E90A; Sun, 4 May 2014 15:54:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6463C11A7; Sun, 4 May 2014 15:54:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s44FsA0H052630; Sun, 4 May 2014 15:54:10 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s44FsAkH052628; Sun, 4 May 2014 15:54:10 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201405041554.s44FsAkH052628@svn.freebsd.org> From: Alex Kozlov Date: Sun, 4 May 2014 15:54:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352963 - branches/2014Q2/emulators/cpmtools2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2014 15:54:10 -0000 Author: ak Date: Sun May 4 15:54:09 2014 New Revision: 352963 URL: http://svnweb.freebsd.org/changeset/ports/352963 QAT: https://qat.redports.org/buildarchive/r352963/ Log: MFH: r350351, r352957 - Update to 2.19 - Update MASTER_SITES - Bump PORTREVISION, distfile has been rerolled Approved by: portmgr (antoine) Modified: branches/2014Q2/emulators/cpmtools2/Makefile branches/2014Q2/emulators/cpmtools2/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/emulators/cpmtools2/Makefile ============================================================================== --- branches/2014Q2/emulators/cpmtools2/Makefile Sun May 4 15:37:11 2014 (r352962) +++ branches/2014Q2/emulators/cpmtools2/Makefile Sun May 4 15:54:09 2014 (r352963) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= cpmtools2 -PORTVERSION= 2.18 +PORTVERSION= 2.19 +PORTREVISION= 1 CATEGORIES= emulators sysutils -MASTER_SITES= http://www.moria.de/~michael/cpmtools/ +MASTER_SITES= http://www.moria.de/~michael/cpmtools/files/ DISTNAME= ${PORTNAME:C/2$//}-${PORTVERSION} MAINTAINER= ak@FreeBSD.org Modified: branches/2014Q2/emulators/cpmtools2/distinfo ============================================================================== --- branches/2014Q2/emulators/cpmtools2/distinfo Sun May 4 15:37:11 2014 (r352962) +++ branches/2014Q2/emulators/cpmtools2/distinfo Sun May 4 15:54:09 2014 (r352963) @@ -1,2 +1,2 @@ -SHA256 (cpmtools-2.18.tar.gz) = cef4437227ed75957d6065b4aa630fa84529215e1b7c64dc5bfc2986923a0ef7 -SIZE (cpmtools-2.18.tar.gz) = 185331 +SHA256 (cpmtools-2.19.tar.gz) = 4404fdd9a4b69a801c5af696aa452b51159f644f7ffb7d37891dcf66c2f75b6a +SIZE (cpmtools-2.19.tar.gz) = 189014 From owner-svn-ports-branches@FreeBSD.ORG Thu May 8 08:00:38 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D72AFEDC; Thu, 8 May 2014 08:00:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B96A8C30; Thu, 8 May 2014 08:00:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4880cAX074233; Thu, 8 May 2014 08:00:38 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4880brM073681; Thu, 8 May 2014 08:00:37 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405080800.s4880brM073681@svn.freebsd.org> From: Antoine Brodin Date: Thu, 8 May 2014 08:00:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353281 - in branches/2014Q2: databases/beansdb databases/py-cmemcache www/ruby-wgettsv www/tokyopromenade X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2014 08:00:39 -0000 Author: antoine Date: Thu May 8 08:00:37 2014 New Revision: 353281 URL: http://svnweb.freebsd.org/changeset/ports/353281 QAT: https://qat.redports.org/buildarchive/r353281/ Log: MFH: r353280 Reset maintainer: : host aspmx.l.google.com[74.125.131.27] said: 550-5.1.1 The email account that you tried to reach does not exist. With hat: portmgr Reported by: pkg-fallout Modified: branches/2014Q2/databases/beansdb/Makefile branches/2014Q2/databases/py-cmemcache/Makefile branches/2014Q2/www/ruby-wgettsv/Makefile branches/2014Q2/www/tokyopromenade/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/beansdb/Makefile ============================================================================== --- branches/2014Q2/databases/beansdb/Makefile Thu May 8 07:59:13 2014 (r353280) +++ branches/2014Q2/databases/beansdb/Makefile Thu May 8 08:00:37 2014 (r353281) @@ -6,7 +6,7 @@ PORTVERSION= 0.5.3 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE -MAINTAINER= qingfeng@douban.com +MAINTAINER= ports@FreeBSD.org COMMENT= Yet another distributed key-value storage system from Douban Inc GNU_CONFIGURE= yes Modified: branches/2014Q2/databases/py-cmemcache/Makefile ============================================================================== --- branches/2014Q2/databases/py-cmemcache/Makefile Thu May 8 07:59:13 2014 (r353280) +++ branches/2014Q2/databases/py-cmemcache/Makefile Thu May 8 08:00:37 2014 (r353281) @@ -7,7 +7,7 @@ CATEGORIES= databases python MASTER_SITES= http://gijsbert.org/downloads/cmemcache/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= qingfeng@douban.com +MAINTAINER= ports@FreeBSD.org COMMENT= Python API for memcached, a distributed memory cache daemon LIB_DEPENDS= libmemcache.so:${PORTSDIR}/databases/libmemcache Modified: branches/2014Q2/www/ruby-wgettsv/Makefile ============================================================================== --- branches/2014Q2/www/ruby-wgettsv/Makefile Thu May 8 07:59:13 2014 (r353280) +++ branches/2014Q2/www/ruby-wgettsv/Makefile Thu May 8 08:00:37 2014 (r353281) @@ -10,7 +10,7 @@ DISTNAME= wgettsv EXTRACT_SUFX= EXTRACT_ONLY= -MAINTAINER= qingfeng@douban.com +MAINTAINER= ports@FreeBSD.org COMMENT= Collect WWW resources and generate TSV data USE_RUBY= yes Modified: branches/2014Q2/www/tokyopromenade/Makefile ============================================================================== --- branches/2014Q2/www/tokyopromenade/Makefile Thu May 8 07:59:13 2014 (r353280) +++ branches/2014Q2/www/tokyopromenade/Makefile Thu May 8 08:00:37 2014 (r353281) @@ -6,7 +6,7 @@ PORTVERSION= 0.9.22 CATEGORIES= www MASTER_SITES= http://fallabs.com/${PORTNAME}/ -MAINTAINER= qingfeng@douban.com +MAINTAINER= ports@FreeBSD.org COMMENT= A content management system BUILD_DEPENDS= tokyocabinet>=1.4.31:${PORTSDIR}/databases/tokyocabinet \ From owner-svn-ports-branches@FreeBSD.ORG Sat May 10 16:11:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 007BCDF6; Sat, 10 May 2014 16:11:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E185AF77; Sat, 10 May 2014 16:11:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AGBBjI096135; Sat, 10 May 2014 16:11:11 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AGBBaT096133; Sat, 10 May 2014 16:11:11 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405101611.s4AGBBaT096133@svn.freebsd.org> From: Antoine Brodin Date: Sat, 10 May 2014 16:11:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353577 - in branches/2014Q2: lang/twelf math/emacs-calc X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 16:11:12 -0000 Author: antoine Date: Sat May 10 16:11:11 2014 New Revision: 353577 URL: http://svnweb.freebsd.org/changeset/ports/353577 QAT: https://qat.redports.org/buildarchive/r353577/ Log: MFH: r353576 Maintainer no longer wishes to maintain those ports With hat: portmgr Modified: branches/2014Q2/lang/twelf/Makefile branches/2014Q2/math/emacs-calc/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/lang/twelf/Makefile ============================================================================== --- branches/2014Q2/lang/twelf/Makefile Sat May 10 16:09:48 2014 (r353576) +++ branches/2014Q2/lang/twelf/Makefile Sat May 10 16:11:11 2014 (r353577) @@ -8,7 +8,7 @@ CATEGORIES= lang MASTER_SITES= http://www-2.cs.cmu.edu/~twelf/dist/ http://www.cs.cmu.edu/~twelf/dist/ DISTNAME= twelf-1-5R1 -MAINTAINER= andrewb@cs.cmu.edu +MAINTAINER= ports@FreeBSD.org COMMENT= A meta-logical framework for deductive systems .if defined(WITH_MLTON) Modified: branches/2014Q2/math/emacs-calc/Makefile ============================================================================== --- branches/2014Q2/math/emacs-calc/Makefile Sat May 10 16:09:48 2014 (r353576) +++ branches/2014Q2/math/emacs-calc/Makefile Sat May 10 16:11:11 2014 (r353577) @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} PKGNAMEPREFIX= emacs- -MAINTAINER= andrewb@cs.cmu.edu +MAINTAINER= ports@FreeBSD.org COMMENT= Arbitrary-precision calculator for Emacs CONFLICTS= emacs-22.* xemacs-packages-\* From owner-svn-ports-branches@FreeBSD.ORG Sat May 10 18:43:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C364ACE; Sat, 10 May 2014 18:43:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FB2DD5B; Sat, 10 May 2014 18:43:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AIhauH074190; Sat, 10 May 2014 18:43:36 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AIhZ42074186; Sat, 10 May 2014 18:43:35 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405101843.s4AIhZ42074186@svn.freebsd.org> From: Antoine Brodin Date: Sat, 10 May 2014 18:43:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353596 - in branches/2014Q2: devel/libphish editors/yui mail/sccmilter sysutils/mountsmb2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 18:43:36 -0000 Author: antoine Date: Sat May 10 18:43:35 2014 New Revision: 353596 URL: http://svnweb.freebsd.org/changeset/ports/353596 QAT: https://qat.redports.org/buildarchive/r353596/ Log: MFH: r353595 Maintainer no longer wishes to maintain those ports With hat: portmgr Modified: branches/2014Q2/devel/libphish/Makefile branches/2014Q2/editors/yui/Makefile branches/2014Q2/mail/sccmilter/Makefile branches/2014Q2/sysutils/mountsmb2/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/libphish/Makefile ============================================================================== --- branches/2014Q2/devel/libphish/Makefile Sat May 10 18:42:01 2014 (r353595) +++ branches/2014Q2/devel/libphish/Makefile Sat May 10 18:43:35 2014 (r353596) @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= http://download.berlios.de/opdb/ \ http://download2.berlios.de/opdb/ \ -MAINTAINER= citycat4@ngs.ru +MAINTAINER= ports@FreeBSD.org COMMENT= Cross-platform library to interact with the Open Phishing Database BUILD_DEPENDS= xmlwf:${PORTSDIR}/textproc/expat2 Modified: branches/2014Q2/editors/yui/Makefile ============================================================================== --- branches/2014Q2/editors/yui/Makefile Sat May 10 18:42:01 2014 (r353595) +++ branches/2014Q2/editors/yui/Makefile Sat May 10 18:43:35 2014 (r353596) @@ -7,7 +7,7 @@ CATEGORIES= editors MASTER_SITES= http://www.sheltonsoft.ru/fileZ/software/ \ http://www.askd.ru/~shelton/design/ -MAINTAINER= citycat4@ngs.ru +MAINTAINER= ports@FreeBSD.org COMMENT= Rich-featured multi-windows console text editor USE_BZIP2= yes Modified: branches/2014Q2/mail/sccmilter/Makefile ============================================================================== --- branches/2014Q2/mail/sccmilter/Makefile Sat May 10 18:42:01 2014 (r353595) +++ branches/2014Q2/mail/sccmilter/Makefile Sat May 10 18:43:35 2014 (r353596) @@ -8,7 +8,7 @@ CATEGORIES= mail sysutils MASTER_SITES= http://openoffice.mirahost.ru/fileZ/ports/ \ http://citycat4.land.ru/ -MAINTAINER= citycat4@ngs.ru +MAINTAINER= ports@FreeBSD.org COMMENT= Sendmail spam control and canceling filter, based on Milter API .if !exists(/usr/lib/libmilter.a) Modified: branches/2014Q2/sysutils/mountsmb2/Makefile ============================================================================== --- branches/2014Q2/sysutils/mountsmb2/Makefile Sat May 10 18:42:01 2014 (r353595) +++ branches/2014Q2/sysutils/mountsmb2/Makefile Sat May 10 18:43:35 2014 (r353596) @@ -7,7 +7,7 @@ CATEGORIES= sysutils net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= lippe -MAINTAINER= citycat4@ngs.ru +MAINTAINER= ports@FreeBSD.org COMMENT= SMB/CIFS shares mounting scripts to do it at login RUN_DEPENDS= nbtscan:${PORTSDIR}/net-mgmt/nbtscan \ From owner-svn-ports-branches@FreeBSD.ORG Sat May 10 21:25:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C99C87D9; Sat, 10 May 2014 21:25:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6F99C00; Sat, 10 May 2014 21:25:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4ALPa8e050942; Sat, 10 May 2014 21:25:36 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4ALPaLg050941; Sat, 10 May 2014 21:25:36 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405102125.s4ALPaLg050941@svn.freebsd.org> From: Antoine Brodin Date: Sat, 10 May 2014 21:25:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353609 - branches/2014Q2/devel/libtecla X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 21:25:36 -0000 Author: antoine Date: Sat May 10 21:25:36 2014 New Revision: 353609 URL: http://svnweb.freebsd.org/changeset/ports/353609 QAT: https://qat.redports.org/buildarchive/r353609/ Log: MFH: r353608 Maintainer no longer wishes to maintain this port With hat: portmgr Modified: branches/2014Q2/devel/libtecla/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/libtecla/Makefile ============================================================================== --- branches/2014Q2/devel/libtecla/Makefile Sat May 10 21:23:11 2014 (r353608) +++ branches/2014Q2/devel/libtecla/Makefile Sat May 10 21:25:36 2014 (r353609) @@ -6,7 +6,7 @@ PORTVERSION= 1.6.2 CATEGORIES= devel MASTER_SITES= http://www.astro.caltech.edu/~mcs/tecla/ -MAINTAINER= mike@fth-devel.net +MAINTAINER= ports@FreeBSD.org COMMENT= Interactive command line editing facilities LICENSE= MIT From owner-svn-ports-branches@FreeBSD.ORG Sat May 10 22:08:12 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 939B2F8E; Sat, 10 May 2014 22:08:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 74A16F07; Sat, 10 May 2014 22:08:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4AM8CWN070334; Sat, 10 May 2014 22:08:12 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4AM89fp070312; Sat, 10 May 2014 22:08:09 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405102208.s4AM89fp070312@svn.freebsd.org> From: Antoine Brodin Date: Sat, 10 May 2014 22:08:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353622 - in branches/2014Q2: astro/p5-Weather-Underground astro/weatherspect audio/snack graphics/imgv java/mx4j lang/bsh misc/mmv misc/unclutter print/cups-pdf textproc/weka www/xpi-f... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 22:08:12 -0000 Author: antoine Date: Sat May 10 22:08:09 2014 New Revision: 353622 URL: http://svnweb.freebsd.org/changeset/ports/353622 QAT: https://qat.redports.org/buildarchive/r353622/ Log: MFH: r353621 Maintainer no longer wishes to maintain those ports With hat: portmgr Modified: branches/2014Q2/astro/p5-Weather-Underground/Makefile branches/2014Q2/astro/weatherspect/Makefile branches/2014Q2/audio/snack/Makefile branches/2014Q2/graphics/imgv/Makefile branches/2014Q2/java/mx4j/Makefile branches/2014Q2/lang/bsh/Makefile branches/2014Q2/misc/mmv/Makefile branches/2014Q2/misc/unclutter/Makefile branches/2014Q2/print/cups-pdf/Makefile branches/2014Q2/textproc/weka/Makefile branches/2014Q2/www/xpi-forecastfox/Makefile branches/2014Q2/www/xpi-vimperator/Makefile branches/2014Q2/x11/numlockx/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/astro/p5-Weather-Underground/Makefile ============================================================================== --- branches/2014Q2/astro/p5-Weather-Underground/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/astro/p5-Weather-Underground/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -8,7 +8,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= Weather PKGNAMEPREFIX= p5- -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Retrieve weather information from wunderground.com BUILD_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ Modified: branches/2014Q2/astro/weatherspect/Makefile ============================================================================== --- branches/2014Q2/astro/weatherspect/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/astro/weatherspect/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -7,7 +7,7 @@ CATEGORIES= astro MASTER_SITES= http://www.robobunny.com/projects/weatherspect/ DISTNAME= ${PORTNAME}_v${PORTVERSION} -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Weather simulation in ASCII art LICENSE= ART10 GPLv1 Modified: branches/2014Q2/audio/snack/Makefile ============================================================================== --- branches/2014Q2/audio/snack/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/audio/snack/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -8,7 +8,7 @@ CATEGORIES= audio tcl tk MASTER_SITES= http://www.speech.kth.se/snack/dist/ DISTNAME= ${PORTNAME}${PORTVERSION} -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= A sound toolkit for scripting languages WRKSRC= ${WRKDIR}/${DISTNAME}/unix Modified: branches/2014Q2/graphics/imgv/Makefile ============================================================================== --- branches/2014Q2/graphics/imgv/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/graphics/imgv/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -8,7 +8,7 @@ CATEGORIES= graphics python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} EXTRACT_SUFX= -src.tar.gz -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= A unique and feature rich Image Viewer RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \ Modified: branches/2014Q2/java/mx4j/Makefile ============================================================================== --- branches/2014Q2/java/mx4j/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/java/mx4j/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= SF/${PORTNAME}/MX4J%20Binary/${PORTVERSION} -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Open Source implementation of the Java Management Extensions (JMX) USE_JAVA= yes Modified: branches/2014Q2/lang/bsh/Makefile ============================================================================== --- branches/2014Q2/lang/bsh/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/lang/bsh/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b EXTRACT_SUFX= .jar EXTRACT_ONLY= -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= A Java scripting language USE_JAVA= yes Modified: branches/2014Q2/misc/mmv/Makefile ============================================================================== --- branches/2014Q2/misc/mmv/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/misc/mmv/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -11,7 +11,7 @@ PATCH_SITES= ${MASTER_SITES} PATCHFILES= ${PORTNAME}_1.01b-15.diff.gz PATCH_DIST_STRIP= -p1 -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Move/Copy/Append/Link multiple files CFLAGS+= -DHAS_DIRENT Modified: branches/2014Q2/misc/unclutter/Makefile ============================================================================== --- branches/2014Q2/misc/unclutter/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/misc/unclutter/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= utilities EXTRACT_SUFX= .tar.Z -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Remove idle cursor image from screen WRKSRC= ${WRKDIR}/unclutter Modified: branches/2014Q2/print/cups-pdf/Makefile ============================================================================== --- branches/2014Q2/print/cups-pdf/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/print/cups-pdf/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.cups-pdf.de/src http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/ DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= A virtual printer for CUPS to produce PDF files LICENSE=GPLv2 Modified: branches/2014Q2/textproc/weka/Makefile ============================================================================== --- branches/2014Q2/textproc/weka/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/textproc/weka/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -6,7 +6,7 @@ DISTVERSION= 3-6-8 CATEGORIES= textproc java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3-6/${PORTVERSION} -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Data Mining Software in Java LICENSE= GPLv2 Modified: branches/2014Q2/www/xpi-forecastfox/Makefile ============================================================================== --- branches/2014Q2/www/xpi-forecastfox/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/www/xpi-forecastfox/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -6,7 +6,7 @@ PORTVERSION= 2.2.1 DISTVERSIONSUFFIX= -fx+sm CATEGORIES= www -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Get international weather forecasts and display them XPI_DISTNAME= ${PORTNAME}_weather Modified: branches/2014Q2/www/xpi-vimperator/Makefile ============================================================================== --- branches/2014Q2/www/xpi-vimperator/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/www/xpi-vimperator/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -6,7 +6,7 @@ PORTVERSION= 3.5 DISTVERSIONSUFFIX= -fx CATEGORIES= www -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Vim look and feel for Firefox LICENSE=MIT Modified: branches/2014Q2/x11/numlockx/Makefile ============================================================================== --- branches/2014Q2/x11/numlockx/Makefile Sat May 10 22:06:22 2014 (r353621) +++ branches/2014Q2/x11/numlockx/Makefile Sat May 10 22:08:09 2014 (r353622) @@ -7,7 +7,7 @@ CATEGORIES= x11 MASTER_SITES= http://home.kde.org/~seli/numlockx/ \ CRITICAL -MAINTAINER= simon@olofsson.de +MAINTAINER= ports@FreeBSD.org COMMENT= Turns on numlock in X USE_XORG= x11 xext xtst From owner-svn-ports-branches@FreeBSD.ORG Sat May 10 23:24:35 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 405D3581; Sat, 10 May 2014 23:24:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 131431B39; Sat, 10 May 2014 23:24:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4ANOYko005545; Sat, 10 May 2014 23:24:34 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4ANOYp2005544; Sat, 10 May 2014 23:24:34 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405102324.s4ANOYp2005544@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 10 May 2014 23:24:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353629 - branches/2014Q2/devel/thrift-cpp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 23:24:35 -0000 Author: rakuco Date: Sat May 10 23:24:34 2014 New Revision: 353629 URL: http://svnweb.freebsd.org/changeset/ports/353629 QAT: https://qat.redports.org/buildarchive/r353629/ Log: MFH: r353614 - Fix the build by building and installing from the right subdirectory. - Support staging. PR: ports/185839 Approved by: portmgr (bapt) Modified: branches/2014Q2/devel/thrift-cpp/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/thrift-cpp/Makefile ============================================================================== --- branches/2014Q2/devel/thrift-cpp/Makefile Sat May 10 23:21:52 2014 (r353628) +++ branches/2014Q2/devel/thrift-cpp/Makefile Sat May 10 23:24:34 2014 (r353629) @@ -20,8 +20,6 @@ DISTINFO_FILE= ${.CURDIR}/../thrift/dis LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libevent-1.4.so:${PORTSDIR}/devel/libevent -BUILDIR= ${WRKDIR}/${DISTNAME}/lib/cpp - USE_AUTOTOOLS= autoconf autoheader:env aclocal automake libtool ACLOCAL_ARGS= -I${WRKSRC}/aclocal AUTOMAKE_ARGS= --foreign --add-missing --copy @@ -31,6 +29,8 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes PLIST_SUB= PORTVERSION="${THRIFT_PORTVERSION}" +BUILD_WRKSRC= ${WRKSRC}/lib/cpp +INSTALL_WRKSRC= ${WRKSRC}/lib/cpp OPTIONS_DEFINE= QT4 QT4_CONFIGURE_WITH= qt4 @@ -50,9 +50,6 @@ CONFIGURE_ARGS+= \ --without-python \ --without-ruby - -NO_STAGE= yes - .include .if ${COMPILER_TYPE} == clang @@ -67,11 +64,11 @@ post-patch: @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am post-install: - @${LN} -sf ${PREFIX}/lib/libthrift-${PORTVERSION}.so ${PREFIX}/lib/libthrift.so.0 - @${LN} -sf ${PREFIX}/lib/libthriftnb-${PORTVERSION}.so ${PREFIX}/lib/libthriftnb.so.0 - @${LN} -sf ${PREFIX}/lib/libthriftz-${PORTVERSION}.so ${PREFIX}/lib/libthriftz.so.0 + ${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0 + ${LN} -sf libthriftnb-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftnb.so.0 + ${LN} -sf libthriftz-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftz.so.0 .if ${PORT_OPTIONS:MQT4} - @${LN} -sf ${PREFIX}/lib/libthriftqt-${PORTVERSION}.so ${PREFIX}/lib/libthriftqt.so.0 + ${LN} -sf libthriftqt-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftqt.so.0 .endif .include "../thrift/bsd.thrift.mk" From owner-svn-ports-branches@FreeBSD.ORG Mon May 12 21:13:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71BBD3E9; Mon, 12 May 2014 21:13:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DFB521A8; Mon, 12 May 2014 21:13:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CLDSbw059699; Mon, 12 May 2014 21:13:28 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CLDSja059696; Mon, 12 May 2014 21:13:28 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405122113.s4CLDSja059696@svn.freebsd.org> From: Antoine Brodin Date: Mon, 12 May 2014 21:13:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353897 - in branches/2014Q2: graphics/cuttlefish mail/ml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 21:13:28 -0000 Author: antoine Date: Mon May 12 21:13:27 2014 New Revision: 353897 URL: http://svnweb.freebsd.org/changeset/ports/353897 QAT: https://qat.redports.org/buildarchive/r353897/ Log: MFH: r353896 Maintainer no longer wishes to maintain those 2 ports With hat: portmgr Modified: branches/2014Q2/graphics/cuttlefish/Makefile branches/2014Q2/mail/ml/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/cuttlefish/Makefile ============================================================================== --- branches/2014Q2/graphics/cuttlefish/Makefile Mon May 12 21:12:25 2014 (r353896) +++ branches/2014Q2/graphics/cuttlefish/Makefile Mon May 12 21:13:27 2014 (r353897) @@ -7,7 +7,7 @@ PORTREVISION= 3 CATEGORIES= graphics geography MASTER_SITES= http://www.caida.org/tools/visualization/cuttlefish/code/ -MAINTAINER= mjl@luckie.org.nz +MAINTAINER= ports@FreeBSD.org COMMENT= Plots diurnal and geographical patterns of supplied data RUN_DEPENDS+= p5-GD>=0:${PORTSDIR}/graphics/p5-GD \ Modified: branches/2014Q2/mail/ml/Makefile ============================================================================== --- branches/2014Q2/mail/ml/Makefile Mon May 12 21:12:25 2014 (r353896) +++ branches/2014Q2/mail/ml/Makefile Mon May 12 21:13:27 2014 (r353897) @@ -7,7 +7,7 @@ PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://ftp.uni-koeln.de/windows/xcontrib/ -MAINTAINER= mjl@luckie.org.nz +MAINTAINER= ports@FreeBSD.org COMMENT= X11 IMAP client WRKSRC= ${WRKDIR}/${DISTNAME}/src From owner-svn-ports-branches@FreeBSD.ORG Tue May 13 07:46:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48472E6A; Tue, 13 May 2014 07:46:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3576A27C1; Tue, 13 May 2014 07:46:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4D7kSx0038145; Tue, 13 May 2014 07:46:28 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4D7kSlq038144; Tue, 13 May 2014 07:46:28 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201405130746.s4D7kSlq038144@svn.freebsd.org> From: Guido Falsi Date: Tue, 13 May 2014 07:46:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353925 - branches/2014Q2/mail/maildrop X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 07:46:28 -0000 Author: madpilot Date: Tue May 13 07:46:27 2014 New Revision: 353925 URL: http://svnweb.freebsd.org/changeset/ports/353925 QAT: https://qat.redports.org/buildarchive/r353925/ Log: MFH: r353031 Fix build with latest clang when option AUTHLIB is turned on (default off) PR: ports/189364 Submitted by: Andre Lehmann Approved by: portmgr (antoine) Modified: branches/2014Q2/mail/maildrop/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/mail/maildrop/Makefile ============================================================================== --- branches/2014Q2/mail/maildrop/Makefile Tue May 13 07:25:54 2014 (r353924) +++ branches/2014Q2/mail/maildrop/Makefile Tue May 13 07:46:27 2014 (r353925) @@ -111,7 +111,7 @@ post-patch: -e "s/\(deliverquota.html\)/maildrop-\1/" ${WRKSRC}/${f} .endfor .if ${PORT_OPTIONS:MAUTHLIB} - @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \ + @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -L${LOCALBASE}/lib/courier-authlib|' \ ${WRKSRC}/libs/maildrop/Makefile.in .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" From owner-svn-ports-branches@FreeBSD.ORG Tue May 13 16:49:45 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2997CD3B; Tue, 13 May 2014 16:49:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 164F52917; Tue, 13 May 2014 16:49:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DGniWV077067; Tue, 13 May 2014 16:49:44 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DGnisl077065; Tue, 13 May 2014 16:49:44 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405131649.s4DGnisl077065@svn.freebsd.org> From: Antoine Brodin Date: Tue, 13 May 2014 16:49:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353972 - in branches/2014Q2/databases: pg_reorg postgresql-repmgr X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 16:49:45 -0000 Author: antoine Date: Tue May 13 16:49:44 2014 New Revision: 353972 URL: http://svnweb.freebsd.org/changeset/ports/353972 QAT: https://qat.redports.org/buildarchive/r353972/ Log: MFH: r353971 Maintainer no longer wishes to maintain those 2 ports Approved by: portmgr (self) Modified: branches/2014Q2/databases/pg_reorg/Makefile branches/2014Q2/databases/postgresql-repmgr/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/pg_reorg/Makefile ============================================================================== --- branches/2014Q2/databases/pg_reorg/Makefile Tue May 13 16:48:50 2014 (r353971) +++ branches/2014Q2/databases/pg_reorg/Makefile Tue May 13 16:49:44 2014 (r353972) @@ -6,7 +6,7 @@ PORTVERSION= 1.1.8 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/3395/ -MAINTAINER= alp@sfedu.ru +MAINTAINER= ports@FreeBSD.org COMMENT= PostgreSQL utility to reorganize tables LICENSE= BSD Modified: branches/2014Q2/databases/postgresql-repmgr/Makefile ============================================================================== --- branches/2014Q2/databases/postgresql-repmgr/Makefile Tue May 13 16:48:50 2014 (r353971) +++ branches/2014Q2/databases/postgresql-repmgr/Makefile Tue May 13 16:49:44 2014 (r353972) @@ -7,7 +7,7 @@ CATEGORIES= databases MASTER_SITES= http://www.repmgr.org/download/ DISTNAME= repmgr-${PORTVERSION} -MAINTAINER= alp@sfedu.ru +MAINTAINER= ports@FreeBSD.org COMMENT= PostgreSQL replication manager LICENSE= GPLv3 From owner-svn-ports-branches@FreeBSD.ORG Tue May 13 20:52:00 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0DAE7320; Tue, 13 May 2014 20:52:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF4BF2DBF; Tue, 13 May 2014 20:51:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DKpxNR089082; Tue, 13 May 2014 20:51:59 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DKpxVW089081; Tue, 13 May 2014 20:51:59 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405132051.s4DKpxVW089081@svn.freebsd.org> From: Koop Mast Date: Tue, 13 May 2014 20:51:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r353992 - in branches/2014Q2/x11-fonts/libXfont: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 20:52:00 -0000 Author: kwm Date: Tue May 13 20:51:59 2014 New Revision: 353992 URL: http://svnweb.freebsd.org/changeset/ports/353992 QAT: https://qat.redports.org/buildarchive/r353992/ Log: MFH: r353969 Fix X Font Service Protocol and Font metadata file handling vulnabilities Obtained from: upstream Security: b060ee50-daba-11e3-99f2-bcaec565249c Approved by: portmgr (erwin@) Added: branches/2014Q2/x11-fonts/libXfont/files/ - copied from r353969, head/x11-fonts/libXfont/files/ Modified: branches/2014Q2/x11-fonts/libXfont/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/x11-fonts/libXfont/Makefile ============================================================================== --- branches/2014Q2/x11-fonts/libXfont/Makefile Tue May 13 20:42:02 2014 (r353991) +++ branches/2014Q2/x11-fonts/libXfont/Makefile Tue May 13 20:51:59 2014 (r353992) @@ -3,6 +3,7 @@ PORTNAME= libXfont PORTVERSION= 1.4.7 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11-fonts From owner-svn-ports-branches@FreeBSD.ORG Tue May 13 22:07:24 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1C463F4; Tue, 13 May 2014 22:07:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC13123DB; Tue, 13 May 2014 22:07:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DM7NU6023249; Tue, 13 May 2014 22:07:23 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DM7Mnw023244; Tue, 13 May 2014 22:07:22 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201405132207.s4DM7Mnw023244@svn.freebsd.org> From: Thomas Zander Date: Tue, 13 May 2014 22:07:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354005 - in branches/2014Q2/multimedia/quodlibet: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 22:07:24 -0000 Author: riggs Date: Tue May 13 22:07:22 2014 New Revision: 354005 URL: http://svnweb.freebsd.org/changeset/ports/354005 QAT: https://qat.redports.org/buildarchive/r354005/ Log: MFH: r353703 Un-break install, but while on it - Update port to upstream release 2.6.3 - Use correct download URL (move from Google code to bitbucket) - Add LICENSE - USE_* -> USES - Generate plist via pydistutils - Use SPC option on i386 only, it's not supported elsewhere - Stagify - Change URLs in pkg-message (pointing to bitbucket), simplify Special thanks to Carlos (submitter) for reviewing, and to Christoph Reiter (Quodlibet project) for fixing the '--record' option for Quodlibet with pydistutils. PR: ports/187263 Submitted by: Carlos Jacobo Puga Medina Reviewed by: submitter Approved by: portmgr(antoine), thierry (mentor), maintainer timeout Added: branches/2014Q2/multimedia/quodlibet/files/extra-patch-pydistutils - copied unchanged from r353703, head/multimedia/quodlibet/files/extra-patch-pydistutils branches/2014Q2/multimedia/quodlibet/files/patch-operon.py - copied unchanged from r353703, head/multimedia/quodlibet/files/patch-operon.py Deleted: branches/2014Q2/multimedia/quodlibet/files/patch-quodlibet__qltk__config.py branches/2014Q2/multimedia/quodlibet/pkg-plist Modified: branches/2014Q2/multimedia/quodlibet/Makefile branches/2014Q2/multimedia/quodlibet/distinfo branches/2014Q2/multimedia/quodlibet/pkg-message Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/multimedia/quodlibet/Makefile ============================================================================== --- branches/2014Q2/multimedia/quodlibet/Makefile Tue May 13 21:49:55 2014 (r354004) +++ branches/2014Q2/multimedia/quodlibet/Makefile Tue May 13 22:07:22 2014 (r354005) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= quodlibet -PORTVERSION= 2.2 -PORTREVISION= 7 +PORTVERSION= 2.6.3 CATEGORIES= multimedia audio python gnome -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= http://bitbucket.org/lazka/${PORTNAME}-files/raw/default/releases/ MAINTAINER= johnson.peter@gmail.com COMMENT= A GTK+-based audio player written in Python @@ -15,24 +14,25 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mutage USE_PYTHON= yes USE_GNOME= pygtk2 -USES= gettext +USES= display gettext USE_PYDISTUTILS= yes -USE_DISPLAY= yes -USE_GSTREAMER= gconf good python +PYDISTUTILS_INSTALLNOSINGLE= yes +PYDISTUTILS_AUTOPLIST= yes + +EXTRA_PATCHES= ${FILESDIR}/extra-patch-pydistutils -MAN1= exfalso.1 quodlibet.1 +USE_GSTREAMER= gconf good python OPTIONS_DEFINE= FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE EXTENSIONS -SPC_DESC= SPC (SNES ROM audio) support + +OPTIONS_DEFAULT= FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE + +SPC_DESC= SPC (SNES ROM audio) support on i386 SPEEX_DESC= OGG/Speex audio support REMOTE_DESC= Enable remote playback EXTENSIONS_DESC= Enable extensions -OPTIONS_DEFAULT= FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE - -NO_STAGE= yes .include -.include .if ${PORT_OPTIONS:MOGG} USE_GSTREAMER+= ogg @@ -42,7 +42,7 @@ USE_GSTREAMER+= ogg USE_GSTREAMER+= vorbis .endif -.if ${PORT_OPTIONS:MSPC} +.if ${PORT_OPTIONS:MSPC} && ${ARCH} == i386 USE_GSTREAMER+= spc .endif @@ -59,17 +59,17 @@ USE_GSTREAMER+= flac .endif .if ${PORT_OPTIONS:MMUSEPACK} -LIB_DEPENDS+= mpcdec.7:${PORTSDIR}/audio/musepack +LIB_DEPENDS+= libmpcdec.so:${PORTSDIR}/audio/musepack USE_GSTREAMER+= musepack .endif .if ${PORT_OPTIONS:MWAVPACK} -LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack +LIB_DEPENDS+= libwavpack.so:${PORTSDIR}/audio/wavpack USE_GSTREAMER+= wavpack .endif .if ${PORT_OPTIONS:MAAC} -LIB_DEPENDS+= mp4v2.10:${PORTSDIR}/multimedia/mp4v2 +LIB_DEPENDS+= libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 USE_GSTREAMER+= faad .endif @@ -86,14 +86,6 @@ USE_GSTREAMER+= gnomevfs .if ${PORT_OPTIONS:MEXTENSIONS} USE_GNOME+= pygnomeextras -PLIST_SUB+= EXTENSIONS="" -.else -PLIST_SUB+= EXTENSIONS="@comment " .endif -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - -.include +.include Modified: branches/2014Q2/multimedia/quodlibet/distinfo ============================================================================== --- branches/2014Q2/multimedia/quodlibet/distinfo Tue May 13 21:49:55 2014 (r354004) +++ branches/2014Q2/multimedia/quodlibet/distinfo Tue May 13 22:07:22 2014 (r354005) @@ -1,2 +1,2 @@ -SHA256 (quodlibet-2.2.tar.gz) = 1aac91369b26fa897c0d9eaa6a43aadcd5ffe8751a298a6c7beabe7591c0e713 -SIZE (quodlibet-2.2.tar.gz) = 910381 +SHA256 (quodlibet-2.6.3.tar.gz) = dff4ebb90c676678f72cecbff8ab15d80154354f40a865b6c9c82bb048d48a46 +SIZE (quodlibet-2.6.3.tar.gz) = 2507416 Copied: branches/2014Q2/multimedia/quodlibet/files/extra-patch-pydistutils (from r353703, head/multimedia/quodlibet/files/extra-patch-pydistutils) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/multimedia/quodlibet/files/extra-patch-pydistutils Tue May 13 22:07:22 2014 (r354005, copy of r353703, head/multimedia/quodlibet/files/extra-patch-pydistutils) @@ -0,0 +1,145 @@ +--- gdist/icons.py.orig 2013-09-25 12:31:19.000000000 +0200 ++++ gdist/icons.py 2014-04-23 11:06:22.328926759 +0200 +@@ -35,13 +35,16 @@ + prefix = None + + def initialize_options(self): +- pass ++ self.outfiles = [] + + def finalize_options(self): + self.set_undefined_options('install', + ('root', 'root'), + ('install_base', 'prefix')) + ++ def get_outputs(self): ++ return self.outfiles ++ + def run(self): + # install into hicolor icon theme + basepath = os.path.join(self.prefix, 'share', 'icons', 'hicolor') +@@ -52,11 +55,13 @@ + + scalable = os.path.join(local, "scalable", "apps") + scalable_dst = os.path.join(basepath, "scalable", "apps") +- self.copy_tree(scalable, scalable_dst) ++ out = self.copy_tree(scalable, scalable_dst) ++ self.outfiles.extend(out) + + png = os.path.join(local, "64x64", "apps") + png_dst = os.path.join(basepath, "64x64", "apps") +- self.copy_tree(png, png_dst) ++ out = self.copy_tree(png, png_dst) ++ self.outfiles.extend(out) + + # this fails during packaging.. so ignore the outcome + subprocess.call(['gtk-update-icon-cache', basepath]) +@@ -66,4 +71,5 @@ + if self.root is not None: + basepath = change_root(self.root, basepath) + +- self.copy_tree(png, basepath) ++ out = self.copy_tree(png, basepath) ++ self.outfiles.extend(out) +--- gdist/man.py.orig 2013-09-25 12:31:19.000000000 +0200 ++++ gdist/man.py 2014-04-23 11:10:03.793912457 +0200 +@@ -29,7 +29,7 @@ + root = None + + def initialize_options(self): +- pass ++ self.outfiles = [] + + def finalize_options(self): + self.set_undefined_options('install', ('root', 'root'), ('install_base', 'prefix')) +@@ -38,15 +38,22 @@ + if not man_page[-1].isdigit(): + raise SystemExit("%r has no section" % man_page) + ++ def get_outputs(self): ++ return self.outfiles ++ + def run(self): + basepath = os.path.join(self.prefix, 'share', 'man') + if self.root != None: + basepath = change_root(self.root, basepath) +- self.mkpath(basepath) ++ out = self.mkpath(basepath) ++ self.outfiles.extend(out or []) + for man_page in self.man_pages: + manpath = os.path.join(basepath, "man" + man_page[-1]) + self.mkpath(manpath) ++ out = self.mkpath(manpath) ++ self.outfiles.extend(out or []) + fullpath = os.path.join(manpath, os.path.basename(man_page)) +- self.copy_file(man_page, fullpath) ++ (out, _) = self.copy_file(man_page, fullpath) ++ self.outfiles.append(out) + + __all__ = ["install_man"] +--- gdist/po.py.orig 2013-09-25 12:31:19.000000000 +0200 ++++ gdist/po.py 2014-04-23 11:06:22.329926420 +0200 +@@ -149,7 +149,7 @@ + root = None + + def initialize_options(self): +- pass ++ self.outfiles = [] + + def finalize_options(self): + self.set_undefined_options('build', ('build_base', 'build_base')) +@@ -159,6 +159,9 @@ + ('install_base', 'install_base'), + ('skip_build', 'skip_build')) + ++ def get_outputs(self): ++ return self.outfiles ++ + def run(self): + if not self.skip_build: + self.run_command('build_mo') +@@ -166,6 +169,7 @@ + dest = os.path.join(self.install_base, "share", "locale") + if self.root != None: + dest = change_root(self.root, dest) +- self.copy_tree(src, dest) ++ out = self.copy_tree(src, dest) ++ self.outfiles.extend(out) + + __all__ = ["build_mo", "install_mo", "po_stats", "check_pot"] +--- gdist/shortcuts.py.orig 2013-09-25 12:31:19.000000000 +0200 ++++ gdist/shortcuts.py 2014-04-23 11:11:31.218905210 +0200 +@@ -66,7 +66,7 @@ + root = None + + def initialize_options(self): +- pass ++ self.outfiles = [] + + def finalize_options(self): + self.set_undefined_options('build', ('build_base', 'build_base')) +@@ -79,6 +79,9 @@ + self.set_undefined_options( + 'build_shortcuts', ('shortcuts', 'shortcuts')) + ++ def get_outputs(self): ++ return self.outfiles ++ + def run(self): + if not self.skip_build: + self.run_command('build_shortcuts') +@@ -86,10 +89,13 @@ + if self.root != None: + basepath = change_root(self.root, basepath) + srcpath = os.path.join(self.build_base, 'share', 'applications') +- self.mkpath(basepath) ++ out = self.mkpath(basepath) ++ self.outfiles.extend(out or []) + for shortcut in self.shortcuts: + fullsrc = os.path.join(srcpath, shortcut) + fullpath = os.path.join(basepath, shortcut) + self.copy_file(fullsrc, fullpath) ++ (out, _) = self.copy_file(fullsrc, fullpath) ++ self.outfiles.append(out) + + __all__ = ["build_shortcuts", "install_shortcuts"] Copied: branches/2014Q2/multimedia/quodlibet/files/patch-operon.py (from r353703, head/multimedia/quodlibet/files/patch-operon.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/multimedia/quodlibet/files/patch-operon.py Tue May 13 22:07:22 2014 (r354005, copy of r353703, head/multimedia/quodlibet/files/patch-operon.py) @@ -0,0 +1,8 @@ +--- operon.py.orig 2013-09-13 00:49:22.000000000 +0200 ++++ operon.py 2014-04-23 12:21:26.430626881 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + # Copyright 2012,2013 Christoph Reiter + # + # This program is free software; you can redistribute it and/or modify Modified: branches/2014Q2/multimedia/quodlibet/pkg-message ============================================================================== --- branches/2014Q2/multimedia/quodlibet/pkg-message Tue May 13 21:49:55 2014 (r354004) +++ branches/2014Q2/multimedia/quodlibet/pkg-message Tue May 13 22:07:22 2014 (r354005) @@ -1,13 +1,11 @@ +===================================================================== For additional Quod Libet plugins: -1. Fetch plugins archive. +1. Fetch plugins archive from project download page: + https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-2.6.3.tar.gz - fetch http://quodlibet.googlecode.com/files/quodlibet-plugins-2.2.tar.gz - -2. Extract archive. - - tar xvfz quodlibet-plugins-2.2.tar.gz - -3. Copy extracted files to Quod Libet plugins directory. - - cp -R quodlibet-plugins-2.2/* ~/.quodlibet/plugins/ +2. Extract archive into plugin dir in a user's home directory + mkdir -p ~/.quodlibet/plugins/ + cd ~/.quodlibet/plugins/ + tar xf path/to/downloaded/quodlibet-plugins-2.6.3.tar.gz +===================================================================== From owner-svn-ports-branches@FreeBSD.ORG Wed May 14 11:41:41 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1124F17; Wed, 14 May 2014 11:41:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DC5B226B6; Wed, 14 May 2014 11:41:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4EBfe4R090618; Wed, 14 May 2014 11:41:40 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4EBfeQJ090617; Wed, 14 May 2014 11:41:40 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405141141.s4EBfeQJ090617@svn.freebsd.org> From: Rene Ladan Date: Wed, 14 May 2014 11:41:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354038 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 11:41:41 -0000 Author: rene Date: Wed May 14 11:41:40 2014 New Revision: 354038 URL: http://svnweb.freebsd.org/changeset/ports/354038 QAT: https://qat.redports.org/buildarchive/r354038/ Log: MFH: r354037 Describe new vulnerabilities in www/chromium < 34.0.1847.137 Obtained from: http://googlechromereleases.blogspot.nl/ Also merge entries for: - libXfont < 1.4.7_3 - libxml2 < 2.8.0_5 - openssl >= 1.0.1 < 1.0.1_12 - qt4-xml < 4.8.6 - strongswan < 5.1.3 - mohawk < 2.0.12 - chromium < 34.0.1847.132 - mozilla/firefox < 29.0 / 24.5.0 (esr), seamonkey < 2.26, thunderbird < 24.5 Approved by: portmgr (erwin) Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Wed May 14 10:38:06 2014 (r354037) +++ branches/2014Q2/security/vuxml/vuln.xml Wed May 14 11:41:40 2014 (r354038) @@ -51,6 +51,419 @@ Note: Please add new entries to the beg --> + + chromium -- multiple vulnerabilities + + + chromium + 34.0.1847.137 + + + + +

Google Chrome Releases reports:

+
+

3 security fixes in this release:

+
    +
  • [358038] High CVE-2014-1740: Use-after-free in WebSockets. + Credit to Collin Payne.
  • +
  • [349898] High CVE-2014-1741: Integer overflow in DOM ranges. + Credit to John Butler.
  • +
  • [356690] High CVE-2014-1742: Use-after-free in editing. Credit + to cloudfuzzer.
  • +
+
+ +
+ + CVE-2014-1740 + CVE-2014-1741 + CVE-2014-1742 + http://googlechromereleases.blogspot.nl/ + + + 2014-05-13 + 2014-05-14 + +
+ + + libXfont -- X Font Service Protocol and Font metadata file handling issues + + + libXfont + 1.4.7_3 + + + + +

Alan Coopersmith reports:

+
+

Ilja van Sprundel, a security researcher with IOActive, has + discovered several issues in the way the libXfont library + handles the responses it receives from xfs servers, and has + worked with X.Org's security team to analyze, confirm, and fix + these issues.

+

Most of these issues stem from libXfont trusting the font server + to send valid protocol data, and not verifying that the values + will not overflow or cause other damage. This code is commonly + called from the X server when an X Font Server is active in the + font path, so may be running in a setuid-root process depending + on the X server in use. Exploits of this path could be used by + a local, authenticated user to attempt to raise privileges; or + by a remote attacker who can control the font server to attempt + to execute code with the privileges of the X server.

+
+ +
+ + CVE-2014-0209 + CVE-2014-0210 + CVE-2014-0211 + http://lists.x.org/archives/xorg-announce/2014-May/002431.html + + + 2014-05-13 + 2014-05-13 + +
+ + + libxml2 -- lack of end-of-document check DoS + + + libxml2 + 2.8.0_5 + + + + +

CVE MITRE reports:

+
+

parser.c in libxml2 before 2.9.0, as used in Google + Chrome before 28.0.1500.71 and other products, allows remote + attackers to cause a denial of service (out-of-bounds read) + via a document that ends abruptly, related to the lack of + certain checks for the XML_PARSER_EOF state.

+
+ +
+ + CVE-2013-2877 + https://git.gnome.org/browse/libxml2/tag/?id=CVE-2013-2877 + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-2877 + https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-2877 + + + 2013-04-11 + 2013-07-10 + +
+ + + libxml2 -- entity substitution DoS + + + libxml2 + 2.8.0_5 + + + + +

Stefan Cornelius reports:

+
+

It was discovered that libxml2, a library providing + support to read, modify and write XML files, incorrectly + performs entity substitution in the doctype prolog, even if + the application using libxml2 disabled any entity + substitution. A remote attacker could provide a + specially-crafted XML file that, when processed, would lead + to the exhaustion of CPU and memory resources or file + descriptors.

+

This issue was discovered by Daniel Berrange of Red Hat.

+
+ +
+ + CVE-2014-0191 + http://www.openwall.com/lists/oss-security/2014/05/06/4 + https://git.gnome.org/browse/libxml2/tag/?id=CVE-2014-0191 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0191 + + + 2013-12-03 + 2014-05-06 + +
+ + + OpenSSL -- NULL pointer dereference / DoS + + + openssl + 1.0.11.0.1_12 + + + + +

OpenBSD and David Ramos reports:

+
+

Applications that use SSL_MODE_RELEASE_BUFFERS, such as nginx/apache, + are prone to a race condition which may allow a remote attacker to + crash the current service.

+
+ +
+ + http://www.openwall.com/lists/oss-security/2014/05/02/5 + https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=3321 + CVE-2014-0198 + + + 2014-05-02 + 2014-05-03 + +
+ + + qt4-xml -- XML Entity Expansion Denial of Service + + + qt4-xml + 4.8.6 + + + + +

Richard J. Moore reports:

+
+

QXmlSimpleReader in Qt versions prior to 5.2 supports + expansion of internal entities in XML documents without + placing restrictions to ensure the document does not cause + excessive memory usage. If an application using this API + processes untrusted data then the application may use + unexpected amounts of memory if a malicious document is + processed.

+

It is possible to construct XML documents using internal + entities that consume large amounts of memory and other + resources to process, this is known as the 'Billion Laughs' + attack. Qt versions prior to 5.2 did not offer protection + against this issue.

+
+ +
+ + CVE-2013-4549 + http://lists.qt-project.org/pipermail/announce/2013-December/000036.html + + + 2013-12-05 + 2014-05-05 + +
+ + + strongswan -- Remote Authentication Bypass + + + strongswan + 5.1.3 + + + + +

strongSwan developers report:

+
+

Remote attackers are able to bypass authentication by rekeying an + IKE_SA during (1) initiation or (2) re-authentication, which + triggers the IKE_SA state to be set to established.

+

Only installations that actively initiate or re-authenticate IKEv2 + IKE_SAs are affected.

+
+ +
+ + CVE-2014-2338 + http://www.strongswan.org/blog/2014/04/14/strongswan-authentication-bypass-vulnerability-%28cve-2014-2338%29.html + + + 2014-03-12 + 2014-05-04 + +
+ + + mohawk -- multiple vulnerabilities + + + mohawk + 2.0.12 + + + + +

The mohawk project reports:

+
+

Segfault when parsing malformed / unescaped url, coredump when setting syslog facility.

+
+ +
+ + http://fossil.bsdsx.fr/mohawk/tktview?name=1707f0e351 + http://fossil.bsdsx.fr/mohawk/tktview?name=1c7565019e + + + 2014-04-10 + 2014-04-30 + +
+ + + chromium -- multiple vulnerabilities + + + chromium + 34.0.1847.132 + + + + +

Google Chrome Releases reports (belatedly):

+
+

9 security fixes in this release, including:

+
    +
  • [354967] High CVE-2014-1730: Type confusion in V8. Credit to + Anonymous.
  • +
  • [349903] High CVE-2014-1731: Type confusion in DOM. Credit to + John Butler.
  • +
  • [359802] High CVE-2014-1736: Integer overflow in V8. Credit to + SkyLined working with HP's Zero Day Initiative.
  • +
  • [352851] Medium CVE-2014-1732: Use-after-free in Speech + Recognition. Credit to Khalil Zhani.
  • +
  • [351103] Medium CVE-2014-1733: Compiler bug in Seccomp-BPF. + Credit to Jed Davis.
  • +
  • [367314] CVE-2014-1734: Various fixes from internal audits, + fuzzing and other initiatives.
  • +
  • [359130, 359525, 360429] CVE-2014-1735: Multiple + vulnerabilities in V8 fixed in version 3.24.35.33.
  • +
+
+ +
+ + CVE-2014-1730 + CVE-2014-1731 + CVE-2014-1732 + CVE-2014-1733 + CVE-2014-1734 + CVE-2014-1735 + CVE-2014-1736 + http://googlechromereleases.blogspot.nl/ + + + 2014-04-24 + 2014-04-30 + +
+ + + mozilla -- multiple vulnerabilities + + + firefox + 29.0,1 + + + firefox-esr + 24.5.0,1 + + + linux-firefox + 29.0,1 + + + linux-seamonkey + 2.26 + + + linux-thunderbird + 24.5.0 + + + seamonkey + 2.26 + + + thunderbird + 24.5.0 + + + + +

The Mozilla Project reports:

+
+

MFSA 2014-34 Miscellaneous memory safety hazards + (rv:29.0 / rv:24.5)

+

MFSA 2014-35 Privilege escalation through Mozilla Maintenance + Service Installer

+

MFSA 2014-36 Web Audio memory corruption issues

+

MFSA 2014-37 Out of bounds read while decoding JPG images

+

MFSA 2014-38 Buffer overflow when using non-XBL object as + XBL

+

MFSA 2014-39 Use-after-free in the Text Track Manager + for HTML video

+

MFSA 2014-41 Out-of-bounds write in Cairo

+

MFSA 2014-42 Privilege escalation through Web Notification + API

+

MFSA 2014-43 Cross-site scripting (XSS) using history + navigations

+

MFSA 2014-44 Use-after-free in imgLoader while resizing + images

+

MFSA 2014-45 Incorrect IDNA domain name matching for + wildcard certificates

+

MFSA 2014-46 Use-after-free in nsHostResolve

+

MFSA 2014-47 Debugger can bypass XrayWrappers + with JavaScript

+
+ +
+ + CVE-2014-1492 + CVE-2014-1518 + CVE-2014-1519 + CVE-2014-1520 + CVE-2014-1522 + CVE-2014-1523 + CVE-2014-1524 + CVE-2014-1525 + CVE-2014-1526 + CVE-2014-1527 + CVE-2014-1528 + CVE-2014-1529 + CVE-2014-1530 + CVE-2014-1531 + CVE-2014-1532 + https://www.mozilla.org/security/announce/2014/mfsa2014-34.html + https://www.mozilla.org/security/announce/2014/mfsa2014-35.html + https://www.mozilla.org/security/announce/2014/mfsa2014-36.html + https://www.mozilla.org/security/announce/2014/mfsa2014-37.html + https://www.mozilla.org/security/announce/2014/mfsa2014-38.html + https://www.mozilla.org/security/announce/2014/mfsa2014-39.html + https://www.mozilla.org/security/announce/2014/mfsa2014-41.html + https://www.mozilla.org/security/announce/2014/mfsa2014-42.html + https://www.mozilla.org/security/announce/2014/mfsa2014-43.html + https://www.mozilla.org/security/announce/2014/mfsa2014-44.html + https://www.mozilla.org/security/announce/2014/mfsa2014-45.html + https://www.mozilla.org/security/announce/2014/mfsa2014-46.html + https://www.mozilla.org/security/announce/2014/mfsa2014-47.html + http://www.mozilla.org/security/known-vulnerabilities/ + + + 2014-04-29 + 2014-04-29 + +
+ django -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Wed May 14 13:33:25 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFD1524D; Wed, 14 May 2014 13:33:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AC2472005; Wed, 14 May 2014 13:33:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4EDXPeh041549; Wed, 14 May 2014 13:33:25 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4EDXPNn041548; Wed, 14 May 2014 13:33:25 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201405141333.s4EDXPNn041548@svn.freebsd.org> From: Brooks Davis Date: Wed, 14 May 2014 13:33:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354057 - branches/2014Q2/devel/llvm-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 13:33:25 -0000 Author: brooks Date: Wed May 14 13:33:25 2014 New Revision: 354057 URL: http://svnweb.freebsd.org/changeset/ports/354057 QAT: https://qat.redports.org/buildarchive/r354057/ Log: Merge r351292,353107 Make PREFIX clean. Use more bsd.options.mk features. Mark broken prior to 9.0 due to bizzare errors from gcc on 8.4. Our use of cmake is unconventional so we need to pass CC and CXX to it directly rather than relying on ports infrastructure Sponsored by: DARPA, AFRL Approved by: portmgr (miwi) Modified: branches/2014Q2/devel/llvm-devel/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/llvm-devel/Makefile ============================================================================== --- branches/2014Q2/devel/llvm-devel/Makefile Wed May 14 13:33:11 2014 (r354056) +++ branches/2014Q2/devel/llvm-devel/Makefile Wed May 14 13:33:25 2014 (r354057) @@ -45,6 +45,16 @@ LTOPLUGIN_DESC= Build LTO plugin (requir OPTIONS_DEFAULT= CMAKE LIT MANPAGES OPTIONS_SUB= yes +ASSERTS_CONFIGURE_ENABLE= assertions +CMAKE_BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake +DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx +DOCS_CONFIGURE_ENABLE= docs +LTOPLUGIN_BUILD_DEPENDS= ld.gold:${PORTSDIR}/devel/binutils +LTOPLUGIN_RUN_DEPENDS= ld.gold:${PORTSDIR}/devel/binutils +LTOPLUGIN_CONFIGURE_ON= --with-binutils-include=${LOCALBASE}/include +LTOPLUGIN_PLIST_FILES= llvm${LLVM_SUFFIX}/lib/LLVMgold.so +MANPAGES_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx + LLVM_RELEASE= ${PORTVERSION:C/\.r[0-9]*//} PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} @@ -85,28 +95,15 @@ STRIP_LIBS= BugpointPasses.so \ .include .if ${PORT_OPTIONS:MASSERTS} -CONFIGURE_ARGS+= --enable-assertions RELEASE_TYPE= Release+Asserts .else -CONFIGURE_ARGS+= --disable-assertions RELEASE_TYPE= Release .endif .if ${PORT_OPTIONS:MCMAKE} -BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake PORTDATA+= cmake .endif -.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES} -BUILD_DEPENDS+= sphinx-build:${PORTSDIR}/textproc/py-sphinx -.endif - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+= --enable-docs -.else -CONFIGURE_ARGS+= --disable-docs -.endif - .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= lit.1 USE_PYTHON= yes @@ -115,13 +112,6 @@ LIT_COMMANDS= lit llvm-lit FileCheck USE_PYTHON_BUILD= yes .endif -.if ${PORT_OPTIONS:MLTOPLUGIN} -BUILD_DEPENDS+= ld.gold:${PORTSDIR}/devel/binutils -RUN_DEPENDS+= ld.gold:${PORTSDIR}/devel/binutils -CONFIGURE_ARGS+= --with-binutils-include=${LOCALBASE}/include -PLIST_FILES+= llvm${LLVM_SUFFIX}/lib/LLVMgold.so -.endif - .if ${PORT_OPTIONS:MMANPAGES} MAN1SRCS+= bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \ llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \ @@ -133,6 +123,10 @@ PLIST_FILES+= ${MAN1SRCS:S|^|man/man1/|: .include +.if ${OSVERSION} < 900000 +BROKEN= GCC failing on 8.x +.endif + .if !defined(SVN_REV) .if defined(BOOTSTRAP) LANG= "C" @@ -178,7 +172,10 @@ post-patch: .if ${PORT_OPTIONS:MCMAKE} post-configure: ${MKDIR} ${WRKDIR}/cmake - cd ${WRKDIR}/cmake && cmake -G "Unix Makefiles" ${WRKSRC} + cd ${WRKDIR}/cmake && cmake -G "Unix Makefiles" \ + -DCMAKE_C_COMPILER:STRING="${CC}" \ + -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ + ${WRKSRC} ${REINPLACE_CMD} -e 's|${WRKDIR}/cmake|${LLVM_PREFIX}|' \ -e 's|${WRKSRC}/cmake/modules|${DATADIR}/cmake|' \ ${WRKDIR}/cmake/share/llvm/cmake/LLVMConfig.cmake @@ -229,9 +226,9 @@ post-install: ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} - ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ - ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_PROGRAM} ${WRKSRC}/${RELEASE_TYPE}/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ From owner-svn-ports-branches@FreeBSD.ORG Wed May 14 15:26:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7A9968C; Wed, 14 May 2014 15:26:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4E8C2ACC; Wed, 14 May 2014 15:26:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4EFQaJK092340; Wed, 14 May 2014 15:26:36 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4EFQaql092339; Wed, 14 May 2014 15:26:36 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405141526.s4EFQaql092339@svn.freebsd.org> From: Rene Ladan Date: Wed, 14 May 2014 15:26:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354066 - branches/2014Q2/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 15:26:37 -0000 Author: rene Date: Wed May 14 15:26:36 2014 New Revision: 354066 URL: http://svnweb.freebsd.org/changeset/ports/354066 QAT: https://qat.redports.org/buildarchive/r354066/ Log: MFH: r352994 Fix quoting of environment variables. PR: ports/187702 Submitted by: Dominic Fandrey Approved by: portmgr (erwin) Modified: branches/2014Q2/www/chromium/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/chromium/Makefile ============================================================================== --- branches/2014Q2/www/chromium/Makefile Wed May 14 15:19:27 2014 (r354065) +++ branches/2014Q2/www/chromium/Makefile Wed May 14 15:26:36 2014 (r354066) @@ -138,12 +138,12 @@ BUILDTYPE= Release GYP_DEFINES+= buildtype=Official .endif -CONFIGURE_ENV+= CC=${CC} \ - CXX=${CXX} \ +CONFIGURE_ENV+= CC="${CC}" \ + CXX="${CXX}" \ GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ - GPERF=${LOCALBASE}/bin/gperf + GPERF="${LOCALBASE}/bin/gperf" MAKE_ARGS+= -C out/${BUILDTYPE} .include From owner-svn-ports-branches@FreeBSD.ORG Wed May 14 15:29:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 909A8891; Wed, 14 May 2014 15:29:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7CB972B06; Wed, 14 May 2014 15:29:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4EFTXj7092798; Wed, 14 May 2014 15:29:33 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4EFTXQ6092796; Wed, 14 May 2014 15:29:33 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405141529.s4EFTXQ6092796@svn.freebsd.org> From: Rene Ladan Date: Wed, 14 May 2014 15:29:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354067 - branches/2014Q2/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 15:29:33 -0000 Author: rene Date: Wed May 14 15:29:32 2014 New Revision: 354067 URL: http://svnweb.freebsd.org/changeset/ports/354067 QAT: https://qat.redports.org/buildarchive/r354067/ Log: MFH: r353447 Fix build on i386 with GCC PR: ports/189286 Submitted by: Lena Approved by: portmgr (erwin) Added: branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc - copied unchanged from r353447, head/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc - copied unchanged from r353447, head/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc Modified: Directory Properties: branches/2014Q2/ (props changed) Copied: branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc (from r353447, head/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc Wed May 14 15:29:32 2014 (r354067, copy of r353447, head/www/chromium/files/patch-net__quic__congestion_control__inter_arrival_overuse_detector.cc) @@ -0,0 +1,11 @@ +--- net/quic/congestion_control/inter_arrival_overuse_detector.cc.orig 2014-04-24 22:35:53.000000000 +0200 ++++ net/quic/congestion_control/inter_arrival_overuse_detector.cc 2014-05-09 10:29:30.000000000 +0200 +@@ -165,7 +165,7 @@ + if ((sigma_delta * kDetectTimeDiffStandardDeviation > + estimated_congestion_delay_.ToMicroseconds()) && + (sigma_delta * kDetectDriftStandardDeviation > +- std::abs(accumulated_deltas_.ToMicroseconds()))) { ++ std::labs(accumulated_deltas_.ToMicroseconds()))) { + if (delta_estimate_ != kBandwidthSteady) { + DVLOG(1) << "Bandwidth estimate drift: Steady" + << " mean:" << delta_mean_ Copied: branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc (from r353447, head/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc Wed May 14 15:29:32 2014 (r354067, copy of r353447, head/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc) @@ -0,0 +1,11 @@ +--- net/quic/congestion_control/tcp_cubic_sender.cc.orig 2014-04-24 22:35:53.000000000 +0200 ++++ net/quic/congestion_control/tcp_cubic_sender.cc 2014-05-09 10:57:21.000000000 +0200 +@@ -341,7 +341,7 @@ + mean_deviation_ = QuicTime::Delta::FromMicroseconds( + kOneMinusBeta * mean_deviation_.ToMicroseconds() + + kBeta * +- std::abs(smoothed_rtt_.ToMicroseconds() - rtt.ToMicroseconds())); ++ std::labs(smoothed_rtt_.ToMicroseconds() - rtt.ToMicroseconds())); + smoothed_rtt_ = QuicTime::Delta::FromMicroseconds( + kOneMinusAlpha * smoothed_rtt_.ToMicroseconds() + + kAlpha * rtt.ToMicroseconds()); From owner-svn-ports-branches@FreeBSD.ORG Wed May 14 15:31:47 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD8CF173; Wed, 14 May 2014 15:31:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 808A42B45; Wed, 14 May 2014 15:31:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4EFVl91094973; Wed, 14 May 2014 15:31:47 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4EFVl84094971; Wed, 14 May 2014 15:31:47 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405141531.s4EFVl84094971@svn.freebsd.org> From: Rene Ladan Date: Wed, 14 May 2014 15:31:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354071 - branches/2014Q2/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 15:31:47 -0000 Author: rene Date: Wed May 14 15:31:46 2014 New Revision: 354071 URL: http://svnweb.freebsd.org/changeset/ports/354071 QAT: https://qat.redports.org/buildarchive/r354071/ Log: MFH: r354065 Update to 34.0.1847.137 Security: cdf450fc-db52-11e3-a9fc-00262d5ed8ee Approved by: portmgr (erwin) Modified: branches/2014Q2/www/chromium/Makefile branches/2014Q2/www/chromium/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/chromium/Makefile ============================================================================== --- branches/2014Q2/www/chromium/Makefile Wed May 14 15:30:27 2014 (r354070) +++ branches/2014Q2/www/chromium/Makefile Wed May 14 15:31:46 2014 (r354071) @@ -4,7 +4,7 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -PORTVERSION= 34.0.1847.132 +PORTVERSION= 34.0.1847.137 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2014Q2/www/chromium/distinfo ============================================================================== --- branches/2014Q2/www/chromium/distinfo Wed May 14 15:30:27 2014 (r354070) +++ branches/2014Q2/www/chromium/distinfo Wed May 14 15:31:46 2014 (r354071) @@ -1,4 +1,4 @@ -SHA256 (chromium-34.0.1847.132.tar.xz) = e8930a43d2cff3cd98d4772f6b7a527b363fa9567afbe86a4c0574dc25886038 -SIZE (chromium-34.0.1847.132.tar.xz) = 190164176 -SHA256 (chromium-34.0.1847.132-testdata.tar.xz) = 0c3c9894cd1a16bfcfc122d40d38bf1c6986087e17d22d86de9d3624c404eb32 -SIZE (chromium-34.0.1847.132-testdata.tar.xz) = 108476892 +SHA256 (chromium-34.0.1847.137.tar.xz) = 938bf0e673101bb1aeec4c3e2e75df372cebe3d2ee93e9f4669d64ce92656027 +SIZE (chromium-34.0.1847.137.tar.xz) = 190173736 +SHA256 (chromium-34.0.1847.137-testdata.tar.xz) = 386899a35d55e490d9119955f87eb2fa0249258ffb56f2892b0ad63ad1683d85 +SIZE (chromium-34.0.1847.137-testdata.tar.xz) = 108472204 From owner-svn-ports-branches@FreeBSD.ORG Wed May 14 21:37:18 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C622ADBE; Wed, 14 May 2014 21:37:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2E2F2CE4; Wed, 14 May 2014 21:37:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4ELbIlF068719; Wed, 14 May 2014 21:37:18 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4ELbI1v068718; Wed, 14 May 2014 21:37:18 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405142137.s4ELbI1v068718@svn.freebsd.org> From: Raphael Kubo da Costa Date: Wed, 14 May 2014 21:37:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354088 - branches/2014Q2/x11-toolkits/qt5-gui X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 21:37:18 -0000 Author: rakuco Date: Wed May 14 21:37:18 2014 New Revision: 354088 URL: http://svnweb.freebsd.org/changeset/ports/354088 QAT: https://qat.redports.org/buildarchive/r354088/ Log: MFH: r353821 Explicitly disable evdev support. This is Linux-specific, and support for it may be accidentally enabled because the compiler test for it passes if multimedia/v4l_compat is installed, since it installs linux/input.h into ${LOCALBASE}/include. PR: ports/187260 Approved by: portmgr (antoine) Modified: branches/2014Q2/x11-toolkits/qt5-gui/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/x11-toolkits/qt5-gui/Makefile ============================================================================== --- branches/2014Q2/x11-toolkits/qt5-gui/Makefile Wed May 14 20:36:00 2014 (r354087) +++ branches/2014Q2/x11-toolkits/qt5-gui/Makefile Wed May 14 21:37:18 2014 (r354088) @@ -27,7 +27,8 @@ USE_QT5= core dbus qmake_build buildtool QT_DIST= base USE_XORG= x11 xi xrender HAS_CONFIGURE= yes -CONFIGURE_ARGS= -no-eglfs +CONFIGURE_ARGS= -no-eglfs \ + -no-evdev USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} From owner-svn-ports-branches@FreeBSD.ORG Fri May 16 21:46:29 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28311E59; Fri, 16 May 2014 21:46:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 151F32C9B; Fri, 16 May 2014 21:46:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GLkSne035528; Fri, 16 May 2014 21:46:28 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GLkS1x035524; Fri, 16 May 2014 21:46:28 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405162146.s4GLkS1x035524@svn.freebsd.org> From: Raphael Kubo da Costa Date: Fri, 16 May 2014 21:46:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354269 - branches/2014Q2/audio/mangler X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2014 21:46:29 -0000 Author: rakuco Date: Fri May 16 21:46:28 2014 New Revision: 354269 URL: http://svnweb.freebsd.org/changeset/ports/354269 QAT: https://qat.redports.org/buildarchive/r354269/ Log: MFH: r354266 - Update to 1.2.5, removing an outdated MASTER_SITE. - Support staging. - Fix the library names in LIB_DEPENDS after the conversion to the new format. - Remove the dependency on gmake, the port builds fine without it. - Convert to the new OPTIONS helpers. This should make the port build again. PR: ports/189269 Submitted by: rakuco Approved by: maintainer timeout (14 days) Approved by: portmgr (erwin) Modified: branches/2014Q2/audio/mangler/Makefile branches/2014Q2/audio/mangler/distinfo branches/2014Q2/audio/mangler/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/audio/mangler/Makefile ============================================================================== --- branches/2014Q2/audio/mangler/Makefile Fri May 16 21:32:51 2014 (r354268) +++ branches/2014Q2/audio/mangler/Makefile Fri May 16 21:46:28 2014 (r354269) @@ -2,23 +2,20 @@ # $FreeBSD$ PORTNAME= mangler -PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTVERSION= 1.2.5 CATEGORIES= audio -MASTER_SITES= http://www.mangler.org/downloads/ \ - http://ultimeordi.com/pub/mangler/ +MASTER_SITES= http://www.mangler.org/downloads/ MAINTAINER= janik@hikarihq.com COMMENT= A Ventrilo VOIP compatible client LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt \ - libspeex..so:${PORTSDIR}/audio/speex \ + libspeex.so:${PORTSDIR}/audio/speex \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ - libgtkmm-2.4..so:${PORTSDIR}/x11-toolkits/gtkmm24 \ + libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ libgsm.so:${PORTSDIR}/audio/gsm -USES= gmake pkgconfig -NO_STAGE= yes +USES= pkgconfig USE_GNOME= librsvg2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-alsa @@ -28,16 +25,7 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= PULSEAUDIO - -MAN1= mangler.1 - -.include - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio -CONFIGURE_ARGS+=--with-pulseaudio -.else -CONFIGURE_ARGS+=--without-pulseaudio -.endif +PULSEAUDIO_CONFIGURE_WITH= pulseaudio +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio .include Modified: branches/2014Q2/audio/mangler/distinfo ============================================================================== --- branches/2014Q2/audio/mangler/distinfo Fri May 16 21:32:51 2014 (r354268) +++ branches/2014Q2/audio/mangler/distinfo Fri May 16 21:46:28 2014 (r354269) @@ -1,2 +1,2 @@ -SHA256 (mangler-1.2.3.tar.gz) = 3d93b2a7404acb8ba6323545d1100fb739f8b12d9f32335ab5c5208877eabb77 -SIZE (mangler-1.2.3.tar.gz) = 6795847 +SHA256 (mangler-1.2.5.tar.gz) = 6f4e024f2d78e131229817c7b8ae19d3ea63dff1febe1b144113040f859cd7ab +SIZE (mangler-1.2.5.tar.gz) = 6797759 Modified: branches/2014Q2/audio/mangler/pkg-plist ============================================================================== --- branches/2014Q2/audio/mangler/pkg-plist Fri May 16 21:32:51 2014 (r354268) +++ branches/2014Q2/audio/mangler/pkg-plist Fri May 16 21:46:28 2014 (r354269) @@ -4,5 +4,6 @@ lib/libventrilo3.a lib/libventrilo3.la lib/libventrilo3.so lib/libventrilo3.so.0 +man/man1/mangler.1.gz share/applications/mangler.desktop share/pixmaps/mangler_logo.svg From owner-svn-ports-branches@FreeBSD.ORG Sat May 17 20:12:41 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25055A67; Sat, 17 May 2014 20:12:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBC56237D; Sat, 17 May 2014 20:12:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HKCeIO064549; Sat, 17 May 2014 20:12:40 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4HKCeIr064547; Sat, 17 May 2014 20:12:40 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405172012.s4HKCeIr064547@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 17 May 2014 20:12:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354364 - in branches/2014Q2/textproc/xmlppm: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 20:12:41 -0000 Author: rakuco Date: Sat May 17 20:12:40 2014 New Revision: 354364 URL: http://svnweb.freebsd.org/changeset/ports/354364 QAT: https://qat.redports.org/buildarchive/r354364/ Log: MFH: r354270 Stop passing -fcheck-new to the compiler. This flag is GCC specific, and there should be no big loss with its removal. This commit fixes the build on HEAD (clang 3.4). Approved by: portmgr (erwin, miwi) Added: branches/2014Q2/textproc/xmlppm/files/patch-src__Makefile.in - copied unchanged from r354270, head/textproc/xmlppm/files/patch-src__Makefile.in Modified: branches/2014Q2/textproc/xmlppm/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/textproc/xmlppm/Makefile ============================================================================== --- branches/2014Q2/textproc/xmlppm/Makefile Sat May 17 20:12:19 2014 (r354363) +++ branches/2014Q2/textproc/xmlppm/Makefile Sat May 17 20:12:40 2014 (r354364) @@ -3,6 +3,7 @@ PORTNAME= xmlppm PORTVERSION= 0.98.3 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \ http://www.cs.cornell.edu/People/jcheney/xmlppm/ Copied: branches/2014Q2/textproc/xmlppm/files/patch-src__Makefile.in (from r354270, head/textproc/xmlppm/files/patch-src__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/textproc/xmlppm/files/patch-src__Makefile.in Sat May 17 20:12:40 2014 (r354364, copy of r354270, head/textproc/xmlppm/files/patch-src__Makefile.in) @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2014-05-17 01:23:05.000000000 +0300 ++++ src/Makefile.in 2014-05-17 01:23:13.000000000 +0300 +@@ -176,7 +176,7 @@ + xmlppm_SOURCES = xmlppm.cpp Args.cpp Args.h Version.h + xmlppm_LDADD = libxmlppm.a + AM_CFLAGS = -Wall -ansi -pedantic -Wno-sign-compare -Wno-unknown-pragmas -Wno-conversion +-AM_CXXFLAGS = -fno-exceptions -fno-rtti -fcheck-new -Wall -ansi -pedantic -Wno-sign-compare -Wno-unknown-pragmas -Wno-conversion ++AM_CXXFLAGS = -fno-exceptions -fno-rtti -Wall -ansi -pedantic -Wno-sign-compare -Wno-unknown-pragmas -Wno-conversion + xmlunppm_SOURCES = xmlunppm.cpp Args.cpp Args.h Version.h + xmlunppm_LDADD = libxmlppm.a + lib_LIBRARIES = libxmlppm.a From owner-svn-ports-branches@FreeBSD.ORG Sat May 17 20:17:25 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA5B6C4B; Sat, 17 May 2014 20:17:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D76EE239D; Sat, 17 May 2014 20:17:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HKHPC5065511; Sat, 17 May 2014 20:17:25 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4HKHPDR065510; Sat, 17 May 2014 20:17:25 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201405172017.s4HKHPDR065510@svn.freebsd.org> From: Johan van Selst Date: Sat, 17 May 2014 20:17:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354366 - branches/2014Q2/security/signing-party X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 20:17:26 -0000 Author: johans Date: Sat May 17 20:17:25 2014 New Revision: 354366 URL: http://svnweb.freebsd.org/changeset/ports/354366 QAT: https://qat.redports.org/buildarchive/r354366/ Log: MFH: r354346 Add missing run-time dependency Submitted by: des Approved by: portmgr (erwin) Modified: branches/2014Q2/security/signing-party/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/signing-party/Makefile ============================================================================== --- branches/2014Q2/security/signing-party/Makefile Sat May 17 20:16:32 2014 (r354365) +++ branches/2014Q2/security/signing-party/Makefile Sat May 17 20:17:25 2014 (r354366) @@ -3,6 +3,7 @@ PORTNAME= signing-party PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/signing-party/ \ ${MASTER_SITE_DEBIAN} @@ -13,6 +14,7 @@ MAINTAINER= johans@FreeBSD.org COMMENT= Various OpenPGP related tools RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \ + p5-Net-IDN-Encode>=0:${PORTSDIR}/textproc/p5-Net-IDN-Encode \ p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \ p5-GnuPG-Interface>=0:${PORTSDIR}/security/p5-GnuPG-Interface \ p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \ From owner-svn-ports-branches@FreeBSD.ORG Sun May 18 21:15:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7EAF61C6; Sun, 18 May 2014 21:15:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A6462CAB; Sun, 18 May 2014 21:15:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4ILFr5C007183; Sun, 18 May 2014 21:15:53 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4ILFpp1007168; Sun, 18 May 2014 21:15:51 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405182115.s4ILFpp1007168@svn.freebsd.org> From: Koop Mast Date: Sun, 18 May 2014 21:15:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354473 - in branches/2014Q2/textproc: libxml2 libxml2/files py-libxml2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 21:15:53 -0000 Author: kwm Date: Sun May 18 21:15:50 2014 New Revision: 354473 URL: http://svnweb.freebsd.org/changeset/ports/354473 QAT: https://qat.redports.org/buildarchive/r354473/ Log: MFH: 353989 Update to libxml2 2.9.1 [1] This version fixes CVE-2013-2877. Add upstream patch for CVE-2014-0191. CVE's Reported by: Akinori MUSHA Obtained from: GNOME dev repo [1], libxml2 upstream [2] This commit was changed to revert the shared library version as previous used in the 2014Q2 branch. MFH: 354000 and 354061 Fix check-plist errors MFH: 354210 Fix miss merge relating to iconv support. Reported & tested by: Cyril Kalinchikov Approved by: portmgr (erwin & bapt) Added: branches/2014Q2/textproc/libxml2/files/patch-python_drv-libxml2.py - copied unchanged from r353989, head/textproc/libxml2/files/patch-python_drv-libxml2.py branches/2014Q2/textproc/libxml2/files/patch-python_setup.py.in - copied unchanged from r353989, head/textproc/libxml2/files/patch-python_setup.py.in Deleted: branches/2014Q2/textproc/libxml2/files/patch-doc_devhelp_Makefile.in branches/2014Q2/textproc/libxml2/files/patch-encoding.c branches/2014Q2/textproc/libxml2/files/patch-include_libxml_parser.h branches/2014Q2/textproc/libxml2/files/patch-parserInternals.c Modified: branches/2014Q2/textproc/libxml2/Makefile branches/2014Q2/textproc/libxml2/distinfo branches/2014Q2/textproc/libxml2/files/patch-Makefile.in (contents, props changed) branches/2014Q2/textproc/libxml2/files/patch-configure branches/2014Q2/textproc/libxml2/files/patch-parser.c branches/2014Q2/textproc/libxml2/files/patch-python_Makefile.in branches/2014Q2/textproc/libxml2/pkg-plist branches/2014Q2/textproc/py-libxml2/Makefile branches/2014Q2/textproc/py-libxml2/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/textproc/libxml2/Makefile ============================================================================== --- branches/2014Q2/textproc/libxml2/Makefile Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/libxml2/Makefile Sun May 18 21:15:50 2014 (r354473) @@ -1,10 +1,10 @@ # Created by: Yukihiro Nakai # $FreeBSD$ -# $MCom: ports/textproc/libxml2/Makefile,v 1.15 2012/11/26 19:55:23 kwm Exp $ +# $MCom: ports/trunk/textproc/libxml2/Makefile 19578 2014-04-25 21:50:30Z kwm $ PORTNAME= libxml2 -PORTVERSION= 2.8.0 -PORTREVISION?= 3 +PORTVERSION= 2.9.1 +PORTREVISION?= 1 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ @@ -15,20 +15,25 @@ MAINTAINER?= gnome@FreeBSD.org COMMENT?= XML parser library for GNOME .if !defined(REFERENCE_PORT) -USE_CSTD= gnu89 + GNU_CONFIGURE= yes -USES= pathfix gmake iconv pkgconfig +USES= gmake iconv pathfix pkgconfig shebangfix +USE_GNOME= ltverhack:5 USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ --with-lzma=/usr \ --without-python +INSTALL_TARGET= install-strip +SHEBANG_FILES= *.py */*.py */*/*.py + +PLIST_SUB+= LIBVERSION=${PORTVERSION} .if !defined(MASTERDIR) + OPTIONS_DEFINE= SCHEMA THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC OPTIONS_DEFAULT=SCHEMA THREADS - SCHEMA_DESC= XML schema support SCHEMA_CONFIGURE_WITH= schemas THREADS_DESC= Threads support @@ -39,26 +44,25 @@ XMLLINT_HIST_DESC= History for xmllint XMLLINT_HIST_CONFIGURE_WITH= history THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!) THREAD_ALLOC_CONFIGURE_WITH= thread-alloc + .endif # !defined(MASTERDIR) post-patch: .for d in . doc doc/devhelp doc/examples @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \ - ${WRKSRC}/${d}/Makefile.in + ${WRKSRC}/${d}/Makefile.in .endfor .for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1 @${REINPLACE_CMD} -e \ - 's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \ - s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \ - ${WRKSRC}/${f} + 's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \ + s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \ + ${WRKSRC}/${f} .endfor -# manual patch because WITH_FBSD10_FIX break the python bindings - ${FIND} ${WRKSRC} -type f -name configure \ - -exec ${SH} -c " \ - mtime=\$$(date -r \$$(stat -f '%m' \$$0) '+%Y%m%d%H%M.%S'); \ - ${SED} -i '.batman' -e 's|freebsd1\*)|freebsd1.\*)|g' \ - -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \$$0; \ - touch -mt \$$mtime \$$0" {} \; || /usr/bin/true + +.if !defined(MASTERDIR) +post-install: + @${RM} -rf ${STAGEDIR}${PREFIX}/share/gtk-doc +.endif .include Modified: branches/2014Q2/textproc/libxml2/distinfo ============================================================================== --- branches/2014Q2/textproc/libxml2/distinfo Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/libxml2/distinfo Sun May 18 21:15:50 2014 (r354473) @@ -1,2 +1,2 @@ -SHA256 (gnome2/libxml2-2.8.0.tar.gz) = f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a -SIZE (gnome2/libxml2-2.8.0.tar.gz) = 4915203 +SHA256 (gnome2/libxml2-2.9.1.tar.gz) = fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb +SIZE (gnome2/libxml2-2.9.1.tar.gz) = 5172503 Modified: branches/2014Q2/textproc/libxml2/files/patch-Makefile.in ============================================================================== --- branches/2014Q2/textproc/libxml2/files/patch-Makefile.in Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/libxml2/files/patch-Makefile.in Sun May 18 21:15:50 2014 (r354473) @@ -1,69 +1,29 @@ - $FreeBSD$ - ---- Makefile.in.orig 2012-08-16 19:38:10.000000000 +0200 -+++ Makefile.in 2012-08-16 19:39:09.000000000 +0200 -@@ -586,7 +586,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@ -+SUBDIRS = include . doc example xstc @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@ - DIST_SUBDIRS = include . doc example python xstc - INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ @LZMA_CFLAGS@ - bin_SCRIPTS = xml2-config -@@ -596,7 +596,7 @@ - @USE_VERSION_SCRIPT_TRUE@LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms - libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \ - $(LIBXML2_VERSION_SCRIPT) \ -- -version-info @LIBXML_VERSION_INFO@ \ -+ -version-info 5:0:0 \ - @MODULE_PLATFORM_LIBS@ - - @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ -@@ -712,7 +712,7 @@ - runxmlconf_DEPENDENCIES = $(DEPS) - runxmlconf_LDADD = $(LDADDS) - CLEANFILES = xml2Conf.sh *.gcda *.gcno --confexecdir = $(libdir) -+confexecdir = $(sysconfdir) - confexec_DATA = xml2Conf.sh - CVS_EXTRA_DIST = - EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ -@@ -735,8 +735,8 @@ - # Install the tests program sources as examples - # - BASE_DIR = $(datadir)/doc --DOC_MODULE = libxml2-$(VERSION) --EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples -+DOC_MODULE = libxml2 -+EXAMPLES_DIR = $(datadir)/examples/libxml2 - - # - # Coverage support, largely borrowed from libvirt -@@ -1094,7 +1094,7 @@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +--- Makefile.in.orig 2013-11-24 09:26:25.000000000 +0100 ++++ Makefile.in 2013-11-24 09:26:37.000000000 +0100 +@@ -1130,7 +1130,7 @@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@@ -1574,7 +1574,7 @@ - exit 1; } >&2 + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@@ -1635,7 +1635,7 @@ check-am: all-am - check: check-recursive + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ config.h install-binPROGRAMS: install-libLTLIBRARIES -@@ -1634,7 +1634,7 @@ +@@ -1703,7 +1703,7 @@ info-am: -install-data-am: install-data-local install-m4dataDATA install-man \ -+install-data-am: install-m4dataDATA install-man \ ++install-data-am: install-m4dataDATA install-man \ install-pkgconfigDATA install-dvi: install-dvi-recursive Modified: branches/2014Q2/textproc/libxml2/files/patch-configure ============================================================================== --- branches/2014Q2/textproc/libxml2/files/patch-configure Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/libxml2/files/patch-configure Sun May 18 21:15:50 2014 (r354473) @@ -1,20 +1,6 @@ ---- configure.orig 2012-08-04 11:48:19.000000000 +0200 -+++ configure 2012-08-04 11:50:50.000000000 +0200 -@@ -14228,11 +14228,12 @@ fi - fi - if test "$PYTHON_VERSION" != "" - then -+ with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` - if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ - -d $with_python/lib/python$PYTHON_VERSION/site-packages - then - PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION -- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages -+ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages - else - if test -r $prefix/include/python$PYTHON_VERSION/Python.h - then -@@ -14635,6 +14636,8 @@ fi +--- configure.orig 2013-11-24 09:41:13.000000000 +0100 ++++ configure 2013-11-24 09:41:55.000000000 +0100 +@@ -14499,6 +14499,8 @@ fi fi ;; Modified: branches/2014Q2/textproc/libxml2/files/patch-parser.c ============================================================================== --- branches/2014Q2/textproc/libxml2/files/patch-parser.c Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/libxml2/files/patch-parser.c Sun May 18 21:15:50 2014 (r354473) @@ -1,343 +1,38 @@ +CVE-2014-0191 + +From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Tue, 22 Apr 2014 15:30:56 +0800 +Subject: Do not fetch external parameter entities + +Unless explicitely asked for when validating or replacing entities +with their value. Problem pointed out by Daniel Berrange + +diff --git a/parser.c b/parser.c +index 9347ac9..c0dea05 100644 +--- parser.c ++++ parser.c +@@ -2598,6 +2598,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) { + xmlCharEncoding enc; + + /* ++ * Note: external parsed entities will not be loaded, it is ++ * not required for a non-validating parser, unless the ++ * option of validating, or substituting entities were ++ * given. Doing so is far more secure as the parser will ++ * only process data coming from the document entity by ++ * default. ++ */ ++ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) && ++ ((ctxt->options & XML_PARSE_NOENT) == 0) && ++ ((ctxt->options & XML_PARSE_DTDVALID) == 0) && ++ (ctxt->validate == 0)) ++ return; ++ ++ /* + * handle the extra spaces added before and after + * c.f. http://www.w3.org/TR/REC-xml#as-PE + * this is done independently. +-- +cgit v0.10.1 ---- parser.c.orig 2013-03-13 09:36:07.000000000 +0000 -+++ parser.c 2013-03-13 09:35:54.000000000 +0000 -@@ -40,6 +40,7 @@ - #endif - - #include -+#include - #include - #include - #include -@@ -117,16 +118,33 @@ - * parser option. - */ - static int --xmlParserEntityCheck(xmlParserCtxtPtr ctxt, unsigned long size, -- xmlEntityPtr ent) -+xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size, -+ xmlEntityPtr ent, size_t replacement) - { -- unsigned long consumed = 0; -+ size_t consumed = 0; - - if ((ctxt == NULL) || (ctxt->options & XML_PARSE_HUGE)) - return (0); - if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP) - return (1); -- if (size != 0) { -+ if (replacement != 0) { -+ if (replacement < XML_MAX_TEXT_LENGTH) -+ return(0); -+ -+ /* -+ * If the volume of entity copy reaches 10 times the -+ * amount of parsed data and over the large text threshold -+ * then that's very likely to be an abuse. -+ */ -+ if (ctxt->input != NULL) { -+ consumed = ctxt->input->consumed + -+ (ctxt->input->cur - ctxt->input->base); -+ } -+ consumed += ctxt->sizeentities; -+ -+ if (replacement < XML_PARSER_NON_LINEAR * consumed) -+ return(0); -+ } else if (size != 0) { - /* - * Do the check based on the replacement size of the entity - */ -@@ -172,7 +190,6 @@ - */ - return (0); - } -- - xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL); - return (1); - } -@@ -2589,15 +2606,17 @@ - - /* - * Macro used to grow the current buffer. -+ * buffer##_size is expected to be a size_t -+ * mem_error: is expected to handle memory allocation failures - */ - #define growBuffer(buffer, n) { \ - xmlChar *tmp; \ -- buffer##_size *= 2; \ -- buffer##_size += n; \ -- tmp = (xmlChar *) \ -- xmlRealloc(buffer, buffer##_size * sizeof(xmlChar)); \ -+ size_t new_size = buffer##_size * 2 + n; \ -+ if (new_size < buffer##_size) goto mem_error; \ -+ tmp = (xmlChar *) xmlRealloc(buffer, new_size); \ - if (tmp == NULL) goto mem_error; \ - buffer = tmp; \ -+ buffer##_size = new_size; \ - } - - /** -@@ -2623,14 +2642,14 @@ - xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, - int what, xmlChar end, xmlChar end2, xmlChar end3) { - xmlChar *buffer = NULL; -- int buffer_size = 0; -+ size_t buffer_size = 0; -+ size_t nbchars = 0; - - xmlChar *current = NULL; - xmlChar *rep = NULL; - const xmlChar *last; - xmlEntityPtr ent; - int c,l; -- int nbchars = 0; - - if ((ctxt == NULL) || (str == NULL) || (len < 0)) - return(NULL); -@@ -2647,7 +2666,7 @@ - * allocate a translation buffer. - */ - buffer_size = XML_PARSER_BIG_BUFFER_SIZE; -- buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar)); -+ buffer = (xmlChar *) xmlMallocAtomic(buffer_size); - if (buffer == NULL) goto mem_error; - - /* -@@ -2667,7 +2686,7 @@ - if (val != 0) { - COPY_BUF(0,buffer,nbchars,val); - } -- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { -+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } - } else if ((c == '&') && (what & XML_SUBSTITUTE_REF)) { -@@ -2685,7 +2704,7 @@ - (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) { - if (ent->content != NULL) { - COPY_BUF(0,buffer,nbchars,ent->content[0]); -- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { -+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } - } else { -@@ -2702,9 +2721,8 @@ - current = rep; - while (*current != 0) { /* non input consuming loop */ - buffer[nbchars++] = *current++; -- if (nbchars > -- buffer_size - XML_PARSER_BUFFER_SIZE) { -- if (xmlParserEntityCheck(ctxt, nbchars, ent)) -+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { -+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0)) - goto int_error; - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } -@@ -2717,7 +2735,7 @@ - const xmlChar *cur = ent->name; - - buffer[nbchars++] = '&'; -- if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { -+ if (nbchars + i + XML_PARSER_BUFFER_SIZE > buffer_size) { - growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); - } - for (;i > 0;i--) -@@ -2745,9 +2763,8 @@ - current = rep; - while (*current != 0) { /* non input consuming loop */ - buffer[nbchars++] = *current++; -- if (nbchars > -- buffer_size - XML_PARSER_BUFFER_SIZE) { -- if (xmlParserEntityCheck(ctxt, nbchars, ent)) -+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { -+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0)) - goto int_error; - growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } -@@ -2759,8 +2776,8 @@ - } else { - COPY_BUF(l,buffer,nbchars,c); - str += l; -- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) { -- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); -+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) { -+ growBuffer(buffer, XML_PARSER_BUFFER_SIZE); - } - } - if (str < last) -@@ -3764,8 +3781,8 @@ - xmlChar limit = 0; - xmlChar *buf = NULL; - xmlChar *rep = NULL; -- int len = 0; -- int buf_size = 0; -+ size_t len = 0; -+ size_t buf_size = 0; - int c, l, in_space = 0; - xmlChar *current = NULL; - xmlEntityPtr ent; -@@ -3787,7 +3804,7 @@ - * allocate a translation buffer. - */ - buf_size = XML_PARSER_BUFFER_SIZE; -- buf = (xmlChar *) xmlMallocAtomic(buf_size * sizeof(xmlChar)); -+ buf = (xmlChar *) xmlMallocAtomic(buf_size); - if (buf == NULL) goto mem_error; - - /* -@@ -3804,7 +3821,7 @@ - - if (val == '&') { - if (ctxt->replaceEntities) { -- if (len > buf_size - 10) { -+ if (len + 10 > buf_size) { - growBuffer(buf, 10); - } - buf[len++] = '&'; -@@ -3813,7 +3830,7 @@ - * The reparsing will be done in xmlStringGetNodeList() - * called by the attribute() function in SAX.c - */ -- if (len > buf_size - 10) { -+ if (len + 10 > buf_size) { - growBuffer(buf, 10); - } - buf[len++] = '&'; -@@ -3823,7 +3840,7 @@ - buf[len++] = ';'; - } - } else if (val != 0) { -- if (len > buf_size - 10) { -+ if (len + 10 > buf_size) { - growBuffer(buf, 10); - } - len += xmlCopyChar(0, &buf[len], val); -@@ -3835,7 +3852,7 @@ - ctxt->nbentities += ent->owner; - if ((ent != NULL) && - (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) { -- if (len > buf_size - 10) { -+ if (len + 10 > buf_size) { - growBuffer(buf, 10); - } - if ((ctxt->replaceEntities == 0) && -@@ -3863,7 +3880,7 @@ - current++; - } else - buf[len++] = *current++; -- if (len > buf_size - 10) { -+ if (len + 10 > buf_size) { - growBuffer(buf, 10); - } - } -@@ -3871,7 +3888,7 @@ - rep = NULL; - } - } else { -- if (len > buf_size - 10) { -+ if (len + 10 > buf_size) { - growBuffer(buf, 10); - } - if (ent->content != NULL) -@@ -3899,7 +3916,7 @@ - * Just output the reference - */ - buf[len++] = '&'; -- while (len > buf_size - i - 10) { -+ while (len + i + 10 > buf_size) { - growBuffer(buf, i + 10); - } - for (;i > 0;i--) -@@ -3912,7 +3929,7 @@ - if ((len != 0) || (!normalize)) { - if ((!normalize) || (!in_space)) { - COPY_BUF(l,buf,len,0x20); -- while (len > buf_size - 10) { -+ while (len + 10 > buf_size) { - growBuffer(buf, 10); - } - } -@@ -3921,7 +3938,7 @@ - } else { - in_space = 0; - COPY_BUF(l,buf,len,c); -- if (len > buf_size - 10) { -+ if (len + 10 > buf_size) { - growBuffer(buf, 10); - } - } -@@ -3931,7 +3948,7 @@ - c = CUR_CHAR(l); - } - if ((in_space) && (normalize)) { -- while (buf[len - 1] == 0x20) len--; -+ while ((len > 0) && (buf[len - 1] == 0x20)) len--; - } - buf[len] = 0; - if (RAW == '<') { -@@ -3946,7 +3963,18 @@ - } - } else - NEXT; -- if (attlen != NULL) *attlen = len; -+ -+ /* -+ * There we potentially risk an overflow, don't allow attribute value of -+ * lenght more than INT_MAX it is a very reasonnable assumption ! -+ */ -+ if (len >= INT_MAX) { -+ xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED, -+ "AttValue lenght too long\n"); -+ goto mem_error; -+ } -+ -+ if (attlen != NULL) *attlen = (int) len; - return(buf); - - mem_error: -@@ -6964,7 +6992,7 @@ - xmlFreeNodeList(list); - return; - } -- if (xmlParserEntityCheck(ctxt, 0, ent)) { -+ if (xmlParserEntityCheck(ctxt, 0, ent, 0)) { - xmlFreeNodeList(list); - return; - } -@@ -7124,6 +7152,13 @@ - xmlNodePtr nw = NULL, cur, firstChild = NULL; - - /* -+ * We are copying here, make sure there is no abuse -+ */ -+ ctxt->sizeentcopy += ent->length; -+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy)) -+ return; -+ -+ /* - * when operating on a reader, the entities definitions - * are always owning the entities subtree. - if (ctxt->parseMode == XML_PARSE_READER) -@@ -7163,6 +7198,14 @@ - } else if (list == NULL) { - xmlNodePtr nw = NULL, cur, next, last, - firstChild = NULL; -+ -+ /* -+ * We are copying here, make sure there is no abuse -+ */ -+ ctxt->sizeentcopy += ent->length; -+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy)) -+ return; -+ - /* - * Copy the entity child list and make it the new - * entity child list. The goal is to make sure any -@@ -14343,6 +14386,7 @@ - ctxt->catalogs = NULL; - ctxt->nbentities = 0; - ctxt->sizeentities = 0; -+ ctxt->sizeentcopy = 0; - xmlInitNodeInfoSeq(&ctxt->node_seq); - - if (ctxt->attsDefault != NULL) { Modified: branches/2014Q2/textproc/libxml2/files/patch-python_Makefile.in ============================================================================== --- branches/2014Q2/textproc/libxml2/files/patch-python_Makefile.in Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/libxml2/files/patch-python_Makefile.in Sun May 18 21:15:50 2014 (r354473) @@ -1,26 +1,20 @@ ---- python/Makefile.in.orig 2012-08-04 12:00:53.000000000 +0200 -+++ python/Makefile.in 2012-08-04 12:02:59.000000000 +0200 -@@ -395,7 +395,7 @@ - -I$(top_builddir)/include \ - -I$(top_builddir)/$(subdir) +--- python/Makefile.in.orig 2013-11-24 08:47:04.000000000 +0100 ++++ python/Makefile.in 2013-11-24 08:51:02.000000000 +0100 +@@ -415,7 +415,7 @@ --docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION) -+docsdir = $(datadir)/doc/py-libxml2 - # libxml2class.txt is generated + # Makefile for libxml2 python library + AUTOMAKE_OPTIONS = 1.4 foreign +-SUBDIRS = . tests ++SUBDIRS = . + docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION) dist_docs_DATA = TODO EXTRA_DIST = \ -@@ -408,12 +408,12 @@ - - libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version - @WITH_PYTHON_TRUE@mylibs = \ --@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la -+@WITH_PYTHON_TRUE@ -lxml2 - +@@ -435,7 +435,7 @@ @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la - @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = $(srcdir)/libxml.c $(srcdir)/types.c - @WITH_PYTHON_TRUE@nodist_libxml2mod_la_SOURCES = libxml2-py.c --@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@ -lpython$(PYTHON_VERSION) -+@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@ - @WITH_PYTHON_TRUE@python_DATA = \ - @WITH_PYTHON_TRUE@ libxml2.py + @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c + @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \ +-@WITH_PYTHON_TRUE@ $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) ++@WITH_PYTHON_TRUE@ -lxml2 $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) + @WITH_PYTHON_TRUE@BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c + @WITH_PYTHON_TRUE@dist_python_DATA = \ Copied: branches/2014Q2/textproc/libxml2/files/patch-python_drv-libxml2.py (from r353989, head/textproc/libxml2/files/patch-python_drv-libxml2.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/textproc/libxml2/files/patch-python_drv-libxml2.py Sun May 18 21:15:50 2014 (r354473, copy of r353989, head/textproc/libxml2/files/patch-python_drv-libxml2.py) @@ -0,0 +1,46 @@ +From 6c9c611beed57f001ca3ae6b964518d9c7336a69 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Thu, 11 Jul 2013 03:00:54 +0000 +Subject: python: fix drv_libxml2.py for python3 compatibility + +https://bugzilla.gnome.org/show_bug.cgi?id=703979 +--- +diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py +index e43fb1d..c9075e6 100644 +--- python/drv_libxml2.py ++++ python/drv_libxml2.py +@@ -34,12 +34,20 @@ TODO + + """ + +-__author__ = u"Stéphane Bidoul " ++__author__ = "Stéphane Bidoul " + __version__ = "0.3" + ++import sys + import codecs +-from types import StringType, UnicodeType +-StringTypes = (StringType,UnicodeType) ++ ++if sys.version < "3": ++ __author__ = codecs.unicode_escape_decode(__author__)[0] ++ ++ from types import StringType, UnicodeType ++ StringTypes = (StringType,UnicodeType) ++ ++else: ++ StringTypes = (str) + + from xml.sax._exceptions import * + from xml.sax import xmlreader, saxutils +@@ -65,7 +73,7 @@ def _d(s): + + try: + import libxml2 +-except ImportError, e: ++except ImportError as e: + raise SAXReaderNotAvailable("libxml2 not available: " \ + "import error was: %s" % e) + +-- +cgit v0.9.2 Copied: branches/2014Q2/textproc/libxml2/files/patch-python_setup.py.in (from r353989, head/textproc/libxml2/files/patch-python_setup.py.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/textproc/libxml2/files/patch-python_setup.py.in Sun May 18 21:15:50 2014 (r354473, copy of r353989, head/textproc/libxml2/files/patch-python_setup.py.in) @@ -0,0 +1,142 @@ +--- python/setup.py.in.orig 2014-03-24 21:27:16.000000000 +0100 ++++ python/setup.py.in 2014-03-24 21:31:10.000000000 +0100 +@@ -67,7 +67,7 @@ + for dir in includes_dir: + if not missing(dir + "/libxml2/libxml/tree.h"): + xml_includes=dir + "/libxml2" +- break; ++ break; + + if xml_includes == "": + print("failed to find headers for libxml2: update includes_dir") +@@ -77,7 +77,7 @@ + for dir in includes_dir: + if not missing(dir + "/iconv.h"): + iconv_includes=dir +- break; ++ break; + + if iconv_includes == "": + print("failed to find headers for libiconv: update includes_dir") +@@ -90,22 +90,22 @@ + + xml_files = ["libxml2-api.xml", "libxml2-python-api.xml", + "libxml.c", "libxml.py", "libxml_wrap.h", "types.c", +- "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"] ++ "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"] + + xslt_files = ["libxslt-api.xml", "libxslt-python-api.xml", + "libxslt.c", "libxsl.py", "libxslt_wrap.h", +- "xsltgenerator.py"] ++ "xsltgenerator.py"] + + if missing("libxml2-py.c") or missing("libxml2.py"): + try: +- try: +- import xmlgenerator +- except: +- import generator ++ try: ++ import xmlgenerator ++ except: ++ import generator + except: +- print("failed to find and generate stubs for libxml2, aborting ...") +- print(sys.exc_info()[0], sys.exc_info()[1]) +- sys.exit(1) ++ print("failed to find and generate stubs for libxml2, aborting ...") ++ print(sys.exc_info()[0], sys.exc_info()[1]) ++ sys.exit(1) + + head = open("libxml.py", "r") + generated = open("libxml2class.py", "r") +@@ -116,7 +116,7 @@ + else: + result.write(line) + for line in generated.readlines(): +- result.write(line) ++ result.write(line) + head.close() + generated.close() + result.close() +@@ -126,39 +126,39 @@ + if missing("xsltgenerator.py") or missing("libxslt-api.xml"): + print("libxslt stub generator not found, libxslt not built") + else: +- try: +- import xsltgenerator +- except: +- print("failed to generate stubs for libxslt, aborting ...") +- print(sys.exc_info()[0], sys.exc_info()[1]) +- else: +- head = open("libxsl.py", "r") +- generated = open("libxsltclass.py", "r") +- result = open("libxslt.py", "w") +- for line in head.readlines(): ++ try: ++ import xsltgenerator ++ except: ++ print("failed to generate stubs for libxslt, aborting ...") ++ print(sys.exc_info()[0], sys.exc_info()[1]) ++ else: ++ head = open("libxsl.py", "r") ++ generated = open("libxsltclass.py", "r") ++ result = open("libxslt.py", "w") ++ for line in head.readlines(): + if WITHDLLS: + result.write(altImport(line)) + else: + result.write(line) +- for line in generated.readlines(): +- result.write(line) +- head.close() +- generated.close() +- result.close() +- with_xslt=1 ++ for line in generated.readlines(): ++ result.write(line) ++ head.close() ++ generated.close() ++ result.close() ++ with_xslt=1 + else: + with_xslt=1 + + if with_xslt == 1: + xslt_includes="" + for dir in includes_dir: +- if not missing(dir + "/libxslt/xsltconfig.h"): +- xslt_includes=dir + "/libxslt" +- break; ++ if not missing(dir + "/libxslt/xsltconfig.h"): ++ xslt_includes=dir + "/libxslt" ++ break; + + if xslt_includes == "": +- print("failed to find headers for libxslt: update includes_dir") +- with_xslt = 0 ++ print("failed to find headers for libxslt: update includes_dir") ++ with_xslt = 0 + + + descr = "libxml2 package" +@@ -198,7 +198,7 @@ + libraries=libs, define_macros=macros)] + if with_xslt == 1: + extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes, +- library_dirs=libdirs, ++ library_dirs=libdirs, + libraries=libs, define_macros=macros)) + + if missing("MANIFEST"): +@@ -208,8 +208,8 @@ + for file in xml_files: + manifest.write(file + "\n") + if with_xslt == 1: +- for file in xslt_files: +- manifest.write(file + "\n") ++ for file in xslt_files: ++ manifest.write(file + "\n") + manifest.close() + + if WITHDLLS: Modified: branches/2014Q2/textproc/libxml2/pkg-plist ============================================================================== --- branches/2014Q2/textproc/libxml2/pkg-plist Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/libxml2/pkg-plist Sun May 18 21:15:50 2014 (r354473) @@ -1,7 +1,6 @@ bin/xml2-config bin/xmlcatalog bin/xmllint -etc/xml2Conf.sh include/libxml2/libxml/DOCBparser.h include/libxml2/libxml/HTMLparser.h include/libxml2/libxml/HTMLtree.h @@ -53,6 +52,7 @@ lib/libxml2.a lib/libxml2.la lib/libxml2.so lib/libxml2.so.5 +lib/xml2Conf.sh libdata/pkgconfig/libxml-2.0.pc share/aclocal/libxml.m4 man/man1/xml2-config.1.gz Modified: branches/2014Q2/textproc/py-libxml2/Makefile ============================================================================== --- branches/2014Q2/textproc/py-libxml2/Makefile Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/py-libxml2/Makefile Sun May 18 21:15:50 2014 (r354473) @@ -1,5 +1,6 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ +# $MCom: ports/trunk/textproc/py-libxml2/Makefile 18999 2014-02-04 18:55:27Z kwm $ PORTREVISION= 0 CATEGORIES= textproc gnome python @@ -16,7 +17,9 @@ PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 USE_PYTHON= 2 -USES= iconv +USE_PYDISTUTILS=yes +PYDISTUTILS_EGGINFO= libxml2_python-${PORTVERSION}-py${PYTHON_VER}.egg-info + CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs` CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ @@ -28,7 +31,6 @@ DOCSDIR= ${PREFIX}/share/doc/py-libxml2 EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2 post-install: - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${STAGEDIR}${PYTHON_SITELIBDIR} - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${STAGEDIR}${PYTHON_SITELIBDIR} + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/textproc/py-libxml2/pkg-plist ============================================================================== --- branches/2014Q2/textproc/py-libxml2/pkg-plist Sun May 18 21:13:09 2014 (r354472) +++ branches/2014Q2/textproc/py-libxml2/pkg-plist Sun May 18 21:15:50 2014 (r354473) @@ -4,59 +4,4 @@ %%PYTHON_SITELIBDIR%%/libxml2.py %%PYTHON_SITELIBDIR%%/libxml2.pyc %%PYTHON_SITELIBDIR%%/libxml2.pyo -%%PYTHON_SITELIBDIR%%/libxml2mod.a -%%PYTHON_SITELIBDIR%%/libxml2mod.la %%PYTHON_SITELIBDIR%%/libxml2mod.so -%%DOCSDIR%%/TODO -%%EXAMPLESDIR%%/attribs.py -%%EXAMPLESDIR%%/build.py -%%EXAMPLESDIR%%/compareNodes.py -%%EXAMPLESDIR%%/ctxterror.py -%%EXAMPLESDIR%%/cutnpaste.py -%%EXAMPLESDIR%%/dtdvalid.py -%%EXAMPLESDIR%%/error.py -%%EXAMPLESDIR%%/inbuf.py -%%EXAMPLESDIR%%/indexes.py -%%EXAMPLESDIR%%/invalid.xml -%%EXAMPLESDIR%%/nsdel.py -%%EXAMPLESDIR%%/outbuf.py -%%EXAMPLESDIR%%/push.py -%%EXAMPLESDIR%%/pushSAX.py -%%EXAMPLESDIR%%/pushSAXhtml.py -%%EXAMPLESDIR%%/reader.py -%%EXAMPLESDIR%%/reader2.py -%%EXAMPLESDIR%%/reader3.py -%%EXAMPLESDIR%%/reader4.py -%%EXAMPLESDIR%%/reader5.py -%%EXAMPLESDIR%%/reader6.py -%%EXAMPLESDIR%%/reader7.py -%%EXAMPLESDIR%%/reader8.py -%%EXAMPLESDIR%%/readererr.py -%%EXAMPLESDIR%%/readernext.py -%%EXAMPLESDIR%%/regexp.py -%%EXAMPLESDIR%%/relaxng.py -%%EXAMPLESDIR%%/resolver.py -%%EXAMPLESDIR%%/schema.py -%%EXAMPLESDIR%%/serialize.py -%%EXAMPLESDIR%%/sync.py -%%EXAMPLESDIR%%/test.dtd -%%EXAMPLESDIR%%/thread2.py -%%EXAMPLESDIR%%/tst.py -%%EXAMPLESDIR%%/tst.xml -%%EXAMPLESDIR%%/tstLastError.py -%%EXAMPLESDIR%%/tstURI.py -%%EXAMPLESDIR%%/tstmem.py -%%EXAMPLESDIR%%/tstxpath.py -%%EXAMPLESDIR%%/valid.xml -%%EXAMPLESDIR%%/validDTD.py -%%EXAMPLESDIR%%/validRNG.py -%%EXAMPLESDIR%%/validSchemas.py -%%EXAMPLESDIR%%/validate.py -%%EXAMPLESDIR%%/walker.py -%%EXAMPLESDIR%%/xpath.py -%%EXAMPLESDIR%%/xpathext.py -%%EXAMPLESDIR%%/xpathleak.py -%%EXAMPLESDIR%%/xpathns.py -%%EXAMPLESDIR%%/xpathret.py -@dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Sun May 18 21:51:41 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A2149D8; Sun, 18 May 2014 21:51:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B0FA2F44; Sun, 18 May 2014 21:51:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4ILpebE031676; Sun, 18 May 2014 21:51:40 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4ILperB031668; Sun, 18 May 2014 21:51:40 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201405182151.s4ILperB031668@svn.freebsd.org> From: Pawel Pekala Date: Sun, 18 May 2014 21:51:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354475 - in branches/2014Q2/japanese/namazu: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 21:51:41 -0000 Author: pawel Date: Sun May 18 21:51:39 2014 New Revision: 354475 URL: http://svnweb.freebsd.org/changeset/ports/354475 QAT: https://qat.redports.org/buildarchive/r354475/ Log: MFH: r354449 - Fix build with clang - Add staging support Approved by: portmgr (erwin) Added: branches/2014Q2/japanese/namazu/files/patch-Makefile.in - copied unchanged from r354449, head/japanese/namazu/files/patch-Makefile.in branches/2014Q2/japanese/namazu/files/patch-codeconv.c - copied unchanged from r354449, head/japanese/namazu/files/patch-codeconv.c branches/2014Q2/japanese/namazu/files/patch-configure - copied unchanged from r354449, head/japanese/namazu/files/patch-configure Deleted: branches/2014Q2/japanese/namazu/files/patch-aa Modified: branches/2014Q2/japanese/namazu/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/japanese/namazu/Makefile ============================================================================== --- branches/2014Q2/japanese/namazu/Makefile Sun May 18 21:42:00 2014 (r354474) +++ branches/2014Q2/japanese/namazu/Makefile Sun May 18 21:51:39 2014 (r354475) @@ -21,5 +21,7 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src -NO_STAGE= yes +post-patch: + @${REINPLACE_CMD} '/^int main/ s|uchar|char|' ${WRKSRC}/namazu.c + .include Copied: branches/2014Q2/japanese/namazu/files/patch-Makefile.in (from r354449, head/japanese/namazu/files/patch-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/japanese/namazu/files/patch-Makefile.in Sun May 18 21:51:39 2014 (r354475, copy of r354449, head/japanese/namazu/files/patch-Makefile.in) @@ -0,0 +1,58 @@ +--- ./Makefile.in.orig 2000-01-26 14:38:51.000000000 +0100 ++++ ./Makefile.in 2014-05-18 20:50:57.000000000 +0200 +@@ -292,34 +292,34 @@ + cp namazu.cgi $(CGIDIR) + + install: all +- if [ ! -d $(BINDIR) ]; then \ +- mkdir -p $(BINDIR); \ ++ if [ ! -d $(DESTDIR)$(BINDIR) ]; then \ ++ mkdir -p $(DESTDIR)$(BINDIR); \ + fi +- if [ ! -d $(INDEXDIR) ]; then \ +- mkdir -p $(INDEXDIR); \ ++ if [ ! -d $(DESTDIR)$(INDEXDIR) ]; then \ ++ mkdir -p $(DESTDIR)$(INDEXDIR); \ + fi +- if [ ! -d "$(DOCDIR)/ja" ]; then \ +- mkdir -p "$(DOCDIR)/ja"; \ ++ if [ ! -d "$(DESTDIR)$(DOCDIR)/ja" ]; then \ ++ mkdir -p "$(DESTDIR)$(DOCDIR)/ja"; \ + fi +- if [ ! -d "$(DOCDIR)/en" ]; then \ +- mkdir -p "$(DOCDIR)/en"; \ ++ if [ ! -d "$(DESTDIR)$(DOCDIR)/en" ]; then \ ++ mkdir -p "$(DESTDIR)$(DOCDIR)/en"; \ + fi +- if [ ! -d $(LIBDIR) ]; then \ +- mkdir -p $(LIBDIR); \ ++ if [ ! -d $(DESTDIR)$(LIBDIR) ]; then \ ++ mkdir -p $(DESTDIR)$(LIBDIR); \ + fi +- if [ ! -d $(CONTRIBDIR) ]; then \ +- mkdir -p $(CONTRIBDIR); \ ++ if [ ! -d $(DESTDIR)$(CONTRIBDIR) ]; then \ ++ mkdir -p $(DESTDIR)$(CONTRIBDIR); \ + fi +- if [ ! -d $(BINDIR_SYS) ]; then \ +- mkdir -p $(BINDIR_SYS); \ ++ if [ ! -d $(DESTDIR)$(BINDIR_SYS) ]; then \ ++ mkdir -p $(DESTDIR)$(BINDIR_SYS); \ + fi +- cp mknmz wdnmz rvnmz clnmz namazu vfnmz mailutime gcnmz gtnmz $(BINDIR) +- cp ../COPYING ../ToDo ../ChangeLog $(DOCDIR) +- cp ../README.ja ../doc/ja/* "$(DOCDIR)/ja" +- cp ../README.en ../doc/en/* "$(DOCDIR)/en" +- cp ../lib/* $(LIBDIR) +- cp ../contrib/* $(CONTRIBDIR) +- cp namazu mknmz $(BINDIR_SYS) ++ cp mknmz wdnmz rvnmz clnmz namazu vfnmz mailutime gcnmz gtnmz $(DESTDIR)$(BINDIR) ++ cp ../COPYING ../ToDo ../ChangeLog $(DESTDIR)$(DOCDIR) ++ cp ../README.ja ../doc/ja/* "$(DESTDIR)$(DOCDIR)/ja" ++ cp ../README.en ../doc/en/* "$(DESTDIR)$(DOCDIR)/en" ++ cp ../lib/* $(DESTDIR)$(LIBDIR) ++ cp ../contrib/* $(DESTDIR)$(CONTRIBDIR) ++ cp namazu mknmz $(DESTDIR)$(BINDIR_SYS) + + clean: + $(RM) $(TARGET) *.o config.cache config.log config.status Copied: branches/2014Q2/japanese/namazu/files/patch-codeconv.c (from r354449, head/japanese/namazu/files/patch-codeconv.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/japanese/namazu/files/patch-codeconv.c Sun May 18 21:51:39 2014 (r354475, copy of r354449, head/japanese/namazu/files/patch-codeconv.c) @@ -0,0 +1,10 @@ +--- ./codeconv.c.orig 2000-01-26 14:38:51.000000000 +0100 ++++ ./codeconv.c 2014-05-18 20:48:26.000000000 +0200 +@@ -31,6 +31,7 @@ + */ + + #include ++#include + #include "namazu.h" + + uchar kanji2nd; Copied: branches/2014Q2/japanese/namazu/files/patch-configure (from r354449, head/japanese/namazu/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/japanese/namazu/files/patch-configure Sun May 18 21:51:39 2014 (r354475, copy of r354449, head/japanese/namazu/files/patch-configure) @@ -0,0 +1,11 @@ +--- ./configure.orig 2000-01-26 14:38:51.000000000 +0100 ++++ ./configure 2014-05-18 20:48:26.000000000 +0200 +@@ -1702,6 +1702,8 @@ + fi + if test "$CHASEN" != "not_found"; then + WAKATI_DEFAULT=CHASEN ++ else ++ CHASEN=/usr/local/bin/chasen + fi + + fi From owner-svn-ports-branches@FreeBSD.ORG Mon May 19 19:55:31 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8477CCDD; Mon, 19 May 2014 19:55:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 704192113; Mon, 19 May 2014 19:55:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JJtVOn093043; Mon, 19 May 2014 19:55:31 GMT (envelope-from cs@svn.freebsd.org) Received: (from cs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JJtVRi093042; Mon, 19 May 2014 19:55:31 GMT (envelope-from cs@svn.freebsd.org) Message-Id: <201405191955.s4JJtVRi093042@svn.freebsd.org> From: Carlo Strub Date: Mon, 19 May 2014 19:55:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354585 - branches/2014Q2/lang/x10 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 19:55:31 -0000 Author: cs Date: Mon May 19 19:55:30 2014 New Revision: 354585 URL: http://svnweb.freebsd.org/changeset/ports/354585 QAT: https://qat.redports.org/buildarchive/r354585/ Log: MFH: r354466 Patch for 10.0-RELEASE and later build failures. Fixes a problem in bundled Boehm GC configure script, which mistakes FreeBSD 1* for FreeBSD 1.* and disables dynamic libraries. PR: ports/189004 Submitted by: Jason Bacon (maintainer) Approved by: portmgr Modified: branches/2014Q2/lang/x10/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/lang/x10/Makefile ============================================================================== --- branches/2014Q2/lang/x10/Makefile Mon May 19 19:40:09 2014 (r354584) +++ branches/2014Q2/lang/x10/Makefile Mon May 19 19:55:30 2014 (r354585) @@ -56,6 +56,7 @@ post-patch: ${CP} ${DISTDIR}/org.eclipse.equinox.common_3.6.0.v20100503.jar ${WRKSRC}/lib ${CP} ${DISTDIR}/commons-math-2.2.jar ${WRKSRC}/lib ${CP} ${DISTDIR}/bdwgc-7.1.tar.gz ${WRKDIR}/x10.runtime/src-cpp/bdwgc + (cd ${WRKDIR}/x10.runtime/src-cpp/bdwgc/src && tar zxvf ../bdwgc-7.1.tar.gz && ${REINPLACE_CMD} -e 's|freebsd1\*|freebsd1.*|g' configure) do-install: .for f in X10Launcher apgas precommit x10 x10c x10c++ x10j From owner-svn-ports-branches@FreeBSD.ORG Mon May 19 19:57:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 05247DE1; Mon, 19 May 2014 19:57:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6DD3212B; Mon, 19 May 2014 19:57:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JJvalb093411; Mon, 19 May 2014 19:57:36 GMT (envelope-from cs@svn.freebsd.org) Received: (from cs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JJva3A093410; Mon, 19 May 2014 19:57:36 GMT (envelope-from cs@svn.freebsd.org) Message-Id: <201405191957.s4JJva3A093410@svn.freebsd.org> From: Carlo Strub Date: Mon, 19 May 2014 19:57:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354586 - branches/2014Q2/lang/x10 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 19:57:37 -0000 Author: cs Date: Mon May 19 19:57:36 2014 New Revision: 354586 URL: http://svnweb.freebsd.org/changeset/ports/354586 QAT: https://qat.redports.org/buildarchive/r354586/ Log: MFH: r354467 PORTREVISION bump due to previous commit Approved by: portmgr Modified: branches/2014Q2/lang/x10/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/lang/x10/Makefile ============================================================================== --- branches/2014Q2/lang/x10/Makefile Mon May 19 19:55:30 2014 (r354585) +++ branches/2014Q2/lang/x10/Makefile Mon May 19 19:57:36 2014 (r354586) @@ -3,7 +3,7 @@ PORTNAME= x10 PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel java MASTER_SITES= http://dist.codehaus.org/x10/dependencies/ \ SF From owner-svn-ports-branches@FreeBSD.ORG Tue May 20 20:17:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8C69730A; Tue, 20 May 2014 20:17:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6C44F2E0D; Tue, 20 May 2014 20:17:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KKHisM066699; Tue, 20 May 2014 20:17:44 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4KKHhlW066696; Tue, 20 May 2014 20:17:43 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405202017.s4KKHhlW066696@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 20 May 2014 20:17:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354682 - branches/2014Q2/databases/libiodbc X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2014 20:17:44 -0000 Author: rakuco Date: Tue May 20 20:17:43 2014 New Revision: 354682 URL: http://svnweb.freebsd.org/changeset/ports/354682 QAT: https://qat.redports.org/buildarchive/r354682/ Log: MFH: r354528 Update to 3.52.9. Changes upstream include: * Added support for building on recent versions of Mac OS X * Fixed warnings from autoconf/automake * Fixed infinite loop in connection pool * Fixed compiler warnings * Fixed build dependency for make -jX * Fixed check for Unicode driver * Fixed issue calling SQLCancel from other thread * Fixed SQLInstallDriverEx when driver is readonly The "Fixed build dependency for make -jX" part is important, as parallel builds (particularly with the GTK2 option on) normally fail with 3.52.8. Based on a patch by Jia-Shiun Li [1]. PR: ports/189496 [1] Submitted by: Jia-Shiun Li [1] Approved by: portmgr (miwi) Modified: branches/2014Q2/databases/libiodbc/Makefile branches/2014Q2/databases/libiodbc/distinfo branches/2014Q2/databases/libiodbc/pkg-descr Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/libiodbc/Makefile ============================================================================== --- branches/2014Q2/databases/libiodbc/Makefile Tue May 20 20:15:04 2014 (r354681) +++ branches/2014Q2/databases/libiodbc/Makefile Tue May 20 20:17:43 2014 (r354682) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libiodbc -PORTVERSION= 3.52.8 +PORTVERSION= 3.52.9 CATEGORIES= databases MASTER_SITES= SF/iodbc/iodbc/${PORTVERSION} Modified: branches/2014Q2/databases/libiodbc/distinfo ============================================================================== --- branches/2014Q2/databases/libiodbc/distinfo Tue May 20 20:15:04 2014 (r354681) +++ branches/2014Q2/databases/libiodbc/distinfo Tue May 20 20:17:43 2014 (r354682) @@ -1,2 +1,2 @@ -SHA256 (libiodbc-3.52.8.tar.gz) = 18165501fbdb5ab8c445d07365907b77c0c20887aecf37ed2b88aacd9c59129a -SIZE (libiodbc-3.52.8.tar.gz) = 1089784 +SHA256 (libiodbc-3.52.9.tar.gz) = 33207d9f477aa5fa76962ff644baa38e59255b96812f28574794659fb61a7ab2 +SIZE (libiodbc-3.52.9.tar.gz) = 1094234 Modified: branches/2014Q2/databases/libiodbc/pkg-descr ============================================================================== --- branches/2014Q2/databases/libiodbc/pkg-descr Tue May 20 20:15:04 2014 (r354681) +++ branches/2014Q2/databases/libiodbc/pkg-descr Tue May 20 20:17:43 2014 (r354682) @@ -5,9 +5,9 @@ function sequence checking, driver funct Applications linked with the iODBC driver manager will be able - through ODBC function calls - to access simultaneously different types of data sources -within one process through suitable ODBC drivers. - +within one process through suitable ODBC drivers. + iODBC is freely redistributable under either the GNU Library General Public Licence (LGPL) or the BSD licence. -WWW: http://www.iodbc.org/ +WWW: http://www.iodbc.org/ From owner-svn-ports-branches@FreeBSD.ORG Wed May 21 05:31:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 56C8C93E; Wed, 21 May 2014 05:31:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A0772A8D; Wed, 21 May 2014 05:31:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4L5VS9q006613; Wed, 21 May 2014 05:31:28 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4L5VRPl006612; Wed, 21 May 2014 05:31:27 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405210531.s4L5VRPl006612@svn.freebsd.org> From: Rene Ladan Date: Wed, 21 May 2014 05:31:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354705 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 05:31:28 -0000 Author: rene Date: Wed May 21 05:31:27 2014 New Revision: 354705 URL: http://svnweb.freebsd.org/changeset/ports/354705 QAT: https://qat.redports.org/buildarchive/r354705/ Log: MFH: r354686 Document new vulnerabilities in www/chromium < 35.0.1916.114 Obtained from: http://googlechromereleases.blogspot.nl/ Approved by: portmgr (erwin) Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Wed May 21 05:28:56 2014 (r354704) +++ branches/2014Q2/security/vuxml/vuln.xml Wed May 21 05:31:27 2014 (r354705) @@ -51,6 +51,57 @@ Note: Please add new entries to the beg --> + + chromium -- multiple vulnerabilities + + + chromium + 35.0.1916.114 + + + + +

Google Chrome Releases reports:

+
+

23 security fixes in this release, including:

+
    +
  • [356653] High CVE-2014-1743: Use-after-free in styles. Credit + to cloudfuzzer.
  • +
  • [359454] High CVE-2014-1744: Integer overflow in audio. Credit + to Aaron Staple.
  • +
  • [346192] High CVE-2014-1745: Use-after-free in SVG. Credit to + Atte Kettunen of OUSPG.
  • +
  • [364065] Medium CVE-2014-1746: Out-of-bounds read in media + filters. Credit to Holger Fuhrmannek.
  • +
  • [330663] Medium CVE-2014-1747: UXSS with local MHTML file. + Credit to packagesu.
  • +
  • [331168] Medium CVE-2014-1748: UI spoofing with scrollbar. + Credit to Jordan Milne.
  • +
  • [374649] CVE-2014-1749: Various fixes from internal audits, + fuzzing and other initiatives.
  • +
  • [358057] CVE-2014-3152: Integer underflow in V8 fixed in + version 3.25.28.16.
  • +
+
+ +
+ + CVE-2014-1743 + CVE-2014-1744 + CVE-2014-1745 + CVE-2014-1746 + CVE-2014-1747 + CVE-2014-1748 + CVE-2014-1749 + CVE-2014-3152 + http://googlechromereleases.blogspot.nl/ + + + 2014-05-20 + 2014-05-20 + +
+ chromium -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Wed May 21 05:34:32 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 40495A3B; Wed, 21 May 2014 05:34:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AAE22AA2; Wed, 21 May 2014 05:34:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4L5YW7x009459; Wed, 21 May 2014 05:34:32 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4L5YI3b009377; Wed, 21 May 2014 05:34:18 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405210534.s4L5YI3b009377@svn.freebsd.org> From: Rene Ladan Date: Wed, 21 May 2014 05:34:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354706 - in branches/2014Q2/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 05:34:32 -0000 Author: rene Date: Wed May 21 05:34:18 2014 New Revision: 354706 URL: http://svnweb.freebsd.org/changeset/ports/354706 QAT: https://qat.redports.org/buildarchive/r354706/ Log: MFH: r354687 Update to 35.0.1916.114 Changes include: - More developer control over touch input - New JavaScript features - Unprefixed Shadow DOM - A number of new apps/extension APIs - Lots of under the hood changes for stability and performance Security: http://vuxml.org/freebsd/64f3872b-e05d-11e3-9dd4-00262d5ed8ee.html Approved by: portmgr (erwin) Added: branches/2014Q2/www/chromium/files/patch-chrome__app__chromium_strings.grd - copied unchanged from r354687, head/www/chromium/files/patch-chrome__app__chromium_strings.grd branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc - copied unchanged from r354687, head/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc - copied unchanged from r354687, head/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h - copied unchanged from r354687, head/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h - copied unchanged from r354687, head/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h branches/2014Q2/www/chromium/files/patch-chrome__chrome_tests.gypi - copied unchanged from r354687, head/www/chromium/files/patch-chrome__chrome_tests.gypi branches/2014Q2/www/chromium/files/patch-chrome__chrome_tests_unit.gypi - copied unchanged from r354687, head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi branches/2014Q2/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc - copied unchanged from r354687, head/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc Deleted: branches/2014Q2/www/chromium/files/patch-base__file_util_posix.cc branches/2014Q2/www/chromium/files/patch-base__process__process_handle_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__process__process_iterator.h branches/2014Q2/www/chromium/files/patch-build__gyp_chromium branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc branches/2014Q2/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp Modified: branches/2014Q2/www/chromium/Makefile branches/2014Q2/www/chromium/Makefile.tests branches/2014Q2/www/chromium/distinfo branches/2014Q2/www/chromium/files/patch-base__base.gyp branches/2014Q2/www/chromium/files/patch-base__base.gypi branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc branches/2014Q2/www/chromium/files/patch-build__common.gypi branches/2014Q2/www/chromium/files/patch-cc__layers__layer.cc branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__memory_details.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__net__connection_tester.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h branches/2014Q2/www/chromium/files/patch-chrome__browser__usb__usb_context.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.h branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_paths.cc branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_switches.cc branches/2014Q2/www/chromium/files/patch-chrome__common__chrome_switches.h branches/2014Q2/www/chromium/files/patch-chrome__common__pref_names.cc branches/2014Q2/www/chromium/files/patch-chrome__common__pref_names.h branches/2014Q2/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc branches/2014Q2/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h branches/2014Q2/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc branches/2014Q2/www/chromium/files/patch-chrome__test__base__testing_browser_process.h branches/2014Q2/www/chromium/files/patch-chrome__test__perf__perf_test.cc branches/2014Q2/www/chromium/files/patch-chrome__test__ui__ui_test.cc branches/2014Q2/www/chromium/files/patch-chrome__tools__build__linux__sed.sh branches/2014Q2/www/chromium/files/patch-components__policy__resources__policy_templates.json branches/2014Q2/www/chromium/files/patch-components__policy__tools__generate_policy_source.py branches/2014Q2/www/chromium/files/patch-components__storage_monitor.gypi branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2014Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h branches/2014Q2/www/chromium/files/patch-content__app__content_main_runner.cc branches/2014Q2/www/chromium/files/patch-content__browser__browser_main_loop.cc branches/2014Q2/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2014Q2/www/chromium/files/patch-content__browser__download__base_file.cc branches/2014Q2/www/chromium/files/patch-content__browser__download__base_file_linux.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc branches/2014Q2/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h branches/2014Q2/www/chromium/files/patch-content__common__set_process_title_linux.cc branches/2014Q2/www/chromium/files/patch-content__common__set_process_title_linux.h branches/2014Q2/www/chromium/files/patch-content__content_browser.gypi branches/2014Q2/www/chromium/files/patch-content__content_common.gypi branches/2014Q2/www/chromium/files/patch-content__content_tests.gypi branches/2014Q2/www/chromium/files/patch-content__plugin__plugin_main_linux.cc branches/2014Q2/www/chromium/files/patch-content__public__test__browser_test_base.cc branches/2014Q2/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc branches/2014Q2/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc branches/2014Q2/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc branches/2014Q2/www/chromium/files/patch-content__renderer__render_process_impl.cc branches/2014Q2/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc branches/2014Q2/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2014Q2/www/chromium/files/patch-crypto__nss_util.cc branches/2014Q2/www/chromium/files/patch-device__hid__hid.gyp branches/2014Q2/www/chromium/files/patch-device__serial__serial.gyp branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_control_list.cc branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc branches/2014Q2/www/chromium/files/patch-gpu__config__gpu_test_config.cc branches/2014Q2/www/chromium/files/patch-gpu__gpu_config.gypi branches/2014Q2/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc branches/2014Q2/www/chromium/files/patch-media__base__audio_splicer.cc branches/2014Q2/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc branches/2014Q2/www/chromium/files/patch-media__media.gyp branches/2014Q2/www/chromium/files/patch-native_client__build__common.gypi branches/2014Q2/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp branches/2014Q2/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp branches/2014Q2/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp branches/2014Q2/www/chromium/files/patch-net__base__dns_reloader.cc branches/2014Q2/www/chromium/files/patch-net__base__mime_util_unittest.cc branches/2014Q2/www/chromium/files/patch-net__base__net_util.h branches/2014Q2/www/chromium/files/patch-net__base__network_change_notifier.cc branches/2014Q2/www/chromium/files/patch-net__dns__address_sorter_posix.cc branches/2014Q2/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc branches/2014Q2/www/chromium/files/patch-net__dns__dns_session.cc branches/2014Q2/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc branches/2014Q2/www/chromium/files/patch-net__net.gyp branches/2014Q2/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2014Q2/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2014Q2/www/chromium/files/patch-net__socket__socks5_client_socket.cc branches/2014Q2/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h branches/2014Q2/www/chromium/files/patch-net__udp__udp_socket_unittest.cc branches/2014Q2/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc branches/2014Q2/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc branches/2014Q2/www/chromium/files/patch-printing__printing.gyp branches/2014Q2/www/chromium/files/patch-skia__skia_common.gypi branches/2014Q2/www/chromium/files/patch-sync__util__get_session_name.cc branches/2014Q2/www/chromium/files/patch-sync__util__get_session_name_linux.cc branches/2014Q2/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h branches/2014Q2/www/chromium/files/patch-testing__gtest__src__gtest.cc branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__config.h branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h branches/2014Q2/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp branches/2014Q2/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c branches/2014Q2/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp branches/2014Q2/www/chromium/files/patch-third_party__libjingle__libjingle.gyp branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h branches/2014Q2/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc branches/2014Q2/www/chromium/files/patch-third_party__libusb__libusb.gyp branches/2014Q2/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh branches/2014Q2/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h branches/2014Q2/www/chromium/files/patch-third_party__webrtc__build__common.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h branches/2014Q2/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py branches/2014Q2/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp branches/2014Q2/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp branches/2014Q2/www/chromium/files/patch-ui__events__event_switches.cc branches/2014Q2/www/chromium/files/patch-ui__events__event_switches.h branches/2014Q2/www/chromium/files/patch-ui__gl__gl.gyp branches/2014Q2/www/chromium/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/chromium/Makefile ============================================================================== --- branches/2014Q2/www/chromium/Makefile Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/Makefile Wed May 21 05:34:18 2014 (r354706) @@ -4,7 +4,7 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -PORTVERSION= 34.0.1847.137 +PORTVERSION= 35.0.1916.114 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -172,7 +172,7 @@ pre-everything:: .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." .else - @${ECHO_MSG} "and a fair amount of free diskspace (~ 2.4GB)." + @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} Modified: branches/2014Q2/www/chromium/Makefile.tests ============================================================================== --- branches/2014Q2/www/chromium/Makefile.tests Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/Makefile.tests Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ #$FreeBSD$ - +#telemetry_unittests : unknown ninja target TEST_TARGETS= base_unittests \ crypto_unittests \ cacheinvalidation_unittests \ @@ -15,9 +15,8 @@ TEST_TARGETS= base_unittests \ ipc_tests \ dbus_unittests \ net_unittests \ - media_unittests -# browser_tests: missing test file? -# unit_tests: missing test file? -# chromedriver_unittests: does not build -# chromedriver_tests: does not build -# telemetry_unittests: unknown ninja target + media_unittests \ + chromedriver_unittests \ + chromedriver_tests \ + browser_tests \ + unit_tests Modified: branches/2014Q2/www/chromium/distinfo ============================================================================== --- branches/2014Q2/www/chromium/distinfo Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/distinfo Wed May 21 05:34:18 2014 (r354706) @@ -1,4 +1,4 @@ -SHA256 (chromium-34.0.1847.137.tar.xz) = 938bf0e673101bb1aeec4c3e2e75df372cebe3d2ee93e9f4669d64ce92656027 -SIZE (chromium-34.0.1847.137.tar.xz) = 190173736 -SHA256 (chromium-34.0.1847.137-testdata.tar.xz) = 386899a35d55e490d9119955f87eb2fa0249258ffb56f2892b0ad63ad1683d85 -SIZE (chromium-34.0.1847.137-testdata.tar.xz) = 108472204 +SHA256 (chromium-35.0.1916.114.tar.xz) = 566fcdc05d53c551d142ac9742ef69ba7c6d5a450d8ec41c0efd4fc8249f77af +SIZE (chromium-35.0.1916.114.tar.xz) = 206243256 +SHA256 (chromium-35.0.1916.114-testdata.tar.xz) = 122977c93e1d211abfe92af2ccad359af83de277e89c89d1259928f0b1a04ea1 +SIZE (chromium-35.0.1916.114-testdata.tar.xz) = 109106164 Modified: branches/2014Q2/www/chromium/files/patch-base__base.gyp ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__base.gyp Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__base.gyp Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./base/base.gyp.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/base.gyp 2014-04-24 23:23:41.000000000 +0200 -@@ -820,6 +820,11 @@ +--- ./base/base.gyp.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/base.gyp 2014-05-04 14:38:46.000000000 +0200 +@@ -803,6 +803,11 @@ ['include', '^debug/proc_maps_linux_unittest\\.cc$'], ], }], Modified: branches/2014Q2/www/chromium/files/patch-base__base.gypi ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__base.gypi Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__base.gypi Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./base/base.gypi.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/base.gypi 2014-04-24 23:23:41.000000000 +0200 -@@ -918,11 +918,15 @@ +--- ./base/base.gypi.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/base.gypi 2014-05-04 14:38:46.000000000 +0200 +@@ -915,11 +915,15 @@ 'process/memory_stubs.cc', ], 'sources/': [ Modified: branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__debug__stack_trace_posix.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,11 +1,21 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -471,7 +471,7 @@ +--- ./base/debug/stack_trace_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-05-04 15:46:56.000000000 +0200 +@@ -586,6 +586,10 @@ + // for the modules that are loaded in the current process. + // Returns true on success. + bool CacheMemoryRegions() { ++#if defined(OS_FREEBSD) ++ // TODO (rene) avoid link error, implement something? ++ return false; ++#else + // Reads /proc/self/maps. + std::string contents; + if (!ReadProcMaps(&contents)) { +@@ -601,6 +605,7 @@ - // Though the backtrace API man page does not list any possible negative - // return values, we take no chance. -- count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); -+ count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); - } + is_initialized_ = true; + return true; ++#endif + } - void StackTrace::Print() const { + // Opens all object files and caches their file descriptors. Modified: branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-04-30 22:41:41.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-05-04 14:38:46.000000000 +0200 @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. Modified: branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__process__internal_linux.h Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/process/internal_linux.h.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-04-24 23:23:41.000000000 +0200 +--- ./base/process/internal_linux.h.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-05-04 14:38:46.000000000 +0200 @@ -12,6 +12,8 @@ #include "base/files/file_path.h" Modified: branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__process__memory_unittest.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/process/memory_unittest.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/process/memory_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-05-04 16:09:01.000000000 +0200 @@ -151,12 +151,12 @@ // Android doesn't implement set_new_handler, so we can't use the @@ -15,9 +15,9 @@ !defined(OS_WIN) && \ !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) -@@ -372,5 +372,5 @@ - #endif // !ARCH_CPU_64_BITS - #endif // OS_MACOSX +@@ -427,5 +427,5 @@ + EXPECT_TRUE(value_ == NULL); + } -#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && +#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,8 +1,8 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -6,6 +6,10 @@ - +--- ./base/process/process_iterator_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -8,6 +8,10 @@ #include + #include +/* getuid() */ +#include Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_metrics.h Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics.h.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-04-24 23:23:41.000000000 +0200 +--- ./base/process/process_metrics.h.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-05-04 14:38:46.000000000 +0200 @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" Modified: branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,11 +1,9 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -4,6 +4,10 @@ +--- ./base/process/process_metrics_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -10,6 +10,8 @@ - #include "base/process/process_metrics.h" + #include "base/sys_info.h" -+#include "base/sys_info.h" -+ +#include /* getpagesize() */ + namespace base { Modified: branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__security_unittest.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/security_unittest.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/security_unittest.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/security_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/security_unittest.cc 2014-05-04 14:38:46.000000000 +0200 @@ -159,7 +159,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { Modified: branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/strings/safe_sprintf.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-05-04 14:38:46.000000000 +0200 @@ -107,11 +107,11 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte Modified: branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__sys_info_freebsd.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/sys_info_freebsd.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-05-04 14:38:46.000000000 +0200 @@ -4,6 +4,7 @@ #include "base/sys_info.h" Modified: branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__sys_info_posix.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/sys_info_posix.cc.orig 2014-04-24 22:36:11.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/sys_info_posix.cc.orig 2014-04-30 22:41:43.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-05-04 14:38:46.000000000 +0200 @@ -49,7 +49,7 @@ namespace base { Modified: branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__test__expectations__expectation.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/test/expectations/expectation.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/test/expectations/expectation.cc.orig 2014-04-30 22:41:42.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-05-04 14:38:46.000000000 +0200 @@ -59,6 +59,7 @@ variant != "64") { return false; Modified: branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__test__launcher__test_launcher.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./base/test/launcher/test_launcher.cc.orig 2014-04-24 22:36:09.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-04-24 23:23:41.000000000 +0200 -@@ -39,6 +39,10 @@ +--- ./base/test/launcher/test_launcher.cc.orig 2014-04-30 22:41:42.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -40,6 +40,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif Modified: branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-base__threading__platform_thread_linux.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./base/threading/platform_thread_linux.cc.orig 2014-04-24 22:36:10.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-04-24 23:23:41.000000000 +0200 +--- ./base/threading/platform_thread_linux.cc.orig 2014-04-30 22:41:42.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-05-04 14:38:46.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" Modified: branches/2014Q2/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2014Q2/www/chromium/files/patch-build__common.gypi Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-build__common.gypi Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./build/common.gypi.orig 2014-04-24 22:36:09.000000000 +0200 -+++ ./build/common.gypi 2014-04-24 23:23:42.000000000 +0200 -@@ -565,7 +565,7 @@ +--- ./build/common.gypi.orig 2014-04-30 22:43:21.000000000 +0200 ++++ ./build/common.gypi 2014-05-04 14:43:03.000000000 +0200 +@@ -615,7 +615,7 @@ }], # DBus usage. @@ -9,27 +9,26 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -1002,6 +1002,10 @@ +@@ -878,7 +878,7 @@ + # By default, use ICU data file (icudtl.dat) on all platforms + # except when building Android WebView. + # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). +- ['android_webview_build==0', { ++ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', { + 'icu_use_data_file_flag%' : 1, + }, { + 'icu_use_data_file_flag%' : 0, +@@ -1076,6 +1076,9 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, + 'os_ver%': 0, -+ 'prefix_dir%': '/usr', + 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -1322,7 +1326,7 @@ - # TODO(jungshik): Turn this on on Android. - # For ChromeOS, this should be turned on in chromeos-chrome.ebuild - # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES. -- ['OS!="android"', { -+ ['OS!="android" and os_bsd!=1', { - 'icu_use_data_file_flag%': 1, - }], - ], -@@ -3701,6 +3705,13 @@ +@@ -3894,6 +3897,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Modified: branches/2014Q2/www/chromium/files/patch-cc__layers__layer.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-cc__layers__layer.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-cc__layers__layer.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./cc/layers/layer.cc.orig 2014-04-24 22:35:51.000000000 +0200 -+++ ./cc/layers/layer.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -726,13 +726,15 @@ +--- ./cc/layers/layer.cc.orig 2014-04-30 22:41:25.000000000 +0200 ++++ ./cc/layers/layer.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -720,13 +720,15 @@ DCHECK(current_layer); DCHECK(current_layer->id() == scroll_clip_layer_id_); Modified: branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-cc__layers__layer_impl.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./cc/layers/layer_impl.cc.orig 2014-04-24 22:35:51.000000000 +0200 -+++ ./cc/layers/layer_impl.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -1222,21 +1222,23 @@ +--- ./cc/layers/layer_impl.cc.orig 2014-04-30 22:41:25.000000000 +0200 ++++ ./cc/layers/layer_impl.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -1190,21 +1190,23 @@ scaled_scroll_bounds.SetSize(scale_factor * scaled_scroll_bounds.width(), scale_factor * scaled_scroll_bounds.height()); Modified: branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/app/chrome_main_delegate.cc.orig 2014-04-24 22:34:55.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/app/chrome_main_delegate.cc.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.cc 2014-05-04 14:38:46.000000000 +0200 @@ -95,7 +95,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -629,7 +629,7 @@ +@@ -630,7 +630,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +54,7 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -747,7 +747,7 @@ +@@ -748,7 +748,7 @@ #endif } @@ -63,7 +63,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -759,7 +759,7 @@ +@@ -760,7 +760,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +72,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -844,7 +844,7 @@ +@@ -845,7 +845,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } Modified: branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-04-24 22:34:55.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-04-24 23:23:42.000000000 +0200 -@@ -31,7 +31,7 @@ +--- ./chrome/app/chrome_main_delegate.h.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-05-04 14:38:46.000000000 +0200 +@@ -35,7 +35,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( const std::string& process_type) OVERRIDE; Copied: branches/2014Q2/www/chromium/files/patch-chrome__app__chromium_strings.grd (from r354687, head/www/chromium/files/patch-chrome__app__chromium_strings.grd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__app__chromium_strings.grd Wed May 21 05:34:18 2014 (r354706, copy of r354687, head/www/chromium/files/patch-chrome__app__chromium_strings.grd) @@ -0,0 +1,11 @@ +--- ./chrome/app/chromium_strings.grd.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/app/chromium_strings.grd 2014-05-05 13:13:16.000000000 +0200 +@@ -1115,7 +1115,7 @@ + + + +- ++ + + The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. + Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__about_flags.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/about_flags.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -2320,7 +2320,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -2153,7 +2153,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/browser_process_impl.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/browser_process_impl.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -261,7 +261,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -256,7 +256,7 @@ ExtensionRendererState::GetInstance()->Shutdown(); Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -973,7 +973,7 @@ +--- ./chrome/browser/chrome_browser_main.cc.orig 2014-04-30 22:42:18.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -972,7 +972,7 @@ } #endif Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main_posix.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-04-30 22:42:18.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main_posix.cc 2014-05-04 14:38:46.000000000 +0200 @@ -314,6 +314,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -493,7 +493,7 @@ +--- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-04-30 22:42:18.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -501,7 +501,7 @@ } } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -549,7 +549,7 @@ +@@ -557,7 +557,7 @@ return -1; } @@ -18,7 +18,7 @@ #endif // !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) -@@ -1449,7 +1449,7 @@ +@@ -1460,7 +1460,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,8 +27,8 @@ if (breakpad::IsCrashReporterEnabled()) { std::string enable_crash_reporter; GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2587,7 +2587,7 @@ - } +@@ -2610,7 +2610,7 @@ + #endif } -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -36,7 +36,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2642,7 +2642,7 @@ +@@ -2664,7 +2664,7 @@ } #endif // defined(OS_ANDROID) } Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed May 21 05:34:18 2014 (r354706) @@ -1,11 +1,11 @@ ---- ./chrome/browser/chrome_content_browser_client.h.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.h 2014-04-24 23:23:42.000000000 +0200 -@@ -255,7 +255,7 @@ +--- ./chrome/browser/chrome_content_browser_client.h.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.h 2014-05-04 14:38:46.000000000 +0200 +@@ -267,7 +267,7 @@ const base::FilePath& storage_partition_path, ScopedVector* additional_backends) OVERRIDE; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) virtual void GetAdditionalMappedFilesForChildProcess( - const CommandLine& command_line, + const base::CommandLine& command_line, int child_process_id, Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-04-30 22:42:03.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-05-04 14:38:46.000000000 +0200 @@ -268,7 +268,7 @@ console_->SetColor(color); console_->Write(base::ASCIIToUTF16(result)); Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-04-30 22:42:03.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-05-04 14:38:46.000000000 +0200 @@ -18,7 +18,7 @@ public: // The type of formatting done by this writer. Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-04-24 22:35:08.000000000 +0200 -+++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -166,10 +166,12 @@ +--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-04-30 22:41:59.000000000 +0200 ++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -167,10 +167,12 @@ } bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() { Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-04-24 22:35:09.000000000 +0200 -+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-04-30 22:42:00.000000000 +0200 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-05-04 14:38:46.000000000 +0200 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-04-24 22:35:08.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -83,7 +83,7 @@ +--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-04-30 22:42:00.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -84,7 +84,7 @@ void SerialGetDevicesFunction::Work() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); @@ -9,7 +9,7 @@ device::SerialDeviceInfoList devices; scoped_ptr enumerator = device::SerialDeviceEnumerator::Create(); -@@ -105,6 +105,7 @@ +@@ -106,6 +106,7 @@ } results_ = serial::GetDevices::Results::Create(out_devices); Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-04-24 22:35:08.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-04-30 22:42:00.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-05-04 14:38:46.000000000 +0200 @@ -36,7 +36,7 @@ BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-04-24 22:35:12.000000000 +0200 -+++ ./chrome/browser/gpu/gl_string_manager.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/gpu/gl_string_manager.cc 2014-05-04 14:38:46.000000000 +0200 @@ -25,7 +25,7 @@ void GLStringManager::Initialize() { Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-04-24 22:35:12.000000000 +0200 -+++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-05-04 14:38:46.000000000 +0200 @@ -33,7 +33,7 @@ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-04-24 22:35:11.000000000 +0200 -+++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -155,6 +155,8 @@ +--- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-04-30 22:42:02.000000000 +0200 ++++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -196,6 +196,8 @@ const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-04-24 22:35:11.000000000 +0200 -+++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-04-30 22:42:13.000000000 +0200 ++++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-05-04 14:38:46.000000000 +0200 @@ -33,9 +33,11 @@ // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-04-24 22:35:11.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-04-24 23:23:42.000000000 +0200 -@@ -631,7 +631,10 @@ +--- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-04-30 22:42:13.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -635,7 +635,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl(this)) { Copied: branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc (from r354687, head/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc Wed May 21 05:34:18 2014 (r354706, copy of r354687, head/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc) @@ -0,0 +1,15 @@ +--- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-04-30 22:42:13.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-05-05 11:50:29.000000000 +0200 +@@ -50,10 +50,10 @@ + chrome::DIR_USER_APPLICATIONS, + chrome::DIR_USER_LIBRARY, + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::DIR_CACHE, + #endif +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + base::DIR_TEMP, + #endif + }; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__memory_details.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__memory_details.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__memory_details.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/memory_details.cc.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/browser/memory_details.cc 2014-04-24 23:23:42.000000000 +0200 +--- ./chrome/browser/memory_details.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/memory_details.cc 2014-05-04 14:38:46.000000000 +0200 @@ -32,7 +32,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__net__connection_tester.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__net__connection_tester.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__net__connection_tester.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/net/connection_tester.cc.orig 2014-04-24 22:35:02.000000000 +0200 -+++ ./chrome/browser/net/connection_tester.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -217,7 +217,7 @@ +--- ./chrome/browser/net/connection_tester.cc.orig 2014-04-30 22:41:58.000000000 +0200 ++++ ./chrome/browser/net/connection_tester.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -213,7 +213,7 @@ // Otherwise returns a network error code. int CreateSystemProxyConfigService( scoped_ptr* config_service) { Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-04-30 22:42:02.000000000 +0200 ++++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-05-04 14:38:46.000000000 +0200 @@ -29,6 +29,8 @@ "linux"; #elif defined(OS_OPENBSD) Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-04-30 22:42:06.000000000 +0200 ++++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-05-04 14:38:46.000000000 +0200 @@ -33,7 +33,7 @@ std::string filename; #if defined(OS_WIN) Copied: branches/2014Q2/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc (from r354687, head/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc Wed May 21 05:34:18 2014 (r354706, copy of r354687, head/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc) @@ -0,0 +1,11 @@ +--- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-04-30 22:41:58.000000000 +0200 ++++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-05-05 18:09:24.000000000 +0200 +@@ -162,6 +162,8 @@ + const std::string os("chromeos"); + #elif defined(OS_LINUX) + const std::string os("linux"); ++#elif defined(OS_FREEBSD) ++ const std::string os("freebsd"); + #else + #error "Unknown platform" + #endif Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig 2014-04-24 22:34:59.000000000 +0200 -+++ ./chrome/browser/ui/gtk/accelerators_gtk.h 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 ++++ ./chrome/browser/ui/gtk/accelerators_gtk.h 2014-05-04 14:38:46.000000000 +0200 @@ -10,6 +10,8 @@ #include "base/containers/hash_tables.h" #include "ui/base/accelerators/accelerator.h" Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/ui/gtk/first_run_dialog.cc.orig 2014-04-24 22:34:59.000000000 +0200 -+++ ./chrome/browser/ui/gtk/first_run_dialog.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/ui/gtk/first_run_dialog.cc.orig 2014-04-30 22:42:07.000000000 +0200 ++++ ./chrome/browser/ui/gtk/first_run_dialog.cc 2014-05-04 14:38:46.000000000 +0200 @@ -132,6 +132,7 @@ if (dialog_) gtk_widget_hide_all(dialog_); Copied: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h (from r354687, head/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h Wed May 21 05:34:18 2014 (r354706, copy of r354687, head/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h) @@ -0,0 +1,11 @@ +--- ./chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 ++++ ./chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h 2014-05-04 20:49:17.000000000 +0200 +@@ -92,7 +92,7 @@ + const gfx::Rect& initial_pos, + bool user_gesture, + bool* was_blocked) OVERRIDE; +- virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; ++ virtual void LoadingStateChanged(content::WebContents* source) /*OVERRIDE*/; + virtual content::JavaScriptDialogManager* + GetJavaScriptDialogManager() OVERRIDE; + virtual void RequestMediaAccessPermission( Copied: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h (from r354687, head/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h Wed May 21 05:34:18 2014 (r354706, copy of r354687, head/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h) @@ -0,0 +1,11 @@ +--- ./chrome/browser/ui/gtk/web_dialog_gtk.h.orig 2014-04-30 22:42:07.000000000 +0200 ++++ ./chrome/browser/ui/gtk/web_dialog_gtk.h 2014-05-04 20:50:58.000000000 +0200 +@@ -62,7 +62,7 @@ + const gfx::Rect& initial_pos, + bool user_gesture, + bool* was_blocked) OVERRIDE; +- virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; ++ virtual void LoadingStateChanged(content::WebContents* source) /*OVERRIDE*/; + + private: + CHROMEGTK_CALLBACK_1(WebDialogGtk, void, OnResponse, int); Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/about_ui.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -768,7 +768,7 @@ +--- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/about_ui.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -762,7 +762,7 @@ return data; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -784,6 +784,7 @@ +@@ -778,6 +778,7 @@ return data; } @@ -17,7 +17,7 @@ void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, bool good) { data->append(""); -@@ -850,6 +851,7 @@ +@@ -848,6 +849,7 @@ return data; } #endif @@ -25,7 +25,7 @@ // AboutMemoryHandler ---------------------------------------------------------- -@@ -1015,7 +1017,7 @@ +@@ -1013,7 +1015,7 @@ } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,11 +1,11 @@ ---- ./chrome/browser/ui/webui/certificate_viewer_webui.cc.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -229,7 +229,7 @@ +--- ./chrome/browser/ui/webui/certificate_viewer_webui.cc.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc 2014-05-04 20:57:59.000000000 +0200 +@@ -274,7 +274,7 @@ if (cert_index < 0) return; - NativeWebContentsModalDialog window = + _GtkWindow* window = - platform_util::GetTopLevel(dialog_->dialog()->GetNativeDialog()); + platform_util::GetTopLevel(dialog_->GetNativeWebContentsModalDialog()); ShowCertExportDialog(web_ui()->GetWebContents(), window, Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -466,7 +466,7 @@ +--- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -473,7 +473,7 @@ url.host() == chrome::kChromeUIMemoryRedirectHost || url.host() == chrome::kChromeUIStatsHost || url.host() == chrome::kChromeUITermsHost Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-04-24 23:23:43.000000000 +0200 -@@ -313,7 +313,8 @@ +--- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-05-04 14:38:46.000000000 +0200 +@@ -328,7 +328,8 @@ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, @@ -10,7 +10,7 @@ { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -620,7 +621,8 @@ +@@ -648,7 +649,8 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -20,7 +20,7 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1204,7 +1206,8 @@ +@@ -1298,7 +1300,8 @@ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_native_theme = false; @@ -30,7 +30,7 @@ bool profile_is_managed = profile->IsManaged(); is_native_theme = theme_service->UsingNativeTheme(); base::FundamentalValue native_theme_enabled(!is_native_theme && -@@ -1226,7 +1229,8 @@ +@@ -1320,7 +1323,8 @@ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-04-24 22:35:00.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-04-24 23:23:43.000000000 +0200 -@@ -168,7 +168,8 @@ +--- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-04-30 22:42:10.000000000 +0200 ++++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-05-04 14:38:46.000000000 +0200 +@@ -183,7 +183,8 @@ void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__usb__usb_context.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__usb__usb_context.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__usb__usb_context.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/usb/usb_context.cc.orig 2014-04-24 22:35:11.000000000 +0200 -+++ ./chrome/browser/usb/usb_context.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/usb/usb_context.cc.orig 2014-04-30 22:42:13.000000000 +0200 ++++ ./chrome/browser/usb/usb_context.cc 2014-05-04 14:38:46.000000000 +0200 @@ -43,7 +43,9 @@ running_ = false; // Spreading running_ to the UsbEventHandler thread. Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/web_applications/web_app.cc.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.cc 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/web_applications/web_app.cc.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/web_applications/web_app.cc 2014-05-04 14:38:46.000000000 +0200 @@ -226,7 +226,7 @@ } #endif Modified: branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.h ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.h Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__browser__web_applications__web_app.h Wed May 21 05:34:18 2014 (r354706) @@ -1,5 +1,5 @@ ---- ./chrome/browser/web_applications/web_app.h.orig 2014-04-24 22:35:10.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.h 2014-04-24 23:23:43.000000000 +0200 +--- ./chrome/browser/web_applications/web_app.h.orig 2014-04-30 22:42:17.000000000 +0200 ++++ ./chrome/browser/web_applications/web_app.h 2014-05-04 14:38:46.000000000 +0200 @@ -97,7 +97,7 @@ IconInfoList* icons); #endif Modified: branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser.gypi ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser.gypi Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser.gypi Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,17 @@ ---- ./chrome/chrome_browser.gypi.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/chrome_browser.gypi 2014-04-24 23:23:43.000000000 +0200 -@@ -2949,7 +2949,7 @@ +--- ./chrome/chrome_browser.gypi.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/chrome_browser.gypi 2014-05-05 20:38:00.000000000 +0200 +@@ -1209,8 +1209,8 @@ + 'browser/media_galleries/imported_media_gallery_registry.h', + 'browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc', + 'browser/media_galleries/linux/mtp_device_delegate_impl_linux.h', +- 'browser/media_galleries/linux/mtp_device_object_enumerator.cc', +- 'browser/media_galleries/linux/mtp_device_object_enumerator.h', ++ #'browser/media_galleries/linux/mtp_device_object_enumerator.cc', ++ #'browser/media_galleries/linux/mtp_device_object_enumerator.h', + 'browser/media_galleries/linux/mtp_device_task_helper.cc', + 'browser/media_galleries/linux/mtp_device_task_helper.h', + 'browser/media_galleries/linux/mtp_device_task_helper_map_service.cc', +@@ -3025,7 +3025,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], @@ -9,7 +20,7 @@ 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3077,7 +3077,7 @@ +@@ -3166,7 +3166,7 @@ '../build/linux/system.gyp:xscrnsaver', ], }], @@ -18,7 +29,7 @@ 'sources': [ 'app/chrome_breakpad_client.cc', 'app/chrome_breakpad_client.h', -@@ -3345,6 +3345,25 @@ +@@ -3434,6 +3434,25 @@ ['exclude', '^third_party/mozilla_security_manager/'], ], }], Modified: branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi ============================================================================== --- branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi Wed May 21 05:31:27 2014 (r354705) +++ branches/2014Q2/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi Wed May 21 05:34:18 2014 (r354706) @@ -1,6 +1,6 @@ ---- ./chrome/chrome_browser_extensions.gypi.orig 2014-04-24 22:35:13.000000000 +0200 -+++ ./chrome/chrome_browser_extensions.gypi 2014-04-24 23:23:43.000000000 +0200 -@@ -922,6 +922,11 @@ +--- ./chrome/chrome_browser_extensions.gypi.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/chrome_browser_extensions.gypi 2014-05-04 14:38:46.000000000 +0200 +@@ -885,6 +885,11 @@ 'browser/extensions/window_controller_list_observer.h', ], 'conditions': [ Copied: branches/2014Q2/www/chromium/files/patch-chrome__chrome_tests.gypi (from r354687, head/www/chromium/files/patch-chrome__chrome_tests.gypi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__chrome_tests.gypi Wed May 21 05:34:18 2014 (r354706, copy of r354687, head/www/chromium/files/patch-chrome__chrome_tests.gypi) @@ -0,0 +1,11 @@ +--- ./chrome/chrome_tests.gypi.orig 2014-04-30 22:42:53.000000000 +0200 ++++ ./chrome/chrome_tests.gypi 2014-05-05 18:29:40.000000000 +0200 +@@ -1628,7 +1628,7 @@ + 'test/remoting/remote_desktop_browsertest.h', + 'test/remoting/waiter.cc', + 'test/remoting/waiter.h', +- 'test/security_tests/sandbox_browsertest_linux.cc', ++ #'test/security_tests/sandbox_browsertest_linux.cc', + 'test/security_tests/sandbox_browsertest_win.cc', + # TODO(craig): Rename this and run from base_unittests when the test + # is safe to run there. See http://crbug.com/78722 for details. Copied: branches/2014Q2/www/chromium/files/patch-chrome__chrome_tests_unit.gypi (from r354687, head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-chrome__chrome_tests_unit.gypi Wed May 21 05:34:18 2014 (r354706, copy of r354687, head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi) @@ -0,0 +1,36 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Wed May 21 06:59:49 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2BB1DF2B; Wed, 21 May 2014 06:59:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1911D224B; Wed, 21 May 2014 06:59:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4L6xm6l044446; Wed, 21 May 2014 06:59:48 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4L6xmKH044445; Wed, 21 May 2014 06:59:48 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405210659.s4L6xmKH044445@svn.freebsd.org> From: Koop Mast Date: Wed, 21 May 2014 06:59:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354714 - branches/2014Q2/textproc/libxml2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 06:59:49 -0000 Author: kwm Date: Wed May 21 06:59:48 2014 New Revision: 354714 URL: http://svnweb.freebsd.org/changeset/ports/354714 QAT: https://qat.redports.org/buildarchive/r354714/ Log: Allow USE_GNOME to be added to. So the libxml2 dependancy in py-libxml2 is recorded. This fix was supposed to be in the libxml2 merge but somehow got lost. Submitted by: David Demelier (via IRC) Approved by: portmgr (antoine@) Modified: branches/2014Q2/textproc/libxml2/Makefile Modified: branches/2014Q2/textproc/libxml2/Makefile ============================================================================== --- branches/2014Q2/textproc/libxml2/Makefile Wed May 21 06:56:47 2014 (r354713) +++ branches/2014Q2/textproc/libxml2/Makefile Wed May 21 06:59:48 2014 (r354714) @@ -18,7 +18,7 @@ COMMENT?= XML parser library for GNOME GNU_CONFIGURE= yes USES= gmake iconv pathfix pkgconfig shebangfix -USE_GNOME= ltverhack:5 +USE_GNOME+= ltverhack:5 USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ From owner-svn-ports-branches@FreeBSD.ORG Wed May 21 08:26:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03C59C28; Wed, 21 May 2014 08:26:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E52DA2C95; Wed, 21 May 2014 08:26:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4L8Qh3s084482; Wed, 21 May 2014 08:26:43 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4L8QhDh084481; Wed, 21 May 2014 08:26:43 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405210826.s4L8QhDh084481@svn.freebsd.org> From: Antoine Brodin Date: Wed, 21 May 2014 08:26:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354733 - branches/2014Q2/security/sssd X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 08:26:44 -0000 Author: antoine Date: Wed May 21 08:26:43 2014 New Revision: 354733 URL: http://svnweb.freebsd.org/changeset/ports/354733 QAT: https://qat.redports.org/buildarchive/r354733/ Log: MFH: r354691 xmllint from new libxml2 seems to be stricter than it used to be Disable it so that man pages can be generated Submitted by: maintainer Approved by: portmgr (self) Modified: branches/2014Q2/security/sssd/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/sssd/Makefile ============================================================================== --- branches/2014Q2/security/sssd/Makefile Wed May 21 08:15:16 2014 (r354732) +++ branches/2014Q2/security/sssd/Makefile Wed May 21 08:26:43 2014 (r354733) @@ -44,6 +44,7 @@ CONFIGURE_ARGS= --with-selinux=no --with --with-db-path=/var/db/sss --with-pipe-path=/var/run/sss \ --with-pubconf-path=/var/run/sss --with-mcache-path=/var/db/sss_mc \ --with-unicode-lib=libunistring --with-autofs=no +CONFIGURE_ENV= XMLLINT="/bin/echo" CFLAGS+= -fstack-protector-all PLIST_SUB= PYTHON_VER=${PYTHON_VER} #DEBUG_FLAGS= -g From owner-svn-ports-branches@FreeBSD.ORG Wed May 21 10:17:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D176E5B4; Wed, 21 May 2014 10:17:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A46EF2825; Wed, 21 May 2014 10:17:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LAHtuc032120; Wed, 21 May 2014 10:17:55 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4LAHtGl032117; Wed, 21 May 2014 10:17:55 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405211017.s4LAHtGl032117@svn.freebsd.org> From: Antoine Brodin Date: Wed, 21 May 2014 10:17:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354738 - in branches/2014Q2: audio/mangler games/minecraft-client games/minecraft-server X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 10:17:55 -0000 Author: antoine Date: Wed May 21 10:17:54 2014 New Revision: 354738 URL: http://svnweb.freebsd.org/changeset/ports/354738 QAT: https://qat.redports.org/buildarchive/r354738/ Log: MFH: r354737 Reset maintainer: : host hikarihq.com[107.170.140.194] said: 454 4.7.1 : Relay access denied (in reply to RCPT TO command) With hat: portmgr Approved by: portmgr (self) Modified: branches/2014Q2/audio/mangler/Makefile branches/2014Q2/games/minecraft-client/Makefile branches/2014Q2/games/minecraft-server/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/audio/mangler/Makefile ============================================================================== --- branches/2014Q2/audio/mangler/Makefile Wed May 21 10:16:36 2014 (r354737) +++ branches/2014Q2/audio/mangler/Makefile Wed May 21 10:17:54 2014 (r354738) @@ -6,7 +6,7 @@ PORTVERSION= 1.2.5 CATEGORIES= audio MASTER_SITES= http://www.mangler.org/downloads/ -MAINTAINER= janik@hikarihq.com +MAINTAINER= ports@FreeBSD.org COMMENT= A Ventrilo VOIP compatible client LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt \ Modified: branches/2014Q2/games/minecraft-client/Makefile ============================================================================== --- branches/2014Q2/games/minecraft-client/Makefile Wed May 21 10:16:36 2014 (r354737) +++ branches/2014Q2/games/minecraft-client/Makefile Wed May 21 10:17:54 2014 (r354738) @@ -11,7 +11,7 @@ DISTFILES= ${PORTVERSION}.jar:minecraft DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} EXTRACT_ONLY= -MAINTAINER= janik@hikarihq.com +MAINTAINER= ports@FreeBSD.org COMMENT= Client for the block building game OPTIONS_DEFINE= NATIVE_LIBS Modified: branches/2014Q2/games/minecraft-server/Makefile ============================================================================== --- branches/2014Q2/games/minecraft-server/Makefile Wed May 21 10:16:36 2014 (r354737) +++ branches/2014Q2/games/minecraft-server/Makefile Wed May 21 10:17:54 2014 (r354738) @@ -12,7 +12,7 @@ DISTFILES= minecraft_server.jar \ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} EXTRACT_ONLY= #empty -MAINTAINER= janik@hikarihq.com +MAINTAINER= ports@FreeBSD.org COMMENT= Server for the block building game RUN_DEPENDS= tmux:${PORTSDIR}/sysutils/tmux From owner-svn-ports-branches@FreeBSD.ORG Wed May 21 12:18:19 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6AA0B6; Wed, 21 May 2014 12:18:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C26BE21BD; Wed, 21 May 2014 12:18:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LCIJKD083720; Wed, 21 May 2014 12:18:19 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4LCIJcA083717; Wed, 21 May 2014 12:18:19 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405211218.s4LCIJcA083717@svn.freebsd.org> From: Antoine Brodin Date: Wed, 21 May 2014 12:18:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354748 - branches/2014Q2/devel/elfkickers X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 12:18:20 -0000 Author: antoine Date: Wed May 21 12:18:18 2014 New Revision: 354748 URL: http://svnweb.freebsd.org/changeset/ports/354748 QAT: https://qat.redports.org/buildarchive/r354748/ Log: MFH: r354742 - Support STAGEDIR - Fix build with clang [1] Reported by: pkg-fallout [1] Approved by: portmgr (self) Added: branches/2014Q2/devel/elfkickers/pkg-plist - copied unchanged from r354742, head/devel/elfkickers/pkg-plist Modified: branches/2014Q2/devel/elfkickers/Makefile branches/2014Q2/devel/elfkickers/pkg-descr Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/elfkickers/Makefile ============================================================================== --- branches/2014Q2/devel/elfkickers/Makefile Wed May 21 12:14:51 2014 (r354747) +++ branches/2014Q2/devel/elfkickers/Makefile Wed May 21 12:18:18 2014 (r354748) @@ -3,7 +3,7 @@ PORTNAME= elfkickers PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel sysutils MASTER_SITES= http://www.muppetlabs.com/~breadbox/pub/software/ DISTNAME= ELFkickers-${PORTVERSION} @@ -12,42 +12,30 @@ MAINTAINER= sbz@FreeBSD.org COMMENT= Collection of programs to manipulate ELF files LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING -USE_GMAKE= yes - -PLIST_FILES= bin/ebfc \ - bin/elfls \ - bin/elftoc \ - bin/infect \ - bin/objres \ - bin/rebind \ - bin/sstrip +USES= gmake +ELFBINS= ebfc elfls elftoc infect objres rebind sstrip PORTDOCS= COPYING Changelog README -MAN1= ebfc.1 elfls.1 elftoc.1 infect.1 objres.1 rebind.1 sstrip.1 - -NO_STAGE= yes post-patch: @${GREP} -lR "\/elf.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's,linux/,,g' -e 's,asm/,,g' + @${GREP} -lR "gcc" ${WRKSRC}/*/Makefile | ${XARGS} \ + ${REINPLACE_CMD} -e 's,gcc,${CC},g' do-build: -.for f in ${PLIST_FILES:S,bin/,,} +.for f in ${ELFBINS} @(cd ${WRKSRC}/$f; ${GMAKE}) .endfor do-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif -.for f in ${PLIST_FILES:S,bin/,,} - ${INSTALL_SCRIPT} ${WRKSRC}/${f}/${f} ${PREFIX}/bin -.endfor -.for f in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/${f:S,.1,,}/${f} ${PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + +.for f in ${ELFBINS} + ${INSTALL_SCRIPT} ${WRKSRC}/${f}/${f} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${f}/${f:S,$,.1,} ${STAGEDIR}${PREFIX}/man/man1 .endfor .include Modified: branches/2014Q2/devel/elfkickers/pkg-descr ============================================================================== --- branches/2014Q2/devel/elfkickers/pkg-descr Wed May 21 12:14:51 2014 (r354747) +++ branches/2014Q2/devel/elfkickers/pkg-descr Wed May 21 12:18:18 2014 (r354748) @@ -5,4 +5,4 @@ The main purpose of these programs is to educational -- to help fellow programmers understand the ELF file format and something of how it works under the Linux platform. -WWW: http://www.muppetlabs.com/~breadbox/software/elfkickers.html +WWW: http://www.muppetlabs.com/~breadbox/software/elfkickers.html Copied: branches/2014Q2/devel/elfkickers/pkg-plist (from r354742, head/devel/elfkickers/pkg-plist) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/devel/elfkickers/pkg-plist Wed May 21 12:18:18 2014 (r354748, copy of r354742, head/devel/elfkickers/pkg-plist) @@ -0,0 +1,14 @@ +bin/ebfc +bin/elfls +bin/elftoc +bin/infect +bin/objres +bin/rebind +bin/sstrip +man/man1/ebfc.1.gz +man/man1/elfls.1.gz +man/man1/elftoc.1.gz +man/man1/infect.1.gz +man/man1/objres.1.gz +man/man1/rebind.1.gz +man/man1/sstrip.1.gz From owner-svn-ports-branches@FreeBSD.ORG Wed May 21 14:14:44 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 667543C6; Wed, 21 May 2014 14:14:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 531782B47; Wed, 21 May 2014 14:14:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LEEixQ034170; Wed, 21 May 2014 14:14:44 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4LEEhPx034168; Wed, 21 May 2014 14:14:43 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405211414.s4LEEhPx034168@svn.freebsd.org> From: Antoine Brodin Date: Wed, 21 May 2014 14:14:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354750 - branches/2014Q2/security/honggfuzz X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 14:14:44 -0000 Author: antoine Date: Wed May 21 14:14:43 2014 New Revision: 354750 URL: http://svnweb.freebsd.org/changeset/ports/354750 QAT: https://qat.redports.org/buildarchive/r354750/ Log: MFH: r354745 - Fix build with clang Reported by: pkg-fallout Approved by: portmgr (self) Modified: branches/2014Q2/security/honggfuzz/Makefile branches/2014Q2/security/honggfuzz/pkg-descr Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/honggfuzz/Makefile ============================================================================== --- branches/2014Q2/security/honggfuzz/Makefile Wed May 21 12:44:28 2014 (r354749) +++ branches/2014Q2/security/honggfuzz/Makefile Wed May 21 14:14:43 2014 (r354750) @@ -3,6 +3,7 @@ PORTNAME= honggfuzz PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} EXTRACT_SUFX= .tgz @@ -11,7 +12,6 @@ MAINTAINER= sbz@FreeBSD.org COMMENT= General-purpose fuzzer with simple, command-line interface LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/COPYING USE_GMAKE= yes @@ -19,6 +19,7 @@ USE_GMAKE= yes NO_STAGE= yes post-patch: @${REINPLACE_CMD} -i "" -E "s,\.\./,," ${WRKSRC}/examples/*.sh + ${REINPLACE_CMD} -i "" -E 's,gcc,${CC},' ${WRKSRC}/Makefile do-build: @(cd ${WRKSRC}; ${GMAKE}) Modified: branches/2014Q2/security/honggfuzz/pkg-descr ============================================================================== --- branches/2014Q2/security/honggfuzz/pkg-descr Wed May 21 12:44:28 2014 (r354749) +++ branches/2014Q2/security/honggfuzz/pkg-descr Wed May 21 14:14:43 2014 (r354750) @@ -2,4 +2,4 @@ Honggfuzz is a general-purpose fuzzing t files, Hongfuzz supplies and modifies input to a test program and utilize the ptrace() API/POSIX signal interface to detect and log crashes. -WWW: http://code.google.com/p/honggfuzz/ +WWW: http://code.google.com/p/honggfuzz/ From owner-svn-ports-branches@FreeBSD.ORG Thu May 22 18:24:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6AF4045C; Thu, 22 May 2014 18:24:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BAAD2D16; Thu, 22 May 2014 18:24:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4MIOa8K092364; Thu, 22 May 2014 18:24:36 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4MIOZuo092355; Thu, 22 May 2014 18:24:35 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405221824.s4MIOZuo092355@svn.freebsd.org> From: Koop Mast Date: Thu, 22 May 2014 18:24:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354880 - in branches/2014Q2: databases/evolution-data-server databases/evolution-data-server/files mail/evolution mail/evolution/files textproc/gdome2 textproc/gdome2/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2014 18:24:36 -0000 Author: kwm Date: Thu May 22 18:24:34 2014 New Revision: 354880 URL: http://svnweb.freebsd.org/changeset/ports/354880 QAT: https://qat.redports.org/buildarchive/r354880/ Log: MFH: r354374 Catch up with libxml2 api breakage in 2.9.x Approved by: portmgr (bapt) Added: branches/2014Q2/databases/evolution-data-server/files/patch-support-libxml2-2.9 - copied unchanged from r354374, head/databases/evolution-data-server/files/patch-support-libxml2-2.9 branches/2014Q2/mail/evolution/files/patch-support-libxml2-2.9 - copied unchanged from r354374, head/mail/evolution/files/patch-support-libxml2-2.9 branches/2014Q2/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c - copied unchanged from r354374, head/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c Modified: branches/2014Q2/databases/evolution-data-server/Makefile branches/2014Q2/mail/evolution/Makefile branches/2014Q2/textproc/gdome2/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/evolution-data-server/Makefile ============================================================================== --- branches/2014Q2/databases/evolution-data-server/Makefile Thu May 22 18:24:21 2014 (r354879) +++ branches/2014Q2/databases/evolution-data-server/Makefile Thu May 22 18:24:34 2014 (r354880) @@ -4,7 +4,7 @@ PORTNAME= evolution-data-server PORTVERSION= 2.32.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Copied: branches/2014Q2/databases/evolution-data-server/files/patch-support-libxml2-2.9 (from r354374, head/databases/evolution-data-server/files/patch-support-libxml2-2.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/databases/evolution-data-server/files/patch-support-libxml2-2.9 Thu May 22 18:24:34 2014 (r354880, copy of r354374, head/databases/evolution-data-server/files/patch-support-libxml2-2.9) @@ -0,0 +1,118 @@ +From 679b10d75730e81fa268e11cfda289a27fd3e306 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 13 Aug 2012 09:50:50 -0400 +Subject: Bug 681321 - Support both old and new-buf libxml2 APIs + +libxml2 changed the API for xmlOutputBuffer incompatibly. +See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html + +diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c +index 0219b34..f96907e 100644 +--- calendar/backends/caldav/e-cal-backend-caldav.c ++++ calendar/backends/caldav/e-cal-backend-caldav.c +@@ -1188,6 +1188,19 @@ caldav_authenticate (ECalBackendCalDAV *cbdav, + return success; + } + ++static gconstpointer ++compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, ++ gsize *out_len) ++{ ++#ifdef LIBXML2_NEW_BUFFER ++ *out_len = xmlOutputBufferGetSize (buf); ++ return xmlOutputBufferGetContent (buf); ++#else ++ *out_len = buf->buffer->use; ++ return buf->buffer->content; ++#endif ++} ++ + /* Returns whether calendar changed on the server. This works only when server + * supports 'getctag' extension. */ + static gboolean +@@ -1198,6 +1211,8 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) + xmlDocPtr doc; + xmlNodePtr root, node; + xmlNsPtr ns, nsdav; ++ gconstpointer buf_content; ++ gsize buf_size; + gboolean result = TRUE; + + g_return_val_if_fail (cbdav != NULL, TRUE); +@@ -1230,11 +1245,11 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) + soup_message_headers_append (message->request_headers, + "Depth", "0"); + ++ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); + soup_message_set_request (message, + "application/xml", + SOUP_MEMORY_COPY, +- (gchar *) buf->buffer->content, +- buf->buffer->use); ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); +@@ -1299,6 +1314,8 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, + xmlDocPtr doc; + xmlNsPtr nsdav; + xmlNsPtr nscd; ++ gconstpointer buf_content; ++ gsize buf_size; + gboolean result; + + /* Allocate the soup message */ +@@ -1378,11 +1395,11 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, + soup_message_headers_append (message->request_headers, + "Depth", "1"); + ++ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); + soup_message_set_request (message, + "application/xml", + SOUP_MEMORY_COPY, +- (gchar *) buf->buffer->content, +- buf->buffer->use); ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); +@@ -1795,6 +1812,8 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) + xmlDocPtr doc; + xmlNodePtr root, node; + xmlNsPtr nsdav; ++ gconstpointer buf_content; ++ gsize buf_size; + gchar *owner = NULL; + + g_return_val_if_fail (E_IS_CAL_BACKEND_CALDAV (cbdav), FALSE); +@@ -1820,11 +1839,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) + soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); + soup_message_headers_append (message->request_headers, "Depth", "0"); + ++ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); + soup_message_set_request (message, + "application/xml", + SOUP_MEMORY_COPY, +- (gchar *) buf->buffer->content, +- buf->buffer->use); ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); +@@ -1870,11 +1889,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) + soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); + soup_message_headers_append (message->request_headers, "Depth", "0"); + ++ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); + soup_message_set_request (message, +- "application/xml", +- SOUP_MEMORY_COPY, +- (gchar *) buf->buffer->content, +- buf->buffer->use); ++ "application/xml", ++ SOUP_MEMORY_COPY, ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); + Modified: branches/2014Q2/mail/evolution/Makefile ============================================================================== --- branches/2014Q2/mail/evolution/Makefile Thu May 22 18:24:21 2014 (r354879) +++ branches/2014Q2/mail/evolution/Makefile Thu May 22 18:24:34 2014 (r354880) @@ -4,7 +4,7 @@ PORTNAME= evolution PORTVERSION= 2.32.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Copied: branches/2014Q2/mail/evolution/files/patch-support-libxml2-2.9 (from r354374, head/mail/evolution/files/patch-support-libxml2-2.9) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/mail/evolution/files/patch-support-libxml2-2.9 Thu May 22 18:24:34 2014 (r354880, copy of r354374, head/mail/evolution/files/patch-support-libxml2-2.9) @@ -0,0 +1,43 @@ +--- plugins/caldav/caldav-browse-server.c.ori 2013-03-02 12:33:59.220751490 -0300 ++++ plugins/caldav/caldav-browse-server.c 2013-03-02 16:47:55.601296985 -0300 +@@ -63,6 +63,18 @@ + + typedef void (*process_message_cb) (GObject *dialog, const gchar *msg_path, guint status_code, const gchar *msg_body, gpointer user_data); + ++static gconstpointer ++compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, ++ gsize *out_len) ++{ ++#ifdef LIBXML2_NEW_BUFFER ++ *out_len = xmlOutputBufferGetSize (buf); ++ return xmlOutputBufferGetContent (buf); ++#else ++ *out_len = buf->buffer->use; ++ return buf->buffer->content; ++#endif ++} + static void send_xml_message (xmlDocPtr doc, gboolean depth_1, const gchar *url, GObject *dialog, process_message_cb cb, gpointer cb_user_data, const gchar *info); + + static gchar * +@@ -953,6 +965,8 @@ + SoupSession *session; + SoupMessage *message; + xmlOutputBufferPtr buf; ++ gconstpointer content; ++ gsize length; + guint poll_id; + struct poll_data *pd; + +@@ -977,9 +991,11 @@ + xmlNodeDumpOutput (buf, doc, xmlDocGetRootElement (doc), 0, 1, NULL); + xmlOutputBufferFlush (buf); + ++ content = compat_libxml_output_buffer_get_content (buf, &length); ++ + soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); + soup_message_headers_append (message->request_headers, "Depth", depth_1 ? "1" : "0"); +- soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, (const gchar *) buf->buffer->content, buf->buffer->use); ++ soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, content, length); + + /* Clean up the memory */ + xmlOutputBufferClose (buf); Modified: branches/2014Q2/textproc/gdome2/Makefile ============================================================================== --- branches/2014Q2/textproc/gdome2/Makefile Thu May 22 18:24:21 2014 (r354879) +++ branches/2014Q2/textproc/gdome2/Makefile Thu May 22 18:24:34 2014 (r354880) @@ -3,7 +3,7 @@ PORTNAME= gdome2 PORTVERSION= 0.8.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= http://gdome2.cs.unibo.it/tarball/ Copied: branches/2014Q2/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c (from r354374, head/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c Thu May 22 18:24:34 2014 (r354880, copy of r354374, head/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c) @@ -0,0 +1,20 @@ +Patch from Gentoo to fix libxml2 2.9 api change + +Patch by Harris Landgarten. + +The patch was submitted on bug 448236, following the announcement on +https://mail.gnome.org/archives/xml/2012-August/msg00005.html +--- libgdome/gdomecore/gdome-xml-documentt.c.orig 2003-07-13 06:47:54.000000000 -0400 ++++ libgdome/gdomecore/gdome-xml-documentt.c 2012-12-23 08:57:23.000000000 -0500 +@@ -342,7 +342,11 @@ + } + xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL); + xmlOutputBufferFlush(out_buff); ++#if LIBXML_VERSION < 20900 + ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use); ++#else ++ ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer)); ++#endif + (void)xmlOutputBufferClose(out_buff); + + return gdome_xml_str_mkref_own (ret); From owner-svn-ports-branches@FreeBSD.ORG Fri May 23 07:50:22 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF57E5DE; Fri, 23 May 2014 07:50:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 903572D7B; Fri, 23 May 2014 07:50:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4N7oM0w088974; Fri, 23 May 2014 07:50:22 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4N7oMZt088971; Fri, 23 May 2014 07:50:22 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405230750.s4N7oMZt088971@svn.freebsd.org> From: Rene Ladan Date: Fri, 23 May 2014 07:50:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r354915 - branches/2014Q2/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 May 2014 07:50:22 -0000 Author: rene Date: Fri May 23 07:50:21 2014 New Revision: 354915 URL: http://svnweb.freebsd.org/changeset/ports/354915 QAT: https://qat.redports.org/buildarchive/r354915/ Log: MFH: r354910 Fix build with GCC on i386 Submitted by: Lena (independently) Approved by: portmgr (erwin) Added: branches/2014Q2/www/chromium/files/patch-media__cast__rtcp__rtcp.cc - copied unchanged from r354910, head/www/chromium/files/patch-media__cast__rtcp__rtcp.cc branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc - copied unchanged from r354910, head/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc - copied unchanged from r354910, head/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc Modified: Directory Properties: branches/2014Q2/ (props changed) Copied: branches/2014Q2/www/chromium/files/patch-media__cast__rtcp__rtcp.cc (from r354910, head/www/chromium/files/patch-media__cast__rtcp__rtcp.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-media__cast__rtcp__rtcp.cc Fri May 23 07:50:21 2014 (r354915, copy of r354910, head/www/chromium/files/patch-media__cast__rtcp__rtcp.cc) @@ -0,0 +1,11 @@ +--- media/cast/rtcp/rtcp.cc.orig 2014-05-14 21:23:34.000000000 +0200 ++++ media/cast/rtcp/rtcp.cc 2014-05-22 09:51:16.000000000 +0200 +@@ -362,7 +362,7 @@ + int64 rtp_time_diff_ms = rtp_timestamp_diff / frequency_khz; + + // Sanity check. +- if (std::abs(rtp_time_diff_ms) > kMaxDiffSinceReceivedRtcpMs) ++ if (std::labs(rtp_time_diff_ms) > kMaxDiffSinceReceivedRtcpMs) + return false; + + *rtp_timestamp_in_ticks = ConvertNtpToTimeTicks(last_received_ntp_seconds_, Copied: branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc (from r354910, head/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc Fri May 23 07:50:21 2014 (r354915, copy of r354910, head/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc) @@ -0,0 +1,11 @@ +--- net/quic/congestion_control/rtt_stats.cc.orig 2014-05-14 21:22:13.000000000 +0200 ++++ net/quic/congestion_control/rtt_stats.cc 2014-05-21 23:32:04.000000000 +0200 +@@ -63,7 +63,7 @@ + } else { + mean_deviation_ = QuicTime::Delta::FromMicroseconds( + kOneMinusBeta * mean_deviation_.ToMicroseconds() + +- kBeta * std::abs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds())); ++ kBeta * std::labs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds())); + smoothed_rtt_ = smoothed_rtt_.Multiply(kOneMinusAlpha).Add( + rtt_sample.Multiply(kAlpha)); + DVLOG(1) << "Cubic; smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds() Copied: branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc (from r354910, head/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc Fri May 23 07:50:21 2014 (r354915, copy of r354910, head/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc) @@ -0,0 +1,17 @@ +--- third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-05-14 21:24:36.000000000 +0200 ++++ third_party/webrtc/modules/video_coding/main/source/receiver.cc 2014-05-21 23:46:49.000000000 +0200 +@@ -158,12 +158,12 @@ + // Assume that render timing errors are due to changes in the video stream. + if (next_render_time_ms < 0) { + timing_error = true; +- } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) { ++ } else if (std::labs(next_render_time_ms - now_ms) > max_video_delay_ms_) { + WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding, + VCMId(vcm_id_, receiver_id_), + "This frame is out of our delay bounds, resetting jitter " + "buffer: %d > %d", +- static_cast(std::abs(next_render_time_ms - now_ms)), ++ static_cast(std::labs(next_render_time_ms - now_ms)), + max_video_delay_ms_); + timing_error = true; + } else if (static_cast(timing_->TargetVideoDelay()) > From owner-svn-ports-branches@FreeBSD.ORG Sat May 24 17:37:05 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E7C9CD4; Sat, 24 May 2014 17:37:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 60C1E2DA6; Sat, 24 May 2014 17:37:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OHb5Re011896; Sat, 24 May 2014 17:37:05 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OHb5Ec011892; Sat, 24 May 2014 17:37:05 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405241737.s4OHb5Ec011892@svn.freebsd.org> From: Koop Mast Date: Sat, 24 May 2014 17:37:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355061 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 17:37:05 -0000 Author: kwm Date: Sat May 24 17:37:04 2014 New Revision: 355061 URL: http://svnweb.freebsd.org/changeset/ports/355061 QAT: https://qat.redports.org/buildarchive/r355061/ Log: MFH: r355040 Document a bunch of openjpeg vulnabilities. Approved by: portmgr (erwin@) Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Sat May 24 17:31:34 2014 (r355060) +++ branches/2014Q2/security/vuxml/vuln.xml Sat May 24 17:37:04 2014 (r355061) @@ -51,6 +51,48 @@ Note: Please add new entries to the beg --> + + openjpeg -- Multiple vulnabilities + + + openjpeg + 1.5.2 + + + + +

Openjpeg release notes report:

+
+

That CVE-2012-3535 and CVE-2012-3358 are fixed in the 1.5.1 + release.

+
+
+

That CVE-2013-4289, CVE-2013-4290, CVE-2013-1447, CVE-2013-6045, + CVE-2013-6052, CVE-2013-6054, CVE-2013-6053, CVE-2013-6887, + where fixed in the 1.5.2 release.

+
+ +
+ + CVE-2012-3358 + CVE-2012-3535 + CVE-2013-1447 + CVE-2013-4289 + CVE-2013-4290 + CVE-2013-6045 + CVE-2013-6052 + CVE-2013-6053 + CVE-2013-6054 + CVE-2013-6887 + http://openjpeg.googlecode.com/svn/tags/version.1.5.1/NEWS + http://openjpeg.googlecode.com/svn/tags/version.1.5.2/NEWS + + + 2012-05-13 + 2014-05-24 + +
+ chromium -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Sat May 24 17:40:04 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7077E92; Sat, 24 May 2014 17:40:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CFA82DC6; Sat, 24 May 2014 17:40:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OHe4LD012676; Sat, 24 May 2014 17:40:04 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OHe3ZA012666; Sat, 24 May 2014 17:40:03 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201405241740.s4OHe3ZA012666@svn.freebsd.org> From: Koop Mast Date: Sat, 24 May 2014 17:40:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355064 - in branches/2014Q2/graphics/openjpeg: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 17:40:04 -0000 Author: kwm Date: Sat May 24 17:40:03 2014 New Revision: 355064 URL: http://svnweb.freebsd.org/changeset/ports/355064 QAT: https://qat.redports.org/buildarchive/r355064/ Log: MFH: r355041 Update to 1.5.2. Fixes a number of vulnabilies. Security: 02db20d7-e34a-11e3-bd92-bcaec565249c Approved by: portmgr (miwi@) Deleted: branches/2014Q2/graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in branches/2014Q2/graphics/openjpeg/files/patch-libopenjpeg-CMakeLists.txt branches/2014Q2/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake branches/2014Q2/graphics/openjpeg/files/patch-opj_malloc.h Modified: branches/2014Q2/graphics/openjpeg/Makefile branches/2014Q2/graphics/openjpeg/distinfo branches/2014Q2/graphics/openjpeg/files/patch-CMakeLists.txt branches/2014Q2/graphics/openjpeg/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/openjpeg/Makefile ============================================================================== --- branches/2014Q2/graphics/openjpeg/Makefile Sat May 24 17:39:36 2014 (r355063) +++ branches/2014Q2/graphics/openjpeg/Makefile Sat May 24 17:40:03 2014 (r355064) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= openjpeg -PORTVERSION= 1.5.0 -PORTREVISION= 2 +PORTVERSION= 1.5.2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= SF/openjpeg.mirror/${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Open-source JPEG 2000 codec Modified: branches/2014Q2/graphics/openjpeg/distinfo ============================================================================== --- branches/2014Q2/graphics/openjpeg/distinfo Sat May 24 17:39:36 2014 (r355063) +++ branches/2014Q2/graphics/openjpeg/distinfo Sat May 24 17:40:03 2014 (r355064) @@ -1,2 +1,2 @@ -SHA256 (openjpeg-1.5.0.tar.gz) = c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace -SIZE (openjpeg-1.5.0.tar.gz) = 2117572 +SHA256 (openjpeg-1.5.2.tar.gz) = 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 +SIZE (openjpeg-1.5.2.tar.gz) = 1385702 Modified: branches/2014Q2/graphics/openjpeg/files/patch-CMakeLists.txt ============================================================================== --- branches/2014Q2/graphics/openjpeg/files/patch-CMakeLists.txt Sat May 24 17:39:36 2014 (r355063) +++ branches/2014Q2/graphics/openjpeg/files/patch-CMakeLists.txt Sat May 24 17:40:03 2014 (r355064) @@ -1,15 +1,15 @@ ---- CMakeLists.txt.orig 2012-02-07 11:49:55.000000000 +0100 -+++ CMakeLists.txt 2012-06-03 14:26:55.000000000 +0200 -@@ -36,7 +36,7 @@ - "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}") +--- CMakeLists.txt.orig 2014-03-27 11:58:08.000000000 +0100 ++++ CMakeLists.txt 2014-05-24 11:24:37.000000000 +0200 +@@ -54,7 +54,7 @@ + endif(NOT OPENJPEG_SOVERSION) SET(OPENJPEG_LIBRARY_PROPERTIES VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}" -- SOVERSION "${OPENJPEG_VERSION_MAJOR}" -+ SOVERSION "2" +- SOVERSION "${OPENJPEG_SOVERSION}" ++ SOVERSION 2 ) # -------------------------------------------------------------------------- -@@ -76,7 +76,7 @@ +@@ -94,7 +94,7 @@ # Install directories STRING(TOLOWER ${PROJECT_NAME} projectname) @@ -18,7 +18,12 @@ IF(NOT OPENJPEG_INSTALL_BIN_DIR) SET(OPENJPEG_INSTALL_BIN_DIR "bin") -@@ -99,7 +99,7 @@ +@@ -125,11 +125,11 @@ + ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR) + + IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) +- SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") ++ SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/") ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) IF(NOT OPENJPEG_INSTALL_MAN_DIR) @@ -27,16 +32,29 @@ ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR) IF(NOT OPENJPEG_INSTALL_DOC_DIR) -@@ -146,7 +146,7 @@ +@@ -148,7 +148,7 @@ + # We could install *.cmake files in share/ however those files contains + # hardcoded path to libraries on a multi-arch system (fedora/debian) those + # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) +- SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") ++ SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") + ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) + + #----------------------------------------------------------------------------- +@@ -188,10 +188,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY) INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION -- ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig ) +- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) + libdata/pkgconfig ) INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" - \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") -@@ -244,6 +241,7 @@ ENDIF(BUILD_TESTING) +- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")") ++ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/libopenjpeg.pc\")") + ENDIF(UNIX) + + #----------------------------------------------------------------------------- +@@ -288,6 +288,7 @@ #----------------------------------------------------------------------------- # install all targets referenced as OPENJPEGTargets INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) Modified: branches/2014Q2/graphics/openjpeg/pkg-plist ============================================================================== --- branches/2014Q2/graphics/openjpeg/pkg-plist Sat May 24 17:39:36 2014 (r355063) +++ branches/2014Q2/graphics/openjpeg/pkg-plist Sat May 24 17:40:03 2014 (r355064) @@ -3,7 +3,7 @@ bin/j2k_dump bin/j2k_to_image include/openjpeg.h lib/libopenjpeg.so -lib/libopenjpeg.so.1.5.0 +lib/libopenjpeg.so.1.5.2 lib/libopenjpeg.so.2 man/man1/image_to_j2k.1.gz man/man1/j2k_dump.1.gz @@ -14,6 +14,7 @@ man/man3/libopenjpeg.3.gz %%DATADIR%%/OpenJPEGConfig.cmake %%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%/OpenJPEGTargets.cmake +libdata/pkgconfig/libopenjpeg.pc libdata/pkgconfig/libopenjpeg1.pc @dirrm %%DATADIR%% @dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Sat May 24 18:05:08 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBA6066D; Sat, 24 May 2014 18:05:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C86752FA4; Sat, 24 May 2014 18:05:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OI58mL025490; Sat, 24 May 2014 18:05:08 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OI58Tf025489; Sat, 24 May 2014 18:05:08 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201405241805.s4OI58Tf025489@svn.freebsd.org> From: Bryan Drewery Date: Sat, 24 May 2014 18:05:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355067 - branches/2014Q2/Mk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 18:05:08 -0000 Author: bdrewery Date: Sat May 24 18:05:08 2014 New Revision: 355067 URL: http://svnweb.freebsd.org/changeset/ports/355067 QAT: https://qat.redports.org/buildarchive/r355067/ Log: MFH: r354161 Change the protocal for the default master site backup used for fallback distfile fetching from ftp to http. Modified: branches/2014Q2/Mk/bsd.port.mk Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/Mk/bsd.port.mk ============================================================================== --- branches/2014Q2/Mk/bsd.port.mk Sat May 24 17:54:54 2014 (r355066) +++ branches/2014Q2/Mk/bsd.port.mk Sat May 24 18:05:08 2014 (r355067) @@ -144,7 +144,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - Backup location(s) for distribution files and patch # files if not found locally and ${MASTER_SITES}/${PATCH_SITES} # Default: -# ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ +# http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ # MASTER_SITE_OVERRIDE # - If set, override the MASTER_SITES setting with this # value. @@ -2489,7 +2489,7 @@ PATCH_SITES_TMP= # The primary backup site. MASTER_SITE_BACKUP?= \ - ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ + http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^} # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository From owner-svn-ports-branches@FreeBSD.ORG Sat May 24 18:05:31 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBB6074E; Sat, 24 May 2014 18:05:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE4952FAB; Sat, 24 May 2014 18:05:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4OI5V09025688; Sat, 24 May 2014 18:05:31 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4OI5V7l025685; Sat, 24 May 2014 18:05:31 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201405241805.s4OI5V7l025685@svn.freebsd.org> From: Bryan Drewery Date: Sat, 24 May 2014 18:05:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355068 - branches/2014Q2/Mk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 18:05:31 -0000 Author: bdrewery Date: Sat May 24 18:05:30 2014 New Revision: 355068 URL: http://svnweb.freebsd.org/changeset/ports/355068 QAT: https://qat.redports.org/buildarchive/r355068/ Log: MFH: r354962 Point MASTER_SITES_BACKUP / MASTER_SITES_LOCAL to distcache.FreeBSD.org Modified: branches/2014Q2/Mk/bsd.port.mk branches/2014Q2/Mk/bsd.sites.mk Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/Mk/bsd.port.mk ============================================================================== --- branches/2014Q2/Mk/bsd.port.mk Sat May 24 18:05:08 2014 (r355067) +++ branches/2014Q2/Mk/bsd.port.mk Sat May 24 18:05:30 2014 (r355068) @@ -144,7 +144,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - Backup location(s) for distribution files and patch # files if not found locally and ${MASTER_SITES}/${PATCH_SITES} # Default: -# http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ +# http://distcache.FreeBSD.org/ports-distfiles/${DIST_SUBDIR}/ # MASTER_SITE_OVERRIDE # - If set, override the MASTER_SITES setting with this # value. @@ -2489,7 +2489,7 @@ PATCH_SITES_TMP= # The primary backup site. MASTER_SITE_BACKUP?= \ - http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ + http://distcache.FreeBSD.org/ports-distfiles/${DIST_SUBDIR}/ MASTER_SITE_BACKUP:= ${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^} # If the user has MASTER_SITE_FREEBSD set, go to the FreeBSD repository Modified: branches/2014Q2/Mk/bsd.sites.mk ============================================================================== --- branches/2014Q2/Mk/bsd.sites.mk Sat May 24 18:05:08 2014 (r355067) +++ branches/2014Q2/Mk/bsd.sites.mk Sat May 24 18:05:30 2014 (r355068) @@ -26,6 +26,7 @@ # Where to put distfiles that don't have any other master site .if !defined(IGNORE_MASTER_SITE_LOCAL) MASTER_SITE_LOCAL+= \ + http://distcache.FreeBSD.org/local-distfiles/%SUBDIR%/ \ http://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \ ftp://ftp.se.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/ \ From owner-svn-ports-branches@FreeBSD.ORG Mon May 26 21:18:01 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 272DD34B; Mon, 26 May 2014 21:18:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13E482C21; Mon, 26 May 2014 21:18:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QLI00Q075325; Mon, 26 May 2014 21:18:00 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QLI0tM075324; Mon, 26 May 2014 21:18:00 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405262118.s4QLI0tM075324@svn.freebsd.org> From: Raphael Kubo da Costa Date: Mon, 26 May 2014 21:18:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355455 - branches/2014Q2/graphics/digikam-kde4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 21:18:01 -0000 Author: rakuco Date: Mon May 26 21:18:00 2014 New Revision: 355455 URL: http://svnweb.freebsd.org/changeset/ports/355455 QAT: https://qat.redports.org/buildarchive/r355455/ Log: MFH: r355452 Makefile.common: Always set USES=tar:bzip2. Setting USES=bzip2 inside the NO_BUILD block caused problems for FreeBSD's distfile fetcher, which apparently set that flag and was getting an invalid distfile to fetch from the KDE mirrors. The rest of the NO_BUILD block needs more attention, but I'll let makc@ and jhale@ handle that since it's not my area. Approved by: portmgr (bapt) Modified: branches/2014Q2/graphics/digikam-kde4/Makefile.common Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/digikam-kde4/Makefile.common ============================================================================== --- branches/2014Q2/graphics/digikam-kde4/Makefile.common Mon May 26 21:11:38 2014 (r355454) +++ branches/2014Q2/graphics/digikam-kde4/Makefile.common Mon May 26 21:18:00 2014 (r355455) @@ -110,12 +110,13 @@ vkontakte_DESC= Export images to VKonta # wallpaper_DESC= Set image as background on desktop yandexfotki_DESC= Export images to Yandex web service +USES+= tar:bzip2 + .if !defined(NO_BUILD) DISTNAME= digikam-${DIGIKAM_VER} LICENSE?= GPLv2 -USE_BZIP2= yes USES+= cmake USE_KDE4+= automoc4 kdehier kdeprefix kdelibs USE_QT4+= qmake_build moc_build rcc_build uic_build From owner-svn-ports-branches@FreeBSD.ORG Mon May 26 21:57:17 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39E1DC65; Mon, 26 May 2014 21:57:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E1102F1E; Mon, 26 May 2014 21:57:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QLvGld092649; Mon, 26 May 2014 21:57:16 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QLvGmA092647; Mon, 26 May 2014 21:57:16 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405262157.s4QLvGmA092647@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 26 May 2014 21:57:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355457 - branches/2014Q2/games/daimonin-music X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 21:57:17 -0000 Author: amdmi3 Date: Mon May 26 21:57:16 2014 New Revision: 355457 URL: http://svnweb.freebsd.org/changeset/ports/355457 QAT: https://qat.redports.org/buildarchive/r355457/ Log: MFH: r355449 - Fix conflict with games/daimonin Approved by: portmgr Modified: branches/2014Q2/games/daimonin-music/Makefile branches/2014Q2/games/daimonin-music/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/daimonin-music/Makefile ============================================================================== --- branches/2014Q2/games/daimonin-music/Makefile Mon May 26 21:33:05 2014 (r355456) +++ branches/2014Q2/games/daimonin-music/Makefile Mon May 26 21:57:16 2014 (r355457) @@ -3,6 +3,7 @@ PORTNAME= daimonin-music PORTVERSION= 20120402 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/daimonin/Addon%20packs/Music/ DISTNAME= AllMusic @@ -13,11 +14,16 @@ COMMENT= Music for daimonin client NO_BUILD= true USES= zip:infozip +NO_ARCH= yes MYDATADIR= ${PREFIX}/share/daimonin EXTRACT_BEFORE_ARGS= -aqo +post-extract: + @${MV} ${WRKDIR}/media/media.txt ${WRKDIR}/media/media-music.txt + @${RM} -f ${WRKDIR}/media/orchestral.ogg + do-install: ${MKDIR} ${STAGEDIR}${MYDATADIR} cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/ Modified: branches/2014Q2/games/daimonin-music/pkg-plist ============================================================================== --- branches/2014Q2/games/daimonin-music/pkg-plist Mon May 26 21:33:05 2014 (r355456) +++ branches/2014Q2/games/daimonin-music/pkg-plist Mon May 26 21:57:16 2014 (r355457) @@ -64,14 +64,13 @@ share/daimonin/media/frozen.ogg share/daimonin/media/ghost.ogg share/daimonin/media/jungle1.ogg share/daimonin/media/landing.ogg -share/daimonin/media/media.txt +share/daimonin/media/media-music.txt share/daimonin/media/ocean.ogg -share/daimonin/media/orchestral.ogg share/daimonin/media/rainthunder.ogg share/daimonin/media/raspy.ogg share/daimonin/media/rubberfreak.ogg share/daimonin/media/spokyspace.ogg share/daimonin/media/swamp.ogg share/daimonin/media/thonkdonk.ogg -@dirrm share/daimonin/media -@dirrm share/daimonin +@dirrmtry share/daimonin/media +@dirrmtry share/daimonin From owner-svn-ports-branches@FreeBSD.ORG Tue May 27 10:37:40 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4F9F54D; Tue, 27 May 2014 10:37:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 902482959; Tue, 27 May 2014 10:37:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RAbeCD032180; Tue, 27 May 2014 10:37:40 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4RAbdgO032176; Tue, 27 May 2014 10:37:39 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405271037.s4RAbdgO032176@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 27 May 2014 10:37:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355481 - in branches/2014Q2/games/daimonin: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2014 10:37:40 -0000 Author: amdmi3 Date: Tue May 27 10:37:39 2014 New Revision: 355481 URL: http://svnweb.freebsd.org/changeset/ports/355481 QAT: https://qat.redports.org/buildarchive/r355481/ Log: MFH: r355450 - Fix fetch - Fix build with clang - Stagify Approved by: portmgr Added: branches/2014Q2/games/daimonin/files/patch-Makefile.am - copied unchanged from r355450, head/games/daimonin/files/patch-Makefile.am branches/2014Q2/games/daimonin/files/patch-src__dialog.c - copied unchanged from r355450, head/games/daimonin/files/patch-src__dialog.c Modified: branches/2014Q2/games/daimonin/Makefile branches/2014Q2/games/daimonin/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/daimonin/Makefile ============================================================================== --- branches/2014Q2/games/daimonin/Makefile Tue May 27 10:20:08 2014 (r355480) +++ branches/2014Q2/games/daimonin/Makefile Tue May 27 10:37:39 2014 (r355481) @@ -5,19 +5,17 @@ PORTNAME= daimonin PORTVERSION= 0.10.5 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=tar&pathrev=${SVN_REVISION}&file= +MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ +# http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=tar&pathrev=${SVN_REVISION}&file= # disabled - weird fetch magic required DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Free open source Massively Multiplayer On-line Role-playing Game (MMORPG) -LIB_DEPENDS= libphysfs.so.1:${PORTSDIR}/devel/physfs \ +LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs \ libcurl.so:${PORTSDIR}/ftp/curl -SVN_REVISION= 6021 -FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} - -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-simplelayout --enable-getaddrinfo LDFLAGS+= -L${LOCALBASE}/lib USE_AUTOTOOLS= automake autoconf @@ -28,19 +26,16 @@ SUB_LIST= PORTVERSION=${PORTVERSION} WRKSRC= ${WRKDIR}/client/make/linux OPTIONS_DEFINE= MUSIC DEBUG +OPTIONS_DEFAULT= KB_DESKTOP MUSIC OPTIONS_SINGLE= KB OPTIONS_SINGLE_KB= KB_DESKTOP KB_LAPTOP KB_ROGUE + KB_DESKTOP_DESC= Key bindings for desktop (num keypad) KB_LAPTOP_DESC= Key bindings for laptop (789uojkl) KB_ROGUE_DESC= Rogue-like key bindings (hjkl and yubn) KB_DESC= KB Selection MUSIC_DESC= Download and Install music files (83 Mb) -OPTIONS_DEFAULT= KB_DESKTOP MUSIC - -DD?= /bin/dd - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDEBUG} @@ -51,13 +46,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- RUN_DEPENDS+= ${DATADIR}/media/AnichGiantTrouble.ogg:${PORTSDIR}/games/daimonin-music .endif -post-fetch-script: - @# the downloaded .tar.gz DISTFILE is regenerated for each download, so contains a different timestamp each time - @# clear the timestamp here so the checksum works - @${PRINTF} '\0\0\0\0' | ${DD} of=${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} bs=1w count=1 seek=1 conv=notrunc 2>/dev/null - pre-patch: - ${CP} ${WRKSRC}/../../settings/keys-laptop.dat ${WRKSRC}/../../settings/keys-rogue.dat + @${CP} ${WRKSRC}/../../settings/keys-laptop.dat ${WRKSRC}/../../settings/keys-rogue.dat post-patch: @${CHMOD} a+x ${WRKSRC}/make_utils/install-sh @@ -68,20 +58,19 @@ pre-configure: cd ${WRKSRC}; ${LN} -sf ${AUTOMAKE_DIR}/COPYING . && ${AUTORECONF} post-install: - ${MV} ${PREFIX}/bin/daimonin ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/daimonin.sh ${PREFIX}/bin/daimonin - ${CHMOD} a+x ${PREFIX}/bin/daimonin - @${FIND} ${DATADIR} -name '*.orig' -exec rm {} \; - ${MV} ${DATADIR}/settings/keys.dat ${DATADIR}/settings/keys-desktop.dat + ${MV} ${STAGEDIR}${PREFIX}/bin/daimonin ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/daimonin.sh ${STAGEDIR}${PREFIX}/bin/daimonin + @${FIND} ${STAGEDIR}${DATADIR} -name '*.orig' -exec rm {} \; + ${MV} ${STAGEDIR}${DATADIR}/settings/keys.dat ${STAGEDIR}${DATADIR}/settings/keys-desktop.dat .if ${PORT_OPTIONS:MKB_LAPTOP} @${ECHO} Configuring keyboard bindings for laptop - ${LN} -s ${DATADIR}/settings/keys-laptop.dat ${DATADIR}/settings/keys.dat + ${LN} -s ${DATADIR}/settings/keys-laptop.dat ${STAGEDIR}${DATADIR}/settings/keys.dat .elif ${PORT_OPTIONS:MKB_ROGUE} @${ECHO} Configuring rogue-like keyboard bindings - ${LN} -s ${DATADIR}/settings/keys-rogue.dat ${DATADIR}/settings/keys.dat + ${LN} -s ${DATADIR}/settings/keys-rogue.dat ${STAGEDIR}${DATADIR}/settings/keys.dat .else @${ECHO} Configuring keyboard bindings for desktop - ${LN} -s ${DATADIR}/settings/keys-desktop.dat ${DATADIR}/settings/keys.dat + ${LN} -s ${DATADIR}/settings/keys-desktop.dat ${STAGEDIR}${DATADIR}/settings/keys.dat .endif .include Copied: branches/2014Q2/games/daimonin/files/patch-Makefile.am (from r355450, head/games/daimonin/files/patch-Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/games/daimonin/files/patch-Makefile.am Tue May 27 10:37:39 2014 (r355481, copy of r355450, head/games/daimonin/files/patch-Makefile.am) @@ -0,0 +1,57 @@ +--- Makefile.am.orig 2010-08-06 00:04:22.000000000 +0400 ++++ Makefile.am 2014-05-26 19:25:24.000000000 +0400 +@@ -72,30 +72,30 @@ + # echo '***'; \ + # exit 42; \ + # fi; +- $(MKDIR) -p $(d_datadir)/sfx +- $(MKDIR) -p $(d_datadir)/man +- $(MKDIR) -p $(d_datadir)/media +- $(MKDIR) -p $(d_datadir)/cache +- $(MKDIR) -p $(d_datadir)/logs +- $(MKDIR) -p $(d_datadir)/gfx_user +- $(MKDIR) -p $(d_datadir)/srv_files +- $(MKDIR) -p $(d_datadir)/bitmaps +- $(MKDIR) -p $(d_datadir)/icons +- $(MKDIR) -p $(d_datadir)/settings +- $(MKDIR) -p $(d_datadir)/update +- $(CP) ../../sfx/*.* $(d_datadir)/sfx +- $(CP) -R ../../man/* $(d_datadir)/man +- $(CP) ../../media/*.* $(d_datadir)/media +- $(CP) ../../cache/*.* $(d_datadir)/cache +- $(CP) ../../bitmaps/* $(d_datadir)/bitmaps +- $(CP) ../../icons/* $(d_datadir)/icons +- $(CP) -R ../../settings/*.* $(d_datadir)/settings +- $(CP) ../../srv_files/*.* $(d_datadir)/srv_files +- $(CP) ../../update/version $(d_datadir)/update +- $(CP) ../../gfx_user/*.* $(d_datadir)/gfx_user +- $(CP) ../../daimonin.p0 $(d_datadir) +- $(CP) ../../License $(d_datadir) +- $(CP) ../../archdef.dat $(d_datadir) ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/sfx ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/man ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/media ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/cache ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/logs ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/gfx_user ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/srv_files ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/bitmaps ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/icons ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/settings ++ $(MKDIR) -p $(DESTDIR)$(d_datadir)/update ++ $(CP) ../../sfx/*.* $(DESTDIR)$(d_datadir)/sfx ++ $(CP) -R ../../man/* $(DESTDIR)$(d_datadir)/man ++ $(CP) ../../media/*.* $(DESTDIR)$(d_datadir)/media ++ $(CP) ../../cache/*.* $(DESTDIR)$(d_datadir)/cache ++ $(CP) ../../bitmaps/* $(DESTDIR)$(d_datadir)/bitmaps ++ $(CP) ../../icons/* $(DESTDIR)$(d_datadir)/icons ++ $(CP) -R ../../settings/*.* $(DESTDIR)$(d_datadir)/settings ++ $(CP) ../../srv_files/*.* $(DESTDIR)$(d_datadir)/srv_files ++ $(CP) ../../update/version $(DESTDIR)$(d_datadir)/update ++ $(CP) ../../gfx_user/*.* $(DESTDIR)$(d_datadir)/gfx_user ++ $(CP) ../../daimonin.p0 $(DESTDIR)$(d_datadir) ++ $(CP) ../../License $(DESTDIR)$(d_datadir) ++ $(CP) ../../archdef.dat $(DESTDIR)$(d_datadir) + @echo "*** Daimonin client successful installed in $(daimonindir)!" + @echo "*** Enter your install folder and type ./daimonin" + @echo "*** to start the game!" Copied: branches/2014Q2/games/daimonin/files/patch-src__dialog.c (from r355450, head/games/daimonin/files/patch-src__dialog.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/games/daimonin/files/patch-src__dialog.c Tue May 27 10:37:39 2014 (r355481, copy of r355450, head/games/daimonin/files/patch-src__dialog.c) @@ -0,0 +1,11 @@ +--- ../../src/dialog.c.orig 2010-09-23 21:23:00.000000000 +0400 ++++ ../../src/dialog.c 2014-05-26 19:19:13.000000000 +0400 +@@ -580,7 +580,7 @@ + /****************************************************************** + draws all options for the actual page. + ******************************************************************/ +-inline void optwin_draw_options(int x, int y) ++void optwin_draw_options(int x, int y) + { + #define LEN_NAME 111 + int i = -1, pos = 0, max = 0; Modified: branches/2014Q2/games/daimonin/pkg-plist ============================================================================== --- branches/2014Q2/games/daimonin/pkg-plist Tue May 27 10:20:08 2014 (r355480) +++ branches/2014Q2/games/daimonin/pkg-plist Tue May 27 10:37:39 2014 (r355481) @@ -1,581 +1,581 @@ bin/daimonin bin/daimonin-updater -share/daimonin/License -share/daimonin/archdef.dat -share/daimonin/bitmaps/apply.png -share/daimonin/bitmaps/below.png -share/daimonin/bitmaps/below_scroll.png -share/daimonin/bitmaps/black_tile.png -share/daimonin/bitmaps/blind.png -share/daimonin/bitmaps/button_small_down.png -share/daimonin/bitmaps/button_small_up.png -share/daimonin/bitmaps/closeb.png -share/daimonin/bitmaps/cmark_end.png -share/daimonin/bitmaps/cmark_middle.png -share/daimonin/bitmaps/cmark_start.png -share/daimonin/bitmaps/confused.png -share/daimonin/bitmaps/cursed.png -share/daimonin/bitmaps/damned.png -share/daimonin/bitmaps/death.png -share/daimonin/bitmaps/dialog_bg.png -share/daimonin/bitmaps/dialog_button_black_down.png -share/daimonin/bitmaps/dialog_button_black_up.png -share/daimonin/bitmaps/dialog_button_down.png -share/daimonin/bitmaps/dialog_button_down_prefix.png -share/daimonin/bitmaps/dialog_button_selected.png -share/daimonin/bitmaps/dialog_button_up.png -share/daimonin/bitmaps/dialog_button_up_prefix.png -share/daimonin/bitmaps/dialog_checker.png -share/daimonin/bitmaps/dialog_icon_bg_active.png -share/daimonin/bitmaps/dialog_icon_bg_inactive.png -share/daimonin/bitmaps/dialog_icon_bg_negative.png -share/daimonin/bitmaps/dialog_icon_bg_positive.png -share/daimonin/bitmaps/dialog_icon_fg_active.png -share/daimonin/bitmaps/dialog_icon_fg_inactive.png -share/daimonin/bitmaps/dialog_icon_fg_selected.png -share/daimonin/bitmaps/dialog_question.png -share/daimonin/bitmaps/dialog_range_l.png -share/daimonin/bitmaps/dialog_range_off.png -share/daimonin/bitmaps/dialog_range_r.png -share/daimonin/bitmaps/dialog_tab.png -share/daimonin/bitmaps/dialog_tab_sel.png -share/daimonin/bitmaps/dialog_tab_start.png -share/daimonin/bitmaps/dialog_tab_stop.png -share/daimonin/bitmaps/dialog_title_creation.png -share/daimonin/bitmaps/dialog_title_keybind.png -share/daimonin/bitmaps/dialog_title_login.png -share/daimonin/bitmaps/dialog_title_options.png -share/daimonin/bitmaps/dialog_title_skill.png -share/daimonin/bitmaps/dialog_title_spell.png -share/daimonin/bitmaps/enemy1.png -share/daimonin/bitmaps/enemy2.png -share/daimonin/bitmaps/exclusive_effect.png -share/daimonin/bitmaps/exp_border.png -share/daimonin/bitmaps/exp_bubble.png -share/daimonin/bitmaps/exp_bubble2.png -share/daimonin/bitmaps/exp_line.png -share/daimonin/bitmaps/exp_skill_border.png -share/daimonin/bitmaps/exp_skill_bubble.png -share/daimonin/bitmaps/exp_skill_line.png -share/daimonin/bitmaps/font11x15.png -share/daimonin/bitmaps/font11x15out.png -share/daimonin/bitmaps/font6x3out.png -share/daimonin/bitmaps/font7x4.png -share/daimonin/bitmaps/font7x4out.png -share/daimonin/bitmaps/font_big.png -share/daimonin/bitmaps/food.png -share/daimonin/bitmaps/food2.png -share/daimonin/bitmaps/food_back.png -share/daimonin/bitmaps/frame_line.png -share/daimonin/bitmaps/grace.png -share/daimonin/bitmaps/grace_back.png -share/daimonin/bitmaps/grid.png -share/daimonin/bitmaps/group.png -share/daimonin/bitmaps/group_bg2.png -share/daimonin/bitmaps/group_bg2_bottom.png -share/daimonin/bitmaps/group_clear.png -share/daimonin/bitmaps/group_grace.png -share/daimonin/bitmaps/group_hp.png -share/daimonin/bitmaps/group_mana.png -share/daimonin/bitmaps/hp.png -share/daimonin/bitmaps/hp_back.png -share/daimonin/bitmaps/icon.png -share/daimonin/bitmaps/intro.png -share/daimonin/bitmaps/inv_scroll.png -share/daimonin/bitmaps/inventory.png -share/daimonin/bitmaps/inventory_bg.png -share/daimonin/bitmaps/invite.png -share/daimonin/bitmaps/invslot.png -share/daimonin/bitmaps/invslot_marked.png -share/daimonin/bitmaps/invslot_u.png -share/daimonin/bitmaps/journal.png -share/daimonin/bitmaps/loading.png -share/daimonin/bitmaps/lock.png -share/daimonin/bitmaps/login_inp.png -share/daimonin/bitmaps/logo270.png -share/daimonin/bitmaps/magic.png -share/daimonin/bitmaps/main_level_bg.png -share/daimonin/bitmaps/main_stats.png -share/daimonin/bitmaps/menu_buttons.png -share/daimonin/bitmaps/mouse_cursor_move.png -share/daimonin/bitmaps/nchar_marker.png -share/daimonin/bitmaps/npc_int_slider.png -share/daimonin/bitmaps/npc_interface_bottom.png -share/daimonin/bitmaps/npc_interface_middle.png -share/daimonin/bitmaps/npc_interface_panel.png -share/daimonin/bitmaps/npc_interface_top.png -share/daimonin/bitmaps/number.png -share/daimonin/bitmaps/options_alpha.png -share/daimonin/bitmaps/options_back.png -share/daimonin/bitmaps/options_head.png -share/daimonin/bitmaps/options_keys.png -share/daimonin/bitmaps/options_logout.png -share/daimonin/bitmaps/options_mark_left.png -share/daimonin/bitmaps/options_mark_right.png -share/daimonin/bitmaps/options_settings.png -share/daimonin/bitmaps/palette.png -share/daimonin/bitmaps/paralyzed.png -share/daimonin/bitmaps/pentagram.png -share/daimonin/bitmaps/player_doll_bg.png -share/daimonin/bitmaps/player_info_bg.png -share/daimonin/bitmaps/pray.png -share/daimonin/bitmaps/probe.png -share/daimonin/bitmaps/progress.png -share/daimonin/bitmaps/progress_back.png -share/daimonin/bitmaps/quad_button_down.png -share/daimonin/bitmaps/quad_button_up.png -share/daimonin/bitmaps/quickslots.png -share/daimonin/bitmaps/quickslotsv.png -share/daimonin/bitmaps/range.png -share/daimonin/bitmaps/range_ctrl.png -share/daimonin/bitmaps/range_ctrl_no.png -share/daimonin/bitmaps/range_marker.png -share/daimonin/bitmaps/range_priest.png -share/daimonin/bitmaps/range_priest_no.png -share/daimonin/bitmaps/range_skill.png -share/daimonin/bitmaps/range_skill_no.png -share/daimonin/bitmaps/range_throw.png -share/daimonin/bitmaps/range_throw_no.png -share/daimonin/bitmaps/range_tool.png -share/daimonin/bitmaps/range_tool_no.png -share/daimonin/bitmaps/range_wizard.png -share/daimonin/bitmaps/range_wizard_no.png -share/daimonin/bitmaps/regen_bg.png -share/daimonin/bitmaps/resist_bg.png -share/daimonin/bitmaps/scared.png -share/daimonin/bitmaps/skill_exp_bg.png -share/daimonin/bitmaps/skill_lvl_bg.png -share/daimonin/bitmaps/skin-subred.png -share/daimonin/bitmaps/slider.png -share/daimonin/bitmaps/slider_down.png -share/daimonin/bitmaps/slider_up.png -share/daimonin/bitmaps/sp.png -share/daimonin/bitmaps/sp_back.png -share/daimonin/bitmaps/stimer.png -share/daimonin/bitmaps/target_attack.png -share/daimonin/bitmaps/target_bg.png -share/daimonin/bitmaps/target_hp.png -share/daimonin/bitmaps/target_hp_b.png -share/daimonin/bitmaps/target_normal.png -share/daimonin/bitmaps/target_talk.png -share/daimonin/bitmaps/textinput.png -share/daimonin/bitmaps/textwin.png -share/daimonin/bitmaps/textwin_mask.png -share/daimonin/bitmaps/textwin_scroll.png -share/daimonin/bitmaps/traped.png -share/daimonin/bitmaps/unpaid.png -share/daimonin/bitmaps/wand.png -share/daimonin/bitmaps/warn_hp.png -share/daimonin/bitmaps/warn_weight.png -share/daimonin/bitmaps/unidentified.png -share/daimonin/cache/README.txt -share/daimonin/daimonin -share/daimonin/daimonin.p0 -share/daimonin/gfx_user/README.txt -share/daimonin/icons/guild_dragon1.png -share/daimonin/icons/guild_merc.png -share/daimonin/icons/quests.png -share/daimonin/icons/si_001.png -share/daimonin/icons/si_002.png -share/daimonin/icons/si_003.png -share/daimonin/icons/si_004.png -share/daimonin/icons/si_005.png -share/daimonin/icons/si_006.png -share/daimonin/icons/si_007.png -share/daimonin/icons/si_008.png -share/daimonin/icons/si_009.png -share/daimonin/icons/si_010.png -share/daimonin/icons/si_011.png -share/daimonin/icons/si_012.png -share/daimonin/icons/si_013.png -share/daimonin/icons/si_014.png -share/daimonin/icons/si_015.png -share/daimonin/icons/si_016.png -share/daimonin/icons/si_017.png -share/daimonin/icons/si_018.png -share/daimonin/icons/si_019.png -share/daimonin/icons/si_020.png -share/daimonin/icons/si_021.png -share/daimonin/icons/si_022.png -share/daimonin/icons/si_023.png -share/daimonin/icons/si_024.png -share/daimonin/icons/si_025.png -share/daimonin/icons/si_026.png -share/daimonin/icons/si_027.png -share/daimonin/icons/si_028.png -share/daimonin/icons/si_029.png -share/daimonin/icons/si_030.png -share/daimonin/icons/si_031.png -share/daimonin/icons/si_032.png -share/daimonin/icons/si_033.png -share/daimonin/icons/si_034.png -share/daimonin/icons/si_035.png -share/daimonin/icons/si_036.png -share/daimonin/icons/si_037.png -share/daimonin/icons/si_038.png -share/daimonin/icons/si_039.png -share/daimonin/icons/si_040.png -share/daimonin/icons/si_041.png -share/daimonin/icons/si_042.png -share/daimonin/icons/si_043.png -share/daimonin/icons/si_044.png -share/daimonin/icons/si_045.png -share/daimonin/icons/si_046.png -share/daimonin/icons/si_047.png -share/daimonin/icons/si_048.png -share/daimonin/icons/si_049.png -share/daimonin/icons/si_050.png -share/daimonin/icons/si_051.png -share/daimonin/icons/si_052.png -share/daimonin/icons/si_053.png -share/daimonin/icons/si_054.png -share/daimonin/icons/si_055.png -share/daimonin/icons/si_056.png -share/daimonin/icons/si_057.png -share/daimonin/icons/si_058.png -share/daimonin/icons/si_059.png -share/daimonin/icons/si_060.png -share/daimonin/icons/si_061.png -share/daimonin/icons/si_062.png -share/daimonin/icons/si_063.png -share/daimonin/icons/si_064.png -share/daimonin/icons/si_065.png -share/daimonin/icons/si_066.png -share/daimonin/icons/si_067.png -share/daimonin/icons/si_068.png -share/daimonin/icons/si_069.png -share/daimonin/icons/si_070.png -share/daimonin/icons/si_071.png -share/daimonin/icons/si_072.png -share/daimonin/icons/si_073.png -share/daimonin/icons/si_074.png -share/daimonin/icons/si_075.png -share/daimonin/icons/si_076.png -share/daimonin/icons/si_077.png -share/daimonin/icons/si_078.png -share/daimonin/icons/si_079.png -share/daimonin/icons/si_080.png -share/daimonin/icons/si_081.png -share/daimonin/icons/si_082.png -share/daimonin/icons/si_083.png -share/daimonin/icons/si_084.png -share/daimonin/icons/si_085.png -share/daimonin/icons/si_086.png -share/daimonin/icons/si_087.png -share/daimonin/icons/si_088.png -share/daimonin/icons/si_089.png -share/daimonin/icons/si_090.png -share/daimonin/icons/si_091.png -share/daimonin/icons/si_092.png -share/daimonin/icons/si_093.png -share/daimonin/icons/si_094.png -share/daimonin/icons/si_095.png -share/daimonin/icons/si_096.png -share/daimonin/icons/si_097.png -share/daimonin/icons/si_098.png -share/daimonin/icons/si_099.png -share/daimonin/icons/si_100.png -share/daimonin/icons/si_101.png -share/daimonin/icons/si_102.png -share/daimonin/icons/si_103.png -share/daimonin/icons/si_104.png -share/daimonin/icons/si_105.png -share/daimonin/icons/si_106.png -share/daimonin/icons/si_107.png -share/daimonin/icons/si_108.png -share/daimonin/icons/si_109.png -share/daimonin/icons/si_110.png -share/daimonin/icons/si_111.png -share/daimonin/icons/si_112.png -share/daimonin/icons/si_113.png -share/daimonin/icons/si_114.png -share/daimonin/icons/si_115.png -share/daimonin/icons/si_116.png -share/daimonin/icons/si_117.png -share/daimonin/icons/si_118.png -share/daimonin/icons/si_119.png -share/daimonin/icons/si_120.png -share/daimonin/icons/si_121.png -share/daimonin/icons/si_122.png -share/daimonin/icons/si_123.png -share/daimonin/icons/si_124.png -share/daimonin/icons/si_125.png -share/daimonin/icons/si_126.png -share/daimonin/icons/si_127.png -share/daimonin/icons/si_128.png -share/daimonin/icons/si_129.png -share/daimonin/icons/si_130.png -share/daimonin/icons/si_131.png -share/daimonin/icons/si_132.png -share/daimonin/icons/si_133.png -share/daimonin/icons/si_134.png -share/daimonin/icons/si_135.png -share/daimonin/icons/si_136.png -share/daimonin/icons/si_137.png -share/daimonin/icons/si_138.png -share/daimonin/icons/si_139.png -share/daimonin/icons/si_140.png -share/daimonin/icons/si_141.png -share/daimonin/icons/si_142.png -share/daimonin/icons/si_143.png -share/daimonin/icons/si_144.png -share/daimonin/icons/si_145.png -share/daimonin/icons/si_146.png -share/daimonin/icons/si_147.png -share/daimonin/icons/si_148.png -share/daimonin/icons/si_149.png -share/daimonin/icons/si_150.png -share/daimonin/icons/si_151.png -share/daimonin/icons/si_152.png -share/daimonin/icons/si_153.png -share/daimonin/icons/si_154.png -share/daimonin/icons/si_155.png -share/daimonin/icons/si_156.png -share/daimonin/icons/si_157.png -share/daimonin/icons/si_158.png -share/daimonin/icons/si_159.png -share/daimonin/icons/si_160.png -share/daimonin/icons/si_161.png -share/daimonin/icons/si_162.png -share/daimonin/icons/si_163.png -share/daimonin/icons/si_164.png -share/daimonin/icons/si_165.png -share/daimonin/icons/si_166.png -share/daimonin/icons/si_167.png -share/daimonin/icons/si_168.png -share/daimonin/icons/si_169.png -share/daimonin/icons/si_170.png -share/daimonin/icons/si_171.png -share/daimonin/icons/si_172.png -share/daimonin/icons/si_173.png -share/daimonin/icons/si_174.png -share/daimonin/icons/si_175.png -share/daimonin/icons/si_176.png -share/daimonin/icons/si_177.png -share/daimonin/icons/si_178.png -share/daimonin/icons/si_179.png -share/daimonin/icons/si_180.png -share/daimonin/icons/si_181.png -share/daimonin/icons/si_182.png -share/daimonin/icons/si_183.png -share/daimonin/icons/si_184.png -share/daimonin/icons/si_185.png -share/daimonin/icons/si_186.png -share/daimonin/icons/si_187.png -share/daimonin/icons/si_188.png -share/daimonin/icons/si_189.png -share/daimonin/icons/si_190.png -share/daimonin/icons/si_191.png -share/daimonin/icons/si_192.png -share/daimonin/icons/si_193.png -share/daimonin/icons/si_194.png -share/daimonin/icons/si_pri.png -share/daimonin/icons/si_wiz.png -share/daimonin/icons/sk_001.png -share/daimonin/icons/sk_002.png -share/daimonin/icons/sk_003.png -share/daimonin/icons/sk_004.png -share/daimonin/icons/sk_005.png -share/daimonin/icons/sk_006.png -share/daimonin/icons/sk_007.png -share/daimonin/icons/sk_008.png -share/daimonin/icons/sk_009.png -share/daimonin/icons/sk_010.png -share/daimonin/icons/sk_011.png -share/daimonin/icons/sk_012.png -share/daimonin/icons/sk_013.png -share/daimonin/icons/sk_014.png -share/daimonin/icons/sk_015.png -share/daimonin/icons/sk_016.png -share/daimonin/icons/sk_017.png -share/daimonin/icons/sk_018.png -share/daimonin/icons/sk_019.png -share/daimonin/icons/sk_020.png -share/daimonin/icons/sk_021.png -share/daimonin/icons/sk_022.png -share/daimonin/icons/sk_023.png -share/daimonin/icons/sk_024.png -share/daimonin/icons/sk_025.png -share/daimonin/icons/sk_026.png -share/daimonin/icons/sk_027.png -share/daimonin/icons/sk_028.png -share/daimonin/icons/sk_029.png -share/daimonin/icons/sk_030.png -share/daimonin/icons/sk_031.png -share/daimonin/icons/sk_032.png -share/daimonin/icons/sk_033.png -share/daimonin/icons/sk_034.png -share/daimonin/icons/sk_035.png -share/daimonin/icons/sk_036.png -share/daimonin/icons/sk_037.png -share/daimonin/icons/sk_038.png -share/daimonin/icons/sk_039.png -share/daimonin/icons/sk_040.png -share/daimonin/icons/sk_041.png -share/daimonin/icons/sk_042.png -share/daimonin/icons/st_001.png -share/daimonin/icons/st_002.png -share/daimonin/icons/st_003.png -share/daimonin/icons/st_004.png -share/daimonin/icons/st_005.png -share/daimonin/man/commands/apply -share/daimonin/man/commands/buddy -share/daimonin/man/commands/cfilter -share/daimonin/man/commands/changeskin -share/daimonin/man/commands/f1 -share/daimonin/man/commands/f2 -share/daimonin/man/commands/f3 -share/daimonin/man/commands/f4 -share/daimonin/man/commands/f5 -share/daimonin/man/commands/f6 -share/daimonin/man/commands/f7 -share/daimonin/man/commands/f8 -share/daimonin/man/commands/grid -share/daimonin/man/commands/ignore -share/daimonin/man/commands/imagestats -share/daimonin/man/commands/keybind -share/daimonin/man/commands/kills -share/daimonin/man/commands/markdmbuster -share/daimonin/man/commands/ready_spell -share/daimonin/man/commands/reloadskinnow -share/daimonin/man/commands/reply -share/daimonin/man/commands/reset -share/daimonin/man/commands/searchpath -share/daimonin/man/commands/setwin -share/daimonin/man/commands/setwinalpha -share/daimonin/man/commands/shout_off -share/daimonin/man/commands/shout_on -share/daimonin/man/commands/sleeptimer -share/daimonin/man/commands/statreset -share/daimonin/man/commands/teststretch -@unexec if [ -f %D/share/daimonin/media/media.txt ]; then rm %D/share/daimonin/media/media.txt; fi -@unexec if [ -f %D/share/daimonin/media/orchestral.ogg ]; then rm %D/share/daimonin/media/orchestral.ogg; fi -share/daimonin/settings/interface.gui -share/daimonin/settings/keys-desktop.dat -share/daimonin/settings/keys-laptop.dat -share/daimonin/settings/keys-rogue.dat -share/daimonin/settings/keys.dat -share/daimonin/settings/options.dat -share/daimonin/settings/skin.def -share/daimonin/settings/skin.info -share/daimonin/sfx/arrow_hit.wav -share/daimonin/sfx/attributions.txt -share/daimonin/sfx/book.wav -share/daimonin/sfx/bow1.wav -share/daimonin/sfx/change1.wav -share/daimonin/sfx/click_fail.wav -share/daimonin/sfx/clock.wav -share/daimonin/sfx/coins1.wav -share/daimonin/sfx/coins2.wav -share/daimonin/sfx/coins3.wav -share/daimonin/sfx/coins4.wav -share/daimonin/sfx/console.wav -share/daimonin/sfx/door.wav -share/daimonin/sfx/door_close.wav -share/daimonin/sfx/drop.wav -share/daimonin/sfx/event01.wav -share/daimonin/sfx/explosion.wav -share/daimonin/sfx/fallhole.wav -share/daimonin/sfx/gate_close.wav -share/daimonin/sfx/gate_open.wav -share/daimonin/sfx/get.wav -share/daimonin/sfx/growl.wav -share/daimonin/sfx/heartbeat.wav -share/daimonin/sfx/hit_block.wav -share/daimonin/sfx/hit_cleave.wav -share/daimonin/sfx/hit_hand.wav -share/daimonin/sfx/hit_impact.wav -share/daimonin/sfx/hit_pierce.wav -share/daimonin/sfx/hit_slash.wav -share/daimonin/sfx/kill.wav -share/daimonin/sfx/learnspell.wav -share/daimonin/sfx/lose_some.wav -share/daimonin/sfx/magic_acid.wav -share/daimonin/sfx/magic_animate.wav -share/daimonin/sfx/magic_avatar.wav -share/daimonin/sfx/magic_bomb.wav -share/daimonin/sfx/magic_bullet1.wav -share/daimonin/sfx/magic_bullet2.wav -share/daimonin/sfx/magic_cancel.wav -share/daimonin/sfx/magic_comet.wav -share/daimonin/sfx/magic_confusion.wav -share/daimonin/sfx/magic_create.wav -share/daimonin/sfx/magic_dark.wav -share/daimonin/sfx/magic_death.wav -share/daimonin/sfx/magic_default.wav -share/daimonin/sfx/magic_destruction.wav -share/daimonin/sfx/magic_elec.wav -share/daimonin/sfx/magic_fear.wav -share/daimonin/sfx/magic_fire.wav -share/daimonin/sfx/magic_fireball1.wav -share/daimonin/sfx/magic_fireball2.wav -share/daimonin/sfx/magic_hword.wav -share/daimonin/sfx/magic_ice.wav -share/daimonin/sfx/magic_invisible.wav -share/daimonin/sfx/magic_invoke.wav -share/daimonin/sfx/magic_invoke2.wav -share/daimonin/sfx/magic_magic.wav -share/daimonin/sfx/magic_manaball.wav -share/daimonin/sfx/magic_missile.wav -share/daimonin/sfx/magic_mmap.wav -share/daimonin/sfx/magic_orb.wav -share/daimonin/sfx/magic_paralyze.wav -share/daimonin/sfx/magic_poison.wav -share/daimonin/sfx/magic_protection.wav -share/daimonin/sfx/magic_rstrike.wav -share/daimonin/sfx/magic_rune.wav -share/daimonin/sfx/magic_sball.wav -share/daimonin/sfx/magic_slow.wav -share/daimonin/sfx/magic_snowstorm.wav -share/daimonin/sfx/magic_stat.wav -share/daimonin/sfx/magic_steambolt.wav -share/daimonin/sfx/magic_summon1.wav -share/daimonin/sfx/magic_summon2.wav -share/daimonin/sfx/magic_summon3.wav -share/daimonin/sfx/magic_teleport.wav -share/daimonin/sfx/magic_turn.wav -share/daimonin/sfx/magic_wall.wav -share/daimonin/sfx/magic_walls.wav -share/daimonin/sfx/magic_wound.wav -share/daimonin/sfx/miss_mob1.wav -share/daimonin/sfx/miss_mob2.wav -share/daimonin/sfx/miss_player1.wav -share/daimonin/sfx/miss_player2.wav -share/daimonin/sfx/missspell.wav -share/daimonin/sfx/open_container.wav -share/daimonin/sfx/page.wav -share/daimonin/sfx/petdead.wav -share/daimonin/sfx/playerdead.wav -share/daimonin/sfx/poison.wav -share/daimonin/sfx/pray.wav -share/daimonin/sfx/pull.wav -share/daimonin/sfx/push.wav -share/daimonin/sfx/rod.wav -share/daimonin/sfx/scroll.wav -share/daimonin/sfx/step1.wav -share/daimonin/sfx/step2.wav -share/daimonin/sfx/teleport.wav -share/daimonin/sfx/throw.wav -share/daimonin/sfx/warning_drain.wav -share/daimonin/sfx/warning_food.wav -share/daimonin/sfx/warning_hp.wav -share/daimonin/sfx/warning_hp2.wav -share/daimonin/sfx/warning_statdown.wav -share/daimonin/sfx/warning_statup.wav -share/daimonin/sfx/weapon_attack.wav -share/daimonin/sfx/weapon_hold.wav -share/daimonin/srv_files/README.txt -share/daimonin/update/version -@dirrm share/daimonin/bitmaps -@dirrm share/daimonin/cache -@dirrm share/daimonin/gfx_user -@dirrm share/daimonin/icons -@dirrm share/daimonin/logs -@dirrm share/daimonin/man/commands -@dirrm share/daimonin/man -@dirrmtry share/daimonin/media -@dirrm share/daimonin/settings -@dirrm share/daimonin/sfx -@dirrm share/daimonin/srv_files -@dirrm share/daimonin/update -@dirrmtry share/daimonin +%%DATADIR%%/License +%%DATADIR%%/archdef.dat +%%DATADIR%%/bitmaps/apply.png +%%DATADIR%%/bitmaps/below.png +%%DATADIR%%/bitmaps/below_scroll.png +%%DATADIR%%/bitmaps/black_tile.png +%%DATADIR%%/bitmaps/blind.png +%%DATADIR%%/bitmaps/button_small_down.png +%%DATADIR%%/bitmaps/button_small_up.png +%%DATADIR%%/bitmaps/closeb.png +%%DATADIR%%/bitmaps/cmark_end.png +%%DATADIR%%/bitmaps/cmark_middle.png +%%DATADIR%%/bitmaps/cmark_start.png +%%DATADIR%%/bitmaps/confused.png +%%DATADIR%%/bitmaps/cursed.png +%%DATADIR%%/bitmaps/damned.png +%%DATADIR%%/bitmaps/death.png +%%DATADIR%%/bitmaps/dialog_bg.png +%%DATADIR%%/bitmaps/dialog_button_black_down.png +%%DATADIR%%/bitmaps/dialog_button_black_up.png +%%DATADIR%%/bitmaps/dialog_button_down.png +%%DATADIR%%/bitmaps/dialog_button_down_prefix.png +%%DATADIR%%/bitmaps/dialog_button_selected.png +%%DATADIR%%/bitmaps/dialog_button_up.png +%%DATADIR%%/bitmaps/dialog_button_up_prefix.png +%%DATADIR%%/bitmaps/dialog_checker.png +%%DATADIR%%/bitmaps/dialog_icon_bg_active.png +%%DATADIR%%/bitmaps/dialog_icon_bg_inactive.png +%%DATADIR%%/bitmaps/dialog_icon_bg_negative.png +%%DATADIR%%/bitmaps/dialog_icon_bg_positive.png +%%DATADIR%%/bitmaps/dialog_icon_fg_active.png +%%DATADIR%%/bitmaps/dialog_icon_fg_inactive.png +%%DATADIR%%/bitmaps/dialog_icon_fg_selected.png +%%DATADIR%%/bitmaps/dialog_question.png +%%DATADIR%%/bitmaps/dialog_range_l.png +%%DATADIR%%/bitmaps/dialog_range_off.png +%%DATADIR%%/bitmaps/dialog_range_r.png +%%DATADIR%%/bitmaps/dialog_tab.png +%%DATADIR%%/bitmaps/dialog_tab_sel.png +%%DATADIR%%/bitmaps/dialog_tab_start.png +%%DATADIR%%/bitmaps/dialog_tab_stop.png +%%DATADIR%%/bitmaps/dialog_title_creation.png +%%DATADIR%%/bitmaps/dialog_title_keybind.png +%%DATADIR%%/bitmaps/dialog_title_login.png +%%DATADIR%%/bitmaps/dialog_title_options.png +%%DATADIR%%/bitmaps/dialog_title_skill.png +%%DATADIR%%/bitmaps/dialog_title_spell.png +%%DATADIR%%/bitmaps/enemy1.png +%%DATADIR%%/bitmaps/enemy2.png +%%DATADIR%%/bitmaps/exclusive_effect.png +%%DATADIR%%/bitmaps/exp_border.png +%%DATADIR%%/bitmaps/exp_bubble.png +%%DATADIR%%/bitmaps/exp_bubble2.png +%%DATADIR%%/bitmaps/exp_line.png +%%DATADIR%%/bitmaps/exp_skill_border.png +%%DATADIR%%/bitmaps/exp_skill_bubble.png +%%DATADIR%%/bitmaps/exp_skill_line.png +%%DATADIR%%/bitmaps/font11x15.png +%%DATADIR%%/bitmaps/font11x15out.png +%%DATADIR%%/bitmaps/font6x3out.png +%%DATADIR%%/bitmaps/font7x4.png +%%DATADIR%%/bitmaps/font7x4out.png +%%DATADIR%%/bitmaps/font_big.png +%%DATADIR%%/bitmaps/food.png +%%DATADIR%%/bitmaps/food2.png +%%DATADIR%%/bitmaps/food_back.png +%%DATADIR%%/bitmaps/frame_line.png +%%DATADIR%%/bitmaps/grace.png +%%DATADIR%%/bitmaps/grace_back.png +%%DATADIR%%/bitmaps/grid.png +%%DATADIR%%/bitmaps/group.png +%%DATADIR%%/bitmaps/group_bg2.png +%%DATADIR%%/bitmaps/group_bg2_bottom.png +%%DATADIR%%/bitmaps/group_clear.png +%%DATADIR%%/bitmaps/group_grace.png +%%DATADIR%%/bitmaps/group_hp.png +%%DATADIR%%/bitmaps/group_mana.png +%%DATADIR%%/bitmaps/hp.png +%%DATADIR%%/bitmaps/hp_back.png +%%DATADIR%%/bitmaps/icon.png +%%DATADIR%%/bitmaps/intro.png +%%DATADIR%%/bitmaps/inv_scroll.png +%%DATADIR%%/bitmaps/inventory.png +%%DATADIR%%/bitmaps/inventory_bg.png +%%DATADIR%%/bitmaps/invite.png +%%DATADIR%%/bitmaps/invslot.png +%%DATADIR%%/bitmaps/invslot_marked.png +%%DATADIR%%/bitmaps/invslot_u.png +%%DATADIR%%/bitmaps/journal.png +%%DATADIR%%/bitmaps/loading.png +%%DATADIR%%/bitmaps/lock.png +%%DATADIR%%/bitmaps/login_inp.png +%%DATADIR%%/bitmaps/logo270.png +%%DATADIR%%/bitmaps/magic.png +%%DATADIR%%/bitmaps/main_level_bg.png +%%DATADIR%%/bitmaps/main_stats.png +%%DATADIR%%/bitmaps/menu_buttons.png +%%DATADIR%%/bitmaps/mouse_cursor_move.png +%%DATADIR%%/bitmaps/nchar_marker.png +%%DATADIR%%/bitmaps/npc_int_slider.png +%%DATADIR%%/bitmaps/npc_interface_bottom.png +%%DATADIR%%/bitmaps/npc_interface_middle.png +%%DATADIR%%/bitmaps/npc_interface_panel.png +%%DATADIR%%/bitmaps/npc_interface_top.png +%%DATADIR%%/bitmaps/number.png +%%DATADIR%%/bitmaps/options_alpha.png +%%DATADIR%%/bitmaps/options_back.png +%%DATADIR%%/bitmaps/options_head.png +%%DATADIR%%/bitmaps/options_keys.png +%%DATADIR%%/bitmaps/options_logout.png +%%DATADIR%%/bitmaps/options_mark_left.png +%%DATADIR%%/bitmaps/options_mark_right.png +%%DATADIR%%/bitmaps/options_settings.png +%%DATADIR%%/bitmaps/palette.png +%%DATADIR%%/bitmaps/paralyzed.png +%%DATADIR%%/bitmaps/pentagram.png +%%DATADIR%%/bitmaps/player_doll_bg.png +%%DATADIR%%/bitmaps/player_info_bg.png +%%DATADIR%%/bitmaps/pray.png +%%DATADIR%%/bitmaps/probe.png +%%DATADIR%%/bitmaps/progress.png +%%DATADIR%%/bitmaps/progress_back.png +%%DATADIR%%/bitmaps/quad_button_down.png +%%DATADIR%%/bitmaps/quad_button_up.png +%%DATADIR%%/bitmaps/quickslots.png +%%DATADIR%%/bitmaps/quickslotsv.png +%%DATADIR%%/bitmaps/range.png +%%DATADIR%%/bitmaps/range_ctrl.png +%%DATADIR%%/bitmaps/range_ctrl_no.png +%%DATADIR%%/bitmaps/range_marker.png +%%DATADIR%%/bitmaps/range_priest.png +%%DATADIR%%/bitmaps/range_priest_no.png +%%DATADIR%%/bitmaps/range_skill.png +%%DATADIR%%/bitmaps/range_skill_no.png +%%DATADIR%%/bitmaps/range_throw.png +%%DATADIR%%/bitmaps/range_throw_no.png +%%DATADIR%%/bitmaps/range_tool.png +%%DATADIR%%/bitmaps/range_tool_no.png +%%DATADIR%%/bitmaps/range_wizard.png +%%DATADIR%%/bitmaps/range_wizard_no.png +%%DATADIR%%/bitmaps/regen_bg.png +%%DATADIR%%/bitmaps/resist_bg.png +%%DATADIR%%/bitmaps/scared.png +%%DATADIR%%/bitmaps/skill_exp_bg.png +%%DATADIR%%/bitmaps/skill_lvl_bg.png +%%DATADIR%%/bitmaps/skin-subred.png +%%DATADIR%%/bitmaps/slider.png +%%DATADIR%%/bitmaps/slider_down.png +%%DATADIR%%/bitmaps/slider_up.png +%%DATADIR%%/bitmaps/sp.png +%%DATADIR%%/bitmaps/sp_back.png +%%DATADIR%%/bitmaps/stimer.png +%%DATADIR%%/bitmaps/target_attack.png +%%DATADIR%%/bitmaps/target_bg.png +%%DATADIR%%/bitmaps/target_hp.png +%%DATADIR%%/bitmaps/target_hp_b.png +%%DATADIR%%/bitmaps/target_normal.png +%%DATADIR%%/bitmaps/target_talk.png +%%DATADIR%%/bitmaps/textinput.png +%%DATADIR%%/bitmaps/textwin.png +%%DATADIR%%/bitmaps/textwin_mask.png +%%DATADIR%%/bitmaps/textwin_scroll.png +%%DATADIR%%/bitmaps/traped.png +%%DATADIR%%/bitmaps/unidentified.png +%%DATADIR%%/bitmaps/unpaid.png +%%DATADIR%%/bitmaps/wand.png +%%DATADIR%%/bitmaps/warn_hp.png +%%DATADIR%%/bitmaps/warn_weight.png +%%DATADIR%%/cache/README.txt +%%DATADIR%%/daimonin +%%DATADIR%%/daimonin.p0 +%%DATADIR%%/gfx_user/README.txt +%%DATADIR%%/icons/guild_dragon1.png +%%DATADIR%%/icons/guild_merc.png +%%DATADIR%%/icons/quests.png +%%DATADIR%%/icons/si_001.png +%%DATADIR%%/icons/si_002.png +%%DATADIR%%/icons/si_003.png +%%DATADIR%%/icons/si_004.png +%%DATADIR%%/icons/si_005.png +%%DATADIR%%/icons/si_006.png +%%DATADIR%%/icons/si_007.png +%%DATADIR%%/icons/si_008.png +%%DATADIR%%/icons/si_009.png +%%DATADIR%%/icons/si_010.png +%%DATADIR%%/icons/si_011.png +%%DATADIR%%/icons/si_012.png +%%DATADIR%%/icons/si_013.png +%%DATADIR%%/icons/si_014.png +%%DATADIR%%/icons/si_015.png +%%DATADIR%%/icons/si_016.png +%%DATADIR%%/icons/si_017.png +%%DATADIR%%/icons/si_018.png +%%DATADIR%%/icons/si_019.png +%%DATADIR%%/icons/si_020.png +%%DATADIR%%/icons/si_021.png +%%DATADIR%%/icons/si_022.png +%%DATADIR%%/icons/si_023.png +%%DATADIR%%/icons/si_024.png +%%DATADIR%%/icons/si_025.png +%%DATADIR%%/icons/si_026.png +%%DATADIR%%/icons/si_027.png +%%DATADIR%%/icons/si_028.png +%%DATADIR%%/icons/si_029.png +%%DATADIR%%/icons/si_030.png +%%DATADIR%%/icons/si_031.png +%%DATADIR%%/icons/si_032.png +%%DATADIR%%/icons/si_033.png +%%DATADIR%%/icons/si_034.png +%%DATADIR%%/icons/si_035.png +%%DATADIR%%/icons/si_036.png +%%DATADIR%%/icons/si_037.png +%%DATADIR%%/icons/si_038.png +%%DATADIR%%/icons/si_039.png +%%DATADIR%%/icons/si_040.png +%%DATADIR%%/icons/si_041.png +%%DATADIR%%/icons/si_042.png +%%DATADIR%%/icons/si_043.png +%%DATADIR%%/icons/si_044.png +%%DATADIR%%/icons/si_045.png +%%DATADIR%%/icons/si_046.png +%%DATADIR%%/icons/si_047.png +%%DATADIR%%/icons/si_048.png +%%DATADIR%%/icons/si_049.png +%%DATADIR%%/icons/si_050.png +%%DATADIR%%/icons/si_051.png +%%DATADIR%%/icons/si_052.png +%%DATADIR%%/icons/si_053.png +%%DATADIR%%/icons/si_054.png +%%DATADIR%%/icons/si_055.png +%%DATADIR%%/icons/si_056.png +%%DATADIR%%/icons/si_057.png +%%DATADIR%%/icons/si_058.png +%%DATADIR%%/icons/si_059.png +%%DATADIR%%/icons/si_060.png +%%DATADIR%%/icons/si_061.png +%%DATADIR%%/icons/si_062.png +%%DATADIR%%/icons/si_063.png +%%DATADIR%%/icons/si_064.png +%%DATADIR%%/icons/si_065.png +%%DATADIR%%/icons/si_066.png +%%DATADIR%%/icons/si_067.png +%%DATADIR%%/icons/si_068.png +%%DATADIR%%/icons/si_069.png +%%DATADIR%%/icons/si_070.png +%%DATADIR%%/icons/si_071.png +%%DATADIR%%/icons/si_072.png +%%DATADIR%%/icons/si_073.png +%%DATADIR%%/icons/si_074.png +%%DATADIR%%/icons/si_075.png +%%DATADIR%%/icons/si_076.png *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Thu May 29 10:44:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4BB13C31; Thu, 29 May 2014 10:44:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 388AC2B22; Thu, 29 May 2014 10:44:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TAiriG031189; Thu, 29 May 2014 10:44:53 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4TAiriF031188; Thu, 29 May 2014 10:44:53 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405291044.s4TAiriF031188@svn.freebsd.org> From: Raphael Kubo da Costa Date: Thu, 29 May 2014 10:44:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355683 - branches/2014Q2/graphics/digikam-kde4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 May 2014 10:44:53 -0000 Author: rakuco Date: Thu May 29 10:44:52 2014 New Revision: 355683 URL: http://svnweb.freebsd.org/changeset/ports/355683 QAT: https://qat.redports.org/buildarchive/r355683/ Log: MFH: r355461 Makefile.common: Move a few other variables outside the NO_BUILD block. Just setting USES=tar:bzip2 is not enough, as ports such as graphics/kipi-plugin-facebook would still report an invalid distfile if NO_BUILD was passed. We now unconditionally set DISTNAME, DISTINFO_FILE and LICENSE besides USES. Approved by: portmgr (bapt) Modified: branches/2014Q2/graphics/digikam-kde4/Makefile.common Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/digikam-kde4/Makefile.common ============================================================================== --- branches/2014Q2/graphics/digikam-kde4/Makefile.common Thu May 29 10:39:36 2014 (r355682) +++ branches/2014Q2/graphics/digikam-kde4/Makefile.common Thu May 29 10:44:52 2014 (r355683) @@ -110,21 +110,20 @@ vkontakte_DESC= Export images to VKonta # wallpaper_DESC= Set image as background on desktop yandexfotki_DESC= Export images to Yandex web service -USES+= tar:bzip2 - -.if !defined(NO_BUILD) DISTNAME= digikam-${DIGIKAM_VER} +DISTINFO_FILE= ${.CURDIR}/../../graphics/digikam-kde4/distinfo LICENSE?= GPLv2 +USES+= tar:bzip2 + +.if !defined(NO_BUILD) USES+= cmake USE_KDE4+= automoc4 kdehier kdeprefix kdelibs USE_QT4+= qmake_build moc_build rcc_build uic_build WRKSRC?= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} -DISTINFO_FILE= ${.CURDIR}/../../graphics/digikam-kde4/distinfo - . if defined(KIPI_PLUGIN) CONFLICTS_INSTALL= kipi-plugins-2.* From owner-svn-ports-branches@FreeBSD.ORG Thu May 29 19:55:22 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86D4F7A3; Thu, 29 May 2014 19:55:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71860216E; Thu, 29 May 2014 19:55:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TJtMnT085568; Thu, 29 May 2014 19:55:22 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4TJtISX085544; Thu, 29 May 2014 19:55:18 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405291955.s4TJtISX085544@svn.freebsd.org> From: Antoine Brodin Date: Thu, 29 May 2014 19:55:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355740 - in branches/2014Q2: japanese/mell japanese/prime japanese/prime-dict japanese/prime-el japanese/suikyo net-mgmt/zenoss net-mgmt/zenpack-checkping net-mgmt/zenpack-dellmon net-... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 May 2014 19:55:22 -0000 Author: antoine Date: Thu May 29 19:55:18 2014 New Revision: 355740 URL: http://svnweb.freebsd.org/changeset/ports/355740 QAT: https://qat.redports.org/buildarchive/r355740/ Log: MFH: r355725 Reset a few maintainers who are unreachable With hat: portmgr Approved by: portmgr (self) Modified: branches/2014Q2/japanese/mell/Makefile branches/2014Q2/japanese/prime-dict/Makefile branches/2014Q2/japanese/prime-el/Makefile branches/2014Q2/japanese/prime/Makefile branches/2014Q2/japanese/suikyo/Makefile branches/2014Q2/net-mgmt/zenoss/Makefile branches/2014Q2/net-mgmt/zenpack-checkping/Makefile branches/2014Q2/net-mgmt/zenpack-dellmon/Makefile branches/2014Q2/net-mgmt/zenpack-deviceadvdetail/Makefile branches/2014Q2/net-mgmt/zenpack-devicesearch/Makefile branches/2014Q2/net-mgmt/zenpack-graphportlet/Makefile branches/2014Q2/net-mgmt/zenpack-interfacegraphs/Makefile branches/2014Q2/net-mgmt/zenpack-libvirt/Makefile branches/2014Q2/net-mgmt/zenpack-macreport/Makefile branches/2014Q2/sysutils/clockspeed-conf/Makefile branches/2014Q2/textproc/py-whoosh/Makefile branches/2014Q2/www/luakit/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/japanese/mell/Makefile ============================================================================== --- branches/2014Q2/japanese/mell/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/japanese/mell/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= japanese MASTER_SITES= http://taiyaki.org/elisp/mell/src/ -MAINTAINER= otsuji@users.sourceforge.jp +MAINTAINER= ports@FreeBSD.org COMMENT= Emacs Lisp for taiyaki-elisp, especially for the prime GNU_CONFIGURE= yes Modified: branches/2014Q2/japanese/prime-dict/Makefile ============================================================================== --- branches/2014Q2/japanese/prime-dict/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/japanese/prime-dict/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -9,7 +9,7 @@ MASTER_SITES= http://prime.sourceforge.j PKGNAMESUFFIX= -dict DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} -MAINTAINER= otsuji@users.sourceforge.jp +MAINTAINER= ports@FreeBSD.org COMMENT= A dictionary set for the prime USE_RUBY= yes Modified: branches/2014Q2/japanese/prime-el/Makefile ============================================================================== --- branches/2014Q2/japanese/prime-el/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/japanese/prime-el/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -9,7 +9,7 @@ MASTER_SITES= http://prime.sourceforge.j PKGNAMESUFFIX= -el DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} -MAINTAINER= otsuji@users.sourceforge.jp +MAINTAINER= ports@FreeBSD.org COMMENT= Emacs lisp set for the prime RUN_DEPENDS+= ${LOCALBASE}/share/emacs/site-lisp/init-mell.el:${PORTSDIR}/japanese/mell \ Modified: branches/2014Q2/japanese/prime/Makefile ============================================================================== --- branches/2014Q2/japanese/prime/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/japanese/prime/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -7,7 +7,7 @@ PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= http://prime.sourceforge.jp/src/ -MAINTAINER= otsuji@users.sourceforge.jp +MAINTAINER= ports@FreeBSD.org COMMENT= PRedictive Input Method Editor(PRIME) LIB_DEPENDS= sary.10:${PORTSDIR}/textproc/sary Modified: branches/2014Q2/japanese/suikyo/Makefile ============================================================================== --- branches/2014Q2/japanese/suikyo/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/japanese/suikyo/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= japanese MASTER_SITES= http://prime.sourceforge.jp/src/ -MAINTAINER= otsuji@users.sourceforge.jp +MAINTAINER= ports@FreeBSD.org COMMENT= Romaji-Kana conversion Library for the prime USE_RUBY= yes Modified: branches/2014Q2/net-mgmt/zenoss/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenoss/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenoss/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -11,7 +11,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.ta JSBuilder2.zip:source2 EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Application, server, and network management platform LICENSE= GPLv2 Modified: branches/2014Q2/net-mgmt/zenpack-checkping/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenpack-checkping/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenpack-checkping/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -7,7 +7,7 @@ CATEGORIES= net-mgmt www MASTER_SITES= https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/tarball/master/ DISTFILES= zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG} -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Provides nagios ping check for Zenoss monitoring PLIST_FILES= zenoss/ZenPack/${ZPACK} Modified: branches/2014Q2/net-mgmt/zenpack-dellmon/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenpack-dellmon/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenpack-dellmon/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -8,7 +8,7 @@ CATEGORIES= net-mgmt MASTER_SITES= https://github.com/epuzanov/${ZPACKPREFIX}${PORTNAME}/tarball/dellmon-2.4/ DISTNAME= epuzanov-${ZPACKPREFIX}${PORTNAME}-dellmon-2.4-0-g9697659 -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Provides additional monitoring options for Dell machines PLIST_FILES= zenoss/ZenPack/${ZPACK} Modified: branches/2014Q2/net-mgmt/zenpack-deviceadvdetail/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenpack-deviceadvdetail/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenpack-deviceadvdetail/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -7,7 +7,7 @@ CATEGORIES= net-mgmt MASTER_SITES= https://github.com/epuzanov/${ZPACKPREFIX}${PORTNAME}/tarball/deviceadvdetail-2.7/ DISTNAME= epuzanov-${ZPACKPREFIX}${PORTNAME}-deviceadvdetail-2.7-0-g4cc7c48 -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Provides additional hardware details for Zenoss PLIST_FILES= zenoss/ZenPack/${ZPACK} Modified: branches/2014Q2/net-mgmt/zenpack-devicesearch/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenpack-devicesearch/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenpack-devicesearch/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -6,7 +6,7 @@ PORTVERSION= 1.0.0 CATEGORIES= net-mgmt MASTER_SITES= http://www.glenbarber.us/ports/net-mgmt/zenpack-${PORTNAME}/ -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Provides the ability to quickly search for devices in Zenoss PLIST_FILES= zenoss/ZenPack/${ZPACK} Modified: branches/2014Q2/net-mgmt/zenpack-graphportlet/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenpack-graphportlet/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenpack-graphportlet/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -7,7 +7,7 @@ CATEGORIES= net-mgmt www MASTER_SITES= https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/tarball/master/ DISTNAME= zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG} -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Enables users to show any graph/multi graph reports on their dashboard PLIST_FILES= zenoss/ZenPack/${ZPACK} Modified: branches/2014Q2/net-mgmt/zenpack-interfacegraphs/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenpack-interfacegraphs/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenpack-interfacegraphs/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -7,7 +7,7 @@ CATEGORIES= net-mgmt MASTER_SITES= https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/tarball/master/ DISTNAME= zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG} -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Provides a link that graphs all network interfaces for a device PLIST_FILES= zenoss/ZenPack/${ZPACK} Modified: branches/2014Q2/net-mgmt/zenpack-libvirt/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenpack-libvirt/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenpack-libvirt/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -8,7 +8,7 @@ CATEGORIES= net-mgmt MASTER_SITES= https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/tarball/master/ DISTNAME= zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG} -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Provides monitoring of virtualization servers through Zenoss LICENSE= GPLv2 Modified: branches/2014Q2/net-mgmt/zenpack-macreport/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/zenpack-macreport/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/net-mgmt/zenpack-macreport/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -7,7 +7,7 @@ CATEGORIES= net-mgmt MASTER_SITES= https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/zipball/master/ DISTNAME= zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG} -MAINTAINER= zenoss@experts-exchange.com +MAINTAINER= ports@FreeBSD.org COMMENT= Lists MAC address and the Device and Interface associated info PLIST_FILES= zenoss/ZenPack/${ZPACK} Modified: branches/2014Q2/sysutils/clockspeed-conf/Makefile ============================================================================== --- branches/2014Q2/sysutils/clockspeed-conf/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/sysutils/clockspeed-conf/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -6,7 +6,7 @@ PORTVERSION= 0.4.5 CATEGORIES= sysutils MASTER_SITES= http://foo42.de/distfiles/ -MAINTAINER= atamaniuk-ports@frobs.net +MAINTAINER= ports@FreeBSD.org COMMENT= Supervise scripts for clockspeed to use daemontools RUN_DEPENDS= supervise:${PORTSDIR}/sysutils/daemontools \ Modified: branches/2014Q2/textproc/py-whoosh/Makefile ============================================================================== --- branches/2014Q2/textproc/py-whoosh/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/textproc/py-whoosh/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -9,7 +9,7 @@ MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Whoosh-${PORTVERSION} -MAINTAINER= gugabsd@mundounix.com.br +MAINTAINER= ports@FreeBSD.org COMMENT= Featureful full-text indexing and searching in Python USE_PYTHON= yes Modified: branches/2014Q2/www/luakit/Makefile ============================================================================== --- branches/2014Q2/www/luakit/Makefile Thu May 29 19:47:43 2014 (r355739) +++ branches/2014Q2/www/luakit/Makefile Thu May 29 19:55:18 2014 (r355740) @@ -5,7 +5,7 @@ PORTNAME= luakit PORTVERSION= 2012.09.13r1 CATEGORIES= www -MAINTAINER= gugabsd@mundounix.com.br +MAINTAINER= ports@FreeBSD.org COMMENT= Fast, small, webkit based browser framework extensible by Lua LICENSE= GPLv3 From owner-svn-ports-branches@FreeBSD.ORG Thu May 29 23:19:57 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E7F9278; Thu, 29 May 2014 23:19:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E585E230B; Thu, 29 May 2014 23:19:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TNJul1078784; Thu, 29 May 2014 23:19:56 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4TNJuIC078780; Thu, 29 May 2014 23:19:56 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405292319.s4TNJuIC078780@svn.freebsd.org> From: Antoine Brodin Date: Thu, 29 May 2014 23:19:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355760 - in branches/2014Q2: archivers/unace mail/pop3gwd misc/buffer sysutils/skill X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 May 2014 23:19:57 -0000 Author: antoine Date: Thu May 29 23:19:55 2014 New Revision: 355760 URL: http://svnweb.freebsd.org/changeset/ports/355760 QAT: https://qat.redports.org/buildarchive/r355760/ Log: MFH: r355759 Reset maintainer, maintainer no longer wishes to maintain those ports With hat: portmgr Approved by: portmgr (self) Modified: branches/2014Q2/archivers/unace/Makefile branches/2014Q2/mail/pop3gwd/Makefile branches/2014Q2/misc/buffer/Makefile branches/2014Q2/sysutils/skill/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/archivers/unace/Makefile ============================================================================== --- branches/2014Q2/archivers/unace/Makefile Thu May 29 23:18:42 2014 (r355759) +++ branches/2014Q2/archivers/unace/Makefile Thu May 29 23:19:55 2014 (r355760) @@ -8,7 +8,7 @@ CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= utils/compress -MAINTAINER= jonny@jonny.eng.br +MAINTAINER= ports@FreeBSD.org COMMENT= Extract, view & test ACE archives MAKE_JOBS_UNSAFE= yes Modified: branches/2014Q2/mail/pop3gwd/Makefile ============================================================================== --- branches/2014Q2/mail/pop3gwd/Makefile Thu May 29 23:18:42 2014 (r355759) +++ branches/2014Q2/mail/pop3gwd/Makefile Thu May 29 23:19:55 2014 (r355760) @@ -6,7 +6,7 @@ PORTVERSION= 1.2 CATEGORIES= mail net MASTER_SITES= http://fresh.t-systems-sfr.com/linux/src/ -MAINTAINER= jonny@jonny.eng.br +MAINTAINER= ports@FreeBSD.org COMMENT= App-level proxy for Mail retrieval behind Firewalls WRKSRC= ${WRKDIR}/${PORTNAME} Modified: branches/2014Q2/misc/buffer/Makefile ============================================================================== --- branches/2014Q2/misc/buffer/Makefile Thu May 29 23:18:42 2014 (r355759) +++ branches/2014Q2/misc/buffer/Makefile Thu May 29 23:19:55 2014 (r355760) @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GENTOO} \ MASTER_SITE_SUBDIR= distfiles EXTRACT_SUFX= .tgz -MAINTAINER= jonny@jonny.eng.br +MAINTAINER= ports@FreeBSD.org COMMENT= Buffer sporadic I/O for faster tape and pipe throughput PLIST_FILES= bin/buffer \ Modified: branches/2014Q2/sysutils/skill/Makefile ============================================================================== --- branches/2014Q2/sysutils/skill/Makefile Thu May 29 23:18:42 2014 (r355759) +++ branches/2014Q2/sysutils/skill/Makefile Thu May 29 23:19:55 2014 (r355760) @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.flux.utah.edu/pu ftp://fast.cs.utah.edu/pub/skill/ EXTRACT_SUFX= .tgz -MAINTAINER= jonny@jonny.eng.br +MAINTAINER= ports@FreeBSD.org COMMENT= SuperKILL, kill, or renice processes by pid, name, tty, or uid .include From owner-svn-ports-branches@FreeBSD.ORG Fri May 30 07:14:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C803C255; Fri, 30 May 2014 07:14:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B05BA27AF; Fri, 30 May 2014 07:14:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4U7ESJF095629; Fri, 30 May 2014 07:14:28 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4U7ESo7095628; Fri, 30 May 2014 07:14:28 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201405300714.s4U7ESo7095628@svn.freebsd.org> From: Antoine Brodin Date: Fri, 30 May 2014 07:14:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355794 - branches/2014Q2/net-mgmt/nedi X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2014 07:14:28 -0000 Author: antoine Date: Fri May 30 07:14:28 2014 New Revision: 355794 URL: http://svnweb.freebsd.org/changeset/ports/355794 QAT: https://qat.redports.org/buildarchive/r355794/ Log: MFH: r355793 Maintainer no longer has time to maintain this port With hat: portmgr Approved by: portmgr (self) Modified: branches/2014Q2/net-mgmt/nedi/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/net-mgmt/nedi/Makefile ============================================================================== --- branches/2014Q2/net-mgmt/nedi/Makefile Fri May 30 07:13:33 2014 (r355793) +++ branches/2014Q2/net-mgmt/nedi/Makefile Fri May 30 07:14:28 2014 (r355794) @@ -8,7 +8,7 @@ CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/w EXTRACT_SUFX= .tgz -MAINTAINER= cristi@net.utcluj.ro +MAINTAINER= ports@FreeBSD.org COMMENT= Network Discovery and Monitoring tool RUN_DEPENDS= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ From owner-svn-ports-branches@FreeBSD.ORG Fri May 30 14:56:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44FF1BC6; Fri, 30 May 2014 14:56:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31A6A2E4E; Fri, 30 May 2014 14:56:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UEuU9U004501; Fri, 30 May 2014 14:56:30 GMT (envelope-from olivierd@svn.freebsd.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4UEuU2x004500; Fri, 30 May 2014 14:56:30 GMT (envelope-from olivierd@svn.freebsd.org) Message-Id: <201405301456.s4UEuU2x004500@svn.freebsd.org> From: Olivier Duchateau Date: Fri, 30 May 2014 14:56:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355854 - branches/2014Q2/science/xfce4-equake-plugin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2014 14:56:30 -0000 Author: olivierd Date: Fri May 30 14:56:29 2014 New Revision: 355854 URL: http://svnweb.freebsd.org/changeset/ports/355854 QAT: https://qat.redports.org/buildarchive/r355854/ Log: - Fix checksum Approved by: portmgr (antoine@) Modified: branches/2014Q2/science/xfce4-equake-plugin/distinfo Modified: branches/2014Q2/science/xfce4-equake-plugin/distinfo ============================================================================== --- branches/2014Q2/science/xfce4-equake-plugin/distinfo Fri May 30 14:41:41 2014 (r355853) +++ branches/2014Q2/science/xfce4-equake-plugin/distinfo Fri May 30 14:56:29 2014 (r355854) @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-equake-plugin-1.3.4.tar.bz2) = 192afa855786f4ee1e24e9ab7f9f1376ca443ebc53824f5a9287bf0c78841d17 -SIZE (xfce4/xfce4-equake-plugin-1.3.4.tar.bz2) = 385454 +SHA256 (xfce4/xfce4-equake-plugin-1.3.4.tar.bz2) = cdf626f6a10b645f994738a572997cc89405ce5b5c8fd077a886b63056a0a38e +SIZE (xfce4/xfce4-equake-plugin-1.3.4.tar.bz2) = 385283 From owner-svn-ports-branches@FreeBSD.ORG Sun Jun 1 10:31:46 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4B80EC39; Sun, 1 Jun 2014 10:31:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 205872DCB; Sun, 1 Jun 2014 10:31:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s51AVjSh087417; Sun, 1 Jun 2014 10:31:45 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s51AVjEH087416; Sun, 1 Jun 2014 10:31:45 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406011031.s51AVjEH087416@svn.freebsd.org> From: Pawel Pekala Date: Sun, 1 Jun 2014 10:31:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356091 - branches/2014Q2/lang/execline X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jun 2014 10:31:46 -0000 Author: pawel Date: Sun Jun 1 10:31:45 2014 New Revision: 356091 URL: http://svnweb.freebsd.org/changeset/ports/356091 QAT: https://qat.redports.org/buildarchive/r356091/ Log: MFH: r356067 - Fix build on 10+ by respecting CC, CFLAGS - Add staging support - Convert to new options framework Approved by: portmgr (miwi) Modified: branches/2014Q2/lang/execline/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/lang/execline/Makefile ============================================================================== --- branches/2014Q2/lang/execline/Makefile Sun Jun 1 10:28:07 2014 (r356090) +++ branches/2014Q2/lang/execline/Makefile Sun Jun 1 10:31:45 2014 (r356091) @@ -16,7 +16,8 @@ WRKSRC= ${WRKDIR}/admin/${DISTNAME} DOCS= package/CHANGES package/README package/THANKS package/TODO \ doc/*.html -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + do-configure: ${ECHO_CMD} "FreeBSD" > ${WRKSRC}/src/sys/systype ${ECHO_CMD} "${LOCALBASE}/include/skalibs" \ @@ -25,20 +26,22 @@ do-configure: >> ${WRKSRC}/conf-compile/import ${REINPLACE_CMD} -e 's|superstrip1|#superstrip1|g' \ ${WRKSRC}/conf-compile/conf-stripbins + @${REINPLACE_CMD} 's|gcc|${CC}|; s|-O2.*|${CFLAGS}|' \ + ${WRKSRC}/conf-compile/conf-cc \ + ${WRKSRC}/conf-compile/conf-ld do-build: cd ${WRKSRC} && package/compile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/command/* ${PREFIX}/bin - @${MKDIR} ${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/library/* ${PREFIX}/lib - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/* ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/command/* ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/include/* \ + ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/library/* ${STAGEDIR}${PREFIX}/lib + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/* ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 5 16:46:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FA6855D; Thu, 5 Jun 2014 16:46:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F03CA2200; Thu, 5 Jun 2014 16:46:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55GkrHq060998; Thu, 5 Jun 2014 16:46:53 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55Gkr3B060996; Thu, 5 Jun 2014 16:46:53 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406051646.s55Gkr3B060996@svn.freebsd.org> From: Raphael Kubo da Costa Date: Thu, 5 Jun 2014 16:46:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356650 - in branches/2014Q2/x11/kdelibs4: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 16:46:54 -0000 Author: rakuco Date: Thu Jun 5 16:46:53 2014 New Revision: 356650 URL: http://svnweb.freebsd.org/changeset/ports/356650 QAT: https://qat.redports.org/buildarchive/r356650/ Log: MFH: r356550 Add upstream patch to fix the build of the translation ports after r353989. The libxml2 fix for CVE-2014-0191 broke meinproc4, which resulted in the KDE translation ports failing to build. Approved by: portmgr (miwi) Added: branches/2014Q2/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a - copied unchanged from r356550, head/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a Modified: branches/2014Q2/x11/kdelibs4/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/x11/kdelibs4/Makefile ============================================================================== --- branches/2014Q2/x11/kdelibs4/Makefile Thu Jun 5 16:44:31 2014 (r356649) +++ branches/2014Q2/x11/kdelibs4/Makefile Thu Jun 5 16:46:53 2014 (r356650) @@ -3,6 +3,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Copied: branches/2014Q2/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a (from r356550, head/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a Thu Jun 5 16:46:53 2014 (r356650, copy of r356550, head/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a) @@ -0,0 +1,44 @@ +commit d4fca9ffb31a2383459c89b27f81b10b7ddece1a +Author: Luigi Toscano +Date: Wed Jun 4 22:40:12 2014 +0200 + + Explicitly load external entities (after CVE-2014-0191) + + Use the more modern API function for XML loading and enable the + flags which load the external entities, so that meinproc4 can work + again after the security changes implemented for CVE-2014-0191. + Network loading is disabled too now. + + REVIEW: 118270 + BUG: 335001 + FIXED-IN: 4.13.2 + +diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp +index e0f8faf..0467f22 100644 +--- kdoctools/meinproc.cpp ++++ kdoctools/meinproc.cpp +@@ -207,8 +207,8 @@ int main(int argc, char **argv) { + + if (style_sheet != NULL) { + +- xmlDocPtr doc = xmlParseFile( QFile::encodeName( checkFilename ).constData() ); +- ++ xmlDocPtr doc = xmlReadFile( QFile::encodeName( checkFilename ).constData(), ++ NULL, XML_PARSE_NOENT|XML_PARSE_DTDLOAD|XML_PARSE_NONET ); + xmlDocPtr res = xsltApplyStylesheet(style_sheet, doc, ¶ms[0]); + + xmlFreeDoc(doc); +diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp +index a7265ca..4d64de4 100644 +--- kdoctools/xslt.cpp ++++ kdoctools/xslt.cpp +@@ -157,7 +157,8 @@ QString transform( const QString &pat, const QString& tss, + + INFO(i18n("Parsing document")); + +- xmlDocPtr doc = xmlParseFile(QFile::encodeName(pat)); ++ xmlDocPtr doc = xmlReadFile(QFile::encodeName(pat), NULL, ++ XML_PARSE_NOENT|XML_PARSE_DTDLOAD|XML_PARSE_NONET); + xsltTransformContextPtr ctxt; + + ctxt = xsltNewTransformContext(style_sheet, doc); From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 5 17:51:35 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B35CE6D7; Thu, 5 Jun 2014 17:51:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A07BB2835; Thu, 5 Jun 2014 17:51:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55HpZiQ090422; Thu, 5 Jun 2014 17:51:35 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55HpZD6090421; Thu, 5 Jun 2014 17:51:35 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406051751.s55HpZD6090421@svn.freebsd.org> From: Bryan Drewery Date: Thu, 5 Jun 2014 17:51:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356655 - in branches/2014Q2/textproc/kdiff3: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 17:51:35 -0000 Author: bdrewery Date: Thu Jun 5 17:51:35 2014 New Revision: 356655 URL: http://svnweb.freebsd.org/changeset/ports/356655 QAT: https://qat.redports.org/buildarchive/r356655/ Log: MFH: r356654 - Fix saving output with -o when using relative paths PR: 190158 Submitted by: emaste Approved by: luca.pizzamiglio@gmail.com (maintainer) Obtained from: http://sourceforge.net/p/kdiff3/code/ci/23ad423e4255c80ee22b269f73e20333f7c06678/ Added: branches/2014Q2/textproc/kdiff3/files/ - copied from r356654, head/textproc/kdiff3/files/ Modified: branches/2014Q2/textproc/kdiff3/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/textproc/kdiff3/Makefile ============================================================================== --- branches/2014Q2/textproc/kdiff3/Makefile Thu Jun 5 17:50:01 2014 (r356654) +++ branches/2014Q2/textproc/kdiff3/Makefile Thu Jun 5 17:51:35 2014 (r356655) @@ -3,8 +3,7 @@ PORTNAME= kdiff3 PORTVERSION= 0.9.97 -#PORTREVISION= 0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc kde MASTER_SITES= SF From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 5 17:54:34 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE5EE7FB; Thu, 5 Jun 2014 17:54:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 814EE284C; Thu, 5 Jun 2014 17:54:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55HsY9s092649; Thu, 5 Jun 2014 17:54:34 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55HsYpx092647; Thu, 5 Jun 2014 17:54:34 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406051754.s55HsYpx092647@svn.freebsd.org> From: Bryan Drewery Date: Thu, 5 Jun 2014 17:54:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356656 - in branches/2014Q2/security/gnutls: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 17:54:34 -0000 Author: bdrewery Date: Thu Jun 5 17:54:33 2014 New Revision: 356656 URL: http://svnweb.freebsd.org/changeset/ports/356656 QAT: https://qat.redports.org/buildarchive/r356656/ Log: MFH: r356535 Patch CVE-2014-3466 to prevent memory corruption due to server hello parsing. Skipped PORTREVISION 5 which made several framework updates not needed here. Obtained from: https://gitorious.org/gnutls/gnutls/commit/688ea6428a432c39203d00acd1af0e7684e5ddfd Security: CVE-2014-3466, 9733c480-ebff-11e3-970b-206a8a720317 Added: branches/2014Q2/security/gnutls/files/patch-lib-gnutls_handshake.c - copied unchanged from r356535, head/security/gnutls/files/patch-lib-gnutls_handshake.c Modified: branches/2014Q2/security/gnutls/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/gnutls/Makefile ============================================================================== --- branches/2014Q2/security/gnutls/Makefile Thu Jun 5 17:51:35 2014 (r356655) +++ branches/2014Q2/security/gnutls/Makefile Thu Jun 5 17:54:33 2014 (r356656) @@ -3,7 +3,7 @@ PORTNAME= gnutls PORTVERSION= 2.12.23 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= security net MASTER_SITES= \ ftp://ftp.gnutls.org/gcrypt/gnutls/v${PORTVERSION:C/.[0-9]+$//}/ \ Copied: branches/2014Q2/security/gnutls/files/patch-lib-gnutls_handshake.c (from r356535, head/security/gnutls/files/patch-lib-gnutls_handshake.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/security/gnutls/files/patch-lib-gnutls_handshake.c Thu Jun 5 17:54:33 2014 (r356656, copy of r356535, head/security/gnutls/files/patch-lib-gnutls_handshake.c) @@ -0,0 +1,11 @@ +--- lib/gnutls_handshake.c.orig 2012-11-03 06:03:47.000000000 -0700 ++++ lib/gnutls_handshake.c 2014-06-04 07:55:49.138570114 -0700 +@@ -1797,7 +1797,7 @@ + DECR_LEN (len, 1); + session_id_len = data[pos++]; + +- if (len < session_id_len) ++ if (len < session_id_len || session_id_len > TLS_MAX_SESSION_ID_SIZE) + { + gnutls_assert (); + return GNUTLS_E_UNSUPPORTED_VERSION_PACKET; From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 5 17:55:39 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B25438F5; Thu, 5 Jun 2014 17:55:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 851082860; Thu, 5 Jun 2014 17:55:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55Htd21092969; Thu, 5 Jun 2014 17:55:39 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55HtdZP092967; Thu, 5 Jun 2014 17:55:39 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406051755.s55HtdZP092967@svn.freebsd.org> From: Bryan Drewery Date: Thu, 5 Jun 2014 17:55:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356657 - in branches/2014Q2/security/openssl: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 17:55:39 -0000 Author: bdrewery Date: Thu Jun 5 17:55:38 2014 New Revision: 356657 URL: http://svnweb.freebsd.org/changeset/ports/356657 QAT: https://qat.redports.org/buildarchive/r356657/ Log: MFH: r352928 - Security patch Security: CVE-2014-0198 Security: http://seclists.org/oss-sec/2014/q2/232 Security: https://rt.openssl.org/Ticket/Display.html?user=guest&pass=guest&id=3321 Obtained from: OpenBSD Modified: branches/2014Q2/security/openssl/Makefile branches/2014Q2/security/openssl/files/patch-ssl-s3_pkt.c Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/openssl/Makefile ============================================================================== --- branches/2014Q2/security/openssl/Makefile Thu Jun 5 17:54:33 2014 (r356656) +++ branches/2014Q2/security/openssl/Makefile Thu Jun 5 17:55:38 2014 (r356657) @@ -4,7 +4,7 @@ PORTNAME= openssl PORTVERSION= 1.0.1 DISTVERSIONSUFFIX= g -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ Modified: branches/2014Q2/security/openssl/files/patch-ssl-s3_pkt.c ============================================================================== --- branches/2014Q2/security/openssl/files/patch-ssl-s3_pkt.c Thu Jun 5 17:54:33 2014 (r356656) +++ branches/2014Q2/security/openssl/files/patch-ssl-s3_pkt.c Thu Jun 5 17:55:38 2014 (r356657) @@ -1,13 +1,22 @@ -Index: crypto/openssl/ssl/s3_pkt.c -=================================================================== ---- ssl/s3_pkt.c (revision 264309) -+++ ssl/s3_pkt.c (working copy) -@@ -1055,7 +1055,7 @@ start: - { - s->rstate=SSL_ST_READ_HEADER; - rr->off=0; +--- ssl/s3_pkt.c.orig 2014-03-17 17:14:20.000000000 +0100 ++++ ssl/s3_pkt.c 2014-05-03 18:07:28.000000000 +0200 +@@ -657,6 +657,10 @@ + if (i <= 0) + return(i); + /* if it went, fall through and send more stuff */ ++ /* we may have released our buffer, so get it again */ ++ if (wb->buf == NULL) ++ if (!ssl3_setup_write_buffer(s)) ++ return -1; + } + + if (len == 0 && !create_empty_fragment) +@@ -1055,7 +1059,7 @@ + { + s->rstate=SSL_ST_READ_HEADER; + rr->off=0; - if (s->mode & SSL_MODE_RELEASE_BUFFERS) + if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0) - ssl3_release_read_buffer(s); - } - } + ssl3_release_read_buffer(s); + } + } From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 5 17:56:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C6B99E1; Thu, 5 Jun 2014 17:56:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2910C2869; Thu, 5 Jun 2014 17:56:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55HuEg4093181; Thu, 5 Jun 2014 17:56:14 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55HuDLJ093178; Thu, 5 Jun 2014 17:56:13 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406051756.s55HuDLJ093178@svn.freebsd.org> From: Bryan Drewery Date: Thu, 5 Jun 2014 17:56:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356658 - in branches/2014Q2/security/openssl: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 17:56:14 -0000 Author: bdrewery Date: Thu Jun 5 17:56:13 2014 New Revision: 356658 URL: http://svnweb.freebsd.org/changeset/ports/356658 QAT: https://qat.redports.org/buildarchive/r356658/ Log: MFH: r356632 Update to 1.0.1h. Approved by: so (ports-security@ blanket) Security: 5ac53801-ec2e-11e3-9cf3-3c970e169bc2 Deleted: branches/2014Q2/security/openssl/files/patch-ssl-s3_pkt.c Modified: branches/2014Q2/security/openssl/Makefile branches/2014Q2/security/openssl/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/openssl/Makefile ============================================================================== --- branches/2014Q2/security/openssl/Makefile Thu Jun 5 17:55:38 2014 (r356657) +++ branches/2014Q2/security/openssl/Makefile Thu Jun 5 17:56:13 2014 (r356658) @@ -3,8 +3,8 @@ PORTNAME= openssl PORTVERSION= 1.0.1 -DISTVERSIONSUFFIX= g -PORTREVISION= 12 +DISTVERSIONSUFFIX= h +PORTREVISION= 13 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ Modified: branches/2014Q2/security/openssl/distinfo ============================================================================== --- branches/2014Q2/security/openssl/distinfo Thu Jun 5 17:55:38 2014 (r356657) +++ branches/2014Q2/security/openssl/distinfo Thu Jun 5 17:56:13 2014 (r356658) @@ -1,10 +1,10 @@ -SHA256 (openssl-1.0.1g/openssl-1.0.1g.tar.gz) = 53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 -SIZE (openssl-1.0.1g/openssl-1.0.1g.tar.gz) = 4509047 -SHA256 (openssl-1.0.1g/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae -SIZE (openssl-1.0.1g/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 -SHA256 (openssl-1.0.1g/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 -SIZE (openssl-1.0.1g/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867 -SHA256 (openssl-1.0.1g/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b -SIZE (openssl-1.0.1g/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 -SHA256 (openssl-1.0.1g/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f -SIZE (openssl-1.0.1g/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 +SHA256 (openssl-1.0.1h/openssl-1.0.1h.tar.gz) = 9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 +SIZE (openssl-1.0.1h/openssl-1.0.1h.tar.gz) = 4475692 +SHA256 (openssl-1.0.1h/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae +SIZE (openssl-1.0.1h/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 +SHA256 (openssl-1.0.1h/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 +SIZE (openssl-1.0.1h/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867 +SHA256 (openssl-1.0.1h/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b +SIZE (openssl-1.0.1h/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 +SHA256 (openssl-1.0.1h/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f +SIZE (openssl-1.0.1h/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 5 17:59:32 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1680EC63; Thu, 5 Jun 2014 17:59:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03887288C; Thu, 5 Jun 2014 17:59:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55HxVt8093696; Thu, 5 Jun 2014 17:59:31 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55HxVS1093694; Thu, 5 Jun 2014 17:59:31 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406051759.s55HxVS1093694@svn.freebsd.org> From: Bryan Drewery Date: Thu, 5 Jun 2014 17:59:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356659 - branches/2014Q2/security/gnutls3 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 17:59:32 -0000 Author: bdrewery Date: Thu Jun 5 17:59:31 2014 New Revision: 356659 URL: http://svnweb.freebsd.org/changeset/ports/356659 QAT: https://qat.redports.org/buildarchive/r356659/ Log: MFH: r356401 - Update to 3.1.25 This fixes a security issue: http://www.gnutls.org/security.html#GNUTLS-SA-2014-3 Security: 027af74d-eb56-11e3-9032-000c2980a9f3 Modified: branches/2014Q2/security/gnutls3/Makefile branches/2014Q2/security/gnutls3/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/gnutls3/Makefile ============================================================================== --- branches/2014Q2/security/gnutls3/Makefile Thu Jun 5 17:56:13 2014 (r356658) +++ branches/2014Q2/security/gnutls3/Makefile Thu Jun 5 17:59:31 2014 (r356659) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gnutls -PORTVERSION= 3.1.22 +PORTVERSION= 3.1.25 CATEGORIES= security net MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/ PKGNAMESUFFIX= ${GNUTLS_SUFFIX} Modified: branches/2014Q2/security/gnutls3/distinfo ============================================================================== --- branches/2014Q2/security/gnutls3/distinfo Thu Jun 5 17:56:13 2014 (r356658) +++ branches/2014Q2/security/gnutls3/distinfo Thu Jun 5 17:59:31 2014 (r356659) @@ -1,2 +1,2 @@ -SHA256 (gnutls-3.1.22.tar.xz) = ef1aedf4118f2f7c75c1a13094ec70cdff92cb724d0413333b4079ea492b9dce -SIZE (gnutls-3.1.22.tar.xz) = 5159752 +SHA256 (gnutls-3.1.25.tar.xz) = 36c2f85b848eb46235909a893b8c17474325084a705b4f6da3c3594e8b94272e +SIZE (gnutls-3.1.25.tar.xz) = 5150612 From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 5 19:06:56 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B06A5A9B; Thu, 5 Jun 2014 19:06:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 92F072FA2; Thu, 5 Jun 2014 19:06:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55J6ueu028916; Thu, 5 Jun 2014 19:06:56 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55J6tZd028907; Thu, 5 Jun 2014 19:06:55 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201406051906.s55J6tZd028907@svn.freebsd.org> From: Antoine Brodin Date: Thu, 5 Jun 2014 19:06:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356684 - branches/2014Q2/devel/p4web X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 19:06:56 -0000 Author: antoine Date: Thu Jun 5 19:06:55 2014 New Revision: 356684 URL: http://svnweb.freebsd.org/changeset/ports/356684 QAT: https://qat.redports.org/buildarchive/r356684/ Log: MFH: r356683 - Update to 2012.1.732581 (and make fetchable again) - Stage support PR: 190522 Submitted by: gordon (maintainer) Approved by: portmgr (self) Modified: branches/2014Q2/devel/p4web/Makefile branches/2014Q2/devel/p4web/distinfo.freebsd60x86 branches/2014Q2/devel/p4web/distinfo.freebsd60x86_64 branches/2014Q2/devel/p4web/distinfo.freebsd70x86 branches/2014Q2/devel/p4web/distinfo.freebsd70x86_64 Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/p4web/Makefile ============================================================================== --- branches/2014Q2/devel/p4web/Makefile Thu Jun 5 19:04:23 2014 (r356683) +++ branches/2014Q2/devel/p4web/Makefile Thu Jun 5 19:06:55 2014 (r356684) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4web -PORTVERSION= 2012.1.610342 +PORTVERSION= 2012.1.732581 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/r${P4VERSION}/bin.${PLATFORM}/ @@ -30,7 +30,6 @@ SUB_LIST= P4LOG=${P4LOG} USE_RC_SUBR= p4web -NO_STAGE= yes .include .include "${.CURDIR}/../p4/Makefile.inc" @@ -39,14 +38,11 @@ USERS= p4admin GROUPS= p4admin do-install: - ${INSTALL_PROGRAM} ${_DISTDIR}/p4web ${PREFIX}/sbin/ + ${INSTALL_PROGRAM} ${_DISTDIR}/p4web ${STAGEDIR}${PREFIX}/sbin/ post-install: - ${TOUCH} ${DESTDIR}${P4LOG} - ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG} - ${CHMOD} 640 ${DESTDIR}${P4LOG} - @${ECHO_CMD} "@exec ${TOUCH} ${DESTDIR}${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHMOD} 640 ${DESTDIR}${P4LOG}" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST} .include Modified: branches/2014Q2/devel/p4web/distinfo.freebsd60x86 ============================================================================== --- branches/2014Q2/devel/p4web/distinfo.freebsd60x86 Thu Jun 5 19:04:23 2014 (r356683) +++ branches/2014Q2/devel/p4web/distinfo.freebsd60x86 Thu Jun 5 19:06:55 2014 (r356684) @@ -1,2 +1,2 @@ -SHA256 (perforce/2012.1.610342/bin.freebsd60x86/p4web) = fc4841a50fe6e318e02514f22526f67c293e147c456eb021a6e2abe4ee15d863 -SIZE (perforce/2012.1.610342/bin.freebsd60x86/p4web) = 3871632 +SHA256 (perforce/2012.1.732581/bin.freebsd60x86/p4web) = 746884d94050689dade71a44eaa37012deff975e8eb4b04e0bf479b69b5d9d2e +SIZE (perforce/2012.1.732581/bin.freebsd60x86/p4web) = 3875952 Modified: branches/2014Q2/devel/p4web/distinfo.freebsd60x86_64 ============================================================================== --- branches/2014Q2/devel/p4web/distinfo.freebsd60x86_64 Thu Jun 5 19:04:23 2014 (r356683) +++ branches/2014Q2/devel/p4web/distinfo.freebsd60x86_64 Thu Jun 5 19:06:55 2014 (r356684) @@ -1,2 +1,2 @@ -SHA256 (perforce/2012.1.610342/bin.freebsd60x86_64/p4web) = 954ca53022984ce99a60db9fafd6fec122785966a6256ef24af3257d0c1b2e86 -SIZE (perforce/2012.1.610342/bin.freebsd60x86_64/p4web) = 4124080 +SHA256 (perforce/2012.1.732581/bin.freebsd60x86_64/p4web) = f211f68c8d6df675601b6fbf53cc985ca03c92c0f67bde0aa53d85028c881ee9 +SIZE (perforce/2012.1.732581/bin.freebsd60x86_64/p4web) = 4128464 Modified: branches/2014Q2/devel/p4web/distinfo.freebsd70x86 ============================================================================== --- branches/2014Q2/devel/p4web/distinfo.freebsd70x86 Thu Jun 5 19:04:23 2014 (r356683) +++ branches/2014Q2/devel/p4web/distinfo.freebsd70x86 Thu Jun 5 19:06:55 2014 (r356684) @@ -1,2 +1,2 @@ -SHA256 (perforce/2012.1.610342/bin.freebsd70x86/p4web) = 16d2b112f01b036dde258fcfa480651a98cbea30b0f3ac4c083a76939fc172cf -SIZE (perforce/2012.1.610342/bin.freebsd70x86/p4web) = 4192504 +SHA256 (perforce/2012.1.732581/bin.freebsd70x86/p4web) = f8f6e7ce86d65beadfcbadcc99104ade75d243f3b42f5fa70714d0903e137820 +SIZE (perforce/2012.1.732581/bin.freebsd70x86/p4web) = 4197112 Modified: branches/2014Q2/devel/p4web/distinfo.freebsd70x86_64 ============================================================================== --- branches/2014Q2/devel/p4web/distinfo.freebsd70x86_64 Thu Jun 5 19:04:23 2014 (r356683) +++ branches/2014Q2/devel/p4web/distinfo.freebsd70x86_64 Thu Jun 5 19:06:55 2014 (r356684) @@ -1,2 +1,2 @@ -SHA256 (perforce/2012.1.610342/bin.freebsd70x86_64/p4web) = 6133e737be9dc1a6067d73bf99eafc28560af3d02c1a420afd8c085fa29cf77e -SIZE (perforce/2012.1.610342/bin.freebsd70x86_64/p4web) = 4094152 +SHA256 (perforce/2012.1.732581/bin.freebsd70x86_64/p4web) = 4a6c5d5a6597757b4a37e62b1cd248ed70ff709730baf9d9f2ef3a360b2edc02 +SIZE (perforce/2012.1.732581/bin.freebsd70x86_64/p4web) = 4098568 From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 6 08:39:13 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FCE9D8C; Fri, 6 Jun 2014 08:39:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 718BF25A3; Fri, 6 Jun 2014 08:39:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s568dDWu002850; Fri, 6 Jun 2014 08:39:13 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s568dD2c002848; Fri, 6 Jun 2014 08:39:13 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201406060839.s568dD2c002848@svn.freebsd.org> From: Jimmy Olgeni Date: Fri, 6 Jun 2014 08:39:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356749 - in branches/2014Q2: . x11-fonts/freefonts X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2014 08:39:13 -0000 Author: olgeni Date: Fri Jun 6 08:39:12 2014 New Revision: 356749 URL: http://svnweb.freebsd.org/changeset/ports/356749 QAT: https://qat.redports.org/buildarchive/r356749/ Log: MFH: r353684, r353941, r354411, r354418. - Sync text of LEGAL and RESTRICTED for x11-fonts/freefonts. - Unbreak with working MASTER_SITES and fix portlint warning. CR: https://phabric.freebsd.org/D185 Approved by: portmgr (bapt) Modified: branches/2014Q2/LEGAL branches/2014Q2/x11-fonts/freefonts/Makefile Modified: branches/2014Q2/LEGAL ============================================================================== --- branches/2014Q2/LEGAL Fri Jun 6 07:52:18 2014 (r356748) +++ branches/2014Q2/LEGAL Fri Jun 6 08:39:12 2014 (r356749) @@ -105,7 +105,7 @@ foiltex* textproc/foiltex Redistributio fp-freebsd-ws-* security/f-prot Free for personal users on personal workstations only fuse-emulator-roms* emulators/fuse-roms No explicit permission to redistribute Opus-22.rom emulators/fuse-roms No explicit permission to redistribute -freefonts-* x11-fonts/freefonts Some of the fonts are shareware. Some are freeware. Permission must be obtained before distributing at least four (mazama.license, muriel.license, roosthea.license, shf_____.license). Two have inconsistent licenses (tempofon.license and tempoita.license say "placed into the public domain and may [not be] sold") +freefonts-* x11-fonts/freefonts License prohibits redistribution; see individual .license files freqship/* sysutils/freqsdwn License agreement is required to download fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo site is allowed to distribute the music fvcom/sourcecode1.tar.gz science/fvcom Requires (free) registration Modified: branches/2014Q2/x11-fonts/freefonts/Makefile ============================================================================== --- branches/2014Q2/x11-fonts/freefonts/Makefile Fri Jun 6 07:52:18 2014 (r356748) +++ branches/2014Q2/x11-fonts/freefonts/Makefile Fri Jun 6 08:39:12 2014 (r356749) @@ -3,12 +3,12 @@ PORTNAME= freefonts PORTVERSION= 0.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \ - ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,} +MASTER_SITES= http://download.gimp.org/pub/%SUBDIR%/ \ + ftp://ftp.sunet.se/pub/gnu/%SUBDIR%/ \ + http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \ + http://mirrors.xmission.com/gimp/%SUBDIR%/ MASTER_SITE_SUBDIR= gimp/fonts MAINTAINER= olgeni@FreeBSD.org @@ -16,7 +16,14 @@ COMMENT= Collection of ATM fonts (not al BUILD_DEPENDS= type1inst:${PORTSDIR}/x11-fonts/p5-type1inst -RESTRICTED= see accompanying .license files +# Some of the fonts are shareware. Some are freeware. Permission must +# be obtained before distributing at least four (mazama.license, +# muriel.license, roosthea.license, shf_____.license). Two have +# inconsistent licenses (tempofon.license and tempoita.license say +# "placed into the public domain and may [not be] sold") + +RESTRICTED= License prohibits redistribution; see individual .license files + NO_WRKSUBDIR= yes FONTDIR?= ${PREFIX}/lib/X11/fonts/freefont From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 6 09:06:32 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B13F5FE; Fri, 6 Jun 2014 09:06:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D33B32852; Fri, 6 Jun 2014 09:06:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5696Vtb015989; Fri, 6 Jun 2014 09:06:31 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5696VEH015985; Fri, 6 Jun 2014 09:06:31 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201406060906.s5696VEH015985@svn.freebsd.org> From: Jimmy Olgeni Date: Fri, 6 Jun 2014 09:06:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356750 - in branches/2014Q2: . x11-fonts/sharefonts X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2014 09:06:32 -0000 Author: olgeni Date: Fri Jun 6 09:06:31 2014 New Revision: 356750 URL: http://svnweb.freebsd.org/changeset/ports/356750 QAT: https://qat.redports.org/buildarchive/r356750/ Log: MFH: r353686, r353942, r354417. - Sync text of LEGAL and RESTRICTED for x11-fonts/sharefonts. - Unbreak with working MASTER_SITES. CR: https://phabric.freebsd.org/D186 Approved by: portmgr (bapt) Modified: branches/2014Q2/LEGAL branches/2014Q2/x11-fonts/sharefonts/Makefile Modified: branches/2014Q2/LEGAL ============================================================================== --- branches/2014Q2/LEGAL Fri Jun 6 08:39:12 2014 (r356749) +++ branches/2014Q2/LEGAL Fri Jun 6 09:06:31 2014 (r356750) @@ -230,7 +230,7 @@ seatools_cli.tar sysutils/seatools Redis serialmail-* mail/serialmail No license -- see http://cr.yp.to/softwarelaw.html serious.sam* games/linux-ssamtfe Redistribution limited serious.sam* games/linux-ssamtse Redistribution limited -sharefonts-* x11-fonts/sharefonts Shareware. Cannot be distributed without prior authorization +sharefonts-* x11-fonts/sharefonts Shareware: cannot be distributed without prior authorization shorten-* audio/shorten May not be sold. May not be distributed if modified sid-milter-* mail/sid-milter May incorporate intellectual property, possible patent issues simian-* devel/simian Have to agree to license before download Modified: branches/2014Q2/x11-fonts/sharefonts/Makefile ============================================================================== --- branches/2014Q2/x11-fonts/sharefonts/Makefile Fri Jun 6 08:39:12 2014 (r356749) +++ branches/2014Q2/x11-fonts/sharefonts/Makefile Fri Jun 6 09:06:31 2014 (r356750) @@ -3,14 +3,18 @@ PORTNAME= sharefonts PORTVERSION= 0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts -MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/ +MASTER_SITES= http://download.gimp.org/pub/%SUBDIR%/ \ + ftp://ftp.sunet.se/pub/gnu/%SUBDIR%/ \ + http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \ + http://mirrors.xmission.com/gimp/%SUBDIR%/ +MASTER_SITE_SUBDIR= gimp/fonts MAINTAINER= olgeni@FreeBSD.org COMMENT= Collection of shareware ATM fonts from the CICA archives -RESTRICTED= Shareware. Cannot be distributed w/o prior authorization. +RESTRICTED= Shareware: cannot be distributed without prior authorization NO_BUILD= yes From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 6 09:21:09 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D8B391D; Fri, 6 Jun 2014 09:21:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EC64298F; Fri, 6 Jun 2014 09:21:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s569L9Jd022287; Fri, 6 Jun 2014 09:21:09 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s569L8ox022280; Fri, 6 Jun 2014 09:21:08 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201406060921.s569L8ox022280@svn.freebsd.org> From: Dmitry Marakasov Date: Fri, 6 Jun 2014 09:21:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356751 - in branches/2014Q2/x11/workrave: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jun 2014 09:21:09 -0000 Author: amdmi3 Date: Fri Jun 6 09:21:08 2014 New Revision: 356751 URL: http://svnweb.freebsd.org/changeset/ports/356751 QAT: https://qat.redports.org/buildarchive/r356751/ Log: MFH: r356693 - Fix build on 10.x+ - Fix and sort plist - Use new LIB_DEPENDS syntax - Whitespace nits Approved by: portmgr Added: branches/2014Q2/x11/workrave/files/patch-backend__include__ICore.hh - copied unchanged from r356693, head/x11/workrave/files/patch-backend__include__ICore.hh Modified: branches/2014Q2/x11/workrave/Makefile branches/2014Q2/x11/workrave/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/x11/workrave/Makefile ============================================================================== --- branches/2014Q2/x11/workrave/Makefile Fri Jun 6 09:06:31 2014 (r356750) +++ branches/2014Q2/x11/workrave/Makefile Fri Jun 6 09:21:08 2014 (r356751) @@ -16,11 +16,11 @@ OPTIONS_DEFINE= GNOME NETWORK NLS NETWORK_DESC= Build with network support INSTALLS_ICONS= yes -DESKTOP_ENTRIES= "Workrave" "RSI prevention tool" \ - "${DATADIR}/images/workrave-icon-small.png" \ - "workrave" \ - "Utility;" \ - false +DESKTOP_ENTRIES="Workrave" "RSI prevention tool" \ + "${DATADIR}/images/workrave-icon-small.png" \ + "workrave" \ + "Utility;" \ + false USE_XORG= x11 xmu recordproto xtst xext USES= pathfix pkgconfig gmake @@ -32,20 +32,20 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-gconf --disable-pulse .include -LIB_DEPENDS+= gdome.8:${PORTSDIR}/textproc/gdome2 +LIB_DEPENDS+= libgdome.so:${PORTSDIR}/textproc/gdome2 .if ${PORT_OPTIONS:MGNOME} -LIB_DEPENDS+= gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 +LIB_DEPENDS+= libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26 USE_GNOME+= gnomepanel PLIST_SUB+= GNOME="" .else -LIB_DEPENDS+= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 +LIB_DEPENDS+= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 CONFIGURE_ARGS+=--disable-gnome PLIST_SUB+= GNOME="@comment " .endif .if ${PORT_OPTIONS:MNETWORK} -LIB_DEPENDS+= gnet-2.0.0:${PORTSDIR}/net/gnet2 +LIB_DEPENDS+= libgnet-2.0.so:${PORTSDIR}/net/gnet2 .else CONFIGURE_ARGS+=--disable-distribution .endif Copied: branches/2014Q2/x11/workrave/files/patch-backend__include__ICore.hh (from r356693, head/x11/workrave/files/patch-backend__include__ICore.hh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/x11/workrave/files/patch-backend__include__ICore.hh Fri Jun 6 09:21:08 2014 (r356751, copy of r356693, head/x11/workrave/files/patch-backend__include__ICore.hh) @@ -0,0 +1,10 @@ +--- backend/include/ICore.hh.orig 2010-12-05 21:01:31.000000000 +0300 ++++ backend/include/ICore.hh 2014-05-17 03:18:53.674936521 +0400 +@@ -21,6 +21,7 @@ + #define ICORE_HH + + #include ++#include + + namespace workrave { + Modified: branches/2014Q2/x11/workrave/pkg-plist ============================================================================== --- branches/2014Q2/x11/workrave/pkg-plist Fri Jun 6 09:06:31 2014 (r356750) +++ branches/2014Q2/x11/workrave/pkg-plist Fri Jun 6 09:21:08 2014 (r356751) @@ -1,25 +1,15 @@ bin/workrave -%%GNOME%%libdata/bonobo/servers/Workrave-Applet.server -%%GNOME%%libdata/bonobo/servers/Workrave-Control.server +%%GNOME%%etc/sound/events/workrave.soundlist %%GNOME%%libexec/workrave-applet -%%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml share/dbus-1/services/org.workrave.Workrave.service +%%GNOME%%share/dbus-1/services/org.workrave.WorkraveAppletFactory.service +%%GNOME%%share/gnome-panel/applets/org.workrave.WorkraveApplet.panel-applet +%%GNOME%%share/gnome-panel/ui/workrave-applet-menu.xml +share/icons/hicolor/48x48/apps/workrave-icon-huge.png +share/icons/hicolor/scalable/apps/workrave-sheep.svg share/locale/ga/LC_MESSAGES/workrave.mo share/locale/ko/LC_MESSAGES/workrave.mo share/locale/te/LC_MESSAGES/workrave.mo -share/icons/hicolor/48x48/apps/workrave-icon-huge.png -share/icons/hicolor/scalable/apps/workrave-sheep.svg -share/sounds/workrave/subtle/break-ignored.wav -share/sounds/workrave/subtle/break-prelude.wav -share/sounds/workrave/subtle/daily-limit.wav -share/sounds/workrave/subtle/exercise-ended.wav -share/sounds/workrave/subtle/exercise-step.wav -share/sounds/workrave/subtle/exercises-ended.wav -share/sounds/workrave/subtle/micro-break-ended.wav -share/sounds/workrave/subtle/micro-break-started.wav -share/sounds/workrave/subtle/rest-break-ended.wav -share/sounds/workrave/subtle/rest-break-started.wav -share/sounds/workrave/subtle/soundtheme share/sounds/workrave/default/break-ignored.wav share/sounds/workrave/default/break-prelude.wav share/sounds/workrave/default/daily-limit.wav @@ -31,6 +21,17 @@ share/sounds/workrave/default/micro-brea share/sounds/workrave/default/rest-break-ended.wav share/sounds/workrave/default/rest-break-started.wav share/sounds/workrave/default/soundtheme +share/sounds/workrave/subtle/break-ignored.wav +share/sounds/workrave/subtle/break-prelude.wav +share/sounds/workrave/subtle/daily-limit.wav +share/sounds/workrave/subtle/exercise-ended.wav +share/sounds/workrave/subtle/exercise-step.wav +share/sounds/workrave/subtle/exercises-ended.wav +share/sounds/workrave/subtle/micro-break-ended.wav +share/sounds/workrave/subtle/micro-break-started.wav +share/sounds/workrave/subtle/rest-break-ended.wav +share/sounds/workrave/subtle/rest-break-started.wav +share/sounds/workrave/subtle/soundtheme share/workrave/images/workrave.xpm %%DATADIR%%/exercises/backward-shoulder-stretch.png %%DATADIR%%/exercises/chair-pushup-1.png From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 7 13:57:18 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63112CB2; Sat, 7 Jun 2014 13:57:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 364EB2FBA; Sat, 7 Jun 2014 13:57:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s57DvI2n030936; Sat, 7 Jun 2014 13:57:18 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s57DvIt9030935; Sat, 7 Jun 2014 13:57:18 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406071357.s57DvIt9030935@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 7 Jun 2014 13:57:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356902 - branches/2014Q2/databases/py-qt4-sql X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 13:57:18 -0000 Author: rakuco Date: Sat Jun 7 13:57:17 2014 New Revision: 356902 URL: http://svnweb.freebsd.org/changeset/ports/356902 QAT: https://qat.redports.org/buildarchive/r356902/ Log: MFH: r356888 Add explicit dependency on qt4-gui. For some reason, PyQt's configure.py adds a dependency on QtGui when figuring out if QtSql is installed. When the API option is on, this dependency is always installed indirectly, but things fail if it is turned off. From configure's build log: Checking to see if the QtSql module should be built... c++ -DQT_NO_DEBUG -DQT_SQL_LIB -I. -I/usr/local/share/qt4/mkspecs/default -I/usr/local/include/qt4/QtSql -I/usr/local/include/qt4/QtGui -I/usr/local/include/qt4 -I/usr/local/include -O2 -pipe -fno-strict-aliasing -O2 -w -pthread -D_THREAD_SAFE cfgtest_QtSql.cpp -o cfgtest_QtSql -L/usr/local/lib/qt4 -L/usr/local/lib -Wl,-O1 -Wl,-rpath,/usr/local/lib/qt4 -lQtSql -L/usr/local/lib/qt4 -L/usr/local/lib/qt4 -L/usr/local/lib -lQtCore -L/usr/local/lib/qt4 -L/usr/local/lib/qt4 -L/usr/local/lib -lQtGui -lXext -lX11 -lm /usr/bin/ld: cannot find -lQtGui c++: error: linker command failed with exit code 1 (use -v to see invocation) PR: 183706 Approved by: portmgr (miwi) Modified: branches/2014Q2/databases/py-qt4-sql/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/py-qt4-sql/Makefile ============================================================================== --- branches/2014Q2/databases/py-qt4-sql/Makefile Sat Jun 7 13:32:02 2014 (r356901) +++ branches/2014Q2/databases/py-qt4-sql/Makefile Sat Jun 7 13:57:17 2014 (r356902) @@ -3,6 +3,7 @@ PORTNAME= sql PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -18,7 +19,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= yes -USE_QT4= moc_build sql qmake_build +USE_QT4= moc_build gui sql qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 7 13:58:25 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4A8B6DD5; Sat, 7 Jun 2014 13:58:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1EF882FCC; Sat, 7 Jun 2014 13:58:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s57DwO9i031213; Sat, 7 Jun 2014 13:58:24 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s57DwO8x031212; Sat, 7 Jun 2014 13:58:24 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406071358.s57DwO8x031212@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 7 Jun 2014 13:58:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356903 - branches/2014Q2/devel/py-qt4-test X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 13:58:25 -0000 Author: rakuco Date: Sat Jun 7 13:58:24 2014 New Revision: 356903 URL: http://svnweb.freebsd.org/changeset/ports/356903 QAT: https://qat.redports.org/buildarchive/r356903/ Log: MFH: r356889 Add explicit dependency on qt4-gui. This is similar to r356888, in that PyQt's configure.py builds py-qt4-test with QtGui's libraries (even though, contrary to qt4-sql, it is not used at configuration time). Using QtGui defines QT_GUI_LIB, which makes the QtTest headers pull in QtGui ones. QtGui comes for free indirectly when the API option is set, but the build fails otherwise: c++ -c -O2 -pipe -fno-strict-aliasing -fPIC -O2 -Wall -W -pthread -D_THREAD_SAFE -DNDEBUG -DQT_NO_DEBUG -DQT_TEST_LIB -DQT_GUI_LIB -DQT_CORE_LIB -I. -I/usr/local/include/python2.7 -I/usr/local/share/qt4/mkspecs/default -I/usr/local/include/qt4/QtTest -I/usr/local/include/qt4/QtGui -I/usr/local/include/qt4/QtCore -I/usr/local/include/qt4 -I/usr/local/include -o sipQtTestQTest.o sipQtTestQTest.cpp In file included from /wrkdirs/usr/ports/devel/py-qt4-test/work/PyQt-x11-gpl-4.10.3/sip/QtTest/qtestkeyboard.sip:31: /usr/local/include/qt4/QtTest/qtestkeyboard.h:56:10: fatal error: 'QtGui/qapplication.h' file not found PR: 183706 Approved by: portmgr (miwi) Modified: branches/2014Q2/devel/py-qt4-test/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/py-qt4-test/Makefile ============================================================================== --- branches/2014Q2/devel/py-qt4-test/Makefile Sat Jun 7 13:57:17 2014 (r356902) +++ branches/2014Q2/devel/py-qt4-test/Makefile Sat Jun 7 13:58:24 2014 (r356903) @@ -3,6 +3,7 @@ PORTNAME= test PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -18,7 +19,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= yes -USE_QT4= moc_build qtestlib qmake_build +USE_QT4= moc_build gui qtestlib qmake_build OPTIONS_DEFINE= API OPTIONS_DEFAULT=API From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 7 14:00:31 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D02EED4; Sat, 7 Jun 2014 14:00:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2DE852FE0; Sat, 7 Jun 2014 14:00:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s57E0Vx4031786; Sat, 7 Jun 2014 14:00:31 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s57E0Vk1031785; Sat, 7 Jun 2014 14:00:31 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406071400.s57E0Vk1031785@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 7 Jun 2014 14:00:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356904 - branches/2014Q2/devel/py-qt4-core/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 14:00:31 -0000 Author: rakuco Date: Sat Jun 7 14:00:30 2014 New Revision: 356904 URL: http://svnweb.freebsd.org/changeset/ports/356904 QAT: https://qat.redports.org/buildarchive/r356904/ Log: MFH: r356890 - Rebase patch-configure.py on top of the current PyQt version, to make it easy to change it, which leads us to... - Build pylupdate and pyrcc only for py-qt4-xml again. This fixes a regression introduced last year when PyQt was updated to 4.10.3: configure.py started building pylupdate and pyrcc unconditionally instead of only if "QtXml" was specified. If the API option is off, the build would fail because the QtXml headers needed to build those tools would not be added as a dependency. PR: 183706 Approved by: portmgr (miwi) Modified: branches/2014Q2/devel/py-qt4-core/files/patch-configure.py Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/py-qt4-core/files/patch-configure.py ============================================================================== --- branches/2014Q2/devel/py-qt4-core/files/patch-configure.py Sat Jun 7 13:58:24 2014 (r356903) +++ branches/2014Q2/devel/py-qt4-core/files/patch-configure.py Sat Jun 7 14:00:30 2014 (r356904) @@ -1,6 +1,6 @@ ---- ./configure.py.orig 2012-06-26 09:09:24.000000000 -0400 -+++ ./configure.py 2012-08-30 22:06:19.000000000 -0400 -@@ -358,7 +358,7 @@ +--- configure.py.orig 2014-06-06 00:15:32.000000000 +0300 ++++ configure.py 2014-06-06 00:20:20.000000000 +0300 +@@ -342,7 +342,7 @@ # Note that the order in which we check is important for the # consolidated module - a module's dependencies must be checked first. @@ -8,7 +8,7 @@ + check_module("QtCore", "qobject.h", "new QObject()") check_module("QtGui", "qwidget.h", "new QWidget()") - if qt_version < 0x050000: check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") + check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") @@ -371,8 +371,8 @@ check_module("QtTest", "QtTest", "QTest::qSleep(0)") check_module("QtWebKit", "qwebpage.h", "new QWebPage()") @@ -20,7 +20,7 @@ check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, extra_libs=ass_libs) -@@ -648,21 +648,6 @@ +@@ -636,21 +636,6 @@ if opts.staticplugins: sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins)) @@ -42,7 +42,7 @@ def _qpy_directories(self, mname, lib_name): """Return a 3-tuple of the directories containing the header files, the directory containing the library, and the name of the support library -@@ -756,6 +741,9 @@ +@@ -741,6 +726,9 @@ return libs, libdirs def module_installs(self): @@ -52,7 +52,7 @@ return [os.path.join(src_dir, "__init__.py"), "pyqtconfig.py"] def qpy_libs(self): -@@ -888,40 +876,41 @@ +@@ -876,76 +864,78 @@ makefile.generate() tool.append("elementtree") @@ -60,18 +60,19 @@ - # previews work properly and normal console use will work anyway), but - # not on Windows (so that normal console use will work). - sipconfig.inform("Creating pyuic4 wrapper...") -+ if "QtCore" in pyqt_modules: -+ # Create the pyuic4 wrapper. Use the GUI version on MacOS (so that -+ # previews work properly and normal console use will work anyway), but -+ # not on Windows (so that normal console use will work). -+ sipconfig.inform("Creating pyuic4 wrapper...") - +- - if sys.platform == 'darwin': - gui = True - use_arch = opts.use_arch - else: - gui = False - use_arch = '' ++ if "QtCore" in pyqt_modules: ++ # Create the pyuic4 wrapper. Use the GUI version on MacOS (so that ++ # previews work properly and normal console use will work anyway), but ++ # not on Windows (so that normal console use will work). ++ sipconfig.inform("Creating pyuic4 wrapper...") ++ + if sys.platform == 'darwin': + gui = True + use_arch = opts.use_arch @@ -120,9 +121,76 @@ + makefile.generate() + tool.append("pyuic") - if "QtXml" in pyqt_modules: - sipconfig.inform("Creating pylupdate4 Makefile...") -@@ -977,9 +966,6 @@ +- sipconfig.inform("Creating pylupdate4 Makefile...") ++ if "QtXml" in pyqt_modules: ++ sipconfig.inform("Creating pylupdate4 Makefile...") + +- cxxflags_app = sipcfg.build_macros().get("CXXFLAGS_APP", "") ++ cxxflags_app = sipcfg.build_macros().get("CXXFLAGS_APP", "") + +- makefile = sipconfig.ProgramMakefile( +- configuration=sipcfg, +- build_file=os.path.join(src_dir, "pylupdate", "pylupdate.sbf"), +- dir="pylupdate", +- install_dir=opts.pyqtbindir, +- console=1, +- qt=["QtCore", "QtXml"], +- debug=opts.debug, +- warnings=1, +- universal=sipcfg.universal, +- arch=sipcfg.arch, +- deployment_target=sipcfg.deployment_target +- ) +- +- makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate")) +- +- if cxxflags_app != "": +- makefile.extra_cxxflags.append(cxxflags_app) +- +- makefile.generate() +- tool.append("pylupdate") +- +- sipconfig.inform("Creating pyrcc4 Makefile...") ++ makefile = sipconfig.ProgramMakefile( ++ configuration=sipcfg, ++ build_file=os.path.join(src_dir, "pylupdate", "pylupdate.sbf"), ++ dir="pylupdate", ++ install_dir=opts.pyqtbindir, ++ console=1, ++ qt=["QtCore", "QtXml"], ++ debug=opts.debug, ++ warnings=1, ++ universal=sipcfg.universal, ++ arch=sipcfg.arch, ++ deployment_target=sipcfg.deployment_target ++ ) + +- makefile = pyrccMakefile() ++ makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate")) + +- if cxxflags_app != "": +- makefile.extra_cxxflags.append(cxxflags_app) ++ if cxxflags_app != "": ++ makefile.extra_cxxflags.append(cxxflags_app) + +- makefile.generate() +- tool.append("pyrcc") ++ makefile.generate() ++ tool.append("pylupdate") ++ ++ sipconfig.inform("Creating pyrcc4 Makefile...") ++ ++ makefile = pyrccMakefile() ++ ++ if cxxflags_app != "": ++ makefile.extra_cxxflags.append(cxxflags_app) ++ ++ makefile.generate() ++ tool.append("pyrcc") + + if opts.designer_plugin and "QtDesigner" in pyqt_modules: + py_major = sipcfg.py_version >> 16 +@@ -972,9 +962,6 @@ # include the ABI information. abi = "" else: @@ -132,7 +200,7 @@ if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)): lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)): -@@ -990,9 +976,6 @@ +@@ -985,9 +972,6 @@ opts.designer_plugin = False link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi) @@ -142,7 +210,7 @@ pysh_lib = ducfg.get("LDLIBRARY", "") -@@ -1378,6 +1361,7 @@ +@@ -1380,6 +1364,7 @@ def check_dbus(): """See if the DBus support module should be built. """ @@ -150,7 +218,7 @@ sipconfig.inform("Checking to see if the dbus support module should be built...") sout = get_command_stdout("pkg-config --cflags-only-I --libs dbus-1") -@@ -1954,6 +1938,7 @@ +@@ -1988,6 +1973,7 @@ sipcfg.qt_framework = qt_framework sipcfg.qt_threaded = 1 sipcfg.qt_dir = qt_dir @@ -158,7 +226,7 @@ sipcfg.qt_lib_dir = qt_libdir return ConfigurePyQt4(generator) -@@ -2273,6 +2258,9 @@ +@@ -2323,6 +2309,9 @@ p.print_help() sys.exit(2) @@ -168,7 +236,7 @@ sipcfg.set_build_macros(macros) # Check Qt is what we need. -@@ -2302,9 +2290,9 @@ +@@ -2364,9 +2353,9 @@ installs=[(pyqt.module_installs(), pyqt_modroot)] if opts.api: @@ -180,7 +248,7 @@ if opts.bigqt: xtra_modules.append("_qt") -@@ -2317,7 +2305,7 @@ +@@ -2379,7 +2368,7 @@ sipconfig.ParentMakefile( configuration=sipcfg, From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 7 14:57:48 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 30AEAD09; Sat, 7 Jun 2014 14:57:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1CE672417; Sat, 7 Jun 2014 14:57:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s57EvlOJ058144; Sat, 7 Jun 2014 14:57:47 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s57EvlKV058141; Sat, 7 Jun 2014 14:57:47 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201406071457.s57EvlKV058141@svn.freebsd.org> From: Thomas Zander Date: Sat, 7 Jun 2014 14:57:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r356909 - in branches/2014Q2/multimedia/ogmrip: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 14:57:48 -0000 Author: riggs Date: Sat Jun 7 14:57:47 2014 New Revision: 356909 URL: http://svnweb.freebsd.org/changeset/ports/356909 QAT: https://qat.redports.org/buildarchive/r356909/ Log: MFH: r356899 - New upstream release 1.0.1 - Un-break build with clang - Stagify - Introduce NLS OPTION - USE_* -> USES - Shared lib convention: shlib.X -> libshlib.so - Pet portlint Approved by: portmgr (swills), mentors (implicit) Added: branches/2014Q2/multimedia/ogmrip/files/ - copied from r356899, head/multimedia/ogmrip/files/ Modified: branches/2014Q2/multimedia/ogmrip/Makefile branches/2014Q2/multimedia/ogmrip/distinfo branches/2014Q2/multimedia/ogmrip/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/multimedia/ogmrip/Makefile ============================================================================== --- branches/2014Q2/multimedia/ogmrip/Makefile Sat Jun 7 14:50:56 2014 (r356908) +++ branches/2014Q2/multimedia/ogmrip/Makefile Sat Jun 7 14:57:47 2014 (r356909) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ogmrip -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION} @@ -16,42 +15,40 @@ LICENSE_COMB= multi BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder \ mplayer:${PORTSDIR}/multimedia/mplayer \ gsed:${PORTSDIR}/textproc/gsed -LIB_DEPENDS= enca.5:${PORTSDIR}/converters/enca \ - png15:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ - dvdread.4:${PORTSDIR}/multimedia/libdvdread +LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca \ + libpng.so:${PORTSDIR}/graphics/png \ + libtiff.so:${PORTSDIR}/graphics/tiff \ + libdvdread.so:${PORTSDIR}/multimedia/libdvdread RUN_DEPENDS= lame:${PORTSDIR}/audio/lame \ oggenc:${PORTSDIR}/audio/vorbis-tools \ mencoder:${PORTSDIR}/multimedia/mencoder \ mplayer:${PORTSDIR}/multimedia/mplayer \ ogmmerge:${PORTSDIR}/multimedia/ogmtools -OPTIONS_DEFINE= GTK2 ENCHANT MATROSKA MP4BOX THEORA FAAC SRT DEBUG -OPTIONS_DEFAULT=GTK2 +OPTIONS_DEFINE= GTK2 ENCHANT MATROSKA MP4BOX NLS THEORA FAAC SRT DEBUG +OPTIONS_DEFAULT=GTK2 NLS ENCHANT_DESC= Enable spell checking for text subtitles MATROSKA_DESC= Enable Matroska container support MP4BOX_DESC= Enable Mpeg-4 container support THEORA_DESC= Enable Ogg Theora video codec support SRT_DESC= Enable SRT text subtitles support -USES= pathfix gettext gmake pkgconfig +USES= desktop-file-utils gmake libtool:keepla pathfix pkgconfig USE_GNOME= glib20 intlhack libxml2 -USE_AUTOTOOLS= libtool USE_LDCONFIG= yes +GNU_CONFIGURE= yes + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= dvdcpy.1 avibox.1 - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGTK2} CONFIGURE_ARGS+= --enable-gtk-support --enable-dbus-support \ --enable-libnotify-support -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.4:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libnotify.so:${PORTSDIR}/devel/libnotify USE_GNOME+= gconf2 libglade2 GCONF_SCHEMAS= ogmrip.schemas PLIST_SUB+= GTK2_SUPPORT="" @@ -63,7 +60,7 @@ PLIST_SUB+= GTK2_SUPPORT="@comment " .if ${PORT_OPTIONS:MENCHANT} CONFIGURE_ARGS+= --enable-enchant-support -LIB_DEPENDS+= enchant:${PORTSDIR}/textproc/enchant +LIB_DEPENDS+= libenchant.so:${PORTSDIR}/textproc/enchant PLIST_SUB+= ENCHANT_SUPPORT="" .else CONFIGURE_ARGS+= --disable-enchant-support @@ -88,9 +85,17 @@ CONFIGURE_ARGS+= --disable-mp4-support PLIST_SUB+= MP4BOX_SUPPORT="@comment " .endif +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " +.endif + .if ${PORT_OPTIONS:MTHEORA} CONFIGURE_ARGS+= --enable-theora-support -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora +LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora PLIST_SUB+= THEORA_SUPPORT="" .else CONFIGURE_ARGS+= --disable-theora-support @@ -135,9 +140,4 @@ post-patch: @${REINPLACE_CMD} -e \ '/PROGRAM/s|MP4Box|mp4box|g' ${WRKSRC}/libogmrip/ogmrip-mp4.c -post-install: - @${ECHO_MSG} "" - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} "" - .include Modified: branches/2014Q2/multimedia/ogmrip/distinfo ============================================================================== --- branches/2014Q2/multimedia/ogmrip/distinfo Sat Jun 7 14:50:56 2014 (r356908) +++ branches/2014Q2/multimedia/ogmrip/distinfo Sat Jun 7 14:57:47 2014 (r356909) @@ -1,2 +1,2 @@ -SHA256 (ogmrip-1.0.0.tar.gz) = 6848a622152a62899b6e876e70ec36df1af7be9803b8b9c809ed631196bc18cc -SIZE (ogmrip-1.0.0.tar.gz) = 3262205 +SHA256 (ogmrip-1.0.1.tar.gz) = 1c7bb9a346f94a0b6ba783d71df7d21ce021b2f179f5c1a2ebf870366d53ed56 +SIZE (ogmrip-1.0.1.tar.gz) = 3276396 Modified: branches/2014Q2/multimedia/ogmrip/pkg-plist ============================================================================== --- branches/2014Q2/multimedia/ogmrip/pkg-plist Sat Jun 7 14:50:56 2014 (r356908) +++ branches/2014Q2/multimedia/ogmrip/pkg-plist Sat Jun 7 14:57:47 2014 (r356909) @@ -74,30 +74,37 @@ include/ogmrip/ogmrip.h %%GTK2_SUPPORT%%lib/libogmdvd-gtk.la %%GTK2_SUPPORT%%lib/libogmdvd-gtk.so %%GTK2_SUPPORT%%lib/libogmdvd-gtk.so.1 +%%GTK2_SUPPORT%%lib/libogmdvd-gtk.so.1.0.0 lib/libogmdvd.a lib/libogmdvd.la lib/libogmdvd.so lib/libogmdvd.so.1 +lib/libogmdvd.so.1.0.0 lib/libogmjob.a lib/libogmjob.la lib/libogmjob.so lib/libogmjob.so.1 +lib/libogmjob.so.1.0.0 %%GTK2_SUPPORT%%lib/libogmrip-gtk.a %%GTK2_SUPPORT%%lib/libogmrip-gtk.la %%GTK2_SUPPORT%%lib/libogmrip-gtk.so %%GTK2_SUPPORT%%lib/libogmrip-gtk.so.1 +%%GTK2_SUPPORT%%lib/libogmrip-gtk.so.1.0.0 lib/libogmrip-lavc.a lib/libogmrip-lavc.la lib/libogmrip-lavc.so lib/libogmrip-lavc.so.1 +lib/libogmrip-lavc.so.1.0.0 lib/libogmrip-mplayer.a lib/libogmrip-mplayer.la lib/libogmrip-mplayer.so lib/libogmrip-mplayer.so.1 +lib/libogmrip-mplayer.so.1.0.0 lib/libogmrip.a lib/libogmrip.la lib/libogmrip.so lib/libogmrip.so.1 +lib/libogmrip.so.1.0.0 %%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.a %%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.la %%FAAC_SUPPORT%%lib/ogmrip/audio-plugins/libogmrip-aac.so @@ -163,13 +170,17 @@ libdata/pkgconfig/ogmdvd.pc libdata/pkgconfig/ogmjob.pc libdata/pkgconfig/ogmrip-gtk.pc libdata/pkgconfig/ogmrip.pc +man/man1/dvdcpy.1.gz +man/man1/avibox.1.gz +%%SRT_SUPPORT%%man/man1/subp2pgm.1.gz +%%SRT_SUPPORT%%man/man1/subptools.1.gz %%GTK2_SUPPORT%%share/applications/ogmrip.desktop -share/locale/cs/LC_MESSAGES/ogmrip.mo -share/locale/de/LC_MESSAGES/ogmrip.mo -share/locale/fr/LC_MESSAGES/ogmrip.mo -share/locale/nb/LC_MESSAGES/ogmrip.mo -share/locale/ru/LC_MESSAGES/ogmrip.mo -share/locale/sk/LC_MESSAGES/ogmrip.mo +%%NLS%%share/locale/cs/LC_MESSAGES/ogmrip.mo +%%NLS%%share/locale/de/LC_MESSAGES/ogmrip.mo +%%NLS%%share/locale/fr/LC_MESSAGES/ogmrip.mo +%%NLS%%share/locale/nb/LC_MESSAGES/ogmrip.mo +%%NLS%%share/locale/ru/LC_MESSAGES/ogmrip.mo +%%NLS%%share/locale/sk/LC_MESSAGES/ogmrip.mo %%GTK2_SUPPORT%%%%DATADIR%%/ogmrip-crop.glade %%GTK2_SUPPORT%%%%DATADIR%%/ogmrip-lavc.glade %%GTK2_SUPPORT%%%%DATADIR%%/ogmrip-main.glade From owner-svn-ports-branches@FreeBSD.ORG Sun Jun 8 11:10:06 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FC5850B; Sun, 8 Jun 2014 11:10:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CAB22A5D; Sun, 8 Jun 2014 11:10:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s58BA6NO008008; Sun, 8 Jun 2014 11:10:06 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s58BA6Uj008007; Sun, 8 Jun 2014 11:10:06 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406081110.s58BA6Uj008007@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 8 Jun 2014 11:10:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357002 - branches/2014Q2/devel/py-sip X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2014 11:10:06 -0000 Author: rakuco Date: Sun Jun 8 11:10:05 2014 New Revision: 357002 URL: http://svnweb.freebsd.org/changeset/ports/357002 QAT: https://qat.redports.org/buildarchive/r357002/ Log: MFH: r357000 Set PYTHON_PY3K_PLIST_HACK to adjust the plist for Python >= 3.2.0. Since this port does not use distutils/setuptools and we manually generate the .pyc/.pyo files, we need to set PYTHON_PY3K_PLIST_HACK so that the cache files end up in the right directory if Python >= 3.2.0 is used due to PEP-3147. PR: 188150 Approved by: portmgr (miwi) Modified: branches/2014Q2/devel/py-sip/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/py-sip/Makefile ============================================================================== --- branches/2014Q2/devel/py-sip/Makefile Sun Jun 8 10:48:10 2014 (r357001) +++ branches/2014Q2/devel/py-sip/Makefile Sun Jun 8 11:10:05 2014 (r357002) @@ -3,6 +3,7 @@ PORTNAME= sip PORTVERSION= ${SIP_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_SIP} ${MASTER_SITE_LOCAL} @@ -12,7 +13,8 @@ DISTNAME= ${SIP_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python to C and C++ bindings generator -USE_PYTHON= yes +USE_PYTHON= yes +PYTHON_PY3K_PLIST_HACK= yes DATADIR= ${PREFIX}/share/py-${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} From owner-svn-ports-branches@FreeBSD.ORG Mon Jun 9 11:12:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D67FCF87; Mon, 9 Jun 2014 11:12:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C23DC29D2; Mon, 9 Jun 2014 11:12:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59BCwJ0051051; Mon, 9 Jun 2014 11:12:58 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59BCwJr051050; Mon, 9 Jun 2014 11:12:58 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406091112.s59BCwJr051050@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 9 Jun 2014 11:12:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357137 - branches/2014Q2/games/tyrquake X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2014 11:12:58 -0000 Author: bapt Date: Mon Jun 9 11:12:58 2014 New Revision: 357137 URL: http://svnweb.freebsd.org/changeset/ports/357137 QAT: https://qat.redports.org/buildarchive/r357137/ Log: MFH: r357136 reassign it to the heap. Submitted by: maintainer With hat: portmgr Modified: branches/2014Q2/games/tyrquake/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/tyrquake/Makefile ============================================================================== --- branches/2014Q2/games/tyrquake/Makefile Mon Jun 9 11:10:54 2014 (r357136) +++ branches/2014Q2/games/tyrquake/Makefile Mon Jun 9 11:12:58 2014 (r357137) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://disenchant.net/files/engine/ -MAINTAINER= rsmith@xs4all.nl +MAINTAINER= ports@FreeBSD.org COMMENT= Very conservative branch of the Quake source code BROKEN= Fails to build From owner-svn-ports-branches@FreeBSD.ORG Wed Jun 11 08:30:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DDDDD8C4; Wed, 11 Jun 2014 08:30:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C98AA28F5; Wed, 11 Jun 2014 08:30:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5B8U1CB031796; Wed, 11 Jun 2014 08:30:01 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5B8U16M031793; Wed, 11 Jun 2014 08:30:01 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201406110830.s5B8U16M031793@svn.freebsd.org> From: Rene Ladan Date: Wed, 11 Jun 2014 08:30:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357430 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 08:30:02 -0000 Author: rene Date: Wed Jun 11 08:30:01 2014 New Revision: 357430 URL: http://svnweb.freebsd.org/changeset/ports/357430 QAT: https://qat.redports.org/buildarchive/r357430/ Log: MFH: r357427 Document new vulnerabilities in www/chromium < 35.0.1916.153 Submitted by: Carlos Jacobo Puga Medina Obtained from: http://www.googlechromereleases.blogspot.nl/ Also merge entries for mozilla, openssl, gnutls (2), mumble (2), and linux-flashplugin Approved by: portmgr (erwin) Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Wed Jun 11 08:19:36 2014 (r357429) +++ branches/2014Q2/security/vuxml/vuln.xml Wed Jun 11 08:30:01 2014 (r357430) @@ -51,6 +51,320 @@ Note: Please add new entries to the beg --> + + chromium -- multiple vulnerabilities + + + chromium + 35.0.1916.153 + + + + +

Google Chrome Releases reports:

+
+

4 security fixes in this release, including:

+
    +
  • [369525] High CVE-2014-3154: Use-after-free in filesystem api. Credit + to Collin Payne.
  • +
  • [369539] High CVE-2014-3155: Out-if-bounds read in SPDY. Credit + to James March, Daniel Sommermann and Alan Frindell of Facebook.
  • +
  • [369621] Medium CVE-2014-3156: Buffer overflow in clipboard. Credit + to Atte Kettunen of OUSPG.
  • +
  • [368980] CVE-2014-3157: Heap overflow in media.
  • +
+
+ +
+ + CVE-2014-3154 + CVE-2014-3155 + CVE-2014-3156 + CVE-2014-3157 + http://googlechromereleases.blogspot.nl + + + 2014-06-10 + 2014-06-10 + +
+ + + mozilla -- multiple vulnerabilities + + + firefox + 30.0,1 + + + firefox-esr + 24.6.0,1 + + + linux-firefox + 30.0,1 + + + linux-thunderbird + 24.6.0 + + + nspr + 4.10.6 + + + thunderbird + 24.6.0 + + + + +

The Mozilla Project reports:

+
+

MFSA 2014-48 Miscellaneous memory safety hazards + (rv:30.0 / rv:24.6)

+

MFSA 2014-49 Use-after-free and out of bounds + issues found using Address Sanitizer

+

MFSA 2014-51 Use-after-free in Event Listener + Manager

+

MFSA 2014-52 Use-after-free with SMIL Animation + Controller

+

MFSA 2014-53 Buffer overflow in Web Audio Speex + resampler

+

MFSA 2014-54 Buffer overflow in Gamepad API

+

MFSA 2014-55 Out of bounds write in NSPR

+
+ +
+ + CVE-2014-1533 + CVE-2014-1534 + CVE-2014-1536 + CVE-2014-1537 + CVE-2014-1540 + CVE-2014-1541 + CVE-2014-1542 + CVE-2014-1543 + CVE-2014-1545 + https://www.mozilla.org/security/announce/2014/mfsa2014-48.html + https://www.mozilla.org/security/announce/2014/mfsa2014-49.html + https://www.mozilla.org/security/announce/2014/mfsa2014-51.html + https://www.mozilla.org/security/announce/2014/mfsa2014-52.html + https://www.mozilla.org/security/announce/2014/mfsa2014-53.html + https://www.mozilla.org/security/announce/2014/mfsa2014-54.html + https://www.mozilla.org/security/announce/2014/mfsa2014-55.html + + + 2014-06-10 + 2014-06-10 + +
+ + + OpenSSL -- multiple vulnerabilities + + + openssl + 1.0.11.0.1_13 + + + mingw32-openssl + 1.0.11.0.1h + + + FreeBSD + 8.08.4_12 + 9.19.1_15 + 9.29.2_8 + 10.010.0_5 + + + + +

The OpenSSL Project reports:

+
+

An attacker using a carefully crafted handshake can force + the use of weak keying material in OpenSSL SSL/TLS clients + and servers. This can be exploited by a Man-in-the-middle + (MITM) attack where the attacker can decrypt and modify + traffic from the attacked client and server. [CVE-2014-0224]

+

By sending an invalid DTLS handshake to an OpenSSL DTLS + client the code can be made to recurse eventually crashing + in a DoS attack. [CVE-2014-0221]

+

A buffer overrun attack can be triggered by sending invalid + DTLS fragments to an OpenSSL DTLS client or server. This is + potentially exploitable to run arbitrary code on a vulnerable + client or server. [CVE-2014-0195]

+

OpenSSL TLS clients enabling anonymous ECDH ciphersuites are + subject to a denial of service attack. [CVE-2014-3470]

+
+ +
+ + CVE-2014-0195 + CVE-2014-0221 + CVE-2014-0224 + CVE-2014-3470 + http://www.freebsd.org/security/advisories/FreeBSD-SA-14:14.openssl.asc + http://www.openssl.org/news/secadv_20140605.txt + + + 2014-06-05 + 2014-06-05 + +
+ + + gnutls -- client-side memory corruption + + + gnutls + 2.12.23_6 + + + + +

GnuTLS project reports:

+
+

This vulnerability affects the client side of the gnutls library. + A server that sends a specially crafted ServerHello could corrupt + the memory of a requesting client.

+
+ +
+ + CVE-2014-3466 + http://www.gnutls.org/security.html#GNUTLS-SA-2014-3 + + + 2014-05-14 + 2014-06-04 + +
+ + + gnutls -- client-side memory corruption + + + gnutls3 + 3.13.1.25 + + + + +

GnuTLS project reports:

+
+

This vulnerability affects the client side of the gnutls library. + A server that sends a specially crafted ServerHello could corrupt + the memory of a requesting client.

+
+ +
+ + CVE-2014-3466 + http://www.gnutls.org/security.html#GNUTLS-SA-2014-3 + + + 2014-05-14 + 2014-06-03 + +
+ + + mumble -- multiple vulnerabilities + + + mumble + 1.2.01.2.6 + + + + +

Mumble reports:

+
+

SVG images with local file references could trigger client DoS

+

The Mumble client did not properly HTML-escape some external strings + before using them in a rich-text (HTML) context.

+
+ +
+ + http://mumble.info/security/Mumble-SA-2014-005.txt + http://mumble.info/security/Mumble-SA-2014-006.txt + + + 2014-04-16 + 2014-05-29 + +
+ + + mumble -- NULL pointer dereference and heap-based buffer overflow + + + mumble + 1.2.41.2.4_6 + + + + +

Mumble reports:

+
+

A malformed Opus voice packet sent to a Mumble client could trigger + a NULL pointer dereference or an out-of-bounds array access.

+

A malformed Opus voice packet sent to a Mumble client could trigger a + heap-based buffer overflow.

+
+ +
+ + CVE-2014-0044 + CVE-2014-0045 + http://mumble.info/security/Mumble-SA-2014-001.txt + http://mumble.info/security/Mumble-SA-2014-002.txt + + + 2014-01-25 + 2014-05-29 + +
+ + + + + + + linux-flashplugin -- multiple vulnerabilities + + + linux-f10-flashplugin + 11.2r202.359 + + + + +

Adobe reports:

+
+

These updates address vulnerabilities that could cause a crash + and potentially allow an attacker to take control of the affected system.

+
+ +
+ + CVE-2014-0510 + CVE-2014-0516 + CVE-2014-0517 + CVE-2014-0518 + CVE-2014-0519 + CVE-2014-0520 + https://helpx.adobe.com/security/products/flash-player/apsb14-14.html + + + 2014-03-13 + 2014-05-26 + +
+ openjpeg -- Multiple vulnabilities From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 13 07:52:50 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 90C16AA5; Fri, 13 Jun 2014 07:52:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72A2E2CF0; Fri, 13 Jun 2014 07:52:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5D7qoFb056544; Fri, 13 Jun 2014 07:52:50 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5D7qo9s056539; Fri, 13 Jun 2014 07:52:50 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201406130752.s5D7qo9s056539@svn.freebsd.org> From: Rene Ladan Date: Fri, 13 Jun 2014 07:52:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357655 - branches/2014Q2/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2014 07:52:50 -0000 Author: rene Date: Fri Jun 13 07:52:49 2014 New Revision: 357655 URL: http://svnweb.freebsd.org/changeset/ports/357655 QAT: https://qat.redports.org/buildarchive/r357655/ Log: MFH: r357475 www/chromium: update to 35.0.1916.153 - Add dependency on libdrm, which is now required by the configure phase - upstream GYP_GENERATOR now defaults to "ninja" on FreeBSD Security: http://vuxml.freebsd.org/freebsd/0b0fb9b0-f0fb-11e3-9bcd-000c6e25e3e9.html Approved by: portmgr (erwin) Modified: branches/2014Q2/www/chromium/Makefile branches/2014Q2/www/chromium/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/chromium/Makefile ============================================================================== --- branches/2014Q2/www/chromium/Makefile Fri Jun 13 07:36:27 2014 (r357654) +++ branches/2014Q2/www/chromium/Makefile Fri Jun 13 07:52:49 2014 (r357655) @@ -4,7 +4,7 @@ #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3 PORTNAME= chromium -PORTVERSION= 35.0.1916.114 +PORTVERSION= 35.0.1916.153 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -33,7 +33,8 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/gra libcups.so:${PORTSDIR}/print/cups-client \ libevent-1.4.so:${PORTSDIR}/devel/libevent \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libpci.so:${PORTSDIR}/devel/libpci + libpci.so:${PORTSDIR}/devel/libpci \ + libdrm.so:${PORTSDIR}/graphics/libdrm RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf @@ -140,7 +141,6 @@ GYP_DEFINES+= buildtype=Official CONFIGURE_ENV+= CC="${CC}" \ CXX="${CXX}" \ - GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" Modified: branches/2014Q2/www/chromium/distinfo ============================================================================== --- branches/2014Q2/www/chromium/distinfo Fri Jun 13 07:36:27 2014 (r357654) +++ branches/2014Q2/www/chromium/distinfo Fri Jun 13 07:52:49 2014 (r357655) @@ -1,4 +1,4 @@ -SHA256 (chromium-35.0.1916.114.tar.xz) = 566fcdc05d53c551d142ac9742ef69ba7c6d5a450d8ec41c0efd4fc8249f77af -SIZE (chromium-35.0.1916.114.tar.xz) = 206243256 -SHA256 (chromium-35.0.1916.114-testdata.tar.xz) = 122977c93e1d211abfe92af2ccad359af83de277e89c89d1259928f0b1a04ea1 -SIZE (chromium-35.0.1916.114-testdata.tar.xz) = 109106164 +SHA256 (chromium-35.0.1916.153.tar.xz) = 280ceb4307ba334918aacd1c5672e6ce6538bf229f90415245ede5b569e5e70e +SIZE (chromium-35.0.1916.153.tar.xz) = 206225052 +SHA256 (chromium-35.0.1916.153-testdata.tar.xz) = b3b977312a7a57f53cd8a02ab59480509ab39ea66130855da16438de888d92f4 +SIZE (chromium-35.0.1916.153-testdata.tar.xz) = 109105000 From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 14 14:10:13 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3357B21F; Sat, 14 Jun 2014 14:10:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 201D22291; Sat, 14 Jun 2014 14:10:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5EEACFc096652; Sat, 14 Jun 2014 14:10:12 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5EEACMT096649; Sat, 14 Jun 2014 14:10:12 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201406141410.s5EEACMT096649@svn.freebsd.org> From: Koop Mast Date: Sat, 14 Jun 2014 14:10:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357780 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jun 2014 14:10:13 -0000 Author: kwm Date: Sat Jun 14 14:10:12 2014 New Revision: 357780 URL: http://svnweb.freebsd.org/changeset/ports/357780 QAT: https://qat.redports.org/buildarchive/r357780/ Log: MFH: r357772 Document dbus local dos Approved by: portmgr (miwi) Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Sat Jun 14 13:40:09 2014 (r357779) +++ branches/2014Q2/security/vuxml/vuln.xml Sat Jun 14 14:10:12 2014 (r357780) @@ -51,6 +51,37 @@ Note: Please add new entries to the beg --> + + dbus -- local DoS + + + dbus + 1.8.01.8.4 + 1.6.20 + + + + +

Simon MvVittie reports:

+
+

Alban Crequy at Collabora Ltd. discovered and fixed a + denial-of-service flaw in dbus-daemon, part of the reference + implementation of D-Bus. Additionally, in highly unusual + environments the same flaw could lead to a side channel between + processes that should not be able to communicate.

+
+ +
+ + CVE-2014-3477 + http://lists.freedesktop.org/archives/dbus/2014-June/016220.html + + + 2014-06-10 + 2014-06-14 + +
+ chromium -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 14 14:17:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FDE75A5; Sat, 14 Jun 2014 14:17:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62D51233E; Sat, 14 Jun 2014 14:17:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5EEH7LT001093; Sat, 14 Jun 2014 14:17:07 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5EEH6ap001087; Sat, 14 Jun 2014 14:17:06 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201406141417.s5EEH6ap001087@svn.freebsd.org> From: Koop Mast Date: Sat, 14 Jun 2014 14:17:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357782 - branches/2014Q2/devel/dbus X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jun 2014 14:17:07 -0000 Author: kwm Date: Sat Jun 14 14:17:06 2014 New Revision: 357782 URL: http://svnweb.freebsd.org/changeset/ports/357782 QAT: https://qat.redports.org/buildarchive/r357782/ Log: Update to 1.6.20. Fix local dos vulnability. Direct commit to 2014Q2 branch because it using a different version that head. Approved by: portmgr (miwi) Security: 52bbc7e8-f13c-11e3-bc09-bcaec565249c Modified: branches/2014Q2/devel/dbus/Makefile branches/2014Q2/devel/dbus/distinfo branches/2014Q2/devel/dbus/pkg-plist Modified: branches/2014Q2/devel/dbus/Makefile ============================================================================== --- branches/2014Q2/devel/dbus/Makefile Sat Jun 14 14:15:58 2014 (r357781) +++ branches/2014Q2/devel/dbus/Makefile Sat Jun 14 14:17:06 2014 (r357782) @@ -3,7 +3,7 @@ # $MCom: ports/devel/dbus/Makefile,v 1.58 2013/02/15 15:06:49 kwm Exp $ PORTNAME= dbus -PORTVERSION= 1.6.18 +PORTVERSION= 1.6.20 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ Modified: branches/2014Q2/devel/dbus/distinfo ============================================================================== --- branches/2014Q2/devel/dbus/distinfo Sat Jun 14 14:15:58 2014 (r357781) +++ branches/2014Q2/devel/dbus/distinfo Sat Jun 14 14:17:06 2014 (r357782) @@ -1,2 +1,2 @@ -SHA256 (dbus-1.6.18.tar.gz) = 7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd -SIZE (dbus-1.6.18.tar.gz) = 1916553 +SHA256 (dbus-1.6.20.tar.gz) = 78e60f78b247fd5ad9b695863957457cbd6c76c690117bb8c1b9df55ea691841 +SIZE (dbus-1.6.20.tar.gz) = 1917579 Modified: branches/2014Q2/devel/dbus/pkg-plist ============================================================================== --- branches/2014Q2/devel/dbus/pkg-plist Sat Jun 14 14:15:58 2014 (r357781) +++ branches/2014Q2/devel/dbus/pkg-plist Sat Jun 14 14:17:06 2014 (r357782) @@ -28,7 +28,7 @@ lib/libdbus-1.a lib/libdbus-1.la lib/libdbus-1.so lib/libdbus-1.so.3 -lib/libdbus-1.so.3.7.6 +lib/libdbus-1.so.3.7.7 libdata/pkgconfig/dbus-1.pc libexec/dbus-daemon-launch-helper man/man1/dbus-cleanup-sockets.1.gz @@ -53,3 +53,6 @@ man/man1/dbus-uuidgen.1.gz @dirrm etc/dbus-1/system.d @dirrm etc/dbus-1/session.d @dirrm etc/dbus-1 +@cwd / +@dirrmtry /var/run/dbus +@cwd From owner-svn-ports-branches@FreeBSD.ORG Sun Jun 15 12:41:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7215CC8; Sun, 15 Jun 2014 12:41:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A860426F2; Sun, 15 Jun 2014 12:41:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5FCfrie023250; Sun, 15 Jun 2014 12:41:53 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5FCfrwI023246; Sun, 15 Jun 2014 12:41:53 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201406151241.s5FCfrwI023246@svn.freebsd.org> From: Thomas Zander Date: Sun, 15 Jun 2014 12:41:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357876 - in branches/2014Q2/multimedia/mpeg4ip: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2014 12:41:53 -0000 Author: riggs Date: Sun Jun 15 12:41:52 2014 New Revision: 357876 URL: http://svnweb.freebsd.org/changeset/ports/357876 QAT: https://qat.redports.org/buildarchive/r357876/ Log: MFH: r357872 - Unbreak build with clang - Update shared lib handling: mp3lame -> libmp3lame.so etc. - USES libtool - Stagify - Pet portlint - Makefile cleanup - Rename files/patch-include::mpeg4ip_byteswap.h -> get rid of colons - Bump PORTREVISION Approved by: portmgr (swills), mentors (implicit) Added: branches/2014Q2/multimedia/mpeg4ip/files/patch-include-mpeg4ip_byteswap.h - copied unchanged from r357872, head/multimedia/mpeg4ip/files/patch-include-mpeg4ip_byteswap.h branches/2014Q2/multimedia/mpeg4ip/files/patch-server-mp4live-video_util_resize.h - copied unchanged from r357872, head/multimedia/mpeg4ip/files/patch-server-mp4live-video_util_resize.h Deleted: branches/2014Q2/multimedia/mpeg4ip/files/patch-include::mpeg4ip_byteswap.h Modified: branches/2014Q2/multimedia/mpeg4ip/Makefile branches/2014Q2/multimedia/mpeg4ip/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/multimedia/mpeg4ip/Makefile ============================================================================== --- branches/2014Q2/multimedia/mpeg4ip/Makefile Sun Jun 15 12:40:42 2014 (r357875) +++ branches/2014Q2/multimedia/mpeg4ip/Makefile Sun Jun 15 12:41:52 2014 (r357876) @@ -3,7 +3,7 @@ PORTNAME= mpeg4ip PORTVERSION= 1.6.1 -PORTREVISION= 27 +PORTREVISION= 28 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= LOCAL/ahze # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136 @@ -15,23 +15,24 @@ COMMENT= Standards-based system to encod BUILD_DEPENDS= mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2 \ ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= faac:${PORTSDIR}/audio/faac \ - faad:${PORTSDIR}/audio/faad \ - mp3lame:${PORTSDIR}/audio/lame \ - id3tag:${PORTSDIR}/audio/libid3tag \ - a52:${PORTSDIR}/audio/liba52 \ - mpeg2:${PORTSDIR}/multimedia/libmpeg2 \ +LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac \ + libfaad.so:${PORTSDIR}/audio/faad \ + libmp3lame.so:${PORTSDIR}/audio/lame \ + libid3tag.so:${PORTSDIR}/audio/libid3tag \ + liba52.so:${PORTSDIR}/audio/liba52 \ + libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \ libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \ - x264:${PORTSDIR}/multimedia/x264 + libx264.so:${PORTSDIR}/multimedia/x264 RUN_DEPENDS= mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2 USE_GNOME= gtk20 USE_SDL= sdl -USE_GMAKE= yes +USES= gmake libtool pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -Wno-return-type +CPPFLAGS+= -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-ffmpeg=${LOCALBASE} \ --enable-mp4live \ --disable-static @@ -45,38 +46,6 @@ PORTDOCS= MAINREADME.html MP4LIVE_INTERN ReadingList.txt encoding.htm m4rm.html \ mp4player.jpg mrm.html pi.html prm.html -MAN1= gmp4player.1 mp4creator.1 mp4encode.1 mp4live.1 -MAN3= MP4.3 MP4AddAudioTrack.3 MP4AddHintTrack.3 MP4AddODTrack.3 \ - MP4AddRtpESConfigurationPacket.3 MP4AddRtpHint.3 MP4AddRtpImmediateData.3 \ - MP4AddRtpPacket.3 MP4AddRtpSampleData.3 MP4AddRtpVideoHint.3 MP4AddSceneTrack.3 \ - MP4AddSystemsTrack.3 MP4AddTrack.3 MP4AddTrackEdit.3 MP4AddVideoTrack.3 \ - MP4AppendHintTrackSdp.3 MP4AppendSessionSdp.3 MP4BinaryToBase16.3 MP4BinaryToBase64.3 \ - MP4CloneTrack.3 MP4Close.3 MP4ConvertFromMovieDuration.3 MP4ConvertFromTrackDuration.3 \ - MP4ConvertFromTrackTimestamp.3 MP4ConvertToTrackDuration.3 MP4ConvertToTrackTimestamp.3 \ - MP4CopySample.3 MP4CopyTrack.3 MP4Create.3 MP4DeleteTrack.3 MP4DeleteTrackEdit.3 \ - MP4Dump.3 MP4FileInfo.3 MP4FindTrackId.3 MP4FindTrackIndex.3 MP4GetAudioProfileLevel.3 \ - MP4GetDuration.3 MP4GetGraphicsProfileLevel.3 MP4GetHintTrackReferenceTrackId.3 MP4GetHintTrackRtpPayload.3 \ - MP4GetHintTrackSdp.3 MP4GetNumberOfTracks.3 MP4GetODProfileLevel.3 MP4GetRtpHintNumberOfPackets.3 \ - MP4GetRtpPacketBFrame.3 MP4GetRtpPacketTransmitOffset.3 MP4GetRtpTimestampStart.3 \ - MP4GetSampleDuration.3 MP4GetSampleIdFromEditTime.3 MP4GetSampleIdFromTime.3 \ - MP4GetSampleRenderingOffset.3 MP4GetSampleSize.3 MP4GetSampleSync.3 MP4GetSampleTime.3 \ - MP4GetSceneProfileLevel.3 MP4GetSessionSdp.3 MP4GetTimeScale.3 MP4GetTrackAudioMpeg4Type.3 \ - MP4GetTrackAudioType.3 MP4GetTrackBitRate.3 MP4GetTrackDuration.3 MP4GetTrackESConfiguration.3 \ - MP4GetTrackEditDuration.3 MP4GetTrackEditDwell.3 MP4GetTrackEditMediaStart.3 MP4GetTrackEditStart.3 \ - MP4GetTrackEditTotalDuration.3 MP4GetTrackFixedSampleDuration.3 MP4GetTrackMaxSampleSize.3 \ - MP4GetTrackNumberOfEdits.3 MP4GetTrackNumberOfSamples.3 MP4GetTrackTimeScale.3 MP4GetTrackType.3 \ - MP4GetTrackVideoFrameRate.3 MP4GetTrackVideoHeight.3 MP4GetTrackVideoType.3 MP4GetTrackVideoWidth.3 \ - MP4GetVerbosity.3 MP4GetVideoProfileLevel.3 MP4Info.3 MP4MakeIsmaCompliant.3 \ - MP4Modify.3 MP4Optimize.3 MP4Read.3 MP4ReadRtpHint.3 MP4ReadRtpPacket.3 \ - MP4ReadSample.3 MP4ReadSampleFromEditTime.3 MP4ReadSampleFromTime.3 MP4SetAudioProfileLevel.3 \ - MP4SetGraphicsProfileLevel.3 MP4SetHintTrackRtpPayload.3 MP4SetHintTrackSdp.3 \ - MP4SetODProfileLevel.3 MP4SetRtpTimestampStart.3 MP4SetSampleRenderingOffset.3 \ - MP4SetSceneProfileLevel.3 MP4SetSessionSdp.3 MP4SetTimeScale.3 MP4SetTrackESConfiguration.3 \ - MP4SetTrackEditDuration.3 MP4SetTrackEditDwell.3 MP4SetTrackEditMediaStart.3 \ - MP4SetTrackTimeScale.3 MP4SetVerbosity.3 MP4SetVideoProfileLevel.3 \ - MP4WriteRtpHint.3 MP4WriteSample.3 - -NO_STAGE= yes .include ### @@ -104,7 +73,7 @@ USE_GNOME+= esound .endif # nas .if ${PORT_OPTIONS:MNAS} -LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas +LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas .endif # ipv6 @@ -114,7 +83,7 @@ CONFIGURE_ARGS+= --enable-ipv6 # xvid .if ${PORT_OPTIONS:MXVID} -LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid +LIB_DEPENDS+= libxvidcore.so:${PORTSDIR}/multimedia/xvid PLIST_SUB+= XVID="" .else @@ -175,16 +144,16 @@ post-configure: @echo '#include "mpeg4ip.h"' > ${WRKSRC}/lib/mp4v2/mp4.h post-install: - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/server/util/mp4encode/mp4encode \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} \ ${WRKSRC}/server/util/mp4encode/mp4venc_template.par \ - ${DATADIR} + ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for files in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/doc/${files} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in ${DOC_FILES} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Copied: branches/2014Q2/multimedia/mpeg4ip/files/patch-include-mpeg4ip_byteswap.h (from r357872, head/multimedia/mpeg4ip/files/patch-include-mpeg4ip_byteswap.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/multimedia/mpeg4ip/files/patch-include-mpeg4ip_byteswap.h Sun Jun 15 12:41:52 2014 (r357876, copy of r357872, head/multimedia/mpeg4ip/files/patch-include-mpeg4ip_byteswap.h) @@ -0,0 +1,38 @@ +--- include/mpeg4ip_byteswap.h.orig Mon Jul 22 14:27:09 2002 ++++ include/mpeg4ip_byteswap.h Sun Nov 7 03:57:01 2004 +@@ -24,6 +24,10 @@ + #include + #endif + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include ++#endif ++ + #if defined(WORDS_BIGENDIAN) + /* All bigendian systems are fine, just ignore the swaps. */ + #define B2N_16(x) (x) +@@ -55,6 +59,24 @@ + * FreeBSD and Solaris don't have or any other such + * functionality! + */ ++ ++#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 ++#include ++#define B2N_16(x) (be16toh(x)) ++#define B2N_32(x) (be32toh(x)) ++# if __FreeBSD_version >= 510000 ++#define B2N_64(x) (be64toh(x)) ++# else ++#define B2N_64(x) \ ++ x = ((((x) & 0xff00000000000000) >> 56) | \ ++ (((x) & 0x00ff000000000000) >> 40) | \ ++ (((x) & 0x0000ff0000000000) >> 24) | \ ++ (((x) & 0x000000ff00000000) >> 8) | \ ++ (((x) & 0x00000000ff000000) << 8) | \ ++ (((x) & 0x0000000000ff0000) << 24) | \ ++ (((x) & 0x000000000000ff00) << 40) | \ ++ (((x) & 0x00000000000000ff) << 56)) ++# endif + + #elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(_WIN32) + #define B2N_16(x) \ Copied: branches/2014Q2/multimedia/mpeg4ip/files/patch-server-mp4live-video_util_resize.h (from r357872, head/multimedia/mpeg4ip/files/patch-server-mp4live-video_util_resize.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/multimedia/mpeg4ip/files/patch-server-mp4live-video_util_resize.h Sun Jun 15 12:41:52 2014 (r357876, copy of r357872, head/multimedia/mpeg4ip/files/patch-server-mp4live-video_util_resize.h) @@ -0,0 +1,12 @@ +--- server/mp4live/video_util_resize.h.orig 2005-03-25 21:40:05.000000000 +0100 ++++ server/mp4live/video_util_resize.h 2014-06-15 12:20:58.012489469 +0200 +@@ -90,7 +90,7 @@ + + void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV, + uint32_t fyStride, uint32_t fuStride, uint32_t fvStride, +- uint8_t *tY, uint8_t *tU, uint8_t *fV, +- uint32_t tyStride, uint32_t tvStride, uint32_t tvStride, ++ uint8_t *tY, uint8_t *tU, uint8_t *tV, ++ uint32_t tyStride, uint32_t tuStride, uint32_t tvStride, + uint32_t w, uint32_t h); + #endif Modified: branches/2014Q2/multimedia/mpeg4ip/pkg-plist ============================================================================== --- branches/2014Q2/multimedia/mpeg4ip/pkg-plist Sun Jun 15 12:40:42 2014 (r357875) +++ branches/2014Q2/multimedia/mpeg4ip/pkg-plist Sun Jun 15 12:41:52 2014 (r357876) @@ -42,130 +42,241 @@ include/rtp_plugin.h include/sdp.h include/sdp_error.h include/text_plugin.h -lib/libhttp.la lib/libhttp.so lib/libhttp.so.0 -lib/libismacryp.la +lib/libhttp.so.0.0.0 lib/libismacryp.so lib/libismacryp.so.0 -lib/libmp4.la +lib/libismacryp.so.0.0.0 lib/libmp4.so lib/libmp4.so.0 -lib/libmp4av.la +lib/libmp4.so.0.0.0 lib/libmp4av.so lib/libmp4av.so.0 -lib/libmp4util.la +lib/libmp4av.so.0.0.0 lib/libmp4util.so lib/libmp4util.so.0 -lib/libmpeg4ipSDL-1.2.so -lib/libmpeg4ipSDL-1.2.so.7 -lib/libmpeg4ipSDL.la +lib/libmp4util.so.0.0.0 +lib/libmpeg4ipSDL-1.2.so.0 +lib/libmpeg4ipSDL-1.2.so.0.7.1 lib/libmpeg4ipSDL.so -lib/libmpeg4ip_celp.la lib/libmpeg4ip_celp.so lib/libmpeg4ip_celp.so.0 -lib/libmpeg4ip_celpbs.la +lib/libmpeg4ip_celp.so.0.0.0 lib/libmpeg4ip_celpbs.so lib/libmpeg4ip_celpbs.so.0 -lib/libmpeg4ip_faad.la +lib/libmpeg4ip_celpbs.so.0.0.0 lib/libmpeg4ip_faad.so lib/libmpeg4ip_faad.so.0 -lib/libmpeg4ip_ffmpeg.la +lib/libmpeg4ip_faad.so.0.0.0 lib/libmpeg4ip_ffmpeg.so lib/libmpeg4ip_ffmpeg.so.0 -lib/libmpeg4ip_fposrec.la +lib/libmpeg4ip_ffmpeg.so.0.0.0 lib/libmpeg4ip_fposrec.so lib/libmpeg4ip_fposrec.so.0 -lib/libmpeg4ip_gnu.la +lib/libmpeg4ip_fposrec.so.0.0.0 lib/libmpeg4ip_gnu.so lib/libmpeg4ip_gnu.so.0 -lib/libmpeg4ip_mpeg4_iso.la +lib/libmpeg4ip_gnu.so.0.0.0 lib/libmpeg4ip_mpeg4_iso.so lib/libmpeg4ip_mpeg4_iso.so.0 -lib/libmsg_queue.la +lib/libmpeg4ip_mpeg4_iso.so.0.0.0 lib/libmsg_queue.so lib/libmsg_queue.so.0 -lib/libsdp.la +lib/libmsg_queue.so.0.0.0 lib/libsdp.so lib/libsdp.so.0 -lib/libsrtpif.la +lib/libsdp.so.0.0.0 lib/libsrtpif.so lib/libsrtpif.so.0 -lib/mp4player_plugin/a52_audio_plugin.la +lib/libsrtpif.so.0.0.0 lib/mp4player_plugin/a52_audio_plugin.so lib/mp4player_plugin/a52_audio_plugin.so.0 -lib/mp4player_plugin/aac_plugin.la +lib/mp4player_plugin/a52_audio_plugin.so.0.0.0 lib/mp4player_plugin/aac_plugin.so lib/mp4player_plugin/aac_plugin.so.0 -lib/mp4player_plugin/celp_plugin.la +lib/mp4player_plugin/aac_plugin.so.0.0.0 lib/mp4player_plugin/celp_plugin.so lib/mp4player_plugin/celp_plugin.so.0 -lib/mp4player_plugin/ffmpeg_audio_plugin.la +lib/mp4player_plugin/celp_plugin.so.0.0.0 lib/mp4player_plugin/ffmpeg_audio_plugin.so lib/mp4player_plugin/ffmpeg_audio_plugin.so.0 -lib/mp4player_plugin/ffmpeg_video_plugin.la +lib/mp4player_plugin/ffmpeg_audio_plugin.so.0.0.0 lib/mp4player_plugin/ffmpeg_video_plugin.so lib/mp4player_plugin/ffmpeg_video_plugin.so.0 -lib/mp4player_plugin/g711_audio_plugin.la +lib/mp4player_plugin/ffmpeg_video_plugin.so.0.0.0 lib/mp4player_plugin/g711_audio_plugin.so lib/mp4player_plugin/g711_audio_plugin.so.0 -lib/mp4player_plugin/h261_plugin.la +lib/mp4player_plugin/g711_audio_plugin.so.0.0.0 lib/mp4player_plugin/h261_plugin.so lib/mp4player_plugin/h261_plugin.so.0 -lib/mp4player_plugin/h261_rtp_plugin.la +lib/mp4player_plugin/h261_plugin.so.0.0.0 lib/mp4player_plugin/h261_rtp_plugin.so lib/mp4player_plugin/h261_rtp_plugin.so.0 -lib/mp4player_plugin/h264_rtp_plugin.la +lib/mp4player_plugin/h261_rtp_plugin.so.0.0.0 lib/mp4player_plugin/h264_rtp_plugin.so lib/mp4player_plugin/h264_rtp_plugin.so.0 -lib/mp4player_plugin/href_rtp_plugin.la +lib/mp4player_plugin/h264_rtp_plugin.so.0.0.0 lib/mp4player_plugin/href_rtp_plugin.so lib/mp4player_plugin/href_rtp_plugin.so.0 -lib/mp4player_plugin/href_text_plugin.la +lib/mp4player_plugin/href_rtp_plugin.so.0.0.0 lib/mp4player_plugin/href_text_plugin.so lib/mp4player_plugin/href_text_plugin.so.0 -lib/mp4player_plugin/isma_enc_rtp_plugin.la +lib/mp4player_plugin/href_text_plugin.so.0.0.0 lib/mp4player_plugin/isma_enc_rtp_plugin.so lib/mp4player_plugin/isma_enc_rtp_plugin.so.0 -lib/mp4player_plugin/isma_enc_video_rtp_plugin.la +lib/mp4player_plugin/isma_enc_rtp_plugin.so.0.0.0 lib/mp4player_plugin/isma_enc_video_rtp_plugin.so lib/mp4player_plugin/isma_enc_video_rtp_plugin.so.0 -lib/mp4player_plugin/isma_rtp_plugin.la +lib/mp4player_plugin/isma_enc_video_rtp_plugin.so.0.0.0 lib/mp4player_plugin/isma_rtp_plugin.so lib/mp4player_plugin/isma_rtp_plugin.so.0 -lib/mp4player_plugin/latm_rtp_plugin.la +lib/mp4player_plugin/isma_rtp_plugin.so.0.0.0 lib/mp4player_plugin/latm_rtp_plugin.so lib/mp4player_plugin/latm_rtp_plugin.so.0 -lib/mp4player_plugin/mp3_plugin.la +lib/mp4player_plugin/latm_rtp_plugin.so.0.0.0 lib/mp4player_plugin/mp3_plugin.so lib/mp4player_plugin/mp3_plugin.so.0 -lib/mp4player_plugin/mpeg2dec_video_plugin.la +lib/mp4player_plugin/mp3_plugin.so.0.0.0 lib/mp4player_plugin/mpeg2dec_video_plugin.so lib/mp4player_plugin/mpeg2dec_video_plugin.so.0 -lib/mp4player_plugin/mpeg4_iso_plugin.la +lib/mp4player_plugin/mpeg2dec_video_plugin.so.0.0.0 lib/mp4player_plugin/mpeg4_iso_plugin.so lib/mp4player_plugin/mpeg4_iso_plugin.so.0 -lib/mp4player_plugin/plaintext_text_plugin.la +lib/mp4player_plugin/mpeg4_iso_plugin.so.0.0.0 lib/mp4player_plugin/plaintext_text_plugin.so lib/mp4player_plugin/plaintext_text_plugin.so.0 -lib/mp4player_plugin/raw_audio_plugin.la +lib/mp4player_plugin/plaintext_text_plugin.so.0.0.0 lib/mp4player_plugin/raw_audio_plugin.so lib/mp4player_plugin/raw_audio_plugin.so.0 -lib/mp4player_plugin/raw_video_plugin.la +lib/mp4player_plugin/raw_audio_plugin.so.0.0.0 lib/mp4player_plugin/raw_video_plugin.so lib/mp4player_plugin/raw_video_plugin.so.0 -lib/mp4player_plugin/rfc2429_rtp_plugin.la +lib/mp4player_plugin/raw_video_plugin.so.0.0.0 lib/mp4player_plugin/rfc2429_rtp_plugin.so lib/mp4player_plugin/rfc2429_rtp_plugin.so.0 -lib/mp4player_plugin/rfc3267_plugin.la +lib/mp4player_plugin/rfc2429_rtp_plugin.so.0.0.0 lib/mp4player_plugin/rfc3267_plugin.so lib/mp4player_plugin/rfc3267_plugin.so.0 -lib/mp4player_plugin/wav_plugin.la +lib/mp4player_plugin/rfc3267_plugin.so.0.0.0 lib/mp4player_plugin/wav_plugin.so lib/mp4player_plugin/wav_plugin.so.0 -%%XVID%%lib/mp4player_plugin/xvid10_plugin.la +lib/mp4player_plugin/wav_plugin.so.0.0.0 %%XVID%%lib/mp4player_plugin/xvid10_plugin.so %%XVID%%lib/mp4player_plugin/xvid10_plugin.so.0 +%%XVID%%lib/mp4player_plugin/xvid10_plugin.so.0.0.0 +man/man1/gmp4player.1.gz +man/man1/mp4creator.1.gz +man/man1/mp4encode.1.gz +man/man1/mp4live.1.gz +man/man3/MP4.3.gz +man/man3/MP4AddAudioTrack.3.gz +man/man3/MP4AddHintTrack.3.gz +man/man3/MP4AddODTrack.3.gz +man/man3/MP4AddRtpESConfigurationPacket.3.gz +man/man3/MP4AddRtpHint.3.gz +man/man3/MP4AddRtpImmediateData.3.gz +man/man3/MP4AddRtpPacket.3.gz +man/man3/MP4AddRtpSampleData.3.gz +man/man3/MP4AddRtpVideoHint.3.gz +man/man3/MP4AddSceneTrack.3.gz +man/man3/MP4AddSystemsTrack.3.gz +man/man3/MP4AddTrack.3.gz +man/man3/MP4AddTrackEdit.3.gz +man/man3/MP4AddVideoTrack.3.gz +man/man3/MP4AppendHintTrackSdp.3.gz +man/man3/MP4AppendSessionSdp.3.gz +man/man3/MP4BinaryToBase16.3.gz +man/man3/MP4BinaryToBase64.3.gz +man/man3/MP4CloneTrack.3.gz +man/man3/MP4Close.3.gz +man/man3/MP4ConvertFromMovieDuration.3.gz +man/man3/MP4ConvertFromTrackDuration.3.gz +man/man3/MP4ConvertFromTrackTimestamp.3.gz +man/man3/MP4ConvertToTrackDuration.3.gz +man/man3/MP4ConvertToTrackTimestamp.3.gz +man/man3/MP4CopySample.3.gz +man/man3/MP4CopyTrack.3.gz +man/man3/MP4Create.3.gz +man/man3/MP4DeleteTrack.3.gz +man/man3/MP4DeleteTrackEdit.3.gz +man/man3/MP4Dump.3.gz +man/man3/MP4FileInfo.3.gz +man/man3/MP4FindTrackId.3.gz +man/man3/MP4FindTrackIndex.3.gz +man/man3/MP4GetAudioProfileLevel.3.gz +man/man3/MP4GetDuration.3.gz +man/man3/MP4GetGraphicsProfileLevel.3.gz +man/man3/MP4GetHintTrackReferenceTrackId.3.gz +man/man3/MP4GetHintTrackRtpPayload.3.gz +man/man3/MP4GetHintTrackSdp.3.gz +man/man3/MP4GetNumberOfTracks.3.gz +man/man3/MP4GetODProfileLevel.3.gz +man/man3/MP4GetRtpHintNumberOfPackets.3.gz +man/man3/MP4GetRtpPacketBFrame.3.gz +man/man3/MP4GetRtpPacketTransmitOffset.3.gz +man/man3/MP4GetRtpTimestampStart.3.gz +man/man3/MP4GetSampleDuration.3.gz +man/man3/MP4GetSampleIdFromEditTime.3.gz +man/man3/MP4GetSampleIdFromTime.3.gz +man/man3/MP4GetSampleRenderingOffset.3.gz +man/man3/MP4GetSampleSize.3.gz +man/man3/MP4GetSampleSync.3.gz +man/man3/MP4GetSampleTime.3.gz +man/man3/MP4GetSceneProfileLevel.3.gz +man/man3/MP4GetSessionSdp.3.gz +man/man3/MP4GetTimeScale.3.gz +man/man3/MP4GetTrackAudioMpeg4Type.3.gz +man/man3/MP4GetTrackAudioType.3.gz +man/man3/MP4GetTrackBitRate.3.gz +man/man3/MP4GetTrackDuration.3.gz +man/man3/MP4GetTrackESConfiguration.3.gz +man/man3/MP4GetTrackEditDuration.3.gz +man/man3/MP4GetTrackEditDwell.3.gz +man/man3/MP4GetTrackEditMediaStart.3.gz +man/man3/MP4GetTrackEditStart.3.gz +man/man3/MP4GetTrackEditTotalDuration.3.gz +man/man3/MP4GetTrackFixedSampleDuration.3.gz +man/man3/MP4GetTrackMaxSampleSize.3.gz +man/man3/MP4GetTrackNumberOfEdits.3.gz +man/man3/MP4GetTrackNumberOfSamples.3.gz +man/man3/MP4GetTrackTimeScale.3.gz +man/man3/MP4GetTrackType.3.gz +man/man3/MP4GetTrackVideoFrameRate.3.gz +man/man3/MP4GetTrackVideoHeight.3.gz +man/man3/MP4GetTrackVideoType.3.gz +man/man3/MP4GetTrackVideoWidth.3.gz +man/man3/MP4GetVerbosity.3.gz +man/man3/MP4GetVideoProfileLevel.3.gz +man/man3/MP4Info.3.gz +man/man3/MP4MakeIsmaCompliant.3.gz +man/man3/MP4Modify.3.gz +man/man3/MP4Optimize.3.gz +man/man3/MP4Read.3.gz +man/man3/MP4ReadRtpHint.3.gz +man/man3/MP4ReadRtpPacket.3.gz +man/man3/MP4ReadSample.3.gz +man/man3/MP4ReadSampleFromEditTime.3.gz +man/man3/MP4ReadSampleFromTime.3.gz +man/man3/MP4SetAudioProfileLevel.3.gz +man/man3/MP4SetGraphicsProfileLevel.3.gz +man/man3/MP4SetHintTrackRtpPayload.3.gz +man/man3/MP4SetHintTrackSdp.3.gz +man/man3/MP4SetODProfileLevel.3.gz +man/man3/MP4SetRtpTimestampStart.3.gz +man/man3/MP4SetSampleRenderingOffset.3.gz +man/man3/MP4SetSceneProfileLevel.3.gz +man/man3/MP4SetSessionSdp.3.gz +man/man3/MP4SetTimeScale.3.gz +man/man3/MP4SetTrackESConfiguration.3.gz +man/man3/MP4SetTrackEditDuration.3.gz +man/man3/MP4SetTrackEditDwell.3.gz +man/man3/MP4SetTrackEditMediaStart.3.gz +man/man3/MP4SetTrackTimeScale.3.gz +man/man3/MP4SetVerbosity.3.gz +man/man3/MP4SetVideoProfileLevel.3.gz +man/man3/MP4WriteRtpHint.3.gz +man/man3/MP4WriteSample.3.gz %%DATADIR%%/mp4venc_template.par @dirrm %%DATADIR%% @dirrm lib/mp4player_plugin From owner-svn-ports-branches@FreeBSD.ORG Mon Jun 16 12:50:52 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D8A49CA; Mon, 16 Jun 2014 12:50:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A07A2D79; Mon, 16 Jun 2014 12:50:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5GCoqRX088262; Mon, 16 Jun 2014 12:50:52 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5GCopCb088259; Mon, 16 Jun 2014 12:50:51 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406161250.s5GCopCb088259@svn.freebsd.org> From: Pawel Pekala Date: Mon, 16 Jun 2014 12:50:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r357984 - in branches/2014Q2/multimedia/nxtvepg: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2014 12:50:52 -0000 Author: pawel Date: Mon Jun 16 12:50:51 2014 New Revision: 357984 URL: http://svnweb.freebsd.org/changeset/ports/357984 QAT: https://qat.redports.org/buildarchive/r357984/ Log: MFH: r357969 - Fix build with clang (include -> ) - Add staging support - Convert to new options framework, USES=tk Approved by: portmgr (swills) Modified: branches/2014Q2/multimedia/nxtvepg/Makefile branches/2014Q2/multimedia/nxtvepg/files/patch-Makefile.bsd branches/2014Q2/multimedia/nxtvepg/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/multimedia/nxtvepg/Makefile ============================================================================== --- branches/2014Q2/multimedia/nxtvepg/Makefile Mon Jun 16 12:49:00 2014 (r357983) +++ branches/2014Q2/multimedia/nxtvepg/Makefile Mon Jun 16 12:50:51 2014 (r357984) @@ -9,33 +9,23 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Viewer for Nextview Electronic TV Programme Guide (needs bktr driver) -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 - NOT_FOR_ARCHS= sparc64 USE_GMAKE= yes USE_XORG= x11 xmu +MAKE_ARGS= ROOT=${STAGEDIR} MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} WRKSRC=${WRKSRC} X11BASE=${LOCALBASE} -MAN1= nxtvepg.1 nxtvepgd.1 -MYPORTDOCS= README TODO CHANGES manual.html +OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e "s,machine/ioctl_bt848.h,dev/bktr/ioctl_bt848.h,; \ + @${REINPLACE_CMD} -e "s,machine/ioctl_bt848.h,dev/bktr/ioctl_bt848.h,; \ s,machine/ioctl_meteor.h,dev/bktr/ioctl_meteor.h," \ ${WRKSRC}/epgvbi/btdrv4linux.c ${WRKSRC}/tvsim/tvsim_main.c + @${REINPLACE_CMD} 's|wait.h|sys/&|' ${WRKSRC}/epgdb/ttxgrab.c post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/nxtvepg ${LOCALBASE}/bin - ${INSTALL_DATA} ${WRKSRC}/Nxtvepg.ad ${LOCALBASE}/lib/X11/app-defaults/Nxtvepg - ${INSTALL_MAN} ${WRKSRC}/nxtvepg.1 ${LOCALBASE}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/nxtvepgd.1 ${LOCALBASE}/man/man1 - -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in ${MYPORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README TODO CHANGES manual.html \ + ${STAGEDIR}${DOCSDIR}) .include Modified: branches/2014Q2/multimedia/nxtvepg/files/patch-Makefile.bsd ============================================================================== --- branches/2014Q2/multimedia/nxtvepg/files/patch-Makefile.bsd Mon Jun 16 12:49:00 2014 (r357983) +++ branches/2014Q2/multimedia/nxtvepg/files/patch-Makefile.bsd Mon Jun 16 12:50:51 2014 (r357984) @@ -1,37 +1,31 @@ ---- Makefile.bsd.orig 2005-01-01 16:35:26.000000000 -0200 -+++ Makefile.bsd 2009-10-21 22:28:33.000000000 -0200 -@@ -69,15 +69,10 @@ - ECHO ?= @echo - - # Paths --ROOT = +--- Makefile.bsd.orig 2005-01-01 19:35:26.000000000 +0100 ++++ Makefile.bsd 2014-06-16 12:41:56.046094882 +0200 +@@ -73,11 +73,7 @@ exec_prefix = ${prefix} --bindir = $(ROOT)${exec_prefix}/bin --mandir = $(ROOT)${prefix}/man/man1 + bindir = $(ROOT)${exec_prefix}/bin + mandir = $(ROOT)${prefix}/man/man1 -ifeq ($(OS), FreeBSD) -resdir = $(ROOT)/usr/X11R6/lib/X11 -else -+bindir = ${exec_prefix}/bin -+mandir = ${prefix}/man/man1 - resdir = $(LOCALBASE)/lib/X11 +-resdir = $(LOCALBASE)/lib/X11 -endif ++resdir = $(ROOT)${prefix}/lib/X11 # other settings OPTFLAGS = -O -pipe -g -@@ -117,7 +112,7 @@ - - ifndef USER_DBDIR - DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\" --INST_DB_DIR = $(ROOT)$(SYS_DBDIR) -+INST_DB_DIR = $(SYS_DBDIR) - INST_DB_PERM = 0777 - endif - -@@ -128,7 +123,7 @@ - CFLAGS += $(WARN) $(INCS) $(DEFS) +@@ -96,7 +92,7 @@ + DEFS += -DTK_LIBRARY_PATH=\"$(TK_LIBRARY_PATH)\" + DEFS += -DTCL_LIBRARY_PATH=\"$(TCL_LIBRARY_PATH)\" + +-DEFS += -DX11_APP_DEFAULTS=\"$(resdir)/app-defaults/Nxtvepg\" ++DEFS += -DX11_APP_DEFAULTS=\"$(LOCALBASE)/lib/X11/app-defaults/Nxtvepg\" + + # enable use of multi-threading + ifdef WANT_THREADS +@@ -129,6 +125,7 @@ LDFLAGS += -lm #LDFLAGS += -pg -- + +BUILD_DIR= ${WRKSRC} all :: printconfig Modified: branches/2014Q2/multimedia/nxtvepg/pkg-plist ============================================================================== --- branches/2014Q2/multimedia/nxtvepg/pkg-plist Mon Jun 16 12:49:00 2014 (r357983) +++ branches/2014Q2/multimedia/nxtvepg/pkg-plist Mon Jun 16 12:50:51 2014 (r357984) @@ -1,6 +1,8 @@ bin/nxtvepg bin/nxtvepgd lib/X11/app-defaults/Nxtvepg +man/man1/nxtvepg.1.gz +man/man1/nxtvepgd.1.gz %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/CHANGES From owner-svn-ports-branches@FreeBSD.ORG Tue Jun 17 19:52:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9ABF8286; Tue, 17 Jun 2014 19:52:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8790326A7; Tue, 17 Jun 2014 19:52:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5HJqtAp066230; Tue, 17 Jun 2014 19:52:55 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5HJqtYi066226; Tue, 17 Jun 2014 19:52:55 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201406171952.s5HJqtYi066226@svn.freebsd.org> From: Brooks Davis Date: Tue, 17 Jun 2014 19:52:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358172 - branches/2014Q2/devel/llvm34 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2014 19:52:55 -0000 Author: brooks Date: Tue Jun 17 19:52:54 2014 New Revision: 358172 URL: http://svnweb.freebsd.org/changeset/ports/358172 QAT: https://qat.redports.org/buildarchive/r358172/ Log: MFC r358146: Install missing components of llvm-lit. PR: 190562 Approved by: portmgr (erwin) Modified: branches/2014Q2/devel/llvm34/Makefile branches/2014Q2/devel/llvm34/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/llvm34/Makefile ============================================================================== --- branches/2014Q2/devel/llvm34/Makefile Tue Jun 17 19:44:28 2014 (r358171) +++ branches/2014Q2/devel/llvm34/Makefile Tue Jun 17 19:52:54 2014 (r358172) @@ -2,6 +2,7 @@ PORTNAME= llvm PORTVERSION= 3.4 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -153,7 +154,8 @@ post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ - ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py + ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \ + ${WRKSRC}/utils/lit/lit/formats/*.py .if ${PORT_OPTIONS:MCMAKE} post-configure: @@ -207,6 +209,9 @@ post-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} + ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}/formats + ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKSRC}/${RELEASE_TYPE}/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ @@ -257,6 +262,8 @@ build-plist: -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' >> ${PLIST} echo "%%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%" >> \ ${PLIST} + echo "%%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats" >> \ + ${PLIST} ${FIND} ${STAGEDIR}${DOCSDIR} -type d | \ ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' | \ ${SORT} -r >> ${PLIST} Modified: branches/2014Q2/devel/llvm34/pkg-plist ============================================================================== --- branches/2014Q2/devel/llvm34/pkg-plist Tue Jun 17 19:44:28 2014 (r358171) +++ branches/2014Q2/devel/llvm34/pkg-plist Tue Jun 17 19:52:54 2014 (r358172) @@ -628,8 +628,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transfo llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize.h llvm%%LLVM_SUFFIX%%/lib/BugpointPasses.so llvm%%LLVM_SUFFIX%%/lib/LLVMHello.so -llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.4.so -llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.4.so.0 +llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%PORTVERSION%%.so +llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%PORTVERSION%%.so.0 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmPrinter.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a @@ -738,6 +738,10 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestingConfig.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/__init__.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/discovery.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/__init__.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/base.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/googletest.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/shtest.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/main.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/run.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/util.py @@ -1003,5 +1007,6 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so @dirrm llvm%%LLVM_SUFFIX%%/bin @dirrm llvm%%LLVM_SUFFIX%% %%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%% +%%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-branches@FreeBSD.ORG Wed Jun 18 11:23:54 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0946FD09; Wed, 18 Jun 2014 11:23:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA34E25B9; Wed, 18 Jun 2014 11:23:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5IBNrrb099340; Wed, 18 Jun 2014 11:23:53 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5IBNr1d099338; Wed, 18 Jun 2014 11:23:53 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201406181123.s5IBNr1d099338@svn.freebsd.org> From: Lars Engels Date: Wed, 18 Jun 2014 11:23:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358242 - branches/2014Q2/games/scummvm-tools X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2014 11:23:54 -0000 Author: lme Date: Wed Jun 18 11:23:53 2014 New Revision: 358242 URL: http://svnweb.freebsd.org/changeset/ports/358242 QAT: https://qat.redports.org/buildarchive/r358242/ Log: MFH: r354829 - Fix packaging Approved by: portmgr (mat) Modified: branches/2014Q2/games/scummvm-tools/Makefile branches/2014Q2/games/scummvm-tools/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/scummvm-tools/Makefile ============================================================================== --- branches/2014Q2/games/scummvm-tools/Makefile Wed Jun 18 11:05:20 2014 (r358241) +++ branches/2014Q2/games/scummvm-tools/Makefile Wed Jun 18 11:23:53 2014 (r358242) @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= -STRIP_FILES= construct_mohawk create_sjisfnt decine decompile degob dekyra \ +STRIP_FILES= construct_mohawk create_sjisfnt decine degob dekyra \ deriven descumm desword2 extract_mohawk gob_loadcalc \ scummvm-tools-cli Modified: branches/2014Q2/games/scummvm-tools/pkg-plist ============================================================================== --- branches/2014Q2/games/scummvm-tools/pkg-plist Wed Jun 18 11:05:20 2014 (r358241) +++ branches/2014Q2/games/scummvm-tools/pkg-plist Wed Jun 18 11:23:53 2014 (r358242) @@ -1,7 +1,6 @@ bin/construct_mohawk bin/create_sjisfnt bin/decine -bin/decompile bin/degob bin/dekyra bin/deriven From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 20 22:22:35 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D4CE0C27; Fri, 20 Jun 2014 22:22:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C14AA21BC; Fri, 20 Jun 2014 22:22:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5KMMZeo067842; Fri, 20 Jun 2014 22:22:35 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5KMMZXN067841; Fri, 20 Jun 2014 22:22:35 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201406202222.s5KMMZXN067841@svn.freebsd.org> From: Matthew Seaman Date: Fri, 20 Jun 2014 22:22:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358646 - branches/2014Q2/databases/phpmyadmin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 22:22:35 -0000 Author: matthew Date: Fri Jun 20 22:22:35 2014 New Revision: 358646 URL: http://svnweb.freebsd.org/changeset/ports/358646 QAT: https://qat.redports.org/buildarchive/r358646/ Log: MFH: r358641 Security update to 4.2.4 - while here switch plist to use @sample The advisories: PMASA-2014-2 and PMASA-2014-3, have not been published yet, so there is very little concrete information about what the security problems are. About all there is comes from the change log, where the security issues are listed as: - bug #4464 [security] XSS injection due to unescaped db/table name in navigation hiding - bug #4465 [security] XSS injection due to unescaped db/table name in recent/favorite tables ChangeLog: http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.2.4/phpMyAdmin-4.2.4-notes.html/view Approved by: portmgr Modified: branches/2014Q2/databases/phpmyadmin/pkg-plist-chunk Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/phpmyadmin/pkg-plist-chunk ============================================================================== --- branches/2014Q2/databases/phpmyadmin/pkg-plist-chunk Fri Jun 20 22:20:56 2014 (r358645) +++ branches/2014Q2/databases/phpmyadmin/pkg-plist-chunk Fri Jun 20 22:22:35 2014 (r358646) @@ -1,7 +1,5 @@ @mode 640 @group %%PMA_GRP%% -@unexec if cmp -s %D/%%WWWDIR%%/config.inc.php.sample %D/%%WWWDIR%%/config.inc.php ; then rm -f %D/%%WWWDIR%%/config.inc.php ; fi -%%WWWDIR%%/config.inc.php.sample -@exec [ ! -f %B/config.inc.php ] && cp -p %B/%f %B/config.inc.php || true +@sample %%WWWDIR%%/config.inc.php.sample @mode @group From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 20 22:25:15 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D167AE5E; Fri, 20 Jun 2014 22:25:15 +0000 (UTC) Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3cd3:cd67:fafa:3d78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.infracaninophile.co.uk", Issuer "ca.infracaninophile.co.uk" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 7891D21CB; Fri, 20 Jun 2014 22:25:15 +0000 (UTC) Received: from seedling.black-earth.co.uk (seedling.black-earth.co.uk [81.2.117.99]) (authenticated bits=0) by smtp.infracaninophile.co.uk (8.14.8/8.14.8) with ESMTP id s5KMPAnZ004000 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 20 Jun 2014 23:25:10 +0100 (BST) (envelope-from matthew@FreeBSD.org) Authentication-Results: lucid-nonsense.infracaninophile.co.uk; dmarc=none header.from=FreeBSD.org DKIM-Filter: OpenDKIM Filter v2.8.3 smtp.infracaninophile.co.uk s5KMPAnZ004000 Authentication-Results: smtp.infracaninophile.co.uk/s5KMPAnZ004000; dkim=none reason="no signature"; dkim-adsp=none Message-ID: <53A4B4BF.6050308@FreeBSD.org> Date: Fri, 20 Jun 2014 23:25:03 +0100 From: Matthew Seaman User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r358646 - branches/2014Q2/databases/phpmyadmin References: <201406202222.s5KMMZXN067841@svn.freebsd.org> In-Reply-To: <201406202222.s5KMMZXN067841@svn.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="IxKS3QnDP577JVFtbrCvHwHvAhgqD2JDg" X-Virus-Scanned: clamav-milter 0.98.3 at lucid-nonsense.infracaninophile.co.uk X-Virus-Status: Clean X-Spam-Status: No, score=-3.0 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lucid-nonsense.infracaninophile.co.uk X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 22:25:15 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --IxKS3QnDP577JVFtbrCvHwHvAhgqD2JDg Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 20/06/2014 23:22, Matthew Seaman wrote: > Author: matthew > Date: Fri Jun 20 22:22:35 2014 > New Revision: 358646 > URL: http://svnweb.freebsd.org/changeset/ports/358646 > QAT: https://qat.redports.org/buildarchive/r358646/ >=20 > Log: > MFH: r358641 > =20 > Security update to 4.2.4 > =20 > - while here switch plist to use @sample > =20 > The advisories: PMASA-2014-2 and PMASA-2014-3, have not been publishe= d > yet, so there is very little concrete information about what the > security problems are. About all there is comes from the change log, > where the security issues are listed as: > =20 > - bug #4464 [security] XSS injection due to unescaped db/table name i= n navigation hiding > - bug #4465 [security] XSS injection due to unescaped db/table name i= n recent/favorite tables > =20 > ChangeLog: http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmi= n/4.2.4/phpMyAdmin-4.2.4-notes.html/view > Approved by: portmgr >=20 > Modified: > branches/2014Q2/databases/phpmyadmin/pkg-plist-chunk > Directory Properties: > branches/2014Q2/ (props changed) >=20 > Modified: branches/2014Q2/databases/phpmyadmin/pkg-plist-chunk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2014Q2/databases/phpmyadmin/pkg-plist-chunk Fri Jun 20 22:= 20:56 2014 (r358645) > +++ branches/2014Q2/databases/phpmyadmin/pkg-plist-chunk Fri Jun 20 22:= 22:35 2014 (r358646) > @@ -1,7 +1,5 @@ > @mode 640 > @group %%PMA_GRP%% > -@unexec if cmp -s %D/%%WWWDIR%%/config.inc.php.sample %D/%%WWWDIR%%/co= nfig.inc.php ; then rm -f %D/%%WWWDIR%%/config.inc.php ; fi > -%%WWWDIR%%/config.inc.php.sample > -@exec [ ! -f %B/config.inc.php ] && cp -p %B/%f %B/config.inc.php || t= rue > +@sample %%WWWDIR%%/config.inc.php.sample > @mode > @group >=20 Oh dear. Epic fail. Missing the important stuff like Makefile and distinfo. Matthew --=20 Dr Matthew J Seaman MA, D.Phil. PGP: http://www.infracaninophile.co.uk/pgpkey --IxKS3QnDP577JVFtbrCvHwHvAhgqD2JDg Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.20 (Darwin) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQJ8BAEBCgBmBQJTpLTFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NTNBNjhCOTEzQTRFNkNGM0UxRTEzMjZC QjIzQUY1MThFMUE0MDEzAAoJELsjr1GOGkATiAUP/2Lu/OPinlhS9L/2rB2jbPU4 onO3h/s03WPFahtbOeZPIXECoaGEO/tAwCKrgac1MEoBAP1rP+4IWhXP1Jgh/W9S QNG/jmovLNHeVqftIrARQ4q9Sg+LPobUb+o/ERSkbdFFmqdb4NWEc268utgLOwUW wbnq7h6KDARiwz99tdX8XOON/h6bPbZtanJTwC/fjNJgXPQ/0KyE70mXJr8UCOgc Dycy67fonyaWbQ7vTi4HbVL6rRz6c7AQ5nHbetvk2+giN/VX0uzzOuWg6C5m95hQ 6xEkWShZMsk8LofWc5JcS3PoYtn7MSpILsqTQTzmc4sB4aSETRQ3QH1vMH3b2gov Ss+FeuDdl3TMnFqbcGjshRZp+bXtBVbICP4fCwaxvR5u15iCACsRH2y603lZlzUo Maph12N0NJBIptKFfYeByb7rH7TT35q+YccmkVB3/sOmrCsegQm1Vqn5LMHn+GGe aNxzAdzYr2qOfcbkuBJnEYJ2hrUC7vTRodSI+uR29sgMuhcy0W+ghW6vV3swL3l1 ykJzYjDqHNlCVQv9RhWIxv6hstV2dFunT1gBIZ3p2sV/aeEpR6gH7dL4EzOghy4a 2tjTsr76dJjSVco0SvrkYxXoXe07YolAR7/U15uFuoO5ReqCgvNgmbEB4cuVP5PG 2aIekH4vsU3FXU+STOuv =oUzS -----END PGP SIGNATURE----- --IxKS3QnDP577JVFtbrCvHwHvAhgqD2JDg-- From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 20 23:07:25 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55265CC3; Fri, 20 Jun 2014 23:07:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 27D052503; Fri, 20 Jun 2014 23:07:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5KN7PZL087916; Fri, 20 Jun 2014 23:07:25 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5KN7O2u087913; Fri, 20 Jun 2014 23:07:24 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201406202307.s5KN7O2u087913@svn.freebsd.org> From: Matthew Seaman Date: Fri, 20 Jun 2014 23:07:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358654 - branches/2014Q2/databases/phpmyadmin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 23:07:25 -0000 Author: matthew Date: Fri Jun 20 23:07:24 2014 New Revision: 358654 URL: http://svnweb.freebsd.org/changeset/ports/358654 QAT: https://qat.redports.org/buildarchive/r358654/ Log: MFH: r358641,r358643 Fix botched initial attempt at MFH Security update to 4.2.4 - while here switch plist to use @sample The advisories: PMASA-2014-2 and PMASA-2014-3, have not been published yet, so there is very little concrete information about what the security problems are. About all there is comes from the change log, where the security issues are listed as: - bug #4464 [security] XSS injection due to unescaped db/table name in navigation hiding - bug #4465 [security] XSS injection due to unescaped db/table name in recent/favorite tables ChaneLog: http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.2.4/phpMyAdmin-4.2.4-notes.html/view Approved by: portmgr Modified: branches/2014Q2/databases/phpmyadmin/Makefile branches/2014Q2/databases/phpmyadmin/distinfo Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/databases/phpmyadmin/Makefile ============================================================================== --- branches/2014Q2/databases/phpmyadmin/Makefile Fri Jun 20 23:04:08 2014 (r358653) +++ branches/2014Q2/databases/phpmyadmin/Makefile Fri Jun 20 23:07:24 2014 (r358654) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.1.12 +DISTVERSION= 4.2.4 CATEGORIES= databases www MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION} DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages @@ -25,7 +25,7 @@ USE_PHP= ctype session filter mbstring j # FONTCONFIG in the graphics/gd port options. OPTIONS_DEFINE= APC BZ2 GD MCRYPT OPENSSL PDF XML ZIP ZLIB -OPTIONS_DEFAULT= APC BZ2 GD MCRYPT MYSQLI OPENSSL PDF XML ZIP ZLIB +OPTIONS_DEFAULT= BZ2 GD MCRYPT OPENSSL XML ZIP ZLIB OPTIONS_MULTI= DB_connect OPTIONS_MULTI_DB_connect= MYSQL MYSQLI Modified: branches/2014Q2/databases/phpmyadmin/distinfo ============================================================================== --- branches/2014Q2/databases/phpmyadmin/distinfo Fri Jun 20 23:04:08 2014 (r358653) +++ branches/2014Q2/databases/phpmyadmin/distinfo Fri Jun 20 23:07:24 2014 (r358654) @@ -1,2 +1,2 @@ -SHA256 (phpMyAdmin-4.1.12-all-languages.tar.xz) = c91d37d9c61fa84e741423173474e5d2fde8f7e450169328c776e5485ebb3c18 -SIZE (phpMyAdmin-4.1.12-all-languages.tar.xz) = 4872100 +SHA256 (phpMyAdmin-4.2.4-all-languages.tar.xz) = aebcd7cfabd4993405340ecb2b76ce0cb4ab345a817ae7c371a830e22b2c2513 +SIZE (phpMyAdmin-4.2.4-all-languages.tar.xz) = 5176840 From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 21 16:48:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F057A3CD; Sat, 21 Jun 2014 16:48:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD9692154; Sat, 21 Jun 2014 16:48:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5LGm2iY077089; Sat, 21 Jun 2014 16:48:02 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5LGm2BM077088; Sat, 21 Jun 2014 16:48:02 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406211648.s5LGm2BM077088@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 21 Jun 2014 16:48:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358717 - branches/2014Q2/Mk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 16:48:03 -0000 Author: rakuco Date: Sat Jun 21 16:48:02 2014 New Revision: 358717 URL: http://svnweb.freebsd.org/changeset/ports/358717 QAT: https://qat.redports.org/buildarchive/r358717/ Log: MFH: r358308 PYTHON_PY3K_PLIST_HACK: Take @dirrmtry entries into account as well. When using the plist hack to add __pycache__ entries for Python >= 3.2.0, take @dirrmtry entries into account as well, otherwise if those directories happen to contain __pycache__ subdirectories the latter will not be removed. CR: D191 PR: 190847 Approved by: portmgr (erwin) Modified: branches/2014Q2/Mk/bsd.python.mk Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/Mk/bsd.python.mk ============================================================================== --- branches/2014Q2/Mk/bsd.python.mk Sat Jun 21 16:38:43 2014 (r358716) +++ branches/2014Q2/Mk/bsd.python.mk Sat Jun 21 16:48:02 2014 (r358717) @@ -564,6 +564,7 @@ add-plist-post: @${AWK} '\ /\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.py[co]$$/, "." mt "&"); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \ /^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \ + /^@dirrmtry / {d = substr($$0, 11); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \ {print} \ END {if (sp in dirs) {print "@dirrm " sp "/" pc}} \ ' \ From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 21 16:49:55 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7F304D8; Sat, 21 Jun 2014 16:49:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B45142166; Sat, 21 Jun 2014 16:49:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5LGntvj077509; Sat, 21 Jun 2014 16:49:55 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5LGntPt077507; Sat, 21 Jun 2014 16:49:55 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406211649.s5LGntPt077507@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sat, 21 Jun 2014 16:49:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358718 - branches/2014Q2/devel/py-qt4-core X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 16:49:55 -0000 Author: rakuco Date: Sat Jun 21 16:49:54 2014 New Revision: 358718 URL: http://svnweb.freebsd.org/changeset/ports/358718 QAT: https://qat.redports.org/buildarchive/r358718/ Log: MFH: r358702 Build with Python 3 as well. Instead of forcefully removing the pyuic/uic/port_v3/ directory, which in effect prevents the port from building with Python 3, check for the major Python version being used and selectively remove either port_v2/ or port_v3/. Additionally, set PYTHON_PY3K_PLIST_HACK, since PyQt does not use either distutils or setuptools, and Python >= 3.2 store .pyc/.pyo files in a different directory. PR: 180467 Submitted by: nwhitehorn@ (original version) Approved by: portmgr (erwin) Modified: branches/2014Q2/devel/py-qt4-core/Makefile branches/2014Q2/devel/py-qt4-core/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/py-qt4-core/Makefile ============================================================================== --- branches/2014Q2/devel/py-qt4-core/Makefile Sat Jun 21 16:48:02 2014 (r358717) +++ branches/2014Q2/devel/py-qt4-core/Makefile Sat Jun 21 16:49:54 2014 (r358718) @@ -3,6 +3,7 @@ PORTNAME= core PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -17,6 +18,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes +PYTHON_PY3K_PLIST_HACK= yes USE_PYTHON= yes USE_QT4= corelib qmake_build moc_build @@ -38,7 +40,7 @@ ARGS= -b ${PREFIX}/bin \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include +.include .if empty(PORT_OPTIONS:MAPI) ARGS+= --no-qsci-api @@ -53,8 +55,16 @@ PLIST_SUB+= API="" ARGS+= --debug --trace .endif +# Bug 180467: We need to remove the port_v${VERSION} directory that does not +# correspond to the Python version being used to avoid failures in the +# bytecompilation calls in post-install. +PLIST_SUB+= PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}" post-patch: +.if ${PYTHON_MAJOR_VER} == "2" ${RM} -rf ${WRKSRC}/pyuic/uic/port_v3 +.elif ${PYTHON_MAJOR_VER} == "3" + ${RM} -rf ${WRKSRC}/pyuic/uic/port_v2 +.endif do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ @@ -75,4 +85,4 @@ post-install: ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\ `ls *.py */*.py */*/*.py` -.include +.include Modified: branches/2014Q2/devel/py-qt4-core/pkg-plist ============================================================================== --- branches/2014Q2/devel/py-qt4-core/pkg-plist Sat Jun 21 16:48:02 2014 (r358717) +++ branches/2014Q2/devel/py-qt4-core/pkg-plist Sat Jun 21 16:49:54 2014 (r358718) @@ -54,27 +54,27 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyo @@ -200,7 +200,7 @@ share/py-sip/QtCore/qxmlstream.sip %%API%%share/qt4/qsci/api/python/QtCore.api @dirrm share/py-sip/QtCore @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins -@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2 +@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%% @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic From owner-svn-ports-branches@FreeBSD.ORG Sun Jun 22 22:19:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 30C1B514; Sun, 22 Jun 2014 22:19:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D7132B3D; Sun, 22 Jun 2014 22:19:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MMJqCj005172; Sun, 22 Jun 2014 22:19:52 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MMJqQP005157; Sun, 22 Jun 2014 22:19:52 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201406222219.s5MMJqQP005157@svn.freebsd.org> From: Rene Ladan Date: Sun, 22 Jun 2014 22:19:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358850 - in branches/2014Q2/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2014 22:19:53 -0000 Author: rene Date: Sun Jun 22 22:19:52 2014 New Revision: 358850 URL: http://svnweb.freebsd.org/changeset/ports/358850 QAT: https://qat.redports.org/buildarchive/r358850/ Log: MFH: r358825 Fix a crash which happens frequently on i386 due to unaligned memory access in its built-in ffmpeg. PR: 189317 Submitted by: dim, adrian on freebsd-chromium@ Approved by: portmgr (erwin) Added: branches/2014Q2/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h - copied unchanged from r358825, head/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h Modified: branches/2014Q2/www/chromium/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/chromium/Makefile ============================================================================== --- branches/2014Q2/www/chromium/Makefile Sun Jun 22 22:18:55 2014 (r358849) +++ branches/2014Q2/www/chromium/Makefile Sun Jun 22 22:19:52 2014 (r358850) @@ -5,6 +5,7 @@ PORTNAME= chromium PORTVERSION= 35.0.1916.153 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Copied: branches/2014Q2/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h (from r358825, head/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h Sun Jun 22 22:19:52 2014 (r358850, copy of r358825, head/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h) @@ -0,0 +1,11 @@ +--- third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-05-13 23:46:25.000000000 +0200 ++++ third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2014-05-16 22:18:50.000000000 +0200 +@@ -1,7 +1,7 @@ + /* Automatically generated by configure - do not modify! */ + #ifndef FFMPEG_CONFIG_H + #define FFMPEG_CONFIG_H +-#define FFMPEG_CONFIGURATION "--disable-everything --disable-avdevice --disable-avfilter --disable-bzlib --disable-doc --disable-ffprobe --disable-lzo --disable-network --disable-postproc --disable-swresample --disable-swscale --disable-zlib --enable-fft --enable-rdft --enable-shared --disable-iconv --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='vp3,vorbis,vp8' --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --disable-error-resilience" ++#define FFMPEG_CONFIGURATION "--disable-everything --disable-avdevice --disable-avfilter --disable-bzlib --disable-doc --disable-ffprobe --disable-lzo --disable-network --disable-postproc --disable-swresample --disable-swscale --disable-zlib --enable-fft --enable-rdft --enable-shared --disable-iconv --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --optflags=-O2 --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='vp3,vorbis,vp8' --arch=i686 --enable-yasm --extra-cflags=-m32,-mstack-alignment=16,-mstackrealign --extra-ldflags=-m32 --enable-pic --disable-error-resilience" + #define FFMPEG_LICENSE "LGPL version 2.1 or later" + #define CONFIG_THIS_YEAR 2013 + #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" From owner-svn-ports-branches@FreeBSD.ORG Sun Jun 22 22:21:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 58950830; Sun, 22 Jun 2014 22:21:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 433792BC5; Sun, 22 Jun 2014 22:21:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MML2uh006926; Sun, 22 Jun 2014 22:21:02 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MML2If006925; Sun, 22 Jun 2014 22:21:02 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201406222221.s5MML2If006925@svn.freebsd.org> From: Rene Ladan Date: Sun, 22 Jun 2014 22:21:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358853 - branches/2014Q2/Mk/Uses X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2014 22:21:02 -0000 Author: rene Date: Sun Jun 22 22:21:01 2014 New Revision: 358853 URL: http://svnweb.freebsd.org/changeset/ports/358853 QAT: https://qat.redports.org/buildarchive/r358853/ Log: MFH: r358828 Add --strip-debug to STRIP_CMD to avoid removing kernel symbols from the installed kernel module. This would otherwise break comms/uarduno on amd64 when converting this port to USES=kmod. PR: 189621 (in private followup) Submitted by: Bob Frazier Approved by: portmgr (erwin) Modified: branches/2014Q2/Mk/Uses/kmod.mk Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/Mk/Uses/kmod.mk ============================================================================== --- branches/2014Q2/Mk/Uses/kmod.mk Sun Jun 22 22:20:46 2014 (r358852) +++ branches/2014Q2/Mk/Uses/kmod.mk Sun Jun 22 22:21:01 2014 (r358853) @@ -32,6 +32,7 @@ KMODDIR= /boot/modules PLIST_SUB+= KMODDIR="${KMODDIR:C,^/,,}" MAKE_ENV+= KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys" NO_XREF=yes +STRIP_CMD+= --strip-debug # do not strip kernel symbols .endif .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_KMOD_POST_MK) From owner-svn-ports-branches@FreeBSD.ORG Sun Jun 22 22:34:06 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC0942E2; Sun, 22 Jun 2014 22:34:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B987D2CC2; Sun, 22 Jun 2014 22:34:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MMY65A014602; Sun, 22 Jun 2014 22:34:06 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MMY6p2014601; Sun, 22 Jun 2014 22:34:06 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406222234.s5MMY6p2014601@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 22 Jun 2014 22:34:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358862 - branches/2014Q2/x11/gnome2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2014 22:34:06 -0000 Author: bapt Date: Sun Jun 22 22:34:06 2014 New Revision: 358862 URL: http://svnweb.freebsd.org/changeset/ports/358862 QAT: https://qat.redports.org/buildarchive/r358862/ Log: MFH: r358860 Remove packagekit from gnome2 packages to allow having a gnome2 package in the release With hat: portmgr Modified: branches/2014Q2/x11/gnome2/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/x11/gnome2/Makefile ============================================================================== --- branches/2014Q2/x11/gnome2/Makefile Sun Jun 22 22:31:36 2014 (r358861) +++ branches/2014Q2/x11/gnome2/Makefile Sun Jun 22 22:34:06 2014 (r358862) @@ -4,7 +4,7 @@ PORTNAME= gnome2 PORTVERSION= 2.32.1 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -91,7 +91,6 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im ${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \ ${LOCALBASE}/lib/gtk-2.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi \ - gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit \ ekiga:${PORTSDIR}/net-im/ekiga .if ${OSVERSION}>=800000 RUN_DEPENDS+= cheese:${PORTSDIR}/multimedia/cheese From owner-svn-ports-branches@FreeBSD.ORG Sun Jun 22 22:34:35 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A1403C8; Sun, 22 Jun 2014 22:34:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 576372CC9; Sun, 22 Jun 2014 22:34:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MMYZei014756; Sun, 22 Jun 2014 22:34:35 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MMYZ8I014755; Sun, 22 Jun 2014 22:34:35 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406222234.s5MMYZ8I014755@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 22 Jun 2014 22:34:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358863 - branches/2014Q2/ports-mgmt/gnome-packagekit X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2014 22:34:35 -0000 Author: bapt Date: Sun Jun 22 22:34:34 2014 New Revision: 358863 URL: http://svnweb.freebsd.org/changeset/ports/358863 QAT: https://qat.redports.org/buildarchive/r358863/ Log: MFH: r358861 Mark as broken: it is failing for a while With hat: portmgr Modified: branches/2014Q2/ports-mgmt/gnome-packagekit/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/ports-mgmt/gnome-packagekit/Makefile ============================================================================== --- branches/2014Q2/ports-mgmt/gnome-packagekit/Makefile Sun Jun 22 22:34:06 2014 (r358862) +++ branches/2014Q2/ports-mgmt/gnome-packagekit/Makefile Sun Jun 22 22:34:34 2014 (r358863) @@ -11,6 +11,8 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= PackageKit client programs for the GNOME desktop +BROKEN= fails to package + BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ packagekit-glib2:${PORTSDIR}/ports-mgmt/packagekit \ From owner-svn-ports-branches@FreeBSD.ORG Wed Jun 25 14:00:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39274760; Wed, 25 Jun 2014 14:00:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CA5D2B1A; Wed, 25 Jun 2014 14:00:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5PE0abt036524; Wed, 25 Jun 2014 14:00:36 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5PE0aaV036523; Wed, 25 Jun 2014 14:00:36 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201406251400.s5PE0aaV036523@svn.freebsd.org> From: Matthew Seaman Date: Wed, 25 Jun 2014 14:00:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r359243 - branches/2014Q2/databases/phpmyadmin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jun 2014 14:00:37 -0000 Author: matthew Date: Wed Jun 25 14:00:36 2014 New Revision: 359243 URL: http://svnweb.freebsd.org/changeset/ports/359243 QAT: https://qat.redports.org/buildarchive/r359243/ Log: Fix mismerge by synching with the version in head. Approved by: portmgr (erwin) Modified: branches/2014Q2/databases/phpmyadmin/Makefile Modified: branches/2014Q2/databases/phpmyadmin/Makefile ============================================================================== --- branches/2014Q2/databases/phpmyadmin/Makefile Wed Jun 25 13:51:33 2014 (r359242) +++ branches/2014Q2/databases/phpmyadmin/Makefile Wed Jun 25 14:00:36 2014 (r359243) @@ -4,11 +4,11 @@ PORTNAME= phpMyAdmin DISTVERSION= 4.2.4 CATEGORIES= databases www -MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION} +MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION} DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages MAINTAINER= matthew@FreeBSD.org -COMMENT= A set of PHP-scripts to manage MySQL over the web +COMMENT= Set of PHP-scripts to manage MySQL over the web NO_ARCH= yes LICENSE= GPLv2 @@ -17,7 +17,7 @@ USES= shebangfix tar:xz NO_BUILD= yes .if !defined(WITHOUT_PHP_DEPENDS) IGNORE_WITH_PHP=52 -USE_PHP= ctype session filter mbstring json spl +USE_PHP= ctype session filter mbstring json spl mysqli .endif # Note: default settings will pull in X11 client support. If you don't @@ -27,15 +27,10 @@ USE_PHP= ctype session filter mbstring j OPTIONS_DEFINE= APC BZ2 GD MCRYPT OPENSSL PDF XML ZIP ZLIB OPTIONS_DEFAULT= BZ2 GD MCRYPT OPENSSL XML ZIP ZLIB -OPTIONS_MULTI= DB_connect -OPTIONS_MULTI_DB_connect= MYSQL MYSQLI - APC_DESC= PHP APC (animated progress bar) support BZ2_DESC= PHP bzip2 library support GD_DESC= PHP GD library support (requires X11) MCRYPT_DESC= PHP MCrypt library support -MYSQLI_DESC= PHP Improved MySQL client support -MYSQL_DESC= PHP MySQL support via mysql client OPENSSL_DESC= PHP OpenSSL support PDF_DESC= PHP PDFlib support XML_DESC= PHP XML support (Export to OpenDoc) @@ -52,7 +47,7 @@ CFG_FILE= config.inc.php PLIST= ${WRKDIR}/plist PLIST_SUB+= PMA_GRP=${GROUPS} -SUB_LIST+= PKGNAME=${PKGNAME} \ +SUB_LIST+= PKGNAME=${PKGNAME} \ CFG_FILE=${WWWDIR}/${CFG_FILE} SUB_FILES+= pkg-message @@ -63,7 +58,7 @@ SHEBANG_FILES= libraries/plugins/transfo .for opt in ${OPTIONS_DEFINE} ${OPTIONS_MULTI_DB_connect} . if ${PORT_OPTIONS:M${opt}} -USE_PHP+= ${opt:L} +USE_PHP+= ${opt:tl} . endif .endfor From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 27 05:58:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E1C3F22; Fri, 27 Jun 2014 05:58:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 17FEB2430; Fri, 27 Jun 2014 05:58:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5R5w7Ur069700; Fri, 27 Jun 2014 05:58:07 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5R5w13V069661; Fri, 27 Jun 2014 05:58:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406270558.s5R5w13V069661@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Jun 2014 05:58:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r359456 - in branches/2014Q2/misc: freebsd-doc-all freebsd-doc-bn freebsd-doc-da freebsd-doc-de freebsd-doc-el freebsd-doc-en freebsd-doc-es freebsd-doc-fr freebsd-doc-hu freebsd-doc-it... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 05:58:07 -0000 Author: bapt Date: Fri Jun 27 05:58:01 2014 New Revision: 359456 URL: http://svnweb.freebsd.org/changeset/ports/359456 QAT: https://qat.redports.org/buildarchive/r359456/ Log: MFH: r354559 Update to r44807 of the FreeBSD docset. Approved by: doceng (implicit) Modified: branches/2014Q2/misc/freebsd-doc-all/Makefile branches/2014Q2/misc/freebsd-doc-bn/Makefile branches/2014Q2/misc/freebsd-doc-da/Makefile branches/2014Q2/misc/freebsd-doc-de/Makefile branches/2014Q2/misc/freebsd-doc-de/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-el/Makefile branches/2014Q2/misc/freebsd-doc-en/Makefile branches/2014Q2/misc/freebsd-doc-en/distinfo branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-common branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-es/Makefile branches/2014Q2/misc/freebsd-doc-fr/Makefile branches/2014Q2/misc/freebsd-doc-hu/Makefile branches/2014Q2/misc/freebsd-doc-it/Makefile branches/2014Q2/misc/freebsd-doc-ja/Makefile branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-mn/Makefile branches/2014Q2/misc/freebsd-doc-nl/Makefile branches/2014Q2/misc/freebsd-doc-pl/Makefile branches/2014Q2/misc/freebsd-doc-pt/Makefile branches/2014Q2/misc/freebsd-doc-ru/Makefile branches/2014Q2/misc/freebsd-doc-ru/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-sr/Makefile branches/2014Q2/misc/freebsd-doc-tr/Makefile branches/2014Q2/misc/freebsd-doc-zh_cn/Makefile branches/2014Q2/misc/freebsd-doc-zh_tw/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/misc/freebsd-doc-all/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-all/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-all/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc-all -PORTVERSION= 44393 +PORTVERSION= 44807 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= #empty @@ -40,5 +40,4 @@ do-install: # empty DEPENDS_TARGET="package" .endif -NO_STAGE= yes .include Modified: branches/2014Q2/misc/freebsd-doc-bn/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-bn/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-bn/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= bn_BD.UTF-8 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-da/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-da/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-da/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= da_DK.ISO8859-1 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-de/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-de/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-de/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= de_DE.ISO8859-1 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-de/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-de/pkg-plist.html-split Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-de/pkg-plist.html-split Fri Jun 27 05:58:01 2014 (r359456) @@ -419,6 +419,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ntp.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-plip.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-pxe-nfs.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-routing.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-samba.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-servers.html Modified: branches/2014Q2/misc/freebsd-doc-el/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-el/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-el/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= el_GR.ISO8859-7 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-en/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-en/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc -PORTVERSION= 44393 +PORTVERSION= 44807 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend @@ -20,12 +20,12 @@ PLIST_SUB= DOCSDIR=${DOCBASE} \ MAKE_ARGS= FORMATS="${DOCFORMAT}" \ DOC_LANG="${DOCLANG}" \ INSTALL_COMPRESSED= \ - DOCDIR=${PREFIX}/${DOCBASE} \ + DOCDIR=${STAGEDIR}${PREFIX}/${DOCBASE} \ DOCOWN=${SHAREOWN} \ DOCGRP=${SHAREGRP} MAKE_JOBS_UNSAFE= yes +DESTDIRNAME= ${STAGEDIR}${PREFIX}/${DOCBASE} PLIST= ${WRKDIR}/pkg-plist -NO_STAGE= yes DOCLANG?= en_US.ISO8859-1 DOCLANG_PREFIX?= ${DOCLANG:C/_.*$//} Modified: branches/2014Q2/misc/freebsd-doc-en/distinfo ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/distinfo Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-en/distinfo Fri Jun 27 05:58:01 2014 (r359456) @@ -1,2 +1,2 @@ -SHA256 (freebsd-doc-44393.tar.gz) = 3baf1a292fe404aa561cc6ef31d9f352ccd6c4ae84fc139095b6d0c6751a69fd -SIZE (freebsd-doc-44393.tar.gz) = 32742504 +SHA256 (freebsd-doc-44807.tar.gz) = 1e5acc5667ccf574df7aaab1303adcb0fb412ee8b05099b963834aa30aa65474 +SIZE (freebsd-doc-44807.tar.gz) = 32775374 Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-common Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-common Fri Jun 27 05:58:01 2014 (r359456) @@ -175,6 +175,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-confirmation.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-modification-shell.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-finalconfiguration.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-keymap-10.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-keymap-select-default.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-mainexit.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-files.png @@ -192,6 +193,14 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-country.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-region.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-zone.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-disk_info.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-disk_select.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-geli_password.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-menu.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-partmenu.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-vdev_invalid.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-vdev_type.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-zfs-warning.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/docbook.css %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom/striping.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/1.png Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split Fri Jun 27 05:58:01 2014 (r359456) @@ -678,7 +678,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-marked-sections.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-xml-escape.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html @@ -690,7 +689,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-inline-glossary.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-tapebackups.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-devices.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-more-information.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-processes.html @@ -705,10 +703,9 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography-userguides.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bibliography.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/book-preface.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-boot0.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-init.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-introduction.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-splash.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html @@ -752,12 +749,10 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-encrypting.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-growing.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-hast.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-naming.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-virtual.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-enable.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-implementation.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-language.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html @@ -779,7 +774,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-graid.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-raid3.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html @@ -805,7 +799,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ix01.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-application.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-build.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-intro.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-terms.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails-tuning.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/jails.html @@ -886,12 +879,11 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ppp-troubleshoot.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoa.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pppoe.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-advanced.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-intro-setup.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-intro-spooler.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-lpd-alternatives.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-troubleshooting.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-using.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-connections.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-direct.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-lpd.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-other.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-pdls.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html @@ -910,7 +902,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn-mirrors.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html @@ -931,7 +922,8 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-bhyve.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host-virtualbox.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-config.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-fonts.html @@ -1019,6 +1011,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist-cleaning.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist-config.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist-dynamic.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist-keywords.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/plist.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/port-upgrading.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-checksum.html Modified: branches/2014Q2/misc/freebsd-doc-es/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-es/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-es/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= es_ES.ISO8859-1 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-fr/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-fr/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-fr/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= fr_FR.ISO8859-1 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-hu/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-hu/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-hu/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= hu_HU.ISO8859-2 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-it/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-it/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-it/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= it_IT.ISO8859-15 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-ja/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-ja/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-ja/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= ja_JP.eucJP -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split Fri Jun 27 05:58:01 2014 (r359456) @@ -239,7 +239,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/nutshell.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssh.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssl.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/packages-using.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/permissions.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-core.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-developers.html Modified: branches/2014Q2/misc/freebsd-doc-mn/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-mn/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-mn/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= mn_MN.UTF-8 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-nl/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-nl/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-nl/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= nl_NL.ISO8859-1 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-pl/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-pl/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-pl/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= pl_PL.ISO8859-2 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-pt/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-pt/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-pt/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -13,5 +13,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= pt_BR.ISO8859-1 DOCLANG_PREFIX= pt_BR -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-ru/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-ru/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-ru/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= ru_RU.KOI8-R -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-ru/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-ru/pkg-plist.html-split Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-ru/pkg-plist.html-split Fri Jun 27 05:58:01 2014 (r359456) @@ -264,7 +264,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-administration.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-config.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-inline-glossary.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-install.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-strategies.html Modified: branches/2014Q2/misc/freebsd-doc-sr/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-sr/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-sr/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= sr_YU.ISO8859-2 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-tr/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-tr/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-tr/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -12,5 +12,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= tr_TR.ISO8859-9 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-zh_cn/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-zh_cn/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-zh_cn/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -13,5 +13,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= zh_CN.UTF-8 DOCLANG_PREFIX= zh_CN -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: branches/2014Q2/misc/freebsd-doc-zh_tw/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-zh_tw/Makefile Fri Jun 27 05:49:31 2014 (r359455) +++ branches/2014Q2/misc/freebsd-doc-zh_tw/Makefile Fri Jun 27 05:58:01 2014 (r359456) @@ -13,5 +13,4 @@ PLIST= ${.CURDIR}/pkg-plist DOCLANG= zh_TW.Big5 DOCLANG_PREFIX= zh_TW -NO_STAGE= yes .include "${MASTERDIR}/Makefile" From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 27 05:59:34 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0041697; Fri, 27 Jun 2014 05:59:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DEBE72438; Fri, 27 Jun 2014 05:59:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5R5xX9N070465; Fri, 27 Jun 2014 05:59:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5R5xSNk070417; Fri, 27 Jun 2014 05:59:28 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406270559.s5R5xSNk070417@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Jun 2014 05:59:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r359457 - in branches/2014Q2/misc: freebsd-doc-all freebsd-doc-bn freebsd-doc-da freebsd-doc-de freebsd-doc-el freebsd-doc-en freebsd-doc-es freebsd-doc-fr freebsd-doc-hu freebsd-doc-it... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 05:59:34 -0000 Author: bapt Date: Fri Jun 27 05:59:28 2014 New Revision: 359457 URL: http://svnweb.freebsd.org/changeset/ports/359457 QAT: https://qat.redports.org/buildarchive/r359457/ Log: MFH: r357873 Update to r45038 of the FreeBSD docset. Approved by: doceng (implicit) Modified: branches/2014Q2/misc/freebsd-doc-all/Makefile branches/2014Q2/misc/freebsd-doc-bn/pkg-plist.common branches/2014Q2/misc/freebsd-doc-da/pkg-plist.common branches/2014Q2/misc/freebsd-doc-de/pkg-plist.common branches/2014Q2/misc/freebsd-doc-de/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-el/pkg-plist.common branches/2014Q2/misc/freebsd-doc-en/Makefile branches/2014Q2/misc/freebsd-doc-en/distinfo branches/2014Q2/misc/freebsd-doc-en/pkg-plist.common branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-common branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-en/pkg-plist.pdf branches/2014Q2/misc/freebsd-doc-en/pkg-plist.ps branches/2014Q2/misc/freebsd-doc-en/pkg-plist.txt branches/2014Q2/misc/freebsd-doc-es/pkg-plist.common branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.common branches/2014Q2/misc/freebsd-doc-hu/pkg-plist.common branches/2014Q2/misc/freebsd-doc-it/pkg-plist.common branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.common branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-mn/pkg-plist.common branches/2014Q2/misc/freebsd-doc-nl/pkg-plist.common branches/2014Q2/misc/freebsd-doc-pl/pkg-plist.common branches/2014Q2/misc/freebsd-doc-pt/pkg-plist.common branches/2014Q2/misc/freebsd-doc-ru/pkg-plist.common branches/2014Q2/misc/freebsd-doc-tr/pkg-plist.common branches/2014Q2/misc/freebsd-doc-zh_cn/pkg-plist.common branches/2014Q2/misc/freebsd-doc-zh_tw/Makefile branches/2014Q2/misc/freebsd-doc-zh_tw/pkg-plist.common Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/misc/freebsd-doc-all/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-all/Makefile Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-all/Makefile Fri Jun 27 05:59:28 2014 (r359457) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc-all -PORTVERSION= 44807 +PORTVERSION= 45038 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= #empty Modified: branches/2014Q2/misc/freebsd-doc-bn/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-bn/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-bn/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,6 +1,6 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/bn +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-da/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-da/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-da/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,6 +1,6 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pxe -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/da +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pxe +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-de/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-de/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-de/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,39 +1,39 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/de +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-de/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-de/pkg-plist.html-split Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-de/pkg-plist.html-split Fri Jun 27 05:59:28 2014 (r359457) @@ -414,7 +414,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-inetd.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ipv6.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-isdn.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-natd.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nfs.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-nis.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/network-ntp.html Modified: branches/2014Q2/misc/freebsd-doc-el/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-el/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-el/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,34 +1,34 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/el +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/greek-language-support +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-en/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/Makefile Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/Makefile Fri Jun 27 05:59:28 2014 (r359457) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc -PORTVERSION= 44807 +PORTVERSION= 45038 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend @@ -26,6 +26,7 @@ MAKE_ARGS= FORMATS="${DOCFORMAT}" \ MAKE_JOBS_UNSAFE= yes DESTDIRNAME= ${STAGEDIR}${PREFIX}/${DOCBASE} PLIST= ${WRKDIR}/pkg-plist +NEED_ROOT= yes DOCLANG?= en_US.ISO8859-1 DOCLANG_PREFIX?= ${DOCLANG:C/_.*$//} Modified: branches/2014Q2/misc/freebsd-doc-en/distinfo ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/distinfo Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/distinfo Fri Jun 27 05:59:28 2014 (r359457) @@ -1,2 +1,2 @@ -SHA256 (freebsd-doc-44807.tar.gz) = 1e5acc5667ccf574df7aaab1303adcb0fb412ee8b05099b963834aa30aa65474 -SIZE (freebsd-doc-44807.tar.gz) = 32775374 +SHA256 (freebsd-doc-45038.tar.gz) = 16332a25926f44c482b21ddc93024f410f74e4969432ee8b1d928b3d98ff8b9a +SIZE (freebsd-doc-45038.tar.gz) = 32859933 Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,89 +1,86 @@ -%%DOCSDIR%%/handbook -%%DOCSDIR%%/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/pmake -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/dev-model -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/en +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/building-products +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/console-server +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributors +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cups +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fonts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/hubs +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mh +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pam +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/remote-install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/serial-uart +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/wp-toolbox +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/arch-handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/dev-model +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/sockets +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/pmake +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html Fri Jun 27 05:59:28 2014 (r359457) @@ -9,7 +9,6 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.html -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.html Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-common Fri Jun 27 05:59:28 2014 (r359457) @@ -15,7 +15,6 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/cups/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/docbook.css -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/docbook.css @@ -152,6 +151,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-loader-menu.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-options-menu.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-choose-mode.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-components.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-crashdump.png @@ -180,6 +180,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-mainexit.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-files.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-mirrorselect.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-newboot-loader-menu.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-entire-part.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-disk.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-manual.png Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split Fri Jun 27 05:59:28 2014 (r359457) @@ -104,10 +104,6 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/performance-imparct.html %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/prerequisites.html %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/trademarks.html -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/index.html -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/trademarks.html %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/comparing-bsd-and-linux.html %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/index.html %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/trademarks.html @@ -589,6 +585,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html +%%DOCSDIR%%/%%DOCLANG%%/books/faq/all-about-zfs.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/bibliography.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-drives.html @@ -596,7 +593,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/disks.html -%%DOCSDIR%%/%%DOCLANG%%/books/faq/funnies.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/index.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/install.html @@ -710,7 +706,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.pdf ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.pdf Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.pdf Fri Jun 27 05:59:28 2014 (r359457) @@ -9,7 +9,6 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.pdf -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.pdf Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.ps ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.ps Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.ps Fri Jun 27 05:59:28 2014 (r359457) @@ -9,7 +9,6 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.ps -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.ps Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.txt ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.txt Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.txt Fri Jun 27 05:59:28 2014 (r359457) @@ -9,7 +9,6 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributors/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/cups/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc/article.txt -%%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges/article.txt Modified: branches/2014Q2/misc/freebsd-doc-es/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-es/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-es/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,31 +1,31 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/es +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fdp-es +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,37 +1,37 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/fr +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/building-products +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributors +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fonts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/mh +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pam +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-hu/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-hu/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-hu/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,26 +1,26 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/hu +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/cups +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/laptop +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-it/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-it/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-it/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,21 +1,21 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/it +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/unix-introduction +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,23 +1,23 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributors -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/ja +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributors +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/fonts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/design-44bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split Fri Jun 27 05:59:28 2014 (r359457) @@ -240,9 +240,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssh.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/openssl.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/permissions.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-core.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-developers.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-other.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pkgng-intro.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken.html Modified: branches/2014Q2/misc/freebsd-doc-mn/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-mn/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-mn/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,15 +1,15 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/mn +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-nl/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-nl/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-nl/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,20 +1,20 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/nl +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-pl/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-pl/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-pl/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,16 +1,16 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles -%%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +%%DOCSDIR%%/pl +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/filtering-bridges +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-pt/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-pt/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-pt/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,22 +1,22 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles %%DOCSDIR%%/%%DOCLANG_PREFIX%% -@dirrm %%DOCSDIR%%/%%DOCLANG%% +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/building-products +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/contributing-ports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/hubs +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/new-users +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/articles +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib/callouts +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/imagelib +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books +@dirrmtry %%DOCSDIR%%/%%DOCLANG%% @dirrmtry %%DOCSDIR%% Modified: branches/2014Q2/misc/freebsd-doc-ru/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-ru/pkg-plist.common Fri Jun 27 05:58:01 2014 (r359456) +++ branches/2014Q2/misc/freebsd-doc-ru/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) @@ -1,46 +1,46 @@ -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/books -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/vm-design -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng-packages -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/releng -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/relaydelay -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pr-guidelines -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/portbuild -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/pam -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/new-users -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mh -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/linux-comparison -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/laptop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/hubs -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/gjournal-desktop -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/geom-class -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-questions -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fonts -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/fbsd-from-scratch -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/custom-gcc -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cups -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing -@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 27 06:02:07 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34AD81C1; Fri, 27 Jun 2014 06:02:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1FE1E24C5; Fri, 27 Jun 2014 06:02:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5R626ii074329; Fri, 27 Jun 2014 06:02:06 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5R625Ph074313; Fri, 27 Jun 2014 06:02:05 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406270602.s5R625Ph074313@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 27 Jun 2014 06:02:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r359458 - in branches/2014Q2/misc: freebsd-doc-all freebsd-doc-en freebsd-doc-fr freebsd-doc-ja freebsd-doc-zh_cn X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 06:02:07 -0000 Author: bapt Date: Fri Jun 27 06:02:04 2014 New Revision: 359458 URL: http://svnweb.freebsd.org/changeset/ports/359458 QAT: https://qat.redports.org/buildarchive/r359458/ Log: MFH: r359083 Update to r45106 of the FreeBSD docset (a.k.a. 9.3-R version). Approved by: doceng (implicit) Modified: branches/2014Q2/misc/freebsd-doc-all/Makefile branches/2014Q2/misc/freebsd-doc-en/Makefile branches/2014Q2/misc/freebsd-doc-en/distinfo branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.common branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.html-common branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split branches/2014Q2/misc/freebsd-doc-zh_cn/pkg-plist.html-split Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/misc/freebsd-doc-all/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-all/Makefile Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-all/Makefile Fri Jun 27 06:02:04 2014 (r359458) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc-all -PORTVERSION= 45038 +PORTVERSION= 45106 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= #empty Modified: branches/2014Q2/misc/freebsd-doc-en/Makefile ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/Makefile Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-en/Makefile Fri Jun 27 06:02:04 2014 (r359458) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc -PORTVERSION= 45038 +PORTVERSION= 45106 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend Modified: branches/2014Q2/misc/freebsd-doc-en/distinfo ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/distinfo Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-en/distinfo Fri Jun 27 06:02:04 2014 (r359458) @@ -1,2 +1,2 @@ -SHA256 (freebsd-doc-45038.tar.gz) = 16332a25926f44c482b21ddc93024f410f74e4969432ee8b1d928b3d98ff8b9a -SIZE (freebsd-doc-45038.tar.gz) = 32859933 +SHA256 (freebsd-doc-45106.tar.gz) = 4ed57ea33e0518406f2ac5960ce77cd0663ea959cffcbe1714367291f7d44dda +SIZE (freebsd-doc-45106.tar.gz) = 32936992 Modified: branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-en/pkg-plist.html-split Fri Jun 27 06:02:04 2014 (r359458) @@ -45,6 +45,7 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/subversion-primer.html +%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/tracking.license.grants.html %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/trademarks.html %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-fusion.html %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/compiz-troubleshooting.html Modified: branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.common Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.common Fri Jun 27 06:02:04 2014 (r359458) @@ -24,6 +24,7 @@ @dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/faq @dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer @dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking +@dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall @dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom @dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts @dirrmtry %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib Modified: branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.html-common ============================================================================== --- branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.html-common Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.html-common Fri Jun 27 06:02:04 2014 (r359458) @@ -30,6 +30,50 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/natd.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/net-routing.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/static-routes.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser1.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-loader-menu.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-choose-mode.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-components.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-crashdump.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-hostname.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-keymap.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-services.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-dhcp.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4-static.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv4.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6-static.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-ipv6.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface-slaac.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-interface.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-network-ipv4-dns.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-accesspoints.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-scan.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-configure-wireless-wpa2setup.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-extracting.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-fetching.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-distfile-verifying.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-confirmation.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-final-modification-shell.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-finalconfiguration.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-keymap-select-default.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-mainexit.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-files.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-mirrorselect.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-entire-part.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-disk.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-manual.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-addpart.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-create.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-manual-partscheme.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-review.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-post-root-passwd.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-set-clock-local-utc.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-confirm.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-country.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-region.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-timezone-zone.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/docbook.css %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom/striping.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/imagelib/callouts/1.png Modified: branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.html-split Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-fr/pkg-plist.html-split Fri Jun 27 06:02:04 2014 (r359458) @@ -485,9 +485,18 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-kernel.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot-shutdown.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/boot.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s03.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s04.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch20s07.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-start.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch21s03.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch21s04.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ch21s07.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/colophon.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/common-tasks.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/config-network-setup.html @@ -711,6 +720,8 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-system.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-user.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-bsdinstall.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html Modified: branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-ja/pkg-plist.html-split Fri Jun 27 06:02:04 2014 (r359458) @@ -93,7 +93,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-UUCP.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-dialup.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/anoncvs.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/apbs04.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/apbs05.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/apbs06.html Modified: branches/2014Q2/misc/freebsd-doc-zh_cn/pkg-plist.html-split ============================================================================== --- branches/2014Q2/misc/freebsd-doc-zh_cn/pkg-plist.html-split Fri Jun 27 05:59:28 2014 (r359457) +++ branches/2014Q2/misc/freebsd-doc-zh_cn/pkg-plist.html-split Fri Jun 27 06:02:04 2014 (r359458) @@ -283,10 +283,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/legalnotice.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-advanced.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-lbc-install.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-maple.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-mathematica.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-matlab.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu-oracle.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/linuxemu.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-biba.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mac-bsdextended.html From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 28 13:14:01 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0D65B25C; Sat, 28 Jun 2014 13:14:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E259E269F; Sat, 28 Jun 2014 13:14:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5SDE0sc060553; Sat, 28 Jun 2014 13:14:00 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5SDE0Iv060551; Sat, 28 Jun 2014 13:14:00 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201406281314.s5SDE0Iv060551@svn.freebsd.org> From: Thomas Zander Date: Sat, 28 Jun 2014 13:14:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r359698 - branches/2014Q2/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jun 2014 13:14:01 -0000 Author: riggs Date: Sat Jun 28 13:14:00 2014 New Revision: 359698 URL: http://svnweb.freebsd.org/changeset/ports/359698 QAT: https://qat.redports.org/buildarchive/r359698/ Log: MFH: r359687 Add vuln entries for mplayer and mencoder for CVE-2014-4610 (integer overflow in ffmpeg's lzo code) Approved by: portmgr(miwi), mentors (implicit) Modified: branches/2014Q2/security/vuxml/vuln.xml Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q2/security/vuxml/vuln.xml Sat Jun 28 13:10:01 2014 (r359697) +++ branches/2014Q2/security/vuxml/vuln.xml Sat Jun 28 13:14:00 2014 (r359698) @@ -51,6 +51,60 @@ Note: Please add new entries to the beg --> + + mencoder -- potential buffer overrun when processing malicious lzo compressed input + + + mencoder + 1.1.r20140418_1 + + + + +

Michael Niedermayer and Luca Barbato report in upstream ffmpeg:

+
+

avutil/lzo: Fix integer overflow

+
+ +
+ + http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=ccda51b14c0fcae2fad73a24872dce75a7964996 + http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=d6af26c55c1ea30f85a7d9edbc373f53be1743ee + CVE-2014-4610 + + + 2014-06-24 + 2014-06-28 + +
+ + + mplayer -- potential buffer overrun when processing malicious lzo compressed input + + + mplayer + 1.1.r20140418_3 + + + + +

Michael Niedermayer and Luca Barbato report in upstream ffmpeg:

+
+

avutil/lzo: Fix integer overflow

+
+ +
+ + http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=ccda51b14c0fcae2fad73a24872dce75a7964996 + http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=d6af26c55c1ea30f85a7d9edbc373f53be1743ee + CVE-2014-4610 + + + 2014-06-24 + 2014-06-28 + +
+ dbus -- local DoS @@ -982,6 +1036,7 @@ Note: Please add new entries to the beg 2014-04-24 + OpenSSL -- Multiple vulnerabilities - private data exposure From owner-svn-ports-branches@FreeBSD.ORG Tue Jul 1 10:42:27 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB505DDD; Tue, 1 Jul 2014 10:42:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9ED762FFC; Tue, 1 Jul 2014 10:42:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61AgRpl001961; Tue, 1 Jul 2014 10:42:27 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61AgRgp001960; Tue, 1 Jul 2014 10:42:27 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201407011042.s61AgRgp001960@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 1 Jul 2014 10:42:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r359976 - branches/2014Q3 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2014 10:42:27 -0000 Author: bapt Date: Tue Jul 1 10:42:27 2014 New Revision: 359976 URL: http://svnweb.freebsd.org/changeset/ports/359976 QAT: https://qat.redports.org/buildarchive/r359976/ Log: Branch 2014Q3 Added: branches/2014Q3/ - copied from r359975, head/ From owner-svn-ports-branches@FreeBSD.ORG Wed Jul 2 18:45:30 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F13E21D; Wed, 2 Jul 2014 18:45:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6BF6424AD; Wed, 2 Jul 2014 18:45:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62IjUgT022678; Wed, 2 Jul 2014 18:45:30 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62IjUJU022677; Wed, 2 Jul 2014 18:45:30 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201407021845.s62IjUJU022677@svn.freebsd.org> From: Antoine Brodin Date: Wed, 2 Jul 2014 18:45:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360245 - branches/2014Q3/ports-mgmt/packagekit X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 18:45:30 -0000 Author: antoine Date: Wed Jul 2 18:45:29 2014 New Revision: 360245 URL: http://svnweb.freebsd.org/changeset/ports/360245 QAT: https://qat.redports.org/buildarchive/r360245/ Log: MFH: r360083 Attempt to unbreak Approved by: portmgr (self) Modified: branches/2014Q3/ports-mgmt/packagekit/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/ports-mgmt/packagekit/pkg-plist ============================================================================== --- branches/2014Q3/ports-mgmt/packagekit/pkg-plist Wed Jul 2 18:38:54 2014 (r360244) +++ branches/2014Q3/ports-mgmt/packagekit/pkg-plist Wed Jul 2 18:45:29 2014 (r360245) @@ -120,10 +120,10 @@ lib/polkit-1/extensions/libpackagekit-ac libdata/pkgconfig/packagekit-glib2.pc libexec/packagekitd libexec/pk-command-not-found -man/man1/pk-debuginfo-install.1.gz -man/man1/pkcon.1.gz -man/man1/pkgenpack.1.gz -man/man1/pkmon.1.gz +%%MAN%%man/man1/pk-debuginfo-install.1.gz +%%MAN%%man/man1/pkcon.1.gz +%%MAN%%man/man1/pkgenpack.1.gz +%%MAN%%man/man1/pkmon.1.gz %%PORTS%%share/PackageKit/helpers/ports/portsBackend.rb %%PORTS%%share/PackageKit/helpers/ports/ruby_packagekit/enums.rb %%PORTS%%share/PackageKit/helpers/ports/ruby_packagekit/prints.rb From owner-svn-ports-branches@FreeBSD.ORG Wed Jul 2 20:50:37 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D39F1F9F; Wed, 2 Jul 2014 20:50:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C146820AA; Wed, 2 Jul 2014 20:50:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62Kobai081740; Wed, 2 Jul 2014 20:50:37 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62Kobf9081739; Wed, 2 Jul 2014 20:50:37 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201407022050.s62Kobf9081739@svn.freebsd.org> From: Antoine Brodin Date: Wed, 2 Jul 2014 20:50:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360261 - branches/2014Q3/editors/speedbar X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 20:50:37 -0000 Author: antoine Date: Wed Jul 2 20:50:37 2014 New Revision: 360261 URL: http://svnweb.freebsd.org/changeset/ports/360261 QAT: https://qat.redports.org/buildarchive/r360261/ Log: MFH: r360260 - Reset maintainer, unstaged - Mark BROKEN: Fails to build ===> Building for speedbar-emacs24-0.14.b4_8 /bin/cp `/usr/bin/find /usr/local/share/emacs/24.3/lisp -name gud.el` /wrkdirs/usr/ports/editors/speedbar/work/speedbar-0.14beta4 usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file target_file cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file ... target_directory Reported by: pkg-fallout With hat:: portmgr Modified: branches/2014Q3/editors/speedbar/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/editors/speedbar/Makefile ============================================================================== --- branches/2014Q3/editors/speedbar/Makefile Wed Jul 2 20:49:32 2014 (r360260) +++ branches/2014Q3/editors/speedbar/Makefile Wed Jul 2 20:50:37 2014 (r360261) @@ -11,9 +11,10 @@ MASTER_SITES= SF/cedet/${PORTNAME}/1.4be PKGNAMESUFFIX= -${EMACS_PORT_NAME} DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/beta/} -MAINTAINER= dryice@dryice.name +MAINTAINER= ports@FreeBSD.org COMMENT= Quick access to files and tags in an Emacs frame +BROKEN= Fails to build USE_EMACS= yes USES= gmake From owner-svn-ports-branches@FreeBSD.ORG Wed Jul 2 22:04:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1C2C86D; Wed, 2 Jul 2014 22:04:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F0862723; Wed, 2 Jul 2014 22:04:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62M4ac5020856; Wed, 2 Jul 2014 22:04:36 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62M4al5020855; Wed, 2 Jul 2014 22:04:36 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201407022204.s62M4al5020855@svn.freebsd.org> From: Antoine Brodin Date: Wed, 2 Jul 2014 22:04:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360283 - branches/2014Q3/www/oops X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 22:04:36 -0000 Author: antoine Date: Wed Jul 2 22:04:36 2014 New Revision: 360283 URL: http://svnweb.freebsd.org/changeset/ports/360283 QAT: https://qat.redports.org/buildarchive/r360283/ Log: MFH: r360281 Mark BROKEN, fails to stage cd src; /usr/bin/make install cd modules; /usr/bin/make ../mkinstalldirs /usr/local/oops /usr/local/oops/DB /usr/local/oops/storages /usr/local/etc/oops/tables /usr/local/libexec/oops mkdir /usr/local/oops mkdir /usr/local/oops/DB mkdir /usr/local/oops/storages mkdir /usr/local/etc/oops mkdir /usr/local/etc/oops/tables mkdir /usr/local/libexec/oops if [ "Xoops" != "X" ]; then /usr/sbin/chown oops /usr/local/oops/DB; fi chown: oops: illegal user name *** [mkinstalldirs] Error code 1 Reported by: pkg-fallout Approved by: portmgr (self) Modified: branches/2014Q3/www/oops/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/oops/Makefile ============================================================================== --- branches/2014Q3/www/oops/Makefile Wed Jul 2 22:04:13 2014 (r360282) +++ branches/2014Q3/www/oops/Makefile Wed Jul 2 22:04:36 2014 (r360283) @@ -10,6 +10,7 @@ MASTER_SITES= http://oops-cache.org/ \ MAINTAINER= ports@FreeBSD.org COMMENT= A caching web proxy server +BROKEN= Fails to stage DEPRECATED= Development stops long ago, domain has been expired EXPIRATION_DATE= 2014-08-31 From owner-svn-ports-branches@FreeBSD.ORG Wed Jul 2 23:44:51 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 884F147A; Wed, 2 Jul 2014 23:44:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72EB13000; Wed, 2 Jul 2014 23:44:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62NipeU072795; Wed, 2 Jul 2014 23:44:51 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62NilUs072770; Wed, 2 Jul 2014 23:44:47 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201407022344.s62NilUs072770@svn.freebsd.org> From: Steve Wills Date: Wed, 2 Jul 2014 23:44:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360322 - in branches/2014Q3: databases/rubygem-activemodel databases/rubygem-activerecord devel/rubygem-activesupport mail/rubygem-actionmailer www/rubygem-actionpack www/rubygem-actio... X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 23:44:51 -0000 Author: swills Date: Wed Jul 2 23:44:47 2014 New Revision: 360322 URL: http://svnweb.freebsd.org/changeset/ports/360322 QAT: https://qat.redports.org/buildarchive/r360322/ Log: MFH: r360311 - Update rails and friend to 3.2.19 Security: CVE-2014-3482 Security: CVE-2014-3483 Modified: branches/2014Q3/databases/rubygem-activemodel/Makefile branches/2014Q3/databases/rubygem-activemodel/distinfo branches/2014Q3/databases/rubygem-activerecord/Makefile branches/2014Q3/databases/rubygem-activerecord/distinfo branches/2014Q3/devel/rubygem-activesupport/Makefile branches/2014Q3/devel/rubygem-activesupport/distinfo branches/2014Q3/mail/rubygem-actionmailer/Makefile branches/2014Q3/mail/rubygem-actionmailer/distinfo branches/2014Q3/www/rubygem-actionpack/Makefile branches/2014Q3/www/rubygem-actionpack/distinfo branches/2014Q3/www/rubygem-actionpack/files/patch-gemspec branches/2014Q3/www/rubygem-activeresource/Makefile branches/2014Q3/www/rubygem-activeresource/distinfo branches/2014Q3/www/rubygem-rails/Makefile branches/2014Q3/www/rubygem-rails/distinfo branches/2014Q3/www/rubygem-railties/Makefile branches/2014Q3/www/rubygem-railties/distinfo branches/2014Q3/www/rubygem-railties/files/patch-gemspec Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/databases/rubygem-activemodel/Makefile ============================================================================== --- branches/2014Q3/databases/rubygem-activemodel/Makefile Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/databases/rubygem-activemodel/Makefile Wed Jul 2 23:44:47 2014 (r360322) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= activemodel -PORTVERSION= 3.2.17 +PORTVERSION= 3.2.19 CATEGORIES= databases rubygems MASTER_SITES= RG Modified: branches/2014Q3/databases/rubygem-activemodel/distinfo ============================================================================== --- branches/2014Q3/databases/rubygem-activemodel/distinfo Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/databases/rubygem-activemodel/distinfo Wed Jul 2 23:44:47 2014 (r360322) @@ -1,2 +1,2 @@ -SHA256 (rubygem/activemodel-3.2.17.gem) = 7fc010fbde8f3574485d768b5fc056c83c7fd01d227b8e56a46b4febc91b4606 -SIZE (rubygem/activemodel-3.2.17.gem) = 44544 +SHA256 (rubygem/activemodel-3.2.19.gem) = 4ea3abf790eca9ee8228e9e2a465350e258294270a639b63f0e1dfad236fe70e +SIZE (rubygem/activemodel-3.2.19.gem) = 44544 Modified: branches/2014Q3/databases/rubygem-activerecord/Makefile ============================================================================== --- branches/2014Q3/databases/rubygem-activerecord/Makefile Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/databases/rubygem-activerecord/Makefile Wed Jul 2 23:44:47 2014 (r360322) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= activerecord -PORTVERSION= 3.2.17 +PORTVERSION= 3.2.19 CATEGORIES= databases rubygems MASTER_SITES= RG Modified: branches/2014Q3/databases/rubygem-activerecord/distinfo ============================================================================== --- branches/2014Q3/databases/rubygem-activerecord/distinfo Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/databases/rubygem-activerecord/distinfo Wed Jul 2 23:44:47 2014 (r360322) @@ -1,2 +1,2 @@ -SHA256 (rubygem/activerecord-3.2.17.gem) = ad544500826264c523082f9533fbb5b9306277f09e53824b9bb176ff53ad59e4 -SIZE (rubygem/activerecord-3.2.17.gem) = 297472 +SHA256 (rubygem/activerecord-3.2.19.gem) = 052945ad510744aaa3e35a817a6f515a2316e7dd96df6460f75b36067bb60372 +SIZE (rubygem/activerecord-3.2.19.gem) = 297472 Modified: branches/2014Q3/devel/rubygem-activesupport/Makefile ============================================================================== --- branches/2014Q3/devel/rubygem-activesupport/Makefile Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/devel/rubygem-activesupport/Makefile Wed Jul 2 23:44:47 2014 (r360322) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= activesupport -PORTVERSION= 3.2.17 +PORTVERSION= 3.2.19 CATEGORIES= devel rubygems MASTER_SITES= RG Modified: branches/2014Q3/devel/rubygem-activesupport/distinfo ============================================================================== --- branches/2014Q3/devel/rubygem-activesupport/distinfo Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/devel/rubygem-activesupport/distinfo Wed Jul 2 23:44:47 2014 (r360322) @@ -1,2 +1,2 @@ -SHA256 (rubygem/activesupport-3.2.17.gem) = e0cc4b452f8cd1350f16017965ebcfe5010a2a699a34d5e8485d214905766b87 -SIZE (rubygem/activesupport-3.2.17.gem) = 290304 +SHA256 (rubygem/activesupport-3.2.19.gem) = 2c837a59250da14b12a6b0cfb6774f0afae90aa749fd96ad4347344d8417ad3d +SIZE (rubygem/activesupport-3.2.19.gem) = 290304 Modified: branches/2014Q3/mail/rubygem-actionmailer/Makefile ============================================================================== --- branches/2014Q3/mail/rubygem-actionmailer/Makefile Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/mail/rubygem-actionmailer/Makefile Wed Jul 2 23:44:47 2014 (r360322) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= actionmailer -PORTVERSION= 3.2.17 +PORTVERSION= 3.2.19 CATEGORIES= mail rubygems MASTER_SITES= RG Modified: branches/2014Q3/mail/rubygem-actionmailer/distinfo ============================================================================== --- branches/2014Q3/mail/rubygem-actionmailer/distinfo Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/mail/rubygem-actionmailer/distinfo Wed Jul 2 23:44:47 2014 (r360322) @@ -1,2 +1,2 @@ -SHA256 (rubygem/actionmailer-3.2.17.gem) = 1bf5ab19bc9fe2f83bd77bab7442d1e9ad62434e0db990161ad256eb6bf5f1a4 -SIZE (rubygem/actionmailer-3.2.17.gem) = 21504 +SHA256 (rubygem/actionmailer-3.2.19.gem) = cd9f0b22f755b0adeae13cf949adaf63fa1c068c72d0a100572c6a11aecd3ba7 +SIZE (rubygem/actionmailer-3.2.19.gem) = 21504 Modified: branches/2014Q3/www/rubygem-actionpack/Makefile ============================================================================== --- branches/2014Q3/www/rubygem-actionpack/Makefile Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-actionpack/Makefile Wed Jul 2 23:44:47 2014 (r360322) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= actionpack -PORTVERSION= 3.2.17 +PORTVERSION= 3.2.19 CATEGORIES= www rubygems MASTER_SITES= RG Modified: branches/2014Q3/www/rubygem-actionpack/distinfo ============================================================================== --- branches/2014Q3/www/rubygem-actionpack/distinfo Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-actionpack/distinfo Wed Jul 2 23:44:47 2014 (r360322) @@ -1,2 +1,2 @@ -SHA256 (rubygem/actionpack-3.2.17.gem) = 6eeedf42ddbfb2393bcdd7fa89625fb115010c20265efe125f267ad601cbe068 -SIZE (rubygem/actionpack-3.2.17.gem) = 291840 +SHA256 (rubygem/actionpack-3.2.19.gem) = c58ca2342aff2062f4f478551ce46d81918ac93200bc62d099764d2cd7499fcd +SIZE (rubygem/actionpack-3.2.19.gem) = 292352 Modified: branches/2014Q3/www/rubygem-actionpack/files/patch-gemspec ============================================================================== --- branches/2014Q3/www/rubygem-actionpack/files/patch-gemspec Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-actionpack/files/patch-gemspec Wed Jul 2 23:44:47 2014 (r360322) @@ -1,7 +1,7 @@ ---- actionpack-3.2.17.gemspec.orig 2014-02-19 02:23:41.415999759 +0000 -+++ actionpack-3.2.17.gemspec 2014-02-19 02:24:09.604998016 +0000 -@@ -134,7 +134,7 @@ - version_requirements: &id008 !ruby/object:Gem::Requirement +--- actionpack-3.2.19.gemspec.orig 2014-07-02 19:24:30.502461548 +0000 ++++ actionpack-3.2.19.gemspec 2014-07-02 19:24:31.347461949 +0000 +@@ -133,7 +133,7 @@ + requirement: &id008 !ruby/object:Gem::Requirement none: false requirements: - - - ~> Modified: branches/2014Q3/www/rubygem-activeresource/Makefile ============================================================================== --- branches/2014Q3/www/rubygem-activeresource/Makefile Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-activeresource/Makefile Wed Jul 2 23:44:47 2014 (r360322) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= activeresource -PORTVERSION= 3.2.17 +PORTVERSION= 3.2.19 CATEGORIES= www rubygems MASTER_SITES= RG Modified: branches/2014Q3/www/rubygem-activeresource/distinfo ============================================================================== --- branches/2014Q3/www/rubygem-activeresource/distinfo Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-activeresource/distinfo Wed Jul 2 23:44:47 2014 (r360322) @@ -1,2 +1,2 @@ -SHA256 (rubygem/activeresource-3.2.17.gem) = 67793805973d85c2d2716ff44de25bafa769761a2701c4ff81da4844662ebfb7 -SIZE (rubygem/activeresource-3.2.17.gem) = 36864 +SHA256 (rubygem/activeresource-3.2.19.gem) = 8617d24537ca937cc67aac46aaa29782510d66136605426d0a23a3585a839daf +SIZE (rubygem/activeresource-3.2.19.gem) = 37376 Modified: branches/2014Q3/www/rubygem-rails/Makefile ============================================================================== --- branches/2014Q3/www/rubygem-rails/Makefile Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-rails/Makefile Wed Jul 2 23:44:47 2014 (r360322) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rails -PORTVERSION= 3.2.17 -PORTREVISION= 1 +PORTVERSION= 3.2.19 CATEGORIES= www rubygems MASTER_SITES= RG Modified: branches/2014Q3/www/rubygem-rails/distinfo ============================================================================== --- branches/2014Q3/www/rubygem-rails/distinfo Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-rails/distinfo Wed Jul 2 23:44:47 2014 (r360322) @@ -1,2 +1,2 @@ -SHA256 (rubygem/rails-3.2.17.gem) = 8eff1bbf9f22fa943e58e9b71c6bdbe5d5d95caf022bec38ce083599961cb984 -SIZE (rubygem/rails-3.2.17.gem) = 3584 +SHA256 (rubygem/rails-3.2.19.gem) = 33b64cf78dfcf3206d961ce03e8fe6d260081da696e60da39d0b2a4a160fe22b +SIZE (rubygem/rails-3.2.19.gem) = 3584 Modified: branches/2014Q3/www/rubygem-railties/Makefile ============================================================================== --- branches/2014Q3/www/rubygem-railties/Makefile Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-railties/Makefile Wed Jul 2 23:44:47 2014 (r360322) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= railties -PORTVERSION= 3.2.17 -PORTREVISION= 1 +PORTVERSION= 3.2.19 CATEGORIES= www rubygems MASTER_SITES= RG Modified: branches/2014Q3/www/rubygem-railties/distinfo ============================================================================== --- branches/2014Q3/www/rubygem-railties/distinfo Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-railties/distinfo Wed Jul 2 23:44:47 2014 (r360322) @@ -1,2 +1,2 @@ -SHA256 (rubygem/railties-3.2.17.gem) = 34b9a5d07f5998541138acbc9966fbbaebb3904a73c442903a0b8f9b0ba7dea7 -SIZE (rubygem/railties-3.2.17.gem) = 1590784 +SHA256 (rubygem/railties-3.2.19.gem) = c569009ee5c005190d208ac228087fdc094b10c6f0cf209f1d12c552b447cc10 +SIZE (rubygem/railties-3.2.19.gem) = 1590784 Modified: branches/2014Q3/www/rubygem-railties/files/patch-gemspec ============================================================================== --- branches/2014Q3/www/rubygem-railties/files/patch-gemspec Wed Jul 2 23:43:56 2014 (r360321) +++ branches/2014Q3/www/rubygem-railties/files/patch-gemspec Wed Jul 2 23:44:47 2014 (r360322) @@ -1,10 +1,10 @@ ---- railties-3.2.17.gemspec.orig 2014-02-19 02:43:27.232919992 +0000 -+++ railties-3.2.17.gemspec 2014-02-19 02:43:36.405917593 +0000 -@@ -75,21 +75,6 @@ +--- railties-3.2.19.gemspec.orig 2014-07-02 19:26:50.010451747 +0000 ++++ railties-3.2.19.gemspec 2014-07-02 19:28:44.333443952 +0000 +@@ -74,21 +74,6 @@ + prerelease: false name: thor - !ruby/object:Gem::Dependency - type: :runtime -- version_requirements: &id004 !ruby/object:Gem::Requirement +- requirement: &id004 !ruby/object:Gem::Requirement - none: false - requirements: - - - ~> @@ -14,11 +14,11 @@ - - 3 - - 4 - version: "3.4" +- type: :runtime +- version_requirements: *id004 - prerelease: false -- requirement: *id004 - name: rdoc -- !ruby/object:Gem::Dependency -- type: :runtime - version_requirements: &id005 !ruby/object:Gem::Requirement + requirement: &id005 !ruby/object:Gem::Requirement none: false requirements: From owner-svn-ports-branches@FreeBSD.ORG Thu Jul 3 15:05:17 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD1ED1DD; Thu, 3 Jul 2014 15:05:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AAA1722DA; Thu, 3 Jul 2014 15:05:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63F5H0t004404; Thu, 3 Jul 2014 15:05:17 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63F5HEt004403; Thu, 3 Jul 2014 15:05:17 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201407031505.s63F5HEt004403@svn.freebsd.org> From: William Grzybowski Date: Thu, 3 Jul 2014 15:05:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360380 - branches/2014Q3/devel/p5-Config-Properties X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 15:05:17 -0000 Author: wg Date: Thu Jul 3 15:05:17 2014 New Revision: 360380 URL: http://svnweb.freebsd.org/changeset/ports/360380 QAT: https://qat.redports.org/buildarchive/r360380/ Log: MFH: r359998 devel/p5-Config-Properties: reset maintainership Submitted by: maintainer Approved by: portmgr (implicit) Modified: branches/2014Q3/devel/p5-Config-Properties/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/devel/p5-Config-Properties/Makefile ============================================================================== --- branches/2014Q3/devel/p5-Config-Properties/Makefile Thu Jul 3 14:57:40 2014 (r360379) +++ branches/2014Q3/devel/p5-Config-Properties/Makefile Thu Jul 3 15:05:17 2014 (r360380) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= cmanley@xs4all.nl +MAINTAINER= ports@FreeBSD.org COMMENT= Read and write property files USES= perl5 From owner-svn-ports-branches@FreeBSD.ORG Thu Jul 3 15:08:29 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1194941D; Thu, 3 Jul 2014 15:08:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F2F742309; Thu, 3 Jul 2014 15:08:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63F8S24005194; Thu, 3 Jul 2014 15:08:28 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63F8SRb005193; Thu, 3 Jul 2014 15:08:28 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201407031508.s63F8SRb005193@svn.freebsd.org> From: William Grzybowski Date: Thu, 3 Jul 2014 15:08:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360382 - branches/2014Q3/sysutils/py-bcfg2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 15:08:29 -0000 Author: wg Date: Thu Jul 3 15:08:28 2014 New Revision: 360382 URL: http://svnweb.freebsd.org/changeset/ports/360382 QAT: https://qat.redports.org/buildarchive/r360382/ Log: MFH: r360107 sysutils/py-bcfg2: pass maintainership Approved by: portmgr (implicit), maintainer Modified: branches/2014Q3/sysutils/py-bcfg2/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/sysutils/py-bcfg2/Makefile ============================================================================== --- branches/2014Q3/sysutils/py-bcfg2/Makefile Thu Jul 3 15:07:00 2014 (r360381) +++ branches/2014Q3/sysutils/py-bcfg2/Makefile Thu Jul 3 15:08:28 2014 (r360382) @@ -9,8 +9,8 @@ MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/ http://mirror.opensysadmin.com/bcfg/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= dhutty@allgoodbits.org -COMMENT= A configuration management system written in Python +MAINTAINER= python@FreeBSD.org +COMMENT= Configuration management system written in Python RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gamin.py:${PORTSDIR}/devel/py-gamin From owner-svn-ports-branches@FreeBSD.ORG Thu Jul 3 15:45:42 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 049B8E67; Thu, 3 Jul 2014 15:45:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CBD1A26D0; Thu, 3 Jul 2014 15:45:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63Fjfap023058; Thu, 3 Jul 2014 15:45:41 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63FjfpQ023057; Thu, 3 Jul 2014 15:45:41 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201407031545.s63FjfpQ023057@svn.freebsd.org> From: Koop Mast Date: Thu, 3 Jul 2014 15:45:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360384 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 15:45:42 -0000 Author: kwm Date: Thu Jul 3 15:45:41 2014 New Revision: 360384 URL: http://svnweb.freebsd.org/changeset/ports/360384 QAT: https://qat.redports.org/buildarchive/r360384/ Log: MFH: r360379 Document more dbus vulnabilities. Approved by: portmgr (erwin@) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Thu Jul 3 15:10:50 2014 (r360383) +++ branches/2014Q3/security/vuxml/vuln.xml Thu Jul 3 15:45:41 2014 (r360384) @@ -57,6 +57,47 @@ Notes: --> + + dbus -- multiple vulnabilities + + + dbus + 1.8.6 + + + + +

Simon McVittie reports:

+
+

Alban Crequy at Collabora Ltd. discovered a bug in dbus-daemon's + support for file descriptor passing. A malicious process could + force system services or user applications to be disconnected + from the D-Bus system bus by sending them a message containing + a file descriptor, then causing that file descriptor to exceed + the kernel's maximum recursion depth (itself introduced to fix + a DoS) before dbus-daemon forwards the message to the victim + process. Most services and applications exit when disconnected + from the system bus, leading to a denial of service.

+

Additionally, Alban discovered that bug fd.o#79694, a bug + previously reported by Alejandro Martínez Suárez which was n + believed to be security flaw, could be used for a similar denial + of service, by causing dbus-daemon to attempt to forward invalid + file descriptors to a victim process when file descriptors become + associated with the wrong message.

+
+ +
+ + CVE-2014-3532 + CVE-2014-3533 + http://lists.freedesktop.org/archives/dbus/2014-July/016235.html + + + 2014-07-02 + 2014-07-03 + +
+ mencoder -- potential buffer overrun when processing malicious lzo compressed input From owner-svn-ports-branches@FreeBSD.ORG Thu Jul 3 15:47:11 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E7B8F66; Thu, 3 Jul 2014 15:47:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51CE526E4; Thu, 3 Jul 2014 15:47:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63FlBLo023410; Thu, 3 Jul 2014 15:47:11 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63FlAck023407; Thu, 3 Jul 2014 15:47:10 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201407031547.s63FlAck023407@svn.freebsd.org> From: Koop Mast Date: Thu, 3 Jul 2014 15:47:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360385 - branches/2014Q3/devel/dbus X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 15:47:11 -0000 Author: kwm Date: Thu Jul 3 15:47:10 2014 New Revision: 360385 URL: http://svnweb.freebsd.org/changeset/ports/360385 QAT: https://qat.redports.org/buildarchive/r360385/ Log: MFH: r360383 Update to 1.8.6. This update fixes two CVE's. Approved by: portmgr (erwin@) Security: e6a7636a-02d0-11e4-88b6-080027671656 Modified: branches/2014Q3/devel/dbus/Makefile branches/2014Q3/devel/dbus/distinfo branches/2014Q3/devel/dbus/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/devel/dbus/Makefile ============================================================================== --- branches/2014Q3/devel/dbus/Makefile Thu Jul 3 15:45:41 2014 (r360384) +++ branches/2014Q3/devel/dbus/Makefile Thu Jul 3 15:47:10 2014 (r360385) @@ -3,7 +3,7 @@ # $MCom: ports/devel/dbus/Makefile,v 1.58 2013/02/15 15:06:49 kwm Exp $ PORTNAME= dbus -PORTVERSION= 1.8.4 +PORTVERSION= 1.8.6 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ Modified: branches/2014Q3/devel/dbus/distinfo ============================================================================== --- branches/2014Q3/devel/dbus/distinfo Thu Jul 3 15:45:41 2014 (r360384) +++ branches/2014Q3/devel/dbus/distinfo Thu Jul 3 15:47:10 2014 (r360385) @@ -1,2 +1,2 @@ -SHA256 (dbus-1.8.4.tar.gz) = 3ef63dc8d0111042071ee7f7bafa0650c6ce2d7be957ef0b7ec269495a651ff8 -SIZE (dbus-1.8.4.tar.gz) = 1860286 +SHA256 (dbus-1.8.6.tar.gz) = eded83ca007b719f32761e60fd8b9ffd0f5796a4caf455b01b5a5ef740ebd23f +SIZE (dbus-1.8.6.tar.gz) = 1861784 Modified: branches/2014Q3/devel/dbus/pkg-plist ============================================================================== --- branches/2014Q3/devel/dbus/pkg-plist Thu Jul 3 15:45:41 2014 (r360384) +++ branches/2014Q3/devel/dbus/pkg-plist Thu Jul 3 15:47:10 2014 (r360385) @@ -29,7 +29,7 @@ lib/libdbus-1.a lib/libdbus-1.la lib/libdbus-1.so lib/libdbus-1.so.3 -lib/libdbus-1.so.3.8.5 +lib/libdbus-1.so.3.8.6 libdata/pkgconfig/dbus-1.pc @group %%GROUPS%% @mode 4750 From owner-svn-ports-branches@FreeBSD.ORG Thu Jul 3 16:14:18 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C990661; Thu, 3 Jul 2014 16:14:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 086C22A04; Thu, 3 Jul 2014 16:14:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63GEHUp038695; Thu, 3 Jul 2014 16:14:17 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63GEH1Z038689; Thu, 3 Jul 2014 16:14:17 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201407031614.s63GEH1Z038689@svn.freebsd.org> From: Bryan Drewery Date: Thu, 3 Jul 2014 16:14:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360398 - in branches/2014Q3/mail: qmail qmail-spamcontrol X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 16:14:18 -0000 Author: bdrewery Date: Thu Jul 3 16:14:17 2014 New Revision: 360398 URL: http://svnweb.freebsd.org/changeset/ports/360398 QAT: https://qat.redports.org/buildarchive/r360398/ Log: MFH: r360338 Fix patch application in mail/qmail-spamcontrol: The spamcontrol patch is applied through a script, install_spamcontrol.sh. This script does not return a non-zero status when patch failures are encountered. So I missed many failures when updating this port. To fix this, move the spamcontrol patch application to pre-patch so that the PATCHFILES->DISTFILES (and manual patch application with PATCH) is not needed for most patches. This ensures that the spamcontrol patch is always applied before PATCHFILES. Some PATCHFILES were applying before the spamcontrol patch causing it to fail to patch properly. Bump revision as the build had been fine but some files were not being generated in the package. Also add my mirror as distcache does not have the updated patches yet. Reported by: Oleg Strizhak Modified: branches/2014Q3/mail/qmail-spamcontrol/Makefile branches/2014Q3/mail/qmail/Makefile branches/2014Q3/mail/qmail/distinfo Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/mail/qmail-spamcontrol/Makefile ============================================================================== --- branches/2014Q3/mail/qmail-spamcontrol/Makefile Thu Jul 3 16:09:40 2014 (r360397) +++ branches/2014Q3/mail/qmail-spamcontrol/Makefile Thu Jul 3 16:14:17 2014 (r360398) @@ -2,7 +2,7 @@ PORTNAME= qmail PORTVERSION= ${QMAIL_VERSION}.${SPAMCONTROL_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES+= http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \ ${MASTER_SITE_LOCAL:S/$/:spamcontrol/} Modified: branches/2014Q3/mail/qmail/Makefile ============================================================================== --- branches/2014Q3/mail/qmail/Makefile Thu Jul 3 16:09:40 2014 (r360397) +++ branches/2014Q3/mail/qmail/Makefile Thu Jul 3 16:14:17 2014 (r360398) @@ -176,8 +176,8 @@ PATCHFILES+= ${TLS_PATCH_NAME}:tls .endif PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip/} -PATCH_SITE_SUBDIR+= bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip -PATCH_SITE_SUBDIR+= bdrewery/qmail/:tls +PATCH_SITE_SUBDIR+= bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip +PATCH_SITES+= http://mirror.shatow.net/freebsd/qmail/:DEFAULT,dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip .if !defined(BARRIER_SMTP_AUTH_PATCH) SMTP_AUTH_VERSION= 0.31 @@ -472,10 +472,10 @@ PATCHFILES+= qmail-discard-double-bounce .if ${PORT_OPTIONS:MSPF_PATCH} . if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL) . if defined(SLAVE_SPAMCONTROL) -SPF_SPAMCONTROL_PATCH= qmail-spf-rc5.patch-spamcontrol-27 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/} -MASTER_SITE_SUBDIR+= garga/qmail/:spf_spamcontrol -DISTFILES+= ${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol +SPF_SPAMCONTROL_PATCH= qmail-spf-rc5.patch-spamcontrol-27_2 +PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/} +PATCH_SITE_SUBDIR+= garga/qmail/:spf_spamcontrol +PATCHFILES+= ${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol . else # XXX - Move change out of conflicting Makefile hunk . if ${PORT_OPTIONS:MSMTP_AUTH_PATCH} @@ -506,13 +506,9 @@ DISTFILES+= ${EXT_BIG_TODO_PATCH}:ext_bi . endif . if ${PORT_OPTIONS:MSPF_PATCH} -. if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL) -. if defined(SLAVE_SPAMCONTROL) -EXTTODO_PATCH= ext_todo-20030105_spf.patch -. else +. if defined(SLAVE_TLS) # XXX - Move qmail-todo out of conflicting Makefile hunk EXTTODO_PATCH= ext_todo-20030105_spf_tls.patch -. endif MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:exttodo/} MASTER_SITE_SUBDIR+= garga/qmail/:exttodo DISTFILES+= ${EXTTODO_PATCH}:exttodo @@ -557,7 +553,11 @@ PATCHFILES+= qmailqueue-patch PATCHFILES+= big-todo.103.patch .endif .if ${PORT_OPTIONS:MBIG_CONCURRENCY_PATCH} +. if defined(SLAVE_SPAMCONTROL) +PATCHFILES+= big-concurrency-spamcontrol-2731.patch +. else PATCHFILES+= big-concurrency.patch +. endif .endif .if !empty(PORT_OPTIONS:MOUTGOINGIP_PATCH) && !empty(PORT_OPTIONS:MQMTPC_PATCH) PATCHFILES+= qmail-1.03-qmtpc_outgoingip_20090630.patch:qmtpc_outgoingip @@ -684,6 +684,40 @@ post-extract: .endif # XXX - Move all the major patch applications to post-extract +# +# Apply main distro patch (which requires building a dependency and +# running a script) before PATCHFILES get applied. +.if defined(SLAVE_SPAMCONTROL) +pre-patch: +. if ${OSVERSION} < 900007 +# Prevent applying utmpx patch + @${ECHO_CMD} > ${WRKSRC}/qbiff.c.patch +. endif + @${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail + @${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \ + > ${WRKSRC}/conf-spamcontrol +. for option in ${SELECTED_OPTIONS} + @${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol +. endfor + @${ECHO_CMD} "${UCSPISRC}/compile" > ${WRKSRC}/conf-ucspissl + ${ECHO_CMD} "${CC} ${CFLAGS}" > ${UCSPISRC}/src/conf-cc + ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${UCSPISRC}/src/conf-ld + ${ECHO_CMD} "${PREFIX}" > ${UCSPISRC}/src/conf-home + ${ECHO_CMD} "${PREFIX}/bin" > ${UCSPISRC}/src/conf-tcpbin + ${ECHO_CMD} "/etc/ssl" > ${UCSPISRC}/src/conf-cadir + ${ECHO_CMD} "/etc/ssl/cert.pem" > ${UCSPISRC}/src/conf-cafile + ${ECHO_CMD} "/etc/ssl/dh1024.pem" > ${UCSPISRC}/src/conf-dhfile + @cd ${UCSPISRC} && ${SETENV} ${MAKE_ENV} package/compile + @cd ${WRKSRC} && ${SH} ./install_spamcontrol.sh +# Any rejected patches are a failure + @if [ "`find ${WRKSRC} -name '*.rej' | wc -l`" -ne 0 ]; then \ + ${ECHO_MSG} "===> Failed to apply spamcontrol patch"; \ + ${FALSE}; \ + fi +# Fix trailing whitespace which breaks some patches + ${SED} -i '' -e 's,^\(binm3 binm3+df\) $$,\1,' ${WRKSRC}/Makefile +.endif + post-patch: .if ${PORT_OPTIONS:MSMTP_AUTH_PATCH} @${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC} @@ -710,33 +744,6 @@ post-patch: -e "s,MYSQL_LIBS=.*,MYSQL_LIBS=\`${LOCALBASE}/bin/mysql_config --libs\`," \ ${WRKSRC}/Makefile .elif defined(SLAVE_SPAMCONTROL) -. if ${OSVERSION} < 900007 -# Prevent applying utmpx patch - @${ECHO_CMD} > ${WRKSRC}/qbiff.c.patch -. endif - @${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail - @${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \ - > ${WRKSRC}/conf-spamcontrol -. for option in ${SELECTED_OPTIONS} - @${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol -. endfor - @${ECHO_CMD} "${UCSPISRC}/compile" > ${WRKSRC}/conf-ucspissl - ${ECHO_CMD} "${CC} ${CFLAGS}" > ${UCSPISRC}/src/conf-cc - ${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${UCSPISRC}/src/conf-ld - ${ECHO_CMD} "${PREFIX}" > ${UCSPISRC}/src/conf-home - ${ECHO_CMD} "${PREFIX}/bin" > ${UCSPISRC}/src/conf-tcpbin - ${ECHO_CMD} "/etc/ssl" > ${UCSPISRC}/src/conf-cadir - ${ECHO_CMD} "/etc/ssl/cert.pem" > ${UCSPISRC}/src/conf-cafile - ${ECHO_CMD} "/etc/ssl/dh1024.pem" > ${UCSPISRC}/src/conf-dhfile - @cd ${UCSPISRC} && ${SETENV} ${MAKE_ENV} package/compile - @cd ${WRKSRC} && ./install_spamcontrol.sh - @${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-spamcontrol-qmail-smtpd.c -. if ${PORT_OPTIONS:MSPF_PATCH} && defined(SPF_SPAMCONTROL_PATCH) - @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_SPAMCONTROL_PATCH} -. if ${PORT_OPTIONS:MEXTTODO_PATCH} && defined(EXTTODO_PATCH) - @${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH} -. endif -. endif . if ${PORT_OPTIONS:MSMTPEXTFORK} @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH} . if ${PORT_OPTIONS:MXF_QUITASAP} Modified: branches/2014Q3/mail/qmail/distinfo ============================================================================== --- branches/2014Q3/mail/qmail/distinfo Thu Jul 3 16:09:40 2014 (r360397) +++ branches/2014Q3/mail/qmail/distinfo Thu Jul 3 16:14:17 2014 (r360398) @@ -10,6 +10,8 @@ SHA256 (qmail/big-todo.103.patch) = afa0 SIZE (qmail/big-todo.103.patch) = 5546 SHA256 (qmail/big-concurrency.patch) = 0322991955878e86af495f7317c3a4bd2e60640f9a6dd70ad501fff27242ac2f SIZE (qmail/big-concurrency.patch) = 9331 +SHA256 (qmail/big-concurrency-spamcontrol-2731.patch) = 0a9e11a784b1e9b47093aea2c67aef4f8b06d4da5624d5284c978fca0d2c5735 +SIZE (qmail/big-concurrency-spamcontrol-2731.patch) = 9632 SHA256 (qmail/sendmail-flagf.patch) = 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e SIZE (qmail/sendmail-flagf.patch) = 863 SHA256 (qmail/patch-qmail-1.03-rfc2821.diff) = c34b331e27882f0596529df14f0e9f24c4dff9f941d04e5df17cc158dddac426 @@ -62,8 +64,8 @@ SHA256 (qmail/ext_todo-20030105_mysql.pa SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797 SHA256 (qmail/ext_todo-20030105_tls.patch) = 0924d3d1287200cb4efc1c3ebfa139f715d3a9d75a6d8af17520c5262a192da2 SIZE (qmail/ext_todo-20030105_tls.patch) = 33795 -SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-27) = 71e1d204a2f388fa2d0d9902a4289a46988f45119f91eed2ba4733b9e81dd932 -SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-27) = 64059 +SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-27_2) = bd53c0ce09ce68e9638abcab7f36a1e259ffb41737e27f6b8d9e0315f2d09524 +SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-27_2) = 64058 SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8 SIZE (qmail/auth.patch.diff) = 4412 SHA256 (qmail/auth.patch.diff-tls-20110119) = 838a35ea92990775fa96567366249f70e7edbfdf127bebbc23b3df58eb086921 From owner-svn-ports-branches@FreeBSD.ORG Thu Jul 3 16:14:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C87D781; Thu, 3 Jul 2014 16:14:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09B0B2A14; Thu, 3 Jul 2014 16:14:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63GEvuO038921; Thu, 3 Jul 2014 16:14:57 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63GEvM4038920; Thu, 3 Jul 2014 16:14:57 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201407031614.s63GEvM4038920@svn.freebsd.org> From: Bryan Drewery Date: Thu, 3 Jul 2014 16:14:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360399 - branches/2014Q3/mail/qmail X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 16:14:58 -0000 Author: bdrewery Date: Thu Jul 3 16:14:57 2014 New Revision: 360399 URL: http://svnweb.freebsd.org/changeset/ports/360399 QAT: https://qat.redports.org/buildarchive/r360399/ Log: MFH: r360395 Fix size for big-concurrency-spamcontrol-2731.patch from r360338 Modified: branches/2014Q3/mail/qmail/distinfo Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/mail/qmail/distinfo ============================================================================== --- branches/2014Q3/mail/qmail/distinfo Thu Jul 3 16:14:17 2014 (r360398) +++ branches/2014Q3/mail/qmail/distinfo Thu Jul 3 16:14:57 2014 (r360399) @@ -11,7 +11,7 @@ SIZE (qmail/big-todo.103.patch) = 5546 SHA256 (qmail/big-concurrency.patch) = 0322991955878e86af495f7317c3a4bd2e60640f9a6dd70ad501fff27242ac2f SIZE (qmail/big-concurrency.patch) = 9331 SHA256 (qmail/big-concurrency-spamcontrol-2731.patch) = 0a9e11a784b1e9b47093aea2c67aef4f8b06d4da5624d5284c978fca0d2c5735 -SIZE (qmail/big-concurrency-spamcontrol-2731.patch) = 9632 +SIZE (qmail/big-concurrency-spamcontrol-2731.patch) = 9362 SHA256 (qmail/sendmail-flagf.patch) = 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e SIZE (qmail/sendmail-flagf.patch) = 863 SHA256 (qmail/patch-qmail-1.03-rfc2821.diff) = c34b331e27882f0596529df14f0e9f24c4dff9f941d04e5df17cc158dddac426 From owner-svn-ports-branches@FreeBSD.ORG Fri Jul 4 21:03:36 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 05A18BA1; Fri, 4 Jul 2014 21:03:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E66DA21A6; Fri, 4 Jul 2014 21:03:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64L3ZG5077859; Fri, 4 Jul 2014 21:03:35 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64L3ZVB077858; Fri, 4 Jul 2014 21:03:35 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407042103.s64L3ZVB077858@svn.freebsd.org> From: Raphael Kubo da Costa Date: Fri, 4 Jul 2014 21:03:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r360662 - branches/2014Q3/mail/dspam X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2014 21:03:36 -0000 Author: rakuco Date: Fri Jul 4 21:03:35 2014 New Revision: 360662 URL: http://svnweb.freebsd.org/changeset/ports/360662 QAT: https://qat.redports.org/buildarchive/r360662/ Log: MFH: r360659 Fix installation with the WEBUI option enabled. PR: 191610 Submitted by: mtomasek4@gmail.com Approved by: portmgr (erwin) Modified: branches/2014Q3/mail/dspam/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/mail/dspam/Makefile ============================================================================== --- branches/2014Q3/mail/dspam/Makefile Fri Jul 4 21:03:10 2014 (r360661) +++ branches/2014Q3/mail/dspam/Makefile Fri Jul 4 21:03:35 2014 (r360662) @@ -519,7 +519,7 @@ post-install: ${INSTALL_DATA} admins ${STAGEDIR}${WWWDIR}/admins.sample ${MKDIR} ${STAGEDIR}${WWWDIR}/templates && cd ${WRKSRC}/webui/cgi-bin/templates && \ ${INSTALL_DATA} *.html ${STAGEDIR}${WWWDIR}/templates/ && \ - ${INSTALL_SCRIPT} strings.pl ${STAGEDIR}${WWWDIR}/templates/ && + ${INSTALL_SCRIPT} strings.pl ${STAGEDIR}${WWWDIR}/templates/ && \ for _dir in de es-es fr he pt-br ro; do \ ${INSTALL_DATA} -d ${STAGEDIR}${WWWDIR}/templates/$${_dir} && \ cd ${WRKSRC}/webui/cgi-bin/templates/$${_dir} && \ From owner-svn-ports-branches@FreeBSD.ORG Tue Jul 8 12:12:53 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A37A8D3; Tue, 8 Jul 2014 12:12:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65D5E2BD1; Tue, 8 Jul 2014 12:12:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68CCraY036394; Tue, 8 Jul 2014 12:12:53 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68CCquZ036379; Tue, 8 Jul 2014 12:12:52 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407081212.s68CCquZ036379@svn.freebsd.org> From: Pawel Pekala Date: Tue, 8 Jul 2014 12:12:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361224 - in branches/2014Q3/security/doscan: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2014 12:12:53 -0000 Author: pawel Date: Tue Jul 8 12:12:51 2014 New Revision: 361224 URL: http://svnweb.freebsd.org/changeset/ports/361224 QAT: https://qat.redports.org/buildarchive/r361224/ Log: MFH: r361222 - Fix build with clang (add missing inlcudes in few files) - Add staging support - Convert to new LIB_DEPENDS format, options framework - Fix spelling mistakes, remove old maintainer contact from pkg-descr Approved by: portmgr (erwin) Added: branches/2014Q3/security/doscan/files/patch-src__event_queue_poll.cc - copied unchanged from r361222, head/security/doscan/files/patch-src__event_queue_poll.cc branches/2014Q3/security/doscan/files/patch-src__half_duplex.cc - copied unchanged from r361222, head/security/doscan/files/patch-src__half_duplex.cc branches/2014Q3/security/doscan/files/patch-src__proto_http_proxy.cc - copied unchanged from r361222, head/security/doscan/files/patch-src__proto_http_proxy.cc branches/2014Q3/security/doscan/files/patch-src__tcp_server.cc - copied unchanged from r361222, head/security/doscan/files/patch-src__tcp_server.cc Modified: branches/2014Q3/security/doscan/Makefile branches/2014Q3/security/doscan/pkg-descr Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/doscan/Makefile ============================================================================== --- branches/2014Q3/security/doscan/Makefile Tue Jul 8 11:52:24 2014 (r361223) +++ branches/2014Q3/security/doscan/Makefile Tue Jul 8 12:12:51 2014 (r361224) @@ -10,26 +10,22 @@ MASTER_SITES= http://static.enyo.de/fw/r MAINTAINER= jmohacsi@bsd.hu COMMENT= Tool to quickly scan your network for machines listening on a TCP port -LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes USES= gmake + PORTDOCS= README -MAN1= doscan.1 +PLIST_FILES= bin/doscan man/man1/doscan.1.gz -PLIST_FILES= bin/doscan +OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's|ony o|on yo|' \ ${WRKSRC}/doc/doscan.1 post-install: -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Copied: branches/2014Q3/security/doscan/files/patch-src__event_queue_poll.cc (from r361222, head/security/doscan/files/patch-src__event_queue_poll.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/security/doscan/files/patch-src__event_queue_poll.cc Tue Jul 8 12:12:51 2014 (r361224, copy of r361222, head/security/doscan/files/patch-src__event_queue_poll.cc) @@ -0,0 +1,10 @@ +--- ./src/event_queue_poll.cc.orig 2014-07-08 13:37:17.446327398 +0200 ++++ ./src/event_queue_poll.cc 2014-07-08 13:37:46.925961262 +0200 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + + void Copied: branches/2014Q3/security/doscan/files/patch-src__half_duplex.cc (from r361222, head/security/doscan/files/patch-src__half_duplex.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/security/doscan/files/patch-src__half_duplex.cc Tue Jul 8 12:12:51 2014 (r361224, copy of r361222, head/security/doscan/files/patch-src__half_duplex.cc) @@ -0,0 +1,10 @@ +--- ./src/half_duplex.cc.orig 2014-07-08 13:35:10.175988570 +0200 ++++ ./src/half_duplex.cc 2014-07-08 13:35:42.546019678 +0200 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + #include + #include Copied: branches/2014Q3/security/doscan/files/patch-src__proto_http_proxy.cc (from r361222, head/security/doscan/files/patch-src__proto_http_proxy.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/security/doscan/files/patch-src__proto_http_proxy.cc Tue Jul 8 12:12:51 2014 (r361224, copy of r361222, head/security/doscan/files/patch-src__proto_http_proxy.cc) @@ -0,0 +1,10 @@ +--- ./src/proto_http_proxy.cc.orig 2014-07-08 13:39:24.466003083 +0200 ++++ ./src/proto_http_proxy.cc 2014-07-08 13:40:02.286093067 +0200 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + static bool proxy_start(subnets&); + static void proxy_open(scan_host_t *); Copied: branches/2014Q3/security/doscan/files/patch-src__tcp_server.cc (from r361222, head/security/doscan/files/patch-src__tcp_server.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/security/doscan/files/patch-src__tcp_server.cc Tue Jul 8 12:12:51 2014 (r361224, copy of r361222, head/security/doscan/files/patch-src__tcp_server.cc) @@ -0,0 +1,10 @@ +--- ./src/tcp_server.cc.orig 2014-07-08 13:38:28.586070857 +0200 ++++ ./src/tcp_server.cc 2014-07-08 13:38:54.175974881 +0200 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + #include + #include + #include Modified: branches/2014Q3/security/doscan/pkg-descr ============================================================================== --- branches/2014Q3/security/doscan/pkg-descr Tue Jul 8 11:52:24 2014 (r361223) +++ branches/2014Q3/security/doscan/pkg-descr Tue Jul 8 12:12:51 2014 (r361224) @@ -6,19 +6,17 @@ are sparsely populated with hosts), with Load distribution: doscan scans the addresses in a seemingly random order. If your scan host is connected to a central router, this ensures that the load is distributed across your network, and you are -stress-tesing just a single router, and not your edge devices. +stress-testing just a single router, and not your edge devices. Low memory consumption: memory usage is proportional to the number of hosts which have responded so far, and to the number of parallel connections. The total number of addresses does not influence memory usage in any way. Can collect responses: doscan optionally records data which is sent by the hosts which are being scanned. You can even specify a regular -expresson to extract part of a server banner, and a message to send to +expression to extract part of a server banner, and a message to send to trigger a response (great for determining HTTP server versions). Extensibility: It is possible to add special handlers for TCP-based protocols, using a straightforward interface. It supports scanning the vulnerable Microsoft DCOM implementation. WWW: http://www.enyo.de/fw/software/doscan/ - -Janos Mohacsi From owner-svn-ports-branches@FreeBSD.ORG Thu Jul 10 18:52:49 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C2775EF3; Thu, 10 Jul 2014 18:52:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9546728D7; Thu, 10 Jul 2014 18:52:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AIqnSx051094; Thu, 10 Jul 2014 18:52:49 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AIqnDH051088; Thu, 10 Jul 2014 18:52:49 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407101852.s6AIqnDH051088@svn.freebsd.org> From: Pawel Pekala Date: Thu, 10 Jul 2014 18:52:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361481 - branches/2014Q3/security/openpgpsdk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2014 18:52:49 -0000 Author: pawel Date: Thu Jul 10 18:52:48 2014 New Revision: 361481 URL: http://svnweb.freebsd.org/changeset/ports/361481 QAT: https://qat.redports.org/buildarchive/r361481/ Log: MFH: r361462 - Fix build with clang (overzealous -Werror) - Add staging support - Respect CFLAGS, LDFLAGS - Convert to new LIB_DEPENDS format - Fix WWW line in pkg-descr Approved by: portmgr (erwin) Modified: branches/2014Q3/security/openpgpsdk/Makefile branches/2014Q3/security/openpgpsdk/pkg-descr Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/openpgpsdk/Makefile ============================================================================== --- branches/2014Q3/security/openpgpsdk/Makefile Thu Jul 10 18:35:04 2014 (r361480) +++ branches/2014Q3/security/openpgpsdk/Makefile Thu Jul 10 18:52:48 2014 (r361481) @@ -11,7 +11,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= OpenPGP SDK BUILD_DEPENDS= gpg2:${PORTSDIR}/security/gnupg -LIB_DEPENDS= cunit.1:${PORTSDIR}/devel/cunit +LIB_DEPENDS= libcunit.so:${PORTSDIR}/devel/cunit USES= perl5 HAS_CONFIGURE= yes @@ -19,9 +19,13 @@ CONFIGURE_ARGS= --without-idea --with-cu PLIST_FILES= bin/openpgp lib/libops.a -NO_STAGE= yes +post-patch: + @${REINPLACE_CMD} 's|-Werror -W -g|${CFLAGS}|' ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name Makefile.template -exec ${REINPLACE_CMD} \ + 's|-Werror -g|${CFLAGS}|; /^LDFLAGS/ s|-g|${LDFLAGS}|' {} \; + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/openpgp ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/lib/libops.a ${PREFIX}/lib/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/openpgp ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/lib/libops.a ${STAGEDIR}${PREFIX}/lib .include Modified: branches/2014Q3/security/openpgpsdk/pkg-descr ============================================================================== --- branches/2014Q3/security/openpgpsdk/pkg-descr Thu Jul 10 18:35:04 2014 (r361480) +++ branches/2014Q3/security/openpgpsdk/pkg-descr Thu Jul 10 18:52:48 2014 (r361481) @@ -1,4 +1,4 @@ The OpenPGP SDK project provides an open source library, written in C, which implements the OpenPGP specification. -WWW: http://openpgp.nominet.org.uk/ +WWW: http://openpgp.nominet.org.uk/ From owner-svn-ports-branches@FreeBSD.ORG Thu Jul 10 22:09:47 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A40CC7FF; Thu, 10 Jul 2014 22:09:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9082D2ACD; Thu, 10 Jul 2014 22:09:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AM9llo043362; Thu, 10 Jul 2014 22:09:47 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AM9kUN043358; Thu, 10 Jul 2014 22:09:46 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407102209.s6AM9kUN043358@svn.freebsd.org> From: Pawel Pekala Date: Thu, 10 Jul 2014 22:09:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361495 - in branches/2014Q3/security/openscep: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2014 22:09:47 -0000 Author: pawel Date: Thu Jul 10 22:09:46 2014 New Revision: 361495 URL: http://svnweb.freebsd.org/changeset/ports/361495 QAT: https://qat.redports.org/buildarchive/r361495/ Log: MFH: r361493 - Fix build on 10+ (new OpenSSL API) - Add staging support, allow it as regular user - Register conflict with security/nss (file ${LOCALBASE}/bin/derdump) - Convert to USES=libtool - Use @sample for config files Approved by: portmgr (erwin) Added: branches/2014Q3/security/openscep/files/patch-include_scep.h - copied unchanged from r361493, head/security/openscep/files/patch-include_scep.h branches/2014Q3/security/openscep/files/patch-scepd_scepconf.c - copied unchanged from r361493, head/security/openscep/files/patch-scepd_scepconf.c Deleted: branches/2014Q3/security/openscep/files/pkg-deinstall.in branches/2014Q3/security/openscep/files/pkg-install.in Modified: branches/2014Q3/security/openscep/Makefile branches/2014Q3/security/openscep/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/openscep/Makefile ============================================================================== --- branches/2014Q3/security/openscep/Makefile Thu Jul 10 21:51:31 2014 (r361494) +++ branches/2014Q3/security/openscep/Makefile Thu Jul 10 22:09:46 2014 (r361495) @@ -3,24 +3,21 @@ PORTNAME= openscep PORTVERSION= 0.4.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security MASTER_SITES= http://openscep.othello.ch/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Open source scep server +CONFLICTS_INSTALL= nss-3.* -USE_AUTOTOOLS= libtool +USES= gmake libtool USE_OPENSSL= yes USE_OPENLDAP= yes USE_APACHE= 22+ GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= gmake - -NO_STAGE= yes -.include PLIST_DIRSTRY= www/cgi-bin @@ -34,41 +31,33 @@ CONFIGURE_ARGS= --with-html-install-dir= CONF_DIR= ${PREFIX}/etc/${PORTNAME} LOCAL_CONF_FILES= openscep.cnf openscep.ldif openscep.schema slapd.conf -SUB_FILES= pkg-deinstall pkg-install pkg-message +SUB_FILES= pkg-message SUB_LIST= CONF_DIR="${CONF_DIR}" CONF_FILES="${LOCAL_CONF_FILES}" -MAN1= derdump.1 \ - scep.1 \ - scepclient.1 \ - scepconf.1 \ - sceplist.1 \ - scepxid.1 -MAN5= openscep.cnf.5 -MAN8= cafingerprint.8 \ - createcrl.8 \ - crl2ldap.8 \ - dn2xid.8 \ - scepd.8 \ - scepgrant.8 \ - scepreject.8 \ - updatecrl.8 - post-patch: @${REINPLACE_CMD} -e '/^subdirs=/ s|libltdl||' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^SUBDIRS =/ s|libltdl||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|^\(install-data-am:\) install-data-local$$|\1|' \ ${WRKSRC}/ldap/Makefile.in ${WRKSRC}/openssl/Makefile.in + @${REINPLACE_CMD} 's,sbindir),DESTDIR)$$(&,' \ + ${WRKSRC}/openssl/Makefile.in + @${REINPLACE_CMD} -E -e 's,(bin|sbin)dir},DESTDIR}$${&,' \ + -e 's,-o \$$\(USER\) -g \$$\(GROUP\),,' \ + ${WRKSRC}/scep/Makefile.in \ + ${WRKSRC}/scepd/Makefile.in + @${REINPLACE_CMD} -E 's,(CGIINSTALLDIR|PKICLIENTEXE)),DESTDIR)$$(&,' \ + ${WRKSRC}/cgi-bin/Makefile.in + @${REINPLACE_CMD} 's|HTMLINSTALLDIR)|DESTDIR)$$(&|' \ + ${WRKSRC}/Makefile.in \ + ${WRKSRC}/doc/Makefile.in \ + ${WRKSRC}/html/Makefile.in post-install: - ${MKDIR} ${CONF_DIR} - ${INSTALL_DATA} ${WRKSRC}/openssl/openscep.cnf ${CONF_DIR}/openscep.cnf.default + @${MKDIR} ${STAGEDIR}${CONF_DIR} + ${INSTALL_DATA} ${WRKSRC}/openssl/openscep.cnf \ + ${STAGEDIR}${CONF_DIR}/openscep.cnf.sample .for f in openscep.ldif openscep.schema slapd.conf - ${INSTALL_DATA} ${WRKSRC}/ldap/${f} ${CONF_DIR}/${f}.default + ${INSTALL_DATA} ${WRKSRC}/ldap/${f} ${STAGEDIR}${CONF_DIR}/${f}.sample .endfor - ${CHOWN} www:www ${PREFIX}/www/cgi-bin/openscep/* - ${CHOWN} www:www ${PREFIX}/www/cgi-bin/pkiclient.exe - ${CHOWN} www:www ${PREFIX}/etc/openscep/* - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} -.include +.include Copied: branches/2014Q3/security/openscep/files/patch-include_scep.h (from r361493, head/security/openscep/files/patch-include_scep.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/security/openscep/files/patch-include_scep.h Thu Jul 10 22:09:46 2014 (r361495, copy of r361493, head/security/openscep/files/patch-include_scep.h) @@ -0,0 +1,14 @@ +--- include/scep.h.orig 2002-02-20 00:40:05.000000000 +0100 ++++ include/scep.h 2014-07-10 22:24:29.366255595 +0200 +@@ -80,7 +80,11 @@ + int recipientNonceLength; + + /* OpenSSL configuration file contents */ ++#ifdef LHASH_OF ++ LHASH_OF(CONF_VALUE) *conf; ++#else + LHASH *conf; ++#endif + + /* signer/client information different from requestor for v2 */ + X509 *selfsignedcert; Copied: branches/2014Q3/security/openscep/files/patch-scepd_scepconf.c (from r361493, head/security/openscep/files/patch-scepd_scepconf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/security/openscep/files/patch-scepd_scepconf.c Thu Jul 10 22:09:46 2014 (r361495, copy of r361493, head/security/openscep/files/patch-scepd_scepconf.c) @@ -0,0 +1,14 @@ +--- scepd/scepconf.c.orig 2001-03-03 23:23:22.000000000 +0100 ++++ scepd/scepconf.c 2014-07-10 22:26:24.326212726 +0200 +@@ -20,7 +20,11 @@ + int debug = 0; + + int main(int argc, char *argv[]) { ++#ifdef LHASH_OF ++ LHASH_OF(CONF_VALUE) *conf; ++#else + LHASH *conf; ++#endif + long eline; + char *section = NULL, *variable = NULL, *value; + int c, n; Modified: branches/2014Q3/security/openscep/pkg-plist ============================================================================== --- branches/2014Q3/security/openscep/pkg-plist Thu Jul 10 21:51:31 2014 (r361494) +++ branches/2014Q3/security/openscep/pkg-plist Thu Jul 10 22:09:46 2014 (r361495) @@ -5,14 +5,33 @@ bin/scepconf bin/scepkey bin/sceplist bin/scepxid -etc/openscep/openscep.cnf.default -etc/openscep/openscep.ldif.default -etc/openscep/openscep.schema.default -etc/openscep/slapd.conf.default +@owner www +@group www +@sample etc/openscep/openscep.cnf.sample +@sample etc/openscep/openscep.ldif.sample +@sample etc/openscep/openscep.schema.sample +@sample etc/openscep/slapd.conf.sample +@owner +@group lib/libscep.a -lib/libscep.la lib/libscep.so lib/libscep.so.4 +lib/libscep.so.4.0.22 +man/man1/derdump.1.gz +man/man1/scep.1.gz +man/man1/scepclient.1.gz +man/man1/scepconf.1.gz +man/man1/sceplist.1.gz +man/man1/scepxid.1.gz +man/man5/openscep.cnf.5.gz +man/man8/cafingerprint.8.gz +man/man8/createcrl.8.gz +man/man8/crl2ldap.8.gz +man/man8/dn2xid.8.gz +man/man8/scepd.8.gz +man/man8/scepgrant.8.gz +man/man8/scepreject.8.gz +man/man8/updatecrl.8.gz sbin/cafingerprint sbin/createcrl sbin/crl2ldap @@ -22,6 +41,8 @@ sbin/scepd sbin/scepgrant sbin/scepreject sbin/updatecrl +@owner www +@group www www/cgi-bin/openscep/add.pl www/cgi-bin/openscep/crl.pl www/cgi-bin/openscep/granted.pl @@ -30,6 +51,8 @@ www/cgi-bin/openscep/pending.pl www/cgi-bin/openscep/rejected.pl www/cgi-bin/openscep/revoked.pl www/cgi-bin/pkiclient.exe +@owner +@group www/openscep/COPYING www/openscep/ChangeLog www/openscep/INSTALL From owner-svn-ports-branches@FreeBSD.ORG Fri Jul 11 15:36:17 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9817D1F; Fri, 11 Jul 2014 15:36:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 93BCC2600; Fri, 11 Jul 2014 15:36:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BFaHIe039725; Fri, 11 Jul 2014 15:36:17 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BFaHFk039724; Fri, 11 Jul 2014 15:36:17 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407111536.s6BFaHFk039724@svn.freebsd.org> From: Pawel Pekala Date: Fri, 11 Jul 2014 15:36:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361552 - branches/2014Q3/security/pwman X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2014 15:36:17 -0000 Author: pawel Date: Fri Jul 11 15:36:17 2014 New Revision: 361552 URL: http://svnweb.freebsd.org/changeset/ports/361552 QAT: https://qat.redports.org/buildarchive/r361552/ Log: MFH: r361540 - Fix build with clang - Add staging support - Convert to new options framework Approved by: portmgr (erwin) Modified: branches/2014Q3/security/pwman/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/pwman/Makefile ============================================================================== --- branches/2014Q3/security/pwman/Makefile Fri Jul 11 15:35:36 2014 (r361551) +++ branches/2014Q3/security/pwman/Makefile Fri Jul 11 15:36:17 2014 (r361552) @@ -15,20 +15,18 @@ RUN_DEPENDS= gpgv:${PORTSDIR}/security/g GNU_CONFIGURE= yes -MAN1= pwman.1 - -PLIST_FILES= bin/convert_pwdb bin/pwdb2csv bin/pwman +CFLAGS+= -Wno-return-type +PLIST_FILES= bin/convert_pwdb bin/pwdb2csv bin/pwman man/man1/pwman.1.gz PORTDOCS= AUTHORS COPYING ChangeLog README TODO -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/gpg|${LOCALBASE}/bin/gpg|g' ${WRKSRC}/src/options.c -.if !defined(NOPORTDOCS) post-install: - @${INSTALL} -d -m 0755 ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include From owner-svn-ports-branches@FreeBSD.ORG Fri Jul 11 15:53:18 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 51B7565F; Fri, 11 Jul 2014 15:53:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D2A327E8; Fri, 11 Jul 2014 15:53:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BFrId2049281; Fri, 11 Jul 2014 15:53:18 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BFrH2t049279; Fri, 11 Jul 2014 15:53:17 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407111553.s6BFrH2t049279@svn.freebsd.org> From: Pawel Pekala Date: Fri, 11 Jul 2014 15:53:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361558 - branches/2014Q3/security/razorback-archiveInflate X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2014 15:53:18 -0000 Author: pawel Date: Fri Jul 11 15:53:17 2014 New Revision: 361558 URL: http://svnweb.freebsd.org/changeset/ports/361558 QAT: https://qat.redports.org/buildarchive/r361558/ Log: MFH: r361550 - Fix build with clang (overzealous -Werror) - Add staging support - Convert to new LIB_DEPENDS format, options helpers, USES=libtool Approved by: portmgr (erwin) Modified: branches/2014Q3/security/razorback-archiveInflate/Makefile branches/2014Q3/security/razorback-archiveInflate/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/razorback-archiveInflate/Makefile ============================================================================== --- branches/2014Q3/security/razorback-archiveInflate/Makefile Fri Jul 11 15:52:23 2014 (r361557) +++ branches/2014Q3/security/razorback-archiveInflate/Makefile Fri Jul 11 15:53:17 2014 (r361558) @@ -3,6 +3,7 @@ PORTNAME= archiveInflate PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- @@ -14,36 +15,28 @@ COMMENT= Framework for an intelligence d LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= razorback_api:${PORTSDIR}/security/razorback-api +LIB_DEPENDS= librazorback_api.so:${PORTSDIR}/security/razorback-api BUILD_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget RUN_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget -OPTIONS_DEFINE= DEBUG ASSERT -ASSERT_DESC= Enable Asserts - RB_LIBDIR?= ${PREFIX}/lib/razorback GNU_CONFIGURE= yes -USES= pkgconfig -USE_AUTOTOOLS= libtool +USES= libtool pkgconfig USE_LDCONFIG= ${RB_LIBDIR} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes -.include +OPTIONS_DEFINE= DEBUG ASSERT + +ASSERT_DESC= Enable Asserts +ASSERT_CONFIGURE_ENABLE= assert +DEBUG_CONFIGURE_ENABLE= debug -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if ${PORT_OPTIONS:MASSERT} -CONFIGURE_ARGS+=--enable-assert -.endif +post-patch: + @${REINPLACE_CMD} '/CWARNINGS/ s|-Werror||' ${WRKSRC}/configure post-install: - ${LN} -sf ${RB_LIBDIR}/archiveInflate.so.2 ${RB_LIBDIR}/archiveInflate.so.2.0.0 - @if [ ! -f ${PREFIX}/etc/razorback/archive_inflate.conf ]; then \ - ${CP} -p ${PREFIX}/etc/razorback/archive_inflate.conf.sample ${PREFIX}/etc/razorback/archive_inflate.conf ; \ - fi + ${LN} -sf ${RB_LIBDIR}/archiveInflate.so.2 \ + ${STAGEDIR}${RB_LIBDIR}/archiveInflate.so.2.0.0 .include Modified: branches/2014Q3/security/razorback-archiveInflate/pkg-plist ============================================================================== --- branches/2014Q3/security/razorback-archiveInflate/pkg-plist Fri Jul 11 15:52:23 2014 (r361557) +++ branches/2014Q3/security/razorback-archiveInflate/pkg-plist Fri Jul 11 15:53:17 2014 (r361558) @@ -1,10 +1,6 @@ -@unexec if cmp -s %D/etc/razorback/archive_inflate.conf %D/etc/razorback/archive_inflate.conf.sample; then rm -f %D/etc/razorback/archive_inflate.conf; fi -etc/razorback/archive_inflate.conf.sample -@exec if [ ! -f %D/etc/razorback/archive_inflate.conf ]; then cp -p %D/%F %B/archive_inflate.conf; fi -@dirrmtry etc/razorback +@sample etc/razorback/archive_inflate.conf.sample lib/razorback/archiveInflate.so.2.0.0 lib/razorback/archiveInflate.so.2 lib/razorback/archiveInflate.so -lib/razorback/archiveInflate.la lib/razorback/archiveInflate.a @dirrmtry lib/razorback From owner-svn-ports-branches@FreeBSD.ORG Fri Jul 11 17:08:47 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D5CBF60; Fri, 11 Jul 2014 17:08:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CF362033; Fri, 11 Jul 2014 17:08:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BH8kqs091106; Fri, 11 Jul 2014 17:08:46 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BH8kPu091104; Fri, 11 Jul 2014 17:08:46 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407111708.s6BH8kPu091104@svn.freebsd.org> From: Pawel Pekala Date: Fri, 11 Jul 2014 17:08:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361572 - branches/2014Q3/security/razorback-pdfFox X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2014 17:08:47 -0000 Author: pawel Date: Fri Jul 11 17:08:46 2014 New Revision: 361572 URL: http://svnweb.freebsd.org/changeset/ports/361572 QAT: https://qat.redports.org/buildarchive/r361572/ Log: MFH: r361564 - Fix build with clang (overzelous -Werror) - Add staging support - Convert to new LIB_DEPENDS format, options helpers, USES=libtool - Use @sample for config file Approved by: portmgr (erwin) Modified: branches/2014Q3/security/razorback-pdfFox/Makefile branches/2014Q3/security/razorback-pdfFox/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/razorback-pdfFox/Makefile ============================================================================== --- branches/2014Q3/security/razorback-pdfFox/Makefile Fri Jul 11 17:00:13 2014 (r361571) +++ branches/2014Q3/security/razorback-pdfFox/Makefile Fri Jul 11 17:08:46 2014 (r361572) @@ -3,6 +3,7 @@ PORTNAME= pdfFox PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- @@ -14,36 +15,27 @@ COMMENT= Framework for an intelligence d LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= razorback_api:${PORTSDIR}/security/razorback-api +LIB_DEPENDS= librazorback_api.so:${PORTSDIR}/security/razorback-api BUILD_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget RUN_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget -OPTIONS_DEFINE= DEBUG ASSERT -ASSERT_DESC= Enable Asserts - RB_LIBDIR?= ${PREFIX}/lib/razorback GNU_CONFIGURE= yes -USES= pkgconfig -USE_AUTOTOOLS= libtool +USES= libtool pkgconfig USE_LDCONFIG= ${RB_LIBDIR} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes -.include +OPTIONS_DEFINE= DEBUG ASSERT + +ASSERT_DESC= Enable Asserts +ASSERT_CONFIGURE_ENABLE= assert +DEBUG_CONFIGURE_ENABLE= debug -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if ${PORT_OPTIONS:MASSERT} -CONFIGURE_ARGS+=--enable-assert -.endif +post-patch: + @${REINPLACE_CMD} '/CWARNINGS/ s|-Werror||' ${WRKSRC}/configure post-install: - ${LN} -sf ${RB_LIBDIR}/pdfFox.so.2 ${RB_LIBDIR}/pdfFox.so.2.0.0 - @if [ ! -f ${PREFIX}/etc/razorback/pdffox.conf ]; then \ - ${CP} -p ${PREFIX}/etc/razorback/pdffox.conf.sample ${PREFIX}/etc/razorback/pdffox.conf ; \ - fi + ${LN} -sf ${RB_LIBDIR}/pdfFox.so.2 ${STAGEDIR}${RB_LIBDIR}/pdfFox.so.2.0.0 .include Modified: branches/2014Q3/security/razorback-pdfFox/pkg-plist ============================================================================== --- branches/2014Q3/security/razorback-pdfFox/pkg-plist Fri Jul 11 17:00:13 2014 (r361571) +++ branches/2014Q3/security/razorback-pdfFox/pkg-plist Fri Jul 11 17:08:46 2014 (r361572) @@ -1,10 +1,6 @@ -@unexec if cmp -s %D/etc/razorback/pdffox.conf %D/etc/razorback/pdffox.conf.sample; then rm -f %D/etc/razorback/pdffox.conf; fi -etc/razorback/pdffox.conf.sample -@exec if [ ! -f %D/etc/razorback/pdffox.conf ]; then cp -p %D/%F %B/pdffox.conf; fi -@dirrmtry etc/razorback +@sample etc/razorback/pdffox.conf.sample lib/razorback/pdfFox.so.2.0.0 lib/razorback/pdfFox.so.2 lib/razorback/pdfFox.so -lib/razorback/pdfFox.la lib/razorback/pdfFox.a @dirrmtry lib/razorback From owner-svn-ports-branches@FreeBSD.ORG Fri Jul 11 17:47:47 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B60AAB37; Fri, 11 Jul 2014 17:47:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A1C1823F0; Fri, 11 Jul 2014 17:47:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BHllZI014239; Fri, 11 Jul 2014 17:47:47 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BHll75014237; Fri, 11 Jul 2014 17:47:47 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407111747.s6BHll75014237@svn.freebsd.org> From: Pawel Pekala Date: Fri, 11 Jul 2014 17:47:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361573 - branches/2014Q3/security/razorback-yaraNugget X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2014 17:47:47 -0000 Author: pawel Date: Fri Jul 11 17:47:46 2014 New Revision: 361573 URL: http://svnweb.freebsd.org/changeset/ports/361573 QAT: https://qat.redports.org/buildarchive/r361573/ Log: MFH: r361571 - Fix build with clang (overzealous -Werror) - Add staging support - Convert to new LIB_DEPENDS, options helpers, USES=libtool - Use @sample for config file Approved by: portmgr (erwin) Modified: branches/2014Q3/security/razorback-yaraNugget/Makefile branches/2014Q3/security/razorback-yaraNugget/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/razorback-yaraNugget/Makefile ============================================================================== --- branches/2014Q3/security/razorback-yaraNugget/Makefile Fri Jul 11 17:08:46 2014 (r361572) +++ branches/2014Q3/security/razorback-yaraNugget/Makefile Fri Jul 11 17:47:46 2014 (r361573) @@ -3,7 +3,7 @@ PORTNAME= yaraNugget PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Nuggets PKGNAMEPREFIX= razorback- @@ -15,35 +15,27 @@ COMMENT= Framework for an intelligence d LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= razorback_api:${PORTSDIR}/security/razorback-api \ - pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS= librazorback_api.so:${PORTSDIR}/security/razorback-api \ + libpcre.so:${PORTSDIR}/devel/pcre BUILD_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget RUN_DEPENDS= razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget -OPTIONS_DEFINE= DEBUG ASSERT -ASSERT_DESC= Enable Asserts - RB_LIBDIR?= ${PREFIX}/lib/razorback GNU_CONFIGURE= yes -USES= pkgconfig -USE_AUTOTOOLS= libtool +USES= libtool pkgconfig USE_LDCONFIG= ${RB_LIBDIR} -NO_STAGE= yes -.include +OPTIONS_DEFINE= DEBUG ASSERT + +ASSERT_DESC= Enable Asserts +ASSERT_CONFIGURE_ENABLE= assert +DEBUG_CONFIGURE_ENABLE= debug -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if ${PORT_OPTIONS:MASSERT} -CONFIGURE_ARGS+=--enable-assert -.endif +post-patch: + @${REINPLACE_CMD} '/CWARNINGS/ s|-Werror||' ${WRKSRC}/configure post-install: - ${LN} -sf ${RB_LIBDIR}/yaraNugget.so.2 ${RB_LIBDIR}/yaraNugget.so.2.0.0 - @if [ ! -f ${PREFIX}/etc/razorback/yara.conf ]; then \ - ${CP} -p ${PREFIX}/etc/razorback/yara.conf.sample ${PREFIX}/etc/razorback/yara.conf ; \ - fi + ${LN} -sf ${RB_LIBDIR}/yaraNugget.so.2 \ + ${STAGEDIR}${RB_LIBDIR}/yaraNugget.so.2.0.0 .include Modified: branches/2014Q3/security/razorback-yaraNugget/pkg-plist ============================================================================== --- branches/2014Q3/security/razorback-yaraNugget/pkg-plist Fri Jul 11 17:08:46 2014 (r361572) +++ branches/2014Q3/security/razorback-yaraNugget/pkg-plist Fri Jul 11 17:47:46 2014 (r361573) @@ -1,13 +1,9 @@ -@unexec if cmp -s %D/etc/razorback/yara.conf %D/etc/razorback/yara.conf.sample; then rm -f %D/etc/razorback/yara.conf; fi -etc/razorback/yara.conf.sample -@exec if [ ! -f %D/etc/razorback/yara.conf ]; then cp -p %D/%F %B/yara.conf; fi +@sample etc/razorback/yara.conf.sample etc/razorback/yara/banker.rules etc/razorback/yara/packer.rules @dirrmtry etc/razorback/yara -@dirrmtry etc/razorback lib/razorback/yaraNugget.so.2.0.0 lib/razorback/yaraNugget.so.2 lib/razorback/yaraNugget.so -lib/razorback/yaraNugget.la lib/razorback/yaraNugget.a @dirrmtry lib/razorback From owner-svn-ports-branches@FreeBSD.ORG Sun Jul 13 18:10:29 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4EB764D; Sun, 13 Jul 2014 18:10:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1F3A2C1E; Sun, 13 Jul 2014 18:10:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DIAT73010191; Sun, 13 Jul 2014 18:10:29 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DIATNK010163; Sun, 13 Jul 2014 18:10:29 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407131810.s6DIATNK010163@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 13 Jul 2014 18:10:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361700 - branches/2014Q3/emulators/vba X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 18:10:29 -0000 Author: rakuco Date: Sun Jul 13 18:10:29 2014 New Revision: 361700 URL: http://svnweb.freebsd.org/changeset/ports/361700 QAT: https://qat.redports.org/buildarchive/r361700/ Log: MFH: r361698 Add dependency on pkg-config when GTK2 is on. PR: 189138 Approved by: maintainer timeout (74 days) Approved by: portmgr (miwi) Modified: branches/2014Q3/emulators/vba/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/emulators/vba/Makefile ============================================================================== --- branches/2014Q3/emulators/vba/Makefile Sun Jul 13 17:55:41 2014 (r361699) +++ branches/2014Q3/emulators/vba/Makefile Sun Jul 13 18:10:29 2014 (r361700) @@ -35,6 +35,7 @@ OPTIONS_SUB= yes PROFILING_DESC= Enable profiling GTK2_CONFIGURE_ON= --enable-gtk=2.4 +GTK2_USES= pkgconfig PROFILING_CONFIGURE_ENABLE= profiling NO_STAGE= yes From owner-svn-ports-branches@FreeBSD.ORG Sun Jul 13 18:12:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69E777DD; Sun, 13 Jul 2014 18:12:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5698D2CAD; Sun, 13 Jul 2014 18:12:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DIC2LV012839; Sun, 13 Jul 2014 18:12:02 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DIC2Y4012837; Sun, 13 Jul 2014 18:12:02 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407131812.s6DIC2Y4012837@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 13 Jul 2014 18:12:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361701 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 18:12:02 -0000 Author: rakuco Date: Sun Jul 13 18:12:01 2014 New Revision: 361701 URL: http://svnweb.freebsd.org/changeset/ports/361701 QAT: https://qat.redports.org/buildarchive/r361701/ Log: MFH: r361678 Add entry for mail/postfixadmin. PR: 189248 Approved by: portmgr (miwi) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Sun Jul 13 18:10:29 2014 (r361700) +++ branches/2014Q3/security/vuxml/vuln.xml Sun Jul 13 18:12:01 2014 (r361701) @@ -57,6 +57,37 @@ Notes: --> + + postfixadmin -- SQL injection vulnerability + + + postfixadmin + 2.3.7 + + + + +

Thijs Kinkhorst reports:

+
+

Postfixadmin has an SQL injection vulnerability. This + vulnerability is only exploitable by authenticated users able to + create new aliases.

+
+ +
+ + CVE-2014-2655 + 66455 + 189248 + http://www.openwall.com/lists/oss-security/2014/03/26/6 + https://www.debian.org/security/2014/dsa-2889 + + + 2014-03-28 + 2014-07-13 + +
+ dbus -- multiple vulnabilities From owner-svn-ports-branches@FreeBSD.ORG Sun Jul 13 18:13:58 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18587920; Sun, 13 Jul 2014 18:13:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EEA952CC4; Sun, 13 Jul 2014 18:13:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DIDvHl013268; Sun, 13 Jul 2014 18:13:57 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DIDvj4013264; Sun, 13 Jul 2014 18:13:57 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407131813.s6DIDvj4013264@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 13 Jul 2014 18:13:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361702 - in branches/2014Q3/mail/postfixadmin: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 18:13:58 -0000 Author: rakuco Date: Sun Jul 13 18:13:56 2014 New Revision: 361702 URL: http://svnweb.freebsd.org/changeset/ports/361702 QAT: https://qat.redports.org/buildarchive/r361702/ Log: MFH: r361679 - Update to 2.3.7, which contains a security fix. - Support staging. PR: 189248 Submitted by: Lukasz Wasikowski Approved by: maintainer timeout (72 days) Security: ff98087f-0a8f-11e4-b00b-5453ed2e2b49 Approved by: portmgr (miwi) Modified: branches/2014Q3/mail/postfixadmin/Makefile branches/2014Q3/mail/postfixadmin/distinfo branches/2014Q3/mail/postfixadmin/files/pkg-message.in branches/2014Q3/mail/postfixadmin/pkg-descr Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/mail/postfixadmin/Makefile ============================================================================== --- branches/2014Q3/mail/postfixadmin/Makefile Sun Jul 13 18:12:01 2014 (r361701) +++ branches/2014Q3/mail/postfixadmin/Makefile Sun Jul 13 18:13:56 2014 (r361702) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfixadmin -PORTVERSION= 2.3.6 +PORTVERSION= 2.3.7 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -17,6 +17,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERS NO_BUILD= yes SUB_FILES+= pkg-message +SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL MYSQLI PGSQL @@ -24,8 +25,6 @@ MYSQLI_DESC= MySQL 4.1+ back-end (use my OPTIONS_DEFAULT= MYSQL -NO_STAGE= yes - OPTIONS_DEFINE= DOCS .include @@ -44,6 +43,8 @@ USE_PHP+= mysqli USE_PHP+= pgsql .endif +WANT_PHP_WEB= yes + post-patch: @${FIND} ${WRKSRC} -name '*.orig' -delete @@ -51,46 +52,35 @@ pre-install: @${RM} -rf ${WRKSRC}/ADDITIONS/squirrelmail-plugin do-install: - @${MKDIR} ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION - @${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS - @${MKDIR} ${PREFIX}/www/postfixadmin/ADDITIONS/cyrus - @${MKDIR} ${PREFIX}/www/postfixadmin/css - @${MKDIR} ${PREFIX}/www/postfixadmin/admin - @${MKDIR} ${PREFIX}/www/postfixadmin/images - @${MKDIR} ${PREFIX}/www/postfixadmin/languages - @${MKDIR} ${PREFIX}/www/postfixadmin/model - @${MKDIR} ${PREFIX}/www/postfixadmin/templates - @${MKDIR} ${PREFIX}/www/postfixadmin/users + @${MKDIR} ${STAGEDIR}${WWWDIR}/VIRTUAL_VACATION + @${MKDIR} ${STAGEDIR}${WWWDIR}/ADDITIONS + @${MKDIR} ${STAGEDIR}${WWWDIR}/ADDITIONS/cyrus + @${MKDIR} ${STAGEDIR}${WWWDIR}/css + @${MKDIR} ${STAGEDIR}${WWWDIR}/admin + @${MKDIR} ${STAGEDIR}${WWWDIR}/images + @${MKDIR} ${STAGEDIR}${WWWDIR}/languages + @${MKDIR} ${STAGEDIR}${WWWDIR}/model + @${MKDIR} ${STAGEDIR}${WWWDIR}/templates + @${MKDIR} ${STAGEDIR}${WWWDIR}/users (cd ${WRKSRC}/ && \ - ${COPYTREE_SHARE} \*.php ${PREFIX}/www/postfixadmin "! -name config.inc.php") - @${CP} ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php.sample - @${CP} -n ${WRKSRC}/config.inc.php ${PREFIX}/www/postfixadmin/config.inc.php || ${TRUE} - @${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/www/postfixadmin - @${INSTALL_DATA} ${WRKSRC}/*.TXT ${PREFIX}/www/postfixadmin - @${INSTALL_DATA} ${WRKSRC}/css/* ${PREFIX}/www/postfixadmin/css - @${INSTALL_DATA} ${WRKSRC}/admin/* ${PREFIX}/www/postfixadmin/admin - @${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/www/postfixadmin/images - @${INSTALL_DATA} ${WRKSRC}/languages/* ${PREFIX}/www/postfixadmin/languages - @${INSTALL_DATA} ${WRKSRC}/model/* ${PREFIX}/www/postfixadmin/model - @${INSTALL_DATA} ${WRKSRC}/templates/* ${PREFIX}/www/postfixadmin/templates - @${INSTALL_DATA} ${WRKSRC}/users/* ${PREFIX}/www/postfixadmin/users - @${CP} -R ${WRKSRC}/VIRTUAL_VACATION/* ${PREFIX}/www/postfixadmin/VIRTUAL_VACATION + ${COPYTREE_SHARE} \*.php ${STAGEDIR}${WWWDIR} "! -name config.inc.php") + @${CP} ${WRKSRC}/config.inc.php ${STAGEDIR}${WWWDIR}/config.inc.php.sample + @${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${WWWDIR} + @${INSTALL_DATA} ${WRKSRC}/*.TXT ${STAGEDIR}${WWWDIR} + @${INSTALL_DATA} ${WRKSRC}/css/* ${STAGEDIR}${WWWDIR}/css + @${INSTALL_DATA} ${WRKSRC}/admin/* ${STAGEDIR}${WWWDIR}/admin + @${INSTALL_DATA} ${WRKSRC}/images/* ${STAGEDIR}${WWWDIR}/images + @${INSTALL_DATA} ${WRKSRC}/languages/* ${STAGEDIR}${WWWDIR}/languages + @${INSTALL_DATA} ${WRKSRC}/model/* ${STAGEDIR}${WWWDIR}/model + @${INSTALL_DATA} ${WRKSRC}/templates/* ${STAGEDIR}${WWWDIR}/templates + @${INSTALL_DATA} ${WRKSRC}/users/* ${STAGEDIR}${WWWDIR}/users + @${CP} -R ${WRKSRC}/VIRTUAL_VACATION/* ${STAGEDIR}${WWWDIR}/VIRTUAL_VACATION (cd ${WRKSRC}/ADDITIONS/ && \ - ${COPYTREE_SHARE} \* ${PREFIX}/www/postfixadmin/ADDITIONS/ "! -name squirrelmail-plugin") + ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/ADDITIONS/ "! -name squirrelmail-plugin") .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${DOCSDIR}) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) .endif -post-install: - @if [ ! -f ${PREFIX}/www/postfixadmin/config.inc.php ]; then \ - ${CP} -p ${PREFIX}/www/postfixadmin/config.inc.php.sample ${PREFIX}/www/postfixadmin/config.inc.php ; \ - fi - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/postfixadmin - @${CHMOD} 640 ${PREFIX}/www/postfixadmin/*.php ${PREFIX}/www/postfixadmin/css/*.css - @${CHMOD} 640 ${PREFIX}/www/postfixadmin/admin/*.php - @${CHMOD} 640 ${PREFIX}/www/postfixadmin/users/*.php - @${CAT} ${PKGMESSAGE} - .include Modified: branches/2014Q3/mail/postfixadmin/distinfo ============================================================================== --- branches/2014Q3/mail/postfixadmin/distinfo Sun Jul 13 18:12:01 2014 (r361701) +++ branches/2014Q3/mail/postfixadmin/distinfo Sun Jul 13 18:13:56 2014 (r361702) @@ -1,2 +1,2 @@ -SHA256 (postfixadmin-2.3.6.tar.gz) = ea505281b6c04bda887eb4e6aa6c023b354c4ef4864aa60dcb1425942bf2af63 -SIZE (postfixadmin-2.3.6.tar.gz) = 1597001 +SHA256 (postfixadmin-2.3.7.tar.gz) = 761074e711ab618deda425dc013133b9d5968e0859bb883f10164061fd87006e +SIZE (postfixadmin-2.3.7.tar.gz) = 1600662 Modified: branches/2014Q3/mail/postfixadmin/files/pkg-message.in ============================================================================== --- branches/2014Q3/mail/postfixadmin/files/pkg-message.in Sun Jul 13 18:12:01 2014 (r361701) +++ branches/2014Q3/mail/postfixadmin/files/pkg-message.in Sun Jul 13 18:13:56 2014 (r361702) @@ -9,7 +9,7 @@ REQUIRED!! ---------- - You are using Postfix 2.0 or higher. - You are using Apache 1.3.27 / Lighttpd 1.3.15 or higher. -- You are using PHP 4.1 or higher (5.X recommended) +- You are using PHP 5.1.2 or higher. - You are using MySQL 3.23 or higher (5.x recommended) OR PostgreSQL 7.4 (or higher) INSTALL / UPGRADE Modified: branches/2014Q3/mail/postfixadmin/pkg-descr ============================================================================== --- branches/2014Q3/mail/postfixadmin/pkg-descr Sun Jul 13 18:12:01 2014 (r361701) +++ branches/2014Q3/mail/postfixadmin/pkg-descr Sun Jul 13 18:13:56 2014 (r361702) @@ -2,7 +2,7 @@ Postfix Admin is a web-based management Postfix with Postfix-style Virtual Domains using MySQL or PostgreSQL lookups. Postfix Admin is known to work on Apache and Lighttpd, but is designed to work on any web server with -PHP 4.1+ support. +PHP 5.1.2+ support. Postfix Admin features: @@ -13,4 +13,4 @@ Postfix Admin features: - Backup MX; - Packaged with over 25 languages. -WWW: http://www.postfixadmin.org +WWW: http://www.postfixadmin.org From owner-svn-ports-branches@FreeBSD.ORG Sun Jul 13 21:29:40 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 684E8C65; Sun, 13 Jul 2014 21:29:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 559602A7A; Sun, 13 Jul 2014 21:29:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DLTebQ009106; Sun, 13 Jul 2014 21:29:40 GMT (envelope-from shurd@svn.freebsd.org) Received: (from shurd@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DLTe6g009105; Sun, 13 Jul 2014 21:29:40 GMT (envelope-from shurd@svn.freebsd.org) Message-Id: <201407132129.s6DLTe6g009105@svn.freebsd.org> From: Stephen Hurd Date: Sun, 13 Jul 2014 21:29:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361711 - branches/2014Q3/comms/fldigi/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 21:29:40 -0000 Author: shurd Date: Sun Jul 13 21:29:39 2014 New Revision: 361711 URL: http://svnweb.freebsd.org/changeset/ports/361711 QAT: https://qat.redports.org/buildarchive/r361711/ Log: MFH: r361113 - Fix compilation using Clang Approved by: portmgr (erwin) Added: branches/2014Q3/comms/fldigi/files/patch-src_spot_pskrep.cxx - copied unchanged from r361113, head/comms/fldigi/files/patch-src_spot_pskrep.cxx Copied: branches/2014Q3/comms/fldigi/files/patch-src_spot_pskrep.cxx (from r361113, head/comms/fldigi/files/patch-src_spot_pskrep.cxx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/comms/fldigi/files/patch-src_spot_pskrep.cxx Sun Jul 13 21:29:39 2014 (r361711, copy of r361113, head/comms/fldigi/files/patch-src_spot_pskrep.cxx) @@ -0,0 +1,11 @@ +--- src/spot/pskrep.cxx.orig 2014-07-04 15:11:14.000000000 -0700 ++++ src/spot/pskrep.cxx 2014-07-04 15:13:32.000000000 -0700 +@@ -50,7 +50,7 @@ + #include + #include + +-#if GCC_VER_OK ++#if GCC_VER_OK || HAVE_STD_HASH + # if HAVE_STD_HASH + # define MAP_TYPE std::unordered_map + # define HASH_TYPE std::hash From owner-svn-ports-branches@FreeBSD.ORG Mon Jul 14 16:10:00 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 131727E1; Mon, 14 Jul 2014 16:10:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DAEE12734; Mon, 14 Jul 2014 16:09:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6EG9xDO047608; Mon, 14 Jul 2014 16:09:59 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6EG9x0C047606; Mon, 14 Jul 2014 16:09:59 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201407141609.s6EG9x0C047606@svn.freebsd.org> From: Rene Ladan Date: Mon, 14 Jul 2014 16:09:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361795 - branches/2014Q3/mail/dspam-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2014 16:10:00 -0000 Author: rene Date: Mon Jul 14 16:09:59 2014 New Revision: 361795 URL: http://svnweb.freebsd.org/changeset/ports/361795 QAT: https://qat.redports.org/buildarchive/r361795/ Log: MFH: r361790 - Fix pkg installation where the dspam user/group/ are non-default. - Bump PORTREVISION PR: 191797 Submitted by: raivo.hool@gmail.com Approved by: portmgr (erwin) Modified: branches/2014Q3/mail/dspam-devel/Makefile branches/2014Q3/mail/dspam-devel/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/mail/dspam-devel/Makefile ============================================================================== --- branches/2014Q3/mail/dspam-devel/Makefile Mon Jul 14 16:07:07 2014 (r361794) +++ branches/2014Q3/mail/dspam-devel/Makefile Mon Jul 14 16:09:59 2014 (r361795) @@ -7,7 +7,7 @@ PORTNAME= dspam PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= # set later Modified: branches/2014Q3/mail/dspam-devel/pkg-plist ============================================================================== --- branches/2014Q3/mail/dspam-devel/pkg-plist Mon Jul 14 16:07:07 2014 (r361794) +++ branches/2014Q3/mail/dspam-devel/pkg-plist Mon Jul 14 16:09:59 2014 (r361795) @@ -15,9 +15,15 @@ bin/dspam_notify %%PGSQL%%bin/dspam_pg2int8 bin/dspam_stats bin/dspam_train +@mode 0640 +@owner %%DSPAM_OWNER%% +@group %%DSPAM_GROUP%% @sample etc/dspam.conf.sample @exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F @exec chmod 0640 %D/%F +@group wheel +@owner root +@mode include/dspam/buffer.h include/dspam/config.h include/dspam/config_shared.h @@ -228,8 +234,14 @@ firstrun.txt.sample firstspam.txt.sample quarantinefull.txt.sample @cwd / +@owner %%DSPAM_HOME_OWNER%% +@group %%DSPAM_HOME_GROUP%% +@mode %%DSPAM_HOME_MODE%% +@dirrm %%DSPAM_HOME%% +@mode @exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%% @exec chmod %%DSPAM_HOME_MODE%% %%DSPAM_HOME%% -@dirrm %%DSPAM_HOME%% @exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%LOG_DIR%% @dirrmtry %%LOG_DIR%% +@group wheel +@owner root From owner-svn-ports-branches@FreeBSD.ORG Mon Jul 14 18:21:14 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A302A3EB; Mon, 14 Jul 2014 18:21:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7740A23F3; Mon, 14 Jul 2014 18:21:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6EILECb012903; Mon, 14 Jul 2014 18:21:14 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6EILDre012900; Mon, 14 Jul 2014 18:21:13 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407141821.s6EILDre012900@svn.freebsd.org> From: Raphael Kubo da Costa Date: Mon, 14 Jul 2014 18:21:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361807 - in branches/2014Q3/devel/freeocl: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2014 18:21:14 -0000 Author: rakuco Date: Mon Jul 14 18:21:13 2014 New Revision: 361807 URL: http://svnweb.freebsd.org/changeset/ports/361807 QAT: https://qat.redports.org/buildarchive/r361807/ Log: MFH: r361803 Fix the build by including xmmintr.h in a few places. PR: 191595 Submitted by: ohartman@zedat.fu-berlin.de (maintainer) Approved by: portmgr (erwin) Added: branches/2014Q3/devel/freeocl/files/patch-src-utils-threadpool.cpp - copied unchanged from r361803, head/devel/freeocl/files/patch-src-utils-threadpool.cpp Modified: branches/2014Q3/devel/freeocl/Makefile branches/2014Q3/devel/freeocl/files/patch-src_freeocl.h Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/devel/freeocl/Makefile ============================================================================== --- branches/2014Q3/devel/freeocl/Makefile Mon Jul 14 17:48:05 2014 (r361806) +++ branches/2014Q3/devel/freeocl/Makefile Mon Jul 14 18:21:13 2014 (r361807) @@ -3,7 +3,7 @@ PORTNAME= freeocl PORTVERSION= 0.3.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= FreeOCL-${PORTVERSION}-src Copied: branches/2014Q3/devel/freeocl/files/patch-src-utils-threadpool.cpp (from r361803, head/devel/freeocl/files/patch-src-utils-threadpool.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/devel/freeocl/files/patch-src-utils-threadpool.cpp Mon Jul 14 18:21:13 2014 (r361807, copy of r361803, head/devel/freeocl/files/patch-src-utils-threadpool.cpp) @@ -0,0 +1,10 @@ +--- src/utils/threadpool.cpp.orig 2014-07-04 08:45:34.000000000 +0200 ++++ src/utils/threadpool.cpp 2014-07-04 08:46:03.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "threadpool.h" + #include + #include ++#include + #include + #include + Modified: branches/2014Q3/devel/freeocl/files/patch-src_freeocl.h ============================================================================== --- branches/2014Q3/devel/freeocl/files/patch-src_freeocl.h Mon Jul 14 17:48:05 2014 (r361806) +++ branches/2014Q3/devel/freeocl/files/patch-src_freeocl.h Mon Jul 14 18:21:13 2014 (r361807) @@ -1,10 +1,11 @@ ---- src/freeocl.h.orig 2013-11-15 21:18:17.000000000 +0100 -+++ src/freeocl.h 2013-11-15 21:24:32.000000000 +0100 -@@ -26,6 +26,7 @@ +--- src/freeocl.h.orig 2012-09-02 19:00:41.000000000 +0200 ++++ src/freeocl.h 2014-07-04 08:42:48.000000000 +0200 +@@ -26,6 +26,8 @@ #include "dispatch.h" #include #include +#include ++#include #ifdef DEBUG_UTILS #define MSG(X) std::cout << #X << std::endl From owner-svn-ports-branches@FreeBSD.ORG Mon Jul 14 20:14:13 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1692400; Mon, 14 Jul 2014 20:14:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DEDFF2EB1; Mon, 14 Jul 2014 20:14:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6EKECLc070725; Mon, 14 Jul 2014 20:14:12 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6EKECdZ070721; Mon, 14 Jul 2014 20:14:12 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201407142014.s6EKECdZ070721@svn.freebsd.org> From: Rene Ladan Date: Mon, 14 Jul 2014 20:14:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r361827 - branches/2014Q3/mail/dspam-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jul 2014 20:14:13 -0000 Author: rene Date: Mon Jul 14 20:14:12 2014 New Revision: 361827 URL: http://svnweb.freebsd.org/changeset/ports/361827 QAT: https://qat.redports.org/buildarchive/r361827/ Log: MFH: r361826 mail/dspam-devel: also set mode/owner/group for bin/dspam, bump PORTREVISION PR: 191797 Submitted by: raivo.hool@gmail.com Approved by: portmgr (erwin) Modified: branches/2014Q3/mail/dspam-devel/Makefile branches/2014Q3/mail/dspam-devel/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/mail/dspam-devel/Makefile ============================================================================== --- branches/2014Q3/mail/dspam-devel/Makefile Mon Jul 14 20:06:49 2014 (r361826) +++ branches/2014Q3/mail/dspam-devel/Makefile Mon Jul 14 20:14:12 2014 (r361827) @@ -7,7 +7,7 @@ PORTNAME= dspam PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE} -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= # set later @@ -131,6 +131,7 @@ CONFIGURE_ARGS+= --with-dspam-home-mode= PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} \ DSPAM_OWNER=${DSPAM_OWNER} \ DSPAM_GROUP=${DSPAM_GROUP} \ + DSPAM_MODE=${DSPAM_MODE} \ DSPAM_HOME_OWNER=${DSPAM_HOME_OWNER} \ DSPAM_HOME_GROUP=${DSPAM_HOME_GROUP} \ DSPAM_HOME_MODE=${DSPAM_HOME_MODE} Modified: branches/2014Q3/mail/dspam-devel/pkg-plist ============================================================================== --- branches/2014Q3/mail/dspam-devel/pkg-plist Mon Jul 14 20:06:49 2014 (r361826) +++ branches/2014Q3/mail/dspam-devel/pkg-plist Mon Jul 14 20:14:12 2014 (r361827) @@ -2,7 +2,15 @@ %%HASH%%bin/csscompress %%HASH%%bin/cssclean %%HASH%%bin/cssconvert +@owner %%DSPAM_OWNER%% +@group %%DSPAM_GROUP%% +@mode %%DSPAM_MODE%% bin/dspam +@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F +@exec chmod %%DSPAM_MODE%% %D/%F +@mode +@group wheel +@owner root bin/dspamc bin/dspam_2sql bin/dspam_admin From owner-svn-ports-branches@FreeBSD.ORG Wed Jul 16 20:17:33 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E4091D2B; Wed, 16 Jul 2014 20:17:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7ABF2EB6; Wed, 16 Jul 2014 20:17:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6GKHX3A084244; Wed, 16 Jul 2014 20:17:33 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6GKHXUF084242; Wed, 16 Jul 2014 20:17:33 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407162017.s6GKHXUF084242@svn.freebsd.org> From: Raphael Kubo da Costa Date: Wed, 16 Jul 2014 20:17:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r362105 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jul 2014 20:17:34 -0000 Author: rakuco Date: Wed Jul 16 20:17:33 2014 New Revision: 362105 URL: http://svnweb.freebsd.org/changeset/ports/362105 QAT: https://qat.redports.org/buildarchive/r362105/ Log: MFH: r362103 Document x11/kdelibs4 vulnerability. Approved by: portmgr (erwin) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Wed Jul 16 20:13:17 2014 (r362104) +++ branches/2014Q3/security/vuxml/vuln.xml Wed Jul 16 20:17:33 2014 (r362105) @@ -57,6 +57,40 @@ Notes: --> + + kdelibs4 -- KMail/KIO POP3 SSL Man-in-the-middle Flaw + + + kdelibs + 4.10.954.12.5_2 + + + + +

Richard J. Moore reports:

+
+

The POP3 kioslave used by KMail will accept invalid + certificates without presenting a dialog to the user due a + bug that leads to an inability to display the dialog + combined with an error in the way the result is checked.

+

This flaw allows an active attacker to perform MITM + attacks against the ioslave which could result in the leakage of + sensitive data such as the authentication details and the contents of + emails.

+
+ +
+ + CVE-2014-3494 + 68113 + http://lists.kde.org/?l=kde-announce&m=140312275318160&w=2 + + + 2014-06-17 + 2014-07-16 + +
+ postfixadmin -- SQL injection vulnerability From owner-svn-ports-branches@FreeBSD.ORG Wed Jul 16 20:18:48 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B861E1D; Wed, 16 Jul 2014 20:18:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC53B2EC5; Wed, 16 Jul 2014 20:18:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6GKIlXA084544; Wed, 16 Jul 2014 20:18:47 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6GKIlVJ084540; Wed, 16 Jul 2014 20:18:47 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407162018.s6GKIlVJ084540@svn.freebsd.org> From: Raphael Kubo da Costa Date: Wed, 16 Jul 2014 20:18:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r362106 - in branches/2014Q3/x11/kdelibs4: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jul 2014 20:18:48 -0000 Author: rakuco Date: Wed Jul 16 20:18:47 2014 New Revision: 362106 URL: http://svnweb.freebsd.org/changeset/ports/362106 QAT: https://qat.redports.org/buildarchive/r362106/ Log: MFH: r362104 Add patch to fix a SSL MITM vulnerability in the POP3 ioslave. Security: 4a114331-0d24-11e4-8dd2-5453ed2e2b49 Approved by: portmgr (erwin) Added: branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-3494 - copied unchanged from r362104, head/x11/kdelibs4/files/patch-CVE-2014-3494 Modified: branches/2014Q3/x11/kdelibs4/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/x11/kdelibs4/Makefile ============================================================================== --- branches/2014Q3/x11/kdelibs4/Makefile Wed Jul 16 20:17:33 2014 (r362105) +++ branches/2014Q3/x11/kdelibs4/Makefile Wed Jul 16 20:18:47 2014 (r362106) @@ -3,7 +3,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Copied: branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-3494 (from r362104, head/x11/kdelibs4/files/patch-CVE-2014-3494) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-3494 Wed Jul 16 20:18:47 2014 (r362106, copy of r362104, head/x11/kdelibs4/files/patch-CVE-2014-3494) @@ -0,0 +1,56 @@ +From: David Faure +Date: Wed, 18 Jun 2014 18:29:04 +0000 +Subject: Don't require a job to handle messageboxes. +X-Git-Tag: v4.13.3 +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d +--- +Don't require a job to handle messageboxes. + +The POP3 ioslave doesn't have a job when it gets here. +--- + + +--- kio/kio/usernotificationhandler.cpp ++++ kio/kio/usernotificationhandler.cpp +@@ -19,7 +19,7 @@ + #include "usernotificationhandler_p.h" + + #include "slave.h" +-#include "job_p.h" ++#include "jobuidelegate.h" + + #include + +@@ -76,19 +76,18 @@ + + if (m_cachedResults.contains(key)) { + result = *(m_cachedResults[key]); +- } else if (r->slave->job()) { +- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); +- if (jobPrivate) { +- result = jobPrivate->requestMessageBox(r->type, +- r->data.value(MSG_TEXT).toString(), +- r->data.value(MSG_CAPTION).toString(), +- r->data.value(MSG_YES_BUTTON_TEXT).toString(), +- r->data.value(MSG_NO_BUTTON_TEXT).toString(), +- r->data.value(MSG_YES_BUTTON_ICON).toString(), +- r->data.value(MSG_NO_BUTTON_ICON).toString(), +- r->data.value(MSG_DONT_ASK_AGAIN).toString(), +- r->data.value(MSG_META_DATA).toMap()); +- } ++ } else { ++ JobUiDelegate ui; ++ const JobUiDelegate::MessageBoxType type = static_cast(r->type); ++ result = ui.requestMessageBox(type, ++ r->data.value(MSG_TEXT).toString(), ++ r->data.value(MSG_CAPTION).toString(), ++ r->data.value(MSG_YES_BUTTON_TEXT).toString(), ++ r->data.value(MSG_NO_BUTTON_TEXT).toString(), ++ r->data.value(MSG_YES_BUTTON_ICON).toString(), ++ r->data.value(MSG_NO_BUTTON_ICON).toString(), ++ r->data.value(MSG_DONT_ASK_AGAIN).toString(), ++ r->data.value(MSG_META_DATA).toMap()); + m_cachedResults.insert(key, new int(result)); + } + } else { +