diff options
Diffstat (limited to 'x11/xorg-cf-files/patches/patch-ai')
| -rw-r--r-- | x11/xorg-cf-files/patches/patch-ai | 63 |
1 files changed, 45 insertions, 18 deletions
diff --git a/x11/xorg-cf-files/patches/patch-ai b/x11/xorg-cf-files/patches/patch-ai index 9cfb28e9463..af96699255f 100644 --- a/x11/xorg-cf-files/patches/patch-ai +++ b/x11/xorg-cf-files/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.2 2012/03/19 12:34:24 joerg Exp $ +$NetBSD: patch-ai,v 1.3 2012/04/12 14:01:17 hans Exp $ --- Imake.tmpl.orig 2009-10-16 21:45:42.000000000 +0000 +++ Imake.tmpl -@@ -898,9 +898,8 @@ TCLIBDIR = TclLibDir +@@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir #ifndef ManPath #define ManPath ManDirectoryRoot #endif @@ -10,10 +10,30 @@ $NetBSD: patch-ai,v 1.2 2012/03/19 12:34:24 joerg Exp $ +#undef ManSourcePath #define ManSourcePath $(MANPATH)/man -#endif - #ifndef ManDir +-#ifndef ManDir ++#undef ManDir #define ManDir $(MANSOURCEPATH)$(MANSUFFIX) +-#endif +-#ifndef LibmanDir ++#undef LibmanDir + #define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX) +-#endif +-#ifndef FileManDir ++#undef FileManDir + #define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX) +-#endif +-#ifndef MiscManDir ++#undef MiscManDir + #define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX) +-#endif +-#ifndef DriverManDir ++#undef DriverManDir + #define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX) +-#endif + #ifndef AppLoadDefs + #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) #endif -@@ -1447,9 +1446,9 @@ TCLIBDIR = TclLibDir +@@ -1447,9 +1441,9 @@ TCLIBDIR = TclLibDir #ifndef DependCmd #if UseGccMakeDepend #ifdef UseInstalled /* assume BINDIR in path */ @@ -25,48 +45,55 @@ $NetBSD: patch-ai,v 1.2 2012/03/19 12:34:24 joerg Exp $ #endif #elif UseCCMakeDepend #ifdef UseInstalled /* assume BINDIR in path */ -@@ -1610,39 +1609,23 @@ TCLIBDIR = TclLibDir +@@ -1609,40 +1603,18 @@ TCLIBDIR = TclLibDir + #ifndef SHsuf #define SHsuf sh #endif - #ifndef ManSuffix +-#ifndef ManSuffix -#define ManSuffix n /* use just one tab or cpp will die */ +-#endif +-#ifndef LibManSuffix ++#undef ManSuffix +#define ManSuffix 1 /* use just one tab or cpp will die */ - #endif - #ifndef LibManSuffix ++#undef LibManSuffix #define LibManSuffix 3 /* use just one tab or cpp will die */ - #endif - #ifndef FileManSuffix +-#endif +-#ifndef FileManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) -#define FileManSuffix 4 /* use just one tab or cpp will die */ -#else ++#undef FileManSuffix #define FileManSuffix 5 /* use just one tab or cpp will die */ - #endif -#endif - #ifndef MiscManSuffix +-#endif +-#ifndef MiscManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) -#define MiscManSuffix 5 /* use just one tab or cpp will die */ -#else ++#undef MiscManSuffix #define MiscManSuffix 7 /* use just one tab or cpp will die */ - #endif -#endif - #ifndef DriverManSuffix +-#endif +-#ifndef DriverManSuffix -#if SystemV || SystemV4 || defined(OSF1Architecture) -#define DriverManSuffix 7 /* use just one tab or cpp will die */ -#else ++#undef DriverManSuffix #define DriverManSuffix 4 /* use just one tab or cpp will die */ - #endif -#endif - #ifndef AdminManSuffix +-#endif +-#ifndef AdminManSuffix -#if SystemV || SystemV4 -#define AdminManSuffix 1m /* use just one tab or cpp will die */ -#else ++#undef AdminManSuffix #define AdminManSuffix 8 /* use just one tab or cpp will die */ - #endif +-#endif -#endif #ifndef ExpandManNames #if SystemV #define ExpandManNames NO -@@ -2049,6 +2032,10 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags +@@ -2049,6 +2021,10 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags INSTDATFLAGS = InstDatFlags /* install flags for data files */ INSTKMEMFLAGS = InstKmemFlags /* install flags for /dev/kmem progs */ |