From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 01:37:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4AE71B80; Sun, 14 Dec 2014 01:37: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 36DC3300; Sun, 14 Dec 2014 01:37:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBE1baLU030829; Sun, 14 Dec 2014 01:37:36 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBE1bZBs030826; Sun, 14 Dec 2014 01:37:35 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201412140137.sBE1bZBs030826@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 14 Dec 2014 01:37:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374691 - head/net/dhcpcd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 01:37:36 -0000 Author: danilo Date: Sun Dec 14 01:37:34 2014 New Revision: 374691 URL: https://svnweb.freebsd.org/changeset/ports/374691 QAT: https://qat.redports.org/buildarchive/r374691/ Log: - Update to 6.6.5 PR: 195849 Submitted by: roy@marples.name (maintainer) Modified: head/net/dhcpcd/Makefile head/net/dhcpcd/distinfo Modified: head/net/dhcpcd/Makefile ============================================================================== --- head/net/dhcpcd/Makefile Sat Dec 13 23:17:44 2014 (r374690) +++ head/net/dhcpcd/Makefile Sun Dec 14 01:37:34 2014 (r374691) @@ -2,9 +2,11 @@ # $FreeBSD$ PORTNAME= dhcpcd -PORTVERSION= 6.5.1 +PORTVERSION= 6.6.5 CATEGORIES= net MASTER_SITES= http://roy.marples.name/downloads/dhcpcd/ \ + http://roy.aydogan.net/dhcpcd/ \ + http://cflags.cc/roy/dhcpcd/ \ LOCAL/delphij MAINTAINER= roy@marples.name Modified: head/net/dhcpcd/distinfo ============================================================================== --- head/net/dhcpcd/distinfo Sat Dec 13 23:17:44 2014 (r374690) +++ head/net/dhcpcd/distinfo Sun Dec 14 01:37:34 2014 (r374691) @@ -1,2 +1,2 @@ -SHA256 (dhcpcd-6.5.1.tar.bz2) = 37d3860a3787b656ae2d1a64855e2dede4460956b979304c14192ada3b550e78 -SIZE (dhcpcd-6.5.1.tar.bz2) = 156068 +SHA256 (dhcpcd-6.6.5.tar.bz2) = 62efd1c7fa162f7277b8a09089065f726e5d4dd45f426bb5db06e879e068bbe0 +SIZE (dhcpcd-6.6.5.tar.bz2) = 157743 From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 02:07:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5BEA3121; Sun, 14 Dec 2014 02:07: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 2E4387E7; Sun, 14 Dec 2014 02:07:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBE27sCx045320; Sun, 14 Dec 2014 02:07:54 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBE27rgA045317; Sun, 14 Dec 2014 02:07:53 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201412140207.sBE27rgA045317@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 14 Dec 2014 02:07:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374692 - head/cad/elmerfem X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 02:07:54 -0000 Author: danilo Date: Sun Dec 14 02:07:52 2014 New Revision: 374692 URL: https://svnweb.freebsd.org/changeset/ports/374692 QAT: https://qat.redports.org/buildarchive/r374692/ Log: - Update to 7.0.20141202 PR: 195789 Submitted by: pfg@ (maintainer) Modified: head/cad/elmerfem/Makefile head/cad/elmerfem/distinfo head/cad/elmerfem/pkg-plist Modified: head/cad/elmerfem/Makefile ============================================================================== --- head/cad/elmerfem/Makefile Sun Dec 14 01:37:34 2014 (r374691) +++ head/cad/elmerfem/Makefile Sun Dec 14 02:07:52 2014 (r374692) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= elmerfem -PORTVERSION= 7.0.20141015 +PORTVERSION= 7.0.20141202 CATEGORIES= cad science MAINTAINER= pfg@FreeBSD.org @@ -18,7 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= ElmerCSC GH_PROJECT= elmerfem GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= 539967a +GH_COMMIT= 0300707 USES= cmake fortran gmake tcl Modified: head/cad/elmerfem/distinfo ============================================================================== --- head/cad/elmerfem/distinfo Sun Dec 14 01:37:34 2014 (r374691) +++ head/cad/elmerfem/distinfo Sun Dec 14 02:07:52 2014 (r374692) @@ -1,2 +1,2 @@ -SHA256 (elmerfem-7.0.20141015.tar.gz) = c339f9c1c9602478d064fadd53338a34645557b96d3cae0cbf0315ba7f24b7a3 -SIZE (elmerfem-7.0.20141015.tar.gz) = 42958413 +SHA256 (elmerfem-7.0.20141202.tar.gz) = f42a395ad021425ffb6bc8f513682d402c5ee31dfc45aed77b377a141f376a2b +SIZE (elmerfem-7.0.20141202.tar.gz) = 43339062 Modified: head/cad/elmerfem/pkg-plist ============================================================================== --- head/cad/elmerfem/pkg-plist Sun Dec 14 01:37:34 2014 (r374691) +++ head/cad/elmerfem/pkg-plist Sun Dec 14 02:07:52 2014 (r374692) @@ -20,6 +20,7 @@ share/elmersolver/include/bandmatrix.mod share/elmersolver/include/bandwidthoptimize.mod share/elmersolver/include/binio.mod share/elmersolver/include/blocksolve.mod +share/elmersolver/include/blowers.mod share/elmersolver/include/clusteringmethods.mod share/elmersolver/include/coordinatesystems.mod share/elmersolver/include/crsmatrix.mod @@ -93,6 +94,7 @@ share/elmersolver/include/statelecbounda share/elmersolver/include/stressgeneral.mod share/elmersolver/include/stresslocal.mod share/elmersolver/include/timeintegrate.mod +share/elmersolver/include/toroidcurrents.mod share/elmersolver/include/types.mod share/elmersolver/include/viewfactorglobals.mod share/elmersolver/include/vtklegacyfile.mod From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 08:59:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 947F9605; Sun, 14 Dec 2014 08:59: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 7EC2FE38; Sun, 14 Dec 2014 08:59:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBE8xEph044747; Sun, 14 Dec 2014 08:59:14 GMT (envelope-from mva@FreeBSD.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBE8xE6d044746; Sun, 14 Dec 2014 08:59:14 GMT (envelope-from mva@FreeBSD.org) Message-Id: <201412140859.sBE8xE6d044746@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mva set sender to mva@FreeBSD.org using -f From: Marcus von Appen Date: Sun, 14 Dec 2014 08:59:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374693 - branches/2014Q4/graphics/blender/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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 08:59:14 -0000 Author: mva Date: Sun Dec 14 08:59:13 2014 New Revision: 374693 URL: https://svnweb.freebsd.org/changeset/ports/374693 QAT: https://qat.redports.org/buildarchive/r374693/ Log: MFH: r374641 - Unbreak after the recent print/freetype2 update Approved by: ports-secteam (rea@) Added: branches/2014Q4/graphics/blender/files/patch-source_blender_blenfont_intern_blf__glyph.c (contents, props changed) Added: branches/2014Q4/graphics/blender/files/patch-source_blender_blenfont_intern_blf__glyph.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/graphics/blender/files/patch-source_blender_blenfont_intern_blf__glyph.c Sun Dec 14 08:59:13 2014 (r374693) @@ -0,0 +1,13 @@ +--- source/blender/blenfont/intern/blf_glyph.c.orig 2014-12-11 06:47:44 UTC ++++ source/blender/blenfont/intern/blf_glyph.c +@@ -262,8 +262,8 @@ GlyphBLF *blf_glyph_add(FontBLF *font, u + g->xoff = -1; + g->yoff = -1; + bitmap = slot->bitmap; +- g->width = bitmap.width; +- g->height = bitmap.rows; ++ g->width = (int)bitmap.width; ++ g->height = (int)bitmap.rows; + + if (g->width && g->height) { + if (sharp) { From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 09:45:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 43B45BF7; Sun, 14 Dec 2014 09:45: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 23992265; Sun, 14 Dec 2014 09:45:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBE9jA06068969; Sun, 14 Dec 2014 09:45:10 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBE9j9cL068968; Sun, 14 Dec 2014 09:45:09 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201412140945.sBE9j9cL068968@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 14 Dec 2014 09:45:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374694 - head/security/vuxml X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 09:45:10 -0000 Author: danfe Date: Sun Dec 14 09:45:08 2014 New Revision: 374694 URL: https://svnweb.freebsd.org/changeset/ports/374694 QAT: https://qat.redports.org/buildarchive/r374694/ Log: The GLX indirect rendering support supplied on NVIDIA products is subject to the recently disclosed X.Org vulnerabilities (CVE-2014-8093, CVE-2014-8098) as well as internally identified vulnerabilities (CVE-2014-8298). Modified: head/security/vuxml/vuln.xml Modified: head/security/vuxml/vuln.xml ============================================================================== --- head/security/vuxml/vuln.xml Sun Dec 14 08:59:13 2014 (r374693) +++ head/security/vuxml/vuln.xml Sun Dec 14 09:45:08 2014 (r374694) @@ -40,7 +40,7 @@ QUICK GUIDE TO ADDING A NEW ENTRY 4. fix any errors 5. profit! -Addtional tests can be done this way: +Additional tests can be done this way: $ env PKG_DBDIR=/usr/ports/security/vuxml pkg audit py26-django-1.6 $ env PKG_DBDIR=/usr/ports/security/vuxml pkg audit py27-django-1.6.1 @@ -57,6 +57,60 @@ Notes: --> + + NVIDIA UNIX driver -- remote denial of service or arbitrary code execution + + + nvidia-driver + 340.65 + + + nvidia-driver-304 + 304.125 + + + nvidia-driver-173 + 173.14.35_3 + + + nvidia-driver-96 + 96.43.23_2 + + + nvidia-driver-71 + 71.86.15_4 + + + + +

NVIDIA Unix security team reports:

+
+

The GLX indirect rendering support supplied on NVIDIA products + is subject to the recently disclosed X.Org vulnerabilities + (CVE-2014-8093, CVE-2014-8098) as well as internally identified + vulnerabilities (CVE-2014-8298).

+

Depending on how it is configured, the X server typically runs + with raised privileges, and listens for GLX indirect rendering + protocol requests from a local socket and potentially a TCP/IP + port. The vulnerabilities could be exploited in a way that + causes the X server to access uninitialized memory or overwrite + arbitrary memory in the X server process. This can cause a + denial of service (e.g., an X server segmentation fault), or + could be exploited to achieve arbitrary code execution.

+
+ + + + CVE-2014-8298 + CVE-2014-8093 + CVE-2014-8098 + + + 2014-12-03 + 2014-12-14 + + + bind -- denial of service vulnerability From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 09:51:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3930AD17; Sun, 14 Dec 2014 09:51: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 23FC233F; Sun, 14 Dec 2014 09:51:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBE9pCgG071812; Sun, 14 Dec 2014 09:51:12 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBE9pBkp071809; Sun, 14 Dec 2014 09:51:11 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201412140951.sBE9pBkp071809@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 14 Dec 2014 09:51:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374695 - in head/x11: nvidia-driver nvidia-driver-304 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 09:51:12 -0000 Author: danfe Date: Sun Dec 14 09:51:10 2014 New Revision: 374695 URL: https://svnweb.freebsd.org/changeset/ports/374695 QAT: https://qat.redports.org/buildarchive/r374695/ Log: Update NVidia drivers (long lived branch and legacy 304.xx branch) to their most recent versions that have CVE-2014-8298 vulnerability fixed. Security: fdf72a0e-8371-11e4-bc20-001636d274f3 Modified: head/x11/nvidia-driver-304/Makefile head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/distinfo Modified: head/x11/nvidia-driver-304/Makefile ============================================================================== --- head/x11/nvidia-driver-304/Makefile Sun Dec 14 09:45:08 2014 (r374694) +++ head/x11/nvidia-driver-304/Makefile Sun Dec 14 09:51:10 2014 (r374695) @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ -DISTVERSION= 304.123 +DISTVERSION= 304.125 # Explicitly set PORTREVISION as it can be overridden by the master port PORTREVISION= 0 Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Sun Dec 14 09:45:08 2014 (r374694) +++ head/x11/nvidia-driver/Makefile Sun Dec 14 09:51:10 2014 (r374695) @@ -11,9 +11,9 @@ # or `x11/nvidia-driver-304' slave ports. PORTNAME= nvidia-driver -DISTVERSION?= 340.46 +DISTVERSION?= 340.65 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_NVIDIA} # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION Modified: head/x11/nvidia-driver/distinfo ============================================================================== --- head/x11/nvidia-driver/distinfo Sun Dec 14 09:45:08 2014 (r374694) +++ head/x11/nvidia-driver/distinfo Sun Dec 14 09:51:10 2014 (r374695) @@ -1,11 +1,11 @@ -SHA256 (NVIDIA-FreeBSD-x86_64-340.46.tar.gz) = 699a65b5184f8705ba4ddbefb5776136bec98619ea00af3304725e5e028b7346 -SIZE (NVIDIA-FreeBSD-x86_64-340.46.tar.gz) = 59835566 -SHA256 (NVIDIA-FreeBSD-x86-340.46.tar.gz) = 5aa4ec5f9ca4425cd3fdc47ac19c76900cecae8a9606632a8063514481363571 -SIZE (NVIDIA-FreeBSD-x86-340.46.tar.gz) = 59013852 -SHA256 (NVIDIA-FreeBSD-x86_64-304.123.tar.gz) = 32ea8ce22b4fe50f59782c390b8ec1d90bb44e02787255476f0304c60f11e877 -SIZE (NVIDIA-FreeBSD-x86_64-304.123.tar.gz) = 35144064 -SHA256 (NVIDIA-FreeBSD-x86-304.123.tar.gz) = 7e4433364c5f42de6611b8cf722e0073eae6763a6664d6b9fd652ef05ebee24b -SIZE (NVIDIA-FreeBSD-x86-304.123.tar.gz) = 34160879 +SHA256 (NVIDIA-FreeBSD-x86_64-340.65.tar.gz) = b613d806d02686bd61b6dcbed1ba29f63a009a504a2a59094208328aac08a029 +SIZE (NVIDIA-FreeBSD-x86_64-340.65.tar.gz) = 60204269 +SHA256 (NVIDIA-FreeBSD-x86-340.65.tar.gz) = e8b5df30c4c2fd7b715d143dca987894bf4d3c28e43132c0cd02143cc0d96d5a +SIZE (NVIDIA-FreeBSD-x86-340.65.tar.gz) = 59368245 +SHA256 (NVIDIA-FreeBSD-x86_64-304.125.tar.gz) = 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d +SIZE (NVIDIA-FreeBSD-x86_64-304.125.tar.gz) = 35498616 +SHA256 (NVIDIA-FreeBSD-x86-304.125.tar.gz) = 806d0bff9d394390b3a257472bc342857f150e9dba6673e6b930f47a93ec0269 +SIZE (NVIDIA-FreeBSD-x86-304.125.tar.gz) = 34494889 SHA256 (NVIDIA-FreeBSD-x86-173.14.35.tar.gz) = 51e82a12db81b5af4ae5ee59612875c0dbef52cb641d61a44c72f2e1cd7f4c78 SIZE (NVIDIA-FreeBSD-x86-173.14.35.tar.gz) = 18748428 SHA256 (NVIDIA-FreeBSD-x86-96.43.23.tar.gz) = 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 11:08:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F4FCF0F; Sun, 14 Dec 2014 11:08: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 5AA8AB67; Sun, 14 Dec 2014 11:08:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEB8QbG008642; Sun, 14 Dec 2014 11:08:26 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEB8QKD008641; Sun, 14 Dec 2014 11:08:26 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201412141108.sBEB8QKD008641@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 14 Dec 2014 11:08:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374696 - head/x11/nvidia-driver X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 11:08:26 -0000 Author: danfe Date: Sun Dec 14 11:08:25 2014 New Revision: 374696 URL: https://svnweb.freebsd.org/changeset/ports/374696 QAT: https://qat.redports.org/buildarchive/r374696/ Log: Adjust version check to unbreak the build of 304.xx branch. Reported by: Walter Schwarzenfeld Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Sun Dec 14 09:51:10 2014 (r374695) +++ head/x11/nvidia-driver/Makefile Sun Dec 14 11:08:25 2014 (r374696) @@ -77,7 +77,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- ${FILESDIR}/extra-patch-src-nv-misc.h .endif -.if ${NVVERSION} >= 331.020 +.if ${NVVERSION} >= 304.125 # 331.020 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11-driver-Makefile .else EXTRA_PATCHES+= ${FILESDIR}/legacy-patch-x11-driver-Makefile From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 11:21:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53B44152; Sun, 14 Dec 2014 11:21: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 24820CCA; Sun, 14 Dec 2014 11:21:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEBLt8o017494; Sun, 14 Dec 2014 11:21:55 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEBLsvP017491; Sun, 14 Dec 2014 11:21:54 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201412141121.sBEBLsvP017491@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 14 Dec 2014 11:21:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374697 - in head/x11: nvidia-driver-173 nvidia-driver-71 nvidia-driver-96 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 11:21:55 -0000 Author: danfe Date: Sun Dec 14 11:21:53 2014 New Revision: 374697 URL: https://svnweb.freebsd.org/changeset/ports/374697 QAT: https://qat.redports.org/buildarchive/r374697/ Log: Mark legacy branches -173, -96, and -71 as FORBIDDEN: they are unsupported by NVidia and no security updates for them were issued to fix CVE-2014-8298. Security: fdf72a0e-8371-11e4-bc20-001636d274f3 Modified: head/x11/nvidia-driver-173/Makefile head/x11/nvidia-driver-71/Makefile head/x11/nvidia-driver-96/Makefile Modified: head/x11/nvidia-driver-173/Makefile ============================================================================== --- head/x11/nvidia-driver-173/Makefile Sun Dec 14 11:08:25 2014 (r374696) +++ head/x11/nvidia-driver-173/Makefile Sun Dec 14 11:21:53 2014 (r374697) @@ -8,4 +8,6 @@ PORTREVISION= 3 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -173 +FORBIDDEN= vulnerable to denial of service or arbitrary code execution (CVE-2014-8298) + .include "${MASTERDIR}/Makefile" Modified: head/x11/nvidia-driver-71/Makefile ============================================================================== --- head/x11/nvidia-driver-71/Makefile Sun Dec 14 11:08:25 2014 (r374696) +++ head/x11/nvidia-driver-71/Makefile Sun Dec 14 11:21:53 2014 (r374697) @@ -8,4 +8,6 @@ PORTREVISION= 4 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -71 +FORBIDDEN= vulnerable to denial of service or arbitrary code execution (CVE-2014-8298) + .include "${MASTERDIR}/Makefile" Modified: head/x11/nvidia-driver-96/Makefile ============================================================================== --- head/x11/nvidia-driver-96/Makefile Sun Dec 14 11:08:25 2014 (r374696) +++ head/x11/nvidia-driver-96/Makefile Sun Dec 14 11:21:53 2014 (r374697) @@ -8,4 +8,6 @@ PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -96 +FORBIDDEN= vulnerable to denial of service or arbitrary code execution (CVE-2014-8298) + .include "${MASTERDIR}/Makefile" From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 11:42:44 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1033) id 535382FE; Sun, 14 Dec 2014 11:42:44 +0000 (UTC) Date: Sun, 14 Dec 2014 11:42:44 +0000 From: Alexey Dokuchaev To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Forbidden due to CVE-2014-8298: nvidia-driver-173, nvidia-driver-96, nvidia-driver-71 Message-ID: <20141214114244.GA2487@FreeBSD.org> References: <201412141121.sBEBLsvP017491@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201412141121.sBEBLsvP017491@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: x11@FreeBSD.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 11:42:44 -0000 On Sun, Dec 14, 2014 at 11:21:54AM +0000, Alexey Dokuchaev wrote: > New Revision: 374697 > URL: https://svnweb.freebsd.org/changeset/ports/374697 > QAT: https://qat.redports.org/buildarchive/r374697/ > > Log: > Mark legacy branches -173, -96, and -71 as FORBIDDEN: they are > unsupported by NVidia and no security updates for them were issued > to fix CVE-2014-8298. > > Security: fdf72a0e-8371-11e4-bc20-001636d274f3 I've marked these ports FORBIDDEN for now, but their fate yet to be decided. Last update to -173 legacy branch, 173.14.39 added support for X.org xserver ABI 15 (xorg-server 1.15), and it was confirmed to work with upcoming v1.14 update (PR 195781), so it would be unfortunate to lose it just because NVidia does not care about it anymore and won't provide a fix CVE-2014-8298. On the other hand, NVidia did provide mitigation techniques: - Configure the X server to prohibit X connections from the local area network (by passing the "-nolisten tcp" command line option to the X.Org X server) -- which we also default to, or - Disable GLX indirect contexts. With any of the fixed NVIDIA driver versions mentioned above, indirect GLX contexts can be prohibited by setting the "AllowIndirectGLXProtocol" X configuration option to False, or setting the "-iglx" X server command line option on X.Org 1.16 or newer. So perhaps instead of forbidding them and subsequently removing, we can provide pkg-message that tells users what are they facing and how to stay safe (with an legal bla-bla about that FreeBSD cannot guarantee anything if you use this vulnerable, unmaintained upstream port)? I wonder what other people think. ./danfe From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 11:44:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD4A141B; Sun, 14 Dec 2014 11:44: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 97849E5A; Sun, 14 Dec 2014 11:44:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEBiQcg027596; Sun, 14 Dec 2014 11:44:26 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEBiP3H027590; Sun, 14 Dec 2014 11:44:25 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412141144.sBEBiP3H027590@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 14 Dec 2014 11:44:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374698 - in head: Mk security/krb5 security/krb5-111 security/krb5-112 security/krb5-appl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 11:44:26 -0000 Author: antoine Date: Sun Dec 14 11:44:24 2014 New Revision: 374698 URL: https://svnweb.freebsd.org/changeset/ports/374698 QAT: https://qat.redports.org/buildarchive/r374698/ Log: - Remove support for EXTRACT_PRESERVE_OWNERSHIP - Update a few comments related to extract Differential Revision: https://reviews.freebsd.org/D1189 With hat: portmgr Modified: head/Mk/bsd.port.mk head/security/krb5-111/Makefile head/security/krb5-112/Makefile head/security/krb5-appl/Makefile head/security/krb5/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Dec 14 11:21:53 2014 (r374697) +++ head/Mk/bsd.port.mk Sun Dec 14 11:44:24 2014 (r374698) @@ -768,19 +768,14 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # # For extract: # -# EXTRACT_CMD - Command for extracting archive: "bzip2" if USE_BZIP2 -# is set, "gzip" otherwise. +# EXTRACT_CMD - Command for extracting archive +# Default: ${TAR} # EXTRACT_BEFORE_ARGS # - Arguments to ${EXTRACT_CMD} before filename. -# Default: "-dc" +# Default: "-xf" # EXTRACT_AFTER_ARGS # - Arguments to ${EXTRACT_CMD} following filename. -# default: "| tar -xf -" -# EXTRACT_PRESERVE_OWNERSHIP -# - Normally, when run as "root", the extract stage will -# change the owner and group of all files under ${WRKDIR} -# to 0:0. Set this variable if you want to turn off this -# feature. +# Default: "--no-same-owner --no-same-permissions" # For patch: # # EXTRA_PATCHES - Define this variable if you have patches not in @@ -2155,11 +2150,7 @@ TAR?= /usr/bin/tar # EXTRACT_SUFX is defined in .pre.mk section EXTRACT_CMD?= ${TAR} EXTRACT_BEFORE_ARGS?= -xf -.if defined(EXTRACT_PRESERVE_OWNERSHIP) -EXTRACT_AFTER_ARGS?= -.else EXTRACT_AFTER_ARGS?= --no-same-owner --no-same-permissions -.endif # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) @@ -3319,13 +3310,11 @@ do-extract: exit 1; \ fi; \ done -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) @if [ ${UID} = 0 ]; then \ ${CHMOD} -R ug-s ${WRKDIR}; \ ${CHOWN} -R 0:0 ${WRKDIR}; \ fi .endif -.endif # Patch Modified: head/security/krb5-111/Makefile ============================================================================== --- head/security/krb5-111/Makefile Sun Dec 14 11:21:53 2014 (r374697) +++ head/security/krb5-111/Makefile Sun Dec 14 11:44:24 2014 (r374698) @@ -81,14 +81,8 @@ PDF_DOC_DIR= ${WRKDIR}/krb5-${PORTVERSI CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/krb5-${PORTVERSION}.tar.gz + @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/krb5-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/krb5-${PORTVERSION}.tar.gz ${WRKDIR}/krb5-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/krb5-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/krb5-${PORTVERSION}; \ - fi -.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 Modified: head/security/krb5-112/Makefile ============================================================================== --- head/security/krb5-112/Makefile Sun Dec 14 11:21:53 2014 (r374697) +++ head/security/krb5-112/Makefile Sun Dec 14 11:44:24 2014 (r374698) @@ -87,14 +87,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PO CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz + @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - fi -.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 Modified: head/security/krb5-appl/Makefile ============================================================================== --- head/security/krb5-appl/Makefile Sun Dec 14 11:21:53 2014 (r374697) +++ head/security/krb5-appl/Makefile Sun Dec 14 11:44:24 2014 (r374698) @@ -124,14 +124,8 @@ HTML_DOCS= ftp.html kdestroy.html kinit CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz + @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - fi -.endif post-install: @${ECHO} "------------------------------------------------------" Modified: head/security/krb5/Makefile ============================================================================== --- head/security/krb5/Makefile Sun Dec 14 11:21:53 2014 (r374697) +++ head/security/krb5/Makefile Sun Dec 14 11:44:24 2014 (r374698) @@ -85,14 +85,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PO CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz + @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - fi -.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 12:03:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 67FE47B5; Sun, 14 Dec 2014 12:03: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 486A48B; Sun, 14 Dec 2014 12:03:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEC3f4E037419; Sun, 14 Dec 2014 12:03:41 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEC3drf037409; Sun, 14 Dec 2014 12:03:39 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201412141203.sBEC3drf037409@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sun, 14 Dec 2014 12:03:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374699 - in head/math: . gnuplot gnuplot-tex-extras gnuplot/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 12:03:41 -0000 Author: hrs Date: Sun Dec 14 12:03:38 2014 New Revision: 374699 URL: https://svnweb.freebsd.org/changeset/ports/374699 QAT: https://qat.redports.org/buildarchive/r374699/ Log: - Separate TeX style files from math/gnuplot into math/gnuplot-tex-extras to eliminate huge TeXLive dependency. Note that TeX terminal support is still enabled by default because it works without them. - Add Lua dependency to support TeX/Tikz terminal. Approved by: glewis (maintainer) Added: head/math/gnuplot-tex-extras/ head/math/gnuplot-tex-extras/Makefile (contents, props changed) head/math/gnuplot-tex-extras/distinfo (contents, props changed) head/math/gnuplot-tex-extras/pkg-descr (contents, props changed) Modified: head/math/Makefile head/math/gnuplot/Makefile head/math/gnuplot/files/patch-configure head/math/gnuplot/pkg-plist Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Sun Dec 14 11:44:24 2014 (r374698) +++ head/math/Makefile Sun Dec 14 12:03:38 2014 (r374699) @@ -150,6 +150,7 @@ SUBDIR += gnubc SUBDIR += gnumeric SUBDIR += gnuplot + SUBDIR += gnuplot-tex-extras SUBDIR += goblin SUBDIR += gotoblas SUBDIR += grace Added: head/math/gnuplot-tex-extras/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/gnuplot-tex-extras/Makefile Sun Dec 14 12:03:38 2014 (r374699) @@ -0,0 +1,30 @@ +# $FreeBSD$ + +PORTNAME= gnuplot +PORTVERSION= 4.6.6 +CATEGORIES= math graphics +MASTER_SITES= SF +PKGNAMESUFFIX= -tex-extras + +MAINTAINER= glewis@FreeBSD.org +COMMENT= Extra files for Gnuplot TeX support + +RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot + +USE_TEX= texmf +NO_BUILD= yes +PLIST_FILES= ${TEX_FILES:S,^,${TEX_DIR}/,} + +TEX_DIR= ${LOCALBASE}/${TEXMFDIR}/tex/latex/gnuplot +TEX_FILES= gnuplot-lua-tikz.sty \ + gnuplot-lua-tikz-common.tex \ + gnuplot-lua-tikz.tex \ + t-gnuplot-lua-tikz.tex \ + gnuplot.cfg + +do-install: + @${MKDIR} ${STAGEDIR}${TEX_DIR} + cd ${WRKSRC}/share/LaTeX && ${INSTALL_DATA} ${TEX_FILES} \ + ${STAGEDIR}${TEX_DIR} + +.include Added: head/math/gnuplot-tex-extras/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/gnuplot-tex-extras/distinfo Sun Dec 14 12:03:38 2014 (r374699) @@ -0,0 +1,2 @@ +SHA256 (gnuplot-4.6.6.tar.gz) = 1f19596fd09045f22225afbfec11fa91b9ad1d95b9f48406362f517d4f130274 +SIZE (gnuplot-4.6.6.tar.gz) = 5059214 Added: head/math/gnuplot-tex-extras/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/gnuplot-tex-extras/pkg-descr Sun Dec 14 12:03:38 2014 (r374699) @@ -0,0 +1,10 @@ +Gnuplot is a portable multi-platform command-line driven graphing utility. It +was originally created to allow scientists and students to visualize +mathematical functions and data interactively, but has grown to support many +non-interactive uses such as web scripting. It is also used as a plotting engine +by third-party applications like Octave. Gnuplot has been supported and under +active development since 1986. + +This port installs extra files for TeX terminals (latex, epslatex, Tikz, etc). + +WWW: http://www.gnuplot.info/ Modified: head/math/gnuplot/Makefile ============================================================================== --- head/math/gnuplot/Makefile Sun Dec 14 11:44:24 2014 (r374698) +++ head/math/gnuplot/Makefile Sun Dec 14 12:03:38 2014 (r374699) @@ -2,32 +2,39 @@ PORTNAME= gnuplot PORTVERSION= 4.6.6 +PORTREVISION= 1 CATEGORIES= math graphics MASTER_SITES= SF MAINTAINER= glewis@FreeBSD.org COMMENT= Command-line driven graphing utility -USES= iconv +USES= iconv lua +USE_TEX= kpathsea GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} +CONFIGURE_ENV= LUA_VER="${LUA_VER}" CONFIGURE_ARGS+=--with-lasergnu \ --with-readline=gnu \ + --with-kpsexpand \ --without-linux-vga \ --without-lisp-files \ --without-tutorial \ - --with-bitmap-terminals + --with-bitmap-terminals \ + --with-latex \ + ac_cv_prog_PLAINTEX=${LOCALBASE}/bin/tex \ + ac_cv_prog_LATEX=${LOCALBASE}/bin/latex \ + ac_cv_prog_PDFLATEX=${LOCALBASE}/bin/pdflatex PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= CAIRO DOCS EXAMPLES GD GRIDBOX PDF PLOT TEX THINSPLINES WX X11 +OPTIONS_DEFINE= CAIRO DOCS EXAMPLES GD GRIDBOX PDF PLOT THINSPLINES WX X11 GRIDBOX_DESC= Use the gridbox optimization for hidden3d PLOT_DESC= Enable plot support -TEX_DESC= Search kpsexpand at run-time THINSPLINES_DESC= Enable thin plate splines for grids in dgrid3d WX_DESC= wxWidgets (formerly wxWindows) support -OPTIONS_DEFAULT=CAIRO GD PLOT TEX WX X11 +OPTIONS_DEFAULT=CAIRO GD PLOT WX X11 OPTIONS_SUB= yes CAIRO_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo @@ -49,11 +56,6 @@ PLOT_LIB_DEPENDS= libplot.so:${PORTSDIR} PLOT_CONFIGURE_ON= --with-plot=${LOCALBASE} PLOT_CONFIGURE_OFF= --without-plot -TEX_USE= TEX=base,texmf,latex,dvipsk -TEX_CONFIGURE_ON= --with-kpsexpand \ - --with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot -TEX_CONFIGURE_OFF= --without-kpexpand - THINSPLINES_CONFIGURE_ENABLE= thin-splines X11_USE= XORG=x11 @@ -71,13 +73,10 @@ CONFIGURE_ARGS+= --disable-wxwidgets .endif post-patch: -.if ! ${PORT_OPTIONS:MTEX} @${REINPLACE_CMD} -e \ '/^install:/s/install-am//' ${WRKSRC}/share/LaTeX/Makefile.in -.endif @${REINPLACE_CMD} -e \ 's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in - @${FIND} "${WRKSRC}" -name '*.orig' -delete .if ${PORT_OPTIONS:MDOCS} post-build: Modified: head/math/gnuplot/files/patch-configure ============================================================================== --- head/math/gnuplot/files/patch-configure Sun Dec 14 11:44:24 2014 (r374698) +++ head/math/gnuplot/files/patch-configure Sun Dec 14 12:03:38 2014 (r374699) @@ -1,6 +1,6 @@ ---- configure.orig -+++ configure -@@ -5919,7 +5919,7 @@ +--- configure.orig 2014-09-22 03:26:10.000000000 +0900 ++++ configure 2014-12-06 14:27:21.000000000 +0900 +@@ -5982,7 +5982,7 @@ fi @@ -9,3 +9,100 @@ then CC=${CC-${host_alias-gcc}} CFLAGS=${CFLAGS-"-g -O2"} +@@ -10844,12 +10844,12 @@ + pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` ++ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-${LUA_VER}" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -10862,12 +10862,12 @@ + pkg_cv_LUA_LIBS="$LUA_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` ++ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-${LUA_VER}" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -10886,9 +10886,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"` ++ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-${LUA_VER}"` + else +- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"` ++ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-${LUA_VER}"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 +@@ -10920,12 +10920,12 @@ + pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` ++ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-${LUA_VER}" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -10938,12 +10938,12 @@ + pkg_cv_LUA_LIBS="$LUA_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` ++ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-${LUA_VER}" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -10962,9 +10962,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"` ++ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-${LUA_VER}"` + else +- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"` ++ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-${LUA_VER}"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LUA_PKG_ERRORS" >&5 +@@ -11024,7 +11024,7 @@ + return 0; + } + _ACEOF +-for ac_lib in '' lua lua5.1; do ++for ac_lib in '' lua lua-${LUA_VER}; do + if test -z "$ac_lib"; then + ac_res="none required" + else Modified: head/math/gnuplot/pkg-plist ============================================================================== --- head/math/gnuplot/pkg-plist Sun Dec 14 11:44:24 2014 (r374698) +++ head/math/gnuplot/pkg-plist Sun Dec 14 12:03:38 2014 (r374699) @@ -38,4 +38,3 @@ man/man1/lasergnu.1.gz %%DATADIR%%/4.6/js/previouszoom.png %%DATADIR%%/4.6/js/textzoom.png %%DATADIR%%/4.6/lua/gnuplot-tikz.lua -%%TEX%%share/texmf/tex/latex/gnuplot/gnuplot.cfg From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 12:25:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA7A1967; Sun, 14 Dec 2014 12:25: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 C6335224; Sun, 14 Dec 2014 12:25:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBECPd1H047383; Sun, 14 Dec 2014 12:25:39 GMT (envelope-from timur@FreeBSD.org) Received: (from timur@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBECPds4047382; Sun, 14 Dec 2014 12:25:39 GMT (envelope-from timur@FreeBSD.org) Message-Id: <201412141225.sBECPds4047382@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: timur set sender to timur@FreeBSD.org using -f From: "Timur I. Bakeyev" Date: Sun, 14 Dec 2014 12:25:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374700 - head/databases/ldb X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 12:25:40 -0000 Author: timur Date: Sun Dec 14 12:25:38 2014 New Revision: 374700 URL: https://svnweb.freebsd.org/changeset/ports/374700 QAT: https://qat.redports.org/buildarchive/r374700/ Log: Fix spelling Modified: head/databases/ldb/Makefile Modified: head/databases/ldb/Makefile ============================================================================== --- head/databases/ldb/Makefile Sun Dec 14 12:03:38 2014 (r374699) +++ head/databases/ldb/Makefile Sun Dec 14 12:25:38 2014 (r374700) @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ DESTDIRNAME= --destdir OPTIONS_DEFINE= MANPAGES -MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) +MANPAGES_DESC= Build and install manpages(requires textproc/docbook-xsl) .include From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 13:12:15 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7048D96; Sun, 14 Dec 2014 13:12: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 B9BD388A; Sun, 14 Dec 2014 13:12:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEDCFM4071180; Sun, 14 Dec 2014 13:12:15 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEDCFdH071178; Sun, 14 Dec 2014 13:12:15 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201412141312.sBEDCFdH071178@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Sun, 14 Dec 2014 13:12:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374701 - in branches/2014Q4/devel/cssc: . 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 13:12:16 -0000 Author: rodrigo Date: Sun Dec 14 13:12:14 2014 New Revision: 374701 URL: https://svnweb.freebsd.org/changeset/ports/374701 QAT: https://qat.redports.org/buildarchive/r374701/ Log: MFH: r374333 Upgrade to 1.4.0 and fix core dumps with clang - Fix Savannah bug #33633 (coredump in prs -d:GB:) - Accept entirely empty comment lines (lacking the initial space). - Fix Savannah bug bug #33153: "prs" includes "AUTO NULL DELTA"s. - NEWS: Point out the change of tar file format used for the distribution file. Also mention the recent updates to googletest and gnulib. - Fix crash when built with clang by forcing gcc - Moves license to makes portlint happy PR: ports/189975 Submitted by: rodrigo Approved by: portmgr Deleted: branches/2014Q4/devel/cssc/files/ Modified: branches/2014Q4/devel/cssc/Makefile branches/2014Q4/devel/cssc/distinfo Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/cssc/Makefile ============================================================================== --- branches/2014Q4/devel/cssc/Makefile Sun Dec 14 12:25:38 2014 (r374700) +++ branches/2014Q4/devel/cssc/Makefile Sun Dec 14 13:12:14 2014 (r374701) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cssc -PORTVERSION= 1.3.0 +PORTVERSION= 1.4.0 CATEGORIES= devel MASTER_SITES= GNU DISTNAME= CSSC-${PORTVERSION} @@ -14,6 +14,7 @@ LICENSE= GPLv3 GNU_CONFIGURE= yes INFO= cssc +USE_GCC= any OPTIONS_DEFINE= BINARY OPTIONS_DEFAULT= BINARY Modified: branches/2014Q4/devel/cssc/distinfo ============================================================================== --- branches/2014Q4/devel/cssc/distinfo Sun Dec 14 12:25:38 2014 (r374700) +++ branches/2014Q4/devel/cssc/distinfo Sun Dec 14 13:12:14 2014 (r374701) @@ -1,2 +1,2 @@ -SHA256 (CSSC-1.3.0.tar.gz) = 95053aab534c111648ea5b096037673b541a0c2960574d8addf70201a5337c2e -SIZE (CSSC-1.3.0.tar.gz) = 1608481 +SHA256 (CSSC-1.4.0.tar.gz) = 30146f96c26c2a4c6b742bc8a498993ec6ea9f289becaaf566866488600b2994 +SIZE (CSSC-1.4.0.tar.gz) = 2012122 From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 13:19:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93F42EC1; Sun, 14 Dec 2014 13:19: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 654E48B3; Sun, 14 Dec 2014 13:19:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEDJ7tV072223; Sun, 14 Dec 2014 13:19:07 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEDJ6jO072221; Sun, 14 Dec 2014 13:19:06 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412141319.sBEDJ6jO072221@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 14 Dec 2014 13:19:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374702 - head/mail/maildrop X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 13:19:07 -0000 Author: madpilot Date: Sun Dec 14 13:19:05 2014 New Revision: 374702 URL: https://svnweb.freebsd.org/changeset/ports/374702 QAT: https://qat.redports.org/buildarchive/r374702/ Log: Update to 2.8.0 With this version the dovecotauth patch has been integrated upstream. Modified: head/mail/maildrop/Makefile head/mail/maildrop/distinfo Modified: head/mail/maildrop/Makefile ============================================================================== --- head/mail/maildrop/Makefile Sun Dec 14 13:12:14 2014 (r374701) +++ head/mail/maildrop/Makefile Sun Dec 14 13:19:05 2014 (r374702) @@ -15,8 +15,7 @@ # MAILDROP_LOG_COLUMNS lenght of 'File:' line in log - 8; default: 72 PORTNAME= maildrop -PORTVERSION= 2.7.2 -PORTREVISION= 1 +PORTVERSION= 2.8.0 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} @@ -76,6 +75,7 @@ GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR} IDN_CONFIGURE_WITH= libidn IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn MAILWRAPPER_CONFIGURE_OFF= --enable-sendmail=/usr/sbin/sendmail +DOVECOTAUTH_CONFIGURE_ENABLE= dovecotauth .include @@ -102,12 +102,6 @@ CONFIGURE_ARGS+= ac_cv_header_fam_h=no a CONFIGURE_ARGS+= --enable-trusted-users="${MAILDROP_TRUSTED_USERS}" .endif -.if ${PORT_OPTIONS:MDOVECOTAUTH} -PATCH_SITES= http://www.madpilot.net/maildrop/ -PATCHFILES= maildrop-2.7.0-dovecotauth.patch.txt -PATCH_DIST_STRIP= -p1 -.endif - post-patch: @${REINPLACE_CMD} -e "s/l= 72 - szbuf.Length();/l= ${MAILDROP_LOG_COLUMNS} - szbuf.Length();/" \ ${WRKSRC}/libs/maildrop/log.C Modified: head/mail/maildrop/distinfo ============================================================================== --- head/mail/maildrop/distinfo Sun Dec 14 13:12:14 2014 (r374701) +++ head/mail/maildrop/distinfo Sun Dec 14 13:19:05 2014 (r374702) @@ -1,4 +1,2 @@ -SHA256 (maildrop-2.7.2.tar.bz2) = d978cba4a6f1f139216f22cf03ee3c878fe2b287c9409024a2d41ef54931a4a6 -SIZE (maildrop-2.7.2.tar.bz2) = 1968673 -SHA256 (maildrop-2.7.0-dovecotauth.patch.txt) = 2987e56071d78dc55ac2ce523fe041dbf6565a90e98410f9fa2219d7434b945b -SIZE (maildrop-2.7.0-dovecotauth.patch.txt) = 22063 +SHA256 (maildrop-2.8.0.tar.bz2) = 28e37051eba909d89a9769556171dde7663a805e69d85e4a7664782b0b3a3c1a +SIZE (maildrop-2.8.0.tar.bz2) = 1989763 From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 13:23:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 890C0FFA; Sun, 14 Dec 2014 13:23: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 5ADC8967; Sun, 14 Dec 2014 13:23:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEDNbhP076376; Sun, 14 Dec 2014 13:23:37 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEDNa82076374; Sun, 14 Dec 2014 13:23:36 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201412141323.sBEDNa82076374@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 14 Dec 2014 13:23:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374703 - in head/astro/celestia: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 13:23:37 -0000 Author: danfe Date: Sun Dec 14 13:23:35 2014 New Revision: 374703 URL: https://svnweb.freebsd.org/changeset/ports/374703 QAT: https://qat.redports.org/buildarchive/r374703/ Log: Pull another patch from Red Hat, to fix a runtime crash: PANIC: unprotected error in call to Lua API (attempt to index a nil value) PR: 195240 Red Hat bug: https://bugzilla.redhat.com/show_bug.cgi?id=1045632 Patch by: Chris Rankin (Comments 13-16) Obtained from: celestia-1.6.1-15.fc20.src.rpm Added: head/astro/celestia/files/celestia-lua-52-fix.patch (contents, props changed) Modified: head/astro/celestia/Makefile Modified: head/astro/celestia/Makefile ============================================================================== --- head/astro/celestia/Makefile Sun Dec 14 13:19:05 2014 (r374702) +++ head/astro/celestia/Makefile Sun Dec 14 13:23:35 2014 (r374703) @@ -3,7 +3,7 @@ PORTNAME= celestia PORTVERSION= 1.6.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/Celestia-source/${PORTVERSION} PKGNAMESUFFIX= -${CELESTIA_UI} @@ -20,6 +20,7 @@ USES= gettext gmake libtool lua pkgconf USE_GL= gl GNU_CONFIGURE= yes EXTRA_PATCHES= ${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \ + ${FILESDIR}/celestia-lua-52-fix.patch:-p1 \ ${FILESDIR}/celestia-1.6.1-gcc47.patch:-p1 \ ${FILESDIR}/celestia-1.6.1-gcc48.patch:-p1 Added: head/astro/celestia/files/celestia-lua-52-fix.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/celestia/files/celestia-lua-52-fix.patch Sun Dec 14 13:23:35 2014 (r374703) @@ -0,0 +1,16 @@ +--- celestia-1.6.1.orig/src/celestia/celx.cpp 2014-02-09 23:23:10.308810741 +0000 ++++ celestia-1.6.1/src/celestia/celx.cpp 2014-02-09 23:24:57.627017784 +0000 +@@ -272,9 +272,13 @@ + const char* name, + lua_CFunction func) + { ++#if LUA_VER >= 0x050200 ++ luaL_requiref(l, name, func, 1); ++#else + lua_pushcfunction(l, func); + lua_pushstring(l, name); + lua_call(l, 1, 0); ++#endif + } + #endif + From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 14:33:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80F52BD3; Sun, 14 Dec 2014 14: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 6D011F6D; Sun, 14 Dec 2014 14:33:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEEXPQO010671; Sun, 14 Dec 2014 14:33:25 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEEXPXR010669; Sun, 14 Dec 2014 14:33:25 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412141433.sBEEXPXR010669@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 14 Dec 2014 14:33:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374704 - head/mail/maildrop X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 14:33:25 -0000 Author: madpilot Date: Sun Dec 14 14:33:23 2014 New Revision: 374704 URL: https://svnweb.freebsd.org/changeset/ports/374704 QAT: https://qat.redports.org/buildarchive/r374704/ Log: Update to 2.8.1 Modified: head/mail/maildrop/Makefile head/mail/maildrop/distinfo Modified: head/mail/maildrop/Makefile ============================================================================== --- head/mail/maildrop/Makefile Sun Dec 14 13:23:35 2014 (r374703) +++ head/mail/maildrop/Makefile Sun Dec 14 14:33:23 2014 (r374704) @@ -15,7 +15,7 @@ # MAILDROP_LOG_COLUMNS lenght of 'File:' line in log - 8; default: 72 PORTNAME= maildrop -PORTVERSION= 2.8.0 +PORTVERSION= 2.8.1 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} Modified: head/mail/maildrop/distinfo ============================================================================== --- head/mail/maildrop/distinfo Sun Dec 14 13:23:35 2014 (r374703) +++ head/mail/maildrop/distinfo Sun Dec 14 14:33:23 2014 (r374704) @@ -1,2 +1,2 @@ -SHA256 (maildrop-2.8.0.tar.bz2) = 28e37051eba909d89a9769556171dde7663a805e69d85e4a7664782b0b3a3c1a -SIZE (maildrop-2.8.0.tar.bz2) = 1989763 +SHA256 (maildrop-2.8.1.tar.bz2) = e1dbdc83ca92c614b05feea837dbae6d275e11b9a35728f68c2d4b8042153b64 +SIZE (maildrop-2.8.1.tar.bz2) = 1989926 From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:01:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A4CF4B5; Sun, 14 Dec 2014 15:01:32 +0000 (UTC) Received: from mail-yk0-x231.google.com (mail-yk0-x231.google.com [IPv6:2607:f8b0:4002:c07::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D983F3F2; Sun, 14 Dec 2014 15:01:31 +0000 (UTC) Received: by mail-yk0-f177.google.com with SMTP id 9so4345251ykp.36 for ; Sun, 14 Dec 2014 07:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=xw/BsifRm4TKV9Fe0pdg9o0R9DZfkmZWKFQOSDG69h8=; b=v2pHcjGmjNXaBsPtNEf1vYRutjQIZXp6a/BlhcJguwMBb4M2T6f0mR2emEfSlHSmjC mNgxBFO8ToVyReCGHvuAM9h2s0/n6tkRxvJQKrIU89S6cnxxRKADRkfraZj1KurhAJ/L D9AZkWKktsAHeArJJ5phobdc83rfd7LOE83fsm1lnRZcOLb2FCTQh8TAJ1IA1gppjP46 4tq1BHObFtAvLveR9R+eB7dEENhkV1rWe7Nn6QybZZIKjCCEuk3W6Zbs2iz4ERFzEsOx ZpFFbgsUFtR2h2LEEqniy0v0UhkgHBlSZ/XeSgzVS8UlBgC7eycyB3SLyUcMZqfRBB7G IoWA== MIME-Version: 1.0 X-Received: by 10.236.105.210 with SMTP id k58mr819680yhg.52.1418569290973; Sun, 14 Dec 2014 07:01:30 -0800 (PST) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.170.142.139 with HTTP; Sun, 14 Dec 2014 07:01:30 -0800 (PST) In-Reply-To: <201412141203.sBEC3drf037409@svn.freebsd.org> References: <201412141203.sBEC3drf037409@svn.freebsd.org> Date: Sun, 14 Dec 2014 16:01:30 +0100 X-Google-Sender-Auth: vwJ9eLcATR4E0-rP_2iGh3elyzw Message-ID: Subject: Re: svn commit: r374699 - in head/math: . gnuplot gnuplot-tex-extras gnuplot/files From: Antoine Brodin To: Hiroki Sato Content-Type: text/plain; charset=UTF-8 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:01:32 -0000 On Sun, Dec 14, 2014 at 1:03 PM, Hiroki Sato wrote: > Author: hrs > Date: Sun Dec 14 12:03:38 2014 > New Revision: 374699 > URL: https://svnweb.freebsd.org/changeset/ports/374699 > QAT: https://qat.redports.org/buildarchive/r374699/ > > Log: > - Separate TeX style files from math/gnuplot into math/gnuplot-tex-extras > to eliminate huge TeXLive dependency. Note that TeX terminal support is > still enabled by default because it works without them. > > - Add Lua dependency to support TeX/Tikz terminal. > > Approved by: glewis (maintainer) Hi, This is now broken: checking for kpsexpand... no checking for texhash... texhash configure: error: You tell me to use kpsexpand, but there is no kpsexpand Cheers, Antoine > > Added: > head/math/gnuplot-tex-extras/ > head/math/gnuplot-tex-extras/Makefile (contents, props changed) > head/math/gnuplot-tex-extras/distinfo (contents, props changed) > head/math/gnuplot-tex-extras/pkg-descr (contents, props changed) > Modified: > head/math/Makefile > head/math/gnuplot/Makefile > head/math/gnuplot/files/patch-configure > head/math/gnuplot/pkg-plist > > Modified: head/math/Makefile > ============================================================================== > --- head/math/Makefile Sun Dec 14 11:44:24 2014 (r374698) > +++ head/math/Makefile Sun Dec 14 12:03:38 2014 (r374699) > @@ -150,6 +150,7 @@ > SUBDIR += gnubc > SUBDIR += gnumeric > SUBDIR += gnuplot > + SUBDIR += gnuplot-tex-extras > SUBDIR += goblin > SUBDIR += gotoblas > SUBDIR += grace > > Added: head/math/gnuplot-tex-extras/Makefile > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/math/gnuplot-tex-extras/Makefile Sun Dec 14 12:03:38 2014 (r374699) > @@ -0,0 +1,30 @@ > +# $FreeBSD$ > + > +PORTNAME= gnuplot > +PORTVERSION= 4.6.6 > +CATEGORIES= math graphics > +MASTER_SITES= SF > +PKGNAMESUFFIX= -tex-extras > + > +MAINTAINER= glewis@FreeBSD.org > +COMMENT= Extra files for Gnuplot TeX support > + > +RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot > + > +USE_TEX= texmf > +NO_BUILD= yes > +PLIST_FILES= ${TEX_FILES:S,^,${TEX_DIR}/,} > + > +TEX_DIR= ${LOCALBASE}/${TEXMFDIR}/tex/latex/gnuplot > +TEX_FILES= gnuplot-lua-tikz.sty \ > + gnuplot-lua-tikz-common.tex \ > + gnuplot-lua-tikz.tex \ > + t-gnuplot-lua-tikz.tex \ > + gnuplot.cfg > + > +do-install: > + @${MKDIR} ${STAGEDIR}${TEX_DIR} > + cd ${WRKSRC}/share/LaTeX && ${INSTALL_DATA} ${TEX_FILES} \ > + ${STAGEDIR}${TEX_DIR} > + > +.include > > Added: head/math/gnuplot-tex-extras/distinfo > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/math/gnuplot-tex-extras/distinfo Sun Dec 14 12:03:38 2014 (r374699) > @@ -0,0 +1,2 @@ > +SHA256 (gnuplot-4.6.6.tar.gz) = 1f19596fd09045f22225afbfec11fa91b9ad1d95b9f48406362f517d4f130274 > +SIZE (gnuplot-4.6.6.tar.gz) = 5059214 > > Added: head/math/gnuplot-tex-extras/pkg-descr > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/math/gnuplot-tex-extras/pkg-descr Sun Dec 14 12:03:38 2014 (r374699) > @@ -0,0 +1,10 @@ > +Gnuplot is a portable multi-platform command-line driven graphing utility. It > +was originally created to allow scientists and students to visualize > +mathematical functions and data interactively, but has grown to support many > +non-interactive uses such as web scripting. It is also used as a plotting engine > +by third-party applications like Octave. Gnuplot has been supported and under > +active development since 1986. > + > +This port installs extra files for TeX terminals (latex, epslatex, Tikz, etc). > + > +WWW: http://www.gnuplot.info/ > > Modified: head/math/gnuplot/Makefile > ============================================================================== > --- head/math/gnuplot/Makefile Sun Dec 14 11:44:24 2014 (r374698) > +++ head/math/gnuplot/Makefile Sun Dec 14 12:03:38 2014 (r374699) > @@ -2,32 +2,39 @@ > > PORTNAME= gnuplot > PORTVERSION= 4.6.6 > +PORTREVISION= 1 > CATEGORIES= math graphics > MASTER_SITES= SF > > MAINTAINER= glewis@FreeBSD.org > COMMENT= Command-line driven graphing utility > > -USES= iconv > +USES= iconv lua > +USE_TEX= kpathsea > GNU_CONFIGURE= yes > LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} > +CONFIGURE_ENV= LUA_VER="${LUA_VER}" > CONFIGURE_ARGS+=--with-lasergnu \ > --with-readline=gnu \ > + --with-kpsexpand \ > --without-linux-vga \ > --without-lisp-files \ > --without-tutorial \ > - --with-bitmap-terminals > + --with-bitmap-terminals \ > + --with-latex \ > + ac_cv_prog_PLAINTEX=${LOCALBASE}/bin/tex \ > + ac_cv_prog_LATEX=${LOCALBASE}/bin/latex \ > + ac_cv_prog_PDFLATEX=${LOCALBASE}/bin/pdflatex > PORTDOCS= * > PORTEXAMPLES= * > > -OPTIONS_DEFINE= CAIRO DOCS EXAMPLES GD GRIDBOX PDF PLOT TEX THINSPLINES WX X11 > +OPTIONS_DEFINE= CAIRO DOCS EXAMPLES GD GRIDBOX PDF PLOT THINSPLINES WX X11 > GRIDBOX_DESC= Use the gridbox optimization for hidden3d > PLOT_DESC= Enable plot support > -TEX_DESC= Search kpsexpand at run-time > THINSPLINES_DESC= Enable thin plate splines for grids in dgrid3d > WX_DESC= wxWidgets (formerly wxWindows) support > > -OPTIONS_DEFAULT=CAIRO GD PLOT TEX WX X11 > +OPTIONS_DEFAULT=CAIRO GD PLOT WX X11 > OPTIONS_SUB= yes > > CAIRO_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo > @@ -49,11 +56,6 @@ PLOT_LIB_DEPENDS= libplot.so:${PORTSDIR} > PLOT_CONFIGURE_ON= --with-plot=${LOCALBASE} > PLOT_CONFIGURE_OFF= --without-plot > > -TEX_USE= TEX=base,texmf,latex,dvipsk > -TEX_CONFIGURE_ON= --with-kpsexpand \ > - --with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot > -TEX_CONFIGURE_OFF= --without-kpexpand > - > THINSPLINES_CONFIGURE_ENABLE= thin-splines > > X11_USE= XORG=x11 > @@ -71,13 +73,10 @@ CONFIGURE_ARGS+= --disable-wxwidgets > .endif > > post-patch: > -.if ! ${PORT_OPTIONS:MTEX} > @${REINPLACE_CMD} -e \ > '/^install:/s/install-am//' ${WRKSRC}/share/LaTeX/Makefile.in > -.endif > @${REINPLACE_CMD} -e \ > 's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in > - @${FIND} "${WRKSRC}" -name '*.orig' -delete > > .if ${PORT_OPTIONS:MDOCS} > post-build: > > Modified: head/math/gnuplot/files/patch-configure > ============================================================================== > --- head/math/gnuplot/files/patch-configure Sun Dec 14 11:44:24 2014 (r374698) > +++ head/math/gnuplot/files/patch-configure Sun Dec 14 12:03:38 2014 (r374699) > @@ -1,6 +1,6 @@ > ---- configure.orig > -+++ configure > -@@ -5919,7 +5919,7 @@ > +--- configure.orig 2014-09-22 03:26:10.000000000 +0900 > ++++ configure 2014-12-06 14:27:21.000000000 +0900 > +@@ -5982,7 +5982,7 @@ > fi > > > @@ -9,3 +9,100 @@ > then > CC=${CC-${host_alias-gcc}} > CFLAGS=${CFLAGS-"-g -O2"} > +@@ -10844,12 +10844,12 @@ > + pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" > + else > + if test -n "$PKG_CONFIG" && \ > +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 > +- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 > ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5 > ++ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5 > + ac_status=$? > + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > + test $ac_status = 0; }; then > +- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` > ++ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-${LUA_VER}" 2>/dev/null` > + else > + pkg_failed=yes > + fi > +@@ -10862,12 +10862,12 @@ > + pkg_cv_LUA_LIBS="$LUA_LIBS" > + else > + if test -n "$PKG_CONFIG" && \ > +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 > +- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 > ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5 > ++ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5 > + ac_status=$? > + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > + test $ac_status = 0; }; then > +- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` > ++ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-${LUA_VER}" 2>/dev/null` > + else > + pkg_failed=yes > + fi > +@@ -10886,9 +10886,9 @@ > + _pkg_short_errors_supported=no > + fi > + if test $_pkg_short_errors_supported = yes; then > +- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"` > ++ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-${LUA_VER}"` > + else > +- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"` > ++ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-${LUA_VER}"` > + fi > + # Put the nasty error message in config.log where it belongs > + echo "$LUA_PKG_ERRORS" >&5 > +@@ -10920,12 +10920,12 @@ > + pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" > + else > + if test -n "$PKG_CONFIG" && \ > +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 > +- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 > ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5 > ++ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5 > + ac_status=$? > + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > + test $ac_status = 0; }; then > +- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null` > ++ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-${LUA_VER}" 2>/dev/null` > + else > + pkg_failed=yes > + fi > +@@ -10938,12 +10938,12 @@ > + pkg_cv_LUA_LIBS="$LUA_LIBS" > + else > + if test -n "$PKG_CONFIG" && \ > +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5 > +- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5 > ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5 > ++ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5 > + ac_status=$? > + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > + test $ac_status = 0; }; then > +- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null` > ++ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-${LUA_VER}" 2>/dev/null` > + else > + pkg_failed=yes > + fi > +@@ -10962,9 +10962,9 @@ > + _pkg_short_errors_supported=no > + fi > + if test $_pkg_short_errors_supported = yes; then > +- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"` > ++ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-${LUA_VER}"` > + else > +- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"` > ++ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-${LUA_VER}"` > + fi > + # Put the nasty error message in config.log where it belongs > + echo "$LUA_PKG_ERRORS" >&5 > +@@ -11024,7 +11024,7 @@ > + return 0; > + } > + _ACEOF > +-for ac_lib in '' lua lua5.1; do > ++for ac_lib in '' lua lua-${LUA_VER}; do > + if test -z "$ac_lib"; then > + ac_res="none required" > + else > > Modified: head/math/gnuplot/pkg-plist > ============================================================================== > --- head/math/gnuplot/pkg-plist Sun Dec 14 11:44:24 2014 (r374698) > +++ head/math/gnuplot/pkg-plist Sun Dec 14 12:03:38 2014 (r374699) > @@ -38,4 +38,3 @@ man/man1/lasergnu.1.gz > %%DATADIR%%/4.6/js/previouszoom.png > %%DATADIR%%/4.6/js/textzoom.png > %%DATADIR%%/4.6/lua/gnuplot-tikz.lua > -%%TEX%%share/texmf/tex/latex/gnuplot/gnuplot.cfg > From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:23:49 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9854ED14; Sun, 14 Dec 2014 15:23: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 8469285D; Sun, 14 Dec 2014 15:23:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFNnSg035123; Sun, 14 Dec 2014 15:23:49 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFNntQ035121; Sun, 14 Dec 2014 15:23:49 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412141523.sBEFNntQ035121@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Dec 2014 15:23:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374705 - head/games/pongix X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:23:49 -0000 Author: amdmi3 Date: Sun Dec 14 15:23:48 2014 New Revision: 374705 URL: https://svnweb.freebsd.org/changeset/ports/374705 QAT: https://qat.redports.org/buildarchive/r374705/ Log: - Clarify LICENSE - Add LICENSE_FILE - Place extra libraries into LIBS, not LDFLAGS - Drop @dirrm* from plist Modified: head/games/pongix/Makefile head/games/pongix/pkg-plist Modified: head/games/pongix/Makefile ============================================================================== --- head/games/pongix/Makefile Sun Dec 14 14:33:23 2014 (r374704) +++ head/games/pongix/Makefile Sun Dec 14 15:23:48 2014 (r374705) @@ -10,13 +10,15 @@ MASTER_SITES= http://www.losersjuegos.co MAINTAINER= ports@FreeBSD.org COMMENT= Free pong-like game -LICENSE= GPLv2 +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake USE_SDL= sdl image net GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lm -L${LOCALBASE}/lib ${PTHREAD} +LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -lm PORTDOCS= AUTHORS ChangeLog README do-install: Modified: head/games/pongix/pkg-plist ============================================================================== --- head/games/pongix/pkg-plist Sun Dec 14 14:33:23 2014 (r374704) +++ head/games/pongix/pkg-plist Sun Dec 14 15:23:48 2014 (r374705) @@ -3,4 +3,3 @@ bin/pongix %%DATADIR%%/fuente.bmp %%DATADIR%%/paleta.bmp %%DATADIR%%/pelota.bmp -@dirrm %%DATADIR%% From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:23:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5F7ADF2; Sun, 14 Dec 2014 15:23: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 D2C98862; Sun, 14 Dec 2014 15:23:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFNtL1035254; Sun, 14 Dec 2014 15:23:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFNtha035253; Sun, 14 Dec 2014 15:23:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412141523.sBEFNtha035253@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Dec 2014 15:23:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374706 - head/games/worldofpadman X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:23:56 -0000 Author: amdmi3 Date: Sun Dec 14 15:23:54 2014 New Revision: 374706 URL: https://svnweb.freebsd.org/changeset/ports/374706 QAT: https://qat.redports.org/buildarchive/r374706/ Log: - Switch NO_PACKAGE to more correct MANUAL_PACKAGE_BUILD - Switch to PLIST_FILES/PORTDOCS/PORTDATA which simplifies plist handling Deleted: head/games/worldofpadman/pkg-plist Modified: head/games/worldofpadman/Makefile Modified: head/games/worldofpadman/Makefile ============================================================================== --- head/games/worldofpadman/Makefile Sun Dec 14 15:23:48 2014 (r374705) +++ head/games/worldofpadman/Makefile Sun Dec 14 15:23:54 2014 (r374706) @@ -16,7 +16,7 @@ EXTRACT_ONLY= worldofpadman.run \ MAINTAINER= ports@FreeBSD.org COMMENT= Open source FPS game inspired by the Padman comic strip -NO_PACKAGE= package will be ~600MB; set FORCE_PACKAGE if you really want it +MANUAL_PACKAGE_BUILD= huge (~600MB) USES= gmake makeself MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -25,6 +25,10 @@ ALL_TARGET= release SRC_FILE= ${PORTNAME}-${PORTVERSION} VM_ARCHS= amd64 i386 powerpc +PLIST_FILES= share/pixmaps/worldofpadman.png +PORTDOCS= * +PORTDATA= * + OPTIONS_DEFINE= CURL CURL_DLOPEN GAMELIBS MP3 OPENAL OPENAL_DLOPEN \ OPTIMIZED_CFLAGS VORBIS DOCS OPTIONS_MULTI= FLAVOR @@ -83,11 +87,13 @@ MAKE_ENV+= USE_CODEC_VORBIS=1 .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= BUILD_CLIENT=1 WOPBIN+= wop +PLIST_FILES+= bin/worldofpadman .endif .if ${PORT_OPTIONS:MSERVER} MAKE_ENV+= BUILD_SERVER=1 WOPBIN+= wopded +PLIST_FILES+= bin/worldofpadmanded .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) @@ -106,6 +112,7 @@ MAKE_ENV+= USE_OPTIMIZED_CFLAGS=1 .if ${PORT_OPTIONS:MSMP_CLIENT} MAKE_ENV+= BUILD_CLIENT_SMP=1 WOPBIN+= wop-smp +PLIST_FILES+= bin/worldofpadman-smp .endif post-extract: From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:24:02 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E70AEFC; Sun, 14 Dec 2014 15:24: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 7B23F869; Sun, 14 Dec 2014 15:24:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFO2UB035401; Sun, 14 Dec 2014 15:24:02 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFO2CQ035399; Sun, 14 Dec 2014 15:24:02 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412141524.sBEFO2CQ035399@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Dec 2014 15:24:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374707 - head/games/crimson X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:24:02 -0000 Author: amdmi3 Date: Sun Dec 14 15:24:01 2014 New Revision: 374707 URL: https://svnweb.freebsd.org/changeset/ports/374707 QAT: https://qat.redports.org/buildarchive/r374707/ Log: - Add distfile mirror - Add LICENSE - Drop @dirrm* from plist Modified: head/games/crimson/Makefile head/games/crimson/pkg-plist Modified: head/games/crimson/Makefile ============================================================================== --- head/games/crimson/Makefile Sun Dec 14 15:23:54 2014 (r374706) +++ head/games/crimson/Makefile Sun Dec 14 15:24:01 2014 (r374707) @@ -5,12 +5,16 @@ PORTNAME= crimson PORTVERSION= 0.5.3 PORTREVISION= 5 CATEGORIES= games -MASTER_SITES= http://crimson.seul.org/files/ +MASTER_SITES= http://crimson.seul.org/files/ \ + http://mirror.amdmi3.ru/distfiles/ PKGNAMESUFFIX= -fields MAINTAINER= ports@FreeBSD.org COMMENT= Tactical war game in the tradition of Battle Isle +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING + GNU_CONFIGURE= yes USES= gmake USE_SDL= mixer sdl ttf Modified: head/games/crimson/pkg-plist ============================================================================== --- head/games/crimson/pkg-plist Sun Dec 14 15:23:54 2014 (r374706) +++ head/games/crimson/pkg-plist Sun Dec 14 15:24:01 2014 (r374707) @@ -45,8 +45,3 @@ share/pixmaps/crimson.png %%DATADIR%%/sound/repair.wav %%DATADIR%%/sound/select.wav share/applications/crimson.desktop -@dirrm %%DATADIR%%/sound -@dirrm %%DATADIR%%/music -@dirrm %%DATADIR%%/locale -@dirrm %%DATADIR%%/levels -@dirrm %%DATADIR%% From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:24:09 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D5BDFD9; Sun, 14 Dec 2014 15:24: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 29A9A86F; Sun, 14 Dec 2014 15:24:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFO9s6035550; Sun, 14 Dec 2014 15:24:09 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFO8Xg035548; Sun, 14 Dec 2014 15:24:08 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412141524.sBEFO8Xg035548@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Dec 2014 15:24:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374708 - head/games/kevedit X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:24:09 -0000 Author: amdmi3 Date: Sun Dec 14 15:24:07 2014 New Revision: 374708 URL: https://svnweb.freebsd.org/changeset/ports/374708 QAT: https://qat.redports.org/buildarchive/r374708/ Log: - Drop @dirrm* from plist - Fix identation - Use GNU_CONFIGURE for GNU configure - Add LICENSE Modified: head/games/kevedit/Makefile head/games/kevedit/pkg-plist Modified: head/games/kevedit/Makefile ============================================================================== --- head/games/kevedit/Makefile Sun Dec 14 15:24:01 2014 (r374707) +++ head/games/kevedit/Makefile Sun Dec 14 15:24:07 2014 (r374708) @@ -1,19 +1,22 @@ # Created by: Raymond Pasco # $FreeBSD$ -PORTNAME= kevedit -PORTVERSION= 0.5.1 -PORTREVISION= 4 -CATEGORIES= games -MASTER_SITES= SF +PORTNAME= kevedit +PORTVERSION= 0.5.1 +PORTREVISION= 4 +CATEGORIES= games +MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org -COMMENT= Modern ZZT editor with necessary features +MAINTAINER= ports@FreeBSD.org +COMMENT= Modern ZZT editor with necessary features -BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools -RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING -USE_SDL= yes -HAS_CONFIGURE= yes +BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools +RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools + +USE_SDL= yes +GNU_CONFIGURE= yes .include Modified: head/games/kevedit/pkg-plist ============================================================================== --- head/games/kevedit/pkg-plist Sun Dec 14 15:24:01 2014 (r374707) +++ head/games/kevedit/pkg-plist Sun Dec 14 15:24:07 2014 (r374708) @@ -3,4 +3,3 @@ bin/kevedit %%DATADIR%%/kevedos.cfg %%DATADIR%%/kevedos.iso %%DATADIR%%/soundfx.zzm -@dirrmtry %%DATADIR%% From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:24:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4737E13E; Sun, 14 Dec 2014 15:24: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 334BE875; Sun, 14 Dec 2014 15:24:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFOJJr035687; Sun, 14 Dec 2014 15:24:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFOJpj035685; Sun, 14 Dec 2014 15:24:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412141524.sBEFOJpj035685@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Dec 2014 15:24:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374709 - head/graphics/libopenraw X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:24:19 -0000 Author: amdmi3 Date: Sun Dec 14 15:24:18 2014 New Revision: 374709 URL: https://svnweb.freebsd.org/changeset/ports/374709 QAT: https://qat.redports.org/buildarchive/r374709/ Log: - Pet portlint - Strip libraries Modified: head/graphics/libopenraw/Makefile Modified: head/graphics/libopenraw/Makefile ============================================================================== --- head/graphics/libopenraw/Makefile Sun Dec 14 15:24:07 2014 (r374708) +++ head/graphics/libopenraw/Makefile Sun Dec 14 15:24:18 2014 (r374709) @@ -10,12 +10,12 @@ MASTER_SITES= http://libopenraw.freedesk MAINTAINER= ports@FreeBSD.org COMMENT= Library for camera RAW files decoding -LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ - libjpeg.so:${PORTSDIR}/graphics/jpeg - LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING.LESSER +LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ + libjpeg.so:${PORTSDIR}/graphics/jpeg + USES= compiler:c++11-lang libtool pkgconfig tar:bzip2 USE_GNOME= libxml2 USE_LDCONFIG= yes @@ -31,8 +31,17 @@ OPTIONS_SUB= yes GNOME_CONFIGURE_ENABLE= gnome GNOME_USE= GNOME=glib20,gdkpixbuf2 +.include + post-patch: @${REINPLACE_CMD} -e 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|testsuite ||' ${WRKSRC}/Makefile.in +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenraw.so +.if ${PORT_OPTIONS:MGNOME} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenrawgnome.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gdk-pixbuf-2.0/${GTK2_VERSION}/loaders/libopenraw_pixbuf.so +.endif + .include From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:24:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8FCC218; Sun, 14 Dec 2014 15: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8A81C878; Sun, 14 Dec 2014 15:24:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFOThA035832; Sun, 14 Dec 2014 15:24:29 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFOTbH035830; Sun, 14 Dec 2014 15:24:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412141524.sBEFOTbH035830@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Dec 2014 15:24:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374710 - head/games/atomix X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:24:29 -0000 Author: amdmi3 Date: Sun Dec 14 15:24:28 2014 New Revision: 374710 URL: https://svnweb.freebsd.org/changeset/ports/374710 QAT: https://qat.redports.org/buildarchive/r374710/ Log: - Add LICENSE - Convert gnomehack to USES=pathfix - Use %%DATADIR%% in plist - Drop @dirrm* from plist Modified: head/games/atomix/Makefile head/games/atomix/pkg-plist Modified: head/games/atomix/Makefile ============================================================================== --- head/games/atomix/Makefile Sun Dec 14 15:24:18 2014 (r374709) +++ head/games/atomix/Makefile Sun Dec 14 15:24:28 2014 (r374710) @@ -11,8 +11,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= ports@FreeBSD.org COMMENT= Yet another little mind game -USES= gettext gmake pkgconfig tar:bzip2 -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= gettext gmake pathfix pkgconfig tar:bzip2 +USE_GNOME= gnomeprefix intlhack libgnomeui GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lm Modified: head/games/atomix/pkg-plist ============================================================================== --- head/games/atomix/pkg-plist Sun Dec 14 15:24:18 2014 (r374709) +++ head/games/atomix/pkg-plist Sun Dec 14 15:24:28 2014 (r374710) @@ -1,71 +1,71 @@ bin/atomix share/applications/atomix.desktop -share/atomix/atomix-logo.png -share/atomix/level/aceticacid.atomix.xml -share/atomix/level/acetone.atomix.xml -share/atomix/level/butanol.atomix.xml -share/atomix/level/cyclobutane.atomix.xml -share/atomix/level/dimethylether.atomix.xml -share/atomix/level/ethanal.atomix.xml -share/atomix/level/ethane.atomix.xml -share/atomix/level/ethanol.atomix.xml -share/atomix/level/ethylene.atomix.xml -share/atomix/level/glycerin.atomix.xml -share/atomix/level/lactic-acid.atomix.xml -share/atomix/level/methanal.atomix.xml -share/atomix/level/methane.atomix.xml -share/atomix/level/methanol.atomix.xml -share/atomix/level/propanal.atomix.xml -share/atomix/level/propylene.atomix.xml -share/atomix/level/pyran.atomix.xml -share/atomix/level/sequence -share/atomix/level/transbutylen.atomix.xml -share/atomix/level/water.atomix.xml -share/atomix/themes/default/arrow-bottom.png -share/atomix/themes/default/arrow-left.png -share/atomix/themes/default/arrow-right.png -share/atomix/themes/default/arrow-top.png -share/atomix/themes/default/atom-c.png -share/atomix/themes/default/atom-f.png -share/atomix/themes/default/atom-h.png -share/atomix/themes/default/atom-n.png -share/atomix/themes/default/atom-o.png -share/atomix/themes/default/cursor.png -share/atomix/themes/default/floor.png -share/atomix/themes/default/link-bottom-double.png -share/atomix/themes/default/link-bottom-left.png -share/atomix/themes/default/link-bottom-right.png -share/atomix/themes/default/link-bottom.png -share/atomix/themes/default/link-left-double.png -share/atomix/themes/default/link-left.png -share/atomix/themes/default/link-right-double.png -share/atomix/themes/default/link-right.png -share/atomix/themes/default/link-top-double.png -share/atomix/themes/default/link-top-left.png -share/atomix/themes/default/link-top-right.png -share/atomix/themes/default/link-top.png -share/atomix/themes/default/shadow-bottom-right.png -share/atomix/themes/default/shadow-left-top.png -share/atomix/themes/default/shadow-left.png -share/atomix/themes/default/shadow-top-left-both.png -share/atomix/themes/default/shadow-top-left.png -share/atomix/themes/default/shadow-top.png -share/atomix/themes/default/theme -share/atomix/themes/default/wall-bottom-left.png -share/atomix/themes/default/wall-bottom-right.png -share/atomix/themes/default/wall-horizontal-bottomx.png -share/atomix/themes/default/wall-horizontal-left-end.png -share/atomix/themes/default/wall-horizontal-right-end.png -share/atomix/themes/default/wall-horizontal-topx.png -share/atomix/themes/default/wall-horizontal.png -share/atomix/themes/default/wall-single.png -share/atomix/themes/default/wall-top-left.png -share/atomix/themes/default/wall-top-right.png -share/atomix/themes/default/wall-vertical-bottom-end.png -share/atomix/themes/default/wall-vertical-leftx.png -share/atomix/themes/default/wall-vertical-rightx.png -share/atomix/themes/default/wall-vertical-top-end.png -share/atomix/themes/default/wall-vertical.png +%%DATADIR%%/atomix-logo.png +%%DATADIR%%/level/aceticacid.atomix.xml +%%DATADIR%%/level/acetone.atomix.xml +%%DATADIR%%/level/butanol.atomix.xml +%%DATADIR%%/level/cyclobutane.atomix.xml +%%DATADIR%%/level/dimethylether.atomix.xml +%%DATADIR%%/level/ethanal.atomix.xml +%%DATADIR%%/level/ethane.atomix.xml +%%DATADIR%%/level/ethanol.atomix.xml +%%DATADIR%%/level/ethylene.atomix.xml +%%DATADIR%%/level/glycerin.atomix.xml +%%DATADIR%%/level/lactic-acid.atomix.xml +%%DATADIR%%/level/methanal.atomix.xml +%%DATADIR%%/level/methane.atomix.xml +%%DATADIR%%/level/methanol.atomix.xml +%%DATADIR%%/level/propanal.atomix.xml +%%DATADIR%%/level/propylene.atomix.xml +%%DATADIR%%/level/pyran.atomix.xml +%%DATADIR%%/level/sequence +%%DATADIR%%/level/transbutylen.atomix.xml +%%DATADIR%%/level/water.atomix.xml +%%DATADIR%%/themes/default/arrow-bottom.png +%%DATADIR%%/themes/default/arrow-left.png +%%DATADIR%%/themes/default/arrow-right.png +%%DATADIR%%/themes/default/arrow-top.png +%%DATADIR%%/themes/default/atom-c.png +%%DATADIR%%/themes/default/atom-f.png +%%DATADIR%%/themes/default/atom-h.png +%%DATADIR%%/themes/default/atom-n.png +%%DATADIR%%/themes/default/atom-o.png +%%DATADIR%%/themes/default/cursor.png +%%DATADIR%%/themes/default/floor.png +%%DATADIR%%/themes/default/link-bottom-double.png +%%DATADIR%%/themes/default/link-bottom-left.png +%%DATADIR%%/themes/default/link-bottom-right.png +%%DATADIR%%/themes/default/link-bottom.png +%%DATADIR%%/themes/default/link-left-double.png +%%DATADIR%%/themes/default/link-left.png +%%DATADIR%%/themes/default/link-right-double.png +%%DATADIR%%/themes/default/link-right.png +%%DATADIR%%/themes/default/link-top-double.png +%%DATADIR%%/themes/default/link-top-left.png +%%DATADIR%%/themes/default/link-top-right.png +%%DATADIR%%/themes/default/link-top.png +%%DATADIR%%/themes/default/shadow-bottom-right.png +%%DATADIR%%/themes/default/shadow-left-top.png +%%DATADIR%%/themes/default/shadow-left.png +%%DATADIR%%/themes/default/shadow-top-left-both.png +%%DATADIR%%/themes/default/shadow-top-left.png +%%DATADIR%%/themes/default/shadow-top.png +%%DATADIR%%/themes/default/theme +%%DATADIR%%/themes/default/wall-bottom-left.png +%%DATADIR%%/themes/default/wall-bottom-right.png +%%DATADIR%%/themes/default/wall-horizontal-bottomx.png +%%DATADIR%%/themes/default/wall-horizontal-left-end.png +%%DATADIR%%/themes/default/wall-horizontal-right-end.png +%%DATADIR%%/themes/default/wall-horizontal-topx.png +%%DATADIR%%/themes/default/wall-horizontal.png +%%DATADIR%%/themes/default/wall-single.png +%%DATADIR%%/themes/default/wall-top-left.png +%%DATADIR%%/themes/default/wall-top-right.png +%%DATADIR%%/themes/default/wall-vertical-bottom-end.png +%%DATADIR%%/themes/default/wall-vertical-leftx.png +%%DATADIR%%/themes/default/wall-vertical-rightx.png +%%DATADIR%%/themes/default/wall-vertical-top-end.png +%%DATADIR%%/themes/default/wall-vertical.png share/gnome-2.0/ui/atomix-ui.xml share/pixmaps/atomix-icon.png share/locale/am/LC_MESSAGES/atomix.mo @@ -122,7 +122,3 @@ share/locale/wa/LC_MESSAGES/atomix.mo share/locale/zh_CN/LC_MESSAGES/atomix.mo share/locale/zh_HK/LC_MESSAGES/atomix.mo share/locale/zh_TW/LC_MESSAGES/atomix.mo -@dirrm share/atomix/themes/default -@dirrm share/atomix/themes -@dirrm share/atomix/level -@dirrm share/atomix From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:24:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF5E62F2; Sun, 14 Dec 2014 15:24: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 BBD1087A; Sun, 14 Dec 2014 15:24:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFOdr3035985; Sun, 14 Dec 2014 15:24:39 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFOdlS035983; Sun, 14 Dec 2014 15:24:39 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412141524.sBEFOdlS035983@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Dec 2014 15:24:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374711 - head/games/freeciv-sounds X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:24:39 -0000 Author: amdmi3 Date: Sun Dec 14 15:24:38 2014 New Revision: 374711 URL: https://svnweb.freebsd.org/changeset/ports/374711 QAT: https://qat.redports.org/buildarchive/r374711/ Log: - Cosmetic fix - Add NO_ARCH - Drop @dirrm* from plist Modified: head/games/freeciv-sounds/Makefile head/games/freeciv-sounds/pkg-plist Modified: head/games/freeciv-sounds/Makefile ============================================================================== --- head/games/freeciv-sounds/Makefile Sun Dec 14 15:24:28 2014 (r374710) +++ head/games/freeciv-sounds/Makefile Sun Dec 14 15:24:38 2014 (r374711) @@ -4,7 +4,8 @@ PORTNAME= freeciv PORTVERSION= 3 CATEGORIES= games -MASTER_SITES= GENTOO/distfiles ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/ +MASTER_SITES= GENTOO/distfiles \ + ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/ PKGNAMESUFFIX= -sounds DISTNAME= stdsounds${DISTVERSION} @@ -13,6 +14,7 @@ COMMENT= Freeciv standard sound set NO_BUILD= yes WRKSRC= ${WRKDIR}/data +NO_ARCH= yes do-install: @cd ${WRKSRC}/&&${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ Modified: head/games/freeciv-sounds/pkg-plist ============================================================================== --- head/games/freeciv-sounds/pkg-plist Sun Dec 14 15:24:28 2014 (r374710) +++ head/games/freeciv-sounds/pkg-plist Sun Dec 14 15:24:38 2014 (r374711) @@ -15,5 +15,3 @@ %%DATADIR%%/stdsounds/wall01.ogg %%DATADIR%%/stdsounds/woodbrk.ogg %%DATADIR%%/stdsounds.soundspec -@dirrm %%DATADIR%%/stdsounds -@dirrmtry %%DATADIR%% From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:26:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 037A960A; Sun, 14 Dec 2014 15:26: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 CA4A48E3; Sun, 14 Dec 2014 15:26:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFQNhf036387; Sun, 14 Dec 2014 15:26:23 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFQNWn036385; Sun, 14 Dec 2014 15:26:23 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201412141526.sBEFQNWn036385@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 14 Dec 2014 15:26:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374712 - head/print/fontforge X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:26:24 -0000 Author: riggs Date: Sun Dec 14 15:26:22 2014 New Revision: 374712 URL: https://svnweb.freebsd.org/changeset/ports/374712 QAT: https://qat.redports.org/buildarchive/r374712/ Log: Chase update of freetype2 to 2.5.4. While on it: - Convert USE_PYTHON -> USES PR: 195872 Submitted by: cyberbotx@cyberbotx.com (maintainer) Modified: head/print/fontforge/Makefile head/print/fontforge/distinfo Modified: head/print/fontforge/Makefile ============================================================================== --- head/print/fontforge/Makefile Sun Dec 14 15:24:38 2014 (r374711) +++ head/print/fontforge/Makefile Sun Dec 14 15:26:22 2014 (r374712) @@ -3,7 +3,7 @@ PORTNAME= fontforge DISTVERSION= 20120731-b -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= print MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source \ SF/freetype/${PORTNAME}/${PORTVERSION}:freetype \ @@ -47,7 +47,7 @@ FREETYPE_CONFIGURE_WITH= freetype-byteco MULTILAYER_CONFIGURE_ENABLE= type3 -PYTHON_USE= PYTHON=yes +PYTHON_USES= python PYTHON_CONFIGURE_WITH= python PYTHON_LDFLAGS= -lutil @@ -67,7 +67,7 @@ DISTFILES+= ${DOCFILES:C/$/:docs/} .endif .if ${PORT_OPTIONS:MFREETYPE} -FREETYPE_VERSION= 2.5.3 +FREETYPE_VERSION= 2.5.4 FREETYPE_SRC= freetype-${FREETYPE_VERSION}.tar.bz2 DISTFILES+= ${FREETYPE_SRC:C/$/:freetype/} CONFIGURE_ARGS+= --with-freetype-src=${WRKDIR}/freetype-${FREETYPE_VERSION} Modified: head/print/fontforge/distinfo ============================================================================== --- head/print/fontforge/distinfo Sun Dec 14 15:24:38 2014 (r374711) +++ head/print/fontforge/distinfo Sun Dec 14 15:26:22 2014 (r374712) @@ -2,5 +2,5 @@ SHA256 (fontforge_full-20120731-b.tar.bz SIZE (fontforge_full-20120731-b.tar.bz2) = 5541994 SHA256 (fontforge_htdocs-20120731-b.tar.bz2) = 6c3f178484d21814762c52859ffead25564a93e88cd5fe7cc9877e4b7e85105d SIZE (fontforge_htdocs-20120731-b.tar.bz2) = 3506833 -SHA256 (freetype-2.5.3.tar.bz2) = c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e -SIZE (freetype-2.5.3.tar.bz2) = 1703842 +SHA256 (freetype-2.5.4.tar.bz2) = 3b4e2c666b33b32ad29ff0fe5c6538e757d3c73368e5dfa88bd59b4bc95cbabb +SIZE (freetype-2.5.4.tar.bz2) = 1726105 From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 15:43:20 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FCAEE6D; Sun, 14 Dec 2014 15:43: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 5BB6BC48; Sun, 14 Dec 2014 15:43:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEFhKH9045878; Sun, 14 Dec 2014 15:43:20 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEFhKNF045877; Sun, 14 Dec 2014 15:43:20 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412141543.sBEFhKNF045877@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 14 Dec 2014 15:43:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374713 - head/math/gnuplot X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 15:43:20 -0000 Author: antoine Date: Sun Dec 14 15:43:19 2014 New Revision: 374713 URL: https://svnweb.freebsd.org/changeset/ports/374713 QAT: https://qat.redports.org/buildarchive/r374713/ Log: Unbreak Modified: head/math/gnuplot/Makefile Modified: head/math/gnuplot/Makefile ============================================================================== --- head/math/gnuplot/Makefile Sun Dec 14 15:26:22 2014 (r374712) +++ head/math/gnuplot/Makefile Sun Dec 14 15:43:19 2014 (r374713) @@ -9,7 +9,7 @@ MASTER_SITES= SF MAINTAINER= glewis@FreeBSD.org COMMENT= Command-line driven graphing utility -USES= iconv lua +USES= iconv lua pkgconfig USE_TEX= kpathsea GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} @@ -22,6 +22,7 @@ CONFIGURE_ARGS+=--with-lasergnu \ --without-tutorial \ --with-bitmap-terminals \ --with-latex \ + ac_cv_prog_KPSEXPAND=${LOCALBASE}/bin/kpsexpand \ ac_cv_prog_PLAINTEX=${LOCALBASE}/bin/tex \ ac_cv_prog_LATEX=${LOCALBASE}/bin/latex \ ac_cv_prog_PDFLATEX=${LOCALBASE}/bin/pdflatex From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 16:33:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CCA6D9B6; Sun, 14 Dec 2014 16:33: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 AE5B6FA; Sun, 14 Dec 2014 16:33:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEGXRK3070706; Sun, 14 Dec 2014 16:33:27 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEGXQJP070700; Sun, 14 Dec 2014 16:33:26 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201412141633.sBEGXQJP070700@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sun, 14 Dec 2014 16:33:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374714 - in head: . devel/tex-kpathsea print/texlive-base print/texlive-base/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 16:33:27 -0000 Author: hrs Date: Sun Dec 14 16:33:25 2014 New Revision: 374714 URL: https://svnweb.freebsd.org/changeset/ports/374714 QAT: https://qat.redports.org/buildarchive/r374714/ Log: - Move kpse* scripts from texlive-base to tex-kpathsea. - Use install-strip target. Modified: head/UPDATING head/devel/tex-kpathsea/Makefile head/devel/tex-kpathsea/pkg-plist head/print/texlive-base/Makefile head/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in head/print/texlive-base/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Dec 14 15:43:19 2014 (r374713) +++ head/UPDATING Sun Dec 14 16:33:25 2014 (r374714) @@ -5,6 +5,23 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20141214: + AFFECTS: users of TeXLive + AUTHOR: hrs@FreeBSD.org + + Several scripts in print/texlive-base have been moved to + devel/tex-kpathsea. Upgrading them can fail because texlive-base + depends on tex-kpathsea, and the new tex-kpathsea tries to install + files which were installed by the old texlive-base. The following + error message indicates this situation: + + pkg-static: tex-kpathsea-6.2.0_1 conflicts with texlive-base-20140525_3 (installs files into the same place). Problematic file: /usr/local/bin/kpsewhere + + To solve this problem, remove both of tex-kpathsea and texlive-base first + and install the new versions: + + # pkg delete -f tex-kpathsea texlive-base + 20141209: AFFECTS: users of emulators/linux_base-f10 and emulators/linux_base-c6 AUTHOR: xmj@freebsd.org Modified: head/devel/tex-kpathsea/Makefile ============================================================================== --- head/devel/tex-kpathsea/Makefile Sun Dec 14 15:43:19 2014 (r374713) +++ head/devel/tex-kpathsea/Makefile Sun Dec 14 16:33:25 2014 (r374714) @@ -2,6 +2,7 @@ PORTNAME= kpathsea PORTVERSION= 6.2.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ PKGNAMEPREFIX= tex- @@ -16,10 +17,24 @@ USE_LDCONFIG= yes USE_TEX= yes EXTRACT_AFTER_ARGS= ${EXTRACT_FILES} EXTRACT_FILES= ${DISTNAME}/build-aux \ - ${DISTNAME}/texk/kpathsea + ${DISTNAME}/texk/kpathsea \ + ${DISTNAME}/texk/texlive/tl_scripts WRKSRC= ${WRKDIR}/${DISTNAME}/texk/kpathsea GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip INFO= kpathsea +post-install: + cd ${WRKDIR}/${DISTNAME}/texk/texlive/tl_scripts && \ + for f in kpsetool kpsewhere; do \ + ${INSTALL_SCRIPT} $${f}.sh ${STAGEDIR}${PREFIX}/bin/$$f; \ + ${INSTALL_MAN} $${f}.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1/$${f}.1; \ + done; \ + for l in kpsexpand kpsepath; do \ + ${LN} -sf kpsetool ${STAGEDIR}${PREFIX}/bin/$$l; \ + ${LN} -sf kpsetool.1 ${STAGEDIR}${MANPREFIX}/man/man1/$${l}.1; \ + done + .include Modified: head/devel/tex-kpathsea/pkg-plist ============================================================================== --- head/devel/tex-kpathsea/pkg-plist Sun Dec 14 15:43:19 2014 (r374713) +++ head/devel/tex-kpathsea/pkg-plist Sun Dec 14 16:33:25 2014 (r374714) @@ -7,6 +7,10 @@ bin/mktexmf bin/mktexpk bin/mktextfm bin/texhash +bin/kpsewhere +bin/kpsetool +bin/kpsexpand +bin/kpsepath include/kpathsea/absolute.h include/kpathsea/c-auto.h include/kpathsea/c-ctype.h @@ -57,6 +61,10 @@ man/man1/kpseaccess.1.gz man/man1/kpsereadlink.1.gz man/man1/kpsestat.1.gz man/man1/kpsewhich.1.gz +man/man1/kpsepath.1.gz +man/man1/kpsetool.1.gz +man/man1/kpsewhere.1.gz +man/man1/kpsexpand.1.gz man/man1/mktexlsr.1.gz man/man1/mktexmf.1.gz man/man1/mktexpk.1.gz Modified: head/print/texlive-base/Makefile ============================================================================== --- head/print/texlive-base/Makefile Sun Dec 14 15:43:19 2014 (r374713) +++ head/print/texlive-base/Makefile Sun Dec 14 16:33:25 2014 (r374714) @@ -2,7 +2,7 @@ PORTNAME= texlive PORTVERSION= 20140525 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ PKGNAMESUFFIX= -base @@ -114,6 +114,7 @@ CFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/kpathsea \ -I${LOCALBASE}/include/ptexenc PLIST_SUB= INSTALL_DATA="${INSTALL_DATA}" +INSTALL_TARGET= install-strip SHEBANG_FILES= texk/texlive/linked_scripts/a2ping/a2ping.pl \ texk/texlive/linked_scripts/accfonts/mkt1font \ Modified: head/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in ============================================================================== --- head/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in Sun Dec 14 15:43:19 2014 (r374713) +++ head/print/texlive-base/files/patch-texk-texlive-tl_scripts-Makefile.in Sun Dec 14 16:33:25 2014 (r374714) @@ -1,5 +1,5 @@ ---- ./texk/texlive/tl_scripts/Makefile.in.orig 2013-12-26 00:37:50.000000000 +0900 -+++ ./texk/texlive/tl_scripts/Makefile.in 2014-08-20 23:57:06.000000000 +0900 +--- texk/texlive/tl_scripts/Makefile.in.orig 2013-12-26 00:37:50.000000000 +0900 ++++ texk/texlive/tl_scripts/Makefile.in 2014-12-15 00:41:48.000000000 +0900 @@ -121,10 +121,9 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ @@ -13,7 +13,41 @@ SCRIPTS = $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \ $(nodist_bin_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) -@@ -627,7 +626,7 @@ +@@ -253,8 +252,6 @@ + dvired \ + fmtutil \ + fontinst \ +- kpsetool \ +- kpsewhere \ + ps2frag \ + pslatex \ + rubibtex \ +@@ -283,8 +280,6 @@ + fmtutil.1 \ + fmtutil.cnf.5 \ + fontinst.1 \ +- kpsetool.1 \ +- kpsewhere.1 \ + ps2frag.1 \ + pslatex.1 \ + rubibtex.1 \ +@@ -296,14 +291,10 @@ + + bin_links = \ + allcm:allec \ +- fmtutil:mktexfmt \ +- kpsetool:kpsexpand \ +- kpsetool:kpsepath ++ fmtutil:mktexfmt + + man1_links = \ + fmtutil:fmtutil-sys \ +- kpsetool:kpsexpand \ +- kpsetool:kpsepath \ + fmtutil:mktexfmt \ + texconfig:texconfig-sys \ + updmap:updmap-sys +@@ -627,7 +618,7 @@ check: check-am all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local installdirs: @@ -22,7 +56,7 @@ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -681,8 +680,8 @@ +@@ -681,8 +672,8 @@ info-am: Modified: head/print/texlive-base/pkg-plist ============================================================================== --- head/print/texlive-base/pkg-plist Sun Dec 14 15:43:19 2014 (r374713) +++ head/print/texlive-base/pkg-plist Sun Dec 14 16:33:25 2014 (r374714) @@ -99,10 +99,6 @@ bin/kanji-config-updmap bin/kanji-config-updmap-sys bin/kanji-fontmap-creator bin/komkindex -bin/kpsepath -bin/kpsetool -bin/kpsewhere -bin/kpsexpand bin/lacheck bin/latex-git-log bin/latex2man @@ -283,10 +279,6 @@ man/man1/fmtutil.1.gz man/man1/fontinst.1.gz man/man1/gsftopk.1.gz man/man1/hbf2gf.1.gz -man/man1/kpsepath.1.gz -man/man1/kpsetool.1.gz -man/man1/kpsewhere.1.gz -man/man1/kpsexpand.1.gz man/man1/lacheck.1.gz man/man1/mag.1.gz man/man1/makeindex.1.gz @@ -471,8 +463,6 @@ man/man5/updmap.cfg.5.gz %%TEXMFDISTDIR%%/scripts/texlive/fmtutil-sys.sh %%TEXMFDISTDIR%%/scripts/texlive/fmtutil.sh %%TEXMFDISTDIR%%/scripts/texlive/fontinst.sh -%%TEXMFDISTDIR%%/scripts/texlive/kpsetool.sh -%%TEXMFDISTDIR%%/scripts/texlive/kpsewhere.sh %%TEXMFDISTDIR%%/scripts/texlive/ps2frag.sh %%TEXMFDISTDIR%%/scripts/texlive/pslatex.sh %%TEXMFDISTDIR%%/scripts/texlive/rubibtex.sh From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 16:36:35 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B01CB38; Sun, 14 Dec 2014 16:36:35 +0000 (UTC) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.allbsd.org", Issuer "RapidSSL CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 38008113; Sun, 14 Dec 2014 16:36:34 +0000 (UTC) Received: from alph.d.allbsd.org (alph.d.allbsd.org [IPv6:2001:2f0:104:e010:862b:2bff:febc:8956] (may be forged)) (authenticated bits=56) by mail.allbsd.org (8.14.9/8.14.8) with ESMTP id sBEGaKbw041115 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 15 Dec 2014 01:36:21 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.d.allbsd.org (8.14.9/8.14.8) with ESMTP id sBEGaIuS006154; Mon, 15 Dec 2014 01:36:20 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Mon, 15 Dec 2014 01:35:27 +0900 (JST) Message-Id: <20141215.013527.1306369867527283994.hrs@allbsd.org> To: antoine@FreeBSD.org Subject: Re: svn commit: r374699 - in head/math: . gnuplot gnuplot-tex-extras gnuplot/files From: Hiroki Sato In-Reply-To: References: <201412141203.sBEC3drf037409@svn.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.6 on Emacs 24.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Mon_Dec_15_01_35_27_2014_741)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (mail.allbsd.org [IPv6:2001:2f0:104:e001::32]); Mon, 15 Dec 2014 01:36:26 +0900 (JST) X-Spam-Status: No, score=-98.8 required=13.0 tests=CONTENT_TYPE_PRESENT, RDNS_NONE,USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on gatekeeper.allbsd.org Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 16:36:35 -0000 ----Security_Multipart(Mon_Dec_15_01_35_27_2014_741)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Antoine Brodin wrote in : an> On Sun, Dec 14, 2014 at 1:03 PM, Hiroki Sato wrote: an> > Author: hrs an> > Date: Sun Dec 14 12:03:38 2014 an> > New Revision: 374699 an> > URL: https://svnweb.freebsd.org/changeset/ports/374699 an> > QAT: https://qat.redports.org/buildarchive/r374699/ an> > an> > Log: an> > - Separate TeX style files from math/gnuplot into math/gnuplot-tex-extras an> > to eliminate huge TeXLive dependency. Note that TeX terminal support is an> > still enabled by default because it works without them. an> > an> > - Add Lua dependency to support TeX/Tikz terminal. an> > an> > Approved by: glewis (maintainer) an> an> Hi, an> an> This is now broken: an> an> checking for kpsexpand... no an> checking for texhash... texhash an> configure: error: You tell me to use kpsexpand, but there is no kpsexpand Gr, sorry. r374714 should fix this. -- Hiroki ----Security_Multipart(Mon_Dec_15_01_35_27_2014_741)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlSNvE8ACgkQTyzT2CeTzy3EwACfZxBUqexiMjvXzOM0JJ21b+Rh dOcAoLWjDN8tp8Ub/Zq+AkUY7PIHbxgK =dfs4 -----END PGP SIGNATURE----- ----Security_Multipart(Mon_Dec_15_01_35_27_2014_741)---- From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 17:25:02 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A597F2F7; Sun, 14 Dec 2014 17:25: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 9158A7DA; Sun, 14 Dec 2014 17:25:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEHP2Zl095336; Sun, 14 Dec 2014 17:25:02 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEHP2lU095335; Sun, 14 Dec 2014 17:25:02 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201412141725.sBEHP2lU095335@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sun, 14 Dec 2014 17:25:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374715 - head/devel/omniNotify/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 17:25:02 -0000 Author: thierry Date: Sun Dec 14 17:25:01 2014 New Revision: 374715 URL: https://svnweb.freebsd.org/changeset/ports/374715 QAT: https://qat.redports.org/buildarchive/r374715/ Log: Unbreak on FreeBSD-11. Submitted by: Stas Timokhin Modified: head/devel/omniNotify/files/patch-configure Modified: head/devel/omniNotify/files/patch-configure ============================================================================== --- head/devel/omniNotify/files/patch-configure Sun Dec 14 16:33:25 2014 (r374714) +++ head/devel/omniNotify/files/patch-configure Sun Dec 14 17:25:01 2014 (r374715) @@ -1,6 +1,6 @@ ---- configure.orig 2003-10-12 13:51:19.000000000 -0500 -+++ configure -@@ -2952,9 +2952,15 @@ case "$host" in +--- configure.orig 2003-10-13 01:51:19.000000000 +0700 ++++ configure 2014-12-14 18:57:55.000000000 +0600 +@@ -2952,9 +2952,16 @@ *-*-irix*) platform_name="IRIX"; os_version="6";; *-*-aix*) platform_name="AIX"; os_version="4";; *-*-darwin*) platform_name="Darwin"; os_version="1";; @@ -16,6 +16,7 @@ + *-*-freebsd8.*) platform_name="FreeBSD"; os_version="5";; + *-*-freebsd9.*) platform_name="FreeBSD"; os_version="5";; + *-*-freebsd10.*) platform_name="FreeBSD"; os_version="5";; ++ *-*-freebsd11.*) platform_name="FreeBSD"; os_version="5";; *-*-sco*) platform_name="OSR5"; os_version="5";; esac From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 17:29:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4807B543; Sun, 14 Dec 2014 17:29:22 +0000 (UTC) Received: from mail.egr.msu.edu (gribble.egr.msu.edu [35.9.37.169]) by mx1.freebsd.org (Postfix) with ESMTP id 20DA9803; Sun, 14 Dec 2014 17:29:21 +0000 (UTC) Received: from gribble (localhost [127.0.0.1]) by mail.egr.msu.edu (Postfix) with ESMTP id 9AB24197DB; Sun, 14 Dec 2014 12:19:17 -0500 (EST) X-Virus-Scanned: amavisd-new at egr.msu.edu Received: from mail.egr.msu.edu ([127.0.0.1]) by gribble (gribble.egr.msu.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D-1NcVmjvLgI; Sun, 14 Dec 2014 12:19:17 -0500 (EST) Received: from EGR authenticated sender Message-ID: <548DC694.4030701@egr.msu.edu> Date: Sun, 14 Dec 2014 12:19:16 -0500 From: Adam McDougall User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: svn-ports-all@freebsd.org Subject: Re: Forbidden due to CVE-2014-8298: nvidia-driver-173, nvidia-driver-96, nvidia-driver-71 References: <201412141121.sBEBLsvP017491@svn.freebsd.org> <20141214114244.GA2487@FreeBSD.org> In-Reply-To: <20141214114244.GA2487@FreeBSD.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: danfe@FreeBSD.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 17:29:22 -0000 On 12/14/2014 06:42, Alexey Dokuchaev wrote: > On Sun, Dec 14, 2014 at 11:21:54AM +0000, Alexey Dokuchaev wrote: >> New Revision: 374697 >> URL: https://svnweb.freebsd.org/changeset/ports/374697 >> QAT: https://qat.redports.org/buildarchive/r374697/ >> >> Log: >> Mark legacy branches -173, -96, and -71 as FORBIDDEN: they are >> unsupported by NVidia and no security updates for them were issued >> to fix CVE-2014-8298. >> >> Security: fdf72a0e-8371-11e4-bc20-001636d274f3 > > I've marked these ports FORBIDDEN for now, but their fate yet to be decided. > Last update to -173 legacy branch, 173.14.39 added support for X.org xserver > ABI 15 (xorg-server 1.15), and it was confirmed to work with upcoming v1.14 > update (PR 195781), so it would be unfortunate to lose it just because NVidia > does not care about it anymore and won't provide a fix CVE-2014-8298. > > On the other hand, NVidia did provide mitigation techniques: > > - Configure the X server to prohibit X connections from the local area > network (by passing the "-nolisten tcp" command line option to the X.Org > X server) -- which we also default to, or > - Disable GLX indirect contexts. With any of the fixed NVIDIA driver > versions mentioned above, indirect GLX contexts can be prohibited by > setting the "AllowIndirectGLXProtocol" X configuration option to False, > or setting the "-iglx" X server command line option on X.Org 1.16 or > newer. > > So perhaps instead of forbidding them and subsequently removing, we can > provide pkg-message that tells users what are they facing and how to stay > safe (with an legal bla-bla about that FreeBSD cannot guarantee anything > if you use this vulnerable, unmaintained upstream port)? > > I wonder what other people think. > > ./danfe I'm worried about whether people will see it. At least the nvidia driver has a higher chance of being installed individually rather than in a large list of ports or packages where the message will be lost in the noise. When I setup a new computer, I still don't install them one by one. For hardware that is so old that people need a legacy driver, maybe people should just have to be pointed at instructions in the Makefile and cause them make to make their own decision? Can they be marked FORBIDDEN with the explanations you provided above, but kept for some period of time? Maybe a note to email a particular address if you still benefit from this driver, and if nobody emails within a year, remove it? It just feels wrong to me for FreeBSD to willfully allow installation of known vulnerable software, even if it is more convenient. From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 17:44:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29FC98D5; Sun, 14 Dec 2014 17:44: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 1624998D; Sun, 14 Dec 2014 17:44:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEHiahh005329; Sun, 14 Dec 2014 17:44:36 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEHiaV8005327; Sun, 14 Dec 2014 17:44:36 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201412141744.sBEHiaV8005327@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 14 Dec 2014 17:44:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374716 - head/www/speedtest-mini X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 17:44:37 -0000 Author: riggs Date: Sun Dec 14 17:44:35 2014 New Revision: 374716 URL: https://svnweb.freebsd.org/changeset/ports/374716 QAT: https://qat.redports.org/buildarchive/r374716/ Log: - Install missing file latency.txt - Bump PORTREVISION PR: 195673 Submitted by: meta+ports@vmeta.jp (maintainer) Modified: head/www/speedtest-mini/Makefile head/www/speedtest-mini/pkg-plist Modified: head/www/speedtest-mini/Makefile ============================================================================== --- head/www/speedtest-mini/Makefile Sun Dec 14 17:25:01 2014 (r374715) +++ head/www/speedtest-mini/Makefile Sun Dec 14 17:44:35 2014 (r374716) @@ -3,6 +3,7 @@ PORTNAME= speedtest-mini PORTVERSION= 2.1.8.20141003 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://c.speedtest.net/mini/ @@ -26,5 +27,7 @@ do-install: ${STAGEDIR}${WWWDIR}/speedtest ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/speedtest/upload.php \ ${STAGEDIR}${WWWDIR}/speedtest + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/speedtest/latency.txt \ + ${STAGEDIR}${WWWDIR}/speedtest .include Modified: head/www/speedtest-mini/pkg-plist ============================================================================== --- head/www/speedtest-mini/pkg-plist Sun Dec 14 17:25:01 2014 (r374715) +++ head/www/speedtest-mini/pkg-plist Sun Dec 14 17:44:35 2014 (r374716) @@ -2,6 +2,7 @@ @group %%WWWGRP%% %%WWWDIR%%/index.html %%WWWDIR%%/speedtest.swf +%%WWWDIR%%/speedtest/latency.txt %%WWWDIR%%/speedtest/random1000x1000.jpg %%WWWDIR%%/speedtest/random1500x1500.jpg %%WWWDIR%%/speedtest/random2000x2000.jpg From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 17:56:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3F1DB9E; Sun, 14 Dec 2014 17:56: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 AD4DBA86; Sun, 14 Dec 2014 17:56:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEHuJ0n010783; Sun, 14 Dec 2014 17:56:19 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEHuF5n010764; Sun, 14 Dec 2014 17:56:15 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201412141756.sBEHuF5n010764@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sun, 14 Dec 2014 17:56:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374717 - in head/mail: . cclient imap-uw panda-cclient panda-cclient/files panda-imap panda-imap/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 17:56:20 -0000 Author: thierry Date: Sun Dec 14 17:56:14 2014 New Revision: 374717 URL: https://svnweb.freebsd.org/changeset/ports/374717 QAT: https://qat.redports.org/buildarchive/r374717/ Log: Adding mail/panda-cclient and mail/panda-imap. Since Mark Crispin left the UW, development on UW-IMAP paused. Mark however continued developing the toolkit under the name Panda-IMAP. Since Mark passed, Jonathan Abbey created a project on GitHub, by concatenating all of the public releases of UW IMAP with the last version of Panda IMAP. Add conflict lines with the original ports. Added: head/mail/panda-cclient/ - copied from r373160, head/mail/cclient/ head/mail/panda-imap/ - copied from r373160, head/mail/imap-uw/ Modified: head/mail/Makefile head/mail/cclient/Makefile head/mail/imap-uw/Makefile head/mail/panda-cclient/Makefile head/mail/panda-cclient/distinfo head/mail/panda-cclient/files/patch-src_osdep_unix_Makefile head/mail/panda-cclient/pkg-descr head/mail/panda-imap/Makefile head/mail/panda-imap/distinfo head/mail/panda-imap/files/patch-src-osdep-unix-env_unix.c head/mail/panda-imap/files/patch-src_imapd_Makefile head/mail/panda-imap/files/patch-src_imapd_imapd.c head/mail/panda-imap/pkg-descr head/mail/panda-imap/pkg-plist Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Sun Dec 14 17:44:35 2014 (r374716) +++ head/mail/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -422,6 +422,8 @@ SUBDIR += p5-WWW-Hotmail SUBDIR += p5-ZConf-Mail SUBDIR += p5-qpsmtpd + SUBDIR += panda-cclient + SUBDIR += panda-imap SUBDIR += pantomime SUBDIR += pathalias SUBDIR += pear-Contact_Vcard_Build Modified: head/mail/cclient/Makefile ============================================================================== --- head/mail/cclient/Makefile Sun Dec 14 17:44:35 2014 (r374716) +++ head/mail/cclient/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -19,6 +19,8 @@ COMMENT= Mark Crispin's C-client mail ac LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +CONFLICTS_INSTALL= panda-cclient-20* + OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT IPV6 MBX_DEFAULT OPTIONS_DEFAULT= SSL SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL Modified: head/mail/imap-uw/Makefile ============================================================================== --- head/mail/imap-uw/Makefile Sun Dec 14 17:44:35 2014 (r374716) +++ head/mail/imap-uw/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -18,7 +18,9 @@ COMMENT= University of Washington IMAP4r LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libc-client4.so:${PORTSDIR}/mail/cclient +LIB_DEPENDS= libc-client4.so.9:${PORTSDIR}/mail/cclient + +CONFLICTS_INSTALL= panda-imap-20* DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message Modified: head/mail/panda-cclient/Makefile ============================================================================== --- head/mail/cclient/Makefile Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-cclient/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -2,22 +2,24 @@ # $FreeBSD$ PORTNAME= cclient -PORTVERSION= 2007f -PORTREVISION= 1 -PORTEPOCH= 1 +PORTVERSION= 20130621 CATEGORIES= mail devel ipv6 -MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ - http://atreides.freenix.no/~anders/%SUBDIR%/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/imap/%SUBDIR%/ \ - ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ -MASTER_SITE_SUBDIR= . old -DISTNAME= imap-${PORTVERSION} +PKGNAMEPREFIX= panda- +DISTNAME= panda-imap-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= Mark Crispin's C-client mail access routines +MAINTAINER= thierry@FreeBSD.org +COMMENT= Mark Crispin's C-client mail access routines forked from UW LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_FILE= ${WRKSRC}/LICENSE + +USE_GITHUB= yes +GH_ACCOUNT= jonabbey +GH_PROJECT= ${PORTNAME} +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 7905901 + +CONFLICTS_INSTALL= cclient-20* OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT IPV6 MBX_DEFAULT OPTIONS_DEFAULT= SSL @@ -47,34 +49,34 @@ MAKE_ARGS+= SSLTYPE=unix.nopwd SSLDIR=${ .endif .endif -WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${DISTNAME:C|${PORTVERSION}|${GH_COMMIT}|} MAKE_ARGS+= EXTRACFLAGS="${CFLAGS}" SHLIBBASE= c-client4 -SHLIBMAJ= 9 +SHLIBMAJ= 10 SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ} MAKE_ENV+= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} -post-patch: +pre-configure: .for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss - @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file} + ${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file} .endfor - @${REINPLACE_CMD} -e "s:/etc/ssl/certs:${PREFIX}/certs:g; \ + ${REINPLACE_CMD} -e "s:/etc/ssl/certs:${PREFIX}/certs:g; \ s:/etc/ssl/private:${PREFIX}/certs:g" ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e "s:/etc/c-client.cf:${PREFIX}/etc/c-client.cf:" \ + ${REINPLACE_CMD} -e "s:/etc/c-client.cf:${PREFIX}/etc/c-client.cf:" \ ${WRKSRC}/src/osdep/unix/env_unix.h .if ${PORT_OPTIONS:MSSL} - @${REINPLACE_CMD} -e " \ + ${REINPLACE_CMD} -e " \ s:SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib:SSLINCLUDE=${OPENSSLINC} SSLLIB=${OPENSSLLIB}: \ " ${WRKSRC}/Makefile .endif .if ${PORT_OPTIONS:MIPV6} - @${REINPLACE_CMD} -e "s|^IP=4|IP=6|" ${WRKSRC}/Makefile \ + ${REINPLACE_CMD} -e "s|^IP=4|IP=6|" ${WRKSRC}/Makefile \ ${WRKSRC}/src/osdep/unix/Makefile .endif .if ${PORT_OPTIONS:MMBX_DEFAULT} - @${REINPLACE_CMD} -e "s|^CREATEPROTO=unixproto|CREATEPROTO=mbxproto|" \ + ${REINPLACE_CMD} -e "s|^CREATEPROTO=unixproto|CREATEPROTO=mbxproto|" \ ${WRKSRC}/src/osdep/unix/Makefile .endif Modified: head/mail/panda-cclient/distinfo ============================================================================== --- head/mail/cclient/distinfo Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-cclient/distinfo Sun Dec 14 17:56:14 2014 (r374717) @@ -1,2 +1,2 @@ -SHA256 (imap-2007f.tar.gz) = 53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28 -SIZE (imap-2007f.tar.gz) = 1990304 +SHA256 (panda-imap-20130621.tar.gz) = 75696352efb56ac1c652e8df4f54ea6c3160fd6aa2cf078f793fac06733bc5b1 +SIZE (panda-imap-20130621.tar.gz) = 2065425 Modified: head/mail/panda-cclient/files/patch-src_osdep_unix_Makefile ============================================================================== --- head/mail/cclient/files/patch-src_osdep_unix_Makefile Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-cclient/files/patch-src_osdep_unix_Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -1,254 +1,152 @@ -*** src/osdep/unix/Makefile.orig Sun Jun 17 17:37:44 2007 ---- src/osdep/unix/Makefile Mon Jul 23 16:30:12 2007 -*************** -*** 28,36 **** - - EXTRAAUTHENTICATORS= - EXTRADRIVERS=mbox -! PASSWDTYPE=std -! SSLTYPE=nopwd -! IP=4 - - - # The optimization level here for GCC ports is set here for a reason. It's ---- 28,36 ---- - - EXTRAAUTHENTICATORS= - EXTRADRIVERS=mbox -! PASSWDTYPE=pam -! SSLTYPE=unix.nopwd -! IP=6 - - - # The optimization level here for GCC ports is set here for a reason. It's -*************** -*** 54,66 **** - - # Extended flags needed for SSL. You may need to modify. - -! SSLDIR=/usr/local/ssl -! SSLCERTS=$(SSLDIR)/certs - SSLKEYS=$(SSLCERTS) - SSLINCLUDE=$(SSLDIR)/include - SSLLIB=$(SSLDIR)/lib - -! SSLCRYPTO=-lcrypto - - # Older versions of MIT Kerberos also have a libcrypto. If so, you may need - # to use this instead ---- 54,66 ---- - - # Extended flags needed for SSL. You may need to modify. - -! #SSLDIR=/usr/local/ssl -! SSLCERTS=$(PREFIX)/certs - SSLKEYS=$(SSLCERTS) - SSLINCLUDE=$(SSLDIR)/include - SSLLIB=$(SSLDIR)/lib - -! SSLCRYPTO=-lcrypto -lcrypt - - # Older versions of MIT Kerberos also have a libcrypto. If so, you may need - # to use this instead -*************** -*** 87,93 **** - # AFSLDFLAGS may also need -L/usr/ucblib -lucb - DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" - DCELDFLAGS= -ldce -! PAMLDFLAGS= -lpam -ldl - - - # Build parameters normally set by the individual port ---- 87,93 ---- - # AFSLDFLAGS may also need -L/usr/ucblib -lucb - DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" - DCELDFLAGS= -ldce -! PAMLDFLAGS= # -lpam -lcrypt - - - # Build parameters normally set by the individual port -*************** -*** 125,131 **** - # Commands possibly overriden by the individual port - - ARRC=ar rc -! CC=cc - LN=ln -s - RANLIB=ranlib - ---- 125,131 ---- - # Commands possibly overriden by the individual port - - ARRC=ar rc -! #CC=cc - LN=ln -s - RANLIB=ranlib - -*************** -*** 149,155 **** - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o -! CFLAGS=-g - - CAT=cat - MAKE=make ---- 149,155 ---- - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o -! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) - - CAT=cat - MAKE=make -*************** -*** 166,171 **** ---- 166,175 ---- - PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) - - -+ # Need this for the shared library rule to work correctly -+ .SUFFIXES: .o .so -+ SOFILES=${BINARIES:.o=.so} -+ - # Here if no make argument established - - missing: osdep.h -*************** -*** 246,258 **** - BASECFLAGS="-g -Dconst=" - - bsf: # FreeBSD -! $(BUILD) `$(CAT) SPECIALS` OS=$@ \ - SIGTYPE=psx CRXTYPE=nfs \ - SPOOLDIR=/var \ - ACTIVEFILE=/usr/local/news/lib/active \ - RSHPATH=/usr/bin/rsh \ - BASECFLAGS="$(GCCCFLAGS)" \ -! BASELDFLAGS="-lcrypt" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ ---- 250,263 ---- - BASECFLAGS="-g -Dconst=" - - bsf: # FreeBSD -! $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \ - SIGTYPE=psx CRXTYPE=nfs \ - SPOOLDIR=/var \ - ACTIVEFILE=/usr/local/news/lib/active \ - RSHPATH=/usr/bin/rsh \ -+ LOCKPGM=$(PREFIX)/libexec/mlock \ - BASECFLAGS="$(GCCCFLAGS)" \ -! BASELDFLAGS="-lpam" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -*************** -*** 840,862 **** - - # Build it! - -! build: clean once $(ARCHIVE) - -! all: $(ARCHIVE) - - $(ARCHIVE): $(BINARIES) - sh -c '$(RM) $(ARCHIVE) || true' - @$(CAT) ARCHIVE - @$(SH) ARCHIVE - - .c.o: -! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c - - - # Cleanup - - clean: - sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' - - - # Dependencies ---- 845,875 ---- - - # Build it! - -! build: clean once $(ARCHIVE) $(SHLIBNAME) - -! all: $(ARCHIVE) $(SHLIBNAME) - - $(ARCHIVE): $(BINARIES) - sh -c '$(RM) $(ARCHIVE) || true' - @$(CAT) ARCHIVE - @$(SH) ARCHIVE - -+ $(SHLIBNAME): $(SOFILES) -+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` -+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so -+ -+ .c.so: osdep.h -+ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@ -+ - .c.o: -! $(CC) -c `cat CFLAGS` $*.c - - - # Cleanup - - clean: - sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' -+ sh -c '$(RM) *.so $(SHLIBNAME)' - - - # Dependencies -*************** -*** 891,897 **** - - # OS-dependent - -! osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ - osdep.h env_unix.h tcp_unix.h \ - osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\ - auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ ---- 904,910 ---- - - # OS-dependent - -! OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ - osdep.h env_unix.h tcp_unix.h \ - osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\ - auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ -*************** -*** 905,916 **** - write.c sslstdio.c \ - strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ - OSCFLAGS - @echo Building OS-dependent module - @echo If you get No such file error messages for files x509.h, ssl.h, - @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL - @echo is not installed on your system. Either install OpenSSL first - @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none -! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c - - osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c - $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c ---- 918,936 ---- - write.c sslstdio.c \ - strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ - OSCFLAGS -+ -+ osdep.o: $(OSDEPS) -+ $(CC) `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c -+ @echo ======================================================================== - @echo Building OS-dependent module - @echo If you get No such file error messages for files x509.h, ssl.h, - @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL - @echo is not installed on your system. Either install OpenSSL first - @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none -! @echo ======================================================================== -! -! osdep.so: $(OSDEPS) -! $(CC) -fPIC -DPIC -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c -o $@ - - osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c - $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c +--- src/osdep/unix/Makefile.orig 2013-06-21 23:29:17.000000000 +0200 ++++ src/osdep/unix/Makefile 2014-12-01 22:35:23.000000000 +0100 +@@ -30,9 +30,9 @@ + + EXTRAAUTHENTICATORS= + EXTRADRIVERS=mbox +-PASSWDTYPE=std +-SSLTYPE=nopwd +-IP=4 ++PASSWDTYPE=pam ++SSLTYPE=unix.nopwd ++IP=6 + + + # The optimization level here for GCC ports is set here for a reason. It's +@@ -56,13 +56,13 @@ + + # Extended flags needed for SSL. You may need to modify. + +-SSLDIR=/usr/local/ssl +-SSLCERTS=$(SSLDIR)/certs ++#SSLDIR=/usr/local/ssl ++SSLCERTS=$(PREFIX)/certs + SSLKEYS=$(SSLCERTS) + SSLINCLUDE=$(SSLDIR)/include + SSLLIB=$(SSLDIR)/lib + +-SSLCRYPTO=-lcrypto ++SSLCRYPTO=-lcrypto -lcrypt + + # Older versions of MIT Kerberos also have a libcrypto. If so, you may need + # to use this instead +@@ -89,7 +89,7 @@ + # AFSLDFLAGS may also need -L/usr/ucblib -lucb + DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" + DCELDFLAGS= -ldce +-PAMLDFLAGS= -lpam -ldl ++PAMLDFLAGS= # -lpam -lcrypt + + + # Build parameters normally set by the individual port +@@ -132,7 +132,7 @@ + # Commands possibly overriden by the individual port + + ARRC=ar rc +-CC=cc ++#CC=cc + LN=ln -s + RANLIB=ranlib + +@@ -156,7 +156,7 @@ + dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ + rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ + unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o +-CFLAGS=-g ++CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) + + CAT=cat + MAKE=make +@@ -173,6 +173,10 @@ + PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) + + ++# Need this for the shared library rule to work correctly ++.SUFFIXES: .o .so ++SOFILES=${BINARIES:.o=.so} ++ + # Here if no make argument established + + missing: osdep.h +@@ -261,13 +265,14 @@ + BASECFLAGS="-g -Dconst=" + + bsf: # FreeBSD +- $(BUILD) `$(CAT) SPECIALS` OS=$@ \ ++ $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \ + SIGTYPE=psx CRXTYPE=nfs \ + SPOOLDIR=/var \ + ACTIVEFILE=/usr/local/news/lib/active \ + RSHPATH=/usr/bin/rsh \ ++ LOCKPGM=$(PREFIX)/libexec/mlock \ + BASECFLAGS="$(GCCCFLAGS)" \ +- BASELDFLAGS="-lcrypt" ++ BASELDFLAGS="-lpam" + + bsi: # BSD/i386 + $(BUILD) `$(CAT) SPECIALS` OS=$@ \ +@@ -863,23 +868,31 @@ + + # Build it! + +-build: clean once $(ARCHIVE) ++build: clean once $(ARCHIVE) $(SHLIBNAME) + +-all: $(ARCHIVE) ++all: $(ARCHIVE) $(SHLIBNAME) + + $(ARCHIVE): $(BINARIES) + sh -c '$(RM) $(ARCHIVE) || true' + @$(CAT) ./ARCHIVE + @$(SH) ./ARCHIVE + ++$(SHLIBNAME): $(SOFILES) ++ $(CC) -shared -Wl,-soname=$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` ++ $(LN) $(SHLIBNAME) lib$(SHLIBBASE).so ++ ++.c.so: osdep.h ++ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@ ++ + .c.o: +- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c ++ $(CC) -c `cat CFLAGS` $*.c + + + # Cleanup + + clean: + sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' ++ sh -c '$(RM) *.so $(SHLIBNAME)' + + + # Dependencies +@@ -914,7 +927,7 @@ + + # OS-dependent + +-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ ++OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ + osdep.h env_unix.h tcp_unix.h \ + osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\ + auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \ +@@ -928,12 +941,19 @@ + write.c sslstdio.c \ + strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ + OSCFLAGS ++ ++osdep.o: $(OSDEPS) ++ $(CC) `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c ++ @echo ======================================================================== + @echo Building OS-dependent module + @echo If you get No such file error messages for files x509.h, ssl.h, + @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL + @echo is not installed on your system. Either install OpenSSL first + @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none +- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c ++ @echo ======================================================================== ++ ++osdep.so: $(OSDEPS) ++ $(CC) -fPIC -DPIC -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c -o $@ + + osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c + $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c Modified: head/mail/panda-cclient/pkg-descr ============================================================================== --- head/mail/cclient/pkg-descr Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-cclient/pkg-descr Sun Dec 14 17:56:14 2014 (r374717) @@ -2,6 +2,8 @@ C-client is a common API for accessing m the popular PINE mail reader as well as the University of Washington's IMAP server. +This is the version forked from UW by the original author Mark Crispin. + For more information, please see the UW IMAP homepage: WWW: http://www.washington.edu/imap/ Modified: head/mail/panda-imap/Makefile ============================================================================== --- head/mail/imap-uw/Makefile Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -1,24 +1,25 @@ # Created by: pst # $FreeBSD$ -PORTNAME= imap -PORTVERSION= 2007f -PORTEPOCH= 1 +PORTNAME= panda-imap +PORTVERSION= 20130621 CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ - ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ \ - http://atreides.freenix.no/~anders/%SUBDIR%/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/ -MASTER_SITE_SUBDIR= . old -PKGNAMESUFFIX= -uw -MAINTAINER= ports@FreeBSD.org -COMMENT= University of Washington IMAP4rev1/POP2/POP3 mail servers +MAINTAINER= thierry@FreeBSD.org +COMMENT= IMAP4rev1/POP2/POP3 mail servers forked from imap-uw LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libc-client4.so:${PORTSDIR}/mail/cclient +LIB_DEPENDS= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient + +USE_GITHUB= yes +GH_ACCOUNT= jonabbey +GH_PROJECT= ${PORTNAME} +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 7905901 + +CONFLICTS_INSTALL= imap-uw-20* DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message @@ -40,7 +41,7 @@ NETSCAPE_BRAIN_DAMAGE_DESC= See Makefile .include .if ${PORT_OPTIONS:MDRAC} -BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac +BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac MAKE_ARGS+= WITH_DRAC=yes .endif @@ -79,7 +80,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${STAGEDIR}${PREFIX}/libexec/ ${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${STAGEDIR}${PREFIX}/libexec/ ${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${STAGEDIR}${PREFIX}/libexec/ - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g mail -m 2711 \ + ${INSTALL} ${COPY} ${STRIP} \ ${WRKSRC}/mlock/mlock ${STAGEDIR}${PREFIX}/libexec ${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${STAGEDIR}${PREFIX}/bin/mboxtest ${INSTALL_MAN} \ @@ -116,15 +117,15 @@ post-install: .endif .if ${PORT_OPTIONS:MDOCS} ${MKDIR} -m 0755 -p ${STAGEDIR}${DOCSDIR} - @${TAR} -C ${WRKSRC}/docs -cf - . | \ + ${TAR} -C ${WRKSRC}/docs -cf - . | \ (umask 022; ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -) .endif cert: - @${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs - @openssl req -new -x509 -days 365 -nodes -config ${FILESDIR}/imap-uw.cnf -out ${PREFIX}/certs/imapd.pem -keyout ${PREFIX}/certs/imapd.pem - @openssl x509 -subject -dates -fingerprint -noout -in ${PREFIX}/certs/imapd.pem - @${CHMOD} 700 ${PREFIX}/certs/imapd.pem - @${LN} -s ${PREFIX}/certs/imapd.pem ${PREFIX}/certs/ipop3d.pem + ${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs + openssl req -new -x509 -days 365 -nodes -config ${FILESDIR}/imap-uw.cnf -out ${PREFIX}/certs/imapd.pem -keyout ${PREFIX}/certs/imapd.pem + openssl x509 -subject -dates -fingerprint -noout -in ${PREFIX}/certs/imapd.pem + ${CHMOD} 700 ${PREFIX}/certs/imapd.pem + ${LN} -s ${PREFIX}/certs/imapd.pem ${PREFIX}/certs/ipop3d.pem .include Modified: head/mail/panda-imap/distinfo ============================================================================== --- head/mail/imap-uw/distinfo Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/distinfo Sun Dec 14 17:56:14 2014 (r374717) @@ -1,2 +1,2 @@ -SHA256 (imap-2007f.tar.gz) = 53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28 -SIZE (imap-2007f.tar.gz) = 1990304 +SHA256 (panda-imap-20130621.tar.gz) = 75696352efb56ac1c652e8df4f54ea6c3160fd6aa2cf078f793fac06733bc5b1 +SIZE (panda-imap-20130621.tar.gz) = 2065425 Modified: head/mail/panda-imap/files/patch-src-osdep-unix-env_unix.c ============================================================================== --- head/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/files/patch-src-osdep-unix-env_unix.c Sun Dec 14 17:56:14 2014 (r374717) @@ -1,19 +1,11 @@ -*** src/osdep/unix/env_unix.c.orig Tue May 29 22:29:52 2007 ---- src/osdep/unix/env_unix.c Mon Jul 23 17:50:43 2007 -*************** -*** 79,85 **** - static short anonymous = NIL; /* is anonymous */ - static short blackBox = NIL; /* is a black box */ - static short closedBox = NIL; /* is a closed box (uses chroot() jail) */ -! static short restrictBox = NIL; /* is a restricted box */ - static short has_no_life = NIL; /* is a cretin with no life */ - static short hideDotFiles = NIL;/* hide files whose names start with . */ - /* advertise filesystem root */ ---- 79,85 ---- - static short anonymous = NIL; /* is anonymous */ - static short blackBox = NIL; /* is a black box */ - static short closedBox = NIL; /* is a closed box (uses chroot() jail) */ -! static short restrictBox = -1; /* is a restricted box */ - static short has_no_life = NIL; /* is a cretin with no life */ - static short hideDotFiles = NIL;/* hide files whose names start with . */ - /* advertise filesystem root */ +--- src/osdep/unix/env_unix.c.orig 2013-06-21 23:29:17.000000000 +0200 ++++ src/osdep/unix/env_unix.c 2014-11-23 22:48:04.000000000 +0100 +@@ -76,7 +76,7 @@ + static short anonymous = NIL; /* is anonymous */ + static short blackBox = NIL; /* is a black box */ + static short closedBox = NIL; /* is a closed box (uses chroot() jail) */ +-static long restrictBox = NIL; /* is a restricted box */ ++static long restrictBox = -1; /* is a restricted box */ + static short has_no_life = NIL; /* is a cretin with no life */ + /* block environment init */ + static short block_env_init = NIL; Modified: head/mail/panda-imap/files/patch-src_imapd_Makefile ============================================================================== --- head/mail/imap-uw/files/patch-src_imapd_Makefile Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/files/patch-src_imapd_Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -1,85 +1,61 @@ -*** src/imapd/Makefile.orig Thu Aug 31 02:10:44 2006 ---- src/imapd/Makefile Mon Jul 23 18:02:12 2007 -*************** -*** 25,35 **** - # Last Edited: 30 August 2006 - - -! ALERT=/etc/imapd.alert - USERALERT=.imapalert -! SHUTDOWN=/etc/nologin -! ANO=/etc/anonymous.newsgroups -! NNTP=/etc/imapd.nntp - SHELL= /bin/sh - - ---- 25,35 ---- - # Last Edited: 30 August 2006 - - -! ALERT=$(PREFIX)/etc/imapd.alert - USERALERT=.imapalert -! SHUTDOWN=$(PREFIX)/etc/nologin -! ANO=$(PREFIX)/etc/anonymous.newsgroups -! NNTP=$(PREFIX)//etc/imapd.nntp - SHELL= /bin/sh - - -*************** -*** 37,64 **** - # causes the "Manage Mail" menu item to open the given URL, e.g. to point to - # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail - # account management page. -! #NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\" - - - # Get local definitions from c-client directory - -! C = ../c-client -! CCLIENTLIB = $C/c-client.a -! CC = `cat $C/CCTYPE` -! CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \ - -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ - -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\" -! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - - all: imapd - -! imapd: $(CCLIENTLIB) imapd.o - $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) -- -- imapd.o: $C/mail.h $C/misc.h $C/osdep.h -- -- $(CCLIENTLIB): -- cd $C;make - - clean: - rm -f *.o imapd || true ---- 37,63 ---- - # causes the "Manage Mail" menu item to open the given URL, e.g. to point to - # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail - # account management page. -! .if defined(WITH_NETSCAPE_BRAIN_DAMAGE) -! NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\" -! .endif - - - # Get local definitions from c-client directory - -! CFLAGS = -DNFSKLUDGE -I$(LOCALBASE)/include/c-client $(NSBD) \ -! -DANOFILE=\"$(ANO)\" \ - -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ - -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\" -! LDFLAGS+= $(EXTRALDFLAGS) -L$(LOCALBASE)/lib -lc-client4 -! .if defined(WITH_DRAC) -! CFLAGS+= -DETC_DIR=\"$(PREFIX)/etc\" -DDRAC_AUTH -! LDFLAGS+= -ldrac -! .endif - - all: imapd - -! imapd: imapd.o - $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) - - clean: - rm -f *.o imapd || true +--- src/imapd/Makefile.orig 2013-06-21 23:29:17.000000000 +0200 ++++ src/imapd/Makefile 2014-12-14 14:44:16.000000000 +0100 +@@ -26,11 +26,11 @@ + # http://www.apache.org/licenses/LICENSE-2.0 + + +-ALERT=/etc/imapd.alert ++ALERT=$(PREFIX)/etc/imapd.alert + USERALERT=.imapalert +-SHUTDOWN=/etc/nologin +-ANO=/etc/anonymous.newsgroups +-NNTP=/etc/imapd.nntp ++SHUTDOWN=$(PREFIX)/etc/nologin ++ANO=$(PREFIX)/etc/anonymous.newsgroups ++NNTP=$(PREFIX)//etc/imapd.nntp + SHELL= /bin/sh + + +@@ -38,7 +38,9 @@ + # causes the "Manage Mail" menu item to open the given URL, e.g. to point to + # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail + # account management page. +-#NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://sourceforge.net/projects/re-alpine\" ++.if defined(WITH_NETSCAPE_BRAIN_DAMAGE) ++NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://sourceforge.net/projects/re-alpine\" ++.endif + + # Un-comment to enable the ESEARCH command. Unfortunately, the iOS4 Mail + # client misinterprets the ESEARCH results due to an ambiguity in RFC 4731. +@@ -46,23 +48,21 @@ + + # Get local definitions from c-client directory + +-C = ../c-client +-CCLIENTLIB = $C/c-client.a +-CC = `cat $C/CCTYPE` +-CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ESEARCH) -DANOFILE=\"$(ANO)\" \ ++CFLAGS = -DNFSKLUDGE -I$(LOCALBASE)/include/c-client $(NSBD) \ ++ -DANOFILE=\"$(ANO)\" \ + -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ + -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\" +-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` ++LDFLAGS+= $(EXTRALDFLAGS) -L$(LOCALBASE)/lib -lc-client4 ++.if defined(WITH_DRAC) ++CFLAGS+= -DETC_DIR=\"$(PREFIX)/etc\" -DDRAC_AUTH ++LDFLAGS+= -ldrac ++.endif + + all: imapd + +-imapd: $(CCLIENTLIB) imapd.o ++imapd: imapd.o + $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) + +-imapd.o: $C/mail.h $C/misc.h $C/osdep.h +- +-$(CCLIENTLIB): +- cd $C;make + + clean: + rm -f *.o imapd || true Modified: head/mail/panda-imap/files/patch-src_imapd_imapd.c ============================================================================== --- head/mail/imap-uw/files/patch-src_imapd_imapd.c Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/files/patch-src_imapd_imapd.c Sun Dec 14 17:56:14 2014 (r374717) @@ -1,5 +1,5 @@ ---- src/imapd/imapd.c.orig 2008-11-18 19:46:59.000000000 +0100 -+++ src/imapd/imapd.c 2009-01-16 10:23:02.000000000 +0100 +--- src/imapd/imapd.c.orig 2013-06-21 23:29:17.000000000 +0200 ++++ src/imapd/imapd.c 2014-11-23 22:59:07.000000000 +0100 @@ -37,6 +37,11 @@ #include "newsrc.h" #include @@ -12,7 +12,7 @@ #define CRLF PSOUT ("\015\012") /* primary output terpri */ -@@ -207,6 +212,12 @@ +@@ -214,6 +219,12 @@ /* Global storage */ @@ -22,10 +22,10 @@ +extern char *getenv (); +#endif /* DRAC_AUTH */ + - char *version = "404"; /* edit number of this server */ + char *version = "417"; /* edit number of this server */ char *logout = "Logout"; /* syslogreason for logout */ char *goodbye = NIL; /* bye reason */ -@@ -283,7 +294,50 @@ +@@ -294,7 +305,50 @@ msg_string_next, /* get next byte in string structure */ msg_string_setpos /* set position in string structure */ }; @@ -77,7 +77,7 @@ /* Main program */ int main (int argc,char *argv[]) -@@ -1525,6 +1579,9 @@ +@@ -1613,6 +1667,9 @@ lasterror ()); return; } Modified: head/mail/panda-imap/pkg-descr ============================================================================== --- head/mail/imap-uw/pkg-descr Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/pkg-descr Sun Dec 14 17:56:14 2014 (r374717) @@ -1,4 +1,6 @@ This is the IMAP4rev1 server from the University of Washington. Included are (almost) backwards-compatible POP2 and POP3 servers. +This is the version forked from UW by the original author Mark Crispin. + WWW: http://www.washington.edu/imap/ Modified: head/mail/panda-imap/pkg-plist ============================================================================== --- head/mail/imap-uw/pkg-plist Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/pkg-plist Sun Dec 14 17:56:14 2014 (r374717) @@ -5,7 +5,7 @@ bin/tmail libexec/imapd libexec/ipop2d libexec/ipop3d -libexec/mlock +@(,mail,2711) libexec/mlock man/man1/dmail.1.gz man/man1/mailutil.1.gz man/man1/tmail.1.gz @@ -22,9 +22,6 @@ man/man8/imapd.8.gz %%PORTDOCS%%%%DOCSDIR%%/bugs.txt %%PORTDOCS%%%%DOCSDIR%%/calendar.txt %%PORTDOCS%%%%DOCSDIR%%/commndmt.txt -%%PORTDOCS%%%%DOCSDIR%%/draft/README -%%PORTDOCS%%%%DOCSDIR%%/draft/i18n.txt -%%PORTDOCS%%%%DOCSDIR%%/draft/sort.txt %%PORTDOCS%%%%DOCSDIR%%/drivers.txt %%PORTDOCS%%%%DOCSDIR%%/formats.txt %%PORTDOCS%%%%DOCSDIR%%/imaprc.txt @@ -33,6 +30,7 @@ man/man8/imapd.8.gz %%PORTDOCS%%%%DOCSDIR%%/md5.txt %%PORTDOCS%%%%DOCSDIR%%/mixfmt.txt %%PORTDOCS%%%%DOCSDIR%%/naming.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/README %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1732.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1733.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2061.txt @@ -72,8 +70,22 @@ man/man8/imapd.8.gz %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4978.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5032.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5051.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5234.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5092.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5161.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5162.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/README +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5234.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5255.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5256.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5257.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5258.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5259.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5267.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5464.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5465.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5466.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5524.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5530.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5593.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5738.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5788.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5819.txt From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 17:59:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4C38D06; Sun, 14 Dec 2014 17:59: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 87DFDAA0; Sun, 14 Dec 2014 17:59:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEHxsD0011366; Sun, 14 Dec 2014 17:59:54 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEHxswp011364; Sun, 14 Dec 2014 17:59:54 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201412141759.sBEHxswp011364@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sun, 14 Dec 2014 17:59:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374718 - head/databases/postgresql-repmgr X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 17:59:54 -0000 Author: matthew Date: Sun Dec 14 17:59:53 2014 New Revision: 374718 URL: https://svnweb.freebsd.org/changeset/ports/374718 QAT: https://qat.redports.org/buildarchive/r374718/ Log: Include postgresql loadable module and related sample SQL files into plist. PR: 195718 Submitted by: maintainer (5u623l20@gmail.com) Modified: head/databases/postgresql-repmgr/Makefile head/databases/postgresql-repmgr/pkg-plist Modified: head/databases/postgresql-repmgr/Makefile ============================================================================== --- head/databases/postgresql-repmgr/Makefile Sun Dec 14 17:56:14 2014 (r374717) +++ head/databases/postgresql-repmgr/Makefile Sun Dec 14 17:59:53 2014 (r374718) @@ -3,7 +3,7 @@ PORTNAME= postgresql-repmgr PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= http://www.repmgr.org/download/ DISTNAME= repmgr-${PORTVERSION} @@ -30,5 +30,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/repmgr.sql ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/sql/repmgr_funcs.sql ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/sql/uninstall_repmgr_funcs.sql ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql + ${INSTALL_LIB} ${WRKSRC}/sql/repmgr_funcs.so ${STAGEDIR}${PREFIX}/lib/postgresql + .include Modified: head/databases/postgresql-repmgr/pkg-plist ============================================================================== --- head/databases/postgresql-repmgr/pkg-plist Sun Dec 14 17:56:14 2014 (r374717) +++ head/databases/postgresql-repmgr/pkg-plist Sun Dec 14 17:59:53 2014 (r374718) @@ -1,5 +1,8 @@ bin/repmgr @sample etc/repmgr.conf.sample sbin/repmgrd +lib/postgresql/repmgr_funcs.so %%PORTDOCS%%%%DOCSDIR%%/README.rst %%DATADIR%%/repmgr.sql +%%DATADIR%%/repmgr_funcs.sql +%%DATADIR%%/uninstall_repmgr_funcs.sql From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 18:02:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9EDBFE1; Sun, 14 Dec 2014 18:02:39 +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 295AAB5B; Sun, 14 Dec 2014 18:02:39 +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.15.1/8.15.1) with ESMTPSA id sBEI2XuQ084279 (version=TLSv1 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 14 Dec 2014 18:02:34 GMT (envelope-from matthew@FreeBSD.org) Authentication-Results: smtp.infracaninophile.co.uk; dmarc=none header.from=FreeBSD.org DKIM-Filter: OpenDKIM Filter v2.9.2 smtp.infracaninophile.co.uk sBEI2XuQ084279 Authentication-Results: smtp.infracaninophile.co.uk/sBEI2XuQ084279; dkim=none reason="no signature"; dkim-adsp=none; dkim-atps=neutral Message-ID: <548DD0AF.9090003@FreeBSD.org> Date: Sun, 14 Dec 2014 18:02:23 +0000 From: Matthew Seaman User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; 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-head@freebsd.org Subject: Re: svn commit: r374718 - head/databases/postgresql-repmgr References: <201412141759.sBEHxswp011364@svn.freebsd.org> In-Reply-To: <201412141759.sBEHxswp011364@svn.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="PpwP8stFO2GP31GUscASVoQNtc0P114ie" X-Virus-Scanned: clamav-milter 0.98.5 at lucid-nonsense.infracaninophile.co.uk X-Virus-Status: Clean X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, URIBL_BLOCKED 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 18:02:39 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --PpwP8stFO2GP31GUscASVoQNtc0P114ie Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 14/12/2014 17:59, Matthew Seaman wrote: > Submitted by: maintainer (5u623l20@gmail.com) Errr... that should obviously have said: 'Approved by: maintainer' Matthew --=20 Dr Matthew J Seaman MA, D.Phil. PGP: http://www.infracaninophile.co.uk/pgpkey --PpwP8stFO2GP31GUscASVoQNtc0P114ie 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) iQJ8BAEBCgBmBQJUjdC4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NTNBNjhCOTEzQTRFNkNGM0UxRTEzMjZC QjIzQUY1MThFMUE0MDEzAAoJELsjr1GOGkATHDMP/2BaRcHMAODLvzkf3z9Xd4A2 G57j2fT7/4FC6TtOx3+TvlHFEHgZxXhz6l9z2u+uJLjmgzkx07p+SUgViXwjPrYZ jawEMrETnTedSSUz/uqN+HijNX4uFIMiutJwkUy4QFzt3Zvh6JEj2NZ18C/C5jJg p6wjmSvxV84r00SPmsSNxN4vku2Ph+spmW06hoNtBNw4GdqEpp4oTIXGn6MLeO8c ZKHTpaYLrpUfXUlgAR7CUUalPU93EdYdXQX7doU1Cx6Bm0bvKeZRWh3rFXMagxUO +nBWr0iTUWVi8mq4yKP69YBvK3Ef1bpfjiuQ3PUV/U5ue8ncUsQA2D7yBxcpv2b3 irmiqEmvTRha6OhtZKH+d0xK12Y033PUfIKE3MYz/HZrpkWq9zhQHNkiQxEamV3Y nBqip+iCtmW6D2tUWsENop3ZRMzVCzdQQf0IaLG7l1tjzfWWbGdL090XLCX0BiGS SyNUw0WqDPTlQPe6dOcmtdCz6YGIKpeTYAV4xqsVM9xwTTqnXyoA+UxwzuQaPNc2 3IbY2JkuP7ASeX1JMlg2TnWLpmg2KGvzxH4puv885Vsa1AUMooznL261NoFAHO/8 2XlvyX0Kq5gwUHFswXfPwQpqcql6z6BMW9oXnPmY1On40aLvYKwu0hfYCMW/5voc OKaYY2NTDx6NTqQ0qPe/ =7FJP -----END PGP SIGNATURE----- --PpwP8stFO2GP31GUscASVoQNtc0P114ie-- From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 19:16:20 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3D10950; Sun, 14 Dec 2014 19:16: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 84B0C284; Sun, 14 Dec 2014 19:16:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEJGKpm050500; Sun, 14 Dec 2014 19:16:20 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEJGJAt050497; Sun, 14 Dec 2014 19:16:19 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201412141916.sBEJGJAt050497@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 14 Dec 2014 19:16:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374719 - head/graphics/qgis X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 19:16:20 -0000 Author: riggs Date: Sun Dec 14 19:16:18 2014 New Revision: 374719 URL: https://svnweb.freebsd.org/changeset/ports/374719 QAT: https://qat.redports.org/buildarchive/r374719/ Log: - Update to 2.6.1 - Fix build error for 8.x and 9.x (base flex) PR: 195875 Submitted by: rhurlin@gwdg.de (maintainer) Modified: head/graphics/qgis/Makefile head/graphics/qgis/distinfo head/graphics/qgis/pkg-plist Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Sun Dec 14 17:59:53 2014 (r374718) +++ head/graphics/qgis/Makefile Sun Dec 14 19:16:18 2014 (r374719) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qgis -PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTVERSION= 2.6.1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -12,20 +11,21 @@ COMMENT= Geographical Information System LICENSE= GPLv2 BUILD_DEPENDS= txt2tags:${PORTSDIR}/textproc/txt2tags -LIB_DEPENDS= libgeos.so:${PORTSDIR}/graphics/geos \ - libproj.so:${PORTSDIR}/graphics/proj \ +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libgdal.so:${PORTSDIR}/graphics/gdal \ + libgeos.so:${PORTSDIR}/graphics/geos \ libgsl.so:${PORTSDIR}/math/gsl \ + libproj.so:${PORTSDIR}/graphics/proj \ + libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \ libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \ - libgdal.so:${PORTSDIR}/graphics/gdal \ - libspatialite.so:${PORTSDIR}/databases/spatialite \ libspatialindex.so:${PORTSDIR}/devel/spatialindex \ - libexecinfo.so:${PORTSDIR}/devel/libexecinfo + libspatialite.so:${PORTSDIR}/databases/spatialite WRKSRC= ${WRKDIR}/${PORTNAME}-QGIS-${GH_COMMIT} USE_GITHUB= GH_ACCOUNT= qgis -GH_COMMIT= 5016213 +GH_COMMIT= e2a51df GH_TAGNAME= ${GH_COMMIT} USES= bison cmake fortran gmake python @@ -44,10 +44,13 @@ CMAKE_ARGS+= -Wno-dev .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033 USES+= compiler:features .else USES+= compiler:gcc-c++11-lib +BUILD_DEPENDS+= flex>=2.5.39:${PORTSDIR}/textproc/flex +CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex +CXXFLAGS+= -I${LOCALBASE}/include/flex .endif .if ${PORT_OPTIONS:MGRASS} @@ -104,7 +107,8 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gda ${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \ ${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite + ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:${PORTSDIR}/databases/py-psycopg2 .else CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=FALSE PLIST_SUB+= QGIS_PYTHON="@comment " Modified: head/graphics/qgis/distinfo ============================================================================== --- head/graphics/qgis/distinfo Sun Dec 14 17:59:53 2014 (r374718) +++ head/graphics/qgis/distinfo Sun Dec 14 19:16:18 2014 (r374719) @@ -1,2 +1,2 @@ -SHA256 (qgis-2.6.0.tar.gz) = da73333e65a9e7c3276b68d1b17bd56352a0b6b364d094965437b9dc56b5dedf -SIZE (qgis-2.6.0.tar.gz) = 70096139 +SHA256 (qgis-2.6.1.tar.gz) = dfadd5f088acb1e2e588897857b789bdf89b192238c2d9eeb7382b11312f9f4c +SIZE (qgis-2.6.1.tar.gz) = 70057271 Modified: head/graphics/qgis/pkg-plist ============================================================================== --- head/graphics/qgis/pkg-plist Sun Dec 14 17:59:53 2014 (r374718) +++ head/graphics/qgis/pkg-plist Sun Dec 14 19:16:18 2014 (r374719) @@ -510,17 +510,17 @@ include/qgis/ui_qgsprojectionselectorbas include/qgis/ui_qgsquerybuilderbase.h include/qgis/ui_qgssublayersdialogbase.h lib/libqgis_analysis.so -lib/libqgis_analysis.so.2.6.0 +lib/libqgis_analysis.so.2.6.1 lib/libqgis_core.so -lib/libqgis_core.so.2.6.0 +lib/libqgis_core.so.2.6.1 lib/libqgis_gui.so -lib/libqgis_gui.so.2.6.0 +lib/libqgis_gui.so.2.6.1 lib/libqgis_networkanalysis.so -lib/libqgis_networkanalysis.so.2.6.0 +lib/libqgis_networkanalysis.so.2.6.1 %%GRASS%%lib/libqgisgrass.so -%%GRASS%%lib/libqgisgrass.so.2.6.0 +%%GRASS%%lib/libqgisgrass.so.2.6.1 %%QGIS_PYTHON%%lib/libqgispython.so -%%QGIS_PYTHON%%lib/libqgispython.so.2.6.0 +%%QGIS_PYTHON%%lib/libqgispython.so.2.6.1 lib/qgis/crssync %%GRASS%%lib/qgis/grass/bin/qgis.g.browser %%GRASS%%lib/qgis/grass/modules/qgis.d.rast @@ -1478,6 +1478,7 @@ man/man1/qgis.1.gz %%DATADIR%%/i18n/qgis_fi.qm %%DATADIR%%/i18n/qgis_fr.qm %%DATADIR%%/i18n/qgis_gl.qm +%%DATADIR%%/i18n/qgis_hi.qm %%DATADIR%%/i18n/qgis_hr.qm %%DATADIR%%/i18n/qgis_hu.qm %%DATADIR%%/i18n/qgis_id.qm From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 19:46:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65DD41C1; Sun, 14 Dec 2014 19:46:46 +0000 (UTC) Received: from mail-wi0-x233.google.com (mail-wi0-x233.google.com [IPv6:2a00:1450:400c:c05::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E460A7B2; Sun, 14 Dec 2014 19:46:45 +0000 (UTC) Received: by mail-wi0-f179.google.com with SMTP id ex7so7105357wid.6 for ; Sun, 14 Dec 2014 11:46:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=wF6eUqG9xGVXYSM7PsRoZrgGd/5TgMHH4MaGjBtHsUA=; b=uU4mwMJ6JS5+FH1lap3oMyuEbQ70gj8x09yu0qbhv6agdRa97tz39Erho34BTL+h8U DHZUUtP6gQvHhW6udGUA8NV9Dy6x95t/5qJbpU1HMZijCEVQTDloWYbCJXShfX/vtJau epDGS2wyZ2C7hI4Q6Z1WHtkSw0UA1nZYr9OtGlSZm6U6A6mnZRvkyh3QTNYJ1eAFcvTv VDc2pEPHVr0PyipLMuqLDqvBecPLqf9REwIPclcR4pM1QEnasCFlOCtl1VRzmvHVy+jx i/Pp1sON/DXJwtKNiPCFpv5i6h0LjaYZ4w0lSxr0HcTDRGIMOdaAFiqHQZNfDJUsPHsx aqRQ== X-Received: by 10.180.92.4 with SMTP id ci4mr1210702wib.67.1418586404390; Sun, 14 Dec 2014 11:46:44 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id cp4sm10305499wjb.16.2014.12.14.11.46.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Dec 2014 11:46:43 -0800 (PST) Sender: Baptiste Daroussin Date: Sun, 14 Dec 2014 20:46:41 +0100 From: Baptiste Daroussin To: Thierry Thomas Subject: Re: svn commit: r374717 - in head/mail: . cclient imap-uw panda-cclient panda-cclient/files panda-imap panda-imap/files Message-ID: <20141214194641.GG11655@ivaldir.etoilebsd.net> References: <201412141756.sBEHuF5n010764@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ev7mvGV+3JQuI2Eo" Content-Disposition: inline In-Reply-To: <201412141756.sBEHuF5n010764@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 19:46:46 -0000 --ev7mvGV+3JQuI2Eo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 14, 2014 at 05:56:15PM +0000, Thierry Thomas wrote: > Author: thierry > Date: Sun Dec 14 17:56:14 2014 > New Revision: 374717 > URL: https://svnweb.freebsd.org/changeset/ports/374717 > QAT: https://qat.redports.org/buildarchive/r374717/ >=20 > Log: > Adding mail/panda-cclient and mail/panda-imap. > =20 > Since Mark Crispin left the UW, development on UW-IMAP paused. Mark > however continued developing the toolkit under the name Panda-IMAP. > Since Mark passed, Jonathan Abbey created a project on GitHub, by > concatenating all of the public releases of UW IMAP with the last > version of Panda IMAP. > =20 > Add conflict lines with the original ports. >=20 [...] > the popular PINE mail reader as well as the University of Washington's I= MAP > server. > =20 > +This is the version forked from UW by the original author Mark Crispin. > + > For more information, please see the UW IMAP homepage: > =20 > WWW: http://www.washington.edu/imap/ This WWW line should probably be updated as well to avoid confusion? Best regards, Bapt --ev7mvGV+3JQuI2Eo Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSN6R4ACgkQ8kTtMUmk6EzzrACfVnii+GNx8Dm4XlOMsAO0liCU sS8AoKEfYU3XWPJ9g0TFZPoV9pYp88hO =gPKm -----END PGP SIGNATURE----- --ev7mvGV+3JQuI2Eo-- From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 20:03:30 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C0D84BC; Sun, 14 Dec 2014 20:03: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 377F794B; Sun, 14 Dec 2014 20:03:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEK3UDF074303; Sun, 14 Dec 2014 20:03:30 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEK3T0v074300; Sun, 14 Dec 2014 20:03:29 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201412142003.sBEK3T0v074300@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sun, 14 Dec 2014 20:03:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374720 - in head/mail: panda-cclient panda-imap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 20:03:30 -0000 Author: thierry Date: Sun Dec 14 20:03:28 2014 New Revision: 374720 URL: https://svnweb.freebsd.org/changeset/ports/374720 QAT: https://qat.redports.org/buildarchive/r374720/ Log: Change the WWW: line to avoid confusion. Suggested by: bapt Modified: head/mail/panda-cclient/pkg-descr head/mail/panda-imap/pkg-descr Modified: head/mail/panda-cclient/pkg-descr ============================================================================== --- head/mail/panda-cclient/pkg-descr Sun Dec 14 19:16:18 2014 (r374719) +++ head/mail/panda-cclient/pkg-descr Sun Dec 14 20:03:28 2014 (r374720) @@ -4,6 +4,6 @@ server. This is the version forked from UW by the original author Mark Crispin. -For more information, please see the UW IMAP homepage: +For more information, please see the repository homepage: -WWW: http://www.washington.edu/imap/ +WWW: https://github.com/jonabbey/panda-imap Modified: head/mail/panda-imap/pkg-descr ============================================================================== --- head/mail/panda-imap/pkg-descr Sun Dec 14 19:16:18 2014 (r374719) +++ head/mail/panda-imap/pkg-descr Sun Dec 14 20:03:28 2014 (r374720) @@ -3,4 +3,4 @@ Included are (almost) backwards-compatib This is the version forked from UW by the original author Mark Crispin. -WWW: http://www.washington.edu/imap/ +WWW: https://github.com/jonabbey/panda-imap From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 20:32:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 30D9E9DC; Sun, 14 Dec 2014 20:32: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 035CFC29; Sun, 14 Dec 2014 20:32:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEKWBUh088597; Sun, 14 Dec 2014 20:32:11 GMT (envelope-from vg@FreeBSD.org) Received: (from vg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEKWBvZ088593; Sun, 14 Dec 2014 20:32:11 GMT (envelope-from vg@FreeBSD.org) Message-Id: <201412142032.sBEKWBvZ088593@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vg set sender to vg@FreeBSD.org using -f From: Veniamin Gvozdikov Date: Sun, 14 Dec 2014 20:32:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374721 - head/sysutils/hfsexplorer X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 20:32:12 -0000 Author: vg Date: Sun Dec 14 20:32:10 2014 New Revision: 374721 URL: https://svnweb.freebsd.org/changeset/ports/374721 QAT: https://qat.redports.org/buildarchive/r374721/ Log: - Upgrade to 0.22.1 - Changed positions my name and surname - Moved LICENSE to LICENSE section - Opportunity to build with Java 1.6+ - Fix plist Modified: head/sysutils/hfsexplorer/Makefile head/sysutils/hfsexplorer/pkg-descr head/sysutils/hfsexplorer/pkg-plist Modified: head/sysutils/hfsexplorer/Makefile ============================================================================== --- head/sysutils/hfsexplorer/Makefile Sun Dec 14 20:03:28 2014 (r374720) +++ head/sysutils/hfsexplorer/Makefile Sun Dec 14 20:32:10 2014 (r374721) @@ -1,9 +1,8 @@ -# Created by: Gvozdikov Veniamin +# Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= hfsexplorer -PORTVERSION= 0.21 -PORTREVISION= 1 +PORTVERSION= 0.22.1 CATEGORIES= sysutils java MASTER_SITES= SF/catacombae/HFSExplorer/${PORTVERSION}/ DISTNAME= ${PORTNAME}-0_21-src @@ -11,18 +10,19 @@ DISTNAME= ${PORTNAME}-0_21-src MAINTAINER= vg@FreeBSD.org COMMENT= HFSExplorer read Mac-formatted harddisks and disk images -BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant - LICENSE= GPLv3 +BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant + DESKTOP_ENTRIES="hfsexplorer" "reader Mac-formatted harddisk" \ "${DATADIR}/res/icon.png" "${PORTNAME}" \ "System;Utility;Java;" false USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6 +JAVA_VERSION= 1.6+ OPTIONS_DEFINE= DOCS +NO_ARCH= yes WRKSRC= ${WRKDIR} .include Modified: head/sysutils/hfsexplorer/pkg-descr ============================================================================== --- head/sysutils/hfsexplorer/pkg-descr Sun Dec 14 20:03:28 2014 (r374720) +++ head/sysutils/hfsexplorer/pkg-descr Sun Dec 14 20:32:10 2014 (r374721) @@ -10,4 +10,4 @@ HFSExplorer can also read most .dmg disk partition schemes Master Boot Record, GUID Partition Table and Apple Partition Map natively. -WWW: http://www.catacombae.org/hfsx.html +WWW: http://www.catacombae.org/hfsx.html Modified: head/sysutils/hfsexplorer/pkg-plist ============================================================================== --- head/sysutils/hfsexplorer/pkg-plist Sun Dec 14 20:03:28 2014 (r374720) +++ head/sysutils/hfsexplorer/pkg-plist Sun Dec 14 20:32:10 2014 (r374721) @@ -13,3 +13,9 @@ bin/unhfs.sh %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html %%PORTDOCS%%%%DOCSDIR%%/html/usage.html +@dir %%DATADIR%%/res +@dir %%DATADIR%%/lib +@dir %%DATADIR%% +%%PORTDOCS%%@dir %%DOCSDIR%%/html/img +%%PORTDOCS%%@dir %%DOCSDIR%%/html +%%PORTDOCS%%@dir %%DOCSDIR%% From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 20:43:59 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86C99E97; Sun, 14 Dec 2014 20:43: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 590F5D42; Sun, 14 Dec 2014 20:43:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEKhxtj093757; Sun, 14 Dec 2014 20:43:59 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEKhwuo093755; Sun, 14 Dec 2014 20:43:58 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201412142043.sBEKhwuo093755@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 14 Dec 2014 20:43:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374722 - in head/net-mgmt/p0f: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 20:43:59 -0000 Author: pi Date: Sun Dec 14 20:43:58 2014 New Revision: 374722 URL: https://svnweb.freebsd.org/changeset/ports/374722 QAT: https://qat.redports.org/buildarchive/r374722/ Log: net-mgmt/p0f: fix p0f-sendsyn Submitted by: Anton Yuzhaninov Added: head/net-mgmt/p0f/files/patch-p0f-sendsyn.c (contents, props changed) Modified: head/net-mgmt/p0f/Makefile Modified: head/net-mgmt/p0f/Makefile ============================================================================== --- head/net-mgmt/p0f/Makefile Sun Dec 14 20:32:10 2014 (r374721) +++ head/net-mgmt/p0f/Makefile Sun Dec 14 20:43:58 2014 (r374722) @@ -3,6 +3,7 @@ PORTNAME= p0f PORTVERSION= 3.08b +PORTREVISION= 1 CATEGORIES= net-mgmt security MASTER_SITES= http://lcamtuf.coredump.cx/p0f3/releases/ \ http://fossies.org/unix/privat/ Added: head/net-mgmt/p0f/files/patch-p0f-sendsyn.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/p0f/files/patch-p0f-sendsyn.c Sun Dec 14 20:43:58 2014 (r374722) @@ -0,0 +1,29 @@ +--- tools/p0f-sendsyn.c.orig 2012-01-14 18:01:02.000000000 +0000 ++++ tools/p0f-sendsyn.c 2014-12-11 14:16:03.000000000 +0000 +@@ -122,7 +122,7 @@ + int main(int argc, char** argv) { + + static struct sockaddr_in sin; +- char one = 1; ++ int one = 1; + s32 sock; + u32 i; + +@@ -145,7 +145,7 @@ + + if (sock < 0) PFATAL("Can't open raw socket (you need to be root)."); + +- if (setsockopt(sock, IPPROTO_IP, IP_HDRINCL, (char*)&one, sizeof(char))) ++ if (setsockopt(sock, IPPROTO_IP, IP_HDRINCL, &one, sizeof(one))) + PFATAL("setsockopt() on raw socket failed."); + + sin.sin_family = PF_INET; +@@ -153,7 +153,7 @@ + memcpy(&sin.sin_addr.s_addr, ip4->dst, 4); + + ip4->ver_hlen = 0x45; +- ip4->tot_len = htons(MIN_TCP4 + 24); ++ ip4->tot_len = MIN_TCP4 + 24; /* converted to network order in kernel */ + ip4->ttl = 192; + ip4->proto = PROTO_TCP; + From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 21:19:49 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82AC8567; Sun, 14 Dec 2014 21:19: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 6E7EE103; Sun, 14 Dec 2014 21:19:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBELJnY0009247; Sun, 14 Dec 2014 21:19:49 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBELJn1A009245; Sun, 14 Dec 2014 21:19:49 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412142119.sBELJn1A009245@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 14 Dec 2014 21:19:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374723 - head/games/gnomekiss X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 21:19:49 -0000 Author: amdmi3 Date: Sun Dec 14 21:19:48 2014 New Revision: 374723 URL: https://svnweb.freebsd.org/changeset/ports/374723 QAT: https://qat.redports.org/buildarchive/r374723/ Log: - Add LICENSE - Convert gnomehack to USES=pathfix - Drop @dirrm* from plist Modified: head/games/gnomekiss/Makefile head/games/gnomekiss/pkg-plist Modified: head/games/gnomekiss/Makefile ============================================================================== --- head/games/gnomekiss/Makefile Sun Dec 14 20:43:58 2014 (r374722) +++ head/games/gnomekiss/Makefile Sun Dec 14 21:19:48 2014 (r374723) @@ -10,10 +10,13 @@ MASTER_SITES= http://devel.tlrmx.org/kis MAINTAINER= ports@FreeBSD.org COMMENT= GNOME version of Kisekae Set System +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING + RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha -USES= gettext-tools pkgconfig -USE_GNOME= gnomeprefix gnomehack libgnomeui +USES= gettext-tools pathfix pkgconfig +USE_GNOME= gnomeprefix libgnomeui GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/games/gnomekiss/pkg-plist ============================================================================== --- head/games/gnomekiss/pkg-plist Sun Dec 14 20:43:58 2014 (r374722) +++ head/games/gnomekiss/pkg-plist Sun Dec 14 21:19:48 2014 (r374723) @@ -6,4 +6,3 @@ share/locale/es/LC_MESSAGES/gnomekiss.mo share/locale/es_ES/LC_MESSAGES/gnomekiss.mo share/pixmaps/gnomekiss/besito_sinfondo.png share/pixmaps/gnomekiss/gnome-kiss.png -@dirrm share/pixmaps/gnomekiss From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 21:43:05 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C39178C; Sun, 14 Dec 2014 21:43: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 3E6A2380; Sun, 14 Dec 2014 21:43:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBELh5T2022758; Sun, 14 Dec 2014 21:43:05 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBELh4Lg022753; Sun, 14 Dec 2014 21:43:04 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412142143.sBELh4Lg022753@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 14 Dec 2014 21:43:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374724 - in head/security/strongswan: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 21:43:05 -0000 Author: pawel Date: Sun Dec 14 21:43:03 2014 New Revision: 374724 URL: https://svnweb.freebsd.org/changeset/ports/374724 QAT: https://qat.redports.org/buildarchive/r374724/ Log: - Update to version 5.2.1 [1] - Convert to USES=execinfo - Fix LDAP, MYSQL options PR: 195580 [1] Submitted by: maintainer [1] Deleted: head/security/strongswan/files/patch-src__libhydra__plugins__kernel_pfroute__kernel_pfroute_net.c Modified: head/security/strongswan/Makefile head/security/strongswan/distinfo head/security/strongswan/files/patch-conf__Makefile.in head/security/strongswan/pkg-plist Modified: head/security/strongswan/Makefile ============================================================================== --- head/security/strongswan/Makefile Sun Dec 14 21:19:48 2014 (r374723) +++ head/security/strongswan/Makefile Sun Dec 14 21:43:03 2014 (r374724) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= strongswan -PORTVERSION= 5.2.0 -PORTREVISION= 1 +PORTVERSION= 5.2.1 CATEGORIES= security MASTER_SITES= http://download.strongswan.org/ \ http://download2.strongswan.org/ @@ -11,9 +10,7 @@ MASTER_SITES= http://download.strongswan MAINTAINER= strongswan@nanoteq.com COMMENT= Open Source IKEv2 IPsec-based VPN solution -LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo - -USES= libtool:keepla tar:bzip2 +USES= execinfo libtool:keepla tar:bzip2 USE_OPENSSL= yes USE_RC_SUBR= strongswan GNU_CONFIGURE= yes @@ -41,8 +38,8 @@ CONFIGURE_ARGS= --enable-kernel-pfkey \ --with-lib-prefix=${PREFIX} OPTIONS_DEFINE= CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE IKEv1 \ - IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL SQLITE \ - TESTVECTOR TOOLS UNBOUND XAUTH + IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL PKI SCEP SQLITE \ + TESTVECTOR UNBOUND XAUTH OPTIONS_SUB= yes CURL_DESC= Enable CURL to fetch CRL/OCSP EAPAKA3GPP2_DESC= Enable EAP AKA with 3gpp2 backend @@ -54,7 +51,8 @@ IPSECKEY_DESC= Enable authentication wit KERNELLIBIPSEC_DESC= Enable IPSec userland backend LOADTESTER_DESC= Enable load testing plugin TESTVECTOR_DESC= Enable crypto test vectors -TOOLS_DESC= Enable PKI tools +PKI_DESC= Enable PKI tools +SCEP_DESC= Enable Simple Certificate Enrollment Protocol UNBOUND_DESC= Enable DNSSEC-enabled resolver XAUTH_DESC= Enable XAuth password verification @@ -71,13 +69,14 @@ IPSECKEY_CONFIGURE_ON= --enable-ipseckey KERNELLIBIPSEC_CONFIGURE_ON= --enable-kernel-libipsec LOADTESTER_CONFIGURE_ON=--enable-load-tester LDAP_CONFIGURE_ON= --enable-ldap -LDAP_USE= USE_OPENLDAP=yes +LDAP_USE= OPENLDAP=yes MYSQL_CONFIGURE_ON= --enable-mysql -MYSQL_USE= USE_MYSQL=yes +MYSQL_USE= MYSQL=yes SQLITE_CONFIGURE_ON= --enable-sqlite SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 TESTVECTOR_CONFIGURE_ON=--enable-test-vectors -TOOLS_CONFIGURE_OFF= --disable-tools +PKI_CONFIGURE_OFF= --disable-pki +SCEP_CONFIGURE_OFF= --disable-scepclient UNBOUND_CONFIGURE_ON= --enable-unbound UNBOUND_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound XAUTH_CONFIGURE_ON= --enable-xauth-eap --enable-xauth-generic Modified: head/security/strongswan/distinfo ============================================================================== --- head/security/strongswan/distinfo Sun Dec 14 21:19:48 2014 (r374723) +++ head/security/strongswan/distinfo Sun Dec 14 21:43:03 2014 (r374724) @@ -1,2 +1,2 @@ -SHA256 (strongswan-5.2.0.tar.bz2) = b00c30bd2e60ff2e5fc85f54bbad54fe246585812fdf212dbe777a5258da26ce -SIZE (strongswan-5.2.0.tar.bz2) = 4063992 +SHA256 (strongswan-5.2.1.tar.bz2) = ea51ab33b5bb39fecaf10668833a9936583b42145948ae9da1ab98f74e939215 +SIZE (strongswan-5.2.1.tar.bz2) = 4075576 Modified: head/security/strongswan/files/patch-conf__Makefile.in ============================================================================== --- head/security/strongswan/files/patch-conf__Makefile.in Sun Dec 14 21:19:48 2014 (r374723) +++ head/security/strongswan/files/patch-conf__Makefile.in Sun Dec 14 21:43:03 2014 (r374724) @@ -1,9 +1,9 @@ ---- ./conf/Makefile.in.orig 2014-07-08 16:06:08.000000000 +0200 -+++ ./conf/Makefile.in 2014-08-19 09:48:46.000000000 +0200 -@@ -842,15 +842,15 @@ - test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" - test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" - test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" +--- conf/Makefile.in.orig 2014-10-18 08:23:39 UTC ++++ conf/Makefile.in +@@ -852,15 +852,15 @@ + test -e "$(DESTDIR)${strongswanconfdir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanconfdir)" || true + test -e "$(DESTDIR)${strongswanddir}" || $(INSTALL) -d "$(DESTDIR)$(strongswanddir)" || true + test -e "$(DESTDIR)${charonconfdir}" || $(INSTALL) -d "$(DESTDIR)$(charonconfdir)" || true - test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf || true + test -e "$(DESTDIR)$(strongswanconfdir)/strongswan.conf" || $(INSTALL) -m 644 $(srcdir)/strongswan.conf $(DESTDIR)$(strongswanconfdir)/strongswan.conf.sample || true for f in $(options_install_src); do \ Modified: head/security/strongswan/pkg-plist ============================================================================== --- head/security/strongswan/pkg-plist Sun Dec 14 21:19:48 2014 (r374723) +++ head/security/strongswan/pkg-plist Sun Dec 14 21:43:03 2014 (r374724) @@ -311,25 +311,25 @@ man/man8/_updown_espmark.8.gz %%TESTVECTOR%%lib/ipsec/plugins/libstrongswan-test-vectors.so %%TESTVECTOR%%%%DATADIR%%/templates/config/plugins/test-vectors.conf %%TESTVECTOR%%@sample %%ETCDIR%%.d/charon/test-vectors.conf.sample -%%TOOLS%%bin/pki -%%TOOLS%%libexec/ipsec/scepclient -%%TOOLS%%man/man1/pki---acert.1.gz -%%TOOLS%%man/man1/pki---gen.1.gz -%%TOOLS%%man/man1/pki---issue.1.gz -%%TOOLS%%man/man1/pki---keyid.1.gz -%%TOOLS%%man/man1/pki---pkcs7.1.gz -%%TOOLS%%man/man1/pki---print.1.gz -%%TOOLS%%man/man1/pki---pub.1.gz -%%TOOLS%%man/man1/pki---req.1.gz -%%TOOLS%%man/man1/pki---self.1.gz -%%TOOLS%%man/man1/pki---signcrl.1.gz -%%TOOLS%%man/man1/pki---verify.1.gz -%%TOOLS%%man/man1/pki.1.gz -%%TOOLS%%man/man8/scepclient.8.gz -%%TOOLS%%%%DATADIR%%/templates/config/strongswan.d/pki.conf -%%TOOLS%%@sample %%ETCDIR%%.d/pki.conf.sample -%%TOOLS%%%%DATADIR%%/templates/config/strongswan.d/scepclient.conf -%%TOOLS%%@sample %%ETCDIR%%.d/scepclient.conf.sample +%%PKI%%bin/pki +%%PKI%%man/man1/pki---acert.1.gz +%%PKI%%man/man1/pki---gen.1.gz +%%PKI%%man/man1/pki---issue.1.gz +%%PKI%%man/man1/pki---keyid.1.gz +%%PKI%%man/man1/pki---pkcs7.1.gz +%%PKI%%man/man1/pki---print.1.gz +%%PKI%%man/man1/pki---pub.1.gz +%%PKI%%man/man1/pki---req.1.gz +%%PKI%%man/man1/pki---self.1.gz +%%PKI%%man/man1/pki---signcrl.1.gz +%%PKI%%man/man1/pki---verify.1.gz +%%PKI%%man/man1/pki.1.gz +%%PKI%%%%DATADIR%%/templates/config/strongswan.d/pki.conf +%%PKI%%@sample %%ETCDIR%%.d/pki.conf.sample +%%SCEP%%libexec/ipsec/scepclient +%%SCEP%%man/man8/scepclient.8.gz +%%SCEP%%%%DATADIR%%/templates/config/strongswan.d/scepclient.conf +%%SCEP%%@sample %%ETCDIR%%.d/scepclient.conf.sample %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.a %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.la %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.so @@ -393,13 +393,11 @@ lib/ipsec/libcharon.so.0.0.0 lib/ipsec/libhydra.so.0.0.0 lib/ipsec/libstrongswan.so.0.0.0 lib/ipsec/libtls.so.0.0.0 -@dir %%DATADIR%%/templates/config/plugins -@dir lib/ipsec/plugins -@dir etc/ipsec.d/reqs -@dir etc/ipsec.d/private -@dir etc/ipsec.d/ocspcerts -@dir etc/ipsec.d/crls -@dir etc/ipsec.d/certs -@dir etc/ipsec.d/cacerts -@dir etc/ipsec.d/acerts @dir etc/ipsec.d/aacerts +@dir etc/ipsec.d/acerts +@dir etc/ipsec.d/cacerts +@dir etc/ipsec.d/certs +@dir etc/ipsec.d/crls +@dir etc/ipsec.d/ocspcerts +@dir etc/ipsec.d/private +@dir etc/ipsec.d/reqs From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 21:53:01 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24F28926; Sun, 14 Dec 2014 21:53: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 EB4D064E; Sun, 14 Dec 2014 21:53:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBELr0pA027639; Sun, 14 Dec 2014 21:53:00 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBELr0ea027635; Sun, 14 Dec 2014 21:53:00 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412142153.sBELr0ea027635@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 14 Dec 2014 21:53:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374725 - head/security/afl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 21:53:01 -0000 Author: pawel Date: Sun Dec 14 21:52:59 2014 New Revision: 374725 URL: https://svnweb.freebsd.org/changeset/ports/374725 QAT: https://qat.redports.org/buildarchive/r374725/ Log: - Update to version 0.80b [1] - Fix DOCS option handling, it's default no need to add it to OPTIONS_DEFAULT, do not optionally install DOCS files, staging takes care of that PR: 195415 [1] Submitted by: maintainer [1] Modified: head/security/afl/Makefile head/security/afl/distinfo head/security/afl/pkg-plist Modified: head/security/afl/Makefile ============================================================================== --- head/security/afl/Makefile Sun Dec 14 21:43:03 2014 (r374724) +++ head/security/afl/Makefile Sun Dec 14 21:52:59 2014 (r374725) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= afl -PORTVERSION= 0.61b +PORTVERSION= 0.80b CATEGORIES= security MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/ @@ -13,7 +13,8 @@ USES= compiler gmake tar:tgz OPTIONS_DEFINE= DEBUG DOCS TEST_INSTRUMENTATION TEST_INSTRUMENTATION_DESC= Execute tests expected to fail in jails -OPTIONS_DEFAULT= DOCS + +PORTSCOUT= ignore:1 ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Uses binary instrumentation @@ -47,10 +48,10 @@ post-patch: ${REINPLACE_CMD} -e 's@ifdef.*\(__OpenBSD__\)@if defined(\1) || \ (defined(__FreeBSD__) \&\& __FreeBSD__ < 9)@' \ ${WRKSRC}/afl-as.h + ${REINPLACE_CMD} -e 's@sys/\(termios.h\)@\1@' \ + ${WRKSRC}/afl-fuzz.c post-install: -.if ${PORT_OPTIONS:MDOCS} ${INSTALL_DATA} ${WRKSRC}/docs/COPYING ${STAGEDIR}${DOCSDIR}/ -.endif .include Modified: head/security/afl/distinfo ============================================================================== --- head/security/afl/distinfo Sun Dec 14 21:43:03 2014 (r374724) +++ head/security/afl/distinfo Sun Dec 14 21:52:59 2014 (r374725) @@ -1,2 +1,2 @@ -SHA256 (afl-0.61b.tgz) = 6f0613c4568bb24f43c8672c351a7205c41836f0d6def9ce98b75aca119d3a1e -SIZE (afl-0.61b.tgz) = 678234 +SHA256 (afl-0.80b.tgz) = bfdb0976c8d3093814cf9008eb3246155945bc04c0fa3018e0d8c956da690d33 +SIZE (afl-0.80b.tgz) = 689981 Modified: head/security/afl/pkg-plist ============================================================================== --- head/security/afl/pkg-plist Sun Dec 14 21:43:03 2014 (r374724) +++ head/security/afl/pkg-plist Sun Dec 14 21:52:59 2014 (r374725) @@ -16,6 +16,9 @@ bin/afl-gcc bin/afl-showmap lib/afl/afl-as lib/afl/as +share/afl/archives/ar/small_archive.a +share/afl/archives/compress/small_archive.Z +share/afl/archives/cpio/small_archive.cpio share/afl/archives/gzip/small_archive.gz share/afl/archives/lzo/small_achive.lzo share/afl/archives/tar/small_archive.tar From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 22:06:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53441B53; Sun, 14 Dec 2014 22:06: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 3E54C810; Sun, 14 Dec 2014 22:06:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEM6qYh033200; Sun, 14 Dec 2014 22:06:52 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEM6orO033194; Sun, 14 Dec 2014 22:06:50 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201412142206.sBEM6orO033194@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Sun, 14 Dec 2014 22:06:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374726 - in head/math: . octave-forge-optics X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 22:06:52 -0000 Author: stephen Date: Sun Dec 14 22:06:49 2014 New Revision: 374726 URL: https://svnweb.freebsd.org/changeset/ports/374726 QAT: https://qat.redports.org/buildarchive/r374726/ Log: - New port math/octave-forge-optics. The octave-forge package is the result of The GNU Octave Repositry project, which is intended to be a central location for custom scripts, functions and extensions for GNU Octave. contains the source for all the functions plus build and install scripts. This is optics. Added: head/math/octave-forge-optics/ head/math/octave-forge-optics/Makefile (contents, props changed) head/math/octave-forge-optics/distinfo (contents, props changed) head/math/octave-forge-optics/pkg-descr (contents, props changed) head/math/octave-forge-optics/pkg-plist (contents, props changed) Modified: head/math/Makefile Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Sun Dec 14 21:52:59 2014 (r374725) +++ head/math/Makefile Sun Dec 14 22:06:49 2014 (r374726) @@ -329,6 +329,7 @@ SUBDIR += octave-forge-octproj SUBDIR += octave-forge-odebvp SUBDIR += octave-forge-odepkg + SUBDIR += octave-forge-optics SUBDIR += octave-forge-optim SUBDIR += octave-forge-optiminterp SUBDIR += octave-forge-outliers Added: head/math/octave-forge-optics/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/octave-forge-optics/Makefile Sun Dec 14 22:06:49 2014 (r374726) @@ -0,0 +1,28 @@ +# Created by: Stephen Montgomery-Smith +# $FreeBSD$ + +PORTNAME= octave-forge-optics +PORTVERSION= 0.1.1 +CATEGORIES= math + +MAINTAINER= stephen@FreeBSD.org +COMMENT= Octave-forge package ${OCTAVE_PKGNAME} + +LICENSE= GPLv2 + +# OCTSRC is the name of the directory of the package. +# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. +OCTSRC= octave-${OCTAVE_PKGNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC}/src + +.include "${.CURDIR}/../../Mk/bsd.octave.mk" + +do-build: + @${DO_NADA} + +post-build: + ${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure + cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} + +.include Added: head/math/octave-forge-optics/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/octave-forge-optics/distinfo Sun Dec 14 22:06:49 2014 (r374726) @@ -0,0 +1,2 @@ +SHA256 (octave-forge/optics-0.1.1.tar.gz) = b660aa4ba5b340952ac8bc6ffcfa23982368c9444b3787e2139233a2dda51a6a +SIZE (octave-forge/optics-0.1.1.tar.gz) = 33481 Added: head/math/octave-forge-optics/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/octave-forge-optics/pkg-descr Sun Dec 14 22:06:49 2014 (r374726) @@ -0,0 +1,10 @@ +The octave-forge package is the result of The GNU Octave Repositry project, +which is intended to be a central location for custom scripts, functions and +extensions for GNU Octave. contains the source for all the functions plus +build and install scripts. + +This is optics. + + Functions covering various aspects of optics. + +WWW: http://octave.sourceforge.net/ Added: head/math/octave-forge-optics/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/octave-forge-optics/pkg-plist Sun Dec 14 22:06:49 2014 (r374726) @@ -0,0 +1 @@ +@comment This file intentionally left empty From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 22:11:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91E96C66; Sun, 14 Dec 2014 22:11: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 63E65835; Sun, 14 Dec 2014 22:11:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEMBdY7036753; Sun, 14 Dec 2014 22:11:39 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEMBd4e036752; Sun, 14 Dec 2014 22:11:39 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201412142211.sBEMBd4e036752@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Sun, 14 Dec 2014 22:11:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374727 - head/math/octave-forge X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 22:11:39 -0000 Author: stephen Date: Sun Dec 14 22:11:38 2014 New Revision: 374727 URL: https://svnweb.freebsd.org/changeset/ports/374727 QAT: https://qat.redports.org/buildarchive/r374727/ Log: - Add optional dependency math/octave-forge-optics. - Update to 20141214. Modified: head/math/octave-forge/Makefile Modified: head/math/octave-forge/Makefile ============================================================================== --- head/math/octave-forge/Makefile Sun Dec 14 22:06:49 2014 (r374726) +++ head/math/octave-forge/Makefile Sun Dec 14 22:11:38 2014 (r374727) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= octave-forge -PORTVERSION= 20141008 +PORTVERSION= 20141214 CATEGORIES= math MASTER_SITES= #none DISTFILES= #none @@ -23,8 +23,8 @@ OPTIONS_DEFINE= ACTUARIAL AD AUDIO BENCH INFORMATIONTHEORY INTEGRATION IO IRSA LINEAR_ALGEBRA LSSA \ MAPPING MECHANICS MISCELLANEOUS MISSING_FUNCTIONS MSH \ MULTICORE MVN NAN NCARRAY NETCDF NLWING2 NNET NURBS OCS \ - OCT2MAT OCTCDF OCTCLIP OCTGPR OCTPROJ ODEBVP ODEPKG OPTIM \ - OPTIMINTERP OUTLIERS PARALLEL PDB PLOT PT_BR QUATERNION \ + OCT2MAT OCTCDF OCTCLIP OCTGPR OCTPROJ ODEBVP ODEPKG OPTICS \ + OPTIM OPTIMINTERP OUTLIERS PARALLEL PDB PLOT PT_BR QUATERNION \ QUEUEING SECS1D SECS2D SECS3D SIGNAL SIMP SOCKETS SPECFUN \ SPECIAL_MATRIX SPLINE_GCVSPL SPLINES STATISTICS STK STRINGS \ STRUCT SYMBAND SYMBOLIC TCL_OCTAVE TSA VIDEO XRAYLIB ZENITY @@ -89,6 +89,7 @@ OCTGPR_DESC= Install package: octgpr OCTPROJ_DESC= Install package: octproj ODEBVP_DESC= Install package: odebvp ODEPKG_DESC= Install package: odepkg +OPTICS_DESC= Install package: optics OPTIM_DESC= Install package: optim OPTIMINTERP_DESC= Install package: optiminterp OUTLIERS_DESC= Install package: outliers @@ -301,6 +302,9 @@ RUN_DEPENDS+= ${TARBALLS_DIR}/odebvp.tar .if ${PORT_OPTIONS:MODEPKG} RUN_DEPENDS+= ${TARBALLS_DIR}/odepkg.tar.gz:${PORTSDIR}/math/octave-forge-odepkg .endif +.if ${PORT_OPTIONS:MOPTICS} +RUN_DEPENDS+= ${TARBALLS_DIR}/optics.tar.gz:${PORTSDIR}/math/octave-forge-optics +.endif .if ${PORT_OPTIONS:MOPTIM} RUN_DEPENDS+= ${TARBALLS_DIR}/optim.tar.gz:${PORTSDIR}/math/octave-forge-optim .endif From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 22:17:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C19ED7E; Sun, 14 Dec 2014 22: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 38A6A8EA; Sun, 14 Dec 2014 22:17:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEMHPHi038277; Sun, 14 Dec 2014 22:17:25 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEMHOYH038274; Sun, 14 Dec 2014 22:17:24 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412142217.sBEMHOYH038274@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 14 Dec 2014 22:17:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374728 - head/www/drood X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 22:17:25 -0000 Author: pawel Date: Sun Dec 14 22:17:23 2014 New Revision: 374728 URL: https://svnweb.freebsd.org/changeset/ports/374728 QAT: https://qat.redports.org/buildarchive/r374728/ Log: Update to version 3.18 PR: 195409 Submitted by: maintainer Modified: head/www/drood/Makefile head/www/drood/distinfo Modified: head/www/drood/Makefile ============================================================================== --- head/www/drood/Makefile Sun Dec 14 22:11:38 2014 (r374727) +++ head/www/drood/Makefile Sun Dec 14 22:17:23 2014 (r374728) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drood -PORTVERSION= 3.17 +PORTVERSION= 3.18 CATEGORIES= www MASTER_SITES= http://www.mammothcheese.ca/ Modified: head/www/drood/distinfo ============================================================================== --- head/www/drood/distinfo Sun Dec 14 22:11:38 2014 (r374727) +++ head/www/drood/distinfo Sun Dec 14 22:17:23 2014 (r374728) @@ -1,2 +1,2 @@ -SHA256 (drood-3.17.tar.gz) = fde3e9bbbc0f4b46a4640a8ee41fed10e3541bd1692070d81a16668950bf7686 -SIZE (drood-3.17.tar.gz) = 60954 +SHA256 (drood-3.18.tar.gz) = 1f78647d67f4bc17d25677bc108d76c6642c4eac9b4d92a457e2612bbd39b384 +SIZE (drood-3.18.tar.gz) = 61228 From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 22:35:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16EA5F2E; Sun, 14 Dec 2014 22:35: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 01DDEA6D; Sun, 14 Dec 2014 22:35:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEMZ9tk047773; Sun, 14 Dec 2014 22:35:09 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEMZ8CQ047767; Sun, 14 Dec 2014 22:35:08 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412142235.sBEMZ8CQ047767@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 14 Dec 2014 22:35:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374729 - in head/biology: . htslib htslib/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 22:35:10 -0000 Author: pawel Date: Sun Dec 14 22:35:07 2014 New Revision: 374729 URL: https://svnweb.freebsd.org/changeset/ports/374729 QAT: https://qat.redports.org/buildarchive/r374729/ Log: HTSlib is an implementation of a unified C library for accessing common file formats, such as SAM, CRAM, VCF, and BCF, used for high-throughput sequencing data. It is the core library used by samtools and bcftools. WWW: http://www.htslib.org/ PR: 195591 Submitted by: Reed A. Cartwright Added: head/biology/htslib/ head/biology/htslib/Makefile (contents, props changed) head/biology/htslib/distinfo (contents, props changed) head/biology/htslib/files/ head/biology/htslib/files/patch-Makefile (contents, props changed) head/biology/htslib/pkg-descr (contents, props changed) head/biology/htslib/pkg-plist (contents, props changed) Modified: head/biology/Makefile Modified: head/biology/Makefile ============================================================================== --- head/biology/Makefile Sun Dec 14 22:17:23 2014 (r374728) +++ head/biology/Makefile Sun Dec 14 22:35:07 2014 (r374729) @@ -26,6 +26,7 @@ SUBDIR += gperiodic SUBDIR += grappa SUBDIR += hmmer + SUBDIR += htslib SUBDIR += iolib SUBDIR += jalview SUBDIR += lagan Added: head/biology/htslib/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/htslib/Makefile Sun Dec 14 22:35:07 2014 (r374729) @@ -0,0 +1,29 @@ +# Created by: Reed A. Cartwright +# $FreeBSD$ + +PORTNAME= htslib +PORTVERSION= 1.1 +CATEGORIES= biology devel + +MAINTAINER= cartwright@asu.edu +COMMENT= C library for high-throughput sequencing data formats + +LICENSE= BSD3CLAUSE MIT +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/LICENSE + +USE_GITHUB= yes +GH_ACCOUNT= samtools +GH_COMMIT= a65fba2 + +USES= gmake +USE_LDCONFIG= yes + +MAKE_ENV= INSTALL_LIB="${INSTALL_LIB}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_DIR="${MKDIR}" + +PLIST_SUB= PORTVERSION="${PORTVERSION}" + +.include Added: head/biology/htslib/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/htslib/distinfo Sun Dec 14 22:35:07 2014 (r374729) @@ -0,0 +1,2 @@ +SHA256 (htslib-1.1.tar.gz) = 0614de1795284181675dd0178fb00f0aca176064b6263e3c7e21b53f34710631 +SIZE (htslib-1.1.tar.gz) = 957434 Added: head/biology/htslib/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/htslib/files/patch-Makefile Sun Dec 14 22:35:07 2014 (r374729) @@ -0,0 +1,64 @@ +--- Makefile.orig 2014-09-23 14:39:41 UTC ++++ Makefile +@@ -22,33 +22,27 @@ + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + # DEALINGS IN THE SOFTWARE. + +-CC = gcc +-AR = ar +-RANLIB = ranlib ++CC ?= cc ++AR = /usr/bin/ar ++RANLIB = /usr/bin/ranlib + + # TODO: edit cram code to remove need for -DSAMTOOLS +-CPPFLAGS = -I. -DSAMTOOLS=1 ++CPPFLAGS += -I. -DSAMTOOLS=1 -Wno-unused-function -Wno-implicit-function-declaration + # TODO: probably update cram code to make it compile cleanly with -Wc++-compat +-CFLAGS = -g -Wall -O2 ++CFLAGS += -Wall + EXTRA_CFLAGS_PIC = -fpic +-LDFLAGS = +-LDLIBS = ++LDFLAGS += ++LDLIBS += + +-prefix = /usr/local ++prefix = ${STAGEDIR}${PREFIX} + exec_prefix = $(prefix) + bindir = $(exec_prefix)/bin + includedir = $(prefix)/include + libdir = $(exec_prefix)/lib +-mandir = $(prefix)/share/man ++mandir = $(prefix)/man + man1dir = $(mandir)/man1 + man5dir = $(mandir)/man5 +-pkgconfigdir= $(libdir)/pkgconfig +- +-MKDIR_P = mkdir -p +-INSTALL = install -p +-INSTALL_PROGRAM = $(INSTALL) +-INSTALL_DATA = $(INSTALL) -m 644 +-INSTALL_DIR = $(MKDIR_P) -m 755 ++pkgconfigdir= $(exec_prefix)/libdata/pkgconfig + + BUILT_PROGRAMS = \ + bgzip \ +@@ -62,7 +56,7 @@ BUILT_TEST_PROGRAMS = \ + test/test-vcf-api \ + test/test-vcf-sweep + +-all: lib-static lib-shared $(BUILT_PROGRAMS) $(BUILT_TEST_PROGRAMS) ++all: lib-static lib-shared $(BUILT_PROGRAMS) + + HTSPREFIX = + include htslib_vars.mk +@@ -284,7 +278,7 @@ installdirs: + # and libhts.so.NN (used by client executables at runtime). + + install-so: libhts.so installdirs +- $(INSTALL_DATA) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION) ++ $(INSTALL_LIB) libhts.so $(DESTDIR)$(libdir)/libhts.so.$(PACKAGE_VERSION) + ln -sf libhts.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libhts.so + ln -sf libhts.so.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libhts.so.$(LIBHTS_SOVERSION) + Added: head/biology/htslib/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/htslib/pkg-descr Sun Dec 14 22:35:07 2014 (r374729) @@ -0,0 +1,5 @@ +HTSlib is an implementation of a unified C library for accessing common file +formats, such as SAM, CRAM, VCF, and BCF, used for high-throughput sequencing +data. It is the core library used by samtools and bcftools. + +WWW: http://www.htslib.org/ Added: head/biology/htslib/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/htslib/pkg-plist Sun Dec 14 22:35:07 2014 (r374729) @@ -0,0 +1,30 @@ +bin/bgzip +bin/tabix +include/htslib/bgzf.h +include/htslib/faidx.h +include/htslib/hfile.h +include/htslib/hts.h +include/htslib/hts_defs.h +include/htslib/kfunc.h +include/htslib/khash.h +include/htslib/khash_str2int.h +include/htslib/klist.h +include/htslib/knetfile.h +include/htslib/kseq.h +include/htslib/ksort.h +include/htslib/kstring.h +include/htslib/sam.h +include/htslib/synced_bcf_reader.h +include/htslib/tbx.h +include/htslib/vcf.h +include/htslib/vcf_sweep.h +include/htslib/vcfutils.h +lib/libhts.a +lib/libhts.so +lib/libhts.so.1 +lib/libhts.so.%%PORTVERSION%% +libdata/pkgconfig/htslib.pc +man/man1/tabix.1.gz +man/man5/faidx.5.gz +man/man5/sam.5.gz +man/man5/vcf.5.gz From owner-svn-ports-all@FreeBSD.ORG Sun Dec 14 23:25:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42347764; Sun, 14 Dec 2014 23:25: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 141E2EF4; Sun, 14 Dec 2014 23:25:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBENPsD8072421; Sun, 14 Dec 2014 23:25:54 GMT (envelope-from nemysis@FreeBSD.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBENPsXK072418; Sun, 14 Dec 2014 23:25:54 GMT (envelope-from nemysis@FreeBSD.org) Message-Id: <201412142325.sBENPsXK072418@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nemysis set sender to nemysis@FreeBSD.org using -f From: Rusmir Dusko Date: Sun, 14 Dec 2014 23:25:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374730 - in head/games/bs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 23:25:55 -0000 Author: nemysis Date: Sun Dec 14 23:25:53 2014 New Revision: 374730 URL: https://svnweb.freebsd.org/changeset/ports/374730 QAT: https://qat.redports.org/buildarchive/r374730/ Log: - Update to 2.10, announce message: Added desktop file. - Change PLIST_FILES, changed by me and Upstream - Simplify installation handling, changed by me and Upstream - Add REINPLACE, fix GNU/Linux paths - Strip executable - Remove Desktop entry file, use supplied desktop files Deleted: head/games/bs/files/ Modified: head/games/bs/Makefile head/games/bs/distinfo Modified: head/games/bs/Makefile ============================================================================== --- head/games/bs/Makefile Sun Dec 14 22:35:07 2014 (r374729) +++ head/games/bs/Makefile Sun Dec 14 23:25:53 2014 (r374730) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bs -PORTVERSION= 2.9 -PORTREVISION= 1 +PORTVERSION= 2.10 CATEGORIES= games MASTER_SITES= http://www.catb.org/~esr/bs/ @@ -18,18 +17,21 @@ ALL_TARGET= # empty PLIST_FILES= bin/${PORTNAME} \ man/man6/${PORTNAME}.6.gz \ + share/appdata/${PORTNAME}.xml \ ${DESKTOPDIR}/${PORTNAME}.desktop \ - share/pixmaps/battleship.png + share/icons/hicolor/32x32/apps/battleship.png PORTDOCS= NEWS README OPTIONS_DEFINE= DOCS -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/battleship.png ${STAGEDIR}${PREFIX}/share/pixmaps/ - ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/ +post-patch: + @${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin/|; \ + s|/usr/share/|${PREFIX}/share/|; \ + s|/usr/local/share/man|${PREFIX}/man/|' \ + ${WRKSRC}/Makefile +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/games/bs/distinfo ============================================================================== --- head/games/bs/distinfo Sun Dec 14 22:35:07 2014 (r374729) +++ head/games/bs/distinfo Sun Dec 14 23:25:53 2014 (r374730) @@ -1,2 +1,2 @@ -SHA256 (bs-2.9.tar.gz) = 32408dfafd7ac09307a2398156c13c5f305075d81d8a82d8aa3f22111ca5db01 -SIZE (bs-2.9.tar.gz) = 14922 +SHA256 (bs-2.10.tar.gz) = 1f8c1541fd13f481ff96df26d668658a7465da064801ae22ee584bd50f3a3107 +SIZE (bs-2.10.tar.gz) = 15426 From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 00:19:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D634DCC9; Mon, 15 Dec 2014 00: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 C24653DD; Mon, 15 Dec 2014 00:19:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBF0JscM098273; Mon, 15 Dec 2014 00:19:54 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBF0JsZB098271; Mon, 15 Dec 2014 00:19:54 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412150019.sBF0JsZB098271@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 00:19:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374731 - head/editors/slime X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 00:19:54 -0000 Author: pawel Date: Mon Dec 15 00:19:53 2014 New Revision: 374731 URL: https://svnweb.freebsd.org/changeset/ports/374731 QAT: https://qat.redports.org/buildarchive/r374731/ Log: Update to version 2.11 PR: 195607 Submitted by: maintainer Modified: head/editors/slime/Makefile head/editors/slime/distinfo Modified: head/editors/slime/Makefile ============================================================================== --- head/editors/slime/Makefile Sun Dec 14 23:25:53 2014 (r374730) +++ head/editors/slime/Makefile Mon Dec 15 00:19:53 2014 (r374731) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= slime -PORTVERSION= 2.10.1 -PORTREVISION= 1 +PORTVERSION= 2.11 CATEGORIES= editors elisp MASTER_SITES= https://codeload.github.com/slime/slime/legacy.tar.gz/v${PORTVERSION}?dummy=/ @@ -21,7 +20,7 @@ USES= gmake USE_EMACS= yes SLIME_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/slime -WRKSRC= ${WRKDIR}/slime-slime-295edb8 +WRKSRC= ${WRKDIR}/slime-slime-d7ae5d3 SUB_FILES= pkg-message SUB_LIST= SLIME_LISPDIR="${SLIME_LISPDIR}" Modified: head/editors/slime/distinfo ============================================================================== --- head/editors/slime/distinfo Sun Dec 14 23:25:53 2014 (r374730) +++ head/editors/slime/distinfo Mon Dec 15 00:19:53 2014 (r374731) @@ -1,2 +1,2 @@ -SHA256 (slime-2.10.1.tar.gz) = cb7f4feaa4a08d07e586915e955ba5f0373f4421151ef0c6a1353c9c0ad93665 -SIZE (slime-2.10.1.tar.gz) = 1048648 +SHA256 (slime-2.11.tar.gz) = 1109b13836e00c143c40de13ca16e7dac92c8018615b32523c8e1b876265380e +SIZE (slime-2.11.tar.gz) = 1054603 From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 00:43:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B01ECFF3; Mon, 15 Dec 2014 00: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 91EBD854; Mon, 15 Dec 2014 00:43:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBF0hEje012012; Mon, 15 Dec 2014 00:43:14 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBF0hE9b012010; Mon, 15 Dec 2014 00:43:14 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201412150043.sBF0hE9b012010@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Mon, 15 Dec 2014 00:43:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374732 - head/sysutils/ansible X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 00:43:14 -0000 Author: olgeni Date: Mon Dec 15 00:43:13 2014 New Revision: 374732 URL: https://svnweb.freebsd.org/changeset/ports/374732 QAT: https://qat.redports.org/buildarchive/r374732/ Log: Restore Ansible modules by switching back to release distfiles. PR: 195936 Submitted by: maintainer Modified: head/sysutils/ansible/Makefile head/sysutils/ansible/distinfo (contents, props changed) Modified: head/sysutils/ansible/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Mon Dec 15 00:19:53 2014 (r374731) +++ head/sysutils/ansible/Makefile Mon Dec 15 00:43:13 2014 (r374732) @@ -3,7 +3,9 @@ PORTNAME= ansible PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= sysutils python +MASTER_SITES= http://releases.ansible.com/ansible/ MAINTAINER= lifanov@mail.lifanov.com COMMENT= Radically simple IT automation @@ -18,14 +20,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml OPTIONS_DEFINE= EXAMPLES -USE_GITHUB= yes -GH_ACCOUNT= ${PORTNAME} -GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= 6f568bd - USES= cpe python:2 shebangfix USE_PYTHON= autoplist distutils -SHEBANG_FILES= lib/ansible/runner/action_plugins/synchronize.py +SHEBANG_FILES= lib/ansible/runner/action_plugins/synchronize.py \ + lib/ansible/modules/core/*/*.py \ + lib/ansible/modules/core/*/*/*.py \ + lib/ansible/modules/extras/*/*.py \ + lib/ansible/modules/extras/*/*/*.py CPE_VENDOR= ansibleworks SUB_FILES= pkg-message @@ -43,18 +44,14 @@ post-patch: .for f in bin/ansible-galaxy docs/man/man1/ansible-galaxy.1 \ docs/man/man1/ansible-playbook.1 docs/man/man1/ansible.1 \ examples/ansible.cfg examples/hosts lib/ansible/constants.py \ - lib/ansible/module_utils/urls.py lib/ansible/playbook/__init__.py \ - lib/ansible/runner/__init__.py plugins/README.md \ - plugins/inventory/cobbler.py plugins/inventory/collins.py \ - plugins/inventory/nova.py plugins/inventory/spacewalk.py \ - v2/ansible/constants.py v2/ansible/playbook/role/definition.py + lib/ansible/module_utils/urls.py lib/ansible/modules/core/system/setup.py \ + lib/ansible/playbook/__init__.py lib/ansible/runner/__init__.py @${REINPLACE_CMD} -e 's|/etc/ansible|${ETCDIR}|' ${WRKSRC}/${f} .endfor .for f in docs/man/man1/ansible-playbook.1 docs/man/man1/ansible.1 \ examples/ansible.cfg lib/ansible/constants.py \ lib/ansible/playbook/__init__.py lib/ansible/runner/__init__.py \ - v2/ansible/constants.py @${REINPLACE_CMD} -e 's|/usr/share/ansible|${DATADIR}|' ${WRKSRC}/${f} .endfor Modified: head/sysutils/ansible/distinfo ============================================================================== --- head/sysutils/ansible/distinfo Mon Dec 15 00:19:53 2014 (r374731) +++ head/sysutils/ansible/distinfo Mon Dec 15 00:43:13 2014 (r374732) @@ -1,2 +1,2 @@ -SHA256 (ansible-1.8.2.tar.gz) = 629d88f44e60b1a581a6164762447635121d4dd272bf2fd0a55f681895daa5b1 -SIZE (ansible-1.8.2.tar.gz) = 934386 +SHA256 (ansible-1.8.2.tar.gz) = 2cd01ff4d67acb410bae0a9438956f6fc36d01babd956b0dc3b700620f2372b9 +SIZE (ansible-1.8.2.tar.gz) = 754435 From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 00:54:21 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62F40218; Mon, 15 Dec 2014 00:54: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 4DF0F925; Mon, 15 Dec 2014 00:54:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBF0sLoR017115; Mon, 15 Dec 2014 00:54:21 GMT (envelope-from timur@FreeBSD.org) Received: (from timur@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBF0sKS7017112; Mon, 15 Dec 2014 00:54:20 GMT (envelope-from timur@FreeBSD.org) Message-Id: <201412150054.sBF0sKS7017112@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: timur set sender to timur@FreeBSD.org using -f From: "Timur I. Bakeyev" Date: Mon, 15 Dec 2014 00:54:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374733 - head/net/samba4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 00:54:21 -0000 Author: timur Date: Mon Dec 15 00:54:19 2014 New Revision: 374733 URL: https://svnweb.freebsd.org/changeset/ports/374733 QAT: https://qat.redports.org/buildarchive/r374733/ Log: Update port to newer version. Work around removed PLIST_REINPLACE, synced with samba41 configuration options. PR: 193415 Modified: head/net/samba4/Makefile head/net/samba4/distinfo head/net/samba4/pkg-plist Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Mon Dec 15 00:43:13 2014 (r374732) +++ head/net/samba4/Makefile Mon Dec 15 00:54:19 2014 (r374733) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}4 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba/stable samba/rc @@ -18,7 +18,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba41-4. SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.0.21 +SAMBA4_VERSION= 4.0.23 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -64,7 +64,7 @@ DESTDIRNAME= --destdir CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -USES= shebangfix compiler perl5 pkgconfig python:2 iconv readline cpe +USES= shebangfix compiler perl5 python:2 pkgconfig iconv readline execinfo cpe USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf @@ -75,9 +75,6 @@ PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR # XXX: Unconditional dependencies which can't be switched off(if present in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt -# XXX: We should try to switch to libunwind, libexecinfo is gcc specific(?) -# backtrace -LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo # inotify LIB_DEPENDS+= libinotify.so:${PORTSDIR}/devel/libinotify # SASL @@ -103,26 +100,30 @@ BUILD_DEPENDS+= tdb>=1.2.11:${PORTSDIR} RUN_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ldb -BUILD_DEPENDS+= ldb>=1.1.15:${PORTSDIR}/databases/ldb -RUN_DEPENDS+= ldb>=1.1.15:${PORTSDIR}/databases/ldb +BUILD_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb +RUN_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options -OPTIONS_DEFINE= ACL_SUPPORT ADS AIO_SUPPORT CUPS DEBUG \ +OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP -OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} +OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ + DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ + PTHREADPOOL QUOTAS SWAT SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support -ADS_DESC= Active Directory support +AD_DC_DESC= Active Directory Domain Controller support +ADS_DESC= Active Directory client support AIO_SUPPORT_DESC= Asyncronous IO support DNSUPDATE_DESC= Dynamic DNS update(require ADS) EXP_MODULES_DESC= Experimental modules FAM_SUPPORT_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries +LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support @@ -134,16 +135,12 @@ OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_ DEVELOPER_DESC= With development support MANPAGES_DESC= Build manpages from DOCBOOK templates -OPTIONS_SINGLE= DNS -OPTIONS_SINGLE_DNS= NSUPDATE BIND99 - -BIND99_DESC= Use bind99 as a DNS server frontend -NSUPDATE_DESC= Use internal DNS with NSUPDATE utility -OPTIONS_DEFAULT+= NSUPDATE - -OPTIONS_RADIO= ZEROCONF +OPTIONS_RADIO= DNS ZEROCONF +OPTIONS_RADIO_DNS= NSUPDATE BIND99 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER -OPTIONS_DEFAULT+= AVAHI + +BIND99_DESC= Use bind99 as AD DC DNS server frontend +NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include @@ -178,7 +175,7 @@ CONFIGURE_ARGS+= --enable-debug # https://bugzilla.samba.org/show_bug.cgi?id=8969 .if ${PORT_OPTIONS:MDEVELOPER} -GDB_CMD?= gdb771 +GDB_CMD?= gdb78 BUILD_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb RUN_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls @@ -228,6 +225,13 @@ CONFIGURE_ARGS+= --with-acl-support CONFIGURE_ARGS+= --without-acl-support .endif +.if ! ${PORT_OPTIONS:MAD_DC} +CONFIGURE_ARGS+= --without-ad-dc +PLIST_SUB+= AD_DC="@comment " +.else +PLIST_SUB+= AD_DC="" +.endif + .if ${PORT_OPTIONS:MADS} SAMBA4_WANT_ADS= yes SAMBA4_WANT_LDAP= yes @@ -346,19 +350,27 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/ xsltproc:${PORTSDIR}/textproc/libxslt .endif +.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) +CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" +.endif + .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} CONFIGURE_ARGS+= --with-shared-modules="${WANT_EXP_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif -.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) -CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" -.endif - -# XXX -.for m in ${SAMBA4_MODULES} -PLIST_REINPLACE+= ${m} -PLIST_REINPLACE_${m:tu}= s|^@comment ${m} ||g +# XXX: Dirty +.for module in auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \ + gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \ + nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ + pdb_test pdb_wbc_sam perfcount_test vfs_aio_posix vfs_aio_pthread \ + vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls vfs_notify_fam \ + vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent +. if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}} +PLIST_SUB+= MODULE_${module:tu}="" +. else +PLIST_SUB+= MODULE_${module:tu}="@comment " +. endif .endfor ############################################################################## # !SAMBA4_SUBPORT Modified: head/net/samba4/distinfo ============================================================================== --- head/net/samba4/distinfo Mon Dec 15 00:43:13 2014 (r374732) +++ head/net/samba4/distinfo Mon Dec 15 00:54:19 2014 (r374733) @@ -1,2 +1,2 @@ -SHA256 (samba-4.0.21.tar.gz) = b28ddbccc4c17951aa86c0a65d8068083d519b81609ec55f919b4b9c2dfdf91f -SIZE (samba-4.0.21.tar.gz) = 22132674 +SHA256 (samba-4.0.23.tar.gz) = 47d7b9d0caf76ea111794c6181db2fed5c15fd496a5a9eaa8ed4323302c72118 +SIZE (samba-4.0.23.tar.gz) = 22140738 Modified: head/net/samba4/pkg-plist ============================================================================== --- head/net/samba4/pkg-plist Mon Dec 15 00:43:13 2014 (r374732) +++ head/net/samba4/pkg-plist Mon Dec 15 00:54:19 2014 (r374733) @@ -17,7 +17,7 @@ bin/regpatch bin/regshell bin/regtree bin/rpcclient -bin/samba-tool +%%AD_DC%%bin/samba-tool bin/sharesec bin/smbcacls bin/smbclient @@ -35,11 +35,11 @@ bin/smbtree bin/testparm bin/wbinfo sbin/nmbd -sbin/samba -sbin/samba_dnsupdate -sbin/samba_kcc -sbin/samba_spnupdate -sbin/samba_upgradedns +%%AD_DC%%sbin/samba +%%AD_DC%%sbin/samba_dnsupdate +%%AD_DC%%sbin/samba_kcc +%%AD_DC%%sbin/samba_spnupdate +%%AD_DC%%sbin/samba_upgradedns sbin/smbd %%SWAT%%sbin/swat sbin/winbindd @@ -50,7 +50,7 @@ include/samba4/core/ntstatus.h include/samba4/core/werror.h include/samba4/credentials.h include/samba4/dcerpc.h -include/samba4/dcerpc_server.h +%%AD_DC%%include/samba4/dcerpc_server.h include/samba4/dlinklist.h include/samba4/domain_credentials.h include/samba4/gen_ndr/atsvc.h @@ -164,8 +164,8 @@ lib/libdcerpc-binding.so lib/libdcerpc-binding.so.0 lib/libdcerpc-samr.so lib/libdcerpc-samr.so.0 -lib/libdcerpc-server.so -lib/libdcerpc-server.so.0 +%%AD_DC%%lib/libdcerpc-server.so +%%AD_DC%%lib/libdcerpc-server.so.0 lib/libdcerpc.so lib/libdcerpc.so.0 lib/libgensec.so @@ -243,7 +243,7 @@ lib/samba/libdbwrap.so lib/samba/libdcerpc-samba.so lib/samba/libdcerpc-samba4.so lib/samba/libdfs_server_ad.so -lib/samba/libdlz_bind9_for_torture.so +%%AD_DC%%lib/samba/libdlz_bind9_for_torture.so lib/samba/libdsdb-module.so lib/samba/liberrors.so lib/samba/libevents.so @@ -274,12 +274,12 @@ lib/samba/libnet_keytab.so lib/samba/libnetif.so lib/samba/libnpa_tstream.so lib/samba/libnss_info.so -lib/samba/libntvfs.so +%%AD_DC%%lib/samba/libntvfs.so lib/samba/libpac.so lib/samba/libpopt_samba3.so -lib/samba/libposix_eadb.so +%%AD_DC%%lib/samba/libposix_eadb.so lib/samba/libprinting_migrate.so -lib/samba/libprocess_model.so +%%AD_DC%%lib/samba/libprocess_model.so lib/samba/libreplace.so lib/samba/libroken-samba4.so.19 lib/samba/libsamba-modules.so @@ -291,7 +291,7 @@ lib/samba/libsamba_python.so lib/samba/libsamdb-common.so lib/samba/libsecrets3.so lib/samba/libserver-role.so -lib/samba/libservice.so +%%AD_DC%%lib/samba/libservice.so lib/samba/libshares.so lib/samba/libsmb_transport.so lib/samba/libsmbd_base.so @@ -315,80 +315,80 @@ lib/samba/libxattr_tdb.so %%DEVELOPER%%lib/samba/libuid_wrapper.so %%DEVELOPER%%lib/samba/libsocket_wrapper.so lib/shared-modules/auth/script.so -@comment auth_skel lib/shared-modules/auth/skel.so -lib/shared-modules/bind9/dlz_bind9.so -lib/shared-modules/bind9/dlz_bind9_9.so -lib/shared-modules/gensec/krb5.so +%%MODULE_AUTH_SKEL%%lib/shared-modules/auth/skel.so +%%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so +%%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so +%%AD_DC%%lib/shared-modules/gensec/krb5.so lib/shared-modules/idmap/autorid.so lib/shared-modules/idmap/hash.so lib/shared-modules/idmap/rid.so lib/shared-modules/idmap/tdb2.so -lib/shared-modules/ldb/acl.so -lib/shared-modules/ldb/aclread.so -lib/shared-modules/ldb/anr.so -lib/shared-modules/ldb/descriptor.so -lib/shared-modules/ldb/dirsync.so -lib/shared-modules/ldb/extended_dn_in.so -lib/shared-modules/ldb/extended_dn_out.so -lib/shared-modules/ldb/extended_dn_store.so +%%AD_DC%%lib/shared-modules/ldb/acl.so +%%AD_DC%%lib/shared-modules/ldb/aclread.so +%%AD_DC%%lib/shared-modules/ldb/anr.so +%%AD_DC%%lib/shared-modules/ldb/descriptor.so +%%AD_DC%%lib/shared-modules/ldb/dirsync.so +%%AD_DC%%lib/shared-modules/ldb/extended_dn_in.so +%%AD_DC%%lib/shared-modules/ldb/extended_dn_out.so +%%AD_DC%%lib/shared-modules/ldb/extended_dn_store.so lib/shared-modules/ldb/ildap.so -lib/shared-modules/ldb/instancetype.so -lib/shared-modules/ldb/lazy_commit.so +%%AD_DC%%lib/shared-modules/ldb/instancetype.so +%%AD_DC%%lib/shared-modules/ldb/lazy_commit.so lib/shared-modules/ldb/ldbsamba_extensions.so -lib/shared-modules/ldb/linked_attributes.so -lib/shared-modules/ldb/local_password.so -lib/shared-modules/ldb/new_partition.so -lib/shared-modules/ldb/objectclass.so -lib/shared-modules/ldb/objectclass_attrs.so -lib/shared-modules/ldb/objectguid.so -lib/shared-modules/ldb/operational.so -lib/shared-modules/ldb/partition.so -lib/shared-modules/ldb/password_hash.so -lib/shared-modules/ldb/ranged_results.so -lib/shared-modules/ldb/repl_meta_data.so -lib/shared-modules/ldb/resolve_oids.so -lib/shared-modules/ldb/rootdse.so -lib/shared-modules/ldb/samba3sam.so -lib/shared-modules/ldb/samba3sid.so -lib/shared-modules/ldb/samba_dsdb.so -lib/shared-modules/ldb/samba_secrets.so -lib/shared-modules/ldb/samldb.so -lib/shared-modules/ldb/schema_data.so -lib/shared-modules/ldb/schema_load.so -lib/shared-modules/ldb/secrets_tdb_sync.so -lib/shared-modules/ldb/show_deleted.so -lib/shared-modules/ldb/simple_dn.so -lib/shared-modules/ldb/simple_ldap_map.so -lib/shared-modules/ldb/subtree_delete.so -lib/shared-modules/ldb/subtree_rename.so -lib/shared-modules/ldb/update_keytab.so -lib/shared-modules/ldb/wins_ldb.so +%%AD_DC%%lib/shared-modules/ldb/linked_attributes.so +%%AD_DC%%lib/shared-modules/ldb/local_password.so +%%AD_DC%%lib/shared-modules/ldb/new_partition.so +%%AD_DC%%lib/shared-modules/ldb/objectclass.so +%%AD_DC%%lib/shared-modules/ldb/objectclass_attrs.so +%%AD_DC%%lib/shared-modules/ldb/objectguid.so +%%AD_DC%%lib/shared-modules/ldb/operational.so +%%AD_DC%%lib/shared-modules/ldb/partition.so +%%AD_DC%%lib/shared-modules/ldb/password_hash.so +%%AD_DC%%lib/shared-modules/ldb/ranged_results.so +%%AD_DC%%lib/shared-modules/ldb/repl_meta_data.so +%%AD_DC%%lib/shared-modules/ldb/resolve_oids.so +%%AD_DC%%lib/shared-modules/ldb/rootdse.so +%%AD_DC%%lib/shared-modules/ldb/samba3sam.so +%%AD_DC%%lib/shared-modules/ldb/samba3sid.so +%%AD_DC%%lib/shared-modules/ldb/samba_dsdb.so +%%AD_DC%%lib/shared-modules/ldb/samba_secrets.so +%%AD_DC%%lib/shared-modules/ldb/samldb.so +%%AD_DC%%lib/shared-modules/ldb/schema_data.so +%%AD_DC%%lib/shared-modules/ldb/schema_load.so +%%AD_DC%%lib/shared-modules/ldb/secrets_tdb_sync.so +%%AD_DC%%lib/shared-modules/ldb/show_deleted.so +%%AD_DC%%lib/shared-modules/ldb/simple_dn.so +%%AD_DC%%lib/shared-modules/ldb/simple_ldap_map.so +%%AD_DC%%lib/shared-modules/ldb/subtree_delete.so +%%AD_DC%%lib/shared-modules/ldb/subtree_rename.so +%%AD_DC%%lib/shared-modules/ldb/update_keytab.so +%%AD_DC%%lib/shared-modules/ldb/wins_ldb.so lib/shared-modules/nss_info/hash.so -@comment perfcount_test lib/shared-modules/perfcount/test.so -@comment pdb_test lib/shared-modules/pdb/test.so -lib/shared-modules/process_model/onefork.so -lib/shared-modules/process_model/prefork.so -lib/shared-modules/process_model/standard.so -lib/shared-modules/service/cldap.so -lib/shared-modules/service/dcerpc.so -lib/shared-modules/service/dns.so -lib/shared-modules/service/dns_update.so -lib/shared-modules/service/drepl.so -lib/shared-modules/service/kcc.so -lib/shared-modules/service/kdc.so -lib/shared-modules/service/ldap.so -lib/shared-modules/service/nbtd.so -lib/shared-modules/service/ntp_signd.so -lib/shared-modules/service/s3fs.so -lib/shared-modules/service/smb.so -lib/shared-modules/service/web.so -lib/shared-modules/service/winbind.so -lib/shared-modules/service/wrepl.so +%%MODULE_PERFCOUNT_TEST%%lib/shared-modules/perfcount/test.so +%%MODULE_PDB_TEST%%lib/shared-modules/pdb/test.so +%%AD_DC%%lib/shared-modules/process_model/onefork.so +%%AD_DC%%lib/shared-modules/process_model/prefork.so +%%AD_DC%%lib/shared-modules/process_model/standard.so +%%AD_DC%%lib/shared-modules/service/cldap.so +%%AD_DC%%lib/shared-modules/service/dcerpc.so +%%AD_DC%%lib/shared-modules/service/dns.so +%%AD_DC%%lib/shared-modules/service/dns_update.so +%%AD_DC%%lib/shared-modules/service/drepl.so +%%AD_DC%%lib/shared-modules/service/kcc.so +%%AD_DC%%lib/shared-modules/service/kdc.so +%%AD_DC%%lib/shared-modules/service/ldap.so +%%AD_DC%%lib/shared-modules/service/nbtd.so +%%AD_DC%%lib/shared-modules/service/ntp_signd.so +%%AD_DC%%lib/shared-modules/service/s3fs.so +%%AD_DC%%lib/shared-modules/service/smb.so +%%AD_DC%%lib/shared-modules/service/web.so +%%AD_DC%%lib/shared-modules/service/winbind.so +%%AD_DC%%lib/shared-modules/service/wrepl.so lib/shared-modules/vfs/acl_tdb.so lib/shared-modules/vfs/acl_xattr.so lib/shared-modules/vfs/aio_fork.so -@comment vfs_aio_posix lib/shared-modules/vfs/aio_posix.so -@comment vfs_aio_pthread lib/shared-modules/vfs/aio_pthread.so +%%MODULE_VFS_AIO_POSIX%%lib/shared-modules/vfs/aio_posix.so +%%MODULE_VFS_AIO_PTHREAD%%lib/shared-modules/vfs/aio_pthread.so lib/shared-modules/vfs/audit.so lib/shared-modules/vfs/cap.so lib/shared-modules/vfs/catia.so @@ -403,8 +403,8 @@ lib/shared-modules/vfs/full_audit.so lib/shared-modules/vfs/linux_xfs_sgid.so lib/shared-modules/vfs/media_harmony.so lib/shared-modules/vfs/netatalk.so -@comment vfs_notify_fam lib/shared-modules/vfs/notify_fam.so -lib/shared-modules/vfs/posix_eadb.so +%%MODULE_VFS_NOTIFY_FAM%%lib/shared-modules/vfs/notify_fam.so +%%AD_DC%%lib/shared-modules/vfs/posix_eadb.so lib/shared-modules/vfs/preopen.so lib/shared-modules/vfs/readahead.so lib/shared-modules/vfs/readonly.so @@ -419,35 +419,35 @@ lib/shared-modules/vfs/syncops.so lib/shared-modules/vfs/time_audit.so lib/shared-modules/vfs/xattr_tdb.so lib/shared-modules/vfs/zfsacl.so -@comment auth_samba4 lib/shared-modules/auth/samba4.so -@comment auth_unix lib/shared-modules/auth/unix.so -@comment auth_wbc lib/shared-modules/auth/wbc.so -@comment gpext_registry lib/shared-modules/gpext/registry.so -@comment gpext_scripts lib/shared-modules/gpext/scripts.so -@comment gpext_security lib/shared-modules/gpext/security.so -@comment idmap_ad lib/shared-modules/idmap/ad.so -@comment idmap_ad lib/shared-modules/nss_info/rfc2307.so -@comment idmap_ad lib/shared-modules/nss_info/sfu.so -@comment idmap_ad lib/shared-modules/nss_info/sfu20.so -@comment idmap_ldap lib/shared-modules/idmap/ldap.so -@comment idmap_nss lib/shared-modules/idmap/nss.so -@comment idmap_passdb lib/shared-modules/idmap/passdb.so -@comment idmap_tdb lib/shared-modules/idmap/tdb.so -@comment nss_info_template lib/shared-modules/nss_info/template.so -@comment pdb_ldap lib/shared-modules/pdb/ldap.so -@comment pdb_samba_dsdb lib/shared-modules/pdb/samba_dsdb.so -@comment pdb_smbpasswd lib/shared-modules/pdb/smbpasswd.so -@comment pdb_tdbsam lib/shared-modules/pdb/tdbsam.so -@comment pdb_wbc_sam lib/shared-modules/pdb/wbc_sam.so -@comment vfs_cacheprime lib/shared-modules/vfs/cacheprime.so -@comment vfs_dfs_samba4 lib/shared-modules/vfs/dfs_samba4.so -@comment vfs_fake_acls lib/shared-modules/vfs/fake_acls.so -@comment vfs_shadow_copy_test lib/shared-modules/vfs/shadow_copy_test.so -@comment vfs_skel_opaque lib/shared-modules/vfs/skel_opaque.so -@comment vfs_skel_transparent lib/shared-modules/vfs/skel_transparent.so +%%MODULE_AUTH_SAMBA4%%lib/shared-modules/auth/samba4.so +%%MODULE_AUTH_UNIX%%lib/shared-modules/auth/unix.so +%%MODULE_AUTH_WBC%%lib/shared-modules/auth/wbc.so +%%MODULE_GPEXT_REGISTRY%%lib/shared-modules/gpext/registry.so +%%MODULE_GPEXT_SCRIPTS%%lib/shared-modules/gpext/scripts.so +%%MODULE_GPEXT_SECURITY%%lib/shared-modules/gpext/security.so +%%MODULE_IDMAP_AD%%lib/shared-modules/idmap/ad.so +%%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/rfc2307.so +%%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/sfu.so +%%MODULE_IDMAP_AD%%lib/shared-modules/nss_info/sfu20.so +%%MODULE_IDMAP_LDAP%%lib/shared-modules/idmap/ldap.so +%%MODULE_IDMAP_NSS%%lib/shared-modules/idmap/nss.so +%%MODULE_IDMAP_PASSDB%%lib/shared-modules/idmap/passdb.so +%%MODULE_IDMAP_TDB%%lib/shared-modules/idmap/tdb.so +%%MODULE_NSS_INFO_TEMPLATE%%lib/shared-modules/nss_info/template.so +%%MODULE_PDB_LDAP%%lib/shared-modules/pdb/ldap.so +%%MODULE_PDB_SAMBA_DSDB%%lib/shared-modules/pdb/samba_dsdb.so +%%MODULE_PDB_SMBPASSWD%%lib/shared-modules/pdb/smbpasswd.so +%%MODULE_PDB_TDBSAM%%lib/shared-modules/pdb/tdbsam.so +%%MODULE_PDB_WBC_SAM%%lib/shared-modules/pdb/wbc_sam.so +%%MODULE_VFS_CACHEPRIME%%lib/shared-modules/vfs/cacheprime.so +%%MODULE_VFS_DFS_SAMBA4%%lib/shared-modules/vfs/dfs_samba4.so +%%MODULE_VFS_FAKE_ACLS%%lib/shared-modules/vfs/fake_acls.so +%%MODULE_VFS_SHADOW_COPY_TEST%%lib/shared-modules/vfs/shadow_copy_test.so +%%MODULE_VFS_SKEL_OPAQUE%%lib/shared-modules/vfs/skel_opaque.so +%%MODULE_VFS_SKEL_TRANSPARENT%%lib/shared-modules/vfs/skel_transparent.so @dirrmtry lib/shared-modules/vfs -@dirrmtry lib/shared-modules/service -@dirrmtry lib/shared-modules/process_model +%%AD_DC%%@dirrmtry lib/shared-modules/service +%%AD_DC%%@dirrmtry lib/shared-modules/process_model @dirrmtry lib/shared-modules/perfcount @dirrmtry lib/shared-modules/pdb @dirrmtry lib/shared-modules/nss_info @@ -462,7 +462,7 @@ lib/shared-modules/vfs/zfsacl.so libdata/pkgconfig/dcerpc.pc libdata/pkgconfig/dcerpc_atsvc.pc libdata/pkgconfig/dcerpc_samr.pc -libdata/pkgconfig/dcerpc_server.pc +%%AD_DC%%libdata/pkgconfig/dcerpc_server.pc libdata/pkgconfig/gensec.pc libdata/pkgconfig/ndr.pc libdata/pkgconfig/ndr_krb5pac.pc @@ -520,7 +520,7 @@ libdata/pkgconfig/wbclient.pc %%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so %%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so %%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so -%%PYTHON_SITELIBDIR%%/samba/dckeytab.so +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so %%PYTHON_SITELIBDIR%%/samba/descriptor.py %%PYTHON_SITELIBDIR%%/samba/drs_utils.py %%PYTHON_SITELIBDIR%%/samba/dsdb.so @@ -701,7 +701,7 @@ libdata/pkgconfig/wbclient.pc %%PYTHON_SITELIBDIR%%/samba/ntacls.py %%PYTHON_SITELIBDIR%%/samba/param.so %%PYTHON_SITELIBDIR%%/samba/policy.so -%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so %%PYTHON_SITELIBDIR%%/samba/provision/__init__.py %%PYTHON_SITELIBDIR%%/samba/provision/backend.py %%PYTHON_SITELIBDIR%%/samba/provision/common.py @@ -776,8 +776,8 @@ libdata/pkgconfig/wbclient.pc %%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py %%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py %%PYTHON_SITELIBDIR%%/samba/xattr.py -%%PYTHON_SITELIBDIR%%/samba/xattr_native.so -%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_native.so +%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/xattr_tdb.so @unexec find %D/%%PYTHON_SITELIBDIR%%/samba -name '*.py[co]' -delete >/dev/null 2>&1 @dirrm %%PYTHON_SITELIBDIR%%/samba/web_server @dirrm %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool @@ -812,96 +812,96 @@ libdata/pkgconfig/wbclient.pc %%DATADIR%%/codepages/tr.msg %%DATADIR%%/codepages/upcase.dat %%DATADIR%%/codepages/valid.dat -%%DATADIR%%/setup/DB_CONFIG -%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt -%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt -%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt -%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt -%%DATADIR%%/setup/ad-schema/licence.txt -%%DATADIR%%/setup/aggregate_schema.ldif -%%DATADIR%%/setup/cn=replicator.ldif -%%DATADIR%%/setup/cn=samba-admin.ldif -%%DATADIR%%/setup/cn=samba.ldif -%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt -%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt -%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt -%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt -%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt -%%DATADIR%%/setup/dns_update_list -%%DATADIR%%/setup/fedora-ds-init.ldif -%%DATADIR%%/setup/fedorads-dna.ldif -%%DATADIR%%/setup/fedorads-index.ldif -%%DATADIR%%/setup/fedorads-linked-attributes.ldif -%%DATADIR%%/setup/fedorads-pam.ldif -%%DATADIR%%/setup/fedorads-partitions.ldif -%%DATADIR%%/setup/fedorads-refint-add.ldif -%%DATADIR%%/setup/fedorads-refint-delete.ldif -%%DATADIR%%/setup/fedorads-samba.ldif -%%DATADIR%%/setup/fedorads-sasl.ldif -%%DATADIR%%/setup/fedorads.inf -%%DATADIR%%/setup/idmap_init.ldif -%%DATADIR%%/setup/krb5.conf -%%DATADIR%%/setup/memberof.conf -%%DATADIR%%/setup/mmr_serverids.conf -%%DATADIR%%/setup/mmr_syncrepl.conf -%%DATADIR%%/setup/modules.conf -%%DATADIR%%/setup/named.conf -%%DATADIR%%/setup/named.conf.dlz -%%DATADIR%%/setup/named.conf.update -%%DATADIR%%/setup/named.txt -%%DATADIR%%/setup/olc_mmr.conf -%%DATADIR%%/setup/olc_seed.ldif -%%DATADIR%%/setup/olc_serverid.conf -%%DATADIR%%/setup/olc_syncrepl.conf -%%DATADIR%%/setup/olc_syncrepl_seed.conf -%%DATADIR%%/setup/prefixMap.txt -%%DATADIR%%/setup/provision.ldif -%%DATADIR%%/setup/provision.reg -%%DATADIR%%/setup/provision.zone -%%DATADIR%%/setup/provision_basedn.ldif -%%DATADIR%%/setup/provision_basedn_modify.ldif -%%DATADIR%%/setup/provision_basedn_options.ldif -%%DATADIR%%/setup/provision_basedn_references.ldif -%%DATADIR%%/setup/provision_computers_add.ldif -%%DATADIR%%/setup/provision_computers_modify.ldif -%%DATADIR%%/setup/provision_configuration.ldif -%%DATADIR%%/setup/provision_configuration_basedn.ldif -%%DATADIR%%/setup/provision_configuration_modify.ldif -%%DATADIR%%/setup/provision_configuration_references.ldif -%%DATADIR%%/setup/provision_dns_accounts_add.ldif -%%DATADIR%%/setup/provision_dns_add_samba.ldif -%%DATADIR%%/setup/provision_dnszones_add.ldif -%%DATADIR%%/setup/provision_dnszones_modify.ldif -%%DATADIR%%/setup/provision_dnszones_partitions.ldif -%%DATADIR%%/setup/provision_group_policy.ldif -%%DATADIR%%/setup/provision_init.ldif -%%DATADIR%%/setup/provision_partitions.ldif -%%DATADIR%%/setup/provision_privilege.ldif -%%DATADIR%%/setup/provision_rootdse_add.ldif -%%DATADIR%%/setup/provision_rootdse_modify.ldif -%%DATADIR%%/setup/provision_schema_basedn.ldif -%%DATADIR%%/setup/provision_schema_basedn_modify.ldif -%%DATADIR%%/setup/provision_self_join.ldif -%%DATADIR%%/setup/provision_self_join_config.ldif -%%DATADIR%%/setup/provision_self_join_modify.ldif -%%DATADIR%%/setup/provision_self_join_modify_config.ldif -%%DATADIR%%/setup/provision_users.ldif -%%DATADIR%%/setup/provision_users_add.ldif -%%DATADIR%%/setup/provision_users_modify.ldif -%%DATADIR%%/setup/provision_well_known_sec_princ.ldif -%%DATADIR%%/setup/refint.conf -%%DATADIR%%/setup/schema-map-fedora-ds-1.0 -%%DATADIR%%/setup/schema-map-openldap-2.3 -%%DATADIR%%/setup/schema_samba4.ldif -%%DATADIR%%/setup/secrets.ldif -%%DATADIR%%/setup/secrets_dns.ldif -%%DATADIR%%/setup/secrets_init.ldif -%%DATADIR%%/setup/secrets_sasl_ldap.ldif -%%DATADIR%%/setup/secrets_simple_ldap.ldif -%%DATADIR%%/setup/share.ldif -%%DATADIR%%/setup/slapd.conf -%%DATADIR%%/setup/spn_update_list -%%DATADIR%%/setup/ypServ30.ldif +%%AD_DC%%%%DATADIR%%/setup/DB_CONFIG +%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt +%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt +%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt +%%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt +%%AD_DC%%%%DATADIR%%/setup/ad-schema/licence.txt +%%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif +%%AD_DC%%%%DATADIR%%/setup/cn=replicator.ldif +%%AD_DC%%%%DATADIR%%/setup/cn=samba-admin.ldif +%%AD_DC%%%%DATADIR%%/setup/cn=samba.ldif +%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt +%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt +%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt +%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt +%%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt +%%AD_DC%%%%DATADIR%%/setup/dns_update_list +%%AD_DC%%%%DATADIR%%/setup/fedora-ds-init.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-dna.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-index.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-linked-attributes.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-pam.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-partitions.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-refint-add.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-refint-delete.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-samba.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads-sasl.ldif +%%AD_DC%%%%DATADIR%%/setup/fedorads.inf +%%AD_DC%%%%DATADIR%%/setup/idmap_init.ldif +%%AD_DC%%%%DATADIR%%/setup/krb5.conf +%%AD_DC%%%%DATADIR%%/setup/memberof.conf +%%AD_DC%%%%DATADIR%%/setup/mmr_serverids.conf +%%AD_DC%%%%DATADIR%%/setup/mmr_syncrepl.conf +%%AD_DC%%%%DATADIR%%/setup/modules.conf +%%AD_DC%%%%DATADIR%%/setup/named.conf +%%AD_DC%%%%DATADIR%%/setup/named.conf.dlz +%%AD_DC%%%%DATADIR%%/setup/named.conf.update +%%AD_DC%%%%DATADIR%%/setup/named.txt +%%AD_DC%%%%DATADIR%%/setup/olc_mmr.conf +%%AD_DC%%%%DATADIR%%/setup/olc_seed.ldif +%%AD_DC%%%%DATADIR%%/setup/olc_serverid.conf +%%AD_DC%%%%DATADIR%%/setup/olc_syncrepl.conf +%%AD_DC%%%%DATADIR%%/setup/olc_syncrepl_seed.conf +%%AD_DC%%%%DATADIR%%/setup/prefixMap.txt +%%AD_DC%%%%DATADIR%%/setup/provision.ldif +%%AD_DC%%%%DATADIR%%/setup/provision.reg +%%AD_DC%%%%DATADIR%%/setup/provision.zone +%%AD_DC%%%%DATADIR%%/setup/provision_basedn.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_basedn_modify.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_basedn_options.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_basedn_references.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_computers_add.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_computers_modify.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_configuration.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_configuration_basedn.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_configuration_modify.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_configuration_references.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_dns_accounts_add.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_dns_add_samba.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_add.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_modify.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_dnszones_partitions.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_group_policy.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_init.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_partitions.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_privilege.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_rootdse_add.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_rootdse_modify.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_schema_basedn_modify.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_self_join.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_self_join_config.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_self_join_modify_config.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_users.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_users_add.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_users_modify.ldif +%%AD_DC%%%%DATADIR%%/setup/provision_well_known_sec_princ.ldif +%%AD_DC%%%%DATADIR%%/setup/refint.conf +%%AD_DC%%%%DATADIR%%/setup/schema-map-fedora-ds-1.0 +%%AD_DC%%%%DATADIR%%/setup/schema-map-openldap-2.3 +%%AD_DC%%%%DATADIR%%/setup/schema_samba4.ldif +%%AD_DC%%%%DATADIR%%/setup/secrets.ldif +%%AD_DC%%%%DATADIR%%/setup/secrets_dns.ldif +%%AD_DC%%%%DATADIR%%/setup/secrets_init.ldif +%%AD_DC%%%%DATADIR%%/setup/secrets_sasl_ldap.ldif +%%AD_DC%%%%DATADIR%%/setup/secrets_simple_ldap.ldif +%%AD_DC%%%%DATADIR%%/setup/share.ldif +%%AD_DC%%%%DATADIR%%/setup/slapd.conf +%%AD_DC%%%%DATADIR%%/setup/spn_update_list +%%AD_DC%%%%DATADIR%%/setup/ypServ30.ldif %%DATADIR%%/swat/help/welcome-no-samba-doc.html %%DATADIR%%/swat/help/welcome.html %%DATADIR%%/swat/images/globals.gif @@ -950,9 +950,9 @@ libdata/pkgconfig/wbclient.pc @dirrm %%DATADIR%%/swat/images @dirrm %%DATADIR%%/swat/help @dirrm %%DATADIR%%/swat -@dirrm %%DATADIR%%/setup/display-specifiers -@dirrm %%DATADIR%%/setup/ad-schema -@dirrm %%DATADIR%%/setup +%%AD_DC%%@dirrm %%DATADIR%%/setup/display-specifiers +%%AD_DC%%@dirrm %%DATADIR%%/setup/ad-schema +%%AD_DC%%@dirrm %%DATADIR%%/setup @dirrm %%DATADIR%%/codepages @dirrm %%DATADIR%% man/man1/dbwrap_tool.1.gz From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 03:51:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0F0D464A; Mon, 15 Dec 2014 03:51: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 EEC38B14; Mon, 15 Dec 2014 03:51:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBF3p5oK003241; Mon, 15 Dec 2014 03:51:05 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBF3p5OE003240; Mon, 15 Dec 2014 03:51:05 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201412150351.sBF3p5OE003240@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Mon, 15 Dec 2014 03:51:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374734 - head/math/octave-forge-optics X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 03:51:06 -0000 Author: stephen Date: Mon Dec 15 03:51:04 2014 New Revision: 374734 URL: https://svnweb.freebsd.org/changeset/ports/374734 QAT: https://qat.redports.org/buildarchive/r374734/ Log: - Change license to correct value. Modified: head/math/octave-forge-optics/Makefile Modified: head/math/octave-forge-optics/Makefile ============================================================================== --- head/math/octave-forge-optics/Makefile Mon Dec 15 00:54:19 2014 (r374733) +++ head/math/octave-forge-optics/Makefile Mon Dec 15 03:51:04 2014 (r374734) @@ -8,7 +8,7 @@ CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} -LICENSE= GPLv2 +LICENSE= GPLv3 # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 07:34:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E81F4E1F; Mon, 15 Dec 2014 07: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 BB04F1BE; Mon, 15 Dec 2014 07:34:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBF7YWKO008601; Mon, 15 Dec 2014 07:34:32 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBF7YW1i008599; Mon, 15 Dec 2014 07:34:32 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201412150734.sBF7YW1i008599@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 15 Dec 2014 07:34:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374735 - in head/sysutils: . syslog-ng-incubator03 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 07:34:33 -0000 Author: cy Date: Mon Dec 15 07:34:31 2014 New Revision: 374735 URL: https://svnweb.freebsd.org/changeset/ports/374735 QAT: https://qat.redports.org/buildarchive/r374735/ Log: Syslog-ng-incubator 0.3.3 only works with syslog-ng35. sysutils/syslog-ng-incubator copied to sysutils/syslog-ng-incubator03 in preparation for pending update of main syslog-ng-incubator port to 0.4.X (which will be suported by the syslog-ng 3.6 branch). Submitted by: Peter Czanik (Syslog-ng upline) Added: head/sysutils/syslog-ng-incubator03/ - copied from r374512, head/sysutils/syslog-ng-incubator/ Modified: head/sysutils/Makefile head/sysutils/syslog-ng-incubator03/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Mon Dec 15 03:51:04 2014 (r374734) +++ head/sysutils/Makefile Mon Dec 15 07:34:31 2014 (r374735) @@ -912,6 +912,7 @@ SUBDIR += syslog-ng SUBDIR += syslog-ng-devel SUBDIR += syslog-ng-incubator + SUBDIR += syslog-ng-incubator03 SUBDIR += syslog-ng33 SUBDIR += syslog-ng34 SUBDIR += syslog-ng35 Modified: head/sysutils/syslog-ng-incubator03/Makefile ============================================================================== --- head/sysutils/syslog-ng-incubator/Makefile Thu Dec 11 05:49:41 2014 (r374512) +++ head/sysutils/syslog-ng-incubator03/Makefile Mon Dec 15 07:34:31 2014 (r374735) @@ -6,18 +6,17 @@ PORTVERSION= 0.3.3 CATEGORIES= sysutils MASTER_SITES= http://packages.madhouse-project.org/syslog-ng/incubator/ DISTFILES= syslog-ng-incubator-${PORTVERSION}.tar.xz +PKGNAMESUFFIX=03 MAINTAINER= cy@FreeBSD.org COMMENT= The syslog-ng module incubator -BROKEN= Fails to build with syslog-ng36 - WRKSRC= $(WRKDIR)/$(PORTNAME)-$(PORTVERSION) MAKE_JOBS_UNSAFE= yes LIB_DEPENDS= libevtlog.so:${PORTSDIR}/sysutils/eventlog \ - libsyslog-ng.so:${PORTSDIR}/sysutils/syslog-ng + libsyslog-ng-3.5.6.so:${PORTSDIR}/sysutils/syslog-ng35 USES= gmake pkgconfig pathfix bison lua tar:xz libtool USE_LDCONFIG= yes From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 08:06:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FAC1751; Mon, 15 Dec 2014 08: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E46036A8; Mon, 15 Dec 2014 08:06:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBF86vEI023666; Mon, 15 Dec 2014 08:06:57 GMT (envelope-from nemysis@FreeBSD.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBF86uSc023661; Mon, 15 Dec 2014 08:06:56 GMT (envelope-from nemysis@FreeBSD.org) Message-Id: <201412150806.sBF86uSc023661@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nemysis set sender to nemysis@FreeBSD.org using -f From: Rusmir Dusko Date: Mon, 15 Dec 2014 08:06:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374736 - in head: . games games/empire games/vms-empire X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 08:06:58 -0000 Author: nemysis Date: Mon Dec 15 08:06:55 2014 New Revision: 374736 URL: https://svnweb.freebsd.org/changeset/ports/374736 QAT: https://qat.redports.org/buildarchive/r374736/ Log: - Update to 1.13, announce message: Comment on entry to and exit from edit mode. Cleaned up packaging and install/uninstall productions. - Rename from games/empire to games/vms-empire to match Upstream name - Remove DISTNAME - Change PLIST_FILES, changed by me and Upstream - Remove obsolete REINPLACE - Simplify installation handling, changed by me and Upstream - Add REINPLACE, fix GNU/Linux paths - Strip executable - Change pkg-descr Added: head/games/vms-empire/ - copied from r374734, head/games/empire/ Deleted: head/games/empire/ Modified: head/MOVED head/games/Makefile head/games/vms-empire/Makefile head/games/vms-empire/distinfo head/games/vms-empire/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Mon Dec 15 07:34:31 2014 (r374735) +++ head/MOVED Mon Dec 15 08:06:55 2014 (r374736) @@ -7318,3 +7318,4 @@ www/twig-php||2014-12-08|Removed, as it net/ntp-rc|net/ntp-devel|2014-12-11|Upline uses devel and relesae candidate interchangably. textproc/xerces-c2|textproc/xerces-c3|2014-12-12|Unused, conflicting with xerces-c3 textproc/xerces-c2-devel|textproc/xerces-c3|2014-12-12|Unused, conflicting with xerces-c3 +games/empire|games/vms-empire|2014-12-15|Moved to match upstream name Modified: head/games/Makefile ============================================================================== --- head/games/Makefile Mon Dec 15 07:34:31 2014 (r374735) +++ head/games/Makefile Mon Dec 15 08:06:55 2014 (r374736) @@ -224,7 +224,6 @@ SUBDIR += el SUBDIR += el-data SUBDIR += ember - SUBDIR += empire SUBDIR += endgame-singularity SUBDIR += endgame-singularity-music SUBDIR += enigma @@ -1034,6 +1033,7 @@ SUBDIR += wmpuzzle SUBDIR += wmqstat SUBDIR += wmquake + SUBDIR += vms-empire SUBDIR += wmshuffle SUBDIR += wmtictactoe SUBDIR += wolfpack Modified: head/games/vms-empire/Makefile ============================================================================== --- head/games/empire/Makefile Mon Dec 15 03:51:04 2014 (r374734) +++ head/games/vms-empire/Makefile Mon Dec 15 08:06:55 2014 (r374736) @@ -1,11 +1,10 @@ # Created by: Andrey Zakhvatov # $FreeBSD$ -PORTNAME= empire -PORTVERSION= 1.12 +PORTNAME= vms-empire +PORTVERSION= 1.13 CATEGORIES= games MASTER_SITES= http://www.catb.org/~esr/vms-empire/ -DISTNAME= vms-${PORTNAME}-${PORTVERSION} MAINTAINER= nemysis@FreeBSD.org COMMENT= Simulation of a full-scale war between two emperors @@ -17,22 +16,19 @@ OPTIONS_DEFINE= DOCS PLIST_FILES= bin/${PORTNAME} \ man/man6/${PORTNAME}.6.gz \ - share/applications/${PORTNAME}.desktop \ - share/pixmaps/${PORTNAME}.png + share/appdata/${PORTNAME}.xml \ + ${DESKTOPDIR}/${PORTNAME}.desktop \ + share/icons/hicolor/48x48/apps/${PORTNAME}.png post-patch: - @${REINPLACE_CMD} -e 's|^CFLAGS|#CFLAGS| ; \ - s|-lncurses|-lcurses|' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|static void|void|g' ${WRKSRC}/game.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vms-empire \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_DATA} ${WRKSRC}/empire-logo.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/ + @${REINPLACE_CMD} -e 's|^CFLAGS|CFLAGS?|; \ + s|/usr/bin|${PREFIX}/bin|; \ + s|/usr/share/|${PREFIX}/share/|; \ + s|/usr/local/share/man|${PREFIX}/man|' \ + ${WRKSRC}/Makefile +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/games/vms-empire/distinfo ============================================================================== --- head/games/empire/distinfo Mon Dec 15 03:51:04 2014 (r374734) +++ head/games/vms-empire/distinfo Mon Dec 15 08:06:55 2014 (r374736) @@ -1,2 +1,2 @@ -SHA256 (vms-empire-1.12.tar.gz) = b3bdca36b767ba3b2b3afca9fecbb1e0ac983fb34f7c8d3c25b20423eed4c1f2 -SIZE (vms-empire-1.12.tar.gz) = 108417 +SHA256 (vms-empire-1.13.tar.gz) = 8d461266a9d469646e9d55f74e41014babd83a93ad2e75736b1e8523bffca181 +SIZE (vms-empire-1.13.tar.gz) = 109310 Modified: head/games/vms-empire/pkg-descr ============================================================================== --- head/games/empire/pkg-descr Mon Dec 15 03:51:04 2014 (r374734) +++ head/games/vms-empire/pkg-descr Mon Dec 15 08:06:55 2014 (r374736) @@ -1,17 +1,8 @@ +The ancestor of all 4x (expand/explore/exploit/exterminate) games. VMS-Empire is a simulation of a full-scale war between two emperors, the computer and you. Naturally, there is only room for one, so the -object of the game is to destroy the other. The computer plays by -the same rules that you do. This game is the ancestor of all the -multiplayer 4X simulations out there, including Civilization and -Master of Orion. - -Apparently, this game was originally written outside of Digital, -probably at a university. The game was ported to DEC's VAX/VMS from -the TOPS-10/20 FORTRAN sources available around fall 1979. Ed James -got hold of the sources at Berkeley and converted portions of the -code to C, mostly to use curses for the screen handling. He published -his modified sources on the net in December 1986. Because this -game ran on VMS machines for so long, a previous version is known -as VMS Empire. +object of the game is to destroy the other. The computer plays by the +same rules that you do. This game is the ancestor of all the multiplayer +4X simulations out there, including Civilization and Master of Orion. WWW: http://www.catb.org/~esr/vms-empire/ From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 11:13:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38426897; Mon, 15 Dec 2014 11: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22CF4C8E; Mon, 15 Dec 2014 11:13:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFBDfa2015522; Mon, 15 Dec 2014 11:13:41 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFBDebv015519; Mon, 15 Dec 2014 11:13:40 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201412151113.sBFBDebv015519@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Mon, 15 Dec 2014 11:13:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374737 - head/www/xpi-gdata_provider X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 11:13:41 -0000 Author: ale Date: Mon Dec 15 11:13:39 2014 New Revision: 374737 URL: https://svnweb.freebsd.org/changeset/ports/374737 QAT: https://qat.redports.org/buildarchive/r374737/ Log: Update to 1.0.3 release. Modified: head/www/xpi-gdata_provider/Makefile head/www/xpi-gdata_provider/distinfo head/www/xpi-gdata_provider/pkg-plist Modified: head/www/xpi-gdata_provider/Makefile ============================================================================== --- head/www/xpi-gdata_provider/Makefile Mon Dec 15 08:06:55 2014 (r374736) +++ head/www/xpi-gdata_provider/Makefile Mon Dec 15 11:13:39 2014 (r374737) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gdata_provider -PORTVERSION= 0.32 +PORTVERSION= 1.0.3 DISTVERSIONSUFFIX= -tb+sm CATEGORIES= www deskutils Modified: head/www/xpi-gdata_provider/distinfo ============================================================================== --- head/www/xpi-gdata_provider/distinfo Mon Dec 15 08:06:55 2014 (r374736) +++ head/www/xpi-gdata_provider/distinfo Mon Dec 15 11:13:39 2014 (r374737) @@ -1,2 +1,2 @@ -SHA256 (xpi/provider_for_google_calendar-0.32-tb+sm.xpi) = b084b8c8f60bebf7ea47c2b10d72011fc9d55f26fcb88b667ee3bfaaa9209746 -SIZE (xpi/provider_for_google_calendar-0.32-tb+sm.xpi) = 114328 +SHA256 (xpi/provider_for_google_calendar-1.0.3-tb+sm.xpi) = 713073d87c4c99e0e64093011dfae4b33cd7a253711ff77969336e986a2c603f +SIZE (xpi/provider_for_google_calendar-1.0.3-tb+sm.xpi) = 88808 Modified: head/www/xpi-gdata_provider/pkg-plist ============================================================================== --- head/www/xpi-gdata_provider/pkg-plist Mon Dec 15 08:06:55 2014 (r374736) +++ head/www/xpi-gdata_provider/pkg-plist Mon Dec 15 11:13:39 2014 (r374737) @@ -1,188 +1,40 @@ -%%XPI_XPIDIR%%/chrome/gdata-provider/content/calendarCreation.xul +%%XPI_XPIDIR%%/chrome.manifest +%%XPI_XPIDIR%%/chrome/.mkdir.done +%%XPI_XPIDIR%%/chrome/gdata-provider-en-US/locale/en-US/gdata.dtd +%%XPI_XPIDIR%%/chrome/gdata-provider-en-US/locale/en-US/gdata.properties +%%XPI_XPIDIR%%/chrome/gdata-provider/content/browserRequest.js +%%XPI_XPIDIR%%/chrome/gdata-provider/content/browserRequest.xul %%XPI_XPIDIR%%/chrome/gdata-provider/content/gcal.png +%%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-calendar-creation.js +%%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-calendar-creation.xul +%%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-calendar-event-dialog.js %%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-calendar-event-dialog.xul +%%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-calendar-properties.js +%%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-calendar-properties.xul +%%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-event-dialog-reminder.js %%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-event-dialog-reminder.xul +%%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-list-tree.xml %%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-migration-overlay.xul %%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-migration-wizard.xul %%XPI_XPIDIR%%/chrome/gdata-provider/content/gdata-migration.js +%%XPI_XPIDIR%%/chrome/gdata-provider/skin/browserRequest.css +%%XPI_XPIDIR%%/chrome/gdata-provider/skin/gdata-bindings.css %%XPI_XPIDIR%%/chrome/gdata-provider/skin/gdata-event-dialog-reminder.css %%XPI_XPIDIR%%/chrome/gdata-provider/skin/reminder-action-sms.png -%%XPI_XPIDIR%%/chrome/gdata-provider-ca/locale/ca/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-ca/locale/ca/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-cs/locale/cs/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-cs/locale/cs/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-da/locale/da/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-da/locale/da/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-de/locale/de/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-de/locale/de/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-en-GB/locale/en-GB/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-en-GB/locale/en-GB/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-en-US/locale/en-US/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-en-US/locale/en-US/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-es-AR/locale/es-AR/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-es-AR/locale/es-AR/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-es-ES/locale/es-ES/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-es-ES/locale/es-ES/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-et/locale/et/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-et/locale/et/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-eu/locale/eu/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-eu/locale/eu/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-fi/locale/fi/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-fi/locale/fi/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-fr/locale/fr/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-fr/locale/fr/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-fy-NL/locale/fy-NL/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-fy-NL/locale/fy-NL/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-ga-IE/locale/ga-IE/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-ga-IE/locale/ga-IE/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-gd/locale/gd/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-gd/locale/gd/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-hr/locale/hr/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-hr/locale/hr/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-hu/locale/hu/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-hu/locale/hu/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-is/locale/is/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-is/locale/is/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-it/locale/it/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-it/locale/it/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-ja/locale/ja/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-ja/locale/ja/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-ja-JP-mac/locale/ja-JP-mac/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-ja-JP-mac/locale/ja-JP-mac/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-ko/locale/ko/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-ko/locale/ko/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-lt/locale/lt/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-lt/locale/lt/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-nb-NO/locale/nb-NO/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-nb-NO/locale/nb-NO/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-nl/locale/nl/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-nl/locale/nl/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-nn-NO/locale/nn-NO/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-nn-NO/locale/nn-NO/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-pl/locale/pl/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-pl/locale/pl/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-pt-PT/locale/pt-PT/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-pt-PT/locale/pt-PT/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-ru/locale/ru/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-ru/locale/ru/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-sk/locale/sk/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-sk/locale/sk/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN/locale/zh-CN/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN/locale/zh-CN/gdata.properties -%%XPI_XPIDIR%%/chrome/gdata-provider-zh-TW/locale/zh-TW/gdata.dtd -%%XPI_XPIDIR%%/chrome/gdata-provider-zh-TW/locale/zh-TW/gdata.properties -%%XPI_XPIDIR%%/chrome.manifest -%%XPI_XPIDIR%%/components/calGoogleCalendarModule.js -%%XPI_XPIDIR%%/components/calGoogleCalendarModule.manifest -%%XPI_XPIDIR%%/components/gdata.xpt -%%XPI_XPIDIR%%/components/interfaces.manifest +%%XPI_XPIDIR%%/components/calGoogleCalendar.js +%%XPI_XPIDIR%%/components/calGoogleCalendar.manifest %%XPI_XPIDIR%%/defaults/preferences/preferences.js %%XPI_XPIDIR%%/install.rdf -%%XPI_XPIDIR%%/js/calGoogleCalendar.js -%%XPI_XPIDIR%%/js/calGoogleRequest.js -%%XPI_XPIDIR%%/js/calGoogleSession.js -%%XPI_XPIDIR%%/js/calGoogleUtils.js -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider/content -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider/skin -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ca/locale/ca -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ca/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ca -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-cs/locale/cs -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-cs/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-cs -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-da/locale/da -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-da/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-da -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-de/locale/de -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-de/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-de -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-en-GB/locale/en-GB -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-en-GB/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-en-GB -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-en-US/locale/en-US -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-en-US/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-en-US -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-es-AR/locale/es-AR -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-es-AR/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-es-AR -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-es-ES/locale/es-ES -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-es-ES/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-es-ES -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-et/locale/et -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-et/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-et -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-eu/locale/eu -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-eu/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-eu -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fi/locale/fi -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fi/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fi -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fr/locale/fr -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fr/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fr -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fy-NL/locale/fy-NL -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fy-NL/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-fy-NL -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ga-IE/locale/ga-IE -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ga-IE/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ga-IE -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gd/locale/gd -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gd/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-gd -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hr/locale/hr -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hr/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hr -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hu/locale/hu -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hu/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-hu -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-is/locale/is -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-is/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-is -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-it/locale/it -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-it/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-it -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ja/locale/ja -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ja/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ja -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ja-JP-mac/locale/ja-JP-mac -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ja-JP-mac/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ja-JP-mac -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ko/locale/ko -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ko/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ko -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-lt/locale/lt -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-lt/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-lt -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nb-NO/locale/nb-NO -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nb-NO/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nb-NO -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nl/locale/nl -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nl/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nl -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nn-NO/locale/nn-NO -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nn-NO/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-nn-NO -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-pl/locale/pl -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-pl/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-pl -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-pt-PT/locale/pt-PT -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-pt-PT/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-pt-PT -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ru/locale/ru -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ru/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-ru -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sk/locale/sk -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sk/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-sk -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN/locale/zh-CN -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-CN -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-TW/locale/zh-TW -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-TW/locale -@dirrm %%XPI_XPIDIR%%/chrome/gdata-provider-zh-TW -@dirrm %%XPI_XPIDIR%%/chrome -@dirrm %%XPI_XPIDIR%%/components -@dirrm %%XPI_XPIDIR%%/defaults/preferences -@dirrm %%XPI_XPIDIR%%/defaults -@dirrm %%XPI_XPIDIR%%/js +%%XPI_XPIDIR%%/modules/OAuth2.jsm +%%XPI_XPIDIR%%/modules/gdataLogging.jsm +%%XPI_XPIDIR%%/modules/gdataRequest.jsm +%%XPI_XPIDIR%%/modules/gdataSession.jsm +%%XPI_XPIDIR%%/modules/gdataUtils.jsm +%%XPI_XPIDIR%%/modules/shim/Calendar.jsm +%%XPI_XPIDIR%%/modules/shim/Http.jsm +%%XPI_XPIDIR%%/modules/shim/Loader.jsm +%%XPI_XPIDIR%%/modules/shim/Preferences.jsm +%%XPI_XPIDIR%%/modules/shim/Promise.jsm +%%XPI_XPIDIR%%/modules/shim/Task.jsm +%%XPI_XPIDIR%%/modules/shim/Timer.jsm +%%XPI_XPIDIR%%/modules/timezoneMap.jsm From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 12:33:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DCD24D4F; Mon, 15 Dec 2014 12:33: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 C8CC3754; Mon, 15 Dec 2014 12:33:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFCXJjS054259; Mon, 15 Dec 2014 12:33:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFCXJeM054257; Mon, 15 Dec 2014 12:33:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412151233.sBFCXJeM054257@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Dec 2014 12:33:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374738 - head/audio/py-openal X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 12:33:20 -0000 Author: amdmi3 Date: Mon Dec 15 12:33:18 2014 New Revision: 374738 URL: https://svnweb.freebsd.org/changeset/ports/374738 QAT: https://qat.redports.org/buildarchive/r374738/ Log: - Add LICENSE - Strip library - Fix tab after WWW: Approved by: bapt Modified: head/audio/py-openal/Makefile head/audio/py-openal/pkg-descr Modified: head/audio/py-openal/Makefile ============================================================================== --- head/audio/py-openal/Makefile Mon Dec 15 11:13:39 2014 (r374737) +++ head/audio/py-openal/Makefile Mon Dec 15 12:33:18 2014 (r374738) @@ -8,13 +8,16 @@ CATEGORIES= audio python MASTER_SITES= http://download.gna.org/pyopenal/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= PyOpenAL-${PORTVERSION} +DIST_SUBDIR= python MAINTAINER= acm@FreeBSD.org COMMENT= PyOpenAL is a binding of OpenAL for Python +LICENSE= LGPL21 # or later +LICENSE_FILE= ${WRKSRC}/LICENSE + OPTIONS_DEFINE= DOCS EXAMPLES -DIST_SUBDIR= python USES= openal:al,alut python USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/PyOpenAL-${PORTVERSION} @@ -28,5 +31,6 @@ post-patch: post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/demo/* ${STAGEDIR}${EXAMPLESDIR} + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_openal.so .include Modified: head/audio/py-openal/pkg-descr ============================================================================== --- head/audio/py-openal/pkg-descr Mon Dec 15 11:13:39 2014 (r374737) +++ head/audio/py-openal/pkg-descr Mon Dec 15 12:33:18 2014 (r374738) @@ -8,4 +8,4 @@ engine for Python. PyOpenAL is Free Software, under the GNU LGPL license. -WWW: http://home.gna.org/oomadness/en/pyopenal/index.html +WWW: http://home.gna.org/oomadness/en/pyopenal/index.html From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 12:33:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 195C9E2F; Mon, 15 Dec 2014 12:33: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 0572B759; Mon, 15 Dec 2014 12:33:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFCXa4c054401; Mon, 15 Dec 2014 12:33:36 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFCXaNo054400; Mon, 15 Dec 2014 12:33:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412151233.sBFCXaNo054400@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Dec 2014 12:33:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374739 - head/graphics/wings X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 12:33:37 -0000 Author: amdmi3 Date: Mon Dec 15 12:33:35 2014 New Revision: 374739 URL: https://svnweb.freebsd.org/changeset/ports/374739 QAT: https://qat.redports.org/buildarchive/r374739/ Log: - Add LICENSE - Strip libraries Modified: head/graphics/wings/Makefile Modified: head/graphics/wings/Makefile ============================================================================== --- head/graphics/wings/Makefile Mon Dec 15 12:33:18 2014 (r374738) +++ head/graphics/wings/Makefile Mon Dec 15 12:33:35 2014 (r374739) @@ -11,6 +11,11 @@ DIST_SUBDIR= erlang MAINTAINER= amdmi3@FreeBSD.org COMMENT= Polygon mesh modeler written in Erlang +LICENSE= Wings3D +LICENSE_NAME= Wings 3D License # similar to TclTk license +LICENSE_FILE= ${WRKSRC}/license.terms +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang \ ${LOCALBASE}/lib/erlang/lib/esdl/include/sdl.hrl:${PORTSDIR}/devel/esdl RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang \ @@ -44,5 +49,8 @@ do-install: ${LN} -sf ${DISTNAME} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}.icon ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico + ${CHMOD} u+w ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/plugins/accel/*.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/plugins/accel/*.so + ${CHMOD} u-w ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/plugins/accel/*.so .include From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 12:37:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 60360FC8; Mon, 15 Dec 2014 12:37: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 4C5D1784; Mon, 15 Dec 2014 12:37:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFCbuod055122; Mon, 15 Dec 2014 12:37:56 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFCbtRR055120; Mon, 15 Dec 2014 12:37:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412151237.sBFCbtRR055120@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Dec 2014 12:37:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374740 - head/games/numptyphysics X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 12:37:56 -0000 Author: amdmi3 Date: Mon Dec 15 12:37:54 2014 New Revision: 374740 URL: https://svnweb.freebsd.org/changeset/ports/374740 QAT: https://qat.redports.org/buildarchive/r374740/ Log: - Update MASTER_SITES - Add LICENSE - Drop @dirrm* from plist Modified: head/games/numptyphysics/Makefile head/games/numptyphysics/pkg-plist Modified: head/games/numptyphysics/Makefile ============================================================================== --- head/games/numptyphysics/Makefile Mon Dec 15 12:33:35 2014 (r374739) +++ head/games/numptyphysics/Makefile Mon Dec 15 12:37:54 2014 (r374740) @@ -5,13 +5,14 @@ PORTNAME= numptyphysics DISTVERSION= 0.3.r20090104 PORTREVISION= 9 CATEGORIES= games -MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ - ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/ \ - ftp://ftp3.usa.openbsd.org/pub/OpenBSD/distfiles/ +MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Drawing physics-based puzzle game +LICENSE= GPLv3 # or later +LICENSE_FILE= ${WRKSRC}/COPYING + USES= tar:bzip2 desktop-file-utils GNU_CONFIGURE= yes USE_SDL= sdl image Modified: head/games/numptyphysics/pkg-plist ============================================================================== --- head/games/numptyphysics/pkg-plist Mon Dec 15 12:33:35 2014 (r374739) +++ head/games/numptyphysics/pkg-plist Mon Dec 15 12:37:54 2014 (r374740) @@ -23,12 +23,3 @@ share/icons/hicolor/scalable/apps/numpty %%DATADIR%%/play.png %%DATADIR%%/record.png %%DATADIR%%/theend.png -@dirrm %%DATADIR%% -@dirrmtry share/icons/hicolor/scalable/apps -@dirrmtry share/icons/hicolor/scalable -@dirrmtry share/icons/hicolor/64x64/apps -@dirrmtry share/icons/hicolor/64x64 -@dirrmtry share/icons/hicolor/26x26/apps -@dirrmtry share/icons/hicolor/26x26 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 12:38:08 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0251E12B; Mon, 15 Dec 2014 12:38: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 E2A40787; Mon, 15 Dec 2014 12:38:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFCc73k055275; Mon, 15 Dec 2014 12:38:07 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFCc7Qt055273; Mon, 15 Dec 2014 12:38:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412151238.sBFCc7Qt055273@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Dec 2014 12:38:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374741 - head/games/numptyphysics-npcomplete X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 12:38:08 -0000 Author: amdmi3 Date: Mon Dec 15 12:38:06 2014 New Revision: 374741 URL: https://svnweb.freebsd.org/changeset/ports/374741 QAT: https://qat.redports.org/buildarchive/r374741/ Log: - Add NO_ARCH - Drop @dirrm* from plist Modified: head/games/numptyphysics-npcomplete/Makefile head/games/numptyphysics-npcomplete/pkg-plist Modified: head/games/numptyphysics-npcomplete/Makefile ============================================================================== --- head/games/numptyphysics-npcomplete/Makefile Mon Dec 15 12:37:54 2014 (r374740) +++ head/games/numptyphysics-npcomplete/Makefile Mon Dec 15 12:38:06 2014 (r374741) @@ -15,6 +15,7 @@ RUN_DEPENDS= numptyphysics:${PORTSDIR}/g USES= tar:bzip2 NO_BUILD= yes +NO_ARCH= yes WRKSRC= ${WRKDIR}/npcomplete DATADIR= ${PREFIX}/share/numptyphysics Modified: head/games/numptyphysics-npcomplete/pkg-plist ============================================================================== --- head/games/numptyphysics-npcomplete/pkg-plist Mon Dec 15 12:37:54 2014 (r374740) +++ head/games/numptyphysics-npcomplete/pkg-plist Mon Dec 15 12:38:06 2014 (r374741) @@ -90,4 +90,3 @@ %%DATADIR%%/ship.nph %%DATADIR%%/surfs_up.nph %%DATADIR%%/szymanowski1.nph -@dirrmtry %%DATADIR%% From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 12:38:42 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A02AC21F; Mon, 15 Dec 2014 12:38: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 8C794794; Mon, 15 Dec 2014 12:38:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFCcgbI055446; Mon, 15 Dec 2014 12:38:42 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFCcgWk055445; Mon, 15 Dec 2014 12:38:42 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412151238.sBFCcgWk055445@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Dec 2014 12:38:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374742 - head/multimedia/smplayer-themes X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 12:38:42 -0000 Author: amdmi3 Date: Mon Dec 15 12:38:41 2014 New Revision: 374742 URL: https://svnweb.freebsd.org/changeset/ports/374742 QAT: https://qat.redports.org/buildarchive/r374742/ Log: - Drop @dirrm* from plist Modified: head/multimedia/smplayer-themes/pkg-plist Modified: head/multimedia/smplayer-themes/pkg-plist ============================================================================== --- head/multimedia/smplayer-themes/pkg-plist Mon Dec 15 12:38:06 2014 (r374741) +++ head/multimedia/smplayer-themes/pkg-plist Mon Dec 15 12:38:41 2014 (r374742) @@ -28,20 +28,3 @@ %%DATADIR%%/themes/blackPanther-Real/blackPanther-Real.rcc %%DATADIR%%/themes/blackPanther-VistaLike/README.txt %%DATADIR%%/themes/blackPanther-VistaLike/blackPanther-VistaLike.rcc -@dirrm %%DATADIR%%/themes/Gartoon -@dirrm %%DATADIR%%/themes/Gnome -@dirrm %%DATADIR%%/themes/Monochrome -@dirrm %%DATADIR%%/themes/Noia -@dirrm %%DATADIR%%/themes/Numix-remix -@dirrm %%DATADIR%%/themes/Numix-uTouch -@dirrm %%DATADIR%%/themes/Nuvola -@dirrm %%DATADIR%%/themes/Oxygen -@dirrm %%DATADIR%%/themes/Oxygen-Air -@dirrm %%DATADIR%%/themes/Oxygen-Refit -@dirrm %%DATADIR%%/themes/Silk -@dirrm %%DATADIR%%/themes/Tango -@dirrm %%DATADIR%%/themes/blackPanther-Light -@dirrm %%DATADIR%%/themes/blackPanther-Real -@dirrm %%DATADIR%%/themes/blackPanther-VistaLike -@dirrm %%DATADIR%%/themes -@dirrmtry %%DATADIR%% From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 12:39:49 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29B41405; Mon, 15 Dec 2014 12:39: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 164C27AD; Mon, 15 Dec 2014 12:39:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFCdmu3055695; Mon, 15 Dec 2014 12:39:48 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFCdmqN055694; Mon, 15 Dec 2014 12:39:48 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412151239.sBFCdmqN055694@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Dec 2014 12:39:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374743 - head/graphics/cal3d X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 12:39:49 -0000 Author: amdmi3 Date: Mon Dec 15 12:39:48 2014 New Revision: 374743 URL: https://svnweb.freebsd.org/changeset/ports/374743 QAT: https://qat.redports.org/buildarchive/r374743/ Log: - Strip library Approved by: bapt Modified: head/graphics/cal3d/Makefile Modified: head/graphics/cal3d/Makefile ============================================================================== --- head/graphics/cal3d/Makefile Mon Dec 15 12:38:41 2014 (r374742) +++ head/graphics/cal3d/Makefile Mon Dec 15 12:39:48 2014 (r374743) @@ -16,6 +16,7 @@ CONFLICTS= cal3d-devel-[0-9]* GNU_CONFIGURE= yes USES= libtool pathfix pkgconfig USE_LDCONFIG= yes +INSTALL_TARGET= install-strip post-patch: @${REINPLACE_CMD} -e 's|||' \ From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 13:29:09 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DF52B00; Mon, 15 Dec 2014 13: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49FD6CD6; Mon, 15 Dec 2014 13:29:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFDT9qm080405; Mon, 15 Dec 2014 13:29:09 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFDT8NL080403; Mon, 15 Dec 2014 13:29:08 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201412151329.sBFDT8NL080403@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Mon, 15 Dec 2014 13:29:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374744 - head/databases/mongodb X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 13:29:09 -0000 Author: ale Date: Mon Dec 15 13:29:08 2014 New Revision: 374744 URL: https://svnweb.freebsd.org/changeset/ports/374744 QAT: https://qat.redports.org/buildarchive/r374744/ Log: Update to 2.6.6 release. Modified: head/databases/mongodb/Makefile head/databases/mongodb/distinfo Modified: head/databases/mongodb/Makefile ============================================================================== --- head/databases/mongodb/Makefile Mon Dec 15 12:39:48 2014 (r374743) +++ head/databases/mongodb/Makefile Mon Dec 15 13:29:08 2014 (r374744) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mongodb -PORTVERSION= 2.6.5 +PORTVERSION= 2.6.6 CATEGORIES= databases net MASTER_SITES= http://downloads.mongodb.org/src/ DISTNAME= ${PORTNAME}-src-r${PORTVERSION} Modified: head/databases/mongodb/distinfo ============================================================================== --- head/databases/mongodb/distinfo Mon Dec 15 12:39:48 2014 (r374743) +++ head/databases/mongodb/distinfo Mon Dec 15 13:29:08 2014 (r374744) @@ -1,2 +1,2 @@ -SHA256 (mongodb-src-r2.6.5.tar.gz) = 55d6cb624fe83935564a5e9cd38f2f94b2ec62745c5bd9c0539e4846ae9fa86c -SIZE (mongodb-src-r2.6.5.tar.gz) = 14513441 +SHA256 (mongodb-src-r2.6.6.tar.gz) = 755d703c3a0b0f2f6486b2ddbf286bfb5e174faeda18dcbea2da63dd93010b6a +SIZE (mongodb-src-r2.6.6.tar.gz) = 14537624 From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 13:58:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0B40ECE; Mon, 15 Dec 2014 13:58: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 DC86BFCF; Mon, 15 Dec 2014 13:58:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFDwLpa094674; Mon, 15 Dec 2014 13:58:21 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFDwL7U094672; Mon, 15 Dec 2014 13:58:21 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412151358.sBFDwL7U094672@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Dec 2014 13:58:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374745 - head/multimedia/smpeg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 13:58:22 -0000 Author: amdmi3 Date: Mon Dec 15 13:58:20 2014 New Revision: 374745 URL: https://svnweb.freebsd.org/changeset/ports/374745 QAT: https://qat.redports.org/buildarchive/r374745/ Log: - Simplify MASTER_SITES - Add LICENSE - Strip library (INSTALL_TARGET=install-strip wasn't working) - Drop @dirrm* from plist Approved by: bapt Modified: head/multimedia/smpeg/Makefile head/multimedia/smpeg/pkg-plist Modified: head/multimedia/smpeg/Makefile ============================================================================== --- head/multimedia/smpeg/Makefile Mon Dec 15 13:29:08 2014 (r374744) +++ head/multimedia/smpeg/Makefile Mon Dec 15 13:58:20 2014 (r374745) @@ -6,14 +6,15 @@ PORTVERSION= 0.4.4 PORTREVISION= 14 CATEGORIES= multimedia MASTER_SITES= ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \ - ${MASTER_SITE_GENTOO} -MASTER_SITE_SUBDIR= distfiles + GENTOO/distfiles MAINTAINER= acm@FreeBSD.org COMMENT= Free MPEG1 video player library with sound support +LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING + GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip USES= gmake libtool USE_SDL= sdl USE_LDCONFIG= yes @@ -28,4 +29,7 @@ CONFIGURE_ARGS= --disable-opengl-player --disable-gtk-player \ --enable-mmx +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsmpeg.so + .include Modified: head/multimedia/smpeg/pkg-plist ============================================================================== --- head/multimedia/smpeg/pkg-plist Mon Dec 15 13:29:08 2014 (r374744) +++ head/multimedia/smpeg/pkg-plist Mon Dec 15 13:58:20 2014 (r374745) @@ -18,4 +18,3 @@ lib/libsmpeg.so share/aclocal/smpeg.m4 man/man1/gtv.1.gz man/man1/plaympeg.1.gz -@dirrm include/smpeg From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 14:07:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F25B4FE; Mon, 15 Dec 2014 14:07: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 D37AD127; Mon, 15 Dec 2014 14:07:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFE7qnZ099583; Mon, 15 Dec 2014 14:07:52 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFE7qkj099578; Mon, 15 Dec 2014 14:07:52 GMT (envelope-from db@FreeBSD.org) Message-Id: <201412151407.sBFE7qkj099578@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Mon, 15 Dec 2014 14:07:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374746 - in head/comms/wspr: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 14:07:53 -0000 Author: db Date: Mon Dec 15 14:07:51 2014 New Revision: 374746 URL: https://svnweb.freebsd.org/changeset/ports/374746 QAT: https://qat.redports.org/buildarchive/r374746/ Log: - Unbreak wspr - While here fix import of zeroes removing obsolete import added DOS2UNIX to faciltate this change - Do not re-add #LDFLAGS+= -shared it breaks configure Added: head/comms/wspr/files/patch-WsprMode_specjt.py (contents, props changed) head/comms/wspr/files/patch-wspr.py (contents, props changed) Modified: head/comms/wspr/Makefile Modified: head/comms/wspr/Makefile ============================================================================== --- head/comms/wspr/Makefile Mon Dec 15 13:58:20 2014 (r374745) +++ head/comms/wspr/Makefile Mon Dec 15 14:07:51 2014 (r374746) @@ -2,7 +2,7 @@ PORTNAME= wspr DISTVERSION= ${VERSION}.r${SVN_REV} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= db @@ -24,19 +24,22 @@ LIB_DEPENDS= libhamlib.so:${PORTSDIR}/co DISABLE_MAKE_JOBS= yes USE_AUTOTOOLS= autoconf -USES= fortran gmake libtool tar:bzip2 python:3.3 +USES= fortran gmake libtool tar:bzip2 python:3.3 dos2unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gfortran=${FC} \ --with-f2py=f2py-${PYTHON_VER} \ --with-python3=${PYTHON_CMD} MAKE_ENV+= PYTHONUSERBASE=${STAGEDIR}${PYTHONBASE} -LDFLAGS+= -shared +#LDFLAGS+= -shared VERSION= 4.00 .include pre-configure: @${CP} ${FILESDIR}/wspr.sh.in ${WRKSRC} +do-build: + (cd ${WRKSRC};${GMAKE}) + post-install: .if defined(BOOTSTRAP) #portlint freaks over this but it's only for dev ignore. Added: head/comms/wspr/files/patch-WsprMode_specjt.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/wspr/files/patch-WsprMode_specjt.py Mon Dec 15 14:07:51 2014 (r374746) @@ -0,0 +1,14 @@ +--- WsprMod/specjt.py.orig 2014-12-14 19:17:21.630624057 -0500 ++++ WsprMod/specjt.py 2014-12-14 19:19:41.021613990 -0500 +@@ -34,10 +34,7 @@ + import tkinter.messagebox + from . import w + +-try: +- from numpy.oldnumeric import zeros, multiarray +-except: +- from Numeric import zeros, multiarray ++from numpy import zeros, multiarray + import Image, ImageTk, ImageDraw + from .palettes import colormapblue, colormapgray0, colormapHot, \ + colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette Added: head/comms/wspr/files/patch-wspr.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/wspr/files/patch-wspr.py Mon Dec 15 14:07:51 2014 (r374746) @@ -0,0 +1,11 @@ +--- wspr.py.orig 2014-12-14 19:16:10.079628932 -0500 ++++ wspr.py 2014-12-14 19:16:18.894628427 -0500 +@@ -50,7 +50,7 @@ + import Pmw + from WsprMod import palettes + from math import log10 +-from numpy.oldnumeric import zeros ++from numpy import zeros + import array + ##import dircache + from PIL import Image, ImageTk, ImageDraw From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 14:26:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8DF75666; Mon, 15 Dec 2014 14:26: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 78DFA357; Mon, 15 Dec 2014 14:26:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFEQ6HB009206; Mon, 15 Dec 2014 14:26:06 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFEQ6jL009204; Mon, 15 Dec 2014 14:26:06 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201412151426.sBFEQ6jL009204@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 15 Dec 2014 14:26:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374747 - in head: net/p5-Google-SAML-Response textproc/p5-XML-CanonicalizeXML X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 14:26:06 -0000 Author: marino Date: Mon Dec 15 14:26:05 2014 New Revision: 374747 URL: https://svnweb.freebsd.org/changeset/ports/374747 QAT: https://qat.redports.org/buildarchive/r374747/ Log: Make jobs unsafe on two ports Both of these ports have failed repeatedly under multi-job runs, and had to be fixed by disabling make jobs. Modified: head/net/p5-Google-SAML-Response/Makefile head/textproc/p5-XML-CanonicalizeXML/Makefile Modified: head/net/p5-Google-SAML-Response/Makefile ============================================================================== --- head/net/p5-Google-SAML-Response/Makefile Mon Dec 15 14:07:51 2014 (r374746) +++ head/net/p5-Google-SAML-Response/Makefile Mon Dec 15 14:26:05 2014 (r374747) @@ -25,4 +25,6 @@ TEST_DEPENDS= p5-Test-Exception>=0:${POR USES= perl5 USE_PERL5= configure +MAKE_JOBS_UNSAFE= yes + .include Modified: head/textproc/p5-XML-CanonicalizeXML/Makefile ============================================================================== --- head/textproc/p5-XML-CanonicalizeXML/Makefile Mon Dec 15 14:07:51 2014 (r374746) +++ head/textproc/p5-XML-CanonicalizeXML/Makefile Mon Dec 15 14:26:05 2014 (r374747) @@ -19,4 +19,6 @@ LIB_DEPENDS= libxml2.so:${PORTSDIR}/text USE_PERL5= configure USES= perl5 +MAKE_JOBS_UNSAFE= yes + .include From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 14:42:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E55FBB8F; Mon, 15 Dec 2014 14:42: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 CF96F7A4; Mon, 15 Dec 2014 14:42:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFEgZej018666; Mon, 15 Dec 2014 14:42:35 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFEgXO4018647; Mon, 15 Dec 2014 14:42:33 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412151442.sBFEgXO4018647@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Dec 2014 14:42:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374748 - in head/net: . pjsip pjsip/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 14:42:36 -0000 Author: madpilot Date: Mon Dec 15 14:42:32 2014 New Revision: 374748 URL: https://svnweb.freebsd.org/changeset/ports/374748 QAT: https://qat.redports.org/buildarchive/r374748/ Log: PJSIP is a free and open source multimedia communication library written in C language implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE. It combines signaling protocol (SIP) with rich multimedia framework and NAT traversal functionality into high level API that is portable and suitable for almost any type of systems ranging from desktops, embedded systems, to mobile handsets. WWW: http://www.pjsip.org/ Please note that default options are tailored for use by the upcoming asterisk13 port. Added: head/net/pjsip/ head/net/pjsip/Makefile (contents, props changed) head/net/pjsip/distinfo (contents, props changed) head/net/pjsip/files/ head/net/pjsip/files/patch-Makefile (contents, props changed) head/net/pjsip/files/patch-aconfigure (contents, props changed) head/net/pjsip/files/patch-pjmedia_src_pjmedia_resample__libsamplerate.c (contents, props changed) head/net/pjsip/files/patch-pkgconfig.py (contents, props changed) head/net/pjsip/pkg-descr (contents, props changed) head/net/pjsip/pkg-plist (contents, props changed) Modified: head/net/Makefile Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/Makefile Mon Dec 15 14:42:32 2014 (r374748) @@ -848,6 +848,7 @@ SUBDIR += phpldapadmin SUBDIR += pimdd SUBDIR += pipsecd + SUBDIR += pjsip SUBDIR += pktanon SUBDIR += pload SUBDIR += plugdaemon Added: head/net/pjsip/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/Makefile Mon Dec 15 14:42:32 2014 (r374748) @@ -0,0 +1,82 @@ +# $FreeBSD$ + +PORTNAME= pjsip +PORTVERSION= 2.3 +CATEGORIES= net +MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ +DISTNAME= pjproject-${DISTVERSION} + +MAINTAINER= madpilot@FreeBSD.org +COMMENT= Multimedia communication library written in C language + +LICENSE= GPLv2 + +LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-external-pa \ + --disable-silk +USES= gmake tar:bz2 +USE_LDCONFIG= yes +PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}" +LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include +MAKE_JOBS_UNSAFE= yes + +OPTIONS_DEFINE= FFMPEG G711 G722 G7221 GSM ILBC L16 OPENH264 RESAMPLE RESAMPLEDLL \ + SAMPLERATE SDL SHARED SPEEX SPEEXAEC V4L IPV6 SOUND VIDEO AMR +OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC + +G711_DESC= G.711 codec support +G722_DESC= G.722 codec support +G7221_DESC= G.722.1 codec support +ILBC_DESC= iLBC codec support +L16_DESC= Linear/L16 codec support +OPENH264_DESC= OpenH264 support +RESAMPLE_DESC= Enable resampling implementations +RESAMPLEDLL_DESC= Build libresample as shared library +SHARED_DESC= Build shared libraries (other ports may depend on this) +SPEEXAEC_DESC= Speex Acoustic Echo Canceller/AEC +V4L_DESC= Video4Linux2 support +YUV_DESC= Libyuv support + +OPTIONS_SUB= yes + +FFMPEG_CONFIGURE_ENABLE= ffmpeg +FFMPEG_LIB_DEPENDS= libswresample.so:${PORTSDIR}/multimedia/ffmpeg +G711_CONFIGURE_ENABLE= g711-codec +G722_CONFIGURE_ENABLE= g722-codec +G7221_CONFIGURE_ENABLE= g7221-codec +GSM_CONFIGURE_ENABLE= gsm-codec +GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm +GSM_CONFIGURE_ON= --with-external-gsm +ILBC_CONFIGURE_ENABLE= ilbc-codec +L16_CONFIGURE_ENABLE= l16-codec +OPENH264_CONFIGURE_ENABLE= openh264 +OPENH264_LIB_DEPENDS= libopenh264.so:${PORTSDIR}/multimedia/openh264 +RESAMPLE_CONFIGURE_ENABLE= resample +RESAMPLEDLL_CONFIGURE_ENABLE= resample-dll +SAMPLERATE_CONFIGURE_ENABLE= libsamplerate +SAMPLERATE_LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate +SDL_CONFIGURE_ENABLE= sdl +SDL_USE= SDL=sdl +SHARED_CONFIGURE_ENABLE= shared +SPEEX_CONFIGURE_ENABLE= speex-codec +SPEEX_CONFIGURE_ON= --with-external-speex +SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex +SPEEXAEC_CONFIGURE_ENABLE= speex-aec +V4L_CONFIGURE_ENABLE= v4l2 +V4L_BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat +V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l +IPV6_CFLAGS= "-DPJ_HAS_IPV6=1" +SOUND_CONFIGURE_ENABLE= sound +VIDEO_CONFIGURE_ENABLE= video +AMR_CONFIGURE_WITH= opencore-amr +AMR_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr \ + libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc + +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/pkgconfig.py + +.include Added: head/net/pjsip/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/distinfo Mon Dec 15 14:42:32 2014 (r374748) @@ -0,0 +1,2 @@ +SHA256 (pjproject-2.3.tar.bz2) = e7fa60a3b59424430145af90372282ca778449f7b68b77bb24a9cf75d94d5765 +SIZE (pjproject-2.3.tar.bz2) = 4633703 Added: head/net/pjsip/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/files/patch-Makefile Mon Dec 15 14:42:32 2014 (r374748) @@ -0,0 +1,26 @@ +--- Makefile.orig 2014-07-14 07:21:58 UTC ++++ Makefile +@@ -124,7 +124,7 @@ install: + for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ + cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \ + done +- mkdir -p $(DESTDIR)$(libdir)/pkgconfig ++ mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig + sed -e "s!@PREFIX@!$(prefix)!" libpjproject.pc.in | \ + sed -e "s!@INCLUDEDIR@!$(includedir)!" | \ + sed -e "s!@LIBDIR@!$(libdir)!" | \ +@@ -132,11 +132,11 @@ install: + sed -e "s!@PJ_LDLIBS@!!" | \ + sed -e "s!@PJ_LDXXLIBS@!$(PJ_LDXXLIBS)!" | \ + sed -e "s!@PJ_INSTALL_CFLAGS@!!" | \ +- sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc ++ sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(prefix)/libdata/pkgconfig/libpjproject.pc + + uninstall: +- $(RM) $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc +- -rmdir $(DESTDIR)$(libdir)/pkgconfig 2> /dev/null ++ $(RM) $(DESTDIR)$(prefix)/libdata/pkgconfig/libpjproject.pc ++ -rmdir $(DESTDIR)$(prefix)/libdata/pkgconfig 2> /dev/null + for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ + for f in $$d/include/*; do \ + $(RM) -r "$(DESTDIR)$(includedir)/`basename $$f`"; \ Added: head/net/pjsip/files/patch-aconfigure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/files/patch-aconfigure Mon Dec 15 14:42:32 2014 (r374748) @@ -0,0 +1,11 @@ +--- aconfigure.orig 2014-08-19 02:18:07 UTC ++++ aconfigure +@@ -6654,7 +6654,7 @@ else + FFMPEG_PREFIX=$with_ffmpeg + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5 + $as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; } +- export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig ++ export PKG_CONFIG_PATH=$FFMPEG_PREFIX/libdata/pkgconfig + fi + + for ac_prog in pkg-config "python pkgconfig.py" Added: head/net/pjsip/files/patch-pjmedia_src_pjmedia_resample__libsamplerate.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/files/patch-pjmedia_src_pjmedia_resample__libsamplerate.c Mon Dec 15 14:42:32 2014 (r374748) @@ -0,0 +1,11 @@ +--- pjmedia/src/pjmedia/resample_libsamplerate.c.orig 2011-05-05 06:14:19 UTC ++++ pjmedia/src/pjmedia/resample_libsamplerate.c +@@ -33,7 +33,7 @@ + + #if PJMEDIA_RESAMPLE_IMP==PJMEDIA_RESAMPLE_LIBSAMPLERATE + +-#include "../../third_party/libsamplerate/src/samplerate.h" ++#include + + #define THIS_FILE "resample_libsamplerate.c" + Added: head/net/pjsip/files/patch-pkgconfig.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/files/patch-pkgconfig.py Mon Dec 15 14:42:32 2014 (r374748) @@ -0,0 +1,11 @@ +--- pkgconfig.py.orig 2012-10-04 07:36:39 UTC ++++ pkgconfig.py +@@ -117,7 +117,7 @@ if __name__ == "__main__": + # Fix search path + PKG_CONFIG_PATH = os.getenv("PKG_CONFIG_PATH", "").strip() + if not PKG_CONFIG_PATH: +- PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/lib/pkgconfig" ++ PKG_CONFIG_PATH="/usr/local/libdata/pkgconfig" + PKG_CONFIG_PATH = PKG_CONFIG_PATH.replace(";", ":") + + # Parse files Added: head/net/pjsip/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/pkg-descr Mon Dec 15 14:42:32 2014 (r374748) @@ -0,0 +1,9 @@ +PJSIP is a free and open source multimedia communication library +written in C language implementing standard based protocols such +as SIP, SDP, RTP, STUN, TURN, and ICE. It combines signaling protocol +(SIP) with rich multimedia framework and NAT traversal functionality +into high level API that is portable and suitable for almost any +type of systems ranging from desktops, embedded systems, to mobile +handsets. + +WWW: http://www.pjsip.org/ Added: head/net/pjsip/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/pkg-plist Mon Dec 15 14:42:32 2014 (r374748) @@ -0,0 +1,348 @@ +include/pj++/file.hpp +include/pj++/hash.hpp +include/pj++/list.hpp +include/pj++/lock.hpp +include/pj++/os.hpp +include/pj++/pool.hpp +include/pj++/proactor.hpp +include/pj++/scanner.hpp +include/pj++/sock.hpp +include/pj++/string.hpp +include/pj++/timer.hpp +include/pj++/tree.hpp +include/pj++/types.hpp +include/pj/activesock.h +include/pj/addr_resolv.h +include/pj/array.h +include/pj/assert.h +include/pj/compat/assert.h +include/pj/compat/cc_armcc.h +include/pj/compat/cc_codew.h +include/pj/compat/cc_gcc.h +include/pj/compat/cc_gcce.h +include/pj/compat/cc_msvc.h +include/pj/compat/cc_mwcc.h +include/pj/compat/ctype.h +include/pj/compat/errno.h +include/pj/compat/high_precision.h +include/pj/compat/m_alpha.h +include/pj/compat/m_armv4.h +include/pj/compat/m_auto.h +include/pj/compat/m_auto.h.in +include/pj/compat/m_i386.h +include/pj/compat/m_m68k.h +include/pj/compat/m_powerpc.h +include/pj/compat/m_sparc.h +include/pj/compat/m_x86_64.h +include/pj/compat/malloc.h +include/pj/compat/os_auto.h +include/pj/compat/os_auto.h.in +include/pj/compat/os_darwinos.h +include/pj/compat/os_linux.h +include/pj/compat/os_linux_kernel.h +include/pj/compat/os_palmos.h +include/pj/compat/os_rtems.h +include/pj/compat/os_sunos.h +include/pj/compat/os_symbian.h +include/pj/compat/os_win32.h +include/pj/compat/os_win32_wince.h +include/pj/compat/rand.h +include/pj/compat/setjmp.h +include/pj/compat/size_t.h +include/pj/compat/socket.h +include/pj/compat/stdarg.h +include/pj/compat/stdfileio.h +include/pj/compat/string.h +include/pj/compat/time.h +include/pj/config.h +include/pj/config_site.h +include/pj/config_site_sample.h +include/pj/ctype.h +include/pj/doxygen.h +include/pj/errno.h +include/pj/except.h +include/pj/fifobuf.h +include/pj/file_access.h +include/pj/file_io.h +include/pj/guid.h +include/pj/hash.h +include/pj/ioqueue.h +include/pj/ip_helper.h +include/pj/list.h +include/pj/list_i.h +include/pj/lock.h +include/pj/log.h +include/pj/math.h +include/pj/os.h +include/pj/pool.h +include/pj/pool_alt.h +include/pj/pool_buf.h +include/pj/pool_i.h +include/pj/rand.h +include/pj/rbtree.h +include/pj/sock.h +include/pj/sock_qos.h +include/pj/sock_select.h +include/pj/ssl_sock.h +include/pj/string.h +include/pj/string_i.h +include/pj/timer.h +include/pj/types.h +include/pj/unicode.h +include/pjlib++.hpp +include/pjlib-util.h +include/pjlib-util/base64.h +include/pjlib-util/cli.h +include/pjlib-util/cli_console.h +include/pjlib-util/cli_imp.h +include/pjlib-util/cli_telnet.h +include/pjlib-util/config.h +include/pjlib-util/crc32.h +include/pjlib-util/dns.h +include/pjlib-util/dns_server.h +include/pjlib-util/errno.h +include/pjlib-util/getopt.h +include/pjlib-util/hmac_md5.h +include/pjlib-util/hmac_sha1.h +include/pjlib-util/http_client.h +include/pjlib-util/json.h +include/pjlib-util/md5.h +include/pjlib-util/pcap.h +include/pjlib-util/resolver.h +include/pjlib-util/scanner.h +include/pjlib-util/scanner_cis_bitwise.h +include/pjlib-util/scanner_cis_uint.h +include/pjlib-util/sha1.h +include/pjlib-util/srv_resolver.h +include/pjlib-util/string.h +include/pjlib-util/stun_simple.h +include/pjlib-util/types.h +include/pjlib-util/xml.h +include/pjlib.h +include/pjmedia-audiodev/audiodev.h +include/pjmedia-audiodev/audiodev_imp.h +include/pjmedia-audiodev/audiotest.h +include/pjmedia-audiodev/config.h +include/pjmedia-audiodev/errno.h +include/pjmedia-codec.h +include/pjmedia-codec/amr_helper.h +include/pjmedia-codec/amr_sdp_match.h +include/pjmedia-codec/audio_codecs.h +include/pjmedia-codec/config.h +include/pjmedia-codec/config_auto.h +include/pjmedia-codec/config_auto.h.in +include/pjmedia-codec/ffmpeg_vid_codecs.h +include/pjmedia-codec/g722.h +include/pjmedia-codec/g7221.h +include/pjmedia-codec/g7221_sdp_match.h +include/pjmedia-codec/gsm.h +include/pjmedia-codec/h263_packetizer.h +include/pjmedia-codec/h264_packetizer.h +include/pjmedia-codec/ilbc.h +include/pjmedia-codec/ipp_codecs.h +include/pjmedia-codec/l16.h +include/pjmedia-codec/opencore_amr.h +include/pjmedia-codec/openh264.h +include/pjmedia-codec/passthrough.h +include/pjmedia-codec/silk.h +include/pjmedia-codec/speex.h +include/pjmedia-codec/types.h +include/pjmedia-videodev/avi_dev.h +include/pjmedia-videodev/config.h +include/pjmedia-videodev/errno.h +include/pjmedia-videodev/opengl_dev.h +include/pjmedia-videodev/videodev.h +include/pjmedia-videodev/videodev_imp.h +include/pjmedia.h +include/pjmedia/alaw_ulaw.h +include/pjmedia/avi.h +include/pjmedia/avi_stream.h +include/pjmedia/bidirectional.h +include/pjmedia/circbuf.h +include/pjmedia/clock.h +include/pjmedia/codec.h +include/pjmedia/conference.h +include/pjmedia/config.h +include/pjmedia/config_auto.h +include/pjmedia/config_auto.h.in +include/pjmedia/converter.h +include/pjmedia/delaybuf.h +include/pjmedia/doxygen.h +include/pjmedia/echo.h +include/pjmedia/echo_port.h +include/pjmedia/endpoint.h +include/pjmedia/errno.h +include/pjmedia/event.h +include/pjmedia/format.h +include/pjmedia/frame.h +include/pjmedia/g711.h +include/pjmedia/jbuf.h +include/pjmedia/master_port.h +include/pjmedia/mem_port.h +include/pjmedia/null_port.h +include/pjmedia/plc.h +include/pjmedia/port.h +include/pjmedia/resample.h +include/pjmedia/rtcp.h +include/pjmedia/rtcp_xr.h +include/pjmedia/rtp.h +include/pjmedia/sdp.h +include/pjmedia/sdp_neg.h +include/pjmedia/session.h +include/pjmedia/signatures.h +include/pjmedia/silencedet.h +include/pjmedia/sound.h +include/pjmedia/sound_port.h +include/pjmedia/splitcomb.h +include/pjmedia/stereo.h +include/pjmedia/stream.h +include/pjmedia/stream_common.h +include/pjmedia/symbian_sound_aps.h +include/pjmedia/tonegen.h +include/pjmedia/transport.h +include/pjmedia/transport_adapter_sample.h +include/pjmedia/transport_ice.h +include/pjmedia/transport_loop.h +include/pjmedia/transport_srtp.h +include/pjmedia/transport_udp.h +include/pjmedia/types.h +include/pjmedia/vid_codec.h +include/pjmedia/vid_codec_util.h +include/pjmedia/vid_port.h +include/pjmedia/vid_stream.h +include/pjmedia/vid_tee.h +include/pjmedia/wav_playlist.h +include/pjmedia/wav_port.h +include/pjmedia/wave.h +include/pjmedia/wsola.h +include/pjmedia_audiodev.h +include/pjmedia_videodev.h +include/pjnath.h +include/pjnath/config.h +include/pjnath/errno.h +include/pjnath/ice_session.h +include/pjnath/ice_strans.h +include/pjnath/nat_detect.h +include/pjnath/stun_auth.h +include/pjnath/stun_config.h +include/pjnath/stun_msg.h +include/pjnath/stun_session.h +include/pjnath/stun_sock.h +include/pjnath/stun_transaction.h +include/pjnath/turn_session.h +include/pjnath/turn_sock.h +include/pjnath/types.h +include/pjsip-simple/errno.h +include/pjsip-simple/evsub.h +include/pjsip-simple/evsub_msg.h +include/pjsip-simple/iscomposing.h +include/pjsip-simple/mwi.h +include/pjsip-simple/pidf.h +include/pjsip-simple/presence.h +include/pjsip-simple/publish.h +include/pjsip-simple/rpid.h +include/pjsip-simple/types.h +include/pjsip-simple/xpidf.h +include/pjsip-ua/sip_100rel.h +include/pjsip-ua/sip_inv.h +include/pjsip-ua/sip_regc.h +include/pjsip-ua/sip_replaces.h +include/pjsip-ua/sip_timer.h +include/pjsip-ua/sip_xfer.h +include/pjsip.h +include/pjsip/print_util.h +include/pjsip/sip_auth.h +include/pjsip/sip_auth_aka.h +include/pjsip/sip_auth_msg.h +include/pjsip/sip_auth_parser.h +include/pjsip/sip_autoconf.h +include/pjsip/sip_autoconf.h.in +include/pjsip/sip_config.h +include/pjsip/sip_dialog.h +include/pjsip/sip_endpoint.h +include/pjsip/sip_errno.h +include/pjsip/sip_event.h +include/pjsip/sip_module.h +include/pjsip/sip_msg.h +include/pjsip/sip_multipart.h +include/pjsip/sip_parser.h +include/pjsip/sip_private.h +include/pjsip/sip_resolve.h +include/pjsip/sip_tel_uri.h +include/pjsip/sip_transaction.h +include/pjsip/sip_transport.h +include/pjsip/sip_transport_loop.h +include/pjsip/sip_transport_tcp.h +include/pjsip/sip_transport_tls.h +include/pjsip/sip_transport_udp.h +include/pjsip/sip_types.h +include/pjsip/sip_ua_layer.h +include/pjsip/sip_uri.h +include/pjsip/sip_util.h +include/pjsip_auth.h +include/pjsip_simple.h +include/pjsip_ua.h +include/pjsua-lib/pjsua.h +include/pjsua-lib/pjsua_internal.h +include/pjsua.h +include/pjsua2.hpp +include/pjsua2/account.hpp +include/pjsua2/call.hpp +include/pjsua2/config.hpp +include/pjsua2/doxygen.hpp +include/pjsua2/endpoint.hpp +include/pjsua2/json.hpp +include/pjsua2/media.hpp +include/pjsua2/persistent.hpp +include/pjsua2/presence.hpp +include/pjsua2/siptypes.hpp +include/pjsua2/types.hpp +%%G7221%%lib/libg7221codec-%%CONFIGURE_TARGET%%.a +%%SHARED%%%%G7221%%lib/libg7221codec.so +%%SHARED%%%%G7221%%lib/libg7221codec.so.2 +%%ILBC%%lib/libilbccodec-%%CONFIGURE_TARGET%%.a +%%SHARED%%%%ILBC%%lib/libilbccodec.so +%%SHARED%%%%ILBC%%lib/libilbccodec.so.2 +lib/libpj-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpj.so +%%SHARED%%lib/libpj.so.2 +lib/libpjlib-util-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjlib-util.so +%%SHARED%%lib/libpjlib-util.so.2 +lib/libpjmedia-%%CONFIGURE_TARGET%%.a +lib/libpjmedia-audiodev-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjmedia-audiodev.so +%%SHARED%%lib/libpjmedia-audiodev.so.2 +lib/libpjmedia-codec-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjmedia-codec.so +%%SHARED%%lib/libpjmedia-codec.so.2 +lib/libpjmedia-videodev-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjmedia-videodev.so +%%SHARED%%lib/libpjmedia-videodev.so.2 +%%SHARED%%lib/libpjmedia.so +%%SHARED%%lib/libpjmedia.so.2 +lib/libpjnath-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjnath.so +%%SHARED%%lib/libpjnath.so.2 +lib/libpjsip-%%CONFIGURE_TARGET%%.a +lib/libpjsip-simple-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjsip-simple.so +%%SHARED%%lib/libpjsip-simple.so.2 +lib/libpjsip-ua-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjsip-ua.so +%%SHARED%%lib/libpjsip-ua.so.2 +%%SHARED%%lib/libpjsip.so +%%SHARED%%lib/libpjsip.so.2 +lib/libpjsua-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjsua.so +%%SHARED%%lib/libpjsua.so.2 +lib/libpjsua2-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libpjsua2.so +%%SHARED%%lib/libpjsua2.so.2 +%%NO_SAMPLERATE%%%%RESAMPLE%%lib/libresample-%%CONFIGURE_TARGET%%.a +%%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so +%%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so.2 +lib/libsrtp-%%CONFIGURE_TARGET%%.a +%%SHARED%%lib/libsrtp.so +%%SHARED%%lib/libsrtp.so.2 +libdata/pkgconfig/libpjproject.pc From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 14:46:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C922CF8; Mon, 15 Dec 2014 14: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 464057DC; Mon, 15 Dec 2014 14:46:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFEkWHU019639; Mon, 15 Dec 2014 14:46:32 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFEkQj1019613; Mon, 15 Dec 2014 14:46:26 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412151446.sBFEkQj1019613@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Dec 2014 14:46:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374749 - in head/net: . asterisk asterisk11 asterisk13 asterisk13/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 14:46:32 -0000 Author: madpilot Date: Mon Dec 15 14:46:25 2014 New Revision: 374749 URL: https://svnweb.freebsd.org/changeset/ports/374749 QAT: https://qat.redports.org/buildarchive/r374749/ Log: Add asterisk13 port. Fix CONFLICTS for asterisk ports and remove long deleted entries references. Upstream announce: http://blogs.digium.com/2014/10/28/asterisk-13-0-0-now-available/ Added: head/net/asterisk13/ - copied from r374747, head/net/asterisk11/ head/net/asterisk13/files/patch-channels_sip_include_route.h (contents, props changed) Modified: head/net/Makefile head/net/asterisk/Makefile head/net/asterisk11/Makefile head/net/asterisk13/Makefile head/net/asterisk13/distinfo head/net/asterisk13/files/patch-Makefile head/net/asterisk13/files/patch-agi__Makefile head/net/asterisk13/files/patch-channels-chan_dahdi.c head/net/asterisk13/files/patch-channels__sip__include__sip.h head/net/asterisk13/files/patch-configure head/net/asterisk13/files/patch-include-asterisk-astobj2.h head/net/asterisk13/files/patch-include-asterisk-config.h head/net/asterisk13/files/patch-main__Makefile head/net/asterisk13/files/patch-main__asterisk.exports.in head/net/asterisk13/files/patch-main__http.c head/net/asterisk13/files/patch-main__lock.c head/net/asterisk13/files/patch-main__utils.c head/net/asterisk13/pkg-descr head/net/asterisk13/pkg-plist Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Mon Dec 15 14:42:32 2014 (r374748) +++ head/net/Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -28,6 +28,7 @@ SUBDIR += aslookup SUBDIR += asterisk SUBDIR += asterisk11 + SUBDIR += asterisk13 SUBDIR += avahi SUBDIR += avahi-app SUBDIR += avahi-autoipd Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Mon Dec 15 14:42:32 2014 (r374748) +++ head/net/asterisk/Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -3,6 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.32.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -44,7 +45,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA ASTCFLAGS="${CFLAGS}" CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-10* +CONFLICTS_INSTALL= asterisk*-11* asterisk*-13* OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Mon Dec 15 14:42:32 2014 (r374748) +++ head/net/asterisk11/Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.14.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -38,7 +39,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA ASTCFLAGS="${CFLAGS}" CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* +CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-13* OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 UUID Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk11/Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -1,30 +1,31 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.14.2 +PORTVERSION= 13.0.2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ -PKGNAMESUFFIX= 11 +PKGNAMESUFFIX= 13 MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit -LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \ - libnewt.so:${PORTSDIR}/devel/newt \ - libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ - libsqlite3.so:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ + libjansson.so:${PORTSDIR}/devel/jansson RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 +CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include USE_GCC= yes USE_GNOME= libxml2 -USES= bison cpe gmake +USE_LDCONFIG= yes +USES= bison cpe gmake iconv CPE_VENDOR= digium USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ @@ -36,14 +37,16 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA NOISY_BUILD=YES \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" +CONFIGURE_ARGS+= --datarootdir=${DATADIR} +CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* +CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-11* OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ - CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 UUID + CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 PJSIP SPEEX OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ - XMPP GSM SQLITE CURL LUA UUID + XMPP GSM SQLITE3 CURL LUA PJSIP SPEEX OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI @@ -59,7 +62,7 @@ SRTP_DESC?= SecureRTP support OOH323_DESC?= ooh323 support DAHDI_DESC?= DAHDI support XMPP_DESC?= XMPP/GTALK support -UUID_DESC?= libuuid support(required for ICE and TURN in RTP) +PJSIP_DESC?= Build the PJSIP based SIP channel OPTIONS_SUB= yes OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ @@ -108,10 +111,11 @@ LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes -UUID_LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid -UUID_CONFIGURE_ON= --with-uuid=${LOCALBASE} -UUID_CONFIGURE_OFF= --disable-uuid -UUID_CONFLICTS= ossp-uuid-[0-9]* +PJSIP_LIB_DEPENDS= libpj.so:${PORTSDIR}/net/pjsip +PJSIP_CONFIGURE_WITH= pjproject +PJSIP_USES= pkgconfig +SPEEX_LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speex +SPEEX_CONFIGURE_WITH= speex ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk @@ -136,7 +140,7 @@ post-extract: ${FIND} ${WRKSRC} -name '*.d' -delete post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample + ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts Modified: head/net/asterisk13/distinfo ============================================================================== --- head/net/asterisk11/distinfo Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/distinfo Mon Dec 15 14:46:25 2014 (r374749) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.14.2.tar.gz) = c9a7a9cf4b4512333853a8f53ea243cd8b0bc62123a397b20e03835ad1497f7e -SIZE (asterisk-11.14.2.tar.gz) = 34967655 +SHA256 (asterisk-13.0.2.tar.gz) = dfaf9d4be3581dc9dfecdfe868b2f119809984743ea42a7abdabd6fa129430fc +SIZE (asterisk-13.0.2.tar.gz) = 56553665 Modified: head/net/asterisk13/files/patch-Makefile ============================================================================== --- head/net/asterisk11/files/patch-Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- Makefile.orig 2012-06-13 16:30:34.000000000 +0200 -+++ Makefile 2012-08-02 00:12:13.812569306 +0200 -@@ -123,7 +123,7 @@ +--- Makefile.orig 2014-10-19 17:07:50 UTC ++++ Makefile +@@ -128,7 +128,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$( OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -9,16 +9,25 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -192,7 +192,7 @@ +@@ -152,7 +152,7 @@ LINKER_SYMBOL_PREFIX= + #_ASTCFLAGS+=-DOLD_DSP_ROUTINES + + # Default install directory for DAHDI hooks. +-DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d ++# DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d + + # If the file .asterisk.makeopts is present in your home directory, you can + # include all of your favorite menuselect options so that every time you download +@@ -207,7 +207,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) + BSDVERSION=$(OSVERSION) _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - endif - -@@ -425,8 +425,12 @@ + # flag to tell 'ldconfig' to only process specified directories + LDCONFIG_FLAGS=-m +@@ -461,8 +461,12 @@ datafiles: _all doc/core-en_US.xml $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -31,17 +40,33 @@ + $(INSTALL) -m 644 $$x "$(DESTDIR)$(DOCSDIR)/images" ; \ done $(MAKE) -C sounds install - -@@ -485,7 +489,7 @@ + find rest-api -name "*.json" | while read x; do \ +@@ -556,7 +560,8 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \ "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ - "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \ -- "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" -+ "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" "$(ASTSPOOLDIR)/outgoing" + "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \ +- "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" ++ "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \ ++ "$(ASTSPOOLDIR)/outgoing" installdirs: @for i in $(INSTALLDIRS); do \ -@@ -552,7 +556,7 @@ +@@ -592,10 +597,10 @@ bininstall: _all installdirs $(SUBDIRS_I + if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ + $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \ + fi +-ifeq ($(HAVE_DAHDI),1) +- $(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR) +- $(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk +-endif ++#ifeq ($(HAVE_DAHDI),1) ++# $(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR) ++# $(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk ++#endif + + $(SUBDIRS_INSTALL): + +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install +@@ -628,7 +633,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -50,17 +75,17 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -594,29 +598,18 @@ +@@ -670,29 +675,16 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ - $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \ done samples: adsi @echo Installing other config files... - @for x in configs/*.sample; do \ + @for x in configs/samples/*.sample; do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ @@ -73,23 +98,32 @@ - echo "Skipping config file $$x"; \ - continue; \ - fi ;\ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ - fi ; \ -- echo "Installing file $$x"; \ +- fi ; \ + echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \ done - if [ "$(OVERWRITE)" = "y" ]; then \ + @if true; then \ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ - -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \ -@@ -630,6 +623,7 @@ + -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ +@@ -705,15 +697,15 @@ samples: adsi + -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ - "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ -+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)-dist" ; \ + -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ +- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ +- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ ++ "$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ ++ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ fi ; \ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" + build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)" + + @for x in phoneprov/*; do \ +- dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ ++ dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ + if [ -f "$${dst}" ]; then \ + if [ "$(OVERWRITE)" = "y" ]; then \ + if cmp -s "$${dst}" "$$x" ; then \ Modified: head/net/asterisk13/files/patch-agi__Makefile ============================================================================== --- head/net/asterisk11/files/patch-agi__Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-agi__Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- ./agi/Makefile.orig 2010-07-23 15:26:41.000000000 +0200 -+++ ./agi/Makefile 2010-11-06 14:54:36.000000000 +0100 -@@ -16,7 +16,9 @@ +--- agi/Makefile.orig 2012-10-14 21:56:13 UTC ++++ agi/Makefile +@@ -16,7 +16,9 @@ ASTTOPDIR?=.. .PHONY: clean all uninstall Modified: head/net/asterisk13/files/patch-channels-chan_dahdi.c ============================================================================== --- head/net/asterisk11/files/patch-channels-chan_dahdi.c Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-channels-chan_dahdi.c Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- channels/chan_dahdi.c.orig 2010-11-09 11:18:39.000000000 +0100 -+++ channels/chan_dahdi.c 2010-11-09 11:22:15.000000000 +0100 -@@ -4688,6 +4688,8 @@ +--- channels/chan_dahdi.c.orig 2014-07-25 16:47:17 UTC ++++ channels/chan_dahdi.c +@@ -4596,6 +4596,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p return; } if (p->echocancel.head.tap_length) { @@ -9,7 +9,7 @@ #if defined(HAVE_PRI) || defined(HAVE_SS7) switch (p->sig) { #if defined(HAVE_PRI) -@@ -4718,7 +4720,9 @@ +@@ -4626,7 +4628,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p break; } #endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */ @@ -20,7 +20,7 @@ if (res) { ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); } else { -@@ -4752,8 +4756,9 @@ +@@ -4660,8 +4664,9 @@ void dahdi_ec_disable(struct dahdi_pvt * if (p->echocanon) { struct dahdi_echocanparams ecp = { .tap_length = 0 }; Modified: head/net/asterisk13/files/patch-channels__sip__include__sip.h ============================================================================== --- head/net/asterisk11/files/patch-channels__sip__include__sip.h Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-channels__sip__include__sip.h Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- ./channels/sip/include/sip.h.orig 2010-11-08 04:46:46.000000000 +0100 -+++ ./channels/sip/include/sip.h 2010-11-08 04:47:07.000000000 +0100 -@@ -180,7 +180,7 @@ +--- channels/sip/include/sip.h.orig 2014-07-24 17:47:29 UTC ++++ channels/sip/include/sip.h +@@ -192,7 +192,7 @@ #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */ #define DEFAULT_MOHSUGGEST "" #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */ Added: head/net/asterisk13/files/patch-channels_sip_include_route.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/asterisk13/files/patch-channels_sip_include_route.h Mon Dec 15 14:46:25 2014 (r374749) @@ -0,0 +1,11 @@ +--- channels/sip/include/route.h.orig 2014-02-10 18:28:35 UTC ++++ channels/sip/include/route.h +@@ -98,7 +98,7 @@ void sip_route_dump(const struct sip_rou + * \retval NULL on failure + */ + struct ast_str *sip_route_list(const struct sip_route *route, int formatcli, int skip) +- __attribute_malloc__ __attribute_warn_unused_result__; ++ __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); + + /*! + * \brief Check if the route is strict Modified: head/net/asterisk13/files/patch-configure ============================================================================== --- head/net/asterisk11/files/patch-configure Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-configure Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- configure.orig 2014-06-21 01:14:52.000000000 +0200 -+++ configure 2014-07-29 23:59:12.060900744 +0200 -@@ -4616,9 +4616,9 @@ +--- configure.orig 2014-10-19 17:07:50 UTC ++++ configure +@@ -4667,9 +4667,9 @@ astheaderdir='${includedir}/asterisk' astlibdir='${libdir}' astmoddir='${libdir}/asterisk/modules' astmandir='${mandir}' @@ -12,7 +12,7 @@ astkeydir='${astvarlibdir}' astspooldir='${localstatedir}/spool/asterisk' astlogdir='${localstatedir}/log/asterisk' -@@ -4641,8 +4641,6 @@ +@@ -4692,8 +4692,6 @@ esac case "${host_os}" in freebsd*) ac_default_prefix=/usr/local @@ -21,7 +21,7 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -18084,6 +18082,8 @@ +@@ -19052,6 +19050,8 @@ $as_echo_n "checking if \"struct ifaddrs cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30,7 +30,7 @@ #include int main () -@@ -26385,7 +26385,7 @@ +@@ -27599,7 +27599,7 @@ $as_echo "${OPENH323_BUILD}" >&6; } fi @@ -39,7 +39,7 @@ if test "${HAS_OPENH323:-unset}" != "unset"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 -@@ -26483,13 +26483,13 @@ +@@ -27697,13 +27697,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh` @@ -56,7 +56,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -26531,18 +26531,18 @@ +@@ -27745,18 +27745,18 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -78,7 +78,7 @@ if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then : LUA_HEADER_FOUND=1 else -@@ -26595,13 +26595,13 @@ +@@ -27809,13 +27809,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` @@ -95,7 +95,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -26643,18 +26643,18 @@ +@@ -27857,18 +27857,18 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then Modified: head/net/asterisk13/files/patch-include-asterisk-astobj2.h ============================================================================== --- head/net/asterisk11/files/patch-include-asterisk-astobj2.h Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-include-asterisk-astobj2.h Mon Dec 15 14:46:25 2014 (r374749) @@ -1,10 +1,11 @@ ---- include/asterisk/astobj2.h.orig 2013-07-02 12:30:02.000000000 +0200 -+++ include/asterisk/astobj2.h 2013-07-02 12:31:39.000000000 +0200 -@@ -1472,5 +1472,7 @@ - #else - #define ao2_cleanup(obj) __ao2_cleanup(obj) +--- include/asterisk/astobj2.h.orig 2014-07-18 17:55:38 UTC ++++ include/asterisk/astobj2.h +@@ -1546,6 +1546,8 @@ void ao2_container_unregister(const char + #define ao2_link_flags(container, obj, flags) __ao2_link((container), (obj), (flags)) + #endif +static inline void ao2_cleanup_cleanup(void *obj) + { ao2_cleanup(*(void **)obj); } - void ao2_iterator_cleanup(struct ao2_iterator *iter); - #endif /* _ASTERISK_ASTOBJ2_H */ + + int __ao2_link_debug(struct ao2_container *c, void *obj_new, int flags, const char *tag, const char *file, int line, const char *func); + int __ao2_link(struct ao2_container *c, void *obj_new, int flags); Modified: head/net/asterisk13/files/patch-include-asterisk-config.h ============================================================================== --- head/net/asterisk11/files/patch-include-asterisk-config.h Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-include-asterisk-config.h Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- include/asterisk/config.h.orig 2013-07-02 12:26:35.000000000 +0200 -+++ include/asterisk/config.h 2013-07-02 12:29:07.000000000 +0200 -@@ -481,6 +481,8 @@ +--- include/asterisk/config.h.orig 2014-10-16 17:30:39 UTC ++++ include/asterisk/config.h +@@ -674,6 +674,8 @@ struct ast_variable *ast_variables_rever * This function frees a list of variables. */ void ast_variables_destroy(struct ast_variable *var); Modified: head/net/asterisk13/files/patch-main__Makefile ============================================================================== --- head/net/asterisk11/files/patch-main__Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- main/Makefile.orig 2013-02-26 20:19:51.000000000 +0100 -+++ main/Makefile 2014-05-16 11:48:55.545963341 +0200 -@@ -215,9 +215,9 @@ +--- main/Makefile.orig 2014-07-04 15:26:58 UTC ++++ main/Makefile +@@ -217,9 +217,9 @@ ifeq ($(GNU_LD),1) endif $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS) @@ -13,7 +13,7 @@ $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) $(LN) -sf $< $@ -@@ -266,9 +266,9 @@ +@@ -264,9 +264,9 @@ ifeq ($(findstring darwin,$(OSARCH)),) # else # Darwin $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/" endif Modified: head/net/asterisk13/files/patch-main__asterisk.exports.in ============================================================================== --- head/net/asterisk11/files/patch-main__asterisk.exports.in Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__asterisk.exports.in Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- main/asterisk.exports.in.orig 2013-08-22 10:22:39.000000000 +0200 -+++ main/asterisk.exports.in 2013-10-27 13:38:56.825678450 +0100 -@@ -65,6 +65,8 @@ +--- main/asterisk.exports.in.orig 2013-08-22 08:26:55 UTC ++++ main/asterisk.exports.in +@@ -68,6 +68,8 @@ */ LINKER_SYMBOL_PREFIX_IO_stdin_used; Modified: head/net/asterisk13/files/patch-main__http.c ============================================================================== --- head/net/asterisk11/files/patch-main__http.c Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__http.c Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- main/http.c.orig 2013-12-17 23:42:58.982720307 +0100 -+++ main/http.c 2013-12-17 23:43:16.054863909 +0100 -@@ -1024,7 +1024,7 @@ +--- main/http.c.orig 2014-07-07 01:10:55 UTC ++++ main/http.c +@@ -2032,7 +2032,7 @@ static int __ast_http_load(int reload) struct http_uri_redirect *redirect; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; uint32_t bindport = DEFAULT_PORT; Modified: head/net/asterisk13/files/patch-main__lock.c ============================================================================== --- head/net/asterisk11/files/patch-main__lock.c Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__lock.c Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- ./main/lock.c.orig 2010-11-06 15:00:15.000000000 +0100 -+++ ./main/lock.c 2010-11-06 15:00:23.000000000 +0100 -@@ -679,10 +679,6 @@ +--- main/lock.c.orig 2014-03-25 15:47:17 UTC ++++ main/lock.c +@@ -691,10 +691,6 @@ int __ast_rwlock_init(int tracking, cons pthread_rwlockattr_init(&attr); Modified: head/net/asterisk13/files/patch-main__utils.c ============================================================================== --- head/net/asterisk11/files/patch-main__utils.c Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__utils.c Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- ./main/utils.c.orig 2010-08-06 20:57:10.000000000 +0200 -+++ ./main/utils.c 2010-11-06 14:54:37.000000000 +0100 -@@ -990,8 +990,8 @@ +--- main/utils.c.orig 2014-09-18 19:22:39 UTC ++++ main/utils.c +@@ -1220,8 +1220,8 @@ int ast_pthread_create_stack(pthread_t * pthread_attr_init(attr); } Modified: head/net/asterisk13/pkg-descr ============================================================================== --- head/net/asterisk11/pkg-descr Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/pkg-descr Mon Dec 15 14:46:25 2014 (r374749) @@ -2,4 +2,4 @@ Asterisk is an Open Source PBX and telep sense, middleware between Internet and telephony channels on the bottom, and Internet and telephony applications at the top. -WWW: http://www.asterisk.org +WWW: http://www.asteriskpbx.com Modified: head/net/asterisk13/pkg-plist ============================================================================== --- head/net/asterisk11/pkg-plist Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/pkg-plist Mon Dec 15 14:46:25 2014 (r374749) @@ -1,442 +1,300 @@ -@unexec if cmp -s %D/%%ETCDIR%%/acl.conf %D/%%ETCDIR%%/acl.conf-dist; then rm -f %D/%%ETCDIR%%/acl.conf; fi -%%ETCDIR%%/acl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_adaptive_odbc.conf %D/%%ETCDIR%%/cdr_adaptive_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; fi -%%ETCDIR%%/cdr_adaptive_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_sqlite3_custom.conf %D/%%ETCDIR%%/cdr_sqlite3_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; fi -%%ETCDIR%%/cdr_sqlite3_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_syslog.conf %D/%%ETCDIR%%/cdr_syslog.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_syslog.conf; fi -%%ETCDIR%%/cdr_syslog.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli.conf %D/%%ETCDIR%%/cli.conf-dist; then rm -f %D/%%ETCDIR%%/cli.conf; fi -%%ETCDIR%%/cli.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli_aliases.conf %D/%%ETCDIR%%/cli_aliases.conf-dist; then rm -f %D/%%ETCDIR%%/cli_aliases.conf; fi -%%ETCDIR%%/cli_aliases.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli_permissions.conf %D/%%ETCDIR%%/cli_permissions.conf-dist; then rm -f %D/%%ETCDIR%%/cli_permissions.conf; fi -%%ETCDIR%%/cli_permissions.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/confbridge.conf %D/%%ETCDIR%%/confbridge.conf-dist; then rm -f %D/%%ETCDIR%%/confbridge.conf; fi -%%ETCDIR%%/confbridge.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/config_test.conf %D/%%ETCDIR%%/config_test.conf-dist; then rm -f %D/%%ETCDIR%%/config_test.conf; fi -%%ETCDIR%%/config_test.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/console.conf %D/%%ETCDIR%%/console.conf-dist; then rm -f %D/%%ETCDIR%%/console.conf; fi -%%ETCDIR%%/console.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dbsep.conf %D/%%ETCDIR%%/dbsep.conf-dist; then rm -f %D/%%ETCDIR%%/dbsep.conf; fi -%%ETCDIR%%/dbsep.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dsp.conf %D/%%ETCDIR%%/dsp.conf-dist; then rm -f %D/%%ETCDIR%%/dsp.conf; fi -%%ETCDIR%%/dsp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.lua %D/%%ETCDIR%%/extensions.lua-dist; then rm -f %D/%%ETCDIR%%/extensions.lua; fi -%%ETCDIR%%/extensions.lua-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions_minivm.conf %D/%%ETCDIR%%/extensions_minivm.conf-dist; then rm -f %D/%%ETCDIR%%/extensions_minivm.conf; fi -%%ETCDIR%%/extensions_minivm.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/jingle.conf %D/%%ETCDIR%%/jingle.conf-dist; then rm -f %D/%%ETCDIR%%/jingle.conf; fi -%%ETCDIR%%/jingle.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/minivm.conf %D/%%ETCDIR%%/minivm.conf-dist; then rm -f %D/%%ETCDIR%%/minivm.conf; fi -%%ETCDIR%%/minivm.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/motif.conf %D/%%ETCDIR%%/motif.conf-dist; then rm -f %D/%%ETCDIR%%/motif.conf; fi -%%ETCDIR%%/motif.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/ooh323.conf %D/%%ETCDIR%%/ooh323.conf-dist; then rm -f %D/%%ETCDIR%%/ooh323.conf; fi -%%ETCDIR%%/ooh323.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/phoneprov.conf %D/%%ETCDIR%%/phoneprov.conf-dist; then rm -f %D/%%ETCDIR%%/phoneprov.conf; fi -%%ETCDIR%%/phoneprov.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/queuerules.conf %D/%%ETCDIR%%/queuerules.conf-dist; then rm -f %D/%%ETCDIR%%/queuerules.conf; fi -%%ETCDIR%%/queuerules.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_ldap.conf %D/%%ETCDIR%%/res_ldap.conf-dist; then rm -f %D/%%ETCDIR%%/res_ldap.conf; fi -%%ETCDIR%%/res_ldap.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/unistim.conf %D/%%ETCDIR%%/unistim.conf-dist; then rm -f %D/%%ETCDIR%%/unistim.conf; fi -%%ETCDIR%%/unistim.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/adsi.conf %D/%%ETCDIR%%/adsi.conf-dist; then rm -f %D/%%ETCDIR%%/adsi.conf; fi -%%ETCDIR%%/adsi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/agents.conf %D/%%ETCDIR%%/agents.conf-dist; then rm -f %D/%%ETCDIR%%/agents.conf; fi -%%ETCDIR%%/agents.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/alarmreceiver.conf %D/%%ETCDIR%%/alarmreceiver.conf-dist; then rm -f %D/%%ETCDIR%%/alarmreceiver.conf; fi -%%ETCDIR%%/alarmreceiver.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/alsa.conf %D/%%ETCDIR%%/alsa.conf-dist; then rm -f %D/%%ETCDIR%%/alsa.conf; fi -%%ETCDIR%%/alsa.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/asterisk.adsi %D/%%ETCDIR%%/asterisk.adsi-dist; then rm -f %D/%%ETCDIR%%/asterisk.adsi; fi -%%ETCDIR%%/asterisk.adsi-dist -@unexec if cmp -s %D/%%ETCDIR%%/asterisk.conf %D/%%ETCDIR%%/asterisk.conf-dist; then rm -f %D/%%ETCDIR%%/asterisk.conf; fi -%%ETCDIR%%/asterisk.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/calendar.conf %D/%%ETCDIR%%/calendar.conf-dist; then rm -f %D/%%ETCDIR%%/calendar.conf; fi -%%ETCDIR%%/calendar.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/ccss.conf %D/%%ETCDIR%%/ccss.conf-dist; then rm -f %D/%%ETCDIR%%/ccss.conf; fi -%%ETCDIR%%/ccss.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr.conf %D/%%ETCDIR%%/cdr.conf-dist; then rm -f %D/%%ETCDIR%%/cdr.conf; fi -%%ETCDIR%%/cdr.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_custom.conf %D/%%ETCDIR%%/cdr_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_custom.conf; fi -%%ETCDIR%%/cdr_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_manager.conf %D/%%ETCDIR%%/cdr_manager.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_manager.conf; fi -%%ETCDIR%%/cdr_manager.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_mysql.conf %D/%%ETCDIR%%/cdr_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_mysql.conf; fi -%%ETCDIR%%/cdr_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_odbc.conf %D/%%ETCDIR%%/cdr_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_odbc.conf; fi -%%ETCDIR%%/cdr_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_pgsql.conf %D/%%ETCDIR%%/cdr_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_pgsql.conf; fi -%%ETCDIR%%/cdr_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_tds.conf %D/%%ETCDIR%%/cdr_tds.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_tds.conf; fi -%%ETCDIR%%/cdr_tds.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel.conf %D/%%ETCDIR%%/cel.conf-dist; then rm -f %D/%%ETCDIR%%/cel.conf; fi -%%ETCDIR%%/cel.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_custom.conf %D/%%ETCDIR%%/cel_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cel_custom.conf; fi -%%ETCDIR%%/cel_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_odbc.conf %D/%%ETCDIR%%/cel_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cel_odbc.conf; fi -%%ETCDIR%%/cel_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_pgsql.conf %D/%%ETCDIR%%/cel_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/cel_pgsql.conf; fi -%%ETCDIR%%/cel_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_sqlite3_custom.conf %D/%%ETCDIR%%/cel_sqlite3_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cel_sqlite3_custom.conf; fi -%%ETCDIR%%/cel_sqlite3_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_tds.conf %D/%%ETCDIR%%/cel_tds.conf-dist; then rm -f %D/%%ETCDIR%%/cel_tds.conf; fi -%%ETCDIR%%/cel_tds.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/codecs.conf %D/%%ETCDIR%%/codecs.conf-dist; then rm -f %D/%%ETCDIR%%/codecs.conf; fi -%%ETCDIR%%/codecs.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dnsmgr.conf %D/%%ETCDIR%%/dnsmgr.conf-dist; then rm -f %D/%%ETCDIR%%/dnsmgr.conf; fi -%%ETCDIR%%/dnsmgr.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dundi.conf %D/%%ETCDIR%%/dundi.conf-dist; then rm -f %D/%%ETCDIR%%/dundi.conf; fi -%%ETCDIR%%/dundi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/enum.conf %D/%%ETCDIR%%/enum.conf-dist; then rm -f %D/%%ETCDIR%%/enum.conf; fi -%%ETCDIR%%/enum.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extconfig.conf %D/%%ETCDIR%%/extconfig.conf-dist; then rm -f %D/%%ETCDIR%%/extconfig.conf; fi -%%ETCDIR%%/extconfig.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.ael %D/%%ETCDIR%%/extensions.ael-dist; then rm -f %D/%%ETCDIR%%/extensions.ael; fi -%%ETCDIR%%/extensions.ael-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.conf %D/%%ETCDIR%%/extensions.conf-dist; then rm -f %D/%%ETCDIR%%/extensions.conf; fi -%%ETCDIR%%/extensions.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/features.conf %D/%%ETCDIR%%/features.conf-dist; then rm -f %D/%%ETCDIR%%/features.conf; fi -%%ETCDIR%%/features.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/festival.conf %D/%%ETCDIR%%/festival.conf-dist; then rm -f %D/%%ETCDIR%%/festival.conf; fi -%%ETCDIR%%/festival.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/iax.conf %D/%%ETCDIR%%/iax.conf-dist; then rm -f %D/%%ETCDIR%%/iax.conf; fi -%%ETCDIR%%/iax.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/iaxprov.conf %D/%%ETCDIR%%/iaxprov.conf-dist; then rm -f %D/%%ETCDIR%%/iaxprov.conf; fi -%%ETCDIR%%/iaxprov.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/indications.conf %D/%%ETCDIR%%/indications.conf-dist; then rm -f %D/%%ETCDIR%%/indications.conf; fi -%%ETCDIR%%/indications.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/logger.conf %D/%%ETCDIR%%/logger.conf-dist; then rm -f %D/%%ETCDIR%%/logger.conf; fi -%%ETCDIR%%/logger.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/manager.conf %D/%%ETCDIR%%/manager.conf-dist; then rm -f %D/%%ETCDIR%%/manager.conf; fi -%%ETCDIR%%/manager.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/meetme.conf %D/%%ETCDIR%%/meetme.conf-dist; then rm -f %D/%%ETCDIR%%/meetme.conf; fi -%%ETCDIR%%/meetme.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/mgcp.conf %D/%%ETCDIR%%/mgcp.conf-dist; then rm -f %D/%%ETCDIR%%/mgcp.conf; fi -%%ETCDIR%%/mgcp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/misdn.conf %D/%%ETCDIR%%/misdn.conf-dist; then rm -f %D/%%ETCDIR%%/misdn.conf; fi -%%ETCDIR%%/misdn.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/modules.conf %D/%%ETCDIR%%/modules.conf-dist; then rm -f %D/%%ETCDIR%%/modules.conf; fi -%%ETCDIR%%/modules.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/musiconhold.conf %D/%%ETCDIR%%/musiconhold.conf-dist; then rm -f %D/%%ETCDIR%%/musiconhold.conf; fi -%%ETCDIR%%/musiconhold.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/osp.conf %D/%%ETCDIR%%/osp.conf-dist; then rm -f %D/%%ETCDIR%%/osp.conf; fi -%%ETCDIR%%/osp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/oss.conf %D/%%ETCDIR%%/oss.conf-dist; then rm -f %D/%%ETCDIR%%/oss.conf; fi -%%ETCDIR%%/oss.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/phone.conf %D/%%ETCDIR%%/phone.conf-dist; then rm -f %D/%%ETCDIR%%/phone.conf; fi -%%ETCDIR%%/phone.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/queues.conf %D/%%ETCDIR%%/queues.conf-dist; then rm -f %D/%%ETCDIR%%/queues.conf; fi -%%ETCDIR%%/queues.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_mysql.conf %D/%%ETCDIR%%/res_config_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_mysql.conf; fi -%%ETCDIR%%/res_config_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_sqlite3.conf %D/%%ETCDIR%%/res_config_sqlite3.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_sqlite3.conf; fi -%%ETCDIR%%/res_config_sqlite3.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_corosync.conf %D/%%ETCDIR%%/res_corosync.conf-dist; then rm -f %D/%%ETCDIR%%/res_corosync.conf; fi -%%ETCDIR%%/res_corosync.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_pgsql.conf %D/%%ETCDIR%%/res_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/res_pgsql.conf; fi -%%ETCDIR%%/res_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_pktccops.conf %D/%%ETCDIR%%/res_pktccops.conf-dist; then rm -f %D/%%ETCDIR%%/res_pktccops.conf; fi -%%ETCDIR%%/res_pktccops.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_odbc.conf %D/%%ETCDIR%%/res_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/res_odbc.conf; fi -%%ETCDIR%%/res_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/rtp.conf %D/%%ETCDIR%%/rtp.conf-dist; then rm -f %D/%%ETCDIR%%/rtp.conf; fi -%%ETCDIR%%/rtp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sip.conf %D/%%ETCDIR%%/sip.conf-dist; then rm -f %D/%%ETCDIR%%/sip.conf; fi -%%ETCDIR%%/sip.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sip_notify.conf %D/%%ETCDIR%%/sip_notify.conf-dist; then rm -f %D/%%ETCDIR%%/sip_notify.conf; fi -%%ETCDIR%%/sip_notify.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/skinny.conf %D/%%ETCDIR%%/skinny.conf-dist; then rm -f %D/%%ETCDIR%%/skinny.conf; fi -%%ETCDIR%%/skinny.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/telcordia-1.adsi %D/%%ETCDIR%%/telcordia-1.adsi-dist; then rm -f %D/%%ETCDIR%%/telcordia-1.adsi; fi -%%ETCDIR%%/telcordia-1.adsi-dist -@unexec if cmp -s %D/%%ETCDIR%%/voicemail.conf %D/%%ETCDIR%%/voicemail.conf-dist; then rm -f %D/%%ETCDIR%%/voicemail.conf; fi -%%ETCDIR%%/voicemail.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/vpb.conf %D/%%ETCDIR%%/vpb.conf-dist; then rm -f %D/%%ETCDIR%%/vpb.conf; fi -%%ETCDIR%%/vpb.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/chan_dahdi.conf %D/%%ETCDIR%%/chan_dahdi.conf-dist; then rm -f %D/%%ETCDIR%%/chan_dahdi.conf; fi -%%ETCDIR%%/chan_dahdi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/chan_mobile.conf %D/%%ETCDIR%%/chan_mobile.conf-dist; then rm -f %D/%%ETCDIR%%/chan_mobile.conf; fi -%%ETCDIR%%/chan_mobile.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/udptl.conf %D/%%ETCDIR%%/udptl.conf-dist; then rm -f %D/%%ETCDIR%%/udptl.conf; fi -%%ETCDIR%%/udptl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/users.conf %D/%%ETCDIR%%/users.conf-dist; then rm -f %D/%%ETCDIR%%/users.conf; fi -%%ETCDIR%%/users.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/smdi.conf %D/%%ETCDIR%%/smdi.conf-dist; then rm -f %D/%%ETCDIR%%/smdi.conf; fi -%%ETCDIR%%/smdi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sla.conf %D/%%ETCDIR%%/sla.conf-dist; then rm -f %D/%%ETCDIR%%/sla.conf; fi -%%ETCDIR%%/sla.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/say.conf %D/%%ETCDIR%%/say.conf-dist; then rm -f %D/%%ETCDIR%%/say.conf; fi -%%ETCDIR%%/say.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_snmp.conf %D/%%ETCDIR%%/res_snmp.conf-dist; then rm -f %D/%%ETCDIR%%/res_snmp.conf; fi -%%ETCDIR%%/res_snmp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_stun_monitor.conf %D/%%ETCDIR%%/res_stun_monitor.conf-dist; then rm -f %D/%%ETCDIR%%/res_stun_monitor.conf; fi -%%ETCDIR%%/res_stun_monitor.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/muted.conf %D/%%ETCDIR%%/muted.conf-dist; then rm -f %D/%%ETCDIR%%/muted.conf; fi -%%ETCDIR%%/muted.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/jabber.conf %D/%%ETCDIR%%/jabber.conf-dist; then rm -f %D/%%ETCDIR%%/jabber.conf; fi -%%ETCDIR%%/jabber.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/http.conf %D/%%ETCDIR%%/http.conf-dist; then rm -f %D/%%ETCDIR%%/http.conf; fi -%%ETCDIR%%/http.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/h323.conf %D/%%ETCDIR%%/h323.conf-dist; then rm -f %D/%%ETCDIR%%/h323.conf; fi -%%ETCDIR%%/h323.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/gtalk.conf %D/%%ETCDIR%%/gtalk.conf-dist; then rm -f %D/%%ETCDIR%%/gtalk.conf; fi -%%ETCDIR%%/gtalk.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/func_odbc.conf %D/%%ETCDIR%%/func_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/func_odbc.conf; fi -%%ETCDIR%%/func_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/followme.conf %D/%%ETCDIR%%/followme.conf-dist; then rm -f %D/%%ETCDIR%%/followme.conf; fi -%%ETCDIR%%/followme.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/amd.conf %D/%%ETCDIR%%/amd.conf-dist; then rm -f %D/%%ETCDIR%%/amd.conf; fi -%%ETCDIR%%/amd.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/app_skel.conf %D/%%ETCDIR%%/app_skel.conf-dist; then rm -f %D/%%ETCDIR%%/app_skel.conf; fi -%%ETCDIR%%/app_skel.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/app_mysql.conf %D/%%ETCDIR%%/app_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/app_mysql.conf; fi -%%ETCDIR%%/app_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_sqlite.conf %D/%%ETCDIR%%/res_config_sqlite.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_sqlite.conf; fi -%%ETCDIR%%/res_config_sqlite.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_curl.conf %D/%%ETCDIR%%/res_curl.conf-dist; then rm -f %D/%%ETCDIR%%/res_curl.conf; fi -%%ETCDIR%%/res_curl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_fax.conf %D/%%ETCDIR%%/res_fax.conf-dist; then rm -f %D/%%ETCDIR%%/res_fax.conf; fi -%%ETCDIR%%/res_fax.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/xmpp.conf %D/%%ETCDIR%%/xmpp.conf-dist; then rm -f %D/%%ETCDIR%%/xmpp.conf; fi -%%ETCDIR%%/xmpp.conf-dist -@exec if test ! -e %D/%%ETCDIR%%/acl.conf; then cp -p %D/%%ETCDIR%%/acl.conf-dist %D/%%ETCDIR%%/acl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; then cp -p %D/%%ETCDIR%%/cdr_adaptive_odbc.conf-dist %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_syslog.conf; then cp -p %D/%%ETCDIR%%/cdr_syslog.conf-dist %D/%%ETCDIR%%/cdr_syslog.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; then cp -p %D/%%ETCDIR%%/cdr_sqlite3_custom.conf-dist %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cli.conf; then cp -p %D/%%ETCDIR%%/cli.conf-dist %D/%%ETCDIR%%/cli.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/confbridge.conf; then cp -p %D/%%ETCDIR%%/confbridge.conf-dist %D/%%ETCDIR%%/confbridge.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/config_test.conf; then cp -p %D/%%ETCDIR%%/config_test.conf-dist %D/%%ETCDIR%%/config_test.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/console.conf; then cp -p %D/%%ETCDIR%%/console.conf-dist %D/%%ETCDIR%%/console.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.lua; then cp -p %D/%%ETCDIR%%/extensions.lua-dist %D/%%ETCDIR%%/extensions.lua; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions_minivm.conf; then cp -p %D/%%ETCDIR%%/extensions_minivm.conf-dist %D/%%ETCDIR%%/extensions_minivm.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/jingle.conf; then cp -p %D/%%ETCDIR%%/jingle.conf-dist %D/%%ETCDIR%%/jingle.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/minivm.conf; then cp -p %D/%%ETCDIR%%/minivm.conf-dist %D/%%ETCDIR%%/minivm.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/motif.conf; then cp -p %D/%%ETCDIR%%/motif.conf-dist %D/%%ETCDIR%%/motif.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/ooh323.conf; then cp -p %D/%%ETCDIR%%/ooh323.conf-dist %D/%%ETCDIR%%/ooh323.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/phoneprov.conf; then cp -p %D/%%ETCDIR%%/phoneprov.conf-dist %D/%%ETCDIR%%/phoneprov.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/queuerules.conf; then cp -p %D/%%ETCDIR%%/queuerules.conf-dist %D/%%ETCDIR%%/queuerules.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_ldap.conf; then cp -p %D/%%ETCDIR%%/res_ldap.conf-dist %D/%%ETCDIR%%/res_ldap.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/unistim.conf; then cp -p %D/%%ETCDIR%%/unistim.conf-dist %D/%%ETCDIR%%/unistim.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/adsi.conf; then cp -p %D/%%ETCDIR%%/adsi.conf-dist %D/%%ETCDIR%%/adsi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/agents.conf; then cp -p %D/%%ETCDIR%%/agents.conf-dist %D/%%ETCDIR%%/agents.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/alarmreceiver.conf; then cp -p %D/%%ETCDIR%%/alarmreceiver.conf-dist %D/%%ETCDIR%%/alarmreceiver.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/alsa.conf; then cp -p %D/%%ETCDIR%%/alsa.conf-dist %D/%%ETCDIR%%/alsa.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/asterisk.adsi; then cp -p %D/%%ETCDIR%%/asterisk.adsi-dist %D/%%ETCDIR%%/asterisk.adsi; fi -@exec if test ! -e %D/%%ETCDIR%%/ccss.conf; then cp -p %D/%%ETCDIR%%/ccss.conf-dist %D/%%ETCDIR%%/ccss.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/calendar.conf; then cp -p %D/%%ETCDIR%%/calendar.conf-dist %D/%%ETCDIR%%/calendar.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/asterisk.conf; then cp -p %D/%%ETCDIR%%/asterisk.conf-dist %D/%%ETCDIR%%/asterisk.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr.conf; then cp -p %D/%%ETCDIR%%/cdr.conf-dist %D/%%ETCDIR%%/cdr.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_custom.conf; then cp -p %D/%%ETCDIR%%/cdr_custom.conf-dist %D/%%ETCDIR%%/cdr_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_mysql.conf; then cp -p %D/%%ETCDIR%%/cdr_mysql.conf-dist %D/%%ETCDIR%%/cdr_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_manager.conf; then cp -p %D/%%ETCDIR%%/cdr_manager.conf-dist %D/%%ETCDIR%%/cdr_manager.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_odbc.conf; then cp -p %D/%%ETCDIR%%/cdr_odbc.conf-dist %D/%%ETCDIR%%/cdr_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_pgsql.conf; then cp -p %D/%%ETCDIR%%/cdr_pgsql.conf-dist %D/%%ETCDIR%%/cdr_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_tds.conf; then cp -p %D/%%ETCDIR%%/cel_tds.conf-dist %D/%%ETCDIR%%/cel_tds.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_sqlite3_custom.conf; then cp -p %D/%%ETCDIR%%/cel_sqlite3_custom.conf-dist %D/%%ETCDIR%%/cel_sqlite3_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_pgsql.conf; then cp -p %D/%%ETCDIR%%/cel_pgsql.conf-dist %D/%%ETCDIR%%/cel_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_odbc.conf; then cp -p %D/%%ETCDIR%%/cel_odbc.conf-dist %D/%%ETCDIR%%/cel_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_custom.conf; then cp -p %D/%%ETCDIR%%/cel_custom.conf-dist %D/%%ETCDIR%%/cel_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel.conf; then cp -p %D/%%ETCDIR%%/cel.conf-dist %D/%%ETCDIR%%/cel.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_tds.conf; then cp -p %D/%%ETCDIR%%/cdr_tds.conf-dist %D/%%ETCDIR%%/cdr_tds.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/codecs.conf; then cp -p %D/%%ETCDIR%%/codecs.conf-dist %D/%%ETCDIR%%/codecs.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/dnsmgr.conf; then cp -p %D/%%ETCDIR%%/dnsmgr.conf-dist %D/%%ETCDIR%%/dnsmgr.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/dundi.conf; then cp -p %D/%%ETCDIR%%/dundi.conf-dist %D/%%ETCDIR%%/dundi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/enum.conf; then cp -p %D/%%ETCDIR%%/enum.conf-dist %D/%%ETCDIR%%/enum.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extconfig.conf; then cp -p %D/%%ETCDIR%%/extconfig.conf-dist %D/%%ETCDIR%%/extconfig.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.ael; then cp -p %D/%%ETCDIR%%/extensions.ael-dist %D/%%ETCDIR%%/extensions.ael; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.conf; then cp -p %D/%%ETCDIR%%/extensions.conf-dist %D/%%ETCDIR%%/extensions.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/features.conf; then cp -p %D/%%ETCDIR%%/features.conf-dist %D/%%ETCDIR%%/features.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/festival.conf; then cp -p %D/%%ETCDIR%%/festival.conf-dist %D/%%ETCDIR%%/festival.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/iax.conf; then cp -p %D/%%ETCDIR%%/iax.conf-dist %D/%%ETCDIR%%/iax.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/iaxprov.conf; then cp -p %D/%%ETCDIR%%/iaxprov.conf-dist %D/%%ETCDIR%%/iaxprov.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/indications.conf; then cp -p %D/%%ETCDIR%%/indications.conf-dist %D/%%ETCDIR%%/indications.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/logger.conf; then cp -p %D/%%ETCDIR%%/logger.conf-dist %D/%%ETCDIR%%/logger.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/manager.conf; then cp -p %D/%%ETCDIR%%/manager.conf-dist %D/%%ETCDIR%%/manager.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/meetme.conf; then cp -p %D/%%ETCDIR%%/meetme.conf-dist %D/%%ETCDIR%%/meetme.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/mgcp.conf; then cp -p %D/%%ETCDIR%%/mgcp.conf-dist %D/%%ETCDIR%%/mgcp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/misdn.conf; then cp -p %D/%%ETCDIR%%/misdn.conf-dist %D/%%ETCDIR%%/misdn.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/modules.conf; then cp -p %D/%%ETCDIR%%/modules.conf-dist %D/%%ETCDIR%%/modules.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/musiconhold.conf; then cp -p %D/%%ETCDIR%%/musiconhold.conf-dist %D/%%ETCDIR%%/musiconhold.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/osp.conf; then cp -p %D/%%ETCDIR%%/osp.conf-dist %D/%%ETCDIR%%/osp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/oss.conf; then cp -p %D/%%ETCDIR%%/oss.conf-dist %D/%%ETCDIR%%/oss.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/phone.conf; then cp -p %D/%%ETCDIR%%/phone.conf-dist %D/%%ETCDIR%%/phone.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_fax.conf; then cp -p %D/%%ETCDIR%%/res_fax.conf-dist %D/%%ETCDIR%%/res_fax.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/xmpp.conf; then cp -p %D/%%ETCDIR%%/xmpp.conf-dist %D/%%ETCDIR%%/xmpp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_curl.conf; then cp -p %D/%%ETCDIR%%/res_curl.conf-dist %D/%%ETCDIR%%/res_curl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_mysql.conf; then cp -p %D/%%ETCDIR%%/res_config_mysql.conf-dist %D/%%ETCDIR%%/res_config_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_sqlite.conf; then cp -p %D/%%ETCDIR%%/res_config_sqlite.conf-dist %D/%%ETCDIR%%/res_config_sqlite.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_sqlite3.conf; then cp -p %D/%%ETCDIR%%/res_config_sqlite3.conf-dist %D/%%ETCDIR%%/res_config_sqlite3.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_corosync.conf; then cp -p %D/%%ETCDIR%%/res_corosync.conf-dist %D/%%ETCDIR%%/res_corosync.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/queues.conf; then cp -p %D/%%ETCDIR%%/queues.conf-dist %D/%%ETCDIR%%/queues.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_pktccops.conf; then cp -p %D/%%ETCDIR%%/res_pktccops.conf-dist %D/%%ETCDIR%%/res_pktccops.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_pgsql.conf; then cp -p %D/%%ETCDIR%%/res_pgsql.conf-dist %D/%%ETCDIR%%/res_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_odbc.conf; then cp -p %D/%%ETCDIR%%/res_odbc.conf-dist %D/%%ETCDIR%%/res_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/rtp.conf; then cp -p %D/%%ETCDIR%%/rtp.conf-dist %D/%%ETCDIR%%/rtp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sip.conf; then cp -p %D/%%ETCDIR%%/sip.conf-dist %D/%%ETCDIR%%/sip.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sip_notify.conf; then cp -p %D/%%ETCDIR%%/sip_notify.conf-dist %D/%%ETCDIR%%/sip_notify.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/skinny.conf; then cp -p %D/%%ETCDIR%%/skinny.conf-dist %D/%%ETCDIR%%/skinny.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/telcordia-1.adsi; then cp -p %D/%%ETCDIR%%/telcordia-1.adsi-dist %D/%%ETCDIR%%/telcordia-1.adsi; fi -@exec if test ! -e %D/%%ETCDIR%%/voicemail.conf; then cp -p %D/%%ETCDIR%%/voicemail.conf-dist %D/%%ETCDIR%%/voicemail.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/vpb.conf; then cp -p %D/%%ETCDIR%%/vpb.conf-dist %D/%%ETCDIR%%/vpb.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/chan_mobile.conf; then cp -p %D/%%ETCDIR%%/chan_mobile.conf-dist %D/%%ETCDIR%%/chan_mobile.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/chan_dahdi.conf; then cp -p %D/%%ETCDIR%%/chan_dahdi.conf-dist %D/%%ETCDIR%%/chan_dahdi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/udptl.conf; then cp -p %D/%%ETCDIR%%/udptl.conf-dist %D/%%ETCDIR%%/udptl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/users.conf; then cp -p %D/%%ETCDIR%%/users.conf-dist %D/%%ETCDIR%%/users.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/smdi.conf; then cp -p %D/%%ETCDIR%%/smdi.conf-dist %D/%%ETCDIR%%/smdi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sla.conf; then cp -p %D/%%ETCDIR%%/sla.conf-dist %D/%%ETCDIR%%/sla.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/say.conf; then cp -p %D/%%ETCDIR%%/say.conf-dist %D/%%ETCDIR%%/say.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_stun_monitor.conf; then cp -p %D/%%ETCDIR%%/res_stun_monitor.conf-dist %D/%%ETCDIR%%/res_stun_monitor.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_snmp.conf; then cp -p %D/%%ETCDIR%%/res_snmp.conf-dist %D/%%ETCDIR%%/res_snmp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/muted.conf; then cp -p %D/%%ETCDIR%%/muted.conf-dist %D/%%ETCDIR%%/muted.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/jabber.conf; then cp -p %D/%%ETCDIR%%/jabber.conf-dist %D/%%ETCDIR%%/jabber.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/http.conf; then cp -p %D/%%ETCDIR%%/http.conf-dist %D/%%ETCDIR%%/http.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/h323.conf; then cp -p %D/%%ETCDIR%%/h323.conf-dist %D/%%ETCDIR%%/h323.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/gtalk.conf; then cp -p %D/%%ETCDIR%%/gtalk.conf-dist %D/%%ETCDIR%%/gtalk.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/func_odbc.conf; then cp -p %D/%%ETCDIR%%/func_odbc.conf-dist %D/%%ETCDIR%%/func_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/followme.conf; then cp -p %D/%%ETCDIR%%/followme.conf-dist %D/%%ETCDIR%%/followme.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/app_mysql.conf; then cp -p %D/%%ETCDIR%%/app_mysql.conf-dist %D/%%ETCDIR%%/app_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/app_skel.conf; then cp -p %D/%%ETCDIR%%/app_skel.conf-dist %D/%%ETCDIR%%/app_skel.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/amd.conf; then cp -p %D/%%ETCDIR%%/amd.conf-dist %D/%%ETCDIR%%/amd.conf; fi -include/asterisk/doxygen/architecture.h -include/asterisk/doxygen/asterisk-git-howto.h -include/asterisk/doxygen/commits.h -include/asterisk/doxygen/licensing.h -include/asterisk/doxygen/mantisworkflow.h -include/asterisk/doxygen/releases.h -include/asterisk/doxygen/reviewboard.h -include/asterisk/_private.h -include/asterisk/aoc.h -include/asterisk/ast_version.h -include/asterisk/autochan.h -include/asterisk/calendar.h -include/asterisk/ccss.h -include/asterisk/cel.h -include/asterisk/celt.h -include/asterisk/channel_internal.h -include/asterisk/channelstate.h -include/asterisk/config_options.h -include/asterisk/data.h -include/asterisk/event.h -include/asterisk/event_defs.h -include/asterisk/extconf.h -include/asterisk/frame_defs.h -include/asterisk/framehook.h -include/asterisk/format.h -include/asterisk/format_cap.h -include/asterisk/format_pref.h -include/asterisk/fskmodem_float.h -include/asterisk/fskmodem_int.h -include/asterisk/hashtab.h -include/asterisk/http_websocket.h -include/asterisk/message.h -include/asterisk/mod_format.h -include/asterisk/netsock2.h -include/asterisk/network.h -include/asterisk/optional_api.h -include/asterisk/pktccops.h -include/asterisk/presencestate.h -include/asterisk/pval.h -include/asterisk/res_fax.h -include/asterisk/res_srtp.h -include/asterisk/rtp_engine.h -include/asterisk/select.h -include/asterisk/security_events.h -include/asterisk/security_events_defs.h -include/asterisk/silk.h -include/asterisk/sip_api.h -include/asterisk/stun.h -include/asterisk/syslog.h -include/asterisk/tcptls.h +@sample %%ETCDIR%%/acl.conf.sample +@sample %%ETCDIR%%/adsi.conf.sample +@sample %%ETCDIR%%/agents.conf.sample +@sample %%ETCDIR%%/alarmreceiver.conf.sample +@sample %%ETCDIR%%/alsa.conf.sample +@sample %%ETCDIR%%/amd.conf.sample +@sample %%ETCDIR%%/app_mysql.conf.sample +@sample %%ETCDIR%%/app_skel.conf.sample +@sample %%ETCDIR%%/ari.conf.sample +@sample %%ETCDIR%%/asterisk.adsi.sample +@sample %%ETCDIR%%/asterisk.conf.sample +@sample %%ETCDIR%%/calendar.conf.sample +@sample %%ETCDIR%%/ccss.conf.sample +@sample %%ETCDIR%%/cdr.conf.sample +@sample %%ETCDIR%%/cdr_adaptive_odbc.conf.sample +@sample %%ETCDIR%%/cdr_custom.conf.sample +@sample %%ETCDIR%%/cdr_manager.conf.sample +@sample %%ETCDIR%%/cdr_mysql.conf.sample +@sample %%ETCDIR%%/cdr_odbc.conf.sample +@sample %%ETCDIR%%/cdr_pgsql.conf.sample +@sample %%ETCDIR%%/cdr_sqlite3_custom.conf.sample +@sample %%ETCDIR%%/cdr_syslog.conf.sample +@sample %%ETCDIR%%/cdr_tds.conf.sample +@sample %%ETCDIR%%/cel.conf.sample +@sample %%ETCDIR%%/cel_custom.conf.sample +@sample %%ETCDIR%%/cel_odbc.conf.sample +@sample %%ETCDIR%%/cel_pgsql.conf.sample +@sample %%ETCDIR%%/cel_sqlite3_custom.conf.sample +@sample %%ETCDIR%%/cel_tds.conf.sample +@sample %%ETCDIR%%/chan_dahdi.conf.sample +@sample %%ETCDIR%%/chan_mobile.conf.sample +@sample %%ETCDIR%%/cli.conf.sample +@sample %%ETCDIR%%/cli_aliases.conf.sample +@sample %%ETCDIR%%/cli_permissions.conf.sample +@sample %%ETCDIR%%/codecs.conf.sample +@sample %%ETCDIR%%/confbridge.conf.sample +@sample %%ETCDIR%%/config_test.conf.sample +@sample %%ETCDIR%%/console.conf.sample +@sample %%ETCDIR%%/dbsep.conf.sample +@sample %%ETCDIR%%/dnsmgr.conf.sample +@sample %%ETCDIR%%/dsp.conf.sample +@sample %%ETCDIR%%/dundi.conf.sample +@sample %%ETCDIR%%/enum.conf.sample +@sample %%ETCDIR%%/extconfig.conf.sample +@sample %%ETCDIR%%/extensions.ael.sample +@sample %%ETCDIR%%/extensions.conf.sample +@sample %%ETCDIR%%/extensions.lua.sample +@sample %%ETCDIR%%/extensions_minivm.conf.sample +@sample %%ETCDIR%%/features.conf.sample +@sample %%ETCDIR%%/festival.conf.sample +@sample %%ETCDIR%%/followme.conf.sample +@sample %%ETCDIR%%/func_odbc.conf.sample +@sample %%ETCDIR%%/hep.conf.sample +@sample %%ETCDIR%%/http.conf.sample +@sample %%ETCDIR%%/iax.conf.sample +@sample %%ETCDIR%%/iaxprov.conf.sample +@sample %%ETCDIR%%/indications.conf.sample +@sample %%ETCDIR%%/logger.conf.sample +@sample %%ETCDIR%%/manager.conf.sample +@sample %%ETCDIR%%/meetme.conf.sample +@sample %%ETCDIR%%/mgcp.conf.sample +@sample %%ETCDIR%%/minivm.conf.sample +@sample %%ETCDIR%%/misdn.conf.sample +@sample %%ETCDIR%%/modules.conf.sample +@sample %%ETCDIR%%/motif.conf.sample +@sample %%ETCDIR%%/musiconhold.conf.sample +@sample %%ETCDIR%%/muted.conf.sample +@sample %%ETCDIR%%/ooh323.conf.sample +@sample %%ETCDIR%%/osp.conf.sample +@sample %%ETCDIR%%/oss.conf.sample +@sample %%ETCDIR%%/phone.conf.sample +@sample %%ETCDIR%%/phoneprov.conf.sample +@sample %%ETCDIR%%/pjsip.conf.sample +@sample %%ETCDIR%%/pjsip_notify.conf.sample +@sample %%ETCDIR%%/queuerules.conf.sample +@sample %%ETCDIR%%/queues.conf.sample +@sample %%ETCDIR%%/res_config_mysql.conf.sample +@sample %%ETCDIR%%/res_config_sqlite.conf.sample +@sample %%ETCDIR%%/res_config_sqlite3.conf.sample +@sample %%ETCDIR%%/res_corosync.conf.sample +@sample %%ETCDIR%%/res_curl.conf.sample +@sample %%ETCDIR%%/res_fax.conf.sample +@sample %%ETCDIR%%/res_ldap.conf.sample +@sample %%ETCDIR%%/res_odbc.conf.sample +@sample %%ETCDIR%%/res_parking.conf.sample +@sample %%ETCDIR%%/res_pgsql.conf.sample +@sample %%ETCDIR%%/res_pktccops.conf.sample +@sample %%ETCDIR%%/res_snmp.conf.sample +@sample %%ETCDIR%%/res_stun_monitor.conf.sample +@sample %%ETCDIR%%/rtp.conf.sample +@sample %%ETCDIR%%/say.conf.sample +@sample %%ETCDIR%%/sip.conf.sample +@sample %%ETCDIR%%/sip_notify.conf.sample +@sample %%ETCDIR%%/skinny.conf.sample +@sample %%ETCDIR%%/sla.conf.sample *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 14:58:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9E4C8316; Mon, 15 Dec 2014 14: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 713D2924; Mon, 15 Dec 2014 14:58:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFEwPSM024863; Mon, 15 Dec 2014 14:58:25 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFEwP37024862; Mon, 15 Dec 2014 14:58:25 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412151458.sBFEwP37024862@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Dec 2014 14:58:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374750 - head/net/asterisk13/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 14:58:25 -0000 Author: madpilot Date: Mon Dec 15 14:58:24 2014 New Revision: 374750 URL: https://svnweb.freebsd.org/changeset/ports/374750 QAT: https://qat.redports.org/buildarchive/r374750/ Log: Remove two patches I forgot to remove in previous commit. Deleted: head/net/asterisk13/files/patch-channels__Makefile head/net/asterisk13/files/patch-channels_h323_Makefile.in From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 15:26:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 23D50941; Mon, 15 Dec 2014 15:26: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 10035C83; Mon, 15 Dec 2014 15:26:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFFQtAf039285; Mon, 15 Dec 2014 15:26:55 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFFQsG8039280; Mon, 15 Dec 2014 15:26:54 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412151526.sBFFQsG8039280@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 15:26:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374751 - in head/sysutils: . rhc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 15:26:56 -0000 Author: pawel Date: Mon Dec 15 15:26:53 2014 New Revision: 374751 URL: https://svnweb.freebsd.org/changeset/ports/374751 QAT: https://qat.redports.org/buildarchive/r374751/ Log: Command line tools for OpenShift, cloud Platform as a service. WWW: https://github.com/openshift/rhc PR: 195650 Submitted by: Dereckson Added: head/sysutils/rhc/ head/sysutils/rhc/Makefile (contents, props changed) head/sysutils/rhc/distinfo (contents, props changed) head/sysutils/rhc/pkg-descr (contents, props changed) head/sysutils/rhc/pkg-message (contents, props changed) Modified: head/sysutils/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Mon Dec 15 14:58:24 2014 (r374750) +++ head/sysutils/Makefile Mon Dec 15 15:26:53 2014 (r374751) @@ -782,6 +782,7 @@ SUBDIR += respond SUBDIR += retail SUBDIR += rfstool + SUBDIR += rhc SUBDIR += rinse SUBDIR += rmonitor SUBDIR += roottail Added: head/sysutils/rhc/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rhc/Makefile Mon Dec 15 15:26:53 2014 (r374751) @@ -0,0 +1,30 @@ +# Created by: Dereckson +# $FreeBSD$ + +PORTNAME= rhc +PORTVERSION= 1.32.2 +CATEGORIES= sysutils +MASTER_SITES= RG + +MAINTAINER= dereckson@gmail.com +COMMENT= Administration console client for RedHat OpenShift + +LICENSE= APACHE20 + +RUN_DEPENDS= ${LOCALBASE}/bin/minitar:${PORTSDIR}/archivers/rubygem-archive-tar-minitar \ + ${LOCALBASE}/bin/commander:${PORTSDIR}/devel/rubygem-commander \ + rubygem-highline>=1.6.11:${PORTSDIR}/devel/rubygem-highline \ + rubygem-httpclient>=2.4:${PORTSDIR}/www/rubygem-httpclient \ + rubygem-net-scp>=1.1.2:${PORTSDIR}/security/rubygem-net-scp \ + rubygem-net-ssh>=2.0.11:${PORTSDIR}/security/rubygem-net-ssh \ + rubygem-net-ssh-multi>=1.2.0:${PORTSDIR}/security/rubygem-net-ssh-multi \ + rubygem-open4>0:${PORTSDIR}/devel/rubygem-open4 + +NO_ARCH= yes +USE_RUBY= yes +USE_RUBYGEMS= yes +RUBYGEM_AUTOPLIST= yes + +PLIST_FILES= bin/rhc + +.include Added: head/sysutils/rhc/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rhc/distinfo Mon Dec 15 15:26:53 2014 (r374751) @@ -0,0 +1,2 @@ +SHA256 (rubygem/rhc-1.32.2.gem) = b4eee2d415c1f0ed857ef43624a75065881c26df9734a99d91074a62fc8181db +SIZE (rubygem/rhc-1.32.2.gem) = 245760 Added: head/sysutils/rhc/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rhc/pkg-descr Mon Dec 15 15:26:53 2014 (r374751) @@ -0,0 +1,3 @@ +Command line tools for OpenShift, cloud Platform as a service. + +WWW: https://github.com/openshift/rhc Added: head/sysutils/rhc/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rhc/pkg-message Mon Dec 15 15:26:53 2014 (r374751) @@ -0,0 +1,3 @@ +If this is your first time installing the RHC tools, +please run 'rhc setup' to configure your account and +working development environment. From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 16:08:16 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9AA3F81; Mon, 15 Dec 2014 16:08: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 D5543A6; Mon, 15 Dec 2014 16:08:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFG8FTj058877; Mon, 15 Dec 2014 16:08:15 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFG8FPS058875; Mon, 15 Dec 2014 16:08:15 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412151608.sBFG8FPS058875@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 15 Dec 2014 16:08:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374752 - in head/www/neon29: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 16:08:16 -0000 Author: ohauer Date: Mon Dec 15 16:08:14 2014 New Revision: 374752 URL: https://svnweb.freebsd.org/changeset/ports/374752 QAT: https://qat.redports.org/buildarchive/r374752/ Log: - use new CONFIG syntax - add LICENSE - do not install man pages a second time - use REINPLACE_CMD instead dedicated patch - remove obsolete CONFLICT line - cleanup pkg-plist - bump PORTREVISION Approved by: lev (implicit) Deleted: head/www/neon29/files/ Modified: head/www/neon29/Makefile head/www/neon29/pkg-plist Modified: head/www/neon29/Makefile ============================================================================== --- head/www/neon29/Makefile Mon Dec 15 15:26:53 2014 (r374751) +++ head/www/neon29/Makefile Mon Dec 15 16:08:14 2014 (r374752) @@ -3,7 +3,7 @@ PORTNAME= neon29 PORTVERSION= 0.29.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= http://www.webdav.org/neon/ DISTNAME= neon-${PORTVERSION} @@ -11,8 +11,13 @@ DISTNAME= neon-${PORTVERSION} MAINTAINER= lev@FreeBSD.org COMMENT= HTTP and WebDAV client library for Unix systems -CONFLICTS= neon2[^9]-[0-9]* +LICENSE= GPLv2 +USES= pathfix libtool +USE_LDCONFIG= yes +GNU_CONFIGURE= yes + +OPTIONS_SUB= yes OPTIONS_DEFINE= CA_BUNDLE DOCS GSSAPI NLS OPENSSL PROXY OPTIONS_DEFAULT= CA_BUNDLE EXPAT GSSAPI NLS OPENSSL OPTIONS_SINGLE= XML @@ -23,63 +28,37 @@ LIBXML_DESC= libxml2 XML parser support PROXY_DESC= libproxy support XML_DESC= XML parser library -USE_LDCONFIG= yes - -USES= pathfix libtool -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared \ - --with-libs=${LOCALBASE}:${PREFIX} - CA_BUNDLE_CONFIGURE_ON= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +EXPAT_CONFIGURE_WITH= expat +EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 +GSSAPI_CONFIGURE_WITH= gssapi +LIBXML_CONFIGURE_WITH= libxml2 +LIBXML_USE= GNOME=libxml2 +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext +OPENSSL_CONFIGURE_WITH= ssl +OPENSSL_USE= OPENSSL=yes +PROXY_CONFIGURE_WITH= libproxy +PROXY_LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy .include +CONFIGURE_ARGS+=--enable-shared \ + --with-libs=${LOCALBASE}:${PREFIX} + .if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL} WARNING+= "OpenSSL need for CA bundle support" WARNING+= "Enable the OPENSSL option or disable the CA_BUNDLE option" .endif -.if ${PORT_OPTIONS:MEXPAT} -CONFIGURE_ARGS+=--with-expat -LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 -.endif - -.if ${PORT_OPTIONS:MLIBXML} -CONFIGURE_ARGS+=--with-libxml2 -USE_GNOME+= libxml2 -.endif - -.if ${PORT_OPTIONS:MOPENSSL} -CONFIGURE_ARGS+=--with-ssl -USE_OPENSSL= yes -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ! ${PORT_OPTIONS:MGSSAPI} -CONFIGURE_ARGS+=--without-gssapi -.endif - -.if ${PORT_OPTIONS:MPROXY} -CONFIGURE_ARGS+=--with-libproxy -LIB_DEPENDS+= libproxy.so:${PORTSDIR}/net/libproxy -.else -CONFIGURE_ARGS+=--without-libproxy -.endif - PLIST_SUB+= PORTVERSION=${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/neon +post-patch: + ${REINPLACE_CMD} -e 's|-@NEON_VERSION@$$||' ${WRKSRC}/Makefile.in + post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MANPREFIX}/man/man3 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libneon.so.27.* .include Modified: head/www/neon29/pkg-plist ============================================================================== --- head/www/neon29/pkg-plist Mon Dec 15 15:26:53 2014 (r374751) +++ head/www/neon29/pkg-plist Mon Dec 15 16:08:14 2014 (r374752) @@ -178,6 +178,3 @@ man/man3/neon.3.gz %%NLS%%share/locale/ru/LC_MESSAGES/neon.mo %%NLS%%share/locale/tr/LC_MESSAGES/neon.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/neon.mo -@dirrm include/neon -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html -%%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 16:16:34 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 27ECE408; Mon, 15 Dec 2014 16:16: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 13D231A9; Mon, 15 Dec 2014 16:16:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFGGXax063621; Mon, 15 Dec 2014 16:16:33 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFGGXZf063620; Mon, 15 Dec 2014 16:16:33 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201412151616.sBFGGXZf063620@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 15 Dec 2014 16:16:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374753 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 16:16:34 -0000 Author: sbruno Date: Mon Dec 15 16:16:32 2014 New Revision: 374753 URL: https://svnweb.freebsd.org/changeset/ports/374753 QAT: https://qat.redports.org/buildarchive/r374753/ Log: Indiciate that CentOS 6 ports are now the default in stable/10. Refer back to the UPDATING entry for reference on migration. Reviewed by: xmj Approved by: mentor (implicit) Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Dec 15 16:08:14 2014 (r374752) +++ head/UPDATING Mon Dec 15 16:16:32 2014 (r374753) @@ -5,6 +5,13 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20141209: + AFFECTS: users of emulators/linux_base-f10 and emulators/linux_base-c6 + AUTHOR: sbruno@freebsd.org + + The CentOS ports are now the default for stable/10 (after revision 275807). + See UPDATING entry 20141209 for details on migration of systems. + 20141214: AFFECTS: users of TeXLive AUTHOR: hrs@FreeBSD.org From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 16:19:30 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BA3AA60A; Mon, 15 Dec 2014 16:19: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 A65601D6; Mon, 15 Dec 2014 16:19:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFGJU2M064107; Mon, 15 Dec 2014 16:19:30 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFGJUAJ064106; Mon, 15 Dec 2014 16:19:30 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201412151619.sBFGJUAJ064106@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 15 Dec 2014 16:19:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374754 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 16:19:30 -0000 Author: sbruno Date: Mon Dec 15 16:19:29 2014 New Revision: 374754 URL: https://svnweb.freebsd.org/changeset/ports/374754 QAT: https://qat.redports.org/buildarchive/r374754/ Log: Today's date is 20141215, make it so. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Dec 15 16:16:32 2014 (r374753) +++ head/UPDATING Mon Dec 15 16:19:29 2014 (r374754) @@ -5,7 +5,7 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. -20141209: +20141215: AFFECTS: users of emulators/linux_base-f10 and emulators/linux_base-c6 AUTHOR: sbruno@freebsd.org From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 16:53:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B866BC33; Mon, 15 Dec 2014 16:53:50 +0000 (UTC) Received: from mail.egr.msu.edu (hill.egr.msu.edu [35.9.37.162]) by mx1.freebsd.org (Postfix) with ESMTP id 92A43864; Mon, 15 Dec 2014 16:53:50 +0000 (UTC) Received: from hill (localhost [127.0.0.1]) by mail.egr.msu.edu (Postfix) with ESMTP id 26B924F67D; Mon, 15 Dec 2014 11:44:05 -0500 (EST) X-Virus-Scanned: amavisd-new at egr.msu.edu Received: from mail.egr.msu.edu ([127.0.0.1]) by hill (hill.egr.msu.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 258tY0R4KiSg; Mon, 15 Dec 2014 11:44:05 -0500 (EST) Received: from EGR authenticated sender Message-ID: <548F0FD4.7050805@egr.msu.edu> Date: Mon, 15 Dec 2014 11:44:04 -0500 From: Adam McDougall User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: svn-ports-all@freebsd.org, kwm@FreeBSD.org Subject: Re: svn commit: r374488 - head/security/vuxml References: <201412102131.sBALVv1H028878@svn.freebsd.org> In-Reply-To: <201412102131.sBALVv1H028878@svn.freebsd.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 16:53:50 -0000 On 12/10/2014 16:31, Koop Mast wrote: > Author: kwm > Date: Wed Dec 10 21:31:56 2014 > New Revision: 374488 > URL: https://svnweb.freebsd.org/changeset/ports/374488 > QAT: https://qat.redports.org/buildarchive/r374488/ > > Log: > Document xserver security advisories. > > Modified: > head/security/vuxml/vuln.xml > > Modified: head/security/vuxml/vuln.xml > ============================================================================== > --- head/security/vuxml/vuln.xml Wed Dec 10 20:23:06 2014 (r374487) > +++ head/security/vuxml/vuln.xml Wed Dec 10 21:31:56 2014 (r374488) > @@ -57,6 +57,71 @@ Notes: > > --> > > + > + xserver -- multiple issue with X client request handling > + > + > + xorg-server > + 1.12.4_10 The range needs a ,1 on the end because of PORTEPOCH, otherwise it does not match. I tested adding it on one of my systems and that makes it work correctly. Do you want me to open a bug report with a patch? Thanks. From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 17:00:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6CB2CD19; Mon, 15 Dec 2014 17:00: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 583DE95B; Mon, 15 Dec 2014 17:00:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFH0OcG083723; Mon, 15 Dec 2014 17:00:24 GMT (envelope-from kmoore@FreeBSD.org) Received: (from kmoore@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFH0Nvd083721; Mon, 15 Dec 2014 17:00:23 GMT (envelope-from kmoore@FreeBSD.org) Message-Id: <201412151700.sBFH0Nvd083721@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kmoore set sender to kmoore@FreeBSD.org using -f From: Kris Moore Date: Mon, 15 Dec 2014 17:00:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374755 - in head/emulators/pipelight: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 17:00:24 -0000 Author: kmoore Date: Mon Dec 15 17:00:22 2014 New Revision: 374755 URL: https://svnweb.freebsd.org/changeset/ports/374755 QAT: https://qat.redports.org/buildarchive/r374755/ Log: - Fix a bug in pipelight-mkufs script - Bump PORTREV PR: 195963 Submitted by: f0andrey@gmail.com Modified: head/emulators/pipelight/Makefile head/emulators/pipelight/files/pipelight-mkufs.in Modified: head/emulators/pipelight/Makefile ============================================================================== --- head/emulators/pipelight/Makefile Mon Dec 15 16:19:29 2014 (r374754) +++ head/emulators/pipelight/Makefile Mon Dec 15 17:00:22 2014 (r374755) @@ -3,7 +3,7 @@ PORTNAME= pipelight DISTVERSION= 0.2.7.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators MASTER_SITES= https://bitbucket.org/mmueller2012/pipelight/get/ \ http://repos.fds-team.de/pluginloader/v${DISTVERSION}/:plg Modified: head/emulators/pipelight/files/pipelight-mkufs.in ============================================================================== --- head/emulators/pipelight/files/pipelight-mkufs.in Mon Dec 15 16:19:29 2014 (r374754) +++ head/emulators/pipelight/files/pipelight-mkufs.in Mon Dec 15 17:00:22 2014 (r374755) @@ -85,8 +85,11 @@ if [ $? -ne 0 ] ; then exit 1 fi +# Get user group +usergroup=`groups $username | cut -d " " -f 1` + # Chown the directory -chown $username:$username ${userhome}/.wine-pipelight +chown $username:$usergroup ${userhome}/.wine-pipelight # Save to fstab echo "/dev/zvol/$zpool/$username-pipelight ${userhome}/.wine-pipelight ufs rw,late 0 0" >> /etc/fstab From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 17:04:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 553EDE68; Mon, 15 Dec 2014 17:04: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 40ED79A2; Mon, 15 Dec 2014 17:04:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFH4S5w087810; Mon, 15 Dec 2014 17:04:28 GMT (envelope-from kmoore@FreeBSD.org) Received: (from kmoore@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFH4RIX087807; Mon, 15 Dec 2014 17:04:27 GMT (envelope-from kmoore@FreeBSD.org) Message-Id: <201412151704.sBFH4RIX087807@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kmoore set sender to kmoore@FreeBSD.org using -f From: Kris Moore Date: Mon, 15 Dec 2014 17:04:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374756 - in head/sysutils/grub2-pcbsd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 17:04:28 -0000 Author: kmoore Date: Mon Dec 15 17:04:26 2014 New Revision: 374756 URL: https://svnweb.freebsd.org/changeset/ports/374756 QAT: https://qat.redports.org/buildarchive/r374756/ Log: - Add detection of another Windows 7 partition label - Bump PORTREV Modified: head/sysutils/grub2-pcbsd/Makefile head/sysutils/grub2-pcbsd/files/30_os-prober.in Modified: head/sysutils/grub2-pcbsd/Makefile ============================================================================== --- head/sysutils/grub2-pcbsd/Makefile Mon Dec 15 17:00:22 2014 (r374755) +++ head/sysutils/grub2-pcbsd/Makefile Mon Dec 15 17:04:26 2014 (r374756) @@ -3,7 +3,7 @@ PORTNAME= grub2-pcbsd PORTVERSION= 2.02p -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= sysutils MASTER_SITES= http://www.pcbsd.org/~kris/software/ \ ftp://ftp.pcbsd.org/pub/software/ Modified: head/sysutils/grub2-pcbsd/files/30_os-prober.in ============================================================================== --- head/sysutils/grub2-pcbsd/files/30_os-prober.in Mon Dec 15 17:00:22 2014 (r374755) +++ head/sysutils/grub2-pcbsd/files/30_os-prober.in Mon Dec 15 17:04:26 2014 (r374756) @@ -32,7 +32,7 @@ check_ntfs_part() fs_label=`grub-probe --device /dev/${disk} --target=fs_label` # Check for common windows NTFS labels for bootable partitions - if [ "$fs_label" != "System Reserved" -a "$fs_label" != "SYSTEM RESERVED" -a "$fs_label" != "eMachines" -a "$fs_label" != "OS" -a "$fs_label" != "SYSTEM" ] ; then return; fi + if [ "$fs_label" != "System Reserved" -a "$fs_label" != "SYSTEM RESERVED" -a "$fs_label" != "eMachines" -a "$fs_label" != "OS" -a "$fs_label" != "SYSTEM" -a "$fs_label" != "SYSTEM_DRV" ] ; then return; fi fs_uuid=`grub-probe --device /dev/${disk} --target=fs_uuid` if [ -z "$fs_uuid" ] ; then From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 17:20:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6375D2CD; Mon, 15 Dec 2014 17:20: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 4FB49B3F; Mon, 15 Dec 2014 17:20:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFHKfEI095543; Mon, 15 Dec 2014 17:20:41 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFHKfKR095542; Mon, 15 Dec 2014 17:20:41 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412151720.sBFHKfKR095542@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Dec 2014 17:20:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374757 - head/deskutils/calibre X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 17:20:41 -0000 Author: madpilot Date: Mon Dec 15 17:20:40 2014 New Revision: 374757 URL: https://svnweb.freebsd.org/changeset/ports/374757 QAT: https://qat.redports.org/buildarchive/r374757/ Log: Take Approved by: Rusty Nejdl (former maintainer) Modified: head/deskutils/calibre/Makefile Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Mon Dec 15 17:04:26 2014 (r374756) +++ head/deskutils/calibre/Makefile Mon Dec 15 17:20:40 2014 (r374757) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ -MAINTAINER= rnejdl@ringofsaturn.com +MAINTAINER= madpilot@FreeBSD.org COMMENT= Ebook management application LIB_DEPENDS= libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \ From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 17:51:00 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 261DF798; Mon, 15 Dec 2014 17:51: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 06FCFE5E; Mon, 15 Dec 2014 17:51:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFHoxgd011091; Mon, 15 Dec 2014 17:50:59 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFHoxUl011088; Mon, 15 Dec 2014 17:50:59 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201412151750.sBFHoxUl011088@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: Jean-Sebastien Pedron Date: Mon, 15 Dec 2014 17:50:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374758 - in head/graphics/darktable: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 17:51:00 -0000 Author: dumbbell (src committer) Date: Mon Dec 15 17:50:58 2014 New Revision: 374758 URL: https://svnweb.freebsd.org/changeset/ports/374758 QAT: https://qat.redports.org/buildarchive/r374758/ Log: graphics/darktable: Update to 1.6.0 The release notes of this new stable branch are available on the darktable website: http://www.darktable.org/2014/12/released-darktable-1-6/ The following changes was made to the options: o LIBSECRET is a new option, turned off by default. When selected, darktable can use libsecret as a password storage backend. This can be useful for GNOME 3 users and it may be turned on by default in the future as the dependency is light. o SLIDESHOW is turned on by default: the features received enhancements in 1.6.0. o SQUISH is turned on by default. This library is used to compress thumbnail and it's recommanded by the darktable developers. PR: 195820 Differential Revision: https://reviews.freebsd.org/D1311 Submitted by: martin@sugioarto.com (earlier version) Reviewed by: antoine Approved by: antoine Deleted: head/graphics/darktable/files/ Modified: head/graphics/darktable/Makefile head/graphics/darktable/distinfo head/graphics/darktable/pkg-plist Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Mon Dec 15 17:20:40 2014 (r374757) +++ head/graphics/darktable/Makefile Mon Dec 15 17:50:58 2014 (r374758) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= darktable -PORTVERSION= 1.4.2 -PORTREVISION= 6 +PORTVERSION= 1.6.0 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION}/ MAINTAINER= dumbbell@FreeBSD.org COMMENT= Virtual lighttable and darkroom for photographers @@ -21,7 +20,8 @@ LIB_DEPENDS= libexiv2.so:${PORTSDIR}/gra ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE extensions -USES= cmake:outsource desktop-file-utils ninja pkgconfig tar:xz +USES= compiler:c++11-lib cmake:outsource desktop-file-utils \ + ninja pkgconfig tar:xz USE_GNOME= librsvg2 USE_SQLITE= yes USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} @@ -29,20 +29,23 @@ INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib -lintl OPTIONS_DEFINE= COLORD DOCS FB_PICASA FLICKR GEO GNOMEKEYRING GPHOTO \ - GRAPHMAGICK LUA NLS OPENEXR OPENJPEG RAWSPEED SLIDESHOW \ - SQUISH WEBP + GRAPHMAGICK LIBSECRET LUA NLS OPENEXR OPENJPEG RAWSPEED \ + SLIDESHOW SQUISH WEBP GEO_DESC= Support geotagging FB_PICASA_DESC= Support export to Facebook and Picasa +LIBSECRET_DESC= Support libsecret as password backend SQUISH_DESC= Compress thumbnail via libsquish RAWSPEED_DESC= Compile with rawspeed backend SLIDESHOW_DESC= Build OpenGL/SDL slideshow viewer OPTIONS_DEFAULT=COLORD FB_PICASA FLICKR GEO GPHOTO LUA NLS OPENEXR \ - OPENJPEG RAWSPEED WEBP + OPENJPEG RAWSPEED SLIDESHOW SQUISH WEBP OPTIONS_SUB= yes CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 +CMAKE_ARGS+= -DBUILD_CMSTEST:BOOL=ON +CMAKE_ARGS+= -DUSE_KWALLET:BOOL=ON # darktable 1.4 can use colord but provides its own libcolord, # statically linked to libdarktable.so. @@ -67,6 +70,9 @@ GPHOTO_CMAKE_OFF= -DUSE_CAMERA_SUPPORT:B GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick GRAPHMAGICK_CMAKE_OFF= -DUSE_GRAPHICSMAGICK:BOOL=OFF +LIBSECRET_LIB_DEPENDS= libsecret-1.so:${PORTSDIR}/security/libsecret +LIBSECRET_CMAKE_OFF= -DUSE_LIBSECRET:BOOL=OFF + LUA_USES= lua LUA_CMAKE_OFF= -DUSE_LUA:BOOL=OFF @@ -81,7 +87,7 @@ OPENJPEG_CMAKE_OFF= -DUSE_OPENJPEG:BOOL= RAWSPEED_CMAKE_OFF= -DDONT_USE_RAWSPEED:BOOL=ON -SLIDESHOW_USE= GL=gl SDL=sdl +SLIDESHOW_USE= GL=gl SDL=sdl SLIDESHOW_CMAKE_OFF= -DBUILD_SLIDESHOW:BOOL=OFF SQUISH_BUILD_DEPENDS= ${LOCALBASE}/lib/libsquish.a:${PORTSDIR}/graphics/squish @@ -92,12 +98,8 @@ WEBP_CMAKE_OFF= -DUSE_WEBP:BOOL=OFF .include -.if ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - .if defined(WITH_DEBUG) -CMAKE_BUILD_TYPE?= RelWithDebInfo +CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif Modified: head/graphics/darktable/distinfo ============================================================================== --- head/graphics/darktable/distinfo Mon Dec 15 17:20:40 2014 (r374757) +++ head/graphics/darktable/distinfo Mon Dec 15 17:50:58 2014 (r374758) @@ -1,2 +1,2 @@ -SHA256 (darktable-1.4.2.tar.xz) = c1311a6e336007b85d21647652ebec3e26840248a968eab04ab5f0a56c2e0709 -SIZE (darktable-1.4.2.tar.xz) = 2836340 +SHA256 (darktable-1.6.0.tar.xz) = 2bf8b05686f84e4b8960378ab785af8bbb187e8f34758f5eb2338ea35263597e +SIZE (darktable-1.6.0.tar.xz) = 3065488 Modified: head/graphics/darktable/pkg-plist ============================================================================== --- head/graphics/darktable/pkg-plist Mon Dec 15 17:20:40 2014 (r374757) +++ head/graphics/darktable/pkg-plist Mon Dec 15 17:50:58 2014 (r374758) @@ -1,6 +1,7 @@ bin/darktable bin/darktable-cli bin/darktable-cltest +bin/darktable-cmstest %%SLIDESHOW%%bin/darktable-viewer lib/darktable/libdarktable.so lib/darktable/plugins/imageio/format/libcopy.so @@ -39,6 +40,7 @@ lib/darktable/plugins/libcolormapping.so lib/darktable/plugins/libcolorout.so lib/darktable/plugins/libcolortransfer.so lib/darktable/plugins/libcolorzones.so +lib/darktable/plugins/libdefringe.so lib/darktable/plugins/libdemosaic.so lib/darktable/plugins/libdenoiseprofile.so lib/darktable/plugins/libdither.so @@ -54,6 +56,7 @@ lib/darktable/plugins/libhighpass.so lib/darktable/plugins/libhotpixels.so lib/darktable/plugins/libinvert.so lib/darktable/plugins/liblens.so +lib/darktable/plugins/libletsgofloat.so lib/darktable/plugins/liblevels.so lib/darktable/plugins/liblowlight.so lib/darktable/plugins/liblowpass.so @@ -63,6 +66,8 @@ lib/darktable/plugins/liboverexposed.so lib/darktable/plugins/libprofile_gamma.so lib/darktable/plugins/librawdenoise.so lib/darktable/plugins/librelight.so +lib/darktable/plugins/librotatepixels.so +lib/darktable/plugins/libscalepixels.so lib/darktable/plugins/libshadhi.so lib/darktable/plugins/libsharpen.so lib/darktable/plugins/libsoften.so @@ -78,7 +83,6 @@ lib/darktable/plugins/libwatermark.so lib/darktable/plugins/libzonesystem.so lib/darktable/plugins/lighttable/libbackgroundjobs.so %%GPHOTO%%lib/darktable/plugins/lighttable/libcamera.so -%%GPHOTO%%lib/darktable/plugins/lighttable/libcapture.so lib/darktable/plugins/lighttable/libcollect.so lib/darktable/plugins/lighttable/libcolorlabels.so lib/darktable/plugins/lighttable/libcolorpicker.so @@ -108,15 +112,17 @@ lib/darktable/plugins/lighttable/libnavi lib/darktable/plugins/lighttable/libratings.so lib/darktable/plugins/lighttable/librecentcollect.so lib/darktable/plugins/lighttable/libselect.so +lib/darktable/plugins/lighttable/libsession.so lib/darktable/plugins/lighttable/libsnapshots.so lib/darktable/plugins/lighttable/libstyles.so lib/darktable/plugins/lighttable/libtagging.so lib/darktable/plugins/lighttable/libview_toolbox.so lib/darktable/plugins/lighttable/libviewswitcher.so -%%GPHOTO%%lib/darktable/views/libcapture.so lib/darktable/views/libdarkroom.so lib/darktable/views/liblighttable.so %%GEO%%lib/darktable/views/libmap.so +lib/darktable/views/libslideshow.so +%%GPHOTO%%lib/darktable/views/libtethering.so man/man1/darktable-cli.1.gz man/man1/darktable.1.gz share/appdata/darktable.appdata.xml @@ -150,60 +156,112 @@ share/applications/darktable.desktop %%LUA%%%%DATADIR%%/lua/darktable/debug.lua %%LUA%%%%DATADIR%%/luarc %%DATADIR%%/pixmaps/dt_logo_128x128.png +%%DATADIR%%/pixmaps/idbutton-1.png +%%DATADIR%%/pixmaps/idbutton-1.svg %%DATADIR%%/pixmaps/idbutton-2.png +%%DATADIR%%/pixmaps/idbutton-2.svg %%DATADIR%%/pixmaps/idbutton.png -%%DATADIR%%/pixmaps/off.png -%%DATADIR%%/pixmaps/plugins/darkroom/anlfyeni.png +%%DATADIR%%/pixmaps/idbutton.svg %%DATADIR%%/pixmaps/plugins/darkroom/atrous.png +%%DATADIR%%/pixmaps/plugins/darkroom/atrous.svg %%DATADIR%%/pixmaps/plugins/darkroom/basecurve.png +%%DATADIR%%/pixmaps/plugins/darkroom/basecurve.svg %%DATADIR%%/pixmaps/plugins/darkroom/bilateral.png +%%DATADIR%%/pixmaps/plugins/darkroom/bilateral.svg %%DATADIR%%/pixmaps/plugins/darkroom/bloom.png +%%DATADIR%%/pixmaps/plugins/darkroom/bloom.svg %%DATADIR%%/pixmaps/plugins/darkroom/borders.png +%%DATADIR%%/pixmaps/plugins/darkroom/borders.svg %%DATADIR%%/pixmaps/plugins/darkroom/cacorrect.png +%%DATADIR%%/pixmaps/plugins/darkroom/cacorrect.svg %%DATADIR%%/pixmaps/plugins/darkroom/channelmixer.png +%%DATADIR%%/pixmaps/plugins/darkroom/channelmixer.svg %%DATADIR%%/pixmaps/plugins/darkroom/clahe.png +%%DATADIR%%/pixmaps/plugins/darkroom/clahe.svg %%DATADIR%%/pixmaps/plugins/darkroom/clipping.png +%%DATADIR%%/pixmaps/plugins/darkroom/clipping.svg %%DATADIR%%/pixmaps/plugins/darkroom/colisa.png +%%DATADIR%%/pixmaps/plugins/darkroom/colisa.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.png +%%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorin.png +%%DATADIR%%/pixmaps/plugins/darkroom/colorin.svg %%DATADIR%%/pixmaps/plugins/darkroom/colormapping.png +%%DATADIR%%/pixmaps/plugins/darkroom/colormapping.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorout.png +%%DATADIR%%/pixmaps/plugins/darkroom/colorout.svg %%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.png +%%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.svg %%DATADIR%%/pixmaps/plugins/darkroom/colorzones.png +%%DATADIR%%/pixmaps/plugins/darkroom/colorzones.svg %%DATADIR%%/pixmaps/plugins/darkroom/demosaic.png +%%DATADIR%%/pixmaps/plugins/darkroom/demosaic.svg %%DATADIR%%/pixmaps/plugins/darkroom/dither.png +%%DATADIR%%/pixmaps/plugins/darkroom/dither.svg %%DATADIR%%/pixmaps/plugins/darkroom/exposure.png +%%DATADIR%%/pixmaps/plugins/darkroom/exposure.svg %%DATADIR%%/pixmaps/plugins/darkroom/flip.png +%%DATADIR%%/pixmaps/plugins/darkroom/flip.svg %%DATADIR%%/pixmaps/plugins/darkroom/graduatednd.png +%%DATADIR%%/pixmaps/plugins/darkroom/graduatednd.svg %%DATADIR%%/pixmaps/plugins/darkroom/grain.png +%%DATADIR%%/pixmaps/plugins/darkroom/grain.svg %%DATADIR%%/pixmaps/plugins/darkroom/highlights.png +%%DATADIR%%/pixmaps/plugins/darkroom/highlights.svg %%DATADIR%%/pixmaps/plugins/darkroom/highpass.png +%%DATADIR%%/pixmaps/plugins/darkroom/highpass.svg %%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.png +%%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.svg %%DATADIR%%/pixmaps/plugins/darkroom/invert.png +%%DATADIR%%/pixmaps/plugins/darkroom/invert.svg %%DATADIR%%/pixmaps/plugins/darkroom/lens.png +%%DATADIR%%/pixmaps/plugins/darkroom/lens.svg %%DATADIR%%/pixmaps/plugins/darkroom/levels.png +%%DATADIR%%/pixmaps/plugins/darkroom/levels.svg %%DATADIR%%/pixmaps/plugins/darkroom/lowlight.png +%%DATADIR%%/pixmaps/plugins/darkroom/lowlight.svg %%DATADIR%%/pixmaps/plugins/darkroom/lowpass.png +%%DATADIR%%/pixmaps/plugins/darkroom/lowpass.svg %%DATADIR%%/pixmaps/plugins/darkroom/monochrome.png +%%DATADIR%%/pixmaps/plugins/darkroom/monochrome.svg %%DATADIR%%/pixmaps/plugins/darkroom/nlmeans.png +%%DATADIR%%/pixmaps/plugins/darkroom/nlmeans.svg %%DATADIR%%/pixmaps/plugins/darkroom/overexposed.png +%%DATADIR%%/pixmaps/plugins/darkroom/overexposed.svg %%DATADIR%%/pixmaps/plugins/darkroom/profile_gamma.png +%%DATADIR%%/pixmaps/plugins/darkroom/profile_gamma.svg %%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.png +%%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.svg %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.png +%%DATADIR%%/pixmaps/plugins/darkroom/rawimport.svg %%DATADIR%%/pixmaps/plugins/darkroom/relight.png +%%DATADIR%%/pixmaps/plugins/darkroom/relight.svg %%DATADIR%%/pixmaps/plugins/darkroom/shadhi.png +%%DATADIR%%/pixmaps/plugins/darkroom/shadhi.svg %%DATADIR%%/pixmaps/plugins/darkroom/sharpen.png +%%DATADIR%%/pixmaps/plugins/darkroom/sharpen.svg %%DATADIR%%/pixmaps/plugins/darkroom/soften.png +%%DATADIR%%/pixmaps/plugins/darkroom/soften.svg %%DATADIR%%/pixmaps/plugins/darkroom/splittoning.png +%%DATADIR%%/pixmaps/plugins/darkroom/splittoning.svg %%DATADIR%%/pixmaps/plugins/darkroom/spots.png +%%DATADIR%%/pixmaps/plugins/darkroom/spots.svg %%DATADIR%%/pixmaps/plugins/darkroom/temperature.png +%%DATADIR%%/pixmaps/plugins/darkroom/temperature.svg %%DATADIR%%/pixmaps/plugins/darkroom/template.png +%%DATADIR%%/pixmaps/plugins/darkroom/template.svg %%DATADIR%%/pixmaps/plugins/darkroom/tonecurve.png +%%DATADIR%%/pixmaps/plugins/darkroom/tonecurve.svg %%DATADIR%%/pixmaps/plugins/darkroom/tonemap.png +%%DATADIR%%/pixmaps/plugins/darkroom/tonemap.svg %%DATADIR%%/pixmaps/plugins/darkroom/velvia.png +%%DATADIR%%/pixmaps/plugins/darkroom/velvia.svg %%DATADIR%%/pixmaps/plugins/darkroom/vignette.png +%%DATADIR%%/pixmaps/plugins/darkroom/vignette.svg %%DATADIR%%/pixmaps/plugins/darkroom/watermark.png +%%DATADIR%%/pixmaps/plugins/darkroom/watermark.svg %%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.png +%%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.svg %%RAWSPEED%%%%DATADIR%%/rawspeed/cameras.xml %%RAWSPEED%%%%DATADIR%%/rawspeed/showcameras.xsl %%DATADIR%%/style/bullet.gif @@ -234,8 +292,10 @@ share/icons/hicolor/256x256/apps/darktab share/icons/hicolor/32x32/apps/darktable.png share/icons/hicolor/48x48/apps/darktable.png share/icons/hicolor/64x64/apps/darktable.png +share/icons/hicolor/scalable/apps/darktable-1.svg share/icons/hicolor/scalable/apps/darktable-2.svg share/icons/hicolor/scalable/apps/darktable.svg +%%NLS%%share/locale/ca/LC_MESSAGES/darktable.mo %%NLS%%share/locale/cs/LC_MESSAGES/darktable.mo %%NLS%%share/locale/da/LC_MESSAGES/darktable.mo %%NLS%%share/locale/de/LC_MESSAGES/darktable.mo From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 18:01:48 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70688B8F; Mon, 15 Dec 2014 18:01: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 5C26C9B; Mon, 15 Dec 2014 18:01:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFI1mCW015105; Mon, 15 Dec 2014 18:01:48 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFI1lmM015103; Mon, 15 Dec 2014 18:01:47 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201412151801.sBFI1lmM015103@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Mon, 15 Dec 2014 18:01:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374759 - head/sysutils/rsnapshot X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 18:01:48 -0000 Author: linimon Date: Mon Dec 15 18:01:47 2014 New Revision: 374759 URL: https://svnweb.freebsd.org/changeset/ports/374759 QAT: https://qat.redports.org/buildarchive/r374759/ Log: Assign to new maintainer. Pet portlint. Submitted by: remko (private communication) Modified: head/sysutils/rsnapshot/Makefile head/sysutils/rsnapshot/pkg-descr Modified: head/sysutils/rsnapshot/Makefile ============================================================================== --- head/sysutils/rsnapshot/Makefile Mon Dec 15 17:50:58 2014 (r374758) +++ head/sysutils/rsnapshot/Makefile Mon Dec 15 18:01:47 2014 (r374759) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.rsnapshot.org/downloads/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= remko@FreeBSD.org COMMENT= Filesystem snapshot utility based on rsync(1) BUILD_DEPENDS= rsync:${PORTSDIR}/net/rsync Modified: head/sysutils/rsnapshot/pkg-descr ============================================================================== --- head/sysutils/rsnapshot/pkg-descr Mon Dec 15 17:50:58 2014 (r374758) +++ head/sysutils/rsnapshot/pkg-descr Mon Dec 15 18:01:47 2014 (r374759) @@ -6,4 +6,4 @@ whenever possible, to greatly reduce the It is written entirely in perl with no module dependencies, and has been tested with versions 5.004 through 5.8.1. -WWW: http://www.rsnapshot.org +WWW: http://www.rsnapshot.org From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 18:43:49 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E78E94E; Mon, 15 Dec 2014 18:43: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 118E8780; Mon, 15 Dec 2014 18:43:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFIhmsT037118; Mon, 15 Dec 2014 18:43:48 GMT (envelope-from nemysis@FreeBSD.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFIhmgC037115; Mon, 15 Dec 2014 18:43:48 GMT (envelope-from nemysis@FreeBSD.org) Message-Id: <201412151843.sBFIhmgC037115@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nemysis set sender to nemysis@FreeBSD.org using -f From: Rusmir Dusko Date: Mon, 15 Dec 2014 18:43:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374760 - head/games/legend-of-edgar X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 18:43:49 -0000 Author: nemysis Date: Mon Dec 15 18:43:47 2014 New Revision: 374760 URL: https://svnweb.freebsd.org/changeset/ports/374760 QAT: https://qat.redports.org/buildarchive/r374760/ Log: - Update to 1.19-1, announce message: Updated Esperanto, French, German, Japanese, Russian and Ukranian translations - Add Man Pages, changed by upstream Modified: head/games/legend-of-edgar/Makefile head/games/legend-of-edgar/distinfo head/games/legend-of-edgar/pkg-plist Modified: head/games/legend-of-edgar/Makefile ============================================================================== --- head/games/legend-of-edgar/Makefile Mon Dec 15 18:01:47 2014 (r374759) +++ head/games/legend-of-edgar/Makefile Mon Dec 15 18:43:47 2014 (r374760) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= edgar -DISTVERSION= 1.18-1 -PORTREVISION= 1 +DISTVERSION= 1.19-1 CATEGORIES= games MASTER_SITES= SF/legendof${PORTNAME}/${PORTVERSION:R}/ PKGNAMEPREFIX= legend-of- @@ -37,6 +36,7 @@ post-patch: s|$$(DESTDIR)/usr|$$(DESTDIR)/usr/local|; \ s|$$(PREFIX)/games/|$$(PREFIX)/bin/|; \ s|/share/games/edgar/|/share/edgar/|; \ + s|/share/man/|/man/|; \ s|-Wall ||; \ s|sdl-config|$(SDL_CONFIG)|; \ s|-s ||' \ Modified: head/games/legend-of-edgar/distinfo ============================================================================== --- head/games/legend-of-edgar/distinfo Mon Dec 15 18:01:47 2014 (r374759) +++ head/games/legend-of-edgar/distinfo Mon Dec 15 18:43:47 2014 (r374760) @@ -1,2 +1,2 @@ -SHA256 (edgar-1.18-1.tar.gz) = b2a661f465e85aca59f77152be2ec168c41d0f26fccff810637c5574ba6d4007 -SIZE (edgar-1.18-1.tar.gz) = 90872297 +SHA256 (edgar-1.19-1.tar.gz) = 2b34efd11006fe3a6cfc341f56b609e8d85936dc02de3426aec2d6597d9a050b +SIZE (edgar-1.19-1.tar.gz) = 90873682 Modified: head/games/legend-of-edgar/pkg-plist ============================================================================== --- head/games/legend-of-edgar/pkg-plist Mon Dec 15 18:01:47 2014 (r374759) +++ head/games/legend-of-edgar/pkg-plist Mon Dec 15 18:43:47 2014 (r374760) @@ -1,4 +1,5 @@ bin/edgar +man/man6/edgar.6x.gz share/applications/edgar.desktop %%DATADIR%%/edgar.pak share/icons/hicolor/16x16/apps/edgar.png From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 18:47:04 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16AB3A5D; Mon, 15 Dec 2014 18:47: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 F3F287A2; Mon, 15 Dec 2014 18:47:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFIl3mg038019; Mon, 15 Dec 2014 18:47:03 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFIkxYq037982; Mon, 15 Dec 2014 18:46:59 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412151846.sBFIkxYq037982@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 18:46:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374761 - in head: . comms/gstreamer1-plugins-spandsp comms/spandsp comms/spandsp-devel comms/spandsp/files misc/libsupertone multimedia/gstreamer1-plugins net/asterisk net/asterisk11 n... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 18:47:04 -0000 Author: pawel Date: Mon Dec 15 18:46:58 2014 New Revision: 374761 URL: https://svnweb.freebsd.org/changeset/ports/374761 QAT: https://qat.redports.org/buildarchive/r374761/ Log: - Update comms/spandsp to version 0.0.6 [1] - Convert all comms/spandsp-devel consumers to use newer comms/spandsp - Bump affected ports - Mark comms/spandsp-devel as deprecated and set expiration date - Add upgrade instructions to UPDATING PR: 194399 [1] Submitted by: Nikola Kolev [1] Approved by: madpilot (asterisk ports), maintainer timeout (other) Added: head/comms/spandsp/files/patch-Makefile.am (contents, props changed) Modified: head/UPDATING head/comms/gstreamer1-plugins-spandsp/Makefile head/comms/spandsp-devel/Makefile head/comms/spandsp/Makefile head/comms/spandsp/distinfo head/comms/spandsp/files/patch-configure.ac head/comms/spandsp/pkg-plist head/misc/libsupertone/Makefile head/multimedia/gstreamer1-plugins/Makefile.common head/net/asterisk/Makefile head/net/asterisk11/Makefile head/net/asterisk13/Makefile head/net/mediastreamer/Makefile head/net/opal/Makefile head/net/yate/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Dec 15 18:43:47 2014 (r374760) +++ head/UPDATING Mon Dec 15 18:46:58 2014 (r374761) @@ -6,6 +6,17 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20141215: + AFFECTS: users of comms/spandsp-devel + AUTHOR: pawel@FreeBSD.org + + comms/spandsp has been upgraded to version 0.0.6 + comms/spandsp-devel is now deprecated and set for removal, all ports using + it were converted to use newer comms/spandsp. Before upgrade you must + remove comms/spandsp-devel so that ports can pick up new dependency. + + # pkg delete -f spandsp-devel + +20141215: AFFECTS: users of emulators/linux_base-f10 and emulators/linux_base-c6 AUTHOR: sbruno@freebsd.org Modified: head/comms/gstreamer1-plugins-spandsp/Makefile ============================================================================== --- head/comms/gstreamer1-plugins-spandsp/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/comms/gstreamer1-plugins-spandsp/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms COMMENT= Gstreamer DSP library and software FAX machine plugin Modified: head/comms/spandsp-devel/Makefile ============================================================================== --- head/comms/spandsp-devel/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/comms/spandsp-devel/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -11,6 +11,9 @@ PKGNAMESUFFIX= -devel MAINTAINER= ports@FreeBSD.org COMMENT= DSP library and software FAX machine +DEPRECATED= Use newer comms/spandsp +EXPIRATION_DATE=2015-01-15 + LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff WRKSRC= ${WRKDIR}/spandsp-${DISTVERSION:C/pre.*//} Modified: head/comms/spandsp/Makefile ============================================================================== --- head/comms/spandsp/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/comms/spandsp/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -2,20 +2,20 @@ # $FreeBSD$ PORTNAME= spandsp -PORTVERSION= 0.0.5 -PORTREVISION= 1 +PORTVERSION= 0.0.6 CATEGORIES= comms -MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/ \ - http://www.soft-switch.org/downloads/spandsp/old/ +MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/ MAINTAINER= ports@FreeBSD.org COMMENT= DSP library and software FAX machine +LICENSE= LGPL21 + LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= autoreconf gmake libtool tar:tgz +USES= autoreconf gmake libtool CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib Modified: head/comms/spandsp/distinfo ============================================================================== --- head/comms/spandsp/distinfo Mon Dec 15 18:43:47 2014 (r374760) +++ head/comms/spandsp/distinfo Mon Dec 15 18:46:58 2014 (r374761) @@ -1,2 +1,2 @@ -SHA256 (spandsp-0.0.5.tgz) = 07f42a237c77b08fa765c3a148c83cdfa267bf24c0ab681d80b90d30dd0b3dbf -SIZE (spandsp-0.0.5.tgz) = 2506742 +SHA256 (spandsp-0.0.6.tar.gz) = cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465 +SIZE (spandsp-0.0.6.tar.gz) = 3309837 Added: head/comms/spandsp/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/spandsp/files/patch-Makefile.am Mon Dec 15 18:46:58 2014 (r374761) @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2014-09-03 14:15:04.000000000 +0300 ++++ Makefile.am 2014-09-03 14:15:16.000000000 +0300 +@@ -61,7 +61,7 @@ SUBDIRS = src $(MAYBE_DOC) $(MAYBE_TESTD + + DIST_SUBDIRS = src doc test-data spandsp-sim tests + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(libdir)data/pkgconfig + pkgconfig_DATA = spandsp.pc + + faq: faq.xml Modified: head/comms/spandsp/files/patch-configure.ac ============================================================================== --- head/comms/spandsp/files/patch-configure.ac Mon Dec 15 18:43:47 2014 (r374760) +++ head/comms/spandsp/files/patch-configure.ac Mon Dec 15 18:46:58 2014 (r374761) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2012-09-01 12:05:10.795461874 +0100 -+++ configure.ac 2012-09-01 12:05:47.473457036 +0100 -@@ -194,7 +194,6 @@ +--- configure.ac.orig 2014-11-11 15:56:10.000000000 +0100 ++++ configure.ac 2014-11-11 15:58:13.000000000 +0100 +@@ -198,7 +198,6 @@ AC_CHECK_HEADERS([stdlib.h]) AC_CHECK_HEADERS([string.h]) AC_CHECK_HEADERS([strings.h]) AC_CHECK_HEADERS([malloc.h]) @@ -8,3 +8,30 @@ AC_CHECK_HEADERS([math.h], [INSERT_MATH_HEADER="#include "]) AC_CHECK_HEADERS([float.h]) AC_CHECK_HEADERS([fcntl.h]) +@@ -331,7 +330,7 @@ AX_CHECK_EXPORT_CAPABILITY([$host], + + case "${ax_cv_c_compiler_vendor}" in + gnu) +- COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" ++ COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" + if test "$enable_avx" = "yes" ; then + COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS" + fi +@@ -392,7 +391,7 @@ sun) + REMOVE_FROM_VAR(CFLAGS, -Xc) + ;; + intel) +- COMP_VENDOR_CFLAGS="-std=c99 -D_POSIX_C_SOURCE=2 -D_GNU_SOURCE=1 -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" ++ COMP_VENDOR_CFLAGS="-std=c99 -D_POSIX_C_SOURCE=2 -D_GNU_SOURCE=1 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" + if test "$enable_avx" = "yes" ; then + COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS" + fi +@@ -426,7 +425,7 @@ intel) + COMP_VENDOR_LDFLAGS= + ;; + *) +- COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" ++ COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" + COMP_VENDOR_LDFLAGS= + ;; + esac Modified: head/comms/spandsp/pkg-plist ============================================================================== --- head/comms/spandsp/pkg-plist Mon Dec 15 18:43:47 2014 (r374760) +++ head/comms/spandsp/pkg-plist Mon Dec 15 18:46:58 2014 (r374761) @@ -51,7 +51,6 @@ include/spandsp/t35.h include/spandsp/t38_core.h include/spandsp/t38_gateway.h include/spandsp/t38_terminal.h -include/spandsp/t4.h include/spandsp/telephony.h include/spandsp/time_scale.h include/spandsp/timing.h @@ -70,7 +69,84 @@ include/spandsp/v8.h include/spandsp/vector_float.h include/spandsp/vector_int.h include/spandsp/version.h +include/spandsp/ademco_contactid.h +include/spandsp/complex_vector_int.h +include/spandsp/expose.h +include/spandsp/fast_convert.h +include/spandsp/fax_modems.h +include/spandsp/image_translate.h +include/spandsp/math_fixed.h +include/spandsp/private/ademco_contactid.h +include/spandsp/private/adsi.h +include/spandsp/private/async.h +include/spandsp/private/at_interpreter.h +include/spandsp/private/awgn.h +include/spandsp/private/bell_r2_mf.h +include/spandsp/private/bert.h +include/spandsp/private/bitstream.h +include/spandsp/private/dtmf.h +include/spandsp/private/echo.h +include/spandsp/private/fax.h +include/spandsp/private/fax_modems.h +include/spandsp/private/fsk.h +include/spandsp/private/g711.h +include/spandsp/private/g722.h +include/spandsp/private/g726.h +include/spandsp/private/gsm0610.h +include/spandsp/private/hdlc.h +include/spandsp/private/ima_adpcm.h +include/spandsp/private/image_translate.h +include/spandsp/private/logging.h +include/spandsp/private/lpc10.h +include/spandsp/private/modem_connect_tones.h +include/spandsp/private/modem_echo.h +include/spandsp/private/noise.h +include/spandsp/private/oki_adpcm.h +include/spandsp/private/queue.h +include/spandsp/private/schedule.h +include/spandsp/private/sig_tone.h +include/spandsp/private/silence_gen.h +include/spandsp/private/super_tone_rx.h +include/spandsp/private/super_tone_tx.h +include/spandsp/private/swept_tone.h +include/spandsp/private/t30.h +include/spandsp/private/t30_dis_dtc_dcs_bits.h +include/spandsp/private/t31.h +include/spandsp/private/t38_core.h +include/spandsp/private/t38_gateway.h +include/spandsp/private/t38_non_ecm_buffer.h +include/spandsp/private/t38_terminal.h +include/spandsp/private/t4_rx.h +include/spandsp/private/t4_t6_decode.h +include/spandsp/private/t4_t6_encode.h +include/spandsp/private/t4_tx.h +include/spandsp/private/time_scale.h +include/spandsp/private/timezone.h +include/spandsp/private/tone_detect.h +include/spandsp/private/tone_generate.h +include/spandsp/private/v17rx.h +include/spandsp/private/v17tx.h +include/spandsp/private/v18.h +include/spandsp/private/v22bis.h +include/spandsp/private/v27ter_rx.h +include/spandsp/private/v27ter_tx.h +include/spandsp/private/v29rx.h +include/spandsp/private/v29tx.h +include/spandsp/private/v42.h +include/spandsp/private/v42bis.h +include/spandsp/private/v8.h +include/spandsp/saturated.h +include/spandsp/stdbool.h +include/spandsp/swept_tone.h +include/spandsp/t38_non_ecm_buffer.h +include/spandsp/t4_rx.h +include/spandsp/t4_t6_decode.h +include/spandsp/t4_t6_encode.h +include/spandsp/t4_tx.h +include/spandsp/timezone.h +include/spandsp/v18.h lib/libspandsp.a lib/libspandsp.so -lib/libspandsp.so.1 -lib/libspandsp.so.1.0.0 +lib/libspandsp.so.2 +lib/libspandsp.so.2.0.0 +libdata/pkgconfig/spandsp.pc Modified: head/misc/libsupertone/Makefile ============================================================================== --- head/misc/libsupertone/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/misc/libsupertone/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -3,7 +3,7 @@ PORTNAME= libsupertone PORTVERSION= 0.0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc MASTER_SITES= http://www.soft-switch.org/downloads/unicall/ @@ -13,7 +13,7 @@ COMMENT= Library for supervisory tone ge LICENSE= LGPL21 LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile \ - libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel \ + libspandsp.so:${PORTSDIR}/comms/spandsp \ libtiff.so:${PORTSDIR}/graphics/tiff \ libxml2.so:${PORTSDIR}/textproc/libxml2 Modified: head/multimedia/gstreamer1-plugins/Makefile.common ============================================================================== --- head/multimedia/gstreamer1-plugins/Makefile.common Mon Dec 15 18:43:47 2014 (r374760) +++ head/multimedia/gstreamer1-plugins/Makefile.common Mon Dec 15 18:46:58 2014 (r374761) @@ -360,8 +360,7 @@ gst_soup_PLIST_FILES= ${GST_LIB_DIR}/lib ${GST_LIB_DIR}/libgstsouphttpsrc.so # spandsp -# keep shlib version here, so we don't pick up the comms/spandsp port by accident. -gst_spandsp_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel +gst_spandsp_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp # speex gst_speex_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/net/asterisk/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -3,7 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.32.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -105,7 +105,7 @@ CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl SPANDSP_CONFIGURE_WITH= spandsp -SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel +SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 SRTP_CONFIGURE_WITH= srtp Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/net/asterisk11/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.14.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -98,7 +98,7 @@ CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl SPANDSP_CONFIGURE_WITH= spandsp -SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel +SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 SRTP_CONFIGURE_WITH= srtp Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/net/asterisk13/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.0.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -100,7 +101,7 @@ CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl SPANDSP_CONFIGURE_WITH= spandsp -SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel +SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 SRTP_CONFIGURE_WITH= srtp Modified: head/net/mediastreamer/Makefile ============================================================================== --- head/net/mediastreamer/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/net/mediastreamer/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -3,7 +3,7 @@ PORTNAME= mediastreamer PORTVERSION= 2.10.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= SAVANNAH/linphone/mediastreamer @@ -57,7 +57,7 @@ OPUS_CONFIGURE_ENABLE= opus OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus SPANDSP_CONFIGURE_ENABLE= spandsp -SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel +SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp SPEEX_CONFIGURE_ENABLE= speex SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex Modified: head/net/opal/Makefile ============================================================================== --- head/net/opal/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/net/opal/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -3,7 +3,7 @@ PORTNAME= opal PORTVERSION= 3.10.10 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net MASTER_SITES= GNOME @@ -209,9 +209,8 @@ CONFIGURE_ARGS+= --enable-h281 CONFIGURE_ARGS+= --disable-h281 .endif -# keep version in lib_depend, to see the difference between spandsp-devel and normal .if ${PORT_OPTIONS:MFAX} -LIB_DEPENDS+= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel +LIB_DEPENDS+= libspandsp.so:${PORTSDIR}/comms/spandsp CONFIGURE_ARGS+= --enable-spandsp --enable-fax --enable-t38 PLIST_SUB+= FAX="" .else Modified: head/net/yate/Makefile ============================================================================== --- head/net/yate/Makefile Mon Dec 15 18:43:47 2014 (r374760) +++ head/net/yate/Makefile Mon Dec 15 18:46:58 2014 (r374761) @@ -3,7 +3,7 @@ PORTNAME= yate DISTVERSION= 5.4.0p1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://yate.null.ro/tarballs/yate5/ DISTNAME= ${PORTNAME}-5.4.0-1 @@ -105,7 +105,7 @@ PLIST_SUB+= WITH_AMRNB="@comment " .endif .if ${PORT_OPTIONS:MSPANDSP} -LIB_DEPENDS+= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel +LIB_DEPENDS+= libspandsp.so:${PORTSDIR}/comms/spandsp CONFIGURE_ARGS+= --with-spandsp PLIST_SUB+= WITH_SPANDSP="" .else From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 19:05:02 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 02C7DE3F; Mon, 15 Dec 2014 19:05: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 D81029C9; Mon, 15 Dec 2014 19:05:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFJ51Vv047545; Mon, 15 Dec 2014 19:05:01 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFJ50nH047529; Mon, 15 Dec 2014 19:05:00 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201412151905.sBFJ50nH047529@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Mon, 15 Dec 2014 19:05:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374762 - in head/devel: libvirt py-libvirt X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 19:05:02 -0000 Author: jgh Date: Mon Dec 15 19:04:59 2014 New Revision: 374762 URL: https://svnweb.freebsd.org/changeset/ports/374762 QAT: https://qat.redports.org/buildarchive/r374762/ Log: - update to devel/libvirt and devel/py-libvirt to 1.2.11 http://libvirt.org/git/?p=libvirt.git;a=shortlog;h=refs/tags/v1.2.11 Modified: head/devel/libvirt/Makefile head/devel/libvirt/distinfo head/devel/libvirt/pkg-plist head/devel/py-libvirt/Makefile head/devel/py-libvirt/distinfo Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Mon Dec 15 18:46:58 2014 (r374761) +++ head/devel/libvirt/Makefile Mon Dec 15 19:04:59 2014 (r374762) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 1.2.10 -PORTREVISION= 1 +PORTVERSION= 1.2.11 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ @@ -73,7 +72,7 @@ CPE_VENDOR= redhat USE_PERL5= build USE_LDCONFIG= yes INSTALL_TARGET= install-strip -SHLIB_VER= 0.1002.10 +SHLIB_VER= 0.1002.11 PLIST_SUB= PORTVERSION="-${PORTVERSION}" \ SHLIB_VER=${SHLIB_VER} PORTDOCS= * Modified: head/devel/libvirt/distinfo ============================================================================== --- head/devel/libvirt/distinfo Mon Dec 15 18:46:58 2014 (r374761) +++ head/devel/libvirt/distinfo Mon Dec 15 19:04:59 2014 (r374762) @@ -1,2 +1,2 @@ -SHA256 (libvirt-1.2.10.tar.gz) = 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e -SIZE (libvirt-1.2.10.tar.gz) = 30029503 +SHA256 (libvirt-1.2.11.tar.gz) = 1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc +SIZE (libvirt-1.2.11.tar.gz) = 30571605 Modified: head/devel/libvirt/pkg-plist ============================================================================== --- head/devel/libvirt/pkg-plist Mon Dec 15 18:46:58 2014 (r374761) +++ head/devel/libvirt/pkg-plist Mon Dec 15 19:04:59 2014 (r374762) @@ -123,7 +123,6 @@ share/augeas/lenses/tests/test_virtlockd %%DOCSDIR%%%%PORTVERSION%%/html/html/home.png %%DOCSDIR%%%%PORTVERSION%%/html/html/index.html %%DOCSDIR%%%%PORTVERSION%%/html/html/left.png -%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt.html %%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-virterror.html %%DOCSDIR%%%%PORTVERSION%%/html/html/right.png %%DOCSDIR%%%%PORTVERSION%%/html/html/up.png @@ -174,11 +173,21 @@ share/augeas/lenses/tests/test_virtlockd %%DOCSDIR%%%%PORTVERSION%%/html/drvbhyve.html %%DOCSDIR%%%%PORTVERSION%%/html/governance.html %%DOCSDIR%%%%PORTVERSION%%/html/internals/oomtesting.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-domain-snapshot.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-domain.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-event.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-host.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-interface.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-network.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-nodedev.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-nwfilter.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-secret.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-storage.html +%%DOCSDIR%%%%PORTVERSION%%/html/html/libvirt-libvirt-stream.html share/gtk-doc/html/libvirt/general.html share/gtk-doc/html/libvirt/home.png share/gtk-doc/html/libvirt/index.html share/gtk-doc/html/libvirt/left.png -share/gtk-doc/html/libvirt/libvirt-libvirt.html share/gtk-doc/html/libvirt/libvirt-virterror.html share/gtk-doc/html/libvirt/libvirt.devhelp share/gtk-doc/html/libvirt/right.png Modified: head/devel/py-libvirt/Makefile ============================================================================== --- head/devel/py-libvirt/Makefile Mon Dec 15 18:46:58 2014 (r374761) +++ head/devel/py-libvirt/Makefile Mon Dec 15 19:04:59 2014 (r374762) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 1.2.10 +PORTVERSION= 1.2.11 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/python/ \ ftp://libvirt.org/libvirt/python/ Modified: head/devel/py-libvirt/distinfo ============================================================================== --- head/devel/py-libvirt/distinfo Mon Dec 15 18:46:58 2014 (r374761) +++ head/devel/py-libvirt/distinfo Mon Dec 15 19:04:59 2014 (r374762) @@ -1,2 +1,2 @@ -SHA256 (libvirt-python-1.2.10.tar.gz) = fd38d589da34de523756e2b39980453bd1149fe162d109fbb7cf65df0c250ba7 -SIZE (libvirt-python-1.2.10.tar.gz) = 162075 +SHA256 (libvirt-python-1.2.11.tar.gz) = 4a526f5d847cee6ef7efcebac1ea18e18a3164fc77704aba948429be88ad7d5e +SIZE (libvirt-python-1.2.11.tar.gz) = 163854 From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 19:29:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79555238; Mon, 15 Dec 2014 19:29: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 6558ABE9; Mon, 15 Dec 2014 19:29:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFJTucH059100; Mon, 15 Dec 2014 19:29:56 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFJTtD9059095; Mon, 15 Dec 2014 19:29:55 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201412151929.sBFJTtD9059095@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 15 Dec 2014 19:29:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374763 - in head: . devel devel/preps-gui devel/prepstools X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 19:29:56 -0000 Author: rene Date: Mon Dec 15 19:29:54 2014 New Revision: 374763 URL: https://svnweb.freebsd.org/changeset/ports/374763 QAT: https://qat.redports.org/buildarchive/r374763/ Log: Remove expired ports: 2014-12-15 devel/preps-gui: upstream disappeared 2014-12-15 devel/prepstools: upstream disappeared Deleted: head/devel/preps-gui/ head/devel/prepstools/ Modified: head/MOVED head/devel/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Dec 15 19:04:59 2014 (r374762) +++ head/MOVED Mon Dec 15 19:29:54 2014 (r374763) @@ -7319,3 +7319,5 @@ net/ntp-rc|net/ntp-devel|2014-12-11|Upli textproc/xerces-c2|textproc/xerces-c3|2014-12-12|Unused, conflicting with xerces-c3 textproc/xerces-c2-devel|textproc/xerces-c3|2014-12-12|Unused, conflicting with xerces-c3 games/empire|games/vms-empire|2014-12-15|Moved to match upstream name +devel/preps-gui||2014-12-15|Has expired: upstream disappeared +devel/prepstools||2014-12-15|Has expired: upstream disappeared Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Mon Dec 15 19:04:59 2014 (r374762) +++ head/devel/Makefile Mon Dec 15 19:29:54 2014 (r374763) @@ -3524,8 +3524,6 @@ SUBDIR += ppl SUBDIR += premake SUBDIR += premake4 - SUBDIR += preps-gui - SUBDIR += prepstools SUBDIR += privman SUBDIR += projectcenter SUBDIR += protobuf From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 19:34:20 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F21D145D; Mon, 15 Dec 2014 19:34: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 C4B0ECDF; Mon, 15 Dec 2014 19:34:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFJYJvt063274; Mon, 15 Dec 2014 19:34:19 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFJYJ4m063273; Mon, 15 Dec 2014 19:34:19 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201412151934.sBFJYJ4m063273@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 15 Dec 2014 19:34:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374764 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 19:34:20 -0000 Author: marino Date: Mon Dec 15 19:34:18 2014 New Revision: 374764 URL: https://svnweb.freebsd.org/changeset/ports/374764 QAT: https://qat.redports.org/buildarchive/r374764/ Log: Relocate 8-DEC entry to be in chronological order. I honestly am not sure how I managed to post this entry in the May 2014 part of the log. Reported by: Katsuya Higuchi PR: 195958 Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Dec 15 19:29:54 2014 (r374763) +++ head/UPDATING Mon Dec 15 19:34:18 2014 (r374764) @@ -97,6 +97,21 @@ you update your ports collection, before should be recreated with 'jail -d' and 'jail -c'. This fixes pkg(8) crashes. +20141208: + AFFECTS: users of databases/postgresql??-(server|client) + AUTHOR: marino@FreeBSD.org + + PostgreSQL version 9.3 is now the default. To upgrade from a version + lower than 9.3, follow the instructions on the PostgreSQL.org website. + http://www.postgresql.org/docs/9.3/interactive/upgrading.html + Please note that the pg_upgrade program is installed by the + databases/postgresql93-contrib port + + When using binary packages, if you only use the client port, you can + issue the following command to follow the default version: + + # pkg set -o databases/postgresql92-client:databases/postgresql93-client + 20141205: AFFECTS: users of polish/kadu AUTHOR: pawel@FreeBSD.org @@ -1070,21 +1085,6 @@ you update your ports collection, before # pkg set -o databases/postgresql90-client:databases/postgresql92-client -20141208: - AFFECTS: users of databases/postgresql??-(server|client) - AUTHOR: marino@FreeBSD.org - - PostgreSQL version 9.3 is now the default. To upgrade from a version - lower than 9.3, follow the instructions on the PostgreSQL.org website. - http://www.postgresql.org/docs/9.3/interactive/upgrading.html - Please note that the pg_upgrade program is installed by the - databases/postgresql93-contrib port - - When using binary packages, if you only use the client port, you can - issue the following command to follow the default version: - - # pkg set -o databases/postgresql92-client:databases/postgresql93-client - 20140528: AFFECTS: users of security/calife & security/calife-devel AUTHOR: roberto@FreeBSD.org From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 21:20:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03D6F94A; Mon, 15 Dec 2014 21:20: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 E3EF8BBD; Mon, 15 Dec 2014 21:20:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFLKZOX012886; Mon, 15 Dec 2014 21:20:35 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFLKZnh012881; Mon, 15 Dec 2014 21:20:35 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412152120.sBFLKZnh012881@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 21:20:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374765 - head/net/nmsg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 21:20:36 -0000 Author: pawel Date: Mon Dec 15 21:20:34 2014 New Revision: 374765 URL: https://svnweb.freebsd.org/changeset/ports/374765 QAT: https://qat.redports.org/buildarchive/r374765/ Log: Update to version 0.9.1 ChangeLog: nmsg (0.9.1) * Fix a crash that was caused by incorrect initialization of ProtobufCBufferSimple objects. * Increase the required verbosity level for several noisy debugging log messages in the seqsrc tracking code from 5 (nmsgtool -ddddd) to 6 (nmsgtool -dddddd). PR: 195696 Submitted by: maintainer Modified: head/net/nmsg/Makefile head/net/nmsg/distinfo Modified: head/net/nmsg/Makefile ============================================================================== --- head/net/nmsg/Makefile Mon Dec 15 19:34:18 2014 (r374764) +++ head/net/nmsg/Makefile Mon Dec 15 21:20:34 2014 (r374765) @@ -1,9 +1,7 @@ # $FreeBSD$ PORTNAME= nmsg -PORTVERSION= 0.9.0 -# DISTNAME= ${PORTNAME}-${PORTVERSION} -PORTREVISION= 1 +PORTVERSION= 0.9.1 CATEGORIES= net MASTER_SITES= https://dl.farsightsecurity.com/dist/nmsg/ \ http://dl.farsightsecurity.com/dist/nmsg/ Modified: head/net/nmsg/distinfo ============================================================================== --- head/net/nmsg/distinfo Mon Dec 15 19:34:18 2014 (r374764) +++ head/net/nmsg/distinfo Mon Dec 15 21:20:34 2014 (r374765) @@ -1,2 +1,2 @@ -SHA256 (nmsg-0.9.0.tar.gz) = 1f29337f92239d9dd0d990d48988d31e55fd83e048a338e8b3e5f0136da8be35 -SIZE (nmsg-0.9.0.tar.gz) = 565942 +SHA256 (nmsg-0.9.1.tar.gz) = b214e2354f35356dbd9f448277d8fc638495349f8b9560d3f3391415c46a06cc +SIZE (nmsg-0.9.1.tar.gz) = 566849 From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 21:45:00 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75A6556B; Mon, 15 Dec 2014 21:45: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 61885EC4; Mon, 15 Dec 2014 21:45:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFLj0qt026185; Mon, 15 Dec 2014 21:45:00 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFLj0lO026184; Mon, 15 Dec 2014 21:45:00 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412152145.sBFLj0lO026184@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 21:45:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374766 - head/devel/spin/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 21:45:00 -0000 Author: pawel Date: Mon Dec 15 21:44:59 2014 New Revision: 374766 URL: https://svnweb.freebsd.org/changeset/ports/374766 QAT: https://qat.redports.org/buildarchive/r374766/ Log: Fix build on FreeBSD 8.x and 9.x PR: 195687 Submitted by: maintainer Added: head/devel/spin/files/ head/devel/spin/files/patch-makefile (contents, props changed) Added: head/devel/spin/files/patch-makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/spin/files/patch-makefile Mon Dec 15 21:44:59 2014 (r374766) @@ -0,0 +1,22 @@ +--- makefile.orig 2014-12-04 21:53:19 UTC ++++ makefile +@@ -17,10 +17,6 @@ CC=gcc + # CC=gcc -m32 # 32bit compilation on a 64bit system + + CFLAGS=-O2 -DNXT # on some systems add: -I/usr/include +- # on a PC: add -DPC +- # on Solaris: add -DSOLARIS +- # on a Mac: add -DMAC +- # on HP-UX: add -Aa + + # CFLAGS=-pg -g -DNXT + +@@ -30,8 +26,6 @@ PICKY=-std=c99 -Wstrict-prototypes -peda + -Wcast-qual -Winline -Wall + + # when running spin with a different compiler: +- # on OS2: spin -Picc -E/Pd+ -E/Q+ +- # for Visual C++: spin -PCL -E/E + + YACC=yacc # on Solaris: /usr/ccs/bin/yacc + YFLAGS=-v -d # creates y.output and y.tab.h From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 21:59:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF615829; Mon, 15 Dec 2014 21:59: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 9054CFE5; Mon, 15 Dec 2014 21:59:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFLxMKI031840; Mon, 15 Dec 2014 21:59:22 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFLxK1Z031819; Mon, 15 Dec 2014 21:59:20 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412152159.sBFLxK1Z031819@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 21:59:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374767 - in head/biology: . samtools samtools/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 21:59:22 -0000 Author: pawel Date: Mon Dec 15 21:59:19 2014 New Revision: 374767 URL: https://svnweb.freebsd.org/changeset/ports/374767 QAT: https://qat.redports.org/buildarchive/r374767/ Log: Samtools implements various utilities for post-processing alignments in the SAM, BAM, and CRAM formats, including indexing, variant calling (in conjunction with bcftools), and a simple alignment viewer. WWW: http://www.htslib.org/ PR: 195592 Submitted by: Reed A. Cartwright Added: head/biology/samtools/ head/biology/samtools/Makefile (contents, props changed) head/biology/samtools/distinfo (contents, props changed) head/biology/samtools/files/ head/biology/samtools/files/patch-Makefile (contents, props changed) head/biology/samtools/files/patch-errmod.c (contents, props changed) head/biology/samtools/files/pkg-message.in (contents, props changed) head/biology/samtools/pkg-descr (contents, props changed) head/biology/samtools/pkg-plist (contents, props changed) Modified: head/biology/Makefile Modified: head/biology/Makefile ============================================================================== --- head/biology/Makefile Mon Dec 15 21:44:59 2014 (r374766) +++ head/biology/Makefile Mon Dec 15 21:59:19 2014 (r374767) @@ -76,6 +76,7 @@ SUBDIR += python-nexus SUBDIR += recombine SUBDIR += ruby-bio + SUBDIR += samtools SUBDIR += seaview SUBDIR += seqan SUBDIR += seqio Added: head/biology/samtools/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/samtools/Makefile Mon Dec 15 21:59:19 2014 (r374767) @@ -0,0 +1,34 @@ +# Created by: Reed A. Cartwright +# $FreeBSD$ + +PORTNAME= samtools +PORTVERSION= 1.1 +CATEGORIES= biology + +MAINTAINER= cartwright@asu.edu +COMMENT= Tools for manipulating next-generation sequencing data + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libhts.so:${PORTSDIR}/biology/htslib + +USE_GITHUB= yes +GH_ACCOUNT= samtools +GH_COMMIT= 34c6691 + +USES= gmake +SUB_FILES= pkg-message + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +MAKE_ENV= INSTALL_LIB="${INSTALL_LIB}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + INSTALL_DIR="${MKDIR}" + +PLIST_SUB= PORTVERSION="${PORTVERSION}" + +.include Added: head/biology/samtools/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/samtools/distinfo Mon Dec 15 21:59:19 2014 (r374767) @@ -0,0 +1,2 @@ +SHA256 (samtools-1.1.tar.gz) = adf674bef85e6ffd88d19178a46f229fc033c7302610d5a51ef9709dd0346c59 +SIZE (samtools-1.1.tar.gz) = 4321336 Added: head/biology/samtools/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/samtools/files/patch-Makefile Mon Dec 15 21:59:19 2014 (r374767) @@ -0,0 +1,85 @@ +--- Makefile.orig 2014-09-19 15:51:42 UTC ++++ Makefile +@@ -21,12 +21,12 @@ + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + # DEALINGS IN THE SOFTWARE. + +-CC = gcc +-CPPFLAGS = $(DFLAGS) $(INCLUDES) +-CFLAGS = -g -Wall -O2 +-LDFLAGS = +-LDLIBS = +-DFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_CURSES_LIB=1 ++CC ?= cc ++CPPFLAGS += $(DFLAGS) $(INCLUDES) ++CFLAGS += -Wall -Wno-unused-function -Wno-implicit-function-declaration ++LDFLAGS += ++LDLIBS += ++DFLAGS= -D_CURSES_LIB=1 + LOBJS= bam_aux.o bam.o bam_import.o sam.o \ + sam_header.o bam_plbuf.o + AOBJS= bam_index.o bam_plcmd.o sam_view.o \ +@@ -39,19 +39,12 @@ AOBJS= bam_index.o bam_plcmd.o sam_ + INCLUDES= -I. -I$(HTSDIR) + LIBCURSES= -lcurses # -lXCurses + +-prefix = /usr/local ++prefix = ${STAGEDIR}${PREFIX} + exec_prefix = $(prefix) + bindir = $(exec_prefix)/bin +-mandir = $(prefix)/share/man ++mandir = $(prefix)/man + man1dir = $(mandir)/man1 + +-MKDIR_P = mkdir -p +-INSTALL = install -p +-INSTALL_PROGRAM = $(INSTALL) +-INSTALL_DATA = $(INSTALL) -m 644 +-INSTALL_DIR = $(MKDIR_P) -m 755 +- +- + PROGRAMS = samtools + + BUILT_MISC_PROGRAMS = \ +@@ -59,7 +52,6 @@ BUILT_MISC_PROGRAMS = \ + misc/md5fa misc/md5sum-lite misc/wgsim + + MISC_PROGRAMS = \ +- $(BUILT_MISC_PROGRAMS) \ + misc/blast2sam.pl misc/bowtie2sam.pl misc/export2sam.pl \ + misc/interpolate_sam.pl misc/novo2sam.pl \ + misc/plot-bamstats misc/psl2sam.pl \ +@@ -82,9 +74,8 @@ all: $(PROGRAMS) $(BUILT_MISC_PROGRAMS) + + + # Adjust $(HTSDIR) to point to your top-level htslib directory +-HTSDIR = ../htslib +-include $(HTSDIR)/htslib.mk +-HTSLIB = $(HTSDIR)/libhts.a ++HTSDIR = $(prefix)/include ++HTSLIB = -lhts + BGZIP = $(HTSDIR)/bgzip + + +@@ -121,7 +112,7 @@ lib:libbam.a + libbam.a:$(LOBJS) + $(AR) -csru $@ $(LOBJS) + +-samtools: $(AOBJS) libbam.a $(HTSLIB) ++samtools: $(AOBJS) libbam.a + $(CC) -pthread $(LDFLAGS) -o $@ $(AOBJS) libbam.a $(HTSLIB) $(LDLIBS) $(LIBCURSES) -lm -lz + + bam_h = bam.h $(htslib_bgzf_h) $(htslib_sam_h) +@@ -269,8 +260,10 @@ misc/md5sum-lite.o: misc/md5.c misc/md5. + + + install: $(PROGRAMS) $(BUILT_MISC_PROGRAMS) +- $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) +- $(INSTALL_PROGRAM) $(PROGRAMS) $(MISC_PROGRAMS) $(DESTDIR)$(bindir) ++ $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)/samtools_misc $(DESTDIR)$(man1dir) ++ $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $(BUILT_MISC_PROGRAMS) $(DESTDIR)$(bindir)/samtools_misc ++ $(INSTALL_SCRIPT) $(MISC_PROGRAMS) $(DESTDIR)$(bindir)/samtools_misc + $(INSTALL_DATA) samtools.1 $(DESTDIR)$(man1dir) + + Added: head/biology/samtools/files/patch-errmod.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/samtools/files/patch-errmod.c Mon Dec 15 21:59:19 2014 (r374767) @@ -0,0 +1,18 @@ +--- errmod.c.orig 2014-12-15 20:22:22 UTC ++++ errmod.c +@@ -24,6 +24,15 @@ FROM, OUT OF OR IN CONNECTION WITH THE S + DEALINGS IN THE SOFTWARE. */ + + #include ++ ++#include ++#ifdef __FreeBSD__ ++# if __FreeBSD_version < 1000034 ++# define logl(x) log(x) ++# define expl(x) exp(x) ++# endif ++#endif ++ + #include "errmod.h" + #include "htslib/ksort.h" + KSORT_INIT_GENERIC(uint16_t) Added: head/biology/samtools/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/samtools/files/pkg-message.in Mon Dec 15 21:59:19 2014 (r374767) @@ -0,0 +1,2 @@ + +Add %%PREFIX%%/bin/samtools_misc to your path to use miscellaneous tools. Added: head/biology/samtools/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/samtools/pkg-descr Mon Dec 15 21:59:19 2014 (r374767) @@ -0,0 +1,5 @@ +Samtools implements various utilities for post-processing alignments in the +SAM, BAM, and CRAM formats, including indexing, variant calling (in conjunction +with bcftools), and a simple alignment viewer. + +WWW: http://www.htslib.org/ Added: head/biology/samtools/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/samtools/pkg-plist Mon Dec 15 21:59:19 2014 (r374767) @@ -0,0 +1,22 @@ +bin/samtools +bin/samtools_misc/ace2sam +bin/samtools_misc/blast2sam.pl +bin/samtools_misc/bowtie2sam.pl +bin/samtools_misc/export2sam.pl +bin/samtools_misc/interpolate_sam.pl +bin/samtools_misc/maq2sam-long +bin/samtools_misc/maq2sam-short +bin/samtools_misc/md5fa +bin/samtools_misc/md5sum-lite +bin/samtools_misc/novo2sam.pl +bin/samtools_misc/plot-bamstats +bin/samtools_misc/psl2sam.pl +bin/samtools_misc/sam2vcf.pl +bin/samtools_misc/samtools.pl +bin/samtools_misc/seq_cache_populate.pl +bin/samtools_misc/soap2sam.pl +bin/samtools_misc/varfilter.py +bin/samtools_misc/wgsim +bin/samtools_misc/wgsim_eval.pl +bin/samtools_misc/zoom2sam.pl +man/man1/samtools.1.gz From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 22:18:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABE11E17; Mon, 15 Dec 2014 22:18: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 7E7CF269; Mon, 15 Dec 2014 22:18:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFMIoaw041647; Mon, 15 Dec 2014 22:18:50 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFMIoZA041646; Mon, 15 Dec 2014 22:18:50 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412152218.sBFMIoZA041646@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 15 Dec 2014 22:18:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374768 - head/security/vuxml X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 22:18:50 -0000 Author: ohauer Date: Mon Dec 15 22:18:49 2014 New Revision: 374768 URL: https://svnweb.freebsd.org/changeset/ports/374768 QAT: https://qat.redports.org/buildarchive/r374768/ Log: - document Subversion remote DoS Modified: head/security/vuxml/vuln.xml Modified: head/security/vuxml/vuln.xml ============================================================================== --- head/security/vuxml/vuln.xml Mon Dec 15 21:59:19 2014 (r374767) +++ head/security/vuxml/vuln.xml Mon Dec 15 22:18:49 2014 (r374768) @@ -57,6 +57,45 @@ Notes: --> + + subversion -- DoS vulnerabilities + + + subversion17 + 1.0.01.7.19 + + + subversion + 1.8.01.8.11 + + + + +

Subversion Project reports:

+
+

Subversion's mod_dav_svn Apache HTTPD server module will crash when it + receives a REPORT request for some invalid formatted special URIs.

+

Subversion's mod_dav_svn Apache HTTPD server module will crash when it + receives a request for some invalid formatted special URIs.

+

We consider this to be a medium risk vulnerability. Repositories which + allow for anonymous reads will be vulnerable without authentication. + Unfortunately, no special configuration is required and all mod_dav_svn + servers are vulnerable.

+
+ + + + CVE-2014-3580 + CVE-2014-8108 + http://subversion.apache.org/security/CVE-2014-3580-advisory.txt + http://subversion.apache.org/security/CVE-2014-8108-advisory.txt + + + 2014-12-13 + 2014-12-15 + + + NVIDIA UNIX driver -- remote denial of service or arbitrary code execution From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 22:24:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BC8C18A; Mon, 15 Dec 2014 22:24: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 77552371; Mon, 15 Dec 2014 22:24:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFMOQuk046040; Mon, 15 Dec 2014 22:24:26 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFMOPAE046036; Mon, 15 Dec 2014 22:24:25 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412152224.sBFMOPAE046036@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 15 Dec 2014 22:24:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374769 - head/devel/subversion17 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 22:24:26 -0000 Author: ohauer Date: Mon Dec 15 22:24:24 2014 New Revision: 374769 URL: https://svnweb.freebsd.org/changeset/ports/374769 QAT: https://qat.redports.org/buildarchive/r374769/ Log: - update to 1.7.19 Changelog: http://svn.apache.org/repos/asf/subversion/trunk/CHANGES MFH: 2014Q4 Security: f5561ade-846c-11e4-b7a7-20cf30e32f6 Modified: head/devel/subversion17/Makefile head/devel/subversion17/Makefile.common head/devel/subversion17/distinfo head/devel/subversion17/pkg-plist Modified: head/devel/subversion17/Makefile ============================================================================== --- head/devel/subversion17/Makefile Mon Dec 15 22:18:49 2014 (r374768) +++ head/devel/subversion17/Makefile Mon Dec 15 22:24:24 2014 (r374769) @@ -200,8 +200,8 @@ post-build: post-install: ${MKREPOS_TARGET} .if ${PORT_OPTIONS:MTOOLS} @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/* + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/* .endif @${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' --exclude '*.bak' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @@ -210,7 +210,7 @@ post-install: ${MKREPOS_TARGET} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} - @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve + ${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve .endif .if ${PORT_OPTIONS:MMOD_DAV_SVN} @@ -278,7 +278,7 @@ _mkrepos: .USE .endif svn-build-outputs-hack: - (cd ${WRKSRC} && python2 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) + (cd ${WRKSRC} && python2.7 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include Modified: head/devel/subversion17/Makefile.common ============================================================================== --- head/devel/subversion17/Makefile.common Mon Dec 15 22:18:49 2014 (r374768) +++ head/devel/subversion17/Makefile.common Mon Dec 15 22:24:24 2014 (r374769) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.7.18 +PORTVERSION= 1.7.19 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} Modified: head/devel/subversion17/distinfo ============================================================================== --- head/devel/subversion17/distinfo Mon Dec 15 22:18:49 2014 (r374768) +++ head/devel/subversion17/distinfo Mon Dec 15 22:24:24 2014 (r374769) @@ -1,2 +1,2 @@ -SHA256 (subversion17/subversion-1.7.18.tar.bz2) = f67381ce62b69bdb373e4c38ff84576677316904753536a78630603cacc5d91a -SIZE (subversion17/subversion-1.7.18.tar.bz2) = 6096031 +SHA256 (subversion17/subversion-1.7.19.tar.bz2) = 0059cd376ac6a14c80612ea99c4b0fed9dc2ff0ad05560d108a4c5625323cd5c +SIZE (subversion17/subversion-1.7.19.tar.bz2) = 6094560 Modified: head/devel/subversion17/pkg-plist ============================================================================== --- head/devel/subversion17/pkg-plist Mon Dec 15 22:18:49 2014 (r374768) +++ head/devel/subversion17/pkg-plist Mon Dec 15 22:24:24 2014 (r374769) @@ -134,9 +134,9 @@ lib/libsvn_wc-1.a %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n authz_svn %D/%F -%%MOD_DAV_SVN%%%%TOOLS%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%MOD_DAV_SVN%%%%TOOLS%%%%APACHEMODDIR%%/mod_dontdothat.so -%%MOD_DAV_SVN%%%%TOOLS%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F +%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F man/man1/svn.1.gz man/man1/svnadmin.1.gz man/man1/svndumpfilter.1.gz From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 22:25:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 203E632C; Mon, 15 Dec 2014 22:25: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 0AA94386; Mon, 15 Dec 2014 22:25:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFMPQcS046341; Mon, 15 Dec 2014 22:25:26 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFMPQ5n046338; Mon, 15 Dec 2014 22:25:26 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412152225.sBFMPQ5n046338@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 15 Dec 2014 22:25:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374770 - in head/devel/subversion: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 22:25:27 -0000 Author: ohauer Date: Mon Dec 15 22:25:25 2014 New Revision: 374770 URL: https://svnweb.freebsd.org/changeset/ports/374770 QAT: https://qat.redports.org/buildarchive/r374770/ Log: - update to 1.8.11 Changelog: http://svn.apache.org/repos/asf/subversion/trunk/CHANGES MFH: 2014Q4 Security: f5561ade-846c-11e4-b7a7-20cf30e32f6 Modified: head/devel/subversion/Makefile.common head/devel/subversion/distinfo head/devel/subversion/files/build-outputs.mk.addons Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Mon Dec 15 22:24:24 2014 (r374769) +++ head/devel/subversion/Makefile.common Mon Dec 15 22:25:25 2014 (r374770) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.8.10 -PORTREVISION?= 3 +PORTVERSION= 1.8.11 +PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 Modified: head/devel/subversion/distinfo ============================================================================== --- head/devel/subversion/distinfo Mon Dec 15 22:24:24 2014 (r374769) +++ head/devel/subversion/distinfo Mon Dec 15 22:25:25 2014 (r374770) @@ -1,2 +1,2 @@ -SHA256 (subversion18/subversion-1.8.10.tar.bz2) = 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc -SIZE (subversion18/subversion-1.8.10.tar.bz2) = 6899384 +SHA256 (subversion18/subversion-1.8.11.tar.bz2) = 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 +SIZE (subversion18/subversion-1.8.11.tar.bz2) = 6896225 Modified: head/devel/subversion/files/build-outputs.mk.addons ============================================================================== --- head/devel/subversion/files/build-outputs.mk.addons Mon Dec 15 22:24:24 2014 (r374769) +++ head/devel/subversion/files/build-outputs.mk.addons Mon Dec 15 22:25:25 2014 (r374770) @@ -2087,7 +2087,7 @@ subversion/libsvn_diff/parse-diff.lo: su subversion/libsvn_diff/token.lo: subversion/libsvn_diff/token.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_diff/diff.h -subversion/libsvn_diff/util.lo: subversion/libsvn_diff/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h +subversion/libsvn_diff/util.lo: subversion/libsvn_diff/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h subversion/libsvn_fs/access.lo: subversion/libsvn_fs/access.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h @@ -2337,7 +2337,7 @@ subversion/libsvn_subr/eol.lo: subversio subversion/libsvn_subr/error.lo: subversion/libsvn_subr/error.c subversion/include/private/svn_debug.h subversion/include/private/svn_error_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h -subversion/libsvn_subr/gpg_agent.lo: subversion/libsvn_subr/gpg_agent.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/gpg_agent.lo: subversion/libsvn_subr/gpg_agent.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/svn_private_config.h subversion/libsvn_subr/hash.lo: subversion/libsvn_subr/hash.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 22:38:18 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA8527DB; Mon, 15 Dec 2014 22:38: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 D610F6A3; Mon, 15 Dec 2014 22:38:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFMcHTW051734; Mon, 15 Dec 2014 22:38:17 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFMcG7B051728; Mon, 15 Dec 2014 22:38:16 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412152238.sBFMcG7B051728@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 22:38:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374771 - in head/net: . axa X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 22:38:18 -0000 Author: pawel Date: Mon Dec 15 22:38:15 2014 New Revision: 374771 URL: https://svnweb.freebsd.org/changeset/ports/374771 QAT: https://qat.redports.org/buildarchive/r374771/ Log: Advanced Exchange Access (AXA) is a suite of tools and library code that brings the capabilities of the Farsight Security Information Exchange (SIE) right to a remote user's network. WWW: https://github.com/farsightsec/axa PR: 195695 Submitted by: truckman@FreeBSD.org Added: head/net/axa/ head/net/axa/Makefile (contents, props changed) head/net/axa/distinfo (contents, props changed) head/net/axa/pkg-descr (contents, props changed) head/net/axa/pkg-plist (contents, props changed) Modified: head/net/Makefile Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Mon Dec 15 22:25:25 2014 (r374770) +++ head/net/Makefile Mon Dec 15 22:38:15 2014 (r374771) @@ -38,6 +38,7 @@ SUBDIR += avahi-libdns SUBDIR += avahi-qt4 SUBDIR += avahi-sharp + SUBDIR += axa SUBDIR += babeld SUBDIR += beacon SUBDIR += beanstalkd Added: head/net/axa/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/axa/Makefile Mon Dec 15 22:38:15 2014 (r374771) @@ -0,0 +1,49 @@ +# $FreeBSD$ + +PORTNAME= axa +PORTVERSION= 1.0.0 +CATEGORIES= net dns + +MAINTAINER= truckman@FreeBSD.org +COMMENT= AXA library and tools + +LICENSE= APACHE20 + +BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ + sie-nmsg>0:${PORTSDIR}/net/sie-nmsg +LIB_DEPENDS= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \ + libnmsg.so:${PORTSDIR}/net/nmsg \ + libwdns.so:${PORTSDIR}/dns/wdns + +USE_GITHUB= yes +GH_ACCOUNT= farsightsec +GH_COMMIT= bf9c038 +GH_TAGNAME= ${GH_COMMIT} + +GNU_CONFIGURE= yes +USES= gmake libtool pathfix pkgconfig +USE_AUTOTOOLS= aclocal autoconf autoheader automake libtoolize +AUTOMAKE_ARGS= --add-missing +CONFIGURE_SHELL= ${LOCALBASE}/bin/bash +INSTALL_TARGET= install-strip +USE_LDCONFIG= yes + +PORTDOCS= * + +OPTIONS_DEFINE= DOXYGEN +OPTIONS_DEFAULT=DOXYGEN + +.include + +ALL_TARGET= all +.if ${PORT_OPTIONS:MDOXYGEN} +BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen +ALL_TARGET+= html-local +.endif + +.if ${PORT_OPTIONS:MDOXYGEN} +post-install: + (cd ${WRKSRC}/doc/doxygen && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) +.endif + +.include Added: head/net/axa/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/axa/distinfo Mon Dec 15 22:38:15 2014 (r374771) @@ -0,0 +1,2 @@ +SHA256 (axa-1.0.0.tar.gz) = fe118b1270a3d39c967070f57873911fc4369927848f8565368afea9e6ea4fde +SIZE (axa-1.0.0.tar.gz) = 150904 Added: head/net/axa/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/axa/pkg-descr Mon Dec 15 22:38:15 2014 (r374771) @@ -0,0 +1,5 @@ +Advanced Exchange Access (AXA) is a suite of tools and library code +that brings the capabilities of the Farsight Security Information +Exchange (SIE) right to a remote user's network. + +WWW: https://github.com/farsightsec/axa Added: head/net/axa/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/axa/pkg-plist Mon Dec 15 22:38:15 2014 (r374771) @@ -0,0 +1,24 @@ +bin/radtool +bin/sratool +bin/sratunnel +%%ETCDIR%%/fields +include/axa/axa.h +include/axa/axa_endian.h +include/axa/bits.h +include/axa/client.h +include/axa/dns_walk.h +include/axa/fields.h +include/axa/open_nmsg_out.h +include/axa/protocol.h +include/axa/rad_mod.h +include/axa/socket.h +include/axa/trie.h +include/axa/wire.h +lib/libaxa.a +lib/libaxa.so +lib/libaxa.so.0 +lib/libaxa.so.0.0.0 +libdata/pkgconfig/libaxa.pc +man/man1/radtool.1.gz +man/man1/sratool.1.gz +man/man1/sratunnel.1.gz From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 22:45:01 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1426F98A; Mon, 15 Dec 2014 22:45: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 F414C7D3; Mon, 15 Dec 2014 22:45:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFMj0YT056172; Mon, 15 Dec 2014 22:45:00 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFMj0Pr056171; Mon, 15 Dec 2014 22:45:00 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412152245.sBFMj0Pr056171@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 22:45:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374772 - head/devel/tijmp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 22:45:01 -0000 Author: pawel Date: Mon Dec 15 22:44:59 2014 New Revision: 374772 URL: https://svnweb.freebsd.org/changeset/ports/374772 QAT: https://qat.redports.org/buildarchive/r374772/ Log: Update mirror location PR: 195681 Submitted by: maintainer Modified: head/devel/tijmp/Makefile Modified: head/devel/tijmp/Makefile ============================================================================== --- head/devel/tijmp/Makefile Mon Dec 15 22:38:15 2014 (r374771) +++ head/devel/tijmp/Makefile Mon Dec 15 22:44:59 2014 (r374772) @@ -6,7 +6,7 @@ PORTVERSION= 0.7 PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= http://www.khelekore.org/jmp/tijmp/ \ - http://www.klop.ws/~ronald/software-mirrors/ + http://www.klop.ws/distfiles/ MAINTAINER= ronald-lists@klop.ws COMMENT= Tools Interface Java Memory Profiler From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 22:59:30 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99ABFD80; Mon, 15 Dec 2014 22:59: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 84ECE8FC; Mon, 15 Dec 2014 22:59:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFMxUJV061763; Mon, 15 Dec 2014 22:59:30 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFMxTll061756; Mon, 15 Dec 2014 22:59:29 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412152259.sBFMxTll061756@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 15 Dec 2014 22:59:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374773 - branches/2014Q4/devel/subversion17 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 22:59:30 -0000 Author: ohauer Date: Mon Dec 15 22:59:28 2014 New Revision: 374773 URL: https://svnweb.freebsd.org/changeset/ports/374773 QAT: https://qat.redports.org/buildarchive/r374773/ Log: MFH: r374769 - update to 1.7.19 Changelog: http://svn.apache.org/repos/asf/subversion/trunk/CHANGES Security: f5561ade-846c-11e4-b7a7-20cf30e32f6 Approved by: portmgr (Xin Li) Modified: branches/2014Q4/devel/subversion17/Makefile branches/2014Q4/devel/subversion17/Makefile.common branches/2014Q4/devel/subversion17/distinfo branches/2014Q4/devel/subversion17/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/subversion17/Makefile ============================================================================== --- branches/2014Q4/devel/subversion17/Makefile Mon Dec 15 22:44:59 2014 (r374772) +++ branches/2014Q4/devel/subversion17/Makefile Mon Dec 15 22:59:28 2014 (r374773) @@ -200,8 +200,8 @@ post-build: post-install: ${MKREPOS_TARGET} .if ${PORT_OPTIONS:MTOOLS} @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/* + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/* .endif @${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' --exclude '*.bak' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @@ -210,7 +210,7 @@ post-install: ${MKREPOS_TARGET} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} - @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve + ${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve .endif .if ${PORT_OPTIONS:MMOD_DAV_SVN} @@ -278,7 +278,7 @@ _mkrepos: .USE .endif svn-build-outputs-hack: - (cd ${WRKSRC} && python2 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) + (cd ${WRKSRC} && python2.7 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include Modified: branches/2014Q4/devel/subversion17/Makefile.common ============================================================================== --- branches/2014Q4/devel/subversion17/Makefile.common Mon Dec 15 22:44:59 2014 (r374772) +++ branches/2014Q4/devel/subversion17/Makefile.common Mon Dec 15 22:59:28 2014 (r374773) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.7.18 +PORTVERSION= 1.7.19 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} Modified: branches/2014Q4/devel/subversion17/distinfo ============================================================================== --- branches/2014Q4/devel/subversion17/distinfo Mon Dec 15 22:44:59 2014 (r374772) +++ branches/2014Q4/devel/subversion17/distinfo Mon Dec 15 22:59:28 2014 (r374773) @@ -1,2 +1,2 @@ -SHA256 (subversion17/subversion-1.7.18.tar.bz2) = f67381ce62b69bdb373e4c38ff84576677316904753536a78630603cacc5d91a -SIZE (subversion17/subversion-1.7.18.tar.bz2) = 6096031 +SHA256 (subversion17/subversion-1.7.19.tar.bz2) = 0059cd376ac6a14c80612ea99c4b0fed9dc2ff0ad05560d108a4c5625323cd5c +SIZE (subversion17/subversion-1.7.19.tar.bz2) = 6094560 Modified: branches/2014Q4/devel/subversion17/pkg-plist ============================================================================== --- branches/2014Q4/devel/subversion17/pkg-plist Mon Dec 15 22:44:59 2014 (r374772) +++ branches/2014Q4/devel/subversion17/pkg-plist Mon Dec 15 22:59:28 2014 (r374773) @@ -134,9 +134,9 @@ lib/libsvn_wc-1.a %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n authz_svn %D/%F -%%MOD_DAV_SVN%%%%TOOLS%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%MOD_DAV_SVN%%%%TOOLS%%%%APACHEMODDIR%%/mod_dontdothat.so -%%MOD_DAV_SVN%%%%TOOLS%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F +%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F man/man1/svn.1.gz man/man1/svnadmin.1.gz man/man1/svndumpfilter.1.gz From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 23:00:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E190FE69; Mon, 15 Dec 2014 23: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 C99D590B; Mon, 15 Dec 2014 23:00:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFN0caT062275; Mon, 15 Dec 2014 23:00:38 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFN0cuo062271; Mon, 15 Dec 2014 23:00:38 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412152300.sBFN0cuo062271@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 15 Dec 2014 23:00:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r374774 - in branches/2014Q4/devel/subversion: . 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 23:00:39 -0000 Author: ohauer Date: Mon Dec 15 23:00:37 2014 New Revision: 374774 URL: https://svnweb.freebsd.org/changeset/ports/374774 QAT: https://qat.redports.org/buildarchive/r374774/ Log: MFH: r374770 - update to 1.8.11 Changelog: http://svn.apache.org/repos/asf/subversion/trunk/CHANGES Security: f5561ade-846c-11e4-b7a7-20cf30e32f6 Approved by: portmgr (Xin Li) Modified: branches/2014Q4/devel/subversion/Makefile.common branches/2014Q4/devel/subversion/distinfo branches/2014Q4/devel/subversion/files/build-outputs.mk.addons Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/devel/subversion/Makefile.common ============================================================================== --- branches/2014Q4/devel/subversion/Makefile.common Mon Dec 15 22:59:28 2014 (r374773) +++ branches/2014Q4/devel/subversion/Makefile.common Mon Dec 15 23:00:37 2014 (r374774) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.8.10 -PORTREVISION?= 3 +PORTVERSION= 1.8.11 +PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 Modified: branches/2014Q4/devel/subversion/distinfo ============================================================================== --- branches/2014Q4/devel/subversion/distinfo Mon Dec 15 22:59:28 2014 (r374773) +++ branches/2014Q4/devel/subversion/distinfo Mon Dec 15 23:00:37 2014 (r374774) @@ -1,2 +1,2 @@ -SHA256 (subversion18/subversion-1.8.10.tar.bz2) = 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc -SIZE (subversion18/subversion-1.8.10.tar.bz2) = 6899384 +SHA256 (subversion18/subversion-1.8.11.tar.bz2) = 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 +SIZE (subversion18/subversion-1.8.11.tar.bz2) = 6896225 Modified: branches/2014Q4/devel/subversion/files/build-outputs.mk.addons ============================================================================== --- branches/2014Q4/devel/subversion/files/build-outputs.mk.addons Mon Dec 15 22:59:28 2014 (r374773) +++ branches/2014Q4/devel/subversion/files/build-outputs.mk.addons Mon Dec 15 23:00:37 2014 (r374774) @@ -2087,7 +2087,7 @@ subversion/libsvn_diff/parse-diff.lo: su subversion/libsvn_diff/token.lo: subversion/libsvn_diff/token.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_diff/diff.h -subversion/libsvn_diff/util.lo: subversion/libsvn_diff/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h +subversion/libsvn_diff/util.lo: subversion/libsvn_diff/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_diff/diff.h subversion/svn_private_config.h subversion/libsvn_fs/access.lo: subversion/libsvn_fs/access.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h @@ -2337,7 +2337,7 @@ subversion/libsvn_subr/eol.lo: subversio subversion/libsvn_subr/error.lo: subversion/libsvn_subr/error.c subversion/include/private/svn_debug.h subversion/include/private/svn_error_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h -subversion/libsvn_subr/gpg_agent.lo: subversion/libsvn_subr/gpg_agent.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h +subversion/libsvn_subr/gpg_agent.lo: subversion/libsvn_subr/gpg_agent.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/svn_private_config.h subversion/libsvn_subr/hash.lo: subversion/libsvn_subr/hash.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 23:00:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5EF23F42; Mon, 15 Dec 2014 23:00: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 30C1B90E; Mon, 15 Dec 2014 23:00:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFN0rd8062614; Mon, 15 Dec 2014 23:00:53 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFN0q2e062609; Mon, 15 Dec 2014 23:00:52 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201412152300.sBFN0q2e062609@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Mon, 15 Dec 2014 23:00:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374775 - in head/deskutils/autocutsel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 23:00:53 -0000 Author: pawel Date: Mon Dec 15 23:00:51 2014 New Revision: 374775 URL: https://svnweb.freebsd.org/changeset/ports/374775 QAT: https://qat.redports.org/buildarchive/r374775/ Log: Update to version 0.10.0 PR: 195725 Submitted by: Anton Tornqvist Approved by: maintainer Deleted: head/deskutils/autocutsel/files/ Modified: head/deskutils/autocutsel/Makefile head/deskutils/autocutsel/distinfo Modified: head/deskutils/autocutsel/Makefile ============================================================================== --- head/deskutils/autocutsel/Makefile Mon Dec 15 23:00:37 2014 (r374774) +++ head/deskutils/autocutsel/Makefile Mon Dec 15 23:00:51 2014 (r374775) @@ -2,20 +2,24 @@ # $FreeBSD$ PORTNAME= autocutsel -PORTVERSION= 0.9.0 -PORTREVISION= 2 +PORTVERSION= 0.10.0 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= autocutsel MAINTAINER= john@jnielsen.net COMMENT= Synchronizes the two copy/paste buffers used by X applications -USE_XORG= x11 xaw xext +USE_GITHUB= yes +GH_ACCOUNT= sigmike +GH_COMMIT= 35388eb + +USE_XORG= x11 xaw xmu GNU_CONFIGURE= yes -USES= gmake +USES= gmake autoreconf libtool PLIST_FILES= bin/autocutsel \ bin/cutsel +post-configure: + @${REINPLACE_CMD} -e 's|-I\.|-I/usr/local/include|g' ${WRKSRC}/Makefile + .include Modified: head/deskutils/autocutsel/distinfo ============================================================================== --- head/deskutils/autocutsel/distinfo Mon Dec 15 23:00:37 2014 (r374774) +++ head/deskutils/autocutsel/distinfo Mon Dec 15 23:00:51 2014 (r374775) @@ -1,2 +1,2 @@ -SHA256 (autocutsel-0.9.0.tar.gz) = bef0ebc2dc2c92fc29f00867771229fd8391e6028bbb8bca9d809e827119e342 -SIZE (autocutsel-0.9.0.tar.gz) = 297595 +SHA256 (autocutsel-0.10.0.tar.gz) = 49974d139c9d476606e747bee2b97fdbc3bd5b99e8df65a6ee440a25eb784a7d +SIZE (autocutsel-0.10.0.tar.gz) = 19125 From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 23:02:47 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 317483CF; Mon, 15 Dec 2014 23:02: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 1D8359DB; Mon, 15 Dec 2014 23:02:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFN2kT9066209; Mon, 15 Dec 2014 23:02:46 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFN2kik066206; Mon, 15 Dec 2014 23:02:46 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201412152302.sBFN2kik066206@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Mon, 15 Dec 2014 23:02:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374776 - head/devel/ruby-build X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 23:02:47 -0000 Author: robak Date: Mon Dec 15 23:02:45 2014 New Revision: 374776 URL: https://svnweb.freebsd.org/changeset/ports/374776 QAT: https://qat.redports.org/buildarchive/r374776/ Log: devel/ruby-build: update 20141028 -> 20141210 PR: 20141210 Submitted by: Thomas Hurst Modified: head/devel/ruby-build/Makefile head/devel/ruby-build/distinfo Modified: head/devel/ruby-build/Makefile ============================================================================== --- head/devel/ruby-build/Makefile Mon Dec 15 23:00:51 2014 (r374775) +++ head/devel/ruby-build/Makefile Mon Dec 15 23:02:45 2014 (r374776) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ruby-build -PORTVERSION= 20141028 +PORTVERSION= 20141210 CATEGORIES= devel ruby MAINTAINER= meta+ports@vmeta.jp @@ -20,7 +20,7 @@ RBENV_RUN_DEPENDS= rbenv:${PORTSDIR}/dev USE_GITHUB= yes GH_ACCOUNT= sstephenson -GH_COMMIT= 81807c6 +GH_COMMIT= b79e713 GH_TAGNAME= v${PORTVERSION} NO_BUILD= yes Modified: head/devel/ruby-build/distinfo ============================================================================== --- head/devel/ruby-build/distinfo Mon Dec 15 23:00:51 2014 (r374775) +++ head/devel/ruby-build/distinfo Mon Dec 15 23:02:45 2014 (r374776) @@ -1,2 +1,2 @@ -SHA256 (ruby-build-20141028.tar.gz) = fca94d23dd7473a26c1cf2ae8ad68a8312c5ed70559aba287968fd17c5b836aa -SIZE (ruby-build-20141028.tar.gz) = 37242 +SHA256 (ruby-build-20141210.tar.gz) = 05c5b7b0d78a7f9154f11a58d366e389d3207bdb6b1b65108ddd54ef1e39be72 +SIZE (ruby-build-20141210.tar.gz) = 37901 From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 23:14:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11211893; Mon, 15 Dec 2014 23:14: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 EF905B1A; Mon, 15 Dec 2014 23:14:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFNEp2t071452; Mon, 15 Dec 2014 23:14:51 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFNEpwK071441; Mon, 15 Dec 2014 23:14:51 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412152314.sBFNEpwK071441@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Dec 2014 23:14:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374777 - in head/net/asterisk11: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 23:14:52 -0000 Author: madpilot Date: Mon Dec 15 23:14:50 2014 New Revision: 374777 URL: https://svnweb.freebsd.org/changeset/ports/374777 QAT: https://qat.redports.org/buildarchive/r374777/ Log: - Update to 11.15.0 - Use @sample - While here, modify an installation message to remove text which is not applicable to our case. Modified: head/net/asterisk11/Makefile head/net/asterisk11/distinfo head/net/asterisk11/files/patch-Makefile head/net/asterisk11/pkg-plist Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Mon Dec 15 23:02:45 2014 (r374776) +++ head/net/asterisk11/Makefile Mon Dec 15 23:14:50 2014 (r374777) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.14.2 -PORTREVISION= 2 +PORTVERSION= 11.15.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: head/net/asterisk11/distinfo ============================================================================== --- head/net/asterisk11/distinfo Mon Dec 15 23:02:45 2014 (r374776) +++ head/net/asterisk11/distinfo Mon Dec 15 23:14:50 2014 (r374777) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.14.2.tar.gz) = c9a7a9cf4b4512333853a8f53ea243cd8b0bc62123a397b20e03835ad1497f7e -SIZE (asterisk-11.14.2.tar.gz) = 34967655 +SHA256 (asterisk-11.15.0.tar.gz) = 20a20d116a70f2187f3ddcf79e3109f62054b20b402d6bdd28a2cefc245bbb99 +SIZE (asterisk-11.15.0.tar.gz) = 34981005 Modified: head/net/asterisk11/files/patch-Makefile ============================================================================== --- head/net/asterisk11/files/patch-Makefile Mon Dec 15 23:02:45 2014 (r374776) +++ head/net/asterisk11/files/patch-Makefile Mon Dec 15 23:14:50 2014 (r374777) @@ -1,6 +1,6 @@ ---- Makefile.orig 2012-06-13 16:30:34.000000000 +0200 -+++ Makefile 2012-08-02 00:12:13.812569306 +0200 -@@ -123,7 +123,7 @@ +--- Makefile.orig 2014-10-31 16:40:55 UTC ++++ Makefile +@@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$( OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -9,16 +9,16 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -192,7 +192,7 @@ +@@ -202,7 +202,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) + BSDVERSION=$(OSVERSION) _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - endif - -@@ -425,8 +425,12 @@ + # flag to tell 'ldconfig' to only process specified directories + LDCONFIG_FLAGS=-m +@@ -456,8 +456,12 @@ datafiles: _all doc/core-en_US.xml $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -32,7 +32,7 @@ done $(MAKE) -C sounds install -@@ -485,7 +489,7 @@ +@@ -537,7 +541,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \ "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \ @@ -41,7 +41,7 @@ installdirs: @for i in $(INSTALLDIRS); do \ -@@ -552,7 +556,7 @@ +@@ -606,7 +610,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -50,12 +50,34 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -594,29 +598,18 @@ +@@ -615,21 +619,7 @@ install: badshell bininstall datafiles + @echo " + YOU MUST READ THE SECURITY DOCUMENT +" + @echo " + +" + @echo " + Asterisk has successfully been installed. +" +- @echo " + If you would like to install the sample +" +- @echo " + configuration files (overwriting any +" +- @echo " + existing config files), run: +" + @echo " + +" +- @echo " + $(mK) samples +" +- @echo " + +" +- @echo " +----------------- or ---------------------+" +- @echo " + +" +- @echo " + You can go ahead and install the asterisk +" +- @echo " + program documentation now or later run: +" +- @echo " + +" +- @echo " + $(mK) progdocs +" +- @echo " + +" +- @echo " + **Note** This requires that you have +" +- @echo " + doxygen installed on your local system +" + @echo " +-------------------------------------------+" + @$(MAKE) -s oldmodcheck + +@@ -648,45 +638,30 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ - $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \ done samples: adsi @@ -73,23 +95,43 @@ - echo "Skipping config file $$x"; \ - continue; \ - fi ;\ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ - fi ; \ -- echo "Installing file $$x"; \ +- fi ; \ + echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ;\ done - if [ "$(OVERWRITE)" = "y" ]; then \ -+ @if true; then \ - echo "Updating asterisk.conf" ; \ - sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ - -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \ -@@ -630,6 +623,7 @@ - -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ - "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ -+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)-dist" ; \ - rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - fi ; \ +- echo "Updating asterisk.conf" ; \ +- sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ +- -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ +- -e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \ +- -e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \ +- -e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \ +- -e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \ +- -e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \ +- -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \ +- -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ +- -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ +- -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ +- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ +- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ +- rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ +- fi ; \ ++ echo "Updating asterisk.conf" ; \ ++ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ ++ -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ ++ -e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \ ++ -e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \ ++ -e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \ ++ -e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \ ++ -e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \ ++ -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \ ++ -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ ++ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ ++ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ ++ "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ ++ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \ ++ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" + build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)" + Modified: head/net/asterisk11/pkg-plist ============================================================================== --- head/net/asterisk11/pkg-plist Mon Dec 15 23:02:45 2014 (r374776) +++ head/net/asterisk11/pkg-plist Mon Dec 15 23:14:50 2014 (r374777) @@ -1,305 +1,105 @@ -@unexec if cmp -s %D/%%ETCDIR%%/acl.conf %D/%%ETCDIR%%/acl.conf-dist; then rm -f %D/%%ETCDIR%%/acl.conf; fi -%%ETCDIR%%/acl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_adaptive_odbc.conf %D/%%ETCDIR%%/cdr_adaptive_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; fi -%%ETCDIR%%/cdr_adaptive_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_sqlite3_custom.conf %D/%%ETCDIR%%/cdr_sqlite3_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; fi -%%ETCDIR%%/cdr_sqlite3_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_syslog.conf %D/%%ETCDIR%%/cdr_syslog.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_syslog.conf; fi -%%ETCDIR%%/cdr_syslog.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli.conf %D/%%ETCDIR%%/cli.conf-dist; then rm -f %D/%%ETCDIR%%/cli.conf; fi -%%ETCDIR%%/cli.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli_aliases.conf %D/%%ETCDIR%%/cli_aliases.conf-dist; then rm -f %D/%%ETCDIR%%/cli_aliases.conf; fi -%%ETCDIR%%/cli_aliases.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli_permissions.conf %D/%%ETCDIR%%/cli_permissions.conf-dist; then rm -f %D/%%ETCDIR%%/cli_permissions.conf; fi -%%ETCDIR%%/cli_permissions.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/confbridge.conf %D/%%ETCDIR%%/confbridge.conf-dist; then rm -f %D/%%ETCDIR%%/confbridge.conf; fi -%%ETCDIR%%/confbridge.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/config_test.conf %D/%%ETCDIR%%/config_test.conf-dist; then rm -f %D/%%ETCDIR%%/config_test.conf; fi -%%ETCDIR%%/config_test.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/console.conf %D/%%ETCDIR%%/console.conf-dist; then rm -f %D/%%ETCDIR%%/console.conf; fi -%%ETCDIR%%/console.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dbsep.conf %D/%%ETCDIR%%/dbsep.conf-dist; then rm -f %D/%%ETCDIR%%/dbsep.conf; fi -%%ETCDIR%%/dbsep.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dsp.conf %D/%%ETCDIR%%/dsp.conf-dist; then rm -f %D/%%ETCDIR%%/dsp.conf; fi -%%ETCDIR%%/dsp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.lua %D/%%ETCDIR%%/extensions.lua-dist; then rm -f %D/%%ETCDIR%%/extensions.lua; fi -%%ETCDIR%%/extensions.lua-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions_minivm.conf %D/%%ETCDIR%%/extensions_minivm.conf-dist; then rm -f %D/%%ETCDIR%%/extensions_minivm.conf; fi -%%ETCDIR%%/extensions_minivm.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/jingle.conf %D/%%ETCDIR%%/jingle.conf-dist; then rm -f %D/%%ETCDIR%%/jingle.conf; fi -%%ETCDIR%%/jingle.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/minivm.conf %D/%%ETCDIR%%/minivm.conf-dist; then rm -f %D/%%ETCDIR%%/minivm.conf; fi -%%ETCDIR%%/minivm.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/motif.conf %D/%%ETCDIR%%/motif.conf-dist; then rm -f %D/%%ETCDIR%%/motif.conf; fi -%%ETCDIR%%/motif.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/ooh323.conf %D/%%ETCDIR%%/ooh323.conf-dist; then rm -f %D/%%ETCDIR%%/ooh323.conf; fi -%%ETCDIR%%/ooh323.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/phoneprov.conf %D/%%ETCDIR%%/phoneprov.conf-dist; then rm -f %D/%%ETCDIR%%/phoneprov.conf; fi -%%ETCDIR%%/phoneprov.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/queuerules.conf %D/%%ETCDIR%%/queuerules.conf-dist; then rm -f %D/%%ETCDIR%%/queuerules.conf; fi -%%ETCDIR%%/queuerules.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_ldap.conf %D/%%ETCDIR%%/res_ldap.conf-dist; then rm -f %D/%%ETCDIR%%/res_ldap.conf; fi -%%ETCDIR%%/res_ldap.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/unistim.conf %D/%%ETCDIR%%/unistim.conf-dist; then rm -f %D/%%ETCDIR%%/unistim.conf; fi -%%ETCDIR%%/unistim.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/adsi.conf %D/%%ETCDIR%%/adsi.conf-dist; then rm -f %D/%%ETCDIR%%/adsi.conf; fi -%%ETCDIR%%/adsi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/agents.conf %D/%%ETCDIR%%/agents.conf-dist; then rm -f %D/%%ETCDIR%%/agents.conf; fi -%%ETCDIR%%/agents.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/alarmreceiver.conf %D/%%ETCDIR%%/alarmreceiver.conf-dist; then rm -f %D/%%ETCDIR%%/alarmreceiver.conf; fi -%%ETCDIR%%/alarmreceiver.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/alsa.conf %D/%%ETCDIR%%/alsa.conf-dist; then rm -f %D/%%ETCDIR%%/alsa.conf; fi -%%ETCDIR%%/alsa.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/asterisk.adsi %D/%%ETCDIR%%/asterisk.adsi-dist; then rm -f %D/%%ETCDIR%%/asterisk.adsi; fi -%%ETCDIR%%/asterisk.adsi-dist -@unexec if cmp -s %D/%%ETCDIR%%/asterisk.conf %D/%%ETCDIR%%/asterisk.conf-dist; then rm -f %D/%%ETCDIR%%/asterisk.conf; fi -%%ETCDIR%%/asterisk.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/calendar.conf %D/%%ETCDIR%%/calendar.conf-dist; then rm -f %D/%%ETCDIR%%/calendar.conf; fi -%%ETCDIR%%/calendar.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/ccss.conf %D/%%ETCDIR%%/ccss.conf-dist; then rm -f %D/%%ETCDIR%%/ccss.conf; fi -%%ETCDIR%%/ccss.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr.conf %D/%%ETCDIR%%/cdr.conf-dist; then rm -f %D/%%ETCDIR%%/cdr.conf; fi -%%ETCDIR%%/cdr.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_custom.conf %D/%%ETCDIR%%/cdr_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_custom.conf; fi -%%ETCDIR%%/cdr_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_manager.conf %D/%%ETCDIR%%/cdr_manager.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_manager.conf; fi -%%ETCDIR%%/cdr_manager.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_mysql.conf %D/%%ETCDIR%%/cdr_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_mysql.conf; fi -%%ETCDIR%%/cdr_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_odbc.conf %D/%%ETCDIR%%/cdr_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_odbc.conf; fi -%%ETCDIR%%/cdr_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_pgsql.conf %D/%%ETCDIR%%/cdr_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_pgsql.conf; fi -%%ETCDIR%%/cdr_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_tds.conf %D/%%ETCDIR%%/cdr_tds.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_tds.conf; fi -%%ETCDIR%%/cdr_tds.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel.conf %D/%%ETCDIR%%/cel.conf-dist; then rm -f %D/%%ETCDIR%%/cel.conf; fi -%%ETCDIR%%/cel.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_custom.conf %D/%%ETCDIR%%/cel_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cel_custom.conf; fi -%%ETCDIR%%/cel_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_odbc.conf %D/%%ETCDIR%%/cel_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cel_odbc.conf; fi -%%ETCDIR%%/cel_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_pgsql.conf %D/%%ETCDIR%%/cel_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/cel_pgsql.conf; fi -%%ETCDIR%%/cel_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_sqlite3_custom.conf %D/%%ETCDIR%%/cel_sqlite3_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cel_sqlite3_custom.conf; fi -%%ETCDIR%%/cel_sqlite3_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_tds.conf %D/%%ETCDIR%%/cel_tds.conf-dist; then rm -f %D/%%ETCDIR%%/cel_tds.conf; fi -%%ETCDIR%%/cel_tds.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/codecs.conf %D/%%ETCDIR%%/codecs.conf-dist; then rm -f %D/%%ETCDIR%%/codecs.conf; fi -%%ETCDIR%%/codecs.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dnsmgr.conf %D/%%ETCDIR%%/dnsmgr.conf-dist; then rm -f %D/%%ETCDIR%%/dnsmgr.conf; fi -%%ETCDIR%%/dnsmgr.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dundi.conf %D/%%ETCDIR%%/dundi.conf-dist; then rm -f %D/%%ETCDIR%%/dundi.conf; fi -%%ETCDIR%%/dundi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/enum.conf %D/%%ETCDIR%%/enum.conf-dist; then rm -f %D/%%ETCDIR%%/enum.conf; fi -%%ETCDIR%%/enum.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extconfig.conf %D/%%ETCDIR%%/extconfig.conf-dist; then rm -f %D/%%ETCDIR%%/extconfig.conf; fi -%%ETCDIR%%/extconfig.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.ael %D/%%ETCDIR%%/extensions.ael-dist; then rm -f %D/%%ETCDIR%%/extensions.ael; fi -%%ETCDIR%%/extensions.ael-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.conf %D/%%ETCDIR%%/extensions.conf-dist; then rm -f %D/%%ETCDIR%%/extensions.conf; fi -%%ETCDIR%%/extensions.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/features.conf %D/%%ETCDIR%%/features.conf-dist; then rm -f %D/%%ETCDIR%%/features.conf; fi -%%ETCDIR%%/features.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/festival.conf %D/%%ETCDIR%%/festival.conf-dist; then rm -f %D/%%ETCDIR%%/festival.conf; fi -%%ETCDIR%%/festival.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/iax.conf %D/%%ETCDIR%%/iax.conf-dist; then rm -f %D/%%ETCDIR%%/iax.conf; fi -%%ETCDIR%%/iax.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/iaxprov.conf %D/%%ETCDIR%%/iaxprov.conf-dist; then rm -f %D/%%ETCDIR%%/iaxprov.conf; fi -%%ETCDIR%%/iaxprov.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/indications.conf %D/%%ETCDIR%%/indications.conf-dist; then rm -f %D/%%ETCDIR%%/indications.conf; fi -%%ETCDIR%%/indications.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/logger.conf %D/%%ETCDIR%%/logger.conf-dist; then rm -f %D/%%ETCDIR%%/logger.conf; fi -%%ETCDIR%%/logger.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/manager.conf %D/%%ETCDIR%%/manager.conf-dist; then rm -f %D/%%ETCDIR%%/manager.conf; fi -%%ETCDIR%%/manager.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/meetme.conf %D/%%ETCDIR%%/meetme.conf-dist; then rm -f %D/%%ETCDIR%%/meetme.conf; fi -%%ETCDIR%%/meetme.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/mgcp.conf %D/%%ETCDIR%%/mgcp.conf-dist; then rm -f %D/%%ETCDIR%%/mgcp.conf; fi -%%ETCDIR%%/mgcp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/misdn.conf %D/%%ETCDIR%%/misdn.conf-dist; then rm -f %D/%%ETCDIR%%/misdn.conf; fi -%%ETCDIR%%/misdn.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/modules.conf %D/%%ETCDIR%%/modules.conf-dist; then rm -f %D/%%ETCDIR%%/modules.conf; fi -%%ETCDIR%%/modules.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/musiconhold.conf %D/%%ETCDIR%%/musiconhold.conf-dist; then rm -f %D/%%ETCDIR%%/musiconhold.conf; fi -%%ETCDIR%%/musiconhold.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/osp.conf %D/%%ETCDIR%%/osp.conf-dist; then rm -f %D/%%ETCDIR%%/osp.conf; fi -%%ETCDIR%%/osp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/oss.conf %D/%%ETCDIR%%/oss.conf-dist; then rm -f %D/%%ETCDIR%%/oss.conf; fi -%%ETCDIR%%/oss.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/phone.conf %D/%%ETCDIR%%/phone.conf-dist; then rm -f %D/%%ETCDIR%%/phone.conf; fi -%%ETCDIR%%/phone.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/queues.conf %D/%%ETCDIR%%/queues.conf-dist; then rm -f %D/%%ETCDIR%%/queues.conf; fi -%%ETCDIR%%/queues.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_mysql.conf %D/%%ETCDIR%%/res_config_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_mysql.conf; fi -%%ETCDIR%%/res_config_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_sqlite3.conf %D/%%ETCDIR%%/res_config_sqlite3.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_sqlite3.conf; fi -%%ETCDIR%%/res_config_sqlite3.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_corosync.conf %D/%%ETCDIR%%/res_corosync.conf-dist; then rm -f %D/%%ETCDIR%%/res_corosync.conf; fi -%%ETCDIR%%/res_corosync.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_pgsql.conf %D/%%ETCDIR%%/res_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/res_pgsql.conf; fi -%%ETCDIR%%/res_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_pktccops.conf %D/%%ETCDIR%%/res_pktccops.conf-dist; then rm -f %D/%%ETCDIR%%/res_pktccops.conf; fi -%%ETCDIR%%/res_pktccops.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_odbc.conf %D/%%ETCDIR%%/res_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/res_odbc.conf; fi -%%ETCDIR%%/res_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/rtp.conf %D/%%ETCDIR%%/rtp.conf-dist; then rm -f %D/%%ETCDIR%%/rtp.conf; fi -%%ETCDIR%%/rtp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sip.conf %D/%%ETCDIR%%/sip.conf-dist; then rm -f %D/%%ETCDIR%%/sip.conf; fi -%%ETCDIR%%/sip.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sip_notify.conf %D/%%ETCDIR%%/sip_notify.conf-dist; then rm -f %D/%%ETCDIR%%/sip_notify.conf; fi -%%ETCDIR%%/sip_notify.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/skinny.conf %D/%%ETCDIR%%/skinny.conf-dist; then rm -f %D/%%ETCDIR%%/skinny.conf; fi -%%ETCDIR%%/skinny.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/telcordia-1.adsi %D/%%ETCDIR%%/telcordia-1.adsi-dist; then rm -f %D/%%ETCDIR%%/telcordia-1.adsi; fi -%%ETCDIR%%/telcordia-1.adsi-dist -@unexec if cmp -s %D/%%ETCDIR%%/voicemail.conf %D/%%ETCDIR%%/voicemail.conf-dist; then rm -f %D/%%ETCDIR%%/voicemail.conf; fi -%%ETCDIR%%/voicemail.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/vpb.conf %D/%%ETCDIR%%/vpb.conf-dist; then rm -f %D/%%ETCDIR%%/vpb.conf; fi -%%ETCDIR%%/vpb.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/chan_dahdi.conf %D/%%ETCDIR%%/chan_dahdi.conf-dist; then rm -f %D/%%ETCDIR%%/chan_dahdi.conf; fi -%%ETCDIR%%/chan_dahdi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/chan_mobile.conf %D/%%ETCDIR%%/chan_mobile.conf-dist; then rm -f %D/%%ETCDIR%%/chan_mobile.conf; fi -%%ETCDIR%%/chan_mobile.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/udptl.conf %D/%%ETCDIR%%/udptl.conf-dist; then rm -f %D/%%ETCDIR%%/udptl.conf; fi -%%ETCDIR%%/udptl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/users.conf %D/%%ETCDIR%%/users.conf-dist; then rm -f %D/%%ETCDIR%%/users.conf; fi -%%ETCDIR%%/users.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/smdi.conf %D/%%ETCDIR%%/smdi.conf-dist; then rm -f %D/%%ETCDIR%%/smdi.conf; fi -%%ETCDIR%%/smdi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sla.conf %D/%%ETCDIR%%/sla.conf-dist; then rm -f %D/%%ETCDIR%%/sla.conf; fi -%%ETCDIR%%/sla.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/say.conf %D/%%ETCDIR%%/say.conf-dist; then rm -f %D/%%ETCDIR%%/say.conf; fi -%%ETCDIR%%/say.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_snmp.conf %D/%%ETCDIR%%/res_snmp.conf-dist; then rm -f %D/%%ETCDIR%%/res_snmp.conf; fi -%%ETCDIR%%/res_snmp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_stun_monitor.conf %D/%%ETCDIR%%/res_stun_monitor.conf-dist; then rm -f %D/%%ETCDIR%%/res_stun_monitor.conf; fi -%%ETCDIR%%/res_stun_monitor.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/muted.conf %D/%%ETCDIR%%/muted.conf-dist; then rm -f %D/%%ETCDIR%%/muted.conf; fi -%%ETCDIR%%/muted.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/jabber.conf %D/%%ETCDIR%%/jabber.conf-dist; then rm -f %D/%%ETCDIR%%/jabber.conf; fi -%%ETCDIR%%/jabber.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/http.conf %D/%%ETCDIR%%/http.conf-dist; then rm -f %D/%%ETCDIR%%/http.conf; fi -%%ETCDIR%%/http.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/h323.conf %D/%%ETCDIR%%/h323.conf-dist; then rm -f %D/%%ETCDIR%%/h323.conf; fi -%%ETCDIR%%/h323.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/gtalk.conf %D/%%ETCDIR%%/gtalk.conf-dist; then rm -f %D/%%ETCDIR%%/gtalk.conf; fi -%%ETCDIR%%/gtalk.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/func_odbc.conf %D/%%ETCDIR%%/func_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/func_odbc.conf; fi -%%ETCDIR%%/func_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/followme.conf %D/%%ETCDIR%%/followme.conf-dist; then rm -f %D/%%ETCDIR%%/followme.conf; fi -%%ETCDIR%%/followme.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/amd.conf %D/%%ETCDIR%%/amd.conf-dist; then rm -f %D/%%ETCDIR%%/amd.conf; fi -%%ETCDIR%%/amd.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/app_skel.conf %D/%%ETCDIR%%/app_skel.conf-dist; then rm -f %D/%%ETCDIR%%/app_skel.conf; fi -%%ETCDIR%%/app_skel.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/app_mysql.conf %D/%%ETCDIR%%/app_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/app_mysql.conf; fi -%%ETCDIR%%/app_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_sqlite.conf %D/%%ETCDIR%%/res_config_sqlite.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_sqlite.conf; fi -%%ETCDIR%%/res_config_sqlite.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_curl.conf %D/%%ETCDIR%%/res_curl.conf-dist; then rm -f %D/%%ETCDIR%%/res_curl.conf; fi -%%ETCDIR%%/res_curl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_fax.conf %D/%%ETCDIR%%/res_fax.conf-dist; then rm -f %D/%%ETCDIR%%/res_fax.conf; fi -%%ETCDIR%%/res_fax.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/xmpp.conf %D/%%ETCDIR%%/xmpp.conf-dist; then rm -f %D/%%ETCDIR%%/xmpp.conf; fi -%%ETCDIR%%/xmpp.conf-dist -@exec if test ! -e %D/%%ETCDIR%%/acl.conf; then cp -p %D/%%ETCDIR%%/acl.conf-dist %D/%%ETCDIR%%/acl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; then cp -p %D/%%ETCDIR%%/cdr_adaptive_odbc.conf-dist %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_syslog.conf; then cp -p %D/%%ETCDIR%%/cdr_syslog.conf-dist %D/%%ETCDIR%%/cdr_syslog.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; then cp -p %D/%%ETCDIR%%/cdr_sqlite3_custom.conf-dist %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cli.conf; then cp -p %D/%%ETCDIR%%/cli.conf-dist %D/%%ETCDIR%%/cli.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/confbridge.conf; then cp -p %D/%%ETCDIR%%/confbridge.conf-dist %D/%%ETCDIR%%/confbridge.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/config_test.conf; then cp -p %D/%%ETCDIR%%/config_test.conf-dist %D/%%ETCDIR%%/config_test.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/console.conf; then cp -p %D/%%ETCDIR%%/console.conf-dist %D/%%ETCDIR%%/console.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.lua; then cp -p %D/%%ETCDIR%%/extensions.lua-dist %D/%%ETCDIR%%/extensions.lua; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions_minivm.conf; then cp -p %D/%%ETCDIR%%/extensions_minivm.conf-dist %D/%%ETCDIR%%/extensions_minivm.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/jingle.conf; then cp -p %D/%%ETCDIR%%/jingle.conf-dist %D/%%ETCDIR%%/jingle.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/minivm.conf; then cp -p %D/%%ETCDIR%%/minivm.conf-dist %D/%%ETCDIR%%/minivm.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/motif.conf; then cp -p %D/%%ETCDIR%%/motif.conf-dist %D/%%ETCDIR%%/motif.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/ooh323.conf; then cp -p %D/%%ETCDIR%%/ooh323.conf-dist %D/%%ETCDIR%%/ooh323.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/phoneprov.conf; then cp -p %D/%%ETCDIR%%/phoneprov.conf-dist %D/%%ETCDIR%%/phoneprov.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/queuerules.conf; then cp -p %D/%%ETCDIR%%/queuerules.conf-dist %D/%%ETCDIR%%/queuerules.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_ldap.conf; then cp -p %D/%%ETCDIR%%/res_ldap.conf-dist %D/%%ETCDIR%%/res_ldap.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/unistim.conf; then cp -p %D/%%ETCDIR%%/unistim.conf-dist %D/%%ETCDIR%%/unistim.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/adsi.conf; then cp -p %D/%%ETCDIR%%/adsi.conf-dist %D/%%ETCDIR%%/adsi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/agents.conf; then cp -p %D/%%ETCDIR%%/agents.conf-dist %D/%%ETCDIR%%/agents.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/alarmreceiver.conf; then cp -p %D/%%ETCDIR%%/alarmreceiver.conf-dist %D/%%ETCDIR%%/alarmreceiver.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/alsa.conf; then cp -p %D/%%ETCDIR%%/alsa.conf-dist %D/%%ETCDIR%%/alsa.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/asterisk.adsi; then cp -p %D/%%ETCDIR%%/asterisk.adsi-dist %D/%%ETCDIR%%/asterisk.adsi; fi -@exec if test ! -e %D/%%ETCDIR%%/ccss.conf; then cp -p %D/%%ETCDIR%%/ccss.conf-dist %D/%%ETCDIR%%/ccss.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/calendar.conf; then cp -p %D/%%ETCDIR%%/calendar.conf-dist %D/%%ETCDIR%%/calendar.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/asterisk.conf; then cp -p %D/%%ETCDIR%%/asterisk.conf-dist %D/%%ETCDIR%%/asterisk.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr.conf; then cp -p %D/%%ETCDIR%%/cdr.conf-dist %D/%%ETCDIR%%/cdr.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_custom.conf; then cp -p %D/%%ETCDIR%%/cdr_custom.conf-dist %D/%%ETCDIR%%/cdr_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_mysql.conf; then cp -p %D/%%ETCDIR%%/cdr_mysql.conf-dist %D/%%ETCDIR%%/cdr_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_manager.conf; then cp -p %D/%%ETCDIR%%/cdr_manager.conf-dist %D/%%ETCDIR%%/cdr_manager.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_odbc.conf; then cp -p %D/%%ETCDIR%%/cdr_odbc.conf-dist %D/%%ETCDIR%%/cdr_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_pgsql.conf; then cp -p %D/%%ETCDIR%%/cdr_pgsql.conf-dist %D/%%ETCDIR%%/cdr_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_tds.conf; then cp -p %D/%%ETCDIR%%/cel_tds.conf-dist %D/%%ETCDIR%%/cel_tds.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_sqlite3_custom.conf; then cp -p %D/%%ETCDIR%%/cel_sqlite3_custom.conf-dist %D/%%ETCDIR%%/cel_sqlite3_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_pgsql.conf; then cp -p %D/%%ETCDIR%%/cel_pgsql.conf-dist %D/%%ETCDIR%%/cel_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_odbc.conf; then cp -p %D/%%ETCDIR%%/cel_odbc.conf-dist %D/%%ETCDIR%%/cel_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_custom.conf; then cp -p %D/%%ETCDIR%%/cel_custom.conf-dist %D/%%ETCDIR%%/cel_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel.conf; then cp -p %D/%%ETCDIR%%/cel.conf-dist %D/%%ETCDIR%%/cel.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_tds.conf; then cp -p %D/%%ETCDIR%%/cdr_tds.conf-dist %D/%%ETCDIR%%/cdr_tds.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/codecs.conf; then cp -p %D/%%ETCDIR%%/codecs.conf-dist %D/%%ETCDIR%%/codecs.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/dnsmgr.conf; then cp -p %D/%%ETCDIR%%/dnsmgr.conf-dist %D/%%ETCDIR%%/dnsmgr.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/dundi.conf; then cp -p %D/%%ETCDIR%%/dundi.conf-dist %D/%%ETCDIR%%/dundi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/enum.conf; then cp -p %D/%%ETCDIR%%/enum.conf-dist %D/%%ETCDIR%%/enum.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extconfig.conf; then cp -p %D/%%ETCDIR%%/extconfig.conf-dist %D/%%ETCDIR%%/extconfig.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.ael; then cp -p %D/%%ETCDIR%%/extensions.ael-dist %D/%%ETCDIR%%/extensions.ael; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.conf; then cp -p %D/%%ETCDIR%%/extensions.conf-dist %D/%%ETCDIR%%/extensions.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/features.conf; then cp -p %D/%%ETCDIR%%/features.conf-dist %D/%%ETCDIR%%/features.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/festival.conf; then cp -p %D/%%ETCDIR%%/festival.conf-dist %D/%%ETCDIR%%/festival.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/iax.conf; then cp -p %D/%%ETCDIR%%/iax.conf-dist %D/%%ETCDIR%%/iax.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/iaxprov.conf; then cp -p %D/%%ETCDIR%%/iaxprov.conf-dist %D/%%ETCDIR%%/iaxprov.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/indications.conf; then cp -p %D/%%ETCDIR%%/indications.conf-dist %D/%%ETCDIR%%/indications.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/logger.conf; then cp -p %D/%%ETCDIR%%/logger.conf-dist %D/%%ETCDIR%%/logger.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/manager.conf; then cp -p %D/%%ETCDIR%%/manager.conf-dist %D/%%ETCDIR%%/manager.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/meetme.conf; then cp -p %D/%%ETCDIR%%/meetme.conf-dist %D/%%ETCDIR%%/meetme.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/mgcp.conf; then cp -p %D/%%ETCDIR%%/mgcp.conf-dist %D/%%ETCDIR%%/mgcp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/misdn.conf; then cp -p %D/%%ETCDIR%%/misdn.conf-dist %D/%%ETCDIR%%/misdn.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/modules.conf; then cp -p %D/%%ETCDIR%%/modules.conf-dist %D/%%ETCDIR%%/modules.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/musiconhold.conf; then cp -p %D/%%ETCDIR%%/musiconhold.conf-dist %D/%%ETCDIR%%/musiconhold.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/osp.conf; then cp -p %D/%%ETCDIR%%/osp.conf-dist %D/%%ETCDIR%%/osp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/oss.conf; then cp -p %D/%%ETCDIR%%/oss.conf-dist %D/%%ETCDIR%%/oss.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/phone.conf; then cp -p %D/%%ETCDIR%%/phone.conf-dist %D/%%ETCDIR%%/phone.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_fax.conf; then cp -p %D/%%ETCDIR%%/res_fax.conf-dist %D/%%ETCDIR%%/res_fax.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/xmpp.conf; then cp -p %D/%%ETCDIR%%/xmpp.conf-dist %D/%%ETCDIR%%/xmpp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_curl.conf; then cp -p %D/%%ETCDIR%%/res_curl.conf-dist %D/%%ETCDIR%%/res_curl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_mysql.conf; then cp -p %D/%%ETCDIR%%/res_config_mysql.conf-dist %D/%%ETCDIR%%/res_config_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_sqlite.conf; then cp -p %D/%%ETCDIR%%/res_config_sqlite.conf-dist %D/%%ETCDIR%%/res_config_sqlite.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_sqlite3.conf; then cp -p %D/%%ETCDIR%%/res_config_sqlite3.conf-dist %D/%%ETCDIR%%/res_config_sqlite3.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_corosync.conf; then cp -p %D/%%ETCDIR%%/res_corosync.conf-dist %D/%%ETCDIR%%/res_corosync.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/queues.conf; then cp -p %D/%%ETCDIR%%/queues.conf-dist %D/%%ETCDIR%%/queues.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_pktccops.conf; then cp -p %D/%%ETCDIR%%/res_pktccops.conf-dist %D/%%ETCDIR%%/res_pktccops.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_pgsql.conf; then cp -p %D/%%ETCDIR%%/res_pgsql.conf-dist %D/%%ETCDIR%%/res_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_odbc.conf; then cp -p %D/%%ETCDIR%%/res_odbc.conf-dist %D/%%ETCDIR%%/res_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/rtp.conf; then cp -p %D/%%ETCDIR%%/rtp.conf-dist %D/%%ETCDIR%%/rtp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sip.conf; then cp -p %D/%%ETCDIR%%/sip.conf-dist %D/%%ETCDIR%%/sip.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sip_notify.conf; then cp -p %D/%%ETCDIR%%/sip_notify.conf-dist %D/%%ETCDIR%%/sip_notify.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/skinny.conf; then cp -p %D/%%ETCDIR%%/skinny.conf-dist %D/%%ETCDIR%%/skinny.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/telcordia-1.adsi; then cp -p %D/%%ETCDIR%%/telcordia-1.adsi-dist %D/%%ETCDIR%%/telcordia-1.adsi; fi -@exec if test ! -e %D/%%ETCDIR%%/voicemail.conf; then cp -p %D/%%ETCDIR%%/voicemail.conf-dist %D/%%ETCDIR%%/voicemail.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/vpb.conf; then cp -p %D/%%ETCDIR%%/vpb.conf-dist %D/%%ETCDIR%%/vpb.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/chan_mobile.conf; then cp -p %D/%%ETCDIR%%/chan_mobile.conf-dist %D/%%ETCDIR%%/chan_mobile.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/chan_dahdi.conf; then cp -p %D/%%ETCDIR%%/chan_dahdi.conf-dist %D/%%ETCDIR%%/chan_dahdi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/udptl.conf; then cp -p %D/%%ETCDIR%%/udptl.conf-dist %D/%%ETCDIR%%/udptl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/users.conf; then cp -p %D/%%ETCDIR%%/users.conf-dist %D/%%ETCDIR%%/users.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/smdi.conf; then cp -p %D/%%ETCDIR%%/smdi.conf-dist %D/%%ETCDIR%%/smdi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sla.conf; then cp -p %D/%%ETCDIR%%/sla.conf-dist %D/%%ETCDIR%%/sla.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/say.conf; then cp -p %D/%%ETCDIR%%/say.conf-dist %D/%%ETCDIR%%/say.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_stun_monitor.conf; then cp -p %D/%%ETCDIR%%/res_stun_monitor.conf-dist %D/%%ETCDIR%%/res_stun_monitor.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_snmp.conf; then cp -p %D/%%ETCDIR%%/res_snmp.conf-dist %D/%%ETCDIR%%/res_snmp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/muted.conf; then cp -p %D/%%ETCDIR%%/muted.conf-dist %D/%%ETCDIR%%/muted.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/jabber.conf; then cp -p %D/%%ETCDIR%%/jabber.conf-dist %D/%%ETCDIR%%/jabber.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/http.conf; then cp -p %D/%%ETCDIR%%/http.conf-dist %D/%%ETCDIR%%/http.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/h323.conf; then cp -p %D/%%ETCDIR%%/h323.conf-dist %D/%%ETCDIR%%/h323.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/gtalk.conf; then cp -p %D/%%ETCDIR%%/gtalk.conf-dist %D/%%ETCDIR%%/gtalk.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/func_odbc.conf; then cp -p %D/%%ETCDIR%%/func_odbc.conf-dist %D/%%ETCDIR%%/func_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/followme.conf; then cp -p %D/%%ETCDIR%%/followme.conf-dist %D/%%ETCDIR%%/followme.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/app_mysql.conf; then cp -p %D/%%ETCDIR%%/app_mysql.conf-dist %D/%%ETCDIR%%/app_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/app_skel.conf; then cp -p %D/%%ETCDIR%%/app_skel.conf-dist %D/%%ETCDIR%%/app_skel.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/amd.conf; then cp -p %D/%%ETCDIR%%/amd.conf-dist %D/%%ETCDIR%%/amd.conf; fi +@sample %%ETCDIR%%/acl.conf.sample +@sample %%ETCDIR%%/cdr_adaptive_odbc.conf.sample +@sample %%ETCDIR%%/cdr_sqlite3_custom.conf.sample +@sample %%ETCDIR%%/cdr_syslog.conf.sample +@sample %%ETCDIR%%/cli.conf.sample +@sample %%ETCDIR%%/cli_aliases.conf.sample +@sample %%ETCDIR%%/cli_permissions.conf.sample +@sample %%ETCDIR%%/confbridge.conf.sample +@sample %%ETCDIR%%/config_test.conf.sample +@sample %%ETCDIR%%/console.conf.sample +@sample %%ETCDIR%%/dbsep.conf.sample +@sample %%ETCDIR%%/dsp.conf.sample +@sample %%ETCDIR%%/extensions.lua.sample +@sample %%ETCDIR%%/extensions_minivm.conf.sample +@sample %%ETCDIR%%/jingle.conf.sample +@sample %%ETCDIR%%/minivm.conf.sample +@sample %%ETCDIR%%/motif.conf.sample +@sample %%ETCDIR%%/ooh323.conf.sample +@sample %%ETCDIR%%/phoneprov.conf.sample +@sample %%ETCDIR%%/queuerules.conf.sample +@sample %%ETCDIR%%/res_ldap.conf.sample +@sample %%ETCDIR%%/unistim.conf.sample +@sample %%ETCDIR%%/adsi.conf.sample +@sample %%ETCDIR%%/agents.conf.sample +@sample %%ETCDIR%%/alarmreceiver.conf.sample +@sample %%ETCDIR%%/alsa.conf.sample +@sample %%ETCDIR%%/asterisk.adsi.sample +@sample %%ETCDIR%%/asterisk.conf.sample +@sample %%ETCDIR%%/calendar.conf.sample +@sample %%ETCDIR%%/ccss.conf.sample +@sample %%ETCDIR%%/cdr.conf.sample +@sample %%ETCDIR%%/cdr_custom.conf.sample +@sample %%ETCDIR%%/cdr_manager.conf.sample +@sample %%ETCDIR%%/cdr_mysql.conf.sample +@sample %%ETCDIR%%/cdr_odbc.conf.sample +@sample %%ETCDIR%%/cdr_pgsql.conf.sample +@sample %%ETCDIR%%/cdr_tds.conf.sample +@sample %%ETCDIR%%/cel.conf.sample +@sample %%ETCDIR%%/cel_custom.conf.sample +@sample %%ETCDIR%%/cel_odbc.conf.sample +@sample %%ETCDIR%%/cel_pgsql.conf.sample +@sample %%ETCDIR%%/cel_sqlite3_custom.conf.sample +@sample %%ETCDIR%%/cel_tds.conf.sample +@sample %%ETCDIR%%/codecs.conf.sample +@sample %%ETCDIR%%/dnsmgr.conf.sample +@sample %%ETCDIR%%/dundi.conf.sample +@sample %%ETCDIR%%/enum.conf.sample +@sample %%ETCDIR%%/extconfig.conf.sample +@sample %%ETCDIR%%/extensions.ael.sample +@sample %%ETCDIR%%/extensions.conf.sample +@sample %%ETCDIR%%/features.conf.sample +@sample %%ETCDIR%%/festival.conf.sample +@sample %%ETCDIR%%/iax.conf.sample +@sample %%ETCDIR%%/iaxprov.conf.sample +@sample %%ETCDIR%%/indications.conf.sample +@sample %%ETCDIR%%/logger.conf.sample +@sample %%ETCDIR%%/manager.conf.sample +@sample %%ETCDIR%%/meetme.conf.sample +@sample %%ETCDIR%%/mgcp.conf.sample +@sample %%ETCDIR%%/misdn.conf.sample +@sample %%ETCDIR%%/modules.conf.sample +@sample %%ETCDIR%%/musiconhold.conf.sample +@sample %%ETCDIR%%/osp.conf.sample +@sample %%ETCDIR%%/oss.conf.sample +@sample %%ETCDIR%%/phone.conf.sample +@sample %%ETCDIR%%/queues.conf.sample +@sample %%ETCDIR%%/res_config_mysql.conf.sample +@sample %%ETCDIR%%/res_config_sqlite3.conf.sample +@sample %%ETCDIR%%/res_corosync.conf.sample +@sample %%ETCDIR%%/res_pgsql.conf.sample +@sample %%ETCDIR%%/res_pktccops.conf.sample +@sample %%ETCDIR%%/res_odbc.conf.sample +@sample %%ETCDIR%%/rtp.conf.sample +@sample %%ETCDIR%%/sip.conf.sample +@sample %%ETCDIR%%/sip_notify.conf.sample +@sample %%ETCDIR%%/skinny.conf.sample +@sample %%ETCDIR%%/telcordia-1.adsi.sample +@sample %%ETCDIR%%/voicemail.conf.sample +@sample %%ETCDIR%%/vpb.conf.sample +@sample %%ETCDIR%%/chan_dahdi.conf.sample +@sample %%ETCDIR%%/chan_mobile.conf.sample +@sample %%ETCDIR%%/udptl.conf.sample +@sample %%ETCDIR%%/users.conf.sample +@sample %%ETCDIR%%/smdi.conf.sample +@sample %%ETCDIR%%/sla.conf.sample +@sample %%ETCDIR%%/say.conf.sample +@sample %%ETCDIR%%/res_snmp.conf.sample +@sample %%ETCDIR%%/res_stun_monitor.conf.sample +@sample %%ETCDIR%%/muted.conf.sample +@sample %%ETCDIR%%/jabber.conf.sample +@sample %%ETCDIR%%/http.conf.sample +@sample %%ETCDIR%%/h323.conf.sample +@sample %%ETCDIR%%/gtalk.conf.sample +@sample %%ETCDIR%%/func_odbc.conf.sample +@sample %%ETCDIR%%/followme.conf.sample +@sample %%ETCDIR%%/amd.conf.sample +@sample %%ETCDIR%%/app_skel.conf.sample +@sample %%ETCDIR%%/app_mysql.conf.sample +@sample %%ETCDIR%%/res_config_sqlite.conf.sample +@sample %%ETCDIR%%/res_curl.conf.sample +@sample %%ETCDIR%%/res_fax.conf.sample +@sample %%ETCDIR%%/xmpp.conf.sample include/asterisk/doxygen/architecture.h include/asterisk/doxygen/asterisk-git-howto.h include/asterisk/doxygen/commits.h From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 23:15:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ECD7F98A; Mon, 15 Dec 2014 23:15: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 BF16DB2F; Mon, 15 Dec 2014 23:15:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFNFb3h071729; Mon, 15 Dec 2014 23:15:37 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFNFbN6071725; Mon, 15 Dec 2014 23:15:37 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412152315.sBFNFbN6071725@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Dec 2014 23:15:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374778 - head/net/asterisk13 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 23:15:38 -0000 Author: madpilot Date: Mon Dec 15 23:15:36 2014 New Revision: 374778 URL: https://svnweb.freebsd.org/changeset/ports/374778 QAT: https://qat.redports.org/buildarchive/r374778/ Log: - Update to 13.1.0 - Fix a mistake in plist Modified: head/net/asterisk13/Makefile head/net/asterisk13/distinfo head/net/asterisk13/pkg-plist Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Mon Dec 15 23:14:50 2014 (r374777) +++ head/net/asterisk13/Makefile Mon Dec 15 23:15:36 2014 (r374778) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.0.2 -PORTREVISION= 1 +PORTVERSION= 13.1.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ Modified: head/net/asterisk13/distinfo ============================================================================== --- head/net/asterisk13/distinfo Mon Dec 15 23:14:50 2014 (r374777) +++ head/net/asterisk13/distinfo Mon Dec 15 23:15:36 2014 (r374778) @@ -1,2 +1,2 @@ -SHA256 (asterisk-13.0.2.tar.gz) = dfaf9d4be3581dc9dfecdfe868b2f119809984743ea42a7abdabd6fa129430fc -SIZE (asterisk-13.0.2.tar.gz) = 56553665 +SHA256 (asterisk-13.1.0.tar.gz) = d4a0943b11f31aa4cb6373ff0edd749919582e67944b526468c20486ec3833c4 +SIZE (asterisk-13.1.0.tar.gz) = 31883979 Modified: head/net/asterisk13/pkg-plist ============================================================================== --- head/net/asterisk13/pkg-plist Mon Dec 15 23:14:50 2014 (r374777) +++ head/net/asterisk13/pkg-plist Mon Dec 15 23:15:36 2014 (r374778) @@ -332,6 +332,7 @@ lib/asterisk/modules/bridge_softmix.so %%ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so %%XMPP%%lib/asterisk/modules/chan_motif.so lib/asterisk/modules/chan_bridge_media.so +%%OOH323%%lib/asterisk/modules/chan_ooh323.so %%PJSIP%%lib/asterisk/modules/chan_pjsip.so lib/asterisk/modules/chan_unistim.so lib/asterisk/modules/codec_g722.so From owner-svn-ports-all@FreeBSD.ORG Mon Dec 15 23:41:01 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ED24EEA2; Mon, 15 Dec 2014 23:41: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 D8FE0D7C; Mon, 15 Dec 2014 23:41:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFNf1qA084588; Mon, 15 Dec 2014 23:41:01 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFNf1q5084587; Mon, 15 Dec 2014 23:41:01 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412152341.sBFNf1q5084587@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Dec 2014 23:41:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374779 - head/devel/git X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2014 23:41:02 -0000 Author: amdmi3 Date: Mon Dec 15 23:41:00 2014 New Revision: 374779 URL: https://svnweb.freebsd.org/changeset/ports/374779 QAT: https://qat.redports.org/buildarchive/r374779/ Log: - Add empty directory to plist PR: 195570 Submitted by: ohauer Approved by: maintainer timeout (wxs, 14 days) Modified: head/devel/git/pkg-plist Modified: head/devel/git/pkg-plist ============================================================================== --- head/devel/git/pkg-plist Mon Dec 15 23:15:36 2014 (r374778) +++ head/devel/git/pkg-plist Mon Dec 15 23:41:00 2014 (r374779) @@ -1345,3 +1345,4 @@ share/git-core/templates/info/exclude %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh %%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir +@dir %%DATADIR%%-core/templates/branches From owner-svn-ports-all@FreeBSD.ORG Tue Dec 16 00:26:00 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C4B8946; Tue, 16 Dec 2014 00:26: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 06CD827A; Tue, 16 Dec 2014 00:26:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBG0Pxg1006544; Tue, 16 Dec 2014 00:25:59 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBG0PxNc006541; Tue, 16 Dec 2014 00:25:59 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201412160025.sBG0PxNc006541@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 16 Dec 2014 00:25:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374780 - in head/java: openjdk6/files openjdk7/files openjdk8/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2014 00:26:00 -0000 Author: jkim Date: Tue Dec 16 00:25:58 2014 New Revision: 374780 URL: https://svnweb.freebsd.org/changeset/ports/374780 QAT: https://qat.redports.org/buildarchive/r374780/ Log: Add an upstream patch to remove adlc's unused class FileBuffRegion. https://bugs.openjdk.java.net/browse/JDK-8041620 Note this is an attempt to fix build with upcoming Clang 3.5. Obtained from: jdk9 Added: head/java/openjdk6/files/patch-remove-FileBuffRegion (contents, props changed) head/java/openjdk7/files/patch-remove-FileBuffRegion (contents, props changed) head/java/openjdk8/files/patch-remove-FileBuffRegion (contents, props changed) Added: head/java/openjdk6/files/patch-remove-FileBuffRegion ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk6/files/patch-remove-FileBuffRegion Tue Dec 16 00:25:58 2014 (r374780) @@ -0,0 +1,270 @@ + +# HG changeset patch +# User lfoltan +# Date 1399384615 14400 +# Node ID 21130eb5768d79c7f3a4ef0b9d976d1942de09ad +# Parent e7a6a3354c8409f739c52ffeb224bb59c1351b64 +8041620: Solaris Studio 12.4 C++ 5.13 change in behavior for placing friend declarations within surrounding scope. +Summary: Remove adlc's unused class FileBuffRegion. +Reviewed-by: coleenp, dholmes, kvn + +diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.cpp +--- hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 08:59:57 2014 -0400 ++++ hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 09:56:55 2014 -0400 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -89,200 +89,6 @@ + return retval; + } + +-//------------------------------FileBuffRegion--------------------------------- +-// Create a new region in a FileBuff. +-FileBuffRegion::FileBuffRegion( FileBuff* bufr, int soln, int ln, +- int off, int len) +-: _bfr(bufr), _sol(soln), _line(ln), _offset(off), _length(len) { +- _next = NULL; // No chained regions +-} +- +-//------------------------------~FileBuffRegion-------------------------------- +-// Delete the entire linked list of buffer regions. +-FileBuffRegion::~FileBuffRegion() { +- if( _next ) delete _next; +-} +- +-//------------------------------copy------------------------------------------- +-// Deep copy a FileBuffRegion +-FileBuffRegion *FileBuffRegion::copy() { +- if( !this ) return NULL; // The empty buffer region +- FileBuffRegion *br = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); +- if( _next ) br->_next = _next->copy(); +- return br; +-} +- +-//------------------------------merge------------------------------------------ +-// Merge another buffer region into this buffer region. Make overlapping areas +-// become a single region. Remove (delete) the input FileBuffRegion. +-// Since the buffer regions are sorted by file offset, this is a varient of a +-// "sorted-merge" running in linear time. +-FileBuffRegion *FileBuffRegion::merge( FileBuffRegion *br ) { +- if( !br ) return this; // Merging nothing +- if( !this ) return br; // Merging into nothing +- +- assert( _bfr == br->_bfr, "" ); // Check for pointer-equivalent buffers +- +- if( _offset < br->_offset ) { // "this" starts before "br" +- if( _offset+_length < br->_offset ) { // "this" ends before "br" +- if( _next ) _next->merge( br ); // Merge with remainder of list +- else _next = br; // No more in this list; just append. +- } else { // Regions overlap. +- int l = br->_offset + br->_length - _offset; +- if( l > _length ) _length = l; // Pick larger region +- FileBuffRegion *nr = br->_next; // Get rest of region +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been subsumed). +- if( nr ) merge( nr ); // Merge with rest of region +- } // End of if regions overlap or not. +- } else { // "this" starts after "br" +- if( br->_offset+br->_length < _offset ) { // "br" ends before "this" +- FileBuffRegion *nr = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); +- nr->_next = _next; // Structure copy "this" guy to "nr" +- *this = *br; // Structure copy "br" over "this". +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been copied) +- merge( nr ); // Finish merging +- } else { // Regions overlap. +- int l = _offset + _length - br->_offset; +- if( l > _length ) _length = l; // Pick larger region +- _offset = br->_offset; // Start with earlier region +- _sol = br->_sol; // Also use earlier line start +- _line = br->_line; // Also use earlier line +- FileBuffRegion *nr = br->_next; // Get rest of region +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been subsumed). +- if( nr ) merge( nr ); // Merge with rest of region +- } // End of if regions overlap or not. +- } +- return this; +-} +- +-//------------------------------expandtab-------------------------------------- +-static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) { +- if( c == '\t' ) { // Tab? +- do os << fill1; // Expand the tab; Output space +- while( (++off) & 7 ); // Expand to tab stop +- } else { // Normal character +- os << fill2; // Display normal character +- off++; // Increment "cursor" offset +- } +- return off; +-} +- +-//------------------------------printline-------------------------------------- +-// Print and highlite a region of a line. Return the amount of highliting left +-// to do (i.e. highlite length minus length of line). +-static int printline( ostream& os, const char *fname, int line, +- const char *_sol, int skip, int len ) { +- +- // Display the entire tab-expanded line +- os << fname << ":" << line << ": "; +- const char *t = strchr(_sol,'\n')+1; // End of line +- int off = 0; // Cursor offset for tab expansion +- const char *s = _sol; // Nice string pointer +- while( t-s ) { // Display whole line +- char c = *s++; // Get next character to display +- off = expandtab(os,off,c,' ',c); +- } +- +- // Display the tab-expanded skippings before underlining. +- os << fname << ":" << line << ": "; +- off = 0; // Cursor offset for tab expansion +- s = _sol; // Restart string pointer +- +- // Start underlining. +- if( skip != -1 ) { // The no-start-indicating flag +- const char *u = _sol+skip; // Amount to skip +- while( u-s ) // Display skipped part +- off = expandtab(os,off,*s++,' ',' '); +- os << '^'; // Start region +- off++; // Moved cursor +- len--; // 1 less char to do +- if( *s++ == '\t' ) // Starting character is a tab? +- off = expandtab(os,off,'\t','-','^'); +- } +- +- // Long region doesn't end on this line +- int llen = (int)(t-s); // Length of line, minus what's already done +- if( len > llen ) { // Doing entire rest of line? +- while( t-s ) // Display rest of line +- off = expandtab(os,off,*s++,'-','-'); +- os << '\n'; // EOL +- return len-llen; // Return what's not yet done. +- } +- +- // Region does end on this line. This code fails subtly if the region ends +- // in a tab character. +- int i; +- for( i=1; iprint(os); // Print region +- brp = brp->_next; // Chain to next +- } +- return os; // Return final stream +-} +- +-//------------------------------print------------------------------------------ +-// Print the FileBuffRegion to a stream. FileBuffRegions are printed with the +-// filename and line number to the left, and complete text lines to the right. +-// Selected portions (portions of a line actually in the FileBuffRegion are +-// underlined. Ellipses are used for long multi-line regions. +-//void FileBuffRegion::print( std::ostream& os ) { +-void FileBuffRegion::print( ostream& os ) { +- if( !this ) return; // Nothing to print +- char *s = _bfr->get_line(); +- int skip = (int)(_offset - _sol); // Amount to skip to start of data +- int len = printline( os, _bfr->_fp->_name, _line, s, skip, _length ); +- +- if( !len ) return; // All done; exit +- +- // Here we require at least 2 lines +- int off1 = _length - len + skip; // Length of line 1 +- int off2 = off1 + _sol; // Offset to start of line 2 +- char *s2 = _bfr->get_line(); // Start of line 2 +- char *s3 = strchr( s2, '\n' )+1; // Start of line 3 (unread) +- if( len <= (s3-s2) ) { // It all fits on the next line +- printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Print&underline +- return; +- } +- +- // Here we require at least 3 lines +- int off3 = off2 + (int)(s3-s2); // Offset to start of line 3 +- s3 = _bfr->get_line(); // Start of line 3 (read) +- const char *s4 = strchr( s3, '\n' )+1;// Start of line 4 (unread) +- if( len < (s4-s3) ) { // It all fits on the next 2 lines +- s2 = _bfr->get_line(); +- len = printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Line 2 +- s3 = _bfr->get_line(); +- printline( os, _bfr->_fp->_name, _line+2, s3, -1, len ); // Line 3 +- return; +- } +- +- // Here we require at least 4 lines. +- // Print only the 1st and last line, with ellipses in middle. +- os << "...\n"; // The ellipses +- int cline = _line+1; // Skipped 2 lines +- do { // Do until find last line +- len -= (int)(s3-s2); // Remove length of line +- cline++; // Next line +- s2 = _bfr->get_line(); // Get next line from end of this line +- s3 = strchr( s2, '\n' ) + 1;// Get end of next line +- } while( len > (s3-s2) ); // Repeat until last line +- printline( os, _bfr->_fp->_name, cline, s2, -1, len ); // Print & underline +-} +- + //------------------------------file_error------------------------------------- + void FileBuff::file_error(int flag, int linenum, const char *fmt, ...) + { +diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.hpp +--- hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 08:59:57 2014 -0400 ++++ hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 09:56:55 2014 -0400 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -46,7 +46,6 @@ + // This class defines a nicely behaved buffer of text. Entire file of text + // is read into buffer at creation, with sentinels at start and end. + class FileBuff { +- friend class FileBuffRegion; + private: + long _bufferSize; // Size of text holding buffer. + long _offset; // Expected filepointer offset. +@@ -82,29 +81,4 @@ + // when the pointer is valid (i.e. just obtained from getline()). + long getoff(const char* s) { return _bufoff + (long)(s - _buf); } + }; +- +-//------------------------------FileBuffRegion--------------------------------- +-// A buffer region is really a region of some file, specified as a linked list +-// of offsets and lengths. These regions can be merged; overlapping regions +-// will coalesce. +-class FileBuffRegion { +- public: // Workaround dev-studio friend/private bug +- FileBuffRegion *_next; // Linked list of regions sorted by offset. +- private: +- FileBuff *_bfr; // The Buffer of the file +- int _offset, _length; // The file area +- int _sol; // Start of line where the file area starts +- int _line; // First line of region +- +- public: +- FileBuffRegion(FileBuff*, int sol, int line, int offset, int len); +- ~FileBuffRegion(); +- +- FileBuffRegion *copy(); // Deep copy +- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input +- +- void print(ostream&); +- friend ostream& operator<< (ostream&, FileBuffRegion&); +-}; +- + #endif // SHARE_VM_ADLC_FILEBUFF_HPP + Added: head/java/openjdk7/files/patch-remove-FileBuffRegion ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-remove-FileBuffRegion Tue Dec 16 00:25:58 2014 (r374780) @@ -0,0 +1,270 @@ + +# HG changeset patch +# User lfoltan +# Date 1399384615 14400 +# Node ID 21130eb5768d79c7f3a4ef0b9d976d1942de09ad +# Parent e7a6a3354c8409f739c52ffeb224bb59c1351b64 +8041620: Solaris Studio 12.4 C++ 5.13 change in behavior for placing friend declarations within surrounding scope. +Summary: Remove adlc's unused class FileBuffRegion. +Reviewed-by: coleenp, dholmes, kvn + +diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.cpp +--- hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 08:59:57 2014 -0400 ++++ hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 09:56:55 2014 -0400 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -89,200 +89,6 @@ + return retval; + } + +-//------------------------------FileBuffRegion--------------------------------- +-// Create a new region in a FileBuff. +-FileBuffRegion::FileBuffRegion( FileBuff* bufr, int soln, int ln, +- int off, int len) +-: _bfr(bufr), _sol(soln), _line(ln), _offset(off), _length(len) { +- _next = NULL; // No chained regions +-} +- +-//------------------------------~FileBuffRegion-------------------------------- +-// Delete the entire linked list of buffer regions. +-FileBuffRegion::~FileBuffRegion() { +- if( _next ) delete _next; +-} +- +-//------------------------------copy------------------------------------------- +-// Deep copy a FileBuffRegion +-FileBuffRegion *FileBuffRegion::copy() { +- if( !this ) return NULL; // The empty buffer region +- FileBuffRegion *br = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); +- if( _next ) br->_next = _next->copy(); +- return br; +-} +- +-//------------------------------merge------------------------------------------ +-// Merge another buffer region into this buffer region. Make overlapping areas +-// become a single region. Remove (delete) the input FileBuffRegion. +-// Since the buffer regions are sorted by file offset, this is a varient of a +-// "sorted-merge" running in linear time. +-FileBuffRegion *FileBuffRegion::merge( FileBuffRegion *br ) { +- if( !br ) return this; // Merging nothing +- if( !this ) return br; // Merging into nothing +- +- assert( _bfr == br->_bfr, "" ); // Check for pointer-equivalent buffers +- +- if( _offset < br->_offset ) { // "this" starts before "br" +- if( _offset+_length < br->_offset ) { // "this" ends before "br" +- if( _next ) _next->merge( br ); // Merge with remainder of list +- else _next = br; // No more in this list; just append. +- } else { // Regions overlap. +- int l = br->_offset + br->_length - _offset; +- if( l > _length ) _length = l; // Pick larger region +- FileBuffRegion *nr = br->_next; // Get rest of region +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been subsumed). +- if( nr ) merge( nr ); // Merge with rest of region +- } // End of if regions overlap or not. +- } else { // "this" starts after "br" +- if( br->_offset+br->_length < _offset ) { // "br" ends before "this" +- FileBuffRegion *nr = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); +- nr->_next = _next; // Structure copy "this" guy to "nr" +- *this = *br; // Structure copy "br" over "this". +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been copied) +- merge( nr ); // Finish merging +- } else { // Regions overlap. +- int l = _offset + _length - br->_offset; +- if( l > _length ) _length = l; // Pick larger region +- _offset = br->_offset; // Start with earlier region +- _sol = br->_sol; // Also use earlier line start +- _line = br->_line; // Also use earlier line +- FileBuffRegion *nr = br->_next; // Get rest of region +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been subsumed). +- if( nr ) merge( nr ); // Merge with rest of region +- } // End of if regions overlap or not. +- } +- return this; +-} +- +-//------------------------------expandtab-------------------------------------- +-static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) { +- if( c == '\t' ) { // Tab? +- do os << fill1; // Expand the tab; Output space +- while( (++off) & 7 ); // Expand to tab stop +- } else { // Normal character +- os << fill2; // Display normal character +- off++; // Increment "cursor" offset +- } +- return off; +-} +- +-//------------------------------printline-------------------------------------- +-// Print and highlite a region of a line. Return the amount of highliting left +-// to do (i.e. highlite length minus length of line). +-static int printline( ostream& os, const char *fname, int line, +- const char *_sol, int skip, int len ) { +- +- // Display the entire tab-expanded line +- os << fname << ":" << line << ": "; +- const char *t = strchr(_sol,'\n')+1; // End of line +- int off = 0; // Cursor offset for tab expansion +- const char *s = _sol; // Nice string pointer +- while( t-s ) { // Display whole line +- char c = *s++; // Get next character to display +- off = expandtab(os,off,c,' ',c); +- } +- +- // Display the tab-expanded skippings before underlining. +- os << fname << ":" << line << ": "; +- off = 0; // Cursor offset for tab expansion +- s = _sol; // Restart string pointer +- +- // Start underlining. +- if( skip != -1 ) { // The no-start-indicating flag +- const char *u = _sol+skip; // Amount to skip +- while( u-s ) // Display skipped part +- off = expandtab(os,off,*s++,' ',' '); +- os << '^'; // Start region +- off++; // Moved cursor +- len--; // 1 less char to do +- if( *s++ == '\t' ) // Starting character is a tab? +- off = expandtab(os,off,'\t','-','^'); +- } +- +- // Long region doesn't end on this line +- int llen = (int)(t-s); // Length of line, minus what's already done +- if( len > llen ) { // Doing entire rest of line? +- while( t-s ) // Display rest of line +- off = expandtab(os,off,*s++,'-','-'); +- os << '\n'; // EOL +- return len-llen; // Return what's not yet done. +- } +- +- // Region does end on this line. This code fails subtly if the region ends +- // in a tab character. +- int i; +- for( i=1; iprint(os); // Print region +- brp = brp->_next; // Chain to next +- } +- return os; // Return final stream +-} +- +-//------------------------------print------------------------------------------ +-// Print the FileBuffRegion to a stream. FileBuffRegions are printed with the +-// filename and line number to the left, and complete text lines to the right. +-// Selected portions (portions of a line actually in the FileBuffRegion are +-// underlined. Ellipses are used for long multi-line regions. +-//void FileBuffRegion::print( std::ostream& os ) { +-void FileBuffRegion::print( ostream& os ) { +- if( !this ) return; // Nothing to print +- char *s = _bfr->get_line(); +- int skip = (int)(_offset - _sol); // Amount to skip to start of data +- int len = printline( os, _bfr->_fp->_name, _line, s, skip, _length ); +- +- if( !len ) return; // All done; exit +- +- // Here we require at least 2 lines +- int off1 = _length - len + skip; // Length of line 1 +- int off2 = off1 + _sol; // Offset to start of line 2 +- char *s2 = _bfr->get_line(); // Start of line 2 +- char *s3 = strchr( s2, '\n' )+1; // Start of line 3 (unread) +- if( len <= (s3-s2) ) { // It all fits on the next line +- printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Print&underline +- return; +- } +- +- // Here we require at least 3 lines +- int off3 = off2 + (int)(s3-s2); // Offset to start of line 3 +- s3 = _bfr->get_line(); // Start of line 3 (read) +- const char *s4 = strchr( s3, '\n' )+1;// Start of line 4 (unread) +- if( len < (s4-s3) ) { // It all fits on the next 2 lines +- s2 = _bfr->get_line(); +- len = printline( os, _bfr->_fp->_name, _line+1, s2, -1, len ); // Line 2 +- s3 = _bfr->get_line(); +- printline( os, _bfr->_fp->_name, _line+2, s3, -1, len ); // Line 3 +- return; +- } +- +- // Here we require at least 4 lines. +- // Print only the 1st and last line, with ellipses in middle. +- os << "...\n"; // The ellipses +- int cline = _line+1; // Skipped 2 lines +- do { // Do until find last line +- len -= (int)(s3-s2); // Remove length of line +- cline++; // Next line +- s2 = _bfr->get_line(); // Get next line from end of this line +- s3 = strchr( s2, '\n' ) + 1;// Get end of next line +- } while( len > (s3-s2) ); // Repeat until last line +- printline( os, _bfr->_fp->_name, cline, s2, -1, len ); // Print & underline +-} +- + //------------------------------file_error------------------------------------- + void FileBuff::file_error(int flag, int linenum, const char *fmt, ...) + { +diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.hpp +--- hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 08:59:57 2014 -0400 ++++ hotspot/src/share/vm/adlc/filebuff.hpp Tue May 06 09:56:55 2014 -0400 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -46,7 +46,6 @@ + // This class defines a nicely behaved buffer of text. Entire file of text + // is read into buffer at creation, with sentinels at start and end. + class FileBuff { +- friend class FileBuffRegion; + private: + long _bufferSize; // Size of text holding buffer. + long _offset; // Expected filepointer offset. +@@ -82,29 +81,4 @@ + // when the pointer is valid (i.e. just obtained from getline()). + long getoff(const char* s) { return _bufoff + (long)(s - _buf); } + }; +- +-//------------------------------FileBuffRegion--------------------------------- +-// A buffer region is really a region of some file, specified as a linked list +-// of offsets and lengths. These regions can be merged; overlapping regions +-// will coalesce. +-class FileBuffRegion { +- public: // Workaround dev-studio friend/private bug +- FileBuffRegion *_next; // Linked list of regions sorted by offset. +- private: +- FileBuff *_bfr; // The Buffer of the file +- int _offset, _length; // The file area +- int _sol; // Start of line where the file area starts +- int _line; // First line of region +- +- public: +- FileBuffRegion(FileBuff*, int sol, int line, int offset, int len); +- ~FileBuffRegion(); +- +- FileBuffRegion *copy(); // Deep copy +- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input +- +- void print(ostream&); +- friend ostream& operator<< (ostream&, FileBuffRegion&); +-}; +- + #endif // SHARE_VM_ADLC_FILEBUFF_HPP + Added: head/java/openjdk8/files/patch-remove-FileBuffRegion ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-remove-FileBuffRegion Tue Dec 16 00:25:58 2014 (r374780) @@ -0,0 +1,270 @@ + +# HG changeset patch +# User lfoltan +# Date 1399384615 14400 +# Node ID 21130eb5768d79c7f3a4ef0b9d976d1942de09ad +# Parent e7a6a3354c8409f739c52ffeb224bb59c1351b64 +8041620: Solaris Studio 12.4 C++ 5.13 change in behavior for placing friend declarations within surrounding scope. +Summary: Remove adlc's unused class FileBuffRegion. +Reviewed-by: coleenp, dholmes, kvn + +diff -r e7a6a3354c84 -r 21130eb5768d src/share/vm/adlc/filebuff.cpp +--- hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 08:59:57 2014 -0400 ++++ hotspot/src/share/vm/adlc/filebuff.cpp Tue May 06 09:56:55 2014 -0400 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -89,200 +89,6 @@ + return retval; + } + +-//------------------------------FileBuffRegion--------------------------------- +-// Create a new region in a FileBuff. +-FileBuffRegion::FileBuffRegion( FileBuff* bufr, int soln, int ln, +- int off, int len) +-: _bfr(bufr), _sol(soln), _line(ln), _offset(off), _length(len) { +- _next = NULL; // No chained regions +-} +- +-//------------------------------~FileBuffRegion-------------------------------- +-// Delete the entire linked list of buffer regions. +-FileBuffRegion::~FileBuffRegion() { +- if( _next ) delete _next; +-} +- +-//------------------------------copy------------------------------------------- +-// Deep copy a FileBuffRegion +-FileBuffRegion *FileBuffRegion::copy() { +- if( !this ) return NULL; // The empty buffer region +- FileBuffRegion *br = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); +- if( _next ) br->_next = _next->copy(); +- return br; +-} +- +-//------------------------------merge------------------------------------------ +-// Merge another buffer region into this buffer region. Make overlapping areas +-// become a single region. Remove (delete) the input FileBuffRegion. +-// Since the buffer regions are sorted by file offset, this is a varient of a +-// "sorted-merge" running in linear time. +-FileBuffRegion *FileBuffRegion::merge( FileBuffRegion *br ) { +- if( !br ) return this; // Merging nothing +- if( !this ) return br; // Merging into nothing +- +- assert( _bfr == br->_bfr, "" ); // Check for pointer-equivalent buffers +- +- if( _offset < br->_offset ) { // "this" starts before "br" +- if( _offset+_length < br->_offset ) { // "this" ends before "br" +- if( _next ) _next->merge( br ); // Merge with remainder of list +- else _next = br; // No more in this list; just append. +- } else { // Regions overlap. +- int l = br->_offset + br->_length - _offset; +- if( l > _length ) _length = l; // Pick larger region +- FileBuffRegion *nr = br->_next; // Get rest of region +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been subsumed). +- if( nr ) merge( nr ); // Merge with rest of region +- } // End of if regions overlap or not. +- } else { // "this" starts after "br" +- if( br->_offset+br->_length < _offset ) { // "br" ends before "this" +- FileBuffRegion *nr = new FileBuffRegion(_bfr,_sol,_line,_offset,_length); +- nr->_next = _next; // Structure copy "this" guy to "nr" +- *this = *br; // Structure copy "br" over "this". +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been copied) +- merge( nr ); // Finish merging +- } else { // Regions overlap. +- int l = _offset + _length - br->_offset; +- if( l > _length ) _length = l; // Pick larger region +- _offset = br->_offset; // Start with earlier region +- _sol = br->_sol; // Also use earlier line start +- _line = br->_line; // Also use earlier line +- FileBuffRegion *nr = br->_next; // Get rest of region +- br->_next = NULL; // Remove indication of rest of region +- delete br; // Delete this region (it's been subsumed). +- if( nr ) merge( nr ); // Merge with rest of region +- } // End of if regions overlap or not. +- } +- return this; +-} +- +-//------------------------------expandtab-------------------------------------- +-static int expandtab( ostream &os, int off, char c, char fill1, char fill2 ) { +- if( c == '\t' ) { // Tab? +- do os << fill1; // Expand the tab; Output space +- while( (++off) & 7 ); // Expand to tab stop +- } else { // Normal character +- os << fill2; // Display normal character +- off++; // Increment "cursor" offset +- } +- return off; +-} +- +-//------------------------------printline-------------------------------------- +-// Print and highlite a region of a line. Return the amount of highliting left +-// to do (i.e. highlite length minus length of line). +-static int printline( ostream& os, const char *fname, int line, +- const char *_sol, int skip, int len ) { +- +- // Display the entire tab-expanded line +- os << fname << ":" << line << ": "; +- const char *t = strchr(_sol,'\n')+1; // End of line +- int off = 0; // Cursor offset for tab expansion +- const char *s = _sol; // Nice string pointer +- while( t-s ) {