summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-01 15:29:52 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-01 15:30:26 +0000
commitf2ee71dc9618ff123ba0fec2efe5c971a3a5cede (patch)
tree688f733025e84019c260b5d06cc406df17acdeea
parentdf5a2e856743c88d2431561c62e551eca9087d9a (diff)
main/xfdesktop: rebuild. let the triggers do the work
-rw-r--r--main/xfdesktop/APKBUILD22
l---------main/xfdesktop/xfdesktop.post-deinstall1
-rw-r--r--main/xfdesktop/xfdesktop.post-install4
l---------main/xfdesktop/xfdesktop.post-upgrade1
4 files changed, 11 insertions, 17 deletions
diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD
index 4341fbf483f..70e27facfc0 100644
--- a/main/xfdesktop/APKBUILD
+++ b/main/xfdesktop/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfdesktop
pkgver=4.6.1
-pkgrel=0
+pkgrel=1
pkgdesc="A desktop manager for Xfce"
url="http://www.xfce.org/"
license="GPL-2"
@@ -11,23 +11,23 @@ makedepends="pkgconfig libxfce4menu-dev thunar-dev intltool gettext-dev
libiconv-dev libxfce4util-dev gtk+-dev libxfcegui4-dev libwnck-dev
libglade-dev xfce4-panel-dev libsm-dev libice-dev expat-dev
e2fsprogs-dev"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
- $install"
+install=
+source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"
-build ()
-{
- cd "$srcdir"/$pkgname-$pkgver
+_builddir="$srcdir"/$pkgname-$pkgver
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
--localstatedir=/var \
--disable-static || return 1
make || return 1
+}
+
+package() {
+ cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="ae15cacc3e3834cca7238a8e1035c50d xfdesktop-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25 xfdesktop.post-install
-db51db79681eadc47be4932355a77c25 xfdesktop.post-upgrade
-db51db79681eadc47be4932355a77c25 xfdesktop.post-deinstall"
+md5sums="ae15cacc3e3834cca7238a8e1035c50d xfdesktop-4.6.1.tar.bz2"
diff --git a/main/xfdesktop/xfdesktop.post-deinstall b/main/xfdesktop/xfdesktop.post-deinstall
deleted file mode 120000
index 15a86781aa8..00000000000
--- a/main/xfdesktop/xfdesktop.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfdesktop.post-install \ No newline at end of file
diff --git a/main/xfdesktop/xfdesktop.post-install b/main/xfdesktop/xfdesktop.post-install
deleted file mode 100644
index c523d78da07..00000000000
--- a/main/xfdesktop/xfdesktop.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/main/xfdesktop/xfdesktop.post-upgrade b/main/xfdesktop/xfdesktop.post-upgrade
deleted file mode 120000
index 15a86781aa8..00000000000
--- a/main/xfdesktop/xfdesktop.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfdesktop.post-install \ No newline at end of file