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

Eric Bélanger eric at archlinux.org
Wed Sep 23 06:21:52 UTC 2009


    Date: Wednesday, September 23, 2009 @ 02:21:51
  Author: eric
Revision: 52912

fixed svn conflict

Modified:
  xfce4-artwork/repos/extra-i686/	(properties)
  xfce4-artwork/repos/extra-i686/PKGBUILD
  xfce4-artwork/repos/extra-x86_64/	(properties)
  xfce4-artwork/repos/extra-x86_64/PKGBUILD

-----------------------+
 extra-i686/PKGBUILD   |    8 ++++----
 extra-x86_64/PKGBUILD |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)


Property changes on: xfce4-artwork/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xfce4-artwork/trunk:1
   + /xfce4-artwork/trunk:1-52911

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-23 06:17:54 UTC (rev 52911)
+++ extra-i686/PKGBUILD	2009-09-23 06:21:51 UTC (rev 52912)
@@ -13,13 +13,13 @@
 depends=('xfdesktop')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://ftp.berlios.de/pub/xfce4-goodies/artwork/${pkgname}-${pkgver}.tar.gz)
+source=(http://download2.berlios.de/xfce-goodies/${pkgname}-${pkgver}.tar.gz)
 md5sums=('b7612ee950fcf052e5acfacd0fda729f')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
+    --localstatedir=/var --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg/ install
+  make DESTDIR="${pkgdir}" install || return 1
 }


Property changes on: xfce4-artwork/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xfce4-artwork/trunk:1
   + /xfce4-artwork/trunk:1-52911

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-23 06:17:54 UTC (rev 52911)
+++ extra-x86_64/PKGBUILD	2009-09-23 06:21:51 UTC (rev 52912)
@@ -13,13 +13,13 @@
 depends=('xfdesktop')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://download.berlios.de/xfce-goodies/${pkgname}-${pkgver}.tar.gz)
+source=(http://download2.berlios.de/xfce-goodies/${pkgname}-${pkgver}.tar.gz)
 md5sums=('b7612ee950fcf052e5acfacd0fda729f')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
+    --localstatedir=/var --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg/ install
+  make DESTDIR="${pkgdir}" install || return 1
 }




More information about the arch-commits mailing list