From af910303503f161a21497089c3aff0be4993efca Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 15:49:57 +0100 Subject: [PATCH 01/13] cwm: simplify by using the gnu-makefile build_style --- srcpkgs/cwm-git/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cwm-git/template b/srcpkgs/cwm-git/template index e9ada65771c..bf710942872 100644 --- a/srcpkgs/cwm-git/template +++ b/srcpkgs/cwm-git/template @@ -1,7 +1,8 @@ # Template file for 'cwm-git' pkgname=cwm-git -version=20131221 +version=20131230 revision=1 +build_style=gnu-makefile hostmakedepends="pkg-config bison" makedepends="fontconfig-devel libXft-devel libXinerama-devel libXrandr-devel libX11-devel" short_desc="Lightweight and efficient window manager for X11" @@ -15,14 +16,13 @@ do_fetch() { git clone ${url} ${pkgname}-${version} } -do_build() { +pre_build() { sed -i 's/^CPPFLAGS+=/CPPFLAGS=/' Makefile sed -i 's/^LDFLAGS+=/LDFLAGS=/' Makefile - make CC=$CC ${makejobs} } -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { + vinstall README 644 usr/share/doc/${pkgname} } cwm-git_package() { From 10f4f0ed9c5c9faad4a487a7d721c092571a4d05 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 18:19:12 +0100 Subject: [PATCH 02/13] monsterwm-git: simplify by using the gnu-makefile build_style --- srcpkgs/monsterwm-git/template | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/srcpkgs/monsterwm-git/template b/srcpkgs/monsterwm-git/template index 80b2453e441..06b0b8f851b 100644 --- a/srcpkgs/monsterwm-git/template +++ b/srcpkgs/monsterwm-git/template @@ -1,34 +1,31 @@ # Template file for 'monsterwm-git' pkgname=monsterwm-git -version=20130719 +version=20131230 revision=1 makedepends="libX11-devel" +build_style=gnu-makefile +make_build_args="INCS=-I. LIBS=-lX11" short_desc="Minimal and lightweight dynamic tiling window manager" maintainer="Ypnose " license="MIT" homepage="https://github.com/c00kiemon5ter/monsterwm" - do_fetch() { local url="git://github.com/c00kiemon5ter/monsterwm" msg_normal "Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } -do_build() { +pre_build() { cp ${FILESDIR}/config.h config.h - sed -i 's/CFLAGS =/CFLAGS +=/g' Makefile - sed -i 's/LDFLAGS =/LDFLAGS +=/g' Makefile - make CC=$CC INCS="-I." LIBS="-lX11" ${makejobs} } -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } monsterwm-git_package() { pkg_install() { - vmove usr + vmove all } } From 2bb3e267c7cba23ca12b137175e70ab42b698cd5 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 18:23:02 +0100 Subject: [PATCH 03/13] sic-git: simplify by using the gnu-makefile build_style --- srcpkgs/sic-git/template | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/srcpkgs/sic-git/template b/srcpkgs/sic-git/template index a519682a859..2a9b7a89afa 100644 --- a/srcpkgs/sic-git/template +++ b/srcpkgs/sic-git/template @@ -1,7 +1,9 @@ # Template file for 'sic-git' pkgname=sic-git -version=20130828 +version=20131230 revision=1 +build_style=gnu-makefile +make_build_args="INCS=-I. LIBS=" short_desc="Simple irc client" maintainer="Ypnose " license="MIT" @@ -13,18 +15,13 @@ do_fetch() { git clone ${url} ${pkgname}-${version} } -do_build() { - make CC=$CC INCS="-I." LIBS= ${makejobs} -} - -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall LICENSE 644 usr/share/licenses/sic vinstall README 644 usr/share/doc/sic } sic-git_package() { pkg_install() { - vmove usr + vmove all } } From e80c36e54551583871406c5d8402f4a639d48510 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 18:25:33 +0100 Subject: [PATCH 04/13] tabbed-git: simplify by using the gnu-makefile build_style --- srcpkgs/tabbed-git/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tabbed-git/template b/srcpkgs/tabbed-git/template index 6d9890c65b1..002ff032cbf 100644 --- a/srcpkgs/tabbed-git/template +++ b/srcpkgs/tabbed-git/template @@ -1,7 +1,9 @@ # Template file for 'tabbed-git' pkgname=tabbed-git -version=20131221 +version=20131230 revision=1 +build_style=gnu-makefile +make_build_args="INCS=-I. LIBS=-lX11" makedepends="libX11-devel" short_desc="Simple generic tabbed fronted to xembed aware applications" maintainer="Ypnose " @@ -14,16 +16,14 @@ do_fetch() { git clone ${url} ${pkgname}-${version} } -do_build() { +pre_build() { cp ${FILESDIR}/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 - make CC=$CC INCS="-I." LIBS="-lX11" ${makejobs} } -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } @@ -31,6 +31,6 @@ tabbed-git_package() { provides="tabbed-${version}" replaces="tabbed>=0" pkg_install() { - vmove usr + vmove all } } From fb334f72b4971671f07821655cb0f536ddbe44cd Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 18:28:10 +0100 Subject: [PATCH 05/13] tabbed: simplify by using the gnu-makefile build_style --- srcpkgs/tabbed/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tabbed/template b/srcpkgs/tabbed/template index 52ef24d096b..429092b007b 100644 --- a/srcpkgs/tabbed/template +++ b/srcpkgs/tabbed/template @@ -1,9 +1,11 @@ # Template file for 'tabbed' pkgname=tabbed version=0.5 -revision=2 +revision=3 homepage="http://tools.suckless.org/tabbed/" distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz" +build_style=gnu-makefile +make_build_args="INCS=-I. LIBS=-lX11" makedepends="libX11-devel" short_desc="Tab interface for application supporting Xembed" maintainer="Ypnose " @@ -12,22 +14,21 @@ checksum=21226506761909fadebdd5fae0ff5149b9a378836fa515c45efbcbe504321fb9 long_desc=" tabbed is a simple tabbed X window container, for application supporting Xembed" -do_build() { +pre_build() { cp ${FILESDIR}/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 - make CC=$CC INCS="-I." LIBS="-lX11" ${makejobs} } -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } tabbed_package() { + provides="tabbed-${version}" replaces="tabbed>=0" pkg_install() { - vmove usr + vmove all } } From 45af6ccdf46a98d9c82fb76892ad4e6b64d76966 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 18:36:09 +0100 Subject: [PATCH 06/13] smu-git: simplify by using the gnu-makefile build_style --- srcpkgs/smu-git/template | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/srcpkgs/smu-git/template b/srcpkgs/smu-git/template index fc1a35e2eea..6c874522269 100644 --- a/srcpkgs/smu-git/template +++ b/srcpkgs/smu-git/template @@ -1,7 +1,9 @@ # Template file for 'smu-git' pkgname=smu-git -version=20131221 +version=20131230 revision=1 +build_style=gnu-makefile +make_build_args="INCS=-I. LIBS=" short_desc="Simple markup - markdown like syntax" maintainer="Ypnose " license="MIT" @@ -13,17 +15,12 @@ do_fetch() { git clone ${url} ${pkgname}-${version} } -do_build() { - make CC=$CC INCS="-I." LIBS= ${makejobs} -} - -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall LICENSE 644 usr/share/licenses/smu } smu-git_package() { pkg_install() { - vmove usr + vmove all } } From e14482b9227ede68715cb4f5351c1f57d8747688 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 18:39:14 +0100 Subject: [PATCH 07/13] sxhkd-git: simplify by using the gnu-makefile build_style --- srcpkgs/sxhkd-git/template | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/sxhkd-git/template b/srcpkgs/sxhkd-git/template index 4da1abcfcc9..d5802275c07 100644 --- a/srcpkgs/sxhkd-git/template +++ b/srcpkgs/sxhkd-git/template @@ -1,32 +1,30 @@ # Template file for 'sxhkd-git' pkgname=sxhkd-git -version=20131221 +version=20131230 revision=1 +build_style=gnu-makefile makedepends="libxcb-devel xcb-util-devel xcb-util-keysyms-devel" short_desc="Simple X HotKey Daemon" maintainer="Ypnose " license="BSD" homepage="https://github.com/baskerville/sxhkd" - do_fetch() { local url="git://github.com/baskerville/sxhkd" msg_normal "Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } -do_build() { +pre_build() { sed -i 's/LIBS =/LIBS +=/g' Makefile - make CC=$CC INCS="-I." ${makejobs} } -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } sxhkd-git_package() { pkg_install() { - vmove usr + vmove all } } From 6e22e9c7d74e65e9ac9c73e72c725f85227f3fb7 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 18:42:38 +0100 Subject: [PATCH 08/13] sxiv-git: simplify by using the gnu-makefile build_style --- srcpkgs/sxiv-git/template | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/srcpkgs/sxiv-git/template b/srcpkgs/sxiv-git/template index 27596d30269..3658d097a43 100644 --- a/srcpkgs/sxiv-git/template +++ b/srcpkgs/sxiv-git/template @@ -1,7 +1,8 @@ # Template file for 'sxiv-git' pkgname=sxiv-git -version=20131221 +version=20131230 revision=1 +build_style=gnu-makefile makedepends="libX11-devel imlib2-devel giflib-devel" short_desc="Simple X Image Viewer" maintainer="Ypnose " @@ -14,21 +15,17 @@ do_fetch() { git clone ${url} ${pkgname}-${version} } -do_build() { +pre_build() { cp ${FILESDIR}/config.h config.h - sed -i 's/^CFLAGS =/CFLAGS +=/' Makefile - sed -i 's/^LDFLAGS =/LDFLAGS +=/' Makefile - make CC=$CC ${makejobs} } -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } sxiv-git_package() { depends="desktop-file-utils" pkg_install() { - vmove usr + vmove all } } From 94dc337a482e0f07f336196cab6ba1dcd4782b59 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 19:03:45 +0100 Subject: [PATCH 09/13] ii: simplify by using the gnu-makefile build_style --- srcpkgs/ii/template | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template index e8b894d62d9..f95f28aa152 100644 --- a/srcpkgs/ii/template +++ b/srcpkgs/ii/template @@ -1,7 +1,9 @@ # Template file for 'ii' pkgname=ii version=1.7 -revision=1 +revision=2 +build_style=gnu-makefile +make_build_args="INCLUDES=-I. LIBS=" short_desc="Minimalist FIFO IRC client" maintainer="Ypnose " license="MIT" @@ -9,18 +11,12 @@ homepage="http://tools.suckless.org/ii" distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz" checksum=3a72ac6606d5560b625c062c71f135820e2214fed098e6d624fc40632dc7cc9c -do_build() { - sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk - make CC=$CC -} - -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } ii_package() { pkg_install() { - vmove usr + vmove all } } From b29cf0ba561385f63411431771ab7af398e249c6 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 19:21:22 +0100 Subject: [PATCH 10/13] b43-fwcutter: simplify by using the gnu-makefile build_style --- srcpkgs/b43-fwcutter/template | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/b43-fwcutter/template b/srcpkgs/b43-fwcutter/template index 47b2e088cb0..f4680b3b95e 100644 --- a/srcpkgs/b43-fwcutter/template +++ b/srcpkgs/b43-fwcutter/template @@ -1,7 +1,8 @@ # Template file for 'b43-fwcutter' pkgname=b43-fwcutter version=018 -revision=1 +revision=2 +build_style=gnu-makefile short_desc="Firmware extraction tool for Broadcom wireless driver" maintainer="Ypnose " license="GPL" @@ -9,10 +10,6 @@ homepage="http://wireless.kernel.org/en/users/Drivers/b43" distfiles="http://bues.ch/b43/fwcutter/$pkgname-$version.tar.bz2" checksum=57b069dcd1a369ceb457ca397aab470be9b3fc537f400d27244e060fd425638f -do_build() { - make PREFIX=/usr CC=$CC ${makejobs} -} - do_install() { vinstall b43-fwcutter 755 usr/bin vinstall b43-fwcutter.1 644 usr/share/man/man1 @@ -20,6 +17,6 @@ do_install() { b43-fwcutter_package() { pkg_install() { - vmove usr + vmove all } } From a90e64652f0976a313f228c3357b98b03d6d40e2 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 19:24:14 +0100 Subject: [PATCH 11/13] acpi: simplify by using the gnu-makefile build_style --- srcpkgs/acpi/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/acpi/template b/srcpkgs/acpi/template index 74d0f9b902a..5f11ae33511 100644 --- a/srcpkgs/acpi/template +++ b/srcpkgs/acpi/template @@ -1,7 +1,7 @@ # Template file for 'acpi' pkgname=acpi version=1.7 -revision=1 +revision=2 build_style=gnu-configure short_desc="Displays informations about ACPI devices (battery, thermal sensors and power)" maintainer="Ypnose " @@ -10,10 +10,6 @@ homepage="http://sourceforge.net/projects/acpiclient/" distfiles="http://downloads.sourceforge.net/acpiclient/$pkgname-$version.tar.gz" checksum=d7a504b61c716ae5b7e81a0c67a50a51f06c7326f197b66a4b823de076a35005 -do_install() { - make DESTDIR=$DESTDIR install -} - acpi_package() { pkg_install() { vmove usr From 433410ac73982d76e73df7231fe06016b449fe1d Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 19:33:54 +0100 Subject: [PATCH 12/13] evilwm: simplify by using the gnu-makefile build_style --- srcpkgs/evilwm/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template index 3c99ea51084..6878fefd0d5 100644 --- a/srcpkgs/evilwm/template +++ b/srcpkgs/evilwm/template @@ -1,7 +1,9 @@ # Template file for 'evilwm' pkgname=evilwm version=1.1.0 -revision=1 +revision=2 +build_style=gnu-makefile +make_install_args="INSTALL_STRIP=" short_desc="A minimalist window manager for the X Window System" maintainer="Ypnose " homepage="http://evilwm.sourceforge.net" @@ -10,12 +12,7 @@ distfiles="http://www.6809.org.uk/$pkgname/$pkgname-$version.tar.gz" checksum=cdc763c875b64ee3734f3cb764249e91ec659f550177ec1bb564304260ef0c75 makedepends="libXrandr-devel" -do_build() { - make CC=$CC STRIP=$STRIP ${makejobs} -} - -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR INSTALL_STRIP= install +post_install() { vinstall ${FILESDIR}/evilwm.desktop 644 usr/share/xsessions vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/$pkgname } From 20d0210017ce8e8c8aa6b8a6e83158e27d869278 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 30 Dec 2013 20:16:50 +0100 Subject: [PATCH 13/13] conky-cli: simplify by using the gnu-makefile build_style --- srcpkgs/conky-cli/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template index 29991694b1c..2f44fcdb884 100644 --- a/srcpkgs/conky-cli/template +++ b/srcpkgs/conky-cli/template @@ -2,7 +2,7 @@ pkgname=conky-cli _pkgname=conky version=1.9.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-lua --disable-x11 --disable-xft --disable-imlib2 --disable-own-window --disable-xdamage --disable-double-buffer --enable-curl @@ -17,8 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/${_pkgname}/${_pkgname}-${version}.tar.gz" checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca wrksrc="${_pkgname}-${version}" -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install +post_install() { vinstall COPYING 644 usr/share/licenses/$_pkgname }