diff options
author | mjl <mjl> | 1999-04-05 22:46:27 +0000 |
---|---|---|
committer | mjl <mjl> | 1999-04-05 22:46:27 +0000 |
commit | ae95f7a5d1235013cce4f28932b6ecba59e20d8c (patch) | |
tree | 6316da2f8d2ad5cf10fee6fb81e79029697ba878 | |
parent | 1f0bc2fa475ed9a7213c30c4afdadbcf5899e13d (diff) | |
download | pkgsrc-ae95f7a5d1235013cce4f28932b6ecba59e20d8c.tar.gz |
Updated xautolock to pl15, as the old pl10 is no longer available.
-rw-r--r-- | x11/xautolock/Makefile | 12 | ||||
-rw-r--r-- | x11/xautolock/files/md5 | 4 | ||||
-rw-r--r-- | x11/xautolock/patches/patch-aa | 82 | ||||
-rw-r--r-- | x11/xautolock/pkg/PLIST | 5 |
4 files changed, 47 insertions, 56 deletions
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile index c66bb323642..32931f8222d 100644 --- a/x11/xautolock/Makefile +++ b/x11/xautolock/Makefile @@ -1,16 +1,20 @@ -# $NetBSD: Makefile,v 1.7 1998/06/22 13:21:03 agc Exp $ +# $NetBSD: Makefile,v 1.8 1999/04/05 22:46:27 mjl Exp $ # FreeBSD Id: Makefile,v 1.2 1996/11/18 09:55:42 asami Exp # -DISTNAME= xautolock.pl10 -PKGNAME= xautolock-1.10 +DISTNAME= xautolock-pl15 +PKGNAME= xautolock-1.15 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications -EXTRACT_SUFX= .tz +EXTRACT_SUFX= .tgz MAINTAINER= eblood@cs.unr.edu USE_IMAKE= yes +post-install: + cd ${WRKSRC}; \ + ${INSTALL_MAN} xautolock.man ${X11BASE}/man/man1/xautolock.1 + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xautolock/files/md5 b/x11/xautolock/files/md5 index d9a9f01f3e5..2b92e087ecf 100644 --- a/x11/xautolock/files/md5 +++ b/x11/xautolock/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:29:09 agc Exp $ +$NetBSD: md5,v 1.3 1999/04/05 22:46:28 mjl Exp $ -MD5 (xautolock.pl10.tz) = eac946325729f6b773e21618704ab5db +MD5 (xautolock-pl15.tgz) = 927c6dcbec6fa3c38dac359bd4ba41f4 diff --git a/x11/xautolock/patches/patch-aa b/x11/xautolock/patches/patch-aa index 1f35f7e7246..2e010b0eefc 100644 --- a/x11/xautolock/patches/patch-aa +++ b/x11/xautolock/patches/patch-aa @@ -1,49 +1,35 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:20 agc Exp $ +$NetBSD: patch-aa,v 1.3 1999/04/05 22:46:28 mjl Exp $ -*** xautolock.c.orig Sat Jul 20 17:32:41 1996 ---- xautolock.c Sat Jul 20 17:56:41 1996 -*************** -*** 196,201 **** ---- 196,203 ---- - * 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 -*************** -*** 235,241 **** ---- 237,247 ---- - #endif /* !NOSTDHDRS */ - - #if !defined (apollo) && !defined (VMS) -+ -+ #if !defined (BSD) - #include <malloc.h> -+ #endif /* !BSD */ -+ - #include <unistd.h> - #endif /* !apollo && !VMS */ - -*************** -*** 1587,1593 **** - #else /* VMS */ - if (locker_pid) - { -! #if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) - union wait status; /* childs process status */ - #else /* !UTEKV && !SYSV && !SVR4 */ - int status; /* childs process status */ ---- 1593,1602 ---- - #else /* VMS */ - if (locker_pid) - { -! -! #if defined (BSD) -! int status; -! #elif !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) - union wait status; /* childs process status */ - #else /* !UTEKV && !SYSV && !SVR4 */ - int status; /* childs process status */ +--- xautolock.c.orig Thu Mar 11 23:43:25 1999 ++++ xautolock.c Tue Apr 6 00:06:02 1999 +@@ -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,10 @@ + #endif /* !NOSTDHDRS */ + + #if !defined (apollo) && !defined (VMS) ++#if !defined (BSD) + #include <malloc.h> ++#endif /* !BSD */ ++ + #include <unistd.h> + #endif /* !apollo && !VMS */ + +@@ -2028,7 +2033,9 @@ + #else /* VMS */ + if (locker_pid) + { +-#if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4) ++#if defined (BSD) ++ 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 */ diff --git a/x11/xautolock/pkg/PLIST b/x11/xautolock/pkg/PLIST index d7c4831a42a..5521a89840e 100644 --- a/x11/xautolock/pkg/PLIST +++ b/x11/xautolock/pkg/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1998/01/20 11:18:16 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1999/04/05 22:46:28 mjl Exp $ bin/xautolock -man/cat1/xautolock.0.gz +man/cat1/xautolock.0 +man/man1/xautolock.1 |