From 6b7dec501983227b4a08f9b076ffa32ac76b5ba8 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Tue, 19 Mar 2002 19:45:15 +0000
Subject: [PATCH] Re-add xautolock as a port. It was removed from main tree
 because of its GPL license. Ok brad@

---
 x11/xautolock/Makefile                   | 31 +++++++++++++-----------
 x11/xautolock/distinfo                   |  3 +++
 x11/xautolock/patches/patch-src_engine_c | 20 +++++++++++++++
 x11/xautolock/pkg/DESCR                  | 12 +++++++++
 x11/xautolock/pkg/PLIST                  |  3 +++
 5 files changed, 55 insertions(+), 14 deletions(-)
 create mode 100644 x11/xautolock/distinfo
 create mode 100644 x11/xautolock/patches/patch-src_engine_c
 create mode 100644 x11/xautolock/pkg/DESCR
 create mode 100644 x11/xautolock/pkg/PLIST

diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 1263add59bc..7d980561cef 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -1,21 +1,24 @@
-# $OpenBSD: Makefile,v 1.8 2001/01/05 16:36:01 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2002/03/19 19:45:15 matthieu Exp $
 
-DISTNAME=	xautolock-pl11
-CATEGORIES=	x11
-NEED_VERSION=	1.336
-MASTER_SITES=	ftp://ftp.science.unitn.it/pub/unix/X11/utilities/
+DISTNAME=		xautolock-2.1
+EXTRACT_SUFX=          .tgz
+CATEGORIES=		x11
+NEED_VERSION=		1.511
+MASTER_SITES=		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=     X11/screensavers
 
-MAINTAINER=	Thomas Graichen <graichen@openbsd.org>
+COMMENT= 		fire up programs in case of user inactivity under X
+HOMEPAGE=		http://freshmeat.net/projects/xautolock/
 
-PERMIT_PACKAGE_CDROM=	No
-PERMIT_PACKAGE_FTP=	No
-PERMIT_DISTFILES_CDROM=	No
-PERMIT_DISTFILES_FTP=	No
-
-COMES_WITH=	2.3
-
-COMMENT=-fire up programs in case of user inactivity under X
+MAINTAINER=		Matthieu Herrb <matthieu@openbsd.org>
 
+# License: GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
+USE_X11=		Yes
+CONFIGURE_STYLE=        imake
 
 .include <bsd.port.mk>
diff --git a/x11/xautolock/distinfo b/x11/xautolock/distinfo
new file mode 100644
index 00000000000..906dc24c2bb
--- /dev/null
+++ b/x11/xautolock/distinfo
@@ -0,0 +1,3 @@
+MD5 (xautolock-2.1.tgz) = 35c22fd9748f872fdb3ce8d861951704
+RMD160 (xautolock-2.1.tgz) = 275fca497e82e9907c25af5af002781c2f8bcf12
+SHA1 (xautolock-2.1.tgz) = 6ea91208ba3edbc3a28eb78485f23b678a4c2aee
diff --git a/x11/xautolock/patches/patch-src_engine_c b/x11/xautolock/patches/patch-src_engine_c
new file mode 100644
index 00000000000..5bea1769914
--- /dev/null
+++ b/x11/xautolock/patches/patch-src_engine_c
@@ -0,0 +1,20 @@
+--- src/engine.c.orig
++++ src/engine.c
+@@ -209,7 +209,7 @@
+ #else /* VMS */
+   if (lockerPid)
+   {
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
++#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) && !defined(__OpenBSD__)
+     union wait  status;      /* childs process status */
+ #else /* !UTEKV && !SYSV && !SVR4 */
+     int         status = 0;  /* childs process status */
+@@ -220,7 +220,7 @@
+       (void) kill (lockerPid, SIGTERM);
+     }
+ 
+-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
++#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4) && !defined(__OpenBSD__) 
+     if (wait3 (&status, WNOHANG, 0))
+ #else /* !UTEKV && !SYSV && !SVR4 */
+     if (waitpid (-1, &status, WNOHANG)) 
diff --git a/x11/xautolock/pkg/DESCR b/x11/xautolock/pkg/DESCR
new file mode 100644
index 00000000000..1a8b279a5be
--- /dev/null
+++ b/x11/xautolock/pkg/DESCR
@@ -0,0 +1,12 @@
+Xautolock  monitors  console activity  under the X window system, and
+fires  up  a  program  of your choice if  nothing  happens  during  a
+user configurable  period of time.  You can use this to automatically
+start up a screen locker in case you tend to forget to do so manually
+before having a coffee break.
+
+Xautolock  will  typically  be used to lock the screen but it  really
+doesn't care what program you make it start. The only real assumption
+made  by  xautolock  is that  a new countdown  starts  as soon as the
+locker exits. 
+
+ 
diff --git a/x11/xautolock/pkg/PLIST b/x11/xautolock/pkg/PLIST
new file mode 100644
index 00000000000..cc7da68ca15
--- /dev/null
+++ b/x11/xautolock/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.3 2002/03/19 19:45:16 matthieu Exp $
+bin/xautolock
+man/cat1/xautolock.0