pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove xidle, it has been imported to pkgsrc



Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sat Oct 8 10:33:18 2022 +0000
Changeset:	03224c936b4fd6daab628db1db7d1c8d5cc931d2

Modified Files:
	Makefile
Removed Files:
	xidle/DESCR
	xidle/MESSAGE
	xidle/Makefile
	xidle/PLIST
	xidle/distinfo
	xidle/patches/patch-Makefile
	xidle/patches/patch-xidle.1
	xidle/patches/patch-xidle.c

Log Message:
Remove xidle, it has been imported to pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=03224c936b4fd6daab628db1db7d1c8d5cc931d2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                     |  1 -
 xidle/DESCR                  |  6 ------
 xidle/MESSAGE                |  9 ---------
 xidle/Makefile               | 43 -------------------------------------------
 xidle/PLIST                  |  3 ---
 xidle/distinfo               |  8 --------
 xidle/patches/patch-Makefile | 21 ---------------------
 xidle/patches/patch-xidle.1  | 15 ---------------
 xidle/patches/patch-xidle.c  | 44 --------------------------------------------
 9 files changed, 150 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 87bdcda885..d85e0ab526 100644
--- a/Makefile
+++ b/Makefile
@@ -6035,7 +6035,6 @@ SUBDIR+=	xf86rushproto
 SUBDIR+=	xfce4-wm-dfbsd
 SUBDIR+=	xfs
 SUBDIR+=	xhyve
-SUBDIR+=	xidle
 SUBDIR+=	xine-plugin
 SUBDIR+=	xinetd
 SUBDIR+=	xinput_calibrator
