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

Eric Bélanger eric at archlinux.org
Tue Dec 9 06:09:38 UTC 2008


    Date: Tuesday, December 9, 2008 @ 01:09:38
  Author: eric
Revision: 21055

fixed svn conflict

Added:
  lesstif/repos/extra-i686/ChangeLog
    (from rev 21053, lesstif/trunk/ChangeLog)
  lesstif/repos/extra-i686/LICENSE
    (from rev 21053, lesstif/trunk/LICENSE)
Modified:
  lesstif/repos/extra-i686/	(properties)
  lesstif/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    8 +++++++
 LICENSE   |   26 +++++++++++++++++++++++
 PKGBUILD  |   66 ++++++++++++++++++++++++++++++++++++------------------------
 3 files changed, 74 insertions(+), 26 deletions(-)


Property changes on: lesstif/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /lesstif/trunk:1
   + /lesstif/trunk:1-21054

Copied: lesstif/repos/extra-i686/ChangeLog (from rev 21053, lesstif/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2008-12-09 06:09:38 UTC (rev 21055)
@@ -0,0 +1,8 @@
+2008-12-08  Eric Belanger  <eric at archlinux.org>
+
+	* lesstif 0.95.0-3
+	* Added license
+	* Updated options syntax
+	* Added url
+	* FHS man pages
+	* Added ChangeLog

Copied: lesstif/repos/extra-i686/LICENSE (from rev 21053, lesstif/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2008-12-09 06:09:38 UTC (rev 21055)
@@ -0,0 +1,26 @@
+/*****************************************************************************/
+/**       Copyright 1988 by Evans & Sutherland Computer Corporation,        **/
+/**                          Salt Lake City, Utah                           **/
+/**  Portions Copyright 1989 by the Massachusetts Institute of Technology   **/
+/**                        Cambridge, Massachusetts                         **/
+/**                                                                         **/
+/**                           All Rights Reserved                           **/
+/**                                                                         **/
+/**    Permission to use, copy, modify, and distribute this software and    **/
+/**    its documentation  for  any  purpose  and  without  fee is hereby    **/
+/**    granted, provided that the above copyright notice appear  in  all    **/
+/**    copies and that both  that  copyright  notice  and  this  permis-    **/
+/**    sion  notice appear in supporting  documentation,  and  that  the    **/
+/**    names of Evans & Sutherland and M.I.T. not be used in advertising    **/
+/**    in publicity pertaining to distribution of the  software  without    **/
+/**    specific, written prior permission.                                  **/
+/**                                                                         **/
+/**    EVANS & SUTHERLAND AND M.I.T. DISCLAIM ALL WARRANTIES WITH REGARD    **/
+/**    TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES  OF  MERCHANT-    **/
+/**    ABILITY  AND  FITNESS,  IN  NO  EVENT SHALL EVANS & SUTHERLAND OR    **/
+/**    M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL  DAM-    **/
+/**    AGES OR  ANY DAMAGES WHATSOEVER  RESULTING FROM LOSS OF USE, DATA    **/
+/**    OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER    **/
+/**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
+/**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
+/*****************************************************************************/

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-09 05:52:25 UTC (rev 21054)
+++ extra-i686/PKGBUILD	2008-12-09 06:09:38 UTC (rev 21055)
@@ -1,46 +1,60 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=lesstif
 pkgver=0.95.0
-pkgrel=2
+pkgrel=3
 pkgdesc="LGPL'd re-implementation of Motif"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://www.lesstif.org/"
+license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
-options=('nolibtool')
-source=(http://heanet.dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	CAN-2005-0605.patch
-	64bitcleanups.patch
-	c++fix.patch
-        scroll.patch)
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	CAN-2005-0605.patch 64bitcleanups.patch	c++fix.patch scroll.patch LICENSE)
 md5sums=('ab895165c149d7f95843c7584b1c7ad4' '8089c6d6e427f2357fc4e85145e04579'\
          '1234d1a45e1410c29f54612548e75127' 'b8caafffe583951e8525b145a4f78174'\
-         '38c43641a01ceeebbd5816a088e1ad48')
+         '38c43641a01ceeebbd5816a088e1ad48' 'b1f320192a9154f72d83e9d3d5a25a2f')
+sha1sums=('2a6f20d3bd525e6066ba2be22d8a47bf4bcd0425'
+          '0531ac69cc4daee9cec724b57efaac74f4379ed1'
+          '0f2af2fc4f8e48f63c30bf91d4ce5332248b449b'
+          '30947900c9ccb3802acc97dc42a58285f92fecb8'
+          'ca2fc0dda0103fdbc2b88d8ce49923cf71cf39a4'
+          '5d7f38555417cb617d7d5b7e41a93af8430dc638')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/CAN-2005-0605.patch || return 1
-  patch -Np1 -i ${startdir}/src/c++fix.patch || return 1
-  patch -Np1 -i ${startdir}/src/scroll.patch || return 1
-  patch -Np1 -i ${startdir}/src/64bitcleanups.patch || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 < ../CAN-2005-0605.patch || return 1
+  patch -p1 < ../c++fix.patch || return 1
+  patch -p1 < ../scroll.patch || return 1
+  patch -p1 < ../64bitcleanups.patch || return 1
 
-  ./configure --prefix=/usr --enable-production \
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-production \
     --enable-nonstandard-conversions --enable-editres \
-    --with-xdnd --enable-build-21 --disable-debug --enable-static
+    --with-xdnd --enable-build-21 --disable-debug --enable-static || return 1
+
+# fix linkage against already installed version
+  perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool || return 1
+
   make || return 1
 
-  mkdir -p ${startdir}/pkg/usr/lib
-  make -C lib/Mrm-2.1
-  make -C lib/Mrm-2.1 DESTDIR=${startdir}/pkg install
-  make appdir=/usr/share/X11/app-defaults DESTDIR=${startdir}/pkg install
+# fix linkage against already installed version
+  for f in `find . -name \*.la -type f` ; do
+    perl -pi -e 's/^(relink_command=.*)/# $1/' $f || return 1
+  done
 
+  install -d ${pkgdir}/usr/lib
+  make -C lib/Mrm-2.1 || return 1
+  make -C lib/Mrm-2.1 DESTDIR=${pkgdir} install || return 1
+  make appdir=/usr/share/X11/app-defaults DESTDIR=${pkgdir} install || return 1
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+
   # clean-up
-  rm -rf ${startdir}/pkg/usr/LessTif
-  rm -f ${startdir}/pkg/usr/lib/X11/mwm/README 
+  rm -rf ${pkgdir}/usr/LessTif
+  rm -f ${pkgdir}/usr/lib/X11/mwm/README 
   # conflicts with Shell from perl
-  rm -f ${startdir}/pkg/usr/man/man3/Shell.3
+  rm -f ${pkgdir}/usr/share/man/man3/Shell.3
   # conflicts with tcl
-  rm -f ${startdir}/pkg/usr/man/man3/Object.3
+  rm -f ${pkgdir}/usr/share/man/man3/Object.3
 }




More information about the arch-commits mailing list