diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
| commit | 5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (patch) | |
| tree | f2d8419cf544c9c1980e49a5a94f19252e17d4e7 /community/dwm | |
| parent | 02380099f9ca13810767a2d25742c6862e255852 (diff) | |
| parent | 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clementine/PKGBUILD
community/google-gadgets/PKGBUILD
community/redis/PKGBUILD
community/uzbl/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/ekiga/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gdl/PKGBUILD
extra/glade/PKGBUILD
extra/glibmm/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-nettool/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgda/PKGBUILD
extra/libotr/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libwebkit/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/pangomm/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rasqal/PKGBUILD
extra/redland/PKGBUILD
extra/vte/PKGBUILD
extra/xarchiver/PKGBUILD
extra/yelp/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/mesa/PKGBUILD
testing/rasqal/PKGBUILD
testing/redland/PKGBUILD
Diffstat (limited to 'community/dwm')
| -rw-r--r-- | community/dwm/PKGBUILD | 18 | ||||
| -rw-r--r-- | community/dwm/dwm.install | 17 |
2 files changed, 10 insertions, 25 deletions
diff --git a/community/dwm/PKGBUILD b/community/dwm/PKGBUILD index 05604c664..75801fa62 100644 --- a/community/dwm/PKGBUILD +++ b/community/dwm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 18861 2010-06-16 09:09:52Z spupykin $ +# $Id: PKGBUILD 45679 2011-04-27 08:57:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Dag Odenhall <dag.odenhall@gmail.com> # Contributor: Grigorios Bouzakis <grbzks@gmail.com> @@ -13,7 +13,7 @@ license=('MIT') options=(zipman) depends=('libx11' 'libxinerama') install=dwm.install -source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz \ +source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz config.h dwm.desktop) md5sums=('f0b422bfeaa812d66c6dd15c3cc92a6b' @@ -26,13 +26,15 @@ build() { cp $srcdir/config.h config.h sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk - sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk - sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk + sed -i 's/^CFLAGS = -g/#CFLAGS += -g/g' config.mk + sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk + sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk + sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 || return 1 - make PREFIX=/usr DESTDIR=$pkgdir install || return 1 + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 + make PREFIX=/usr DESTDIR=$pkgdir install - install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE && \ - install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README && \ + install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README install -m644 -D $srcdir/dwm.desktop $pkgdir//etc/X11/sessions/dwm.desktop } diff --git a/community/dwm/dwm.install b/community/dwm/dwm.install index d4fa27e62..7415613df 100644 --- a/community/dwm/dwm.install +++ b/community/dwm/dwm.install @@ -4,25 +4,8 @@ pre_install() { /bin/true } -post_install() { - /bin/true -} - pre_upgrade() { echo "-- Edit config.h in PKGBUILD's directory (generally /var/abs/community/x11/dwm/)" echo "-- and rebuild package if you want to change settings." /bin/true } - -post_upgrade() { - /bin/true -} - -pre_remove() { - /bin/true -} - -post_remove() { - /bin/true -} - |