From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 24 11:00:10 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C6B31065670 for ; Sun, 24 May 2009 11:00:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1DE658FC24 for ; Sun, 24 May 2009 11:00:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OB09ER061982 for ; Sun, 24 May 2009 11:00:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n4OB099q061981; Sun, 24 May 2009 11:00:09 GMT (envelope-from gnats) Resent-Date: Sun, 24 May 2009 11:00:09 GMT Resent-Message-Id: <200905241100.n4OB099q061981@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alexander V. Chernikov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8C73106564A for ; Sun, 24 May 2009 10:53:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id C75008FC1B for ; Sun, 24 May 2009 10:53:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OArnB6086602 for ; Sun, 24 May 2009 10:53:49 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n4OArnst086590; Sun, 24 May 2009 10:53:49 GMT (envelope-from nobody) Message-Id: <200905241053.n4OArnst086590@www.freebsd.org> Date: Sun, 24 May 2009 10:53:49 GMT From: "Alexander V. Chernikov" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/134905: [maintainer update] devel/ptlib26 fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 May 2009 11:00:10 -0000 >Number: 134905 >Category: ports >Synopsis: [maintainer update] devel/ptlib26 fix >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun May 24 11:00:09 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Alexander V. Chernikov >Release: FreeBSD 8.0-CURRENT >Organization: >Environment: FreeBSD ws.ipfw.ru 8.0-CURRENT FreeBSD 8.0-CURRENT #3: Sun Apr 19 15:40:34 MSD 2009 root@ws.su29.net:/usr/obj/usr/src/sys/WS amd64 >Description: Please remove following files incorrectly added by repocopy in ports/134365 files/patch-plugins_vidinput_bsd_h files/patch-src__ptlib__unix__tlib.cxx files/patch-src__ptlib__unix__tlibthrd.cxx >How-To-Repeat: >Fix: Apply attached patch Patch attached with submission follows: diff -urN ptlib26.orig/Makefile ptlib26/Makefile --- ptlib26.orig/Makefile 2009-05-17 03:17:11.000000000 +0400 +++ ptlib26/Makefile 2009-05-24 14:47:46.000000000 +0400 @@ -7,6 +7,7 @@ PORTNAME= ptlib PORTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/ptlib/2.6 diff -urN ptlib26.orig/files/patch-plugins_vidinput_bsd_h ptlib26/files/patch-plugins_vidinput_bsd_h --- ptlib26.orig/files/patch-plugins_vidinput_bsd_h 2009-02-23 21:53:25.000000000 +0300 +++ ptlib26/files/patch-plugins_vidinput_bsd_h 1970-01-01 03:00:00.000000000 +0300 @@ -1,22 +0,0 @@ ---- plugins/vidinput_bsd/vidinput_bsd.h.orig 2009-01-12 06:52:59.000000000 +0800 -+++ plugins/vidinput_bsd/vidinput_bsd.h 2009-02-23 16:33:18.000000000 +0800 -@@ -17,8 +17,10 @@ - #include - # if __FreeBSD_version >= 502100 - #include -+#include - # else - #include -+#include - # endif - #endif - -@@ -62,7 +64,7 @@ public: - - static PStringList GetInputDeviceNames(); - -- PStringList GetDeviceNames() const -+ PStringArray GetDeviceNames() const - { return GetInputDeviceNames(); } - - PINDEX GetMaxFrameBytes(); diff -urN ptlib26.orig/files/patch-src__ptlib__unix__tlib.cxx ptlib26/files/patch-src__ptlib__unix__tlib.cxx --- ptlib26.orig/files/patch-src__ptlib__unix__tlib.cxx 2009-02-21 22:01:07.000000000 +0300 +++ ptlib26/files/patch-src__ptlib__unix__tlib.cxx 1970-01-01 03:00:00.000000000 +0300 @@ -1,11 +0,0 @@ ---- ./src/ptlib/unix/tlib.cxx.orig 2009-02-14 22:02:51.000000000 +0100 -+++ ./src/ptlib/unix/tlib.cxx 2009-02-14 22:03:09.000000000 +0100 -@@ -400,7 +400,7 @@ - { - if (PProcessInstance != NULL) { - PWaitAndSignal m(PProcessInstance->threadMutex); -- PThread & thread = PProcessInstance->activeThreads[(unsigned)id]; -+ PThread & thread = PProcessInstance->activeThreads[(unsigned long)id]; - return thread.GetThreadName(); - } - return psprintf("%08x", id); diff -urN ptlib26.orig/files/patch-src__ptlib__unix__tlibthrd.cxx ptlib26/files/patch-src__ptlib__unix__tlibthrd.cxx --- ptlib26.orig/files/patch-src__ptlib__unix__tlibthrd.cxx 2009-02-21 22:01:07.000000000 +0300 +++ ptlib26/files/patch-src__ptlib__unix__tlibthrd.cxx 1970-01-01 03:00:00.000000000 +0300 @@ -1,47 +0,0 @@ ---- ./src/ptlib/unix/tlibthrd.cxx.orig 2009-02-14 22:04:11.000000000 +0100 -+++ ./src/ptlib/unix/tlibthrd.cxx 2009-02-14 22:04:18.000000000 +0100 -@@ -216,7 +216,7 @@ - { - PWaitAndSignal m(threadMutex); - -- if (!activeThreads.Contains((unsigned)id)) -+ if (!activeThreads.Contains((unsigned long)id)) - return PFalse; - - return pthread_kill(id, sig) == 0; -@@ -254,7 +254,7 @@ - #endif - - ((PProcess *)this)->activeThreads.DisallowDeleteObjects(); -- ((PProcess *)this)->activeThreads.SetAt((unsigned)PX_threadId, this); -+ ((PProcess *)this)->activeThreads.SetAt((unsigned long)PX_threadId, this); - - PX_firstTimeStart = PFalse; - } -@@ -370,7 +370,7 @@ - PAssertPTHREAD(pthread_create, (&PX_threadId, &threadAttr, PX_ThreadStart, this)); - - // put the thread into the thread list -- process.activeThreads.SetAt((unsigned)PX_threadId, this); -+ process.activeThreads.SetAt((unsigned long)PX_threadId, this); - if (process.activeThreads.GetSize() > highWaterMark) - newHighWaterMark = highWaterMark = process.activeThreads.GetSize(); - -@@ -693,7 +693,7 @@ - { - PProcess & process = PProcess::Current(); - process.threadMutex.Wait(); -- PThread * thread = process.activeThreads.GetAt((unsigned)pthread_self()); -+ PThread * thread = process.activeThreads.GetAt((unsigned long)pthread_self()); - process.threadMutex.Signal(); - return thread; - } -@@ -834,7 +834,7 @@ - } - - // remove this thread from the active thread list -- process.activeThreads.SetAt((unsigned)id, NULL); -+ process.activeThreads.SetAt((unsigned long)id, NULL); - - // delete the thread if required, note this is done this way to avoid - // a race condition, the thread ID cannot be zeroed before the if! >Release-Note: >Audit-Trail: >Unformatted: