diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-12-23 01:35:49 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-12-23 01:35:49 +0000 |
| commit | c90ee83f03de6ce87bf86a6daf09a0010f59c46d (patch) | |
| tree | 589d40624d0cb825807bd5fe7f399d8769657bb1 /devel/imake-6/files/patch-Imake.tmpl | |
| parent | - Re-do mozilla 1.7.5 patch so kazehakase still works with pre-mozilla 1.7.5 (diff) | |
Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2. Because Mesa 6.2
DRI drivers are incompatible with the old libGL in XFree86, they have been
repocopied to graphics/xfree86-dri. Also note that with this commit the html
manpages are going away, and with it the runtime dependency on perl for the
imake port.
Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt
Props to: kris (multiple cluster runs and sorting through logs)
lesi (fixing all the issues in those logs, and more)
Notes
Notes:
svn path=/head/; revision=124866
Diffstat (limited to 'devel/imake-6/files/patch-Imake.tmpl')
| -rw-r--r-- | devel/imake-6/files/patch-Imake.tmpl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/devel/imake-6/files/patch-Imake.tmpl b/devel/imake-6/files/patch-Imake.tmpl index 93412ae23182..04114110a2b9 100644 --- a/devel/imake-6/files/patch-Imake.tmpl +++ b/devel/imake-6/files/patch-Imake.tmpl @@ -1,6 +1,6 @@ ---- cf/Imake.tmpl.orig Fri Apr 2 13:47:10 2004 -+++ cf/Imake.tmpl Thu Jul 22 22:51:21 2004 -@@ -1776,7 +1776,7 @@ +--- cf/Imake.tmpl.orig Tue Jul 27 20:24:29 2004 ++++ cf/Imake.tmpl Fri Sep 10 18:45:12 2004 +@@ -1798,7 +1798,7 @@ CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) @@ -9,13 +9,11 @@ #endif COMPRESS = CompressCmd GZIPCMD = GzipCmd -@@ -2015,8 +2015,8 @@ - * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile +@@ -2038,7 +2038,7 @@ */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) -- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) $(VENDOR_DEFINES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib $(INSTALLED_LIBS) |