- USE_IMAKE -> CONFIGURE_STYLE

- split out patch-aa into individual patches
- add @comment with RCS id to PLIST
This commit is contained in:
brad 2000-08-19 01:34:03 +00:00
parent cb2ee6fde3
commit ea74c33952
7 changed files with 79 additions and 76 deletions

View File

@ -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 <bsd.port.mk>

View File

@ -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;

View File

@ -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);
}

View File

@ -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();

View File

@ -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;
{

View File

@ -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);
}

View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST,v 1.3 2000/08/19 01:34:04 brad Exp $
bin/9wm
man/cat1/9wm.0