diff --git a/xidle/DESCR b/xidle/DESCR
deleted file mode 100644
index 11c4dfa2e1..0000000000
--- a/xidle/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-xidle uses the XScreenSaver(3) extension to receive inactivity events
-when a timeout is specified, running a specific program after the
-elapsed time.
-xidle also monitors the very corner of the given position for pointer
-activity and runs a program if the pointer sits there for more than the
-specified number of seconds.
diff --git a/xidle/MESSAGE b/xidle/MESSAGE
deleted file mode 100644
index 80022924db..0000000000
--- a/xidle/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD$
-
-Unless told otherwise, xidle will attempt to start xlock(1) as default
-screen locker.
-
-Install x11/xlockmore if you wish this behaviour to take effect.
-
-===========================================================================
diff --git a/xidle/Makefile b/xidle/Makefile
deleted file mode 100644
index 31f821b529..0000000000
--- a/xidle/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	xidle-20220718
-CATEGORIES=	x11
-MASTER_SITES=	https://sehnsucht.multics.org/pub/pkgsrc/distfiles/
-DIST_SUBDIR=	${PKGNAME_NOREV}
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	vms%retrobsd.ddns.net@localhost
-HOMEPAGE=	https://man.openbsd.org/xidle.1
-COMMENT=	Run a program on X inactivity
-LICENSE=	isc
-
-MAKEFLAGS+=	X11BASE=${X11BASE}
-MAKEFLAGS+=	MANDIR=${PKGMANDIR}
-MAKEFLAGS+=	CFLAGS=${CFLAGS:Q}
-
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths+=	xidle.c
-SUBST_FILES.paths+=	xidle.1
-SUBST_VARS.paths=	PREFIX
-SUBST_MESSAGE.paths=	Setting default locker's path.
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xidle ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xidle.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux" 	# strtonum()
-LDFLAGS+=   -lbsd
-.include "../../devel/libbsd/buildlink3.mk"
-.endif
-
-.include "../../x11/libXdmcp/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXau/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/xidle/PLIST b/xidle/PLIST
deleted file mode 100644
index 8de7904a2f..0000000000
--- a/xidle/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-bin/xidle
-man/man1/xidle.1
diff --git a/xidle/distinfo b/xidle/distinfo
deleted file mode 100644
index 7471942f75..0000000000
--- a/xidle/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-BLAKE2s (xidle-20220718/xidle-20220718.tar.xz) = fb40e18d9bfe7b8379b57390e79e35a7df2f06223632f8c71da4c20244eaff92
-SHA512 (xidle-20220718/xidle-20220718.tar.xz) = f72fdc91a2c9173ca26291d46ed3857624a1be7c44918bf7e985f0dae184eb8c0201c4e0fb0cda5f33e6f488835f7a68e888aebc180c1eca3c4396a67e659c86
-Size (xidle-20220718/xidle-20220718.tar.xz) = 5640 bytes
-SHA1 (patch-Makefile) = f93b2ffc31da13d143dd157d670e299f0568713a
-SHA1 (patch-xidle.1) = dcb4906dd1ca4780925ffd96193afd3cdb3b6401
-SHA1 (patch-xidle.c) = 02058baddefbad2ba42784eba6fce980a1020314
diff --git a/xidle/patches/patch-Makefile b/xidle/patches/patch-Makefile
deleted file mode 100644
index 42d2f36c3a..0000000000
--- a/xidle/patches/patch-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-Portability fixes for pkgsrc.
-
---- Makefile.orig	2015-05-26 05:22:15.000000000 +0000
-+++ Makefile
-@@ -1,6 +1,3 @@
--# $OpenBSD: Makefile,v 1.7 2011/06/23 22:48:59 naddy Exp $
--.include <bsd.xconf.mk>
--
- PROG=	xidle
- 
- CPPFLAGS+= -I${X11BASE}/include
-@@ -9,7 +6,4 @@ LDADD+=	-L${X11BASE}/lib -lXss -lXext -l
- 
- MANDIR=	${X11BASE}/man/man
- 
--obj: _xenocara_obj
--
- .include <bsd.prog.mk>
--.include <bsd.xorg.mk>
diff --git a/xidle/patches/patch-xidle.1 b/xidle/patches/patch-xidle.1
deleted file mode 100644
index 153aa01672..0000000000
--- a/xidle/patches/patch-xidle.1
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Do not hard-code xlock path.
-
---- xidle.1.orig	2015-05-26 05:22:15.000000000 +0000
-+++ xidle.1
-@@ -127,7 +127,7 @@ Run
- using the flying bats mode if no activity is detected in 300 seconds or the
- pointer sits in the southwest corner for more than 5 seconds:
- .Bd -literal -offset indent
--$ xidle -delay 5 -sw -program "/usr/X11R6/bin/xlock -mode bat" \e
-+$ xidle -delay 5 -sw -program "@PREFIX@/bin/xlock -mode bat" \e
- 	-timeout 300
- .Ed
- .Sh SEE ALSO
diff --git a/xidle/patches/patch-xidle.c b/xidle/patches/patch-xidle.c
deleted file mode 100644
index af7d0ad85e..0000000000
--- a/xidle/patches/patch-xidle.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-Portability fixes:
-
-- Define non-standard compiler attribute extension.
-- Do not hard-code xlock path.
-- Disable pledge.
-- Use libbsd on Linux.
-
---- xidle.c.orig	2022-07-18 06:17:31.000000000 +0000
-+++ xidle.c
-@@ -39,15 +39,21 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#ifdef __linux__
-+#include <bsd/stdlib.h>
-+#endif
- 
- #ifndef CLASS_NAME
- #define CLASS_NAME	"XIdle"
- #endif
- 
- #ifndef PATH_PROG
--#define PATH_PROG	"/usr/X11R6/bin/xlock"
-+#define PATH_PROG	"@PREFIX@/bin/xlock"
- #endif
- 
-+#ifndef	__dead 
-+#define __dead      __attribute__((__noreturn__))
-+#endif
- 
- enum {
- 	north = 0x01,
-@@ -354,9 +360,6 @@ main(int argc, char **argv)
- 	if (fd > 2)
- 		close(fd);
- 
--	if (pledge("stdio proc exec", NULL) == -1)
--		err(1, "pledge");
--
- 	for (;;) {
- 		XEvent ev;
- 		u_long mask;


Home | Main Index | Thread Index | Old Index