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

[Jan de Groot]

    Date: Sunday, May 10, 2009 @ 14:14:10
  Author: jgc
Revision: 38897

Merged revisions 38889 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/imake/trunk

........
  r38889 | jgc | 2009-05-10 20:02:56 +0200 (Sun, 10 May 2009) | 2 lines
  
  upgpkg: imake 1.0.2-4
      Fix manpath, get rid of this piece of crap (libxp)
........

Added:
  imake/repos/extra-i686/xorg-cf-files-1.0.2-xprint.patch
    (from rev 38889, imake/trunk/xorg-cf-files-1.0.2-xprint.patch)
Modified:
  imake/repos/extra-i686/	(properties)
  imake/repos/extra-i686/PKGBUILD
  imake/repos/extra-i686/linuxconfig.patch

----------------------------------+
 PKGBUILD                         |   25 +++++++++++++++--------
 linuxconfig.patch                |    2 -
 xorg-cf-files-1.0.2-xprint.patch |   39 +++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 10 deletions(-)


Property changes on: imake/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /imake/trunk:1-34510
   + /imake/trunk:1-38896

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-10 18:12:17 UTC (rev 38896)
+++ extra-i686/PKGBUILD	2009-05-10 18:14:10 UTC (rev 38897)
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=imake
 pkgver=1.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="X.Org imake program and related utilities"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -15,24 +15,31 @@
 	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 LICENSE)
-md5sums=('02fea5a02ba2857c7d81820c8e8b8e6f' 'b533c0771dbbaf9b041ff35bb941d3a2'\
-         'e274ea9f55dfd62afa0a7b1e1ab4ba96' '54ab2549d723e51ff2b9cff4d8bf44d1'\
-         '5f62dd5545b782c74f6e4e70d0e6552c' '1b1d7653ac95d4b479784afcd61a889f'\
+	linuxconfig.patch
+	xorg-cf-files-1.0.2-xprint.patch
+	LICENSE)
+md5sums=('02fea5a02ba2857c7d81820c8e8b8e6f'
+         'b533c0771dbbaf9b041ff35bb941d3a2'
+         'e274ea9f55dfd62afa0a7b1e1ab4ba96'
+         '54ab2549d723e51ff2b9cff4d8bf44d1'
+         '5f62dd5545b782c74f6e4e70d0e6552c'
+         'b3385d8efbbe7c7fc50ed3a96ce37a16'
+         'eae2925d0bc39c3b1dc0872ccbff99ed'
          'f5767133ef7a98a0bfa15139e0e3d32e')
 
 build() {
   cd ${srcdir}/xorg-cf-files-*
-  patch -Np1 -i ${srcdir}/linuxconfig.patch || return 1
-  cd ${srcdir}
+  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 --mandir=/usr/share/man || return 1
       make || return 1
-      make DESTDIR=${pkgdir} install || return 1
+      make DESTDIR="${pkgdir}" install || return 1
       popd
     fi
   done
-  install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }

Modified: extra-i686/linuxconfig.patch
===================================================================
--- extra-i686/linuxconfig.patch	2009-05-10 18:12:17 UTC (rev 38896)
+++ extra-i686/linuxconfig.patch	2009-05-10 18:14:10 UTC (rev 38897)
@@ -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

Copied: imake/repos/extra-i686/xorg-cf-files-1.0.2-xprint.patch (from rev 38889, imake/trunk/xorg-cf-files-1.0.2-xprint.patch)
===================================================================
--- extra-i686/xorg-cf-files-1.0.2-xprint.patch	                        (rev 0)
+++ extra-i686/xorg-cf-files-1.0.2-xprint.patch	2009-05-10 18:14:10 UTC (rev 38897)
@@ -0,0 +1,39 @@
+--- xorg-cf-files-1.0.2/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
++++ xorg-cf-files-1.0.2/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