diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 06:27:24 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 06:27:24 +0000 |
| commit | d0fb7ab1fe4f2e99c94c9e744a65cc5a4ffd2b2c (patch) | |
| tree | aac96c378ec491fcfe5b46a33a135b80d699e012 /devel/imake-6 | |
| parent | Update to 1.068 (diff) | |
Remove VENDOR_DEFINES from ALLDEFINES, which had broken several ports (xbl,
ja-chimera, xdtm, ko-hanterm, pixmap, xzx) due to quoting issues.
Obtained from: X.Org CVS
Notes
Notes:
svn path=/head/; revision=114467
Diffstat (limited to 'devel/imake-6')
| -rw-r--r-- | devel/imake-6/Makefile | 2 | ||||
| -rw-r--r-- | devel/imake-6/files/patch-Imake.tmpl | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/devel/imake-6/Makefile b/devel/imake-6/Makefile index 542695782d14..531b63e46319 100644 --- a/devel/imake-6/Makefile +++ b/devel/imake-6/Makefile @@ -7,7 +7,7 @@ PORTNAME= imake PORTVERSION= 6.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ ${MASTER_SITE_XORG} \ diff --git a/devel/imake-6/files/patch-Imake.tmpl b/devel/imake-6/files/patch-Imake.tmpl index 9f03d569bf20..93412ae23182 100644 --- a/devel/imake-6/files/patch-Imake.tmpl +++ b/devel/imake-6/files/patch-Imake.tmpl @@ -1,5 +1,5 @@ --- cf/Imake.tmpl.orig Fri Apr 2 13:47:10 2004 -+++ cf/Imake.tmpl Fri Jun 18 19:19:17 2004 ++++ cf/Imake.tmpl Thu Jul 22 22:51:21 2004 @@ -1776,7 +1776,7 @@ CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) @@ -9,11 +9,13 @@ #endif COMPRESS = CompressCmd GZIPCMD = GzipCmd -@@ -2016,7 +2016,7 @@ +@@ -2015,8 +2015,8 @@ + * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile */ 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) $(VENDOR_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) |