pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/9menu Update to 1.9
details: https://anonhg.NetBSD.org/pkgsrc/rev/d781994b86d7
branches: trunk
changeset: 375803:d781994b86d7
user: triaxx <triaxx%pkgsrc.org@localhost>
date: Wed Feb 21 15:12:00 2018 +0000
description:
Update to 1.9
- Minor changes and fixes
- Add license
diffstat:
misc/9menu/Makefile | 11 +-
misc/9menu/distinfo | 14 ++-
misc/9menu/patches/patch-9menu.1 | 16 +++++
misc/9menu/patches/patch-9menu.c | 120 +++++++++++++++++++++++++++++++++++++++
misc/9menu/patches/patch-aa | 4 +-
5 files changed, 152 insertions(+), 13 deletions(-)
diffs (201 lines):
diff -r bbb72b21056c -r d781994b86d7 misc/9menu/Makefile
--- a/misc/9menu/Makefile Wed Feb 21 14:04:51 2018 +0000
+++ b/misc/9menu/Makefile Wed Feb 21 15:12:00 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2012/10/08 09:57:15 asau Exp $
+# $NetBSD: Makefile,v 1.24 2018/02/21 15:12:00 triaxx Exp $
-DISTNAME= 9menu-1.8
-PKGREVISION= 1
+DISTNAME= 9menu-1.9
CATEGORIES= misc plan9
-MASTER_SITES= ftp://ftp.freefriends.org/arnold/Source/
-EXTRACT_SUFX= .shar.gz
+GITHUB_TAG= ${PKGBASE}-release-${PKGVERSION_NOREV}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=arnoldrobbins/}
+LICENSE= 9menu-license
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Simple menu patterned after the plan9 user interface
@@ -12,7 +12,6 @@
MAKE_FILE= Makefile.noimake
BUILD_TARGET= 9menu
-WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
do-install:
diff -r bbb72b21056c -r d781994b86d7 misc/9menu/distinfo
--- a/misc/9menu/distinfo Wed Feb 21 14:04:51 2018 +0000
+++ b/misc/9menu/distinfo Wed Feb 21 15:12:00 2018 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 23:49:31 agc Exp $
+$NetBSD: distinfo,v 1.9 2018/02/21 15:12:00 triaxx Exp $
-SHA1 (9menu-1.8.shar.gz) = 8eed85ccf211d967fcf9100beaf6bfc2a3330ea5
-RMD160 (9menu-1.8.shar.gz) = e91eaa901c9f7db3860be49f977a9460bbafd01e
-SHA512 (9menu-1.8.shar.gz) = eb41094365993329add0faa39a319236836a2c13bd8730299a069aa7d40fb646434f4070bbd9807f124a6e3c0c3f5e3e7e9d955c58100950097c3f2e24781100
-Size (9menu-1.8.shar.gz) = 8990 bytes
-SHA1 (patch-aa) = 381ea9092583fc0e91a9cc619ea1ee0d32c49abb
+SHA1 (9menu-1.9.tar.gz) = c121ac0bdec798e7340063e48e0cf33ac3319ca9
+RMD160 (9menu-1.9.tar.gz) = b69942cea4e839ffafcec16e96eebcc8ef35ec35
+SHA512 (9menu-1.9.tar.gz) = c08ad77d11857bef78d7275ba1dbed27603188a8786b81b28fa3cdb85bd6445717b5b79b2b4a1eca917e0eedec7a3f9e1b12b5ccfd51198197a6889b466ca521
+Size (9menu-1.9.tar.gz) = 16620 bytes
+SHA1 (patch-9menu.1) = 443b69fa07aca82f4a03810d99b0099298e53f74
+SHA1 (patch-9menu.c) = f9471be52bc3367c096593a82cb60f5a04250582
+SHA1 (patch-aa) = d03504dc3d17c4b10e38cc6f1253d30885669749
diff -r bbb72b21056c -r d781994b86d7 misc/9menu/patches/patch-9menu.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/9menu/patches/patch-9menu.1 Wed Feb 21 15:12:00 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-9menu.1,v 1.1 2018/02/21 15:12:00 triaxx Exp $
+
+Allow '-file -' to cause stdin to be read as the file.
+From Debian
+
+--- 9menu.1.orig 2015-06-25 20:15:02.000000000 +0000
++++ 9menu.1
+@@ -98,7 +98,7 @@ Read items to display from
+ in addition to any other command line arguments. This is intended for use
+ with
+ .B #!
+-in scripts.
++in scripts. If the filename is "-" read from stdin.
+ A
+ .I filename
+ of
diff -r bbb72b21056c -r d781994b86d7 misc/9menu/patches/patch-9menu.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/9menu/patches/patch-9menu.c Wed Feb 21 15:12:00 2018 +0000
@@ -0,0 +1,120 @@
+$NetBSD: patch-9menu.c,v 1.1 2018/02/21 15:12:00 triaxx Exp $
+
+Bug fix for use with keyboard. More prototypes.
+https://github.com/arnoldrobbins/9menu/commit/43465036b6f986dd2638504e9ce51b3b6dc976e3
+
+Fix resource leak: fp.
+Fix compilation warngings.
+From Debian
+
+--- 9menu.c.orig 2015-06-25 20:15:02.000000000 +0000
++++ 9menu.c
+@@ -113,7 +113,7 @@ char *fontlist[] = { /* default font lis
+ /* the 9menu icon, for garish window managers */
+ #define nine_menu_width 40
+ #define nine_menu_height 40
+-static unsigned char nine_menu_bits[] = {
++static char nine_menu_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x04, 0x00,
+ 0x80, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x00,
+ 0x00, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x04,
+@@ -154,11 +154,14 @@ int numitems;
+
+ char *shell = "/bin/sh"; /* default shell */
+
+-extern void usage(), run_menu(), spawn(), ask_wm_for_delete();
+-extern void reap(), set_wm_hints();
+-extern void redraw(), teleportmenu(), warpmouse(), restoremouse();
+-extern void memory();
+-extern int args();
++extern void usage(), run_menu(), spawn(char *com), ask_wm_for_delete();
++extern void reap(int sig), set_wm_hints(int wide, int high);
++extern void redraw(int cur, int high, int wide);
++extern void teleportmenu(int cur, int wide, int high);
++extern void warpmouse(int cur, int wide, int high);
++extern void restoremouse();
++extern void memory(char *msg);
++extern int args(int argc, char **argv);
+
+ /* memory --- print the out of memory message and die */
+
+@@ -278,11 +281,13 @@ main(int argc, char **argv)
+ } else {
+ fp = fopen(filename, "r");
+ }
++
+ if (fp == NULL) {
+ fprintf(stderr, "%s: couldn't open '%s'\n", progname,
+ filename);
+ exit(1);
+ }
++
+ while (fgets(fbuf, sizeof fbuf, fp)) {
+ char *s = fbuf;
+ strtok(s, "\n");
+@@ -327,6 +332,7 @@ main(int argc, char **argv)
+ strcpy(f_argv[nlabels], s);
+ ++nlabels;
+ }
++ fclose(fp);
+ }
+
+ labels = (char **) malloc((numitems + nlabels) * sizeof(char *));
+@@ -368,8 +374,10 @@ main(int argc, char **argv)
+ fprintf(stderr, "\n");
+ exit(1);
+ }
++
+ screen = DefaultScreen(dpy);
+ root = RootWindow(dpy, screen);
++
+ /*
+ * This used to be
+ * black = BlackPixel(dpy, screen);
+@@ -471,10 +479,10 @@ spawn(char *com)
+ /* reap --- collect dead children */
+
+ void
+-reap(int s)
++reap(int sig)
+ {
+ (void) wait((int *) NULL);
+- signal(s, reap);
++ signal(sig, reap);
+ }
+
+ /* usage --- print a usage message and die */
+@@ -585,12 +593,15 @@ run_menu()
+ && key != CONFIG_MENU_SELECT_KEY)
+ break;
+
++ /* adjust i so mapping will work */
+ if (key == CONFIG_MENU_UP_KEY) {
+ old = cur;
+ cur--;
++ i--;
+ } else if (key == CONFIG_MENU_DOWN_KEY) {
+ old = cur;
+ cur++;
++ i++;
+ }
+
+ while (cur < 0)
+@@ -787,7 +798,7 @@ teleportmenu(int cur, int wide, int high
+ Window wdummy;
+
+ if (XQueryPointer(dpy, menuwin, &wdummy, &wdummy, &x, &y,
+- &dummy, &dummy, &dummy))
++ &dummy, &dummy, (unsigned int *)&dummy))
+ XMoveWindow(dpy, menuwin, x-wide/2, y-cur*high-high/2);
+ }
+
+@@ -805,7 +816,7 @@ warpmouse(int cur, int wide, int high)
+ offset += 6; /* fudge factor */
+
+ if (XQueryPointer(dpy, menuwin, &wdummy, &wdummy, &savex, &savey,
+- &dummy, &dummy, &dummy))
++ &dummy, &dummy, (unsigned int *)&dummy))
+ XWarpPointer(dpy, None, menuwin, 0, 0, 0, 0,
+ wide/2, cur*high-high/2+offset);
+ }
diff -r bbb72b21056c -r d781994b86d7 misc/9menu/patches/patch-aa
--- a/misc/9menu/patches/patch-aa Wed Feb 21 14:04:51 2018 +0000
+++ b/misc/9menu/patches/patch-aa Wed Feb 21 15:12:00 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2003/06/04 08:50:13 agc Exp $
+$NetBSD: patch-aa,v 1.3 2018/02/21 15:12:00 triaxx Exp $
+
+Adjust compilation and linking flags to pkgsrc.
--- Makefile.noimake 2003/06/04 08:23:07 1.1
+++ Makefile.noimake 2003/06/04 08:37:56
Home |
Main Index |
Thread Index |
Old Index