Date: Tue, 23 Nov 1999 03:13:50 -0800 From: Jeremy Lea <reg@shale.csir.co.za> To: billf@freebsd.org, current@freebsd.org, ports@freebsd.org Subject: Unbreak XFree86 Message-ID: <19991123031350.A28286@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
Hi,
This patch might be a bit heavy handed, but it seems to fix the
problem...
Index: Makefile
===================================================================
RCS file: /usr/home/ncvs/ports/x11/XFree86/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
--- Makefile 1999/11/23 04:49:34 1.68
+++ Makefile 1999/11/23 08:09:17
@@ -20,7 +20,7 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 400011
-BROKEN= problem with /usr/libexec/cpp
+#BROKEN= problem with /usr/libexec/cpp
.endif
IS_INTERACTIVE= yes # configure script asks questions
Index: files/kerberos4.diffs
===================================================================
RCS file: /usr/home/ncvs/ports/x11/XFree86/files/kerberos4.diffs,v
retrieving revision 1.4
diff -u -r1.4 kerberos4.diffs
--- kerberos4.diffs 1998/09/23 05:50:40 1.4
+++ kerberos4.diffs 1999/11/23 10:05:40
@@ -34,7 +34,7 @@
+#define Krb4Includes /**/
+#endif
+#ifndef Krb4Libraries
-+#define Krb4Libraries -lkrb -ldes -lcrypt
++#define Krb4Libraries -lkrb -ldes -lcrypt -lcom_err
+#endif
+#else
+#undef Krb4Includes
@@ -170,8 +170,8 @@
diff -udr ../xc.ORIG/programs/xdm/session.c ./programs/xdm/session.c
--- ../xc.ORIG/programs/xdm/session.c Sat Aug 23 14:12:29 1997
+++ ./programs/xdm/session.c Sat Aug 23 14:23:51 1997
-@@ -56,6 +56,10 @@
- # include <krb5/krb5.h>
+@@ -62,6 +62,10 @@
+ # include <shadow.h>
#endif
+#ifdef K4AUTH
@@ -181,7 +181,7 @@
#ifndef GREET_USER_STATIC
#include <dlfcn.h>
#ifndef RTLD_NOW
-@@ -489,6 +493,28 @@
+@@ -498,6 +502,28 @@
}
}
#endif /* K5AUTH */
@@ -207,10 +207,10 @@
+ }
+ }
+#endif /* K4AUTH */
- }
- Debug ("Display %s exiting with status %d\n", d->name, status);
- exit (status);
-@@ -673,6 +699,22 @@
+ #ifdef USE_PAM
+ if (pamh) {
+ /* shutdown PAM session */
+@@ -717,6 +743,22 @@
}
}
#endif /* K5AUTH */
Index: patches/patch-4
===================================================================
RCS file: /usr/home/ncvs/ports/x11/XFree86/patches/patch-4,v
retrieving revision 1.1
diff -u -r1.1 patch-4
--- patch-4 1999/07/27 14:27:33 1.1
+++ patch-4 1999/11/23 10:58:23
@@ -1,6 +1,15 @@
diff -ur /usr/ports/x11/XFree86/work/xc/config/cf/FreeBSD.cf config/cf/FreeBSD.cf
--- /usr/ports/x11/XFree86/work/xc/config/cf/FreeBSD.cf Sun Nov 8 11:19:10 1998
+++ config/cf/FreeBSD.cf Tue Dec 8 10:10:06 1998
+@@ -60,7 +60,7 @@
+ #define MkdirHierCmd mkdir -p
+
+ #define CcCmd cc
+-#define CppCmd /usr/libexec/cpp
++#define CppCmd /usr/bin/gcc -E
+ #define PreProcessCmd CppCmd
+ #define StandardCppDefines -traditional
+ #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
@@ -282,7 +282,12 @@
# define AsmDefines AsmElfDefines
#endif
@@ -846,3 +855,14 @@
close(fd);
return(Len);
+--- config/imake/imakemdep.h.orig Tue Nov 23 02:56:33 1999
++++ config/imake/imakemdep.h Tue Nov 23 02:57:25 1999
+@@ -266,7 +266,7 @@
+ #define DEFAULT_CPP "/lib/pcpp"
+ #endif
+ #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+-#define DEFAULT_CPP "/usr/libexec/cpp"
++#define USE_CC_E
+ #endif
+ #if defined(__sgi) && defined(__ANSI_CPP__)
+ #define USE_CC_E
Please test, polish and commit.
Regards,
-Jeremy
--
| If I was not so weak, if I was not so cold,
--+-- If I was not so scared of being broken, growing old,
| I would be. I would be... frail.
| - jars of clay / much afraid / frail
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991123031350.A28286>