Update to 2.1

PR:		88334
Submitted by:	Andrew Pantyukhin <infofarmer@gmail.com>
This commit is contained in:
Tilman Keskinoz 2005-11-01 16:15:13 +00:00
parent 32265c2b86
commit 712f887db2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=146923
3 changed files with 13 additions and 46 deletions

View file

@ -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

View file

@ -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

View file

@ -1,45 +1,13 @@
$FreeBSD$
--- 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 <sys/param.h>
+
#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 <malloc.h>
+#endif /* !BSD */
#include <unistd.h>
#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 */