From 3ecceb27a3143bb3d7875f001cad8018211206ba Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Tue, 5 Jul 2011 18:59:31 -0700
Subject: imake:Bumped to latest.

---
 abs/core/imake/LICENSE                          | 131 ++++++++++++++++++++++++
 abs/core/imake/PKGBUILD                         |  51 +++++----
 abs/core/imake/linuxconfig.patch                |   2 +-
 abs/core/imake/xorg-cf-files-1.0.2-xprint.patch |  39 +++++++
 4 files changed, 200 insertions(+), 23 deletions(-)
 create mode 100644 abs/core/imake/LICENSE
 create mode 100644 abs/core/imake/xorg-cf-files-1.0.2-xprint.patch

diff --git a/abs/core/imake/LICENSE b/abs/core/imake/LICENSE
new file mode 100644
index 0000000..cc6d1a3
--- /dev/null
+++ b/abs/core/imake/LICENSE
@@ -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.
diff --git a/abs/core/imake/PKGBUILD b/abs/core/imake/PKGBUILD
index ba2dc4c..9a879d8 100644
--- a/abs/core/imake/PKGBUILD
+++ b/abs/core/imake/PKGBUILD
@@ -1,39 +1,46 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 87585 2010-08-17 07:28:34Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=imake
-pkgver=1.0.2
-pkgrel=3
-force=y
+pkgver=1.0.3
+pkgrel=2
 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)
-source=(http://xorg.freedesktop.org/releases/individual/util/imake-1.0.2.tar.bz2
+optdepends=('perl: for mkhtmlindex')
+source=(http://xorg.freedesktop.org/releases/individual/util/imake-1.0.3.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.1.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.1.tar.bz2
-	http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.2.tar.bz2
-	linuxconfig.patch)
+	http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.2.tar.bz2
+	http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.2.tar.bz2
+	http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.3.tar.bz2
+	linuxconfig.patch
+	xorg-cf-files-1.0.2-xprint.patch
+	LICENSE)
+md5sums=('ff553c4646edcc9e76b7308991ad421a'
+         'b533c0771dbbaf9b041ff35bb941d3a2'
+         '619acbb2ed766d7762f02328513b1f72'
+         '62e58330fe8d1e3e28c7a45779833a48'
+         '10546b5ddda3cdda7950bb56bf98e0ea'
+         'b3385d8efbbe7c7fc50ed3a96ce37a16'
+         '82356cfc8a761c85b0b37736fc91f604'
+         'f5767133ef7a98a0bfa15139e0e3d32e')
 
 build() {
-  cd ${startdir}/src/xorg-cf-files-*
-  patch -Np1 -i ${startdir}/src/linuxconfig.patch || return 1
-  cd ${startdir}/src
+  cd ${srcdir}/xorg-cf-files-1.0.3*
+  patch -Np1 -i "${srcdir}/linuxconfig.patch" || return 1
+  patch -Np1 -i "${srcdir}/xorg-cf-files-1.0.2-xprint.patch" || return 1
+  cd "${srcdir}"
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-      ./configure --prefix=/usr
+      ./configure --prefix=/usr --mandir=/usr/share/man || return 1
       make || return 1
-      make DESTDIR=${startdir}/pkg install || return 1
+      make DESTDIR="${pkgdir}" install || return 1
       popd
     fi
   done
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }
-md5sums=('02fea5a02ba2857c7d81820c8e8b8e6f'
-         'b533c0771dbbaf9b041ff35bb941d3a2'
-         'e274ea9f55dfd62afa0a7b1e1ab4ba96'
-         '54ab2549d723e51ff2b9cff4d8bf44d1'
-         '5f62dd5545b782c74f6e4e70d0e6552c'
-         '1b1d7653ac95d4b479784afcd61a889f')
diff --git a/abs/core/imake/linuxconfig.patch b/abs/core/imake/linuxconfig.patch
index 8e1c5a0..e557922 100644
--- a/abs/core/imake/linuxconfig.patch
+++ b/abs/core/imake/linuxconfig.patch
@@ -8,7 +8,7 @@
 +#define BuildRman		NO
 +#define BuildHtmlManPages	NO
 +#define ProjectRoot		/usr
-+#define ManPath			/usr/man
++#define ManPath			/usr/share/man
 +#define XappLoadDir		/usr/share/X11/app-defaults
 +
  #ifndef HasDevRandom
diff --git a/abs/core/imake/xorg-cf-files-1.0.2-xprint.patch b/abs/core/imake/xorg-cf-files-1.0.2-xprint.patch
new file mode 100644
index 0000000..3926d72
--- /dev/null
+++ b/abs/core/imake/xorg-cf-files-1.0.2-xprint.patch
@@ -0,0 +1,39 @@
+--- xorg-cf-files-1.0.3/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
++++ xorg-cf-files-1.0.3/X11.tmpl	2006-04-25 20:24:02.000000000 -0400
+@@ -3920,21 +3920,13 @@
+ #endif
+ 
+ #ifndef ExtraXawReqs
+-# if BuildXaw
+-#  define ExtraXawReqs $(XPLIB)
+-# else
+-#  define ExtraXawReqs /**/
+-# endif
++# define ExtraXawReqs /**/
+ #endif
+ 
+ EXTRAXAWREQS = ExtraXawReqs
+ 
+ #ifndef ExtraXawClientDepLibs
+-# if BuildXaw
+-#  define ExtraXawClientDepLibs $(DEPXPLIB)
+-# else
+-#  define ExtraXawClientDepLibs /**/
+-# endif
++# define ExtraXawClientDepLibs /**/
+ #endif
+ 
+ EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs
+@@ -3944,11 +3936,7 @@
+ #endif
+ 
+ #ifndef ExtraXawClientLibs
+-# if BuildXaw
+-#  define ExtraXawClientLibs $(XPLIB)
+-# else
+-#  define ExtraXawClientLibs /**/
+-# endif
++# define ExtraXawClientLibs /**/
+ #endif
+ 
+ EXTRAXAWCLIENTLIBS = ExtraXawClientLibs
-- 
cgit v0.12

