Date: Wed, 24 Nov 1999 02:12:44 -0800 From: Jeremy Lea <reg@shale.csir.co.za> To: Jean-Marc Zucconi <jmz@FreeBSD.ORG> Cc: green@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: ports/x11/XFree86 Makefile Message-ID: <19991124021244.C28286@shale.csir.co.za> In-Reply-To: <199911240034.BAA79492@qix.jmz.org> References: <Pine.BSF.4.10.9911231801170.26050-100000@green.dyndns.org> <199911240034.BAA79492@qix.jmz.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi,
On Wed, Nov 24, 1999 at 01:34:56AM +0100, Jean-Marc Zucconi wrote:
> I think our choice is between changing /usr/libexec/cpp so that it
> behaves like the previous versions (i.e. we predefine things like
> __FreeBSD__) or changing StandardCppDefines in
> /usr/X11R6/lib/X11/config/FreeBSD.cf.
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/24 08:57:22
@@ -19,9 +19,6 @@
MAINTAINER= jmz@FreeBSD.org
.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 400011
-BROKEN= problem with /usr/libexec/cpp
-.endif
IS_INTERACTIVE= yes # configure script asks questions
.if (${MACHINE} != "alpha")
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/24 09:11:45
@@ -14,12 +14,20 @@
#define StandardDefines -DCSRG_BASED
-@@ -314,7 +319,7 @@
+@@ -333,14 +338,14 @@
+ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+ #ifndef DefaultGcc2i386Opt
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2
++#define DefaultGcc2i386Opt
+ #endif
+ #endif
+
#ifdef i386Architecture
# define OptimizedCDebugFlags DefaultGcc2i386Opt
#else
-# define OptimizedCDebugFlags -O2
-+# define OptimizedCDebugFlags -O
++# define OptimizedCDebugFlags
#endif
#ifndef PreIncDir
@@ -846,3 +854,34 @@
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
+--- config/cf/Imake.tmpl.orig Sat Jan 9 06:18:57 1999
++++ config/cf/Imake.tmpl Wed Nov 24 00:54:32 1999
+@@ -1150,7 +1173,7 @@
+ CXXOPTIONS = CplusplusOptions
+ CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
+- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
++ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ #endif
+ COMPRESS = CompressCmd
+ GZIPCMD = GzipCmd
+@@ -1321,7 +1344,7 @@
+ */
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
+- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+ LDPRELIB = LdPreLib
+ LDPOSTLIB = LdPostLib
While I had my mind warped around Imake, I also made it obey make.conf's
CFLAGS... Please close ports/11453
Yes, it all compiles (including AOUT libs). No, I've not tested it,
since I don't want to blow away a working system just at the moment.
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 cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991124021244.C28286>