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

[Jan de Groot]

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

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

........
  r38893 | jgc | 2009-05-10 18:10:20 +0000 (Sun, 10 May 2009) | 2 lines
  
  upgpkg: xaw3d 1.5E-2
      Update changelog, make sure amd64 does not go into lib64
........

Modified:
  xaw3d/repos/extra-x86_64/	(properties)
  xaw3d/repos/extra-x86_64/ChangeLog
  xaw3d/repos/extra-x86_64/PKGBUILD
Deleted:
  xaw3d/repos/extra-x86_64/Xaw3d-1.5E-lex.patch

----------------------+
 ChangeLog            |    7 +++++++
 PKGBUILD             |    4 ++--
 Xaw3d-1.5E-lex.patch |   17 -----------------
 3 files changed, 9 insertions(+), 19 deletions(-)


Property changes on: xaw3d/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xaw3d/trunk:1-38891
   + /xaw3d/trunk:1-38893

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-05-10 18:10:20 UTC (rev 38893)
+++ extra-x86_64/ChangeLog	2009-05-10 18:10:36 UTC (rev 38894)
@@ -1,3 +1,10 @@
+2009-05-10  Jan de Groot  <jgc at archlinux.org>
+
+	* xaw3d 1.5E-2
+	* Build without libxp (requires latest imake)
+	* Simplify PKGBUILD a bit
+	* Add extra patches from Fedora
+
 2008-12-14  Eric Belanger  <eric at archlinux.org>
 
 	* xaw3d 1.5E-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-10 18:10:20 UTC (rev 38893)
+++ extra-x86_64/PKGBUILD	2009-05-10 18:10:36 UTC (rev 38894)
@@ -32,7 +32,7 @@
          '5b6b0242b3f53b7fe308e702abe28561')
 
 build() {
-  cd ${srcdir}/xc/lib/Xaw3d
+  cd "${srcdir}/xc/lib/Xaw3d"
   patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch" || return 1
   patch -Np4 -i "${srcdir}/xaw3d.patch" || return 1
   patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch" || return 1
@@ -44,6 +44,6 @@
   ln -s .. X11
   xmkmf || return 1
   make CDEBUGFLAGS="${CFLAGS} -DARROW_SCROLLBAR"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install || return 1
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }

Deleted: extra-x86_64/Xaw3d-1.5E-lex.patch
===================================================================
--- extra-x86_64/Xaw3d-1.5E-lex.patch	2009-05-10 18:10:20 UTC (rev 38893)
+++ extra-x86_64/Xaw3d-1.5E-lex.patch	2009-05-10 18:10:36 UTC (rev 38894)
@@ -1,17 +0,0 @@
---- Xaw3d-1.5E/xc/lib/Xaw3d/laylex.l.orig	2004-11-30 16:27:01.853702426 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/laylex.l	2004-11-30 16:27:29.298646332 +0100
-@@ -86,12 +86,14 @@
-     return i;
- }
- 
-+static void
- yysetsource(s)
-     char    *s;
- {
-     yysourcebase = yysource = s;
- }
- 
-+static void
- yyerror(s)
-     char    *s;
- {