From ea74c339527ea3229440061ec181e09dbb510bd1 Mon Sep 17 00:00:00 2001 From: brad Date: Sat, 19 Aug 2000 01:34:03 +0000 Subject: [PATCH] - USE_IMAKE -> CONFIGURE_STYLE - split out patch-aa into individual patches - add @comment with RCS id to PLIST --- plan9/9wm/Makefile | 12 +++--- plan9/9wm/patches/patch-9wm.c | 11 +++++ plan9/9wm/patches/patch-aa | 71 -------------------------------- plan9/9wm/patches/patch-fns.h | 11 +++++ plan9/9wm/patches/patch-manage.c | 29 +++++++++++++ plan9/9wm/patches/patch-menu.c | 20 +++++++++ plan9/9wm/pkg/PLIST | 1 + 7 files changed, 79 insertions(+), 76 deletions(-) create mode 100644 plan9/9wm/patches/patch-9wm.c delete mode 100644 plan9/9wm/patches/patch-aa create mode 100644 plan9/9wm/patches/patch-fns.h create mode 100644 plan9/9wm/patches/patch-manage.c create mode 100644 plan9/9wm/patches/patch-menu.c diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile index e43f61b96da..a8a50f6a3eb 100644 --- a/plan9/9wm/Makefile +++ b/plan9/9wm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2000/07/10 02:06:56 angelos Exp $ +# $OpenBSD: Makefile,v 1.12 2000/08/19 01:34:03 brad Exp $ DISTNAME= 9wm-1.1 CATEGORIES= plan9 @@ -6,6 +6,10 @@ NEED_VERSION= 1.191 MASTER_SITES= ftp://ftp.mathcs.emory.edu/pub/arnold/ EXTRACT_SUFX= .shar.gz +EXTRACT_CMD= gzcat +EXTRACT_BEFORE_ARGS= # empty +EXTRACT_AFTER_ARGS= | ${SH} + MAINTAINER= ports@openbsd.org PERMIT_PACKAGE_CDROM= Yes @@ -13,10 +17,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +CONFIGURE_STYLE= imake + WRKDIST= ${WRKDIR} -EXTRACT_CMD= gzcat -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | ${SH} -USE_IMAKE= Yes .include diff --git a/plan9/9wm/patches/patch-9wm.c b/plan9/9wm/patches/patch-9wm.c new file mode 100644 index 00000000000..f98b0010314 --- /dev/null +++ b/plan9/9wm/patches/patch-9wm.c @@ -0,0 +1,11 @@ +--- 9wm.c.orig Fri Aug 18 21:27:31 2000 ++++ 9wm.c Fri Aug 18 21:27:34 2000 +@@ -471,7 +471,7 @@ + case NormalState: + XMapRaised(dpy, c->parent); + XMapWindow(dpy, c->window); +- setstate(c, NormalState); ++ _setstate(c, NormalState); + if (c->trans != None && current && c->trans == current->window) + active(c); + break; diff --git a/plan9/9wm/patches/patch-aa b/plan9/9wm/patches/patch-aa deleted file mode 100644 index 00a602d92df..00000000000 --- a/plan9/9wm/patches/patch-aa +++ /dev/null @@ -1,71 +0,0 @@ ---- 9wm.c~ Mon Oct 21 09:26:24 1996 -+++ 9wm.c Mon Oct 21 09:27:19 1996 -@@ -471,7 +471,7 @@ - case NormalState: - XMapRaised(dpy, c->parent); - XMapWindow(dpy, c->window); -- setstate(c, NormalState); -+ _setstate(c, NormalState); - if (c->trans != None && current && c->trans == current->window) - active(c); - break; ---- fns.h~ Mon Oct 21 09:26:25 1996 -+++ fns.h Mon Oct 21 09:27:31 1996 -@@ -31,7 +31,7 @@ - Window getwprop(); - int getiprop(); - int getstate(); --void setstate(); -+void _setstate(); - void setlabel(); - void getproto(); - void gettrans(); ---- manage.c~ Mon Oct 21 09:26:24 1996 -+++ manage.c Mon Oct 21 09:27:49 1996 -@@ -131,7 +131,7 @@ - active(c); - else - setactive(c, 0); -- setstate(c, NormalState); -+ _setstate(c, NormalState); - } - if (current != c) - cmapfocus(current); -@@ -161,7 +161,7 @@ - XReparentWindow(dpy, c->window, root, c->x, c->y); - gravitate(c, 0); - XRemoveFromSaveSet(dpy, c->window); -- setstate(c, WithdrawnState); -+ _setstate(c, WithdrawnState); - - /* flush any errors */ - ignore_badwindow = 1; -@@ -417,7 +417,7 @@ - } - - void --setstate(c, state) -+_setstate(c, state) - Client *c; - int state; - { ---- menu.c~ Mon Oct 21 09:26:24 1996 -+++ menu.c Mon Oct 21 09:27:45 1996 -@@ -179,7 +179,7 @@ - } - XUnmapWindow(dpy, c->parent); - XUnmapWindow(dpy, c->window); -- setstate(c, IconicState); -+ _setstate(c, IconicState); - if (c == current) - nofocus(); - hiddenc[numhidden] = c; -@@ -210,7 +210,7 @@ - if (map) { - XMapWindow(dpy, c->window); - XMapRaised(dpy, c->parent); -- setstate(c, NormalState); -+ _setstate(c, NormalState); - active(c); - } - diff --git a/plan9/9wm/patches/patch-fns.h b/plan9/9wm/patches/patch-fns.h new file mode 100644 index 00000000000..4f572a82b25 --- /dev/null +++ b/plan9/9wm/patches/patch-fns.h @@ -0,0 +1,11 @@ +--- fns.h.orig Fri Aug 18 21:27:33 2000 ++++ fns.h Fri Aug 18 21:27:34 2000 +@@ -31,7 +31,7 @@ + Window getwprop(); + int getiprop(); + int getstate(); +-void setstate(); ++void _setstate(); + void setlabel(); + void getproto(); + void gettrans(); diff --git a/plan9/9wm/patches/patch-manage.c b/plan9/9wm/patches/patch-manage.c new file mode 100644 index 00000000000..3fa258bb671 --- /dev/null +++ b/plan9/9wm/patches/patch-manage.c @@ -0,0 +1,29 @@ +--- manage.c.orig Fri Aug 18 21:27:31 2000 ++++ manage.c Fri Aug 18 21:27:34 2000 +@@ -131,7 +131,7 @@ + active(c); + else + setactive(c, 0); +- setstate(c, NormalState); ++ _setstate(c, NormalState); + } + if (current != c) + cmapfocus(current); +@@ -161,7 +161,7 @@ + XReparentWindow(dpy, c->window, root, c->x, c->y); + gravitate(c, 0); + XRemoveFromSaveSet(dpy, c->window); +- setstate(c, WithdrawnState); ++ _setstate(c, WithdrawnState); + + /* flush any errors */ + ignore_badwindow = 1; +@@ -417,7 +417,7 @@ + } + + void +-setstate(c, state) ++_setstate(c, state) + Client *c; + int state; + { diff --git a/plan9/9wm/patches/patch-menu.c b/plan9/9wm/patches/patch-menu.c new file mode 100644 index 00000000000..febba36925e --- /dev/null +++ b/plan9/9wm/patches/patch-menu.c @@ -0,0 +1,20 @@ +--- menu.c.orig Fri Aug 18 21:27:32 2000 ++++ menu.c Fri Aug 18 21:27:34 2000 +@@ -179,7 +179,7 @@ + } + XUnmapWindow(dpy, c->parent); + XUnmapWindow(dpy, c->window); +- setstate(c, IconicState); ++ _setstate(c, IconicState); + if (c == current) + nofocus(); + hiddenc[numhidden] = c; +@@ -210,7 +210,7 @@ + if (map) { + XMapWindow(dpy, c->window); + XMapRaised(dpy, c->parent); +- setstate(c, NormalState); ++ _setstate(c, NormalState); + active(c); + } + diff --git a/plan9/9wm/pkg/PLIST b/plan9/9wm/pkg/PLIST index 86f4a4a2d14..e6f103ac1e7 100644 --- a/plan9/9wm/pkg/PLIST +++ b/plan9/9wm/pkg/PLIST @@ -1,2 +1,3 @@ +@comment $OpenBSD: PLIST,v 1.3 2000/08/19 01:34:04 brad Exp $ bin/9wm man/cat1/9wm.0