View | Details | Raw Unified | Return to bug 260484 | Differences between
and this patch

Collapse All | Expand All

(-)b/x11/xorg-cf-files/Makefile (+1 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	xorg-cf-files
3
PORTNAME=	xorg-cf-files
4
PORTVERSION=	1.0.6
4
PORTVERSION=	1.0.6
5
PORTREVISION=	1
5
CATEGORIES=	x11
6
CATEGORIES=	x11
6
7
7
MAINTAINER=	x11@FreeBSD.org
8
MAINTAINER=	x11@FreeBSD.org
(-)b/x11/xorg-cf-files/files/patch-FreeBSD.cf (-15 / +29 lines)
Lines 1-6 Link Here
1
--- ./FreeBSD.cf.orig	2009-10-16 23:45:42.000000000 +0200
1
--- FreeBSD.cf.orig	2015-12-22 01:28:02 UTC
2
+++ ./FreeBSD.cf	2013-06-27 17:14:30.661790922 +0200
2
+++ FreeBSD.cf
3
@@ -78,6 +78,7 @@
3
@@ -78,6 +78,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
4
 #define HasIssetugid		YES
4
 #define HasIssetugid		YES
5
 #define HasPoll			YES
5
 #define HasPoll			YES
6
 #endif
6
 #endif
Lines 8-14 Link Here
8
 
8
 
9
 #if OSMajorVersion >= 4
9
 #if OSMajorVersion >= 4
10
 #define HasGetIfAddrs		YES
10
 #define HasGetIfAddrs		YES
11
@@ -117,14 +118,8 @@
11
@@ -117,14 +118,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
12
 # if (OSRelVersion < 500043)
12
 # if (OSRelVersion < 500043)
13
 #  define NeedUIThrStubs	YES
13
 #  define NeedUIThrStubs	YES
14
 # endif
14
 # endif
Lines 25-31 Link Here
25
 #endif
25
 #endif
26
 
26
 
27
 /* This fixes linking C programs against libGLU on FreeBSD 3.x */
27
 /* This fixes linking C programs against libGLU on FreeBSD 3.x */
28
@@ -178,7 +173,9 @@
28
@@ -172,13 +167,24 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
29
 #endif
30
 #endif
31
 
32
+#ifndef ArCmd
33
+#define ArCmd			ar cq
34
+#endif
35
+#ifndef ArAddCmd
36
+#define ArAddCmd		ar ru
37
+#endif
38
+#ifndef ArExtCmd
39
+#define ArExtCmd		ar x
40
+#endif
41
 #ifndef CcCmd
42
 #define CcCmd			cc
43
 #endif
29
 #ifndef CplusplusCmd
44
 #ifndef CplusplusCmd
30
 #define CplusplusCmd		c++
45
 #define CplusplusCmd		c++
31
 #endif
46
 #endif
Lines 35-41 Link Here
35
 #define PreProcessCmd		CppCmd
50
 #define PreProcessCmd		CppCmd
36
 #define StandardCppOptions	-traditional
51
 #define StandardCppOptions	-traditional
37
 #define StandardCppDefines	/**/
52
 #define StandardCppDefines	/**/
38
@@ -338,7 +335,7 @@
53
@@ -338,7 +344,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
39
 #ifndef LibraryRpathLoadFlags
54
 #ifndef LibraryRpathLoadFlags
40
 # if UseRpath
55
 # if UseRpath
41
 #  if UseElfFormat
56
 #  if UseElfFormat
Lines 44-50 Link Here
44
 #  else
59
 #  else
45
 #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
60
 #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
46
 #  endif
61
 #  endif
47
@@ -470,14 +467,14 @@
62
@@ -470,14 +476,14 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
48
 /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
63
 /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
49
 #ifndef DefaultGcc2i386Opt
64
 #ifndef DefaultGcc2i386Opt
50
 #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
65
 #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
Lines 61-74 Link Here
61
 #endif
76
 #endif
62
 
77
 
63
 #ifndef PreIncDir
78
 #ifndef PreIncDir
64
@@ -498,6 +495,10 @@
79
@@ -496,6 +502,10 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
80
 #define DefaultSystemPath	/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
81
 #ifndef SystemManDirectory
65
 #define SystemManDirectory	/usr/share/man
82
 #define SystemManDirectory	/usr/share/man
66
 #endif
67
 
68
+#ifndef UseConfDirForAppDefaults
69
+#define UseConfDirForAppDefaults	NO
70
+#endif
83
+#endif
71
+
84
+
72
 #define InstKmemFlags	-g kmem -m 2755
85
+#ifndef UseConfDirForAppDefaults
86
+#define UseConfDirForAppDefaults	NO
87
 #endif
73
 
88
 
74
 /*
89
 #define InstKmemFlags	-g kmem -m 2755
75
- 

Return to bug 260484