Attachment #230189 for bug #260484

Lines 2-7 Link Here

(-)b/x11/xorg-cf-files/Makefile (+1 lines)
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




--- Imake.tmpl.orig	2015-12-22 01:28:02 UTC
+++ Imake.tmpl
@@ -1078,26 +1078,14 @@ TCLIBDIR = TclLibDir
 #define ArCmdBase ar
 #endif
 #ifndef ArCmd
-#if HasLargeTmp || SystemV4
 #define ArCmd ArCmdBase cq
-#else
-#define ArCmd ArCmdBase clq
 #endif
-#endif
 #ifndef ArAddCmd
-#if HasLargeTmp || SystemV4
 #define ArAddCmd ArCmdBase ru
-#else
-#define ArAddCmd ArCmdBase rul
 #endif
-#endif
 #ifndef ArExtCmd
-#if HasLargeTmp || SystemV4
 #define ArExtCmd ArCmdBase x
-#else
-#define ArExtCmd ArCmdBase xl
 #endif
-#endif
 #ifndef BootstrapCFlags
 #define BootstrapCFlags /**/
 #endif
@@ -1823,7 +1811,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
        CXXOPTIONS = CplusplusOptions
       CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)

 #endif
          COMPRESS = CompressCmd
           GZIPCMD = GzipCmd
@@ -2073,7 +2061,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
  */
       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
- 

Return to bug 260484

Lines 1-6 Link Here

(-)b/x11/xorg-cf-files/files/patch-Imake.tmpl (-5 / +31 lines)
1	--- Imake.tmpl.orig Tue Jul 27 20:24:29 2004	1	--- Imake.tmpl.orig 2015-12-22 01:28:02 UTC
2	+++ Imake.tmpl Fri Sep 10 18:45:12 2004	2	+++ Imake.tmpl
3	@@ -1798,7 +1798,7 @@	3	@@ -1078,26 +1078,14 @@ TCLIBDIR = TclLibDir
		4	#define ArCmdBase ar
		5	#endif
		6	#ifndef ArCmd
		7	-#if HasLargeTmp \|\| SystemV4
		8	#define ArCmd ArCmdBase cq
		9	-#else
		10	-#define ArCmd ArCmdBase clq
		11	#endif
		12	-#endif
		13	#ifndef ArAddCmd
		14	-#if HasLargeTmp \|\| SystemV4
		15	#define ArAddCmd ArCmdBase ru
		16	-#else
		17	-#define ArAddCmd ArCmdBase rul
		18	#endif
		19	-#endif
		20	#ifndef ArExtCmd
		21	-#if HasLargeTmp \|\| SystemV4
		22	#define ArExtCmd ArCmdBase x
		23	-#else
		24	-#define ArExtCmd ArCmdBase xl
		25	#endif
		26	-#endif
		27	#ifndef BootstrapCFlags
		28	#define BootstrapCFlags /**/
		29	#endif
		30	@@ -1823,7 +1811,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
4	CXXOPTIONS = CplusplusOptions	31	CXXOPTIONS = CplusplusOptions
5	CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)	32	CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
6	CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)	33	CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
Lines 9-15 Link Here
9	#endif	36	#endif
10	COMPRESS = CompressCmd	37	COMPRESS = CompressCmd
11	GZIPCMD = GzipCmd	38	GZIPCMD = GzipCmd
12	@@ -2038,7 +2038,7 @@	39	@@ -2073,7 +2061,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
13	*/	40	*/
14	ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)	41	ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
15	ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)	42	ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
16	-