freebsd-ports/devel/imake-4/files/patch-c

--- cf/Imake.tmpl.orig	Tue Jun 27 09:55:44 2000
+++ cf/Imake.tmpl	Wed Sep  6 13:31:04 2000
@@ -1385,7 +1385,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
@@ -1574,7 +1574,8 @@
  */
       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+          SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
          LDPRELIB = LdPreLib
         LDPOSTLIB = LdPostLib
Update to 4.0.1. Remove libraries from -clients. Try to extract only what each port needs. Other miscellaneous bug fixes. Submitted by: maintainer 2000-08-25 10:35:22 +00:00			`--- cf/Imake.tmpl.orig Tue Jun 27 09:55:44 2000`
Both of the below are Submitted by: maintainer (1) Respect CFLAGS when compiling shared libraries and servers. (imake-4, XFree86-4-libraries) Reported by: asami (2) Do not redefine list of supported cards, and support architectures other than i386 better. (imake-4, XFree86-4-Server) 2000-09-07 00:03:49 +00:00			`+++ cf/Imake.tmpl Wed Sep 6 13:31:04 2000`
Update to 4.0.1. Remove libraries from -clients. Try to extract only what each port needs. Other miscellaneous bug fixes. Submitted by: maintainer 2000-08-25 10:35:22 +00:00			`@@ -1385,7 +1385,7 @@`
Add imake based on XFree86-4.0. Submitted by: taguchi@tohoku.iij.ad.jp 2000-06-08 03:25:55 +00:00			`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`
Both of the below are Submitted by: maintainer (1) Respect CFLAGS when compiling shared libraries and servers. (imake-4, XFree86-4-libraries) Reported by: asami (2) Do not redefine list of supported cards, and support architectures other than i386 better. (imake-4, XFree86-4-Server) 2000-09-07 00:03:49 +00:00			`@@ -1574,7 +1574,8 @@`
Add imake based on XFree86-4.0. Submitted by: taguchi@tohoku.iij.ad.jp 2000-06-08 03:25:55 +00:00			`*/`
			`ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)`
			`ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)`
			`- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)`
Both of the below are Submitted by: maintainer (1) Respect CFLAGS when compiling shared libraries and servers. (imake-4, XFree86-4-libraries) Reported by: asami (2) Do not redefine list of supported cards, and support architectures other than i386 better. (imake-4, XFree86-4-Server) 2000-09-07 00:03:49 +00:00			`+ SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)`
Add imake based on XFree86-4.0. Submitted by: taguchi@tohoku.iij.ad.jp 2000-06-08 03:25:55 +00:00			`+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)`
			`LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)`
			`LDPRELIB = LdPreLib`
			`LDPOSTLIB = LdPostLib`