While checking the new ports' imake I stumbled on this
Imakefile defines X11R6 as the empty string. so /usr/X11R6/{bin,lib}
become /usr//{bin,lib} and are thus useless (and potentially
dangerous, as passing -I/usr/include -L/usr/lib to cc generally
does more harm than good).
While here regen all patches.
ok?
Index: patches/patch-Imakefile
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/ctwm/patches/patch-Imakefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Imakefile
--- patches/patch-Imakefile 5 Jul 2002 07:21:52 -0000 1.1
+++ patches/patch-Imakefile 2 Sep 2012 17:02:37 -0000
@@ -1,6 +1,6 @@
---- Imakefile.orig Tue Dec 11 15:38:52 2001
-+++ Imakefile Fri Jul 5 14:54:29 2002
-@@ -11,7 +11,7 @@
+--- Imakefile.orig Tue Dec 11 16:38:52 2001
++++ Imakefile Sun Sep 2 19:01:07 2012
+@@ -11,7 +11,7 @@ XCOMM
#undef USE_SOUND
#define XPM
#define USEM4
@@ -9,18 +9,7 @@
#undef I18N
YFLAGS = -d
-@@ -19,8 +19,8 @@
- LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
-
- #ifdef XPM
-- XPMLIBDIR =
-- XPMINCDIR =
-+ XPMLIBDIR = -L/usr/X11R6/lib
-+ XPMINCDIR = -I/usr/X11R6/include
-
- XPMDEFINES = -DXPM
- XPMLIB = $(XPMLIBDIR) -lXpm
-@@ -145,14 +145,6 @@
+@@ -145,14 +145,6 @@ depend:: lex.c gram.c deftwmrc.c
NormalLibraryTarget(ctwm, libctwm.o)
ComplexProgramTarget(ctwm)
InstallNonExecFile(system.ctwmrc,$(TWMDIR))
Index: patches/patch-gram.y
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/ctwm/patches/patch-gram.y,v
retrieving revision 1.1
diff -u -r1.1 patch-gram.y
--- patches/patch-gram.y 5 Jul 2002 07:21:52 -0000 1.1
+++ patches/patch-gram.y 2 Sep 2012 17:02:37 -0000
@@ -1,6 +1,6 @@
---- gram.y.orig Tue Dec 11 15:38:52 2001
-+++ gram.y Fri Jul 5 15:10:02 2002
-@@ -419,7 +419,6 @@
+--- gram.y.orig Tue Dec 11 16:38:52 2001
++++ gram.y Sun Sep 2 18:59:56 2012
+@@ -419,7 +419,6 @@ stmt : error
| WINDOW_RING { list = &Scr->WindowRingL; }
win_list
| WINDOW_RING { Scr->WindowRingAll = TRUE; }
@@ -8,7 +8,7 @@
| WINDOW_RING_EXCLUDE { if (!Scr->WindowRingL)
Scr->WindowRingAll = TRUE;
list = &Scr->WindowRingExcludeL; }
-@@ -427,6 +426,7 @@
+@@ -427,6 +426,7 @@ stmt : error
| WINDOW_GEOMETRIES { }
wingeom_list
@@ -16,18 +16,20 @@
noarg : KEYWORD { if (!do_single_keyword ($1)) {
twmrc_error_prefix();
-@@ -683,8 +683,8 @@
+@@ -683,10 +683,10 @@ wingeom_entries : /* Empty */
| wingeom_entries wingeom_entry
;
-wingeom_entry : string string { AddToList (&Scr->WindowGeometries, $1, $2) }
--
+wingeom_entry : string string { AddToList (&Scr->WindowGeometries, $1, $2); }
+ ;
+-
squeeze : SQUEEZE_TITLE {
-@@ -834,6 +834,7 @@
+ if (HasShape) Scr->SqueezeTitle = TRUE;
+ }
+@@ -834,6 +834,7 @@ occupy_workspc_entries : /* Empty */
occupy_workspc_entry : string {
AddToClientsList ($1, client);
}
@@ -35,7 +37,7 @@
occupy_window_list : LB occupy_window_entries RB {}
;
-@@ -845,6 +846,7 @@
+@@ -845,6 +846,7 @@ occupy_window_entries : /* Empty */
occupy_window_entry : string {
AddToClientsList (workspace, $1);
}
@@ -43,7 +45,7 @@
icon_list : LB icon_entries RB {}
;
-@@ -962,6 +964,8 @@
+@@ -962,6 +964,8 @@ string : STRING { ptr = (char
*)malloc(strlen((char*
RemoveDQuote(ptr);
$$ = (unsigned char*)ptr;
}
Index: patches/patch-session.c
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/ctwm/patches/patch-session.c,v
retrieving revision 1.1
diff -u -r1.1 patch-session.c
--- patches/patch-session.c 5 Jul 2002 07:21:52 -0000 1.1
+++ patches/patch-session.c 2 Sep 2012 17:02:37 -0000
@@ -1,6 +1,6 @@
---- session.c.orig Tue Dec 11 15:38:52 2001
-+++ session.c Fri Jul 5 14:36:25 2002
-@@ -892,6 +892,7 @@
+--- session.c.orig Tue Dec 11 16:38:52 2001
++++ session.c Sun Sep 2 18:59:56 2012
+@@ -892,6 +892,7 @@ int *occupation; /* <== [ Matthew McNeill Feb 1997 ] =
return found;
}
@@ -8,7 +8,7 @@
/*===[ Unique Filename Generator
]===========================================*/
static char *
-@@ -922,6 +923,7 @@
+@@ -922,6 +923,7 @@ char *prefix;
#endif
}
@@ -16,7 +16,7 @@
/*===[ SAVE WINDOW INFORMATION
]=============================================*/
#ifndef PATH_MAX
-@@ -951,6 +953,10 @@
+@@ -951,6 +953,10 @@ SmPointer clientData;
char discardCommand[PATH_MAX + 4];
int numVals, i;
char yes = 1;
@@ -27,7 +27,7 @@
static int first_time = 1;
if (first_time)
-@@ -1003,12 +1009,20 @@
+@@ -1003,12 +1009,20 @@ SmPointer clientData;
* no longer the same since the new format supports
* virtaul workspaces.
*========================================================*/
--
Matthieu Herrb
