[arch-commits] Commit in seamonkey/repos (3 files)

[andyrtr at archlinux.org]

    Date: Sunday, November 9, 2008 @ 15:15:45
  Author: andyrtr
Revision: 18852

Merged revisions 18830 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/seamonkey/trunk

........
  r18830 | jgc | 2008-11-09 14:14:49 +0000 (So, 09 Nov 2008) | 1 line
  
  upgpkg: seamonkey 1.1.12-1
........

Modified:
  seamonkey/repos/extra-x86_64/	(properties)
  seamonkey/repos/extra-x86_64/PKGBUILD
  seamonkey/repos/extra-x86_64/mozconfig

-----------+
 PKGBUILD  |   32 ++++++++++++++++----------------
 mozconfig |    1 +
 2 files changed, 17 insertions(+), 16 deletions(-)


Property changes on: seamonkey/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /seamonkey/trunk:1-5603
   + /seamonkey/trunk:1-18851

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-09 19:55:52 UTC (rev 18851)
+++ extra-x86_64/PKGBUILD	2008-11-09 20:15:45 UTC (rev 18852)
@@ -2,42 +2,42 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=seamonkey
-pkgver=1.1.11
+pkgver=1.1.12
 pkgrel=1
 pkgdesc="SeaMonkey internet suite"
 arch=(i686 x86_64)
 license=('MPL')
-depends=('gtk2>=2.12.11' 'libidl2>=0.8.10' 'mozilla-common>=1.1-2' 'nss>=3.12' 'libxt' 'gcc-libs>=4.3.1')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'gcc' 'libgnomeui>=2.22.1')
+depends=('gtk2>=2.14.4' 'libidl2>=0.8.10' 'mozilla-common>=1.1-2' 'nss>=3.12' 'libxt' 'gcc-libs>=4.3.2')
+makedepends=('zip' 'pkgconfig' 'diffutils' 'gcc' 'libgnomeui>=2.24.0')
 replaces=('mozilla')
 url="http://www.mozilla.org/projects/seamonkey"
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/${pkgver}/seamonkey-${pkgver}.source.tar.bz2
         mozconfig 
         seamonkey.desktop
 	firefox-2.0-link-layout.patch)
-md5sums=('a1bde0923cb1eaef48e61c67676ad18f'
-         '56da79cce7f766b03a127a16f99af1ff'
+md5sums=('95c09bd1a3d10791d482f284473253f3'
+         '195fb49e6e39b6ca6acee0c35aec1c13'
          '448848e65efcbf1b2be2873b66b6cd48'
          'b933c00957ea793fe940f4d46a85e10e')
 
 build() {
-  cd ${startdir}/src/mozilla
-  patch -Np1 -i ${startdir}/src/firefox-2.0-link-layout.patch || return 1
-  cp ${startdir}/src/mozconfig .mozconfig
+  cd "${srcdir}/mozilla"
+  patch -Np1 -i "${srcdir}/firefox-2.0-link-layout.patch" || return 1
+  cp ${srcdir}/mozconfig .mozconfig
 
   unset CFLAGS
   unset CXXFLAGS
 
   export LDFLAGS="-Wl,-rpath,/usr/lib/seamonkey-${pkgver}"
 
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
-  make -j1 DESTDIR=${startdir}/pkg install || return 1
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
+  make -j1 DESTDIR="${pkgdir}" install || return 1
 
-  install -m755 -d ${startdir}/pkg/usr/share/applications
-  install -m755 -d ${startdir}/pkg/usr/share/pixmaps
-  install -m644 ${startdir}/src/mozilla/suite/branding/icons/gtk/seamonkey.png \
-                ${startdir}/pkg/usr/share/pixmaps/ || return 1
-  install -m644 ${startdir}/src/seamonkey.desktop ${startdir}/pkg/usr/share/applications/ || return 1
+  install -m755 -d "${pkgdir}/usr/share/applications"
+  install -m755 -d "${pkgdir}/usr/share/pixmaps"
+  install -m644 "${srcdir}/mozilla/suite/branding/icons/gtk/seamonkey.png" \
+                "${pkgdir}/usr/share/pixmaps/" || return 1
+  install -m644 "${srcdir}/seamonkey.desktop" "${pkgdir}/usr/share/applications/" || return 1
 
-  rm -f ${startdir}/pkg/usr/lib/pkgconfig/seamonkey-ns{s,pr}.pc
+  rm -f ${pkgdir}/usr/lib/pkgconfig/seamonkey-ns{s,pr}.pc
 }

Modified: extra-x86_64/mozconfig
===================================================================
--- extra-x86_64/mozconfig	2008-11-09 19:55:52 UTC (rev 18851)
+++ extra-x86_64/mozconfig	2008-11-09 20:15:45 UTC (rev 18852)
@@ -17,6 +17,7 @@
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --prefix=/usr
+ac_add_options --mandir=/usr/share/man
 ac_add_options --enable-crypto
 ac_add_options --enable-application=suite