diff options
| author | abs <abs> | 1999-01-04 02:40:16 +0000 |
|---|---|---|
| committer | abs <abs> | 1999-01-04 02:40:16 +0000 |
| commit | be5780a89decb9dd5bf1b7a57f4e2551fca41148 (patch) | |
| tree | a4b24e4b6938d4272bdd7550a7090c0afe3ca383 /x11/XF86Setup | |
| parent | ee5fb26a3eb0f49d0b9e46e87888446e13c85bb3 (diff) | |
| download | pkgsrc-be5780a89decb9dd5bf1b7a57f4e2551fca41148.tar.gz | |
These patches used HAVE_RESOLUTION_FIELD to work with both old and newer
versions of Xfree86. Unfortunately the configure script (to set
HAVE_RESOLUTION_FIELD) was never run, and if run it failed due to missing
-I/usr/X11R6/include. The net result was it always configured for the old
version of XFree86. Now sets HAVE_RESOLUTION_FIELD correctly, which means
we can work with XFree86 3.3.3.
Diffstat (limited to 'x11/XF86Setup')
| -rw-r--r-- | x11/XF86Setup/patches/patch-aa | 6 | ||||
| -rw-r--r-- | x11/XF86Setup/patches/patch-ac | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/x11/XF86Setup/patches/patch-aa b/x11/XF86Setup/patches/patch-aa index d340bf6bc92..27d298318d1 100644 --- a/x11/XF86Setup/patches/patch-aa +++ b/x11/XF86Setup/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 1998/09/08 10:17:26 agc Exp $ +$NetBSD: patch-aa,v 1.4 1999/01/04 02:40:16 abs Exp $ --- Imakefile.orig Thu Mar 5 04:19:56 1998 +++ Imakefile Sun Jun 28 18:56:38 1998 @@ -32,11 +32,9 @@ $NetBSD: patch-aa,v 1.3 1998/09/08 10:17:26 agc Exp $ INCLUDES = -I../os-support -I../common \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(INCLUDESRC) \ -I$(EXTINCSRC) $(USEINSTALLEDINC) \ -@@ -119,3 +133,7 @@ +@@ -119,3 +133,5 @@ #endif +depend:: res_cpp_symbol -+ -+res_cpp_symbol: + -sh ./configure diff --git a/x11/XF86Setup/patches/patch-ac b/x11/XF86Setup/patches/patch-ac index 44c797916fe..a1f20d13c00 100644 --- a/x11/XF86Setup/patches/patch-ac +++ b/x11/XF86Setup/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 1998/09/08 10:17:26 agc Exp $ +$NetBSD: patch-ac,v 1.2 1999/01/04 02:40:16 abs Exp $ Introduce a configure script which produces a file called res_cpp_symbol, containing either a definition or "undefinition" of @@ -27,7 +27,7 @@ HAVE_RESOLUTION_FIELD +EOF + +ex=1 -+cc -g config.c 2>/dev/null ++cc -I/usr/X11R6/include -g config.c 2>/dev/null +case $? in +0) + echo "-DHAVE_RESOLUTION_FIELD=1" > ./res_cpp_symbol |