Override man directories and suffixes to be the same on all platforms.

2 files changed, 47 insertions, 20 deletions

diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index 158faaba9a4..e627c4dd154 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2012/03/19 12:34:22 joerg Exp $
+$NetBSD: distinfo,v 1.14 2012/04/12 14:01:17 hans Exp $
 
 SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45
 RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d
@@ -13,7 +13,7 @@ SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
 SHA1 (patch-af) = e48481afac82cd93e61a1f44dab84876d645ce09
 SHA1 (patch-ag) = 20010c3ade12a6ee07e1093c6143d9600cca3b37
 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
-SHA1 (patch-ai) = dc4791668610d56fad88dbc05088eb5257d52c7f
+SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449
 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
 SHA1 (patch-ak) = dba7e9f6bd9043e438bf6f309a5dc6f424204fd9
 SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
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 */