From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 1 15:40:43 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D8D416A421 for ; Tue, 1 Nov 2005 15:40:43 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D48A243D5E for ; Tue, 1 Nov 2005 15:40:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jA1FeHIb007247 for ; Tue, 1 Nov 2005 15:40:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jA1FeHuB007246; Tue, 1 Nov 2005 15:40:17 GMT (envelope-from gnats) Resent-Date: Tue, 1 Nov 2005 15:40:17 GMT Resent-Message-Id: <200511011540.jA1FeHuB007246@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, infofarmer@gmail.com Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C5A2616A41F for ; Tue, 1 Nov 2005 15:30:13 +0000 (GMT) (envelope-from sat@proxy.gubkin.ru) Received: from proxy.gubkin.ru (proxy.gubkin.ru [193.233.78.245]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93FAD43D46 for ; Tue, 1 Nov 2005 15:30:12 +0000 (GMT) (envelope-from sat@proxy.gubkin.ru) Received: from proxy.gubkin.ru (localhost [127.0.0.1]) by proxy.gubkin.ru (8.13.3/8.13.3) with ESMTP id jA1FU8gn022683 for ; Tue, 1 Nov 2005 18:30:08 +0300 (MSK) (envelope-from sat@proxy.gubkin.ru) Received: (from sat@localhost) by proxy.gubkin.ru (8.13.3/8.13.3/Submit) id jA1FU7sN022682; Tue, 1 Nov 2005 18:30:07 +0300 (MSK) (envelope-from sat) Message-Id: <200511011530.jA1FU7sN022682@proxy.gubkin.ru> Date: Tue, 1 Nov 2005 18:30:07 +0300 (MSK) From: Andrew Pantyukhin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/88334: update x11/xautolock to 2.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: infofarmer@gmail.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Nov 2005 15:40:43 -0000 >Number: 88334 >Category: ports >Synopsis: update x11/xautolock to 2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Nov 01 15:40:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrew Pantyukhin >Release: FreeBSD 5.4-RELEASE-p8 i386 >Organization: >Environment: System: FreeBSD proxy.gubkin.ru 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #6: Thu Oct 20 19:33:42 MSD 2005 sat@proxy.gubkin.ru:/usr/obj/usr/src/sys/SATPROXYGUB i386 >Description: - Update to 2.1 - Select more appropriate MASTER_SITES >How-To-Repeat: >Fix: --- xautolock.diff begins here --- diff -urN /usr/ports/x11/xautolock/Makefile xautolock/Makefile --- /usr/ports/x11/xautolock/Makefile Mon Feb 14 18:43:10 2005 +++ xautolock/Makefile Tue Nov 1 18:23:51 2005 @@ -6,11 +6,10 @@ # PORTNAME= xautolock -PORTVERSION= 1.15 +PORTVERSION= 2.1 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= applications -DISTNAME= ${PORTNAME}-pl15 +MASTER_SITES= ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR= X11/screensavers EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org diff -urN /usr/ports/x11/xautolock/distinfo xautolock/distinfo --- /usr/ports/x11/xautolock/distinfo Wed Mar 31 07:12:42 2004 +++ xautolock/distinfo Tue Nov 1 16:38:06 2005 @@ -1,2 +1,2 @@ -MD5 (xautolock-pl15.tgz) = 927c6dcbec6fa3c38dac359bd4ba41f4 -SIZE (xautolock-pl15.tgz) = 39240 +MD5 (xautolock-2.1.tgz) = 35c22fd9748f872fdb3ce8d861951704 +SIZE (xautolock-2.1.tgz) = 33789 diff -urN /usr/ports/x11/xautolock/files/patch-aa xautolock/files/patch-aa --- /usr/ports/x11/xautolock/files/patch-aa Sun Aug 22 19:46:35 2004 +++ xautolock/files/patch-aa Tue Nov 1 17:57:25 2005 @@ -1,45 +1,13 @@ - -$FreeBSD: ports/x11/xautolock/files/patch-aa,v 1.3 2004/08/22 15:46:35 krion Exp $ - ---- xautolock.c.orig Thu Mar 11 23:43:25 1999 -+++ xautolock.c Sun Aug 22 17:45:10 2004 -@@ -297,6 +297,8 @@ - * with vroot.h, because it needs to know the real root window. - */ - -+#include -+ - #if defined(hpux) || defined (__hpux) - #ifndef _HPUX_SOURCE - #define _HPUX_SOURCE -@@ -368,7 +370,9 @@ - #endif /* !NOSTDHDRS */ - - #if !defined (apollo) && !defined (VMS) -+#if !defined (BSD) - #include -+#endif /* !BSD */ - #include - #endif /* !apollo && !VMS */ - -@@ -1970,7 +1974,8 @@ - #ifdef __GNUC__ - default: /* Makes gcc -Wall shut up. */ - #endif /* __GNUC__ */ -- } -+ break; -+ } - } - } - else -@@ -2028,7 +2033,9 @@ +--- src/engine.c.orig Tue Nov 1 16:57:31 2005 ++++ src/engine.c Tue Nov 1 17:11:51 2005 +@@ -209,7 +209,9 @@ #else /* VMS */ - if (locker_pid) + if (lockerPid) { --#if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) -+#if defined (BSD) -+ int status; -+#elif !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) +-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) ++#if defined (__FreeBSD__) ++ int status; ++#elif !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) union wait status; /* childs process status */ #else /* !UTEKV && !SYSV && !SVR4 */ int status = 0; /* childs process status */ --- xautolock.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: