From dacf1f99e929babdb8e0892ee7b8cccc851969d8 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sun, 23 Jun 2013 13:05:35 +0200 Subject: [PATCH 1/3] slock: fix crossbuilds fatal errors --- srcpkgs/slock/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template index c5e69151c0..7ab2115b6c 100644 --- a/srcpkgs/slock/template +++ b/srcpkgs/slock/template @@ -1,9 +1,9 @@ # Template file for 'slock' pkgname=slock version=1.1 -revision=1 +revision=2 hostmakedepends="pkg-config" -makedepends="libXext-devel" +makedepends="libX11-devel libXext-devel" short_desc="A simple screen locker for X" maintainer="Juan RP " license="MIT" @@ -16,11 +16,15 @@ long_desc=" day when they are out with friends or fetching some food from the local pub." do_build() { - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 ${makejobs} + 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 -lXext -lcrypt" ${makejobs} } do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install + make PREFIX=/usr DESTDIR=$DESTDIR install + vinstall LICENSE 644 usr/share/licenses/$pkgname } slock_package() { From 536ed7851fdd526eba2f05a91bf0828f1431ff05 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sun, 23 Jun 2013 17:20:22 +0200 Subject: [PATCH 2/3] New package: mcwm-20130209 --- srcpkgs/mcwm/template | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/mcwm/template diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template new file mode 100644 index 0000000000..c95e6b3528 --- /dev/null +++ b/srcpkgs/mcwm/template @@ -0,0 +1,28 @@ +# Template file for 'mcwm' +pkgname=mcwm +version=20130209-2 +revision=1 +build_style=gnu-makefile +makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel" +short_desc="A minimalist stacking X window manager based on XCB" +maintainer="Ypnose " +license="ISC" +homepage="http://hack.org/mc/projects/mcwm/" +distfiles="http://hack.org/mc/hacks/$pkgname/$pkgname-$version.tar.bz2" +checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be + +do_build() { + sed -i 's/man\/man1/share\/man\/man1/g' Makefile + make ${makejobs} +} + +do_install() { + make PREFIX=/usr DESTDIR=${DESTDIR} install + vinstall LICENSE 644 usr/share/licenses/${pkgname} +} + +mcwm_package() { + pkg_install() { + vmove usr + } +} From 2b1a0615b91ee6c1b6bdc2a8a1add0b13db9b899 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sun, 23 Jun 2013 19:16:15 +0200 Subject: [PATCH 3/3] mcwm: little fix CC --- srcpkgs/mcwm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template index c95e6b3528..33af5b522f 100644 --- a/srcpkgs/mcwm/template +++ b/srcpkgs/mcwm/template @@ -13,7 +13,7 @@ checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be do_build() { sed -i 's/man\/man1/share\/man\/man1/g' Makefile - make ${makejobs} + make CC=$CC ${makejobs} } do_install() {