[pkgsrc/pkgsrc-2012Q1]: pkgsrc/x11/xorg-cf-files Pullup ticket #3776 - reques...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c024eb3dffe
branches:  pkgsrc-2012Q1
changeset: 602088:9c024eb3dffe
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed May 09 06:23:13 2012 +0000

description:
Pullup ticket #3776 - requested by sbd
x11/xorg-cf-files: portability fix

Revisions pulled up:
- x11/xorg-cf-files/Makefile                                    1.20
- x11/xorg-cf-files/distinfo                                    1.14
- x11/xorg-cf-files/patches/patch-ai                            1.3

---
   Module Name: pkgsrc
   Committed By:        hans
   Date:                Thu Apr 12 14:01:17 UTC 2012

   Modified Files:
        pkgsrc/x11/xorg-cf-files: distinfo
        pkgsrc/x11/xorg-cf-files/patches: patch-ai

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

---
   Module Name: pkgsrc
   Committed By:        sbd
   Date:                Mon Apr 30 07:26:08 UTC 2012

   Modified Files:
        pkgsrc/x11/xorg-cf-files: Makefile

   Log Message:
   The changes to patch-ai in rev1.3 need the PKGREVISION to be bumped.

diffstat:

 x11/xorg-cf-files/Makefile         |   4 +-
 x11/xorg-cf-files/distinfo         |   4 +-
 x11/xorg-cf-files/patches/patch-ai |  63 +++++++++++++++++++++++++++----------
 3 files changed, 49 insertions(+), 22 deletions(-)

diffs (149 lines):

diff -r 12b371f031ee -r 9c024eb3dffe x11/xorg-cf-files/Makefile
--- a/x11/xorg-cf-files/Makefile        Mon May 07 09:43:40 2012 +0000
+++ b/x11/xorg-cf-files/Makefile        Wed May 09 06:23:13 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2012/03/19 12:34:22 joerg Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2012/05/09 06:23:13 tron Exp $
 #
 
 DISTNAME=              xorg-cf-files-1.0.4
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 12b371f031ee -r 9c024eb3dffe x11/xorg-cf-files/distinfo
--- a/x11/xorg-cf-files/distinfo        Mon May 07 09:43:40 2012 +0000
+++ b/x11/xorg-cf-files/distinfo        Wed May 09 06:23:13 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2012/03/19 12:34:22 joerg Exp $
+$NetBSD: distinfo,v 1.13.2.1 2012/05/09 06:23:13 tron 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-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 -r 12b371f031ee -r 9c024eb3dffe x11/xorg-cf-files/patches/patch-ai
--- a/x11/xorg-cf-files/patches/patch-ai        Mon May 07 09:43:40 2012 +0000
+++ b/x11/xorg-cf-files/patches/patch-ai        Wed May 09 06:23:13 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2012/03/19 12:34:24 joerg Exp $
+$NetBSD: patch-ai,v 1.2.2.1 2012/05/09 06:23:14 tron 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 @@
 +#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 @@
  #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
 -#endif
- #ifndef MiscManSuffix
+-#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
 -#endif
- #ifndef DriverManSuffix
+-#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
 -#endif
- #ifndef AdminManSuffix
+-#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 */