Date: Thursday, May 3, 2012 @ 19:54:02
Author: bisson
Revision: 158528
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
conky/repos/extra-i686/PKGBUILD
(from rev 158527, conky/trunk/PKGBUILD)
conky/repos/extra-i686/PKGBUILD.cmake
(from rev 158527, conky/trunk/PKGBUILD.cmake)
conky/repos/extra-x86_64/PKGBUILD
(from rev 158527, conky/trunk/PKGBUILD)
conky/repos/extra-x86_64/PKGBUILD.cmake
(from rev 158527, conky/trunk/PKGBUILD.cmake)
Deleted:
conky/repos/extra-i686/PKGBUILD
conky/repos/extra-i686/PKGBUILD.cmake
conky/repos/extra-x86_64/PKGBUILD
conky/repos/extra-x86_64/PKGBUILD.cmake
-----------------------------+
extra-i686/PKGBUILD | 96 +++++++++++++++++++----------------------
extra-i686/PKGBUILD.cmake | 98 +++++++++++++++++++++---------------------
extra-x86_64/PKGBUILD | 96 +++++++++++++++++++----------------------
extra-x86_64/PKGBUILD.cmake | 98 +++++++++++++++++++++---------------------
4 files changed, 190 insertions(+), 198 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-05-03 23:53:48 UTC (rev 158527)
+++ extra-i686/PKGBUILD 2012-05-03 23:54:02 UTC (rev 158528)
@@ -1,50 +0,0 @@
-# $Id$
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: James Rayner <ja...@archlinux.org>
-# Contributor: Partha Chowdhury <kira.lau...@gmail.com>
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-
-pkgname=conky
-pkgver=1.8.2git20111107
-pkgrel=2
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-options=('!emptydirs')
-makedepends=('pkg-config' 'docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2'
'libxdamage' 'imlib2')
-backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('133fc6fdc725162af9a98c72c1b7349efc22447c')
-
-# git clone git://git.omp.am/conky.git; cd conky; git archive
--prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz >
../${pkgname}-${pkgver}.tar.xz
-
-replaces=('torsmo')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sh autogen.sh
-
- CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-ibm \
- --enable-curl \
- --enable-rss \
- --enable-weather-xoap \
- --enable-imlib2 \
- --disable-lua \
- --enable-wlan \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
- install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
-}
Copied: conky/repos/extra-i686/PKGBUILD (from rev 158527, conky/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-05-03 23:54:02 UTC (rev 158528)
@@ -0,0 +1,46 @@
+# $Id$
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: James Rayner <ja...@archlinux.org>
+# Contributor: Partha Chowdhury <kira.lau...@gmail.com>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=conky
+pkgver=1.9.0
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+options=('!emptydirs')
+makedepends=('docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2'
'libxdamage' 'imlib2')
+backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
+sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
+
+replaces=('torsmo')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-ibm \
+ --enable-curl \
+ --enable-rss \
+ --enable-weather-xoap \
+ --enable-imlib2 \
+ --disable-lua \
+ --enable-wlan \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+ install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
+}
Deleted: extra-i686/PKGBUILD.cmake
===================================================================
--- extra-i686/PKGBUILD.cmake 2012-05-03 23:53:48 UTC (rev 158527)
+++ extra-i686/PKGBUILD.cmake 2012-05-03 23:54:02 UTC (rev 158528)
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: James Rayner <ja...@archlinux.org>
-# Contributor: Partha Chowdhury <kira.lau...@gmail.com>
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-
-pkgname=conky
-pkgver=1.8.2git20111021
-pkgrel=1
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage'
'imlib2' 'lua')
-
-replaces=('torsmo')
-
-build() {
- cd "${srcdir}"
-
- cd conky && { git pull origin; cd ..; } || git clone
git://git.omp.am/conky.git
- rm -fr build; mkdir build; cd build
-
- cmake \
- -D CMAKE_BUILD_TYPE:STRING="Release" \
- -D MAINTAINER_MODE:BOOL=ON \
- -D BUILD_CURL:BOOL=ON \
- -D BUILD_IMLIB2:BOOL=ON \
- -D BUILD_LUA_IMLIB2:BOOL=OFF \
- -D BUILD_MYSQL:BOOL=OFF \
- -D BUILD_RSS:BOOL=ON \
- -D BUILD_WEATHER_METAR:BOOL=ON \
- -D BUILD_WEATHER_XOAP:BOOL=ON \
- -D BUILD_WLAN:BOOL=ON \
- -D CMAKE_INSTALL_PREFIX:PATH=/usr \
- ../conky
-
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 ../conky/{COPYING,LICENSE}*
"${pkgdir}/usr/share/licenses/${pkgname}"
- install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
- install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
-}
Copied: conky/repos/extra-i686/PKGBUILD.cmake (from rev 158527,
conky/trunk/PKGBUILD.cmake)
===================================================================
--- extra-i686/PKGBUILD.cmake (rev 0)
+++ extra-i686/PKGBUILD.cmake 2012-05-03 23:54:02 UTC (rev 158528)
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: James Rayner <ja...@archlinux.org>
+# Contributor: Partha Chowdhury <kira.lau...@gmail.com>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=conky
+pkgver=1.8.2git20111021
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage'
'imlib2' 'lua')
+
+replaces=('torsmo')
+
+build() {
+ cd "${srcdir}"
+
+ cd conky && { git pull origin; cd ..; } || git clone
git://git.omp.am/conky.git
+ rm -fr build; mkdir build; cd build
+
+ cmake \
+ -D CMAKE_BUILD_TYPE:STRING="Release" \
+ -D MAINTAINER_MODE:BOOL=ON \
+ -D BUILD_CURL:BOOL=ON \
+ -D BUILD_IMLIB2:BOOL=ON \
+ -D BUILD_LUA_IMLIB2:BOOL=OFF \
+ -D BUILD_MYSQL:BOOL=OFF \
+ -D BUILD_RSS:BOOL=ON \
+ -D BUILD_WEATHER_METAR:BOOL=ON \
+ -D BUILD_WEATHER_XOAP:BOOL=ON \
+ -D BUILD_WLAN:BOOL=ON \
+ -D CMAKE_INSTALL_PREFIX:PATH=/usr \
+ ../conky
+
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+ install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 ../conky/{COPYING,LICENSE}*
"${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+ install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-05-03 23:53:48 UTC (rev 158527)
+++ extra-x86_64/PKGBUILD 2012-05-03 23:54:02 UTC (rev 158528)
@@ -1,50 +0,0 @@
-# $Id$
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: James Rayner <ja...@archlinux.org>
-# Contributor: Partha Chowdhury <kira.lau...@gmail.com>
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-
-pkgname=conky
-pkgver=1.8.2git20111107
-pkgrel=2
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-options=('!emptydirs')
-makedepends=('pkg-config' 'docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2'
'libxdamage' 'imlib2')
-backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('133fc6fdc725162af9a98c72c1b7349efc22447c')
-
-# git clone git://git.omp.am/conky.git; cd conky; git archive
--prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz >
../${pkgname}-${pkgver}.tar.xz
-
-replaces=('torsmo')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sh autogen.sh
-
- CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-ibm \
- --enable-curl \
- --enable-rss \
- --enable-weather-xoap \
- --enable-imlib2 \
- --disable-lua \
- --enable-wlan \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
- install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
-}
Copied: conky/repos/extra-x86_64/PKGBUILD (from rev 158527,
conky/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-05-03 23:54:02 UTC (rev 158528)
@@ -0,0 +1,46 @@
+# $Id$
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: James Rayner <ja...@archlinux.org>
+# Contributor: Partha Chowdhury <kira.lau...@gmail.com>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=conky
+pkgver=1.9.0
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+options=('!emptydirs')
+makedepends=('docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2'
'libxdamage' 'imlib2')
+backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz";)
+sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
+
+replaces=('torsmo')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-ibm \
+ --enable-curl \
+ --enable-rss \
+ --enable-weather-xoap \
+ --enable-imlib2 \
+ --disable-lua \
+ --enable-wlan \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+ install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
+}
Deleted: extra-x86_64/PKGBUILD.cmake
===================================================================
--- extra-x86_64/PKGBUILD.cmake 2012-05-03 23:53:48 UTC (rev 158527)
+++ extra-x86_64/PKGBUILD.cmake 2012-05-03 23:54:02 UTC (rev 158528)
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: James Rayner <ja...@archlinux.org>
-# Contributor: Partha Chowdhury <kira.lau...@gmail.com>
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-
-pkgname=conky
-pkgver=1.8.2git20111021
-pkgrel=1
-pkgdesc='Lightweight system monitor for X'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
-makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage'
'imlib2' 'lua')
-
-replaces=('torsmo')
-
-build() {
- cd "${srcdir}"
-
- cd conky && { git pull origin; cd ..; } || git clone
git://git.omp.am/conky.git
- rm -fr build; mkdir build; cd build
-
- cmake \
- -D CMAKE_BUILD_TYPE:STRING="Release" \
- -D MAINTAINER_MODE:BOOL=ON \
- -D BUILD_CURL:BOOL=ON \
- -D BUILD_IMLIB2:BOOL=ON \
- -D BUILD_LUA_IMLIB2:BOOL=OFF \
- -D BUILD_MYSQL:BOOL=OFF \
- -D BUILD_RSS:BOOL=ON \
- -D BUILD_WEATHER_METAR:BOOL=ON \
- -D BUILD_WEATHER_XOAP:BOOL=ON \
- -D BUILD_WLAN:BOOL=ON \
- -D CMAKE_INSTALL_PREFIX:PATH=/usr \
- ../conky
-
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 ../conky/{COPYING,LICENSE}*
"${pkgdir}/usr/share/licenses/${pkgname}"
- install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
- install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
-}
Copied: conky/repos/extra-x86_64/PKGBUILD.cmake (from rev 158527,
conky/trunk/PKGBUILD.cmake)
===================================================================
--- extra-x86_64/PKGBUILD.cmake (rev 0)
+++ extra-x86_64/PKGBUILD.cmake 2012-05-03 23:54:02 UTC (rev 158528)
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: James Rayner <ja...@archlinux.org>
+# Contributor: Partha Chowdhury <kira.lau...@gmail.com>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=conky
+pkgver=1.8.2git20111021
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='http://conky.sourceforge.net/'
+license=('BSD' 'GPL')
+arch=('i686' 'x86_64')
+makedepends=('pkg-config' 'cmake' 'git' 'docbook2x')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage'
'imlib2' 'lua')
+
+replaces=('torsmo')
+
+build() {
+ cd "${srcdir}"
+
+ cd conky && { git pull origin; cd ..; } || git clone
git://git.omp.am/conky.git
+ rm -fr build; mkdir build; cd build
+
+ cmake \
+ -D CMAKE_BUILD_TYPE:STRING="Release" \
+ -D MAINTAINER_MODE:BOOL=ON \
+ -D BUILD_CURL:BOOL=ON \
+ -D BUILD_IMLIB2:BOOL=ON \
+ -D BUILD_LUA_IMLIB2:BOOL=OFF \
+ -D BUILD_MYSQL:BOOL=OFF \
+ -D BUILD_RSS:BOOL=ON \
+ -D BUILD_WEATHER_METAR:BOOL=ON \
+ -D BUILD_WEATHER_XOAP:BOOL=ON \
+ -D BUILD_WLAN:BOOL=ON \
+ -D CMAKE_INSTALL_PREFIX:PATH=/usr \
+ ../conky
+
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+ install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 ../conky/{COPYING,LICENSE}*
"${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm644 extras/vim/syntax/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+ install -Dm644 extras/vim/ftdetect/conkyrc.vim
"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
+}
