mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-28 21:29:28 +00:00
502fe521bd
- patch-0 replaced by 'MAKE_ARGS=' in Makefile - XF86Setup is no more supported in XFree-4, so patch-8 is removed as well as corresponding stuff in scripts/configure - patch-config_cf_Server_tmpl replaced by the setting of InstallXserverSetUID in scripts/configure other removed patches are no more necessary. Note that freetype2 is now part of the base 4.0.3 distribution. The freetype2 include and libs files are always installed.
108 lines
3.5 KiB
Plaintext
108 lines
3.5 KiB
Plaintext
--- include/Xos_r.h.orig Sun Mar 18 00:12:23 2001
|
|
+++ include/Xos_r.h Sun Mar 18 00:26:45 2001
|
|
@@ -245,7 +245,7 @@
|
|
|
|
/* NetBSD, at least, is missing several of the unixware passwd fields. */
|
|
|
|
-#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
|
|
__inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
|
|
{
|
|
memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
|
|
@@ -412,7 +412,7 @@
|
|
/* UnixWare 2.0, or other systems with thread support but no _r API. */
|
|
/* WARNING: The h_addr_list and s_aliases values are *not* copied! */
|
|
|
|
-#if defined(__NetBSD__)
|
|
+#if defined(__NetBSD__) || defined(__FreeBSD__)
|
|
#include <sys/param.h>
|
|
#endif
|
|
|
|
--- config/cf/FreeBSD.cf.old Wed Dec 20 02:56:11 2000
|
|
+++ config/cf/FreeBSD.cf Wed Dec 20 02:56:24 2000
|
|
@@ -60,6 +60,38 @@
|
|
#define HasVarRun YES
|
|
#define HasVarDb YES
|
|
|
|
+/*
|
|
+ * Multi-thread safe libs
|
|
+ */
|
|
+/* 2.2.7 and later has libc_r (POSIX threads) */
|
|
+#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
|
|
+ OSMajorVersion >= 3
|
|
+# ifndef HasLibPthread
|
|
+# define HasLibPthread NO
|
|
+# endif
|
|
+# define HasPosixThreads YES
|
|
+# define ThreadedX YES
|
|
+/*
|
|
+ * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
|
|
+ */
|
|
+# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
|
|
+/*
|
|
+ * FreeBSD has tread-safe api but no getpwnam_r yet.
|
|
+ */
|
|
+# define HasThreadSafeAPI YES
|
|
+# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
|
|
+# if HasLibPthread
|
|
+# define ThreadsLibraries -lpthread
|
|
+# else
|
|
+# define BuildThreadStubLibrary YES
|
|
+# define NeedUIThrStubs YES
|
|
+# define ThreadsCompileFlags -pthread
|
|
+# define ThreadsLibraries -pthread
|
|
+# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
|
|
+# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
|
|
+# endif
|
|
+#endif
|
|
+
|
|
#define AvoidNullMakeCommand YES
|
|
#define StripInstalledPrograms YES
|
|
#define CompressAllFonts YES
|
|
@@ -82,7 +114,23 @@
|
|
#define HasFlex YES
|
|
#endif
|
|
|
|
-#define CcCmd cc
|
|
+/*
|
|
+ * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP),
|
|
+ * when building X to avoid that for each client ld give the message
|
|
+ *
|
|
+ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found
|
|
+ */
|
|
+#if BuildThreadStubLibrary && !UseInstalled
|
|
+# define CcCmd $(CLIENTENVSETUP) cc
|
|
+# define CplusplusCmd $(CLIENTENVSETUP) c++
|
|
+#else
|
|
+# define CcCmd cc
|
|
+# define CplusplusCmd c++
|
|
+#endif
|
|
+
|
|
+#define CppCmd /usr/bin/cpp
|
|
+#define PreProcessCmd CppCmd
|
|
+#define StandardCppOptions -traditional
|
|
#define CppCmd /usr/bin/cpp
|
|
#define PreProcessCmd CppCmd
|
|
#define StandardCppOptions -traditional
|
|
--- config/cf/bsdLib.tmpl~ Mon Aug 28 20:43:49 2000
|
|
+++ config/cf/bsdLib.tmpl Wed Dec 20 04:31:46 2000
|
|
@@ -47,7 +47,9 @@
|
|
#define SharedX11Reqs
|
|
#endif
|
|
#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
|
|
+#ifndef SharedXtReqs
|
|
#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
|
|
+#endif
|
|
#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
|
|
#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
|
|
#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
|
|
--- programs/glxinfo/Imakefile.orig Fri Sep 22 13:35:46 2000
|
|
+++ programs/glxinfo/Imakefile Thu Dec 21 02:11:55 2000
|
|
@@ -1,5 +1,6 @@
|
|
XCOMM $XConsortium: Imakefile /main/7 1995/12/04 15:10:00 dpw $
|
|
XCOMM $XFree86: xc/programs/glxinfo/Imakefile,v 1.1 2000/09/22 11:35:46 alanh Exp $
|
|
+#include <Threads.tmpl>
|
|
DEPLIBS = $(DEPXTESTLIB) $(DEPXIELIB) $(DEPXLIB) $(DEPXKBFILELIB) $(DEPXF86LIBS) $(DEPXILIB)
|
|
#ifndef OS2Architecture
|
|
LOCAL_LIBRARIES = $(GLXLIB) $(XLIB)
|