[arch-commits] Commit in imake/repos (12 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Mar 9 12:06:43 EST 2012


    Date: Friday, March 9, 2012 @ 12:06:42
  Author: andyrtr
Revision: 152805

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  imake/repos/extra-i686/LICENSE
    (from rev 152804, imake/trunk/LICENSE)
  imake/repos/extra-i686/PKGBUILD
    (from rev 152804, imake/trunk/PKGBUILD)
  imake/repos/extra-i686/linuxconfig.patch
    (from rev 152804, imake/trunk/linuxconfig.patch)
  imake/repos/extra-x86_64/LICENSE
    (from rev 152804, imake/trunk/LICENSE)
  imake/repos/extra-x86_64/PKGBUILD
    (from rev 152804, imake/trunk/PKGBUILD)
  imake/repos/extra-x86_64/linuxconfig.patch
    (from rev 152804, imake/trunk/linuxconfig.patch)
Deleted:
  imake/repos/extra-i686/LICENSE
  imake/repos/extra-i686/PKGBUILD
  imake/repos/extra-i686/linuxconfig.patch
  imake/repos/extra-x86_64/LICENSE
  imake/repos/extra-x86_64/PKGBUILD
  imake/repos/extra-x86_64/linuxconfig.patch

--------------------------------+
 extra-i686/LICENSE             |  262 +++++++++++++++++++--------------------
 extra-i686/PKGBUILD            |  106 +++++++--------
 extra-i686/linuxconfig.patch   |   62 ++++-----
 extra-x86_64/LICENSE           |  262 +++++++++++++++++++--------------------
 extra-x86_64/PKGBUILD          |  106 +++++++--------
 extra-x86_64/linuxconfig.patch |   62 ++++-----
 6 files changed, 430 insertions(+), 430 deletions(-)

Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE	2012-03-09 17:06:01 UTC (rev 152804)
+++ extra-i686/LICENSE	2012-03-09 17:06:42 UTC (rev 152805)
@@ -1,131 +0,0 @@
-gccmakedep:
-
-  XFree86 code without an explicit copyright is covered by the following copy-
-  right/license:
-  
-  Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is fur-
-  nished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-  NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-  NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of the XFree86 Project shall not
-  be used in advertising or otherwise to promote the sale, use or other deal-
-  ings in this Software without prior written authorization from the XFree86
-  Project.
-
-imake:
-
-  Copyright (c) 1985, 1986, 1987, 1998 The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-   *
-   * Original Author:
-   *	Todd Brunhoff
-   *	Tektronix, inc.
-   *	While a guest engineer at Project Athena, MIT
-
-lndir:
-
-  Copyright (c) 1990, 1998 The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-
-makedepend:
-
-  Copyright (c) 1993, 1994, 1998 The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-
-util-macros:
-
-  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of the copyright holders shall
-  not be used in advertising or otherwise to promote the sale, use or
-  other dealings in this Software without prior written authorization
-  from the copyright holders.

Copied: imake/repos/extra-i686/LICENSE (from rev 152804, imake/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2012-03-09 17:06:42 UTC (rev 152805)
@@ -0,0 +1,131 @@
+gccmakedep:
+
+  XFree86 code without an explicit copyright is covered by the following copy-
+  right/license:
+  
+  Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is fur-
+  nished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+  NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+  NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of the XFree86 Project shall not
+  be used in advertising or otherwise to promote the sale, use or other deal-
+  ings in this Software without prior written authorization from the XFree86
+  Project.
+
+imake:
+
+  Copyright (c) 1985, 1986, 1987, 1998 The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings
+  in this Software without prior written authorization from The Open Group.
+   *
+   * Original Author:
+   *	Todd Brunhoff
+   *	Tektronix, inc.
+   *	While a guest engineer at Project Athena, MIT
+
+lndir:
+
+  Copyright (c) 1990, 1998 The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings
+  in this Software without prior written authorization from The Open Group.
+
+makedepend:
+
+  Copyright (c) 1993, 1994, 1998 The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings
+  in this Software without prior written authorization from The Open Group.
+
+util-macros:
+
+  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of the copyright holders shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from the copyright holders.

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-03-09 17:06:01 UTC (rev 152804)
+++ extra-i686/PKGBUILD	2012-03-09 17:06:42 UTC (rev 152805)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=imake
-pkgver=1.0.4
-pkgrel=1
-pkgdesc="X.Org imake program and related utilities"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('pkgconfig' 'xproto' 'perl')
-optdepends=('perl: for mkhtmlindex')
-source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2"
-        'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2'
-        'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2'
-        'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2'
-        'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2'
-        'linuxconfig.patch'
-        'LICENSE')
-md5sums=('48133c75bd77c127c7eff122e08ebbf6'
-         'b533c0771dbbaf9b041ff35bb941d3a2'
-         '619acbb2ed766d7762f02328513b1f72'
-         '4e6cb97bbecfbb34f3f644a75e513093'
-         '700c6d040d36a569e657a3ba5e1d8b24'
-         'b3385d8efbbe7c7fc50ed3a96ce37a16'
-         'f5767133ef7a98a0bfa15139e0e3d32e')
-
-build() {
-  cd ${srcdir}/xorg-cf-files-1.0.4
-  patch -p1 -i "${srcdir}/linuxconfig.patch"
-  cd "${srcdir}"
-  for i in *; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      ./configure --prefix=/usr --mandir=/usr/share/man
-      make
-      popd
-    fi
-  done
-}
-
-package() {
-  cd "${srcdir}"
-  for i in *; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      make DESTDIR="${pkgdir}" install
-      popd
-    fi
-  done
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: imake/repos/extra-i686/PKGBUILD (from rev 152804, imake/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-03-09 17:06:42 UTC (rev 152805)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=imake
+pkgver=1.0.5
+pkgrel=1
+pkgdesc="X.Org imake program and related utilities"
+arch=('i686' 'x86_64')
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('pkgconfig' 'xproto' 'perl')
+optdepends=('perl: for mkhtmlindex')
+source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2"
+        'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2'
+        'linuxconfig.patch'
+        'LICENSE')
+sha1sums=('1fd3dca267d125ad86583d7f9663b6ff532cddd1'
+          'a3d971a507a460233afd8ed46e9f06135fed634d'
+          'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe'
+          '1f0f8aea1526c6c022f2cf16f7a6c67118c68336'
+          'c58b7252df481572ec1ccd77b9f1ab561ed89e45'
+          '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0'
+          'c5ecffb25ad079ba3858e3aec047d046df603a89')
+
+build() {
+  cd ${srcdir}/xorg-cf-files-1.0.4
+  patch -p1 -i "${srcdir}/linuxconfig.patch"
+  cd "${srcdir}"
+  for i in *; do
+    if [ -d "${i}" ]; then
+      pushd "${i}"
+      ./configure --prefix=/usr --mandir=/usr/share/man
+      make
+      popd
+    fi
+  done
+}
+
+package() {
+  cd "${srcdir}"
+  for i in *; do
+    if [ -d "${i}" ]; then
+      pushd "${i}"
+      make DESTDIR="${pkgdir}" install
+      popd
+    fi
+  done
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: extra-i686/linuxconfig.patch
===================================================================
--- extra-i686/linuxconfig.patch	2012-03-09 17:06:01 UTC (rev 152804)
+++ extra-i686/linuxconfig.patch	2012-03-09 17:06:42 UTC (rev 152805)
@@ -1,31 +0,0 @@
---- xorg-cf-files-1.0.1/linux.cf.orig	2006-03-04 18:40:43.000000000 +0000
-+++ xorg-cf-files-1.0.1/linux.cf	2006-03-04 18:41:48.000000000 +0000
-@@ -193,6 +193,13 @@
- #define FSUseSyslog		YES
- #endif
- 
-+#define FSUseSyslog		YES
-+#define BuildRman		NO
-+#define BuildHtmlManPages	NO
-+#define ProjectRoot		/usr
-+#define ManPath			/usr/share/man
-+#define XappLoadDir		/usr/share/X11/app-defaults
-+
- #ifndef HasDevRandom
- # define HasDevRandom YES
- # ifndef RandomDeviceName
---- xorg-cf-files-1.0.2/X11.tmpl.orig	2006-07-15 10:45:23.000000000 +0000
-+++ xorg-cf-files-1.0.2/X11.tmpl	2006-07-15 10:46:19.000000000 +0000
-@@ -1502,10 +1502,10 @@
- #define DocPdfDir $(DOCDIR)/PDF
- #endif
- #ifndef FontDir
--#define FontDir $(LIBDIR)/fonts
-+#define FontDir /usr/share/fonts
- #endif
- #ifndef FontEncDir
--#define FontEncDir $(LIBDIR)/fonts/encodings
-+#define FontEncDir /usr/share/fonts/encodings
- #endif
- #ifndef AdmDir
- #define AdmDir /usr/adm

Copied: imake/repos/extra-i686/linuxconfig.patch (from rev 152804, imake/trunk/linuxconfig.patch)
===================================================================
--- extra-i686/linuxconfig.patch	                        (rev 0)
+++ extra-i686/linuxconfig.patch	2012-03-09 17:06:42 UTC (rev 152805)
@@ -0,0 +1,31 @@
+--- xorg-cf-files-1.0.1/linux.cf.orig	2006-03-04 18:40:43.000000000 +0000
++++ xorg-cf-files-1.0.1/linux.cf	2006-03-04 18:41:48.000000000 +0000
+@@ -193,6 +193,13 @@
+ #define FSUseSyslog		YES
+ #endif
+ 
++#define FSUseSyslog		YES
++#define BuildRman		NO
++#define BuildHtmlManPages	NO
++#define ProjectRoot		/usr
++#define ManPath			/usr/share/man
++#define XappLoadDir		/usr/share/X11/app-defaults
++
+ #ifndef HasDevRandom
+ # define HasDevRandom YES
+ # ifndef RandomDeviceName
+--- xorg-cf-files-1.0.2/X11.tmpl.orig	2006-07-15 10:45:23.000000000 +0000
++++ xorg-cf-files-1.0.2/X11.tmpl	2006-07-15 10:46:19.000000000 +0000
+@@ -1502,10 +1502,10 @@
+ #define DocPdfDir $(DOCDIR)/PDF
+ #endif
+ #ifndef FontDir
+-#define FontDir $(LIBDIR)/fonts
++#define FontDir /usr/share/fonts
+ #endif
+ #ifndef FontEncDir
+-#define FontEncDir $(LIBDIR)/fonts/encodings
++#define FontEncDir /usr/share/fonts/encodings
+ #endif
+ #ifndef AdmDir
+ #define AdmDir /usr/adm

Deleted: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE	2012-03-09 17:06:01 UTC (rev 152804)
+++ extra-x86_64/LICENSE	2012-03-09 17:06:42 UTC (rev 152805)
@@ -1,131 +0,0 @@
-gccmakedep:
-
-  XFree86 code without an explicit copyright is covered by the following copy-
-  right/license:
-  
-  Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is fur-
-  nished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-  NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-  NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of the XFree86 Project shall not
-  be used in advertising or otherwise to promote the sale, use or other deal-
-  ings in this Software without prior written authorization from the XFree86
-  Project.
-
-imake:
-
-  Copyright (c) 1985, 1986, 1987, 1998 The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-   *
-   * Original Author:
-   *	Todd Brunhoff
-   *	Tektronix, inc.
-   *	While a guest engineer at Project Athena, MIT
-
-lndir:
-
-  Copyright (c) 1990, 1998 The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-
-makedepend:
-
-  Copyright (c) 1993, 1994, 1998 The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-
-util-macros:
-
-  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of the copyright holders shall
-  not be used in advertising or otherwise to promote the sale, use or
-  other dealings in this Software without prior written authorization
-  from the copyright holders.

Copied: imake/repos/extra-x86_64/LICENSE (from rev 152804, imake/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2012-03-09 17:06:42 UTC (rev 152805)
@@ -0,0 +1,131 @@
+gccmakedep:
+
+  XFree86 code without an explicit copyright is covered by the following copy-
+  right/license:
+  
+  Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is fur-
+  nished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+  NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+  NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of the XFree86 Project shall not
+  be used in advertising or otherwise to promote the sale, use or other deal-
+  ings in this Software without prior written authorization from the XFree86
+  Project.
+
+imake:
+
+  Copyright (c) 1985, 1986, 1987, 1998 The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings
+  in this Software without prior written authorization from The Open Group.
+   *
+   * Original Author:
+   *	Todd Brunhoff
+   *	Tektronix, inc.
+   *	While a guest engineer at Project Athena, MIT
+
+lndir:
+
+  Copyright (c) 1990, 1998 The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings
+  in this Software without prior written authorization from The Open Group.
+
+makedepend:
+
+  Copyright (c) 1993, 1994, 1998 The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings
+  in this Software without prior written authorization from The Open Group.
+
+util-macros:
+
+  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of the copyright holders shall
+  not be used in advertising or otherwise to promote the sale, use or
+  other dealings in this Software without prior written authorization
+  from the copyright holders.

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-03-09 17:06:01 UTC (rev 152804)
+++ extra-x86_64/PKGBUILD	2012-03-09 17:06:42 UTC (rev 152805)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=imake
-pkgver=1.0.4
-pkgrel=1
-pkgdesc="X.Org imake program and related utilities"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('pkgconfig' 'xproto' 'perl')
-optdepends=('perl: for mkhtmlindex')
-source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2"
-        'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2'
-        'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2'
-        'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2'
-        'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2'
-        'linuxconfig.patch'
-        'LICENSE')
-md5sums=('48133c75bd77c127c7eff122e08ebbf6'
-         'b533c0771dbbaf9b041ff35bb941d3a2'
-         '619acbb2ed766d7762f02328513b1f72'
-         '4e6cb97bbecfbb34f3f644a75e513093'
-         '700c6d040d36a569e657a3ba5e1d8b24'
-         'b3385d8efbbe7c7fc50ed3a96ce37a16'
-         'f5767133ef7a98a0bfa15139e0e3d32e')
-
-build() {
-  cd ${srcdir}/xorg-cf-files-1.0.4
-  patch -p1 -i "${srcdir}/linuxconfig.patch"
-  cd "${srcdir}"
-  for i in *; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      ./configure --prefix=/usr --mandir=/usr/share/man
-      make
-      popd
-    fi
-  done
-}
-
-package() {
-  cd "${srcdir}"
-  for i in *; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      make DESTDIR="${pkgdir}" install
-      popd
-    fi
-  done
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: imake/repos/extra-x86_64/PKGBUILD (from rev 152804, imake/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-03-09 17:06:42 UTC (rev 152805)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=imake
+pkgver=1.0.5
+pkgrel=1
+pkgdesc="X.Org imake program and related utilities"
+arch=('i686' 'x86_64')
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('pkgconfig' 'xproto' 'perl')
+optdepends=('perl: for mkhtmlindex')
+source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2"
+        'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2'
+        'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2'
+        'linuxconfig.patch'
+        'LICENSE')
+sha1sums=('1fd3dca267d125ad86583d7f9663b6ff532cddd1'
+          'a3d971a507a460233afd8ed46e9f06135fed634d'
+          'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe'
+          '1f0f8aea1526c6c022f2cf16f7a6c67118c68336'
+          'c58b7252df481572ec1ccd77b9f1ab561ed89e45'
+          '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0'
+          'c5ecffb25ad079ba3858e3aec047d046df603a89')
+
+build() {
+  cd ${srcdir}/xorg-cf-files-1.0.4
+  patch -p1 -i "${srcdir}/linuxconfig.patch"
+  cd "${srcdir}"
+  for i in *; do
+    if [ -d "${i}" ]; then
+      pushd "${i}"
+      ./configure --prefix=/usr --mandir=/usr/share/man
+      make
+      popd
+    fi
+  done
+}
+
+package() {
+  cd "${srcdir}"
+  for i in *; do
+    if [ -d "${i}" ]; then
+      pushd "${i}"
+      make DESTDIR="${pkgdir}" install
+      popd
+    fi
+  done
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: extra-x86_64/linuxconfig.patch
===================================================================
--- extra-x86_64/linuxconfig.patch	2012-03-09 17:06:01 UTC (rev 152804)
+++ extra-x86_64/linuxconfig.patch	2012-03-09 17:06:42 UTC (rev 152805)
@@ -1,31 +0,0 @@
---- xorg-cf-files-1.0.1/linux.cf.orig	2006-03-04 18:40:43.000000000 +0000
-+++ xorg-cf-files-1.0.1/linux.cf	2006-03-04 18:41:48.000000000 +0000
-@@ -193,6 +193,13 @@
- #define FSUseSyslog		YES
- #endif
- 
-+#define FSUseSyslog		YES
-+#define BuildRman		NO
-+#define BuildHtmlManPages	NO
-+#define ProjectRoot		/usr
-+#define ManPath			/usr/share/man
-+#define XappLoadDir		/usr/share/X11/app-defaults
-+
- #ifndef HasDevRandom
- # define HasDevRandom YES
- # ifndef RandomDeviceName
---- xorg-cf-files-1.0.2/X11.tmpl.orig	2006-07-15 10:45:23.000000000 +0000
-+++ xorg-cf-files-1.0.2/X11.tmpl	2006-07-15 10:46:19.000000000 +0000
-@@ -1502,10 +1502,10 @@
- #define DocPdfDir $(DOCDIR)/PDF
- #endif
- #ifndef FontDir
--#define FontDir $(LIBDIR)/fonts
-+#define FontDir /usr/share/fonts
- #endif
- #ifndef FontEncDir
--#define FontEncDir $(LIBDIR)/fonts/encodings
-+#define FontEncDir /usr/share/fonts/encodings
- #endif
- #ifndef AdmDir
- #define AdmDir /usr/adm

Copied: imake/repos/extra-x86_64/linuxconfig.patch (from rev 152804, imake/trunk/linuxconfig.patch)
===================================================================
--- extra-x86_64/linuxconfig.patch	                        (rev 0)
+++ extra-x86_64/linuxconfig.patch	2012-03-09 17:06:42 UTC (rev 152805)
@@ -0,0 +1,31 @@
+--- xorg-cf-files-1.0.1/linux.cf.orig	2006-03-04 18:40:43.000000000 +0000
++++ xorg-cf-files-1.0.1/linux.cf	2006-03-04 18:41:48.000000000 +0000
+@@ -193,6 +193,13 @@
+ #define FSUseSyslog		YES
+ #endif
+ 
++#define FSUseSyslog		YES
++#define BuildRman		NO
++#define BuildHtmlManPages	NO
++#define ProjectRoot		/usr
++#define ManPath			/usr/share/man
++#define XappLoadDir		/usr/share/X11/app-defaults
++
+ #ifndef HasDevRandom
+ # define HasDevRandom YES
+ # ifndef RandomDeviceName
+--- xorg-cf-files-1.0.2/X11.tmpl.orig	2006-07-15 10:45:23.000000000 +0000
++++ xorg-cf-files-1.0.2/X11.tmpl	2006-07-15 10:46:19.000000000 +0000
+@@ -1502,10 +1502,10 @@
+ #define DocPdfDir $(DOCDIR)/PDF
+ #endif
+ #ifndef FontDir
+-#define FontDir $(LIBDIR)/fonts
++#define FontDir /usr/share/fonts
+ #endif
+ #ifndef FontEncDir
+-#define FontEncDir $(LIBDIR)/fonts/encodings
++#define FontEncDir /usr/share/fonts/encodings
+ #endif
+ #ifndef AdmDir
+ #define AdmDir /usr/adm



More information about the arch-commits mailing list