[arch-commits] Commit in imake/repos (12 files)
Jan de Groot
jgc at archlinux.org
Fri Aug 11 21:45:17 UTC 2017
Date: Friday, August 11, 2017 @ 21:45:16
Author: jgc
Revision: 301940
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
imake/repos/extra-i686/LICENSE
(from rev 301939, imake/trunk/LICENSE)
imake/repos/extra-i686/PKGBUILD
(from rev 301939, imake/trunk/PKGBUILD)
imake/repos/extra-i686/linuxconfig.patch
(from rev 301939, imake/trunk/linuxconfig.patch)
imake/repos/extra-x86_64/LICENSE
(from rev 301939, imake/trunk/LICENSE)
imake/repos/extra-x86_64/PKGBUILD
(from rev 301939, imake/trunk/PKGBUILD)
imake/repos/extra-x86_64/linuxconfig.patch
(from rev 301939, 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
--------------------------------+
/LICENSE | 262 +++++++++++++++++++++++++++++++++++++++
/PKGBUILD | 114 ++++++++++++++++
/linuxconfig.patch | 62 +++++++++
extra-i686/LICENSE | 131 -------------------
extra-i686/PKGBUILD | 56 --------
extra-i686/linuxconfig.patch | 31 ----
extra-x86_64/LICENSE | 131 -------------------
extra-x86_64/PKGBUILD | 56 --------
extra-x86_64/linuxconfig.patch | 31 ----
9 files changed, 438 insertions(+), 436 deletions(-)
Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE 2017-08-11 21:45:11 UTC (rev 301939)
+++ extra-i686/LICENSE 2017-08-11 21:45:16 UTC (rev 301940)
@@ -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 301939, imake/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2017-08-11 21:45:16 UTC (rev 301940)
@@ -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 2017-08-11 21:45:11 UTC (rev 301939)
+++ extra-i686/PKGBUILD 2017-08-11 21:45:16 UTC (rev 301940)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=imake
-pkgver=1.0.7
-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' 'xorg-util-macros' 'xorg-font-util')
-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.3.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.5.tar.bz2
- http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2
- linuxconfig.patch
- LICENSE)
-sha1sums=('52e236776133f217d438622034b8603d201a6ec5'
- '03018e2fb9d7df4fec1623cedb1c090bc224f971'
- 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe'
- '2599afa039d2070bae9df6ce43da288b3a4adf97'
- 'ae22eb81d56d018f0b3b149f70965ebfef2385fd'
- '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0'
- 'c5ecffb25ad079ba3858e3aec047d046df603a89')
-
-
-prepare() {
- cd xorg-cf-files-1.0.5
- patch -p1 -i ../linuxconfig.patch
-}
-
-build() {
- for i in *; do
- if [ -d "${i}" ]; then
- pushd "${i}"
- autoreconf -fi
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
- popd
- fi
- done
-}
-
-package() {
- 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 301939, imake/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-08-11 21:45:16 UTC (rev 301940)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=imake
+pkgver=1.0.7
+pkgrel=2
+pkgdesc="X.Org imake program and related utilities"
+arch=('i686' 'x86_64')
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('pkgconfig' 'xproto' 'perl' 'xorg-util-macros' 'xorg-font-util')
+optdepends=('perl: for mkhtmlindex')
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') #Alan Coopersmith <alan.coopersmith at oracle.com>
+source=(https://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2
+ https://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.3.tar.bz2
+ https://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2
+ https://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2
+ https://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.6.tar.bz2{,.sig}
+ linuxconfig.patch
+ LICENSE)
+sha256sums=('690c2c4ac1fad2470a5ea73156cf930b8040dc821a0da4e322014a42c045f37e'
+ 'b275dcf1f7323ed89e8b36f8fbd5da665d8700005f1779fa5b90a1688bbf2ee4'
+ '49f4fab0de8d418db4ce80dad34e9b879a4199f3e554253a8e1ab68f7c7cb65d'
+ 'f7a80575f3724ac3d9b19eaeab802892ece7e4b0061dd6425b4b789353e25425'
+ '4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d'
+ 'SKIP'
+ '1aa503f9a78e3d3b87b26aca15798825a7190cdedfcfa3e8ef850487a7bd45d3'
+ '507f58781329532b9177ce21f8d4212a3146903eaa3aaf8472453d65f267b1bc')
+
+prepare() {
+ cd xorg-cf-files-1.0.6
+ patch -p1 -i ../linuxconfig.patch
+}
+
+build() {
+ for i in *; do
+ if [ -d "${i}" ]; then
+ pushd "${i}"
+ autoreconf -fi
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+ popd
+ fi
+ done
+}
+
+package() {
+ 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 2017-08-11 21:45:11 UTC (rev 301939)
+++ extra-i686/linuxconfig.patch 2017-08-11 21:45:16 UTC (rev 301940)
@@ -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 301939, imake/trunk/linuxconfig.patch)
===================================================================
--- extra-i686/linuxconfig.patch (rev 0)
+++ extra-i686/linuxconfig.patch 2017-08-11 21:45:16 UTC (rev 301940)
@@ -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 2017-08-11 21:45:11 UTC (rev 301939)
+++ extra-x86_64/LICENSE 2017-08-11 21:45:16 UTC (rev 301940)
@@ -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 301939, imake/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE (rev 0)
+++ extra-x86_64/LICENSE 2017-08-11 21:45:16 UTC (rev 301940)
@@ -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 2017-08-11 21:45:11 UTC (rev 301939)
+++ extra-x86_64/PKGBUILD 2017-08-11 21:45:16 UTC (rev 301940)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=imake
-pkgver=1.0.7
-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' 'xorg-util-macros' 'xorg-font-util')
-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.3.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.5.tar.bz2
- http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2
- linuxconfig.patch
- LICENSE)
-sha1sums=('52e236776133f217d438622034b8603d201a6ec5'
- '03018e2fb9d7df4fec1623cedb1c090bc224f971'
- 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe'
- '2599afa039d2070bae9df6ce43da288b3a4adf97'
- 'ae22eb81d56d018f0b3b149f70965ebfef2385fd'
- '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0'
- 'c5ecffb25ad079ba3858e3aec047d046df603a89')
-
-
-prepare() {
- cd xorg-cf-files-1.0.5
- patch -p1 -i ../linuxconfig.patch
-}
-
-build() {
- for i in *; do
- if [ -d "${i}" ]; then
- pushd "${i}"
- autoreconf -fi
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
- popd
- fi
- done
-}
-
-package() {
- 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 301939, imake/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-08-11 21:45:16 UTC (rev 301940)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=imake
+pkgver=1.0.7
+pkgrel=2
+pkgdesc="X.Org imake program and related utilities"
+arch=('i686' 'x86_64')
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('pkgconfig' 'xproto' 'perl' 'xorg-util-macros' 'xorg-font-util')
+optdepends=('perl: for mkhtmlindex')
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') #Alan Coopersmith <alan.coopersmith at oracle.com>
+source=(https://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2
+ https://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.3.tar.bz2
+ https://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2
+ https://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2
+ https://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.6.tar.bz2{,.sig}
+ linuxconfig.patch
+ LICENSE)
+sha256sums=('690c2c4ac1fad2470a5ea73156cf930b8040dc821a0da4e322014a42c045f37e'
+ 'b275dcf1f7323ed89e8b36f8fbd5da665d8700005f1779fa5b90a1688bbf2ee4'
+ '49f4fab0de8d418db4ce80dad34e9b879a4199f3e554253a8e1ab68f7c7cb65d'
+ 'f7a80575f3724ac3d9b19eaeab802892ece7e4b0061dd6425b4b789353e25425'
+ '4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d'
+ 'SKIP'
+ '1aa503f9a78e3d3b87b26aca15798825a7190cdedfcfa3e8ef850487a7bd45d3'
+ '507f58781329532b9177ce21f8d4212a3146903eaa3aaf8472453d65f267b1bc')
+
+prepare() {
+ cd xorg-cf-files-1.0.6
+ patch -p1 -i ../linuxconfig.patch
+}
+
+build() {
+ for i in *; do
+ if [ -d "${i}" ]; then
+ pushd "${i}"
+ autoreconf -fi
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+ popd
+ fi
+ done
+}
+
+package() {
+ 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 2017-08-11 21:45:11 UTC (rev 301939)
+++ extra-x86_64/linuxconfig.patch 2017-08-11 21:45:16 UTC (rev 301940)
@@ -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 301939, imake/trunk/linuxconfig.patch)
===================================================================
--- extra-x86_64/linuxconfig.patch (rev 0)
+++ extra-x86_64/linuxconfig.patch 2017-08-11 21:45:16 UTC (rev 301940)
@@ -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