From 01d56e29257fa73252e90fe045d610b8ffd4ea9e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 28 Dec 2013 11:25:35 +0100
Subject: [PATCH 01/22] xorg-server: update to 1.15.0 (wip).
---
srcpkgs/xorg-server/template | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index ab4b6837ec..9a706d8c45 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
# Template build file for 'xorg-server'.
pkgname=xorg-server
-version=1.14.5
+version=1.15.0
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@@ -17,12 +17,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
license="MIT/X11, BSD"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1
+checksum=613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8
hostmakedepends="pkg-config perl flex"
-makedepends="libfl-devel damageproto inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22
+makedepends="libfl-devel damageproto inputproto>=2.2 glproto>=1.4.17 xproto>=7.0.25
dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto
- resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto libudev-devel>=183
+ resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto dri3proto presentproto
+ libxshmfence-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel libudev-devel>=183
openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel
libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
@@ -84,12 +85,12 @@ xorg-server-xvfb_package() {
}
xorg-server-devel_package() {
- depends="libudev-devel dri2proto>=2.1 glproto xf86driproto randrproto
+ depends="libudev-devel dri2proto>=2.1 dri3proto presentproto glproto xf86driproto randrproto
videoproto compositeproto scrnsaverproto resourceproto xineramaproto
libdmx-devel libXext-devel libX11-devel libpciaccess-devel libXfont-devel
libXau-devel pixman-devel libXdmcp-devel libXmu-devel libXrender-devel
libXfixes-devel libXi-devel libXaw-devel libXt-devel libXpm-devel
- libdrm-devel>=2.4.34"
+ libxshmfence-devel libdrm-devel>=2.4.34"
if [ "$build_option_opengl" ]; then
depends+=" MesaLib-devel"
fi
@@ -103,7 +104,7 @@ xorg-server-devel_package() {
xorg-server_package() {
# See hw/xfree86/common/xf86Module.h. Only care for the major version.
- provides="xserver-abi-extension-7_1 xserver-abi-input-19_1 xserver-abi-video-14_1"
+ provides="xserver-abi-extension-8_1 xserver-abi-input-20_1 xserver-abi-video-15_1"
depends="xkeyboard-config"
pkg_install() {
vmove all
From 01c977c451b12a4df375c30496497601ac909d36 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 28 Dec 2013 11:37:26 +0100
Subject: [PATCH 02/22] xf86-video-intel: update to 2.99.906 for
xorg-server-1.15.
---
srcpkgs/xf86-video-intel/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index 41a74a80bd..0c682a5e5d 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -1,18 +1,18 @@
# Template build file for 'xf86-video-intel'.
pkgname=xf86-video-intel
-version=2.21.15
+version=2.99.906
revision=1
build_style=gnu-configure
configure_args="--with-default-accel=sna --enable-kms-only --enable-sna"
makedepends="pkg-config dri2proto>=2.6 libudev-devel>=183 libdrm-devel
libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel
- xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.14"
+ xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.15<1.16"
short_desc="Xorg DDX Intel video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
license="MIT"
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
-checksum=7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc
+checksum=2d9343ce0257f82612ab6cb4a18ebfdcb2bc76a226d8442b2f7f210cc4f63cd6
only_for_archs="i686 x86_64"
@@ -21,7 +21,7 @@ post_install() {
}
xf86-video-intel_package() {
- depends="xserver-abi-video>=14_1 mesa-intel-dri"
+ depends="xserver-abi-video>=15_1 mesa-intel-dri"
pkg_install() {
vmove all
}
From 04040d0f7c350ce59bd5d9fc89b8e083a0549fa5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:11:52 +0100
Subject: [PATCH 03/22] xf86-input-evdev: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-input-evdev/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template
index ee2ec8b258..429caaf528 100644
--- a/srcpkgs/xf86-input-evdev/template
+++ b/srcpkgs/xf86-input-evdev/template
@@ -1,10 +1,10 @@
# Template build file for 'xf86-input-evdev'.
pkgname=xf86-input-evdev
version=2.8.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="xorg-server-devel>=1.14 mtdev-devel"
+makedepends="xorg-server-devel>=1.15<1.16 mtdev-devel"
short_desc="Xorg event device input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@@ -13,7 +13,7 @@ distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
checksum=750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3
xf86-input-evdev-devel_package() {
- depends="xorg-server-devel ${sourcepkg}>=${version}"
+ depends="xorg-server-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -22,7 +22,7 @@ xf86-input-evdev-devel_package() {
}
xf86-input-evdev_package() {
- depends="xserver-abi-input-19_1"
+ depends="xserver-abi-input-20_1"
pkg_install() {
vmove all
}
From eb0d138947ab527a7c03179e347347bae67e95b6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:12:44 +0100
Subject: [PATCH 04/22] xf86-input-joystick: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-input-joystick/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template
index 2bb3a5991d..13ac5ba960 100644
--- a/srcpkgs/xf86-input-joystick/template
+++ b/srcpkgs/xf86-input-joystick/template
@@ -1,10 +1,10 @@
# Template build file for 'xf86-input-joystick'.
pkgname=xf86-input-joystick
version=1.6.2
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="xorg-server-devel>=1.14"
+makedepends="xorg-server-devel>=1.15<1.16"
short_desc="Joystick Input driver for Xorg"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@@ -25,7 +25,7 @@ xf86-input-joystick-devel_package() {
}
xf86-input-joystick_package() {
- depends="xserver-abi-input-19_1"
+ depends="xserver-abi-input-20_1"
pkg_install() {
vmove all
}
From 3cb4b2da69a8aa463e809e68745c062bb1ec5405 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:13:24 +0100
Subject: [PATCH 05/22] xf86-input-synaptics: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-input-synaptics/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template
index 7d5b1cd37e..8df8328cc8 100644
--- a/srcpkgs/xf86-input-synaptics/template
+++ b/srcpkgs/xf86-input-synaptics/template
@@ -1,11 +1,11 @@
# Template build file for 'xf86-input-synaptics'.
pkgname=xf86-input-synaptics
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libX11-devel libXtst-devel mtdev-devel
- pixman-devel libpciaccess-devel xorg-server-devel>=1.14"
+ pixman-devel libpciaccess-devel xorg-server-devel>=1.15<1.16"
short_desc="Xorg synaptics touchpad input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.x.org/"
@@ -22,7 +22,7 @@ xf86-input-synaptics-devel_package() {
}
xf86-input-synaptics_package() {
- depends="xserver-abi-input-19_1"
+ depends="xserver-abi-input-20_1"
pkg_install() {
vmove all
}
From dc0cb6979173ed1426a2d98d4be14ab6e3652df4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:13:58 +0100
Subject: [PATCH 06/22] xf86-input-vmmouse: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-input-vmmouse/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template
index 5035b319c9..7e905ddb4c 100644
--- a/srcpkgs/xf86-input-vmmouse/template
+++ b/srcpkgs/xf86-input-vmmouse/template
@@ -1,10 +1,10 @@
# Template build file for 'xf86-input-vmmouse'.
pkgname=xf86-input-vmmouse
version=13.0.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="xorg-server-devel>=1.14"
+makedepends="xorg-server-devel>=1.15<1.16"
short_desc="Xorg VMware virtual mouse input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@@ -18,7 +18,7 @@ post_install() {
}
xf86-input-vmmouse_package() {
- depends="xserver-abi-input-19_1"
+ depends="xserver-abi-input-20_1"
pkg_install() {
vmove all
}
From 5c63f69cc170503947d1904d2ebb85419d5dfd4f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:14:33 +0100
Subject: [PATCH 07/22] xf86-input-wacom: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-input-wacom/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template
index 76e6ebf2bc..faa573902f 100644
--- a/srcpkgs/xf86-input-wacom/template
+++ b/srcpkgs/xf86-input-wacom/template
@@ -1,11 +1,11 @@
# Template build file for 'xf86-input-wacom'.
pkgname=xf86-input-wacom
version=0.23.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-xorg-conf-dir=/etc/X11/xorg.conf.d"
hostmakedepends="pkg-config"
-makedepends="xorg-server-devel>=1.14 libXrandr-devel libXinerama-devel libXi-devel"
+makedepends="xorg-server-devel>=1.15<1.16 libXrandr-devel libXinerama-devel libXi-devel"
short_desc="Xorg Wacom tablet input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@@ -26,7 +26,7 @@ xf86-input-wacom-devel_package() {
}
xf86-input-wacom_package() {
- depends="xserver-abi-input-19_1"
+ depends="xserver-abi-input-20_1"
pkg_install() {
vmove all
}
From bcfe72c7a5f9182fa67496db5dcd69b9cac85cc6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:15:39 +0100
Subject: [PATCH 08/22] glamor-egl: rebuild for xorg-server-1.15.
---
srcpkgs/glamor-egl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glamor-egl/template b/srcpkgs/glamor-egl/template
index 15ab5c56a9..77a2626334 100644
--- a/srcpkgs/glamor-egl/template
+++ b/srcpkgs/glamor-egl/template
@@ -1,10 +1,10 @@
# Template build file for 'glamor-egl'.
pkgname=glamor-egl
version=0.5.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config xorg-util-macros"
-makedepends="libdrm-devel MesaLib-devel xorg-server-devel>=1.14<1.15"
+makedepends="libdrm-devel MesaLib-devel xorg-server-devel>=1.15<1.16"
short_desc="OpenGL based 2D rendering acceleration library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/Glamor/"
@@ -29,7 +29,7 @@ glamor-egl-devel_package() {
}
glamor-egl_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From af712cfac93084ae956117b447e043bab82eb5fc Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:16:24 +0100
Subject: [PATCH 09/22] xf86-video-ati: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-ati/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template
index 9d6621bb0a..5157a5e22f 100644
--- a/srcpkgs/xf86-video-ati/template
+++ b/srcpkgs/xf86-video-ati/template
@@ -1,13 +1,13 @@
# Template build file for 'xf86-video-ati'.
pkgname=xf86-video-ati
version=7.2.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-glamor"
hostmakedepends="pkg-config"
makedepends="xf86driproto libudev-devel>=183 libpciaccess-devel
libdrm-devel pixman-devel MesaLib-devel>=9.0.2 glamor-egl-devel
- xorg-server-devel>=1.14"
+ xorg-server-devel>=1.15<1.16"
short_desc="Xorg ATI Radeon video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@@ -17,7 +17,7 @@ checksum=f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4
xf86-video-ati_package() {
replaces="xf86-video-ati>=0"
- depends="xserver-abi-video-14_1 mesa-ati-dri"
+ depends="xserver-abi-video-15_1 mesa-ati-dri"
pkg_install() {
vmove all
}
From a013869c5a1604c13c1c092937c957f15f1c4dc2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:17:01 +0100
Subject: [PATCH 10/22] xf86-video-cirrus: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-cirrus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template
index 9d9f0e1859..c83a429d91 100644
--- a/srcpkgs/xf86-video-cirrus/template
+++ b/srcpkgs/xf86-video-cirrus/template
@@ -1,10 +1,10 @@
# Template build file for 'xf86-video-cirrus'.
pkgname=xf86-video-cirrus
version=1.5.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="xorg-server-devel>=1.14"
+makedepends="xorg-server-devel>=1.15<1.16"
short_desc="Xorg Cirrus Logic video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
@@ -13,7 +13,7 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
xf86-video-cirrus_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From c7922b30e5e2fa8536a3a056610c1e128a695e65 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:17:38 +0100
Subject: [PATCH 11/22] xf86-video-fbdev: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-fbdev/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template
index 1c3e401d79..3fee7cbc2a 100644
--- a/srcpkgs/xf86-video-fbdev/template
+++ b/srcpkgs/xf86-video-fbdev/template
@@ -1,10 +1,10 @@
# Template build file for 'xf86-video-fbdev'.
pkgname=xf86-video-fbdev
version=0.4.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="xorg-server-devel>=1.14"
+makedepends="xorg-server-devel>=1.15<1.16"
short_desc="Xorg framebuffer video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
@@ -17,7 +17,7 @@ if [ "$CROSS_BUILD" ]; then
fi
xf86-video-fbdev_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From df3c6f21edd3d631490e191207d0ae049518e9a9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:19:06 +0100
Subject: [PATCH 12/22] xf86-video-fbturbo-git: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-fbturbo-git/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xf86-video-fbturbo-git/template b/srcpkgs/xf86-video-fbturbo-git/template
index 82b0c4d05a..126d621283 100644
--- a/srcpkgs/xf86-video-fbturbo-git/template
+++ b/srcpkgs/xf86-video-fbturbo-git/template
@@ -1,10 +1,10 @@
# Template build file for 'xf86-video-fbturbo-git'.
pkgname=xf86-video-fbturbo-git
version=20131218
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config xorg-util-macros xorg-server-devel"
-makedepends="libXrandr-devel xorg-server-devel>=1.14"
+hostmakedepends="automake libtool pkg-config xorg-util-macros xorg-server-devel>=1.15<1.16"
+makedepends="libXrandr-devel xorg-server-devel>=1.15<1.16"
short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices"
homepage="http://github.com/ssvb/xf86-video-fbturbo"
license="MIT, GPL"
@@ -22,7 +22,7 @@ pre_configure() {
}
xf86-video-fbturbo-git_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From 2148bb10892f9d669eda1a237dd194e052bd9b80 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:19:26 +0100
Subject: [PATCH 13/22] xf86-video-geode: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-geode/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template
index d826892ae4..d2f7dda08e 100644
--- a/srcpkgs/xf86-video-geode/template
+++ b/srcpkgs/xf86-video-geode/template
@@ -1,7 +1,7 @@
# Template build file for 'xf86-video-geode'.
pkgname=xf86-video-geode
version=2.11.14
-revision=3
+revision=4
build_style=gnu-configure
short_desc="Xorg AMD Geode GX/LX video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,10 +12,10 @@ checksum=4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc
# This is x86 specific.
only_for_archs=i686
-makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.14"
+makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.15<1.16"
xf86-video-geode_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From 68d354fcc87c4eddb00b53552c70c92e815d8488 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:19:48 +0100
Subject: [PATCH 14/22] xf86-video-modesetting: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-modesetting/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-modesetting/template b/srcpkgs/xf86-video-modesetting/template
index 98d52710e0..ff8bd83867 100644
--- a/srcpkgs/xf86-video-modesetting/template
+++ b/srcpkgs/xf86-video-modesetting/template
@@ -1,10 +1,10 @@
# Template build file for 'xf86-video-modesetting'.
pkgname=xf86-video-modesetting
version=0.8.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.14"
+makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.15<1.16"
short_desc="X.org generic modesetting video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@@ -13,7 +13,7 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca
xf86-video-modesetting_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From 9bd5480209292b0122e6779e71f081b9ca9309c4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:20:24 +0100
Subject: [PATCH 15/22] xf86-video-nouveau: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-nouveau/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index 71fe79952c..dfc03b350f 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -1,10 +1,10 @@
# Template build file for 'xf86-video-nouveau'.
pkgname=xf86-video-nouveau
version=1.0.10
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.14"
+makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.15<1.16"
short_desc="Xorg opensource NVIDIA video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://nouveau.freedesktop.org/wiki/"
@@ -13,7 +13,7 @@ distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${ve
checksum=c1bab3160bae96d485fc93a048d19775398aa85b407bac53020675f7e995db9d
xf86-video-nouveau_package() {
- depends="xserver-abi-video-14_1 mesa-nouveau-dri"
+ depends="xserver-abi-video-15_1 mesa-nouveau-dri"
pkg_install() {
vmove all
}
From 353653290f8edb36e81e42aa4232385a6ed4196d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:20:54 +0100
Subject: [PATCH 16/22] xf86-video-openchrome: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-openchrome/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template
index 38ba061efb..1e882c2340 100644
--- a/srcpkgs/xf86-video-openchrome/template
+++ b/srcpkgs/xf86-video-openchrome/template
@@ -1,12 +1,12 @@
# Template build file for 'xf86-video-openchrome'.
pkgname=xf86-video-openchrome
version=0.3.1
-revision=3
+revision=4
only_for_archs=i686
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel
- MesaLib-devel xorg-server-devel>=1.14"
+ MesaLib-devel xorg-server-devel>=1.15<1.16"
short_desc="Xorg VIA Unichromes video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
@@ -15,7 +15,7 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=eb459a86e20fa090577315a0d9964bf3f94abc5241c5408453f326eaf8915ce7
xf86-video-openchrome_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From 2575ef8e80e3462810d2a01e27f2cd019fc44da0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:21:25 +0100
Subject: [PATCH 17/22] xf86-video-sisusb: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-sisusb/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template
index 1b6ac6b3ee..8db23c75b1 100644
--- a/srcpkgs/xf86-video-sisusb/template
+++ b/srcpkgs/xf86-video-sisusb/template
@@ -1,9 +1,10 @@
# Template build file for 'xf86-video-sisusb'.
pkgname=xf86-video-sisusb
version=0.9.6
-revision=3
+revision=4
build_style=gnu-configure
-makedepends="pkg-config xorg-server-devel>=1.14"
+hostmakedepends="pkg-config"
+makedepends="xorg-server-devel>=1.15<1.16"
short_desc="Xorg SiS USB video driver"
homepage="http://xorg.freedesktop.org/"
license="Custom"
@@ -16,7 +17,7 @@ long_desc="
that are connected via a Net2280-based USB dongle for the Xorg X11 server."
xf86-video-sisusb_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From 2e1f2b7c3d375a74df0142f85fc90c799f7d45ea Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:22:02 +0100
Subject: [PATCH 18/22] xf86-video-vesa: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-vesa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template
index d50252743b..a4d8a592e0 100644
--- a/srcpkgs/xf86-video-vesa/template
+++ b/srcpkgs/xf86-video-vesa/template
@@ -2,10 +2,10 @@
pkgname=xf86-video-vesa
version="2:2.3.3"
wrksrc="${pkgname}-${version#*:}"
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="xorg-server-devel>=1.14"
+makedepends="xorg-server-devel>=1.15<1.16"
short_desc="Xorg VESA video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
@@ -18,7 +18,7 @@ if [ "$CROSS_BUILD" ]; then
fi
xf86-video-vesa_package() {
- depends="xserver-abi-video-14_1"
+ depends="xserver-abi-video-15_1"
pkg_install() {
vmove all
}
From 85559bc948b495db45a42731617310f320540195 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:22:32 +0100
Subject: [PATCH 19/22] xf86-video-vmware: rebuild for xorg-server-1.15.
---
srcpkgs/xf86-video-vmware/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template
index cd3c32be87..a0ef9dadcc 100644
--- a/srcpkgs/xf86-video-vmware/template
+++ b/srcpkgs/xf86-video-vmware/template
@@ -1,12 +1,12 @@
# Template build file for 'xf86-video-vmware'.
pkgname=xf86-video-vmware
version=13.0.1
-revision=3
+revision=4
only_for_archs="i686 x86_64"
build_style=gnu-configure
configure_args="--enable-vmwarectrl-client"
hostmakedepends="automake libtool pkg-config xorg-util-macros"
-makedepends="libdrm-devel MesaLib-devel>=10.0.0_2 xorg-server-devel>=1.14"
+makedepends="libdrm-devel MesaLib-devel>=10.0.0_2 xorg-server-devel>=1.15<1.16"
short_desc="Modular Xorg VMware virtual video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@@ -19,7 +19,7 @@ pre_configure() {
}
xf86-video-vmware_package() {
- depends="xserver-abi-video-14_1 mesa-vmwgfx-dri"
+ depends="xserver-abi-video-15_1 mesa-vmwgfx-dri"
pkg_install() {
vmove all
}
From 365868ccdce11276d826b1da2eaedc4bbf48c31b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:25:43 +0100
Subject: [PATCH 20/22] xf86-video-vmware: update patch for xorg-server-1.15.
---
...bea5fc32eacb7bf42639efbd45dcd43e7ab5.patch | 179 --
.../patches/xatracker-v2-fixes.patch | 1583 +++++++++++++++++
srcpkgs/xf86-video-vmware/template | 1 +
3 files changed, 1584 insertions(+), 179 deletions(-)
delete mode 100644 srcpkgs/xf86-video-vmware/patches/0945bea5fc32eacb7bf42639efbd45dcd43e7ab5.patch
create mode 100644 srcpkgs/xf86-video-vmware/patches/xatracker-v2-fixes.patch
diff --git a/srcpkgs/xf86-video-vmware/patches/0945bea5fc32eacb7bf42639efbd45dcd43e7ab5.patch b/srcpkgs/xf86-video-vmware/patches/0945bea5fc32eacb7bf42639efbd45dcd43e7ab5.patch
deleted file mode 100644
index 91304d64f9..0000000000
--- a/srcpkgs/xf86-video-vmware/patches/0945bea5fc32eacb7bf42639efbd45dcd43e7ab5.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001
-From: Rob Clark <robdclark@gmail.com>
-Date: Mon, 10 Jun 2013 17:31:31 +0000
-Subject: vmwgfx: update for XA API changes
-
-Signed-off-by: Rob Clark <robdclark@gmail.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/configure.ac b/configure.ac
-index 0631bcc..dccfb27 100644
---- configure.ac
-+++ configure.ac
-@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then
- PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
- fi
- if test x$BUILD_VMWGFX = xyes; then
-- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
-+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
- fi
-
- DRIVER_NAME=vmware
-diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
-index 7de0772..2f007f0 100644
---- vmwgfx/vmwgfx_dri2.c
-+++ vmwgfx/vmwgfx_dri2.c
-@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
- }
-
- private->srf = srf;
-- if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
-+ if (xa_surface_handle(srf, xa_handle_type_shared,
-+ &buffer->name, &buffer->pitch) != 0)
- return FALSE;
-
- buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
-@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
- struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
-
- if (--private->refcount == 0 && srf) {
-- xa_surface_destroy(srf);
-+ xa_surface_unref(srf);
- }
-
- /*
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index 7863ba2..3002285 100644
---- vmwgfx/vmwgfx_driver.c
-+++ vmwgfx/vmwgfx_driver.c
-@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
- return FALSE;
- }
-
-- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
-+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
-+ &handle, &dummy) != 0) {
- LogMessage(X_ERROR, "Could not get present surface handle.\n");
- return FALSE;
- }
-diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
-index 63df3a1..ed3c1ee 100644
---- vmwgfx/vmwgfx_saa.c
-+++ vmwgfx/vmwgfx_saa.c
-@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
- vpix->malloc = NULL;
- }
- if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
-- xa_surface_destroy(vpix->hw);
-+ xa_surface_unref(vpix->hw);
- vpix->hw = NULL;
- }
- if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
-@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
- if (vpix->gmr && vsaa->can_optimize_dma) {
- uint32_t handle, dummy;
-
-- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
-+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
-+ &handle, &dummy) != 0)
- goto out_err;
- if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
- to_hw) != 0)
-@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
- (int) to_hw,
- (struct xa_box *) REGION_RECTS(reg),
- REGION_NUM_RECTS(reg));
-+ if (to_hw)
-+ xa_context_flush(vsaa->xa_ctx);
- if (vpix->gmr)
- vmwgfx_dmabuf_unmap(vpix->gmr);
- if (ret)
-@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
- &spix->dirty_hw))
- return FALSE;
-
-- xa_surface_destroy(vpix->hw);
-+ xa_surface_unref(vpix->hw);
- vpix->hw = NULL;
-
- /*
-@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
-
- (void) pScreen;
- if (src_vpix == dst_vpix || !src_vpix->hw ||
-- xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
-+ xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
-+ &vsaa->src_handle, &dummy) != 0)
- return FALSE;
-
- REGION_NULL(pScreen, &vsaa->present_region);
-@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
- return TRUE;
-
- out_no_damage:
-- xa_surface_destroy(hw);
-+ xa_surface_unref(hw);
- return FALSE;
- }
-
-@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
-
- if (!vmwgfx_hw_validate(src_pixmap, src_reg)) {
- xa_copy_done(vsaa->xa_ctx);
-+ xa_context_flush(vsaa->xa_ctx);
- return FALSE;
- }
-
-@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver)
- return;
- }
- xa_copy_done(vsaa->xa_ctx);
-+ xa_context_flush(vsaa->xa_ctx);
- }
-
- static Bool
-@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver)
- struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
-
- xa_composite_done(vsaa->xa_ctx);
-+ xa_context_flush(vsaa->xa_ctx);
- }
-
- static void
-@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
- */
- if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
- goto out_err;
-- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
-+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
-+ &handle, &dummy) != 0)
- goto out_err;
- depth = xa_format_depth(xa_surface_format(vpix->hw));
-
-diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
-index 449266b..2971ed7 100644
---- vmwgfx/vmwgfx_tex_video.c
-+++ vmwgfx/vmwgfx_tex_video.c
-@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
-
- for (i=0; i<3; ++i) {
- if (priv->yuv[i]) {
-- xa_surface_destroy(priv->yuv[i]);
-+ xa_surface_unref(priv->yuv[i]);
- priv->yuv[i] = NULL;
- }
- for (j=0; j<2; ++j) {
-@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn,
- REGION_RESET(pScrn->pScreen, ®, &box);
- }
-
-- if (xa_surface_handle(srf, &handle, &stride) != 0) {
-+ if (xa_surface_handle(srf, xa_handle_type_shared,
-+ &handle, &stride) != 0) {
- ret = BadAlloc;
- break;
- }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/srcpkgs/xf86-video-vmware/patches/xatracker-v2-fixes.patch b/srcpkgs/xf86-video-vmware/patches/xatracker-v2-fixes.patch
new file mode 100644
index 0000000000..9b8ed54a59
--- /dev/null
+++ b/srcpkgs/xf86-video-vmware/patches/xatracker-v2-fixes.patch
@@ -0,0 +1,1583 @@
+From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Mon, 10 Jun 2013 13:31:31 -0400
+Subject: [PATCH 01/11] vmwgfx: update for XA API changes
+
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Tested-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ configure.ac | 2 +-
+ vmwgfx/vmwgfx_dri2.c | 5 +++--
+ vmwgfx/vmwgfx_driver.c | 3 ++-
+ vmwgfx/vmwgfx_saa.c | 20 ++++++++++++++------
+ vmwgfx/vmwgfx_tex_video.c | 5 +++--
+ 5 files changed, 23 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0631bcc..dccfb27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then
+ PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
+ fi
+ if test x$BUILD_VMWGFX = xyes; then
+- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
+ fi
+
+ DRIVER_NAME=vmware
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 7de0772..2f007f0 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ }
+
+ private->srf = srf;
+- if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
++ if (xa_surface_handle(srf, xa_handle_type_shared,
++ &buffer->name, &buffer->pitch) != 0)
+ return FALSE;
+
+ buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
+@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
+
+ if (--private->refcount == 0 && srf) {
+- xa_surface_destroy(srf);
++ xa_surface_unref(srf);
+ }
+
+ /*
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 7863ba2..3002285 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
+ return FALSE;
+ }
+
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0) {
+ LogMessage(X_ERROR, "Could not get present surface handle.\n");
+ return FALSE;
+ }
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 63df3a1..ed3c1ee 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
+ vpix->malloc = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
+- xa_surface_destroy(vpix->hw);
++ xa_surface_unref(vpix->hw);
+ vpix->hw = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
+@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ if (vpix->gmr && vsaa->can_optimize_dma) {
+ uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+ to_hw) != 0)
+@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ (int) to_hw,
+ (struct xa_box *) REGION_RECTS(reg),
+ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
+ if (vpix->gmr)
+ vmwgfx_dmabuf_unmap(vpix->gmr);
+ if (ret)
+@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
+ &spix->dirty_hw))
+ return FALSE;
+
+- xa_surface_destroy(vpix->hw);
++ xa_surface_unref(vpix->hw);
+ vpix->hw = NULL;
+
+ /*
+@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
+
+ (void) pScreen;
+ if (src_vpix == dst_vpix || !src_vpix->hw ||
+- xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
++ xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
++ &vsaa->src_handle, &dummy) != 0)
+ return FALSE;
+
+ REGION_NULL(pScreen, &vsaa->present_region);
+@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
+ return TRUE;
+
+ out_no_damage:
+- xa_surface_destroy(hw);
++ xa_surface_unref(hw);
+ return FALSE;
+ }
+
+@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
+
+ if (!vmwgfx_hw_validate(src_pixmap, src_reg)) {
+ xa_copy_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ return FALSE;
+ }
+
+@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver)
+ return;
+ }
+ xa_copy_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ }
+
+ static Bool
+@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver)
+ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
+
+ xa_composite_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ }
+
+ static void
+@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
+ */
+ if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+ goto out_err;
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+ depth = xa_format_depth(xa_surface_format(vpix->hw));
+
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 449266b..2971ed7 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+
+ for (i=0; i<3; ++i) {
+ if (priv->yuv[i]) {
+- xa_surface_destroy(priv->yuv[i]);
++ xa_surface_unref(priv->yuv[i]);
+ priv->yuv[i] = NULL;
+ }
+ for (j=0; j<2; ++j) {
+@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ REGION_RESET(pScrn->pScreen, ®, &box);
+ }
+
+- if (xa_surface_handle(srf, &handle, &stride) != 0) {
++ if (xa_surface_handle(srf, xa_handle_type_shared,
++ &handle, &stride) != 0) {
+ ret = BadAlloc;
+ break;
+ }
+--
+1.8.5.1
+
+
+From 835ce4698f916ba080f4132988fd4caf898e0b1e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 26 Sep 2013 01:25:33 -0700
+Subject: [PATCH 02/11] vmwgfx: Avoid HW operations when not master
+
+Note that for DRI2, a dri2_copy_region becomes a NOP when not master.
+Additionally, all dri2 operations that lead to a potential kernel
+access will return FALSE.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_dri2.c | 13 +++++++++++++
+ vmwgfx/vmwgfx_driver.c | 3 +++
+ vmwgfx/vmwgfx_saa.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
+ vmwgfx/vmwgfx_saa.h | 8 ++++++++
+ vmwgfx/vmwgfx_saa_priv.h | 2 ++
+ vmwgfx/vmwgfx_xa_surface.c | 6 ++++++
+ 6 files changed, 75 insertions(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 2f007f0..57f2d9d 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -138,6 +138,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ return TRUE;
+ case DRI2BufferStencil:
+ case DRI2BufferDepthStencil:
++ if (!pScrn->vtSema)
++ return FALSE;
+
+ depth = (format) ? vmwgfx_zs_format_to_depth(format) : 32;
+
+@@ -155,6 +157,9 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+
+ break;
+ case DRI2BufferDepth:
++ if (!pScrn->vtSema)
++ return FALSE;
++
+ depth = (format) ? vmwgfx_z_format_to_depth(format) :
+ pDraw->bitsPerPixel;
+
+@@ -291,6 +296,14 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
+ DrawablePtr dst_draw;
+ RegionPtr myClip;
+ GCPtr gc;
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
++
++ /*
++ * This is a fragile protection against HW operations when not master.
++ * Needs to be blocked higher up in the dri2 code.
++ */
++ if (!pScrn->vtSema)
++ return;
+
+ /*
+ * In driCreateBuffers we dewrap windows into the
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 3002285..eeaea4b 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1116,6 +1116,7 @@ drv_leave_vt(VT_FUNC_ARGS_DECL)
+
+ vmwgfx_cursor_bypass(ms->fd, 0, 0);
+ vmwgfx_disable_scanout(pScrn);
++ vmwgfx_saa_drop_master(pScrn->pScreen);
+
+ if (drmDropMaster(ms->fd))
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+@@ -1136,6 +1137,8 @@ drv_enter_vt(VT_FUNC_ARGS_DECL)
+ if (!drv_set_master(pScrn))
+ return FALSE;
+
++ vmwgfx_saa_set_master(pScrn->pScreen);
++
+ if (!xf86SetDesiredModes(pScrn))
+ return FALSE;
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index ed3c1ee..5534ca3 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -423,6 +423,7 @@ vmwgfx_create_pixmap(struct saa_driver *driver, struct saa_pixmap *spix,
+
+ WSBMINITLISTHEAD(&vpix->sync_x_head);
+ WSBMINITLISTHEAD(&vpix->scanout_list);
++ WSBMINITLISTHEAD(&vpix->pixmap_list);
+
+ return TRUE;
+ }
+@@ -499,6 +500,7 @@ vmwgfx_destroy_pixmap(struct saa_driver *driver, PixmapPtr pixmap)
+ */
+
+ vmwgfx_pixmap_remove_present(vpix);
++ WSBMLISTDELINIT(&vpix->pixmap_list);
+ WSBMLISTDELINIT(&vpix->sync_x_head);
+
+ if (vpix->hw_is_dri2_fronts)
+@@ -627,6 +629,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
+ int bpp, int devkind, void *pixdata)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
++ ScreenPtr pScreen = pixmap->drawable.pScreen;
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
+ unsigned int old_height;
+ unsigned int old_width;
+ unsigned int old_pitch;
+@@ -670,6 +674,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
+
+ vmwgfx_pix_resize(pixmap, old_pitch, old_height, old_width);
+ vmwgfx_pixmap_free_storage(vpix);
++ WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
++
+ return TRUE;
+
+ out_no_modify:
+@@ -860,7 +866,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
+ Bool has_valid_hw;
+
+ if (!vsaa->xat || !SAA_PM_IS_SOLID(&dst_pixmap->drawable, plane_mask) ||
+- alu != GXcopy)
++ alu != GXcopy || !vsaa->is_master)
+ return FALSE;
+
+ src_vpix = vmwgfx_saa_pixmap(src_pixmap);
+@@ -1057,6 +1063,9 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 op,
+ RegionRec empty;
+ struct xa_composite *xa_comp;
+
++ if (!vsaa->is_master)
++ return FALSE;
++
+ REGION_NULL(pScreen, &empty);
+
+ /*
+@@ -1367,7 +1376,9 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
++ vsaa->is_master = TRUE;
+ WSBMINITLISTHEAD(&vsaa->sync_x_list);
++ WSBMINITLISTHEAD(&vsaa->pixmaps);
+
+ vsaa->driver = vmwgfx_saa_driver;
+ vsaa->vcomp = vmwgfx_alloc_composite();
+@@ -1518,3 +1529,34 @@ vmwgfx_scanout_unref(struct vmwgfx_screen_entry *entry)
+ entry->pixmap = NULL;
+ pixmap->drawable.pScreen->DestroyPixmap(pixmap);
+ }
++
++void
++vmwgfx_saa_set_master(ScreenPtr pScreen)
++{
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
++
++ vsaa->is_master = TRUE;
++}
++
++void
++vmwgfx_saa_drop_master(ScreenPtr pScreen)
++{
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
++ struct _WsbmListHead *list;
++ struct vmwgfx_saa_pixmap *vpix;
++ struct saa_pixmap *spix;
++
++ WSBMLISTFOREACH(list, &vsaa->pixmaps) {
++ vpix = WSBMLISTENTRY(list, struct vmwgfx_saa_pixmap, pixmap_list);
++ spix = &vpix->base;
++
++ if (!vpix->hw)
++ continue;
++
++ (void) vmwgfx_download_from_hw(&vsaa->driver, spix->pixmap,
++ &spix->dirty_hw);
++ REGION_EMPTY(draw->pScreen, &spix->dirty_hw);
++ }
++
++ vsaa->is_master = FALSE;
++}
+diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h
+index bb8ec96..d8aa3d3 100644
+--- a/vmwgfx/vmwgfx_saa.h
++++ b/vmwgfx/vmwgfx_saa.h
+@@ -54,6 +54,7 @@ struct vmwgfx_saa_pixmap {
+ int hw_is_dri2_fronts;
+ struct _WsbmListHead sync_x_head;
+ struct _WsbmListHead scanout_list;
++ struct _WsbmListHead pixmap_list;
+
+ uint32_t xa_flags;
+ uint32_t staging_add_flags;
+@@ -107,4 +108,11 @@ Bool
+ vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth,
+ uint32_t add_flags, uint32_t remove_flags,
+ RegionPtr region);
++
++void
++vmwgfx_saa_set_master(ScreenPtr pScreen);
++
++void
++vmwgfx_saa_drop_master(ScreenPtr pScreen);
++
+ #endif
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index 5f46dee..16583b0 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -54,8 +54,10 @@ struct vmwgfx_saa {
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
++ Bool is_master;
+ void (*present_flush) (ScreenPtr pScreen);
+ struct _WsbmListHead sync_x_list;
++ struct _WsbmListHead pixmaps;
+ struct vmwgfx_composite *vcomp;
+ };
+
+diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
+index 8b30e45..2f23c57 100644
+--- a/vmwgfx/vmwgfx_xa_surface.c
++++ b/vmwgfx/vmwgfx_xa_surface.c
+@@ -362,6 +362,12 @@ vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth,
+ Bool
+ vmwgfx_hw_dri2_validate(PixmapPtr pixmap, unsigned int depth)
+ {
++ struct vmwgfx_saa *vsaa =
++ to_vmwgfx_saa(saa_get_driver(pixmap->drawable.pScreen));
++
++ if (!vsaa->is_master)
++ return FALSE;
++
+ return (vmwgfx_hw_dri2_stage(pixmap, depth) &&
+ vmwgfx_hw_commit(pixmap) &&
+ vmwgfx_hw_validate(pixmap, NULL));
+--
+1.8.5.1
+
+
+From 7192acf9f0bf8e7176ab0b803b861a858623f709 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 19 Sep 2012 20:36:57 +0200
+Subject: [PATCH 03/11] vmwgfx: Implement textured video completely on top of
+ XA.
+
+Remove device-specific hacks. This may increase resource usage a little
+on old hardware revisions, but we don't need separate code paths on
+different hardware revisions.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_tex_video.c | 109 ++++++----------------------------------------
+ 1 file changed, 14 insertions(+), 95 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 2971ed7..a0a4f4a 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -111,8 +111,7 @@ struct xorg_xv_port_priv {
+ int hue;
+
+ int current_set;
+- struct vmwgfx_dmabuf *bounce[2][3];
+- struct xa_surface *yuv[3];
++ struct xa_surface *yuv[2][3];
+
+ int drm_fd;
+
+@@ -198,14 +197,10 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ priv->fence = NULL;
+
+ for (i=0; i<3; ++i) {
+- if (priv->yuv[i]) {
+- xa_surface_unref(priv->yuv[i]);
+- priv->yuv[i] = NULL;
+- }
+ for (j=0; j<2; ++j) {
+- if (priv->bounce[j][i]) {
+- vmwgfx_dmabuf_destroy(priv->bounce[j][i]);
+- priv->bounce[0][i] = NULL;
++ if (priv->yuv[i]) {
++ xa_surface_unref(priv->yuv[j][i]);
++ priv->yuv[j][i] = NULL;
+ }
+ }
+ }
+@@ -297,11 +292,9 @@ static int
+ check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id,
+ int width, int height)
+ {
+- struct xa_surface **yuv = priv->yuv;
+- struct vmwgfx_dmabuf **bounce = priv->bounce[priv->current_set];
++ struct xa_surface **yuv = priv->yuv[priv->current_set];
+ int ret = 0;
+ int i;
+- size_t size;
+
+ for (i=0; i<3; ++i) {
+
+@@ -334,19 +327,6 @@ check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id,
+ if (ret || !yuv[i])
+ return BadAlloc;
+
+- size = width * height;
+-
+- if (bounce[i] && (bounce[i]->size < size ||
+- bounce[i]->size > 2*size)) {
+- vmwgfx_dmabuf_destroy(bounce[i]);
+- bounce[i] = NULL;
+- }
+-
+- if (!bounce[i]) {
+- bounce[i] = vmwgfx_dmabuf_alloc(priv->drm_fd, size);
+- if (!bounce[i])
+- return BadAlloc;
+- }
+ }
+ return Success;
+ }
+@@ -413,28 +393,20 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ unsigned short w, unsigned short h)
+ {
+ int i;
+- struct vmwgfx_dmabuf **bounce = port->bounce[port->current_set];
++ struct xa_surface **yuv = port->yuv[port->current_set];
+ char *ymap, *vmap, *umap;
+ unsigned char y1, y2, u, v;
+ int yidx, uidx, vidx;
+ int y_array_size = w * h;
+ int ret = BadAlloc;
+
+- /*
+- * Here, we could use xa_surface_[map|unmap], but given the size of
+- * the yuv textures, that could stress the xa tracker dma buffer pool,
+- * particularaly with multiple videos rendering simultaneously.
+- *
+- * Instead, cheat and allocate vmwgfx dma buffers directly.
+- */
+-
+- ymap = (char *)vmwgfx_dmabuf_map(bounce[0]);
++ ymap = xa_surface_map(port->r, yuv[0], XA_MAP_WRITE);
+ if (!ymap)
+ return BadAlloc;
+- umap = (char *)vmwgfx_dmabuf_map(bounce[1]);
++ umap = xa_surface_map(port->r, yuv[1], XA_MAP_WRITE);
+ if (!umap)
+ goto out_no_umap;
+- vmap = (char *)vmwgfx_dmabuf_map(bounce[2]);
++ vmap = xa_surface_map(port->r, yuv[2], XA_MAP_WRITE);
+ if (!vmap)
+ goto out_no_vmap;
+
+@@ -493,65 +465,11 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ }
+
+ ret = Success;
+- vmwgfx_dmabuf_unmap(bounce[2]);
++ xa_surface_unmap(yuv[2]);
+ out_no_vmap:
+- vmwgfx_dmabuf_unmap(bounce[1]);
++ xa_surface_unmap(yuv[1]);
+ out_no_umap:
+- vmwgfx_dmabuf_unmap(bounce[0]);
+-
+- if (ret == Success) {
+- struct xa_surface *srf;
+- struct vmwgfx_dmabuf *buf;
+- uint32_t handle;
+- unsigned int stride;
+- BoxRec box;
+- RegionRec reg;
+-
+- box.x1 = 0;
+- box.x2 = w;
+- box.y1 = 0;
+- box.y2 = h;
+-
+- REGION_INIT(pScrn->pScreen, ®, &box, 1);
+-
+- for (i=0; i<3; ++i) {
+- srf = port->yuv[i];
+- buf = bounce[i];
+-
+- if (i == 1) {
+- switch(id) {
+- case FOURCC_YV12:
+- h /= 2;
+- /* Fall through */
+- case FOURCC_YUY2:
+- case FOURCC_UYVY:
+- w /= 2;
+- break;
+- default:
+- break;
+- }
+-
+- box.x1 = 0;
+- box.x2 = w;
+- box.y1 = 0;
+- box.y2 = h;
+-
+- REGION_RESET(pScrn->pScreen, ®, &box);
+- }
+-
+- if (xa_surface_handle(srf, xa_handle_type_shared,
+- &handle, &stride) != 0) {
+- ret = BadAlloc;
+- break;
+- }
+-
+- if (vmwgfx_dma(0, 0, ®, buf, w, handle, 1) != 0) {
+- ret = BadAlloc;
+- break;
+- }
+- }
+- REGION_UNINIT(pScrn->pScreen, ®);
+- }
++ xa_surface_unmap(yuv[0]);
+
+ return ret;
+ }
+@@ -610,7 +528,8 @@ display_video(ScreenPtr pScreen, struct xorg_xv_port_priv *pPriv, int id,
+ (struct xa_box *)REGION_RECTS(dstRegion),
+ REGION_NUM_RECTS(dstRegion),
+ pPriv->cm,
+- vpix->hw, pPriv->yuv);
++ vpix->hw,
++ pPriv->yuv[pPriv->current_set ]);
+
+ saa_pixmap_dirty(pPixmap, TRUE, dstRegion);
+ DamageRegionProcessPending(&pPixmap->drawable);
+--
+1.8.5.1
+
+
+From 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 19 Sep 2012 21:50:40 +0200
+Subject: [PATCH 04/11] vmwgfx: Get rid of device-specific DMA code
+
+It's rarely used and things seem to work well enough on top of XA.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_drmi.c | 103 -----------------------------------------------
+ vmwgfx/vmwgfx_drmi.h | 5 ---
+ vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------
+ vmwgfx/vmwgfx_saa_priv.h | 1 -
+ 4 files changed, 26 insertions(+), 136 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c
+index 496a16b..1e23f4a 100644
+--- a/vmwgfx/vmwgfx_drmi.c
++++ b/vmwgfx/vmwgfx_drmi.c
+@@ -284,109 +284,6 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf)
+ }
+
+ int
+-vmwgfx_dma(unsigned int host_x, unsigned int host_y,
+- RegionPtr region, struct vmwgfx_dmabuf *buf,
+- uint32_t buf_pitch, uint32_t surface_handle, int to_surface)
+-{
+- BoxPtr clips = REGION_RECTS(region);
+- unsigned int num_clips = REGION_NUM_RECTS(region);
+- struct drm_vmw_execbuf_arg arg;
+- struct drm_vmw_fence_rep rep;
+- int ret;
+- unsigned int size;
+- unsigned i;
+- SVGA3dCopyBox *cb;
+- SVGA3dCmdSurfaceDMASuffix *suffix;
+- SVGA3dCmdSurfaceDMA *body;
+- struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf);
+-
+- struct {
+- SVGA3dCmdHeader header;
+- SVGA3dCmdSurfaceDMA body;
+- SVGA3dCopyBox cb;
+- } *cmd;
+-
+- if (num_clips == 0)
+- return 0;
+-
+- size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) +
+- sizeof(*suffix);
+- cmd = malloc(size);
+- if (!cmd)
+- return -1;
+-
+- cmd->header.id = SVGA_3D_CMD_SURFACE_DMA;
+- cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) +
+- sizeof(*suffix);
+- cb = &cmd->cb;
+-
+- suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips];
+- suffix->suffixSize = sizeof(*suffix);
+- suffix->maximumOffset = (uint32_t) -1;
+- suffix->flags.discard = 0;
+- suffix->flags.unsynchronized = 0;
+- suffix->flags.reserved = 0;
+-
+- body = &cmd->body;
+- body->guest.ptr.gmrId = buf->gmr_id;
+- body->guest.ptr.offset = buf->gmr_offset;
+- body->guest.pitch = buf_pitch;
+- body->host.sid = surface_handle;
+- body->host.face = 0;
+- body->host.mipmap = 0;
+-
+- body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM :
+- SVGA3D_READ_HOST_VRAM);
+-
+-
+- for (i=0; i < num_clips; i++, cb++, clips++) {
+- cb->x = (uint16_t) clips->x1 + host_x;
+- cb->y = (uint16_t) clips->y1 + host_y;
+- cb->z = 0;
+- cb->srcx = (uint16_t) clips->x1;
+- cb->srcy = (uint16_t) clips->y1;
+- cb->srcz = 0;
+- cb->w = (uint16_t) (clips->x2 - clips->x1);
+- cb->h = (uint16_t) (clips->y2 - clips->y1);
+- cb->d = 1;
+-#if 0
+- LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n",
+- cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h,
+- to_surface ? "to" : "from");
+-#endif
+-
+- }
+-
+- memset(&arg, 0, sizeof(arg));
+- memset(&rep, 0, sizeof(rep));
+-
+- rep.error = -EFAULT;
+- arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep);
+- arg.commands = (unsigned long)cmd;
+- arg.command_size = size;
+- arg.throttle_us = 0;
+- arg.version = DRM_VMW_EXECBUF_VERSION;
+-
+- ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg));
+- if (ret) {
+- LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret));
+- }
+-
+- free(cmd);
+-
+- if (rep.error == 0) {
+- ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE);
+- if (ret) {
+- LogMessage(X_ERROR, "DMA from host fence wait error %s.\n",
+- strerror(-ret));
+- vmwgfx_fence_unref(ibuf->drm_fd, rep.handle);
+- }
+- }
+-
+- return 0;
+-}
+-
+-int
+ vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out)
+ {
+ struct drm_vmw_getparam_arg gp_arg;
+diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h
+index 2435009..fff728a 100644
+--- a/vmwgfx/vmwgfx_drmi.h
++++ b/vmwgfx/vmwgfx_drmi.h
+@@ -60,11 +60,6 @@ extern void
+ vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf);
+
+ extern int
+-vmwgfx_dma(unsigned int host_x, unsigned int host_y,
+- RegionPtr region, struct vmwgfx_dmabuf *buf,
+- uint32_t buf_pitch, uint32_t surface_handle, int to_surface);
+-
+-extern int
+ vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree);
+
+ extern int
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 5534ca3..fd80682 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -279,40 +279,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ Bool to_hw)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
++ void *data = vpix->malloc;
++ int ret;
+
+ if (!vpix->hw || (!vpix->gmr && !vpix->malloc))
+ return TRUE;
+
+- if (vpix->gmr && vsaa->can_optimize_dma) {
+- uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
+- goto out_err;
+- if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+- to_hw) != 0)
++ if (vpix->gmr) {
++ data = vmwgfx_dmabuf_map(vpix->gmr);
++ if (!data)
+ goto out_err;
+- } else {
+- void *data = vpix->malloc;
+- int ret;
++ }
+
+- if (vpix->gmr) {
+- data = vmwgfx_dmabuf_map(vpix->gmr);
+- if (!data)
+- goto out_err;
+- }
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++
++ if (ret)
++ goto out_err;
++
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++ if (ret)
++ goto out_err;
+
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (to_hw)
+- xa_context_flush(vsaa->xa_ctx);
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+- if (ret)
+- goto out_err;
+- }
+ return TRUE;
+ out_err:
+ LogMessage(X_ERROR, "DMA %s surface failed.\n",
+@@ -1372,7 +1372,6 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->xa_ctx = xa_context_default(xat);
+ vsaa->drm_fd = drm_fd;
+ vsaa->present_flush = present_flush;
+- vsaa->can_optimize_dma = FALSE;
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index 16583b0..f5f45ba 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -50,7 +50,6 @@ struct vmwgfx_saa {
+ int ydiff;
+ RegionRec present_region;
+ uint32_t src_handle;
+- Bool can_optimize_dma;
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
+--
+1.8.5.1
+
+
+From e26dec8f5278df74a102493bf6d2d8444dab5d6d Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon, 28 Oct 2013 18:21:29 -0400
+Subject: [PATCH 05/11] vmwgfx: handle changes of DamageUnregister API in
+ 1.14.99.2
+
+Fix is inspired from the intel driver.
+
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_saa.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index fd80682..346e7f4 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -26,6 +26,7 @@
+ */
+
+ #include <xorg-server.h>
++#include <xorgVersion.h>
+ #include <mi.h>
+ #include <fb.h>
+ #include <xf86drmMode.h>
+@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap)
+ if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc)
+ return;
+
++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
++ DamageUnregister(spix->damage);
++#else
+ DamageUnregister(&pixmap->drawable, spix->damage);
++#endif
++
+ DamageDestroy(spix->damage);
+ spix->damage = NULL;
+ }
+--
+1.8.5.1
+
+
+From 7ac45326eccbf3bea9a4a8f95b9662a36ab58eb0 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 28 Nov 2013 02:02:20 -0800
+Subject: [PATCH 06/11] vmwgfx: Fix some compilation warnings and indentations
+
+Most of the compilation warnings we're seeing are due to bad xorg headers,
+but fix the ones we can fix in the driver. Some indentation fixes as well.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ src/vmware_bootstrap.c | 2 --
+ src/vmwarevideo.c | 4 ++--
+ vmwgfx/vmwgfx_driver.c | 1 -
+ vmwgfx/vmwgfx_output.c | 2 +-
+ vmwgfx/vmwgfx_overlay.c | 4 ++--
+ vmwgfx/vmwgfx_tex_video.c | 26 +++++++++++++-------------
+ 6 files changed, 18 insertions(+), 21 deletions(-)
+
+diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c
+index ea5be19..bb58325 100644
+--- a/src/vmware_bootstrap.c
++++ b/src/vmware_bootstrap.c
+@@ -256,7 +256,6 @@ VMwarePciProbe (DriverPtr drv,
+ intptr_t match_data)
+ {
+ ScrnInfoPtr scrn = NULL;
+- EntityInfoPtr entity;
+
+ scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets,
+ NULL, NULL, NULL, NULL, NULL);
+@@ -267,7 +266,6 @@ VMwarePciProbe (DriverPtr drv,
+ scrn->Probe = NULL;
+ }
+
+- entity = xf86GetEntityInfo(entity_num);
+ switch (DEVICE_ID(device)) {
+ case PCI_DEVICE_ID_VMWARE_SVGA2:
+ case PCI_DEVICE_ID_VMWARE_SVGA:
+diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
+index 745c71f..8d7d171 100644
+--- a/src/vmwarevideo.c
++++ b/src/vmwarevideo.c
+@@ -82,7 +82,7 @@
+ #define VMWARE_VID_MAX_HEIGHT 2048
+
+ #define VMWARE_VID_NUM_ENCODINGS 1
+-static XF86VideoEncodingRec vmwareVideoEncodings[] =
++static const XF86VideoEncodingRec vmwareVideoEncodings[] =
+ {
+ {
+ 0,
+@@ -108,7 +108,7 @@ static XF86ImageRec vmwareVideoImages[] =
+ };
+
+ #define VMWARE_VID_NUM_ATTRIBUTES 2
+-static XF86AttributeRec vmwareVideoAttributes[] =
++static const XF86AttributeRec vmwareVideoAttributes[] =
+ {
+ {
+ XvGettable | XvSettable,
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index eeaea4b..bfc07f8 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -658,7 +658,6 @@ void xorg_flush(ScreenPtr pScreen)
+ if (crtc->enabled) {
+ pixmap = crtc_get_scanout(crtc);
+ if (pixmap) {
+- unsigned int j;
+
+ /*
+ * Remove duplicates.
+diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c
+index 4f52f1d..f9e4263 100644
+--- a/vmwgfx/vmwgfx_output.c
++++ b/vmwgfx/vmwgfx_output.c
+@@ -60,7 +60,7 @@ struct output_private
+ Bool is_implicit;
+ };
+
+-static char *output_enum_list[] = {
++static const char *output_enum_list[] = {
+ "Unknown",
+ "VGA",
+ "DVI",
+diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c
+index 6624a10..986dd06 100644
+--- a/vmwgfx/vmwgfx_overlay.c
++++ b/vmwgfx/vmwgfx_overlay.c
+@@ -84,7 +84,7 @@ typedef uint8_t uint8;
+ #define VMWARE_VID_MAX_HEIGHT 2048
+
+ #define VMWARE_VID_NUM_ENCODINGS 1
+-static XF86VideoEncodingRec vmwareVideoEncodings[] =
++static const XF86VideoEncodingRec vmwareVideoEncodings[] =
+ {
+ {
+ 0,
+@@ -110,7 +110,7 @@ static XF86ImageRec vmwareVideoImages[] =
+ };
+
+ #define VMWARE_VID_NUM_ATTRIBUTES 2
+-static XF86AttributeRec vmwareVideoAttributes[] =
++static const XF86AttributeRec vmwareVideoAttributes[] =
+ {
+ {
+ XvGettable | XvSettable,
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index a0a4f4a..3ba40ef 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -70,11 +70,11 @@ static const float bt_709[] = {
+ static Atom xvBrightness, xvContrast, xvSaturation, xvHue;
+
+ #define NUM_TEXTURED_ATTRIBUTES 4
+-static XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = {
+- {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_HUE"}
++static const XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = {
++ {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_HUE"}
+ };
+
+ #define NUM_FORMATS 3
+@@ -82,7 +82,7 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] = {
+ {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+ };
+
+-static XF86VideoEncodingRec DummyEncoding[1] = {
++static const XF86VideoEncodingRec DummyEncoding[1] = {
+ {
+ 0,
+ "XV_IMAGE",
+@@ -416,16 +416,16 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ switch (id) {
+ case FOURCC_YV12: {
+ int pitches[3], offsets[3];
+- unsigned char *y, *u, *v;
++ unsigned char *yp, *up, *vp;
+ query_image_attributes(pScrn, FOURCC_YV12,
+ &w, &h, pitches, offsets);
+
+- y = buf + offsets[0];
+- v = buf + offsets[1];
+- u = buf + offsets[2];
+- memcpy(ymap, y, w*h);
+- memcpy(vmap, v, w*h/4);
+- memcpy(umap, u, w*h/4);
++ yp = buf + offsets[0];
++ vp = buf + offsets[1];
++ up = buf + offsets[2];
++ memcpy(ymap, yp, w*h);
++ memcpy(vmap, vp, w*h/4);
++ memcpy(umap, up, w*h/4);
+ break;
+ }
+ case FOURCC_UYVY:
+--
+1.8.5.1
+
+
+From a40cbd7b4fa19219849b4b0a48f07538772c3e22 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 5 Dec 2013 02:58:47 -0800
+Subject: [PATCH 07/11] vmwgfx: Support also XA version 1 v2
+
+We need to support also XA version 1, since we want to be backwards
+compatible with older mesa releases.
+Unfortunately, the intended way of detecting XA major version at
+compile-time was broken on mesa 10 so we need a workaround that tests
+for XA version 2 at config time.
+
+v2: Update the test for XA version 2.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ configure.ac | 10 +++++++++-
+ vmwgfx/vmwgfx_dri2.c | 5 ++---
+ vmwgfx/vmwgfx_driver.c | 3 +--
+ vmwgfx/vmwgfx_saa.c | 12 +++++-------
+ vmwgfx/vmwgfx_saa.h | 12 ++++++++++++
+ vmwgfx/vmwgfx_tex_video.c | 2 +-
+ 6 files changed, 30 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dccfb27..123356c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,15 @@ if test x$BUILD_VMWGFX = xyes; then
+ PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
+ fi
+ if test x$BUILD_VMWGFX = xyes; then
+- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
++#
++# Early versions of mesa 10 forgot to bump the XA major version number in
++# the xa_tracker.h header
++#
++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
++ [PKG_CHECK_EXISTS([xatracker = 2.0.0],
++ [AC_DEFINE([HAVE_XA_2], 1,
++ [Has version 2 of XA])])],
++ [],[BUILD_VMWGFX=no])
+ fi
+
+ DRIVER_NAME=vmware
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 57f2d9d..4c74a6b 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -206,8 +206,7 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ }
+
+ private->srf = srf;
+- if (xa_surface_handle(srf, xa_handle_type_shared,
+- &buffer->name, &buffer->pitch) != 0)
++ if (_xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
+ return FALSE;
+
+ buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
+@@ -228,7 +227,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
+
+ if (--private->refcount == 0 && srf) {
+- xa_surface_unref(srf);
++ xa_surface_destroy(srf);
+ }
+
+ /*
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index bfc07f8..6301c29 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -617,8 +617,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
+ return FALSE;
+ }
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0) {
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
+ LogMessage(X_ERROR, "Could not get present surface handle.\n");
+ return FALSE;
+ }
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 346e7f4..1459933 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -146,7 +146,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
+ vpix->malloc = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
+- xa_surface_unref(vpix->hw);
++ xa_surface_destroy(vpix->hw);
+ vpix->hw = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
+@@ -451,7 +451,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
+ &spix->dirty_hw))
+ return FALSE;
+
+- xa_surface_unref(vpix->hw);
++ xa_surface_destroy(vpix->hw);
+ vpix->hw = NULL;
+
+ /*
+@@ -698,8 +698,7 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
+
+ (void) pScreen;
+ if (src_vpix == dst_vpix || !src_vpix->hw ||
+- xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
+- &vsaa->src_handle, &dummy) != 0)
++ _xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
+ return FALSE;
+
+ REGION_NULL(pScreen, &vsaa->present_region);
+@@ -800,7 +799,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
+ return TRUE;
+
+ out_no_damage:
+- xa_surface_unref(hw);
++ xa_surface_destroy(hw);
+ return FALSE;
+ }
+
+@@ -1459,8 +1458,7 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
+ */
+ if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+ goto out_err;
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
+ goto out_err;
+ depth = xa_format_depth(xa_surface_format(vpix->hw));
+
+diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h
+index d8aa3d3..5e1f40c 100644
+--- a/vmwgfx/vmwgfx_saa.h
++++ b/vmwgfx/vmwgfx_saa.h
+@@ -115,4 +115,16 @@ vmwgfx_saa_set_master(ScreenPtr pScreen);
+ void
+ vmwgfx_saa_drop_master(ScreenPtr pScreen);
+
++#if (XA_TRACKER_VERSION_MAJOR <= 1) && !defined(HAVE_XA_2)
++
++#define _xa_surface_handle(_a, _b, _c) xa_surface_handle(_a, _b, _c)
++#define xa_context_flush(_a)
++
++#else
++
++#define xa_surface_destroy(_a) xa_surface_unref(_a)
++#define _xa_surface_handle(_a, _b, _c) \
++ xa_surface_handle(_a, xa_handle_type_shared, _b, _c)
++
++#endif /* (XA_TRACKER_VERSION_MAJOR <= 1) */
+ #endif
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 3ba40ef..9fd8f22 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ for (i=0; i<3; ++i) {
+ for (j=0; j<2; ++j) {
+ if (priv->yuv[i]) {
+- xa_surface_unref(priv->yuv[j][i]);
++ xa_surface_destroy(priv->yuv[j][i]);
+ priv->yuv[j][i] = NULL;
+ }
+ }
+--
+1.8.5.1
+
+
+From c36cbcefb8526944141eb431e1e736dc4485a36e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Mon, 9 Dec 2013 00:19:55 -0800
+Subject: [PATCH 08/11] vmwgfx: Remove stray 1
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_saa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 1459933..28819c1 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -1230,7 +1230,7 @@ vmwgfx_operation_complete(struct saa_driver *driver,
+ */
+
+ if (vpix->hw && vpix->hw_is_dri2_fronts) {
+- if (1 && pScrn->vtSema &&
++ if (pScrn->vtSema &&
+ vmwgfx_upload_to_hw(driver, pixmap, &spix->dirty_shadow)) {
+
+ REGION_EMPTY(vsaa->pScreen, &spix->dirty_shadow);
+--
+1.8.5.1
+
+
+From 4af6062ce281a7f4aaa50985fe757e9569208ee1 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 11 Dec 2013 04:59:49 -0800
+Subject: [PATCH 09/11] Revert "vmwgfx: Get rid of device-specific DMA code"
+
+This reverts commit 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932.
+
+Reverting this because using direct DMA for shared pixmaps should
+boost performance. It should be usable both in a composited environment
+and when running hosted. Need to retest the DMA flaws I saw before disabling
+this code.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_drmi.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++
+ vmwgfx/vmwgfx_drmi.h | 5 +++
+ vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------
+ vmwgfx/vmwgfx_saa_priv.h | 1 +
+ 4 files changed, 136 insertions(+), 26 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c
+index 1e23f4a..496a16b 100644
+--- a/vmwgfx/vmwgfx_drmi.c
++++ b/vmwgfx/vmwgfx_drmi.c
+@@ -284,6 +284,109 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf)
+ }
+
+ int
++vmwgfx_dma(unsigned int host_x, unsigned int host_y,
++ RegionPtr region, struct vmwgfx_dmabuf *buf,
++ uint32_t buf_pitch, uint32_t surface_handle, int to_surface)
++{
++ BoxPtr clips = REGION_RECTS(region);
++ unsigned int num_clips = REGION_NUM_RECTS(region);
++ struct drm_vmw_execbuf_arg arg;
++ struct drm_vmw_fence_rep rep;
++ int ret;
++ unsigned int size;
++ unsigned i;
++ SVGA3dCopyBox *cb;
++ SVGA3dCmdSurfaceDMASuffix *suffix;
++ SVGA3dCmdSurfaceDMA *body;
++ struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf);
++
++ struct {
++ SVGA3dCmdHeader header;
++ SVGA3dCmdSurfaceDMA body;
++ SVGA3dCopyBox cb;
++ } *cmd;
++
++ if (num_clips == 0)
++ return 0;
++
++ size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) +
++ sizeof(*suffix);
++ cmd = malloc(size);
++ if (!cmd)
++ return -1;
++
++ cmd->header.id = SVGA_3D_CMD_SURFACE_DMA;
++ cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) +
++ sizeof(*suffix);
++ cb = &cmd->cb;
++
++ suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips];
++ suffix->suffixSize = sizeof(*suffix);
++ suffix->maximumOffset = (uint32_t) -1;
++ suffix->flags.discard = 0;
++ suffix->flags.unsynchronized = 0;
++ suffix->flags.reserved = 0;
++
++ body = &cmd->body;
++ body->guest.ptr.gmrId = buf->gmr_id;
++ body->guest.ptr.offset = buf->gmr_offset;
++ body->guest.pitch = buf_pitch;
++ body->host.sid = surface_handle;
++ body->host.face = 0;
++ body->host.mipmap = 0;
++
++ body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM :
++ SVGA3D_READ_HOST_VRAM);
++
++
++ for (i=0; i < num_clips; i++, cb++, clips++) {
++ cb->x = (uint16_t) clips->x1 + host_x;
++ cb->y = (uint16_t) clips->y1 + host_y;
++ cb->z = 0;
++ cb->srcx = (uint16_t) clips->x1;
++ cb->srcy = (uint16_t) clips->y1;
++ cb->srcz = 0;
++ cb->w = (uint16_t) (clips->x2 - clips->x1);
++ cb->h = (uint16_t) (clips->y2 - clips->y1);
++ cb->d = 1;
++#if 0
++ LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n",
++ cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h,
++ to_surface ? "to" : "from");
++#endif
++
++ }
++
++ memset(&arg, 0, sizeof(arg));
++ memset(&rep, 0, sizeof(rep));
++
++ rep.error = -EFAULT;
++ arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep);
++ arg.commands = (unsigned long)cmd;
++ arg.command_size = size;
++ arg.throttle_us = 0;
++ arg.version = DRM_VMW_EXECBUF_VERSION;
++
++ ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg));
++ if (ret) {
++ LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret));
++ }
++
++ free(cmd);
++
++ if (rep.error == 0) {
++ ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE);
++ if (ret) {
++ LogMessage(X_ERROR, "DMA from host fence wait error %s.\n",
++ strerror(-ret));
++ vmwgfx_fence_unref(ibuf->drm_fd, rep.handle);
++ }
++ }
++
++ return 0;
++}
++
++int
+ vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out)
+ {
+ struct drm_vmw_getparam_arg gp_arg;
+diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h
+index fff728a..2435009 100644
+--- a/vmwgfx/vmwgfx_drmi.h
++++ b/vmwgfx/vmwgfx_drmi.h
+@@ -60,6 +60,11 @@ extern void
+ vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf);
+
+ extern int
++vmwgfx_dma(unsigned int host_x, unsigned int host_y,
++ RegionPtr region, struct vmwgfx_dmabuf *buf,
++ uint32_t buf_pitch, uint32_t surface_handle, int to_surface);
++
++extern int
+ vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree);
+
+ extern int
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 28819c1..96275a5 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -285,40 +285,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ Bool to_hw)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
+- void *data = vpix->malloc;
+- int ret;
+
+ if (!vpix->hw || (!vpix->gmr && !vpix->malloc))
+ return TRUE;
+
++ if (vpix->gmr && vsaa->can_optimize_dma) {
++ uint32_t handle, dummy;
+
+- if (vpix->gmr) {
+- data = vmwgfx_dmabuf_map(vpix->gmr);
+- if (!data)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+- }
+-
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+-
+- if (ret)
+- goto out_err;
++ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
++ to_hw) != 0)
++ goto out_err;
++ } else {
++ void *data = vpix->malloc;
++ int ret;
+
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (to_hw)
+- xa_context_flush(vsaa->xa_ctx);
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+- if (ret)
+- goto out_err;
++ if (vpix->gmr) {
++ data = vmwgfx_dmabuf_map(vpix->gmr);
++ if (!data)
++ goto out_err;
++ }
+
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++ if (ret)
++ goto out_err;
++ }
+ return TRUE;
+ out_err:
+ LogMessage(X_ERROR, "DMA %s surface failed.\n",
+@@ -1377,6 +1377,7 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->xa_ctx = xa_context_default(xat);
+ vsaa->drm_fd = drm_fd;
+ vsaa->present_flush = present_flush;
++ vsaa->can_optimize_dma = FALSE;
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index f5f45ba..16583b0 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -50,6 +50,7 @@ struct vmwgfx_saa {
+ int ydiff;
+ RegionRec present_region;
+ uint32_t src_handle;
++ Bool can_optimize_dma;
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
+--
+1.8.5.1
+
+
+From 93228f3dd3355a25583d22dbb96791678b93be3e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 11 Dec 2013 06:54:02 -0800
+Subject: [PATCH 10/11] vmwgfx: Really allow XA version 2.
+
+When XA starts to correctly advertise version 2, we didn't allow it.
+Fix this.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 6301c29..4e28097 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -79,7 +79,7 @@ typedef uint8_t uint8;
+
+ #define XA_VERSION_MINOR_REQUIRED 0
+ #define XA_VERSION_MAJOR_REQUIRED 1
+-#define XA_VERSION_MAJOR_COMPAT 1
++#define XA_VERSION_MAJOR_COMPAT 2
+
+ #define DRM_VERSION_MAJOR_REQUIRED 2
+ #define DRM_VERSION_MINOR_REQUIRED 3
+--
+1.8.5.1
+
+
+From f45a551e9b70ccec8f92df02747d4e2af299cf8c Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Mon, 16 Dec 2013 10:38:21 +0100
+Subject: [PATCH 11/11] vmwgfx: Fix compile breakage on XA version 1.
+
+A recent revert brought back code that assumed XA version 2.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: trivial
+---
+ vmwgfx/vmwgfx_saa.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 96275a5..e76bd09 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -292,8 +292,7 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ if (vpix->gmr && vsaa->can_optimize_dma) {
+ uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
+ goto out_err;
+ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+ to_hw) != 0)
+--
+1.8.5.1
+
diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template
index a0ef9dadcc..0588f40c8e 100644
--- a/srcpkgs/xf86-video-vmware/template
+++ b/srcpkgs/xf86-video-vmware/template
@@ -2,6 +2,7 @@
pkgname=xf86-video-vmware
version=13.0.1
revision=4
+patch_args="-Np1"
only_for_archs="i686 x86_64"
build_style=gnu-configure
configure_args="--enable-vmwarectrl-client"
From c28097ca289923db6cd9bb524bcdfe08fa44ce00 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 29 Dec 2013 10:31:58 +0100
Subject: [PATCH 21/22] virtualbox-ose: rebuild for xorg-server-1.15.
---
srcpkgs/virtualbox-ose/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index ff32c72a67..7e81194e3d 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -2,7 +2,7 @@
pkgname=virtualbox-ose
_vbox_distver=4.3.6
version=${_vbox_distver}
-revision=1
+revision=2
wrksrc="VirtualBox-${version}"
patch_args="-Np1"
short_desc="General-purpose full virtualizer for x86 hardware"
@@ -18,7 +18,7 @@ hostmakedepends="which perl pkg-config dev86 yasm acpica-utils"
makedepends="openssl-devel libcurl-devel libpng-devel>=1.6 libvpx-devel
alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel
libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel
- pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.14
+ pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.15<1.16
device-mapper-devel docbook-xsl"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
@@ -130,7 +130,7 @@ virtualbox-ose-dkms_package() {
virtualbox-ose-guest_package() {
systemd_services="vboxservice.service on"
- depends="xserver-abi-video-14_1 virtualbox-ose-guest-dkms-${version}_${revision}"
+ depends="xserver-abi-video-15_1 virtualbox-ose-guest-dkms-${version}_${revision}"
short_desc+=" - guest utilities"
pkg_install() {
From 957c991dccd7db9e1874d8dcb907c20025091877 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 2 Feb 2014 09:34:38 +0100
Subject: [PATCH 22/22] Merged master branch.
---
COPYING | 45 +-
common/build_style/README | 12 +
common/build_style/cmake.sh | 45 +
common/build_style/configure.sh | 24 +
common/build_style/gnu-configure.sh | 33 +
common/build_style/gnu-makefile.sh | 20 +
common/build_style/meta.sh | 13 +
common/build_style/perl-ModuleBuild.sh | 32 +
common/build_style/perl-module.sh | 64 +
common/build_style/python-module.sh | 36 +
common/build_style/waf.sh | 16 +
common/build_style/waf3.sh | 16 +
common/cross-profiles/README | 14 +
common/cross-profiles/armv6hf-musl.sh | 8 +
common/cross-profiles/armv6hf.sh | 8 +
common/cross-profiles/armv7.sh | 8 +
common/cross-profiles/config.sub | 1762 ++++++++
common/cross-profiles/i686-musl.sh | 8 +
common/cross-profiles/i686.sh | 8 +
common/cross-profiles/mips.sh | 8 +
common/cross-profiles/mipsel.sh | 8 +
common/cross-profiles/musl-gnulibfix | 179 +
common/cross-profiles/x86_64-musl.sh | 8 +
common/environment/0000-REQUIREMENTS.sh | 16 +
common/environment/0001-bootstrap.sh | 6 +
common/environment/0001-configure-args.sh | 6 +
common/environment/0002-cross.sh | 11 +
common/{vars.sh => environment/0003-misc.sh} | 0
common/environment/README | 11 +
common/global-defs.sh | 23 -
common/helpers/README | 25 +
common/helpers/replace-interpreter.sh | 41 +
common/shlibs | 22 +-
doc/manual.txt | 435 +-
srcpkgs/2bwm-git/template | 6 -
srcpkgs/GConf/template | 14 +-
srcpkgs/Ice/template | 6 -
srcpkgs/LuaJIT/template | 6 -
srcpkgs/MesaLib/template | 12 +-
srcpkgs/ModemManager/template | 10 +-
srcpkgs/MoinMoin/template | 12 +-
srcpkgs/NetworkManager/files/tmpfilesd | 3 +
srcpkgs/NetworkManager/template | 48 +-
srcpkgs/ORBit2/template | 6 -
srcpkgs/Pyrex/template | 10 +-
srcpkgs/SDL/template | 15 +-
srcpkgs/SDL2/template | 23 +-
srcpkgs/SDL_image/template | 10 +-
srcpkgs/SDL_mixer/template | 20 +-
srcpkgs/SDL_net/template | 16 +-
srcpkgs/SDL_sound/template | 23 +-
srcpkgs/SDL_ttf/template | 20 +-
srcpkgs/Thunar/template | 8 +-
srcpkgs/Twisted/template | 10 +-
srcpkgs/VirtualGL/template | 19 +-
srcpkgs/WindowMaker/template | 47 +-
srcpkgs/a10disp/template | 26 +
srcpkgs/a2jmidid/template | 6 -
srcpkgs/aalib/template | 6 -
srcpkgs/abGate/template | 8 +-
srcpkgs/abcde/template | 15 +
srcpkgs/abiword/template | 10 +-
srcpkgs/abook/template | 13 +-
srcpkgs/accountsservice/template | 12 +-
srcpkgs/acct/template | 6 -
srcpkgs/acl/template | 9 +-
srcpkgs/acpi/template | 12 +-
srcpkgs/acpica-utils/template | 28 +-
srcpkgs/acpid/template | 10 +-
srcpkgs/acr/template | 15 +-
srcpkgs/adobe-flash-plugin/template | 11 +-
srcpkgs/adobe-flash-plugin11.1/template | 15 +-
srcpkgs/agar/template | 6 -
srcpkgs/agg/template | 6 -
srcpkgs/akonadi/template | 18 +-
.../allegro4/patches/mesa10-uncompat.patch | 22 +
srcpkgs/allegro4/template | 16 +-
srcpkgs/alsa-lib/template | 6 -
srcpkgs/alsa-plugins/template | 6 -
srcpkgs/alsa-utils/template | 12 +-
srcpkgs/anjuta/template | 8 +-
srcpkgs/ansible/template | 12 +-
srcpkgs/apache-mpm-event/template | 13 +-
srcpkgs/apache-mpm-worker/template | 13 +-
srcpkgs/apache/template | 44 +-
srcpkgs/apg/template | 6 -
srcpkgs/apr-util/template | 6 -
srcpkgs/apr/template | 6 -
srcpkgs/aqemu/template | 8 +-
srcpkgs/aria2/template | 8 +-
srcpkgs/arm-mem-git/template | 6 -
srcpkgs/artwiz-fonts/template | 14 +-
srcpkgs/asciidoc/template | 60 +-
srcpkgs/aspell-en/template | 8 +-
srcpkgs/aspell/template | 8 +-
srcpkgs/astyle/template | 19 +
srcpkgs/at-spi2-atk/template | 8 +-
srcpkgs/at-spi2-core/template | 8 +-
srcpkgs/atf/template | 12 +-
srcpkgs/atk/template | 6 -
srcpkgs/atkmm/template | 10 +-
srcpkgs/atop/template | 9 +-
srcpkgs/attica/template | 6 -
srcpkgs/attr/template | 9 +-
srcpkgs/aubio/template | 6 -
srcpkgs/audacious-plugins/template | 12 +-
srcpkgs/audacious/template | 26 +-
srcpkgs/autoconf/template | 10 +-
srcpkgs/autoconf213/template | 10 +-
srcpkgs/autogen/template | 6 -
srcpkgs/automake/template | 16 +-
srcpkgs/automoc4/template | 8 -
srcpkgs/avahi-discover/template | 19 +-
srcpkgs/avahi/template | 22 +-
srcpkgs/awesome/template | 11 +-
srcpkgs/awoken-icons/template | 13 +-
srcpkgs/b43-fwcutter/template | 13 +-
srcpkgs/babl/template | 8 +-
srcpkgs/backintime/template | 13 +-
srcpkgs/balsa/template | 8 +-
srcpkgs/baobab/template | 10 +-
srcpkgs/bar-git/template | 14 +-
srcpkgs/base-chroot/template | 13 +-
srcpkgs/base-directories/template | 5 +-
srcpkgs/base-files/template | 42 +-
srcpkgs/base-system-busybox/template | 31 +-
srcpkgs/base-system/template | 30 +-
srcpkgs/base-voidstrap/template | 17 +-
srcpkgs/bash-completion/template | 10 +-
srcpkgs/bash/template | 10 +-
srcpkgs/bbswitch/template | 12 +-
srcpkgs/bc/template | 6 -
srcpkgs/bdftopcf/template | 6 -
srcpkgs/beets/template | 12 +-
srcpkgs/bigreqsproto/template | 12 +-
srcpkgs/bijiben/template | 8 +-
srcpkgs/bin86/template | 8 -
srcpkgs/bind/template | 71 +-
srcpkgs/binutils/template | 14 +-
srcpkgs/bison/template | 8 +-
srcpkgs/bitcoin/template | 24 +-
srcpkgs/bleachbit/template | 12 +-
srcpkgs/bluefish/template | 16 +-
srcpkgs/blueman/template | 12 +-
srcpkgs/bluez/template | 19 +-
srcpkgs/bokken/template | 12 +-
srcpkgs/boost/template | 6 -
srcpkgs/bootchart/template | 6 -
srcpkgs/boxfs/template | 7 -
srcpkgs/brasero/template | 8 +-
srcpkgs/bridge-utils/template | 6 -
srcpkgs/bsdbuild/template | 10 +-
srcpkgs/bspwm-git/template | 16 +-
srcpkgs/btrfs-progs/template | 6 -
srcpkgs/buildbot-slave/template | 15 +-
srcpkgs/buildbot/template | 13 +-
srcpkgs/bumblebee/template | 31 +-
srcpkgs/busybox/template | 6 -
srcpkgs/bwidget/template | 12 +-
srcpkgs/bzip2/template | 8 +-
srcpkgs/bzr/template | 10 +-
srcpkgs/bzrtools/template | 14 +-
srcpkgs/c-ares/template | 6 -
srcpkgs/ca-certificates/template | 13 +-
srcpkgs/cabextract/template | 8 -
srcpkgs/cairo-dock-plugins/template | 8 +-
srcpkgs/cairo-dock/template | 8 +-
srcpkgs/cairo/template | 8 +-
srcpkgs/cairomm/template | 8 +-
srcpkgs/calf/template | 8 +-
srcpkgs/cantarell-fonts/template | 10 +-
srcpkgs/caribou/template | 10 +-
.../files/arch_3.13_kernel_acpi_node.patch | 13 +
.../files/lano1106_fglrx-13.8_proc.patch | 50 +
.../files/lano1106_fglrx_intel_iommu.patch | 11 +
.../files/lano1106_kcl_agp_13_4.patch | 90 +
.../files/looks_like_amd_forgot_this.patch | 17 +
srcpkgs/catalyst/template | 51 +-
srcpkgs/ccache/template | 6 -
srcpkgs/cclive/template | 8 +-
srcpkgs/cd-discid/template | 11 +
srcpkgs/cdparanoia/template | 6 -
srcpkgs/cdrtools/template | 8 +-
srcpkgs/celt/template | 6 -
srcpkgs/celt051/template | 6 -
srcpkgs/cgminer/template | 15 +-
srcpkgs/cheese/template | 18 +-
srcpkgs/cherokee/template | 26 +-
srcpkgs/chicken/template | 6 -
srcpkgs/chromaprint/template | 6 -
srcpkgs/chromium-bsu/template | 8 +-
srcpkgs/chromium/template | 48 +-
srcpkgs/chrony/files/chrony.conf | 4 +-
srcpkgs/chrony/template | 24 +-
srcpkgs/chroot-bash/template | 24 +-
.../patches/disable-man.patch | 20 +
srcpkgs/chroot-coreutils/template | 28 +-
srcpkgs/chroot-diffutils/template | 18 +-
srcpkgs/chroot-distcc/template | 32 +-
srcpkgs/chroot-fakeroot/patches/musl.patch | 24 +
srcpkgs/chroot-fakeroot/template | 23 +-
srcpkgs/chroot-findutils/template | 30 +-
srcpkgs/chroot-gawk/template | 10 +-
srcpkgs/chroot-gcc/files | 1 -
.../files/gcc-4.7.0-cloog-0.17.patch | 23 +
.../chroot-gcc/files/gcc-4.7.1-ppl-1.0.patch | 11 +
srcpkgs/chroot-gcc/files/gcc-4.7.3-musl.diff | 739 +++
srcpkgs/chroot-gcc/template | 122 +-
srcpkgs/chroot-gettext/template | 20 +-
srcpkgs/chroot-git/template | 32 +-
srcpkgs/chroot-grep/template | 35 +-
srcpkgs/chroot-gzip/template | 31 +-
srcpkgs/chroot-m4/template | 27 +-
srcpkgs/chroot-make/template | 10 +-
srcpkgs/chroot-patch/template | 18 +-
srcpkgs/chroot-sed/template | 31 +-
srcpkgs/chroot-tar/template | 22 +-
srcpkgs/chroot-texinfo/template | 24 +-
srcpkgs/chroot-util-linux/patches | 1 +
srcpkgs/chroot-util-linux/template | 27 +-
srcpkgs/chrpath/template | 6 -
srcpkgs/cifs-utils/template | 6 -
srcpkgs/cinnamon-control-center/template | 8 +-
srcpkgs/cinnamon-desktop/template | 13 +-
srcpkgs/cinnamon-screensaver/template | 10 +-
srcpkgs/cinnamon-session/template | 8 +-
srcpkgs/cinnamon-settings-daemon/template | 8 +-
srcpkgs/cinnamon-translations/template | 15 +-
srcpkgs/cinnamon/template | 8 +-
srcpkgs/cjs/template | 8 +-
srcpkgs/clipgrab/template | 8 +-
srcpkgs/cloog/template | 8 +-
srcpkgs/clucene/template | 6 -
srcpkgs/clutter-gst/template | 16 +-
srcpkgs/clutter-gtk/template | 6 -
srcpkgs/clutter/patches/evdev-0.6.patch | 34 +
srcpkgs/clutter/template | 21 +-
srcpkgs/cmake-gui/template | 24 +-
srcpkgs/cmake/template | 6 -
srcpkgs/cmus/template | 23 +-
srcpkgs/cntlm/template | 8 +-
srcpkgs/cogl/template | 14 +-
srcpkgs/colord-gtk/template | 8 +-
srcpkgs/colord/template | 51 +-
srcpkgs/compositeproto/template | 11 +-
srcpkgs/compton-git/template | 13 +-
srcpkgs/confuse/template | 6 -
srcpkgs/conky-cli/template | 22 +-
srcpkgs/conky/template | 11 +-
srcpkgs/connman-ui-git/template | 6 -
srcpkgs/connman/template | 18 +-
srcpkgs/containers/template | 6 -
srcpkgs/coreutils/template | 10 +-
srcpkgs/cpio/template | 6 -
.../cppcheck/patches/Makefile-db2man.patch | 23 -
srcpkgs/cppcheck/template | 21 +-
srcpkgs/cproto/template | 6 -
srcpkgs/cpufrequtils/template | 6 -
srcpkgs/cpuminer/template | 6 -
srcpkgs/cracklib/template | 6 -
srcpkgs/cronie/template | 28 +-
.../files/glibc-2.18-make-4.patch | 45 +
srcpkgs/cross-arm-linux-gnueabihf/template | 98 +-
srcpkgs/cross-arm-linux-gnueabihf7-libc | 1 +
.../files/glibc-2.18-make-4.patch | 45 +
srcpkgs/cross-arm-linux-gnueabihf7/template | 291 ++
.../files/binutils-2.22-musl.diff | 18 -
srcpkgs/cross-arm-linux-musleabi/template | 134 +-
.../files/binutils-2.22-musl.diff | 18 -
.../files/gcc-4.7.2-musl.diff | 464 --
.../files/gcc-4.7.3-musl.diff | 739 +++
srcpkgs/cross-i686-linux-musl/template | 161 +-
.../files/glibc-2.18-make-4.patch | 45 +
srcpkgs/cross-i686-pc-linux-gnu/template | 99 +-
.../files/glibc-2.18-make-4.patch | 45 +
.../cross-mips-softfloat-linux-gnu/template | 122 +-
.../files/glibc-2.18-make-4.patch | 45 +
.../cross-mipsel-softfloat-linux-gnu/template | 122 +-
srcpkgs/cross-vpkg-dummy/template | 39 +-
srcpkgs/cross-x86_64-linux-musl-libc | 1 +
.../files/gcc-4.7.3-musl.diff | 739 +++
srcpkgs/cross-x86_64-linux-musl/template | 235 +
srcpkgs/crypto++/template | 6 -
srcpkgs/cryptsetup/template | 6 -
srcpkgs/ctags/template | 15 +
srcpkgs/cubieboard2-base/INSTALL | 6 +
srcpkgs/cubieboard2-base/template | 22 +
srcpkgs/cubieboard2-kernel-headers | 1 +
srcpkgs/cubieboard2-kernel/files/config | 3668 +++++++++++++++
srcpkgs/cubieboard2-kernel/template | 172 +
.../files/cubieboard2.bootcmd | 5 +
.../cubieboard2-uboot/files/cubieboard2.fex | 975 ++++
srcpkgs/cubieboard2-uboot/template | 34 +
srcpkgs/cups-filters/template | 12 +-
srcpkgs/cups/template | 38 +-
srcpkgs/curl/template | 16 +-
srcpkgs/curlftpfs/template | 6 -
srcpkgs/cvs/template | 8 +-
srcpkgs/cvs2svn/template | 10 +-
srcpkgs/cwm-git/template | 16 +-
srcpkgs/cyrus-sasl/template | 10 +-
srcpkgs/damageproto/template | 13 +-
srcpkgs/darkice/template | 9 +-
srcpkgs/dash/template | 10 +-
srcpkgs/db/template | 6 -
srcpkgs/dbus-glib/template | 6 -
srcpkgs/dbus-python/template | 61 +-
srcpkgs/dbus-python3 | 1 -
srcpkgs/dbus-python3/template | 22 +
srcpkgs/dbus-sharp/template | 10 +-
srcpkgs/dbus/INSTALL | 2 -
srcpkgs/dbus/files/systemd-user-session.patch | 183 -
srcpkgs/dbus/template | 110 +-
srcpkgs/dconf/template | 6 -
srcpkgs/dcron/template | 16 +-
srcpkgs/ddrescue/template | 6 -
srcpkgs/deadbeef/template | 19 +-
srcpkgs/deheader/template | 16 +-
srcpkgs/dejavu-fonts-ttf/template | 12 +-
srcpkgs/desktop-file-utils/template | 6 -
srcpkgs/desmume/patches/glx_3Demu.cpp.patch | 16 +
srcpkgs/desmume/template | 23 +-
srcpkgs/dev86/template | 10 +-
srcpkgs/devhelp/template | 6 -
srcpkgs/dfc-git/template | 16 +
srcpkgs/dgen-sdl/template | 6 -
srcpkgs/dhcpcd-dbus/template | 12 +-
srcpkgs/dhcpcd-gtk/template | 8 +-
srcpkgs/dhcpcd/files/dhcpcd@.service | 2 +-
srcpkgs/dhcpcd/template | 20 +-
srcpkgs/dialog/template | 18 +-
srcpkgs/diffutils/template | 8 +-
srcpkgs/distcc/template | 17 +-
srcpkgs/djmount/template | 6 -
srcpkgs/djvulibre/template | 7 -
srcpkgs/dkms/template | 12 +-
srcpkgs/dmd/template | 8 +-
srcpkgs/dmenu/template | 6 -
srcpkgs/dmidecode/template | 6 -
srcpkgs/dmraid/template | 10 +-
srcpkgs/dmxproto/template | 12 +-
srcpkgs/dnsmasq/template | 10 +-
srcpkgs/docbook-dsssl/template | 12 +-
srcpkgs/docbook-xml/template | 42 +-
srcpkgs/docbook-xsl/template | 12 +-
srcpkgs/docbook/template | 42 +-
srcpkgs/docbook2x/template | 14 +-
srcpkgs/dolphin-emu/template | 8 +-
srcpkgs/dosbox/template | 5 -
.../dosfstools-loff_and_BLOCK_SIZE.patch | 31 +
srcpkgs/dosfstools/template | 14 +-
srcpkgs/dotconf/template | 10 +-
srcpkgs/dovecot/template | 66 +-
srcpkgs/doxygen/template | 6 -
srcpkgs/dracut/template | 22 +-
srcpkgs/dri2proto/template | 10 +-
srcpkgs/dri3proto/template | 8 +-
srcpkgs/dropbear/files/dropbear.service | 10 +
srcpkgs/dropbear/template | 19 +
srcpkgs/dssi-vst/template | 10 +-
srcpkgs/dssi/template | 10 +-
srcpkgs/dtach/template | 6 -
srcpkgs/dumpet/template | 11 +-
srcpkgs/duplicity/template | 14 +-
srcpkgs/dvtm/template | 29 +-
srcpkgs/dwm/template | 6 -
srcpkgs/dzen2/template | 6 -
srcpkgs/e2fsprogs/template | 16 +-
srcpkgs/eclipse-ecj/template | 10 +-
srcpkgs/econnman/template | 10 +-
srcpkgs/ecryptfs-utils/template | 6 -
srcpkgs/ed/template | 20 +-
srcpkgs/efibootmgr/template | 6 -
srcpkgs/efl/template | 26 +-
srcpkgs/eigen2/template | 10 +-
srcpkgs/elementary/template | 12 +-
srcpkgs/elfutils/template | 6 -
srcpkgs/elinks/template | 6 -
srcpkgs/emacs/template | 6 -
srcpkgs/emotion_generic_players/template | 14 +-
srcpkgs/empathy/template | 8 +-
srcpkgs/enca/template | 6 -
srcpkgs/encfs/template | 6 -
srcpkgs/enchant/template | 6 -
srcpkgs/encodings/template | 10 +-
srcpkgs/enlightenment/template | 20 +-
srcpkgs/enscript/template | 13 +-
srcpkgs/enventor/template | 8 +-
srcpkgs/envypn-font/template | 12 +-
srcpkgs/eog/template | 9 +-
srcpkgs/epdfview/template | 8 +-
srcpkgs/epiphany/template | 10 +-
srcpkgs/epson-inkjet-printer-escpr/template | 6 -
srcpkgs/ethtool/patches/stdint.patch | 25 +
srcpkgs/ethtool/template | 10 +-
srcpkgs/ettercap/template | 8 +-
srcpkgs/eudev-libgudev | 1 +
srcpkgs/eudev-libgudev-devel | 1 +
srcpkgs/eudev-libudev | 1 +
srcpkgs/eudev-libudev-devel | 1 +
srcpkgs/eudev/template | 90 +
srcpkgs/evas_generic_loaders/template | 10 +-
srcpkgs/evieext/template | 11 +-
srcpkgs/evilwm/template | 17 +-
srcpkgs/evince/template | 8 +-
srcpkgs/evolution-data-server/template | 8 +-
srcpkgs/evolution/template | 8 +-
srcpkgs/exempi/template | 6 -
srcpkgs/exfat-utils/template | 17 +-
srcpkgs/exiftool/template | 14 +-
srcpkgs/exiv2/template | 8 +-
srcpkgs/exo/template | 13 +-
srcpkgs/expat/template | 10 +-
srcpkgs/exquisite/template | 6 -
srcpkgs/extundelete/template | 6 -
srcpkgs/eyeD3/template | 12 +-
srcpkgs/f2fs-tools/template | 6 -
srcpkgs/faac/template | 16 +-
srcpkgs/faad2/template | 6 -
srcpkgs/fakechroot/template | 14 +-
srcpkgs/farstream/template | 12 +-
srcpkgs/fbset/template | 8 +-
srcpkgs/fdupes/template | 6 -
srcpkgs/feh/template | 10 +-
srcpkgs/fetchmail/template | 8 +-
srcpkgs/ffmpeg/template | 24 +-
srcpkgs/fftw/template | 6 -
srcpkgs/file-roller/template | 8 +-
srcpkgs/file/template | 8 +-
srcpkgs/filezilla/template | 8 +-
srcpkgs/firefox-i18n/template | 14 +-
srcpkgs/firefox/template | 8 +-
srcpkgs/fish-shell/template | 8 +-
srcpkgs/fixesproto/template | 13 +-
srcpkgs/flac/template | 6 -
srcpkgs/flashrom/template | 6 -
srcpkgs/flex/template | 9 +-
srcpkgs/flowcanvas/template | 6 -
srcpkgs/fltk/template | 6 -
srcpkgs/fluidsynth/template | 6 -
srcpkgs/fluxbox/template | 23 +-
srcpkgs/folks/template | 8 +-
srcpkgs/font-adobe-100dpi/template | 21 +-
srcpkgs/font-adobe-75dpi/template | 23 +-
srcpkgs/font-adobe-utopia-100dpi/template | 19 +-
srcpkgs/font-adobe-utopia-75dpi/template | 19 +-
srcpkgs/font-adobe-utopia-type1/template | 19 +-
srcpkgs/font-alias/template | 15 +-
srcpkgs/font-bh-100dpi/template | 23 +-
srcpkgs/font-bh-75dpi/template | 23 +-
.../font-bh-lucidatypewriter-100dpi/template | 20 +-
.../font-bh-lucidatypewriter-75dpi/template | 22 +-
srcpkgs/font-bh-ttf/template | 23 +-
srcpkgs/font-bh-type1/template | 23 +-
srcpkgs/font-bitstream-100dpi/template | 23 +-
srcpkgs/font-bitstream-75dpi/template | 23 +-
srcpkgs/font-bitstream-speedo/template | 17 +-
srcpkgs/font-bitstream-type1/template | 21 +-
srcpkgs/font-cursor-misc/template | 21 +-
srcpkgs/font-daewoo-misc/template | 20 +-
srcpkgs/font-dec-misc/template | 22 +-
srcpkgs/font-ibm-type1/template | 20 +-
srcpkgs/font-isas-misc/template | 19 +-
srcpkgs/font-misc-misc/template | 19 +-
srcpkgs/font-mutt-misc/template | 19 +-
srcpkgs/font-sony-misc/template | 19 +-
srcpkgs/font-unifont-bdf/template | 14 +-
srcpkgs/font-util/template | 16 +-
srcpkgs/fontcacheproto/template | 15 +-
srcpkgs/fontconfig/template | 8 +-
srcpkgs/fontsproto/template | 15 +-
srcpkgs/foobillard++/template | 8 +-
srcpkgs/foomatic-db-engine/template | 14 +-
srcpkgs/foomatic-db-nonfree/template | 8 +-
srcpkgs/foomatic-db/template | 8 +-
srcpkgs/foomatic-filters/template | 10 +-
srcpkgs/foremost/template | 9 +-
srcpkgs/fossil/template | 6 -
srcpkgs/fox/template | 6 -
srcpkgs/freealut/template | 19 +-
srcpkgs/freefont-ttf/template | 12 +-
srcpkgs/freerdp-devel | 1 +
srcpkgs/freerdp/patches/ffmpeg2.0.patch | 75 +
srcpkgs/freerdp/patches/patch_numblock.patch | 11 +
srcpkgs/freerdp/template | 35 +
srcpkgs/freetype/template | 6 -
srcpkgs/fribidi/template | 6 -
srcpkgs/fs-uae/template | 8 +-
srcpkgs/fs-utils/template | 6 -
srcpkgs/fsarchiver/template | 6 -
srcpkgs/ftgl/template | 6 -
srcpkgs/ftjam/template | 8 -
srcpkgs/fuse-archivemount/template | 6 -
srcpkgs/fuse-exfat/template | 17 +-
srcpkgs/fuse-sshfs/template | 16 +
srcpkgs/fuse/patches/fuse-headers.patch | 13 +
srcpkgs/fuse/patches/fuse-lock.patch | 20 +
srcpkgs/fuse/patches/fuse-paths.patch | 20 +
srcpkgs/fuse/template | 24 +-
srcpkgs/gajim/template | 17 +-
srcpkgs/garcon/template | 8 +-
srcpkgs/gawk/template | 8 +-
srcpkgs/gc/template | 22 +-
srcpkgs/gcc/files/gcc-4.7.3-musl.diff | 739 +++
.../gcc/patches/gcc-4.7.0-cloog-0.17.patch | 4 +-
srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch | 4 +-
srcpkgs/gcc/template | 66 +-
srcpkgs/gcr/template | 10 +-
srcpkgs/gd/template | 6 -
.../patches/gdb-76-linux-low-threaddb.patch | 32 +
srcpkgs/gdb/patches/gdb-76-pid_t.patch | 10 +
srcpkgs/gdb/patches/gdb-amd64-debugreg.patch | 64 +
srcpkgs/gdb/patches/gdb-arm-gentmap.patch | 10 +
srcpkgs/gdb/patches/gdb-linux_nat.patch | 30 +
srcpkgs/gdb/patches/gdb-threaddb.patch | 36 +
srcpkgs/gdb/template | 15 +-
srcpkgs/gdbm/template | 19 +-
srcpkgs/gdk-pixbuf/template | 15 +-
srcpkgs/gdl/template | 6 -
srcpkgs/gdm/template | 34 +-
srcpkgs/geany/template | 12 +-
srcpkgs/geary/template | 23 +-
srcpkgs/gedit/template | 8 +-
srcpkgs/geeqie/template | 8 +-
srcpkgs/gegl/template | 6 -
srcpkgs/gendesk/template | 6 -
srcpkgs/genext2fs/template | 12 +
srcpkgs/gengetopt/template | 9 +-
srcpkgs/geoclue/template | 6 -
srcpkgs/geoclue2/template | 8 +-
srcpkgs/geocode-glib/template | 8 +-
srcpkgs/geoip/template | 13 +-
srcpkgs/getmail/template | 12 +-
srcpkgs/gettext-tiny/template | 8 +-
srcpkgs/gettext/template | 8 +-
srcpkgs/ghostscript/template | 8 +-
srcpkgs/giblib/template | 6 -
srcpkgs/giggle/template | 14 +-
srcpkgs/gimp/template | 24 +-
srcpkgs/git/template | 17 +-
srcpkgs/gitflow/template | 11 +-
srcpkgs/gjs/template | 6 -
srcpkgs/gkrellm/template | 37 +-
srcpkgs/glade3/template | 8 +-
srcpkgs/glamor-egl/template | 14 +-
srcpkgs/glances/template | 23 +-
srcpkgs/glew/template | 6 -
srcpkgs/glib-networking/template | 8 +-
srcpkgs/glib/template | 6 -
srcpkgs/glibc/template | 60 +-
srcpkgs/glibc32/template | 15 +-
srcpkgs/glibmm/template | 8 +-
srcpkgs/glm/template | 11 +-
srcpkgs/glproto/template | 8 +-
srcpkgs/glu/template | 10 +-
srcpkgs/glusterfs/template | 20 +-
srcpkgs/gmime/files/iconv-detect.h | 5 +
srcpkgs/gmime/template | 24 +-
srcpkgs/gmp/template | 6 -
srcpkgs/gmtk/template | 6 -
srcpkgs/gnac/template | 10 +-
srcpkgs/gnome-backgrounds/template | 8 +-
srcpkgs/gnome-bluetooth/template | 8 +-
srcpkgs/gnome-boxes/template | 8 +-
srcpkgs/gnome-calculator/template | 10 +-
srcpkgs/gnome-clocks/template | 8 +-
srcpkgs/gnome-color-manager/template | 10 +-
srcpkgs/gnome-common/template | 10 +-
srcpkgs/gnome-contacts/template | 8 +-
srcpkgs/gnome-control-center/template | 13 +-
srcpkgs/gnome-desktop/template | 8 +-
srcpkgs/gnome-dictionary/template | 11 +-
srcpkgs/gnome-disk-utility/template | 8 +-
srcpkgs/gnome-doc-utils/template | 12 +-
srcpkgs/gnome-documents/template | 8 +-
srcpkgs/gnome-font-viewer/template | 10 +-
srcpkgs/gnome-getting-started-docs/template | 8 +-
srcpkgs/gnome-icon-theme-extras/template | 10 +-
srcpkgs/gnome-icon-theme-symbolic/template | 10 +-
srcpkgs/gnome-icon-theme/template | 8 +-
srcpkgs/gnome-initial-setup/template | 8 +-
srcpkgs/gnome-js-common/template | 10 +-
srcpkgs/gnome-keyring/template | 10 +-
srcpkgs/gnome-maps/template | 10 +-
srcpkgs/gnome-menus/template | 6 -
srcpkgs/gnome-mime-data/template | 12 +-
srcpkgs/gnome-mplayer/template | 8 +-
srcpkgs/gnome-music/template | 8 +-
srcpkgs/gnome-nettool/template | 9 +-
srcpkgs/gnome-online-accounts/template | 12 +-
srcpkgs/gnome-online-miners/template | 12 +-
srcpkgs/gnome-photos/template | 8 +-
srcpkgs/gnome-power-manager/template | 8 +-
srcpkgs/gnome-screenshot/template | 8 +-
srcpkgs/gnome-session/template | 10 +-
srcpkgs/gnome-settings-daemon/template | 8 +-
srcpkgs/gnome-shell-extensions/template | 10 +-
srcpkgs/gnome-shell/template | 16 +-
srcpkgs/gnome-system-log/template | 8 +-
srcpkgs/gnome-system-monitor/template | 8 +-
srcpkgs/gnome-terminal/template | 8 +-
srcpkgs/gnome-themes-standard/template | 8 +-
srcpkgs/gnome-tweak-tool/template | 24 +-
srcpkgs/gnome-user-docs/template | 10 +-
srcpkgs/gnome-video-effects/template | 12 +-
srcpkgs/gnome-weather/template | 8 +-
srcpkgs/gnome/template | 7 +-
srcpkgs/gnote/template | 8 +-
srcpkgs/gnu-efi-libs/template | 30 +
srcpkgs/gnucash-devel | 1 +
srcpkgs/gnucash/template | 24 +
srcpkgs/gnupg/template | 6 -
srcpkgs/gnutls/template | 6 -
srcpkgs/go/template | 27 +-
srcpkgs/gobject-introspection/template | 10 +-
srcpkgs/goffice-devel | 1 +
srcpkgs/goffice/template | 24 +
srcpkgs/goffice0.8-devel | 1 +
srcpkgs/goffice0.8/template | 25 +
srcpkgs/gource/template | 15 +-
srcpkgs/gpart/template | 6 -
srcpkgs/gparted/template | 8 +-
srcpkgs/gperf/template | 6 -
srcpkgs/gpgme/template | 18 +-
srcpkgs/gpicview/template | 17 +-
srcpkgs/gpm/template | 8 +-
srcpkgs/gptfdisk/template | 6 -
srcpkgs/granite/template | 13 +-
srcpkgs/grantlee/template | 6 -
srcpkgs/graphite/template | 6 -
srcpkgs/graphviz/template | 6 -
srcpkgs/grep/template | 16 +-
srcpkgs/grilo-plugins/template | 8 +-
srcpkgs/grilo/template | 6 -
srcpkgs/groff/template | 8 +-
srcpkgs/grub/template | 33 +-
srcpkgs/gsasl/template | 6 -
srcpkgs/gsettings-desktop-schemas/template | 35 +-
srcpkgs/gsfonts/template | 16 +-
srcpkgs/gsl/template | 6 -
srcpkgs/gssdp/template | 6 -
srcpkgs/gst-ffmpeg/template | 6 -
srcpkgs/gst-libav/template | 12 +-
srcpkgs/gst-plugins-bad/template | 10 +-
srcpkgs/gst-plugins-bad1/template | 30 +-
srcpkgs/gst-plugins-base/template | 6 -
srcpkgs/gst-plugins-base1/template | 58 +-
srcpkgs/gst-plugins-good/template | 6 -
srcpkgs/gst-plugins-good1/template | 16 +-
srcpkgs/gst-plugins-ugly/template | 6 -
srcpkgs/gst-plugins-ugly1/template | 25 +-
srcpkgs/gst-python/template | 12 +-
srcpkgs/gst123/template | 11 +-
srcpkgs/gstreamer-vaapi/template | 23 +-
srcpkgs/gstreamer/template | 6 -
srcpkgs/gstreamer1/template | 41 +-
srcpkgs/gtk+/template | 14 +-
srcpkgs/gtk+3/template | 23 +-
srcpkgs/gtk-doc/template | 10 +-
srcpkgs/gtk-engine-murrine/template | 6 -
srcpkgs/gtk-sharp/template | 13 +-
srcpkgs/gtk-theme-config/template | 14 +-
srcpkgs/gtk-vnc/template | 6 -
srcpkgs/gtk-xfce-engine/template | 6 -
srcpkgs/gtk2-engines/template | 8 -
srcpkgs/gtkaml/template | 12 +-
srcpkgs/gtkdialog/template | 8 +-
srcpkgs/gtkhtml/template | 8 +-
srcpkgs/gtkmm/template | 8 +-
srcpkgs/gtkmm2/template | 6 -
srcpkgs/gtksourceview/template | 12 +-
srcpkgs/gtksourceview2/template | 6 -
srcpkgs/gtksourceviewmm/template | 6 -
srcpkgs/gtkspell/template | 8 +-
srcpkgs/gucharmap/template | 8 +-
srcpkgs/guile/template | 12 +-
srcpkgs/gupnp-av/template | 6 -
srcpkgs/gupnp-dlna/template | 6 -
srcpkgs/gupnp-igd/template | 8 +-
srcpkgs/gupnp/template | 6 -
srcpkgs/gvfs/template | 6 -
srcpkgs/hamster-applet/template | 17 +-
srcpkgs/handbrake/template | 8 +-
srcpkgs/hardinfo/template | 8 +-
srcpkgs/harfbuzz/template | 6 -
srcpkgs/hdparm/template | 6 -
srcpkgs/help2man/template | 8 +-
srcpkgs/herbstluftwm/template | 8 +-
srcpkgs/hg-git/template | 12 +-
srcpkgs/hicolor-icon-theme/template | 8 +-
srcpkgs/hostapd/template | 29 +-
srcpkgs/hplip/template | 23 +-
srcpkgs/hsetroot/template | 6 -
srcpkgs/htop/template | 6 -
srcpkgs/hunspell/template | 6 -
srcpkgs/hwids/template | 13 +-
srcpkgs/hydrogen/template | 8 +-
srcpkgs/i3/template | 26 +-
srcpkgs/i3lock/template | 15 +-
srcpkgs/i3status/template | 29 +-
srcpkgs/iana-etc/template | 9 +-
srcpkgs/ibus/template | 10 +-
srcpkgs/iceauth/template | 6 -
srcpkgs/icecast/template | 14 +-
srcpkgs/icon-naming-utils/template | 10 +-
srcpkgs/icu/template | 6 -
srcpkgs/idjc/template | 10 +-
srcpkgs/ifenslave/template | 6 -
srcpkgs/iftop/template | 6 -
srcpkgs/ii/template | 18 +-
srcpkgs/imlib2-tools | 1 +
srcpkgs/imlib2/template | 46 +-
srcpkgs/inetutils/template | 6 -
srcpkgs/inkscape/template | 8 +-
srcpkgs/inputproto/template | 8 +-
srcpkgs/intel-gpu-tools/template | 15 +-
srcpkgs/intel-ucode/template | 11 +-
srcpkgs/intltool/template | 14 +-
srcpkgs/inxi/template | 16 +-
srcpkgs/ioquake3-rpi/template | 6 -
srcpkgs/iotop/template | 12 +-
srcpkgs/iproute2/template | 26 +-
.../patches/0503-extension_cppflags.patch | 11 -
srcpkgs/iptables/template | 12 +-
srcpkgs/iptraf-ng/template | 28 +-
srcpkgs/iputils/template | 8 +-
srcpkgs/ipw2100-firmware/template | 8 +-
srcpkgs/ipw2200-firmware/template | 8 +-
srcpkgs/ired/template | 15 +-
srcpkgs/irqbalance/template | 8 +-
srcpkgs/irrlicht/template | 6 -
srcpkgs/irssi/template | 11 +-
srcpkgs/isl/template | 14 +-
srcpkgs/iso-codes/template | 8 +-
srcpkgs/itstool/template | 10 +-
srcpkgs/iw/template | 10 +-
srcpkgs/jack/template | 13 +-
srcpkgs/jansson/template | 6 -
srcpkgs/jasper/template | 6 -
srcpkgs/jbig2dec/template | 6 -
srcpkgs/john/template | 9 +-
srcpkgs/jre/template | 27 +-
srcpkgs/js/template | 6 -
srcpkgs/json-c/template | 6 -
srcpkgs/json-glib/template | 6 -
srcpkgs/jsoncpp/template | 6 -
srcpkgs/jupp/template | 32 +
srcpkgs/kactivities/template | 18 +-
srcpkgs/kbd/template | 8 +-
srcpkgs/kbproto/template | 12 +-
srcpkgs/kde-base-artwork/template | 8 +-
srcpkgs/kde-baseapps/template | 8 +-
srcpkgs/kde-runtime/template | 11 +-
srcpkgs/kde-wallpapers/template | 8 +-
srcpkgs/kde-workspace/template | 32 +-
srcpkgs/kde/template | 7 +-
srcpkgs/kdeartwork/template | 6 -
srcpkgs/kdelibs/template | 11 +-
srcpkgs/kdepim-runtime/template | 6 -
srcpkgs/kdepim/template | 21 +-
srcpkgs/kdepimlibs/template | 8 +-
srcpkgs/kdeplasma-addons/template | 6 -
srcpkgs/kdesdk/template | 7 -
srcpkgs/keepassx/template | 8 +-
srcpkgs/kernel-headers-rpi | 1 -
srcpkgs/kernel-libc-headers/template | 15 +-
srcpkgs/kernel-manpages/template | 8 +-
srcpkgs/kernel-uml/template | 11 +-
srcpkgs/kexec-tools/template | 6 -
srcpkgs/keychain/template | 8 +-
srcpkgs/keyutils/template | 8 +-
srcpkgs/kmix/template | 6 -
srcpkgs/kmod/patches/kmod.patch | 32 +
srcpkgs/kmod/template | 32 +-
srcpkgs/kmscon/template | 8 +-
srcpkgs/konsole/template | 6 -
srcpkgs/kuser/template | 8 +-
srcpkgs/kwallet/template | 6 -
srcpkgs/kyua-cli/template | 10 +-
srcpkgs/kyua-testers/template | 10 +-
srcpkgs/ladish/template | 10 +-
srcpkgs/laditools/template | 17 +-
srcpkgs/ladspa-sdk/template | 14 +-
srcpkgs/lame/template | 6 -
srcpkgs/laptop-mode/template | 68 +-
srcpkgs/latencytop/template | 6 -
srcpkgs/lbreakout2/template | 6 -
srcpkgs/lcms/template | 8 +-
srcpkgs/lcms2/template | 6 -
srcpkgs/ldc/template | 8 +-
srcpkgs/less/template | 6 -
srcpkgs/leveldb/template | 8 +-
srcpkgs/lftp/template | 8 +-
srcpkgs/lftpfs/template | 10 +-
srcpkgs/lgi/template | 8 +-
srcpkgs/libCello/template | 6 -
srcpkgs/libHX/template | 6 -
srcpkgs/libICE/template | 8 +-
srcpkgs/libIDL/template | 6 -
srcpkgs/libSM/template | 6 -
srcpkgs/libX11/template | 9 +-
srcpkgs/libXScrnSaver/template | 8 +-
srcpkgs/libXau/template | 8 +-
srcpkgs/libXaw/template | 6 -
srcpkgs/libXcomposite/template | 8 +-
srcpkgs/libXcursor/template | 6 -
srcpkgs/libXdamage/template | 8 +-
srcpkgs/libXdmcp/template | 8 +-
srcpkgs/libXevie/template | 6 -
srcpkgs/libXext/template | 6 -
srcpkgs/libXfixes/template | 6 -
srcpkgs/libXfont/template | 17 +-
srcpkgs/libXfontcache/template | 6 -
srcpkgs/libXft/patches/freetype_header.patch | 30 +
srcpkgs/libXft/template | 30 +-
srcpkgs/libXi/template | 6 -
srcpkgs/libXinerama/template | 6 -
srcpkgs/libXmu/template | 6 -
srcpkgs/libXp/template | 6 -
srcpkgs/libXpm/template | 6 -
srcpkgs/libXrandr/template | 6 -
srcpkgs/libXrender/template | 6 -
srcpkgs/libXres/template | 6 -
srcpkgs/libXt/template | 6 -
srcpkgs/libXtst/template | 6 -
srcpkgs/libXv/template | 6 -
srcpkgs/libXvMC/template | 6 -
srcpkgs/libXxf86dga/template | 6 -
srcpkgs/libXxf86misc/template | 6 -
srcpkgs/libXxf86vm/template | 6 -
srcpkgs/liba52/template | 6 -
srcpkgs/libao/template | 16 +-
srcpkgs/libapp/template | 9 +-
srcpkgs/libarchive/template | 9 +-
srcpkgs/libart/template | 6 -
srcpkgs/libass/template | 6 -
srcpkgs/libassuan/template | 6 -
srcpkgs/libasyncns/template | 6 -
srcpkgs/libatasmart/template | 6 -
srcpkgs/libatomic_ops-devel | 1 +
srcpkgs/libatomic_ops/template | 33 +
srcpkgs/libavcodec53/template | 10 +-
srcpkgs/libbluray/template | 10 +-
srcpkgs/libbsd/template | 6 -
srcpkgs/libburn/template | 6 -
srcpkgs/libcaca/template | 6 -
srcpkgs/libcanberra/template | 8 +-
.../libcap-ng/patches/pid_t-portability.patch | 12 +
srcpkgs/libcap-ng/template | 44 +-
srcpkgs/libcap-pam | 1 -
srcpkgs/libcap-pam/template | 30 +
srcpkgs/libcap/template | 28 +-
srcpkgs/libcddb/template | 6 -
srcpkgs/libcdio/template | 6 -
srcpkgs/libcec/template | 6 -
srcpkgs/libcgroup/template | 8 +-
srcpkgs/libchamplain/template | 6 -
srcpkgs/libconfig/template | 8 +-
srcpkgs/libcprops/template | 8 +-
srcpkgs/libcroco/template | 18 +-
srcpkgs/libcryptui/template | 8 +-
srcpkgs/libcss/template | 6 -
srcpkgs/libcxx-devel | 1 +
srcpkgs/libcxx/template | 21 +
srcpkgs/libdaemon/template | 8 +-
srcpkgs/libdbusmenu-qt/template | 6 -
srcpkgs/libdca/template | 6 -
srcpkgs/libdiscid/template | 6 -
srcpkgs/libdmapsharing/template | 6 -
srcpkgs/libdmx/template | 6 -
srcpkgs/libdom/template | 7 -
srcpkgs/libdri2-devel-git | 1 +
srcpkgs/libdri2-git/template | 36 +
srcpkgs/libdrm/template | 10 +-
srcpkgs/libdvbpsi/template | 6 -
srcpkgs/libdvdcss/template | 8 +-
srcpkgs/libdvdnav/template | 6 -
srcpkgs/libdvdread/template | 6 -
srcpkgs/libeatmydata/template | 6 -
srcpkgs/libebml/template | 6 -
srcpkgs/libedit/template | 6 -
srcpkgs/libee/template | 6 -
srcpkgs/libepc/template | 8 +-
srcpkgs/liberation-fonts-ttf/template | 15 +-
srcpkgs/libesmtp/template | 8 +-
srcpkgs/libestr/template | 6 -
srcpkgs/libev/template | 8 +-
srcpkgs/libevdev/template | 10 +-
srcpkgs/libevent/template | 8 +-
srcpkgs/libewf/template | 6 -
srcpkgs/libexif/template | 6 -
srcpkgs/libfetch/template | 8 +-
srcpkgs/libffi/template | 8 +-
srcpkgs/libfm/template | 32 +-
srcpkgs/libglade/template | 26 +-
srcpkgs/libgpg-error/template | 6 -
srcpkgs/libgphoto2/template | 6 -
srcpkgs/libgsf/template | 6 -
srcpkgs/libgsm/template | 6 -
srcpkgs/libgssglue/template | 8 +-
srcpkgs/libgtop/template | 6 -
srcpkgs/libgudev/template | 36 +-
srcpkgs/libguess/template | 6 -
srcpkgs/libgusb/template | 8 +-
srcpkgs/libgweather/template | 8 +-
srcpkgs/libgxps/template | 6 -
srcpkgs/libhubbub/template | 6 -
srcpkgs/libical/template | 6 -
srcpkgs/libid3tag/template | 6 -
srcpkgs/libidn/template | 16 +-
srcpkgs/libieee1284/template | 8 +-
srcpkgs/libiodbc/template | 6 -
srcpkgs/libiptcdata/template | 8 +-
srcpkgs/libisofs/template | 6 -
srcpkgs/libjpeg-turbo/template | 10 +-
srcpkgs/libkexiv2/template | 6 -
srcpkgs/libkgapi/template | 6 -
srcpkgs/libktorrent/template | 6 -
srcpkgs/libldap/template | 8 +-
srcpkgs/liblo/template | 6 -
srcpkgs/liblrdf/template | 8 +-
srcpkgs/libmad/template | 8 +-
srcpkgs/libmatroska/template | 6 -
srcpkgs/libmbim/template | 6 -
srcpkgs/libmcrypt/template | 6 -
srcpkgs/libmicrohttpd/template | 13 +-
srcpkgs/libmikmod/template | 6 -
srcpkgs/libmms/template | 6 -
srcpkgs/libmng/template | 6 -
srcpkgs/libmodplug/template | 6 -
srcpkgs/libmowgli/template | 6 -
srcpkgs/libmp4v2/template | 8 +-
srcpkgs/libmpc/template | 16 +-
srcpkgs/libmpcdec/template | 8 +-
srcpkgs/libmpdclient/template | 6 -
srcpkgs/libmpeg2/template | 6 -
srcpkgs/libmtp/template | 6 -
srcpkgs/libmusicbrainz/template | 6 -
srcpkgs/libmusicbrainz5/template | 6 -
srcpkgs/libnet/template | 6 -
srcpkgs/libnfs/template | 6 -
srcpkgs/libnfsidmap/template | 6 -
srcpkgs/libnice/template | 6 -
srcpkgs/libnl/template | 6 -
srcpkgs/libnl3/template | 8 +-
srcpkgs/libnotify/template | 6 -
srcpkgs/libnotmuch | 1 +
srcpkgs/libnotmuch-devel | 1 +
srcpkgs/libnsbmp/template | 6 -
srcpkgs/libnsgif/template | 6 -
srcpkgs/liboauth/template | 6 -
srcpkgs/libogg/template | 6 -
srcpkgs/liboil/template | 6 -
srcpkgs/libopenal/template | 10 +-
srcpkgs/libopenobex-devel | 1 -
srcpkgs/libosinfo/template | 6 -
srcpkgs/libotr/template | 6 -
srcpkgs/libotr3/template | 6 -
srcpkgs/libparserutils/template | 6 -
srcpkgs/libpcap/template | 34 +-
srcpkgs/libpciaccess/template | 6 -
srcpkgs/libpeas/template | 8 +-
srcpkgs/libpipeline/template | 6 -
srcpkgs/libplist/template | 15 +-
srcpkgs/libpng/template | 12 +-
srcpkgs/libproxy/template | 28 +-
srcpkgs/libpwquality/template | 8 +-
srcpkgs/libqmi/template | 6 -
srcpkgs/libquvi-scripts/template | 10 +-
srcpkgs/libquvi/template | 10 +-
srcpkgs/libqzeitgeist/template | 6 -
srcpkgs/libraw/template | 6 -
srcpkgs/libraw1394/template | 6 -
srcpkgs/libreoffice-bin-i18n/template | 39 +-
srcpkgs/libreoffice-bin/template | 10 +-
srcpkgs/librlog/template | 6 -
srcpkgs/librpcsecgss/template | 6 -
srcpkgs/librsvg/template | 10 +-
srcpkgs/librsync/template | 8 +-
srcpkgs/libsamplerate/template | 8 +-
srcpkgs/libsasl/template | 6 -
srcpkgs/libseccomp/template | 6 -
srcpkgs/libsecret/template | 6 -
srcpkgs/libsexy/template | 6 -
srcpkgs/libshout-idjc/template | 6 -
srcpkgs/libsigc++/template | 6 -
srcpkgs/libsmbios/template | 6 -
srcpkgs/libsndfile/template | 10 +-
srcpkgs/libsoup/template | 46 +-
srcpkgs/libspectre/template | 8 +-
srcpkgs/libsrtp/template | 8 +-
srcpkgs/libssh/patches/fix-includes.patch | 10 +
srcpkgs/libssh/template | 15 +-
srcpkgs/libssh2/template | 6 -
srcpkgs/libstatgrab/template | 6 -
srcpkgs/libtaginfo/template | 6 -
srcpkgs/libtar/template | 6 -
srcpkgs/libtasn1/template | 31 +-
srcpkgs/libtheora/template | 20 +-
srcpkgs/libtirpc/template | 19 +-
srcpkgs/libtomcrypt/template | 6 -
srcpkgs/libtool/template | 10 +-
srcpkgs/libtorrent/template | 8 +-
srcpkgs/libtsm/template | 6 -
srcpkgs/libtxc_dxtn/template | 6 -
srcpkgs/libunique/template | 6 -
srcpkgs/libunique1/template | 6 -
srcpkgs/libunistring/template | 6 -
srcpkgs/libunwind/template | 6 -
srcpkgs/libupnp/template | 6 -
srcpkgs/libusb-compat/template | 8 +-
.../libusb/patches/portability-fixes.patch | 16 +
srcpkgs/libusb/template | 21 +-
srcpkgs/libusbx-devel | 1 -
srcpkgs/libusbx/template | 33 -
srcpkgs/libutempter/template | 8 +-
srcpkgs/libva-intel-driver/template | 8 +-
srcpkgs/libva/template | 6 -
srcpkgs/libvdpau-sunxi-git/template | 19 +
srcpkgs/libvdpau-va-gl/template | 8 +-
srcpkgs/libvdpau/template | 6 -
srcpkgs/libvirt-glib/template | 6 -
srcpkgs/libvirt/template | 44 +-
srcpkgs/libvisual/template | 6 -
srcpkgs/libvncserver/template | 6 -
srcpkgs/libvorbis/template | 37 +-
srcpkgs/libvpx-tools | 1 +
srcpkgs/libvpx/template | 36 +-
srcpkgs/libwacom/template | 6 -
srcpkgs/libwapcaplet/template | 6 -
srcpkgs/libwebp/template | 6 -
srcpkgs/libwmf/template | 10 +-
srcpkgs/libwnck/template | 6 -
srcpkgs/libwnck2/template | 38 +-
srcpkgs/libx86/template | 6 -
srcpkgs/libxcb/template | 6 -
srcpkgs/libxdg-basedir/template | 6 -
srcpkgs/libxfce4ui/template | 8 +-
srcpkgs/libxfce4util/template | 6 -
srcpkgs/libxfcegui4/template | 12 +-
srcpkgs/libxkbcommon/template | 8 +-
srcpkgs/libxkbfile/template | 8 +-
srcpkgs/libxkbui/template | 8 +-
srcpkgs/libxklavier/template | 8 +-
srcpkgs/libxml++/template | 8 +-
srcpkgs/libxml2/patches/libxml2-pthread.patch | 53 +
srcpkgs/libxml2/template | 11 +-
srcpkgs/libxshmfence/template | 6 -
srcpkgs/libxslt/template | 10 +-
srcpkgs/libyaml/template | 8 +-
srcpkgs/libzapojit/template | 8 +-
srcpkgs/libzeitgeist/template | 8 +-
srcpkgs/libzip/template | 18 +-
srcpkgs/lightdm-gtk-greeter/template | 12 +-
srcpkgs/lightdm-gtk3-greeter/template | 12 +-
srcpkgs/lightdm/INSTALL | 3 +
srcpkgs/lightdm/files/xsession | 12 -
srcpkgs/lightdm/template | 45 +-
srcpkgs/lightspark/template | 10 +-
srcpkgs/lilv/template | 12 +-
srcpkgs/linux-firmware/template | 18 +-
srcpkgs/linux-tools/template | 8 +-
srcpkgs/linux-user-chroot/template | 7 -
srcpkgs/linux/template | 27 +-
srcpkgs/linux3.10/template | 42 +-
srcpkgs/linux3.11-headers | 1 -
srcpkgs/linux3.12/template | 41 +-
srcpkgs/linux3.13-headers | 1 +
.../files/i386-dotconfig | 321 +-
.../files/x86_64-dotconfig | 338 +-
srcpkgs/{linux3.11 => linux3.13}/template | 49 +-
srcpkgs/linux3.2-grsec/template | 39 +-
srcpkgs/litecoin/template | 6 -
.../cross-internal-compiler-error.patch | 22 +
srcpkgs/llvm/template | 44 +-
srcpkgs/lm-sensors/template | 8 +-
srcpkgs/lmdb/template | 6 -
srcpkgs/lockdev/template | 6 -
srcpkgs/logrotate/template | 9 +-
srcpkgs/lrzip/template | 6 -
srcpkgs/lrzsz/template | 6 -
srcpkgs/ls++-git/template | 13 +-
srcpkgs/lsof/template | 6 -
srcpkgs/ltrace/template | 8 +-
srcpkgs/ltris/template | 7 -
srcpkgs/lua/template | 25 +-
srcpkgs/lua51/template | 6 -
srcpkgs/luafilesystem/template | 8 +-
srcpkgs/luakit/template | 28 +-
srcpkgs/luaposix/template | 8 +-
srcpkgs/luasocket/template | 8 +-
srcpkgs/lutok/template | 6 -
srcpkgs/lv2/template | 12 +-
srcpkgs/lvm2/template | 22 +-
srcpkgs/lxappearance/template | 14 +-
srcpkgs/lxc/template | 59 +-
srcpkgs/lxde-common/template | 17 +-
srcpkgs/lxde-icon-theme/template | 10 +-
srcpkgs/lxde/template | 30 +-
srcpkgs/lxdm/template | 32 +-
srcpkgs/lxinput/template | 8 +-
srcpkgs/lxlauncher/template | 15 +-
srcpkgs/lxmenu-data/template | 8 +-
srcpkgs/lxpanel/template | 8 +-
srcpkgs/lxpolkit/template | 6 -
srcpkgs/lxrandr/template | 8 +-
srcpkgs/lxsession/template | 8 +-
srcpkgs/lxtask/template | 8 +-
srcpkgs/lxterminal/template | 8 +-
srcpkgs/lzip/template | 6 -
srcpkgs/lzo/template | 6 -
srcpkgs/m4/template | 6 -
srcpkgs/mailx/template | 12 +-
srcpkgs/make/template | 8 +-
srcpkgs/makedepend/template | 6 -
srcpkgs/makeself/template | 10 +-
srcpkgs/man-db/template | 16 +-
srcpkgs/man-pages-posix/template | 12 +-
srcpkgs/man-pages/template | 12 +-
srcpkgs/mariadb/template | 20 +-
srcpkgs/mash/template | 8 +-
srcpkgs/mawk/template | 6 -
srcpkgs/mc/template | 28 +-
srcpkgs/mcpp/template | 10 +-
srcpkgs/mcwm-git/template | 11 +-
srcpkgs/mcwm/template | 6 -
srcpkgs/mda-lv2/template | 8 +-
srcpkgs/mdbtools/template | 6 -
srcpkgs/mdocml/template | 10 +-
srcpkgs/media-player-info/template | 8 +-
srcpkgs/meld/template | 12 +-
srcpkgs/memcached/template | 6 -
srcpkgs/memtest86+/template | 10 +-
srcpkgs/menu-cache/template | 6 -
srcpkgs/menumaker/template | 12 +-
srcpkgs/mercurial/template | 8 +-
srcpkgs/mesa-demos/template | 6 -
srcpkgs/mg/template | 6 -
srcpkgs/midori/template | 14 +-
srcpkgs/mime-types/template | 12 +-
srcpkgs/minecraft/template | 13 +-
srcpkgs/minetest/template | 9 +-
srcpkgs/mingw-w64-binutils/template | 6 -
srcpkgs/mingw-w64-crt/template | 6 -
srcpkgs/mingw-w64-gcc/template | 6 -
srcpkgs/mingw-w64-headers/template | 7 -
srcpkgs/mingw-w64-libgcc/template | 6 -
srcpkgs/minicom/template | 12 +-
srcpkgs/minitube/template | 8 +-
srcpkgs/miniupnpc/template | 6 -
srcpkgs/minizip/template | 8 +-
srcpkgs/mit-krb5/template | 10 +-
srcpkgs/mkfontdir/template | 10 +-
srcpkgs/mkfontscale/template | 6 -
srcpkgs/mksh/files/TaC-mksh.txt | 17 +-
srcpkgs/mksh/template | 20 +-
.../mobile-broadband-provider-info/template | 8 +-
srcpkgs/mod_wsgi/template | 6 -
srcpkgs/mongoose/template | 9 +-
srcpkgs/mono/template | 12 +-
srcpkgs/monsterwm-git/template | 19 +-
srcpkgs/mosh/template | 8 +-
srcpkgs/mousepad/template | 8 +-
srcpkgs/mousetweaks/template | 8 +-
srcpkgs/mozjs17/template | 33 +-
srcpkgs/mpc/template | 6 -
srcpkgs/mpd/template | 16 +-
srcpkgs/mpfr/template | 6 -
srcpkgs/mpg123/template | 22 +-
srcpkgs/mplayer/template | 13 +-
srcpkgs/mpv/template | 13 +-
srcpkgs/ms-sys/template | 6 -
srcpkgs/msmtp/template | 6 -
srcpkgs/mtd-utils/template | 6 -
srcpkgs/mtdev/template | 6 -
srcpkgs/mtools/template | 9 +-
srcpkgs/mtpfs/template | 6 -
srcpkgs/mtr/template | 6 -
srcpkgs/muffin/template | 11 +-
srcpkgs/mumble/template | 12 +-
srcpkgs/mumble122/template | 12 +-
srcpkgs/mupdf/template | 8 +-
srcpkgs/mupen64plus/template | 8 +-
srcpkgs/musl-bootstrap/template | 14 +-
srcpkgs/musl/template | 16 +-
srcpkgs/mutagen/template | 16 +-
srcpkgs/mutt-kz/template | 30 +-
srcpkgs/mutt/template | 10 +-
srcpkgs/mutter-wayland/template | 8 +-
srcpkgs/mutter/template | 14 +-
srcpkgs/mysql/template | 16 +-
srcpkgs/nano/template | 6 -
srcpkgs/nasm/template | 6 -
srcpkgs/nautilus-dropbox/template | 8 +-
srcpkgs/nautilus-sendto/template | 6 -
srcpkgs/nautilus/template | 8 +-
srcpkgs/nbd/files/config | 33 +
srcpkgs/nbd/files/nbd.service | 10 +
srcpkgs/nbd/template | 22 +
srcpkgs/ncdu/template | 6 -
srcpkgs/ncmpcpp/template | 6 -
srcpkgs/ncurses/template | 9 +-
srcpkgs/ne/template | 6 -
srcpkgs/nemo/template | 8 +-
srcpkgs/neon/template | 8 +-
srcpkgs/nepomuk-core/template | 6 -
srcpkgs/nepomuk-widgets/template | 6 -
srcpkgs/net-snmp/template | 12 +-
srcpkgs/net-tools/template | 6 -
srcpkgs/netbsd-rumpkernel/template | 10 +-
srcpkgs/netbsd-wtf/template | 8 +-
srcpkgs/netcat/template | 6 -
srcpkgs/netctl/template | 16 +-
srcpkgs/nethogs/template | 6 -
srcpkgs/netpgp/template | 6 -
srcpkgs/netsurf/template | 8 +-
srcpkgs/nettle/template | 6 -
srcpkgs/network-manager-applet/template | 8 +-
srcpkgs/network-ups-tools/template | 24 +-
srcpkgs/neverball/template | 8 +-
srcpkgs/newlisp/template | 6 -
srcpkgs/nfs-utils/template | 16 +-
srcpkgs/nginx/template | 44 +-
srcpkgs/ngircd/template | 8 +-
srcpkgs/ngrep/template | 6 -
srcpkgs/nilfs-utils/template | 8 +-
srcpkgs/nitrogen/template | 8 +-
srcpkgs/nix/template | 62 +-
srcpkgs/nmap/template | 6 -
srcpkgs/nodejs/template | 8 +-
srcpkgs/notification-daemon/template | 10 +-
srcpkgs/notify-python/template | 10 +-
srcpkgs/notmuch/template | 30 +
srcpkgs/nspr/template | 30 +-
srcpkgs/nss-mdns/template | 8 +-
srcpkgs/nss/template | 53 +-
srcpkgs/ntfs-3g/template | 17 +-
srcpkgs/ntp/template | 18 +-
srcpkgs/numactl/template | 6 -
srcpkgs/nvi/template | 6 -
srcpkgs/nvidia/template | 30 +-
srcpkgs/nvidia304/template | 25 +-
srcpkgs/obconf/template | 8 +-
srcpkgs/obex-data-server/template | 30 -
srcpkgs/objfw/template | 6 -
srcpkgs/obmenu/template | 16 +
srcpkgs/ocaml-camomile/template | 6 -
srcpkgs/ocaml-findlib/template | 7 -
srcpkgs/ocaml-lidl/template | 6 -
srcpkgs/ocaml/template | 6 -
srcpkgs/odroid-u2-base/INSTALL | 6 +
srcpkgs/odroid-u2-base/files/odroid-led | 48 +
.../odroid-u2-base/files/odroid-led.default | 5 +
.../odroid-u2-base/files/odroid-led.service | 9 +
srcpkgs/odroid-u2-base/template | 30 +
srcpkgs/odroid-u2-boot-fw/template | 21 +
srcpkgs/odroid-u2-kernel-headers | 1 +
.../files/u2-dotconfig-custom | 4020 +++++++++++++++++
srcpkgs/odroid-u2-kernel/template | 166 +
.../files/boot-1024x768-noedid.ini | 6 +
.../odroid-u2-uboot/files/boot-1080p-edid.ini | 6 +
.../files/boot-1080p-noedid.ini | 6 +
.../odroid-u2-uboot/files/boot-720p-edid.ini | 6 +
.../files/boot-720p-noedid.ini | 6 +
.../odroid-u2-uboot/files/boot-auto_edid.ini | 5 +
srcpkgs/odroid-u2-uboot/files/config.patch | 13 +
srcpkgs/odroid-u2-uboot/template | 52 +
srcpkgs/omxplayer/template | 17 +-
srcpkgs/openbox/template | 16 +-
srcpkgs/opencl-headers/template | 8 +-
srcpkgs/openjade/template | 10 +-
srcpkgs/openmpi/template | 17 +-
srcpkgs/openmsx/template | 6 -
srcpkgs/{libopenobex => openobex-devel} | 0
srcpkgs/openobex/template | 51 +-
srcpkgs/openresolv/template | 8 +-
srcpkgs/opensmtpd/template | 20 +-
srcpkgs/opensonic/template | 10 +-
srcpkgs/opensp/template | 12 +-
srcpkgs/openssh/files/sshdgenkeys.service | 10 +-
srcpkgs/openssh/template | 21 +-
...1.patch => openssl-1.0.1f-perl-5.18.patch} | 189 +-
srcpkgs/openssl/template | 47 +-
srcpkgs/openvpn/template | 6 -
srcpkgs/oprofile/template | 16 +-
srcpkgs/optipng/template | 6 -
srcpkgs/opus-tools/template | 6 -
srcpkgs/opus/template | 6 -
srcpkgs/opusfile/template | 22 +-
srcpkgs/orage/template | 8 +-
srcpkgs/orc/template | 6 -
srcpkgs/os-prober/template | 8 +-
srcpkgs/oxygen-icons/template | 8 +-
srcpkgs/p11-kit/template | 25 +-
srcpkgs/p7zip/template | 6 -
srcpkgs/pam/patches/portability-fixes.patch | 106 +
srcpkgs/pam/template | 43 +-
srcpkgs/pango/template | 10 +-
srcpkgs/pangomm/template | 8 +-
srcpkgs/pangox-compat/template | 8 +-
srcpkgs/papyon/template | 12 +-
srcpkgs/par2cmdline/template | 18 +
srcpkgs/parallel/template | 10 +-
srcpkgs/parted/template | 10 +-
srcpkgs/patch/template | 12 +-
srcpkgs/patchage/template | 11 +-
srcpkgs/patchelf/template | 6 -
srcpkgs/pavucontrol/template | 6 -
srcpkgs/pbzip2/template | 6 -
srcpkgs/pcc-libs/template | 6 -
srcpkgs/pcc/template | 8 +-
srcpkgs/pciutils/template | 20 +-
srcpkgs/pcmanfm/template | 18 +-
srcpkgs/pcre/template | 20 +-
srcpkgs/pcsxr/template | 8 +-
srcpkgs/pekwm/template | 42 +-
srcpkgs/pelican/template | 11 +-
srcpkgs/pen/template | 6 -
srcpkgs/perl-Archive-Zip/template | 10 +-
srcpkgs/perl-Crypt-Blowfish/template | 8 +-
srcpkgs/perl-Crypt-DH/template | 10 +-
srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 8 +-
srcpkgs/perl-DBD-SQLite/template | 8 +-
srcpkgs/perl-DBI/template | 8 +-
srcpkgs/perl-Encode-Locale/template | 10 +-
srcpkgs/perl-ExtUtils-Depends/template | 10 +-
srcpkgs/perl-ExtUtils-PkgConfig/template | 10 +-
srcpkgs/perl-File-Listing/template | 10 +-
srcpkgs/perl-Fuse/template | 8 +-
srcpkgs/perl-Glib/template | 8 +-
srcpkgs/perl-HTML-Form/template | 10 +-
srcpkgs/perl-HTML-Parser/template | 8 +-
srcpkgs/perl-HTML-Tagset/template | 10 +-
srcpkgs/perl-HTTP-Cookies/template | 10 +-
srcpkgs/perl-HTTP-Daemon/template | 10 +-
srcpkgs/perl-HTTP-Date/template | 10 +-
srcpkgs/perl-HTTP-Message/template | 10 +-
srcpkgs/perl-HTTP-Negotiate/template | 10 +-
srcpkgs/perl-IO-Tty/template | 8 +-
srcpkgs/perl-IPC-Run/template | 10 +-
srcpkgs/perl-LWP-MediaTypes/template | 10 +-
srcpkgs/perl-LWP/template | 10 +-
srcpkgs/perl-Lchown/template | 8 +-
srcpkgs/perl-Locale-gettext/template | 8 +-
srcpkgs/perl-Math-BigInt-GMP/template | 8 +-
srcpkgs/perl-Net-HTTP/template | 10 +-
srcpkgs/perl-Parse-CPAN-Meta/template | 10 +-
srcpkgs/perl-Term-ExtendedColor/template | 10 +-
srcpkgs/perl-URI/template | 10 +-
srcpkgs/perl-WWW-Curl/template | 8 +-
srcpkgs/perl-WWW-RobotRules/template | 10 +-
srcpkgs/perl-XML-NamespaceSupport/template | 10 +-
srcpkgs/perl-XML-Parser/template | 24 +-
srcpkgs/perl-XML-SAX-Base/template | 10 +-
srcpkgs/perl-XML-SAX/template | 10 +-
srcpkgs/perl-XML-Simple/template | 10 +-
.../{arm-linux-gnueabihf => cross}/bitcount.h | 0
.../{arm-linux-gnueabihf => cross}/config.h | 0
.../{arm-linux-gnueabihf => cross}/config.sh | 30 +-
.../{arm-linux-gnueabihf => cross}/mg_data.h | 0
.../{arm-linux-gnueabihf => cross}/uudmap.h | 0
srcpkgs/perl/template | 304 +-
srcpkgs/phonon-backend-gstreamer/template | 12 +-
srcpkgs/phonon/template | 6 -
srcpkgs/phoronix-test-suite/template | 10 +-
srcpkgs/phorward/template | 6 -
srcpkgs/php/template | 8 +-
srcpkgs/physfs/template | 6 -
srcpkgs/pidgin-gpg/template | 6 -
srcpkgs/pidgin-otr/template | 6 -
...idgin-2.10.7-link-libirc-to-libsasl2.patch | 11 -
srcpkgs/pidgin/template | 47 +-
srcpkgs/pigz/template | 6 -
srcpkgs/pingus/template | 6 -
srcpkgs/pixman/template | 6 -
srcpkgs/pixz/template | 6 -
srcpkgs/pkg-config/template | 6 -
srcpkgs/poedit/template | 6 -
srcpkgs/polarssl/template | 6 -
srcpkgs/polipo/template | 8 +-
srcpkgs/polkit-gnome/template | 6 -
srcpkgs/polkit-kde/template | 11 +-
srcpkgs/polkit-qt/template | 8 +-
srcpkgs/polkit/template | 52 +-
srcpkgs/polysh/template | 15 +-
srcpkgs/poppler-qt4/template | 8 +-
srcpkgs/poppler/template | 8 +-
srcpkgs/popt/template | 15 +-
srcpkgs/portaudio/template | 12 +-
srcpkgs/postfix/template | 78 +-
srcpkgs/postgresql/template | 30 +-
srcpkgs/potrace/template | 6 -
srcpkgs/powertop/template | 6 -
srcpkgs/ppl/template | 6 -
srcpkgs/ppp/template | 19 +-
srcpkgs/prelink/template | 6 -
srcpkgs/presentproto/template | 8 +-
srcpkgs/primus/template | 6 -
srcpkgs/printproto/template | 10 +-
srcpkgs/procps-ng/template | 8 +-
srcpkgs/profile-cleaner/template | 10 +-
srcpkgs/profile-sync-daemon/template | 17 +-
srcpkgs/proot/template | 6 -
srcpkgs/proplib/template | 6 -
srcpkgs/protobuf-vala/template | 10 +-
srcpkgs/protobuf/template | 6 -
srcpkgs/psmisc/template | 13 +-
srcpkgs/pulseaudio/template | 18 +-
srcpkgs/putty/template | 6 -
srcpkgs/py2cairo/files/python-config | 9 +
srcpkgs/py2cairo/template | 32 +-
srcpkgs/pyatspi/template | 12 +-
srcpkgs/pycairo/template | 6 -
srcpkgs/pycrypto/template | 8 +-
srcpkgs/pycups/template | 6 -
srcpkgs/pycurl/template | 8 +-
srcpkgs/pygobject/template | 10 +-
srcpkgs/pygobject2/template | 32 +-
srcpkgs/pygtk/template | 28 +-
srcpkgs/pygtksourceview/template | 8 +-
srcpkgs/pyopenssl/template | 9 +-
srcpkgs/pypy/template | 6 -
srcpkgs/pysmbc/template | 6 -
srcpkgs/pysqlite/template | 8 +-
srcpkgs/python-Markdown/template | 12 +-
srcpkgs/python-MarkupSafe/template | 8 +-
srcpkgs/python-Pygments/template | 12 +-
srcpkgs/python-Unidecode/template | 12 +-
srcpkgs/python-audioread/template | 12 +-
srcpkgs/python-babel/template | 10 +-
srcpkgs/python-blinker/template | 12 +-
srcpkgs/python-decorator/template | 14 +-
srcpkgs/python-distribute/template | 14 +-
srcpkgs/python-distutils-extra/template | 12 +-
srcpkgs/python-docutils/template | 12 +-
srcpkgs/python-dulwich/template | 8 +-
srcpkgs/python-e_dbus-devel | 1 -
srcpkgs/python-ecdsa/template | 10 +-
srcpkgs/python-ecore-devel | 1 -
srcpkgs/python-edje-devel | 1 -
srcpkgs/python-efl/template | 22 +-
srcpkgs/python-elementary-devel | 1 -
srcpkgs/python-evas-devel | 1 -
srcpkgs/python-feedgenerator/template | 12 +-
srcpkgs/python-gconf/template | 10 +-
srcpkgs/python-httplib2/template | 10 +-
srcpkgs/python-imaging/template | 8 +-
srcpkgs/python-inotify/template | 12 +-
srcpkgs/python-isodate/template | 12 +-
srcpkgs/python-jinja/template | 30 +-
srcpkgs/python-lockfile/template | 12 +-
srcpkgs/python-lxml/template | 8 +-
srcpkgs/python-munkres/template | 12 +-
srcpkgs/python-musicbrainzngs/template | 12 +-
srcpkgs/python-pam/template | 12 +-
srcpkgs/python-paramiko/template | 12 +-
srcpkgs/python-parsing/template | 12 +-
srcpkgs/python-pexpect/template | 12 +-
srcpkgs/python-pip/template | 12 +-
srcpkgs/python-psutil/template | 10 +-
srcpkgs/python-pyacoustid/template | 12 +-
srcpkgs/python-pylastfp/template | 10 +-
srcpkgs/python-pytz/template | 12 +-
srcpkgs/python-rdflib/template | 12 +-
srcpkgs/python-requests/template | 16 +-
srcpkgs/python-setproctitle/template | 10 +-
srcpkgs/python-setuptools/template | 16 +-
srcpkgs/python-simplejson/template | 15 +-
srcpkgs/python-six/template | 12 +-
srcpkgs/python-sqlalchemy/template | 8 +-
srcpkgs/python-tempita/template | 14 +-
srcpkgs/python-termcolor/template | 12 +-
srcpkgs/python-urwid/template | 8 +-
.../python-fix-posix-close-clash.patch | 20 +
srcpkgs/python/template | 14 +-
srcpkgs/python3/template | 6 -
srcpkgs/pyxdg/template | 11 +-
srcpkgs/pyyaml/template | 8 +-
srcpkgs/qca/template | 8 +-
srcpkgs/qemu-user-static/template | 6 -
srcpkgs/qemu/template | 20 +-
srcpkgs/qimageblitz/template | 6 -
srcpkgs/qjackctl/template | 8 +-
srcpkgs/qjson/template | 7 -
srcpkgs/qoauth/template | 6 -
srcpkgs/qpdf/template | 10 +-
srcpkgs/qrencode/template | 6 -
srcpkgs/qsynth/template | 8 +-
srcpkgs/qt/template | 6 -
srcpkgs/qtractor/template | 8 +-
srcpkgs/quvi/template | 6 -
srcpkgs/r2-bindings-git/template | 51 -
srcpkgs/r2-bindings/template | 12 +-
srcpkgs/radare2-devel-git | 1 -
srcpkgs/radare2-git/template | 35 -
srcpkgs/radare2/template | 6 -
srcpkgs/randrproto/template | 10 +-
srcpkgs/ranger/template | 12 +-
srcpkgs/raptor/template | 6 -
srcpkgs/rarian/template | 9 +-
srcpkgs/rasqal/template | 6 -
srcpkgs/raul/template | 8 +-
srcpkgs/rawtherapee/template | 8 +-
srcpkgs/razor-qt/template | 25 +-
srcpkgs/rdesktop/template | 6 -
srcpkgs/rdis-git/template | 7 -
srcpkgs/re2/template | 8 +-
srcpkgs/readline/template | 6 -
srcpkgs/recode/template | 6 -
srcpkgs/recordproto/template | 11 +-
srcpkgs/redland/template | 23 +-
srcpkgs/redshift/template | 6 -
srcpkgs/reminiscence/template | 6 -
srcpkgs/renderproto/template | 8 +-
srcpkgs/resourceproto/template | 10 +-
srcpkgs/rest/template | 8 +-
srcpkgs/rfkill/template | 6 -
srcpkgs/rgb/template | 6 -
srcpkgs/rhythmbox/template | 8 +-
srcpkgs/ristretto/template | 8 +-
srcpkgs/rox/template | 8 +-
srcpkgs/roxterm/template | 8 +-
srcpkgs/rpcbind/template | 14 +-
srcpkgs/rpi-base-files/template | 32 -
srcpkgs/rpi-base/INSTALL | 6 +
srcpkgs/rpi-base/files/bcm_host.pc | 11 +
srcpkgs/rpi-base/files/egl.pc | 12 +
srcpkgs/rpi-base/files/glesv2.pc | 12 +
srcpkgs/rpi-base/template | 28 +
srcpkgs/rpi-firmware-pcfiles/template | 12 +-
srcpkgs/rpi-firmware/template | 18 +-
srcpkgs/rpi-kernel-headers | 1 +
.../files/args-uncompressed.txt | 0
.../files/boot-uncompressed.txt | 0
.../files/imagetool-uncompressed.py | 0
srcpkgs/{kernel-rpi => rpi-kernel}/template | 73 +-
srcpkgs/rpmextract/template | 11 +-
srcpkgs/rsnapshot/template | 16 +-
srcpkgs/rsync/template | 6 -
srcpkgs/rsyslog/template | 16 +-
srcpkgs/rtkit/template | 12 +-
srcpkgs/rtmpdump/template | 10 +-
srcpkgs/rtorrent/template | 8 +-
srcpkgs/rubberband/template | 12 +-
srcpkgs/ruby/template | 6 -
srcpkgs/run-parts/template | 6 -
srcpkgs/rust/template | 6 -
srcpkgs/rxvt-unicode/template | 6 -
srcpkgs/rygel/template | 10 +-
srcpkgs/s-nail/template | 21 +-
srcpkgs/samba/template | 8 +-
srcpkgs/sane/template | 171 +-
srcpkgs/sbc/template | 6 -
srcpkgs/scons/template | 12 +-
srcpkgs/screen/template | 8 +-
srcpkgs/scrnsaverproto/template | 8 +-
srcpkgs/scrot/template | 6 -
srcpkgs/scrypt/template | 6 -
srcpkgs/scummvm/template | 6 -
srcpkgs/sdb/template | 6 -
srcpkgs/sdlmame/template | 10 +-
srcpkgs/sdparm/template | 6 -
srcpkgs/seahorse-nautilus/template | 8 +-
srcpkgs/seahorse-sharing/template | 11 +-
srcpkgs/seahorse/template | 29 +-
srcpkgs/sed/template | 8 +-
srcpkgs/seed/template | 8 +-
srcpkgs/serd/template | 10 +-
srcpkgs/serf/template | 6 -
srcpkgs/sessreg/template | 6 -
srcpkgs/setxkbmap/template | 6 -
srcpkgs/sexy-python/template | 10 +-
srcpkgs/sg3_utils/template | 10 +-
srcpkgs/shadow/template | 47 +-
srcpkgs/shared-color-profiles/template | 8 +-
srcpkgs/shared-color-targets/template | 8 +-
srcpkgs/shared-desktop-ontologies/template | 8 +-
srcpkgs/shared-mime-info/template | 6 -
srcpkgs/shorewall/template | 71 +-
srcpkgs/shotwell/template | 8 +-
srcpkgs/sic-git/template | 17 +-
srcpkgs/silc-client/template | 8 +-
srcpkgs/silc-toolkit/template | 6 -
srcpkgs/silc/template | 6 -
srcpkgs/simple-scan/template | 8 +-
srcpkgs/skype/template | 12 +-
srcpkgs/skypetab-ng/template | 8 +-
srcpkgs/slim/template | 16 +-
srcpkgs/sloccount/template | 8 +-
srcpkgs/slock/template | 6 -
srcpkgs/smali/template | 6 -
srcpkgs/smartmontools/template | 12 +-
srcpkgs/smpeg/template | 8 +-
srcpkgs/smplayer/template | 8 +-
srcpkgs/smproxy/template | 6 -
srcpkgs/smu-git/template | 17 +-
srcpkgs/snapper/template | 8 +-
srcpkgs/snappy/template | 6 -
srcpkgs/socat/template | 20 +-
srcpkgs/soprano/template | 8 +-
srcpkgs/sord/template | 10 +-
srcpkgs/sound-juicer/template | 8 +-
srcpkgs/sound-theme-freedesktop/template | 8 +-
srcpkgs/soundtouch/template | 8 +-
srcpkgs/source-highlight/template | 6 -
srcpkgs/spacefm/template | 8 +-
srcpkgs/speech-dispatcher/template | 42 +-
srcpkgs/speex/template | 6 -
srcpkgs/spice-gtk/template | 8 +-
srcpkgs/spice-protocol/template | 8 +-
srcpkgs/spice-vdagent/template | 10 +-
srcpkgs/spice/template | 6 -
srcpkgs/splint/template | 6 -
srcpkgs/sqlalchemy-migrate/template | 15 +-
srcpkgs/sqlite/template | 6 -
srcpkgs/squashfs-tools/template | 6 -
srcpkgs/sratom/template | 8 +-
srcpkgs/sshfs-fuse/template | 24 -
srcpkgs/st/template | 8 +-
srcpkgs/startup-notification/template | 6 -
srcpkgs/steam/template | 10 +-
srcpkgs/strace/patches/use-sys-ptrace.h.patch | 13 +
srcpkgs/strace/template | 6 -
srcpkgs/strigi/template | 6 -
srcpkgs/sublime-text3/template | 10 +-
srcpkgs/subversion/template | 8 +-
srcpkgs/sudo/template | 12 +-
srcpkgs/suil/template | 8 +-
srcpkgs/sunxi-mali-devel | 1 +
srcpkgs/sunxi-mali/patches/make-tabs.patch | 29 +
srcpkgs/sunxi-mali/template | 42 +
srcpkgs/sunxi-tools/template | 26 +
srcpkgs/surf/template | 6 -
srcpkgs/sushi/template | 6 -
srcpkgs/swh-lv2/template | 6 -
srcpkgs/swig/template | 6 -
srcpkgs/sxhkd-git/template | 16 +-
srcpkgs/sxiv-git/template | 21 +-
srcpkgs/sylpheed/template | 6 -
srcpkgs/synergy/template | 6 -
srcpkgs/sysfsutils/template | 6 -
srcpkgs/syslinux/INSTALL | 16 +
.../syslinux-6.02-fix-bios-isolinux.patch | 10 +
.../syslinux-6.02-fix-chainloading.patch | 45 +
...linux-dont-build-dos-windows-targets.patch | 11 -
srcpkgs/syslinux/template | 35 +-
srcpkgs/sysprof/template | 6 -
srcpkgs/system-config-printer/template | 14 +-
srcpkgs/systemd/template | 34 +-
srcpkgs/t1lib/template | 6 -
srcpkgs/tabbed-git/template | 20 +-
srcpkgs/tabbed/template | 19 +-
srcpkgs/taglib-sharp/template | 6 -
srcpkgs/taglib/template | 6 -
srcpkgs/talloc/template | 6 -
srcpkgs/tar/template | 8 +-
srcpkgs/task/template | 6 -
srcpkgs/tcc/template | 6 -
srcpkgs/tcl/template | 6 -
srcpkgs/tcp_wrappers/template | 10 +-
srcpkgs/tcpdump/template | 6 -
srcpkgs/tdb/template | 6 -
srcpkgs/telepathy-butterfly/template | 12 +-
srcpkgs/telepathy-farstream/template | 8 +-
srcpkgs/telepathy-gabble/template | 8 +-
srcpkgs/telepathy-glib/template | 39 +-
srcpkgs/telepathy-haze/template | 6 -
srcpkgs/telepathy-idle/template | 8 +-
srcpkgs/telepathy-logger/template | 8 +-
srcpkgs/telepathy-mission-control/template | 8 +-
srcpkgs/telepathy-python/template | 12 +-
srcpkgs/telepathy-salut/template | 8 +-
srcpkgs/terminology/template | 8 +-
srcpkgs/terminus-font/template | 12 +-
srcpkgs/testdisk/template | 8 +-
srcpkgs/texinfo/template | 10 +-
srcpkgs/tftp-hpa/template | 6 -
srcpkgs/thttpd/template | 6 -
srcpkgs/thunar-volman/template | 8 +-
srcpkgs/thunderbird-i18n/template | 17 +-
srcpkgs/thunderbird/template | 8 +-
srcpkgs/tiff/template | 8 +-
srcpkgs/tig/template | 8 +-
srcpkgs/time/template | 6 -
srcpkgs/tinc/template | 6 -
srcpkgs/tint2/template | 8 +-
srcpkgs/tinyxml/template | 8 +-
srcpkgs/tiv/template | 6 -
srcpkgs/tk/template | 6 -
srcpkgs/tlp/template | 15 +-
srcpkgs/tmux/template | 6 -
srcpkgs/tor/template | 19 +-
srcpkgs/torsocks/template | 9 +-
srcpkgs/totem-pl-parser/template | 8 +-
srcpkgs/totem/template | 10 +-
srcpkgs/traceroute/template | 6 -
srcpkgs/tracker/template | 6 -
srcpkgs/transmission/template | 6 -
srcpkgs/tree/template | 6 -
srcpkgs/tsocks/template | 6 -
srcpkgs/tty-clock-git/template | 7 -
srcpkgs/tumbler/template | 6 -
srcpkgs/turbovnc/template | 6 -
srcpkgs/tzdata/template | 8 +-
srcpkgs/uboot-mkimage/template | 10 +-
srcpkgs/ucl/template | 6 -
srcpkgs/udevil/template | 8 +-
srcpkgs/udis86/template | 8 +-
srcpkgs/udisks/template | 21 +-
srcpkgs/udisks2/template | 34 +-
srcpkgs/ufw/template | 15 +-
srcpkgs/uml-utilities/template | 6 -
srcpkgs/unicc/template | 9 +-
srcpkgs/unixodbc/template | 8 +-
srcpkgs/unrar/template | 8 +-
srcpkgs/unzip/template | 6 -
srcpkgs/upower/template | 36 +-
srcpkgs/upx/template | 9 +-
srcpkgs/urlgrabber/template | 12 +-
srcpkgs/usbutils/template | 8 +-
srcpkgs/util-linux/template | 40 +-
srcpkgs/uwsgi/template | 8 +-
srcpkgs/v4l-utils/template | 10 +-
srcpkgs/v8/template | 6 -
srcpkgs/vala/template | 6 -
srcpkgs/valabind-git/template | 37 -
srcpkgs/valabind/template | 27 +-
srcpkgs/valadoc-git/template | 11 +-
srcpkgs/valgrind/template | 14 +-
srcpkgs/vamp-plugin-sdk/template | 10 +-
srcpkgs/vanitygen/template | 6 -
srcpkgs/varnish/template | 17 +-
srcpkgs/vbetool/template | 8 +-
srcpkgs/vde2/template | 41 +-
srcpkgs/vdpau-video/template | 8 -
srcpkgs/vdpauinfo/template | 6 -
srcpkgs/vice/template | 6 -
srcpkgs/vicious/template | 14 +-
srcpkgs/videoproto/template | 10 +-
srcpkgs/viewnior/template | 8 +-
srcpkgs/vim/template | 16 +-
srcpkgs/vinagre/template | 8 +-
srcpkgs/vino/template | 8 +-
srcpkgs/virt-manager/template | 14 +-
srcpkgs/virtinst/template | 12 +-
srcpkgs/virtualbox-ose/template | 21 +-
srcpkgs/vlc/template | 12 +-
srcpkgs/void-artwork/template | 15 +-
srcpkgs/void-mklive/template | 14 +-
srcpkgs/volumeicon/template | 6 -
srcpkgs/vorbis-tools/template | 13 +
srcpkgs/vte/template | 31 +-
srcpkgs/vte3/template | 8 +-
srcpkgs/w3m/template | 6 -
srcpkgs/warsow-data/template | 8 +-
srcpkgs/warsow/template | 10 +-
srcpkgs/warzone2100/template | 8 +-
srcpkgs/wavpack/template | 6 -
srcpkgs/wayland/template | 12 +-
srcpkgs/webkit-gtk/template | 6 -
srcpkgs/webkitgtk/template | 34 +-
srcpkgs/webrtc-audio-processing/template | 8 +-
srcpkgs/weechat/template | 10 +-
srcpkgs/weston/template | 20 +-
srcpkgs/wget/template | 30 +-
srcpkgs/wgetpaste/template | 10 +-
srcpkgs/which/template | 6 -
srcpkgs/whois/template | 6 -
srcpkgs/wicd/template | 24 +-
srcpkgs/wifi-firmware/template | 7 +-
srcpkgs/wine-gecko/template | 8 +-
srcpkgs/wine-mono/template | 9 +-
srcpkgs/wine/template | 10 +-
srcpkgs/wineasio/template | 17 +-
srcpkgs/winusb/template | 8 +-
srcpkgs/wireless_tools/template | 6 -
srcpkgs/wmfs/template | 12 +-
srcpkgs/wmname/template | 6 -
srcpkgs/wok/template | 12 +-
srcpkgs/wpa_supplicant/template | 22 +-
srcpkgs/wv/template | 6 -
srcpkgs/wxGTK/template | 6 -
srcpkgs/wxPython/template | 10 +-
srcpkgs/x11perf/template | 6 -
srcpkgs/x264/template | 6 -
srcpkgs/xapian-core/template | 6 -
srcpkgs/xar/template | 8 +-
srcpkgs/xarchiver/template | 8 +-
srcpkgs/xauth/template | 6 -
srcpkgs/xbacklight/template | 6 -
srcpkgs/xbitmaps/template | 10 +-
srcpkgs/xbmc-rpi/INSTALL | 6 +
srcpkgs/xbmc-rpi/REMOVE | 5 +
srcpkgs/xbmc-rpi/files/polkit.rules | 11 +
srcpkgs/xbmc-rpi/files/xbmc.service | 13 +
...1-texturepacker-hostflags-and-rework.patch | 169 +
srcpkgs/xbmc-rpi/template | 116 +
srcpkgs/xbmc/template | 13 +-
srcpkgs/xbps-git/template | 38 +-
srcpkgs/xbps-src-utils/template | 24 +-
srcpkgs/xbps-src/INSTALL | 7 +
srcpkgs/xbps-src/template | 14 +-
srcpkgs/xbps-triggers/template | 10 +-
...-8-fix-24-and-added-an-ATF-test-case.patch | 135 -
...25-sign-unnecessarily-regenerates-ar.patch | 35 -
...ectly-compare-against-repo-signature.patch | 70 -
srcpkgs/xbps/template | 30 +-
srcpkgs/xcalib/template | 6 -
srcpkgs/xcb-proto/template | 12 +-
srcpkgs/xcb-util-cursor/template | 6 -
srcpkgs/xcb-util-image/template | 10 +-
srcpkgs/xcb-util-keysyms/template | 10 +-
srcpkgs/xcb-util-renderutil/template | 6 -
srcpkgs/xcb-util-wm/template | 21 +-
srcpkgs/xcb-util/template | 6 -
srcpkgs/xclip/template | 6 -
srcpkgs/xcmiscproto/template | 10 +-
srcpkgs/xcmsdb/template | 6 -
srcpkgs/xcursorgen/template | 8 -
srcpkgs/xdelta3/template | 6 -
srcpkgs/xdg-user-dirs-gtk/template | 8 +-
srcpkgs/xdg-user-dirs/template | 12 +-
srcpkgs/xdg-utils/template | 32 +-
srcpkgs/xdot/template | 13 +-
srcpkgs/xdpyinfo/template | 8 -
srcpkgs/xdriinfo/template | 6 -
srcpkgs/xen/template | 40 +-
srcpkgs/xen4.2/template | 44 +-
srcpkgs/xev/template | 6 -
srcpkgs/xextproto/template | 8 +-
srcpkgs/xf86-input-evdev/template | 8 +-
srcpkgs/xf86-input-joystick/template | 8 +-
srcpkgs/xf86-input-synaptics/template | 8 +-
srcpkgs/xf86-input-vmmouse/template | 8 +-
srcpkgs/xf86-input-wacom/template | 8 +-
srcpkgs/xf86-video-ati/template | 17 +-
srcpkgs/xf86-video-cirrus/template | 8 +-
srcpkgs/xf86-video-fbdev/template | 8 +-
srcpkgs/xf86-video-fbturbo-git/template | 29 -
srcpkgs/xf86-video-fbturbo/template | 30 +
srcpkgs/xf86-video-geode/template | 15 +-
srcpkgs/xf86-video-intel/template | 11 +-
srcpkgs/xf86-video-modesetting/template | 8 +-
srcpkgs/xf86-video-nouveau/template | 8 +-
srcpkgs/xf86-video-openchrome/template | 8 +-
srcpkgs/xf86-video-sisusb/template | 8 +-
srcpkgs/xf86-video-vesa/template | 8 +-
srcpkgs/xf86-video-vmware/template | 8 +-
srcpkgs/xf86bigfontproto/template | 10 +-
srcpkgs/xf86dgaproto/template | 10 +-
srcpkgs/xf86driproto/template | 19 +-
srcpkgs/xf86miscproto/template | 11 +-
srcpkgs/xf86vidmodeproto/template | 11 +-
srcpkgs/xfburn/template | 8 +-
srcpkgs/xfce-utils/template | 10 +-
srcpkgs/xfce4-appfinder/template | 10 +-
srcpkgs/xfce4-dev-tools/template | 10 +-
srcpkgs/xfce4-mixer/template | 10 +-
srcpkgs/xfce4-notifyd/template | 14 +-
srcpkgs/xfce4-panel/template | 6 -
srcpkgs/xfce4-power-manager/template | 10 +-
srcpkgs/xfce4-screenshooter/template | 8 +-
srcpkgs/xfce4-sensors-plugin/template | 8 +-
srcpkgs/xfce4-session/template | 10 +-
srcpkgs/xfce4-terminal/template | 10 +-
srcpkgs/xfce4-weather-plugin/template | 8 +-
srcpkgs/xfce4/template | 7 +-
srcpkgs/xfconf/template | 17 +-
srcpkgs/xfd/template | 8 +-
srcpkgs/xfdesktop/template | 10 +-
srcpkgs/xfe/template | 8 +-
srcpkgs/xfontsel/template | 9 -
srcpkgs/xfsprogs/template | 17 +-
srcpkgs/xfwm4-themes/template | 10 +-
srcpkgs/xfwm4/template | 8 +-
srcpkgs/xgamma/template | 6 -
srcpkgs/xhost/template | 6 -
srcpkgs/xine-lib/template | 6 -
srcpkgs/xineramaproto/template | 11 +-
srcpkgs/xinit/template | 16 +-
srcpkgs/xinput/template | 6 -
srcpkgs/xkbcomp/template | 6 -
srcpkgs/xkbevd/template | 6 -
srcpkgs/xkbutils/template | 6 -
srcpkgs/xkeyboard-config/template | 14 +-
srcpkgs/xkill/template | 6 -
srcpkgs/xlsatoms/template | 6 -
srcpkgs/xmag/template | 6 -
srcpkgs/xmlcatmgr/template | 21 +-
srcpkgs/xmldiff/template | 10 +-
srcpkgs/xmlto/template | 8 +-
srcpkgs/xmodmap/template | 6 -
srcpkgs/xnoise/template | 8 +-
srcpkgs/xombrero/template | 8 +-
srcpkgs/xonotic-data-low/template | 22 +-
srcpkgs/xonotic-data/template | 10 +-
srcpkgs/xonotic/template | 10 +-
srcpkgs/xorg-apps/template | 9 +-
srcpkgs/xorg-fonts/template | 7 +-
srcpkgs/xorg-input-drivers/template | 7 +-
srcpkgs/xorg-minimal/template | 7 +-
srcpkgs/xorg-server/template | 46 +-
srcpkgs/xorg-util-macros/template | 8 +-
srcpkgs/xorg-video-drivers/template | 12 +-
srcpkgs/xorg/template | 7 +-
srcpkgs/xorriso/template | 6 -
srcpkgs/xournal/template | 8 +-
srcpkgs/xplanet/template | 6 -
srcpkgs/xpr/template | 6 -
srcpkgs/xprop/template | 6 -
srcpkgs/xproto/template | 8 +-
srcpkgs/xrandr/template | 6 -
srcpkgs/xrdb/template | 6 -
srcpkgs/xrefresh/template | 9 +-
srcpkgs/xsel/template | 6 -
srcpkgs/xset/template | 6 -
srcpkgs/xsetmode/template | 6 -
srcpkgs/xsetroot/template | 6 -
srcpkgs/xstow/template | 17 +-
srcpkgs/xterm/template | 6 -
srcpkgs/xtrans/template | 12 +-
srcpkgs/xvidcore/template | 17 +-
srcpkgs/xvinfo/template | 6 -
srcpkgs/xwd/template | 6 -
srcpkgs/xwininfo/template | 6 -
srcpkgs/xwud/template | 6 -
srcpkgs/xz/template | 8 +-
srcpkgs/yajl/template | 7 -
srcpkgs/yasm/template | 6 -
srcpkgs/yelp-xsl/template | 8 +-
srcpkgs/yelp/template | 9 +-
srcpkgs/youtube-dl/template | 14 +-
srcpkgs/yt-play/template | 15 +
srcpkgs/zd1211-firmware/template | 8 +-
srcpkgs/zeitgeist/template | 10 +-
srcpkgs/zenity/template | 6 -
srcpkgs/zerofree/template | 9 +-
srcpkgs/zeroinstall-injector/template | 12 +-
srcpkgs/zeromq/template | 6 -
srcpkgs/zip/template | 6 -
srcpkgs/zisofs-tools/template | 6 -
srcpkgs/zlib/template | 6 -
srcpkgs/zlib32/template | 14 +-
srcpkgs/zope.interface/template | 8 +-
srcpkgs/zsh/patches/xattr-build-fix.patch | 20 +
srcpkgs/zsh/template | 16 +-
srcpkgs/zsync/template | 6 -
srcpkgs/zziplib/template | 6 -
1948 files changed, 24145 insertions(+), 17791 deletions(-)
create mode 100644 common/build_style/README
create mode 100644 common/build_style/cmake.sh
create mode 100644 common/build_style/configure.sh
create mode 100644 common/build_style/gnu-configure.sh
create mode 100644 common/build_style/gnu-makefile.sh
create mode 100644 common/build_style/meta.sh
create mode 100644 common/build_style/perl-ModuleBuild.sh
create mode 100644 common/build_style/perl-module.sh
create mode 100644 common/build_style/python-module.sh
create mode 100644 common/build_style/waf.sh
create mode 100644 common/build_style/waf3.sh
create mode 100644 common/cross-profiles/README
create mode 100644 common/cross-profiles/armv6hf-musl.sh
create mode 100644 common/cross-profiles/armv6hf.sh
create mode 100644 common/cross-profiles/armv7.sh
create mode 100644 common/cross-profiles/config.sub
create mode 100644 common/cross-profiles/i686-musl.sh
create mode 100644 common/cross-profiles/i686.sh
create mode 100644 common/cross-profiles/mips.sh
create mode 100644 common/cross-profiles/mipsel.sh
create mode 100644 common/cross-profiles/musl-gnulibfix
create mode 100644 common/cross-profiles/x86_64-musl.sh
create mode 100644 common/environment/0000-REQUIREMENTS.sh
create mode 100644 common/environment/0001-bootstrap.sh
create mode 100644 common/environment/0001-configure-args.sh
create mode 100644 common/environment/0002-cross.sh
rename common/{vars.sh => environment/0003-misc.sh} (100%)
create mode 100644 common/environment/README
delete mode 100644 common/global-defs.sh
create mode 100644 common/helpers/README
create mode 100644 common/helpers/replace-interpreter.sh
create mode 100644 srcpkgs/NetworkManager/files/tmpfilesd
create mode 100644 srcpkgs/a10disp/template
create mode 100644 srcpkgs/abcde/template
create mode 100644 srcpkgs/allegro4/patches/mesa10-uncompat.patch
create mode 100644 srcpkgs/astyle/template
create mode 100644 srcpkgs/catalyst/files/arch_3.13_kernel_acpi_node.patch
create mode 100644 srcpkgs/catalyst/files/lano1106_fglrx-13.8_proc.patch
create mode 100644 srcpkgs/catalyst/files/lano1106_fglrx_intel_iommu.patch
create mode 100644 srcpkgs/catalyst/files/lano1106_kcl_agp_13_4.patch
create mode 100644 srcpkgs/catalyst/files/looks_like_amd_forgot_this.patch
create mode 100644 srcpkgs/cd-discid/template
create mode 100644 srcpkgs/chroot-coreutils/patches/disable-man.patch
create mode 100644 srcpkgs/chroot-fakeroot/patches/musl.patch
delete mode 120000 srcpkgs/chroot-gcc/files
create mode 100644 srcpkgs/chroot-gcc/files/gcc-4.7.0-cloog-0.17.patch
create mode 100644 srcpkgs/chroot-gcc/files/gcc-4.7.1-ppl-1.0.patch
create mode 100644 srcpkgs/chroot-gcc/files/gcc-4.7.3-musl.diff
create mode 120000 srcpkgs/chroot-util-linux/patches
create mode 100644 srcpkgs/clutter/patches/evdev-0.6.patch
delete mode 100644 srcpkgs/cppcheck/patches/Makefile-db2man.patch
create mode 100644 srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-make-4.patch
create mode 120000 srcpkgs/cross-arm-linux-gnueabihf7-libc
create mode 100644 srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-make-4.patch
create mode 100644 srcpkgs/cross-arm-linux-gnueabihf7/template
delete mode 100644 srcpkgs/cross-arm-linux-musleabi/files/binutils-2.22-musl.diff
delete mode 100644 srcpkgs/cross-i686-linux-musl/files/binutils-2.22-musl.diff
delete mode 100644 srcpkgs/cross-i686-linux-musl/files/gcc-4.7.2-musl.diff
create mode 100644 srcpkgs/cross-i686-linux-musl/files/gcc-4.7.3-musl.diff
create mode 100644 srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch
create mode 100644 srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-make-4.patch
create mode 100644 srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-make-4.patch
create mode 120000 srcpkgs/cross-x86_64-linux-musl-libc
create mode 100644 srcpkgs/cross-x86_64-linux-musl/files/gcc-4.7.3-musl.diff
create mode 100644 srcpkgs/cross-x86_64-linux-musl/template
create mode 100644 srcpkgs/ctags/template
create mode 100644 srcpkgs/cubieboard2-base/INSTALL
create mode 100644 srcpkgs/cubieboard2-base/template
create mode 120000 srcpkgs/cubieboard2-kernel-headers
create mode 100644 srcpkgs/cubieboard2-kernel/files/config
create mode 100644 srcpkgs/cubieboard2-kernel/template
create mode 100644 srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
create mode 100644 srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
create mode 100644 srcpkgs/cubieboard2-uboot/template
delete mode 120000 srcpkgs/dbus-python3
create mode 100644 srcpkgs/dbus-python3/template
delete mode 100644 srcpkgs/dbus/files/systemd-user-session.patch
create mode 100644 srcpkgs/desmume/patches/glx_3Demu.cpp.patch
create mode 100644 srcpkgs/dfc-git/template
create mode 100644 srcpkgs/dosfstools/patches/dosfstools-loff_and_BLOCK_SIZE.patch
create mode 100644 srcpkgs/dropbear/files/dropbear.service
create mode 100644 srcpkgs/dropbear/template
create mode 100644 srcpkgs/ethtool/patches/stdint.patch
create mode 120000 srcpkgs/eudev-libgudev
create mode 120000 srcpkgs/eudev-libgudev-devel
create mode 120000 srcpkgs/eudev-libudev
create mode 120000 srcpkgs/eudev-libudev-devel
create mode 100644 srcpkgs/eudev/template
create mode 120000 srcpkgs/freerdp-devel
create mode 100644 srcpkgs/freerdp/patches/ffmpeg2.0.patch
create mode 100644 srcpkgs/freerdp/patches/patch_numblock.patch
create mode 100644 srcpkgs/freerdp/template
create mode 100644 srcpkgs/fuse-sshfs/template
create mode 100644 srcpkgs/fuse/patches/fuse-headers.patch
create mode 100644 srcpkgs/fuse/patches/fuse-lock.patch
create mode 100644 srcpkgs/fuse/patches/fuse-paths.patch
create mode 100644 srcpkgs/gcc/files/gcc-4.7.3-musl.diff
create mode 100644 srcpkgs/gdb/patches/gdb-76-linux-low-threaddb.patch
create mode 100644 srcpkgs/gdb/patches/gdb-76-pid_t.patch
create mode 100644 srcpkgs/gdb/patches/gdb-amd64-debugreg.patch
create mode 100644 srcpkgs/gdb/patches/gdb-arm-gentmap.patch
create mode 100644 srcpkgs/gdb/patches/gdb-linux_nat.patch
create mode 100644 srcpkgs/gdb/patches/gdb-threaddb.patch
create mode 100644 srcpkgs/genext2fs/template
create mode 100644 srcpkgs/gmime/files/iconv-detect.h
create mode 100644 srcpkgs/gnu-efi-libs/template
create mode 120000 srcpkgs/gnucash-devel
create mode 100644 srcpkgs/gnucash/template
create mode 120000 srcpkgs/goffice-devel
create mode 100644 srcpkgs/goffice/template
create mode 120000 srcpkgs/goffice0.8-devel
create mode 100644 srcpkgs/goffice0.8/template
create mode 120000 srcpkgs/imlib2-tools
delete mode 100644 srcpkgs/iptables/patches/0503-extension_cppflags.patch
create mode 100644 srcpkgs/jupp/template
delete mode 120000 srcpkgs/kernel-headers-rpi
create mode 100644 srcpkgs/kmod/patches/kmod.patch
create mode 100644 srcpkgs/libXft/patches/freetype_header.patch
create mode 120000 srcpkgs/libatomic_ops-devel
create mode 100644 srcpkgs/libatomic_ops/template
create mode 100644 srcpkgs/libcap-ng/patches/pid_t-portability.patch
delete mode 120000 srcpkgs/libcap-pam
create mode 100644 srcpkgs/libcap-pam/template
create mode 120000 srcpkgs/libcxx-devel
create mode 100644 srcpkgs/libcxx/template
create mode 120000 srcpkgs/libdri2-devel-git
create mode 100644 srcpkgs/libdri2-git/template
create mode 120000 srcpkgs/libnotmuch
create mode 120000 srcpkgs/libnotmuch-devel
delete mode 120000 srcpkgs/libopenobex-devel
create mode 100644 srcpkgs/libssh/patches/fix-includes.patch
create mode 100644 srcpkgs/libusb/patches/portability-fixes.patch
delete mode 120000 srcpkgs/libusbx-devel
delete mode 100644 srcpkgs/libusbx/template
create mode 100644 srcpkgs/libvdpau-sunxi-git/template
create mode 120000 srcpkgs/libvpx-tools
create mode 100644 srcpkgs/libxml2/patches/libxml2-pthread.patch
delete mode 120000 srcpkgs/linux3.11-headers
create mode 120000 srcpkgs/linux3.13-headers
rename srcpkgs/{linux3.11 => linux3.13}/files/i386-dotconfig (96%)
rename srcpkgs/{linux3.11 => linux3.13}/files/x86_64-dotconfig (96%)
rename srcpkgs/{linux3.11 => linux3.13}/template (87%)
create mode 100644 srcpkgs/llvm/patches/cross-internal-compiler-error.patch
create mode 100644 srcpkgs/nbd/files/config
create mode 100644 srcpkgs/nbd/files/nbd.service
create mode 100644 srcpkgs/nbd/template
create mode 100644 srcpkgs/notmuch/template
delete mode 100644 srcpkgs/obex-data-server/template
create mode 100644 srcpkgs/obmenu/template
create mode 100644 srcpkgs/odroid-u2-base/INSTALL
create mode 100644 srcpkgs/odroid-u2-base/files/odroid-led
create mode 100644 srcpkgs/odroid-u2-base/files/odroid-led.default
create mode 100644 srcpkgs/odroid-u2-base/files/odroid-led.service
create mode 100644 srcpkgs/odroid-u2-base/template
create mode 100644 srcpkgs/odroid-u2-boot-fw/template
create mode 120000 srcpkgs/odroid-u2-kernel-headers
create mode 100644 srcpkgs/odroid-u2-kernel/files/u2-dotconfig-custom
create mode 100644 srcpkgs/odroid-u2-kernel/template
create mode 100644 srcpkgs/odroid-u2-uboot/files/boot-1024x768-noedid.ini
create mode 100644 srcpkgs/odroid-u2-uboot/files/boot-1080p-edid.ini
create mode 100644 srcpkgs/odroid-u2-uboot/files/boot-1080p-noedid.ini
create mode 100644 srcpkgs/odroid-u2-uboot/files/boot-720p-edid.ini
create mode 100644 srcpkgs/odroid-u2-uboot/files/boot-720p-noedid.ini
create mode 100644 srcpkgs/odroid-u2-uboot/files/boot-auto_edid.ini
create mode 100644 srcpkgs/odroid-u2-uboot/files/config.patch
create mode 100644 srcpkgs/odroid-u2-uboot/template
rename srcpkgs/{libopenobex => openobex-devel} (100%)
rename srcpkgs/openssl/patches/{openssl-1.0.1e-fix_pod_syntax-1.patch => openssl-1.0.1f-perl-5.18.patch} (60%)
create mode 100644 srcpkgs/pam/patches/portability-fixes.patch
create mode 100644 srcpkgs/par2cmdline/template
rename srcpkgs/perl/files/{arm-linux-gnueabihf => cross}/bitcount.h (100%)
rename srcpkgs/perl/files/{arm-linux-gnueabihf => cross}/config.h (100%)
rename srcpkgs/perl/files/{arm-linux-gnueabihf => cross}/config.sh (96%)
rename srcpkgs/perl/files/{arm-linux-gnueabihf => cross}/mg_data.h (100%)
rename srcpkgs/perl/files/{arm-linux-gnueabihf => cross}/uudmap.h (100%)
delete mode 100644 srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch
create mode 100644 srcpkgs/py2cairo/files/python-config
delete mode 120000 srcpkgs/python-e_dbus-devel
delete mode 120000 srcpkgs/python-ecore-devel
delete mode 120000 srcpkgs/python-edje-devel
delete mode 120000 srcpkgs/python-elementary-devel
delete mode 120000 srcpkgs/python-evas-devel
create mode 100644 srcpkgs/python/patches/python-fix-posix-close-clash.patch
delete mode 100644 srcpkgs/r2-bindings-git/template
delete mode 120000 srcpkgs/radare2-devel-git
delete mode 100644 srcpkgs/radare2-git/template
delete mode 100644 srcpkgs/rpi-base-files/template
create mode 100644 srcpkgs/rpi-base/INSTALL
create mode 100644 srcpkgs/rpi-base/files/bcm_host.pc
create mode 100644 srcpkgs/rpi-base/files/egl.pc
create mode 100644 srcpkgs/rpi-base/files/glesv2.pc
create mode 100644 srcpkgs/rpi-base/template
create mode 120000 srcpkgs/rpi-kernel-headers
rename srcpkgs/{kernel-rpi => rpi-kernel}/files/args-uncompressed.txt (100%)
rename srcpkgs/{kernel-rpi => rpi-kernel}/files/boot-uncompressed.txt (100%)
rename srcpkgs/{kernel-rpi => rpi-kernel}/files/imagetool-uncompressed.py (100%)
rename srcpkgs/{kernel-rpi => rpi-kernel}/template (75%)
delete mode 100644 srcpkgs/sshfs-fuse/template
create mode 100644 srcpkgs/strace/patches/use-sys-ptrace.h.patch
create mode 120000 srcpkgs/sunxi-mali-devel
create mode 100644 srcpkgs/sunxi-mali/patches/make-tabs.patch
create mode 100644 srcpkgs/sunxi-mali/template
create mode 100644 srcpkgs/sunxi-tools/template
create mode 100644 srcpkgs/syslinux/INSTALL
create mode 100644 srcpkgs/syslinux/patches/syslinux-6.02-fix-bios-isolinux.patch
create mode 100644 srcpkgs/syslinux/patches/syslinux-6.02-fix-chainloading.patch
delete mode 100644 srcpkgs/syslinux/patches/syslinux-dont-build-dos-windows-targets.patch
delete mode 100644 srcpkgs/valabind-git/template
create mode 100644 srcpkgs/vorbis-tools/template
create mode 100644 srcpkgs/xbmc-rpi/INSTALL
create mode 100644 srcpkgs/xbmc-rpi/REMOVE
create mode 100644 srcpkgs/xbmc-rpi/files/polkit.rules
create mode 100644 srcpkgs/xbmc-rpi/files/xbmc.service
create mode 100644 srcpkgs/xbmc-rpi/patches/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
create mode 100644 srcpkgs/xbmc-rpi/template
create mode 100644 srcpkgs/xbps-src/INSTALL
delete mode 100644 srcpkgs/xbps/patches/0001-xbps-rindex-8-fix-24-and-added-an-ATF-test-case.patch
delete mode 100644 srcpkgs/xbps/patches/0001-xbps-rindex-fix-25-sign-unnecessarily-regenerates-ar.patch
delete mode 100644 srcpkgs/xbps/patches/0002-Fix-25-correctly-compare-against-repo-signature.patch
delete mode 100644 srcpkgs/xf86-video-fbturbo-git/template
create mode 100644 srcpkgs/xf86-video-fbturbo/template
create mode 100644 srcpkgs/yt-play/template
create mode 100644 srcpkgs/zsh/patches/xattr-build-fix.patch
diff --git a/COPYING b/COPYING
index 9d1202d01b..38382b9d76 100644
--- a/COPYING
+++ b/COPYING
@@ -1,23 +1,22 @@
-/* Copyright (c) 2008-2013 The XBPS developers and contributors.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ Copyright (c) 2008-2014 The XBPS developers and contributors.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/common/build_style/README b/common/build_style/README
new file mode 100644
index 0000000000..8ed990b724
--- /dev/null
+++ b/common/build_style/README
@@ -0,0 +1,12 @@
+BUILD STYLES
+============
+
+These shell snippets provide support for multiple build systems, i.e GNU configure,
+CMake, etc. A build style file must provide at least the following functions:
+
+ - do_configure
+ - do_build
+ - do_install
+
+If a source package defines its own do_xxx() function, the function defined in
+the build style file is simply ignored.
diff --git a/common/build_style/cmake.sh b/common/build_style/cmake.sh
new file mode 100644
index 0000000000..1e2b0b9880
--- /dev/null
+++ b/common/build_style/cmake.sh
@@ -0,0 +1,45 @@
+#
+# This helper is for templates using cmake.
+#
+do_configure() {
+ [ ! -d build ] && mkdir build
+ cd build
+
+ if [ "$CROSS_BUILD" ]; then
+ cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER ${XBPS_CROSS_TRIPLET}-gcc)
+SET(CMAKE_CXX_COMPILER ${XBPS_CROSS_TRIPLET}-g++)
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_FIND_ROOT_PATH ${XBPS_CROSS_BASE})
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+ configure_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
+ fi
+ configure_args+=" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON"
+
+ cmake ${configure_args} ..
+}
+
+do_build() {
+ : ${make_cmd:=make}
+
+ cd build
+ ${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+
+ make_install_args+=" DESTDIR=${DESTDIR}"
+
+ cd build
+ ${make_cmd} ${make_install_args} ${make_install_target}
+}
diff --git a/common/build_style/configure.sh b/common/build_style/configure.sh
new file mode 100644
index 0000000000..b310a88a3d
--- /dev/null
+++ b/common/build_style/configure.sh
@@ -0,0 +1,24 @@
+#
+# This helper is for templates using configure scripts (not generated
+# by the GNU autotools).
+#
+do_configure() {
+ : ${configure_script:=./configure}
+
+ ${configure_script} ${configure_args}
+}
+
+do_build() {
+ : ${make_cmd:=make}
+
+ ${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+
+ make_install_args+=" DESTDIR=${DESTDIR}"
+
+ ${make_cmd} ${make_install_args} ${make_install_target}
+}
diff --git a/common/build_style/gnu-configure.sh b/common/build_style/gnu-configure.sh
new file mode 100644
index 0000000000..9c52832835
--- /dev/null
+++ b/common/build_style/gnu-configure.sh
@@ -0,0 +1,33 @@
+#
+# This helper is for templates using GNU configure scripts.
+#
+do_configure() {
+ : ${configure_script:=./configure}
+
+ # Make sure that shared libraries are built with --as-needed.
+ #
+ # http://lists.gnu.org/archive/html/libtool-patches/2004-06/msg00002.html
+ if [ -z "$broken_as_needed" ]; then
+ sed -i "s/^\([ \t]*tmp_sharedflag\)='-shared'/\1='-shared -Wl,--as-needed'/" ${configure_script}
+ fi
+ # Automatically detect musl toolchains.
+ for f in $(find ${wrksrc} -type f -name *config*.sub); do
+ cp -f ${XBPS_CROSSPFDIR}/config.sub ${f}
+ done
+ ${configure_script} ${configure_args}
+}
+
+do_build() {
+ : ${make_cmd:=make}
+
+ ${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+
+ make_install_args+=" DESTDIR=${DESTDIR}"
+
+ ${make_cmd} ${make_install_args} ${make_install_target}
+}
diff --git a/common/build_style/gnu-makefile.sh b/common/build_style/gnu-makefile.sh
new file mode 100644
index 0000000000..d910011784
--- /dev/null
+++ b/common/build_style/gnu-makefile.sh
@@ -0,0 +1,20 @@
+#
+# This helper is for templates using GNU Makefiles.
+#
+do_build() {
+ : ${make_cmd:=make}
+
+ ${make_cmd} \
+ CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+ CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="$STRIP" \
+ ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+
+ make_install_args+=" PREFIX=/usr DESTDIR=${DESTDIR}"
+
+ ${make_cmd} ${make_install_args} ${make_install_target}
+}
diff --git a/common/build_style/meta.sh b/common/build_style/meta.sh
new file mode 100644
index 0000000000..2a33d0b465
--- /dev/null
+++ b/common/build_style/meta.sh
@@ -0,0 +1,13 @@
+# meta pkg build style; do nothing.
+
+do_fetch() {
+ :
+}
+
+do_extract() {
+ :
+}
+
+do_install() {
+ :
+}
diff --git a/common/build_style/perl-ModuleBuild.sh b/common/build_style/perl-ModuleBuild.sh
new file mode 100644
index 0000000000..7a4eef5890
--- /dev/null
+++ b/common/build_style/perl-ModuleBuild.sh
@@ -0,0 +1,32 @@
+#
+# This helper does the required steps to be able to build and install
+# perl modules with the Module::Build method into the correct location.
+#
+# Required vars to be set by a template:
+#
+# build_style=perl-ModuleBuild
+#
+do_configure() {
+ if [ -f Build.PL ]; then
+ PERL_MM_USE_DEFAULT=1 PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$DESTDIR'" \
+ PERL_MB_OPT="--installdirs vendor --destdir '$DESTDIR'" \
+ LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+ perl Build.PL ${configure_args} INSTALLDIRS=vendor
+ else
+ msg_error "$pkgver: cannot find Build.PL for perl module!\n"
+ fi
+}
+
+do_build() {
+ if [ ! -x ./Build ]; then
+ msg_error "$pkgver: cannot find ./Build script!\n"
+ fi
+ LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ./Build ${make_build_args}
+}
+
+do_install() {
+ if [ ! -x ./Build ]; then
+ msg_error "$pkgver: cannot find ./Build script!\n"
+ fi
+ ./Build ${make_install_args} install
+}
diff --git a/common/build_style/perl-module.sh b/common/build_style/perl-module.sh
new file mode 100644
index 0000000000..37c5c3a71b
--- /dev/null
+++ b/common/build_style/perl-module.sh
@@ -0,0 +1,64 @@
+#
+# This helper does the required steps to be able to build and install
+# perl modules that use MakeMaker into the correct location.
+#
+# Required vars to be set by a template:
+#
+# build_style=perl-module
+#
+# Optionally if the module needs more directories to be configured other
+# than $XBPS_BUILDDIR/$wrksrc, one can use (relative to $wrksrc):
+#
+# perl_configure_dirs="blob/bob foo/blah"
+#
+do_configure() {
+ local perlmkf
+
+ if [ -z "$perl_configure_dirs" ]; then
+ perlmkf="$wrksrc/Makefile.PL"
+ if [ ! -f $perlmkf ]; then
+ msg_error "*** ERROR couldn't find $perlmkf, aborting ***\n"
+ fi
+
+ cd $wrksrc
+ PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \
+ OPTIMIZE="$CFLAGS" \
+ CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
+ LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
+ LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
+ perl Makefile.PL ${configure_args} INSTALLDIRS=vendor
+ fi
+
+ for i in "$perl_configure_dirs"; do
+ perlmkf="$wrksrc/$i/Makefile.PL"
+ if [ -f $perlmkf ]; then
+ cd $wrksrc/$i
+ PERL_MM_USE_DEFAULT=1 GCC="$CC" CC="$CC" LD="$CC" \
+ OPTIMIZE="$CFLAGS" \
+ CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include" \
+ LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
+ LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
+ perl Makefile.PL ${make_build_args} INSTALLDIRS=vendor
+ else
+ msg_error "*** ERROR: couldn't find $perlmkf, aborting **\n"
+ fi
+ done
+}
+
+do_build() {
+ : ${make_cmd:=make}
+
+ ${make_cmd} CC="$CC" LD="$CC" CFLAGS="$CFLAGS" OPTIMIZE="$CFLAGS" \
+ LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
+ LDDLFLAGS="-shared $CFLAGS -L${XBPS_CROSS_BASE}/usr/lib" \
+ ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_install() {
+ : ${make_cmd:=make}
+ : ${make_install_target:=install}
+
+ make_install_args+=" DESTDIR=${DESTDIR}"
+
+ ${make_cmd} ${make_install_args} ${make_install_target}
+}
diff --git a/common/build_style/python-module.sh b/common/build_style/python-module.sh
new file mode 100644
index 0000000000..a0202a1894
--- /dev/null
+++ b/common/build_style/python-module.sh
@@ -0,0 +1,36 @@
+#
+# This helper is for templates installing python modules.
+#
+XBPS_PYVER="2.7" # currently 2.7 is the default python
+
+do_build() {
+ if [ -n "$CROSS_BUILD" ]; then
+ CC="${XBPS_CROSS_TRIPLET}-gcc -pthread"
+ LDSHARED="${CC} -shared"
+ PYPREFIX="$XBPS_CROSS_BASE"
+ CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/include/python${XBPS_PYVER} -I${XBPS_CROSS_BASE}/usr/include"
+ LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/lib/python${XBPS_PYVER} -L${XBPS_CROSS_BASE}/lib"
+ env CC="$CC" LDSHARED="$LDSHARED" \
+ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
+ LDFLAGS="$LDFLAGS" python setup.py build ${make_build_args}
+ else
+ python setup.py build ${make_build_args}
+ fi
+}
+
+do_install() {
+ make_install_args+=" --prefix=/usr --root=$DESTDIR"
+
+ if [ -n "$CROSS_BUILD" ]; then
+ CC="${XBPS_CROSS_TRIPLET}-gcc -pthread"
+ LDSHARED="${CC} -shared"
+ PYPREFIX="$XBPS_CROSS_BASE"
+ CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/include/python${XBPS_PYVER} -I${XBPS_CROSS_BASE}/usr/include"
+ LDFLAGS="$LDFLAGS -L${XBPS_CROSS_BASE}/lib/python${XBPS_PYVER} -L${XBPS_CROSS_BASE}/lib"
+ env CC="$CC" LDSHARED="$LDSHARED" \
+ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
+ LDFLAGS="$LDFLAGS" python setup.py install ${make_install_args}
+ else
+ python setup.py install ${make_install_args}
+ fi
+}
diff --git a/common/build_style/waf.sh b/common/build_style/waf.sh
new file mode 100644
index 0000000000..5b241c2950
--- /dev/null
+++ b/common/build_style/waf.sh
@@ -0,0 +1,16 @@
+#
+# This helper is for templates using WAF to build/install.
+#
+do_configure() {
+ python waf configure --prefix=/usr ${configure_args}
+}
+
+do_build() {
+ python waf build ${make_build_args}
+}
+
+do_install() {
+ make_install_args+=" --destdir=${DESTDIR}"
+
+ python waf install ${make_install_args}
+}
diff --git a/common/build_style/waf3.sh b/common/build_style/waf3.sh
new file mode 100644
index 0000000000..bfa11c3614
--- /dev/null
+++ b/common/build_style/waf3.sh
@@ -0,0 +1,16 @@
+#
+# This helper is for templates using WAF with python3 to build/install.
+#
+do_configure() {
+ PYTHON=python3 python3 waf configure --prefix=/usr ${configure_args}
+}
+
+do_build() {
+ PYTHON=python3 python3 waf build ${make_build_args}
+}
+
+do_install() {
+ make_install_args+=" --destdir=$DESTDIR"
+
+ PYTHON=python3 python3 waf install ${make_install_args}
+}
diff --git a/common/cross-profiles/README b/common/cross-profiles/README
new file mode 100644
index 0000000000..a9c0a13f41
--- /dev/null
+++ b/common/cross-profiles/README
@@ -0,0 +1,14 @@
+CROSS PROFILES
+==============
+
+This directory contains cross profiles to allow cross compilation for the specified target.
+A cross profile file must provide the following variables:
+
+ - XBPS_TARGET_ARCH (as returned by uname -m)
+ - XBPS_CROSS_TRIPLET (the cross compiler triplet)
+ - XBPS_CFLAGS (C compiler flags for host compiler)
+ - XBPS_CXXFLAGS (C++ compiler flags for the host compiler)
+ - XBPS_CROSS_CFLAGS (C compiler flags for the cross compiler)
+ - XBPS_CROSS_CXXFLAGS (C++ compiler flags for the cross compiler)
+
+A source package matching `cross-${XBPS_CROSS_TRIPLET}' must also exist.
diff --git a/common/cross-profiles/armv6hf-musl.sh b/common/cross-profiles/armv6hf-musl.sh
new file mode 100644
index 0000000000..2f51fd0859
--- /dev/null
+++ b/common/cross-profiles/armv6hf-musl.sh
@@ -0,0 +1,8 @@
+# Cross build profile for ARM EABI5 Hard Float and Musl libc.
+
+XBPS_TARGET_ARCH="armv6l-musl"
+XBPS_CROSS_TRIPLET="arm-linux-musleabi"
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
+XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/cross-profiles/armv6hf.sh b/common/cross-profiles/armv6hf.sh
new file mode 100644
index 0000000000..0931f65194
--- /dev/null
+++ b/common/cross-profiles/armv6hf.sh
@@ -0,0 +1,8 @@
+# Cross build profile for ARM GNU EABI5 Hard Float.
+
+XBPS_TARGET_ARCH="armv6l"
+XBPS_CROSS_TRIPLET="arm-linux-gnueabihf"
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
+XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/cross-profiles/armv7.sh b/common/cross-profiles/armv7.sh
new file mode 100644
index 0000000000..0bebb31163
--- /dev/null
+++ b/common/cross-profiles/armv7.sh
@@ -0,0 +1,8 @@
+# Cross build profile for ARMv7 GNU EABI Hard Float.
+
+XBPS_TARGET_ARCH="armv7l"
+XBPS_CROSS_TRIPLET="arm-linux-gnueabihf7"
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
+XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/cross-profiles/config.sub b/common/cross-profiles/config.sub
new file mode 100644
index 0000000000..f66c6624bb
--- /dev/null
+++ b/common/cross-profiles/config.sub
@@ -0,0 +1,1762 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
+
+timestamp='2011-03-23'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted GNU ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit ;;
+ --version | -v )
+ echo "$version" ; exit ;;
+ --help | --h* | -h )
+ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit ;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-musl* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple | -axis | -knuth | -cray | -microblaze)
+ os=
+ basic_machine=$1
+ ;;
+ -bluegene*)
+ os=-cnk
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+ -psos*)
+ os=-psos
+ ;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
+ | moxie \
+ | mt \
+ | msp430 \
+ | nds32 | nds32le | nds32be \
+ | nios | nios2 \
+ | ns16k | ns32k \
+ | open8 \
+ | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
+
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ basic_machine=$basic_machine-pc
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+ | mips64octeon-* | mips64octeonel-* \
+ | mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | mt-* \
+ | msp430-* \
+ | nds32-* | nds32le-* | nds32be-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile-* | tilegx-* \
+ | tron-* \
+ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+ | z8k-* | z80-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+ basic_machine=i386-unknown
+ os=-bsd
+ ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-unknown
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | j90)
+ basic_machine=j90-cray
+ os=-unicos
+ ;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16 | cr16-*)
+ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=-ose
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=-xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hppa-next)
+ os=-nextstep3
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=-osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=-proelf
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+ ;;
+ i*86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv4
+ ;;
+ i*86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv
+ ;;
+ i*86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-solaris2
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=-mach
+ ;;
+ i386-vsta | vsta)
+ basic_machine=i386-unknown
+ os=-vsta
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+ ;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-unknown
+ os=-netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=-linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=-sysv
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=-mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
+ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+ openrisc | openrisc-*)
+ basic_machine=or32-unknown
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=-ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=-os68k
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentium | p5 | k5 | k6 | nexgen | viac3)
+ basic_machine=i586-pc
+ ;;
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ basic_machine=i686-pc
+ ;;
+ pentiumii | pentium2 | pentiumiii | pentium3)
+ basic_machine=i686-pc
+ ;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+ ppc | ppcbe) basic_machine=powerpc-unknown
+ ;;
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+ ;;
+ ppc64le-* | powerpc64little-*)
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ps2)
+ basic_machine=i386-ibm
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ rm[46]00)
+ basic_machine=mips-siemens
+ ;;
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparclite-wrs | simso-wrs)
+ basic_machine=sparclite-wrs
+ os=-vxworks
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=-sysv2
+ ;;
+ spur)
+ basic_machine=spur-unknown
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=-sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=-sunos4
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=-sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=-sunos4
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=-sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=-sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=-solaris2
+ ;;
+ sun3 | sun3-*)
+ basic_machine=m68k-sun
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ os=-unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=-dynix
+ ;;
+ t3e)
+ basic_machine=alphaev5-cray
+ os=-unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+ # This must be matched before tile*.
+ tilegx*)
+ basic_machine=tilegx-unknown
+ os=-linux-gnu
+ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+ tx39el)
+ basic_machine=mipstx39el-unknown
+ ;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=-sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=-none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=-sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=-vms
+ ;;
+ vpp*|vx|vx-*)
+ basic_machine=f301-fujitsu
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=-vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=-vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=-vxworks
+ ;;
+ w65*)
+ basic_machine=w65-wdc
+ os=-none
+ ;;
+ w89k-*)
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ z8k-*-coff)
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+ z80-*-coff)
+ basic_machine=z80-unknown
+ os=-sim
+ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+ ;;
+
+# Here we handle the default manufacturer of certain CPU types. It is in
+# some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ basic_machine=hppa1.1-winbond
+ ;;
+ op50n)
+ basic_machine=hppa1.1-oki
+ ;;
+ op60c)
+ basic_machine=hppa1.1-oki
+ ;;
+ romp)
+ basic_machine=romp-ibm
+ ;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+ vax)
+ basic_machine=vax-dec
+ ;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
+ pdp11)
+ basic_machine=pdp11-dec
+ ;;
+ we32k)
+ basic_machine=we32k-att
+ ;;
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
+ basic_machine=cydra-cydrome
+ ;;
+ orion)
+ basic_machine=orion-highlevel
+ ;;
+ orion105)
+ basic_machine=clipper-highlevel
+ ;;
+ mac | mpw | mac-mpw)
+ basic_machine=m68k-apple
+ ;;
+ pmac | pmac-mpw)
+ basic_machine=powerpc-apple
+ ;;
+ *-unknown)
+ # Make sure to match an already-canonicalized machine name.
+ ;;
+ *)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+ *-digital*)
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ ;;
+ *-commodore*)
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ ;;
+ *)
+ ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+ -solaris)
+ os=-solaris2
+ ;;
+ -svr4*)
+ os=-sysv4
+ ;;
+ -unixware*)
+ os=-sysv4.2uw
+ ;;
+ -gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ ;;
+ # First accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
+ | -linux-musl* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+ case $basic_machine in
+ x86-* | i*86-*)
+ ;;
+ *)
+ os=-nto$os
+ ;;
+ esac
+ ;;
+ -nto-qnx*)
+ ;;
+ -nto*)
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
+ ;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
+ -linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
+ -sunos5*)
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ ;;
+ -sunos6*)
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ ;;
+ -opened*)
+ os=-openedition
+ ;;
+ -os400*)
+ os=-os400
+ ;;
+ -wince*)
+ os=-wince
+ ;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
+ -utek*)
+ os=-bsd
+ ;;
+ -dynix*)
+ os=-bsd
+ ;;
+ -acis*)
+ os=-aos
+ ;;
+ -atheos*)
+ os=-atheos
+ ;;
+ -syllable*)
+ os=-syllable
+ ;;
+ -386bsd)
+ os=-bsd
+ ;;
+ -ctix* | -uts*)
+ os=-sysv
+ ;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
+ -ns2 )
+ os=-nextstep2
+ ;;
+ -nsk*)
+ os=-nsk
+ ;;
+ # Preserve the version number of sinix5.
+ -sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+ -sinix*)
+ os=-sysv4
+ ;;
+ -tpf*)
+ os=-tpf
+ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+ -oss*)
+ os=-sysv3
+ ;;
+ -svr4)
+ os=-sysv4
+ ;;
+ -svr3)
+ os=-sysv3
+ ;;
+ -sysvr4)
+ os=-sysv4
+ ;;
+ # This must come after -sysvr4.
+ -sysv*)
+ ;;
+ -ose*)
+ os=-ose
+ ;;
+ -es1800*)
+ os=-ose
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
+ ;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
+ -dicos*)
+ os=-dicos
+ ;;
+ -nacl*)
+ ;;
+ -none)
+ ;;
+ *)
+ # Get rid of the `-' at the beginning of $os.
+ os=`echo $os | sed 's/[^-]*-//'`
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system. Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
+ *-acorn)
+ os=-riscix1.2
+ ;;
+ arm*-rebel)
+ os=-linux
+ ;;
+ arm*-semi)
+ os=-aout
+ ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ tic54x-*)
+ os=-coff
+ ;;
+ tic55x-*)
+ os=-coff
+ ;;
+ tic6x-*)
+ os=-coff
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
+ ;;
+ pdp11-*)
+ os=-none
+ ;;
+ *-dec | vax-*)
+ os=-ultrix4.2
+ ;;
+ m68*-apollo)
+ os=-domain
+ ;;
+ i386-sun)
+ os=-sunos4.0.2
+ ;;
+ m68000-sun)
+ os=-sunos3
+ # This also exists in the configure program, but was not the
+ # default.
+ # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+ mep-*)
+ os=-elf
+ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+ mips*-*)
+ os=-elf
+ ;;
+ or32-*)
+ os=-coff
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+ *-be)
+ os=-beos
+ ;;
+ *-haiku)
+ os=-haiku
+ ;;
+ *-ibm)
+ os=-aix
+ ;;
+ *-knuth)
+ os=-mmixware
+ ;;
+ *-wec)
+ os=-proelf
+ ;;
+ *-winbond)
+ os=-proelf
+ ;;
+ *-oki)
+ os=-proelf
+ ;;
+ *-hp)
+ os=-hpux
+ ;;
+ *-hitachi)
+ os=-hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=-sysv
+ ;;
+ *-cbm)
+ os=-amigaos
+ ;;
+ *-dg)
+ os=-dgux
+ ;;
+ *-dolphin)
+ os=-sysv3
+ ;;
+ m68k-ccur)
+ os=-rtu
+ ;;
+ m88k-omron*)
+ os=-luna
+ ;;
+ *-next )
+ os=-nextstep
+ ;;
+ *-sequent)
+ os=-ptx
+ ;;
+ *-crds)
+ os=-unos
+ ;;
+ *-ns)
+ os=-genix
+ ;;
+ i370-*)
+ os=-mvs
+ ;;
+ *-next)
+ os=-nextstep3
+ ;;
+ *-gould)
+ os=-sysv
+ ;;
+ *-highlevel)
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
+ *-sgi)
+ os=-irix
+ ;;
+ *-siemens)
+ os=-sysv4
+ ;;
+ *-masscomp)
+ os=-rtu
+ ;;
+ f30[01]-fujitsu | f700-fujitsu)
+ os=-uxpv
+ ;;
+ *-rom68k)
+ os=-coff
+ ;;
+ *-*bug)
+ os=-coff
+ ;;
+ *-apple)
+ os=-macos
+ ;;
+ *-atari*)
+ os=-mint
+ ;;
+ *)
+ os=-none
+ ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer. We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+ *-unknown)
+ case $os in
+ -riscix*)
+ vendor=acorn
+ ;;
+ -sunos*)
+ vendor=sun
+ ;;
+ -cnk*|-aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+ vendor=be
+ ;;
+ -hpux*)
+ vendor=hp
+ ;;
+ -mpeix*)
+ vendor=hp
+ ;;
+ -hiux*)
+ vendor=hitachi
+ ;;
+ -unos*)
+ vendor=crds
+ ;;
+ -dgux*)
+ vendor=dg
+ ;;
+ -luna*)
+ vendor=omron
+ ;;
+ -genix*)
+ vendor=ns
+ ;;
+ -mvs* | -opened*)
+ vendor=ibm
+ ;;
+ -os400*)
+ vendor=ibm
+ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+ -tpf*)
+ vendor=ibm
+ ;;
+ -vxsim* | -vxworks* | -windiss*)
+ vendor=wrs
+ ;;
+ -aux*)
+ vendor=apple
+ ;;
+ -hms*)
+ vendor=hitachi
+ ;;
+ -mpw* | -macos*)
+ vendor=apple
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ vendor=atari
+ ;;
+ -vos*)
+ vendor=stratus
+ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/common/cross-profiles/i686-musl.sh b/common/cross-profiles/i686-musl.sh
new file mode 100644
index 0000000000..e9004a546d
--- /dev/null
+++ b/common/cross-profiles/i686-musl.sh
@@ -0,0 +1,8 @@
+# Cross build profile for i686 and Musl libc.
+
+XBPS_TARGET_ARCH="i686-musl"
+XBPS_CROSS_TRIPLET="i686-linux-musl"
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-march=i686"
+XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/cross-profiles/i686.sh b/common/cross-profiles/i686.sh
new file mode 100644
index 0000000000..2cf14e80e9
--- /dev/null
+++ b/common/cross-profiles/i686.sh
@@ -0,0 +1,8 @@
+# Cross build profile for i686 GNU.
+
+XBPS_TARGET_ARCH="i686"
+XBPS_CROSS_TRIPLET="i686-pc-linux-gnu"
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-march=i686 -mtune=generic"
+XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/cross-profiles/mips.sh b/common/cross-profiles/mips.sh
new file mode 100644
index 0000000000..74e14a66e6
--- /dev/null
+++ b/common/cross-profiles/mips.sh
@@ -0,0 +1,8 @@
+# Cross build profile for MIPS BE soft float.
+
+XBPS_TARGET_ARCH="mips"
+XBPS_CROSS_TRIPLET="mips-softfloat-linux-gnu"
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -msoft-float"
+XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/cross-profiles/mipsel.sh b/common/cross-profiles/mipsel.sh
new file mode 100644
index 0000000000..7335138b94
--- /dev/null
+++ b/common/cross-profiles/mipsel.sh
@@ -0,0 +1,8 @@
+# Cross build profile for MIPS LE soft float.
+
+XBPS_TARGET_ARCH="mipsel"
+XBPS_CROSS_TRIPLET="mipsel-softfloat-linux-gnu"
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -msoft-float"
+XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/cross-profiles/musl-gnulibfix b/common/cross-profiles/musl-gnulibfix
new file mode 100644
index 0000000000..a9ff663d3a
--- /dev/null
+++ b/common/cross-profiles/musl-gnulibfix
@@ -0,0 +1,179 @@
+#!/bin/sh
+empty_file() {
+ rm -f "$1"
+ touch "$1"
+}
+
+dir="$1"
+# fix files breaking the build entirely
+for i in fseeko.c freadahead.c fseterr.c ; do empty_file "$dir"/$i ; done
+echo "void close_stdin(void) {}" > "$dir"/closein.c
+
+# fix stuff trying to reimplement libc
+culprits=`cat << EOF
+accept4
+acosl
+alloca
+alphasort
+asinl
+asprintf
+atanl
+atexit
+atoll
+bcopy
+btowc
+chown
+closedir
+cosl
+dirfd
+dprintf
+dup2
+dup3
+_Exit
+expl
+fchdir
+fchown-stub
+fdatasync
+fdopendir
+ffs
+flock
+fnmatch
+forkpty
+fpending
+fprintf
+freeaddrinfo
+fsync
+ftell
+ftruncate
+futimens
+gai_strerror
+getaddrinfo
+getdelim
+getdtablesize
+getgroups
+gethostname
+getline
+getlogin
+getlogin_r
+getnameinfo
+getpagesize
+getpass
+getsubopt
+gettimeofday
+getusershell
+gmtime_r
+grantpt
+imaxabs
+imaxdiv
+inet_ntop
+inet_pton
+isblank
+iswblank
+lchmod
+lchown
+ldexp
+ldexpl
+link
+linkat
+logl
+mbrlen
+mbrtowc
+mbsinit
+memmove
+mempcpy
+mkdtemp
+mkfifo
+mkfifoat
+mknod
+mknodat
+mkstemp
+mktime
+nanosleep
+nl_langinfo
+open
+openat
+opendir
+openpty
+pclose
+perror
+pipe
+pipe2
+poll
+popen
+pread
+pselect
+ptsname
+pwrite
+raise
+readdir
+readlink
+renameat
+rewinddir
+setenv
+sigaction
+sigaddset
+sigdelset
+sigemptyset
+sigfillset
+sigismember
+sigpending
+sigprocmask
+sinl
+snprintf
+spawnattr_destroy
+spawnattr_getdefault
+spawnattr_getflags
+spawnattr_getpgroup
+spawnattr_getsigmask
+spawnattr_init
+spawnattr_setdefault.c
+spawnattr_setflags
+spawnattr_setpgroup
+spawnattr_setsigmask
+spawn_faction_addclose
+spawn_faction_adddup2
+spawn_faction_addopen
+spawn_faction_destroy
+spawn_faction_init
+spawn_factions_addopen
+spawn_factions_destroy
+spawn_factions_init
+sprintf
+sqrtl
+stdio-read
+stdio-write
+strcasecmp
+strcasestr
+strchrnul
+strcspn
+strncasecmp
+strndup
+strnlen
+strpbrk
+strsep
+strsignal
+strstr
+strtod
+strtoimax
+strtol
+symlink
+symlinkat
+tanl
+tcgetsid
+timegm
+time_r
+times
+tmpfile
+uname
+unlockpt
+unsetenv
+usleep
+vasprintf
+vdprintf
+waitpid
+wcrtomb
+wctob
+EOF
+`
+#fixme check fsusage
+for i in $culprits ; do empty_file "$dir"/$i.c ; done
diff --git a/common/cross-profiles/x86_64-musl.sh b/common/cross-profiles/x86_64-musl.sh
new file mode 100644
index 0000000000..7df635af1f
--- /dev/null
+++ b/common/cross-profiles/x86_64-musl.sh
@@ -0,0 +1,8 @@
+# Cross build profile for x86_64 and Musl libc.
+
+XBPS_TARGET_ARCH="x86_64-musl"
+XBPS_CROSS_TRIPLET="x86_64-linux-musl"
+XBPS_CFLAGS="-O2 -pipe"
+XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_CROSS_CFLAGS="-mtune=generic"
+XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/common/environment/0000-REQUIREMENTS.sh b/common/environment/0000-REQUIREMENTS.sh
new file mode 100644
index 0000000000..92fc4eb442
--- /dev/null
+++ b/common/environment/0000-REQUIREMENTS.sh
@@ -0,0 +1,16 @@
+# -*- shell mode -*-
+#
+# Sets the minimal required xbps versions to build packages.
+#
+# =========================================================
+# DO NOT MODIFY THIS FILE WITHOUT PRIOR WRITTEN PERMISSION!
+# =========================================================
+#
+# xbps-src version.
+export XBPS_SRC_REQ=100
+
+# XBPS utils version.
+export XBPS_UTILS_REQ=0.29
+
+# XBPS utils API version.
+export XBPS_UTILS_API_REQ=20131224
diff --git a/common/environment/0001-bootstrap.sh b/common/environment/0001-bootstrap.sh
new file mode 100644
index 0000000000..5d4aed052e
--- /dev/null
+++ b/common/environment/0001-bootstrap.sh
@@ -0,0 +1,6 @@
+# This file sets some envvars to allow building bootstrap packages
+# when the chroot is not yet ready.
+
+[ -z "$CHROOT_READY" ] && return 0
+
+export PKG_CONFIG_PATH="${XBPS_MASTERDIR}/usr/lib/pkgconfig:${XBPS_MASTERDIR}/usr/share/pkgconfig"
diff --git a/common/environment/0001-configure-args.sh b/common/environment/0001-configure-args.sh
new file mode 100644
index 0000000000..e9b5fb7e5e
--- /dev/null
+++ b/common/environment/0001-configure-args.sh
@@ -0,0 +1,6 @@
+# This file sets up configure_args with commong settings for packages
+# that don't set $build_style or set it to gnu-configure.
+
+if [ "$build_style" = "gnu-configure" -o -z "$build_style" ]; then
+ export configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}"
+fi
diff --git a/common/environment/0002-cross.sh b/common/environment/0002-cross.sh
new file mode 100644
index 0000000000..109bbfc80b
--- /dev/null
+++ b/common/environment/0002-cross.sh
@@ -0,0 +1,11 @@
+# This file sets some envvars to allow cross compiling packages.
+
+[ -z "$CROSS_BUILD" ] && return 0
+
+export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/lib/pkgconfig"
+
+if [ "$build_style" = "gnu-configure" -o -z "$build_style" ]; then
+ export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
+fi
diff --git a/common/vars.sh b/common/environment/0003-misc.sh
similarity index 100%
rename from common/vars.sh
rename to common/environment/0003-misc.sh
diff --git a/common/environment/README b/common/environment/README
new file mode 100644
index 0000000000..99812870e1
--- /dev/null
+++ b/common/environment/README
@@ -0,0 +1,11 @@
+ENVIRONMENT SHELL SNIPPETS
+==========================
+
+This directory contains shell files (must not be executable nor contain a shebang)
+that are read by xbps-src when building source packages. The shell files
+are read in lexical order (as ordered by shell rules).
+
+These files shall set environment variables for use in the xbps-src helpers
+(libexec/xbps-src-*). Only files with the `.sh' extension are read, so this file
+will be simply ignored.
+
diff --git a/common/global-defs.sh b/common/global-defs.sh
deleted file mode 100644
index fcda9830d2..0000000000
--- a/common/global-defs.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- shell mode -*-
-#
-# Sets globally the minimal versions required by the xbps source packages.
-#
-# =========================================================
-# DO NOT MODIFY THIS FILE WITHOUT PRIOR WRITTEN PERMISSION!
-# =========================================================
-#
-# Every time a new source package requires a specific feature from a new
-# 'xbps-src', 'xbps' or 'base-chroot' package, that version must be
-# increased to "reproduce" the build behaviour (somewhat :-).
-
-# xbps-src version.
-XBPS_SRC_REQ=83
-
-# XBPS utils version.
-XBPS_UTILS_REQ=0.26.1
-
-# XBPS utils API version.
-XBPS_UTILS_API_REQ=20130918
-
-# base-chroot version.
-BASE_CHROOT_REQ=0.40_1
diff --git a/common/helpers/README b/common/helpers/README
new file mode 100644
index 0000000000..ff5e3b865c
--- /dev/null
+++ b/common/helpers/README
@@ -0,0 +1,25 @@
+SHELL HELPERS
+=============
+
+This directory contains shell files that are read by xbps-src and can be used at any
+phase when building source packages. Only files with the `.sh' extension will be read.
+
+A shell helper must provide its own function for use in the source packages.
+The following examples illustrates a fake helper named `myhelper.sh' that provides
+the `myhelper_func' function:
+
+myhelper.sh:
+...
+myhelper_func() {
+ ...
+}
+...
+
+You can then use this helper in a source package like this:
+
+srcpkgs/foo/template:
+...
+do_install() {
+ myhelper_func ...
+}
+...
diff --git a/common/helpers/replace-interpreter.sh b/common/helpers/replace-interpreter.sh
new file mode 100644
index 0000000000..1660ac6fa1
--- /dev/null
+++ b/common/helpers/replace-interpreter.sh
@@ -0,0 +1,41 @@
+# This helper replaces shebang paths pointing to the correct ones
+# as used by xbps. Multiple languages are supported:
+#
+# - GNU Bash
+# - Perl
+# - Python
+#
+
+bash_regexp=".*sh"
+perl_regexp=".*perl[^[:space:]]*"
+python_regexp=".*python[^[:space:]]*"
+
+replace_interpreter() {
+ local lang="$1" file="$2" trsb orsb
+
+ [ -z $lang -o -z $file ] && return 1
+
+ case $lang in
+ bash)
+ orsb=$bash_regexp
+ trpath="/bin/bash"
+ ;;
+ perl)
+ orsb=$perl_regexp
+ trpath="/usr/bin/perl"
+ ;;
+ python)
+ orsb=$python_regexp
+ trpath="/usr/bin/python"
+ ;;
+ *)
+ ;;
+ esac
+
+ if [ -f $file ]; then
+ sed -i -e "1s|^#![[:space:]]*${orsb}|#!${trpath}|" $file
+ msg_normal "Transformed $lang script: ${file##$wrksrc}.\n"
+ else
+ msg_warn "Ignoring unexistent $lang script: ${file##$wrksrc}.\n"
+ fi
+}
diff --git a/common/shlibs b/common/shlibs
index a76b9ca057..88d8fd1bf9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -105,9 +105,11 @@ libXrender.so.1 libXrender-0.9.4_1
libXrandr.so.2 libXrandr-1.3.0_1
libGLU.so.1 glu-9.0.0_1
libEGL.so.1 libEGL-7.11_1
+libEGL.so libEGL-1.0_1
+libGLESv1_CM.so libGLES-1.0_1
+libGLESv1_CM.so.1 libGLES-1.0_1
+libGLESv2.so libGLES-1.0_1
libwayland-egl.so.1 libwayland-egl-9.0.1_4
-libGLESv1_CM.so.1 libGLES-9.0.1_1
-libGLESv2.so.2 libGLES-9.0.1_1
libGL.so.1 libGL-7.11_1
libglapi.so.0 libglapi-7.11_1
libOpenVG.so.1 libOpenVG-7.11_1
@@ -440,7 +442,6 @@ libphysfs.so.1 physfs-2.0.0_1
libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1
libparted.so.2 libparted-3.1_1
libparted-fs-resize.so.0 libparted-3.1_1
-libopenobex.so.1 libopenobex-1.5_1
libntfs-3g.so.84 ntfs-3g-2013.1.13_1
libruby.so.1.9 ruby-1.9.3_1
libruby.so.2.0 ruby-2.0.0_1
@@ -921,6 +922,7 @@ libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
libyajl.so.2 yajl-2.0.1_1
libconfuse.so.0 confuse-2.7_1
libLLVM-3.3.so libllvm-3.3_4
+libLLVM-3.4.so libllvm-3.4_1
libisofs.so.6 libisofs-0.6.24_1
libbfd-2.22.so binutils-2.22_1<2.23_1
libopcodes-2.22.so binutils-2.22_1<2.23_1
@@ -1193,8 +1195,6 @@ libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libWFC.so rpi-firmware-20130228_1
-libGLESv2.so rpi-firmware-20130228_1
-libEGL.so rpi-firmware-20130228_1
libbcm_host.so rpi-firmware-20130228_1
libopenmaxil.so rpi-firmware-20130228_1
libvchiq_arm.so rpi-firmware-20130228_1
@@ -1392,7 +1392,7 @@ libSDL2-2.0.so.0 SDL2-2.0.0_1
libcacard.so.0 libcacard-1.6.1_1
libxcb-cursor.so.0 xcb-util-cursor-0.1.0_1
libgldi.so.3 libgldi-3.3.1_1
-libevdev.so.1 libevdev-0.4_1
+libevdev.so.1 libevdev-0.6_1
libmutter-wayland.so.0 mutter-wayland-3.10.1_1
libgdiplus.so.0 libgdiplus-2.10.9_1
libmonosgen-2.0.so.1 mono-3.2.3_1
@@ -1446,3 +1446,13 @@ libcinnamon-desktop.so.4 cinnamon-desktop-2.0.4_1
libcinnamon-control-center.so.1 cinnamon-control-center-2.0.9_1
libnemo-extension.so.1 libnemo-2.0.8_1
libxshmfence.so.1 libxshmfence-1.1_1
+libgoffice-0.8.so.8 goffice0.8-0.8.13_1
+libgoffice-0.10.so.10 goffice-0.10.9_1
+libc++.so.1 libcxx-3.4_1
+libopenobex.so.2 openobex-1.7.1_1
+libnotmuch.so.3 libnotmuch-0.17_2
+libdri2.so.1 libdri2-0.1_1
+libUMP.so libump-1.0_1
+libUMP.so.3 libump-1.0_1
+libatomic_ops_gpl.so.0 libatomic_ops-7.2e_1
+libatomic_ops.so.0 libatomic_ops-7.2e_1
diff --git a/doc/manual.txt b/doc/manual.txt
index a8af37c0fd..88bc6c801c 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -1,3 +1,5 @@
+// vim: set syntax=asciidoc:
+
The XBPS source packages manual
===============================
Juan RP <xtraeme@gmail.com>
@@ -8,7 +10,7 @@ Juan RP <xtraeme@gmail.com>
:website: http://www.voidlinux.eu
This article contains an exhaustive manual of how to create new source
-packages for XBPS, the package manager of the *Void Linux distribution*.
+packages for XBPS, the `Void Linux` native packaging system.
Introduction
------------
@@ -25,11 +27,10 @@ A simple `template` example is as follows:
--------------------------------------------------------------------------
# Template file for 'foo'
-## source section
pkgname="foo"
version="1.0"
-revision="1"
-build_style="gnu-configure"
+revision=1
+build_style=gnu-configure
short_desc="A short description max 72 chars"
maintainer="name <email>"
license="GPL-3"
@@ -37,22 +38,20 @@ homepage="http://www.foo.org"
distfiles="http://www.foo.org/foo-${version}.tar.gz"
checksum="fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff"
-## package section
-foo_package() {
- pkg_install() {
- vmove all
- }
+## optional
+foo-devel_package() {
+ short_desc+=" - development files"
+ depends="..."
+ pkg_install() {
+ vmove usr/include
+ }
}
---------------------------------------------------------------------------
-There are two main `sections` in a template: the `source section` and the
-`package section`. The `source section` contains definitions to download, build
-and install the package files to a `fake destdir`. The `package section`
-contains the definitions to how the resulting binary packages are generated.
-
-A template always requires at least a `source section` and a `package section`;
-multiple `package sections` can be defined to generate `multiple binary packages`.
+The template file contains definitions to download, build and install the
+package files to a `fake destdir`, and after this a binary package can be
+generated with the definitions specified on it.
Don't worry if anything is not clear as it should be. The reserved `variables`
and `functions` will be explained later. This `template` file should be created
@@ -61,7 +60,7 @@ If everything went fine after running `xbps-src build-pkg` a binary package
called `foo-1.0_1.<arch>.xbps` will be generated in the local repository.
Additional binary packages (those defined in `_package() blocks` need a
-symlink to the `main` package, like this:
+symlink to the `main` package), like this:
----------------------------------
@@ -80,25 +79,25 @@ Package build phases
Building a package consist of the following phases:
*fetch*::
- This phase downloads required sources for a `source package`, as defined by
- the `distfiles` variable or `do_fetch()` function.
+ This phase downloads required sources for a `source package`, as defined by
+the `distfiles` variable or `do_fetch()` function.
*extract*::
- This phase extracts the `distfiles` files into `$wrksrc` or executes the `do_extract()`
- function, which is the directory to be used to compile the `source package`.
+ This phase extracts the `distfiles` files into `$wrksrc` or executes the `do_extract()`
+function, which is the directory to be used to compile the `source package`.
*configure*::
- This phase executes the `configuration` of a `source package`, i.e `GNU configure scripts`.
+ This phase executes the `configuration` of a `source package`, i.e `GNU configure scripts`.
*build*::
- This phase compiles/prepares the `source files` via `make` or any other compatible method.
+ This phase compiles/prepares the `source files` via `make` or any other compatible method.
*install-destdir*::
- This phase installs the `package files` into a `fake destdir`, via `make install` or
- any other compatible method.
+ This phase installs the `package files` into a `fake destdir`, via `make install` or
+any other compatible method.
*build-pkg*::
- This phase builds the `binary packages` with files stored in the `package destdir`.
+ This phase builds the `binary packages` with files stored in the `package destdir`.
`xbps-src` supports running just the specified phase, and if it ran
successfully, the phase will be skipped later (unless its work directory
@@ -111,28 +110,28 @@ The following functions are defined by `xbps-src` and can be used on any templat
*vinstall()*::
`vinstall <file> <mode> <targetdir> [<name>]`
- Installs `file` with the specified `mode` into `targetdir` in `$DESTDIR`
- (if called from a `source section`) or `$PKGDESTDIR` (if called from a `package section`).
- The optional 4th argument can be used to change the `file name`.
+Installs `file` with the specified `mode` into `targetdir` in `$DESTDIR`
+(if called from a `source section`) or `$PKGDESTDIR` (if called from a `package section`).
+The optional 4th argument can be used to change the `file name`.
*vcopy()*::
`vcopy <pattern> <targetdir>`
- Copies resursively all files in `pattern` to `targetdir` on `$DESTDIR`
- (if called from a `source section`) or `$PKGDESTDIR` (if called from a `package section`).
+Copies resursively all files in `pattern` to `targetdir` on `$DESTDIR`
+(if called from a `source section`) or `$PKGDESTDIR` (if called from a `package section`).
*vmove()*::
`vmove <pattern>`
- Moves `pattern` to the specified directory in `$DESTDIR`
- (if called from a `source section`) or `$PKGDESTDIR` (if called from a `package section`).
+Moves `pattern` to the specified directory in `$DESTDIR`
+(if called from a `source section`) or `$PKGDESTDIR` (if called from a `package section`).
*vmkdir()*::
`vmkdir <directory> [<mode>]`
- Creates a directory in `$DESTDIR` (if called from a `source section`) or
- $PKGDESTDIR` (if called from a `package section`). The 2nd optional argument
- sets the mode of the directory.
+Creates a directory in `$DESTDIR` (if called from a `source section`) or
+`$PKGDESTDIR` (if called from a `package section`). The 2nd optional argument
+sets the mode of the directory.
NOTE: shell wildcards must be properly quoted.
@@ -141,38 +140,40 @@ Global variables
The following variables are defined by `xbps-src` and can be used on any template:
*makejobs*::
- Set to `-jX` if `XBPS_MAKEJOBS` is defined, to allow parallel jobs with `GNU make`.
+ Set to `-jX` if `XBPS_MAKEJOBS` is defined, to allow parallel jobs with `GNU make`.
*sourcepkg*::
- Set to the to main package name, can be used to match the main package
- rather than additional binary package names.
+ Set to the to main package name, can be used to match the main package
+rather than additional binary package names.
*CHROOT_READY*::
- True if the target chroot (masterdir) is ready for chroot builds.
+ True if the target chroot (masterdir) is ready for chroot builds.
*CROSS_BUILD*::
- True if `xbps-src` is cross compiling a package.
+ True if `xbps-src` is cross compiling a package.
*DESTDIR*::
- Full path to the fake destdir used by the `source section`, set to
- `${XBPS_MASTERDIR}/destdir/${sourcepkg}-${version}`.
+ Full path to the fake destdir used by the `source section`, set to
+`${XBPS_MASTERDIR}/destdir/${sourcepkg}-${version}`.
*PKGDESTDIR*::
- Full path to the fake destdir used by the `pkg_install()` function in the
- `package section`, set to `${XBPS_MASTERDIR}/destdir/pkg-${pkgname}-${version}`.
+ Full path to the fake destdir used by the `pkg_install()` function in the
+`package section`, set to `${XBPS_MASTERDIR}/destdir/${pkgname}-${version}`.
*XBPS_MACHINE*::
- The machine architecture as returned by `uname -m`.
+ The machine architecture as returned by `uname -m`.
*XBPS_SRCDISTDIR*::
- Full path to where the `source distfiles` are stored, i.e `$XBPS_HOSTDIR/sources`.
+ Full path to where the `source distfiles` are stored, i.e `$XBPS_HOSTDIR/sources`.
*XBPS_SRCPKGDIR*::
- Full path to the `srcpkgs` directory.
+ Full path to the `srcpkgs` directory.
*XBPS_TARGET_MACHINE*::
- The target machine architecture when cross compiling a package.
+ The target machine architecture when cross compiling a package.
+*XBPS_FETCH_CMD*::
+ The utility to fetch files from `ftp`, `http` of `https` servers.
Source section
--------------
@@ -181,150 +182,167 @@ Mandatory variables
The list of mandatory variables in the `source section`:
*homepage*::
- A string pointing to the `upstream` homepage.
+ A string pointing to the `upstream` homepage.
*license*::
- A string matching any license file available in `/usr/share/licenses`.
- Multiple licenses should be separated by commas, i.e `GPL-3, LGPL-2.1`.
+ A string matching any license file available in `/usr/share/licenses`.
+Multiple licenses should be separated by commas, i.e `GPL-3, LGPL-2.1`.
*maintainer*::
- A string in the form of `name <user@domain>`.
+ A string in the form of `name <user@domain>`.
*pkgname*::
- A string with the package name, matching `srcpkgs/<pkgname>`.
+ A string with the package name, matching `srcpkgs/<pkgname>`.
*revision*::
- A number that must be set to 1 when the `source package` is created, or
- updated to a new `upstream version`. This should only be increased when
- the generated `binary packages` have been modified.
+ A number that must be set to 1 when the `source package` is created, or
+updated to a new `upstream version`. This should only be increased when
+the generated `binary packages` have been modified.
*short_desc*::
- A string with a brief description for this package. Max 72 chars.
+ A string with a brief description for this package. Max 72 chars.
*version*::
- A string with the package version. Must not contain dashes and at least
- one digit is required.
+ A string with the package version. Must not contain dashes and at least
+one digit is required.
Optional variables
~~~~~~~~~~~~~~~~~~
*hostmakedepends*::
- The list of `host` dependencies required to build the package. Dependencies
- can be specified with the following version comparators: `<`, `>`, `<=`, `>=`
- or `foo-1.0_1` to match an exact version. If version comparator is not
- defined (just a package name), the version comparator is automatically set to `>=0`.
- Example `hostmakedepends="foo blah<1.0"`.
+ The list of `host` dependencies required to build the package. Dependencies
+can be specified with the following version comparators: `<`, `>`, `<=`, `>=`
+or `foo-1.0_1` to match an exact version. If version comparator is not
+defined (just a package name), the version comparator is automatically set to `>=0`.
+Example `hostmakedepends="foo blah<1.0"`.
*makedepends*::
- The list of `target` dependencies required to build the package. Dependencies
- can be specified with the following version comparators: `<`, `>`, `<=`, `>=`
- or `foo-1.0_1` to match an exact version. If version comparator is not
- defined (just a package name), the version comparator is automatically set to `>=0`.
- Example `makedepends="foo blah>=1.0"`.
+ The list of `target` dependencies required to build the package. Dependencies
+can be specified with the following version comparators: `<`, `>`, `<=`, `>=`
+or `foo-1.0_1` to match an exact version. If version comparator is not
+defined (just a package name), the version comparator is automatically set to `>=0`.
+Example `makedepends="foo blah>=1.0"`.
*bootstrap*::
- If enabled the source package is considered to be part of the `bootstrap`
- process and required to be able to build packages in the chroot. Only a
- small number of packages must set this property.
+ If enabled the source package is considered to be part of the `bootstrap`
+process and required to be able to build packages in the chroot. Only a
+small number of packages must set this property.
*distfiles*::
- The full URL to the `upstream` source distribution files. Multiple files
- can be separated by blanks. The files must end in `.tar.lzma`, `.tar.xz`,
- `.txz`, `.tar.bz2`, `.tbz`, `.tar.gz`, `.tgz`, `.gz`, `.bz2`, `.tar` or
- `.zip`. Example `distfiles="http://foo.org/foo-1.0.tar.gz"`
+ The full URL to the `upstream` source distribution files. Multiple files
+can be separated by blanks. The files must end in `.tar.lzma`, `.tar.xz`,
+`.txz`, `.tar.bz2`, `.tbz`, `.tar.gz`, `.tgz`, `.gz`, `.bz2`, `.tar` or
+`.zip`. Example `distfiles="http://foo.org/foo-1.0.tar.gz"`
*checksum*::
- The `sha256` digests matching `${distfiles}`. Multiple files can be
- separated by blanks. Please note that the order must be the same than
- was used in `${distfiles}`. Example `checksum="kkas00xjkjas"`
+ The `sha256` digests matching `${distfiles}`. Multiple files can be
+separated by blanks. Please note that the order must be the same than
+was used in `${distfiles}`. Example `checksum="kkas00xjkjas"`
*long_desc*::
- A long description of the main package. Max 80 chars per line and must
- not contain the following characters: `&`, `<`, `>`.
+ A long description of the main package. Max 80 chars per line and must
+not contain the following characters: `&`, `<`, `>`.
*wrksrc*::
- The directory name where the package sources are extracted, by default
- set to `${pkgname}-${version}`.
+ The directory name where the package sources are extracted, by default
+set to `${pkgname}-${version}`.
*build_wrksrc*::
- A directory relative to `${wrksrc}` that will be used when building the package.
+ A directory relative to `${wrksrc}` that will be used when building the package.
*create_wrksrc*::
- Enable it to create the `${wrksrc}` directory. Required if a package
- contains multiple `distfiles`.
+ Enable it to create the `${wrksrc}` directory. Required if a package
+contains multiple `distfiles`.
*only_for_archs*::
- This expects a separated list of architectures where the package can be
- built matching `uname -m` output. Example `only_for_archs="x86_64 armv6l"`
+ This expects a separated list of architectures where the package can be
+built matching `uname -m` output. Example `only_for_archs="x86_64 armv6l"`
*build_style*::
- This specifies the `build method` for a package. Read below to know more
- about the available package `build methods`. If `build_style` is not set,
- the package must define at least a `do_install()` function, and optionally
- more build phases as such `do_configure()`, `do_build()`, etc.
+ This specifies the `build method` for a package. Read below to know more
+about the available package `build methods`. If `build_style` is not set,
+the package must define at least a `do_install()` function, and optionally
+ more build phases as such `do_configure()`, `do_build()`, etc.
*create_srcdir*::
- This creates a directory in `${XBPS_SRCDISTDIR}` as such `${pkgname}-${version}`
- to store the package sources at the `extract` phase. Required in packages that
- use unversioned ${distfiles}`.
+ This creates a directory in `${XBPS_SRCDISTDIR}` as such `${pkgname}-${version}`
+to store the package sources at the `extract` phase. Required in packages that
+use unversioned ${distfiles}`.
*configure_script*::
- The name of the `configure` script to execute at the `configure` phase if
- `${build_style}` is set to `configure` or `gnu-configure` build methods.
- By default set to `./configure`.
+ The name of the `configure` script to execute at the `configure` phase if
+`${build_style}` is set to `configure` or `gnu-configure` build methods.
+By default set to `./configure`.
*configure_args*::
- The arguments to be passed in to the `configure` script if `${build_style}`
- is set to `configure` or `gnu-configure` build methods. By default, prefix
- must be set to `/usr`. In `gnu-configure` packages, some options are already
- set by default: `--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var`.
+ The arguments to be passed in to the `configure` script if `${build_style}`
+is set to `configure` or `gnu-configure` build methods. By default, prefix
+must be set to `/usr`. In `gnu-configure` packages, some options are already
+set by default: `--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var`.
*make_cmd*::
- The executable to run at the `build` phase if `${build_style}` is set to
- `configure`, `gnu-configure` or `gnu-makefile` build methods.
- By default set to `make`.
+ The executable to run at the `build` phase if `${build_style}` is set to
+`configure`, `gnu-configure` or `gnu-makefile` build methods.
+By default set to `make`.
*make_build_args*::
- The arguments to be passed in to `${make_cmd}` at the build phase if
- `${build_style}` is set to `configure`, `gnu-configure` or `gnu_makefile`
- build methods. Unset by default.
+ The arguments to be passed in to `${make_cmd}` at the build phase if
+`${build_style}` is set to `configure`, `gnu-configure` or `gnu_makefile`
+build methods. Unset by default.
*make_install_args*::
- The arguments to be passed in to `${make_cmd}` at the `install-destdir`
- phase if `${build_style}` is set to `configure`, `gnu-configure` or
- `gnu_makefile` build methods. Unset by default.
+ The arguments to be passed in to `${make_cmd}` at the `install-destdir`
+phase if `${build_style}` is set to `configure`, `gnu-configure` or
+`gnu_makefile` build methods. By default set to
+`PREFIX=/usr DESTDIR=${DESTDIR}`.
*make_build_target*::
- The target to be passed in to `${make_cmd}` at the build phase if
- `${build_style}` is set to `configure`, `gnu-configure` or `gnu_makefile`
- build methods. Unset by default (`all` target).
+ The target to be passed in to `${make_cmd}` at the build phase if
+`${build_style}` is set to `configure`, `gnu-configure` or `gnu_makefile`
+build methods. Unset by default (`all` target).
*make_install_target*::
- The target to be passed in to `${make_cmd}` at the `install-destdir` phase
- if `${build_style}` is set to `configure`, `gnu-configure` or `gnu_makefile`
- build methods. By default set to `DESTDIR=${DESTDIR} install`.
+ The target to be passed in to `${make_cmd}` at the `install-destdir` phase
+if `${build_style}` is set to `configure`, `gnu-configure` or `gnu_makefile`
+build methods. By default set to `install`.
*patch_args*::
- The arguments to be passed in to the `patch(1)` command when applying
- patches to the package sources after `do_extract()`. Patches are stored in
- `srcpkgs/<pkgname>/patches` and must be in `-p0` format. By default set to `-Np0`.
+ The arguments to be passed in to the `patch(1)` command when applying
+patches to the package sources after `do_extract()`. Patches are stored in
+`srcpkgs/<pkgname>/patches` and must be in `-p0` format. By default set to `-Np0`.
*disable_parallel_build*::
- If set the package won't be built in parallel and `XBPS_MAKEJOBS` has no effect.
+ If set the package won't be built in parallel and `XBPS_MAKEJOBS` has no effect.
*keep_libtool_archives*::
- If enabled the `GNU Libtool` archives won't be removed. By default those
- files are always removed automatically.
+ If enabled the `GNU Libtool` archives won't be removed. By default those
+files are always removed automatically.
*skip_extraction*::
- A list of filenames that should not be extracted in the `extract` phase.
- This must match the basename of any url defined in `${distfiles}`.
- Example `skip_extraction="foo-${version}.tar.gz"`.
+ A list of filenames that should not be extracted in the `extract` phase.
+This must match the basename of any url defined in `${distfiles}`.
+Example `skip_extraction="foo-${version}.tar.gz"`.
*force_debug_pkgs*::
- If enabled binary packages with debugging symbols will be generated
- even if `XBPS_DEBUG_PKGS` is disabled in `xbps-src.conf` or in the
- `command line arguments`.
+ If enabled binary packages with debugging symbols will be generated
+even if `XBPS_DEBUG_PKGS` is disabled in `xbps-src.conf` or in the
+`command line arguments`.
+
+*conf_files*::
+A list of configuration files the binary package owns; this expects full
+paths, and multiple entries can be separated by blanks, i.e:
+`conf_files="/etc/foo.conf /etc/foo2.conf"`.
+
+*noarch*::
+ If set, the binary package is not architecture specific and can be shared
+by all supported architectures.
+
+*nonfree*::
+ If set, the binary package will be put into the *non free* repository.
+
+*nostrip*::
+ If set, the ELF binaries with debugging symbols won't be stripped. By
+default all binaries are stripped.
build style scripts
~~~~~~~~~~~~~~~~~~~
@@ -336,42 +354,48 @@ to execute a `build_style` script must be defined via `hostmakedepends`.
The current list of available `build_style` scripts is the following:
*cmake*::
- For packages that use the CMake build system, configuration arguments
- can be passed in via `configure_args`.
+ For packages that use the CMake build system, configuration arguments
+can be passed in via `configure_args`.
*configure*::
- For packages that use non-GNU configure scripts, at least `--prefix=/usr`
- should be passed in via `configure_args`.
+ For packages that use non-GNU configure scripts, at least `--prefix=/usr`
+should be passed in via `configure_args`.
*gnu-configure*::
- For packages that use GNU configure scripts, additional configuration
- arguments can be passed in via `configure_args`.
+ For packages that use GNU configure scripts, additional configuration
+arguments can be passed in via `configure_args`.
*gnu-makefile*::
- For packages that use GNU make, build arguments can be passed in via
- `make_build_args` and install arguments via `make_install_args`. The build
- target can be overriden via `make_build_target` and the install target
+ For packages that use GNU make, build arguments can be passed in via
+`make_build_args` and install arguments via `make_install_args`. The build
+target can be overriden via `make_build_target` and the install target
+via `make_install_target`.
*meta*::
- For `meta-packages`, i.e packages that only install local files or simply
- depend on additional packages.
+ For `meta-packages`, i.e packages that only install local files or simply
+depend on additional packages. This build style does not install
+dependencies to the root directory, and only checks if a binary package is
+available in repositories.
*perl-ModuleBuild*::
- For packages that use the Perl
- http://search.cpan.org/~leont/Module-Build-0.4202/lib/Module/Build.pm[Module::Build] method.
+ For packages that use the Perl
+http://search.cpan.org/~leont/Module-Build-0.4202/lib/Module/Build.pm[Module::Build] method.
*perl*::
- For packages that use the Perl
- http://perldoc.perl.org/ExtUtils/MakeMaker.html[ExtUtils::MakeMaker] build method.
+ For packages that use the Perl
+http://perldoc.perl.org/ExtUtils/MakeMaker.html[ExtUtils::MakeMaker] build method.
*python-module*::
- For packages that use the Python module build method (setup.py).
+ For packages that use the Python module build method (setup.py).
*waf3*::
- For packages that use the Python3 `waf` build method with python3.
+ For packages that use the Python3 `waf` build method with python3.
*waf*::
- For packages that use the Python `waf` method with python2.
+ For packages that use the Python `waf` method with python2.
+
+NOTE: if `build_style` is not set, the template must (at least) define a
+`do_install()` function and optionally more phases via `do_xxx()` functions.
Functions
~~~~~~~~~
@@ -379,80 +403,47 @@ The following functions can be defined to change the behavior of how the
package is downloaded, compiled and installed.
*do_fetch()*::
- if defined and `distfiles` is not set, use it to fetch the required sources.
+ if defined and `distfiles` is not set, use it to fetch the required sources.
*do_extract()*::
- if defined and `distfiles` is not set, use it to extract the required sources.
+ if defined and `distfiles` is not set, use it to extract the required sources.
*post_extract()*::
- Actions to execute after `do_extract()`.
+ Actions to execute after `do_extract()`.
*pre_configure()*::
- Actions to execute after `post_extract()`.
+ Actions to execute after `post_extract()`.
*do_configure()*::
- Actions to execute to configure the package; `${configure_args}` should
- still be passed in if it's a GNU configure script.
+ Actions to execute to configure the package; `${configure_args}` should
+still be passed in if it's a GNU configure script.
*post_configure()*::
- Actions to execute after `do_configure()`.
+ Actions to execute after `do_configure()`.
*pre_build()*::
- Actions to execute after `post_configure()`.
+ Actions to execute after `post_configure()`.
*do_build()*::
- Actions to execute to build the package.
+ Actions to execute to build the package.
*post_build()*::
- Actions to execute after `do_build()`.
+ Actions to execute after `do_build()`.
*pre_install()*::
- Actions to execute after `post_build()`.
+ Actions to execute after `post_build()`.
*do_install()*::
- Actions to execute to install the packages files into the `fake destdir`.
+ Actions to execute to install the packages files into the `fake destdir`.
*post_install()*::
- Actions to execute after `do_install()`.
+ Actions to execute after `do_install()`.
NOTE: A function defined in a template has preference over the same function
defined by a `build_style` script.
-Run-time dependencies
-~~~~~~~~~~~~~~~~~~~~~
-
-Dependencies for ELF executables or shared libraries are detected
-automatically by `xbps-src`, hence run-time dependencies must not be specified
-in the *package sections* with the following exceptions:
-
-- ELF binaries using dlopen(3).
-- non ELF objects, i.e perl/python/ruby/etc modules.
-- Overriding the minimal version specified in the `shlibs` file.
-
-The run-time dependencies for ELF binaries are detected by checking which SONAMEs
-use and then the SONAMEs are mapped to a binary package name with a minimal
-required version. The `shlibs` file in the `xbps-packages/common` directory
-sets up the `SONAME pkgname>=version` mappings.
-
-For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
-software requiring this library will link to `libfoo`; the resulting binary
-package will have a run-time dependency to `foo>=1.0_1` package as specified in
-`common/shlibs`:
-
------------------------
-# common/shlibs
-...
-libfoo.so.1 foo-1.0_1
-...
------------------------
-
-- The first field specifies the SONAME.
-- The second field specified the package name and minimal version required.
-- A third optional field specifies the architecture (rarely used).
-
Build options
-~~~~~~~~~~~~~
-
+-------------
Some packages might be built with different build options to enable/disable
additional features; `xbps-src` allows you to do this with some simple tweaks
to the `template` file.
@@ -460,14 +451,14 @@ to the `template` file.
The following variables may be set to allow package build options:
*build_options*::
- Sets the build options supported by the source package.
+ Sets the build options supported by the source package.
*build_options_default*::
- Sets the default build options to be used by the source package.
+ Sets the default build options to be used by the source package.
*desc_option_<option>*::
- Sets the description for the build option `option`. This must match the
- keyword set in *build_options*.
+ Sets the description for the build option `option`. This must match the
+keyword set in *build_options*.
After defining those required variables, you can check for the
`build_option_<option>` variable to know if it has been set and adapt the source
@@ -533,9 +524,39 @@ The build options can also be shown for binary packages via `xbps-query(8)`:
$ xbps-query -R --property=build-options foo
--------------------------------------------
-Contributing via git
-~~~~~~~~~~~~~~~~~~~~
+Run-time dependencies
+---------------------
+Dependencies for ELF executables or shared libraries are detected
+automatically by `xbps-src`, hence run-time dependencies must not be specified
+in the *package sections* with the following exceptions:
+- ELF binaries using dlopen(3).
+- non ELF objects, i.e perl/python/ruby/etc modules.
+- Overriding the minimal version specified in the `shlibs` file.
+
+The run-time dependencies for ELF binaries are detected by checking which SONAMEs
+use and then the SONAMEs are mapped to a binary package name with a minimal
+required version. The `shlibs` file in the `xbps-packages/common` directory
+sets up the `SONAME pkgname>=version` mappings.
+
+For example the `foo-1.0_1` package provides the `libfoo.so.1` SONAME and
+software requiring this library will link to `libfoo`; the resulting binary
+package will have a run-time dependency to `foo>=1.0_1` package as specified in
+`common/shlibs`:
+
+-----------------------
+# common/shlibs
+...
+libfoo.so.1 foo-1.0_1
+...
+-----------------------
+
+- The first field specifies the SONAME.
+- The second field specified the package name and minimal version required.
+- A third optional field specifies the architecture (rarely used).
+
+Contributing via git
+--------------------
You can fork the `xbps-packages` git repository on github and then set up
a remote to pull in new changes:
@@ -556,8 +577,12 @@ for more information.
For commit messages please use the following rules:
-- If you've imported a new package use `New package: <pkgver>`.
-- If you've updated a package use `<pkgname>: updated to <version>`.
-- If you've removed a package use `<pkgname>: removed ...`.
-
+- If you've imported a new package use `"New package: <pkgver>"`.
+- If you've updated a package use `"<pkgname>: updated to <version>"`.
+- If you've removed a package use `"<pkgname>: removed ..."`.
+- If you've modified a package use `"<pkgname>: ..."`.
+Help
+----
+If after reading this `manual` you still need some kind of help, please join
+us at `#xbps` via IRC at `irc.freenode.net`.
diff --git a/srcpkgs/2bwm-git/template b/srcpkgs/2bwm-git/template
index 86f14cf756..1e72f83cab 100644
--- a/srcpkgs/2bwm-git/template
+++ b/srcpkgs/2bwm-git/template
@@ -29,9 +29,3 @@ do_install() {
install -Dm644 hidden.man ${DESTDIR}/usr/share/man/man1/hidden.1
vinstall README.md 644 usr/share/doc/${pkgname}
}
-
-2bwm-git_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index ab8677b6a9..3cfd90c694 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
# Template file for 'GConf'
pkgname=GConf
version=3.2.6
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--without-openldap --enable-gtk --enable-defaults-service
--disable-orbit --enable-gsettings-backend --disable-static"
+conf_files="/etc/gconf/2/path"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
short_desc="A process-transparent configuration system"
@@ -26,11 +27,12 @@ post_install() {
}
GConf-devel_package() {
- depends="glib-devel dbus-devel GConf>=${version}"
+ depends="glib-devel dbus-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
vmove usr/share/gir-1.0
vmove usr/share/sgml
vmove usr/share/aclocal
@@ -39,11 +41,3 @@ GConf-devel_package() {
vinstall ${FILESDIR}/gconf-merge-schema.sh 755 usr/bin gconf-merge-schema
}
}
-
-GConf_package() {
- conf_files="/etc/gconf/2/path"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 67b7e75dad..f1e5993e58 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -65,9 +65,3 @@ Ice-devel_package() {
vmove usr/include
}
}
-
-Ice_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template
index 31ca4ee994..8f6810641f 100644
--- a/srcpkgs/LuaJIT/template
+++ b/srcpkgs/LuaJIT/template
@@ -32,9 +32,3 @@ LuaJIT-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-LuaJIT_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 12460bb3f9..02f20544a7 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,6 +1,6 @@
# Template build file for 'MesaLib'.
pkgname=MesaLib
-version=10.0.1
+version=10.0.2
revision=1
wrksrc="Mesa-${version}"
build_style=gnu-configure
@@ -16,12 +16,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.mesa3d.org/"
license="MIT, LGPL-2.1"
distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.tar.bz2"
-checksum=3cdf868f9599ca310c17fcf5b4ce9aec9903d8bf8561fde2577f3d422f823270
+checksum=4502a8e2dfa53e15d8fff89c153e6b14824fe82e49bd101e7edc02fa8cf76a7e
hostmakedepends="automake libtool flex pkg-config llvm>=3.3"
makedepends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
libudev-devel>=183 libdrm-devel expat-devel talloc-devel libxml2-python
libvdpau-devel libXvMC-devel>=1.0.6 wayland-devel elfutils-devel"
+conf_files="/etc/drirc"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
@@ -175,10 +176,3 @@ mesa-vmwgfx-dri_package() {
vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
}
}
-
-MesaLib_package() {
- conf_files="/etc/drirc"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index df357d7082..7141f18fb3 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--disable-static --sbindir=/usr/bin --with-udev-base-dir=/usr/lib/udev --with-polkit=permissive"
hostmakedepends="pkg-config intltool"
makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel libmbim-devel systemd-devel ppp"
+depends="hicolor-icon-theme ppp"
+systemd_services="${pkgname}.service on"
short_desc="Mobile broadband modem management service"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -29,11 +31,3 @@ libmm-glib_package() {
vmove "usr/lib/libmm-glib.so.*"
}
}
-
-ModemManager_package() {
- depends="hicolor-icon-theme ppp"
- systemd_services="${pkgname}.service on"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/MoinMoin/template b/srcpkgs/MoinMoin/template
index b73468543e..33e3f406f0 100644
--- a/srcpkgs/MoinMoin/template
+++ b/srcpkgs/MoinMoin/template
@@ -3,8 +3,11 @@ pkgname=MoinMoin
version=1.9.4
revision=1
wrksrc=moin-${version}
+noarch="yes"
build_style=python-module
makedepends="python"
+depends="python"
+pycompile_module="MoinMoin jabberbot"
short_desc="MoinMoin, a Python clone of WikiWiki"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://moinmo.in"
@@ -16,12 +19,3 @@ long_desc="
emphasis on easy access to and modification of information. MoinMoin
is a Python WikiClone that allows you to easily set up your own wiki,
only requiring a Python installation."
-
-MoinMoin_package() {
- noarch="yes"
- pycompile_module="MoinMoin jabberbot"
- depends="python"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/NetworkManager/files/tmpfilesd b/srcpkgs/NetworkManager/files/tmpfilesd
new file mode 100644
index 0000000000..18bf5900da
--- /dev/null
+++ b/srcpkgs/NetworkManager/files/tmpfilesd
@@ -0,0 +1,3 @@
+d /etc/NetworkManager/dispatcher.d 0755 root root -
+d /etc/NetworkManager/system-connections 0755 root root -
+d /var/lib/NetworkManager 0700 root root -
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 602a964f7f..0b8bea0fca 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,7 +1,7 @@
# Template file for 'NetworkManager'
pkgname=NetworkManager
version=0.9.8.8
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
--with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
@@ -19,20 +19,41 @@ license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
checksum=8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool"
makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel systemd-devel
ModemManager-devel dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant bluez>5
mobile-broadband-provider-info"
+depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
+conf_files="/etc/${pkgname}/${pkgname}.conf"
+systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
+
pre_configure() {
# Full switch to /run to not depend on /var/run being a symlink.
sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure
}
post_install() {
- # Install config file.
vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
+ vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf
+ # remove unused stuff
rm -rf ${DESTDIR}/etc/init.d
}
@@ -41,7 +62,9 @@ libnm_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
- vmove "usr/lib/girepository-*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ fi
}
}
@@ -52,20 +75,9 @@ NetworkManager-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
vmove usr/share/gtk-doc
}
}
-
-NetworkManager_package() {
- make_dirs="
- /etc/${pkgname}/dispatcher.d 0755 root root
- /etc/${pkgname}/system-connections 0755 root root
- /var/lib/${pkgname} 0700 root root"
- depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
- conf_files="/etc/${pkgname}/${pkgname}.conf"
- systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ORBit2/template b/srcpkgs/ORBit2/template
index 13883fbf1a..61f390bcf1 100644
--- a/srcpkgs/ORBit2/template
+++ b/srcpkgs/ORBit2/template
@@ -42,9 +42,3 @@ ORBit2-devel_package() {
vmove usr/share/aclocal
}
}
-
-ORBit2_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/Pyrex/template b/srcpkgs/Pyrex/template
index 96ef9778a9..59cc44d577 100644
--- a/srcpkgs/Pyrex/template
+++ b/srcpkgs/Pyrex/template
@@ -4,6 +4,8 @@ version=0.9.9
revision=2
build_style=python-module
makedepends="python"
+noarch="yes"
+pycompile_module="Pyrex"
short_desc="Language for writing Python extension modules"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex"
@@ -13,11 +15,3 @@ checksum=5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50
long_desc="
Pyrex lets you write code that mixes Python and C data types any way you
want, and compiles it into a C extension for Python."
-
-Pyrex_package() {
- noarch="yes"
- pycompile_module="Pyrex"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template
index e3e1de8cd0..77defac96a 100644
--- a/srcpkgs/SDL/template
+++ b/srcpkgs/SDL/template
@@ -67,6 +67,11 @@ else
configure_args+=" --disable-pulseaudio"
fi
+if [ "$build_option_opengl" ]; then
+ # libGL.so.1 is dynamically loaded with dlopen.
+ depends="libGL"
+fi
+
SDL-devel_package() {
short_desc="${short_desc} -- development files"
depends="alsa-lib-devel SDL>=${version}"
@@ -88,13 +93,3 @@ SDL-devel_package() {
vmove usr/share
}
}
-
-SDL_package() {
- if [ "$build_option_opengl" ]; then
- # libGL.so.1 is dynamically loaded with dlopen.
- depends="libGL"
- fi
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 6318c48f95..dfe3e60924 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -65,6 +65,15 @@ else
configure_args+=" --disable-pulseaudio"
fi
+if [ "$build_option_opengl" ]; then
+ # libGL.so.1 is dynamically loaded with dlopen.
+ depends+=" libGL"
+fi
+if [ "$build_option_gles" ]; then
+ # libGLESv2.so.1 is dynamically loaded with dlopen.
+ depends+=" libGLES"
+fi
+
SDL2-devel_package() {
short_desc+=" - development files"
depends="alsa-lib-devel ${sourcepkg}>=${version}_${revision}"
@@ -90,17 +99,3 @@ SDL2-devel_package() {
vmove usr/share
}
}
-
-SDL2_package() {
- if [ "$build_option_opengl" ]; then
- # libGL.so.1 is dynamically loaded with dlopen.
- depends+=" libGL"
- fi
- if [ "$build_option_gles" ]; then
- # libGLESv2.so.1 is dynamically loaded with dlopen.
- depends+=" libGLES"
- fi
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template
index ec4dbf5011..a2996bfcc0 100644
--- a/srcpkgs/SDL_image/template
+++ b/srcpkgs/SDL_image/template
@@ -5,6 +5,8 @@ revision=9
build_style=gnu-configure
configure_args="--disable-static"
makedepends="libpng-devel>=1.6 tiff-devel SDL-devel libwebp-devel>=0.2.0"
+# The following are dlopen(3)ed at runtime.
+depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.2.0"
short_desc="Load images as SDL surfaces"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -24,11 +26,3 @@ SDL_image-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-SDL_image_package() {
- # The following are dlopen(3)ed at runtime.
- depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.2.0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template
index 3bc14bb9df..0e8cab1132 100644
--- a/srcpkgs/SDL_mixer/template
+++ b/srcpkgs/SDL_mixer/template
@@ -1,11 +1,12 @@
# Template file for 'SDL_mixer'
pkgname=SDL_mixer
version=1.2.12
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static"
-makedepends="SDL-devel libvorbis-devel libmikmod-devel>=3.2.0
- libflac-devel smpeg-devel fluidsynth-devel"
+makedepends="SDL-devel libvorbis-devel libmikmod-devel>=3.2.0 libflac-devel smpeg-devel fluidsynth-devel"
+# The following deps are dlopen(3)ed at runtime.
+depends="libvorbis libmikmod smpeg libflac"
short_desc="Multi-channel audio mixer library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -30,18 +31,11 @@ post_install() {
}
SDL_mixer-devel_package() {
- depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} (development files)"
+ depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-SDL_mixer_package() {
- # The following deps are dlopen(3)ed at runtime.
- depends="libvorbis libmikmod smpeg libflac"
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template
index 9cc34e67e2..afb4c8435b 100644
--- a/srcpkgs/SDL_net/template
+++ b/srcpkgs/SDL_net/template
@@ -1,7 +1,7 @@
# Template file for 'SDL_net'
pkgname=SDL_net
version=1.2.8
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
makedepends="SDL-devel"
@@ -11,25 +11,17 @@ license="BSD"
homepage="http://www.libsdl.org/projects/SDL_net/"
distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz"
checksum=5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4
-long_desc="
- This is a small sample cross-platform networking library which is
- supplementary to the SDL (Simple DirectMedia Layer) library."
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
SDL_net-devel_package() {
- depends="SDL-devel SDL_net>=${version}"
- short_desc+=" -- development files"
+ depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-SDL_net_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/SDL_sound/template b/srcpkgs/SDL_sound/template
index a2091d7475..9c8c8e28a9 100644
--- a/srcpkgs/SDL_sound/template
+++ b/srcpkgs/SDL_sound/template
@@ -1,7 +1,7 @@
# Template file for 'SDL_sound'
pkgname=SDL_sound
version=1.0.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
@@ -13,27 +13,12 @@ homepage="http://icculus.org/SDL_sound/"
license="LGPL-2.1"
distfiles="http://icculus.org/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
checksum="3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df"
-long_desc="
- SDL_sound is a library that handles the decoding of several popular sound
- file formats, such as .WAV and .MP3. It is meant to make the programmer's
- sound playback tasks simpler. The programmer gives SDL_sound a filename, or
- feeds it data directly from one of many sources, and then reads the decoded
- waveform data back at her leisure. If resource constraints are a concern,
- SDL_sound can process sound data in programmer-specified blocks. Alternately,
- SDL_sound can decode a whole sound file and hand back a single pointer to the
- whole waveform. SDL_sound can also handle sample rate, audio format, and
- channel conversion on-the-fly and behind-the-scenes, if the programmer desires."
SDL_sound-devel_package() {
- depends="SDL_sound>=${version}"
- short_desc="${short_desc} -- development files"
+ depends="SDL-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
- }
-}
-
-SDL_sound_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index d53cb8e43c..991e798a08 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -1,7 +1,7 @@
# Template file for 'SDL_ttf'
pkgname=SDL_ttf
version=2.0.11
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
@@ -12,25 +12,13 @@ license="LGPL-2.1"
homepage="http://www.libsdl.org/projects/${pkgname}"
distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
-long_desc="
- SDL_ttf is a TrueType font rendering library that is used with the SDL
- library, and almost as portable. It depends on freetype2 to handle the
- TrueType font data. It allows a programmer to use multiple TrueType fonts
- without having to code a font rendering routine themselves. With the power
- of outline fonts and antialiasing, high quality text output can be obtained
- without much effort."
SDL_ttf-devel_package() {
- depends="freetype-devel SDL-devel ${sourcepkg}>=${version}"
- short_desc+=" -- development files"
+ depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-SDL_ttf_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 10800e7d83..28e67db7ed 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -18,6 +18,7 @@ makedepends="pcre-devel>=8.30 libglib-devel>=2.32.3_2
gtk+-devel dbus-glib-devel libexif-devel exo-devel>=0.10.2 xfce4-panel-devel
startup-notification-devel systemd-devel gvfs-devel hicolor-icon-theme
desktop-file-utils"
+depends="gvfs hicolor-icon-theme desktop-file-utils"
Thunar-devel_package() {
depends="libglib-devel gtk+-devel Thunar>=${version}"
@@ -28,10 +29,3 @@ Thunar-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-Thunar_package() {
- depends="gvfs hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/Twisted/template b/srcpkgs/Twisted/template
index 2fc134e985..5ec795792c 100644
--- a/srcpkgs/Twisted/template
+++ b/srcpkgs/Twisted/template
@@ -4,6 +4,8 @@ version=13.2.0
revision=1
build_style=python-module
makedepends="python-devel zope.interface>=4.0.1 pycrypto pyopenssl"
+depends="zope.interface>=4.0.1 pycrypto pyopenssl"
+pycompile_module="twisted"
short_desc="Event-driven networking engine written in Python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://twistedmatrix.com/"
@@ -14,11 +16,3 @@ checksum=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3
if [ "$CROSS_BUILD" ]; then
hostmakedepends="${makedepends}"
fi
-
-Twisted_package() {
- depends="zope.interface>=4.0.1 pycrypto pyopenssl"
- pycompile_module="twisted"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index a150b7467d..b8307c34f7 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,36 +1,29 @@
# Template file for 'VirtualGL'
pkgname=VirtualGL
version=2.3.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DTJPEG_INCLUDE_DIR=/usr/include
-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DVGL_LIBDIR=/usr/lib
-DVGL_BINDIR=/usr/bin -DVGL_DOCDIR=/usr/share/doc/${pkgname}"
-makedepends="cmake libXv-devel glu-devel libjpeg-turbo-devel>=1.3.0_4"
+hostmakedepends="cmake"
+makedepends="libXv-devel glu-devel libjpeg-turbo-devel>=1.3.0_4"
short_desc="Run remote OpenGL applications with full acceleration"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.virtualgl.org/"
license="LGPL-2.1"
distfiles="${SOURCEFORGE_SITE}/virtualgl/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
checksum=bee2abb3225bd1a607036a50e60e2652248d976afdbfcb096423648f1acc5418
-long_desc="
- Redirects the 3D rendering commands from Unix and Linux OpenGL applications to
- 3D accelerator hardware in a dedicated server and displays the rendered output
- interactively to a thin client located elsewhere on the network."
post_install() {
- cd ${DESTDIR}/usr/bin && mv glxinfo vglxinfo
+ cd ${DESTDIR}/usr/bin
+ mv glxinfo vglxinfo
}
VirtualGL-devel_package() {
depends="VirtualGL>=${version}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
}
}
-
-VirtualGL_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/WindowMaker/template b/srcpkgs/WindowMaker/template
index 34d896eb0f..98ac8fa4b9 100644
--- a/srcpkgs/WindowMaker/template
+++ b/srcpkgs/WindowMaker/template
@@ -1,20 +1,35 @@
# Template file for 'WindowMaker'
pkgname=WindowMaker
-version=0.95.4
-revision=3
+version=0.95.5
+revision=1
build_style=gnu-configure
configure_args="--enable-xinerama --with-nlsdir=/usr/share/locale
- --with-gnustepdir=/usr/lib/GNUstep --enable-usermenu --enable-modelock
- --enable-xrandr --disable-static"
-makedepends="pkg-config libXinerama-devel libXrandr-devel
- libXmu-devel libpng-devel>=1.6 libXpm-devel libXft-devel tiff-devel
- giflib-devel fontconfig-devel"
+ --enable-usermenu --enable-modelock --enable-xrandr --disable-static"
+hostmakedepends="automake libtool pkg-config"
+makedepends="libXinerama-devel libXrandr-devel libXmu-devel libXpm-devel
+ libXpm-devel libXft-devel libpng-devel>=1.6 tiff-devel giflib-devel
+ fontconfig-devel"
+conf_files="
+ /etc/WindowMaker/WindowMaker
+ /etc/WindowMaker/WMRootMenu
+ /etc/WindowMaker/WMWindowAttributes
+ /etc/WindowMaker/WMState
+ /etc/WindowMaker/WMGLOBA"
short_desc="An X11 window manager with a NEXTSTEP look and feel"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.windowmaker.org/"
distfiles="http://windowmaker.org/pub/source/release/${pkgname}-${version}.tar.gz"
-checksum=2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45
+checksum=4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_configure() {
+ # Remove hardcoded /usr/{include,lib} paths!
+ find ${wrksrc} -name Makefile -exec sed 's,-L${libdir},,g;s,-I${includedir},,g' -i {} \;
+}
post_install() {
vinstall COPYING.WTFPL 644 usr/share/licenses/${pkgname}
@@ -22,23 +37,11 @@ post_install() {
}
WindowMaker-devel_package() {
- depends="${sourcepkg}>=${version}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}
-
-WindowMaker_package() {
- conf_files="
- /etc/WindowMaker
- /etc/WindowMaker/WindowMaker
- /etc/WindowMaker/WMRootMenu
- /etc/WindowMaker/WMWindowAttributes
- /etc/WindowMaker/WMState
- /etc/WindowMaker/WMGLOBA"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/a10disp/template b/srcpkgs/a10disp/template
new file mode 100644
index 0000000000..b7b5349b5d
--- /dev/null
+++ b/srcpkgs/a10disp/template
@@ -0,0 +1,26 @@
+# Template file for 'a10disp'
+pkgname=a10disp
+version=20140127
+revision=1
+short_desc="Utility to change the display mode of Allwinner A10/13/20 devices"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="MIT"
+homepage="https://github.com/hglm/a10disp"
+
+only_for_archs="armv7l"
+makedepends="fbset cubieboard2-kernel-headers"
+depends="fbset"
+
+do_fetch() {
+ git clone git://github.com/hglm/a10disp ${pkgname}-${version}
+}
+
+do_build() {
+ cp ${XBPS_CROSS_BASE}/usr/src/cubieboard2-kernel*/include/video/sunxi_disp_ioctl.h .
+ $CC -Wall a10disp.c -o a10disp
+}
+
+do_install() {
+ vinstall a10disp 755 usr/bin
+ vinstall README 644 usr/share/doc/a10disp
+}
diff --git a/srcpkgs/a2jmidid/template b/srcpkgs/a2jmidid/template
index 73528ee1c5..989901e981 100644
--- a/srcpkgs/a2jmidid/template
+++ b/srcpkgs/a2jmidid/template
@@ -13,9 +13,3 @@ checksum=2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f
long_desc="
a2jmidid is daemon for exposing legacy ALSA sequencer applications in JACK
MIDI system."
-
-a2jmidid_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/aalib/template b/srcpkgs/aalib/template
index 1b87ce77cd..5ee713dfaf 100644
--- a/srcpkgs/aalib/template
+++ b/srcpkgs/aalib/template
@@ -30,9 +30,3 @@ aalib-devel_package() {
vmove usr/share/man/man3
}
}
-
-aalib_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template
index c78be27c24..ee65e236f9 100644
--- a/srcpkgs/abGate/template
+++ b/srcpkgs/abGate/template
@@ -5,16 +5,10 @@ build_style=gnu-makefile
revision=2
hostmakedepends="pkg-config"
makedepends="qt-devel gtkmm2-devel lv2"
+depends="lv2"
short_desc="LV2 Noise Gate plugin"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3"
homepage="http://abgate.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/abgate/${pkgname}-${version}.tar.gz"
checksum=df1e0457757ba3c01ba55eba975fd04f8b96c10157ae1955738c0a77106dafa4
-
-abGate_package() {
- depends="lv2"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/abcde/template b/srcpkgs/abcde/template
new file mode 100644
index 0000000000..db8c370854
--- /dev/null
+++ b/srcpkgs/abcde/template
@@ -0,0 +1,15 @@
+# Template file for 'abcde'
+pkgname=abcde
+version=2.5.4
+revision=2
+noarch="yes"
+conf_files="/etc/${pkgname}.conf"
+makedepends="cd-discid vorbis-tools perl"
+depends="${makedepends}"
+build_style="gnu-makefile"
+maintainer="Philipp Hirsch <itself@hanspolo.net>"
+short_desc="A Better CD Encoder"
+license="GPL-2"
+homepage="http://code.google.com/p/abcde/"
+distfiles="http://abcde.googlecode.com/files/${pkgname}-${version}.tar.gz"
+checksum=85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591
diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index d7988bd1c6..1ee5cb32c3 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -9,6 +9,8 @@ makedepends="libjpeg-turbo-devel libpng-devel>=1.6
fribidi-devel libgsf-devel enchant-devel gtk+3-devel librsvg-devel
wv-devel>=1.2.9 boost-devel libxslt-devel libwmf-devel libchamplain-devel
redland-devel libical-devel"
+replaces="abiword-plugins>=0"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Free word processing program similar to Microsoft(R) Word"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3"
@@ -32,11 +34,3 @@ abiword-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-abiword_package() {
- replaces="abiword-plugins>=0"
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/abook/template b/srcpkgs/abook/template
index 1a5f268017..93517496cd 100644
--- a/srcpkgs/abook/template
+++ b/srcpkgs/abook/template
@@ -2,18 +2,11 @@
pkgname=abook
version=0.5.6
revision=1
+build_style=gnu-configure
+makedepends="ncurses-devel readline-devel"
maintainer="Philipp Hirsch <itself@hanspolo.net>"
license="GPL-2"
homepage="http://abook.sourceforge.net/"
+short_desc="text-based addressbook designed to use with mutt mail client"
distfiles="http://prdownloads.sourceforge.net/abook/${pkgname}-${version}.tar.gz"
checksum=0646f6311a94ad3341812a4de12a5a940a7a44d5cb6e9da5b0930aae9f44756e
-short_desc="text-based addressbook designed to use with mutt mail client"
-makedepends="ncurses-devel readline-devel"
-build_style=gnu-configure
-
-
-abook_package() {
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index 6095c144a1..d69df02950 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -7,6 +7,9 @@ configure_args="--disable-static
--with-systemdsystemunitdir=/usr/lib/systemd/system"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="polkit-devel systemd-devel"
+make_dirs="
+ /var/lib/AccountsService/users 755 root root
+ /var/lib/AccountsService/icons 755 root root"
short_desc="D-Bus interfaces for querying and manipulating user account information"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://cgit.freedesktop.org/accountsservice/"
@@ -29,12 +32,3 @@ accountsservice-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-accountsservice_package() {
- make_dirs="
- /var/lib/AccountsService/users 755 root root
- /var/lib/AccountsService/icons 755 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/acct/template b/srcpkgs/acct/template
index 08d7742ee3..df63c29449 100644
--- a/srcpkgs/acct/template
+++ b/srcpkgs/acct/template
@@ -18,9 +18,3 @@ post_install() {
rm ${DESTDIR}/usr/bin/last
rm ${DESTDIR}/usr/share/man/man1/last.1
}
-
-acct_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index 427951e543..e167a89251 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -2,6 +2,7 @@
pkgname=acl
version=2.2.52
revision=2
+bootstrap=yes
build_style=gnu-configure
configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
makedepends="attr-devel"
@@ -12,8 +13,6 @@ license="LGPL-2.1"
distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz"
checksum=179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23
-bootstrap=yes
-
if [ -z "$CHROOT_READY" ]; then
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
@@ -42,9 +41,3 @@ acl-progs_package() {
vmove usr/share
}
}
-
-acl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/acpi/template b/srcpkgs/acpi/template
index 74d0f9b902..36efb5e56a 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 <linuxienATlegtuxDOTorg>"
@@ -9,13 +9,3 @@ license="GPL-2"
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
- }
-}
diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index 2e6a4886e8..0c45772476 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,32 +1,16 @@
# Template file for 'acpica-utils'
pkgname=acpica-utils
-version=20130725
+version=20140114
wrksrc=acpica-unix-${version}
revision=1
+only_for_archs="i686 x86_64"
hostmakedepends="flex"
short_desc="Intel ACPI CA Unix utilities"
homepage="https://www.acpica.org/"
license="GPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=ce2651e1b3a74d5eada4baea2cec9646ff9a20204bb703ce014a3433b99f0ea2
-long_desc="
- This package contains only the user-space tools needed for ACPI table
- development, not the kernel implementation of ACPI. The following commands
- are installed:
-
- * iasl: compiles ASL (ACPI Source Language) into AML (ACPI Machine
- Language), suitable for inclusion as a DSDT in system firmware.
- It also can disassemble AML, for debugging purposes.
- * acpibin: performs basic operations on binary AML files (e.g.,
- comparison, data extraction)
- * acpiexec: simulate AML execution in order to debug method definitions
- * acpihelp: display help messages describing ASL keywords and op-codes
- * acpinames: display complete ACPI name space from input AML
- * acpisrc: manipulate the ACPICA source tree and format source files
- for specific environments
- * acpixtract: extract binary ACPI tables from acpidump output (see
- also the pmtools package)"
+checksum=bd6ac4d7d4ac451c4c3224bbfe77497ffd55b26217c3cd422973f190af64e77a
do_build() {
sed -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' -i generate/unix/Makefile.config
@@ -41,9 +25,3 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
}
-
-acpica-utils_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index b4329d1c52..cdf78de483 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -3,6 +3,8 @@ pkgname=acpid
version=2.0.19
revision=1
build_style=gnu-configure
+conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
+systemd_services="acpid.socket on"
short_desc="The ACPI Daemon (acpid) With Netlink Support"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -22,11 +24,3 @@ post_install() {
vinstall ${FILESDIR}/handler.sh 755 etc/acpi
vinstall ${FILESDIR}/anything 644 etc/acpi/events
}
-
-acpid_package() {
- conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
- systemd_services="acpid.socket on"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/acr/template b/srcpkgs/acr/template
index 1cf9495ca0..037ca14712 100644
--- a/srcpkgs/acr/template
+++ b/srcpkgs/acr/template
@@ -1,22 +1,17 @@
# Template file for 'acr'
pkgname=acr
-version=0.9.6
+version=0.9.8
revision=1
+noarch=yes
+create_srcdir=yes
build_style=gnu-configure
short_desc="AutoConf Replacement"
maintainer="pancake <pancake@nopcode.org>"
license="GPL-3"
homepage="http://github.com/radare/${pkgname}"
distfiles="https://github.com/radare/${pkgname}/archive/${version}.tar.gz"
-checksum=ad5ebef15c835e86f6bd6479633ec94a34d0b57dfc684c36a42cba4d655ef407
+checksum=10db4b3f8272f427a245c0bbe039c1e240dc810de9ced4aa8789f4b28f0bf4ec
long_desc="
ACR tries to replace autoconf functionality generating a full-compatible
- 'configure' script (runtime flags). But using shell-script instead of m4.
+ configure script (runtime flags). But using shell-script instead of m4.
This means that ACR is faster, smaller and easy to use."
-
-acr_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template
index 74b3bc6a3a..8ecadb152f 100644
--- a/srcpkgs/adobe-flash-plugin/template
+++ b/srcpkgs/adobe-flash-plugin/template
@@ -20,6 +20,9 @@ short_desc="Adobe Flash Player plugin for Netscape compatible browsers"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.adobe.com"
license="Adobe License (non free)"
+nonfree="yes"
+makedepends="curl hicolor-icon-theme desktop-file-utils"
+depends="${makedepends}"
create_srcdir=yes
create_wrksrc=yes
@@ -40,11 +43,3 @@ do_install() {
vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" 644 \
usr/share/licenses/${pkgname} LICENSE.pdf
}
-
-adobe-flash-plugin_package() {
- nonfree="yes"
- depends="curl hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/adobe-flash-plugin11.1/template b/srcpkgs/adobe-flash-plugin11.1/template
index 4f9deef852..e373485fc6 100644
--- a/srcpkgs/adobe-flash-plugin11.1/template
+++ b/srcpkgs/adobe-flash-plugin11.1/template
@@ -20,6 +20,11 @@ short_desc="Adobe Flash Player plugin (11.1 series)"
homepage="http://www.adobe.com"
license="Propietary license - adobe"
maintainer="Juan RP <xtraeme@gmail.com>"
+nonfree="yes"
+replaces="adobe-flash-plugin>=0"
+provides="adobe-flash-plugin-11.1.102.63"
+makedepends="curl hicolor-icon-theme desktop-file-utils"
+depends="${makedepends}"
create_srcdir=yes
create_wrksrc=yes
@@ -39,13 +44,3 @@ do_install() {
vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" 644 \
usr/share/licenses/${pkgname} LICENSE.pdf
}
-
-adobe-flash-plugin11.1_package() {
- nonfree="yes"
- replaces="adobe-flash-plugin>=0"
- provides="adobe-flash-plugin-11.1.102.63"
- depends="curl hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/agar/template b/srcpkgs/agar/template
index ecb936d011..ae3628d83a 100644
--- a/srcpkgs/agar/template
+++ b/srcpkgs/agar/template
@@ -46,9 +46,3 @@ agar-devel_package() {
vmove usr/share/man
}
}
-
-agar_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/agg/template b/srcpkgs/agg/template
index f983cb50a7..b1f4d2ef2e 100644
--- a/srcpkgs/agg/template
+++ b/srcpkgs/agg/template
@@ -32,9 +32,3 @@ agg-devel_package() {
vmove usr/share
}
}
-
-agg_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/akonadi/template b/srcpkgs/akonadi/template
index 3b236ecb2f..c6ed5ef341 100644
--- a/srcpkgs/akonadi/template
+++ b/srcpkgs/akonadi/template
@@ -1,13 +1,13 @@
# Template file for 'akonadi'
pkgname=akonadi
-version=1.10.3
-revision=2
+version=1.11.0
+revision=1
short_desc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
homepage="http://community.kde.org/KDE_PIM/Akonadi"
-distfiles="http://download.kde.org/stable/${pkgname}/src/${pkgname}-${version}-1.tar.bz2"
-checksum=a8f66eec479c235ec67e77befac50c42743f627663fe2bb49238e82e6fbfffb0
+distfiles="http://download.kde.org/stable/${pkgname}/src/${pkgname}-${version}.tar.bz2"
+checksum=0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d
build_style=cmake
configure_args="-DAKONADI_BUILD_TESTS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
@@ -17,10 +17,11 @@ configure_args="-DAKONADI_BUILD_TESTS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
hostmakedepends="cmake automoc4 pkg-config"
makedepends="shared-mime-info sqlite-devel boost-devel>=1.54 qt-devel
phonon-devel soprano-devel>=2.9.2_4"
+depends="shared-mime-info"
akonadi-devel_package() {
short_desc+=" - development files"
- depends="qt-devel ${sourcepkg}-${version}_${revision}"
+ depends="qt-devel ${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
@@ -28,10 +29,3 @@ akonadi-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-akonadi_package() {
- depends="shared-mime-info"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/allegro4/patches/mesa10-uncompat.patch b/srcpkgs/allegro4/patches/mesa10-uncompat.patch
new file mode 100644
index 0000000000..ae1aa4440e
--- /dev/null
+++ b/srcpkgs/allegro4/patches/mesa10-uncompat.patch
@@ -0,0 +1,22 @@
+Mesa<=10.0.1 removed the GLXContextID from glx.h and it has been re-added since:
+
+http://cgit.freedesktop.org/mesa/mesa/commit/?id=f425d56ba41382be04366d011536ee78a03a2f33
+
+For now, use the same type (XID) than GLXContextID; we can remove this patch
+once mesa-10 contains the above commit.
+
+ -- xtraeme
+
+--- addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h.orig 2014-01-05 09:08:26.796542194 +0100
++++ addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h 2014-01-05 09:08:46.115682136 +0100
+@@ -59,8 +59,8 @@ AGL_API(void, DestroyGLXVideoSourceSGIX,
+ /* GLX_EXT_import_context */
+ AGL_API(Display *, GetCurrentDisplayEXT, (void))
+ AGL_API(int, QueryContextInfoEXT, (Display *, GLXContext, int, int *))
+-AGL_API(GLXContextID, GetContextIDEXT, (const GLXContext))
+-AGL_API(GLXContext, ImportContextEXT, (Display *, GLXContextID))
++AGL_API(XID, GetContextIDEXT, (const GLXContext))
++AGL_API(GLXContext, ImportContextEXT, (Display *, XID))
+ AGL_API(void, FreeContextEXT, (Display *, GLXContext))
+ #endif
+
diff --git a/srcpkgs/allegro4/template b/srcpkgs/allegro4/template
index 3fb4a67a31..6c50538bc7 100644
--- a/srcpkgs/allegro4/template
+++ b/srcpkgs/allegro4/template
@@ -1,13 +1,15 @@
# Template file for 'allegro4'.
pkgname=allegro4
version=4.4.2
-revision=1
+revision=2
wrksrc="allegro-${version}"
build_style=cmake
configure_args="-DWANT_DOCS=OFF"
hostmakedepends="pkg-config cmake"
makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel
libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel"
+# libGL.so is dlopen()ed.
+depends="libGL"
short_desc="Portable library mainly aimed at video game and multimedia programming"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Allegro License (MIT alike)"
@@ -16,19 +18,13 @@ distfiles="${SOURCEFORGE_SITE}/alleg/allegro-$version.tar.gz"
checksum=1b21e7577dbfada02d85ca4510bd22fedaa6ce76fde7f4838c7c1276eb840fdc
allegro4-devel_package() {
- depends="${sourcepkg}-${version}_${revision}"
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/bin/allegro-config
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
- }
-}
-
-allegro4_package() {
- # libGL.so is dlopen()ed.
- depends="libGL"
- pkg_install() {
- vmove usr
+ vmove usr/lib/pkgconfig
}
}
diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template
index 09dc201786..dc2c1a3870 100644
--- a/srcpkgs/alsa-lib/template
+++ b/srcpkgs/alsa-lib/template
@@ -40,12 +40,6 @@ alsa-lib-devel_package() {
}
}
-alsa-lib_package() {
- pkg_install() {
- vmove all
- }
-}
-
if [ -z "$CROSS_BUILD" ]; then
alsa-lib-python_package() {
short_desc+=" - python smixer plugin"
diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template
index d80a2d8032..fab7852826 100644
--- a/srcpkgs/alsa-plugins/template
+++ b/srcpkgs/alsa-plugins/template
@@ -58,9 +58,3 @@ alsa-plugins-ffmpeg_package() {
vmove "usr/lib/alsa-lib/*a52*"
}
}
-
-alsa-plugins_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template
index 5dd4fd0260..72d311de4c 100644
--- a/srcpkgs/alsa-utils/template
+++ b/srcpkgs/alsa-utils/template
@@ -7,6 +7,9 @@ configure_args="--with-systemdsystemunitdir=/usr/lib/systemd/system
--with-udev-rules-dir=/usr/lib/udev/rules.d -disable-alsaconf"
hostmakedepends="pkg-config xmlto"
makedepends="ncurses-devel alsa-lib-devel>=1.0.27 libsamplerate-devel"
+# Needs snd_pcm_abort() from >= 1.0.27.
+depends="alsa-lib>=1.0.27"
+make_dirs="/var/lib/alsa 0750 root root"
short_desc="The Advanced Linux Sound Architecture (ALSA) utils"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.alsa-project.org"
@@ -24,12 +27,3 @@ post_install() {
make -C alsactl 90-alsa-restore.rules
vinstall alsactl/90-alsa-restore.rules 644 usr/lib/udev/rules.d
}
-
-alsa-utils_package() {
- # Needs snd_pcm_abort() from >= 1.0.27.
- depends="alsa-lib>=1.0.27"
- make_dirs="/var/lib/alsa 0750 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 814f8082b2..8a2eae9248 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -21,6 +21,7 @@ makedepends="gtksourceview-devel>=3.10 libxml2-devel vte3-devel gjs-devel>=1.38
libxslt-devel glade3-devel>=3.16 graphviz-devel vala-devel>=0.22 gdl-devel>=3.10
libgda-devel devhelp-devel>=3.10 sqlite-devel apr-util-devel
neon-devel subversion-devel python-devel"
+depends="autogen"
anjuta-devel_package() {
short_desc+=" - Development files"
@@ -41,10 +42,3 @@ anjuta-docs_package() {
vmove usr/share/gtk-doc
}
}
-
-anjuta_package() {
- depends="autogen"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 3c688fc0a5..2cca8de921 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -2,21 +2,15 @@
pkgname=ansible
version=1.4.3
revision=1
+noarch="yes"
build_style=python-module
hostmakedepends="python"
makedepends="python-devel python-jinja python-paramiko pyyaml"
+depends="python python-jinja python-paramiko pyyaml"
+pycompile_module="${pkgname}"
short_desc="A radically simple deployment, model-driven configuration management, and command execution framework"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.ansibleworks.com"
distfiles="http://www.ansibleworks.com/releases/$pkgname-$version.tar.gz"
checksum=0741788cdd86d2e3bbfb4474c26bb13d57690ed2e2c8ff8dd1c271a7de590ee3
-
-ansible_package() {
- noarch="yes"
- pycompile_module="${pkgname}"
- depends="python python-jinja python-paramiko pyyaml"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template
index da2aa70dd2..f17a42510f 100644
--- a/srcpkgs/apache-mpm-event/template
+++ b/srcpkgs/apache-mpm-event/template
@@ -28,6 +28,10 @@ long_desc="
This MPM is experimental and less tested than the worker and prefork MPMs."
+# dlopen(3) run-time dependencies.
+depends="apache>=$version"
+systemd_services="apache-mpm-event.service on"
+
pre_configure() {
cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
}
@@ -39,12 +43,3 @@ post_install() {
vinstall httpd 755 usr/sbin httpd.event
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
}
-
-apache-mpm-event_package() {
- # dlopen(3) run-time dependencies.
- depends="apache>=$version"
- systemd_services="apache-mpm-event.service on"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/apache-mpm-worker/template b/srcpkgs/apache-mpm-worker/template
index aa33b1df7a..f23bfa135c 100644
--- a/srcpkgs/apache-mpm-worker/template
+++ b/srcpkgs/apache-mpm-worker/template
@@ -25,6 +25,10 @@ long_desc="
recommended especially for high-traffic sites because it is faster and has
a smaller memory footprint than the traditional prefork MPM."
+# dlopen(3) run-time dependencies.
+depends="apache>=$version"
+systemd_services="apache-mpm-worker.service on"
+
pre_configure() {
cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout
}
@@ -36,12 +40,3 @@ post_install() {
vinstall httpd 755 usr/sbin httpd.worker
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
}
-
-apache-mpm-worker_package() {
- # dlopen(3) run-time dependencies.
- depends="apache>=$version"
- systemd_services="apache-mpm-worker.service on"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 11941faafa..ae13191c76 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -22,6 +22,25 @@ configure_args="--prefix= --enable-pie --enable-modules=all
hostmakedepends="pkg-config perl"
makedepends="zlib-devel libuuid-devel pcre-devel>=8.30
openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+conf_files="
+ /etc/httpd/extra/httpd-autoindex.conf
+ /etc/httpd/extra/httpd-dav.conf
+ /etc/httpd/extra/httpd-manual.conf
+ /etc/httpd/extra/httpd-vhosts.conf
+ /etc/httpd/extra/httpd-info.conf
+ /etc/httpd/extra/httpd-languages.conf
+ /etc/httpd/extra/httpd-userdir.conf
+ /etc/httpd/extra/httpd-ssl.conf
+ /etc/httpd/extra/httpd-mpm.conf
+ /etc/httpd/extra/httpd-default.conf
+ /etc/httpd/extra/httpd-multilang-errordoc.conf
+ /etc/httpd/httpd.conf
+ /etc/httpd/magic
+ /etc/httpd/mime.types"
+systemd_services="apache.service on"
+system_accounts="httpd"
+httpd_descr="Apache HTTP server"
+httpd_homedir="/srv/httpd"
short_desc="The Number One HTTP Server On The Internet"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://httpd.apache.org/"
@@ -87,28 +106,3 @@ apache-devel_package() {
vmove "usr/share/man/man1/apxs*"
}
}
-
-apache_package() {
- conf_files="
- /etc/httpd/extra/httpd-autoindex.conf
- /etc/httpd/extra/httpd-dav.conf
- /etc/httpd/extra/httpd-manual.conf
- /etc/httpd/extra/httpd-vhosts.conf
- /etc/httpd/extra/httpd-info.conf
- /etc/httpd/extra/httpd-languages.conf
- /etc/httpd/extra/httpd-userdir.conf
- /etc/httpd/extra/httpd-ssl.conf
- /etc/httpd/extra/httpd-mpm.conf
- /etc/httpd/extra/httpd-default.conf
- /etc/httpd/extra/httpd-multilang-errordoc.conf
- /etc/httpd/httpd.conf
- /etc/httpd/magic
- /etc/httpd/mime.types"
- systemd_services="apache.service on"
- system_accounts="httpd"
- httpd_descr="Apache HTTP server"
- httpd_homedir="/srv/httpd"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/apg/template b/srcpkgs/apg/template
index c65464fb5c..9ae8278947 100644
--- a/srcpkgs/apg/template
+++ b/srcpkgs/apg/template
@@ -23,9 +23,3 @@ do_install() {
install -D -m644 doc/man/$i.1 ${DESTDIR}/usr/share/man/man1/$i.1
done
}
-
-apg_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 35019fe408..3d8d340327 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -86,9 +86,3 @@ apr-util-sqlite_package() {
vmove "usr/lib/apr-util-1/apr_dbd_sqlite*"
}
}
-
-apr-util_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template
index 869dfcf541..82881fcc9a 100644
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@@ -36,9 +36,3 @@ apr-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-apr_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template
index f85d78414f..ef90e413b8 100644
--- a/srcpkgs/aqemu/template
+++ b/srcpkgs/aqemu/template
@@ -6,6 +6,7 @@ build_style=cmake
configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1"
hostmakedepends="cmake"
makedepends="qt-devel qemu desktop-file-utils"
+depends="qemu desktop-file-utils"
short_desc="GUI to QEMU and KVM emulators, written in Qt4"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://aqemu.sourceforge.net"
@@ -16,10 +17,3 @@ long_desc="
AQEMU is GUI to QEMU and KVM emulators, written in Qt4. The program has
user-friendly interface and allows to set up the majority of QEMU and KVM
options."
-
-aqemu_package() {
- depends="qemu desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index 505a58bd32..9955343cd7 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -12,16 +12,10 @@ configure_args="--with-openssl --with-libexpat --without-gnutls
hostmakedepends="pkg-config"
makedepends="zlib-devel gmp-devel expat-devel openssl-devel sqlite-devel
c-ares-devel ca-certificates"
+depends="ca-certificates"
short_desc="Lightweight multi-protocol/multi-source command-line download utility"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://aria2.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz"
checksum=b4c99eea9e11d265ed90ab685571f7328a20f5c5a438da93ecdba0959170f460
-
-aria2_package() {
- depends="ca-certificates"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/arm-mem-git/template b/srcpkgs/arm-mem-git/template
index 6de7a2c39b..c8e9aaaf55 100644
--- a/srcpkgs/arm-mem-git/template
+++ b/srcpkgs/arm-mem-git/template
@@ -19,9 +19,3 @@ do_fetch() {
do_install() {
vinstall libarmmem.so 755 usr/lib
}
-
-arm-mem-git_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/artwiz-fonts/template b/srcpkgs/artwiz-fonts/template
index 80927a7bb6..d50d34515d 100644
--- a/srcpkgs/artwiz-fonts/template
+++ b/srcpkgs/artwiz-fonts/template
@@ -2,6 +2,8 @@
pkgname=artwiz-fonts
version=1.3
revision=1
+noarch="yes"
+wrksrc="artwiz-aleczapka-en-${version}"
short_desc="Small futuristic ASCII fonts for X"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
homepage="http://artwizaleczapka.sourceforge.net/"
@@ -9,7 +11,8 @@ license="GPL-2"
distfiles="http://downloads.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-${version}.tar.bz2"
checksum=19f163de81548db9b9dd7d3a415fba379f1d17989020236aa4eb88c25929afe1
makedepends="font-util mkfontdir"
-wrksrc="artwiz-aleczapka-en-${version}"
+depends="${makedepends}"
+font_dirs="/usr/share/fonts/artwiz-fonts"
do_install() {
vmkdir usr/share/fonts/artwiz-fonts
@@ -18,12 +21,3 @@ do_install() {
vinstall fonts.alias 644 usr/share/fonts/artwiz-fonts
vinstall README 644 usr/share/doc/artwiz-fonts
}
-
-artwiz-fonts_package() {
- depends="${makedepends}"
- noarch="yes"
- font_dirs="/usr/share/fonts/artwiz-fonts"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template
index 7ae7ed55e6..4e1393365d 100644
--- a/srcpkgs/asciidoc/template
+++ b/srcpkgs/asciidoc/template
@@ -2,8 +2,35 @@
pkgname=asciidoc
version=8.6.9
revision=1
+noarch="yes"
build_style=gnu-configure
makedepends="python libxslt docbook-xsl"
+depends="${makedepends}"
+conf_files="
+ /etc/asciidoc/asciidoc.conf
+ /etc/asciidoc/docbook45.conf
+ /etc/asciidoc/filters/code/code-filter.conf
+ /etc/asciidoc/filters/graphviz/graphviz-filter.conf
+ /etc/asciidoc/filters/latex/latex-filter.conf
+ /etc/asciidoc/filters/music/music-filter.conf
+ /etc/asciidoc/filters/source/source-highlight-filter.conf
+ /etc/asciidoc/help.conf
+ /etc/asciidoc/html4.conf
+ /etc/asciidoc/lang-de.conf
+ /etc/asciidoc/lang-en.conf
+ /etc/asciidoc/lang-es.conf
+ /etc/asciidoc/lang-fr.conf
+ /etc/asciidoc/lang-hu.conf
+ /etc/asciidoc/lang-it.conf
+ /etc/asciidoc/lang-pt-BR.conf
+ /etc/asciidoc/lang-ru.conf
+ /etc/asciidoc/lang-uk.conf
+ /etc/asciidoc/latex.conf
+ /etc/asciidoc/slidy.conf
+ /etc/asciidoc/text.conf
+ /etc/asciidoc/wordpress.conf
+ /etc/asciidoc/xhtml11.conf
+ /etc/asciidoc/xhtml11-quirks.conf"
short_desc="Text based document generation"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.methods.co.nz/asciidoc/"
@@ -18,36 +45,3 @@ long_desc="
AsciiDoc is highly configurable: both the AsciiDoc source file syntax
and the backend output markups (which can be almost any type of SGML/XML
markup) can be customized and extended by the user."
-
-asciidoc_package() {
- depends="${makedepends}"
- conf_files="
- /etc/asciidoc/asciidoc.conf
- /etc/asciidoc/docbook45.conf
- /etc/asciidoc/filters/code/code-filter.conf
- /etc/asciidoc/filters/graphviz/graphviz-filter.conf
- /etc/asciidoc/filters/latex/latex-filter.conf
- /etc/asciidoc/filters/music/music-filter.conf
- /etc/asciidoc/filters/source/source-highlight-filter.conf
- /etc/asciidoc/help.conf
- /etc/asciidoc/html4.conf
- /etc/asciidoc/lang-de.conf
- /etc/asciidoc/lang-en.conf
- /etc/asciidoc/lang-es.conf
- /etc/asciidoc/lang-fr.conf
- /etc/asciidoc/lang-hu.conf
- /etc/asciidoc/lang-it.conf
- /etc/asciidoc/lang-pt-BR.conf
- /etc/asciidoc/lang-ru.conf
- /etc/asciidoc/lang-uk.conf
- /etc/asciidoc/latex.conf
- /etc/asciidoc/slidy.conf
- /etc/asciidoc/text.conf
- /etc/asciidoc/wordpress.conf
- /etc/asciidoc/xhtml11.conf
- /etc/asciidoc/xhtml11-quirks.conf"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/aspell-en/template b/srcpkgs/aspell-en/template
index cac6b57980..b08b866404 100644
--- a/srcpkgs/aspell-en/template
+++ b/srcpkgs/aspell-en/template
@@ -2,6 +2,7 @@
pkgname=aspell-en
version=7.1
revision=1
+noarch=yes
wrksrc="aspell6-en-${version}-0"
build_style=configure
hostmakedepends="which"
@@ -12,10 +13,3 @@ license="LGPL-2.1"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2"
checksum=ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a
-
-aspell-en_package() {
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template
index c07b230d20..f775ea35b8 100644
--- a/srcpkgs/aspell/template
+++ b/srcpkgs/aspell/template
@@ -22,6 +22,7 @@ build_style=gnu-configure
configure_args="--enable-compile-in-filters"
hostmakedepends="perl"
makedepends="ncurses-devel"
+depends="perl"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" automake libtool gettext-devel"
@@ -41,10 +42,3 @@ aspell-devel_package() {
vmove usr/share/man/man1/pspell-config.1
}
}
-
-aspell_package() {
- depends="perl"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/astyle/template b/srcpkgs/astyle/template
new file mode 100644
index 0000000000..017da159d0
--- /dev/null
+++ b/srcpkgs/astyle/template
@@ -0,0 +1,19 @@
+# Template file for 'astyle'
+pkgname=astyle
+version=2.04
+revision=1
+wrksrc="$pkgname"
+build_wrksrc="build/gcc"
+build_style=gnu-makefile
+short_desc="A free, fast and small automatic formatter for C, C++, C#, and Java source code"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="LGPL-3"
+homepage="http://astyle.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version}_linux.tar.gz"
+checksum=70b37f4853c418d1e2632612967eebf1bdb93dfbe558c51d7d013c9b4e116b60
+
+do_install() {
+ vinstall bin/astyle 755 usr/bin
+ vmkdir usr/share/doc/html/astyle
+ install -m644 ../../doc/*.html ${DESTDIR}/usr/share/doc/html/astyle
+}
diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template
index 4f132ca53e..f07246fa7f 100644
--- a/srcpkgs/at-spi2-atk/template
+++ b/srcpkgs/at-spi2-atk/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="libglib-devel>=2.38 atk-devel>=2.10 at-spi2-core-devel>=2.10"
+depends="at-spi2-core>=2.10"
short_desc="A GTK+ module that bridges ATK to D-Bus at-spi"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -28,10 +29,3 @@ at-spi2-atk-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-at-spi2-atk_package() {
- depends="at-spi2-core>=2.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 2b10fd5f4f..16b40c9413 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool dbus gobject-introspection"
makedepends="libXext-devel libSM-devel libXtst-devel libXevie-devel dbus-devel"
+conf_files="/etc/at-spi2/accessibility.conf"
short_desc="Assistive Technology Service Provider Interface"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -23,10 +24,3 @@ at-spi2-core-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-at-spi2-core_package() {
- conf_files="/etc/at-spi2/accessibility.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/atf/template b/srcpkgs/atf/template
index ec504ecf4e..a40cc390e0 100644
--- a/srcpkgs/atf/template
+++ b/srcpkgs/atf/template
@@ -3,8 +3,10 @@ pkgname=atf
version=0.18
revision=1
build_style=gnu-configure
-hostmakedepends="libtool gdb"
+hostmakedepends="automake libtool gdb"
makedepends="gdb xmlcatmgr"
+depends="${makedepends}"
+xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
short_desc="Automated Testing Framework"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/kyua/wiki/ATF"
@@ -40,11 +42,3 @@ atf-libs_package() {
vmove "usr/lib/*.so.*"
}
}
-
-atf_package() {
- depends="gdb xmlcatmgr"
- xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index c2fa1df5c1..31ead333cf 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -51,9 +51,3 @@ atk-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-atk_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/atkmm/template b/srcpkgs/atkmm/template
index de1a26975a..cb44242a1a 100644
--- a/srcpkgs/atkmm/template
+++ b/srcpkgs/atkmm/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-documentation"
hostmakedepends="pkg-config"
makedepends="libsigc++-devel atk-devel glibmm-devel"
+replaces="gtkmm<2.22"
short_desc="Set of interfaces for accessibility (C++ bindings)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://gtkmm.sourceforge.net/"
@@ -28,7 +29,7 @@ long_desc="
atkmm-devel_package() {
depends="glibmm-devel atk-devel atkmm>=${version}"
- short_desc="Set of interfaces for accessibility (C++ bindings) - development files"
+ short_desc+=" - development files"
replaces="gtkmm-devel<2.22"
pkg_install() {
vmove usr/include
@@ -36,10 +37,3 @@ atkmm-devel_package() {
vmove usr/lib/atkmm-1.6
}
}
-
-atkmm_package() {
- replaces="gtkmm<2.22"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template
index c965837e51..febd2ee570 100644
--- a/srcpkgs/atop/template
+++ b/srcpkgs/atop/template
@@ -7,6 +7,7 @@ wrksrc=atop-${_distver}-${_patchver}
revision=1
build_style=gnu-makefile
makedepends="ncurses-devel zlib-devel"
+systemd_services="atop.service true"
short_desc="A system and process level monitor"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -21,11 +22,3 @@ post_install() {
# systemd service
vinstall atop.service 644 usr/lib/systemd/system
}
-
-atop_package() {
- systemd_services="atop.service true"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 92542b0b34..576fc08923 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -19,9 +19,3 @@ attica-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-attica_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template
index 23d4a18df5..c9757ccbbc 100644
--- a/srcpkgs/attr/template
+++ b/srcpkgs/attr/template
@@ -2,6 +2,7 @@
pkgname=attr
version=2.4.47
revision=2
+bootstrap=yes
build_style=gnu-configure
configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
short_desc="Extended attribute support library for ACL support"
@@ -11,8 +12,6 @@ license="LGPL-2.1"
distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz"
checksum=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
-bootstrap=yes
-
do_install() {
make DIST_ROOT=${DESTDIR} install install-lib install-dev
}
@@ -39,9 +38,3 @@ attr-progs_package() {
vmove usr/share/locale
}
}
-
-attr_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template
index 68521322ab..d559167a36 100644
--- a/srcpkgs/aubio/template
+++ b/srcpkgs/aubio/template
@@ -34,9 +34,3 @@ aubio-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-aubio_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index c39ff0c3ad..72fe031dd5 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'audacious-plugins'.
pkgname=audacious-plugins
-version=3.4
-revision=2
+version=3.4.3
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="
@@ -14,10 +14,4 @@ maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3"
homepage="http://audacious-media-player.org/"
distfiles="http://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
-checksum=8b10c61481d7ee9972f329d79f56001aa7b092aab44a0084bdd1472fe529b874
-
-audacious-plugins_package() {
- pkg_install() {
- vmove all
- }
-}
+checksum=bee67a8f8e84d855d4008367a61e662f1e6d15db5accda587c4025ed12462803
diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index 75f22c100b..8c4bbc0b95 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -1,30 +1,21 @@
# Template file for 'audacious'.
pkgname=audacious
-version=3.4
+version=3.4.3
revision=1
build_style=gnu-configure
configure_args="--enable-thunar"
hostmakedepends="pkg-config"
-makedepends="libSM-devel gtk+3-devel dbus-glib-devel libguess-devel"
+makedepends="libSM-devel gtk+3-devel dbus-glib-devel libguess-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="Lightweight, advanced audio player focused on audio quality"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3"
homepage="http://audacious-media-player.org/"
distfiles="http://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2"
-checksum=a401b4ce85fda23bcb17c187f006ee00e8af2e5e4000768dee08b8108ed975c2
-long_desc="
- Audacious is an open source audio player. A descendant of XMMS, Audacious plays
- your music how you want it, without stealing away your computers resources
- from other tasks. Drag and drop folders and individual song files, search for
- artists and albums in your entire music library, or create and edit your own
- custom playlists. Listen to CDs or stream music from the Internet. Tweak the
- sound with the graphical equalizer or experiment with LADSPA effects. Enjoy the
- modern GTK-themed interface or change things up with Winamp classic skins. Use
- the plugins included with Audacious to fetch lyrics for your music, to set an
- alarm in the morning, and more."
+checksum=183454f4df1482e569d16d1452b3e14010daeab2fbf9dfdd82cf741a72e39f12
audacious-devel_package() {
- depends="audacious>=${version}"
+ depends="audacious>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -32,10 +23,3 @@ audacious-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-audacious_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/autoconf/template b/srcpkgs/autoconf/template
index 9813ecbfdc..6d4c1dfb57 100644
--- a/srcpkgs/autoconf/template
+++ b/srcpkgs/autoconf/template
@@ -2,8 +2,10 @@
pkgname=autoconf
version=2.69
revision=1
+noarch=yes
build_style=gnu-configure
hostmakedepends="perl>=0"
+depends="gawk diffutils m4"
short_desc="Generates automatic source code configuration scripts"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, GPL-3"
@@ -18,11 +20,3 @@ long_desc="
configuration script for a package from a template file that lists the
operating system features that the package can use, in the form of m4
macro calls."
-
-autoconf_package() {
- depends="gawk diffutils m4"
- noarch=yes
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/autoconf213/template b/srcpkgs/autoconf213/template
index 2040c910e7..f83e2a1ebf 100644
--- a/srcpkgs/autoconf213/template
+++ b/srcpkgs/autoconf213/template
@@ -2,8 +2,10 @@
pkgname=autoconf213
version=2.13
revision=1
+noarch=yes
wrksrc="autoconf-${version}"
hostmakedepends="perl>=0"
+depends="gawk diffutils m4"
short_desc="Generates automatic source code configuration scripts (2.13 version)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, GPL-3"
@@ -33,11 +35,3 @@ do_install() {
mv ${DESTDIR}/usr/share/autoconf ${DESTDIR}/usr/share/autoconf213
sed -e 's,/usr/share/autoconf,/usr/share/autoconf213,g' -i ${DESTDIR}/usr/bin/*
}
-
-autoconf213_package() {
- depends="gawk diffutils m4"
- noarch=yes
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/autogen/template b/srcpkgs/autogen/template
index 5ab03bcba8..a23bb3b82c 100644
--- a/srcpkgs/autogen/template
+++ b/srcpkgs/autogen/template
@@ -46,9 +46,3 @@ autogen-docs_package() {
vmove usr/share/man
}
}
-
-autogen_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template
index 98c0ce9838..28c1a7d93a 100644
--- a/srcpkgs/automake/template
+++ b/srcpkgs/automake/template
@@ -1,20 +1,14 @@
# Template build file for 'automake'.
pkgname=automake
-version=1.14
-revision=1
+version=1.14.1
+revision=2
+noarch=yes
build_style=gnu-configure
hostmakedepends="perl autoconf>=2.60"
+depends="${hostmakedepends}"
short_desc="GNU Standards-compliant Makefile generator"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.gnu.org/software/automake"
distfiles="http://ftp.gnu.org/gnu/automake/${pkgname}-${version}.tar.xz"
-checksum=e1188f5d074374cf06946cabb2b9e70bee141637a8fd1fab9a660c8930fe8059
-
-automake_package() {
- depends="perl autoconf>=2.60"
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
+checksum=a9b4f04b8b69cac2e832a38a718943aa976dbdad0097211f8b3448afdacf0669
diff --git a/srcpkgs/automoc4/template b/srcpkgs/automoc4/template
index 48323c4dbf..337f4d42c6 100644
--- a/srcpkgs/automoc4/template
+++ b/srcpkgs/automoc4/template
@@ -11,11 +11,3 @@ license="BSD"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="ftp://ftp.kde.org/pub/kde/stable/$pkgname/$version/$pkgname-$version.tar.bz2"
checksum=234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49
-long_desc="
- automoc4 tool, used to build KDE4 and related packages."
-
-automoc4_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 3e923612b2..629e5e9d8b 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -7,6 +7,7 @@ pkgname=avahi-discover
version=0.6.31
wrksrc="avahi-${version}"
revision=13
+noarch=yes
build_style=gnu-configure
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
--disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
@@ -17,7 +18,7 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
--disable-static ssp_cv_lib=no --enable-python --enable-pygtk
--enable-glib --enable-gobject --enable-gtk --enable-gtk3
--enable-introspection"
-short_desc="Multicast DNS Service Discovery"
+short_desc="Service discover user interface for avahi"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
homepage="http://www.avahi.org"
@@ -27,6 +28,8 @@ checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
hostmakedepends="pkg-config intltool"
makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
pygtk-devel dbus-python gtk+3-devel gobject-introspection"
+depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils"
+pycompile_module="avahi_discover"
if [ "$CROSS_BUILD" ]; then
msg_error "$pkgver: this package is not cross buildable currently.\n"
@@ -123,17 +126,3 @@ avahi-ui-utils_package() {
vmove usr/bin/bshell
}
}
-
-avahi-discover_package() {
- depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils"
- short_desc="Service discover user interface for avahi"
- noarch=yes
- pycompile_module="avahi_discover"
- pkg_install() {
- vmove usr/lib/python2.7/site-packages/avahi_discover
- vmove usr/share/applications/avahi-discover.desktop
- vmove usr/share/man/man1/avahi-discover.1
- vmove usr/share/avahi/interfaces/avahi-discover.ui
- vmove usr/bin/avahi-discover
- }
-}
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 3807651947..a6a6a74ffe 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -21,6 +21,14 @@ checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
hostmakedepends="pkg-config intltool"
makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
+depends="dbus"
+systemd_services="avahi-daemon.service on"
+conf_files="
+ /etc/avahi/services/ssh.service
+ /etc/avahi/services/sftp-ssh.service
+ /etc/avahi/avahi-daemon.conf
+ /etc/avahi/hosts
+ /etc/avahi/avahi-dnsconfd.action"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libtool glib-devel"
@@ -99,17 +107,3 @@ avahi-utils_package() {
vmove usr/share/man/man1
}
}
-
-avahi_package() {
- systemd_services="avahi-daemon.service on"
- conf_files="
- /etc/avahi/services/ssh.service
- /etc/avahi/services/sftp-ssh.service
- /etc/avahi/avahi-daemon.conf
- /etc/avahi/hosts
- /etc/avahi/avahi-dnsconfd.action"
- depends="dbus"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template
index 5119bbbe5b..f43372f04b 100644
--- a/srcpkgs/awesome/template
+++ b/srcpkgs/awesome/template
@@ -10,6 +10,8 @@ makedepends="
xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9 xcb-util-cursor-devel>=0.1.0_2
startup-notification-devel>=0.12_3 imlib2-devel ImageMagick>=6.7.9.6_2 lgi>=0.7.2
libxdg-basedir-devel>=1.1.1_1 gdk-pixbuf-devel lua-devel>=5.2 dbus-devel"
+depends="dbus-x11 lgi>=0.7.2"
+conf_files="/etc/xdg/awesome/rc.lua"
short_desc="Highly configurable, next gen framework window manager for X"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -22,11 +24,6 @@ pre_configure() {
sed -i -e "s|es fr de ru|es fr de|g" CMakeLists.txt
}
-awesome_package() {
- conf_files="/etc/xdg/awesome/rc.lua"
- depends="dbus-x11 lgi>=0.7.2"
- pkg_install() {
- vmove all
- vinstall ${wrksrc}/awesome.desktop 644 usr/share/xsessions
- }
+post_install() {
+ vinstall awesome.desktop 644 usr/share/xsessions
}
diff --git a/srcpkgs/awoken-icons/template b/srcpkgs/awoken-icons/template
index 8c8ffe1fd4..f53496df20 100644
--- a/srcpkgs/awoken-icons/template
+++ b/srcpkgs/awoken-icons/template
@@ -2,14 +2,16 @@
pkgname=awoken-icons
version=2.5.2
revision=1
+noarch="yes"
distfiles="https://dl.dropbox.com/u/8029324/AwOken-2.5.zip"
checksum="d122ee0457079aaa30a664ae582fbc6208414e8728f497dce399ed9f33f9b36e"
makedepends="unzip"
+depends="zenity xdg-utils ImageMagick"
wrksrc="AwOken-2.5"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://alecive.deviantart.com/art/AwOken-163570862"
license="CCPL:by-sa"
-short_desc="Simple and quite complete icon set, Token-style."
+short_desc="Simple and quite complete icon set, Token-style"
do_install() {
vmkdir "usr/bin"
@@ -44,12 +46,3 @@ awoken-icons-white_package() {
vmove usr/bin/awoken-icon-theme-customization-white
}
}
-
-awoken-icons_package() {
- noarch="yes"
- depends="zenity xdg-utils ImageMagick"
- pkg_install() {
- vmove usr/share/icons/AwOken
- vmove usr/bin/awoken-icon-theme-customization
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/b43-fwcutter/template b/srcpkgs/b43-fwcutter/template
index 47b2e088cb..6c9de551c8 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 <linuxienATlegtuxDOTorg>"
license="GPL"
@@ -9,17 +10,7 @@ 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
}
-
-b43-fwcutter_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index c2dcc35dd8..8479a48fea 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -23,15 +23,9 @@ long_desc="
babl-devel_package() {
depends="babl>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-babl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 253fb302b2..678f0b7411 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -2,21 +2,16 @@
pkgname=backintime
version=1.0.8
revision=2
+noarch="yes"
wrksrc=$pkgname-$version/common
build_style=gnu-configure
hostmakedepends="which"
+makedepends="python rsync cron-daemon"
+depends="${makedepends}"
+pycompile_dirs="/usr/share/backintime"
short_desc="A simple backup tool for Linux"
maintainer="tripledes <tripledes@gmail.com>"
license="GPL-2"
homepage="http://$pkgname.le-web.org"
distfiles="http://$pkgname.le-web.org/download/$pkgname/$pkgname-${version}_src.tar.gz"
checksum=fb83736ae0671b0d63468a9d39a29334320d93df004911cc192b1989df97d931
-
-backintime_package() {
- noarch="yes"
- pycompile_dirs="/usr/share/backintime"
- depends="python rsync cron-daemon"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template
index b5f20b25c6..97ff137a83 100644
--- a/srcpkgs/balsa/template
+++ b/srcpkgs/balsa/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool automake gettext-devel"
makedepends="iso-codes enchant-devel libnotify-devel libesmtp-devel gtk+3-devel
gmime-devel webkitgtk-devel openssl-devel gpgme-devel libsecret-devel pcre-devel
hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="An email client for GNOME"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://pawsa.fedorapeople.org/balsa/"
@@ -24,10 +25,3 @@ pre_configure() {
mkdir m4
autoreconf -fi
}
-
-balsa_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template
index f1a38752bf..d9886b188a 100644
--- a/srcpkgs/baobab/template
+++ b/srcpkgs/baobab/template
@@ -6,17 +6,11 @@ build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection"
makedepends="gtk+3-devel vala-devel>=0.22 gsettings-desktop-schemas-devel>=3.10"
+depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10"
+replaces="gnome-utils>=3.0"
short_desc="A graphical directory tree analyzer for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9
-
-baobab_package() {
- replaces="gnome-utils>=3.0"
- depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bar-git/template b/srcpkgs/bar-git/template
index 4ed61a89eb..c93409bad5 100644
--- a/srcpkgs/bar-git/template
+++ b/srcpkgs/bar-git/template
@@ -2,33 +2,25 @@
pkgname=bar-git
version=20131221
revision=1
+build_style=gnu-makefile
makedepends="libxcb-devel"
short_desc="A lightweight xcb based bar"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="MIT"
homepage="https://github.com/LemonBoy/bar"
-
do_fetch() {
local url="git://github.com/LemonBoy/bar"
msg_normal "Fetching source from $url ...\n"
git clone ${url} ${pkgname}-${version}
}
-do_build() {
+pre_build() {
cp ${FILESDIR}/config.h config.h
- make CC=$CC INCS="-I." ${makejobs}
}
-do_install() {
- make PREFIX=/usr DESTDIR=$DESTDIR install
+post_install() {
vinstall palette.pl 755 usr/bin
vinstall LICENSE 644 usr/share/licenses/${pkgname}
vinstall README.md 644 usr/share/doc/${pkgname}
}
-
-bar-git_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 311e17dae6..0e85f41b9f 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,8 @@
# Template file for 'base-chroot'
pkgname=base-chroot
-version=0.40
+version=0.41
revision=1
+noarch=yes
bootstrap=yes
build_style=meta
homepage="http://www.voidlinux.eu"
@@ -13,13 +14,9 @@ long_desc="
inside of a chroot with xbps-src."
makedepends="
- xbps-triggers base-files>=0.92 kernel-libc-headers glibc-devel binutils chroot-gcc
- chroot-patch chroot-bash chroot-grep chroot-coreutils chroot-diffutils
+ xbps-triggers base-files>=0.92 kernel-libc-headers glibc-devel chroot-gcc
+ binutils chroot-patch chroot-bash chroot-grep chroot-coreutils chroot-diffutils
chroot-gettext chroot-texinfo chroot-sed chroot-gawk chroot-findutils
chroot-make chroot-gzip chroot-file chroot-tar chroot-m4 chroot-fakeroot
chroot-distcc chroot-git ccache xbps-src>=20130317_4 xbps xz"
-
-base-chroot_package() {
- noarch="yes"
- depends="${makedepends}"
-}
+depends="${makedepends}"
diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template
index aa1d6f43a0..921f9660d2 100644
--- a/srcpkgs/base-directories/template
+++ b/srcpkgs/base-directories/template
@@ -2,6 +2,7 @@
pkgname=base-directories
version=0.22
revision=1
+noarch=yes
bootstrap=yes
build_style=meta
short_desc="Void Linux base system directories"
@@ -11,7 +12,3 @@ license="Public domain"
long_desc="
This package installs the base system directories as specifed by FHS that aren't
installed by any other package and are required on any GNU/Linux system."
-
-base-directories_package() {
- noarch=yes
-}
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index c693603dfa..35b748c95a 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -9,6 +9,24 @@ short_desc="Void Linux base system files"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.voidlinux.eu"
license="Public domain"
+conf_files="
+ /etc/inputrc
+ /etc/profile
+ /etc/hosts
+ /etc/host.conf
+ /etc/securetty
+ /etc/skel/.bash_profile
+ /etc/skel/.bash_logout
+ /etc/skel/.bashrc
+ /etc/skel/.inputrc
+ /etc/issue
+ /etc/passwd
+ /etc/group
+ /etc/fstab
+ /etc/crypttab
+ /etc/nsswitch.conf"
+noarch="yes"
+depends="base-directories xbps-triggers"
do_install() {
# Install misc config files.
@@ -43,27 +61,3 @@ do_install() {
# Create /proc/self/mounts -> /etc/mtab symlink.
ln -sf /proc/self/mounts ${DESTDIR}/etc/mtab
}
-
-base-files_package() {
- conf_files="
- /etc/inputrc
- /etc/profile
- /etc/hosts
- /etc/host.conf
- /etc/securetty
- /etc/skel/.bash_profile
- /etc/skel/.bash_logout
- /etc/skel/.bashrc
- /etc/skel/.inputrc
- /etc/issue
- /etc/passwd
- /etc/group
- /etc/fstab
- /etc/crypttab
- /etc/nsswitch.conf"
- noarch="yes"
- depends="base-directories xbps-triggers"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template
index d2a6cf676f..6c70dda62e 100644
--- a/srcpkgs/base-system-busybox/template
+++ b/srcpkgs/base-system-busybox/template
@@ -11,6 +11,19 @@ license="GPL-2"
distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
checksum=cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303
+# Applets provided by this busybox version.
+# Keep this list updated with ${FILESDIR}/dotconfig.
+#
+# XXX bzip2 provides libbz2, split it into libbz2 pkg.
+_FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils gawk
+ grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
+ patch powertop procps-ng psmisc rfkill run-parts sed tar
+ traceroute util-linux wget which whois xz"
+for f in ${_FEATURES}; do
+ provides+="${f}-${version}_${revision} "
+ replaces+="${f}>=0 "
+done
+
do_build() {
cp -f ${FILESDIR}/dotconfig .config
if [ "$CROSS_BUILD" ]; then
@@ -30,21 +43,3 @@ do_install() {
755 usr/share/udhcpc default.script
rm -f ${DESTDIR}/{bin,sbin,usr/sbin}
}
-
-base-system-busybox_package() {
- # Applets provided by this busybox version.
- # Keep this list updated with ${FILESDIR}/dotconfig.
- #
- # XXX bzip2 provides libbz2, split it into libbz2 pkg.
- FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils gawk
- grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
- patch powertop procps-ng psmisc rfkill run-parts sed tar
- traceroute util-linux wget which whois xz"
- for f in ${FEATURES}; do
- provides+="${f}-${version}_${revision} "
- replaces+="${f}>=0 "
- done
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
index de627dfd25..5680ad215a 100644
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@@ -1,6 +1,6 @@
# Template file for 'base-system'
pkgname=base-system
-version=0.79
+version=0.80
revision=1
build_style=meta
homepage="http://www.voidlinux.eu/"
@@ -14,22 +14,16 @@ makedepends="
shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools kbd psmisc procps-ng
tzdata pciutils iana-etc systemd dcron?cron-daemon openssh dhcpcd
iproute2 iputils bridge-utils ifenslave iw wpa_supplicant xbps netbsd-wtf
- nvi sudo wifi-firmware linux void-artwork nss-mdns traceroute ethtool parted"
+ nvi sudo wifi-firmware void-artwork nss-mdns traceroute ethtool parted"
-if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- makedepends+=" grub"
-elif [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- makedepends+=" grub-x86_64-efi"
-elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
- # XXX only for Raspberry Pi
- makedepends+=" rpi-base-files rpi-firmware"
-fi
+case "$XBPS_TARGET_MACHINE" in
+ i686) makedepends+=" linux grub";;
+ x86_64) makedepends+=" linux grub-x86_64-efi";;
+esac
-base-system_package() {
- # gcc and glibc shouldn't be direct dependencies.
- for f in ${makedepends}; do
- if [ "$f" != "gcc" -a "$f" != "glibc" ]; then
- depends+=" $f"
- fi
- done
-}
+# gcc and glibc shouldn't be direct dependencies.
+for f in ${makedepends}; do
+ if [ "$f" != "gcc" -a "$f" != "glibc" ]; then
+ depends+=" $f"
+ fi
+done
diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template
index 4a9d533be9..07025bf912 100644
--- a/srcpkgs/base-voidstrap/template
+++ b/srcpkgs/base-voidstrap/template
@@ -2,18 +2,15 @@
pkgname=base-voidstrap
version=0.2
revision=1
+noarch="yes"
build_style=meta
+makedepends="
+ base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep
+ texinfo file sed gawk less util-linux which tar man-pages man-db shadow
+ e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata
+ iana-etc systemd cron-daemon openssh>=6.1p1 xbps netbsd-wtf nvi"
+depends="${makedepends}"
homepage="http://www.voidlinux.eu"
short_desc="Void Linux base system for the voidstrap script"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Public domain"
-
-makedepends="base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep
- texinfo file sed gawk less util-linux which tar man-pages man-db shadow
- e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata
- iana-etc systemd cron-daemon openssh>=6.1p1 xbps netbsd-wtf nvi"
-
-base-voidstrap_package() {
- noarch="yes"
- depends="${makedepends}"
-}
diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template
index 26fd81d5a2..1ca255983c 100644
--- a/srcpkgs/bash-completion/template
+++ b/srcpkgs/bash-completion/template
@@ -2,8 +2,10 @@
pkgname=bash-completion
version=2.1
revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="bash"
+depends="${makedepends}"
short_desc="Programmable completion for the GNU Bash shell"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -24,11 +26,3 @@ post_install() {
rm -f ${DESTDIR}/usr/share/bash-completion/completions/${f}
done
}
-
-bash-completion_package() {
- depends="bash"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index 72141016b9..22ad7218dd 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -21,6 +21,8 @@ configure_args="--without-bash-malloc --with-curses --with-installed-readline
bash_cv_func_strcoll_broken=no bash_cv_func_vsnprintf=yes"
hostmakedepends="bison"
makedepends="readline-devel"
+conflicts="chroot-bash>=0"
+register_shell="/bin/bash"
short_desc="The GNU Bourne Again Shell"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/bash/bash.html"
@@ -46,11 +48,3 @@ pre_configure() {
msg_normal " Applying patch bash${ver}-$p.\n"
done
}
-
-bash_package() {
- conflicts="chroot-bash>=0"
- register_shell="/bin/bash"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bbswitch/template b/srcpkgs/bbswitch/template
index 90690b41f4..6485b03c0c 100644
--- a/srcpkgs/bbswitch/template
+++ b/srcpkgs/bbswitch/template
@@ -3,6 +3,9 @@ pkgname=bbswitch
version=0.7
revision=1
makedepends="dkms"
+depends="dkms"
+dkms_modules="${pkgname} ${version}"
+triggers="dkms"
short_desc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -20,12 +23,3 @@ do_install() {
sed "s,#MODULE_VERSION#,${version}," dkms/dkms.conf > \
${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf
}
-
-bbswitch_package() {
- dkms_modules="${pkgname} ${version}"
- triggers="dkms"
- depends="dkms"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template
index 992b50c35c..e2cd39797d 100644
--- a/srcpkgs/bc/template
+++ b/srcpkgs/bc/template
@@ -27,9 +27,3 @@ long_desc="
do_build() {
make ${makejobs} LEX="flex -I"
}
-
-bc_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bdftopcf/template b/srcpkgs/bdftopcf/template
index c6220d1b42..35701bfd9b 100644
--- a/srcpkgs/bdftopcf/template
+++ b/srcpkgs/bdftopcf/template
@@ -20,9 +20,3 @@ long_desc="
architecture to read them directly without reformatting. This
allows fast reading on the appropriate machine, but the files
are still portable (but read more slowly) on other machines."
-
-bdftopcf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index 68fdb21a0b..f6675dd5c3 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -2,21 +2,15 @@
pkgname=beets
version=1.3.2
revision=1
+noarch="yes"
distfiles="https://github.com/sampsyo/beets/archive/v${version}.tar.gz"
checksum="1946b5e981a2858112b7f3aadb2d5f22c1d1438f2753cfda9996091c5e30520a"
build_style=python-module
hostmakedepends="python-devel"
makedepends="python-distribute"
+depends="python>=2.7 pyyaml python-Unidecode python-musicbrainzngs mutagen>=1.22 python-munkres python-distribute"
+pycompile_module="beets beetsplug"
maintainer="Steven R <strob AT styez DOT com>"
homepage="https://github.com/sampsyo/beets"
license="GPL"
short_desc="Media library management system for obsessive-compulsive music geeks"
-
-beets_package() {
- noarch="yes"
- depends="python>=2.7 pyyaml python-Unidecode python-musicbrainzngs mutagen>=1.22 python-munkres python-distribute"
- pycompile_module="beets beetsplug"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bigreqsproto/template b/srcpkgs/bigreqsproto/template
index 111ed4e4fc..c3843e3433 100644
--- a/srcpkgs/bigreqsproto/template
+++ b/srcpkgs/bigreqsproto/template
@@ -1,20 +1,12 @@
# Template build for 'bigreqsproto'.
pkgname=bigreqsproto
version=1.1.0
-build_style=gnu-configure
revision=2
+noarch="yes"
+build_style=gnu-configure
short_desc="BigReqs extension headers from modular Xorg X11"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd
-long_desc="
- BigReqs extension headers from modular Xorg X11."
-
-bigreqsproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 1353cedf3c..139b92168e 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -8,16 +8,10 @@ hostmakedepends="pkg-config intltool itstool gobject-introspection"
makedepends="libuuid-devel webkitgtk-devel>=2.1.90 gnome-desktop-devel>=3.10
gnome-online-accounts-devel>=3.10 tracker-devel>=0.16.2_2
clutter-gtk-devel>=1.4.4_2 zeitgeist-devel>=0.9.14"
+depends="zeitgeist>=0.9.14 desktop-file-utils"
short_desc="Intuitive note editor with strong GNOME desktop integration"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/Apps/Bijiben"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4
-
-bijiben_package() {
- depends="zeitgeist>=0.9.14 desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bin86/template b/srcpkgs/bin86/template
index 6d29c30086..237eb5cad2 100644
--- a/srcpkgs/bin86/template
+++ b/srcpkgs/bin86/template
@@ -8,8 +8,6 @@ homepage="http://www.debath.co.uk/"
license="GPL-2"
distfiles="http://www.debath.co.uk/dev86/bin86-$version.tar.gz"
checksum=35b99e05395264d0692f8b327f9b4f18de9e483484faa5ccbaa7c9f353d9c30c
-long_desc="
- This package provides a complete 8086 assembler and loader."
do_build() {
make ${makejobs} PREFIX=/usr
@@ -20,9 +18,3 @@ do_install() {
vmkdir usr/share/man/man1
make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man/man1 install
}
-
-bin86_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 18107eabb4..8b8b9a2b7f 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,26 +1,35 @@
# Template file for 'bind'
pkgname=bind
-version=9.9.4
+#_distver=9.9.4
+#_patchver=P2
+#version=${_distver}${_patchver}
+#wrksrc=${pkgname}-${_distver}-${_patchver}
+version=9.9.5
revision=1
short_desc="Berkeley Internet Name Domain server"
maintainer="Juan RP <xtraeme@gmail.com>"
license="ISC"
homepage="http://www.isc.org/software/bind/"
distfiles="http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz"
-checksum=fe0f16653382e428b10282ce9850722d19589d66f2b45a528e98be3153f654c8
-long_desc="
- BIND is by far the most widely used DNS software on the Internet. It provides
- a robust and stable platform on top of which organizations can build
- distributed computing systems with the knowledge that those systems are fully
- compliant with published DNS standards."
+checksum=d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1
-hostmakedepends="automake libtool perl"
-makedepends="openssl-devel mit-krb5-devel libxml2-devel
- libcap-devel readline-devel"
+build_style=gnu-configure
+configure_args="--disable-static --enable-threads --enable-largefile
+ --with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll --with-gost=no
+ --enable-ipv6 --with-randomdev=/dev/urandom --with-ecdsa=yes --with-libtool
+ --with-openssl=$XBPS_CROSS_BASE/usr --with-gssapi=$XBPS_CROSS_BASE/usr
+ --with-libxml2=$XBPS_CROSS_BASE/usr"
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" libxml2-devel"
-fi
+hostmakedepends="automake libtool perl libxml2-devel"
+makedepends="openssl-devel mit-krb5-devel libxml2-devel libcap-devel readline-devel shadow"
+depends="shadow"
+systemd_services="named.service true"
+conf_files="/etc/named/named.conf"
+system_accounts="named"
+named_desc="BIND DNS server"
+named_homedir="/var/named"
+named_shell="/bin/false"
+make_dirs="/var/named 0770 root named"
pre_configure() {
# disable bin tests for now.
@@ -29,27 +38,7 @@ pre_configure() {
autoreconf -fi
}
-do_configure() {
- if [ "$CROSS_BUILD" ]; then
- configure_args+=" --with-openssl=$XBPS_CROSS_BASE
- --with-gssapi=$XBPS_CROSS_BASE
- --with-libxml2=$XBPS_CROSS_BASE"
- fi
-
- ./configure ${configure_args} --disable-static \
- --enable-threads --enable-largefile \
- --with-libtool --enable-atomic --sysconfdir=/etc/named \
- --enable-epoll --with-gost=no --enable-ipv6 \
- --with-randomdev=/dev/urandom --with-ecdsa=yes
-}
-
-do_build() {
- make ${makejobs}
-}
-
-do_install() {
- make DESTDIR=$DESTDIR install
-
+post_install() {
vinstall ${FILESDIR}/named.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named
vinstall ${FILESDIR}/named.conf 640 etc/named
@@ -87,17 +76,3 @@ bind-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-bind_package() {
- systemd_services="named.service true"
- conf_files="/etc/named/named.conf"
- system_accounts="named"
- named_desc="BIND DNS server"
- named_homedir="/var/named"
- named_shell="/bin/false"
- make_dirs="/var/named 0770 root named"
- depends="shadow"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 98517b426c..3fe484fee8 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -2,6 +2,8 @@
pkgname=binutils
version=2.24
revision=1
+bootstrap=yes
+replaces="chroot-binutils>=0"
short_desc="GNU binary utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/binutils/"
@@ -9,13 +11,12 @@ license="GPL-3"
distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
checksum=4930b2886309112c00a279483eaef2f0f8e1b1b62010e0239c16b22af7c346d4
-bootstrap=yes
-
if [ "$CHROOT_READY" ]; then
hostmakedepends="flex perl"
+ makedepends="libfl-devel"
fi
-makedepends="libfl-devel zlib-devel"
+makedepends+=" zlib-devel"
pre_configure() {
# Drop bashism!
@@ -114,10 +115,3 @@ binutils-devel_package() {
vmove usr/lib/libopcodes.so
}
}
-
-binutils_package() {
- replaces="chroot-binutils>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index dd45e70e55..0b049ee2d5 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -4,6 +4,7 @@ version=2.7
revision=1
build_style=gnu-configure
hostmakedepends="perl"
+depends="m4"
short_desc="GNU yacc(1) replacement"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/bison/bison.html"
@@ -13,10 +14,3 @@ checksum=43d8c5c466486031d5e7195a152ff49651ccac91599692e788b5ec5b693ca7fd
long_desc="
Bison is the GNU replacement for yacc(1). Some programs depend on
extensions present in Bison."
-
-bison_package() {
- depends="m4"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 8683442d2f..520554b4cb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -39,22 +39,14 @@ do_install() {
vinstall COPYING 644 usr/share/licenses/$pkgname
}
-bitcoin_package() {
- pkg_install() {
- vmove all
- }
-}
-
if [ -z "$CROSS_BUILD" ]; then
-
-bitcoin-qt_package() {
- depends="desktop-file-utils"
- short_desc+=" - QT GUI"
- pkg_install() {
- vinstall ${wrksrc}/src/bitcoin-qt 755 usr/bin
- vinstall ${wrksrc}/src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications
- vinstall ${wrksrc}/src/share/pixmaps/bitcoin64.xpm 644 usr/share/pixmaps
+ bitcoin-qt_package() {
+ depends="desktop-file-utils"
+ short_desc+=" - QT GUI"
+ pkg_install() {
+ vinstall ${wrksrc}/src/bitcoin-qt 755 usr/bin
+ vinstall ${wrksrc}/src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications
+ vinstall ${wrksrc}/src/share/pixmaps/bitcoin64.xpm 644 usr/share/pixmaps
+ }
}
-}
-
fi # !CROSS_BUILD
diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template
index 1b8b993741..3663f93a77 100644
--- a/srcpkgs/bleachbit/template
+++ b/srcpkgs/bleachbit/template
@@ -2,22 +2,16 @@
pkgname=bleachbit
version=1.0
revision=1
+noarch="yes"
build_style=gnu-makefile
make_install_args="prefix=/usr"
hostmakedepends="desktop-file-utils gtk-update-icon-cache hicolor-icon-theme"
makedepends="pygtk-devel"
+depends="pygtk>=2 ${hostmakedepends}"
+pycompile_dirs="/usr/share/bleachbit"
short_desc="Deletes unneeded files to free disk space and maintain privacy"
maintainer="graysky <graysky AT archlinux DOT us>"
license="GPL3"
homepage="http://bleachbit.sourceforge.net"
distfiles="http://downloads.sourceforge.net/$pkgname/$pkgname-$version.tar.bz2"
checksum=1b18c7ae2eadbe6c799159f2cc04f5b99dfbb8d3b87af61fa7ac192a8ce38162
-
-bleachbit_package() {
- noarch="yes"
- depends="pygtk>=2 desktop-file-utils gtk-update-icon-cache hicolor-icon-theme"
- pycompile_dirs="/usr/share/bleachbit"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index 690c9effc7..68401e9a40 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -1,23 +1,17 @@
# Template file for 'bluefish'
pkgname=bluefish
-version=2.2.4
+version=2.2.5
revision=1
build_style=gnu-configure
configure_args="--enable-spell-check --disable-update-databases --disable-xml-catalog-update"
hostmakedepends="pkg-config intltool"
makedepends="python-devel libxml2-devel gtk+-devel enchant-devel gucharmap-devel xmlcatmgr"
+depends="python hicolor-icon-theme desktop-file-utils xmlcatmgr"
+xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
+pycompile_dirs="/usr/share/bluefish"
short_desc="A powerful HTML editor for experienced web designers and programmers"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://bluefish.openoffice.nl/"
distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
-checksum=771621d848af6342fbab50a52bc7d6fddb29c4616f31ab939c508175c146b3a3
-
-bluefish_package() {
- xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --"
- pycompile_dirs="/usr/share/bluefish"
- depends="python hicolor-icon-theme desktop-file-utils xmlcatmgr"
- pkg_install() {
- vmove all
- }
-}
+checksum=7fbd0b51b32fceae2c0074e03be547b44b74ca9be17b883ce720b1a5f49eaef2
diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template
index 195b255a7c..d0f91f3ed6 100644
--- a/srcpkgs/blueman/template
+++ b/srcpkgs/blueman/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--enable-polkit=yes --enable-hal=no"
makedepends="intltool Pyrex libbluetooth-devel startup-notification-devel
gtk+-devel pygtk-devel bluez notify-python dbus-python obexd"
+depends="pygtk desktop-file-utils hicolor-icon-theme bluez notify-python dbus-python obexd"
+pycompile_module="blueman"
short_desc="GTK+ Bluetooth Manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://blueman-project.org/"
@@ -22,13 +24,3 @@ long_desc="
* Connecting to audio devices
* Sending/Receiving/Browsing files via OBEX
* Pairing"
-
-blueman_package() {
- pycompile_module="blueman"
- depends="pygtk desktop-file-utils hicolor-icon-theme
- bluez notify-python dbus-python obexd"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 422cf03915..bc652e108c 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,6 +1,6 @@
# Template file for 'bluez'
pkgname=bluez
-version=5.13
+version=5.14
revision=1
build_style=gnu-configure
configure_args="--with-udevdir=/usr/lib/udev
@@ -9,12 +9,18 @@ configure_args="--with-udevdir=/usr/lib/udev
hostmakedepends="pkg-config flex"
makedepends="libglib-devel libudev-devel>=183 dbus-devel systemd-devel
cups-devel libical-devel readline-devel"
+conf_files="/etc/bluetooth/main.conf"
+systemd_services="bluetooth.service true"
short_desc="Bluetooth tools and daemons"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.bluez.org/"
license="GPL-2"
distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=4581beedde485246b16e2b4665d60f3fe041284b5d5afc3a0a818604ad525ad3
+checksum=5a485837c215f3093d3a98cb412dc99e1139f88a66c8809bdf183ad5e676395f
+
+post_install() {
+ vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth
+}
libbluetooth_package() {
short_desc="Library to use the Bluez Linux Bluetooth Stack"
@@ -39,12 +45,3 @@ bluez-cups_package() {
vmove usr/lib/cups/backend/bluetooth
}
}
-
-bluez_package() {
- conf_files="/etc/bluetooth/main.conf"
- systemd_services="bluetooth.service true"
- pkg_install() {
- vmove all
- vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth
- }
-}
diff --git a/srcpkgs/bokken/template b/srcpkgs/bokken/template
index c363efa4d9..ac384b6e1d 100644
--- a/srcpkgs/bokken/template
+++ b/srcpkgs/bokken/template
@@ -9,7 +9,10 @@ homepage="http://inguma.eu/projects/bokken/"
distfiles="http://inguma.eu/attachments/download/197/${pkgname}-${version}.tar.gz"
checksum=4770602585b3e77b2977a8a6906c91ae0d64373eae328f42688106224c8bbc12
+noarch="yes"
makedepends="pygtk pygtksourceview radare2 r2-bindings"
+depends="${makedepends}"
+pycompile_dirs="/usr/lib/bokken"
do_install() {
vmkdir usr/lib/bokken
@@ -17,12 +20,3 @@ do_install() {
cp -rf * ${DESTDIR}/usr/lib/bokken
ln -frs ${DESTDIR}/usr/lib/bokken/bokken.py ${DESTDIR}/usr/bin/bokken
}
-
-bokken_package() {
- noarch="yes"
- pycompile_dirs="/usr/lib/bokken"
- depends="${makedepends}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 43c8b52eaa..7860e19bc3 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -107,9 +107,3 @@ boost-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-boost_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bootchart/template b/srcpkgs/bootchart/template
index ba7d15654f..48da79e00f 100644
--- a/srcpkgs/bootchart/template
+++ b/srcpkgs/bootchart/template
@@ -16,9 +16,3 @@ long_desc="
by passing \"init=/usr/sbin/bootchartd\" to the kernel. Bootchart will then fork
init off to resume normal system startup, while monitoring and logging
startup information in the background."
-
-bootchart_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/boxfs/template b/srcpkgs/boxfs/template
index fb7ab5ae48..8120a165f3 100644
--- a/srcpkgs/boxfs/template
+++ b/srcpkgs/boxfs/template
@@ -6,7 +6,6 @@ short_desc="FUSE-based filesystem that lets you mount your box.net account to a
maintainer="pancake <pancake@nopcode.org>"
license="GPL-2"
homepage="https://code.google.com/p/boxfs/"
-
hostmakedepends="pkg-config subversion"
makedepends="libxml2-devel libzip-devel libapp-devel fuse-devel libcurl-devel"
@@ -22,9 +21,3 @@ do_build() {
do_install() {
vinstall boxfs 755 usr/bin
}
-
-boxfs_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index a139a83cf4..bfd964c109 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -9,6 +9,7 @@ hostmakedepends="pkg-config intltool which gnome-doc-utils
makedepends="gst-plugins-base1-devel totem-pl-parser-devel>=3.10 libnotify-devel
libcanberra-devel nautilus-devel>=3.10 tracker-devel>=0.16_2 libisofs-devel
libburn-devel libSM-devel cdrtools dconf-devel"
+depends="cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
short_desc="Application to burn CD/DVD for the Gnome Desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org/projects/brasero"
@@ -38,10 +39,3 @@ brasero-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-brasero_package() {
- depends="cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bridge-utils/template b/srcpkgs/bridge-utils/template
index a78cb3aeb9..4199d12ae4 100644
--- a/srcpkgs/bridge-utils/template
+++ b/srcpkgs/bridge-utils/template
@@ -14,9 +14,3 @@ checksum=42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688
pre_configure() {
autoreconf -fi
}
-
-bridge-utils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bsdbuild/template b/srcpkgs/bsdbuild/template
index 4ee5fa1171..ce8a0d2864 100644
--- a/srcpkgs/bsdbuild/template
+++ b/srcpkgs/bsdbuild/template
@@ -2,9 +2,11 @@
pkgname=bsdbuild
version=3.0
revision=1
+noarch="yes"
build_style=gnu-configure
configure_args="--with-manpages --with-manlinks"
hostmakedepends="groff perl"
+depends="perl"
short_desc="Simple, self-contained and portable build system"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://hypertriton.com/bsdbuild/"
@@ -30,11 +32,3 @@ pre_install() {
vmkdir usr/share/man/man1
vmkdir usr/share/man/man5
}
-
-bsdbuild_package() {
- depends="perl"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bspwm-git/template b/srcpkgs/bspwm-git/template
index 250ee22d15..212b76a03a 100644
--- a/srcpkgs/bspwm-git/template
+++ b/srcpkgs/bspwm-git/template
@@ -2,31 +2,19 @@
pkgname=bspwm-git
version=20131221
revision=1
+build_style=gnu-makefile
makedepends="libxcb-devel xcb-util-devel xcb-util-wm-devel"
short_desc="A tiling window manager based on binary space partitioning"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="BSD"
homepage="https://github.com/baskerville/bspwm"
-
do_fetch() {
local url="git://github.com/baskerville/bspwm"
msg_normal "Fetching source from $url ...\n"
git clone ${url} ${pkgname}-${version}
}
-do_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
}
-
-bspwm-git_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index e9234a59f2..4b47b386f5 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -38,9 +38,3 @@ libbtrfs-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-btrfs-progs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template
index 33d3bbb5eb..a4a91681a4 100644
--- a/srcpkgs/buildbot-slave/template
+++ b/srcpkgs/buildbot-slave/template
@@ -2,8 +2,12 @@
pkgname=buildbot-slave
version=0.8.8
revision=1
+noarch="yes"
build_style=python-module
-makedepends="python Twisted"
+hostmakedepends="python"
+makedepends="Twisted"
+depends="${makedepends}"
+pycompile_module="buildslave"
short_desc="BuildBot Slave Daemon"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://trac.buildbot.net/"
@@ -25,12 +29,3 @@ long_desc="
This package contains only the buildslave implementation. The buildbot master
is available in the buildbot package."
-
-buildbot-slave_package() {
- noarch="yes"
- pycompile_module="buildslave"
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index d82bff0ccf..53ce525450 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -2,8 +2,12 @@
pkgname=buildbot
version=0.8.8
revision=1
+noarch="yes"
build_style=python-module
+hostmakedepends="python"
makedepends="python python-jinja sqlalchemy-migrate python-simplejson Twisted"
+depends="${makedepends}"
+pycompile_module="buildbot"
short_desc="A system to automate the compile/test cycle"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://trac.buildbot.net/"
@@ -30,12 +34,3 @@ post_install() {
vmkdir usr/share/buildbot/contrib
install -m755 ${wrksrc}/contrib/*.py ${contribdir}
}
-
-buildbot_package() {
- noarch="yes"
- pycompile_module="buildbot"
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bumblebee/template b/srcpkgs/bumblebee/template
index aa4dba6157..3d0eca6d60 100644
--- a/srcpkgs/bumblebee/template
+++ b/srcpkgs/bumblebee/template
@@ -3,11 +3,21 @@ pkgname=bumblebee
version=3.2.1
revision=1
build_style=gnu-configure
-configure_args="CONF_DRIVER_MODULE_NVIDIA=nvidia
-CONF_LDPATH_NVIDIA=/usr/lib
-CONF_MODPATH_NVIDIA=/usr/lib/xorg/modules --sbindir=/usr/bin
---with-udev-rules=/usr/lib/udev/rules.d/ --without-pidfile"
+configure_args="
+ CONF_DRIVER_MODULE_NVIDIA=nvidia
+ CONF_LDPATH_NVIDIA=/usr/lib
+ CONF_MODPATH_NVIDIA=/usr/lib/xorg/modules
+ --sbindir=/usr/bin
+ --with-udev-rules=/usr/lib/udev/rules.d/
+ --without-pidfile"
makedepends="pkg-config help2man VirtualGL-devel glib-devel MesaLib-devel"
+depends="VirtualGL"
+systemd_services="bumblebeed.service true"
+conf_files="
+ /etc/bumblebee/bumblebee.conf
+ /etc/bumblebee/xorg.conf.nouveau
+ /etc/bumblebee/xorg.conf.nvidia"
+system_groups="bumblebee"
short_desc="NVIDIA Optimus support for Linux through VirtualGL"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.bumblebee-project.org/"
@@ -29,16 +39,3 @@ post_install() {
mv -v ${DESTDIR}/etc/bash_completion.d/bumblebee \
${DESTDIR}/usr/share/bash-completion/completions/optirun
}
-
-
-bumblebee_package() {
- depends="VirtualGL"
- systemd_services="bumblebeed.service true"
- conf_files="/etc/bumblebee/bumblebee.conf
- /etc/bumblebee/xorg.conf.nouveau
- /etc/bumblebee/xorg.conf.nvidia"
- system_groups="bumblebee"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 2fc46491d8..e6c2046445 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -27,9 +27,3 @@ do_install() {
vinstall busybox 755 usr/bin
vinstall docs/busybox.1 644 usr/share/man/man1
}
-
-busybox_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bwidget/template b/srcpkgs/bwidget/template
index 224b7319be..6e7f240810 100644
--- a/srcpkgs/bwidget/template
+++ b/srcpkgs/bwidget/template
@@ -2,6 +2,9 @@
pkgname=bwidget
version=1.9.6
revision=2
+noarch=yes
+makedepends="tk>=8.6"
+depends="${makedepends}"
short_desc="Set of extension widgets for Tcl/Tk"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://tcllib.sourceforge.net/"
@@ -9,7 +12,6 @@ license="tcl/tk"
distfiles="${SOURCEFORGE_SITE}/tcllib/BWidget/$version/${pkgname}-${version}.tar.gz"
checksum=155e9cf2c6973956a0bbde450f2df358ce1eb97a2b2950d0681a36f861e67553
-
do_install() {
local _tclversion=8.6
@@ -19,11 +21,3 @@ do_install() {
$DESTDIR/usr/lib/tcl$_tclversion/BWidget
rmdir $DESTDIR/usr/lib/tcl8.6/$pkgname-$version
}
-
-bwidget_package() {
- noarch=yes
- depends="tk>=8.6"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bzip2/template b/srcpkgs/bzip2/template
index 471320ebb2..bd295a5d8f 100644
--- a/srcpkgs/bzip2/template
+++ b/srcpkgs/bzip2/template
@@ -3,6 +3,7 @@ pkgname=bzip2
version=1.0.6
revision=7
bootstrap=yes
+replaces="chroot-bzip2>=0"
homepage="http://www.bzip.org"
distfiles="http://www.bzip.org/$version/$pkgname-$version.tar.gz"
short_desc="The bzip2 compression library"
@@ -48,10 +49,3 @@ bzip2-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-bzip2_package() {
- replaces="chroot-bzip2>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/bzr/template b/srcpkgs/bzr/template
index 1624aa7e39..ead7fc2b47 100644
--- a/srcpkgs/bzr/template
+++ b/srcpkgs/bzr/template
@@ -5,6 +5,8 @@ revision=1
build_style=python-module
hostmakedepends="Cython"
makedepends="zlib-devel python-devel ca-certificates"
+depends="ca-certificates"
+pycompile_module="bzrlib"
short_desc="Distributed version control system that Just Works"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -15,11 +17,3 @@ checksum=0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0
pre_install() {
sed -i -e "s|man/man1|share/man/man1|" setup.py
}
-
-bzr_package() {
- pycompile_module="bzrlib"
- depends="ca-certificates"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template
index 5dd9b1fcbf..1912f1a594 100644
--- a/srcpkgs/bzrtools/template
+++ b/srcpkgs/bzrtools/template
@@ -3,22 +3,14 @@ pkgname=bzrtools
version=2.4.1
wrksrc=$pkgname
revision=1
+noarch="yes"
build_style=python-module
makedepends="python bzr"
+depends="${makedepends}"
+pycompile_module="bzrlib/plugins/bzrtools"
homepage="http://bazaar-vcs.org/BzrTools"
license="GPL-2"
distfiles="http://launchpad.net/$pkgname/stable/$version/+download/$pkgname-$version.tar.gz"
short_desc="Plugin providing a collection of utilities for bzr"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=f62771dd221ad820e0363386608985e282cb88b52b5a6f0ed7b7fb2e99804def
-long_desc="
- This is a plugin providing a collection of utilities for bzr."
-
-bzrtools_package() {
- noarch="yes"
- pycompile_module="bzrlib/plugins/bzrtools"
- depends="${makedepends}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template
index e81fd888b3..8930b6df60 100644
--- a/srcpkgs/c-ares/template
+++ b/srcpkgs/c-ares/template
@@ -19,9 +19,3 @@ c-ares-devel_package() {
vmove usr/share/man
}
}
-
-c-ares_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 88fae67181..9f4d448fc8 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -3,7 +3,11 @@ pkgname=ca-certificates
version=20130906
revision=2
wrksrc="${pkgname}"
+noarch="yes"
hostmakedepends="python openssl run-parts"
+makedepends="openssl run-parts"
+depends="${makedepends}"
+conf_files="/etc/ca-certificates.conf"
short_desc="Common CA certificates"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://packages.qa.debian.org/c/ca-certificates.html"
@@ -28,12 +32,3 @@ do_install() {
cd ${DESTDIR}/usr/share/ca-certificates
find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
}
-
-ca-certificates_package() {
- conf_files="/etc/ca-certificates.conf"
- depends="openssl run-parts"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cabextract/template b/srcpkgs/cabextract/template
index adec2773de..0753bd6637 100644
--- a/srcpkgs/cabextract/template
+++ b/srcpkgs/cabextract/template
@@ -9,11 +9,3 @@ license="GPL-3"
homepage="http://www.cabextract.org.uk/"
distfiles="http://www.cabextract.org.uk/${pkgname}-${version}.tar.gz"
checksum=f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e
-long_desc="
- A program to extract Microsoft cabinet (.CAB) files."
-
-cabextract_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 8fb38f3487..db19a28123 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -9,6 +9,7 @@ makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
libical-devel libxklavier-devel zeitgeist-devel libsensors-devel
upower-devel cairo-dock-devel>=3.3.1_2 gnome-menus-devel webkitgtk-devel
vte3-devel vala-devel python-devel python3-devel"
+depends="cairo-dock>=${version}"
short_desc="Plugins for cairo-dock"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -39,10 +40,3 @@ cairo-dock-plugins-vala_package() {
vmove usr/share/vala
}
}
-
-cairo-dock-plugins_package() {
- depends="cairo-dock>=${version}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cairo-dock/template b/srcpkgs/cairo-dock/template
index 5920437f6a..6523a91ff6 100644
--- a/srcpkgs/cairo-dock/template
+++ b/srcpkgs/cairo-dock/template
@@ -6,6 +6,7 @@ build_style=cmake
configure_args="-Denable-desktop-manager=ON"
hostmakedepends="cmake pkg-config"
makedepends="libcurl-devel dbus-glib-devel libXtst-devel gtk+3-devel librsvg-devel glu-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="Light eye-candy fully themable animated dock"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -29,10 +30,3 @@ libgldi_package() {
vmove "usr/lib/*.so.*"
}
}
-
-cairo-dock_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 747b86ecaf..5fa8f4679c 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -24,6 +24,7 @@ long_desc="
hostmakedepends="which automake libtool pkg-config"
makedepends="libpng-devel>=1.6 fontconfig-devel pixman-devel>=0.28 libXrender-devel>=0.9.7_3 libglib-devel"
+depends="pixman>=0.28"
pre_configure() {
autoreconf -fi
@@ -70,10 +71,3 @@ cairo-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-cairo_package() {
- depends="pixman>=0.28"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cairomm/template b/srcpkgs/cairomm/template
index 7e6d361db6..a0738739f4 100644
--- a/srcpkgs/cairomm/template
+++ b/srcpkgs/cairomm/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libsigc++-devel fontconfig-devel
libpng-devel>=1.6 libXrender-devel cairo-devel>=1.12.14_6"
+depends="cairo>=1.12.14_6"
short_desc="C++ bindings to Cairo vector graphics library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.cairographics.org"
@@ -27,10 +28,3 @@ cairomm-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-cairomm_package() {
- depends="cairo>=1.12.14_6"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index ca15ae2853..af73463286 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -7,6 +7,7 @@ configure_args="--enable-experimental"
makedepends="expat-devel dssi-devel jack-devel glib-devel gtk+-devel
libglade-devel cairo-devel ladish-devel>=1_3
ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme"
+depends="ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme"
homepage="http://calf.sourceforge.net"
short_desc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host"
maintainer="davehome <davehome@redthumb.info.tm>"
@@ -19,10 +20,3 @@ long_desc="
multitrack software, as software replacement for instruments and guitar stomp
boxes (and not as single modules in a modular synthesizer, which was a primary
design goal in some other open source plugin packages)."
-
-calf_package() {
- depends="ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template
index 3e2707dca2..8aa5afbee3 100644
--- a/srcpkgs/cantarell-fonts/template
+++ b/srcpkgs/cantarell-fonts/template
@@ -2,9 +2,11 @@
pkgname=cantarell-fonts
version=0.0.15
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="fontconfig"
+depends="${makedepends}"
short_desc="Cantarell family of TrueType fonts"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://abattis.org/cantarell/"
@@ -21,11 +23,3 @@ post_install() {
vinstall ${FILESDIR}/21-cantarell-hinting.conf 644 etc/fonts/conf.avail
ln -s ../conf.avail/21-cantarell-hinting.conf ${DESTDIR}/etc/fonts/conf.d
}
-
-cantarell-fonts_package() {
- depends="fontconfig"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template
index 83276c6557..ae6d6a761e 100644
--- a/srcpkgs/caribou/template
+++ b/srcpkgs/caribou/template
@@ -8,6 +8,8 @@ hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection"
makedepends="
vala-devel>=0.20 libxklavier-devel libgee08-devel pygobject-devel
clutter-devel gtk+3-devel libXtst-devel gir-freedesktop"
+depends="pygobject pyatspi dbus-python gir-freedesktop at-spi2-atk desktop-file-utils"
+pycompile_module="$pkgname"
short_desc="An alternative to the Gnome On-screen Keyboard"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -35,11 +37,3 @@ caribou-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-caribou_package() {
- depends="pygobject pyatspi dbus-python gir-freedesktop at-spi2-atk desktop-file-utils"
- pycompile_module="$pkgname"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/catalyst/files/arch_3.13_kernel_acpi_node.patch b/srcpkgs/catalyst/files/arch_3.13_kernel_acpi_node.patch
new file mode 100644
index 0000000000..ca26556d3c
--- /dev/null
+++ b/srcpkgs/catalyst/files/arch_3.13_kernel_acpi_node.patch
@@ -0,0 +1,13 @@
+--- 13.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-11-22 19:52:37.000000000 +0100
++++ 13.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-11-25 11:48:51.227678982 +0100
+@@ -778,7 +778,9 @@
+ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
+ {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
++ pInfo->video_handle = pInfo->pcidev->dev.acpi_node.companion;
++ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+ pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
+ #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+ pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
diff --git a/srcpkgs/catalyst/files/lano1106_fglrx-13.8_proc.patch b/srcpkgs/catalyst/files/lano1106_fglrx-13.8_proc.patch
new file mode 100644
index 0000000000..e2ec7c30d0
--- /dev/null
+++ b/srcpkgs/catalyst/files/lano1106_fglrx-13.8_proc.patch
@@ -0,0 +1,50 @@
+--- 13.8/common/lib/modules/fglrx/build_mod/firegl_public.c 2013-09-26 00:59:28.292596334 -0400
++++ 13.8/common/lib/modules/fglrx/build_mod/firegl_public.c 2013-09-26 01:02:35.036252455 -0400
+@@ -821,7 +821,7 @@ static struct proc_dir_entry *firegl_pro
+ KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
+ if (!minor)
+ {
+- root = KCL_create_proc_dir(NULL, "ati", S_IRUGO|S_IXUGO);
++ root = KCL_create_proc_dir(NULL, "ati", 0);
+ }
+
+ if (!root)
+@@ -835,7 +835,7 @@ static struct proc_dir_entry *firegl_pro
+ // Global major debice number entry and Global debug entry
+ while (globallist->rp || globallist->fops)
+ {
+- ent = KCL_create_proc_entry(root, globallist->name, S_IFREG|S_IRUGO, globallist->fops, globallist->rp, globallist->wp, dev);
++ ent = KCL_create_proc_entry(root, globallist->name, 0, globallist->fops, globallist->rp, globallist->wp, dev);
+ if (!ent)
+ {
+ KCL_remove_proc_dir_entry(NULL, "ati");
+@@ -847,7 +847,7 @@ static struct proc_dir_entry *firegl_pro
+ }
+
+ sprintf(name, "%d", minor);
+- *dev_root = KCL_create_proc_dir(root, name, S_IRUGO|S_IXUGO);
++ *dev_root = KCL_create_proc_dir(root, name, 0);
+ if (!*dev_root) {
+ KCL_remove_proc_dir_entry(root, "major");
+ KCL_remove_proc_dir_entry(NULL, "ati");
+@@ -857,7 +857,7 @@ static struct proc_dir_entry *firegl_pro
+
+ while (list->rp || list->fops)
+ {
+- ent = KCL_create_proc_entry(*dev_root, list->name, S_IFREG|S_IRUGO, list->fops, list->rp, list->wp,
++ ent = KCL_create_proc_entry(*dev_root, list->name, 0, list->fops, list->rp, list->wp,
+ ((dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev)));
+ if (!ent)
+ {
+@@ -6358,9 +6358,9 @@ void * KCL_create_proc_dir(void *root_di
+ dir = create_proc_entry(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
+ #else
+ if (root_dir == NULL)
+- dir = proc_mkdir_mode(name, S_IFDIR | access, NULL);
++ dir = proc_mkdir_mode(name, access, NULL);
+ else
+- dir = proc_mkdir_mode(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
++ dir = proc_mkdir_mode(name, access, (struct proc_dir_entry *)root_dir);
+ #endif
+
+ return dir;
diff --git a/srcpkgs/catalyst/files/lano1106_fglrx_intel_iommu.patch b/srcpkgs/catalyst/files/lano1106_fglrx_intel_iommu.patch
new file mode 100644
index 0000000000..101654c41c
--- /dev/null
+++ b/srcpkgs/catalyst/files/lano1106_fglrx_intel_iommu.patch
@@ -0,0 +1,11 @@
+--- 13.4/common/lib/modules/fglrx/build_mod/firegl_public.c 2013-04-16 23:29:55.000000000 +0200
++++ 13.4/common/lib/modules/fglrx/build_mod/firegl_public.c 2013-05-21 17:05:34.726681102 +0200
+@@ -93,7 +93,7 @@
+ and they use different config options. These options can only be enabled
+ on x86_64 with newer 2.6 kernels (2.6.23 for intel, 2.6.26 for amd).
+ */
+-#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_DMAR)
++#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_INTEL_IOMMU)
+ #define FIREGL_DMA_REMAPPING
+ #endif
+
diff --git a/srcpkgs/catalyst/files/lano1106_kcl_agp_13_4.patch b/srcpkgs/catalyst/files/lano1106_kcl_agp_13_4.patch
new file mode 100644
index 0000000000..d39c5aaeb1
--- /dev/null
+++ b/srcpkgs/catalyst/files/lano1106_kcl_agp_13_4.patch
@@ -0,0 +1,90 @@
+--- 13.4/common/lib/modules/fglrx/build_mod/kcl_agp.c 2013-05-24 16:45:52.236740084 -0400
++++ 13.4/common/lib/modules/fglrx/build_mod/kcl_agp.c 2013-05-24 16:49:29.283579408 -0400
+@@ -56,6 +56,43 @@ unsigned int KCL_AGP_IsInUse(void)
+ return kcl_agp_is_in_use;
+ }
+
++/** \brief Find AGP caps registers in PCI config space
++ ** \param dev PCI device handle
++ ** \return Positive register index on success, negative errno on error
++ */
++int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
++{
++ u8 capndx;
++ u32 cap_id;
++
++ if (!dev)
++ {
++ return -ENODEV;
++ }
++
++ pci_read_config_byte((struct pci_dev*)dev, 0x34, &capndx);
++
++ if (capndx == 0x00)
++ {
++ return -ENODATA;
++ }
++
++ do
++ { // search capability list for AGP caps
++ pci_read_config_dword((struct pci_dev*)dev, capndx, &cap_id);
++
++ if ((cap_id & 0xff) == 0x02)
++ {
++ return capndx;
++ }
++
++ capndx = (cap_id >> 8) & 0xff;
++ }
++ while (capndx != 0x00);
++
++ return -ENODATA;
++}
++
+ #if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
+
+ typedef struct {
+@@ -272,43 +309,6 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned
+ }
+ }
+
+-/** \brief Find AGP caps registers in PCI config space
+- ** \param dev PCI device handle
+- ** \return Positive register index on success, negative errno on error
+- */
+-int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
+-{
+- u8 capndx;
+- u32 cap_id;
+-
+- if (!dev)
+- {
+- return -ENODEV;
+- }
+-
+- pci_read_config_byte((struct pci_dev*)dev, 0x34, &capndx);
+-
+- if (capndx == 0x00)
+- {
+- return -ENODATA;
+- }
+-
+- do
+- { // search capability list for AGP caps
+- pci_read_config_dword((struct pci_dev*)dev, capndx, &cap_id);
+-
+- if ((cap_id & 0xff) == 0x02)
+- {
+- return capndx;
+- }
+-
+- capndx = (cap_id >> 8) & 0xff;
+- }
+- while (capndx != 0x00);
+-
+- return -ENODATA;
+-}
+-
+ /** \brief Get AGP caps
+ ** \param dev PCI device handle
+ ** \param caps pointer to caps vector
diff --git a/srcpkgs/catalyst/files/looks_like_amd_forgot_this.patch b/srcpkgs/catalyst/files/looks_like_amd_forgot_this.patch
new file mode 100644
index 0000000000..03bc705ec9
--- /dev/null
+++ b/srcpkgs/catalyst/files/looks_like_amd_forgot_this.patch
@@ -0,0 +1,17 @@
+--- 13.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-17 20:05:35.000000000 +0100
++++ 13.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-19 18:40:18.386568588 +0100
+@@ -995,7 +995,11 @@
+ #endif
+ {
+ return KCL_ACPI_ERROR;
+- }
++ }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
++ ((acpi_tbl_table_handler)handler)(hdr);
++#else
+ ((acpi_table_handler)handler)(hdr);
++#endif
+ return KCL_ACPI_OK;
+-}
++}
+\ No newline at end of file
diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template
index 5f56fd0769..3e7cb50aa7 100644
--- a/srcpkgs/catalyst/template
+++ b/srcpkgs/catalyst/template
@@ -1,18 +1,26 @@
# Template file for 'catalyst'
+_desc="AMD catalyst driver for Linux"
+
pkgname=catalyst
-version=13.9
-revision=1
-short_desc="AMD catalyst driver for Linux"
+version=13.12
+revision=2
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary AMD license"
homepage="http://www.amd.com"
only_for_archs="i686 x86_64"
+hostmakedepends="unzip wget"
+depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision}"
+conflicts="nvidia>=0"
+short_desc="${_desc} - Libraries and Utilities"
+nonfree=yes
create_wrksrc=yes
-makedepends="unzip"
-distfiles=http://www2.ati.com/drivers/linux/amd-catalyst-${version}-linux-x86.x86_64.zip
-checksum=ebade5062713c69d2b703b0a3f62defc409d58e98ceab3bfac7a71643c0c4cd3
+XBPS_FETCH_CMD="wget --referer='http://support.amd.com/en-us/download/desktop?os=Linux+x86' "
+
+distfiles="http://www2.ati.com/drivers/linux/amd-catalyst-${version}-linux-x86.x86_64.zip"
+checksum=024033f4847d1c2a182fc44e0b3df29b2d133e24aeaba390f4504a8f3361a0ca
+
if [ "$XBPS_MACHINE" = "i686" ]; then
_ARCHDIR="x86"
@@ -27,11 +35,19 @@ do_build() {
./amd-catalyst-*.run --extract fglrx
}
+pre_install() {
+ cd ${wrksrc}/fglrx
+
+ for f in ${FILESDIR}/*.patch; do
+ patch -Np1 -i $f
+ done
+}
+
do_install() {
cd ${wrksrc}/fglrx
install -dm755 ${DESTDIR}/usr/{bin,sbin}
- install -dm755 ${DESTDIR}/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system}
+ install -dm755 ${DESTDIR}/usr/lib/{dri,xorg/modules/{drivers,extensions/fglrx,linux},systemd/system}
install -dm755 ${DESTDIR}/usr/include/GL
install -dm755 ${DESTDIR}/etc/{ati,acpi/events,security/console.apps}
install -dm755 ${DESTDIR}/usr/share/{applications,ati/amdcccle,man/man8,pixmaps}
@@ -54,8 +70,8 @@ do_install() {
cd ${wrksrc}/fglrx/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
- install -m755 modules/dri/fglrx_dri.so ${DESTDIR}/usr/lib/xorg/modules/dri/
- ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so ${DESTDIR}/usr/lib/dri/
+ install -m755 modules/dri/fglrx_dri.so ${DESTDIR}/usr/lib/xorg/modules/drivers/
+ ln -sfr ${DESTDIR}/usr/lib/xorg/modules/drivers/fglrx_dri.so ${DESTDIR}/usr/lib/dri/fglrx_dri.so
install -m755 fglrx/fglrx-libGL.so.1.2 ${DESTDIR}/usr/lib/
install -m755 *.so* ${DESTDIR}/usr/lib/
install -m644 libAMDXvBA.cap ${DESTDIR}/usr/lib/
@@ -100,8 +116,9 @@ do_install() {
}
catalyst-dkms_package() {
- short_desc+=" - DKMS kernel module"
+ short_desc="${_desc} - DKMS kernel module"
triggers="dkms"
+ depends="dkms"
dkms_modules="fglrx ${version}_${revision}"
nonfree=yes
pkg_install() {
@@ -126,8 +143,8 @@ catalyst-dkms_package() {
}
catalyst-opencl_package() {
- short_desc+=" - OpenCL implementation"
- provides="libOpenCL-${version}"
+ short_desc="${_desc} - OpenCL implementation"
+ provides="libOpenCL-${version}_${revision}"
replaces="libOpenCL>=0"
nonfree=yes
noverifyrdeps=yes
@@ -146,13 +163,3 @@ catalyst-opencl_package() {
ln -s libOpenCL.so.1 ${PKGDESTDIR}/usr/lib/libOpenCL.so
}
}
-
-catalyst_package() {
- short_desc+=" - Libraries and Utilities"
- depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision}"
- conflicts="nvidia>=0"
- nonfree=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 49566df57e..27de688f0d 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -18,9 +18,3 @@ post_install() {
ln -sfr ${DESTDIR}/usr/bin/ccache ${DESTDIR}/usr/lib/ccache/bin/${f}
done
}
-
-ccache_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index 4be121a6bc..07a5b931c6 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel>=1.54 pcre-devel libcurl-devel libquvi-devel>=0.4.1_4 glibmm-devel"
+depends="libquvi>=0.4.1_4"
short_desc="Commandline downloader for popular video websites"
maintainer="Juan RP <xtraeme@gmail.com>"
license="AGPL-3"
@@ -15,10 +16,3 @@ checksum=586a120faddcfa16f5bb058b5c901f1659336c6fc85a0d3f1538882a44ee10e1
do_configure() {
./configure ${configure_args} boost_cv_rpath_link_ldflag="-L/usr/lib"
}
-
-cclive_package() {
- depends="libquvi>=0.4.1_4"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cd-discid/template b/srcpkgs/cd-discid/template
new file mode 100644
index 0000000000..5ab0c906f6
--- /dev/null
+++ b/srcpkgs/cd-discid/template
@@ -0,0 +1,11 @@
+# Template file for 'cd-discid'
+pkgname=cd-discid
+version=1.4
+revision=2
+build_style="gnu-makefile"
+maintainer="Philipp Hirsch <itself@hanspolo.net>"
+license="GPL-2"
+homepage="http://linukz.org/cd-discid.shtml"
+short_desc="An utility to get CDDB discid information from a CD-ROM disc"
+distfiles="http://linukz.org/download/${pkgname}-${version}.tar.gz"
+checksum=ffd68cd406309e764be6af4d5cbcc309e132c13f3597c6a4570a1f218edd2c63
diff --git a/srcpkgs/cdparanoia/template b/srcpkgs/cdparanoia/template
index 8250b9211b..f02d0082bd 100644
--- a/srcpkgs/cdparanoia/template
+++ b/srcpkgs/cdparanoia/template
@@ -40,9 +40,3 @@ cdparanoia-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-cdparanoia_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cdrtools/template b/srcpkgs/cdrtools/template
index 01a8fe1df3..b7e4c24db5 100644
--- a/srcpkgs/cdrtools/template
+++ b/srcpkgs/cdrtools/template
@@ -6,6 +6,7 @@ build_style=gnu-makefile
make_build_args="CCOM=gcc RUNPATH= LDPATH= NOWARN=true"
make_install_args="INS_BASE=/usr MANDIR=/man"
makedepends="acl-devel"
+conf_files="/etc/default/rscsi /etc/default/cdrecord"
short_desc="Highly portable CD/DVD/BluRay command line recording software"
homepage="http://cdrecord.berlios.de/"
license="CDDL"
@@ -34,10 +35,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/include
rm -rf ${DESTDIR}/usr/lib/lib* ${DESTDIR}/usr/lib/profiled
}
-
-cdrtools_package() {
- conf_files="/etc/default/rscsi /etc/default/cdrecord"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/celt/template b/srcpkgs/celt/template
index 4f3ce5e669..03a2486bcf 100644
--- a/srcpkgs/celt/template
+++ b/srcpkgs/celt/template
@@ -31,9 +31,3 @@ celt-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-celt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/celt051/template b/srcpkgs/celt051/template
index 2500001ec4..5a4679ed9d 100644
--- a/srcpkgs/celt051/template
+++ b/srcpkgs/celt051/template
@@ -32,9 +32,3 @@ celt051-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-celt051_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template
index f1c13b27dd..6a40b1ec47 100644
--- a/srcpkgs/cgminer/template
+++ b/srcpkgs/cgminer/template
@@ -1,20 +1,21 @@
# Template file for 'cgminer'
pkgname=cgminer
-version=3.9.0
+version=3.10.0
revision=1
build_style=gnu-configure
configure_args="
--enable-bflsc --enable-bitforce --enable-icarus --enable-modminer
--enable-avalon --enable-klondike --enable-bitfury --enable-hashfast
- --enable-bab --with-system-libusb"
+ --enable-bab --with-system-libusb --enable-minion"
hostmakedepends="pkg-config automake libtool yasm"
makedepends="libcurl-devel libusb-devel jansson-devel libudev-devel ncurses-devel"
+conf_files="/etc/cgminer.conf"
short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="https://github.com/ckolivas/cgminer"
distfiles="http://ck.kolivas.org/apps/cgminer/cgminer-${version}.tar.bz2"
-checksum=f4a9af3e5e08919cfc9ca26628d63e7a3f8e986ebfa358b7316a79b1e8621790
+checksum=ef271e0ae3ab803110d58e7a27266ff5d25e6fa440af00561c2f42d73d96dcc9
pre_configure() {
# We have latest jansson and libusb - just use them
@@ -37,11 +38,3 @@ post_install() {
sed -i -e 's#/usr/local/bin#/usr/bin#g' ${DESTDIR}/etc/cgminer.conf
vinstall ${FILESDIR}/cgminer.service 644 usr/lib/systemd/system
}
-
-cgminer_package() {
- conf_files="/etc/cgminer.conf"
- pkg_install() {
- vmove all
- }
-}
-
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 79f7d43871..e48209ea34 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -11,6 +11,12 @@ makedepends="
clutter-gst-devel>=2.0.8_2 libgee08-devel>=0.12 libcanberra-devel
librsvg-devel libgudev-devel gnome-desktop-devel>=3.10
gst-plugins-good1>=1:1.2.0 gnome-video-effects"
+depends="clutter-gst>=2.0.8_2
+ clutter-gtk>=1.4.4_2
+ gst-plugins-good1>=1:1.2
+ desktop-file-utils
+ hicolor-icon-theme
+ gnome-video-effects"
short_desc="GNOME tool to take pictures and videos from your webcam"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org/projects/cheese/"
@@ -46,15 +52,3 @@ cheese-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-cheese_package() {
- depends="clutter-gst>=2.0.8_2
- clutter-gtk>=1.4.4_2
- gst-plugins-good1>=1:1.2
- desktop-file-utils
- hicolor-icon-theme
- gnome-video-effects"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template
index 76b4b5dfc9..edb833c919 100644
--- a/srcpkgs/cherokee/template
+++ b/srcpkgs/cherokee/template
@@ -9,6 +9,16 @@ configure_args="
--with-wwwgroup=httpd --with-python=python --enable-os-string=Linux"
makedepends="pcre-devel>=8.30 python-devel libldap-devel pam-devel
libmysqlclient-devel ffmpeg-devel>=2.1 geoip-devel"
+depends="shadow"
+conf_files="/etc/${pkgname}/${pkgname}.conf"
+systemd_services="cherokee.service on"
+system_accounts="httpd"
+httpd_descr="Cherokee HTTP server"
+httpd_homedir="/srv/httpd"
+make_dirs="
+ /etc/cherokee/ssl 0755 httpd httpd
+ /var/log/cherokee 0755 httpd httpd
+ /var/lib/cherokee/graphs/images 0755 httpd httpd"
short_desc="An innovative, feature rich, and yet easy to configure open source Web Server"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.cherokee-project.com/"
@@ -58,19 +68,3 @@ libcherokee_package() {
vmove usr/lib/cherokee
}
}
-
-cherokee_package() {
- depends="shadow"
- conf_files="/etc/${pkgname}/${pkgname}.conf"
- systemd_services="cherokee.service on"
- system_accounts="httpd"
- httpd_descr="Cherokee HTTP server"
- httpd_homedir="/srv/httpd"
- make_dirs="
- /etc/cherokee/ssl 0755 httpd httpd
- /var/log/cherokee 0755 httpd httpd
- /var/lib/cherokee/graphs/images 0755 httpd httpd"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chicken/template b/srcpkgs/chicken/template
index 62f3a579f3..99357ced17 100644
--- a/srcpkgs/chicken/template
+++ b/srcpkgs/chicken/template
@@ -42,9 +42,3 @@ chicken-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-chicken_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template
index 3a9ad45f05..88acc09879 100644
--- a/srcpkgs/chromaprint/template
+++ b/srcpkgs/chromaprint/template
@@ -21,9 +21,3 @@ chromaprint-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-chromaprint_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chromium-bsu/template b/srcpkgs/chromium-bsu/template
index 652fcb50dd..9862de30d5 100644
--- a/srcpkgs/chromium-bsu/template
+++ b/srcpkgs/chromium-bsu/template
@@ -20,14 +20,8 @@ long_desc="
makedepends="ftgl-devel>=2.1.3rc5_4 fontconfig-devel SDL-devel
SDL_image-devel libopenal-devel freealut-devel desktop-file-utils"
+depends="desktop-file-utils"
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-chromium-bsu_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 767cee5b19..6ee3934404 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,22 +1,15 @@
# Template file for 'chromium'
pkgname=chromium
#See http://www.chromium.org/developers/calendar for the latest version
-version=30.0.1599.66
+version=32.0.1700.102
revision=1
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.chromium.org/"
license="BSD"
-long_desc="
- Chromium is an open-source browser project that aims to build a safer,
- faster, and more stable way for all Internet users to experience the web.
-
- Chromium serves as a base for Google Chrome, which is Chromium rebranded
- (name and logo) with very few additions such as usage tracking and an
- auto-updater system."
_url_base="https://commondatastorage.googleapis.com"
-_toolchains_rev=12029
+_toolchains_rev=12181
create_srcdir=yes
@@ -27,11 +20,11 @@ distfiles="
${_url_base}/nativeclient-archive2/toolchain/${_toolchains_rev}/naclsdk_pnacl_translator.tgz
${_url_base}/nativeclient-archive2/toolchain/${_toolchains_rev}/naclsdk_pnacl_translator.tgz.sha1hash"
checksum="
- 8fe8262fd69b59c759916d17eaf4225d1d5b64c468629cb9a684144d3cd15724
- 641e2acf0e755bfe052016164e9e0198104130b612a042eacf259a2f2630d6cd
- 6ce53b1af8fef34c1557c7fbb764cfbca29cb70b8ee3367746a31976cf115e01
- 0b7afcbad1461336e7062d7c8d64e67e670a1fce07214e24313204af1f3a5a70
- d6c5ed767ee9ee4e92b4de958cd32b0152783f170c1483fe99d2199fc2623813"
+ da13d46517053541fc110acbbdc3b529f96a31a68f7d9b75dc1198c64e83bc4b
+ cb4ac159f61de5e75d339813c0fc74f986156310a2c43a30ba40125951e72450
+ ad229b69a5af72a9fa7cf2167ee48560cc11049206e4ef919cb31d1273d6409f
+ fdb8309ef2b1c8600d63c4420ac02d66d85ab9befe98d99e9706828870730077
+ 162cf456b0a1cb4ce505004f828a09164ee3e3c8274739c6d5e972bf0ef1cfe9"
skip_extraction="
naclsdk_linux_x86.tgz
naclsdk_pnacl_linux_x86.tgz
@@ -44,11 +37,13 @@ makedepends="libpng-devel>=1.6 gtk+-devel nss-devel GConf-devel pciutils-devel
libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
libXScrnSaver-devel alsa-lib-devel icu-devel protobuf-devel snappy-devel
libxml2-devel libxslt-devel opus-devel pulseaudio-devel nss-devel
- libXcursor-devel libflac-devel speex-devel libmtp-devel v8-devel>=3.20
+ libXcursor-devel libflac-devel speex-devel libmtp-devel
libjpeg-turbo-devel libevent-devel json-c-devel re2-devel harfbuzz-devel
- libwebp-devel minizip-devel jsoncpp-devel zlib-devel hwids"
+ libwebp-devel minizip-devel jsoncpp-devel zlib-devel libcap-devel hwids"
+depends="desktop-file-utils hicolor-icon-theme"
+nostrip_files="nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe"
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-c++-multilib"
fi
@@ -77,11 +72,9 @@ do_configure() {
-Dgoogle_default_client_id=858256686058.apps.googleusercontent.com
-Dgoogle_default_client_secret=sMVx271L_MAz23TW2ek3AASn"
- # Never tell the build system to "enable" SSE2, it has a few unexpected issues.
- conf+=" -Ddisable_sse2=1"
-
# Disable glibc Native Client toolchain.
conf+=" -Ddisable_glibc=1"
+ conf+=" -Dlinux_use_tcmalloc=0"
# Use system-provided libraries.
# TODO: use_system_hunspell (upstream changes needed).
@@ -89,7 +82,9 @@ do_configure() {
# TODO: use_system_libusb (http://crbug.com/266149).
# TODO: use_system_ssl (http://crbug.com/58087).
# TODO: use_system_sqlite (http://crbug.com/22208).
+ # TODO: -Duse_system_libwebp=1 (currently broken with with 0.3.1)
conf+="
+ -Dpython_ver=2.7
-Duse_system_bzip2=1
-Duse_system_flac=1
-Duse_system_harfbuzz=1
@@ -98,7 +93,6 @@ do_configure() {
-Duse_system_libevent=1
-Duse_system_libjpeg=1
-Duse_system_libpng=1
- -Duse_system_libwebp=1
-Duse_system_libxml=1
-Duse_system_libxslt=1
-Duse_system_minizip=1
@@ -108,7 +102,6 @@ do_configure() {
-Duse_system_re2=1
-Duse_system_snappy=1
-Duse_system_speex=1
- -Duse_system_v8=1
-Duse_system_xdg_utils=1
-Duse_system_zlib=1
-Duse_system_yasm=1
@@ -145,9 +138,6 @@ do_configure() {
# the build to fail because of that.
conf+=" -Dwerror="
- # Disable tcmalloc.
- conf+=" -Dlinux_use_tcmalloc=0"
-
# Save space by removing DLOG and DCHECK messages (about 6% reduction).
conf+=" -Dlogging_like_official_build=1"
@@ -184,11 +174,3 @@ do_install() {
vinstall ${FILESDIR}/chromium.sh 755 usr/bin chromium
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-chromium_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- nostrip_files="nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chrony/files/chrony.conf b/srcpkgs/chrony/files/chrony.conf
index 0f2a38fdc1..c6e31f9ecd 100644
--- a/srcpkgs/chrony/files/chrony.conf
+++ b/srcpkgs/chrony/files/chrony.conf
@@ -273,7 +273,7 @@ cmdallow 127.0.0.1
# You need to have 'enhanced RTC support' compiled into your Linux
# kernel. (Note, these options apply only to Linux.)
-rtcfile /var/db/chrony/rtc
+! rtcfile /var/db/chrony/rtc
# Your RTC can be set to keep Universal Coordinated Time (UTC) or local
# time. (Local time means UTC +/- the effect of your timezone.) If you
@@ -309,4 +309,4 @@ rtconutc
# for extreme clock stability. Works only on Linux. Note that the "-m"
# command-line switch will also enable this feature.
-lock_all
+! lock_all
diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template
index 2ba8e907b8..0c67facbae 100644
--- a/srcpkgs/chrony/template
+++ b/srcpkgs/chrony/template
@@ -1,17 +1,23 @@
# Template file for 'chrony'
pkgname=chrony
-version=1.29
+version=1.29.1
revision=1
build_style=gnu-configure
configure_args="--without-nss"
hostmakedepends="pkg-config"
-makedepends="libtomcrypt-devel libcap-devel readline-devel"
+makedepends="libtomcrypt-devel libcap-devel libedit-devel"
+conf_files="/etc/chrony.conf"
+system_accounts="chrony"
+systemd_services="chrony.service on"
+make_dirs="
+ /var/log/chrony 0755 chrony chrony
+ /var/db/chrony 0755 chrony chrony"
short_desc="Sets your computer's clock from time servers on the Net"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://chrony.tuxfamily.org/"
distfiles="http://download.tuxfamily.org/chrony/$pkgname-$version.tar.gz"
-checksum=c685f072ba0663ab026a7f56870ab2c246bd97ca4629dd2e1899617bd16ad39b
+checksum=658c9bb4d8c8d8ec7d0908429aa266e5f8413ba86bd4acbfd2f9669f6065af27
post_install() {
vinstall ${FILESDIR}/chrony.conf 644 etc
@@ -22,15 +28,3 @@ post_install() {
vmkdir usr/lib/systemd/ntp-units.d
echo "chrony.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/50-chrony.list
}
-
-chrony_package() {
- conf_files="/etc/chrony.conf"
- system_accounts="chrony"
- systemd_services="chrony.service on"
- make_dirs="
- /var/log/chrony 0755 chrony chrony
- /var/db/chrony 0755 chrony chrony"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 63d9e042cd..4f86797c17 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -1,7 +1,7 @@
# Template build file for 'chroot-bash'.
pkgname=chroot-bash
version=4.2
-revision=4
+revision=5
wrksrc="bash-${version}"
build_style=gnu-configure
configure_args="--without-bash-malloc --enable-static-link
@@ -22,29 +22,13 @@ homepage="http://www.gnu.org/software/bash/bash.html"
license="GPL-3"
distfiles="http://ftp.gnu.org/gnu/bash/bash-${version}.tar.gz"
checksum=a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8
-long_desc="
- Bash is an sh-compatible shell that incorporates useful features from
- the Korn shell (ksh) and C shell (csh). It is intended to conform to
- the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard.
-
- It offers functional improvements over sh for both programming and
- interactive use; these include command line editing, unlimited size
- command history, job control, shell functions and aliases, indexed
- arrays of unlimited size, and integer arithmetic in any base from two
- to sixty-four. In addition, most sh scripts can be run by Bash without
- modification."
broken_as_needed=yes
bootstrap=yes
+provides="bash-${version}_${revision}"
+conflicts="bash>=0"
post_install() {
+ ln -s /bin/bash ${DESTDIR}/usr/bin/sh
rm -rf ${DESTDIR}/usr/share
}
-
-chroot-bash_package() {
- provides="bash-4.2"
- conflicts="bash>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/chroot-coreutils/patches/disable-man.patch b/srcpkgs/chroot-coreutils/patches/disable-man.patch
new file mode 100644
index 0000000000..30ec64e567
--- /dev/null
+++ b/srcpkgs/chroot-coreutils/patches/disable-man.patch
@@ -0,0 +1,20 @@
+--- Makefile.in.orig 2014-01-08 09:01:48.970245932 +0100
++++ Makefile.in 2014-01-08 09:02:23.283386875 +0100
+@@ -7390,7 +7390,7 @@ check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+ check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
+-all-am: Makefile $(INFO_DEPS) $(LIBRARIES) $(PROGRAMS) $(MANS) \
++all-am: Makefile $(LIBRARIES) $(PROGRAMS) \
+ $(HEADERS) all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
+@@ -7558,7 +7558,7 @@ install-info-am: $(INFO_DEPS)
+ install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
+ done; \
+ else : ; fi
+-install-man: install-man1
++install-man:
+
+ install-pdf: install-pdf-recursive
+
diff --git a/srcpkgs/chroot-coreutils/template b/srcpkgs/chroot-coreutils/template
index 00e236f92f..169d3651e4 100644
--- a/srcpkgs/chroot-coreutils/template
+++ b/srcpkgs/chroot-coreutils/template
@@ -1,8 +1,11 @@
# Template file for 'chroot-coreutils'
pkgname=chroot-coreutils
-version=8.17
-revision=3
-wrksrc=coreutils-${version}
+version=8.22
+revision=2
+wrksrc="${pkgname/chroot-}-${version}"
+bootstrap=yes
+provides="coreutils-${version}_${revision}"
+conflicts="coreutils>=0"
build_style=gnu-configure
configure_args="--without-gmp --disable-libcap --disable-xattr
--disable-acl --disable-rpath --disable-nls
@@ -13,18 +16,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/coreutils"
license="GPL-3"
distfiles="http://ftp.gnu.org/gnu/coreutils/coreutils-$version.tar.xz"
-checksum=4e075a0d238072a5bd079046e1f024dc5e0d9133d43a39c73d0b86b0d1e2c5e5
+checksum=5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212
-bootstrap=yes
+case "$XBPS_TARGET_MACHINE" in
+ *-musl) CFLAGS+=" -DSLOW_BUT_NO_HACKS";;
+esac
-pre_configure() {
- sed -i 's/^\(SUBDIRS =\).*/\1 lib src/g' Makefile.in
-}
-
-chroot-coreutils_package() {
- provides="coreutils-${version}"
- conflicts="coreutils>=0"
- pkg_install() {
- vmove usr
- }
+post_install() {
+ rm -rf ${DESTDIR}/usr/lib
+ rm -rf ${DESTDIR}/usr/share
}
diff --git a/srcpkgs/chroot-diffutils/template b/srcpkgs/chroot-diffutils/template
index f7dcc2d238..12a9bfbfc9 100644
--- a/srcpkgs/chroot-diffutils/template
+++ b/srcpkgs/chroot-diffutils/template
@@ -1,8 +1,11 @@
# Template file for 'chroot-diffutils'
pkgname=chroot-diffutils
version=3.2
+revision=3
wrksrc="diffutils-${version}"
-revision=2
+bootstrap=yes
+conflicts="diffutils>=0"
+provides="diffutils-${version}_${revision}"
build_style=gnu-configure
configure_args="--disable-nls ac_cv_libsigsegv=/bin/false"
short_desc="The GNU diff utilities -- for xbps-src use"
@@ -12,20 +15,13 @@ license="GPL-3"
distfiles="${GNU_SITE}/diffutils/diffutils-$version.tar.xz"
checksum=ab4fb75d0ef35f3c8c9a148cd3526ba6f4db71d10467a041eb45006436079149
-bootstrap=yes
-
pre_configure() {
sed -i -e '/gets is a/d' lib/stdio.in.h
}
post_install() {
rm -rf ${DESTDIR}/usr/share
-}
-
-chroot-diffutils_package() {
- conflicts="diffutils>=0"
- provides="diffutils-${version}"
- pkg_install() {
- vmove usr
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index e4ce8dac1f..034d2a5426 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -1,8 +1,14 @@
# Template file for 'chroot-distcc'
pkgname=chroot-distcc
version=3.2rc1
-revision=1
+revision=2
wrksrc="distcc-${version}"
+bootstrap=yes
+build_style=gnu-configure
+configure_args="--with-included-popt --without-avahi --without-gnome
+ --without-gtk --disable-Werror ac_cv_path_PYTHON=/bin/false"
+make_install_target="install-programs"
+conflicts="distcc>=0"
short_desc="Distributed compilation for faster C/C++ builds -- for xbps-src use"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://code.google.com/p/distcc"
@@ -10,24 +16,11 @@ license="GPL-2"
distfiles="http://distcc.googlecode.com/files/distcc-${version}.tar.bz2"
checksum=311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30
-bootstrap=yes
-
-do_configure() {
+pre_configure() {
sed -i -e 's|^\(all: $(bin_PROGRAMS)\) pump include-server|\1|g' Makefile.in
-
- ./configure ${configure_args} --with-included-popt \
- --without-avahi --without-gnome \
- --without-gtk --disable-Werror \
- ac_cv_path_PYTHON=/bin/false
}
-do_build() {
- make ${make_build_args}
-}
-
-do_install() {
- make DESTDIR=${DESTDIR} install-programs
-
+post_install() {
# Remove useless files.
rm -f ${DESTDIR}/usr/bin/distccd
rm -rf ${DESTDIR}/etc
@@ -39,10 +32,3 @@ do_install() {
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f}
done
}
-
-chroot-distcc_package() {
- conflicts="distcc>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/chroot-fakeroot/patches/musl.patch b/srcpkgs/chroot-fakeroot/patches/musl.patch
new file mode 100644
index 0000000000..bd5aeefea4
--- /dev/null
+++ b/srcpkgs/chroot-fakeroot/patches/musl.patch
@@ -0,0 +1,24 @@
+--- communicate.h.orig 2014-01-08 10:28:04.825714200 +0100
++++ communicate.h 2014-01-08 10:29:13.825221763 +0100
+@@ -70,7 +70,7 @@
+ # define STAT64_SUPPORT
+ #else
+ # ifndef __APPLE__
+-# warning Not using stat64 support
++# define STAT64_SUPPORT
+ # endif
+ /* if glibc is 2.0 or older, undefine these again */
+ # undef STAT64_SUPPORT
+--- libfakeroot.c.orig 2014-01-08 10:44:53.185797653 +0100
++++ libfakeroot.c 2014-01-08 10:45:18.249966551 +0100
+@@ -31,6 +31,10 @@
+ */
+ #define _GNU_SOURCE
+
++#ifndef _STAT_VER
++#define _STAT_VER 0
++#endif
++
+ #define FAKEROOT_LIBFAKEROOT
+
+ #ifdef __APPLE__
diff --git a/srcpkgs/chroot-fakeroot/template b/srcpkgs/chroot-fakeroot/template
index d75f224f6c..b059f3618e 100644
--- a/srcpkgs/chroot-fakeroot/template
+++ b/srcpkgs/chroot-fakeroot/template
@@ -1,35 +1,22 @@
# Template file for 'chroot-fakeroot'
pkgname=chroot-fakeroot
version=1.18.4
-revision=1
+revision=2
bootstrap=yes
wrksrc="fakeroot-${version}"
build_style=gnu-configure
-makedepends="chroot-util-linux"
+provides="fakeroot-${version}_${revision}"
+conflicts="fakeroot>=0"
+# need getopt(1)
+depends="chroot-util-linux"
short_desc="Gives a fake root environment -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://packages.debian.org/fakeroot"
license="GPL-3"
distfiles="${DEBIAN_SITE}/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2"
checksum=0a359efa3e9496c33234b3e9c89306a09bb4da9d33de43c261f1d8447e6ebea2
-long_desc="
- This package is intended to remove the need to become root for a package build.
- This is done by setting LD_PRELOAD to libfakeroot.so, which provides wrappers
- around getuid, chown, chmod, mknod, stat, and so on, thereby creating a fake
- root environment.
-
- This package is only meant to be used by xbps-src, don't install it manually."
post_install() {
rm -rf ${DESTDIR}/usr/share
rm -f ${DESTDIR}/usr/lib/*.a
}
-
-chroot-fakeroot_package() {
- depends="chroot-util-linux"
- provides="fakeroot-${version}_${revision}"
- conflicts="fakeroot>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/chroot-findutils/template b/srcpkgs/chroot-findutils/template
index c8a96521ae..6f34e8fa74 100644
--- a/srcpkgs/chroot-findutils/template
+++ b/srcpkgs/chroot-findutils/template
@@ -1,11 +1,15 @@
# Template file for 'chroot-findutils'
pkgname=chroot-findutils
version=4.4.2
-revision=1
+revision=3
wrksrc="findutils-${version}"
+bootstrap=yes
+conflicts="findutils>=0"
+provides="findutils-${version}_${revision}"
build_style=gnu-configure
configure_args="--disable-nls gl_cv_func_wcwidth_works=yes
- gl_cv_header_working_fcntl_h=yes ac_cv_func_fnmatch_gnu=yes"
+ gl_cv_header_working_fcntl_h=yes am_cv_func_working_getline=yes
+ gl_cv_func_gettimeofday_clobber=no ac_cv_func_working_mktime=yes"
short_desc="The GNU Find Utilities -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -13,19 +17,23 @@ homepage="http://www.gnu.org/software/findutils"
distfiles="http://ftp.gnu.org/gnu/findutils/findutils-$version.tar.gz"
checksum=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
-bootstrap=yes
+pre_configure() {
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ # Special case for musl libc; "fix" issues with gnulib.
+ : > gnulib/lib/freadahead.c
+ : > gnulib/lib/fseeko.c
+ echo "void close_stdin(void) {}" > gnulib/lib/closein.c
+ ;;
+ esac
+}
post_install() {
for f in locate oldfind updatedb; do
rm -f ${DESTDIR}/usr/bin/${f}
done
rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec
-}
-
-chroot-findutils_package() {
- conflicts="findutils>=0"
- provides="findutils-${version}"
- pkg_install() {
- vmove usr
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index b0222edafd..a6ca11215a 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -13,15 +13,9 @@ distfiles="http://ftp.gnu.org/gnu/gawk/gawk-$version.tar.gz"
checksum=c3a7cf7d976e05c6a1d8a9b3f14fa55d4304707408ddafb1396212653ea00be5
bootstrap=yes
+conflicts="gawk>=0"
+provides="gawk-${version}"
post_install() {
rm -rf ${DESTDIR}/usr/share
}
-
-chroot-gawk_package() {
- conflicts="gawk>=0"
- provides="gawk-${version}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/chroot-gcc/files b/srcpkgs/chroot-gcc/files
deleted file mode 120000
index c42218ef09..0000000000
--- a/srcpkgs/chroot-gcc/files
+++ /dev/null
@@ -1 +0,0 @@
-../gcc/patches
\ No newline at end of file
diff --git a/srcpkgs/chroot-gcc/files/gcc-4.7.0-cloog-0.17.patch b/srcpkgs/chroot-gcc/files/gcc-4.7.0-cloog-0.17.patch
new file mode 100644
index 0000000000..de80561b86
--- /dev/null
+++ b/srcpkgs/chroot-gcc/files/gcc-4.7.0-cloog-0.17.patch
@@ -0,0 +1,23 @@
+--- a/configure 2011-12-18 20:03:44.000000000 +1000
++++ b/configure 2012-02-03 17:55:14.885990135 +1000
+@@ -6049,8 +6049,8 @@
+ LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
+
+ if test "${cloog_org}" = yes ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
+-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
++$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
+ if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+@@ -6061,8 +6061,7 @@
+ main ()
+ {
+ #if CLOOG_VERSION_MAJOR != 0 \
+- || CLOOG_VERSION_MINOR != 16 \
+- || CLOOG_VERSION_REVISION < 1
++ || CLOOG_VERSION_MINOR != 17
+ choke me
+ #endif
+ ;
diff --git a/srcpkgs/chroot-gcc/files/gcc-4.7.1-ppl-1.0.patch b/srcpkgs/chroot-gcc/files/gcc-4.7.1-ppl-1.0.patch
new file mode 100644
index 0000000000..c8624b7643
--- /dev/null
+++ b/srcpkgs/chroot-gcc/files/gcc-4.7.1-ppl-1.0.patch
@@ -0,0 +1,11 @@
+--- a/configure.orig 2012-07-01 17:01:26.754771029 +0200
++++ b/configure 2012-07-01 17:02:05.402843729 +0200
+@@ -5690,7 +5690,7 @@ int
+ main ()
+ {
+
+- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
++ #if PPL_VERSION_MAJOR > 2 || PPL_VERSION_MINOR > 20
+ choke me
+ #endif
+
diff --git a/srcpkgs/chroot-gcc/files/gcc-4.7.3-musl.diff b/srcpkgs/chroot-gcc/files/gcc-4.7.3-musl.diff
new file mode 100644
index 0000000000..e32d1f6272
--- /dev/null
+++ b/srcpkgs/chroot-gcc/files/gcc-4.7.3-musl.diff
@@ -0,0 +1,739 @@
+# HG changeset patch
+# Parent f50bb54f331f73405131a30b4f353cfda1c70304
+Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one.
+
+diff -r f50bb54f331f libstdc++-v3/configure.host
+--- a/libstdc++-v3/configure.host Fri Mar 29 16:38:52 2013 -0400
++++ b/libstdc++-v3/configure.host Fri Mar 29 16:41:10 2013 -0400
+@@ -264,6 +264,13 @@
+ os_include_dir="os/bsd/freebsd"
+ ;;
+ gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++ # check for musl by target
++ case "${host_os}" in
++ *-musl*)
++ os_include_dir="os/generic"
++ ;;
++ *)
++
+ if [ "$uclibc" = "yes" ]; then
+ os_include_dir="os/uclibc"
+ elif [ "$bionic" = "yes" ]; then
+@@ -272,6 +279,9 @@
+ os_include_dir="os/gnu-linux"
+ fi
+ ;;
++
++ esac
++ ;;
+ hpux*)
+ os_include_dir="os/hpux"
+ ;;
+# HG changeset patch
+# Parent 8cd76d5f6674f04c31523971d1dfc81c91388c38
+Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
+
+diff -r 8cd76d5f6674 gcc/config.gcc
+--- a/gcc/config.gcc Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config.gcc Mon Sep 09 12:54:37 2013 -0400
+@@ -522,7 +522,7 @@
+ esac
+
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+
+ # Common parts for widely ported systems.
+ case ${target} in
+@@ -625,6 +625,9 @@
+ *-*-*uclibc*)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+ ;;
++ *-*-*musl*)
++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++ ;;
+ *)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+ ;;
+diff -r 8cd76d5f6674 gcc/config/linux.h
+--- a/gcc/config/linux.h Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config/linux.h Mon Sep 09 12:54:37 2013 -0400
+@@ -33,10 +33,12 @@
+ #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL (linux_libc == LIBC_MUSL)
+ #endif
+
+ #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
+@@ -54,18 +56,21 @@
+ uClibc or Bionic is the default C library and whether
+ -muclibc or -mglibc or -mbionic has been passed to change the default. */
+
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
+- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -85,21 +90,21 @@
+
+ #define GNU_USER_DYNAMIC_LINKER \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
+- BIONIC_DYNAMIC_LINKER)
++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define GNU_USER_DYNAMIC_LINKER32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+- BIONIC_DYNAMIC_LINKER32)
++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+- BIONIC_DYNAMIC_LINKER64)
++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ #define GNU_USER_DYNAMIC_LINKERX32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
+- BIONIC_DYNAMIC_LINKERX32)
++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
+
+ /* Determine whether the entire c99 runtime
+ is present in the runtime library. */
+ #undef TARGET_C99_FUNCTIONS
+-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
+
+ /* Whether we have sincos that follows the GNU extension. */
+ #undef TARGET_HAS_SINCOS
+@@ -108,3 +113,74 @@
+ /* Whether we have Bionic libc runtime */
+ #undef TARGET_HAS_BIONIC
+ #define TARGET_HAS_BIONIC (OPTION_BIONIC)
++
++/* musl avoids problematic includes by rearranging the include directories.
++ * Unfortunately, this is mostly duplicated from cppdefault.c */
++#if DEFAULT_LIBC == LIBC_MUSL
++#define INCLUDE_DEFAULTS_MUSL_GPP \
++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
++
++#ifdef LOCAL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_LOCAL \
++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_LOCAL
++#endif
++
++#ifdef PREFIX_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_PREFIX \
++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_PREFIX
++#endif
++
++#ifdef CROSS_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_CROSS \
++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#ifdef TOOL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_TOOL \
++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_TOOL
++#endif
++
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++#define INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_NATIVE
++#endif
++
++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
++# undef INCLUDE_DEFAULTS_MUSL_LOCAL
++# define INCLUDE_DEFAULTS_MUSL_LOCAL
++# undef INCLUDE_DEFAULTS_MUSL_NATIVE
++# define INCLUDE_DEFAULTS_MUSL_NATIVE
++#else
++# undef INCLUDE_DEFAULTS_MUSL_CROSS
++# define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#undef INCLUDE_DEFAULTS
++#define INCLUDE_DEFAULTS \
++ { \
++ INCLUDE_DEFAULTS_MUSL_GPP \
++ INCLUDE_DEFAULTS_MUSL_PREFIX \
++ INCLUDE_DEFAULTS_MUSL_CROSS \
++ INCLUDE_DEFAULTS_MUSL_TOOL \
++ INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
++ { 0, 0, 0, 0, 0, 0 } \
++ }
++#endif
+diff -r 8cd76d5f6674 gcc/config/linux.opt
+--- a/gcc/config/linux.opt Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config/linux.opt Mon Sep 09 12:54:37 2013 -0400
+@@ -30,3 +30,7 @@
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+diff -r 8cd76d5f6674 gcc/ginclude/stddef.h
+--- a/gcc/ginclude/stddef.h Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/ginclude/stddef.h Mon Sep 09 12:54:37 2013 -0400
+@@ -184,6 +184,7 @@
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__ /* BeOS */
+ #define __SIZE_T__ /* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -200,6 +201,7 @@
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+ || defined(__FreeBSD_kernel__)
+ /* __size_t is a typedef on FreeBSD 5, must not trash it. */
+@@ -215,6 +217,7 @@
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+# HG changeset patch
+# Parent 2b94537ce2496c88e7e797c617e5b95e8d7e4785
+A fix for libgomp to correctly request a POSIX version for time support.
+
+diff -r 2b94537ce249 libgomp/config/posix/time.c
+--- a/libgomp/config/posix/time.c Fri Mar 29 16:41:14 2013 -0400
++++ b/libgomp/config/posix/time.c Fri Mar 29 16:41:17 2013 -0400
+@@ -28,6 +28,8 @@
+ The following implementation uses the most simple POSIX routines.
+ If present, POSIX 4 clocks should be used instead. */
+
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
+diff -r 2ebb44d1e6f1 libgcc/unwind-dw2-fde-dip.c
+--- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 28 12:15:47 2013 -0400
++++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 28 12:17:02 2013 -0400
+@@ -47,28 +47,13 @@
+ #include "unwind-compat.h"
+ #include "gthr.h"
+
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
+ # define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(__FreeBSD__) && __FreeBSD__ >= 7
+-# define ElfW __ElfN
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(__OpenBSD__)
+-# define ElfW(type) Elf_##type
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(TARGET_DL_ITERATE_PHDR) \
+- && defined(__sun__) && defined(__svr4__)
+-# define USE_PT_GNU_EH_FRAME
++# ifdef __OpenBSD__
++# define ElfW(type) Elf_##typ
++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
++# define ElfW __ElfN
++# endif
+ #endif
+
+ #if defined(USE_PT_GNU_EH_FRAME)
+diff -r 75d9c38318a7 gcc/configure
+--- a/gcc/configure Tue Sep 24 06:52:49 2013 -0400
++++ b/gcc/configure Tue Sep 24 06:54:33 2013 -0400
+@@ -26736,6 +26736,9 @@
+ else
+ gcc_cv_libc_provides_ssp=no
+ case "$target" in
++ *-*-musl*)
++ # All versions of musl provide stack protector
++ gcc_cv_libc_provides_ssp=yes;;
+ *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ # glibc 2.4 and later provides __stack_chk_fail and
+ # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -26769,6 +26772,7 @@
+ # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ # simply assert that glibc does provide this, which is true for all
+ # realistically usable GNU/Hurd configurations.
++ # All supported versions of musl provide it as well
+ gcc_cv_libc_provides_ssp=yes;;
+ *-*-darwin* | *-*-freebsd*)
+ ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
+@@ -26851,6 +26855,9 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
++ *-linux-musl*)
++ gcc_cv_target_dl_iterate_phdr=yes
++ ;;
+ esac
+
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+diff -r 75d9c38318a7 gcc/configure.ac
+--- a/gcc/configure.ac Tue Sep 24 06:52:49 2013 -0400
++++ b/gcc/configure.ac Tue Sep 24 06:54:33 2013 -0400
+@@ -4719,6 +4719,9 @@
+ gcc_cv_libc_provides_ssp,
+ [gcc_cv_libc_provides_ssp=no
+ case "$target" in
++ *-*-musl*)
++ # All versions of musl provide stack protector
++ gcc_cv_libc_provides_ssp=yes;;
+ *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ [# glibc 2.4 and later provides __stack_chk_fail and
+ # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -4752,6 +4755,7 @@
+ # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ # simply assert that glibc does provide this, which is true for all
+ # realistically usable GNU/Hurd configurations.
++ # All supported versions of musl provide it as well
+ gcc_cv_libc_provides_ssp=yes;;
+ *-*-darwin* | *-*-freebsd*)
+ AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
+@@ -4817,6 +4821,9 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
++ *-linux-musl*)
++ gcc_cv_target_dl_iterate_phdr=yes
++ ;;
+ esac
+ GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+# HG changeset patch
+# Parent 94e435662aff38e86c9ca0dff4bbf451e0190b34
+Get rid of ever-broken fixincludes on musl.
+
+
+diff -r 94e435662aff -r e27957848dc8 fixincludes/mkfixinc.sh
+--- a/fixincludes/mkfixinc.sh Sat Jul 27 23:37:20 2013 -0400
++++ b/fixincludes/mkfixinc.sh Sat Jul 27 23:43:03 2013 -0400
+@@ -19,7 +19,8 @@
+ powerpc-*-eabi* | \
+ powerpc-*-rtems* | \
+ powerpcle-*-eabisim* | \
+- powerpcle-*-eabi* )
++ powerpcle-*-eabi* | \
++ *-musl* )
+ # IF there is no include fixing,
+ # THEN create a no-op fixer and exit
+ (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
+# HG changeset patch
+# Parent 65cd23493c45f2a531ca15ffea563d6110143cdd
+New config.sub for GCC versions too early for the update.
+
+
+diff -r 65cd23493c45 -r 355cec477536 config.sub
+--- a/config.sub Tue Aug 27 15:49:27 2013 -0400
++++ b/config.sub Tue Aug 27 15:51:14 2013 -0400
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ # 2011 Free Software Foundation, Inc.
+
+-timestamp='2011-10-29'
++timestamp='2011-03-23'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -125,6 +125,7 @@
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++ linux-musl* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+@@ -251,17 +252,13 @@
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+- | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+- | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+@@ -295,7 +292,7 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+- | rl78 | rx \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -304,7 +301,7 @@
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
++ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
+@@ -361,7 +358,6 @@
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+- | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+@@ -370,10 +366,8 @@
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+- | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+- | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -407,7 +401,7 @@
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+- | rl78-* | romp-* | rs6000-* | rx-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+@@ -415,11 +409,10 @@
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+- | tile*-* \
++ | tile-* | tilegx-* \
+ | tron-* \
+ | ubicom32-* \
+- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+- | vax-* \
++ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+@@ -820,10 +813,6 @@
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+- nacl)
+- basic_machine=le32-unknown
+- os=-nacl
+- ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -1132,8 +1121,13 @@
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+- basic_machine=$basic_machine-unknown
++ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1346,6 +1340,7 @@
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
++ | -linux-musl* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+# HG changeset patch
+# Parent 3ea10cd626cb7abdfd56d3fe8d2c9ed58a82797b
+Support for i386-linux-musl and x86_64-linux-musl.
+
+diff -r 3ea10cd626cb gcc/config/i386/linux.h
+--- a/gcc/config/i386/linux.h Fri Mar 29 16:41:17 2013 -0400
++++ b/gcc/config/i386/linux.h Fri Mar 29 16:41:20 2013 -0400
+@@ -21,3 +21,4 @@
+
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+diff -r 3ea10cd626cb gcc/config/i386/linux64.h
+--- a/gcc/config/i386/linux64.h Fri Mar 29 16:41:17 2013 -0400
++++ b/gcc/config/i386/linux64.h Fri Mar 29 16:41:20 2013 -0400
+@@ -30,3 +30,7 @@
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+diff -r 3ea10cd626cb libitm/config/linux/x86/tls.h
+--- a/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:17 2013 -0400
++++ b/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:20 2013 -0400
+@@ -25,16 +25,19 @@
+ #ifndef LIBITM_X86_TLS_H
+ #define LIBITM_X86_TLS_H 1
+
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ /* Use slots in the TCB head rather than __thread lookups.
+ GLIBC has reserved words 10 through 13 for TM. */
+ #define HAVE_ARCH_GTM_THREAD 1
+ #define HAVE_ARCH_GTM_THREAD_DISP 1
+ #endif
++#endif
+
+ #include "config/generic/tls.h"
+
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ namespace GTM HIDDEN {
+
+ #ifdef __x86_64__
+@@ -101,5 +104,6 @@
+
+ } // namespace GTM
+ #endif /* >= GLIBC 2.10 */
++#endif
+
+ #endif // LIBITM_X86_TLS_H
+Support for arm-linux-musl.
+
+diff -r 8801a3f6d050 gcc/config/arm/linux-eabi.h
+--- a/gcc/config/arm/linux-eabi.h Tue Aug 27 15:47:31 2013 -0400
++++ b/gcc/config/arm/linux-eabi.h Tue Aug 27 15:47:37 2013 -0400
+@@ -64,6 +64,23 @@
+ #undef GLIBC_DYNAMIC_LINKER
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
+
++/* For ARM musl currently supports four dynamic linkers:
++ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
++ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
++ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
++ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
++ musl does not support the legacy OABI mode.
++ All the dynamic linkers live in /lib.
++ We default to soft-float, EL. */
++#undef MUSL_DYNAMIC_LINKER
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
++#endif
++#define MUSL_DYNAMIC_LINKER \
++ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
+ use the GNU/Linux version, not the generic BPABI version. */
+ #undef LINK_SPEC
+diff -r 8801a3f6d050 libitm/config/arm/hwcap.cc
+--- a/libitm/config/arm/hwcap.cc Tue Aug 27 15:47:31 2013 -0400
++++ b/libitm/config/arm/hwcap.cc Tue Aug 27 15:47:37 2013 -0400
+@@ -40,7 +40,11 @@
+
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+
+ static void __attribute__((constructor))
+# HG changeset patch
+# Parent 4618ad6f036f1e944a5262ae5875dcdf62c41f8b
+Support for mips-linux-musl.
+
+diff -r 4618ad6f036f gcc/config/mips/linux.h
+--- a/gcc/config/mips/linux.h Thu Sep 19 08:56:47 2013 -0400
++++ b/gcc/config/mips/linux.h Thu Sep 19 09:08:11 2013 -0400
+@@ -18,3 +18,10 @@
+ <http://www.gnu.org/licenses/>. */
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
+# HG changeset patch
+# Parent 2ffe76b215fdb082cbbc262536077627757fa9bf
+Support for powerpc-linux-musl.
+
+diff -r 2ffe76b215fd gcc/config.gcc
+--- a/gcc/config.gcc Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config.gcc Fri Mar 29 16:41:28 2013 -0400
+@@ -2112,6 +2112,10 @@
+ powerpc*-*-linux*paired*)
+ tm_file="${tm_file} rs6000/750cl.h" ;;
+ esac
++ case ${target} in
++ *-linux*-musl*)
++ enable_secureplt=yes ;;
++ esac
+ if test x${enable_secureplt} = xyes; then
+ tm_file="rs6000/secureplt.h ${tm_file}"
+ fi
+diff -r 2ffe76b215fd gcc/config/rs6000/linux64.h
+--- a/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:28 2013 -0400
+@@ -364,17 +364,21 @@
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER32 \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+
+
+ #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
+diff -r 2ffe76b215fd gcc/config/rs6000/secureplt.h
+--- a/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:28 2013 -0400
+@@ -18,3 +18,4 @@
+ <http://www.gnu.org/licenses/>. */
+
+ #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
+diff -r 2ffe76b215fd gcc/config/rs6000/sysv4.h
+--- a/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:28 2013 -0400
+@@ -551,6 +551,9 @@
+ #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
+ #define CC1_SECURE_PLT_DEFAULT_SPEC ""
+ #endif
++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
++#define LINK_SECURE_PLT_DEFAULT_SPEC ""
++#endif
+
+ /* Pass -G xxx to the compiler and set correct endian mode. */
+ #define CC1_SPEC "%{G*} %(cc1_cpu) \
+@@ -611,7 +614,8 @@
+ %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
+ %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
+ %{mcall-i960-old: --oformat elf32-powerpcle} \
+- }}}}"
++ }}}} \
++%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
+
+ /* Any specific OS flags. */
+ #define LINK_OS_SPEC "\
+@@ -789,15 +793,18 @@
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+@@ -923,6 +930,7 @@
+ { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \
+ { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \
+ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
+ { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
+ { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
+ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template
index a877332b1e..4efbc18692 100644
--- a/srcpkgs/chroot-gcc/template
+++ b/srcpkgs/chroot-gcc/template
@@ -1,13 +1,16 @@
# Template build file for 'chroot-gcc'
#
+# WARNING: version and revision must match gcc, otherwise exact dependencies
+# won't work (libgfortran depends on libgcc-${version}_${revision}).
+#
_majorver=4.7
-_gmp_ver=5.0.5
+_gmp_ver=5.1.3
_mpfr_ver=3.1.2
-_mpc_ver=0.8.2
+_mpc_ver=1.0.2
pkgname=chroot-gcc
version=${_majorver}.3
-revision=4
+revision=10
wrksrc="gcc-${version}"
homepage="http://gcc.gnu.org"
short_desc="The GNU C Compiler suite -- for xbps-src use"
@@ -20,12 +23,25 @@ distfiles="
http://www.multiprecision.org/mpc/download/mpc-${_mpc_ver}.tar.gz"
checksum="
2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
- 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
+ 752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
- ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7"
+ b561f54d8a479cee3bc891ee52735f18ff86712ba30f036f8b8537bae380c488"
create_wrksrc=yes
bootstrap=yes
+provides="
+ libgcc-${version}_${revision}
+ libstdc++-${version}_${revision}
+ libstdc++-devel-${version}_${revision}
+ gcc-${version}_${revision}
+ gcc-c++-${version}_${revision}"
+conflicts="
+ libgcc>=0
+ libstdc++>=0
+ libstdc++-devel>=0
+ gcc>=0
+ gcc-c++>=0"
+noverifyrdeps=yes
if [ "$CHROOT_READY" ]; then
hostmakedepends+=" perl flex"
@@ -33,8 +49,11 @@ fi
pre_configure() {
cd gcc-${version}
- for f in ${FILESDIR}/*; do
- patch -Np0 -i ${f}
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) patch -Np1 -i ${FILESDIR}/gcc-${version}-musl.diff;;
+ esac
+ for f in ${FILESDIR}/*.patch; do
+ patch -Np1 -i $f
done
# As specified in the LFS book, disable installing libiberty.
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
@@ -47,11 +66,12 @@ _gmp_build() {
[ ! -d gmp-build ] && mkdir gmp-build
cd gmp-build
[ -f .gmp_build_done ] && return
+ cp -f ${XBPS_CROSSPFDIR}/config.sub ../gmp-${_gmp_ver}/configfsf.sub
- if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- export ABI=32
- fi
- ../gmp-${_gmp_ver}/configure --prefix=${wrksrc}/buildtmp \
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) _abi="env ABI=32";;
+ esac
+ ${_abi} ../gmp-${_gmp_ver}/configure --prefix=${wrksrc}/buildtmp \
--disable-shared --enable-static "$@"
make ${makejobs}
@@ -67,6 +87,7 @@ _mpfr_build() {
[ ! -d mpfr-build ] && mkdir mpfr-build
cd mpfr-build
[ -f .mpfr_build_done ] && return
+ cp -f ${XBPS_CROSSPFDIR}/config.sub ../mpfr-${_mpfr_ver}/
../mpfr-${_mpfr_ver}/configure --prefix=${wrksrc}/buildtmp \
--with-gmp=${wrksrc}/buildtmp \
@@ -85,6 +106,7 @@ _mpc_build() {
[ ! -d mpc-build ] && mkdir mpc-build
cd mpc-build
[ -f .mpc_build_done ] && return
+ cp -f ${XBPS_CROSSPFDIR}/config.sub ../mpc-${_mpc_ver}/
../mpc-${_mpc_ver}/configure --prefix=${wrksrc}/buildtmp \
--with-gmp=${wrksrc}/buildtmp \
@@ -102,25 +124,16 @@ _mpc_build() {
do_configure() {
local _floatabi _args
- if [ "$CROSS_BUILD" ]; then
- _args="--host=$XBPS_CROSS_TRIPLET"
- fi
-
- if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
- _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard"
- elif [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
- _args+=" --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard"
- fi
+ case "$XBPS_TARGET_MACHINE" in
+ armv6*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";;
+ armv7*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";;
+ esac
if [ "$CROSS_BUILD" ]; then
- export CC="$XBPS_CROSS_TRIPLET-gcc"
- export GCC="$CC"
+ _args+=" --host=$XBPS_CROSS_TRIPLET"
export CC_FOR_TARGET="$CC"
export GCC_FOR_TARGET="$CC"
- export CXX="$XBPS_CROSS_TRIPLET-g++"
export CXX_FOR_TARGET="$CXX"
- export CFLAGS="-Os"
- export CXXFLAGS="$CFLAGS"
fi
_gmp_build ${_args}
@@ -132,7 +145,8 @@ do_configure() {
cd gcc-build
CONFIG_SHELL=/bin/bash \
- ../gcc-${version}/configure --prefix=/usr \
+ ../gcc-${version}/configure --disable-bootstrap \
+ --prefix=/usr --bindir=/usr/bin \
--mandir=/usr/share/man --infodir=/usr/share/info \
--libdir=/usr/lib --libexecdir=/usr/lib \
--enable-clocale=gnu --enable-shared \
@@ -146,7 +160,7 @@ do_configure() {
--without-cloog --without-ppl --disable-libstdcxx-pch \
--disable-libquadmath --disable-libquadmath-support \
--disable-libgomp --disable-libssp --disable-libitm \
- ${_args}
+ --disable-libmudflap ${_args}
}
do_build() {
@@ -155,43 +169,45 @@ do_build() {
}
do_install() {
- local _triplet=
+ local _triplet
- if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- _triplet="${XBPS_TARGET_MACHINE}-unknown-linux-gnu"
- elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- _triplet="${XBPS_TARGET_MACHINE}-pc-linux-gnu"
- elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
- _triplet="arm-linux-gnueabihf"
- else
- msg_error "$pkgver: unknown XBPS_MACHINE\n"
- fi
-
- if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- vmkdir usr/lib
- cd ${DESTDIR}/usr && ln -sf lib lib64 && cd ${wrksrc}
- fi
+ case "$XBPS_TARGET_MACHINE" in
+ x86_64) _triplet="x86_64-unknown-linux-gnu";;
+ x86_64-musl) _triplet="x86_64-unknown-linux-musl";;
+ i686) _triplet="i686-pc-linux-gnu";;
+ i686-musl) _triplet="i686-pc-linux-musl";;
+ armv6l) _triplet="arm-linux-gnueabihf";;
+ armv7l) _triplet="arm-linux-gnueabihf7";;
+ armv6l-musl) _triplet="arm-linux-musleabi";;
+ armv7l-musl) _triplet="arm-linux-musleabi7";;
+ *) _triplet="$XBPS_CROSS_TRIPLET";;
+ esac
cd gcc-build
make DESTDIR=${DESTDIR} install
+ if [ -d ${DESTDIR}/usr/lib64 ]; then
+ mv ${DESTDIR}/usr/lib64/* ${DESTDIR}/usr/lib/
+ rmdir ${DESTDIR}/usr/lib64
+ fi
+
# Make version a symlink of major version to make all versions
# from the same series work automagically.
mv ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} \
${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}
- cd ${DESTDIR}/usr/lib/gcc/${_triplet} && ln -sf ${_majorver} ${version}
+ ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver} \
+ ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
# Ditto for c++ headers.
mv ${DESTDIR}/usr/include/c++/${version} \
${DESTDIR}/usr/include/c++/${_majorver}
- cd ${DESTDIR}/usr/include/c++ && ln -sf ${_majorver} ${version}
+ ln -sfr ${DESTDIR}/usr/include/c++/${_majorver} \
+ ${DESTDIR}/usr/include/c++/${version}
# cc symlink.
- cd ${DESTDIR}/usr/bin && ln -sf gcc cc
+ ln -sfr ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc
# rpcgen wants /lib/cpp, make a symlink
- cd ${DESTDIR}/usr/lib && ln -sf ../bin/cpp .
-
- rm -f ${DESTDIR}/usr/lib64
+ ln -sfr ${DESTDIR}/usr/bin/cpp ${DESTDIR}/usr/lib/cpp
# Remove unused stuff.
rm -f ${DESTDIR}/usr/lib/libffi*
@@ -201,13 +217,3 @@ do_install() {
# Remove all python scripts in libdir.
rm -f ${DESTDIR}/usr/lib/*.py
}
-
-chroot-gcc_package() {
- provides="libgcc-${version} libstdc++-${version} libstdc++-devel-${version}
- gcc-${version} gcc-c++-${version}"
- conflicts="libgcc>=0 libstdc++>=0 libstdc++-devel>=0 gcc>=0 gcc-c++>=0"
- noverifyrdeps=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chroot-gettext/template b/srcpkgs/chroot-gettext/template
index 965d23bbbf..7a6e576580 100644
--- a/srcpkgs/chroot-gettext/template
+++ b/srcpkgs/chroot-gettext/template
@@ -1,15 +1,17 @@
# Template build file for 'chroot-gettext'.
pkgname=chroot-gettext
version=0.18.3
-revision=2
+revision=3
wrksrc="gettext-${version}"
+bootstrap=yes
+conflicts="gettext>=0"
+provides="gettext-${version}_${revision}"
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath
--disable-acl --with-included-glib --with-included-libcroco --without-git
- --with-included-libxml --without-included-regex --without-emacs
- --disable-shared --disable-nls --disable-openmp --disable-curses
- --without-included-regex"
+ --with-included-libxml --without-emacs --disable-shared --disable-nls
+ --disable-openmp --disable-curses gl_cv_func_gettimeofday_clobber=no"
homepage="http://www.gnu.org/software/gettext/"
license="GPL-3"
short_desc="Internationalized Message Handling tools -- for xbps-src use"
@@ -17,16 +19,6 @@ maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.gz"
checksum=36f3c1043df803565d4977c1efbd41e1ec0f0301acf5f057984406c34cb9f948
-bootstrap=yes
-
post_install() {
rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/lib ${DESTDIR}/usr/include
}
-
-chroot-gettext_package() {
- conflicts="gettext>=0"
- provides="gettext-${version}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index d53bc3fe0c..6b77b0674f 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,12 +1,17 @@
# Template build file for "chroot-git".
pkgname=chroot-git
-version=1.8.2
+version=1.8.5.2
revision=1
+bootstrap=yes
wrksrc="git-$version"
+conflicts="git>=0"
+provides="git-${version}_${revision}"
build_style=gnu-configure
-configure_args="--without-curl --without-openssl --without-python
- --without-expat --without-tcltk --with-zlib=${XBPS_MASTERDIR}/usr
- ac_cv_lib_curl_curl_global_init=no ac_cv_lib_expat_XML_ParserCreate=no"
+configure_args="--without-curl --without-openssl
+ --without-python --without-expat --without-tcltk
+ ac_cv_lib_curl_curl_global_init=no ac_cv_lib_expat_XML_ParserCreate=no
+ ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no"
+makedepends="zlib-devel"
make_build_args="CC_LD_DYNPATH=-L"
make_install_args="NO_INSTALL_HARDLINKS=1"
short_desc="GIT Tree History Storage Tool -- for xbps-src use"
@@ -14,17 +19,12 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://git-scm.com/"
license="GPL-2"
distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz"
-checksum=c2f35bcefa4f62a54c4bde41cc0f1cd3ddf03e9a6bc8a79557f1683789f213e6
-
-bootstrap=yes
+checksum=024694524b8be91fe29afca65bc3a9e40de1322dd5ef2b2c0babb6849c913e8a
if [ "$CHROOT_READY" ]; then
hostmakedepends="perl"
-fi
-
-if [ "$CROSS_BUILD" ]; then
- makedepends="zlib-devel"
- configure_args+=" ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no"
+else
+ configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
fi
post_install() {
@@ -33,11 +33,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/share/man
rm -rf ${DESTDIR}/usr/share/perl5
}
-
-chroot-git_package() {
- conflicts="git>=0"
- provides="git-${version}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 48d9f3a811..e619541e81 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -1,36 +1,23 @@
# Build template for 'chroot-grep'.
pkgname=chroot-grep
-version=2.10
-revision=4
-build_style=gnu-configure
+version=2.16
+revision=1
wrksrc=grep-${version}
+bootstrap=yes
+conflicts="grep>=0"
+provides="grep-${version}_${revision}"
+build_style=gnu-configure
+configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
homepage="http://www.gnu.org/software/grep/"
distfiles="http://ftp.gnu.org/gnu/grep/grep-$version.tar.xz"
short_desc="The GNU grep utility - for use with xbps-src"
-configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
-checksum=6c796773f23bcd9bb751165bb9ce13a04d678e6d426ca59843e386f99dc77ab3
-long_desc="
- GNU grep is based on a fast lazy-state deterministic matcher (about twice
- as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper search for
- a fixed string that eliminates impossible text from being considered by the
- full regexp matcher without necessarily having to look at every character.
- The result is typically many times faster than Unix grep or egrep.
-
- This package is only meant to be used with xbps-src exclusively, you probably
- don't have to install it manually."
-
-bootstrap=yes
+checksum=16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162
post_install() {
rm -rf ${DESTDIR}/usr/share/info ${DESTDIR}/usr/share/man
-}
-
-chroot-grep_package() {
- conflicts="grep>=0"
- provides="grep-${version}"
- pkg_install() {
- vmove usr
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-gzip/template b/srcpkgs/chroot-gzip/template
index 9ba787550d..37e9742568 100644
--- a/srcpkgs/chroot-gzip/template
+++ b/srcpkgs/chroot-gzip/template
@@ -1,30 +1,33 @@
# Template file for 'chroot-gzip'
pkgname=chroot-gzip
-version=1.4
-revision=1
+version=1.6
+revision=2
wrksrc="gzip-${version}"
+bootstrap=yes
+conflicts="gzip>=0"
+provides="gzip-${version}_${revision}"
build_style=gnu-configure
+configure_args="gl_cv_func_fprintf_posix=yes gl_cv_func_fflush_stdin=yes"
homepage="http://www.gnu.org/software/gzip/"
license="GPL-3"
short_desc="GNU compression utility -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://ftp.gnu.org/gnu/gzip/gzip-$version.tar.gz"
-checksum=d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee
-
-bootstrap=yes
+checksum=97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e
pre_configure() {
- sed -i -e '/gets is a/d' lib/stdio.in.h
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ # Special case for musl libc; "fix" issues with gnulib.
+ : > lib/fseeko.c
+ echo "void close_stdin(void) {}" > lib/closein.c
+ ;;
+ esac
}
post_install() {
rm -rf ${DESTDIR}/usr/share
-}
-
-chroot-gzip_package() {
- conflicts="gzip>=0"
- provides="gzip-${version}"
- pkg_install() {
- vmove usr
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-m4/template b/srcpkgs/chroot-m4/template
index 9129a80361..a76ef24f62 100644
--- a/srcpkgs/chroot-m4/template
+++ b/srcpkgs/chroot-m4/template
@@ -1,31 +1,22 @@
# Template build file for 'chroot-m4'.
pkgname=chroot-m4
-version=1.4.16
-revision=1
+version=1.4.17
+revision=2
wrksrc="m4-${version}"
+bootstrap=yes
+conflicts="m4>=0"
+provides="m4-${version}_${revision}"
build_style=gnu-configure
-configure_args="--without-included-regex"
homepage="http://www.gnu.org/software/m4/"
license="GPL-3"
short_desc="GNU version of UNIX m4 macro language processor -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://ftp.gnu.org/gnu/m4/m4-$version.tar.bz2"
-checksum=42500c1fddd90bcb161e6b58de931d769929c495c124112d67428a23543db90c
-
-bootstrap=yes
-
-pre_configure() {
- sed -i -e '/gets is a/d' lib/stdio.in.h
-}
+checksum=8e4e1f963932136ed45dcd5afb0c6e237e96a6fcdcd2a2fa6755040859500d70
post_install() {
rm -rf ${DESTDIR}/usr/share
-}
-
-chroot-m4_package() {
- conflicts="m4>=0"
- provides="m4-${version}"
- pkg_install() {
- vmove usr
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-make/template b/srcpkgs/chroot-make/template
index adc95b60ae..d459e2bc02 100644
--- a/srcpkgs/chroot-make/template
+++ b/srcpkgs/chroot-make/template
@@ -4,6 +4,8 @@ version=4.0
revision=1
bootstrap=yes
wrksrc="make-${version}"
+conflicts="make>=0"
+provides="make-${version}_${revision}"
build_style=gnu-configure
configure_args="--disable-nls --without-guile"
short_desc="The GNU make system -- for xbps-src use"
@@ -23,11 +25,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/share
rm -rf ${DESTDIR}/usr/include
}
-
-chroot-make_package() {
- conflicts="make>=0"
- provides="make-${version}_${revision}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/chroot-patch/template b/srcpkgs/chroot-patch/template
index d33be34f89..ce1ee0806d 100644
--- a/srcpkgs/chroot-patch/template
+++ b/srcpkgs/chroot-patch/template
@@ -1,10 +1,13 @@
# Template file for 'chroot-patch'
pkgname=chroot-patch
version=2.7.1
-revision=2
+revision=3
wrksrc="patch-${version}"
+bootstrap=yes
build_style=gnu-configure
configure_args="--disable-xattr"
+conflicts="patch>=0"
+provides="patch-${version}"
short_desc="Patch files using diff output -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://savannah.gnu.org/projects/patch/"
@@ -12,16 +15,9 @@ license="GPL-3"
distfiles="http://ftp.gnu.org/gnu/patch/patch-$version.tar.bz2"
checksum=aae676de9e95051f425af4507fcc9a019941a2a1f78405e7dbd40bccf786aa11
-bootstrap=yes
-
post_install() {
rm -rf ${DESTDIR}/usr/share
-}
-
-chroot-patch_package() {
- conflicts="patch>=0"
- provides="patch-${version}"
- pkg_install() {
- vmove usr
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-sed/template b/srcpkgs/chroot-sed/template
index af559f1b97..783811bc10 100644
--- a/srcpkgs/chroot-sed/template
+++ b/srcpkgs/chroot-sed/template
@@ -1,32 +1,23 @@
# Template file for 'chroot-sed'
pkgname=chroot-sed
-version=4.2.1
-revision=1
+version=4.2.2
+revision=2
wrksrc="sed-${version}"
+bootstrap=yes
+conflicts="sed>=0"
+provides="sed-${version}_${revision}"
build_style=gnu-configure
-configure_args="--disable-acl --disable-nls --disable-i18n --without-included-regex"
+configure_args="--disable-acl --disable-nls --disable-i18n"
short_desc="The GNU stream editor -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
-distfiles="http://ftp.gnu.org/gnu/sed/sed-$version.tar.gz"
-checksum=8773541ce097fdc4c5b9e7da12a82dffbb30cd91f7bc169f52f05f93b7fc3060
homepage="http://www.gnu.org/software/sed/"
license="GPL-3"
-long_desc="
- Sed, the GNU Stream Editor, copies the named files (standard input default)
- to the standard output, edited according to a script of commands.
-
- This package is only meant to be used by xbps-src, don't install it manually."
-
-bootstrap=yes
+distfiles="http://ftp.gnu.org/gnu/sed/sed-$version.tar.gz"
+checksum=fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff
post_install() {
rm -rf ${DESTDIR}/usr/share
-}
-
-chroot-sed_package() {
- conflicts="sed>=0"
- provides="sed-${version}"
- pkg_install() {
- vmove usr
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-tar/template b/srcpkgs/chroot-tar/template
index f12567cf54..7d6bb54ac0 100644
--- a/srcpkgs/chroot-tar/template
+++ b/srcpkgs/chroot-tar/template
@@ -1,8 +1,11 @@
# Template build file for 'chroot-tar'.
pkgname=chroot-tar
-version=1.27
-revision=2
+version=1.27.1
+revision=1
wrksrc="tar-${version}"
+bootstrap=yes
+conflicts="tar>=0"
+provides="tar-${version}_${revision}"
build_style=gnu-configure
configure_args="--disable-acl"
homepage="http://www.gnu.org/software/tar/"
@@ -10,18 +13,11 @@ license="GPL-3"
short_desc="The GNU tape archiver -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://ftp.gnu.org/gnu/tar/tar-$version.tar.xz"
-checksum=1b2a6b4b9de6b48e9e994276197e1f18e512a9acf6f598905f0e481ca3f8245b
-
-bootstrap=yes
+checksum=574210bccbcf9eec889f73234a63ad6863f5b8644ac1f3d7f13871372295b7c7
post_install() {
rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec
-}
-
-chroot-tar_package() {
- conflicts="tar>=0"
- provides="tar-${version}_${revision}"
- pkg_install() {
- vmove all
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-texinfo/template b/srcpkgs/chroot-texinfo/template
index 1fef22d9c7..657f680188 100644
--- a/srcpkgs/chroot-texinfo/template
+++ b/srcpkgs/chroot-texinfo/template
@@ -1,8 +1,13 @@
# Template file for 'chroot-texinfo'
pkgname=chroot-texinfo
version=4.13a
-revision=2
+revision=4
wrksrc="texinfo-4.13"
+bootstrap=yes
+hostmakedepends="ncurses-devel"
+makedepends="ncurses-devel"
+conflicts="texinfo>=0"
+provides="texinfo-${version}_${revision}"
short_desc="The GNU Documentation System -- for xbps-src use"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -10,11 +15,9 @@ homepage="http://www.gnu.org/software/texinfo/"
distfiles="http://ftp.gnu.org/gnu/texinfo/texinfo-$version.tar.gz"
checksum=1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68
-bootstrap=yes
-hostmakedepends="ncurses-devel"
-makedepends="ncurses-devel"
-
do_configure() {
+ cp -f ${XBPS_CROSSPFDIR}/config.sub build-aux
+
./configure ${configure_args} --disable-nls
}
@@ -32,12 +35,7 @@ do_install() {
rm -f ${DESTDIR}/usr/bin/info
rm -f ${DESTDIR}/usr/bin/infokey
rm -rf ${DESTDIR}/usr/share
-}
-
-chroot-texinfo_package() {
- conflicts="texinfo>=0"
- provides="texinfo-${version}"
- pkg_install() {
- vmove all
- }
+ if [ -f ${DESTDIR}/usr/lib/charset.alias ]; then
+ rm -f ${DESTDIR}/usr/lib/charset.alias
+ fi
}
diff --git a/srcpkgs/chroot-util-linux/patches b/srcpkgs/chroot-util-linux/patches
new file mode 120000
index 0000000000..33edac3e59
--- /dev/null
+++ b/srcpkgs/chroot-util-linux/patches
@@ -0,0 +1 @@
+../util-linux/patches
\ No newline at end of file
diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index 3ea0b7348b..f93b26b654 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -1,8 +1,12 @@
# Template file for 'chroot-util-linux'
pkgname=chroot-util-linux
-version=2.21
+version=2.24
revision=1
-wrksrc="util-linux-${version}"
+wrksrc="${pkgname/chroot-/}-${version}"
+bootstrap=yes
+conflicts="util-linux>=0"
+provides="util-linux-${version}_${revision}"
+makedepends="zlib-devel"
build_style=gnu-configure
configure_args="--without-ncurses --without-udev --disable-libuuid
--disable-libblkid --disable-libmount --disable-mount --disable-losetup
@@ -14,15 +18,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/util-linux/v2.21/util-linux-${version}.tar.xz"
-checksum=5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f
-long_desc="
- The util-linux package contains miscellaneous utility programs. Among
- them are utilities for handling file systems, consoles, partitions,
- and messages.
-
- This package is only meant to be used by xbps-src, don't install it manually."
-
-bootstrap=yes
+checksum=30add9a8869cef9e5a76755214f074689b6294cea63f4569711faeb099aecc06
if [ -z "$CHROOT_READY" ]; then
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
@@ -36,12 +32,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/sbin
rm -rf ${DESTDIR}/usr/share/man
}
-
-chroot-util-linux_package() {
- conflicts="util-linux>=0"
- provides="util-linux-${version}"
- replaces="chroot-gnu-getopt>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/chrpath/template b/srcpkgs/chrpath/template
index 286c4678f6..b7c0e048a3 100644
--- a/srcpkgs/chrpath/template
+++ b/srcpkgs/chrpath/template
@@ -12,9 +12,3 @@ checksum="c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b"
long_desc="
chrpath allows you to modify the dynamic library load path (rpath and runpath)
of compiled programs and libraries."
-
-chrpath_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index 98eab8641a..716805391f 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -32,9 +32,3 @@ post_install() {
chmod +s ${DESTDIR}/usr/bin/mount.cifs
rm -rf ${DESTDIR}/usr/include
}
-
-cifs-utils_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 9f0619ca7f..c37009dd8a 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -13,6 +13,7 @@ makedepends="dbus-glib-devel gnome-menus-devel libgnomekbd-devel cinnamon-deskto
libnotify-devel upower-devel polkit-devel colord-devel ibus-devel pulseaudio-devel
libcanberra-devel cups-devel cheese-devel libXxf86misc-devel
desktop-file-utils hicolor-icon-theme"
+depends="cinnamon-settings-daemon cinnamon-translations desktop-file-utils hicolor-icon-theme"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -50,10 +51,3 @@ cinnamon-control-center-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-cinnamon-control-center_package() {
- depends="cinnamon-settings-daemon cinnamon-translations desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index fa30a35972..86849096db 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -7,8 +7,9 @@ build_style=gnu-configure
configure_args=" --disable-static"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel intltool which"
-makedepends="gdk-pixbuf-devel gtk+3-devel libXrandr-devel xkeyboard-config libxkbfile-devel "
-maintainer="Roelof Wobben <rwobben@hotmail.com>"
+makedepends="gdk-pixbuf-devel gtk+3-devel libXrandr-devel xkeyboard-config libxkbfile-devel"
+depends="xkeyboard-config"
+maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -30,11 +31,3 @@ cinnamon-desktop-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-cinnamon-desktop_package() {
- depends="xkeyboard-config"
- pkg_install() {
- vmove all
- }
-}
-
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index 186aecc338..8a09aa5980 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -11,6 +11,8 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel intltool which"
makedepends="dbus-glib-devel libgnomekbd-devel cinnamon-desktop-devel
libXxf86misc-devel pam-devel systemd-devel desktop-file-utils hicolor-icon-theme"
+depends="cinnamon-translations desktop-file-utils hicolor-icon-theme"
+conf_files="/etc/pam.d/${pkgname}"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -26,11 +28,3 @@ pre_configure() {
post_install() {
vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname}
}
-
-cinnamon-screensaver_package() {
- depends="cinnamon-translations desktop-file-utils hicolor-icon-theme"
- conf_files="/etc/pam.d/${pkgname}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index ee4a3cc4a8..760e7b9afa 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -11,6 +11,7 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel
systemd-devel pangox-compat-devel cinnamon-desktop-devel desktop-file-utils
hicolor-icon-theme"
+depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -22,10 +23,3 @@ do_fetch() {
pre_configure() {
./autogen.sh
}
-
-cinnamon-session_package() {
- depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 8e53c69243..c102e05921 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -13,6 +13,7 @@ makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel
systemd-devel libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel
pulseaudio-devel libcanberra-devel colord-devel cups-devel nss-devel polkit-devel
desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -33,10 +34,3 @@ cinnamon-settings-daemon-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-cinnamon-settings-daemon_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index 19be804d19..2dca4d2df3 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -2,8 +2,9 @@
pkgname=cinnamon-translations
version=2.0.3
revision=1
+noarch=yes
short_desc="Translations for Cinnamon and Nemo"
-maintainer="Roelof Wobben <rwobben@hotmail.com>"
+maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -12,14 +13,6 @@ do_fetch() {
}
do_install () {
- vmkdir /usr/share/cinnamon/locale
- cp -a mo-export/* ${DESTDIR}/usr/share/cinnamon/locale
-}
-
-cinnamon-translations_package() {
- noarch=yes
- pkg_install () {
- vmove all
- }
-
+ vmkdir /usr/share/cinnamon/locale
+ cp -a mo-export/* ${DESTDIR}/usr/share/cinnamon/locale
}
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 42296b893e..50dcceedf6 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -20,6 +20,7 @@ makedepends="cjs-devel clutter-gtk-devel gnome-menus-devel gstreamer1-devel
muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel
startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel
libgnome-keyring-devel NetworkManager-devel libcroco-devel ${_RUNTIMEDEPS}"
+depends="${_RUNTIMEDEPS}"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -55,10 +56,3 @@ post_install() {
vinstall ${FILESDIR}/org.cinnamon.settings-users.policy 644 usr/share/polkit-1/actions
vinstall ${FILESDIR}//polkit-cinnamon-authentication-agent-1.desktop 644 usr/share/applications
}
-
-cinnamon_package() {
- depends="${_RUNTIMEDEPS}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 95671454b5..8e6f789798 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args=" --disable-static"
hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection"
makedepends="js-devel dbus-glib-devel readline-devel"
-maintainer="Roelof Wobben <rwobben@hotmail.com>"
+maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -28,9 +28,3 @@ cjs-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-cjs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template
index 04937ec4e7..aec073a080 100644
--- a/srcpkgs/clipgrab/template
+++ b/srcpkgs/clipgrab/template
@@ -3,6 +3,7 @@ pkgname=clipgrab
version=3.2.1.2
revision=1
makedepends="qt-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A friendly downloader for YouTube and other sites"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -20,10 +21,3 @@ do_install() {
vinstall icon.png 644 usr/share/pixmaps clipgrab.png
vinstall ${FILESDIR}/clipgrab.desktop 644 usr/share/applications
}
-
-clipgrab_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template
index 1fef48e704..25edaa974c 100644
--- a/srcpkgs/cloog/template
+++ b/srcpkgs/cloog/template
@@ -5,6 +5,7 @@ revision=3
build_style=gnu-configure
configure_args="--with-isl=system --with-gmp=system"
makedepends="gmp-devel isl-devel"
+replaces="cloog-ppl>=0"
short_desc="Library that generates loops for scanning polyhedra"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.bastoul.net/cloog/"
@@ -26,10 +27,3 @@ cloog-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-cloog_package() {
- replaces="cloog-ppl>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/clucene/template b/srcpkgs/clucene/template
index 5ba66b56a5..a545243463 100644
--- a/srcpkgs/clucene/template
+++ b/srcpkgs/clucene/template
@@ -34,9 +34,3 @@ clucene-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-clucene_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/clutter-gst/template b/srcpkgs/clutter-gst/template
index 61de691128..f7b1023957 100644
--- a/srcpkgs/clutter-gst/template
+++ b/srcpkgs/clutter-gst/template
@@ -1,20 +1,21 @@
# Template file for 'clutter-gst'
pkgname=clutter-gst
-version=2.0.8
-revision=2
+version=2.0.10
+revision=1
build_style=gnu-configure
configure_args="--disable-debug"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="clutter-devel>=1.16 gst-plugins-bad1-devel>=1:1.2.0"
+depends="gst-plugins-base1>=1:1.2 gst-plugins-bad1>=1:1.2"
short_desc="GStreamer bindings for the Clutter Toolkit"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gtk.org/"
license="GPL-2"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d
+checksum=f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00
clutter-gst-devel_package() {
- depends="clutter-devel>=1.16 gst-plugins-bad1-devel>=1:1.2.0 ${sourcepkg}-${version}_${revision}"
+ depends="clutter-devel>=1.16 gst-plugins-bad1-devel>=1:1.2.0 ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -24,10 +25,3 @@ clutter-gst-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-clutter-gst_package() {
- depends="gst-plugins-base1>=1:1.2 gst-plugins-bad1>=1:1.2"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template
index 3b29d4689d..c998353c56 100644
--- a/srcpkgs/clutter-gtk/template
+++ b/srcpkgs/clutter-gtk/template
@@ -23,9 +23,3 @@ clutter-gtk-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-clutter-gtk_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/clutter/patches/evdev-0.6.patch b/srcpkgs/clutter/patches/evdev-0.6.patch
new file mode 100644
index 0000000000..092ed3f4ff
--- /dev/null
+++ b/srcpkgs/clutter/patches/evdev-0.6.patch
@@ -0,0 +1,34 @@
+--- clutter/evdev/clutter-device-manager-evdev.c.orig 2014-01-11 20:23:48.666461064 +0100
++++ clutter/evdev/clutter-device-manager-evdev.c 2014-01-11 20:24:23.951600220 +0100
+@@ -605,11 +605,11 @@ sync_source (ClutterEventSource *source)
+ const gchar *device_path;
+
+ /* We read a SYN_DROPPED, ignore it and sync the device */
+- err = libevdev_next_event (source->dev, LIBEVDEV_READ_SYNC, &ev);
++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_SYNC, &ev);
+ while (err == 1)
+ {
+ dispatch_one_event (source, &ev);
+- err = libevdev_next_event (source->dev, LIBEVDEV_READ_SYNC, &ev);
++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_SYNC, &ev);
+ }
+
+ if (err != -EAGAIN && CLUTTER_HAS_DEBUG (EVENT))
+@@ -664,7 +664,7 @@ clutter_event_dispatch (GSource *g_s
+ if (clutter_events_pending ())
+ goto queue_event;
+
+- err = libevdev_next_event (source->dev, LIBEVDEV_READ_NORMAL, &ev);
++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
+ while (err != -EAGAIN)
+ {
+ if (err == 1)
+@@ -677,7 +677,7 @@ clutter_event_dispatch (GSource *g_s
+ goto out;
+ }
+
+- err = libevdev_next_event (source->dev, LIBEVDEV_READ_NORMAL, &ev);
++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
+ }
+
+ queue_event:
diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template
index 07319ba6b0..31f2353126 100644
--- a/srcpkgs/clutter/template
+++ b/srcpkgs/clutter/template
@@ -1,6 +1,6 @@
# Template file for 'clutter'
pkgname=clutter
-version=1.16.2
+version=1.16.4
revision=1
build_style=gnu-configure
configure_args="--enable-introspection --enable-evdev-input
@@ -8,22 +8,21 @@ configure_args="--enable-introspection --enable-evdev-input
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="
atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel
- libxkbcommon-devel cogl-devel>=1.16.0_2 libevdev-devel libgudev-devel"
+ libxkbcommon-devel cogl-devel>=1.16.0_2 libevdev-devel>=0.6 libgudev-devel"
+# egl/kms/wayland support in cogl
+depends="cogl>=1.16.0_2"
short_desc="OpenGL based interactive canvas library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.clutter-project.org"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz"
-checksum=0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42
-long_desc="
- Clutter is an open source software library for creating fast, visually
- rich and animated graphical user interfaces."
+checksum=cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65
clutter-devel_package() {
depends="cogl-devel>=1.16.0_2 cairo-devel atk-devel pango-devel json-glib-devel
libX11-devel libXext-devel libXfixes-devel libXdamage-devel
libXcomposite-devel libXi-devel libevdev-devel libgudev-devel
- clutter>=${version}_${revision}"
+ libxkbcommon-devel clutter>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -33,11 +32,3 @@ clutter-devel_package() {
vmove "usr/share/gir-*"
}
}
-
-clutter_package() {
- # egl/kms/wayland support in cogl
- depends="cogl>=1.16.0_2"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index b0fa37c735..ee5b789d57 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -4,14 +4,14 @@ version=2.8.12
revision=1
wrksrc="cmake-${version}"
build_style=configure
-configure_script=./bootstrap
-configure_args="--prefix=/usr --mandir=/share/man
- --docdir=/share/doc/cmake --system-libs --qt-gui"
+configure_script="./bootstrap"
+configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake --system-libs --qt-gui"
if [ -n "$XBPS_MAKEJOBS" ]; then
configure_args+=" --parallel=$XBPS_MAKEJOBS"
fi
makedepends="zlib-devel expat-devel libcurl-devel
ncurses-devel libarchive-devel>=3.1.2 qt-devel desktop-file-utils shared-mime-info"
+depends="desktop-file-utils shared-mime-info"
short_desc="Cross-platform, open-source build system - QT GUI"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -19,13 +19,13 @@ homepage="http://www.cmake.org"
distfiles="http://www.cmake.org/files/v2.8/cmake-$version.tar.gz"
checksum=d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287
-cmake-gui_package() {
- depends="desktop-file-utils shared-mime-info"
- pkg_install() {
- vmove usr/bin/cmake-gui
- vmove usr/share/man/man1/cmake-gui.1
- vmove usr/share/applications
- vmove usr/share/mime/packages
- vmove usr/share/pixmaps
- }
+do_install() {
+ # We are only interested in cmake-gui.
+ make DESTDIR=${wrksrc}/${pkgname} install
+
+ vmove ${pkgname}/usr/bin/cmake-gui
+ vmove ${pkgname}/usr/share/man/man1/cmake-gui.1
+ vmove ${pkgname}/usr/share/applications
+ vmove ${pkgname}/usr/share/mime/packages
+ vmove ${pkgname}/usr/share/pixmaps
}
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index bbece223ee..3fc5b72f05 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -16,9 +16,3 @@ license="BSD"
homepage="http://www.cmake.org"
distfiles="http://www.cmake.org/files/v2.8/$pkgname-$version.tar.gz"
checksum=fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67
-
-cmake_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 0d825074f4..ca26b73301 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,7 +1,7 @@
# Template file for 'cmus'
pkgname=cmus
version=2.5.0
-revision=4
+revision=5
wrksrc="cmus-v${version}"
short_desc="Small, fast and powerful console music player"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -10,24 +10,17 @@ homepage="http://cmus.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/cmus/cmus-v${version}.tar.bz2"
checksum=2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf
+build_style=configure
+configure_args="prefix=/usr"
hostmakedepends="pkg-config"
-makedepends="faad2-devel libflac-devel libao-devel libmad-devel
+makedepends="ncurses-devel faad2-devel libflac-devel libao-devel libmad-devel
libmodplug-devel libmp4v2-devel>=2.0.0 libmpcdec-devel pulseaudio-devel
- opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel>=2.1
- ncurses-devel"
-
-do_configure() {
- ./configure prefix=/usr
-}
+ opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel>=2.1"
do_build() {
make GCC=$CC CC=$CC LD=$CC ${makejobs}
}
-do_install() {
- make DESTDIR=$DESTDIR install
-}
-
cmus-libao_package() {
short_desc+=" - libao output plugin"
pkg_install() {
@@ -98,9 +91,3 @@ cmus-wavpack_package() {
vmove usr/lib/cmus/ip/wavpack.so
}
}
-
-cmus_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cntlm/template b/srcpkgs/cntlm/template
index e1c21341d7..c04962339a 100644
--- a/srcpkgs/cntlm/template
+++ b/srcpkgs/cntlm/template
@@ -4,6 +4,7 @@ version=0.92.3
revision=1
build_style=gnu-configure
hostmakedepends="which"
+conf_files="/etc/cntlm.conf"
short_desc="NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL-2"
@@ -19,10 +20,3 @@ do_build() {
post_install() {
vinstall ${FILESDIR}/cntlm.service 644 usr/lib/systemd/system
}
-
-cntlm_package() {
- conf_files="/etc/cntlm.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cogl/template b/srcpkgs/cogl/template
index 87659c568a..a7c6fcae08 100644
--- a/srcpkgs/cogl/template
+++ b/srcpkgs/cogl/template
@@ -1,7 +1,7 @@
# Template file for 'cogl'
pkgname=cogl
-version=1.16.0
-revision=2
+version=1.16.2
+revision=1
build_style=gnu-configure
configure_args="--enable-introspection --enable-cogl-gst=yes
--enable-gles1 --enable-gles2 --enable-kms-egl-platform
@@ -9,12 +9,13 @@ configure_args="--enable-introspection --enable-cogl-gst=yes
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="libXcomposite-devel libXrandr-devel libXdamage-devel pango-devel
gdk-pixbuf-devel gst-plugins-base1-devel>=1:1.2.0 wayland-devel"
+depends="gst-plugins-base1>=1:1.2.0"
short_desc="Library for using 3D graphics hardware for rendering"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.clutter-project.org"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/cogl/${version%.*}/cogl-${version}.tar.xz"
-checksum=75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094
+checksum=65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7
cogl-devel_package() {
depends="libdrm-devel libXcomposite-devel libXdamage-devel
@@ -28,10 +29,3 @@ cogl-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-cogl_package() {
- depends="gst-plugins-base1>=1:1.2.0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index d1024d60d2..cb662b8cd4 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -18,16 +18,10 @@ long_desc="
colord-gtk-devel_package() {
depends="colord-devel>=0.1.31 gtk+3-devel>=3.8.0 ${sourcepkg}>=${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gir-1.0
}
}
-
-colord-gtk_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index 442c929f33..326da0761c 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -1,26 +1,52 @@
# Template file for 'colord'
pkgname=colord
-version=1.0.4
+version=1.0.6
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile
--with-systemdsystemunitdir=/usr/lib/systemd/system --enable-vala
--with-udevrulesdir=/usr/lib/udev/rules.d --disable-bash-completion
--enable-polkit --enable-volume-search --with-daemon-user=colord"
-hostmakedepends="pkg-config intltool gobject-introspection docbook2x"
+hostmakedepends="pkg-config intltool docbook2x"
makedepends="vala-devel>=0.20 libgudev-devel polkit-devel lcms2-devel dbus-devel
libusb-devel libgusb-devel>=0.1.6 systemd-devel sqlite-devel shared-color-profiles"
+depends="shared-color-profiles shadow"
+conf_files="/etc/colord.conf"
+system_accounts="colord"
+colord_homedir="/var/lib/colord"
+make_dirs="
+ /var/lib/colord 0755 colord colord
+ /var/lib/colord/icc 0755 colord colord"
short_desc="System daemon for managing color devices"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/software/colord"
license="GPL-2"
distfiles="$homepage/releases/$pkgname-$version.tar.xz"
-checksum=e716d5c284031f7cc6a3fc7aeceab5df2bc5bb17920a57e37b2d800ce26d8bdc
+checksum=a40bbceaa3d3b1d6fd2777b181bf641b4eb49ad249796823585136c146ad7e8e
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
libcolord_package() {
short_desc+=" - runtime library"
- replaces="colord<0.1.23_3"
+ replaces="colord<1.0.6"
pkg_install() {
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ fi
vmove "usr/lib/*.so.*"
}
}
@@ -32,20 +58,9 @@ colord-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
vmove usr/share/vala
}
}
-
-colord_package() {
- conf_files="/etc/colord.conf"
- system_accounts="colord"
- colord_homedir="/var/lib/colord"
- make_dirs="
- /var/lib/colord 0755 colord colord
- /var/lib/colord/icc 0755 colord colord"
- depends="shared-color-profiles shadow"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/compositeproto/template b/srcpkgs/compositeproto/template
index 67de8c2804..895d171a80 100644
--- a/srcpkgs/compositeproto/template
+++ b/srcpkgs/compositeproto/template
@@ -2,6 +2,7 @@
pkgname=compositeproto
version=0.4.1
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="Composite extension headers from modular X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,13 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984
-long_desc="
- This package provides Composite extension headers from the modular
- X.org X11 project."
-
-compositeproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/compton-git/template b/srcpkgs/compton-git/template
index 1a2a2224ea..d96e8dcf2e 100644
--- a/srcpkgs/compton-git/template
+++ b/srcpkgs/compton-git/template
@@ -1,27 +1,20 @@
# Template file for 'compton-git'
pkgname=compton-git
-version=20131217
+version=20140124
revision=1
+only_for_archs="i686 x86_64"
build_style=gnu-makefile
hostmakedepends="pkg-config asciidoc"
makedepends="dbus-devel libXcomposite-devel libXdamage-devel libXrandr-devel pcre-devel
libconfig-devel libdrm-devel MesaLib-devel libXinerama-devel desktop-file-utils"
+depends="desktop-file-utils"
maintainer="Steven R <strob AT styez DOT com>"
homepage="https://github.com/chjj/compton"
license="MIT"
short_desc="A compositor for X (fork of xcompmgr-dana)"
-only_for_archs="i686 x86_64"
-
do_fetch() {
local url="git://github.com/chjj/compton.git"
msg_normal "Fetching source from $url ...\n"
git clone ${url} ${pkgname}-${version}
}
-
-compton-git_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/confuse/template b/srcpkgs/confuse/template
index c112a64210..a6574877b9 100644
--- a/srcpkgs/confuse/template
+++ b/srcpkgs/confuse/template
@@ -35,9 +35,3 @@ confuse-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-confuse_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 29991694b1..19b29628ed 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -1,32 +1,24 @@
# Template file for 'conky-cli'
pkgname=conky-cli
-_pkgname=conky
version=1.9.0
-revision=1
+revision=2
+wrksrc="${pkgname/-cli/}-${version}"
build_style=gnu-configure
configure_args="--disable-lua --disable-x11 --disable-xft --disable-imlib2
--disable-own-window --disable-xdamage --disable-double-buffer --enable-curl
--enable-wlan --enable-rss --enable-ibm"
hostmakedepends="pkg-config"
makedepends="ncurses-devel wireless_tools-devel libglib-devel libcurl-devel libxml2-devel"
+conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
+provides="conky-${version}"
+conflicts="conky>=0"
short_desc="Conky command line without X11"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="BSD, GPL"
homepage="http://conky.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/${pkgname/-cli/}/${pkgname/-cli/}-${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
}
-
-conky-cli_package() {
- conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
- provides="conky-${version}"
- conflicts="conky>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index f55fc7fd93..e2cf3544a0 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -8,18 +8,11 @@ configure_args="--enable-ibm --enable-curl --enable-rss --enable-weather-xoap
hostmakedepends="pkg-config docbook2x"
makedepends="alsa-lib-devel libglib-devel libxml2-devel libXft-devel
libXdamage-devel imlib2-devel wireless_tools-devel libcurl-devel ncurses-devel"
+conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
+conflicts="conky>=0"
short_desc="Lightweight system monitor for X"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD, GPL"
homepage="http://conky.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca
-
-conky_package() {
- conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
- provides="conky-${version}"
- conflicts="conky>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/connman-ui-git/template b/srcpkgs/connman-ui-git/template
index 894aef790c..cd2cae5ebc 100644
--- a/srcpkgs/connman-ui-git/template
+++ b/srcpkgs/connman-ui-git/template
@@ -17,9 +17,3 @@ do_fetch() {
pre_configure() {
autoreconf -fi
}
-
-connman-ui-git_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index fb1a44e740..36b6306458 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -1,21 +1,20 @@
# Template file for 'connman'
pkgname=connman
-version=1.19
+version=1.21
revision=1
build_style=gnu-configure
configure_args="--enable-pie --enable-threads --enable-ethernet
--enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat
--enable-polkit --enable-client --with-systemdunitdir=/usr/lib/systemd/system"
+hostmakedepends="pkg-config"
+makedepends="libglib-devel dbus-devel iptables-devel>=1.4.18 gnutls-devel>=3.1.5 readline-devel wpa_supplicant"
+depends="wpa_supplicant"
short_desc="Open Source CONNection MANager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://connman.net/"
distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz"
-checksum=7e4e624cadf42feed18e783351b10f81ef23d7e298bddc7ffe26fe5e69f25b8b
-
-hostmakedepends="pkg-config"
-makedepends="libglib-devel dbus-devel iptables-devel>=1.4.18
- gnutls-devel>=3.1.5 readline-devel wpa_supplicant"
+checksum=e80f4e9c639ef016e9c497c122c349dbc9e6dc78a9976f986134739ee208c08a
post_install() {
# Install the client connmanctl.
@@ -30,10 +29,3 @@ connman-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-connman_package() {
- depends="wpa_supplicant"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/containers/template b/srcpkgs/containers/template
index 05d5df7e6e..4208e8a7b2 100644
--- a/srcpkgs/containers/template
+++ b/srcpkgs/containers/template
@@ -26,9 +26,3 @@ do_install() {
sed -e 's,-s ,,g' -i Makefile
make BINDIR=/usr/bin DESTDIR=${DESTDIR} install
}
-
-containers_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index 0304f13dc3..1fa49a2854 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -4,6 +4,8 @@ version=8.22
revision=1
hostmakedepends="perl"
makedepends="gmp-devel acl-devel libcap-devel"
+depends="coreutils-doc-${version}_${revision}"
+conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3"
short_desc="The GNU core utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/coreutils"
@@ -53,14 +55,6 @@ do_install() {
fi
}
-coreutils_package() {
- conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3"
- depends="coreutils-doc-${version}_${revision}"
- pkg_install() {
- vmove all
- }
-}
-
if [ -z "$CROSS_BUILD" ]; then
coreutils-doc_package() {
noarch=yes
diff --git a/srcpkgs/cpio/template b/srcpkgs/cpio/template
index 74436aa959..9382df5a7a 100644
--- a/srcpkgs/cpio/template
+++ b/srcpkgs/cpio/template
@@ -21,9 +21,3 @@ post_install() {
# Remove rmt that conflicts with the one from tar.
rm -rf ${DESTDIR}/usr/libexec
}
-
-cpio_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cppcheck/patches/Makefile-db2man.patch b/srcpkgs/cppcheck/patches/Makefile-db2man.patch
deleted file mode 100644
index 213b6abc41..0000000000
--- a/srcpkgs/cppcheck/patches/Makefile-db2man.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig 2011-02-06 12:14:09.000000000 +0100
-+++ Makefile 2011-02-08 09:44:42.673787912 +0100
-@@ -15,7 +15,7 @@ endif
- BIN=$(DESTDIR)$(PREFIX)/bin
-
- # For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux
--DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-+DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl
- XP=xsltproc -''-nonet -''-param man.charmap.use.subset "0"
- MAN_SOURCE=man/cppcheck.1.xml
-
-@@ -131,8 +131,9 @@ tags:
-
- install: cppcheck
- install -d ${BIN}
-- install cppcheck ${BIN}
--
-+ install -m755 cppcheck ${BIN}
-+ install -d $(DESTDIR)$(PREFIX)/share/man/man1
-+ install -m644 cppcheck.1 $(DESTDIR)$(PREFIX)/share/man/man1
-
- ###### Build
-
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 14e9d74e12..d0ad1c9444 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,19 +1,22 @@
# Template file for 'cppcheck'
pkgname=cppcheck
-version=1.60.1
+version=1.63.1
revision=1
-build_style=gnu-makefile
-make_build_target="all man"
hostmakedepends="libxslt docbook-xsl"
short_desc="Static analysis of C/C++ code"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://cppcheck.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=73eb56e5ea268e917c73f64e68744add35409bdc93be99773d814f9cc0a7221e
-cppcheck_package() {
- pkg_install() {
- vmove usr
- }
+do_fetch() {
+ git clone -b ${version} git://github.com/danmar/cppcheck ${pkgname}-${version}
+}
+
+do_build() {
+ make ${makejobs} DB2MAN=/usr/share/xsl/docbook/manpages/docbook.xsl all man
+}
+
+do_install() {
+ make DESTDIR=${DESTDIR} install
+ vinstall cppcheck.1 644 usr/share/man/man1
}
diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template
index 8365d58322..e07cbefd47 100644
--- a/srcpkgs/cproto/template
+++ b/srcpkgs/cproto/template
@@ -14,9 +14,3 @@ checksum=1231309b1e9712551e1247120b096d019e1c66e612ad446184ad2def89f32d5d
do_install() {
make bindir=${DESTDIR}/usr/bin mandir=${DESTDIR}/usr/share/man install
}
-
-cproto_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index dc73490c52..f76dede9c6 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -34,9 +34,3 @@ libcpufreq-devel_package() {
vmove usr/include
}
}
-
-cpufrequtils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cpuminer/template b/srcpkgs/cpuminer/template
index 7268dcdf31..62038eb047 100644
--- a/srcpkgs/cpuminer/template
+++ b/srcpkgs/cpuminer/template
@@ -11,9 +11,3 @@ license="GPL-3"
homepage="https://github.com/pooler/cpuminer"
distfiles="${SOURCEFORGE_SITE}/cpuminer/pooler-cpuminer-${version}.tar.gz"
checksum=93460fbb5b368cbf8b2f90bc915a78ced37fed8a39dd1ee2e3983101bd1fdc1f
-
-cpuminer_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template
index 9c02266ce0..cbb2cb5598 100644
--- a/srcpkgs/cracklib/template
+++ b/srcpkgs/cracklib/template
@@ -57,9 +57,3 @@ libcracklib_package() {
vmove "usr/lib/*.so*"
}
}
-
-cracklib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 84064e9cdf..efdaca9116 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -6,6 +6,17 @@ build_style=gnu-configure
configure_args="--with-inotify --without-selinux --with-pam
--disable-anacron --localstatedir=/var --enable-pie --enable-relro"
makedepends="pam-devel run-parts"
+depends="run-parts"
+make_dirs="
+ /etc/cron.d/daily 0755 root root
+ /etc/cron.d/weekly 0755 root root
+ /etc/cron.d/monthly 0755 root root
+ /etc/cron.d/yearly 0755 root root
+ /var/spool/cron 0755 root root"
+conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny"
+replaces="cron-daemon>=0"
+provides="cron-daemon-0"
+systemd_services="cronie.service on"
short_desc="Runs specified programs at scheduled times"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://fedorahosted.org/cronie/"
@@ -22,20 +33,3 @@ post_install() {
touch ${DESTDIR}/etc/cron.deny
chmod 644 ${DESTDIR}/etc/cron.deny
}
-
-cronie_package() {
- make_dirs="
- /etc/cron.d/daily 0755 root root
- /etc/cron.d/weekly 0755 root root
- /etc/cron.d/monthly 0755 root root
- /etc/cron.d/yearly 0755 root root
- /var/spool/cron 0755 root root"
- conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny"
- replaces="cron-daemon>=0"
- provides="cron-daemon-0"
- systemd_services="cronie.service on"
- depends="run-parts"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-make-4.patch b/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-make-4.patch
new file mode 100644
index 0000000000..0a842b12dd
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf/files/glibc-2.18-make-4.patch
@@ -0,0 +1,45 @@
+From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 10 Oct 2013 14:26:12 +0900
+Subject: [PATCH] configure: allow building with GNU Make 4
+
+Currently, configure errors telling make 4 is too old
+since it does not match our regexp.
+
+configure.in: allow GNU Make 4.*
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5e2f4d0..e139bf0 100755
+--- configure
++++ configure
+@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+ ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 3.79* | 3.[89]*)
++ 3.79* | 3.[89]* | 4.*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+diff --git a/configure.in b/configure.in
+index a7f9881..95c36b6 100644
+--- configure.in
++++ configure.in
+@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+ critic_missing="$critic_missing gcc")
+ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
+ [GNU Make[^0-9]*\([0-9][0-9.]*\)],
+- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make")
+
+ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
+ [GNU gettext.* \([0-9]*\.[0-9.]*\)],
+--
+1.8.4.1
+
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 38202f45d1..27e8a66136 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,47 +1,40 @@
# Template build file for 'cross-arm-linux-gnueabihf'
#
-_binutils_version=2.23.1
+_binutils_version=2.24
_gcc_version=4.7.3
_glibc_version=2.18
-_gmp_version=5.0.5
-_mpfr_version=3.1.2
-_mpc_version=0.9
_linux_version=3.10.6
_triplet=arm-linux-gnueabihf
_fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
_archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
+_CROSS_SYSROOT="/usr/${_triplet}"
pkgname=cross-${_triplet}
-version=0.13
+version=0.14
revision=1
short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
-maintainer="pancake <pancake@nopcode.org>"
+maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.voidlinux.eu"
license="Public Domain"
distfiles="
http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
- http://mirrors.kernel.org/gnu/gmp/gmp-${_gmp_version}.tar.bz2
- http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_version}.tar.bz2
- http://www.multiprecision.org/mpc/download/mpc-${_mpc_version}.tar.gz
http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
checksum="
- 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
+ e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
- 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
- 79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
- fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
create_wrksrc=yes
-makedepends="perl flex"
+hostmakedepends="perl flex"
+makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
+depends="${pkgname}-libc-${version}_${revision}"
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
only_for_archs="i686 x86_64"
-_CROSS_TARGET=${_triplet}
-_CROSS_SYSROOT="/usr/${_CROSS_TARGET}"
_apply_patch() {
local pname="$(basename $1)"
@@ -75,7 +68,7 @@ _binutils_build() {
cd binutils-build
../binutils-${_binutils_version}/configure \
- --prefix=/usr --target=${_CROSS_TARGET} \
+ --prefix=/usr --target=${_triplet} \
--with-sysroot=${_CROSS_SYSROOT} --disable-nls --disable-shared \
--disable-multilib --disable-werror
@@ -96,18 +89,8 @@ _gcc_bootstrap() {
[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
cd ../gcc-bootstrap
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/gmp ]; then
- mv ${wrksrc}/gmp-${_gmp_version} ${wrksrc}/gcc-${_gcc_version}/gmp
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpfr ]; then
- mv ${wrksrc}/mpfr-${_mpfr_version} ${wrksrc}/gcc-${_gcc_version}/mpfr
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpc ]; then
- mv ${wrksrc}/mpc-${_mpc_version} ${wrksrc}/gcc-${_gcc_version}/mpc
- fi
-
../gcc-${_gcc_version}/configure --prefix=/usr \
- --target=${_CROSS_TARGET} --without-headers \
+ --target=${_triplet} --without-headers \
--disable-nls --disable-shared --disable-libquadmath \
--disable-decimal-float --disable-libgomp --disable-libmudflap \
--disable-libssp --disable-threads --enable-languages=c \
@@ -123,6 +106,9 @@ _gcc_bootstrap() {
_glibc_headers() {
[ -f ${wrksrc}/.glibc_headers_done ] && return 0
+ cd ${wrksrc}/glibc-${_glibc_version}
+ _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch
+
cd ${wrksrc}
msg_normal "Building cross glibc headers\n"
@@ -132,11 +118,11 @@ _glibc_headers() {
echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache
- export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" \
- AS="${_CROSS_TARGET}-as" CPP="${_CROSS_TARGET}-cpp"
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" \
+ AS="${_triplet}-as" CPP="${_triplet}-cpp"
../glibc-${_glibc_version}/configure \
- --host=${_CROSS_TARGET} --prefix=/usr \
+ --host=${_triplet} --prefix=/usr \
--with-headers=${_CROSS_SYSROOT}/usr/include \
--config-cache --enable-add-ons=nptl,ports \
--enable-obsolete-rpc \
@@ -160,12 +146,12 @@ _glibc_build() {
echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache
- export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" \
- AS="${_CROSS_TARGET}-as" CPP="${_CROSS_TARGET}-cpp"
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" \
+ AS="${_triplet}-as" CPP="${_triplet}-cpp"
export CFLAGS="-Os -pipe ${_archflags}"
../glibc-${_glibc_version}/configure \
- --host=${_CROSS_TARGET} --prefix=/usr \
+ --host=${_triplet} --prefix=/usr \
--with-headers=${_CROSS_SYSROOT}/usr/include \
--config-cache --enable-add-ons=nptl,ports \
--enable-obsolete-rpc --disable-profile \
@@ -197,13 +183,13 @@ _gcc_build() {
fi
../gcc-${_gcc_version}/configure \
- --target=${_CROSS_TARGET} --prefix=/usr \
- --with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++ \
+ --target=${_triplet} --prefix=/usr \
+ --with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++,lto \
--with-gnu-as --with-gnu-ld --disable-multilib \
--disable-nls --disable-sjlj-exceptions \
--enable-threads=posix --enable-long-longx \
--enable-shared --enable-linker-build-id \
- --enable-gnu-unique-object ${_fpuflags}
+ --enable-gnu-unique-object --enable-lto ${_fpuflags}
make ${makejobs}
@@ -243,21 +229,22 @@ do_install() {
done
# install cross binutils
- cd ${wrksrc}/binutils-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/binutils-build
+ make DESTDIR=${DESTDIR} install
# install cross gcc
- cd ${wrksrc}/gcc-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/gcc-build
+ make DESTDIR=${DESTDIR} install
# install linux API headers for MIPS
- cd ${wrksrc}/linux-${_linux_version} && \
- make ARCH=arm INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr \
- headers_install
+ cd ${wrksrc}/linux-${_linux_version}
+ make ARCH=arm INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr headers_install
rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd)
rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm
# install glibc for target
- cd ${wrksrc}/glibc-build && \
- make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers
+ cd ${wrksrc}/glibc-build
+ make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers
# XXX hard-float only toolchain.
ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/gnu/stubs-hard.h \
@@ -284,12 +271,11 @@ do_install() {
do_clean() {
# Remove temporary stuff from masterdir
rm -rf ${_CROSS_SYSROOT}
- rm -f /usr/bin/${_CROSS_TARGET}*
- rm -rf /usr/lib/gcc/${_CROSS_TARGET}
- rm -rf /usr/libexec/gcc/${_CROSS_TARGET}
+ rm -f /usr/bin/${_triplet}*
+ rm -rf /usr/lib/gcc/${_triplet}
+ rm -rf /usr/libexec/gcc/${_triplet}
}
-# Packages
cross-arm-linux-gnueabihf-libc_package() {
short_desc+=" - glibc files"
noarch=yes
@@ -297,17 +283,9 @@ cross-arm-linux-gnueabihf-libc_package() {
noverifyrdeps=yes
pkg_install() {
- vmove usr/${_CROSS_TARGET}
- mkdir -p ${DESTDIR}/usr/${_CROSS_TARGET}/usr/
- mv ${PKGDESTDIR}/usr/${_CROSS_TARGET}/usr/bin \
- ${DESTDIR}/usr/${_CROSS_TARGET}/usr
- }
-}
-
-cross-arm-linux-gnueabihf_package() {
- depends="${pkgname}-libc-${version}_${revision}"
- nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
- pkg_install() {
- vmove all
+ vmove usr/${_triplet}
+ mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
+ mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin \
+ ${DESTDIR}/usr/${_triplet}/usr
}
}
diff --git a/srcpkgs/cross-arm-linux-gnueabihf7-libc b/srcpkgs/cross-arm-linux-gnueabihf7-libc
new file mode 120000
index 0000000000..91475a64be
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf7-libc
@@ -0,0 +1 @@
+cross-arm-linux-gnueabihf7
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-make-4.patch b/srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-make-4.patch
new file mode 100644
index 0000000000..0a842b12dd
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-make-4.patch
@@ -0,0 +1,45 @@
+From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 10 Oct 2013 14:26:12 +0900
+Subject: [PATCH] configure: allow building with GNU Make 4
+
+Currently, configure errors telling make 4 is too old
+since it does not match our regexp.
+
+configure.in: allow GNU Make 4.*
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5e2f4d0..e139bf0 100755
+--- configure
++++ configure
+@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+ ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 3.79* | 3.[89]*)
++ 3.79* | 3.[89]* | 4.*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+diff --git a/configure.in b/configure.in
+index a7f9881..95c36b6 100644
+--- configure.in
++++ configure.in
+@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+ critic_missing="$critic_missing gcc")
+ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
+ [GNU Make[^0-9]*\([0-9][0-9.]*\)],
+- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make")
+
+ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
+ [GNU gettext.* \([0-9]*\.[0-9.]*\)],
+--
+1.8.4.1
+
diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/template b/srcpkgs/cross-arm-linux-gnueabihf7/template
new file mode 100644
index 0000000000..c6e1245043
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf7/template
@@ -0,0 +1,291 @@
+# Template build file for 'cross-arm-linux-gnueabihf7'
+#
+_binutils_version=2.24
+_gcc_version=4.7.3
+_glibc_version=2.18
+_linux_version=3.10.6
+
+_triplet=arm-linux-gnueabihf7
+_fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
+_archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
+_CROSS_SYSROOT="/usr/${_triplet}"
+
+pkgname=cross-${_triplet}
+version=0.14
+revision=1
+short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.voidlinux.eu"
+license="Public Domain"
+distfiles="
+ http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
+ http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
+ http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
+ http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
+checksum="
+ e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
+ 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
+ 2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
+ ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
+
+create_wrksrc=yes
+hostmakedepends="perl flex"
+makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
+depends="${pkgname}-libc-${version}_${revision}"
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
+only_for_archs="i686 x86_64"
+
+
+_apply_patch() {
+ local pname="$(basename $1)"
+
+ if [ ! -f ".${pname}_done" ]; then
+ patch -Np1 -i ${1}
+ touch .${pname}_done
+ fi
+}
+
+_linux_headers() {
+ [ -f ${wrksrc}/.linux_build_done ] && return 0
+
+ cd ${wrksrc}
+ msg_normal "Building Linux API headers for ARM\n"
+
+ cd linux-${_linux_version}
+
+ make ARCH=arm headers_check
+ make ARCH=arm INSTALL_HDR_PATH=${_CROSS_SYSROOT}/usr headers_install
+
+ touch ${wrksrc}/.linux_build_done
+}
+
+_binutils_build() {
+ [ -f ${wrksrc}/.binutils_build_done ] && return 0
+
+ cd ${wrksrc}
+ msg_normal "Building cross binutils\n"
+ [ ! -d binutils-build ] && mkdir binutils-build
+ cd binutils-build
+
+ ../binutils-${_binutils_version}/configure \
+ --prefix=/usr --target=${_triplet} \
+ --with-sysroot=${_CROSS_SYSROOT} --disable-nls --disable-shared \
+ --disable-multilib --disable-werror
+
+ make configure-host && make ${makejobs}
+ make install
+
+ touch ${wrksrc}/.binutils_build_done
+}
+
+_gcc_bootstrap() {
+ [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
+
+ cd ${wrksrc}
+ msg_normal "Building cross gcc bootstrap\n"
+
+ cd gcc-${_gcc_version}
+
+ [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
+ cd ../gcc-bootstrap
+
+ ../gcc-${_gcc_version}/configure --prefix=/usr \
+ --target=${_triplet} --without-headers \
+ --disable-nls --disable-shared --disable-libquadmath \
+ --disable-decimal-float --disable-libgomp --disable-libmudflap \
+ --disable-libssp --disable-threads --enable-languages=c \
+ --disable-sjlj-exceptions --disable-multilib \
+ --with-gnu-ld --with-gnu-as ${_fpuflags}
+
+ make ${makejobs}
+ make install
+
+ touch ${wrksrc}/.gcc_bootstrap_done
+}
+
+_glibc_headers() {
+ [ -f ${wrksrc}/.glibc_headers_done ] && return 0
+
+ cd ${wrksrc}/glibc-${_glibc_version}
+ _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch
+
+ cd ${wrksrc}
+ msg_normal "Building cross glibc headers\n"
+
+ [ ! -d glibc-headers ] && mkdir glibc-headers
+ cd glibc-headers
+
+ echo "libc_cv_forced_unwind=yes" > config.cache
+ echo "libc_cv_c_cleanup=yes" >> config.cache
+
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" \
+ AS="${_triplet}-as" CPP="${_triplet}-cpp"
+
+ ../glibc-${_glibc_version}/configure \
+ --host=${_triplet} --prefix=/usr \
+ --with-headers=${_CROSS_SYSROOT}/usr/include \
+ --config-cache --enable-add-ons=nptl,ports \
+ --enable-obsolete-rpc \
+ --enable-kernel=2.6.27 ${_fpuflags}
+
+ make -k install-headers cross_compiling=yes \
+ install_root=${_CROSS_SYSROOT}
+
+ touch ${wrksrc}/.glibc_headers_done
+}
+
+_glibc_build() {
+ [ -f ${wrksrc}/.glibc_build_done ] && return 0
+
+ cd ${wrksrc}
+ msg_normal "Building cross glibc\n"
+
+ [ ! -d glibc-build ] && mkdir glibc-build
+ cd glibc-build
+
+ echo "libc_cv_forced_unwind=yes" > config.cache
+ echo "libc_cv_c_cleanup=yes" >> config.cache
+
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" \
+ AS="${_triplet}-as" CPP="${_triplet}-cpp"
+ export CFLAGS="-Os -pipe ${_archflags}"
+
+ ../glibc-${_glibc_version}/configure \
+ --host=${_triplet} --prefix=/usr \
+ --with-headers=${_CROSS_SYSROOT}/usr/include \
+ --config-cache --enable-add-ons=nptl,ports \
+ --enable-obsolete-rpc --disable-profile \
+ --enable-kernel=2.6.27 ${_fpuflags}
+
+ make ${makejobs}
+ make install_root=${_CROSS_SYSROOT} install
+
+ touch ${wrksrc}/.glibc_build_done
+}
+
+_gcc_build() {
+ [ -f ${wrksrc}/.gcc_build_done ] && return 0
+
+ cd ${wrksrc}
+ msg_normal "Building cross gcc final\n"
+
+ [ ! -d gcc-build ] && mkdir gcc-build
+ cd gcc-build
+
+ export CC="gcc" CFLAGS="-Os -pipe"
+ unset LD AS
+
+ # Make this link to target libs.
+ if [ ! -f .sed_subst_done ]; then
+ sed -e "s, /lib/, ${_CROSS_SYSROOT}/lib/,g;s, /usr/lib/, ${_CROSS_SYSROOT}/usr/lib/,g" \
+ -i ${_CROSS_SYSROOT}/lib/libc.so ${_CROSS_SYSROOT}/lib/libpthread.so
+ touch .sed_subst_done
+ fi
+
+ ../gcc-${_gcc_version}/configure \
+ --target=${_triplet} --prefix=/usr \
+ --with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++,lto \
+ --with-gnu-as --with-gnu-ld --disable-multilib \
+ --disable-nls --disable-sjlj-exceptions \
+ --enable-threads=posix --enable-long-longx \
+ --enable-shared --enable-linker-build-id \
+ --enable-gnu-unique-object --enable-lto ${_fpuflags}
+
+ make ${makejobs}
+
+ touch ${wrksrc}/.gcc_build_done
+}
+
+do_build() {
+ unset LDFLAGS
+ export CFLAGS="-Os" CXXFLAGS="-Os"
+
+ for f in include lib libexec bin sbin; do
+ if [ ! -d ${_CROSS_SYSROOT}/usr/${f} ]; then
+ mkdir -p ${_CROSS_SYSROOT}/usr/${f}
+ fi
+ if [ ! -h ${_CROSS_SYSROOT}/${f} ]; then
+ ln -sfr ${_CROSS_SYSROOT}/usr/${f} ${_CROSS_SYSROOT}/${f}
+ fi
+ done
+
+ _binutils_build
+ _gcc_bootstrap
+ _linux_headers
+ _glibc_headers
+ _glibc_build
+ _gcc_build
+}
+
+do_install() {
+ for f in include lib libexec bin sbin; do
+ if [ ! -d ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} ]; then
+ mkdir -p ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f}
+ fi
+ if [ ! -h ${DESTDIR}/${_CROSS_SYSROOT}/${f} ]; then
+ ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} \
+ ${DESTDIR}/${_CROSS_SYSROOT}/${f}
+ fi
+ done
+
+ # install cross binutils
+ cd ${wrksrc}/binutils-build
+ make DESTDIR=${DESTDIR} install
+
+ # install cross gcc
+ cd ${wrksrc}/gcc-build
+ make DESTDIR=${DESTDIR} install
+
+ # install linux API headers for MIPS
+ cd ${wrksrc}/linux-${_linux_version}
+ make ARCH=arm INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr headers_install
+ rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd)
+ rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm
+
+ # install glibc for target
+ cd ${wrksrc}/glibc-build
+ make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers
+
+ # XXX hard-float only toolchain.
+ ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/gnu/stubs-hard.h \
+ ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/gnu/stubs-soft.h
+
+ ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib/ld-linux-armhf.so.3 \
+ ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib/ld-linux.so.3
+
+ # Remove unnecessary stuff
+ rm -f ${DESTDIR}/usr/lib*/libiberty.a
+ rm -rf ${DESTDIR}/usr/share
+ rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/{etc,var}
+ rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/{sbin,share,libexec}
+ rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib/gconv
+ rm -f ${DESTDIR}/${_CROSS_SYSROOT}/libexec
+
+ for f in sprof localedef gencat pldd sotruss tzselect iconv mtrace \
+ catchsegv xtrace makedb pcprofiledump locale rpcgen getconf \
+ getent ldd; do
+ rm -f ${DESTDIR}/${_CROSS_SYSROOT}/usr/bin/${f}
+ done
+}
+
+do_clean() {
+ # Remove temporary stuff from masterdir
+ rm -rf ${_CROSS_SYSROOT}
+ rm -f /usr/bin/${_triplet}*
+ rm -rf /usr/lib/gcc/${_triplet}
+ rm -rf /usr/libexec/gcc/${_triplet}
+}
+
+cross-arm-linux-gnueabihf7-libc_package() {
+ short_desc+=" - glibc files"
+ noarch=yes
+ nostrip=yes
+ noverifyrdeps=yes
+
+ pkg_install() {
+ vmove usr/${_triplet}
+ mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
+ mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin \
+ ${DESTDIR}/usr/${_triplet}/usr
+ }
+}
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/binutils-2.22-musl.diff b/srcpkgs/cross-arm-linux-musleabi/files/binutils-2.22-musl.diff
deleted file mode 100644
index 68286559a3..0000000000
--- a/srcpkgs/cross-arm-linux-musleabi/files/binutils-2.22-musl.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- config.sub Wed Nov 21 20:06:14 2012 -0500
-+++ config.sub Wed Nov 21 20:07:23 2012 -0500
-@@ -125,6 +125,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+ linux-musl* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
-@@ -1335,6 +1336,7 @@
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
-+ | -linux-musl* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 6080407a3e..9aae148c3b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,19 +1,17 @@
# Template build file for 'cross-arm-linux-musleabi'
#
-_binutils_version=2.23.1
+_binutils_version=2.24
_gcc_version=4.7.3
-_musl_version=0.9.11
-_gmp_version=5.0.5
-_mpfr_version=3.1.2
-_mpc_version=0.9
-_linux_version=3.7.1
+_musl_version=0.9.15
+_linux_version=3.10.6
_triplet=arm-linux-musleabi
_fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
_archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
+_sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
-version=0.3
+version=0.4
revision=1
short_desc="Cross toolchain for the ${_triplet} LE Hard Float target"
maintainer="Juan RP <xtraeme@gmail.org>"
@@ -22,25 +20,19 @@ license="Public Domain"
distfiles="
http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
- http://mirrors.kernel.org/gnu/gmp/gmp-${_gmp_version}.tar.bz2
- http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_version}.tar.bz2
- http://www.multiprecision.org/mpc/download/mpc-${_mpc_version}.tar.gz
http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz
http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
checksum="
- 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
+ e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
- 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
- 79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
- fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
- e1ca8b8376ebdf797357f5f1734ed6eed3cadc16c32d280a780f150372de7255
- 8b81fd9b71becb7b674ea93fd65d82a039fab79ab738957a5e9ee47ba08a13fd"
+ ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf
+ 4a7baab8f295511196dee48d33b8b82a159a81233facb89433707c792033cbe7"
create_wrksrc=yes
hostmakedepends="perl flex"
-
-_CROSS_TARGET=${_triplet}
-_CROSS_SYSROOT="/usr/${_CROSS_TARGET}"
+makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel"
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
+depends="${pkgname}-libc-${version}_${revision}"
_apply_patch() {
local pname="$(basename $1)"
@@ -54,16 +46,14 @@ _apply_patch() {
_binutils_build() {
[ -f ${wrksrc}/.binutils_build_done ] && return 0
- cd ${wrksrc}/binutils-${_binutils_version}
- _apply_patch ${FILESDIR}/binutils-2.22-musl.diff
-
+ cd ${wrksrc}
msg_normal "Building cross binutils bootstrap\n"
- [ ! -d ../binutils-build ] && mkdir ../binutils-build
- cd ../binutils-build
+ [ ! -d binutils-build ] && mkdir binutils-build
+ cd binutils-build
../binutils-${_binutils_version}/configure \
- --prefix=/usr --target=${_CROSS_TARGET} \
+ --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \
--disable-nls --disable-multilib --disable-werror \
--disable-shared ${_fpuflags}
@@ -84,18 +74,8 @@ _gcc_bootstrap() {
[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
cd ../gcc-bootstrap
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/gmp ]; then
- mv ${wrksrc}/gmp-${_gmp_version} ${wrksrc}/gcc-${_gcc_version}/gmp
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpfr ]; then
- mv ${wrksrc}/mpfr-${_mpfr_version} ${wrksrc}/gcc-${_gcc_version}/mpfr
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpc ]; then
- mv ${wrksrc}/mpc-${_mpc_version} ${wrksrc}/gcc-${_gcc_version}/mpc
- fi
-
../gcc-${_gcc_version}/configure --prefix=/usr \
- --target=${_CROSS_TARGET} --with-newlib \
+ --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \
--disable-nls --disable-shared --disable-multilib \
--disable-decimal-float --disable-libgomp --disable-libmudflap \
--disable-libquadmath --disable-libssp --disable-threads \
@@ -116,7 +96,7 @@ _linux_headers() {
cd linux-${_linux_version}
make ARCH=arm headers_check
- make ARCH=arm INSTALL_HDR_PATH=${_CROSS_SYSROOT}/usr headers_install
+ make ARCH=arm INSTALL_HDR_PATH=${_sysroot}/usr headers_install
touch ${wrksrc}/.linux_build_done
}
@@ -127,11 +107,11 @@ _musl_build() {
cd ${wrksrc}/musl-${_musl_version}
msg_normal "Building cross musl libc\n"
- CC="${_CROSS_TARGET}-gcc" CFLAGS="-Os -pipe ${_archflags}" \
+ CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \
./configure --prefix=/usr \
make ${makejobs}
- make DESTDIR=${_CROSS_SYSROOT} install
+ make DESTDIR=${_sysroot} install
touch ${wrksrc}/.musl_build_done
}
@@ -146,8 +126,8 @@ _gcc_build() {
cd gcc-build
../gcc-${_gcc_version}/configure \
- --target=${_CROSS_TARGET} --prefix=/usr \
- --enable-languages=c,c++ \
+ --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \
+ --enable-languages=c,c++,lto --enable-lto \
--disable-multilib --disable-nls --disable-libquadmath \
--disable-libmudflap --enable-c99 --enable-shared \
--enable-long-long --enable-threads=posix \
@@ -165,11 +145,11 @@ do_build() {
export CFLAGS="-Os -pipe" CXXFLAGS="-Os -pipe"
for f in include lib libexec bin sbin; do
- if [ ! -d ${_CROSS_SYSROOT}/usr/${f} ]; then
- mkdir -p ${_CROSS_SYSROOT}/usr/${f}
+ if [ ! -d ${_sysroot}/usr/${f} ]; then
+ mkdir -p ${_sysroot}/usr/${f}
fi
- if [ ! -h ${_CROSS_SYSROOT}/${f} ]; then
- ln -sfr ${_CROSS_SYSROOT}/usr/${f} ${_CROSS_SYSROOT}/${f}
+ if [ ! -h ${_sysroot}/${f} ]; then
+ ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
fi
done
@@ -182,55 +162,56 @@ do_build() {
do_install() {
for f in include lib libexec bin sbin; do
- if [ ! -d ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} ]; then
- mkdir -p ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f}
+ if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then
+ mkdir -p ${DESTDIR}/${_sysroot}/usr/${f}
fi
- if [ ! -h ${DESTDIR}/${_CROSS_SYSROOT}/${f} ]; then
- ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} \
- ${DESTDIR}/${_CROSS_SYSROOT}/${f}
+ if [ ! -h ${DESTDIR}/${_sysroot}/${f} ]; then
+ ln -sfr ${DESTDIR}/${_sysroot}/usr/${f} \
+ ${DESTDIR}/${_sysroot}/${f}
fi
done
# install cross binutils
- cd ${wrksrc}/binutils-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/binutils-build
+ make DESTDIR=${DESTDIR} install
# install cross gcc
- cd ${wrksrc}/gcc-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/gcc-build
+ make DESTDIR=${DESTDIR} install
# install musl libc for target
- cd ${wrksrc}/musl-${_musl_version} && \
- make DESTDIR=${DESTDIR}/${_CROSS_SYSROOT} install
+ cd ${wrksrc}/musl-${_musl_version}
+ make DESTDIR=${DESTDIR}/${_sysroot} install
# Remove useless headers.
- rm -rf ${DESTDIR}/usr/lib/gcc/${_CROSS_TARGET}/*/include-fixed/ \
- ${DESTDIR}/usr/lib/gcc/${_CROSS_TARGET}/*/include/stddef.h
+ rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \
+ ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h
# Make ld-musl-arm.so.1 symlink relative to cwd.
- cd ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib
+ cd ${DESTDIR}/${_sysroot}/usr/lib
ln -sf libc.so ld-musl-arm.so.1
- # install linux API headers for MIPS
- cd ${wrksrc}/linux-${_linux_version} && \
- make ARCH=arm INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr \
- headers_install
- rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd)
- rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm
+ # install linux API headers
+ cd ${wrksrc}/linux-${_linux_version}
+ make ARCH=arm INSTALL_HDR_PATH=${DESTDIR}/${_sysroot}/usr headers_install
+ rm -f $(find ${DESTDIR}/${_sysroot}/usr/include -name .install -or -name ..install.cmd)
+ rm -rf ${DESTDIR}/${_sysroot}/usr/include/drm
# Remove unnecessary stuff
rm -f ${DESTDIR}/usr/lib*/libiberty.a
rm -rf ${DESTDIR}/usr/share
- rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/{etc,var}
- rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/{sbin,share,libexec}
- rm -f ${DESTDIR}/${_CROSS_SYSROOT}/libexec
- rm -f ${DESTDIR}/${_CROSS_SYSROOT}/lib/*.py
+ rm -rf ${DESTDIR}/${_sysroot}/{etc,var}
+ rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
+ rm -f ${DESTDIR}/${_sysroot}/libexec
+ rm -f ${DESTDIR}/${_sysroot}/lib/*.py
}
do_clean() {
# Remove temporary stuff from masterdir
- rm -rf ${_CROSS_SYSROOT}
- rm -f /usr/bin/${_CROSS_TARGET}*
- rm -rf /usr/lib/gcc/${_CROSS_TARGET}
- rm -rf /usr/libexec/gcc/${_CROSS_TARGET}
+ rm -rf ${_sysroot}
+ rm -f /usr/bin/${_triplet}*
+ rm -rf /usr/lib/gcc/${_triplet}
+ rm -rf /usr/libexec/gcc/${_triplet}
}
cross-arm-linux-musleabi-libc_package() {
@@ -238,14 +219,9 @@ cross-arm-linux-musleabi-libc_package() {
noarch=yes
noverifydeps=yes
pkg_install() {
- vmove usr/${_CROSS_TARGET}
- }
-}
+ vmove usr/${_triplet}
+ mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
+ mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin ${DESTDIR}/usr/${_triplet}/usr
-cross-arm-linux-musleabi_package() {
- nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
- depends="${pkgname}-libc-${version}_${revision}"
- pkg_install() {
- vmove all
}
}
diff --git a/srcpkgs/cross-i686-linux-musl/files/binutils-2.22-musl.diff b/srcpkgs/cross-i686-linux-musl/files/binutils-2.22-musl.diff
deleted file mode 100644
index 68286559a3..0000000000
--- a/srcpkgs/cross-i686-linux-musl/files/binutils-2.22-musl.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- config.sub Wed Nov 21 20:06:14 2012 -0500
-+++ config.sub Wed Nov 21 20:07:23 2012 -0500
-@@ -125,6 +125,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+ linux-musl* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
-@@ -1335,6 +1336,7 @@
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
-+ | -linux-musl* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/srcpkgs/cross-i686-linux-musl/files/gcc-4.7.2-musl.diff b/srcpkgs/cross-i686-linux-musl/files/gcc-4.7.2-musl.diff
deleted file mode 100644
index ae1e8eb6f4..0000000000
--- a/srcpkgs/cross-i686-linux-musl/files/gcc-4.7.2-musl.diff
+++ /dev/null
@@ -1,464 +0,0 @@
-# HG changeset patch
-# Parent 05e4cf5f033d266c8f8fe065f8c5752891c5bf7a
-Adding musl to config.sub, so it's recognized as a target platform.
-
-
-diff -r 05e4cf5f033d -r 04a6a82b8e06 config.sub
---- config.sub Wed Nov 21 21:16:07 2012 -0500
-+++ config.sub Wed Nov 21 21:16:58 2012 -0500
-@@ -125,6 +125,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+ linux-musl* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
-@@ -1346,6 +1347,7 @@
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
-+ | -linux-musl* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-# HG changeset patch
-# Parent 04a6a82b8e06669a42181c96381b4fbc3ffa008c
-Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one.
-
-
-diff -r 04a6a82b8e06 -r 193f80e01b02 libstdc++-v3/configure.host
---- libstdc++-v3/configure.host Wed Nov 21 21:16:58 2012 -0500
-+++ libstdc++-v3/configure.host Wed Nov 21 21:17:38 2012 -0500
-@@ -243,6 +243,13 @@
- os_include_dir="os/bsd/freebsd"
- ;;
- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-+ # check for musl by target
-+ case "${host_os}" in
-+ *-musl*)
-+ os_include_dir="os/generic"
-+ ;;
-+ *)
-+
- if [ "$uclibc" = "yes" ]; then
- os_include_dir="os/uclibc"
- elif [ "$bionic" = "yes" ]; then
-@@ -251,6 +258,9 @@
- os_include_dir="os/gnu-linux"
- fi
- ;;
-+
-+ esac
-+ ;;
- hpux*)
- os_include_dir="os/hpux"
- ;;
-# HG changeset patch
-# Parent 193f80e01b026d8de7f53d467f2c59cd0b7927dc
-Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
-
-
-diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config.gcc
---- gcc/config.gcc Wed Nov 21 21:17:38 2012 -0500
-+++ gcc/config.gcc Wed Nov 21 21:19:19 2012 -0500
-@@ -522,7 +522,7 @@
- esac
-
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
-
- # Common parts for widely ported systems.
- case ${target} in
-@@ -625,6 +625,9 @@
- *-*-*uclibc*)
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
- ;;
-+ *-*-*musl*)
-+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+ ;;
- *)
- tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
- ;;
-diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config/linux.h
---- gcc/config/linux.h Wed Nov 21 21:17:38 2012 -0500
-+++ gcc/config/linux.h Wed Nov 21 21:19:19 2012 -0500
-@@ -33,10 +33,12 @@
- #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL (linux_libc == LIBC_MUSL)
- #endif
-
- #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
-@@ -54,18 +56,21 @@
- uClibc or Bionic is the default C library and whether
- -muclibc or -mglibc or -mbionic has been passed to change the default. */
-
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
-- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
-+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
-
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
-- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -85,16 +90,16 @@
-
- #define GNU_USER_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
-- BIONIC_DYNAMIC_LINKER)
-+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
-- BIONIC_DYNAMIC_LINKER32)
-+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
-- BIONIC_DYNAMIC_LINKER64)
-+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32 \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
-- BIONIC_DYNAMIC_LINKERX32)
-+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
-
- /* Determine whether the entire c99 runtime
- is present in the runtime library. */
-diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config/linux.opt
---- gcc/config/linux.opt Wed Nov 21 21:17:38 2012 -0500
-+++ gcc/config/linux.opt Wed Nov 21 21:19:19 2012 -0500
-@@ -30,3 +30,7 @@
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
-+Use musl C library
-diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/ginclude/stddef.h
---- gcc/ginclude/stddef.h Wed Nov 21 21:17:38 2012 -0500
-+++ gcc/ginclude/stddef.h Wed Nov 21 21:19:19 2012 -0500
-@@ -184,6 +184,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__ /* BeOS */
- #define __SIZE_T__ /* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -200,6 +201,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
- || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-@@ -215,6 +217,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
-# HG changeset patch
-# Parent 45cd88d4fb7b0e813578c296004eaab2c2d0bfb9
-A fix for libgomp to correctly request a POSIX version for time support.
-
-
-diff -r 45cd88d4fb7b -r 0afd9d82498d libgomp/config/posix/time.c
---- libgomp/config/posix/time.c Wed Nov 21 21:19:19 2012 -0500
-+++ libgomp/config/posix/time.c Wed Nov 21 21:20:22 2012 -0500
-@@ -28,6 +28,8 @@
- The following implementation uses the most simple POSIX routines.
- If present, POSIX 4 clocks should be used instead. */
-
-+#define _POSIX_C_SOURCE 199309L /* for clocks */
-+
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
-# HG changeset patch
-# Parent 0afd9d82498d2cd30aa78529ff25f211bdc0c3b9
-Support for i386-linux-musl and x86_64-linux-musl.
-
-
-diff -r 0afd9d82498d -r 53f3e21a7d14 gcc/config/i386/linux.h
---- gcc/config/i386/linux.h Wed Nov 21 21:20:22 2012 -0500
-+++ gcc/config/i386/linux.h Wed Nov 21 21:21:21 2012 -0500
-@@ -22,3 +22,4 @@
-
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-diff -r 0afd9d82498d -r 53f3e21a7d14 gcc/config/i386/linux64.h
---- gcc/config/i386/linux64.h Wed Nov 21 21:20:22 2012 -0500
-+++ gcc/config/i386/linux64.h Wed Nov 21 21:21:21 2012 -0500
-@@ -31,3 +31,7 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-diff -r 0afd9d82498d -r 53f3e21a7d14 libitm/config/linux/x86/tls.h
---- libitm/config/linux/x86/tls.h Wed Nov 21 21:20:22 2012 -0500
-+++ libitm/config/linux/x86/tls.h Wed Nov 21 21:21:21 2012 -0500
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
-
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
- GLIBC has reserved words 10 through 13 for TM. */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
-
- #include "config/generic/tls.h"
-
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
-
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@
-
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
-
- #endif // LIBITM_X86_TLS_H
-# HG changeset patch
-# Parent 53f3e21a7d14d0514ec7cb9ffb67b24dcf1f9fc9
-Support for arm-linux-musl.
-
-
-diff -r 53f3e21a7d14 -r 0a4e297edad6 gcc/config/arm/linux-eabi.h
---- gcc/config/arm/linux-eabi.h Wed Nov 21 21:21:21 2012 -0500
-+++ gcc/config/arm/linux-eabi.h Wed Nov 21 21:21:54 2012 -0500
-@@ -64,6 +64,10 @@
- #undef GLIBC_DYNAMIC_LINKER
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
-
-+/* musl has no "classic" (i.e. broken) mode */
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
- use the GNU/Linux version, not the generic BPABI version. */
- #undef LINK_SPEC
-diff -r 53f3e21a7d14 -r 0a4e297edad6 libitm/config/arm/hwcap.cc
---- libitm/config/arm/hwcap.cc Wed Nov 21 21:21:21 2012 -0500
-+++ libitm/config/arm/hwcap.cc Wed Nov 21 21:21:54 2012 -0500
-@@ -40,7 +40,11 @@
-
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
-
- static void __attribute__((constructor))
-# HG changeset patch
-# Parent 0a4e297edad6e46f4b66401b93b217aa3194af4e
-Support for mips-linux-musl.
-
-
-diff -r 0a4e297edad6 -r 78025c74c5c1 gcc/config/mips/linux.h
---- gcc/config/mips/linux.h Wed Nov 21 21:21:54 2012 -0500
-+++ gcc/config/mips/linux.h Wed Nov 21 21:23:49 2012 -0500
-@@ -19,3 +19,5 @@
- <http://www.gnu.org/licenses/>. */
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
-# HG changeset patch
-# Parent 78025c74c5c1705f16ce13f3645ecb86c10cc1c2
-Support for powerpc-linux-musl.
-
-diff -r 78025c74c5c1 gcc/config.gcc
---- gcc/config.gcc Wed Nov 21 21:23:49 2012 -0500
-+++ gcc/config.gcc Wed Nov 21 21:45:58 2012 -0500
-@@ -2078,6 +2078,10 @@
- powerpc*-*-linux*paired*)
- tm_file="${tm_file} rs6000/750cl.h" ;;
- esac
-+ case ${target} in
-+ *-linux*-musl*)
-+ enable_secureplt=yes ;;
-+ esac
- if test x${enable_secureplt} = xyes; then
- tm_file="rs6000/secureplt.h ${tm_file}"
- fi
-diff -r 78025c74c5c1 gcc/config/rs6000/linux64.h
---- gcc/config/rs6000/linux64.h Wed Nov 21 21:23:49 2012 -0500
-+++ gcc/config/rs6000/linux64.h Wed Nov 21 21:45:58 2012 -0500
-@@ -362,17 +362,21 @@
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
-- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
-- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
-
-
- #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-diff -r 78025c74c5c1 gcc/config/rs6000/secureplt.h
---- gcc/config/rs6000/secureplt.h Wed Nov 21 21:23:49 2012 -0500
-+++ gcc/config/rs6000/secureplt.h Wed Nov 21 21:45:58 2012 -0500
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>. */
-
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-diff -r 78025c74c5c1 gcc/config/rs6000/sysv4.h
---- gcc/config/rs6000/sysv4.h Wed Nov 21 21:23:49 2012 -0500
-+++ gcc/config/rs6000/sysv4.h Wed Nov 21 21:45:58 2012 -0500
-@@ -566,6 +566,9 @@
- #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
- #define CC1_SECURE_PLT_DEFAULT_SPEC ""
- #endif
-+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
-+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
-+#endif
-
- /* Pass -G xxx to the compiler and set correct endian mode. */
- #define CC1_SPEC "%{G*} %(cc1_cpu) \
-@@ -626,7 +629,8 @@
- %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
- %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
- %{mcall-i960-old: --oformat elf32-powerpcle} \
-- }}}}"
-+ }}}} \
-+%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
-
- /* Any specific OS flags. */
- #define LINK_OS_SPEC "\
-@@ -804,15 +808,18 @@
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
-- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
-
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -938,6 +945,7 @@
- { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \
- { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \
- { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
-+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
- { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
- { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
- { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
-diff -r 78025c74c5c1 libgcc/config/rs6000/linux-unwind.h
---- libgcc/config/rs6000/linux-unwind.h Wed Nov 21 21:23:49 2012 -0500
-+++ libgcc/config/rs6000/linux-unwind.h Wed Nov 21 21:45:58 2012 -0500
-@@ -176,6 +176,7 @@
- }
- #endif
-
-+#ifdef __GLIBC__
- /* Find an entry in the process auxiliary vector. The canonical way to
- test for VMX is to look at AT_HWCAP. */
-
-@@ -207,6 +208,7 @@
- return auxp->a_val;
- return 0;
- }
-+#endif
-
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-@@ -253,7 +255,11 @@
-
- if (hwcap == 0)
- {
-+#ifdef __GLIBC__
- hwcap = ppc_linux_aux_vector (16);
-+#else
-+ hwcap = -1;
-+#endif
- /* These will already be set if we found AT_HWCAP. A nonzero
- value stops us looking again if for some reason we couldn't
- find AT_HWCAP. */
-# HG changeset patch
-# Parent de922e533313cc0a2af7e1f69a65ed69263904cd
-Support (partial) for microblaze-linux-musl.
-
-
-diff -r de922e533313 -r b065d0a4bebb gcc/config.gcc
---- gcc/config.gcc Wed Nov 21 21:24:08 2012 -0500
-+++ gcc/config.gcc Wed Nov 21 21:31:28 2012 -0500
-@@ -1725,6 +1725,7 @@
- tm_file="${tm_file} dbxelf.h gnu-user.h linux.h microblaze/linux.h"
- c_target_objs="${c_target_objs} microblaze-c.o"
- cxx_target_objs="${cxx_target_objs} microblaze-c.o"
-+ tmake_file="${tmake_file} microblaze/t-microblaze"
- ;;
- microblaze*-*-*)
- tm_file="${tm_file} dbxelf.h"
diff --git a/srcpkgs/cross-i686-linux-musl/files/gcc-4.7.3-musl.diff b/srcpkgs/cross-i686-linux-musl/files/gcc-4.7.3-musl.diff
new file mode 100644
index 0000000000..e32d1f6272
--- /dev/null
+++ b/srcpkgs/cross-i686-linux-musl/files/gcc-4.7.3-musl.diff
@@ -0,0 +1,739 @@
+# HG changeset patch
+# Parent f50bb54f331f73405131a30b4f353cfda1c70304
+Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one.
+
+diff -r f50bb54f331f libstdc++-v3/configure.host
+--- a/libstdc++-v3/configure.host Fri Mar 29 16:38:52 2013 -0400
++++ b/libstdc++-v3/configure.host Fri Mar 29 16:41:10 2013 -0400
+@@ -264,6 +264,13 @@
+ os_include_dir="os/bsd/freebsd"
+ ;;
+ gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++ # check for musl by target
++ case "${host_os}" in
++ *-musl*)
++ os_include_dir="os/generic"
++ ;;
++ *)
++
+ if [ "$uclibc" = "yes" ]; then
+ os_include_dir="os/uclibc"
+ elif [ "$bionic" = "yes" ]; then
+@@ -272,6 +279,9 @@
+ os_include_dir="os/gnu-linux"
+ fi
+ ;;
++
++ esac
++ ;;
+ hpux*)
+ os_include_dir="os/hpux"
+ ;;
+# HG changeset patch
+# Parent 8cd76d5f6674f04c31523971d1dfc81c91388c38
+Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
+
+diff -r 8cd76d5f6674 gcc/config.gcc
+--- a/gcc/config.gcc Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config.gcc Mon Sep 09 12:54:37 2013 -0400
+@@ -522,7 +522,7 @@
+ esac
+
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+
+ # Common parts for widely ported systems.
+ case ${target} in
+@@ -625,6 +625,9 @@
+ *-*-*uclibc*)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+ ;;
++ *-*-*musl*)
++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++ ;;
+ *)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+ ;;
+diff -r 8cd76d5f6674 gcc/config/linux.h
+--- a/gcc/config/linux.h Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config/linux.h Mon Sep 09 12:54:37 2013 -0400
+@@ -33,10 +33,12 @@
+ #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL (linux_libc == LIBC_MUSL)
+ #endif
+
+ #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
+@@ -54,18 +56,21 @@
+ uClibc or Bionic is the default C library and whether
+ -muclibc or -mglibc or -mbionic has been passed to change the default. */
+
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
+- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -85,21 +90,21 @@
+
+ #define GNU_USER_DYNAMIC_LINKER \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
+- BIONIC_DYNAMIC_LINKER)
++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define GNU_USER_DYNAMIC_LINKER32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+- BIONIC_DYNAMIC_LINKER32)
++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+- BIONIC_DYNAMIC_LINKER64)
++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ #define GNU_USER_DYNAMIC_LINKERX32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
+- BIONIC_DYNAMIC_LINKERX32)
++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
+
+ /* Determine whether the entire c99 runtime
+ is present in the runtime library. */
+ #undef TARGET_C99_FUNCTIONS
+-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
+
+ /* Whether we have sincos that follows the GNU extension. */
+ #undef TARGET_HAS_SINCOS
+@@ -108,3 +113,74 @@
+ /* Whether we have Bionic libc runtime */
+ #undef TARGET_HAS_BIONIC
+ #define TARGET_HAS_BIONIC (OPTION_BIONIC)
++
++/* musl avoids problematic includes by rearranging the include directories.
++ * Unfortunately, this is mostly duplicated from cppdefault.c */
++#if DEFAULT_LIBC == LIBC_MUSL
++#define INCLUDE_DEFAULTS_MUSL_GPP \
++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
++
++#ifdef LOCAL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_LOCAL \
++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_LOCAL
++#endif
++
++#ifdef PREFIX_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_PREFIX \
++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_PREFIX
++#endif
++
++#ifdef CROSS_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_CROSS \
++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#ifdef TOOL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_TOOL \
++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_TOOL
++#endif
++
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++#define INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_NATIVE
++#endif
++
++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
++# undef INCLUDE_DEFAULTS_MUSL_LOCAL
++# define INCLUDE_DEFAULTS_MUSL_LOCAL
++# undef INCLUDE_DEFAULTS_MUSL_NATIVE
++# define INCLUDE_DEFAULTS_MUSL_NATIVE
++#else
++# undef INCLUDE_DEFAULTS_MUSL_CROSS
++# define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#undef INCLUDE_DEFAULTS
++#define INCLUDE_DEFAULTS \
++ { \
++ INCLUDE_DEFAULTS_MUSL_GPP \
++ INCLUDE_DEFAULTS_MUSL_PREFIX \
++ INCLUDE_DEFAULTS_MUSL_CROSS \
++ INCLUDE_DEFAULTS_MUSL_TOOL \
++ INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
++ { 0, 0, 0, 0, 0, 0 } \
++ }
++#endif
+diff -r 8cd76d5f6674 gcc/config/linux.opt
+--- a/gcc/config/linux.opt Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config/linux.opt Mon Sep 09 12:54:37 2013 -0400
+@@ -30,3 +30,7 @@
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+diff -r 8cd76d5f6674 gcc/ginclude/stddef.h
+--- a/gcc/ginclude/stddef.h Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/ginclude/stddef.h Mon Sep 09 12:54:37 2013 -0400
+@@ -184,6 +184,7 @@
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__ /* BeOS */
+ #define __SIZE_T__ /* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -200,6 +201,7 @@
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+ || defined(__FreeBSD_kernel__)
+ /* __size_t is a typedef on FreeBSD 5, must not trash it. */
+@@ -215,6 +217,7 @@
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+# HG changeset patch
+# Parent 2b94537ce2496c88e7e797c617e5b95e8d7e4785
+A fix for libgomp to correctly request a POSIX version for time support.
+
+diff -r 2b94537ce249 libgomp/config/posix/time.c
+--- a/libgomp/config/posix/time.c Fri Mar 29 16:41:14 2013 -0400
++++ b/libgomp/config/posix/time.c Fri Mar 29 16:41:17 2013 -0400
+@@ -28,6 +28,8 @@
+ The following implementation uses the most simple POSIX routines.
+ If present, POSIX 4 clocks should be used instead. */
+
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
+diff -r 2ebb44d1e6f1 libgcc/unwind-dw2-fde-dip.c
+--- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 28 12:15:47 2013 -0400
++++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 28 12:17:02 2013 -0400
+@@ -47,28 +47,13 @@
+ #include "unwind-compat.h"
+ #include "gthr.h"
+
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
+ # define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(__FreeBSD__) && __FreeBSD__ >= 7
+-# define ElfW __ElfN
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(__OpenBSD__)
+-# define ElfW(type) Elf_##type
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(TARGET_DL_ITERATE_PHDR) \
+- && defined(__sun__) && defined(__svr4__)
+-# define USE_PT_GNU_EH_FRAME
++# ifdef __OpenBSD__
++# define ElfW(type) Elf_##typ
++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
++# define ElfW __ElfN
++# endif
+ #endif
+
+ #if defined(USE_PT_GNU_EH_FRAME)
+diff -r 75d9c38318a7 gcc/configure
+--- a/gcc/configure Tue Sep 24 06:52:49 2013 -0400
++++ b/gcc/configure Tue Sep 24 06:54:33 2013 -0400
+@@ -26736,6 +26736,9 @@
+ else
+ gcc_cv_libc_provides_ssp=no
+ case "$target" in
++ *-*-musl*)
++ # All versions of musl provide stack protector
++ gcc_cv_libc_provides_ssp=yes;;
+ *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ # glibc 2.4 and later provides __stack_chk_fail and
+ # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -26769,6 +26772,7 @@
+ # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ # simply assert that glibc does provide this, which is true for all
+ # realistically usable GNU/Hurd configurations.
++ # All supported versions of musl provide it as well
+ gcc_cv_libc_provides_ssp=yes;;
+ *-*-darwin* | *-*-freebsd*)
+ ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
+@@ -26851,6 +26855,9 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
++ *-linux-musl*)
++ gcc_cv_target_dl_iterate_phdr=yes
++ ;;
+ esac
+
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+diff -r 75d9c38318a7 gcc/configure.ac
+--- a/gcc/configure.ac Tue Sep 24 06:52:49 2013 -0400
++++ b/gcc/configure.ac Tue Sep 24 06:54:33 2013 -0400
+@@ -4719,6 +4719,9 @@
+ gcc_cv_libc_provides_ssp,
+ [gcc_cv_libc_provides_ssp=no
+ case "$target" in
++ *-*-musl*)
++ # All versions of musl provide stack protector
++ gcc_cv_libc_provides_ssp=yes;;
+ *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ [# glibc 2.4 and later provides __stack_chk_fail and
+ # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -4752,6 +4755,7 @@
+ # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ # simply assert that glibc does provide this, which is true for all
+ # realistically usable GNU/Hurd configurations.
++ # All supported versions of musl provide it as well
+ gcc_cv_libc_provides_ssp=yes;;
+ *-*-darwin* | *-*-freebsd*)
+ AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
+@@ -4817,6 +4821,9 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
++ *-linux-musl*)
++ gcc_cv_target_dl_iterate_phdr=yes
++ ;;
+ esac
+ GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+# HG changeset patch
+# Parent 94e435662aff38e86c9ca0dff4bbf451e0190b34
+Get rid of ever-broken fixincludes on musl.
+
+
+diff -r 94e435662aff -r e27957848dc8 fixincludes/mkfixinc.sh
+--- a/fixincludes/mkfixinc.sh Sat Jul 27 23:37:20 2013 -0400
++++ b/fixincludes/mkfixinc.sh Sat Jul 27 23:43:03 2013 -0400
+@@ -19,7 +19,8 @@
+ powerpc-*-eabi* | \
+ powerpc-*-rtems* | \
+ powerpcle-*-eabisim* | \
+- powerpcle-*-eabi* )
++ powerpcle-*-eabi* | \
++ *-musl* )
+ # IF there is no include fixing,
+ # THEN create a no-op fixer and exit
+ (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
+# HG changeset patch
+# Parent 65cd23493c45f2a531ca15ffea563d6110143cdd
+New config.sub for GCC versions too early for the update.
+
+
+diff -r 65cd23493c45 -r 355cec477536 config.sub
+--- a/config.sub Tue Aug 27 15:49:27 2013 -0400
++++ b/config.sub Tue Aug 27 15:51:14 2013 -0400
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ # 2011 Free Software Foundation, Inc.
+
+-timestamp='2011-10-29'
++timestamp='2011-03-23'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -125,6 +125,7 @@
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++ linux-musl* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+@@ -251,17 +252,13 @@
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+- | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+- | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+@@ -295,7 +292,7 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+- | rl78 | rx \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -304,7 +301,7 @@
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
++ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
+@@ -361,7 +358,6 @@
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+- | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+@@ -370,10 +366,8 @@
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+- | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+- | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -407,7 +401,7 @@
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+- | rl78-* | romp-* | rs6000-* | rx-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+@@ -415,11 +409,10 @@
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+- | tile*-* \
++ | tile-* | tilegx-* \
+ | tron-* \
+ | ubicom32-* \
+- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+- | vax-* \
++ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+@@ -820,10 +813,6 @@
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+- nacl)
+- basic_machine=le32-unknown
+- os=-nacl
+- ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -1132,8 +1121,13 @@
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+- basic_machine=$basic_machine-unknown
++ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1346,6 +1340,7 @@
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
++ | -linux-musl* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+# HG changeset patch
+# Parent 3ea10cd626cb7abdfd56d3fe8d2c9ed58a82797b
+Support for i386-linux-musl and x86_64-linux-musl.
+
+diff -r 3ea10cd626cb gcc/config/i386/linux.h
+--- a/gcc/config/i386/linux.h Fri Mar 29 16:41:17 2013 -0400
++++ b/gcc/config/i386/linux.h Fri Mar 29 16:41:20 2013 -0400
+@@ -21,3 +21,4 @@
+
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+diff -r 3ea10cd626cb gcc/config/i386/linux64.h
+--- a/gcc/config/i386/linux64.h Fri Mar 29 16:41:17 2013 -0400
++++ b/gcc/config/i386/linux64.h Fri Mar 29 16:41:20 2013 -0400
+@@ -30,3 +30,7 @@
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+diff -r 3ea10cd626cb libitm/config/linux/x86/tls.h
+--- a/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:17 2013 -0400
++++ b/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:20 2013 -0400
+@@ -25,16 +25,19 @@
+ #ifndef LIBITM_X86_TLS_H
+ #define LIBITM_X86_TLS_H 1
+
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ /* Use slots in the TCB head rather than __thread lookups.
+ GLIBC has reserved words 10 through 13 for TM. */
+ #define HAVE_ARCH_GTM_THREAD 1
+ #define HAVE_ARCH_GTM_THREAD_DISP 1
+ #endif
++#endif
+
+ #include "config/generic/tls.h"
+
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ namespace GTM HIDDEN {
+
+ #ifdef __x86_64__
+@@ -101,5 +104,6 @@
+
+ } // namespace GTM
+ #endif /* >= GLIBC 2.10 */
++#endif
+
+ #endif // LIBITM_X86_TLS_H
+Support for arm-linux-musl.
+
+diff -r 8801a3f6d050 gcc/config/arm/linux-eabi.h
+--- a/gcc/config/arm/linux-eabi.h Tue Aug 27 15:47:31 2013 -0400
++++ b/gcc/config/arm/linux-eabi.h Tue Aug 27 15:47:37 2013 -0400
+@@ -64,6 +64,23 @@
+ #undef GLIBC_DYNAMIC_LINKER
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
+
++/* For ARM musl currently supports four dynamic linkers:
++ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
++ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
++ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
++ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
++ musl does not support the legacy OABI mode.
++ All the dynamic linkers live in /lib.
++ We default to soft-float, EL. */
++#undef MUSL_DYNAMIC_LINKER
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
++#endif
++#define MUSL_DYNAMIC_LINKER \
++ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
+ use the GNU/Linux version, not the generic BPABI version. */
+ #undef LINK_SPEC
+diff -r 8801a3f6d050 libitm/config/arm/hwcap.cc
+--- a/libitm/config/arm/hwcap.cc Tue Aug 27 15:47:31 2013 -0400
++++ b/libitm/config/arm/hwcap.cc Tue Aug 27 15:47:37 2013 -0400
+@@ -40,7 +40,11 @@
+
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+
+ static void __attribute__((constructor))
+# HG changeset patch
+# Parent 4618ad6f036f1e944a5262ae5875dcdf62c41f8b
+Support for mips-linux-musl.
+
+diff -r 4618ad6f036f gcc/config/mips/linux.h
+--- a/gcc/config/mips/linux.h Thu Sep 19 08:56:47 2013 -0400
++++ b/gcc/config/mips/linux.h Thu Sep 19 09:08:11 2013 -0400
+@@ -18,3 +18,10 @@
+ <http://www.gnu.org/licenses/>. */
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
+# HG changeset patch
+# Parent 2ffe76b215fdb082cbbc262536077627757fa9bf
+Support for powerpc-linux-musl.
+
+diff -r 2ffe76b215fd gcc/config.gcc
+--- a/gcc/config.gcc Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config.gcc Fri Mar 29 16:41:28 2013 -0400
+@@ -2112,6 +2112,10 @@
+ powerpc*-*-linux*paired*)
+ tm_file="${tm_file} rs6000/750cl.h" ;;
+ esac
++ case ${target} in
++ *-linux*-musl*)
++ enable_secureplt=yes ;;
++ esac
+ if test x${enable_secureplt} = xyes; then
+ tm_file="rs6000/secureplt.h ${tm_file}"
+ fi
+diff -r 2ffe76b215fd gcc/config/rs6000/linux64.h
+--- a/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:28 2013 -0400
+@@ -364,17 +364,21 @@
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER32 \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+
+
+ #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
+diff -r 2ffe76b215fd gcc/config/rs6000/secureplt.h
+--- a/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:28 2013 -0400
+@@ -18,3 +18,4 @@
+ <http://www.gnu.org/licenses/>. */
+
+ #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
+diff -r 2ffe76b215fd gcc/config/rs6000/sysv4.h
+--- a/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:28 2013 -0400
+@@ -551,6 +551,9 @@
+ #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
+ #define CC1_SECURE_PLT_DEFAULT_SPEC ""
+ #endif
++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
++#define LINK_SECURE_PLT_DEFAULT_SPEC ""
++#endif
+
+ /* Pass -G xxx to the compiler and set correct endian mode. */
+ #define CC1_SPEC "%{G*} %(cc1_cpu) \
+@@ -611,7 +614,8 @@
+ %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
+ %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
+ %{mcall-i960-old: --oformat elf32-powerpcle} \
+- }}}}"
++ }}}} \
++%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
+
+ /* Any specific OS flags. */
+ #define LINK_OS_SPEC "\
+@@ -789,15 +793,18 @@
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+@@ -923,6 +930,7 @@
+ { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \
+ { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \
+ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
+ { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
+ { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
+ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 9e83d7fe93..389559e7ab 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,17 +1,15 @@
-# Template build file for 'cross-arm-linux-musleabi'
+# Template build file for 'cross-i686-linux-musl'
#
-_binutils_version=2.23.1
+_binutils_version=2.24
_gcc_version=4.7.3
-_musl_version=0.9.10
-_gmp_version=5.0.5
-_mpfr_version=3.1.1
-_mpc_version=0.9
-_linux_version=3.7.1
+_musl_version=0.9.15
+_linux_version=3.10.6
_triplet=i686-linux-musl
+_sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
-version=0.2
+version=0.4
revision=1
short_desc="Cross toolchain for the ${_triplet} target"
maintainer="Juan RP <xtraeme@gmail.org>"
@@ -20,35 +18,31 @@ license="Public Domain"
distfiles="
http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
- http://mirrors.kernel.org/gnu/gmp/gmp-${_gmp_version}.tar.bz2
- http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_version}.tar.bz2
- http://www.multiprecision.org/mpc/download/mpc-${_mpc_version}.tar.gz
http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz
http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
checksum="
- 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
+ e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
- 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
- 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd
- fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
- e1ca8b8376ebdf797357f5f1734ed6eed3cadc16c32d280a780f150372de7255
- 71fc00733a3ee45fab342870ccd84d33d079e64f2d6fdcfb8b463a769c3ff391"
+ ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf
+ 4a7baab8f295511196dee48d33b8b82a159a81233facb89433707c792033cbe7"
create_wrksrc=yes
hostmakedepends="perl flex"
+makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel"
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
+depends="${pkgname}-libc-${version}_${revision}"
-if [ "$CROSS_BUILD" ]; then
- makedepends="libfl-devel"
+if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then
+ # No need to build a cross compiler if we are running x86_64-musl.
+ msg_normal "${pkgname}-${version}: cannot be built on $XBPS_TARGET_MACHINE\n"
+ exit 0
fi
-_CROSS_TARGET=${_triplet}
-_CROSS_SYSROOT="/usr/${_CROSS_TARGET}"
-
_apply_patch() {
local pname="$(basename $1)"
if [ ! -f ".${pname}_done" ]; then
- patch -Np0 -i ${1}
+ patch -Np1 -i ${1}
touch .${pname}_done
fi
}
@@ -56,20 +50,19 @@ _apply_patch() {
_binutils_build() {
[ -f ${wrksrc}/.binutils_build_done ] && return 0
- cd ${wrksrc}/binutils-${_binutils_version}
- _apply_patch ${FILESDIR}/binutils-2.22-musl.diff
-
+ cd ${wrksrc}
msg_normal "Building cross binutils bootstrap\n"
- [ ! -d ../binutils-build ] && mkdir ../binutils-build
- cd ../binutils-build
+ [ ! -d binutils-build ] && mkdir binutils-build
+ cd binutils-build
../binutils-${_binutils_version}/configure \
- --prefix=/usr --target=${_CROSS_TARGET} \
+ --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \
--disable-nls --disable-multilib --disable-werror \
--disable-shared ${_fpuflags}
- make configure-host && make ${makejobs}
+ make configure-host
+ make ${makejobs}
make install
touch ${wrksrc}/.binutils_build_done
@@ -79,25 +72,15 @@ _gcc_bootstrap() {
[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
cd ${wrksrc}/gcc-${_gcc_version}
- _apply_patch ${FILESDIR}/gcc-4.7.2-musl.diff
+ _apply_patch ${FILESDIR}/gcc-${_gcc_version}-musl.diff
msg_normal "Building cross gcc bootstrap\n"
[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
cd ../gcc-bootstrap
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/gmp ]; then
- mv ${wrksrc}/gmp-${_gmp_version} ${wrksrc}/gcc-${_gcc_version}/gmp
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpfr ]; then
- mv ${wrksrc}/mpfr-${_mpfr_version} ${wrksrc}/gcc-${_gcc_version}/mpfr
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpc ]; then
- mv ${wrksrc}/mpc-${_mpc_version} ${wrksrc}/gcc-${_gcc_version}/mpc
- fi
-
../gcc-${_gcc_version}/configure --prefix=/usr \
- --target=${_CROSS_TARGET} --with-newlib \
+ --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \
--disable-nls --disable-shared --disable-multilib \
--disable-decimal-float --disable-libgomp --disable-libmudflap \
--disable-libquadmath --disable-libssp --disable-threads \
@@ -113,12 +96,12 @@ _linux_headers() {
[ -f ${wrksrc}/.linux_build_done ] && return 0
cd ${wrksrc}
- msg_normal "Building Linux API headers for ARM\n"
+ msg_normal "Building Linux API headers\n"
cd linux-${_linux_version}
make ARCH=x86 headers_check
- make ARCH=x86 INSTALL_HDR_PATH=${_CROSS_SYSROOT}/usr headers_install
+ make ARCH=x86 INSTALL_HDR_PATH=${_sysroot}/usr headers_install
touch ${wrksrc}/.linux_build_done
}
@@ -129,11 +112,11 @@ _musl_build() {
cd ${wrksrc}/musl-${_musl_version}
msg_normal "Building cross musl libc\n"
- CC="${_CROSS_TARGET}-gcc" CFLAGS="-Os -pipe ${_archflags}" \
+ CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \
./configure --prefix=/usr \
make ${makejobs}
- make DESTDIR=${_CROSS_SYSROOT} install
+ make DESTDIR=${_sysroot} install
touch ${wrksrc}/.musl_build_done
}
@@ -148,12 +131,12 @@ _gcc_build() {
cd gcc-build
../gcc-${_gcc_version}/configure \
- --target=${_CROSS_TARGET} --prefix=/usr \
- --enable-languages=c,c++ \
+ --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \
+ --enable-languages=c,c++,lto --enable-lto \
--disable-multilib --disable-nls --disable-libquadmath \
--disable-libmudflap --enable-c99 --enable-shared \
--enable-long-long --enable-threads=posix \
- --disable-libstdcxx-pch ${_fpuflags}
+ --disable-libssp --disable-libstdcxx-pch ${_fpuflags}
make ${makejobs}
@@ -167,11 +150,11 @@ do_build() {
export CFLAGS="-Os -pipe" CXXFLAGS="-Os -pipe"
for f in include lib libexec bin sbin; do
- if [ ! -d ${_CROSS_SYSROOT}/usr/${f} ]; then
- mkdir -p ${_CROSS_SYSROOT}/usr/${f}
+ if [ ! -d ${_sysroot}/usr/${f} ]; then
+ mkdir -p ${_sysroot}/usr/${f}
fi
- if [ ! -h ${_CROSS_SYSROOT}/${f} ]; then
- ln -sfr ${_CROSS_SYSROOT}/usr/${f} ${_CROSS_SYSROOT}/${f}
+ if [ ! -h ${_sysroot}/${f} ]; then
+ ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
fi
done
@@ -184,55 +167,61 @@ do_build() {
do_install() {
for f in include lib libexec bin sbin; do
- if [ ! -d ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} ]; then
- mkdir -p ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f}
+ if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then
+ mkdir -p ${DESTDIR}/${_sysroot}/usr/${f}
fi
- if [ ! -h ${DESTDIR}/${_CROSS_SYSROOT}/${f} ]; then
- ln -sfr ${DESTDIR}/${_CROSS_SYSROOT}/usr/${f} \
- ${DESTDIR}/${_CROSS_SYSROOT}/${f}
+ if [ ! -h ${DESTDIR}/${_sysroot}/${f} ]; then
+ ln -sfr ${DESTDIR}/${_sysroot}/usr/${f} \
+ ${DESTDIR}/${_sysroot}/${f}
fi
done
# install cross binutils
- cd ${wrksrc}/binutils-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/binutils-build
+ make DESTDIR=${DESTDIR} install
# install cross gcc
- cd ${wrksrc}/gcc-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/gcc-build
+ make DESTDIR=${DESTDIR} install
# install musl libc for target
- cd ${wrksrc}/musl-${_musl_version} && \
- make DESTDIR=${DESTDIR}/${_CROSS_SYSROOT} install
+ cd ${wrksrc}/musl-${_musl_version}
+ make DESTDIR=${DESTDIR}/${_sysroot} install
# Remove useless headers.
- rm -rf ${DESTDIR}/usr/lib/gcc/${_CROSS_TARGET}/*/include-fixed/ \
- ${DESTDIR}/usr/lib/gcc/${_CROSS_TARGET}/*/include/stddef.h
+ rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \
+ ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h
- # Make ld-musl-arm.so.1 symlink relative to cwd.
- cd ${DESTDIR}/${_CROSS_SYSROOT}/usr/lib
- ln -sf libc.so ld-musl-arm.so.1
+ # Make ld-musl-i386.so.1 symlink relative to cwd.
+ cd ${DESTDIR}/${_sysroot}/usr/lib
+ ln -sf libc.so ld-musl-i386.so.1
# install linux API headers for x86
- cd ${wrksrc}/linux-${_linux_version} && \
- make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr \
- headers_install
- rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd)
- rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm
+ cd ${wrksrc}/linux-${_linux_version}
+ make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_sysroot}/usr headers_install
+ rm -f $(find ${DESTDIR}/${_sysroot}/usr/include -name .install -or -name ..install.cmd)
+ rm -rf ${DESTDIR}/${_sysroot}/usr/include/drm
+ # Move files to /usr/lib (lib64).
+ if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then
+ mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/
+ rmdir ${DESTDIR}/${_sysroot}/usr/lib64
+ fi
# Remove unnecessary stuff
rm -f ${DESTDIR}/usr/lib*/libiberty.a
rm -rf ${DESTDIR}/usr/share
- rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/{etc,var}
- rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/{sbin,share,libexec}
- rm -f ${DESTDIR}/${_CROSS_SYSROOT}/libexec
- rm -f ${DESTDIR}/${_CROSS_SYSROOT}/lib/*.py
+ rm -rf ${DESTDIR}/${_sysroot}/{etc,var}
+ rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
+ rm -f ${DESTDIR}/${_sysroot}/libexec
+ rm -f ${DESTDIR}/${_sysroot}/lib/*.py
}
do_clean() {
# Remove temporary stuff from masterdir
- rm -rf ${_CROSS_SYSROOT}
- rm -f /usr/bin/${_CROSS_TARGET}*
- rm -rf /usr/lib/gcc/${_CROSS_TARGET}
- rm -rf /usr/libexec/gcc/${_CROSS_TARGET}
+ rm -rf ${_sysroot}
+ rm -f /usr/bin/${_triplet}*
+ rm -rf /usr/lib/gcc/${_triplet}
+ rm -rf /usr/libexec/gcc/${_triplet}
}
cross-i686-linux-musl-libc_package() {
@@ -240,14 +229,8 @@ cross-i686-linux-musl-libc_package() {
noarch=yes
noverifydeps=yes
pkg_install() {
- vmove usr/${_CROSS_TARGET}
- }
-}
-
-cross-i686-linux-musl_package() {
- nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
- depends="${pkgname}-libc-${version}_${revision}"
- pkg_install() {
- vmove usr
+ vmove usr/${_triplet}
+ mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
+ mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin ${DESTDIR}/usr/${_triplet}/usr
}
}
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch
new file mode 100644
index 0000000000..0a842b12dd
--- /dev/null
+++ b/srcpkgs/cross-i686-pc-linux-gnu/files/glibc-2.18-make-4.patch
@@ -0,0 +1,45 @@
+From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 10 Oct 2013 14:26:12 +0900
+Subject: [PATCH] configure: allow building with GNU Make 4
+
+Currently, configure errors telling make 4 is too old
+since it does not match our regexp.
+
+configure.in: allow GNU Make 4.*
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5e2f4d0..e139bf0 100755
+--- configure
++++ configure
+@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+ ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 3.79* | 3.[89]*)
++ 3.79* | 3.[89]* | 4.*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+diff --git a/configure.in b/configure.in
+index a7f9881..95c36b6 100644
+--- configure.in
++++ configure.in
+@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+ critic_missing="$critic_missing gcc")
+ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
+ [GNU Make[^0-9]*\([0-9][0-9.]*\)],
+- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make")
+
+ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
+ [GNU gettext.* \([0-9]*\.[0-9.]*\)],
+--
+1.8.4.1
+
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 4d256182a1..8d773fc59d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,46 +1,47 @@
# Template build file for 'cross-i686-pc-linux-gnu'
#
-_binutils_version=2.23.1
+_binutils_version=2.24
_gcc_version=4.7.3
_glibc_version=2.18
-_gmp_version=5.0.5
-_mpfr_version=3.1.2
-_mpc_version=0.9
_linux_version=3.10.6
_triplet=i686-pc-linux-gnu
_archflags="-march=i686 -mtune=generic"
+_CROSS_SYSROOT="/usr/${_triplet}"
pkgname=cross-${_triplet}
-version=0.9
+version=0.10
revision=1
short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
-maintainer="Juan RP <xtraeme@gmail.org>"
+maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.voidlinux.eu"
license="Public Domain"
distfiles="
http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
- http://mirrors.kernel.org/gnu/gmp/gmp-${_gmp_version}.tar.bz2
- http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_version}.tar.bz2
- http://www.multiprecision.org/mpc/download/mpc-${_mpc_version}.tar.gz
http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
checksum="
- 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
+ e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
- 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
- 79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
- fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
only_for_archs="x86_64"
create_wrksrc=yes
-makedepends="perl flex"
+hostmakedepends="perl flex"
+makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
+depends="${pkgname}-libc-${version}_${revision}"
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
-_CROSS_TARGET=${_triplet}
-_CROSS_SYSROOT="/usr/${_CROSS_TARGET}"
+_apply_patch() {
+ local pname="$(basename $1)"
+
+ if [ ! -f ".${pname}_done" ]; then
+ patch -Np1 -i ${1}
+ touch .${pname}_done
+ fi
+}
_binutils_build() {
[ -f ${wrksrc}/.binutils_build_done ] && return 0
@@ -53,7 +54,7 @@ _binutils_build() {
cd ../binutils-build
../binutils-${_binutils_version}/configure \
- --prefix=/usr --target=${_CROSS_TARGET} \
+ --prefix=/usr --target=${_triplet} \
--with-sysroot=${_CROSS_SYSROOT} \
--disable-nls --disable-multilib --disable-werror \
--disable-shared ${_fpuflags}
@@ -74,18 +75,8 @@ _gcc_bootstrap() {
[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
cd ../gcc-bootstrap
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/gmp ]; then
- mv ${wrksrc}/gmp-${_gmp_version} ${wrksrc}/gcc-${_gcc_version}/gmp
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpfr ]; then
- mv ${wrksrc}/mpfr-${_mpfr_version} ${wrksrc}/gcc-${_gcc_version}/mpfr
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpc ]; then
- mv ${wrksrc}/mpc-${_mpc_version} ${wrksrc}/gcc-${_gcc_version}/mpc
- fi
-
../gcc-${_gcc_version}/configure --prefix=/usr \
- --target=${_CROSS_TARGET} --with-newlib \
+ --target=${_triplet} --with-newlib \
--with-sysroot=${_CROSS_SYSROOT} \
--disable-nls --disable-shared --disable-multilib \
--disable-decimal-float --disable-libgomp --disable-libmudflap \
@@ -115,6 +106,9 @@ _linux_headers() {
_glibc_headers() {
[ -f ${wrksrc}/.glibc_headers_done ] && return 0
+ cd ${wrksrc}/glibc-${_glibc_version}
+ _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch
+
cd ${wrksrc}
msg_normal "Building cross glibc headers\n"
@@ -125,11 +119,11 @@ _glibc_headers() {
echo "libc_cv_c_cleanup=yes" >> config.cache
echo "libc_cv_ssp=no" >> config.cache
- export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" \
- AS="${_CROSS_TARGET}-as" CPP="${_CROSS_TARGET}-cpp"
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" \
+ AS="${_triplet}-as" CPP="${_triplet}-cpp"
../glibc-${_glibc_version}/configure \
- --host=${_CROSS_TARGET} --prefix=/usr \
+ --host=${_triplet} --prefix=/usr \
--with-headers=${_CROSS_SYSROOT}/usr/include \
--config-cache --enable-add-ons=nptl,ports \
--enable-obsolete-rpc \
@@ -154,12 +148,12 @@ _glibc_build() {
echo "libc_cv_c_cleanup=yes" >> config.cache
echo "libc_cv_ssp=no" >> config.cache
- export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" \
- AS="${_CROSS_TARGET}-as" CPP="${_CROSS_TARGET}-cpp"
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" \
+ AS="${_triplet}-as" CPP="${_triplet}-cpp"
export CFLAGS="-Os -pipe ${_archflags}"
../glibc-${_glibc_version}/configure \
- --host=${_CROSS_TARGET} --prefix=/usr \
+ --host=${_triplet} --prefix=/usr \
--with-headers=${_CROSS_SYSROOT}/usr/include \
--config-cache --enable-add-ons=nptl,ports \
--enable-obsolete-rpc --disable-profile \
@@ -191,9 +185,9 @@ _gcc_build() {
fi
../gcc-${_gcc_version}/configure \
- --target=${_CROSS_TARGET} --prefix=/usr \
+ --target=${_triplet} --prefix=/usr \
--with-sysroot=${_CROSS_SYSROOT} \
- --enable-languages=c,c++ \
+ --enable-languages=c,c++,lto --enable-lto \
--disable-multilib --disable-nls --disable-libquadmath \
--disable-libmudflap --enable-c99 --enable-shared \
--enable-long-long --enable-threads=posix \
@@ -239,22 +233,23 @@ do_install() {
done
# install cross binutils
- cd ${wrksrc}/binutils-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/binutils-build
+ make DESTDIR=${DESTDIR} install
# install cross gcc
- cd ${wrksrc}/gcc-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/gcc-build
+ make DESTDIR=${DESTDIR} install
- # install linux API headers for MIPS
- cd ${wrksrc}/linux-${_linux_version} && \
- make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr \
- headers_install
+ # install linux API headers for x86.
+ cd ${wrksrc}/linux-${_linux_version}
+ make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_CROSS_SYSROOT}/usr headers_install
rm -f $(find ${DESTDIR}/${_CROSS_SYSROOT}/usr/include -name .install -or -name ..install.cmd)
rm -rf ${DESTDIR}/${_CROSS_SYSROOT}/usr/include/drm
# install glibc for target
- cd ${wrksrc}/glibc-build && \
- make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers
+ cd ${wrksrc}/glibc-build
+ make install_root=${DESTDIR}/${_CROSS_SYSROOT} install install-headers
# Remove unnecessary stuff
rm -f ${DESTDIR}/usr/lib*/libiberty.a
@@ -274,9 +269,9 @@ do_install() {
do_clean() {
# Remove temporary stuff from masterdir
rm -rf ${_CROSS_SYSROOT}
- rm -f /usr/bin/${_CROSS_TARGET}*
- rm -rf /usr/lib/gcc/${_CROSS_TARGET}
- rm -rf /usr/libexec/gcc/${_CROSS_TARGET}
+ rm -f /usr/bin/${_triplet}*
+ rm -rf /usr/lib/gcc/${_triplet}
+ rm -rf /usr/libexec/gcc/${_triplet}
}
cross-i686-pc-linux-gnu-libc_package() {
@@ -285,14 +280,6 @@ cross-i686-pc-linux-gnu-libc_package() {
nostrip=yes
noverifydeps=yes
pkg_install() {
- vmove usr/${_CROSS_TARGET}
- }
-}
-
-cross-i686-pc-linux-gnu_package() {
- depends="${pkgname}-libc-${version}_${revision}"
- nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
- pkg_install() {
- vmove usr
+ vmove usr/${_triplet}
}
}
diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-make-4.patch b/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-make-4.patch
new file mode 100644
index 0000000000..0a842b12dd
--- /dev/null
+++ b/srcpkgs/cross-mips-softfloat-linux-gnu/files/glibc-2.18-make-4.patch
@@ -0,0 +1,45 @@
+From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 10 Oct 2013 14:26:12 +0900
+Subject: [PATCH] configure: allow building with GNU Make 4
+
+Currently, configure errors telling make 4 is too old
+since it does not match our regexp.
+
+configure.in: allow GNU Make 4.*
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5e2f4d0..e139bf0 100755
+--- configure
++++ configure
+@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+ ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 3.79* | 3.[89]*)
++ 3.79* | 3.[89]* | 4.*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+diff --git a/configure.in b/configure.in
+index a7f9881..95c36b6 100644
+--- configure.in
++++ configure.in
+@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+ critic_missing="$critic_missing gcc")
+ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
+ [GNU Make[^0-9]*\([0-9][0-9.]*\)],
+- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make")
+
+ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
+ [GNU gettext.* \([0-9]*\.[0-9.]*\)],
+--
+1.8.4.1
+
diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/template b/srcpkgs/cross-mips-softfloat-linux-gnu/template
index 7979b366c3..09403ab52f 100644
--- a/srcpkgs/cross-mips-softfloat-linux-gnu/template
+++ b/srcpkgs/cross-mips-softfloat-linux-gnu/template
@@ -1,47 +1,47 @@
# Template build file for 'cross-mips-softfloat-linux-gnu'
#
-_binutils_version=2.23.1
-_gcc_version=4.7.2
-_glibc_version=2.17
-_gmp_version=5.0.5
-_mpfr_version=3.1.1
-_mpc_version=0.9
-_linux_version=3.7.1
+_binutils_version=2.24
+_gcc_version=4.7.3
+_glibc_version=2.18
+_linux_version=3.10.6
_triplet=mips-softfloat-linux-gnu
_fpuflags="--with-float=soft --without-fp"
_archflags="-mtune=mips32r2 -mabi=32 -msoft-float"
+_CROSS_SYSROOT="/usr/${_triplet}"
pkgname=cross-${_triplet}
-version=0.5
-revision=2
+version=0.6
+revision=1
short_desc="GNU Cross toolchain for the ${_triplet} BE target (binutils/gcc/glibc)"
-maintainer="pancake <pancake@nopcode.org>"
+maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.voidlinux.eu"
license="Public Domain"
distfiles="
http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
- http://mirrors.kernel.org/gnu/gmp/gmp-${_gmp_version}.tar.bz2
- http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_version}.tar.bz2
- http://www.multiprecision.org/mpc/download/mpc-${_mpc_version}.tar.gz
http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
checksum="
- 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
- 8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084
- 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e
- 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
- 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd
- fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
- e1ca8b8376ebdf797357f5f1734ed6eed3cadc16c32d280a780f150372de7255"
+ e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
+ 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
+ 2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
+ ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
create_wrksrc=yes
-disable_debug=yes
-makedepends="perl flex"
+hostmakedepends="perl flex"
+makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
+depends="${pkgname}-libc-${version}_${revision}"
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
-_CROSS_TARGET=${_triplet}
-_CROSS_SYSROOT="/usr/${_CROSS_TARGET}"
+_apply_patch() {
+ local pname="$(basename $1)"
+
+ if [ ! -f ".${pname}_done" ]; then
+ patch -Np1 -i ${1}
+ touch .${pname}_done
+ fi
+}
_linux_headers() {
[ -f ${wrksrc}/.linux_build_done ] && return 0
@@ -52,7 +52,7 @@ _linux_headers() {
cd linux-${_linux_version}
make ARCH=mips headers_check
- make ARCH=mips INSTALL_HDR_PATH=/usr/${_CROSS_TARGET}/usr headers_install
+ make ARCH=mips INSTALL_HDR_PATH=/usr/${_triplet}/usr headers_install
touch ${wrksrc}/.linux_build_done
}
@@ -66,7 +66,7 @@ _binutils_bootstrap() {
cd binutils-build
../binutils-${_binutils_version}/configure \
- --prefix=/usr --target=${_CROSS_TARGET} \
+ --prefix=/usr --target=${_triplet} \
--with-sysroot=${_CROSS_SYSROOT} --disable-nls --disable-shared \
--disable-multilib --disable-werror
@@ -87,18 +87,8 @@ _gcc_bootstrap() {
[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
cd ../gcc-bootstrap
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/gmp ]; then
- mv ${wrksrc}/gmp-${_gmp_version} ${wrksrc}/gcc-${_gcc_version}/gmp
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpfr ]; then
- mv ${wrksrc}/mpfr-${_mpfr_version} ${wrksrc}/gcc-${_gcc_version}/mpfr
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpc ]; then
- mv ${wrksrc}/mpc-${_mpc_version} ${wrksrc}/gcc-${_gcc_version}/mpc
- fi
-
../gcc-${_gcc_version}/configure --prefix=/usr \
- --target=${_CROSS_TARGET} --without-headers \
+ --target=${_triplet} --without-headers \
--disable-nls --disable-shared --without-headers \
--disable-decimal-float --disable-libgomp --disable-libmudflap \
--disable-libssp --disable-threads --enable-languages=c \
@@ -114,6 +104,9 @@ _gcc_bootstrap() {
_glibc_headers() {
[ -f ${wrksrc}/.glibc_headers_done ] && return 0
+ cd ${wrksrc}/glibc-${_glibc_version}
+ _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch
+
cd ${wrksrc}
msg_normal "Building cross glibc headers\n"
@@ -123,11 +116,11 @@ _glibc_headers() {
echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache
- export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" AS="${_triplet}-as"
../glibc-${_glibc_version}/configure \
- --host=${_CROSS_TARGET} --prefix=/usr \
- --with-headers=/usr/${_CROSS_TARGET}/usr/include \
+ --host=${_triplet} --prefix=/usr \
+ --with-headers=/usr/${_triplet}/usr/include \
--config-cache --enable-add-ons=nptl,ports \
--enable-obsolete-rpc \
--enable-kernel=2.6.27 ${_fpuflags}
@@ -150,12 +143,12 @@ _glibc_build() {
echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache
- export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" AS="${_triplet}-as"
export CFLAGS="-Os -pipe ${_archflags}"
../glibc-${_glibc_version}/configure \
- --host=${_CROSS_TARGET} --prefix=/usr \
- --with-headers=/usr/${_CROSS_TARGET}/usr/include \
+ --host=${_triplet} --prefix=/usr \
+ --with-headers=/usr/${_triplet}/usr/include \
--config-cache --enable-add-ons=nptl,ports \
--enable-obsolete-rpc --disable-profile \
--enable-kernel=2.6.27 ${_fpuflags}
@@ -186,13 +179,13 @@ _gcc_build() {
fi
../gcc-${_gcc_version}/configure \
- --target=${_CROSS_TARGET} --prefix=/usr \
- --with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++ \
+ --target=${_triplet} --prefix=/usr \
+ --with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++,lto \
--with-gnu-as --with-gnu-ld --disable-multilib \
--disable-nls --disable-sjlj-exceptions \
--enable-threads=posix --enable-long-longx \
--enable-shared --disable-libquadmath \
- --disable-libstdcxx-pch ${_fpuflags}
+ --disable-libstdcxx-pch --enable-lto ${_fpuflags}
make ${makejobs}
@@ -232,21 +225,22 @@ do_install() {
done
# install cross binutils
- cd ${wrksrc}/binutils-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/binutils-build
+ make DESTDIR=${DESTDIR} install
# install cross gcc
- cd ${wrksrc}/gcc-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/gcc-build
+ make DESTDIR=${DESTDIR} install
# install linux API headers for MIPS
- cd ${wrksrc}/linux-${_linux_version} && \
- make ARCH=mips INSTALL_HDR_PATH=${DESTDIR}/usr/${_CROSS_TARGET}/usr \
- headers_install
- rm -f $(find ${DESTDIR}/usr/${_CROSS_TARGET}/usr/include -name .install -or -name ..install.cmd)
- rm -rf ${DESTDIR}/usr/${_CROSS_TARGET}/usr/include/drm
+ cd ${wrksrc}/linux-${_linux_version}
+ make ARCH=mips INSTALL_HDR_PATH=${DESTDIR}/usr/${_triplet}/usr headers_install
+ rm -f $(find ${DESTDIR}/usr/${_triplet}/usr/include -name .install -or -name ..install.cmd)
+ rm -rf ${DESTDIR}/usr/${_triplet}/usr/include/drm
# install glibc for target
- cd ${wrksrc}/glibc-build && \
- make install_root=${DESTDIR}/usr/${_CROSS_TARGET} install install-headers
+ cd ${wrksrc}/glibc-build
+ make install_root=${DESTDIR}/usr/${_triplet} install install-headers
# Remove unnecessary stuff
rm -f ${DESTDIR}/usr/lib*/libiberty.a
@@ -266,25 +260,17 @@ do_install() {
do_clean() {
# Remove temporary stuff from masterdir
rm -rf ${_CROSS_SYSROOT}
- rm -f /usr/bin/${_CROSS_TARGET}*
- rm -rf /usr/lib/gcc/${_CROSS_TARGET}
- rm -rf /usr/libexec/gcc/${_CROSS_TARGET}
+ rm -f /usr/bin/${_triplet}*
+ rm -rf /usr/lib/gcc/${_triplet}
+ rm -rf /usr/libexec/gcc/${_triplet}
}
cross-mips-softfloat-linux-gnu-libc_package() {
- short_desc="${short_desc} -- glibc files"
+ short_desc+=" - libc files"
noarch=yes
nostrip=yes
noverifydeps=yes
pkg_install() {
- vmove usr/${_CROSS_TARGET}
- }
-}
-
-cross-mips-softfloat-linux-gnu_package() {
- depends="${pkgname}-libc-${version}_${revision}"
- nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
- pkg_install() {
- vmove usr
+ vmove usr/${_triplet}
}
}
diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-make-4.patch b/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-make-4.patch
new file mode 100644
index 0000000000..0a842b12dd
--- /dev/null
+++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/files/glibc-2.18-make-4.patch
@@ -0,0 +1,45 @@
+From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 10 Oct 2013 14:26:12 +0900
+Subject: [PATCH] configure: allow building with GNU Make 4
+
+Currently, configure errors telling make 4 is too old
+since it does not match our regexp.
+
+configure.in: allow GNU Make 4.*
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5e2f4d0..e139bf0 100755
+--- configure
++++ configure
+@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+ ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+- 3.79* | 3.[89]*)
++ 3.79* | 3.[89]* | 4.*)
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+diff --git a/configure.in b/configure.in
+index a7f9881..95c36b6 100644
+--- configure.in
++++ configure.in
+@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+ critic_missing="$critic_missing gcc")
+ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
+ [GNU Make[^0-9]*\([0-9][0-9.]*\)],
+- [3.79* | 3.[89]*], critic_missing="$critic_missing make")
++ [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make")
+
+ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
+ [GNU gettext.* \([0-9]*\.[0-9.]*\)],
+--
+1.8.4.1
+
diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template
index 6f29a4b38b..fa3402acee 100644
--- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template
+++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template
@@ -1,47 +1,47 @@
# Template build file for 'cross-mipsel-softfloat-linux-gnu'
#
-_binutils_version=2.23.1
-_gcc_version=4.7.2
-_glibc_version=2.17
-_gmp_version=5.0.5
-_mpfr_version=3.1.1
-_mpc_version=0.9
-_linux_version=3.7.1
+_binutils_version=2.24
+_gcc_version=4.7.3
+_glibc_version=2.18
+_linux_version=3.10.6
_triplet=mipsel-softfloat-linux-gnu
_fpuflags="--with-float=soft --without-fp"
_archflags="-mtune=mips32r2 -mabi=32 -msoft-float"
+_CROSS_SYSROOT="/usr/${_triplet}"
pkgname=cross-${_triplet}
-version=0.5
-revision=2
+version=0.6
+revision=1
short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
-maintainer="pancake <pancake@nopcode.org>"
+maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.voidlinux.eu"
license="Public Domain"
distfiles="
http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
- http://mirrors.kernel.org/gnu/gmp/gmp-${_gmp_version}.tar.bz2
- http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_version}.tar.bz2
- http://www.multiprecision.org/mpc/download/mpc-${_mpc_version}.tar.gz
http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz"
checksum="
- 2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19
- 8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084
- 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e
- 1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
- 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd
- fd3efe422f0d454592059e80f2c00d1a2e381bf2beda424c5094abd4deb049ac
- e1ca8b8376ebdf797357f5f1734ed6eed3cadc16c32d280a780f150372de7255"
+ e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
+ 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
+ 2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
+ ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf"
create_wrksrc=yes
-disable_debug=yes
-makedepends="perl flex"
+hostmakedepends="perl flex"
+makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
+depends="${pkgname}-libc-${version}_${revision}"
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
-_CROSS_TARGET=${_triplet}
-_CROSS_SYSROOT="/usr/${_CROSS_TARGET}"
+_apply_patch() {
+ local pname="$(basename $1)"
+
+ if [ ! -f ".${pname}_done" ]; then
+ patch -Np1 -i ${1}
+ touch .${pname}_done
+ fi
+}
_linux_headers() {
[ -f ${wrksrc}/.linux_build_done ] && return 0
@@ -52,7 +52,7 @@ _linux_headers() {
cd linux-${_linux_version}
make ARCH=mips headers_check
- make ARCH=mips INSTALL_HDR_PATH=/usr/${_CROSS_TARGET}/usr headers_install
+ make ARCH=mips INSTALL_HDR_PATH=/usr/${_triplet}/usr headers_install
touch ${wrksrc}/.linux_build_done
}
@@ -66,7 +66,7 @@ _binutils_bootstrap() {
cd binutils-build
../binutils-${_binutils_version}/configure \
- --prefix=/usr --target=${_CROSS_TARGET} \
+ --prefix=/usr --target=${_triplet} \
--with-sysroot=${_CROSS_SYSROOT} --disable-nls --disable-shared \
--disable-multilib --disable-werror
@@ -87,18 +87,8 @@ _gcc_bootstrap() {
[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
cd ../gcc-bootstrap
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/gmp ]; then
- mv ${wrksrc}/gmp-${_gmp_version} ${wrksrc}/gcc-${_gcc_version}/gmp
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpfr ]; then
- mv ${wrksrc}/mpfr-${_mpfr_version} ${wrksrc}/gcc-${_gcc_version}/mpfr
- fi
- if [ ! -d ${wrksrc}/gcc-${_gcc_version}/mpc ]; then
- mv ${wrksrc}/mpc-${_mpc_version} ${wrksrc}/gcc-${_gcc_version}/mpc
- fi
-
../gcc-${_gcc_version}/configure --prefix=/usr \
- --target=${_CROSS_TARGET} --without-headers \
+ --target=${_triplet} --without-headers \
--disable-nls --disable-shared --without-headers \
--disable-decimal-float --disable-libgomp --disable-libmudflap \
--disable-libssp --disable-threads --enable-languages=c \
@@ -114,6 +104,9 @@ _gcc_bootstrap() {
_glibc_headers() {
[ -f ${wrksrc}/.glibc_headers_done ] && return 0
+ cd ${wrksrc}/glibc-${_glibc_version}
+ _apply_patch ${FILESDIR}/glibc-2.18-make-4.patch
+
cd ${wrksrc}
msg_normal "Building cross glibc headers\n"
@@ -123,11 +116,11 @@ _glibc_headers() {
echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache
- export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" AS="${_triplet}-as"
../glibc-${_glibc_version}/configure \
- --host=${_CROSS_TARGET} --prefix=/usr \
- --with-headers=/usr/${_CROSS_TARGET}/usr/include \
+ --host=${_triplet} --prefix=/usr \
+ --with-headers=/usr/${_triplet}/usr/include \
--config-cache --enable-add-ons=nptl,ports \
--enable-obsolete-rpc \
--enable-kernel=2.6.27 ${_fpuflags}
@@ -150,12 +143,12 @@ _glibc_build() {
echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache
- export CC="${_CROSS_TARGET}-gcc" LD="${_CROSS_TARGET}-ld" AS="${_CROSS_TARGET}-as"
+ export CC="${_triplet}-gcc" LD="${_triplet}-ld" AS="${_triplet}-as"
export CFLAGS="-Os -pipe ${_archflags}"
../glibc-${_glibc_version}/configure \
- --host=${_CROSS_TARGET} --prefix=/usr \
- --with-headers=/usr/${_CROSS_TARGET}/usr/include \
+ --host=${_triplet} --prefix=/usr \
+ --with-headers=/usr/${_triplet}/usr/include \
--config-cache --enable-add-ons=nptl,ports \
--enable-obsolete-rpc --disable-profile \
--enable-kernel=2.6.27 ${_fpuflags}
@@ -186,13 +179,13 @@ _gcc_build() {
fi
../gcc-${_gcc_version}/configure \
- --target=${_CROSS_TARGET} --prefix=/usr \
- --with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++ \
+ --target=${_triplet} --prefix=/usr \
+ --with-sysroot=${_CROSS_SYSROOT} --enable-languages=c,c++,lto \
--with-gnu-as --with-gnu-ld --disable-multilib \
--disable-nls --disable-sjlj-exceptions \
--enable-threads=posix --enable-long-longx \
--enable-shared --disable-libquadmath \
- --disable-libstdcxx-pch ${_fpuflags}
+ --disable-libstdcxx-pch --enable-lto ${_fpuflags}
make ${makejobs}
@@ -232,21 +225,22 @@ do_install() {
done
# install cross binutils
- cd ${wrksrc}/binutils-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/binutils-build
+ make DESTDIR=${DESTDIR} install
# install cross gcc
- cd ${wrksrc}/gcc-build && make DESTDIR=${DESTDIR} install
+ cd ${wrksrc}/gcc-build
+ make DESTDIR=${DESTDIR} install
# install linux API headers for MIPS
- cd ${wrksrc}/linux-${_linux_version} && \
- make ARCH=mips INSTALL_HDR_PATH=${DESTDIR}/usr/${_CROSS_TARGET}/usr \
- headers_install
- rm -f $(find ${DESTDIR}/usr/${_CROSS_TARGET}/usr/include -name .install -or -name ..install.cmd)
- rm -rf ${DESTDIR}/usr/${_CROSS_TARGET}/usr/include/drm
+ cd ${wrksrc}/linux-${_linux_version}
+ make ARCH=mips INSTALL_HDR_PATH=${DESTDIR}/usr/${_triplet}/usr headers_install
+ rm -f $(find ${DESTDIR}/usr/${_triplet}/usr/include -name .install -or -name ..install.cmd)
+ rm -rf ${DESTDIR}/usr/${_triplet}/usr/include/drm
# install glibc for target
- cd ${wrksrc}/glibc-build && \
- make install_root=${DESTDIR}/usr/${_CROSS_TARGET} install install-headers
+ cd ${wrksrc}/glibc-build
+ make install_root=${DESTDIR}/usr/${_triplet} install install-headers
# Remove unnecessary stuff
rm -f ${DESTDIR}/usr/lib*/libiberty.a
@@ -266,25 +260,17 @@ do_install() {
do_clean() {
# Remove temporary stuff from masterdir
rm -rf ${_CROSS_SYSROOT}
- rm -f /usr/bin/${_CROSS_TARGET}*
- rm -rf /usr/lib/gcc/${_CROSS_TARGET}
- rm -rf /usr/libexec/gcc/${_CROSS_TARGET}
+ rm -f /usr/bin/${_triplet}*
+ rm -rf /usr/lib/gcc/${_triplet}
+ rm -rf /usr/libexec/gcc/${_triplet}
}
cross-mipsel-softfloat-linux-gnu-libc_package() {
- short_desc="${short_desc} -- glibc files"
+ short_desc+=" - libc files"
noarch=yes
nostrip=yes
noverifydeps=yes
pkg_install() {
- vmove usr/${_CROSS_TARGET}
- }
-}
-
-cross-mipsel-softfloat-linux-gnu_package() {
- depends="${pkgname}-libc-${version}_${revision}"
- nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
- pkg_install() {
- vmove usr
+ vmove usr/${_triplet}
}
}
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index 45fc7a93de..46acc6eb24 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,6 +1,6 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
-version=0.3
+version=0.4
revision=1
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
@@ -9,12 +9,31 @@ license="Public domain"
homepage="http://www.voidlinux.eu"
noarch=yes
-
-cross-vpkg-dummy_package() {
- depends="base-directories xbps-triggers"
- provides="binutils-2.23.51.0.3 bash-4.2 coreutils-8.17 diffutils-3.2
- fakeroot-1.18.4_1 findutils-4.4.2 gawk-4.0.0 libgcc-4.7.2 libstdc++-4.7.2
- libstdc++-devel-4.7.2 gcc-4.7.2 gcc-c++-4.7.2 gettext-0.18.1.1
- glibc-2.17 glibc-devel-2.17 musl-0.9.9 grep-2.10 gzip-1.4 m4-1.4.16 make-3.82
- patch-2.7.1 sed-4.2.1 tar-1.26 texinfo-4.13a util-linux-2.21 xz-5.0.4"
-}
+depends="base-directories xbps-triggers"
+provides="
+ binutils-2.24_1
+ libgcc-4.7.3_10
+ libstdc++-4.7.3_10
+ libstdc++-devel-4.7.3_10
+ gcc-4.7.3_10
+ gcc-c++-4.7.3_10
+ glibc-2.18_1
+ glibc-devel-2.18_1
+ musl-0.9.15_1
+ bash-4.2_1
+ coreutils-8.17_1
+ diffutils-3.2_1
+ fakeroot-1.18.4_1
+ findutils-4.4.2_1
+ gawk-4.0.0
+ gettext-0.18.1.1_1
+ grep-2.10_1
+ gzip-1.4_1
+ m4-1.4.16_1
+ make-3.82_1
+ patch-2.7.1_1
+ sed-4.2.1_1
+ tar-1.26_1
+ texinfo-4.13a_1
+ util-linux-2.21_1
+ xz-5.0.4_1"
diff --git a/srcpkgs/cross-x86_64-linux-musl-libc b/srcpkgs/cross-x86_64-linux-musl-libc
new file mode 120000
index 0000000000..b3ab881064
--- /dev/null
+++ b/srcpkgs/cross-x86_64-linux-musl-libc
@@ -0,0 +1 @@
+cross-x86_64-linux-musl
\ No newline at end of file
diff --git a/srcpkgs/cross-x86_64-linux-musl/files/gcc-4.7.3-musl.diff b/srcpkgs/cross-x86_64-linux-musl/files/gcc-4.7.3-musl.diff
new file mode 100644
index 0000000000..e32d1f6272
--- /dev/null
+++ b/srcpkgs/cross-x86_64-linux-musl/files/gcc-4.7.3-musl.diff
@@ -0,0 +1,739 @@
+# HG changeset patch
+# Parent f50bb54f331f73405131a30b4f353cfda1c70304
+Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one.
+
+diff -r f50bb54f331f libstdc++-v3/configure.host
+--- a/libstdc++-v3/configure.host Fri Mar 29 16:38:52 2013 -0400
++++ b/libstdc++-v3/configure.host Fri Mar 29 16:41:10 2013 -0400
+@@ -264,6 +264,13 @@
+ os_include_dir="os/bsd/freebsd"
+ ;;
+ gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++ # check for musl by target
++ case "${host_os}" in
++ *-musl*)
++ os_include_dir="os/generic"
++ ;;
++ *)
++
+ if [ "$uclibc" = "yes" ]; then
+ os_include_dir="os/uclibc"
+ elif [ "$bionic" = "yes" ]; then
+@@ -272,6 +279,9 @@
+ os_include_dir="os/gnu-linux"
+ fi
+ ;;
++
++ esac
++ ;;
+ hpux*)
+ os_include_dir="os/hpux"
+ ;;
+# HG changeset patch
+# Parent 8cd76d5f6674f04c31523971d1dfc81c91388c38
+Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
+
+diff -r 8cd76d5f6674 gcc/config.gcc
+--- a/gcc/config.gcc Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config.gcc Mon Sep 09 12:54:37 2013 -0400
+@@ -522,7 +522,7 @@
+ esac
+
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+
+ # Common parts for widely ported systems.
+ case ${target} in
+@@ -625,6 +625,9 @@
+ *-*-*uclibc*)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+ ;;
++ *-*-*musl*)
++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++ ;;
+ *)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+ ;;
+diff -r 8cd76d5f6674 gcc/config/linux.h
+--- a/gcc/config/linux.h Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config/linux.h Mon Sep 09 12:54:37 2013 -0400
+@@ -33,10 +33,12 @@
+ #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL (linux_libc == LIBC_MUSL)
+ #endif
+
+ #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
+@@ -54,18 +56,21 @@
+ uClibc or Bionic is the default C library and whether
+ -muclibc or -mglibc or -mbionic has been passed to change the default. */
+
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
+- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -85,21 +90,21 @@
+
+ #define GNU_USER_DYNAMIC_LINKER \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
+- BIONIC_DYNAMIC_LINKER)
++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define GNU_USER_DYNAMIC_LINKER32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+- BIONIC_DYNAMIC_LINKER32)
++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+- BIONIC_DYNAMIC_LINKER64)
++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ #define GNU_USER_DYNAMIC_LINKERX32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
+- BIONIC_DYNAMIC_LINKERX32)
++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
+
+ /* Determine whether the entire c99 runtime
+ is present in the runtime library. */
+ #undef TARGET_C99_FUNCTIONS
+-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
+
+ /* Whether we have sincos that follows the GNU extension. */
+ #undef TARGET_HAS_SINCOS
+@@ -108,3 +113,74 @@
+ /* Whether we have Bionic libc runtime */
+ #undef TARGET_HAS_BIONIC
+ #define TARGET_HAS_BIONIC (OPTION_BIONIC)
++
++/* musl avoids problematic includes by rearranging the include directories.
++ * Unfortunately, this is mostly duplicated from cppdefault.c */
++#if DEFAULT_LIBC == LIBC_MUSL
++#define INCLUDE_DEFAULTS_MUSL_GPP \
++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
++
++#ifdef LOCAL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_LOCAL \
++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_LOCAL
++#endif
++
++#ifdef PREFIX_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_PREFIX \
++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_PREFIX
++#endif
++
++#ifdef CROSS_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_CROSS \
++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#ifdef TOOL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_TOOL \
++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_TOOL
++#endif
++
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++#define INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_NATIVE
++#endif
++
++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
++# undef INCLUDE_DEFAULTS_MUSL_LOCAL
++# define INCLUDE_DEFAULTS_MUSL_LOCAL
++# undef INCLUDE_DEFAULTS_MUSL_NATIVE
++# define INCLUDE_DEFAULTS_MUSL_NATIVE
++#else
++# undef INCLUDE_DEFAULTS_MUSL_CROSS
++# define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#undef INCLUDE_DEFAULTS
++#define INCLUDE_DEFAULTS \
++ { \
++ INCLUDE_DEFAULTS_MUSL_GPP \
++ INCLUDE_DEFAULTS_MUSL_PREFIX \
++ INCLUDE_DEFAULTS_MUSL_CROSS \
++ INCLUDE_DEFAULTS_MUSL_TOOL \
++ INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
++ { 0, 0, 0, 0, 0, 0 } \
++ }
++#endif
+diff -r 8cd76d5f6674 gcc/config/linux.opt
+--- a/gcc/config/linux.opt Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config/linux.opt Mon Sep 09 12:54:37 2013 -0400
+@@ -30,3 +30,7 @@
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+diff -r 8cd76d5f6674 gcc/ginclude/stddef.h
+--- a/gcc/ginclude/stddef.h Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/ginclude/stddef.h Mon Sep 09 12:54:37 2013 -0400
+@@ -184,6 +184,7 @@
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__ /* BeOS */
+ #define __SIZE_T__ /* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -200,6 +201,7 @@
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+ || defined(__FreeBSD_kernel__)
+ /* __size_t is a typedef on FreeBSD 5, must not trash it. */
+@@ -215,6 +217,7 @@
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+# HG changeset patch
+# Parent 2b94537ce2496c88e7e797c617e5b95e8d7e4785
+A fix for libgomp to correctly request a POSIX version for time support.
+
+diff -r 2b94537ce249 libgomp/config/posix/time.c
+--- a/libgomp/config/posix/time.c Fri Mar 29 16:41:14 2013 -0400
++++ b/libgomp/config/posix/time.c Fri Mar 29 16:41:17 2013 -0400
+@@ -28,6 +28,8 @@
+ The following implementation uses the most simple POSIX routines.
+ If present, POSIX 4 clocks should be used instead. */
+
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
+diff -r 2ebb44d1e6f1 libgcc/unwind-dw2-fde-dip.c
+--- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 28 12:15:47 2013 -0400
++++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 28 12:17:02 2013 -0400
+@@ -47,28 +47,13 @@
+ #include "unwind-compat.h"
+ #include "gthr.h"
+
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
+ # define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(__FreeBSD__) && __FreeBSD__ >= 7
+-# define ElfW __ElfN
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(__OpenBSD__)
+-# define ElfW(type) Elf_##type
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(TARGET_DL_ITERATE_PHDR) \
+- && defined(__sun__) && defined(__svr4__)
+-# define USE_PT_GNU_EH_FRAME
++# ifdef __OpenBSD__
++# define ElfW(type) Elf_##typ
++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
++# define ElfW __ElfN
++# endif
+ #endif
+
+ #if defined(USE_PT_GNU_EH_FRAME)
+diff -r 75d9c38318a7 gcc/configure
+--- a/gcc/configure Tue Sep 24 06:52:49 2013 -0400
++++ b/gcc/configure Tue Sep 24 06:54:33 2013 -0400
+@@ -26736,6 +26736,9 @@
+ else
+ gcc_cv_libc_provides_ssp=no
+ case "$target" in
++ *-*-musl*)
++ # All versions of musl provide stack protector
++ gcc_cv_libc_provides_ssp=yes;;
+ *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ # glibc 2.4 and later provides __stack_chk_fail and
+ # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -26769,6 +26772,7 @@
+ # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ # simply assert that glibc does provide this, which is true for all
+ # realistically usable GNU/Hurd configurations.
++ # All supported versions of musl provide it as well
+ gcc_cv_libc_provides_ssp=yes;;
+ *-*-darwin* | *-*-freebsd*)
+ ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
+@@ -26851,6 +26855,9 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
++ *-linux-musl*)
++ gcc_cv_target_dl_iterate_phdr=yes
++ ;;
+ esac
+
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+diff -r 75d9c38318a7 gcc/configure.ac
+--- a/gcc/configure.ac Tue Sep 24 06:52:49 2013 -0400
++++ b/gcc/configure.ac Tue Sep 24 06:54:33 2013 -0400
+@@ -4719,6 +4719,9 @@
+ gcc_cv_libc_provides_ssp,
+ [gcc_cv_libc_provides_ssp=no
+ case "$target" in
++ *-*-musl*)
++ # All versions of musl provide stack protector
++ gcc_cv_libc_provides_ssp=yes;;
+ *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ [# glibc 2.4 and later provides __stack_chk_fail and
+ # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -4752,6 +4755,7 @@
+ # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ # simply assert that glibc does provide this, which is true for all
+ # realistically usable GNU/Hurd configurations.
++ # All supported versions of musl provide it as well
+ gcc_cv_libc_provides_ssp=yes;;
+ *-*-darwin* | *-*-freebsd*)
+ AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
+@@ -4817,6 +4821,9 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
++ *-linux-musl*)
++ gcc_cv_target_dl_iterate_phdr=yes
++ ;;
+ esac
+ GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+# HG changeset patch
+# Parent 94e435662aff38e86c9ca0dff4bbf451e0190b34
+Get rid of ever-broken fixincludes on musl.
+
+
+diff -r 94e435662aff -r e27957848dc8 fixincludes/mkfixinc.sh
+--- a/fixincludes/mkfixinc.sh Sat Jul 27 23:37:20 2013 -0400
++++ b/fixincludes/mkfixinc.sh Sat Jul 27 23:43:03 2013 -0400
+@@ -19,7 +19,8 @@
+ powerpc-*-eabi* | \
+ powerpc-*-rtems* | \
+ powerpcle-*-eabisim* | \
+- powerpcle-*-eabi* )
++ powerpcle-*-eabi* | \
++ *-musl* )
+ # IF there is no include fixing,
+ # THEN create a no-op fixer and exit
+ (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
+# HG changeset patch
+# Parent 65cd23493c45f2a531ca15ffea563d6110143cdd
+New config.sub for GCC versions too early for the update.
+
+
+diff -r 65cd23493c45 -r 355cec477536 config.sub
+--- a/config.sub Tue Aug 27 15:49:27 2013 -0400
++++ b/config.sub Tue Aug 27 15:51:14 2013 -0400
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ # 2011 Free Software Foundation, Inc.
+
+-timestamp='2011-10-29'
++timestamp='2011-03-23'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -125,6 +125,7 @@
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++ linux-musl* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+@@ -251,17 +252,13 @@
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+- | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+- | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+@@ -295,7 +292,7 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+- | rl78 | rx \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -304,7 +301,7 @@
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
++ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
+@@ -361,7 +358,6 @@
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+- | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+@@ -370,10 +366,8 @@
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+- | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+- | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -407,7 +401,7 @@
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+- | rl78-* | romp-* | rs6000-* | rx-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+@@ -415,11 +409,10 @@
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+- | tile*-* \
++ | tile-* | tilegx-* \
+ | tron-* \
+ | ubicom32-* \
+- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+- | vax-* \
++ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+@@ -820,10 +813,6 @@
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+- nacl)
+- basic_machine=le32-unknown
+- os=-nacl
+- ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -1132,8 +1121,13 @@
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+- basic_machine=$basic_machine-unknown
++ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1346,6 +1340,7 @@
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
++ | -linux-musl* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+# HG changeset patch
+# Parent 3ea10cd626cb7abdfd56d3fe8d2c9ed58a82797b
+Support for i386-linux-musl and x86_64-linux-musl.
+
+diff -r 3ea10cd626cb gcc/config/i386/linux.h
+--- a/gcc/config/i386/linux.h Fri Mar 29 16:41:17 2013 -0400
++++ b/gcc/config/i386/linux.h Fri Mar 29 16:41:20 2013 -0400
+@@ -21,3 +21,4 @@
+
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+diff -r 3ea10cd626cb gcc/config/i386/linux64.h
+--- a/gcc/config/i386/linux64.h Fri Mar 29 16:41:17 2013 -0400
++++ b/gcc/config/i386/linux64.h Fri Mar 29 16:41:20 2013 -0400
+@@ -30,3 +30,7 @@
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+diff -r 3ea10cd626cb libitm/config/linux/x86/tls.h
+--- a/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:17 2013 -0400
++++ b/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:20 2013 -0400
+@@ -25,16 +25,19 @@
+ #ifndef LIBITM_X86_TLS_H
+ #define LIBITM_X86_TLS_H 1
+
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ /* Use slots in the TCB head rather than __thread lookups.
+ GLIBC has reserved words 10 through 13 for TM. */
+ #define HAVE_ARCH_GTM_THREAD 1
+ #define HAVE_ARCH_GTM_THREAD_DISP 1
+ #endif
++#endif
+
+ #include "config/generic/tls.h"
+
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ namespace GTM HIDDEN {
+
+ #ifdef __x86_64__
+@@ -101,5 +104,6 @@
+
+ } // namespace GTM
+ #endif /* >= GLIBC 2.10 */
++#endif
+
+ #endif // LIBITM_X86_TLS_H
+Support for arm-linux-musl.
+
+diff -r 8801a3f6d050 gcc/config/arm/linux-eabi.h
+--- a/gcc/config/arm/linux-eabi.h Tue Aug 27 15:47:31 2013 -0400
++++ b/gcc/config/arm/linux-eabi.h Tue Aug 27 15:47:37 2013 -0400
+@@ -64,6 +64,23 @@
+ #undef GLIBC_DYNAMIC_LINKER
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
+
++/* For ARM musl currently supports four dynamic linkers:
++ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
++ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
++ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
++ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
++ musl does not support the legacy OABI mode.
++ All the dynamic linkers live in /lib.
++ We default to soft-float, EL. */
++#undef MUSL_DYNAMIC_LINKER
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
++#endif
++#define MUSL_DYNAMIC_LINKER \
++ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
+ use the GNU/Linux version, not the generic BPABI version. */
+ #undef LINK_SPEC
+diff -r 8801a3f6d050 libitm/config/arm/hwcap.cc
+--- a/libitm/config/arm/hwcap.cc Tue Aug 27 15:47:31 2013 -0400
++++ b/libitm/config/arm/hwcap.cc Tue Aug 27 15:47:37 2013 -0400
+@@ -40,7 +40,11 @@
+
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+
+ static void __attribute__((constructor))
+# HG changeset patch
+# Parent 4618ad6f036f1e944a5262ae5875dcdf62c41f8b
+Support for mips-linux-musl.
+
+diff -r 4618ad6f036f gcc/config/mips/linux.h
+--- a/gcc/config/mips/linux.h Thu Sep 19 08:56:47 2013 -0400
++++ b/gcc/config/mips/linux.h Thu Sep 19 09:08:11 2013 -0400
+@@ -18,3 +18,10 @@
+ <http://www.gnu.org/licenses/>. */
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
+# HG changeset patch
+# Parent 2ffe76b215fdb082cbbc262536077627757fa9bf
+Support for powerpc-linux-musl.
+
+diff -r 2ffe76b215fd gcc/config.gcc
+--- a/gcc/config.gcc Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config.gcc Fri Mar 29 16:41:28 2013 -0400
+@@ -2112,6 +2112,10 @@
+ powerpc*-*-linux*paired*)
+ tm_file="${tm_file} rs6000/750cl.h" ;;
+ esac
++ case ${target} in
++ *-linux*-musl*)
++ enable_secureplt=yes ;;
++ esac
+ if test x${enable_secureplt} = xyes; then
+ tm_file="rs6000/secureplt.h ${tm_file}"
+ fi
+diff -r 2ffe76b215fd gcc/config/rs6000/linux64.h
+--- a/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:28 2013 -0400
+@@ -364,17 +364,21 @@
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER32 \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+
+
+ #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
+diff -r 2ffe76b215fd gcc/config/rs6000/secureplt.h
+--- a/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:28 2013 -0400
+@@ -18,3 +18,4 @@
+ <http://www.gnu.org/licenses/>. */
+
+ #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
+diff -r 2ffe76b215fd gcc/config/rs6000/sysv4.h
+--- a/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:28 2013 -0400
+@@ -551,6 +551,9 @@
+ #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
+ #define CC1_SECURE_PLT_DEFAULT_SPEC ""
+ #endif
++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
++#define LINK_SECURE_PLT_DEFAULT_SPEC ""
++#endif
+
+ /* Pass -G xxx to the compiler and set correct endian mode. */
+ #define CC1_SPEC "%{G*} %(cc1_cpu) \
+@@ -611,7 +614,8 @@
+ %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
+ %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
+ %{mcall-i960-old: --oformat elf32-powerpcle} \
+- }}}}"
++ }}}} \
++%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
+
+ /* Any specific OS flags. */
+ #define LINK_OS_SPEC "\
+@@ -789,15 +793,18 @@
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+@@ -923,6 +930,7 @@
+ { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \
+ { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \
+ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
+ { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
+ { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
+ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
new file mode 100644
index 0000000000..266a721c48
--- /dev/null
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -0,0 +1,235 @@
+# Template build file for 'cross-x86_64-linux-musl'
+#
+_binutils_version=2.24
+_gcc_version=4.7.3
+_musl_version=0.9.15
+_linux_version=3.10.6
+
+_triplet=x86_64-linux-musl
+_sysroot="/usr/${_triplet}"
+
+pkgname=cross-${_triplet}
+version=0.3
+revision=1
+short_desc="Cross toolchain for the ${_triplet} target"
+maintainer="Juan RP <xtraeme@gmail.org>"
+homepage="http://www.voidlinux.eu"
+license="Public Domain"
+distfiles="
+ http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2
+ http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2
+ http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz
+ http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
+checksum="
+ e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
+ 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
+ ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf
+ 4a7baab8f295511196dee48d33b8b82a159a81233facb89433707c792033cbe7"
+
+create_wrksrc=yes
+hostmakedepends="perl flex"
+makedepends="libfl-devel zlib-devel gmp-devel mpfr-devel libmpc-devel"
+nostrip_files="libgcc.a libgcov.a libgcc_eh.a"
+depends="${pkgname}-libc-${version}_${revision}"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ # No need to build a cross compiler if we are running x86_64-musl.
+ msg_normal "${pkgname}-${version}: cannot be built on $XBPS_TARGET_MACHINE\n"
+ exit 0
+fi
+_apply_patch() {
+ local pname="$(basename $1)"
+
+ if [ ! -f ".${pname}_done" ]; then
+ patch -Np1 -i ${1}
+ touch .${pname}_done
+ fi
+}
+
+_binutils_build() {
+ [ -f ${wrksrc}/.binutils_build_done ] && return 0
+
+ cd ${wrksrc}
+ msg_normal "Building cross binutils bootstrap\n"
+
+ [ ! -d binutils-build ] && mkdir binutils-build
+ cd binutils-build
+
+ ../binutils-${_binutils_version}/configure \
+ --prefix=/usr --target=${_triplet} --with-sysroot=${_sysroot} \
+ --disable-nls --disable-multilib --disable-werror \
+ --disable-shared ${_fpuflags}
+
+ make configure-host
+ make ${makejobs}
+ make install
+
+ touch ${wrksrc}/.binutils_build_done
+}
+
+_gcc_bootstrap() {
+ [ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
+
+ cd ${wrksrc}/gcc-${_gcc_version}
+ _apply_patch ${FILESDIR}/gcc-${_gcc_version}-musl.diff
+
+ msg_normal "Building cross gcc bootstrap\n"
+
+ [ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
+ cd ../gcc-bootstrap
+
+ ../gcc-${_gcc_version}/configure --prefix=/usr \
+ --target=${_triplet} --with-sysroot=${_sysroot} --with-newlib \
+ --disable-nls --disable-shared --disable-multilib \
+ --disable-decimal-float --disable-libgomp --disable-libmudflap \
+ --disable-libquadmath --disable-libssp --disable-threads \
+ --enable-languages=c ${_fpuflags}
+
+ make ${makejobs}
+ make install
+
+ touch ${wrksrc}/.gcc_bootstrap_done
+}
+
+_linux_headers() {
+ [ -f ${wrksrc}/.linux_build_done ] && return 0
+
+ cd ${wrksrc}
+ msg_normal "Building Linux API headers\n"
+
+ cd linux-${_linux_version}
+
+ make ARCH=x86 headers_check
+ make ARCH=x86 INSTALL_HDR_PATH=${_sysroot}/usr headers_install
+
+ touch ${wrksrc}/.linux_build_done
+}
+
+_musl_build() {
+ [ -f ${wrksrc}/.musl_build_done ] && return 0
+
+ cd ${wrksrc}/musl-${_musl_version}
+ msg_normal "Building cross musl libc\n"
+
+ CC="${_triplet}-gcc" CFLAGS="-Os -pipe ${_archflags}" \
+ ./configure --prefix=/usr \
+
+ make ${makejobs}
+ make DESTDIR=${_sysroot} install
+
+ touch ${wrksrc}/.musl_build_done
+}
+
+_gcc_build() {
+ [ -f ${wrksrc}/.gcc_build_done ] && return 0
+
+ cd ${wrksrc}
+ msg_normal "Building cross gcc final\n"
+
+ [ ! -d gcc-build ] && mkdir gcc-build
+ cd gcc-build
+
+ ../gcc-${_gcc_version}/configure \
+ --target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \
+ --enable-languages=c,c++,lto --enable-lto \
+ --disable-multilib --disable-nls --disable-libquadmath \
+ --disable-libmudflap --enable-c99 --enable-shared \
+ --enable-long-long --enable-threads=posix \
+ --disable-libssp --disable-libstdcxx-pch ${_fpuflags}
+
+ make ${makejobs}
+
+ touch ${wrksrc}/.gcc_build_done
+}
+
+do_build() {
+ # Ensure we use sane environment
+ unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM
+ unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+ export CFLAGS="-Os -pipe" CXXFLAGS="-Os -pipe"
+
+ for f in include lib libexec bin sbin; do
+ if [ ! -d ${_sysroot}/usr/${f} ]; then
+ mkdir -p ${_sysroot}/usr/${f}
+ fi
+ if [ ! -h ${_sysroot}/${f} ]; then
+ ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
+ fi
+ done
+
+ _binutils_build
+ _gcc_bootstrap
+ _linux_headers
+ _musl_build
+ _gcc_build
+}
+
+do_install() {
+ for f in include lib libexec bin sbin; do
+ if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then
+ mkdir -p ${DESTDIR}/${_sysroot}/usr/${f}
+ fi
+ if [ ! -h ${DESTDIR}/${_sysroot}/${f} ]; then
+ ln -sfr ${DESTDIR}/${_sysroot}/usr/${f} \
+ ${DESTDIR}/${_sysroot}/${f}
+ fi
+ done
+
+ # install cross binutils
+ cd ${wrksrc}/binutils-build
+ make DESTDIR=${DESTDIR} install
+
+ # install cross gcc
+ cd ${wrksrc}/gcc-build
+ make DESTDIR=${DESTDIR} install
+
+ # install musl libc for target
+ cd ${wrksrc}/musl-${_musl_version}
+ make DESTDIR=${DESTDIR}/${_sysroot} install
+
+ # Remove useless headers.
+ rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \
+ ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h
+
+ # Make ld-musl-x86_64.so.1 symlink relative to cwd.
+ cd ${DESTDIR}/${_sysroot}/usr/lib
+ ln -sf libc.so ld-musl-x86_64.so.1
+
+ # install linux API headers for x86
+ cd ${wrksrc}/linux-${_linux_version}
+ make ARCH=x86 INSTALL_HDR_PATH=${DESTDIR}/${_sysroot}/usr headers_install
+ rm -f $(find ${DESTDIR}/${_sysroot}/usr/include -name .install -or -name ..install.cmd)
+ rm -rf ${DESTDIR}/${_sysroot}/usr/include/drm
+
+ # Move files to /usr/lib (lib64).
+ if [ -d ${DESTDIR}/${_sysroot}/usr/lib64 ]; then
+ mv ${DESTDIR}/${_sysroot}/usr/lib64/* ${DESTDIR}/${_sysroot}/usr/lib/
+ rmdir ${DESTDIR}/${_sysroot}/usr/lib64
+ fi
+ # Remove unnecessary stuff
+ rm -f ${DESTDIR}/usr/lib*/libiberty.a
+ rm -rf ${DESTDIR}/usr/share
+ rm -rf ${DESTDIR}/${_sysroot}/{etc,var}
+ rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
+ rm -f ${DESTDIR}/${_sysroot}/libexec
+ rm -f ${DESTDIR}/${_sysroot}/lib/*.py
+}
+
+do_clean() {
+ # Remove temporary stuff from masterdir
+ rm -rf ${_sysroot}
+ rm -f /usr/bin/${_triplet}*
+ rm -rf /usr/lib/gcc/${_triplet}
+ rm -rf /usr/libexec/gcc/${_triplet}
+}
+
+cross-x86_64-linux-musl-libc_package() {
+ short_desc+=" - libc files"
+ noarch=yes
+ noverifydeps=yes
+ pkg_install() {
+ vmove usr/${_triplet}
+ mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
+ mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin ${DESTDIR}/usr/${_triplet}/usr
+ }
+}
diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index d4f1587b20..ec500d90b1 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -37,9 +37,3 @@ crypto++-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-crypto++_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index e346362891..f0ac2ed466 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -36,9 +36,3 @@ cryptsetup-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-cryptsetup_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ctags/template b/srcpkgs/ctags/template
new file mode 100644
index 0000000000..af944e18a2
--- /dev/null
+++ b/srcpkgs/ctags/template
@@ -0,0 +1,15 @@
+# Template file for 'ctags'
+pkgname=ctags
+version=5.8
+revision=2
+build_style=gnu-configure
+short_desc="Generates an index file of language objects found in source files"
+maintainer="Jan S. <jan.schreib@gmail.com>"
+license="GPL-3"
+homepage="http://ctags.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/ctags/${version}/ctags-${version}.tar.gz"
+checksum=0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7
+
+do_install() {
+ make prefix=${DESTDIR}/usr mandir=${DESTDIR}/usr/share/man install
+}
diff --git a/srcpkgs/cubieboard2-base/INSTALL b/srcpkgs/cubieboard2-base/INSTALL
new file mode 100644
index 0000000000..5cf298084d
--- /dev/null
+++ b/srcpkgs/cubieboard2-base/INSTALL
@@ -0,0 +1,6 @@
+case "$ACTION" in
+post)
+ # enable sshd, ntpdate, ntpd and dhcpcd services.
+ systemctl enable sshd.service ntpdate.service ntpd.service dhcpcd.service
+ ;;
+esac
diff --git a/srcpkgs/cubieboard2-base/template b/srcpkgs/cubieboard2-base/template
new file mode 100644
index 0000000000..b4c4fe0fc7
--- /dev/null
+++ b/srcpkgs/cubieboard2-base/template
@@ -0,0 +1,22 @@
+# Template file for 'cubieboard2-base'
+pkgname=cubieboard2-base
+version=1.4
+revision=1
+build_style=meta
+homepage="http://www.voidlinux.eu"
+short_desc="Void Linux Cubieboard2 platform package"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="Public Domain"
+
+only_for_archs="armv7l"
+makedepends="ntp?ntp-daemon dhcpcd openssh-server cubieboard2-uboot cubieboard2-kernel"
+depends="${makedepends}"
+
+do_install() {
+ # Load the sunxi-emac module by default.
+ vmkdir usr/lib/modules-load.d
+ echo sunxi-emac > ${DESTDIR}/usr/lib/modules-load.d/cubieboard2.conf
+ # Set proper perms to some devices.
+ vmkdir usr/lib/udev/rules.d
+ echo 'KERNEL=="disp|cedar_dev|mali|ump", MODE="0660", GROUP="video"' > ${DESTDIR}/usr/lib/udev/rules.d/50-cubieboard.rules
+}
diff --git a/srcpkgs/cubieboard2-kernel-headers b/srcpkgs/cubieboard2-kernel-headers
new file mode 120000
index 0000000000..220183916a
--- /dev/null
+++ b/srcpkgs/cubieboard2-kernel-headers
@@ -0,0 +1 @@
+cubieboard2-kernel
\ No newline at end of file
diff --git a/srcpkgs/cubieboard2-kernel/files/config b/srcpkgs/cubieboard2-kernel/files/config
new file mode 100644
index 0000000000..7ee6131bc2
--- /dev/null
+++ b/srcpkgs/cubieboard2-kernel/files/config
@@ -0,0 +1,3668 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 3.4.75 Kernel Configuration
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_LOCKBREAK=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_NEED_MACH_IO_H=y
+CONFIG_NEED_MACH_MEMORY_H=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_FHANDLE=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_BOOST is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=16
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
+CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+# CONFIG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_EMBEDDED=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_PERF_COUNTERS is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_JUMP_LABEL=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_SUNXI_NAND_PARTITION=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_READ_UNLOCK is not set
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+# CONFIG_INLINE_WRITE_UNLOCK is not set
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCMRING is not set
+# CONFIG_ARCH_HIGHBANK is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_PRIMA2 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_SUN4I is not set
+# CONFIG_ARCH_SUN5I is not set
+CONFIG_ARCH_SUN7I=y
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_VT8500 is not set
+# CONFIG_ARCH_ZYNQ is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+
+#
+# System MMU
+#
+
+#
+# Allwinner's sunxi options
+#
+CONFIG_SW_DEBUG_UART=0
+CONFIG_SUNXI_MULTIPLATFORM=y
+CONFIG_SUNXI_MALI_RESERVED_MEM=y
+CONFIG_SUNXI_SCALING_MIN=60
+CONFIG_PLAT_SUNXI=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_LPAE is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_SWP_EMULATE=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+# CONFIG_CACHE_L2X0 is not set
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARCH_HAS_BARRIERS=y
+CONFIG_ARM_NR_BANKS=8
+CONFIG_CPU_HAS_PMU=y
+CONFIG_MULTI_IRQ_HANDLER=y
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
+CONFIG_ARM_GIC=y
+# CONFIG_FIQ_DEBUGGER is not set
+
+#
+# Bus support
+#
+CONFIG_ARM_AMBA=y
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_HAVE_SMP=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_HAVE_ARM_TWD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_NR_CPUS=2
+CONFIG_HOTPLUG_CPU=y
+CONFIG_LOCAL_TIMERS=y
+CONFIG_ARCH_NR_GPIO=0
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_HZ=100
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_COMPACTION is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_CLEANCACHE is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_SECCOMP is not set
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
+
+#
+# Boot options
+#
+# CONFIG_USE_OF is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="earlyprintk=ttyS0,115200 loglevel=9 initcall_debug=1 console=ttyS0,115200 ramfs"
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_EXTEND is not set
+# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_AUTO_ZRELADDR is not set
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_FANTASY is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_FANTASY=y
+CONFIG_CPU_FREQ_USR_EVNT_NOTIFY=y
+CONFIG_CPU_FREQ_DVFS=y
+
+#
+# ARM CPU frequency scaling drivers
+#
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
+# CONFIG_CPU_IDLE is not set
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_AOUT=y
+CONFIG_BINFMT_MISC=y
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HAS_WAKELOCK=y
+CONFIG_WAKELOCK=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+# CONFIG_PM_RUNTIME is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_APM_EMULATION is not set
+CONFIG_PM_CLK=y
+CONFIG_CPU_PM=y
+# CONFIG_SUSPEND_TIME is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+# CONFIG_UNIX_DIAG is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_IPCOMP=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
+# CONFIG_NET_ACTIVITY_STATS is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=y
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=y
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=y
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA2=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_REJECT_SKERR=y
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_L2TP=m
+# CONFIG_L2TP_DEBUGFS is not set
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_NET_DSA=m
+# CONFIG_NET_DSA_TAG_DSA is not set
+# CONFIG_NET_DSA_TAG_EDSA is not set
+# CONFIG_NET_DSA_TAG_TRAILER is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+# CONFIG_NETPRIO_CGROUP is not set
+CONFIG_BQL=y
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_BPF_JIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+CONFIG_NL80211_TESTMODE=y
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=y
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_CFG80211_ALLOW_RECONNECT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+# CONFIG_MAC80211_RC_PID is not set
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_PM=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
+CONFIG_RFKILL_GPIO=m
+CONFIG_SUNXI_RFKILL=y
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_SYNC=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# CONFIG_MTD_NAND_IDS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MG_DISK is not set
+# CONFIG_BLK_DEV_RBD is not set
+CONFIG_SUNXI_NAND=y
+CONFIG_SUNXI_NAND_COMPAT_DEV=y
+# CONFIG_SUNXI_NAND_TEST is not set
+
+#
+# Misc devices
+#
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_AD525X_DPOT is not set
+CONFIG_SUN4I_VIBRATOR=m
+CONFIG_SUN4I_GPIO_UGLY=m
+CONFIG_SUNXI_DBGREG=y
+# CONFIG_ATMEL_PWM is not set
+CONFIG_SUNXI_PWM=y
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_SENSORS_AK8975 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_UID_STAT is not set
+# CONFIG_BMP085 is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_WL127X_RFKILL is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+# CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_SW_SATA_AHCI_PLATFORM=y
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+# CONFIG_SATA_MV is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_PLATFORM is not set
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MULTICORE_RAID456 is not set
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_SPACE_MAPS is not set
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+# CONFIG_DM_LOG_USERSPACE is not set
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+# CONFIG_DM_UEVENT is not set
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+# CONFIG_BONDING is not set
+# CONFIG_DUMMY is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_MII=y
+# CONFIG_NET_TEAM is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+CONFIG_CS89x0_PLATFORM=y
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_ETHOC is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_SUNXI_EMAC=m
+CONFIG_SUNXI_GMAC=m
+CONFIG_GMAC_SCRIPT_SYS=y
+CONFIG_GMAC_CLK_SYS=y
+CONFIG_GMAC_RING=y
+# CONFIG_GMAC_CHAINED is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_AMD_PHY=m
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPPOLAC=m
+CONFIG_PPPOPNS=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_QF9700=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_WLAN=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AT76C50X_USB=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_WIFI_CONTROL_FUNC=y
+CONFIG_ATH_COMMON=m
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_ATH9K is not set
+# CONFIG_ATH9K_HTC is not set
+# CONFIG_CARL9170 is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+CONFIG_BCMDHD=m
+CONFIG_BCM4339=m
+CONFIG_BCMDHD_FW_PATH="/system/vendor/modules/fw_bcmxxxx.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/system/vendor/modules/nvram_apxxxx.txt"
+# CONFIG_DHD_USE_STATIC_BUF is not set
+# CONFIG_DHD_USE_SCHED_SCAN is not set
+# CONFIG_BRCMFMAC is not set
+CONFIG_BCM4330=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+# CONFIG_IWM is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_SDIO is not set
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX_MENU is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_RTL8192CU_SW=m
+CONFIG_RTL8188EU=m
+# CONFIG_RTL8189ES is not set
+# CONFIG_RTL8723AS is not set
+CONFIG_RTXX7X_SW=m
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=y
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_KEYRESET is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_SUN4IKEYPAD=m
+CONFIG_KEYBOARD_SUN4I_KEYBOARD=m
+# CONFIG_KEYBOARD_SUN4I_KEYBOARD_FEX is not set
+CONFIG_KEYBOARD_HV2605_KEYBOARD=m
+CONFIG_IR_SUNXI=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_SERIAL=y
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_MOUSE_SYNAPTICS_I2C is not set
+CONFIG_MOUSE_SYNAPTICS_USB=m
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_AMBAKMI is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_GSENSOR is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=16
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+CONFIG_DEVMEM=y
+CONFIG_DEVKMEM=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_SUNXI=y
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=1
+CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+# CONFIG_SERIAL_8250_SHARE_IRQ is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_RSA is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_AMBA_PL010 is not set
+# CONFIG_SERIAL_AMBA_PL011 is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_DCC_TTY is not set
+# CONFIG_RAMOOPS is not set
+CONFIG_SUNXI_G2D=m
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_SIMTEC is not set
+CONFIG_I2C_SUNXI=m
+# CONFIG_SUNXI_IIC_PRINT_TRANSFER_INFO is not set
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+CONFIG_I2C_TINY_USB=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=y
+
+#
+# Memory mapped GPIO drivers:
+#
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_PL061 is not set
+CONFIG_GPIO_SUNXI=m
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_ADP5588 is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
+
+#
+# AC97 GPIO expanders:
+#
+
+#
+# MODULbus GPIO expanders:
+#
+CONFIG_W1=y
+CONFIG_W1_SUNXI=m
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_DS2490=m
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_GPIO is not set
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+# CONFIG_W1_SLAVE_SMEM is not set
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2423=m
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+CONFIG_W1_SLAVE_DS2781=m
+# CONFIG_W1_SLAVE_BQ27000 is not set
+CONFIG_POWER_SUPPLY=y
+CONFIG_AW_AXP=y
+# CONFIG_AW_AXP18 is not set
+# CONFIG_AW_AXP19 is not set
+CONFIG_AW_AXP20=y
+CONFIG_AXP_CHARGEINIT=y
+CONFIG_AXP_CHGCHANGE=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_AXP152=y
+# CONFIG_PDA_POWER is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2780 is not set
+CONFIG_BATTERY_DS2781=m
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_MANAGER is not set
+CONFIG_CHARGER_SMB347=m
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_MMA7660=m
+# CONFIG_SENSORS_AD7314 is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7411 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_LINEAGE is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM73 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4151 is not set
+# CONFIG_SENSORS_LTC4215 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_LM95241 is not set
+# CONFIG_SENSORS_LM95245 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX16065 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX1668 is not set
+# CONFIG_SENSORS_MAX6639 is not set
+# CONFIG_SENSORS_MAX6642 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+CONFIG_SENSORS_MCP3021=m
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
+# CONFIG_SENSORS_SMM665 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_EMC1403 is not set
+# CONFIG_SENSORS_EMC2103 is not set
+# CONFIG_SENSORS_EMC6W201 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_ADS1015 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADS7871 is not set
+# CONFIG_SENSORS_AMC6821 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TMP102 is not set
+# CONFIG_SENSORS_TMP401 is not set
+# CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_CORE is not set
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ARM_SP805_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_MPCORE_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_TWL4030_CORE is not set
+CONFIG_TWL6040_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_S5M_CORE is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13XXX is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_WL1273_CORE is not set
+CONFIG_MFD_TPS65090=y
+# CONFIG_MFD_AAT2870_CORE is not set
+CONFIG_MFD_RC5T583=y
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+CONFIG_REGULATOR_TPS62360=m
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_REGULATOR_TPS65217=m
+# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_MEDIA_SUPPORT=y
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_RC_CORE=y
+CONFIG_LIRC=y
+CONFIG_RC_MAP=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Encoders, decoders, sensors and other helper chips
+#
+
+#
+# Audio decoders, processors and mixers
+#
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+CONFIG_VIDEO_MSP3400=m
+# CONFIG_VIDEO_CS5345 is not set
+CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_WM8775=m
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+
+#
+# RDS decoders
+#
+# CONFIG_VIDEO_SAA6588 is not set
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7180 is not set
+CONFIG_VIDEO_ADV7183=m
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+# CONFIG_VIDEO_SAA717X is not set
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_AK881X is not set
+
+#
+# Camera sensor devices
+#
+# CONFIG_VIDEO_OV7670 is not set
+CONFIG_VIDEO_VS6624=m
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_AS3645A is not set
+
+#
+# Video improvement chips
+#
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+
+#
+# Miscelaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_VIVI is not set
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=y
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_USB_ET61X251=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+CONFIG_VIDEO_SUNXI_CEDAR=m
+CONFIG_VIDEO_DECODER_SUNXI=m
+CONFIG_VIDEO_AVS_COUNTER=m
+CONFIG_VIDEO_CSI_SUN4I=y
+CONFIG_CSI_DEV_SEL=m
+CONFIG_CSI0_SUN4I=m
+CONFIG_CSI1_SUN4I=m
+CONFIG_CSI_OV7670=m
+CONFIG_CSI_GT2005=m
+CONFIG_CSI_GC0308=m
+CONFIG_CSI_HI704=m
+CONFIG_CSI_SP0838=m
+CONFIG_CSI_MT9M112=m
+CONFIG_CSI_MT9M113=m
+CONFIG_CSI_OV2655=m
+CONFIG_CSI_HI253=m
+CONFIG_CSI_MT9D112=m
+CONFIG_CSI_GC0307=m
+CONFIG_CSI_OV5640=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+# CONFIG_I2C_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+# CONFIG_I2C_SI4713 is not set
+# CONFIG_RADIO_SI4713 is not set
+CONFIG_USB_KEENE=m
+# CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_SAA7706H is not set
+# CONFIG_RADIO_TEF6862 is not set
+# CONFIG_RADIO_WL1273 is not set
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+CONFIG_AUDIO_ENGINE=m
+CONFIG_ACE_CONFIG=m
+# CONFIG_PA_CONTROL is not set
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+# CONFIG_TTPCI_EEPROM is not set
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+# CONFIG_DVB_USB_PCTV452E is not set
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_SMS_SIANO_MDTV=m
+
+#
+# Siano module components
+#
+CONFIG_SMS_USB_DRV=m
+# CONFIG_SMS_SDIO_DRV is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported DVB Frontends
+#
+CONFIG_DVB_FE_CUSTOMISE=y
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_HD29L2=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_DRM=y
+CONFIG_DRM_USB=m
+CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_MALI=m
+CONFIG_DRM_UDL=m
+# CONFIG_ION is not set
+CONFIG_MALI=m
+CONFIG_MALI400=m
+# CONFIG_MALI400_DEBUG is not set
+# CONFIG_MALI400_GPU_UTILIZATION is not set
+CONFIG_UMP=m
+# CONFIG_UMP_DEBUG is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_SUNXI=y
+CONFIG_FB_SUNXI_RESERVED_MEM=y
+CONFIG_FB_SUNXI_UMP=y
+CONFIG_FB_SUNXI_LCD=y
+CONFIG_FB_SUNXI_HDMI=y
+CONFIG_HDMI_CEC=m
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_TMIO=m
+CONFIG_FB_TMIO_ACCELL=y
+# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_UDL=m
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_PLATFORM is not set
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_LP855X=m
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_RAWMIDI_SEQ=m
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_ARM=y
+# CONFIG_SND_ARMAACI is not set
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_SOC=y
+CONFIG_SOUND_SUNXI=y
+CONFIG_SND_SUNXI_SOC_CODEC=y
+CONFIG_SND_SUNXI_SOC_HDMIAUDIO=y
+CONFIG_SND_SUNXI_SOC_SPDIF=m
+CONFIG_SND_SOC_I2C_AND_SPI=y
+# CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_BATTERY_STRENGTH is not set
+CONFIG_HIDRAW=y
+# CONFIG_UHID is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+# CONFIG_HID_ELECOM is not set
+CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+# CONFIG_HID_MAGICMOUSE is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+# CONFIG_HID_PICOLCD_BACKLIGHT is not set
+# CONFIG_HID_PICOLCD_LCD is not set
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB_ARCH_HAS_XHCI is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_U132_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_SUNXI_EHCI=y
+CONFIG_USB_SUNXI_OHCI=y
+CONFIG_USB_SUNXI_COMMON=y
+CONFIG_USB_SW_SUNXI_HCD0=y
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+# CONFIG_USB_PRINTER is not set
+CONFIG_USB_WDM=m
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_LIBUSUAL=y
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=y
+# CONFIG_USB_SERIAL_CONSOLE is not set
+# CONFIG_USB_EZUSB is not set
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+CONFIG_USB_SERIAL_CP210X=m
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+CONFIG_USB_SERIAL_METRO=m
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MOTOROLA is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+CONFIG_USB_SERIAL_WWAN=y
+CONFIG_USB_SERIAL_OPTION=y
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_TEST is not set
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_FUSB300=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_M66592=m
+CONFIG_USB_NET2272=m
+# CONFIG_USB_NET2272_DMA is not set
+CONFIG_USB_SW_SUNXI_UDC0_SELECT=m
+CONFIG_USB_DUMMY_HCD=m
+CONFIG_USB_SW_SUNXI_UDC0=y
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_GADGET_SUPERSPEED=y
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_ACM_MS=m
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+# CONFIG_USB_G_DBGP is not set
+CONFIG_USB_G_WEBCAM=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_OTG_WAKELOCK is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_USB_SW_SUNXI_USB=y
+CONFIG_USB_SW_SUNXI_USB_MANAGER=y
+# CONFIG_USB_SW_SUNXI_USB0_HOST_ONLY is not set
+CONFIG_USB_SW_SUNXI_USB0_OTG=y
+# CONFIG_USB_SW_SUNXI_USB0_DEVICE_ONLY is not set
+# CONFIG_USB_SW_SUNXI_USB0_NULL is not set
+CONFIG_USB_SW_SUNXI_USB_DEBUG=m
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_EMBEDDED_SDIO is not set
+CONFIG_MMC_PARANOID_SD_INIT=y
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=16
+# CONFIG_MMC_BLOCK_BOUNCE is not set
+# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_DW is not set
+CONFIG_MMC_SUNXI_NEW=y
+# CONFIG_MMC_DEBUG_SUNXI is not set
+CONFIG_MMC_PRE_DBGLVL_SUNXI=3
+# CONFIG_MMC_VUB300 is not set
+# CONFIG_MMC_USHC is not set
+
+#
+# MMC/SD/SDIO Card Power Management Drivers
+#
+CONFIG_MMC_SUNXI_POWER_CONTROL=y
+
+#
+# SUNXI MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_SUNXI=y
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_PCA955X is not set
+CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_OT200 is not set
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_SWITCH=m
+CONFIG_SWITCH_GPIO=m
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+CONFIG_RTC_DRV_SUN4I=m
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+
+#
+# Virtio drivers
+#
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_MMIO is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_STAGING=y
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+# CONFIG_W35UND is not set
+CONFIG_PRISM2_USB=m
+# CONFIG_ECHO is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_R8712U is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_IIO is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+CONFIG_STAGING_MEDIA=y
+# CONFIG_DVB_AS102 is not set
+# CONFIG_EASYCAP is not set
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+CONFIG_ANDROID=y
+# CONFIG_ANDROID_BINDER_IPC is not set
+# CONFIG_ASHMEM is not set
+# CONFIG_ANDROID_LOGGER is not set
+# CONFIG_ANDROID_RAM_CONSOLE is not set
+# CONFIG_PERSISTENT_TRACER is not set
+CONFIG_ANDROID_TIMED_OUTPUT=y
+# CONFIG_ANDROID_TIMED_GPIO is not set
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+CONFIG_ANDROID_SWITCH=y
+CONFIG_ANDROID_SWITCH_GPIO=y
+# CONFIG_ANDROID_INTF_ALARM_DEV is not set
+# CONFIG_PHONE is not set
+CONFIG_USB_WPAN_HCD=m
+CONFIG_CLKDEV_LOOKUP=y
+
+#
+# Hardware Spinlock drivers
+#
+# CONFIG_IOMMU_SUPPORT is not set
+
+#
+# Remoteproc drivers (EXPERIMENTAL)
+#
+
+#
+# Rpmsg drivers (EXPERIMENTAL)
+#
+# CONFIG_VIRT_DRIVERS is not set
+# CONFIG_PM_DEVFREQ is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+CONFIG_QFMT_V1=y
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=y
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=y
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_UBIFS_FS is not set
+# CONFIG_LOGFS is not set
+CONFIG_CRAMFS=y
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=y
+CONFIG_PNFS_BLOCK=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_ROOT_NFS=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_FAULT_INJECTION=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_BACKCHANNEL=y
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_CIFS_ACL=y
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+CONFIG_NLS_CODEPAGE_936=y
+CONFIG_NLS_CODEPAGE_950=y
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=6
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR_NMI is not set
+# CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_VM=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_DEBUG_LIST=y
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_VERBOSE=y
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_LKDTM is not set
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_DEBUG_PAGEALLOC=y
+CONFIG_WANT_PAGE_DEBUG_FLAGS=y
+CONFIG_PAGE_POISONING=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING_SUPPORT=y
+# CONFIG_FTRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_ARM_UNWIND=y
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_RODATA is not set
+CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_LL_UART_NONE=y
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_SEMIHOSTING is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_OC_ETM is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_USER is not set
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZLIB=y
+CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=y
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+# CONFIG_CRC8 is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_AVERAGE=y
+# CONFIG_CORDIC is not set
diff --git a/srcpkgs/cubieboard2-kernel/template b/srcpkgs/cubieboard2-kernel/template
new file mode 100644
index 0000000000..50a492ee67
--- /dev/null
+++ b/srcpkgs/cubieboard2-kernel/template
@@ -0,0 +1,172 @@
+# Template file for 'cubieboard2-kernel'
+#
+# Latest commit as of 20140126
+_githash="9cfbbed3b2b098774b04553843d2f4092b8f7fe8"
+_gitshort="${_githash:0:7}"
+
+pkgname=cubieboard2-kernel
+version=3.4.75
+revision=4
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.kernel.org"
+license="GPL-2"
+short_desc="The Linux kernel and modules for the Cubieboard2 (${version%.*} series [git ${_gitshort}])"
+distfiles="https://github.com/linux-sunxi/linux-sunxi/archive/${_githash}.tar.gz"
+checksum=c9dc6689a9152f3a60459896926183cc5d04428c1a6ed44c20b3e342771b0dc1
+
+wrksrc="linux-sunxi-${_githash}"
+_kernver="${version}_${revision}"
+
+create_srcdir=yes
+nostrip=yes
+noverifyrdeps=yes
+only_for_archs="armv7l"
+hostmakedepends="perl python kmod>=11_2 uboot-mkimage openssl which elfutils bc"
+makedepends="ncurses-devel"
+depends="kmod>=11_2"
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+ fi
+
+ unset LDFLAGS
+ if [ -f ${FILESDIR}/config ]; then
+ cp ${FILESDIR}/config .config
+ make ${makejobs} ${_args} ARCH=arm oldconfig
+ else
+ # Use upstream default configuration, too huge!
+ make ${makejobs} ${_args} ARCH=arm sun7i_defconfig
+ fi
+
+ # Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+ sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+
+ # Enable Autofs for systemd
+ sed -i -e "s|.*CONFIG_AUTOFS4_FS.*|CONFIG_AUTOFS4_FS=y|" .config
+}
+
+do_build() {
+ if [ "$CROSS_BUILD" ]; then
+ _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+ fi
+ unset LDFLAGS
+ make ${makejobs} ${_args} ARCH=arm prepare
+ make ${makejobs} ${_args} ARCH=arm uImage modules
+}
+
+do_install() {
+ local hdrdest
+
+ # Run depmod after compressing modules.
+ sed -i '2iexit 0' scripts/depmod.sh
+
+ # Install kernel, firmware and modules
+ make ARCH=arm INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+ vinstall arch/arm/boot/uImage 644 boot
+
+ hdrdest=${DESTDIR}/usr/src/${sourcepkg}-kernel-headers-${_kernver}
+
+ # Switch to /usr.
+ vmkdir usr
+ mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+ cd ${DESTDIR}/usr/lib/modules/${_kernver}
+ rm -f source build
+ ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
+
+ cd ${wrksrc}
+
+ # Remove firmware stuff provided by the "linux-firmware" pkg.
+ rm -rf ${DESTDIR}/usr/lib/firmware
+
+ mkdir -p ${hdrdest}/include
+ for i in acpi asm-generic config crypto drm generated linux math-emu \
+ media net pcmcia scsi sound trace video xen; do
+ [ -d include/$i ] && cp -a include/$i ${hdrdest}/include
+ done
+
+ cd ${wrksrc}
+ # Copy files necessary for later builds.
+ cp Module.symvers ${hdrdest}
+ cp -a scripts ${hdrdest}
+
+ # fix permissions on scripts dir
+ chmod og-w -R ${hdrdest}/scripts
+
+ # copy arch includes for external modules
+ mkdir -p ${hdrdest}/arch/arm/mach-exynos
+ mkdir -p ${hdrdest}/arch/arm/plat-samsung
+
+ cp -a arch/arm/include ${hdrdest}/arch/arm
+ cp -a arch/arm/mach-sun7i/include ${hdrdest}/arch/arm/mach-sun7i
+
+ mkdir -p ${hdrdest}/arch/arm/kernel
+
+ cp arch/arm/Makefile ${hdrdest}/arch/arm
+ if [ "$MACHINE_ARCH" = "i686" ]; then
+ cp arch/arm/Makefile_32.cpu ${hdrdest}/arch/arm
+ fi
+ cp arch/arm/kernel/asm-offsets.s ${hdrdest}/arch/arm/kernel
+
+ # Add docbook makefile
+ install -Dm644 Documentation/DocBook/Makefile \
+ ${hdrdest}/Documentation/DocBook/Makefile
+
+ # Add md headers
+ mkdir -p ${hdrdest}/drivers/md
+ cp drivers/md/*.h ${hdrdest}/drivers/md
+
+ # Add inotify.h
+ mkdir -p ${hdrdest}/include/linux
+ cp include/linux/inotify.h ${hdrdest}/include/linux
+
+ # Add wireless headers
+ mkdir -p ${hdrdest}/net/mac80211/
+ cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+ # add dvb headers for external modules
+ mkdir -p ${hdrdest}/include/config/dvb/
+ cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+ # Copy in Kconfig files
+ for i in $(find . -name "Kconfig*"); do
+ mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
+ cp $i ${hdrdest}/$i
+ done
+
+ # Remove unneeded architectures
+ for arch in alpha arm26 avr32 blackfin cris frv h8300 \
+ ia64 m* p* s* um v850 x86 xtensa; do
+ rm -rf ${hdrdest}/arch/${arch}
+ done
+
+ # Compress all modules with xz to save a few MBs.
+ msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
+ find ${DESTDIR} -name '*.ko' -exec gzip -9 {} \;
+
+ # ... and run depmod again.
+ depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+
+cubieboard2-kernel-headers_package() {
+ nostrip=yes
+ noverifyrdeps=yes
+ short_desc="Linux kernel headers for the Cubieboard2 (${version%.*} series [${_gitshort}])"
+ pkg_install() {
+ vmove usr/src
+ vmove usr/lib/modules/${_kernver}/build
+ }
+}
+
diff --git a/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd b/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
new file mode 100644
index 0000000000..afa05c60df
--- /dev/null
+++ b/srcpkgs/cubieboard2-uboot/files/cubieboard2.bootcmd
@@ -0,0 +1,5 @@
+setenv machid 0x10bb
+setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p2 rw rootwait loglevel=4 panic=10 ${extra}
+fatload mmc 0 0x43000000 script.bin || ext2load mmc 0 0x43000000 boot/script.bin
+fatload mmc 0 0x48000000 uImage || ext2load mmc 0 0x48000000 uImage boot/uImage
+bootm 0x48000000
diff --git a/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex b/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
new file mode 100644
index 0000000000..8ebaba874a
--- /dev/null
+++ b/srcpkgs/cubieboard2-uboot/files/cubieboard2.fex
@@ -0,0 +1,975 @@
+[product]
+version = "100"
+machine = "cubieboard2"
+
+[platform]
+eraseflag = 0
+
+[target]
+boot_clock = 912
+dcdc2_vol = 1400
+dcdc3_vol = 1250
+ldo2_vol = 3000
+ldo3_vol = 2800
+ldo4_vol = 2800
+storage_type = 1
+
+[clock]
+pll3 = 297
+pll4 = 300
+pll6 = 600
+pll7 = 297
+pll8 = 336
+
+[card_boot]
+logical_start = 40960
+sprite_gpio0 =
+
+[card0_boot_para]
+card_ctrl = 0
+card_high_speed = 1
+card_line = 4
+sdc_d1 = port:PF00<2><1><default><default>
+sdc_d0 = port:PF01<2><1><default><default>
+sdc_clk = port:PF02<2><1><default><default>
+sdc_cmd = port:PF03<2><1><default><default>
+sdc_d3 = port:PF04<2><1><default><default>
+sdc_d2 = port:PF05<2><1><default><default>
+
+[card2_boot_para]
+card_ctrl = 2
+card_high_speed = 1
+card_line = 4
+sdc_cmd = port:PC06<3><1><default><default>
+sdc_clk = port:PC07<3><1><default><default>
+sdc_d0 = port:PC08<3><1><default><default>
+sdc_d1 = port:PC09<3><1><default><default>
+sdc_d2 = port:PC10<3><1><default><default>
+sdc_d3 = port:PC11<3><1><default><default>
+
+[twi_para]
+twi_port = 0
+twi_scl = port:PB00<2><default><default><default>
+twi_sda = port:PB01<2><default><default><default>
+
+[uart_para]
+uart_debug_port = 0
+uart_debug_tx = port:PB22<2><1><default><default>
+uart_debug_rx = port:PB23<2><1><default><default>
+
+[uart_force_debug]
+uart_debug_port = 0
+uart_debug_tx = port:PF02<4><1><default><default>
+uart_debug_rx = port:PF04<4><1><default><default>
+
+[jtag_para]
+jtag_enable = 0
+jtag_ms = port:PB14<3><default><default><default>
+jtag_ck = port:PB15<3><default><default><default>
+jtag_do = port:PB16<3><default><default><default>
+jtag_di = port:PB17<3><default><default><default>
+
+[pm_para]
+standby_mode = 0
+
+[dram_para]
+dram_baseaddr = 0x40000000
+dram_clk = 432
+dram_type = 3
+dram_rank_num = 1
+dram_chip_density = 4096
+dram_io_width = 16
+dram_bus_width = 32
+dram_cas = 9
+dram_zq = 0x7f
+dram_odt_en = 0
+dram_size = 1024
+dram_tpr0 = 0x42d899b7
+dram_tpr1 = 0xa090
+dram_tpr2 = 0x22a00
+dram_tpr3 = 0x0
+dram_tpr4 = 0x1
+dram_tpr5 = 0x0
+dram_emr1 = 0x4
+dram_emr2 = 0x10
+dram_emr3 = 0x0
+
+[mali_para]
+mali_used = 1
+mali_clkdiv = 1
+
+[emac_para]
+emac_used = 1
+emac_rxd3 = port:PA00<2><default><default><default>
+emac_rxd2 = port:PA01<2><default><default><default>
+emac_rxd1 = port:PA02<2><default><default><default>
+emac_rxd0 = port:PA03<2><default><default><default>
+emac_txd3 = port:PA04<2><default><default><default>
+emac_txd2 = port:PA05<2><default><default><default>
+emac_txd1 = port:PA06<2><default><default><default>
+emac_txd0 = port:PA07<2><default><default><default>
+emac_rxclk = port:PA08<2><default><default><default>
+emac_rxerr = port:PA09<2><default><default><default>
+emac_rxdV = port:PA10<2><default><default><default>
+emac_mdc = port:PA11<2><default><default><default>
+emac_mdio = port:PA12<2><default><default><default>
+emac_txen = port:PA13<2><default><default><default>
+emac_txclk = port:PA14<2><default><default><default>
+emac_crs = port:PA15<2><default><default><default>
+emac_col = port:PA16<2><default><default><default>
+emac_reset = port:PA17<1><default><default><default>
+
+[twi0_para]
+twi0_used = 1
+twi0_scl = port:PB00<2><default><default><default>
+twi0_sda = port:PB01<2><default><default><default>
+
+[twi1_para]
+twi1_used = 0
+twi1_scl = port:PB18<2><default><default><default>
+twi1_sda = port:PB19<2><default><default><default>
+
+[twi2_para]
+twi2_used = 0
+twi2_scl = port:PB20<2><default><default><default>
+twi2_sda = port:PB21<2><default><default><default>
+
+[uart_para0]
+uart_used = 1
+uart_port = 0
+uart_type = 2
+uart_tx = port:PB22<2><1><default><default>
+uart_rx = port:PB23<2><1><default><default>
+
+[uart_para1]
+uart_used = 0
+uart_port = 1
+uart_type = 8
+uart_tx = port:PA10<4><1><default><default>
+uart_rx = port:PA11<4><1><default><default>
+uart_rts = port:PA12<4><1><default><default>
+uart_cts = port:PA13<4><1><default><default>
+uart_dtr = port:PA14<4><1><default><default>
+uart_dsr = port:PA15<4><1><default><default>
+uart_dcd = port:PA16<4><1><default><default>
+uart_ring = port:PA17<4><1><default><default>
+
+[uart_para2]
+uart_used = 0
+uart_port = 2
+uart_type = 4
+uart_tx = port:PI18<3><1><default><default>
+uart_rx = port:PI19<3><1><default><default>
+uart_rts = port:PI16<3><1><default><default>
+uart_cts = port:PI17<3><1><default><default>
+
+[uart_para3]
+uart_used = 0
+uart_port = 3
+uart_type = 4
+uart_tx = port:PH00<4><1><default><default>
+uart_rx = port:PH01<4><1><default><default>
+uart_rts = port:PH02<4><1><default><default>
+uart_cts = port:PH03<4><1><default><default>
+
+[uart_para4]
+uart_used = 0
+uart_port = 4
+uart_type = 2
+uart_tx = port:PH04<4><1><default><default>
+uart_rx = port:PH05<4><1><default><default>
+
+[uart_para5]
+uart_used = 0
+uart_port = 5
+uart_type = 2
+uart_tx = port:PH06<4><1><default><default>
+uart_rx = port:PH07<4><1><default><default>
+
+[uart_para6]
+uart_used = 0
+uart_port = 6
+uart_type = 2
+uart_tx = port:PA12<4><1><default><default>
+uart_rx = port:PA13<4><1><default><default>
+
+[uart_para7]
+uart_used = 0
+uart_port = 7
+uart_type = 2
+uart_tx = port:PA14<4><1><default><default>
+uart_rx = port:PA15<4><1><default><default>
+
+[spi0_para]
+spi_used = 0
+spi_cs_bitmap = 1
+spi_cs0 = port:PI10<2><default><default><default>
+spi_cs1 = port:PI14<2><default><default><default>
+spi_sclk = port:PI11<2><default><default><default>
+spi_mosi = port:PI12<2><default><default><default>
+spi_miso = port:PI13<2><default><default><default>
+
+[spi1_para]
+spi_used = 0
+spi_cs_bitmap = 1
+spi_cs0 = port:PA00<3><default><default><default>
+spi_cs1 = port:PA04<3><default><default><default>
+spi_sclk = port:PA01<3><default><default><default>
+spi_mosi = port:PA02<3><default><default><default>
+spi_miso = port:PA03<3><default><default><default>
+
+[spi2_para]
+spi_used = 0
+spi_cs_bitmap = 1
+spi_cs0 = port:PC19<3><default><default><default>
+spi_cs1 = port:PB13<2><default><default><default>
+spi_sclk = port:PC20<3><default><default><default>
+spi_mosi = port:PC21<3><default><default><default>
+spi_miso = port:PC22<3><default><default><default>
+
+[spi3_para]
+spi_used = 0
+spi_cs_bitmap = 1
+spi_cs0 = port:PA05<3><default><default><default>
+spi_cs1 = port:PA09<3><default><default><default>
+spi_sclk = port:PA06<3><default><default><default>
+spi_mosi = port:PA07<3><default><default><default>
+spi_miso = port:PA08<3><default><default><default>
+
+[ctp_para]
+ctp_used = 0
+ctp_name = "gt811"
+ctp_twi_id = 2
+ctp_twi_addr = 0x40
+ctp_screen_max_x = 1024
+ctp_screen_max_y = 600
+ctp_revert_x_flag = 0
+ctp_revert_y_flag = 0
+ctp_exchange_x_y_flag = 1
+ctp_firm = 1
+ctp_int_port = port:PH21<6><default><default><default>
+ctp_wakeup = port:PB13<1><default><default><1>
+
+[ctp_list_para]
+ctp_det_used = 0
+ft5x_ts = 0
+gt82x = 0
+gslX680 = 0
+gt9xx_ts = 0
+gt811 = 0
+
+[tkey_para]
+tkey_used = 0
+tkey_twi_id = 2
+tkey_twi_addr = 0x62
+tkey_int = port:PI13<6><default><default><default>
+
+[motor_para]
+motor_used = 0
+motor_shake = port:PB03<1><default><default><1>
+
+[gpio_para]
+gpio_used = 1
+gpio_num = 2
+gpio_pin_1 = port:PH20<1><default><default><1>
+gpio_pin_2 = port:PH21<1><default><default><1>
+
+[nand_para]
+nand_used = 1
+nand_we = port:PC00<2><default><default><default>
+nand_ale = port:PC01<2><default><default><default>
+nand_cle = port:PC02<2><default><default><default>
+nand_ce1 = port:PC03<2><default><default><default>
+nand_ce0 = port:PC04<2><default><default><default>
+nand_nre = port:PC05<2><default><default><default>
+nand_rb0 = port:PC06<2><default><default><default>
+nand_rb1 = port:PC07<2><default><default><default>
+nand_d0 = port:PC08<2><default><default><default>
+nand_d1 = port:PC09<2><default><default><default>
+nand_d2 = port:PC10<2><default><default><default>
+nand_d3 = port:PC11<2><default><default><default>
+nand_d4 = port:PC12<2><default><default><default>
+nand_d5 = port:PC13<2><default><default><default>
+nand_d6 = port:PC14<2><default><default><default>
+nand_d7 = port:PC15<2><default><default><default>
+nand_wp = port:PC16<2><default><default><default>
+nand_ce2 = port:PC17<2><default><default><default>
+nand_ce3 = port:PC18<2><default><default><default>
+nand_ce4 =
+nand_ce5 =
+nand_ce6 =
+nand_ce7 =
+nand_spi = port:PC23<3><default><default><default>
+nand_ndqs = port:PC24<2><default><default><default>
+good_block_ratio = 0
+
+[disp_init]
+disp_init_enable = 1
+disp_mode = 0
+screen0_output_type = 3
+screen0_output_mode = 4
+screen1_output_type = 0
+screen1_output_mode = 4
+fb0_framebuffer_num = 3
+fb0_format = 10
+fb0_pixel_sequence = 0
+fb0_scaler_mode_enable = 0
+fb1_framebuffer_num = 2
+fb1_format = 10
+fb1_pixel_sequence = 0
+fb1_scaler_mode_enable = 0
+lcd0_backlight = 197
+lcd1_backlight = 197
+lcd0_bright = 50
+lcd0_contrast = 50
+lcd0_saturation = 57
+lcd0_hue = 50
+lcd1_bright = 50
+lcd1_contrast = 50
+lcd1_saturation = 57
+lcd1_hue = 50
+
+[lcd0_para]
+lcd_used = 0
+lcd_x = 1024
+lcd_y = 600
+lcd_dclk_freq = 51
+lcd_pwm_not_used = 0
+lcd_pwm_ch = 0
+lcd_pwm_freq = 10000
+lcd_pwm_pol = 1
+lcd_max_bright = 240
+lcd_min_bright = 64
+lcd_if = 0
+lcd_hbp = 158
+lcd_ht = 1344
+lcd_vbp = 25
+lcd_vt = 1270
+lcd_vspw = 3
+lcd_hspw = 20
+lcd_hv_if = 0
+lcd_hv_smode = 0
+lcd_hv_s888_if = 0
+lcd_hv_syuv_if = 0
+lcd_lvds_ch = 0
+lcd_lvds_mode = 0
+lcd_lvds_bitwidth = 0
+lcd_lvds_io_cross = 0
+lcd_cpu_if = 0
+lcd_frm = 1
+lcd_io_cfg0 = 0
+lcd_gamma_correction_en = 0
+lcd_gamma_tbl_0 = 0x0
+lcd_gamma_tbl_1 = 0x10101
+lcd_gamma_tbl_255 = 0xffffff
+lcd_bl_en_used = 0
+lcd_bl_en = port:PH07<1><0><default><1>
+lcd_power_used = 0
+lcd_power = port:PH08<1><0><default><1>
+lcd_pwm_used = 0
+lcd_pwm = port:PB02<2><0><default><default>
+lcdd0 = port:PD00<2><0><default><default>
+lcdd1 = port:PD01<2><0><default><default>
+lcdd2 = port:PD02<2><0><default><default>
+lcdd3 = port:PD03<2><0><default><default>
+lcdd4 = port:PD04<2><0><default><default>
+lcdd5 = port:PD05<2><0><default><default>
+lcdd6 = port:PD06<2><0><default><default>
+lcdd7 = port:PD07<2><0><default><default>
+lcdd8 = port:PD08<2><0><default><default>
+lcdd9 = port:PD09<2><0><default><default>
+lcdd10 = port:PD10<2><0><default><default>
+lcdd11 = port:PD11<2><0><default><default>
+lcdd12 = port:PD12<2><0><default><default>
+lcdd13 = port:PD13<2><0><default><default>
+lcdd14 = port:PD14<2><0><default><default>
+lcdd15 = port:PD15<2><0><default><default>
+lcdd16 = port:PD16<2><0><default><default>
+lcdd17 = port:PD17<2><0><default><default>
+lcdd18 = port:PD18<2><0><default><default>
+lcdd19 = port:PD19<2><0><default><default>
+lcdd20 = port:PD20<2><0><default><default>
+lcdd21 = port:PD21<2><0><default><default>
+lcdd22 = port:PD22<2><0><default><default>
+lcdd23 = port:PD23<2><0><default><default>
+lcdclk = port:PD24<2><0><default><default>
+lcdde = port:PD25<2><0><default><default>
+lcdhsync = port:PD26<2><0><default><default>
+lcdvsync = port:PD27<2><0><default><default>
+
+[lcd1_para]
+lcd_used = 0
+lcd_x = 0
+lcd_y = 0
+lcd_dclk_freq = 0
+lcd_pwm_not_used = 0
+lcd_pwm_ch = 1
+lcd_pwm_freq = 0
+lcd_pwm_pol = 0
+lcd_max_bright = 240
+lcd_min_bright = 64
+lcd_if = 0
+lcd_hbp = 0
+lcd_ht = 0
+lcd_vbp = 0
+lcd_vt = 0
+lcd_vspw = 0
+lcd_hspw = 0
+lcd_hv_if = 0
+lcd_hv_smode = 0
+lcd_hv_s888_if = 0
+lcd_hv_syuv_if = 0
+lcd_lvds_ch = 0
+lcd_lvds_mode = 0
+lcd_lvds_bitwidth = 0
+lcd_lvds_io_cross = 0
+lcd_cpu_if = 0
+lcd_frm = 0
+lcd_io_cfg0 = 0
+lcd_gamma_correction_en = 0
+lcd_gamma_tbl_0 = 0x0
+lcd_gamma_tbl_1 = 0x10101
+lcd_gamma_tbl_255 = 0xffffff
+lcd_bl_en_used = 0
+lcd_bl_en =
+lcd_power_used = 0
+lcd_power =
+lcd_pwm_used = 0
+lcd_pwm = port:PI03<2><0><default><default>
+lcd_gpio_0 =
+lcd_gpio_1 =
+lcd_gpio_2 =
+lcd_gpio_3 =
+lcdd0 = port:PH00<2><0><default><default>
+lcdd1 = port:PH01<2><0><default><default>
+lcdd2 = port:PH02<2><0><default><default>
+lcdd3 = port:PH03<2><0><default><default>
+lcdd4 = port:PH04<2><0><default><default>
+lcdd5 = port:PH05<2><0><default><default>
+lcdd6 = port:PH06<2><0><default><default>
+lcdd7 = port:PH07<2><0><default><default>
+lcdd8 = port:PH08<2><0><default><default>
+lcdd9 = port:PH09<2><0><default><default>
+lcdd10 = port:PH10<2><0><default><default>
+lcdd11 = port:PH11<2><0><default><default>
+lcdd12 = port:PH12<2><0><default><default>
+lcdd13 = port:PH13<2><0><default><default>
+lcdd14 = port:PH14<2><0><default><default>
+lcdd15 = port:PH15<2><0><default><default>
+lcdd16 = port:PH16<2><0><default><default>
+lcdd17 = port:PH17<2><0><default><default>
+lcdd18 = port:PH18<2><0><default><default>
+lcdd19 = port:PH19<2><0><default><default>
+lcdd20 = port:PH20<2><0><default><default>
+lcdd21 = port:PH21<2><0><default><default>
+lcdd22 = port:PH22<2><0><default><default>
+lcdd23 = port:PH23<2><0><default><default>
+lcdclk = port:PH24<2><0><default><default>
+lcdde = port:PH25<2><0><default><default>
+lcdhsync = port:PH26<2><0><default><default>
+lcdvsync = port:PH27<2><0><default><default>
+
+[tv_out_dac_para]
+dac_used = 0
+dac0_src = 4
+dac1_src = 5
+dac2_src = 6
+dac3_src = 0
+
+[hdmi_para]
+hdmi_used = 1
+
+[camera_list_para]
+camera_list_para_used = 0
+ov7670 = 0
+gc0308 = 1
+gt2005 = 1
+hi704 = 0
+sp0838 = 0
+mt9m112 = 0
+mt9m113 = 0
+ov2655 = 0
+hi253 = 0
+gc0307 = 0
+mt9d112 = 0
+ov5640 = 0
+gc2015 = 0
+ov2643 = 0
+gc0329 = 0
+gc0309 = 0
+tvp5150 = 0
+s5k4ec = 0
+ov5650_mv9335 = 0
+siv121d = 0
+gc2035 = 0
+
+[csi0_para]
+csi_used = 0
+csi_dev_qty = 2
+csi_stby_mode = 0
+csi_mname = "gc0308"
+csi_twi_id = 1
+csi_twi_addr = 0x42
+csi_if = 0
+csi_vflip = 0
+csi_hflip = 0
+csi_iovdd = "axp20_pll"
+csi_avdd = ""
+csi_dvdd = ""
+csi_vol_iovdd = 2800
+csi_vol_dvdd =
+csi_vol_avdd =
+csi_flash_pol = 0
+csi_mname_b = "gt2005"
+csi_twi_id_b = 1
+csi_twi_addr_b = 0x78
+csi_if_b = 0
+csi_vflip_b = 0
+csi_hflip_b = 0
+csi_iovdd_b = "axp20_pll"
+csi_avdd_b = ""
+csi_dvdd_b = ""
+csi_vol_iovdd_b = 2800
+csi_vol_avdd_b =
+csi_vol_dvdd_b =
+csi_flash_pol_b = 0
+csi_pck = port:PE00<3><default><default><default>
+csi_ck = port:PE01<3><default><default><default>
+csi_hsync = port:PE02<3><default><default><default>
+csi_vsync = port:PE03<3><default><default><default>
+csi_d0 = port:PE04<3><default><default><default>
+csi_d1 = port:PE05<3><default><default><default>
+csi_d2 = port:PE06<3><default><default><default>
+csi_d3 = port:PE07<3><default><default><default>
+csi_d4 = port:PE08<3><default><default><default>
+csi_d5 = port:PE09<3><default><default><default>
+csi_d6 = port:PE10<3><default><default><default>
+csi_d7 = port:PE11<3><default><default><default>
+csi_reset = port:PH14<1><default><default><0>
+csi_power_en = port:PH17<1><default><default><0>
+csi_stby = port:PH19<1><default><default><0>
+csi_flash =
+csi_af_en =
+csi_reset_b = port:PH14<1><default><default><0>
+csi_power_en_b = port:PH17<1><default><default><0>
+csi_stby_b = port:PH18<1><default><default><0>
+csi_flash_b =
+csi_af_en_b =
+
+[csi1_para]
+csi_used = 0
+csi_dev_qty = 1
+csi_stby_mode = 0
+csi_mname = "gc0308"
+csi_if = 0
+csi_iovdd = "axp20_pll"
+csi_avdd = ""
+csi_dvdd = ""
+csi_vol_iovdd = 2800
+csi_vol_dvdd =
+csi_vol_avdd =
+csi_vflip = 0
+csi_hflip = 0
+csi_flash_pol = 0
+csi_facing = 1
+csi_twi_id = 1
+csi_twi_addr = 0x42
+csi_pck = port:PG00<3><default><default><default>
+csi_ck = port:PG01<3><default><default><default>
+csi_hsync = port:PG02<3><default><default><default>
+csi_vsync = port:PG03<3><default><default><default>
+csi_d0 = port:PG04<3><default><default><default>
+csi_d1 = port:PG05<3><default><default><default>
+csi_d2 = port:PG06<3><default><default><default>
+csi_d3 = port:PG07<3><default><default><default>
+csi_d4 = port:PG08<3><default><default><default>
+csi_d5 = port:PG09<3><default><default><default>
+csi_d6 = port:PG10<3><default><default><default>
+csi_d7 = port:PG11<3><default><default><default>
+csi_reset = port:PH13<1><default><default><0>
+csi_power_en = port:PH16<1><default><default><0>
+csi_stby = port:PH19<1><default><default><0>
+
+[tvout_para]
+tvout_used = 0
+tvout_channel_num = 1
+
+[tvin_para]
+tvin_used = 0
+tvin_channel_num = 4
+
+[sata_para]
+sata_used = 1
+sata_power_en = port:PB08<1><default><default><0>
+
+[mmc0_para]
+sdc_used = 1
+sdc_detmode = 1
+sdc_buswidth = 4
+sdc_clk = port:PF02<2><1><2><default>
+sdc_cmd = port:PF03<2><1><2><default>
+sdc_d0 = port:PF01<2><1><2><default>
+sdc_d1 = port:PF00<2><1><2><default>
+sdc_d2 = port:PF05<2><1><2><default>
+sdc_d3 = port:PF04<2><1><2><default>
+sdc_det = port:PH01<0><1><default><default>
+sdc_use_wp = 0
+sdc_wp =
+sdc_isio = 0
+sdc_regulator = "none"
+
+[mmc1_para]
+sdc_used = 0
+sdc_detmode = 4
+sdc_buswidth = 4
+sdc_clk = port:PG00<2><1><2><default>
+sdc_cmd = port:PG01<2><1><2><default>
+sdc_d0 = port:PG02<2><1><2><default>
+sdc_d1 = port:PG03<2><1><2><default>
+sdc_d2 = port:PG04<2><1><2><default>
+sdc_d3 = port:PG05<2><1><2><default>
+sdc_det =
+sdc_use_wp = 0
+sdc_wp =
+sdc_isio = 0
+sdc_regulator = "none"
+
+[mmc2_para]
+sdc_used = 0
+sdc_detmode = 3
+sdc_buswidth = 4
+sdc_cmd = port:PC06<3><1><2><default>
+sdc_clk = port:PC07<3><1><2><default>
+sdc_d0 = port:PC08<3><1><2><default>
+sdc_d1 = port:PC09<3><1><2><default>
+sdc_d2 = port:PC10<3><1><2><default>
+sdc_d3 = port:PC11<3><1><2><default>
+sdc_det =
+sdc_use_wp = 0
+sdc_wp =
+sdc_isio = 0
+sdc_regulator = "none"
+
+[mmc3_para]
+sdc_used = 0
+sdc_detmode = 4
+sdc_buswidth = 4
+sdc_cmd = port:PI04<2><1><2><default>
+sdc_clk = port:PI05<2><1><2><default>
+sdc_d0 = port:PI06<2><1><2><default>
+sdc_d1 = port:PI07<2><1><2><default>
+sdc_d2 = port:PI08<2><1><2><default>
+sdc_d3 = port:PI09<2><1><2><default>
+sdc_det =
+sdc_use_wp = 0
+sdc_wp =
+sdc_isio = 1
+sdc_regulator = "none"
+
+[ms_para]
+ms_used = 0
+ms_bs = port:PH06<5><default><default><default>
+ms_clk = port:PH07<5><default><default><default>
+ms_d0 = port:PH08<5><default><default><default>
+ms_d1 = port:PH09<5><default><default><default>
+ms_d2 = port:PH10<5><default><default><default>
+ms_d3 = port:PH11<5><default><default><default>
+ms_det =
+
+[smc_para]
+smc_used = 0
+smc_rst = port:PH13<5><default><default><default>
+smc_vppen = port:PH14<5><default><default><default>
+smc_vppp = port:PH15<5><default><default><default>
+smc_det = port:PH16<5><default><default><default>
+smc_vccen = port:PH17<5><default><default><default>
+smc_sck = port:PH18<5><default><default><default>
+smc_sda = port:PH19<5><default><default><default>
+
+[ps2_0_para]
+ps2_used = 0
+ps2_scl = port:PI20<2><1><default><default>
+ps2_sda = port:PI21<2><1><default><default>
+
+[ps2_1_para]
+ps2_used = 0
+ps2_scl = port:PI14<3><1><default><default>
+ps2_sda = port:PI15<3><1><default><default>
+
+[can_para]
+can_used = 0
+can_tx = port:PA16<3><default><default><default>
+can_rx = port:PA17<3><default><default><default>
+
+[keypad_para]
+kp_used = 0
+kp_in_size = 8
+kp_out_size = 8
+kp_in0 = port:PH08<4><1><default><default>
+kp_in1 = port:PH09<4><1><default><default>
+kp_in2 = port:PH10<4><1><default><default>
+kp_in3 = port:PH11<4><1><default><default>
+kp_in4 = port:PH14<4><1><default><default>
+kp_in5 = port:PH15<4><1><default><default>
+kp_in6 = port:PH16<4><1><default><default>
+kp_in7 = port:PH17<4><1><default><default>
+kp_out0 = port:PH18<4><1><default><default>
+kp_out1 = port:PH19<4><1><default><default>
+kp_out2 = port:PH22<4><1><default><default>
+kp_out3 = port:PH23<4><1><default><default>
+kp_out4 = port:PH24<4><1><default><default>
+kp_out5 = port:PH25<4><1><default><default>
+kp_out6 = port:PH26<4><1><default><default>
+kp_out7 = port:PH27<4><1><default><default>
+
+[usbc0]
+usb_used = 1
+usb_port_type = 2
+usb_detect_type = 1
+usb_id_gpio = port:PH04<0><1><default><default>
+usb_det_vbus_gpio = port:PH05<0><0><default><default>
+usb_drv_vbus_gpio = port:PB09<1><0><default><0>
+usb_host_init_state = 0
+
+[usbc1]
+usb_used = 1
+usb_port_type = 1
+usb_detect_type = 0
+usb_id_gpio =
+usb_det_vbus_gpio =
+usb_drv_vbus_gpio = port:PH06<1><0><default><0>
+usb_host_init_state = 1
+
+[usbc2]
+usb_used = 1
+usb_port_type = 1
+usb_detect_type = 0
+usb_id_gpio =
+usb_det_vbus_gpio =
+usb_drv_vbus_gpio = port:PH03<1><0><default><0>
+usb_host_init_state = 1
+
+[usb_feature]
+vendor_id = 6353
+mass_storage_id = 1
+adb_id = 2
+manufacturer_name = "USB Developer"
+product_name = "Android"
+serial_number = "20080411"
+
+[msc_feature]
+vendor_name = "USB 2.0"
+product_name = "USB Flash Driver"
+release = 100
+luns = 3
+
+[gsensor_para]
+gsensor_used = 0
+gsensor_twi_id = 1
+gsensor_int1 =
+gsensor_int2 =
+
+[gsensor_list_para]
+gsensor_det_used = 0
+bma250 = 1
+mma8452 = 1
+mma7660 = 1
+mma865x = 1
+afa750 = 1
+lis3de_acc = 1
+lis3dh_acc = 1
+kxtik = 1
+dmard10 = 0
+dmard06 = 1
+mxc622x = 1
+fxos8700 = 1
+lsm303d = 1
+
+[gps_para]
+gps_used = 0
+gps_spi_id = 2
+gps_spi_cs_num = 0
+gps_lradc = 1
+gps_clk = port:PI00<2><default><default><default>
+gps_sign = port:PI01<2><default><default><default>
+gps_mag = port:PI02<2><default><default><default>
+gps_vcc_en = port:PC22<1><default><default><0>
+gps_osc_en = port:PI14<1><default><default><0>
+gps_rx_en = port:PI15<1><default><default><0>
+
+[wifi_para]
+wifi_used = 0
+wifi_sdc_id = 3
+wifi_usbc_id = 2
+wifi_usbc_type = 1
+wifi_mod_sel = 6
+wifi_power = ""
+rtk_rtl8723as_wl_dis = port:PH09<1><default><default><0>
+rtk_rtl8723as_bt_dis = port:PB05<1><default><default><0>
+rtk_rtl8723as_wl_host_wake = port:PH10<0><default><default><0>
+rtk_rtl8723as_bt_host_wake = port:PI21<0><default><default><0>
+ap6xxx_wl_regon = port:PH09<1><default><default><0>
+ap6xxx_wl_host_wake = port:PH10<0><default><default><0>
+ap6xxx_bt_regon = port:PB05<1><default><default><0>
+ap6xxx_bt_wake = port:PI20<1><default><default><0>
+ap6xxx_bt_host_wake = port:PI21<0><default><default><0>
+
+[3g_para]
+3g_used = 0
+3g_usbc_num = 2
+3g_uart_num = 0
+3g_pwr =
+3g_wakeup =
+3g_int =
+
+[gy_para]
+gy_used = 0
+gy_twi_id = 1
+gy_twi_addr = 0
+gy_int1 = port:PH18<6><1><default><default>
+gy_int2 = port:PH19<6><1><default><default>
+
+[ls_para]
+ls_used = 0
+ls_twi_id = 1
+ls_twi_addr = 0
+ls_int = port:PH20<6><1><default><default>
+
+[compass_para]
+compass_used = 0
+compass_twi_id = 1
+compass_twi_addr = 0
+compass_int = port:PI13<6><1><default><default>
+
+[bt_para]
+bt_used = 0
+bt_uart_id = 2
+bt_wakeup = port:PI20<1><default><default><default>
+bt_gpio = port:PI21<1><default><default><default>
+bt_rst = port:PB05<1><default><default><default>
+
+[i2s_para]
+i2s_used = 0
+i2s_channel = 2
+i2s_mclk = port:PB05<2><1><default><default>
+i2s_bclk = port:PB06<2><1><default><default>
+i2s_lrclk = port:PB07<2><1><default><default>
+i2s_dout0 = port:PB08<2><1><default><default>
+i2s_dout1 =
+i2s_dout2 =
+i2s_dout3 =
+i2s_din = port:PB12<2><1><default><default>
+
+[spdif_para]
+spdif_used = 0
+spdif_mclk =
+spdif_dout = port:PB13<4><1><default><default>
+spdif_din =
+
+[audio_para]
+audio_used = 1
+capture_used = 1
+audio_pa_ctrl = port:PH15<1><default><default><1>
+
+[switch_para]
+switch_used = 0
+
+[leds_para]
+leds_used = 1
+leds_num = 2
+leds_pin_1 = port:PH20<1><default><default><0>
+leds_name_1 = "green:ph20:led1"
+leds_default_1 = 1
+leds_trigger_1 = "mmc0"
+leds_pin_2 = port:PH21<1><default><default><0>
+leds_name_2 = "blue:ph21:led2"
+leds_default_2 = 0
+leds_trigger_2 = "heartbeat"
+
+[ir_para]
+ir_used = 1
+ir_rx = port:PB04<2><default><default><default>
+
+[pmu_para]
+pmu_used = 1
+pmu_twi_addr = 52
+pmu_twi_id = 0
+pmu_irq_id = 32
+pmu_battery_rdc = 120
+pmu_battery_cap = 2100
+pmu_init_chgcur = 300
+pmu_earlysuspend_chgcur = 600
+pmu_suspend_chgcur = 1000
+pmu_resume_chgcur = 300
+pmu_shutdown_chgcur = 1000
+pmu_init_chgvol = 4200
+pmu_init_chgend_rate = 15
+pmu_init_chg_enabled = 1
+pmu_init_adc_freq = 100
+pmu_init_adc_freqc = 100
+pmu_init_chg_pretime = 50
+pmu_init_chg_csttime = 720
+pmu_bat_para1 = 0
+pmu_bat_para2 = 0
+pmu_bat_para3 = 0
+pmu_bat_para4 = 0
+pmu_bat_para5 = 5
+pmu_bat_para6 = 11
+pmu_bat_para7 = 13
+pmu_bat_para8 = 15
+pmu_bat_para9 = 19
+pmu_bat_para10 = 32
+pmu_bat_para11 = 50
+pmu_bat_para12 = 58
+pmu_bat_para13 = 71
+pmu_bat_para14 = 81
+pmu_bat_para15 = 89
+pmu_bat_para16 = 100
+pmu_usbvol_limit = 1
+pmu_usbcur_limit = 0
+pmu_usbvol = 4000
+pmu_usbcur = 0
+pmu_usbvol_pc = 4200
+pmu_usbcur_pc = 0
+pmu_pwroff_vol = 3300
+pmu_pwron_vol = 2900
+pmu_pekoff_time = 6000
+pmu_pekoff_en = 1
+pmu_peklong_time = 1500
+pmu_pekon_time = 1000
+pmu_pwrok_time = 64
+pmu_pwrnoe_time = 2000
+pmu_intotp_en = 1
+pmu_used2 = 0
+pmu_adpdet = port:PH02<0><default><default><default>
+pmu_init_chgcur2 = 400
+pmu_earlysuspend_chgcur2 = 600
+pmu_suspend_chgcur2 = 1200
+pmu_resume_chgcur2 = 400
+pmu_shutdown_chgcur2 = 1200
+pmu_suspendpwroff_vol = 3500
+pmu_batdeten = 1
+
+[recovery_key]
+key_min = 4
+key_max = 40
+
+[dvfs_table]
+max_freq = 912000000
+min_freq = 400000000
+LV_count = 7
+LV1_freq = 1008000000
+LV1_volt = 1450
+LV2_freq = 912000000
+LV2_volt = 1400
+LV3_freq = 864000000
+LV3_volt = 1300
+LV4_freq = 720000000
+LV4_volt = 1200
+LV5_freq = 528000000
+LV5_volt = 1100
+LV6_freq = 312000000
+LV6_volt = 1050
+LV7_freq = 144000000
+LV7_volt = 1050
+
diff --git a/srcpkgs/cubieboard2-uboot/template b/srcpkgs/cubieboard2-uboot/template
new file mode 100644
index 0000000000..99f8bfc1fe
--- /dev/null
+++ b/srcpkgs/cubieboard2-uboot/template
@@ -0,0 +1,34 @@
+# Template file for 'cubieboard2-uboot'
+pkgname=cubieboard2-uboot
+version=v2013.10
+revision=9
+wrksrc="u-boot-sunxi-${version/v/}-sunxi"
+hostmakedepends="sunxi-tools uboot-mkimage"
+short_desc="Cubieboard2 U-Boot files for SD booting"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="https://github.com/linux-sunxi/u-boot-sunxi"
+distfiles="https://github.com/linux-sunxi/u-boot-sunxi/archive/${version}-sunxi.tar.gz"
+checksum=a2a606939574795598d29f04852b1a40ddfcced96e9535d1d31fad30c68e0326
+
+create_srcdir=yes
+only_for_archs="armv7l"
+
+do_build() {
+ unset CFLAGS CXXFLAGS LDFLAGS
+
+ if [ "$CROSS_BUILD" ]; then
+ make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- Cubieboard2
+ else
+ make Cubieboard2
+ fi
+ mkimage -C none -A arm -T script -d ${FILESDIR}/cubieboard2.bootcmd boot.scr
+ fex2bin ${FILESDIR}/cubieboard2.fex script.bin
+}
+
+do_install() {
+ vinstall u-boot-sunxi-with-spl.bin 644 boot
+ vinstall script.bin 644 boot
+ vinstall boot.scr 644 boot
+ vinstall ${FILESDIR}/cubieboard2.bootcmd 644 boot boot.cmd
+}
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 21da89d58e..175675d99a 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -8,6 +8,9 @@ hostmakedepends="pkg-config"
makedepends="lcms2-devel libpng-devel>=1.6 libqpdf-devel
poppler-cpp-devel>=0.24.1 fontconfig-devel avahi-glib-libs-devel
ghostscript-devel cups-devel ghostscript poppler-utils"
+depends="ghostscript poppler-utils"
+conf_files="/etc/cups/cups-browsed.conf"
+systemd_services="cups-browsed.service on"
short_desc="The OpenPrinting CUPS Filters"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1, MIT"
@@ -25,12 +28,3 @@ post_install() {
vinstall utils/cups-browsed.service 644 usr/lib/systemd/system
chgrp -R lp ${DESTDIR}/etc/cups
}
-
-cups-filters_package() {
- conf_files="/etc/cups/cups-browsed.conf"
- systemd_services="cups-browsed.service on"
- depends="ghostscript poppler-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index e30ac8a62b..13b0e43739 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -14,6 +14,22 @@ hostmakedepends="automake pkg-config poppler-utils"
makedepends="acl-devel libjpeg-turbo-devel libpng-devel>=1.5.10 tiff-devel
openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel
systemd-devel gnutls-devel>=3.1.5 bc"
+depends="libcups>=${version}_${revision} cups-filters bc"
+systemd_services="cups.socket on"
+conf_files="
+ /etc/cups/cupsd.conf
+ /etc/cups/snmp.conf
+ /etc/cups/printers.conf
+ /etc/cups/classes.conf
+ /etc/cups/subscriptions.conf
+ /etc/dbus-1/system.d/cups.conf
+ /etc/pam.d/cups"
+make_dirs="
+ /var/cache/cups/rss 0750 root lp
+ /var/run/cups/certs 0750 root lp
+ /var/log/cups 0750 root root
+ /var/spool/cups 0755 root lp
+ /etc/cups/ssl 0700 root lp"
pre_configure() {
aclocal -I config-scripts
@@ -91,25 +107,3 @@ cups-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-cups_package() {
- systemd_services="cups.socket on"
- conf_files="
- /etc/cups/cupsd.conf
- /etc/cups/snmp.conf
- /etc/cups/printers.conf
- /etc/cups/classes.conf
- /etc/cups/subscriptions.conf
- /etc/dbus-1/system.d/cups.conf
- /etc/pam.d/cups"
- make_dirs="
- /var/cache/cups/rss 0750 root lp
- /var/run/cups/certs 0750 root lp
- /var/log/cups 0750 root root
- /var/spool/cups 0755 root lp
- /etc/cups/ssl 0700 root lp"
- depends="libcups>=${version}_${revision} cups-filters bc"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6c9abe6351..f7976f2bb7 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,19 +1,20 @@
# Template build file for 'curl'.
pkgname=curl
-version=7.34.0
+version=7.35.0
revision=1
build_style=gnu-configure
-configure_args="--disable-ldaps --with-gssapi=/usr
+configure_args="--disable-ldaps --with-gssapi=${XBPS_CROSS_BASE}/usr
--enable-threaded-resolver --enable-ipv6
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
hostmakedepends="pkg-config perl groff"
-makedepends="libidn-devel openssl-devel mit-krb5-devel"
+makedepends="libidn-devel openssl-devel mit-krb5-devel ca-certificates"
+depends="ca-certificates"
short_desc="Client that groks URLs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="http://curl.haxx.se"
distfiles="$homepage/download/$pkgname-$version.tar.bz2"
-checksum=10beade56b48311499e444783df3413405b22f20a147ed4a1d8a8125f1cc829b
+checksum=d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83
libcurl_package() {
short_desc="The multiprotocol file transfer library"
@@ -35,10 +36,3 @@ libcurl-devel_package() {
vmove usr/share/man/man3
}
}
-
-curl_package() {
- depends="ca-certificates"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/curlftpfs/template b/srcpkgs/curlftpfs/template
index 6a0e123776..160c903104 100644
--- a/srcpkgs/curlftpfs/template
+++ b/srcpkgs/curlftpfs/template
@@ -21,9 +21,3 @@ long_desc="
automatically reconnection if the server times out
transform absolute symlinks to point back into the ftp file system
"
-
-curlftpfs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template
index 0ff72dc52b..2d134d8887 100644
--- a/srcpkgs/cvs/template
+++ b/srcpkgs/cvs/template
@@ -7,6 +7,7 @@ configure_args="--with-editor=/usr/bin/vi --with-external-zlib
cvs_cv_func_printf_ptr=yes ac_cv_func_malloc_0_nonnull=yes"
hostmakedepends="nvi openssh"
makedepends="mit-krb5-devel openssh"
+depends="openssh>=6.1p1"
short_desc="Concurrent Versions System"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.nongnu.org/cvs/"
@@ -21,10 +22,3 @@ long_desc="
CVS is a production quality system in wide use around the world, including
many free software projects."
-
-cvs_package() {
- depends="openssh>=6.1p1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/cvs2svn/template b/srcpkgs/cvs2svn/template
index 7ec256c428..b5848ee374 100644
--- a/srcpkgs/cvs2svn/template
+++ b/srcpkgs/cvs2svn/template
@@ -6,9 +6,11 @@ XBPS_FETCH_CMD="wget"
pkgname=cvs2svn
version=2.3.0
revision=2
+noarch="yes"
build_style=gnu-makefile
make_build_args="man"
makedepends="wget cvs python"
+depends="cvs python>=0"
short_desc="CVS to Subversion, git and bazaar repository conversion tool"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://cvs2svn.tigris.org/"
@@ -33,11 +35,3 @@ post_install() {
install -m644 *.1 ${DESTDIR}/usr/share/man/man1
vinstall COPYING 644 usr/share/licenses/cvs2svn
}
-
-cvs2svn_package() {
- depends="cvs python>=0"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/cwm-git/template b/srcpkgs/cwm-git/template
index e9ada65771..998bb77c63 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,18 +16,11 @@ 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
-}
-
-cwm-git_package() {
- pkg_install() {
- vmove all
- }
+post_install() {
+ vinstall README 644 usr/share/doc/${pkgname}
}
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 9db270f072..44f66d59d6 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -26,6 +26,8 @@ disable_parallel_build=yes
hostmakedepends="groff"
makedepends="openssl-devel db-devel>=5.3 libldap-devel mit-krb5-devel pam-devel
postgresql-libs-devel libmysqlclient-devel>=5.5.27 sqlite-devel"
+depends="libsasl>=${version}"
+systemd_services="saslauthd.service on"
do_configure() {
./configure ${configure_args} --disable-static --enable-shared \
@@ -91,11 +93,3 @@ cyrus-sasl-modules_package() {
vmove usr/lib/sasl2
}
}
-
-cyrus-sasl_package() {
- systemd_services="saslauthd.service on"
- depends="libsasl>=${version}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/damageproto/template b/srcpkgs/damageproto/template
index e4f7db01a6..2271be9d38 100644
--- a/srcpkgs/damageproto/template
+++ b/srcpkgs/damageproto/template
@@ -1,21 +1,12 @@
# Template build file 'damageproto'.
pkgname=damageproto
version=1.2.1
-build_style=gnu-configure
revision=1
+noarch="yes"
+build_style=gnu-configure
short_desc="Damage extension headers from modular X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="${XORG_HOME}"
license="custom"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b
-long_desc="
- This package contains header files and documentation for the X Damage
- extension of X RandR. This is from the modular X.org X11 project."
-
-damageproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template
index f1194fdc69..dcea61cb92 100644
--- a/srcpkgs/darkice/template
+++ b/srcpkgs/darkice/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
makedepends="pkg-config lame-devel libogg-devel libvorbis-devel faac-devel
alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel"
+conf_files="/etc/darkice.cfg"
short_desc="A live audio streamer source client for icecast"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3"
@@ -14,11 +15,3 @@ checksum=170342cb4dbb0b44a62e37d0db1515fa7799c410fc4995bf8f32aaa6614f5f79
long_desc="
DarkIce is a live audio streamer. It records audio from an audio interface
(e.g. sound card), encodes it and sends it to a streaming server."
-
-darkice_package() {
- conf_files="/etc/darkice.cfg"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index 2d7b806782..a07e7ad4e4 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -4,6 +4,8 @@ version=0.5.7
revision=7
build_style=gnu-configure
hostmakedepends="bison coreutils"
+depends="coreutils"
+register_shell="/bin/sh"
short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://gondor.apana.org.au/~herbert/dash/"
@@ -14,11 +16,3 @@ checksum=ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39
post_install() {
ln -sfr ${DESTDIR}/usr/bin/dash ${DESTDIR}/usr/bin/sh
}
-
-dash_package() {
- register_shell="/bin/sh"
- depends="coreutils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/db/template b/srcpkgs/db/template
index c21d46bd41..2cf6a799da 100644
--- a/srcpkgs/db/template
+++ b/srcpkgs/db/template
@@ -62,9 +62,3 @@ libdb_package() {
vmove "usr/lib/libdb-*.so*"
}
}
-
-db_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template
index 480e5b297d..8763c7d9dd 100644
--- a/srcpkgs/dbus-glib/template
+++ b/srcpkgs/dbus-glib/template
@@ -36,9 +36,3 @@ dbus-glib-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-dbus-glib_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dbus-python/template b/srcpkgs/dbus-python/template
index c963cab1ed..a8910a1a22 100644
--- a/srcpkgs/dbus-python/template
+++ b/srcpkgs/dbus-python/template
@@ -1,9 +1,12 @@
# Template file for 'dbus-python'
pkgname=dbus-python
version=1.2.0
-revision=1
-hostmakedepends="pkg-config"
-makedepends="glib-devel dbus-glib-devel python-devel python3-devel>=3.3.2_2"
+revision=2
+build_style=gnu-configure
+hostmakedepends="pkg-config python-devel"
+makedepends="glib-devel dbus-glib-devel python-devel"
+depends="python"
+pycompile_module="dbus"
short_desc="D-Bus Python bindings"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -12,59 +15,23 @@ distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.g
checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
do_configure() {
- mkdir build-python2 build-python3
-
- cd $wrksrc/build-python2
- PYTHON=python2 ../configure --prefix=/usr
-
- cd $wrksrc/build-python3
- PYTHON=python3 ../configure --prefix=/usr
+ if [ "$CROSS_BUILD" ]; then
+ # create a python-config wrapper to fake --includes
+ install -m755 ${XBPS_SRCPKGDIR}/py2cairo/files/python-config ${wrksrc}
+ export PATH=${wrksrc}:$PATH
+ fi
+ env PYTHON=python ./configure ${configure_args}
}
-do_build() {
- cd $wrksrc/build-python2
- make ${makejobs}
-
- cd $wrksrc/build-python3
- make ${makejobs}
-}
-
-do_install() {
- cd $wrksrc/build-python2
- make DESTDIR=${DESTDIR} install
-
- cd $wrksrc/build-python3
- make DESTDIR=${DESTDIR}/python3 install
-
+post_install() {
rm -rf ${DESTDIR}/usr/share/doc
}
dbus-python-devel_package() {
- depends="python-devel
- python3-devel>=3.3.2_2
- dbus-python>=${version}
- dbus-python3>=${version}"
+ depends="python-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-dbus-python3_package() {
- short_desc="D-Bus Python3 bindings"
- depends="python3"
- pkg_install() {
- vmkdir usr/lib
- mv ${DESTDIR}/python3/usr/lib/python3.3 ${PKGDESTDIR}/usr/lib
- }
-}
-
-dbus-python_package() {
- pycompile_module="dbus"
- depends="python"
- pkg_install() {
- rm -rf ${DESTDIR}/python3
- vmove all
- }
-}
diff --git a/srcpkgs/dbus-python3 b/srcpkgs/dbus-python3
deleted file mode 120000
index 906753c297..0000000000
--- a/srcpkgs/dbus-python3
+++ /dev/null
@@ -1 +0,0 @@
-dbus-python
\ No newline at end of file
diff --git a/srcpkgs/dbus-python3/template b/srcpkgs/dbus-python3/template
new file mode 100644
index 0000000000..169faba5d9
--- /dev/null
+++ b/srcpkgs/dbus-python3/template
@@ -0,0 +1,22 @@
+# Template file for 'dbus-python3'
+pkgname=dbus-python3
+version=1.2.0
+revision=2
+wrksrc="${pkgname/3/}-${version}"
+build_style=gnu-configure
+configure_args="PYTHON=python3"
+hostmakedepends="pkg-config python3-devel"
+makedepends="glib-devel dbus-glib-devel python3-devel"
+depends="python3"
+short_desc="D-Bus Python bindings"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
+distfiles="http://dbus.freedesktop.org/releases/${pkgname/3/}/${pkgname/3/}-${version}.tar.gz"
+checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
+
+post_install() {
+ rm -rf ${DESTDIR}/usr/share/doc
+ # Remove development files, provided by dbus-python-devel.
+ rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig
+}
diff --git a/srcpkgs/dbus-sharp/template b/srcpkgs/dbus-sharp/template
index 4d82974fcd..f11fff7fb3 100644
--- a/srcpkgs/dbus-sharp/template
+++ b/srcpkgs/dbus-sharp/template
@@ -2,11 +2,13 @@
pkgname=dbus-sharp
version=0.7
revision=1
+noarch="yes"
distfiles="https://github.com/mono/dbus-sharp/archive/v${version}.tar.gz"
checksum="535360a164b62bd629f7ca7396a0dcfb143e05287ac2cc95ab4387bd81dd6d58"
build_style=gnu-configure
hostmakedepends="pkg-config automake"
makedepends="mono"
+depends="${makedepends}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://github.com/mono/dbus-sharp/"
license="Custom"
@@ -15,11 +17,3 @@ short_desc="C# implementation of D-Bus"
pre_configure() {
./autogen.sh
}
-
-dbus-sharp_package() {
- noarch="yes"
- depends="mono"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dbus/INSTALL b/srcpkgs/dbus/INSTALL
index 55122c2054..2fa82f4ad9 100644
--- a/srcpkgs/dbus/INSTALL
+++ b/srcpkgs/dbus/INSTALL
@@ -9,7 +9,5 @@ post)
[ ! -d etc/dbus-1/session.d ] && install -d etc/dbus-1/session.d
chown root:22 ${dbus_launch}
chmod 4750 ${dbus_launch}
- # In case var/run is detected as obsolete create it again.
- [ ! -h var/run ] && ln -sfr /run var/run
;;
esac
diff --git a/srcpkgs/dbus/files/systemd-user-session.patch b/srcpkgs/dbus/files/systemd-user-session.patch
deleted file mode 100644
index 38d8a7a74c..0000000000
--- a/srcpkgs/dbus/files/systemd-user-session.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-commit d728fdc655f17031da3bb129ab2fd17dadf0fe3a
-Author: Simon Peeters <peeters.simon@gmail.com>
-Date: 8 weeks ago
-
- Set correct address when using --address=systemd:
-
- When dbus gets launched through systemd, we need to create an address
- string based on the sockets passed.
-
- The _dbus_append_addres_from_socket() function is responsible for
- extracting the address information from the file-descriptor and
- formatting it in a dbus friendly way.
-
- This fixes bus activation when running dbus under a systemd session.
-
- https://bugs.freedesktop.org/show_bug.cgi?id=50962
-
- Signed-off-by: Simon Peeters <peeters.simon@gmail.com>
-
-diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
-index 130f66e..d995240 100644
---- dbus/dbus-server-unix.c
-+++ dbus/dbus-server-unix.c
-@@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
- }
- else if (strcmp (method, "systemd") == 0)
- {
-- int n, *fds;
-+ int i, n, *fds;
- DBusString address;
-
- n = _dbus_listen_systemd_sockets (&fds, error);
-@@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
- }
-
-- _dbus_string_init_const (&address, "systemd:");
-+ if (!_dbus_string_init (&address))
-+ goto systemd_oom;
-
-- *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
-- if (*server_p == NULL)
-+ for (i = 0; i < n; i++)
- {
-- int i;
--
-- for (i = 0; i < n; i++)
-+ if (i > 0)
- {
-- _dbus_close_socket (fds[i], NULL);
-+ if (!_dbus_string_append (&address, ";"))
-+ goto systemd_oom;
- }
-- dbus_free (fds);
--
-- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-+ if (!_dbus_append_address_from_socket (fds[i], &address, error))
-+ goto systemd_err;
- }
-
-+ *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
-+ if (*server_p == NULL)
-+ goto systemd_oom;
-+
- dbus_free (fds);
-
- return DBUS_SERVER_LISTEN_OK;
-- }
-+ systemd_oom:
-+ _DBUS_SET_OOM (error);
-+ systemd_err:
-+ for (i = 0; i < n; i++)
-+ {
-+ _dbus_close_socket (fds[i], NULL);
-+ }
-+ dbus_free (fds);
-+ _dbus_string_free (&address);
-+
-+ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-+ }
- #ifdef DBUS_ENABLE_LAUNCHD
- else if (strcmp (method, "launchd") == 0)
- {
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index b4ecc96..55743b1 100644
---- dbus/dbus-sysdeps-unix.c
-+++ dbus/dbus-sysdeps-unix.c
-@@ -55,6 +55,7 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <grp.h>
-+#include <arpa/inet.h>
-
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
-@@ -4160,4 +4161,71 @@ _dbus_check_setuid (void)
- #endif
- }
-
-+/**
-+ * Read the address from the socket and append it to the string
-+ *
-+ * @param fd the socket
-+ * @param address
-+ * @param error return location for error code
-+ */
-+dbus_bool_t
-+_dbus_append_address_from_socket (int fd,
-+ DBusString *address,
-+ DBusError *error)
-+{
-+ union {
-+ struct sockaddr sa;
-+ struct sockaddr_storage storage;
-+ struct sockaddr_un un;
-+ struct sockaddr_in ipv4;
-+ struct sockaddr_in6 ipv6;
-+ } socket;
-+ char hostip[INET6_ADDRSTRLEN];
-+ int size = sizeof (socket);
-+
-+ if (getsockname (fd, &socket.sa, &size))
-+ goto err;
-+
-+ switch (socket.sa.sa_family)
-+ {
-+ case AF_UNIX:
-+ if (socket.un.sun_path[0]=='\0')
-+ {
-+ if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1])))
-+ return TRUE;
-+ }
-+ else
-+ {
-+ if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path))
-+ return TRUE;
-+ }
-+ break;
-+ case AF_INET:
-+ if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip)))
-+ if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u",
-+ hostip, ntohs (socket.ipv4.sin_port)))
-+ return TRUE;
-+ break;
-+#ifdef AF_INET6
-+ case AF_INET6:
-+ if (inet_ntop (AF_INET6, &socket.ipv6.sin6_addr, hostip, sizeof (hostip)))
-+ if (_dbus_string_append_printf (address, "tcp:family=ipv6,host=%s,port=%u",
-+ hostip, ntohs (socket.ipv6.sin6_port)))
-+ return TRUE;
-+ break;
-+#endif
-+ default:
-+ dbus_set_error (error,
-+ _dbus_error_from_errno (EINVAL),
-+ "Failed to read address from socket: Unknown socket type.");
-+ return FALSE;
-+ }
-+ err:
-+ dbus_set_error (error,
-+ _dbus_error_from_errno (errno),
-+ "Failed to open socket: %s",
-+ _dbus_strerror (errno));
-+ return FALSE;
-+}
-+
- /* tests in dbus-sysdeps-util.c */
-diff --git a/dbus/dbus-sysdeps-unix.h b/dbus/dbus-sysdeps-unix.h
-index 9b70896..a265b33 100644
---- dbus/dbus-sysdeps-unix.h
-+++ dbus/dbus-sysdeps-unix.h
-@@ -138,6 +138,10 @@ dbus_bool_t _dbus_parse_uid (const DBusString *uid_str,
-
- void _dbus_close_all (void);
-
-+dbus_bool_t _dbus_append_address_from_socket (int fd,
-+ DBusString *address,
-+ DBusError *error);
-+
- /** @} */
-
- DBUS_END_DECLS
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 9571d5ae0e..cd627263a7 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,9 +1,9 @@
# Template file for 'dbus'
#
-_systemd_version=204
+_systemd_version=208
pkgname=dbus
-version=1.6.18
+version=1.8.0
revision=1
short_desc="Message bus system"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,33 +13,38 @@ distfiles="
${homepage}/releases/dbus/dbus-${version}.tar.gz
http://www.freedesktop.org/software/systemd/systemd-${_systemd_version}.tar.xz"
checksum="
- 7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd
- 072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b"
+ 769f8c7282b535ccbe610f63a5f14137a5549834b0b0c8a783e90891b8d70b13
+ aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390"
create_wrksrc=yes
-hostmakedepends="pkg-config intltool gperf"
+hostmakedepends="pkg-config intltool gperf xmlto"
makedepends="expat-devel libX11-devel libcap-devel"
+conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
-if [ "$CROSS_BUILD" ]; then
- _systemddir="$XBPS_CROSS_BASE"
- hostmakedepends+=" libtool automake gettext-devel libgcrypt-devel"
-else
- _systemddir="/usr"
+# Package build options
+build_options="systemd"
+desc_option_systemd="Enable support for systemd"
+
+# Disable systemd option for *-musl.
+case "$XBPS_TARGET_MACHINE" in
+ *-musl) ;;
+ *) build_options_default="systemd";;
+esac
+
+if [ "$build_option_systemd" ]; then
+ if [ "$CROSS_BUILD" ]; then
+ _systemddir="$XBPS_CROSS_BASE"
+ _confargs="--host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE"
+ hostmakedepends+=" libtool automake gettext-devel libgcrypt-devel"
+ else
+ _systemddir="/usr"
+ fi
fi
-pre_configure() {
- cd dbus-${version}
- patch -Np0 -i ${FILESDIR}/systemd-user-session.patch
-
+_dbus_bootstrap() {
# Build a temporary dbus; we are only interested in libdbus.
- cd ${wrksrc}
- [ ! -d dbus-bootstrap ] && mkdir dbus-bootstrap
- cd dbus-bootstrap
-
- if [ "$CROSS_BUILD" ]; then
- _confargs="--host=$XBPS_CROSS_TRIPLET
- --with-libtool-sysroot=$XBPS_CROSS_BASE"
- fi
+ mkdir ${wrksrc}/dbus-bootstrap
+ cd ${wrksrc}/dbus-bootstrap
../dbus-${version}/configure ${_confargs} \
--prefix=${wrksrc}/tmpbuild/usr \
@@ -47,23 +52,25 @@ pre_configure() {
--enable-abstract-sockets ac_cv_have_abstract_sockets=yes
make ${makejobs}
make install
+}
+_systemd_bootstrap() {
# Build a temporary systemd; we are only interested in libsystemd-login.
- if [ "$CROSS_BUILD" ]; then
- cd ${wrksrc}/systemd-${_systemd_version}
- autoreconf -fi
+ if [ ! -d ${wrksrc}/systemd-bootstrap ]; then
+ if [ "$CROSS_BUILD" ]; then
+ cd ${wrksrc}/systemd-${_systemd_version}
+ autoreconf -fi
+ fi
+ mkdir ${wrksrc}/systemd-bootstrap
fi
-
- cd ${wrksrc}
- [ ! -d systemd-bootstrap ] && mkdir systemd-bootstrap
- cd systemd-bootstrap
+ cd ${wrksrc}/systemd-bootstrap
unset PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_PATH
env PKG_CONFIG_LIBDIR=${wrksrc}/tmpbuild/usr/lib/pkgconfig \
../systemd-${_systemd_version}/configure ${_confargs} \
--prefix=/usr --disable-nls \
- --enable-introspection=no --disable-kmod --disable-blkid \
+ --disable-introspection --disable-kmod --disable-blkid \
--disable-ima --disable-chkconfig --disable-selinux \
--disable-xz --disable-tcpwrap --disable-pam \
--disable-acl --disable-xattr --disable-gcrypt \
@@ -89,23 +96,39 @@ pre_configure() {
${_systemddir}/lib/pkgconfig/
}
+pre_configure() {
+ if [ "$build_option_systemd" ]; then
+ if [ ! -f ${wrksrc}/dbus_bootstrap_done ]; then
+ _dbus_bootstrap
+ touch -f ${wrksrc}/dbus_bootstrap_done
+ fi
+ if [ ! -f ${wrksrc}/systemd_bootstrap_done ]; then
+ _systemd_bootstrap
+ touch -f ${wrksrc}/systemd_bootstrap_done
+ fi
+ fi
+}
+
do_configure() {
cd ${wrksrc}/dbus-${version}
- if [ "$CROSS_BUILD" ]; then
- autoreconf -fi
- export PKG_CONFIG_LIBDIR="${_systemddir}/lib/pkgconfig"
+ if [ "$build_option_systemd" ]; then
+ if [ "$CROSS_BUILD" ]; then
+ autoreconf -fi
+ export PKG_CONFIG_LIBDIR="${_systemddir}/lib/pkgconfig"
+ fi
fi
+
./configure ${configure_args} \
--disable-selinux --enable-userdb-cache --with-xml=expat \
--disable-dnotify --enable-inotify --with-dbus-user=dbus \
- --disable-doxygen-docs --disable-xml-docs --disable-static \
+ --disable-doxygen-docs --enable-xml-docs --disable-static \
--disable-tests --enable-epoll --disable-asserts \
--with-system-socket=/run/dbus/system_bus_socket \
--with-system-pid-file=/run/dbus/pid \
--with-console-auth-dir=/run/console/ \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
- --enable-abstract-sockets --enable-systemd \
+ --enable-abstract-sockets \
ac_cv_have_abstract_sockets=yes
}
@@ -119,13 +142,15 @@ do_install() {
make DESTDIR=${DESTDIR} install
# Remove systemd temp files from masterdir.
- rm -f ${_systemddir}/lib/pkgconfig/libsystemd-*
- rm -rf ${_systemddir}/include/systemd
- rm -f ${_systemddir}/lib/libsystemd-*
+ if [ "$build_option_systemd" ]; then
+ rm -f ${_systemddir}/lib/pkgconfig/libsystemd-*
+ rm -rf ${_systemddir}/include/systemd
+ rm -f ${_systemddir}/lib/libsystemd-*
+ fi
}
dbus-devel_package() {
- depends="expat-devel dbus-libs>=${version}"
+ depends="expat-devel dbus-libs>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -151,10 +176,3 @@ dbus-x11_package() {
vmove usr/share/man/man1/dbus-launch.1
}
}
-
-dbus_package() {
- conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template
index 3b9c34965e..2d6218bef0 100644
--- a/srcpkgs/dconf/template
+++ b/srcpkgs/dconf/template
@@ -36,9 +36,3 @@ dconf-editor_package() {
vmove usr/share/man/man1/dconf-editor.1
}
}
-
-dconf_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template
index ab8b33199f..6ff1727733 100644
--- a/srcpkgs/dcron/template
+++ b/srcpkgs/dcron/template
@@ -2,6 +2,10 @@
pkgname=dcron
version=4.5
revision=19
+conf_files="/var/spool/cron/root"
+replaces="cron-daemon>=0"
+provides="cron-daemon-0"
+systemd_services="dcron.service on"
short_desc="Dillon's lightweight cron daemon"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.jimpryor.net/linux/dcron.html"
@@ -34,15 +38,3 @@ do_install() {
# crontab must be setuid for all users to work!
chmod 4755 ${DESTDIR}/usr/bin/crontab
}
-
-dcron_package() {
- conf_files="/var/spool/cron/root"
- replaces="cron-daemon>=0"
- provides="cron-daemon-0"
- systemd_services="dcron.service on"
- pkg_install() {
- vmove etc
- vmove usr
- vmove var
- }
-}
diff --git a/srcpkgs/ddrescue/template b/srcpkgs/ddrescue/template
index 1ada024271..1d6c5f4c43 100644
--- a/srcpkgs/ddrescue/template
+++ b/srcpkgs/ddrescue/template
@@ -14,9 +14,3 @@ checksum=bef96c181b031cc7de9d02c0aec2e8dbf860d149fa2f35f967448a48ffd2752f
do_configure() {
./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS"
}
-
-ddrescue_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index e684ef322d..09426b7f43 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,30 +1,25 @@
# Template file for 'deadbeef'.
pkgname=deadbeef
-version=0.5.6
-revision=2
+version=0.6.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static --enable-gtk3 --disable-gtk2"
-makedepends="pkg-config intltool gtk+3-devel libSM-devel libICE-devel
+hostmakedepends="pkg-config intltool yasm"
+makedepends="desktop-file-utils hicolor-icon-theme libSM-devel libICE-devel
alsa-lib-devel ffmpeg-devel libvorbis-devel libcurl-devel imlib2-devel
libjpeg-turbo-devel libpng-devel libmad-devel libflac-devel wavpack-devel
libsndfile-devel libcdio-devel libcddb-devel libX11-devel dbus-devel
- pulseaudio-devel faad2-devel libsamplerate-devel yasm"
+ pulseaudio-devel faad2-devel libsamplerate-devel glu-devel gtk+3-devel"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="Ultimate Music Player For GNU/Linux"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2,LGPL-2.1"
homepage="http://deadbeef.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=17c123eb50e33c89403d8d3035b9132463a227a6905fd42bcbb2a3a5616cea5b
+checksum=78a684bd50f3bae2cb3913a7d9c1b06549d0718b37f923fbb0ea523fd9e7826a
post_install() {
vinstall ${FILESDIR}/deadbeef-queue.desktop 644 usr/share/applications
# Remove devel stuff.
rm -rf ${DESTDIR}/usr/include
}
-
-deadbeef_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template
index 31af088a61..aa0c37a023 100644
--- a/srcpkgs/deheader/template
+++ b/srcpkgs/deheader/template
@@ -2,7 +2,9 @@
pkgname=deheader
version=0.6
revision=2
+noarch="yes"
makedepends="python"
+depends="python"
short_desc="C and C++ header analyzer"
homepage="http://www.catb.org/~esr/deheader/"
license="BSD"
@@ -16,16 +18,6 @@ long_desc="
sometimes exposes dependencies and cohesions of which developers were unaware."
do_install() {
- install -d ${DESTDIR}/usr/bin
- install -d ${DESTDIR}/usr/share/man/man1
- install -m755 deheader ${DESTDIR}/usr/bin
- install -m644 deheader.1 ${DESTDIR}/usr/share/man/man1
-}
-
-deheader_package() {
- depends="python"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
+ vinstall deheader 755 usr/bin
+ vinstall deheader.1 644 usr/share/man/man1
}
diff --git a/srcpkgs/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template
index 299d1eebdb..b279da199a 100644
--- a/srcpkgs/dejavu-fonts-ttf/template
+++ b/srcpkgs/dejavu-fonts-ttf/template
@@ -10,6 +10,9 @@ distfiles="${SOURCEFORGE_SITE}/dejavu/$pkgname-$version.tar.bz2"
checksum=d0a72c3ae99f5b8d7470daf091ec43f78dc942795aed5c996ab1aa678702eb5d
makedepends="font-util xbps-triggers>=0.58"
+depends="${makedepends}"
+noarch="yes"
+font_dirs="/usr/share/fonts/TTF"
do_install() {
vmkdir usr/share/fonts/TTF
@@ -19,12 +22,3 @@ do_install() {
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-dejavu-fonts-ttf_package() {
- depends="${makedepends}"
- noarch="yes"
- font_dirs="/usr/share/fonts/TTF"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/desktop-file-utils/template b/srcpkgs/desktop-file-utils/template
index 10ea86eb77..15c5d7dec2 100644
--- a/srcpkgs/desktop-file-utils/template
+++ b/srcpkgs/desktop-file-utils/template
@@ -16,9 +16,3 @@ long_desc="
with desktop entries and the applications database. More specifically,
it contains the update-desktop-database utility, used to rebuild the database
that connects MIME types to applications."
-
-desktop-file-utils_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/desmume/patches/glx_3Demu.cpp.patch b/srcpkgs/desmume/patches/glx_3Demu.cpp.patch
new file mode 100644
index 0000000000..544b5b5822
--- /dev/null
+++ b/srcpkgs/desmume/patches/glx_3Demu.cpp.patch
@@ -0,0 +1,16 @@
+Function returning void should not return a value :-)
+
+--- src/gtk/glx_3Demu.cpp.orig 2014-02-01 16:26:52.801231527 +0100
++++ src/gtk/glx_3Demu.cpp 2014-02-01 16:27:17.632357063 +0100
+@@ -41,11 +41,7 @@ void deinit_glx_3Demu(void)
+ glXDestroyContext(dpy, ctx);
+
+ XCloseDisplay(dpy);
+-
+- return true;
+ }
+-
+- return false;
+ }
+
+ int init_glx_3Demu(void)
diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index d493c243eb..81611067ef 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,31 +1,16 @@
# Template file for 'desmume'
pkgname=desmume
-version=0.9.9
+version=0.9.10
revision=1
build_style=gnu-configure
configure_args="--enable-wifi --enable-hud --disable-openal"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool SDL-devel"
makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel
agg-devel zziplib-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="Nintendo DS emulator"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.desmume.org"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=cd2ad70cdde1236eba5a4ff8cea838f42b7dc470e32ac938263f49f12a55d754
-
-if [ "$CROSS_BUILD" ]; then
- # XXX needs sdl-config
- hostmakedepends+=" SDL-devel"
-fi
-
-pre_configure() {
- sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in
-}
-
-desmume_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
+checksum=8900a7a1fc849fdd33b014748dd97a6cda4c32548b8d2e06511e6ed8d5ba7445
diff --git a/srcpkgs/dev86/template b/srcpkgs/dev86/template
index 2f0b62c2e4..d6036315ee 100644
--- a/srcpkgs/dev86/template
+++ b/srcpkgs/dev86/template
@@ -2,7 +2,9 @@
pkgname=dev86
version=0.16.19
revision=1
+nostrip=yes
makedepends="bin86"
+depends="${makedepends}"
short_desc="8086 cross development compiler, assembler and linker"
homepage="http://www.debath.co.uk/dev86/"
license="GPL+, GPL-2+, LGPL-2+"
@@ -29,11 +31,3 @@ do_install() {
rm -f ${DESTDIR}/usr/bin/{as,ld,nm,objdump,size}86
rm -f ${DESTDIR}/usr/share/man/man1/{as,ld}86.1
}
-
-dev86_package() {
- depends="bin86"
- nostrip=yes
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 33643ce90d..0a3807264b 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -41,9 +41,3 @@ devhelp-gedit-plugin_package() {
vmove usr/lib/gedit
}
}
-
-devhelp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dfc-git/template b/srcpkgs/dfc-git/template
new file mode 100644
index 0000000000..12555bb7b0
--- /dev/null
+++ b/srcpkgs/dfc-git/template
@@ -0,0 +1,16 @@
+# Template file for 'dfc-git'
+pkgname=dfc-git
+version=20140105
+revision=1
+build_style=cmake
+hostmakedepends="cmake"
+short_desc="Display file system space usage using graphs and colors"
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+license="BSD"
+homepage="http://projects.gw-computing.net/projects/dfc"
+
+do_fetch() {
+ local url="git://gw-computing.net/dfc"
+ msg_normal "Fetching source from $url ...\n"
+ git clone ${url} ${pkgname}-${version}
+}
diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template
index afea4c66d7..6f56269a8c 100644
--- a/srcpkgs/dgen-sdl/template
+++ b/srcpkgs/dgen-sdl/template
@@ -14,9 +14,3 @@ checksum=efc61733dae4f5f5e74930a25f5632ff5732ecbcabf50f189c10e5e024c5fb45
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-dgen-sdl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dhcpcd-dbus/template b/srcpkgs/dhcpcd-dbus/template
index 85def49e1a..f5f658801d 100644
--- a/srcpkgs/dhcpcd-dbus/template
+++ b/srcpkgs/dhcpcd-dbus/template
@@ -3,7 +3,9 @@ pkgname=dhcpcd-dbus
version=0.4.2
revision=3
build_style=gnu-makefile
-makedepends="pkg-config dbus-devel dhcpcd dbus"
+hostmakedepends="pkg-config"
+makedepends="dbus-devel dhcpcd dbus"
+depends="dhcpcd dbus"
short_desc="dhcpcd D-Bus interface"
homepage="http://roy.marples.name/projects/dhcpcd-dbus"
license="BSD"
@@ -13,11 +15,3 @@ checksum=beaf6c45b0066530576d44357ae8a4b32dd036c200910eb5ca5364dc8d4dc996
long_desc="
dhcpcd-dbus is the dhcpcd D-Bus interface, receives interface configuration
events from the dhcpcd control socket and emits them to the DBus listeners."
-
-dhcpcd-dbus_package() {
- depends="dhcpcd dbus"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 5d4fd817f3..ac9a6dd1ae 100644
--- a/srcpkgs/dhcpcd-gtk/template
+++ b/srcpkgs/dhcpcd-gtk/template
@@ -6,6 +6,7 @@ wrksrc=dhcpcd-ui-${version}
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtk+-devel libnotify-devel dbus-devel dhcpcd dhcpcd-dbus"
+depends="dhcpcd dhcpcd-dbus"
short_desc="GTK+ monitor and configuration GUI for dhcpcd"
homepage="http://roy.marples.name/projects/dhcpcd-ui"
license="BSD"
@@ -24,10 +25,3 @@ long_desc="
A drop down menu shows available Access Points, which one your connected
to, if they're encrypted or not and their overall quality. You can click
on one to configure the PSK or WEP key 0 for it."
-
-dhcpcd-gtk_package() {
- depends="dhcpcd dhcpcd-dbus"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dhcpcd/files/dhcpcd@.service b/srcpkgs/dhcpcd/files/dhcpcd@.service
index 8dca5c3dbe..a33d235d1d 100644
--- a/srcpkgs/dhcpcd/files/dhcpcd@.service
+++ b/srcpkgs/dhcpcd/files/dhcpcd@.service
@@ -8,7 +8,7 @@ After=sys-subsystem-net-devices-%i.device
[Service]
Type=forking
PIDFile=/run/dhcpcd-%I.pid
-ExecStart=/usr/sbin/dhcpcd -q -w %I
+ExecStart=/usr/sbin/dhcpcd -q -w %I -e "wpa_supplicant_conf=/etc/wpa_supplicant/wpa_supplicant-%I.conf"
ExecStop=/usr/sbin/dhcpcd -x %I
[Install]
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index f873dec17d..e9f21c5df2 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,27 +1,21 @@
# Template file for 'dhcpcd'
pkgname=dhcpcd
-version=6.1.0
-revision=1
+version=6.2.0
+revision=3
build_style=configure
-configure_args="--prefix=/usr --libexecdir=/usr/lib
- --sysconfdir=/etc --rundir=/run"
-hostmakedepends="which ntp"
+configure_args="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --rundir=/run"
+hostmakedepends="which ntp pkg-config"
+makedepends="libudev-devel"
+conf_files="/etc/dhcpcd.conf"
short_desc="RFC2131 compliant DHCP client"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Simplified BSD"
homepage="http://roy.marples.name/projects/dhcpcd"
distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2"
-checksum=71735bcc2e740f37865a985fe32eaa9da5bf557e8b74b214d8099cac878cab64
+checksum=16ef25e8b6b15dcc0e53ff97a131b09828723dffb12a885f0da91b275296b362
post_install() {
chmod 755 ${DESTDIR}/usr/sbin/dhcpcd
vinstall ${FILESDIR}/dhcpcd.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/dhcpcd@.service 644 usr/lib/systemd/system
}
-
-dhcpcd_package() {
- conf_files="/etc/dhcpcd.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index eca569b2a6..b4b83c874e 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,28 +1,20 @@
# Template file for 'dialog'
pkgname=dialog
_distver=1.2
-_date=20130523
+_date=20140112
version=${_distver}.${_date}
revision=1
wrksrc=${pkgname}-${_distver}-${_date}
build_style=gnu-configure
-configure_args="--with-ncursesw --enable-nls"
+configure_args="--with-ncursesw --disable-nls"
makedepends="ncurses-devel"
short_desc="A tool to display dialog boxes from shell scripts"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
homepage="http://invisible-island.net/dialog/"
distfiles="ftp://invisible-island.net/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=c8d114b7698022bcbd6c88f3c0b2296b0e846c60c5ed6bd28f86dd72b94fd36d
-long_desc="
- Dialog is a program that will let you to present a variety of questions
- or display messages using dialog boxes from a shell script. Currently,
- these types of dialog boxes are implemented:
- yes/no box, menu box, input box, message box, text box, info box,
- guage box, checklist box, and radiolist box."
+checksum=8d30043872c57d4d3b3b05e4390ece356843f2a71303c91a2f8a536b369e0077
-dialog_package() {
- pkg_install() {
- vmove all
- }
+post_install() {
+ rm -r ${DESTDIR}/usr/lib
}
diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template
index f58051246c..7c219e4a2b 100644
--- a/srcpkgs/diffutils/template
+++ b/srcpkgs/diffutils/template
@@ -3,6 +3,7 @@ pkgname=diffutils
version=3.3
revision=1
build_style=gnu-configure
+conflicts="chroot-diffutils>=0"
short_desc="The GNU diff utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/diffutils"
@@ -14,10 +15,3 @@ long_desc="
features are a superset of the Unix features and they are significantly
faster. Cmp has been moved into this package from the GNU textutils package.
These programs are usually used for creating patch files."
-
-diffutils_package() {
- conflicts="chroot-diffutils>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 62f7935123..f7eb6e0923 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -5,6 +5,10 @@ revision=5
build_style=gnu-configure
configure_args="--disable-Werror"
makedepends="pkg-config python-devel popt-devel avahi-libs-devel"
+conflicts="chroot-distcc>=0"
+conf_files="
+ /etc/distcc/hosts
+ /etc/distcc/clients.allow"
short_desc="Distributed compilation for faster C/C++ builds"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://code.google.com/p/distcc"
@@ -30,7 +34,7 @@ post_install() {
distcc-pump_package() {
depends="distcc-${version}_${revision}"
- short_desc="${short_desc} -- Pump mode support files"
+ short_desc+=" - Pump mode support files"
pycompile_module="include_server"
pkg_install() {
vmove usr/bin/pump
@@ -40,14 +44,3 @@ distcc-pump_package() {
vmove usr/share/doc/distcc/README.pump
}
}
-
-distcc_package() {
- conflicts="chroot-distcc>=0"
- conf_files="
- /etc/distcc/hosts
- /etc/distcc/clients.allow"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/djmount/template b/srcpkgs/djmount/template
index 785d9434c6..0b4a479613 100644
--- a/srcpkgs/djmount/template
+++ b/srcpkgs/djmount/template
@@ -23,9 +23,3 @@ do_install() {
vinstall djmount/djmount 755 usr/bin
vinstall djmount.1 644 usr/share/man/man1
}
-
-djmount_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template
index 4e3c8d330c..c1df80f164 100644
--- a/srcpkgs/djvulibre/template
+++ b/srcpkgs/djvulibre/template
@@ -27,10 +27,3 @@ djvulibre-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-djvulibre_package() {
- pkg_install() {
- vmove usr/bin
- vmove usr/share
- }
-}
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 05a076d62a..5730cdd84b 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -2,6 +2,9 @@
pkgname=dkms
version=2.2.0.3
revision=5
+noarch="yes"
+conf_files="/etc/dkms/framework.conf"
+depends="bash kmod gcc make coreutils linux-headers"
homepage="http://linux.dell.com/dkms"
distfiles="${homepage}/permalink/dkms-$version.tar.gz"
short_desc="Dynamic Kernel Modules System"
@@ -25,12 +28,3 @@ do_install() {
vinstall ${FILESDIR}/kernel.d/dkms.prerm 750 \
etc/kernel.d/pre-remove 20-dkms
}
-
-dkms_package() {
- conf_files="/etc/dkms/framework.conf"
- noarch="yes"
- depends="bash kmod gcc make coreutils linux-headers"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template
index d41f07128f..f313a6b189 100644
--- a/srcpkgs/dmd/template
+++ b/srcpkgs/dmd/template
@@ -17,6 +17,7 @@ elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
fi
hostmakedepends="unzip"
+depends="libphobos>=${version} gcc"
do_build() {
cd src
@@ -69,10 +70,3 @@ libphobos_package() {
vinstall ${wrksrc}/src/druntime/LICENSE 644 usr/share/licenses/libphobos
}
}
-
-dmd_package() {
- depends="libphobos>=${version} gcc"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template
index 30ea8d4330..a9a8453001 100644
--- a/srcpkgs/dmenu/template
+++ b/srcpkgs/dmenu/template
@@ -30,9 +30,3 @@ do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-dmenu_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template
index 7a47f1eea8..99394068ae 100644
--- a/srcpkgs/dmidecode/template
+++ b/srcpkgs/dmidecode/template
@@ -21,9 +21,3 @@ long_desc="
This will often include usage status for the CPU sockets, expansion
slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of
I/O ports (e.g. serial, parallel, USB)."
-
-dmidecode_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dmraid/template b/srcpkgs/dmraid/template
index 1aa6102ac3..295810f8c4 100644
--- a/srcpkgs/dmraid/template
+++ b/srcpkgs/dmraid/template
@@ -9,6 +9,8 @@ build_wrksrc="${_distver}-${_patchver}/${pkgname}"
build_style=gnu-configure
configure_args="--enable-led --enable-intel_led --enable-shared_lib"
makedepends="device-mapper-devel>=2.02.95_3"
+systemd_services="dmraid.service off"
+depends="device-mapper>=2.02.95_3"
short_desc="Device mapper RAID interface"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -38,11 +40,3 @@ post_install() {
# systemd service.
vinstall ${FILESDIR}/dmraid.service 644 usr/lib/systemd/system
}
-
-dmraid_package() {
- systemd_services="dmraid.service off"
- depends="device-mapper>=2.02.95_3"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dmxproto/template b/srcpkgs/dmxproto/template
index 0e445707a3..2905a22d73 100644
--- a/srcpkgs/dmxproto/template
+++ b/srcpkgs/dmxproto/template
@@ -1,21 +1,15 @@
# Template build file for 'dmxproto'.
pkgname=dmxproto
version=2.3
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
revision=2
+noarch="yes"
+build_style=gnu-configure
short_desc="Distributed Multi-headed X protocol headers from modular X.org"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0
long_desc="
Distributed Multi-headed X protocol headers from modular X.org:
your networked Xinerama."
-
-dmxproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index f004f28917..166c261306 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -4,6 +4,8 @@ version=2.67
revision=1
hostmakedepends="pkg-config"
makedepends="dbus-devel libcap-devel libidn-devel"
+conf_files="/etc/dnsmasq.conf"
+system_accounts="dnsmasq"
short_desc="Lightweight, easy to configure DNS forwarder and DHCP server"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -31,11 +33,3 @@ do_install() {
vinstall ${FILESDIR}/dnsmasq.service 644 usr/lib/systemd/system
vinstall dbus/dnsmasq.conf 644 etc/dbus-1/system.d
}
-
-dnsmasq_package() {
- conf_files="/etc/dnsmasq.conf"
- system_accounts="dnsmasq"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/docbook-dsssl/template b/srcpkgs/docbook-dsssl/template
index f0cb92fa4b..c147272e09 100644
--- a/srcpkgs/docbook-dsssl/template
+++ b/srcpkgs/docbook-dsssl/template
@@ -2,7 +2,10 @@
pkgname=docbook-dsssl
version=1.79
revision=1
+noarch="yes"
makedepends="xmlcatmgr docbook-xml>=4.2"
+depends="${makedepends}"
+sgml_entries="CATALOG /usr/share/sgml/docbook/dsssl/modular/catalog --"
short_desc="DSSSL stylesheets for the DocBook DTD"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.docbook.org/"
@@ -25,12 +28,3 @@ do_install() {
install -d ${DESTDIR}/usr/share/sgml/docbook/dsssl/modular
cp -rp ${wrksrc}/* ${DESTDIR}/usr/share/sgml/docbook/dsssl/modular
}
-
-docbook-dsssl_package() {
- depends="${makedepends}"
- noarch="yes"
- sgml_entries="CATALOG /usr/share/sgml/docbook/dsssl/modular/catalog --"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template
index 3afcb5ea7b..edaf241b65 100644
--- a/srcpkgs/docbook-xml/template
+++ b/srcpkgs/docbook-xml/template
@@ -2,17 +2,30 @@
pkgname=docbook-xml
version=4.5
revision=2
+noarch="yes"
wrksrc="docbook"
+makedepends="bsdtar xmlcatmgr"
+depends="xmlcatmgr"
+xml_entries="
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.2 /usr/share/xml/docbook/4.2
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.3 /usr/share/xml/docbook/4.3
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.4 /usr/share/xml/docbook/4.4
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.5 /usr/share/xml/docbook/4.5
+ rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 /usr/share/xml/docbook/4.2
+ nextCatalog /usr/share/xml/docbook/4.2/catalog --
+ nextCatalog /usr/share/xml/docbook/4.3/catalog --
+ nextCatalog /usr/share/xml/docbook/4.4/catalog --
+ nextCatalog /usr/share/xml/docbook/4.5/catalog --
+ nextCatalog /usr/share/xml/docbook/4.2/catalog-4.1.2 --"
+homepage="http://www.oasis-open.org/docbook/"
+license="MIT"
+short_desc="XML DTD designed for computer documentation"
+maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="
http://www.oasis-open.org/docbook/xml/$version/$pkgname-$version.zip
http://www.oasis-open.org/docbook/xml/4.4/$pkgname-4.4.zip
http://www.oasis-open.org/docbook/xml/4.3/$pkgname-4.3.zip
http://www.oasis-open.org/docbook/xml/4.2/$pkgname-4.2.zip"
-makedepends="bsdtar xmlcatmgr"
-homepage="http://www.oasis-open.org/docbook/"
-license="MIT"
-short_desc="XML DTD designed for computer documentation"
-maintainer="Juan RP <xtraeme@gmail.com>"
checksum="
4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4
02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090
@@ -47,22 +60,3 @@ do_install() {
sed -e 's|V4.2|V4.1.2|g' < ${dir}/catalog > ${dir}/catalog-4.1.2
chmod 644 ${dir}/catalog-4.1.2
}
-
-docbook-xml_package() {
- depends="xmlcatmgr"
- noarch="yes"
- xml_entries="
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.2 /usr/share/xml/docbook/4.2
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.3 /usr/share/xml/docbook/4.3
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.4 /usr/share/xml/docbook/4.4
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.5 /usr/share/xml/docbook/4.5
- rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 /usr/share/xml/docbook/4.2
- nextCatalog /usr/share/xml/docbook/4.2/catalog --
- nextCatalog /usr/share/xml/docbook/4.3/catalog --
- nextCatalog /usr/share/xml/docbook/4.4/catalog --
- nextCatalog /usr/share/xml/docbook/4.5/catalog --
- nextCatalog /usr/share/xml/docbook/4.2/catalog-4.1.2 --"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/docbook-xsl/template b/srcpkgs/docbook-xsl/template
index cbf7c5d7ec..8dbc144ade 100644
--- a/srcpkgs/docbook-xsl/template
+++ b/srcpkgs/docbook-xsl/template
@@ -2,7 +2,10 @@
pkgname=docbook-xsl
version=1.77.1
revision=2
+noarch="yes"
makedepends="xmlcatmgr docbook-xml>=4.2"
+depends="${makedepends}"
+xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --"
short_desc="Docbook XSL modular stylesheet"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://docbook.sourceforge.net/"
@@ -36,12 +39,3 @@ do_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-docbook-xsl_package() {
- depends="${makedepends}"
- noarch="yes"
- xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/docbook/template b/srcpkgs/docbook/template
index 96622bc591..b0bf8129f4 100644
--- a/srcpkgs/docbook/template
+++ b/srcpkgs/docbook/template
@@ -1,6 +1,24 @@
# Template file for 'docbook'
pkgname=docbook
version=4.5
+revision=1
+noarch="yes"
+makedepends="bsdtar xmlcatmgr ISOEnts"
+depends="xmlcatmgr ISOEnts"
+sgml_entries="
+ CATALOG /usr/share/sgml/docbook/2.4.1/catalog --
+ CATALOG /usr/share/sgml/docbook/3.0/catalog --
+ CATALOG /usr/share/sgml/docbook/3.1/catalog --
+ CATALOG /usr/share/sgml/docbook/4.0/catalog --
+ CATALOG /usr/share/sgml/docbook/4.1/catalog --
+ CATALOG /usr/share/sgml/docbook/4.2/catalog --
+ CATALOG /usr/share/sgml/docbook/4.3/catalog --
+ CATALOG /usr/share/sgml/docbook/4.4/catalog --
+ CATALOG /usr/share/sgml/docbook/4.5/catalog --"
+short_desc="SGML DTD designed for computer documentation"
+homepage="http://www.docbook.org"
+license="Copyright only"
+maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="
http://www.docbook.org/sgml/$version/$pkgname-$version.zip
http://www.docbook.org/sgml/4.4/$pkgname-4.4.zip
@@ -11,12 +29,6 @@ distfiles="
http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
http://www.oasis-open.org/docbook/sgml/2.4.1/docbk241.zip"
-makedepends="bsdtar xmlcatmgr ISOEnts"
-revision=1
-short_desc="SGML DTD designed for computer documentation"
-homepage="http://www.docbook.org"
-license="Copyright only"
-maintainer="Juan RP <xtraeme@gmail.com>"
checksum="
8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43
0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c
@@ -56,21 +68,3 @@ do_install() {
install -m644 ${FILESDIR}/catalog${vernodot} ${dir}/catalog
done
}
-
-docbook_package() {
- depends="xmlcatmgr ISOEnts"
- noarch="yes"
- sgml_entries="
-CATALOG /usr/share/sgml/docbook/2.4.1/catalog --
-CATALOG /usr/share/sgml/docbook/3.0/catalog --
-CATALOG /usr/share/sgml/docbook/3.1/catalog --
-CATALOG /usr/share/sgml/docbook/4.0/catalog --
-CATALOG /usr/share/sgml/docbook/4.1/catalog --
-CATALOG /usr/share/sgml/docbook/4.2/catalog --
-CATALOG /usr/share/sgml/docbook/4.3/catalog --
-CATALOG /usr/share/sgml/docbook/4.4/catalog --
-CATALOG /usr/share/sgml/docbook/4.5/catalog --"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/docbook2x/template b/srcpkgs/docbook2x/template
index 02983fff8b..4c34b4b586 100644
--- a/srcpkgs/docbook2x/template
+++ b/srcpkgs/docbook2x/template
@@ -6,6 +6,10 @@ patch_args="-Np1"
wrksrc="docbook2X-${version}"
build_style=gnu-configure
makedepends="texinfo libxslt docbook docbook-dsssl docbook-xsl perl-XML-SAX"
+depends="${makedepends}"
+xml_entries="
+ nextCatalog /usr/share/docbook2X/dtd/catalog.xml --
+ nextCatalog /usr/share/docbook2X/xslt/catalog.xml --"
short_desc="DocBook converter to UNIX manpage and GNU Texinfo format"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://docbook2x.sourceforge.net"
@@ -19,13 +23,3 @@ long_desc="
post_install() {
sed -i -e 's|${prefix}|/usr|g' ${DESTDIR}/usr/bin/*
}
-
-docbook2x_package() {
- depends="${makedepends}"
- xml_entries="
-nextCatalog /usr/share/docbook2X/dtd/catalog.xml --
-nextCatalog /usr/share/docbook2X/xslt/catalog.xml --"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index af7e6cfa5b..976a824d48 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -8,6 +8,7 @@ makedepends="
zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel>=1.8
SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel>=2.1 libgomp-devel
libopenal-devel soundtouch-devel lzo-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A Gamecube / Wii / Triforce emulator"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -18,10 +19,3 @@ checksum=9ee1cbb671ff45b1d9300f5d726787ccdf06214d0b82c91587890a9bcd3a49c5
post_install() {
rm -f ${DESTDIR}/usr/lib/*.a
}
-
-dolphin-emu_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dosbox/template b/srcpkgs/dosbox/template
index 73bfe13473..651707a9cd 100644
--- a/srcpkgs/dosbox/template
+++ b/srcpkgs/dosbox/template
@@ -31,8 +31,3 @@ post_install() {
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
}
-dosbox_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dosfstools/patches/dosfstools-loff_and_BLOCK_SIZE.patch b/srcpkgs/dosfstools/patches/dosfstools-loff_and_BLOCK_SIZE.patch
new file mode 100644
index 0000000000..6c5d6c7d25
--- /dev/null
+++ b/srcpkgs/dosfstools/patches/dosfstools-loff_and_BLOCK_SIZE.patch
@@ -0,0 +1,31 @@
+--- src/fsck.fat.h
++++ src/fsck.fat.h
+@@ -27,6 +27,7 @@
+ #ifndef _DOSFSCK_H
+ #define _DOSFSCK_H
+
++#include <fcntl.h>
+ #include <sys/types.h>
+ #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */
+ #define _LINUX_STRING_H_ /* hack to avoid inclusion of <linux/string.h> */
+--- src/io.h
++++ src/io.h
+@@ -27,7 +27,7 @@
+ #ifndef _IO_H
+ #define _IO_H
+
+-#include <sys/types.h> /* for loff_t */
++#include <fcntl.h> /* for loff_t */
+
+ loff_t llseek(int fd, loff_t offset, int whence);
+
+--- src/mkfs.fat.c
++++ src/mkfs.fat.c
+@@ -49,6 +49,7 @@
+ #include <fcntl.h>
+ #include <linux/hdreg.h>
+ #include <sys/mount.h>
++#include <linux/fs.h>
+ #include <linux/fd.h>
+ #include <endian.h>
+ #include <mntent.h>
diff --git a/srcpkgs/dosfstools/template b/srcpkgs/dosfstools/template
index f92a72e581..bbcd00608a 100644
--- a/srcpkgs/dosfstools/template
+++ b/srcpkgs/dosfstools/template
@@ -1,6 +1,6 @@
# Template file for 'dosfstools'
pkgname=dosfstools
-version=3.0.24
+version=3.0.25
revision=1
build_style=gnu-makefile
make_install_args="PREFIX=/usr SBINDIR=/usr/bin"
@@ -9,14 +9,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.daniel-baumann.ch/software/$pkgname"
license="GPL-2"
distfiles="http://daniel-baumann.ch/files/software/dosfstools/dosfstools-${version}.tar.xz"
-checksum=1e21b7e7c8872fb3debf2a7fdc8c223a5f592a6efa8ae181a92f558ed28274c1
-long_desc="
- The dosfstools package includes the mkdosfs (a.k.a. mkfs.dos and mkfs.vfat)
- and dosfsck (a.k.a. fsck.msdos and fsck.vfat) utilities, which respectively
- make and check MS-DOS FAT filesystems on hard drives or on floppies."
-
-dosfstools_package() {
- pkg_install() {
- vmove all
- }
-}
+checksum=1d4912860e88fa829314c7824821b502a66460afc5f4bb963dd149e9ee430320
diff --git a/srcpkgs/dotconf/template b/srcpkgs/dotconf/template
index 5031f73791..bf0aef3420 100644
--- a/srcpkgs/dotconf/template
+++ b/srcpkgs/dotconf/template
@@ -16,18 +16,12 @@ pre_configure() {
autoreconf -i
}
-dotconf_package() {
- pkg_install() {
- vmove all
- }
-}
-
dotconf-devel_package() {
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
-}
\ No newline at end of file
+}
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 639d77c832..bdb111eec0 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -39,6 +39,36 @@ fi
makedepends="zlib-devel bzip2-devel openssl-devel mit-krb5-devel
libmysqlclient-devel>=5.5.27 postgresql-libs-devel sqlite-devel
libldap-devel libcap-devel pam-devel libcurl-devel expat-devel"
+# For SSL support.
+depends="openssl>=0 shadow"
+systemd_services="dovecot.service true"
+system_accounts="dovecot dovenull"
+dovecot_homedir="/var/chroot"
+dovenull_homedir="/var/chroot"
+conf_files="
+ /etc/dovecot/conf.d/10-auth.conf
+ /etc/dovecot/conf.d/10-director.conf
+ /etc/dovecot/conf.d/10-logging.conf
+ /etc/dovecot/conf.d/10-mail.conf
+ /etc/dovecot/conf.d/10-master.conf
+ /etc/dovecot/conf.d/10-ssl.conf
+ /etc/dovecot/conf.d/15-lda.conf
+ /etc/dovecot/conf.d/20-imap.conf
+ /etc/dovecot/conf.d/20-lmtp.conf
+ /etc/dovecot/conf.d/20-pop3.conf
+ /etc/dovecot/conf.d/90-acl.conf
+ /etc/dovecot/conf.d/90-plugin.conf
+ /etc/dovecot/conf.d/90-quota.conf
+ /etc/dovecot/conf.d/auth-checkpassword.conf.ext
+ /etc/dovecot/conf.d/auth-deny.conf.ext
+ /etc/dovecot/conf.d/auth-master.conf.ext
+ /etc/dovecot/conf.d/auth-passwdfile.conf.ext
+ /etc/dovecot/conf.d/auth-sql.conf.ext
+ /etc/dovecot/conf.d/auth-static.conf.ext
+ /etc/dovecot/conf.d/auth-system.conf.ext
+ /etc/dovecot/conf.d/auth-vpopmail.conf.ext
+ /etc/dovecot/dovecot.conf
+ /etc/ssl/dovecot-openssl.cnf"
post_install() {
local econfdir=usr/share/doc/dovecot/example-config
@@ -100,39 +130,3 @@ dovecot-plugin-sqlite_package() {
vmove usr/lib/dovecot/modules/libdriver_sqlite.so
}
}
-
-dovecot_package() {
- systemd_services="dovecot.service true"
- system_accounts="dovecot dovenull"
- dovecot_homedir="/var/chroot"
- dovenull_homedir="/var/chroot"
- conf_files="
- /etc/dovecot/conf.d/10-auth.conf
- /etc/dovecot/conf.d/10-director.conf
- /etc/dovecot/conf.d/10-logging.conf
- /etc/dovecot/conf.d/10-mail.conf
- /etc/dovecot/conf.d/10-master.conf
- /etc/dovecot/conf.d/10-ssl.conf
- /etc/dovecot/conf.d/15-lda.conf
- /etc/dovecot/conf.d/20-imap.conf
- /etc/dovecot/conf.d/20-lmtp.conf
- /etc/dovecot/conf.d/20-pop3.conf
- /etc/dovecot/conf.d/90-acl.conf
- /etc/dovecot/conf.d/90-plugin.conf
- /etc/dovecot/conf.d/90-quota.conf
- /etc/dovecot/conf.d/auth-checkpassword.conf.ext
- /etc/dovecot/conf.d/auth-deny.conf.ext
- /etc/dovecot/conf.d/auth-master.conf.ext
- /etc/dovecot/conf.d/auth-passwdfile.conf.ext
- /etc/dovecot/conf.d/auth-sql.conf.ext
- /etc/dovecot/conf.d/auth-static.conf.ext
- /etc/dovecot/conf.d/auth-system.conf.ext
- /etc/dovecot/conf.d/auth-vpopmail.conf.ext
- /etc/dovecot/dovecot.conf
- /etc/ssl/dovecot-openssl.cnf"
- # For SSL support.
- depends="openssl>=0 shadow"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index b6713dfc67..4565c3a6ec 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -31,9 +31,3 @@ doxygen-gui_package() {
vmove usr/share/man/man1/doxywizard.1
}
}
-
-doxygen_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 0510c69161..5a0f0ffe53 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,15 +1,20 @@
# Template file for 'dracut'
pkgname=dracut
-version=034
-revision=2
+version=036
+revision=1
hostmakedepends="libxslt docbook-xsl asciidoc"
makedepends="psmisc cpio xz systemd"
+depends="${makedepends}"
+conf_files="/etc/dracut.conf"
+make_dirs="
+ /etc/dracut.conf.d 0755 root root
+ /usr/lib/dracut/dracut.conf.d 0755 root root"
homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
short_desc="A new initramfs infrastructure"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
-checksum=6a03d054f78bdf6e0ff6b66f374a24381fe12537f9e86a383f4486db48d1caeb
+checksum=6dd97c4323ec8bd87b24a95349692fb6c6ca2d1b3528793ef117820049b6fcd3
do_build() {
make ${makejobs} sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system
@@ -37,14 +42,3 @@ dracut-network_package() {
done
}
}
-
-dracut_package() {
- depends="${makedepends}"
- conf_files="/etc/dracut.conf"
- make_dirs="
- /etc/dracut.conf.d 0755 root root
- /usr/lib/dracut/dracut.conf.d 0755 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dri2proto/template b/srcpkgs/dri2proto/template
index 0f12fc806a..65fbf80bc3 100644
--- a/srcpkgs/dri2proto/template
+++ b/srcpkgs/dri2proto/template
@@ -2,6 +2,7 @@
pkgname=dri2proto
version=2.8
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="Direct Rendering Interface 2 prototypes"
homepage="http://xorg.freedesktop.org"
@@ -9,12 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04
-long_desc="
- Definitions needed by Direct Rendering Interface version 2."
-
-dri2proto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dri3proto/template b/srcpkgs/dri3proto/template
index a56b0b9619..56c62f5e1a 100644
--- a/srcpkgs/dri3proto/template
+++ b/srcpkgs/dri3proto/template
@@ -2,6 +2,7 @@
pkgname=dri3proto
version=1.0
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="DRI3 extension headers from X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,10 +10,3 @@ homepage="http://xorg.freedesktop.org"
license="MIT"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074
-
-dri3proto_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/dropbear/files/dropbear.service b/srcpkgs/dropbear/files/dropbear.service
new file mode 100644
index 0000000000..d9bccb4c8d
--- /dev/null
+++ b/srcpkgs/dropbear/files/dropbear.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Dropbear SSH Daemon
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/dropbear -F -P /run/dropbear.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
new file mode 100644
index 0000000000..d39629b9b7
--- /dev/null
+++ b/srcpkgs/dropbear/template
@@ -0,0 +1,19 @@
+# Template file for 'dropbear'
+pkgname=dropbear
+version=2013.62
+revision=2
+build_style="gnu-configure"
+configure_args="--sbindir=/usr/bin --enable-zlib"
+makedepends="zlib-devel"
+make_dirs="/etc/dropbear 0755 root root"
+short_desc="Small SSH server and client."
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+license="MIT"
+homepage="https://matt.ucc.asn.au/dropbear/dropbear.html"
+distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2"
+checksum=c6656302bbcc54b0a9c361f505822f6994039117ec32d2897ead3364da079ffa
+
+post_install() {
+ vinstall ${FILESDIR}/dropbear.service 644 usr/lib/systemd/system/
+ vinstall LICENSE 644 usr/share/licenses/${pkgname}
+}
diff --git a/srcpkgs/dssi-vst/template b/srcpkgs/dssi-vst/template
index 55c4e4dcb3..fb96565d2b 100644
--- a/srcpkgs/dssi-vst/template
+++ b/srcpkgs/dssi-vst/template
@@ -3,7 +3,8 @@ pkgname=dssi-vst
version=0.9.2.20131028
revision=1
makedepends="pkg-config zlib-devel jack-devel alsa-lib-devel liblo-devel
-dssi-devel ladspa-sdk wine wine-devel"
+ dssi-devel ladspa-sdk wine wine-devel"
+depends="dssi ladspa-sdk ladspa-sdk-progs wine"
short_desc="Run Windows VST plugins on Linux"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL"
@@ -35,10 +36,3 @@ do_build() {
do_install() {
make ${makejobs} DESTDIR=${DESTDIR} install
}
-
-dssi-vst_package() {
- depends="dssi ladspa-sdk ladspa-sdk-progs wine"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template
index b13c7912b4..f864360d4a 100644
--- a/srcpkgs/dssi/template
+++ b/srcpkgs/dssi/template
@@ -18,7 +18,7 @@ long_desc="
dssi-devel_package() {
depends="dssi>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -27,14 +27,8 @@ dssi-devel_package() {
dssi-example-plugins_package() {
depends="dssi>=${version}"
- short_desc="${short_desc} - Example plugins"
+ short_desc+=" - Example plugins"
pkg_install() {
vmove usr/lib/dssi
}
}
-
-dssi_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dtach/template b/srcpkgs/dtach/template
index 3eab4f12e0..f25a86210b 100644
--- a/srcpkgs/dtach/template
+++ b/srcpkgs/dtach/template
@@ -24,9 +24,3 @@ do_install() {
install -Dm755 dtach "${DESTDIR}/usr/bin/dtach"
install -Dm644 dtach.1 "${DESTDIR}/usr/share/man/man1/dtach.1"
}
-
-dtach_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template
index 02b6b7c62d..55412defaf 100644
--- a/srcpkgs/dumpet/template
+++ b/srcpkgs/dumpet/template
@@ -3,18 +3,11 @@ pkgname=dumpet
version=2.1
revision=1
build_style=gnu-makefile
-makedepends="pkg-config popt-devel libxml2-devel"
+hostmakedepends="pkg-config"
+makedepends="popt-devel libxml2-devel"
short_desc="Tool to dump and debug bootable CD-like images"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="https://fedorahosted.org/dumpet/"
distfiles="https://fedorahosted.org/releases/d/u/dumpet/dumpet-$version.tar.bz2"
checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3
-long_desc="
- This package contains dumpet, a $short_desc."
-
-dumpet_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index 338a37c99b..5de27f93f9 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,12 +1,14 @@
# Template file for 'duplicity'
pkgname=duplicity
-version=0.6.22
+version=0.6.23
revision=1
distfiles="http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz"
-checksum="6f489b0445681f0697488f3d4097b4c56a7fe8a5fea5fadd2e431724039c5a12"
+checksum="7a17f1e10395dedcf3204bc53925bb9dcbbf2a7552c9b096ebe727eceb9c0c60"
build_style=python-module
hostmakedepends="python-devel"
makedepends="librsync-devel"
+depends="python>=2.7"
+pycompile_module="duplicity"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://duplicity.nongnu.org/"
license="GPL"
@@ -16,11 +18,3 @@ pre_configure() {
chmod 644 "${BUILDDIR}bin/duplicity.1"
chmod 644 "${BUILDDIR}bin/rdiffdir.1"
}
-
-duplicity_package() {
- depends="python>=2.7"
- pycompile_module="duplicity"
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/dvtm/template b/srcpkgs/dvtm/template
index 0aa8d571a1..9af7459178 100644
--- a/srcpkgs/dvtm/template
+++ b/srcpkgs/dvtm/template
@@ -1,32 +1,25 @@
# Template file for 'dvtm'
pkgname=dvtm
-version=0.9
-revision=3
+version=0.10
+revision=1
+build_style=gnu-makefile
+make_build_args="INCS=-I."
makedepends="ncurses-devel"
+depends="ncurses" # needs tic at post-install
short_desc="Tiling window manager for the console"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://www.brain-dump.org/projects/dvtm/"
license="MIT/X11"
distfiles="http://www.brain-dump.org/projects/dvtm/$pkgname-$version.tar.gz"
-checksum=c751fb5778ecd24465c0db0e5ab9ac0a3e0dd61ab006708d6168fd609e81aa98
+checksum=7750872578e259d86c79277c19f3715c1fd3ff8d4f6c300ff8e12b270db86651
-do_build() {
+pre_build() {
# Do not run tic, useless in build environment.
- sed s,tic,/bin/true,g -i Makefile
-
- make PREFIX=/usr MANPREFIX=/usr/share/man ${makejobs}
+ sed -i 's,tic,/bin/true,g' Makefile
+ sed -i 's,@strip,@${STRIP},g' Makefile
+ sed -i 's,LDFLAGS += -L/usr/lib -L/usr/local/lib,LDFLAGS += ,g' config.mk
}
-do_install() {
- make install DESTDIR=${DESTDIR} MANPREFIX=/usr/share/man PREFIX=/usr
-
- # Install terminfo file to the correct dir.
+post_install() {
vinstall dvtm.info 644 usr/share/terminfo/d
}
-
-dvtm_package() {
- depends="ncurses" # needs tic at post-install
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index 3c17a42563..3e3c61e2a1 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -30,9 +30,3 @@ do_install() {
vinstall README 644 usr/share/doc/$pkgname
vinstall ${FILESDIR}/dwm.desktop 644 usr/share/xsessions
}
-
-dwm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/dzen2/template b/srcpkgs/dzen2/template
index 6e736cba03..d2f4e6a91d 100644
--- a/srcpkgs/dzen2/template
+++ b/srcpkgs/dzen2/template
@@ -30,9 +30,3 @@ do_install() {
cd gadgets
make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=${DESTDIR} install
}
-
-dzen2_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index f9e7ee05f2..48f62326e1 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,23 +1,24 @@
# Template file for 'e2fsprogs'
pkgname=e2fsprogs
-version=1.42.8
+version=1.42.9
revision=1
short_desc="Ext2/3/4 Filesystem Utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
homepage="http://e2fsprogs.sourceforge.net/"
distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
-checksum=b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97
+checksum=2f92ac06e92fa00f2ada3ee67dad012d74d685537527ad1241d82f2d041f2802
build_style=gnu-configure
configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
--enable-e2initrd-helper --disable-rpath --with-root-prefix=/usr
--disable-uuidd --disable-libuuid --disable-libblkid
--enable-symlink-build --enable-symlink-install
- --libdir=/usr/lib --libexecdir=/usr/lib"
+ --sbindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib"
make_install_args="install-libs"
hostmakedepends="pkg-config"
makedepends="libuuid-devel libblkid-devel"
+conf_files="/etc/mke2fs.conf"
post_install() {
# Remove stuff belonging to libblkid or libuuid pkgs.
@@ -32,7 +33,7 @@ post_install() {
}
e2fsprogs-devel_package() {
- depends="libuuid-devel libblkid-devel e2fsprogs-libs-${version}_${revision}"
+ depends="libuuid-devel libblkid-devel e2fsprogs-libs>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -56,10 +57,3 @@ e2fsprogs-libs_package() {
vmove "usr/lib/*.so.*"
}
}
-
-e2fsprogs_package() {
- conf_files="/etc/mke2fs.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/eclipse-ecj/template b/srcpkgs/eclipse-ecj/template
index 89d620b790..1984f6b09c 100644
--- a/srcpkgs/eclipse-ecj/template
+++ b/srcpkgs/eclipse-ecj/template
@@ -2,6 +2,8 @@
pkgname=eclipse-ecj
version=4.5
revision=1
+noarch="yes"
+create_wrksrc=yes
short_desc="A fork of the Eclipse Java bytecode compiler for GCJ"
maintainer="davehome <davehome@redthumb.info.tm>"
license="EPL"
@@ -11,7 +13,6 @@ distfiles="http://mirrors.kernel.org/sources.redhat.com/java/ecj-${version}.jar"
long_desc="
A fork of the open source Eclipse Java bytecode incremental compiler for GCJ."
-create_wrksrc=yes
do_extract() {
cp -v "${XBPS_SRCDISTDIR}/ecj-${version}.jar" "${wrksrc}"
@@ -22,10 +23,3 @@ do_install() {
vinstall "${FILESDIR}/ecj1" 755 usr/bin
}
-
-eclipse-ecj_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/econnman/template b/srcpkgs/econnman/template
index 82033507ee..8dad79c25f 100644
--- a/srcpkgs/econnman/template
+++ b/srcpkgs/econnman/template
@@ -2,20 +2,14 @@
pkgname=econnman
version=1.1
revision=1
+noarch=yes
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="efl-devel python-efl connman desktop-file-utils"
+depends="python-efl connman desktop-file-utils"
homepage="http://enlightenment.org"
short_desc="Enlightenment ConnMan user interface"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-3"
distfiles="http://download.enlightenment.org/rel/apps/econnman/econnman-${version}.tar.gz"
checksum=60f30748b2642b83763fe1e00f6a54ff27425c761633bb8cc0396fba15e7f714
-
-econnman_package() {
- noarch=yes
- depends="python-efl connman desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 7e23157ca8..5fb75c3d07 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -63,9 +63,3 @@ ecryptfs-utils-python_package() {
vmove usr/lib/python2.7
}
}
-
-ecryptfs-utils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ed/template b/srcpkgs/ed/template
index 9d240bc400..cb80acca1a 100644
--- a/srcpkgs/ed/template
+++ b/srcpkgs/ed/template
@@ -2,6 +2,7 @@
pkgname=ed
version=1.8
revision=1
+build_style=gnu-configure
short_desc="GNU Line-oriented text editor"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -14,22 +15,3 @@ long_desc="
A restricted version of ed, red, can only edit files in the current directory
and cannot execute shell commands. Ed is the standard text editor in the
sense that it is the original editor for Unix, and thus widely available."
-
-do_configure() {
- ./configure --prefix=/usr \
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
-}
-
-do_build() {
- make ${makejobs}
-}
-
-do_install() {
- make DESTDIR=${DESTDIR} install
-}
-
-ed_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index 24877c0c81..f6f98d42f9 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -23,9 +23,3 @@ do_install() {
vinstall src/efibootmgr/efibootmgr 755 usr/sbin
vinstall src/man/man8/efibootmgr.8 644 usr/share/man/man8
}
-
-efibootmgr_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 50390099d1..c06f070292 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,6 +1,6 @@
# Template file for 'efl'
pkgname=efl
-version=1.8.3
+version=1.8.5
revision=1
build_style=gnu-configure
configure_args="--enable-xinput22 --enable-multisense --enable-systemd
@@ -13,12 +13,15 @@ makedepends="openssl-devel systemd-devel glib-devel libXdamage-devel
libXinerama-devel xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel
xcb-util-renderutil-devel xcb-util-wm-devel pixman-devel libxkbcommon-devel
printproto libXp-devel libXrandr-devel libXScrnSaver-devel libmount-devel lua-devel"
+replaces="
+ ecore>=0 evas>=0 edje>=0 eio>=0 eina>=0 emotion>=0 eeze>=0 e_dbus>=0 eet>=0
+ embryo>=0 efreet>=0 ethumb>=0"
homepage="http://enlightenment.org"
short_desc="Enlightenment Foundation Libraries"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.gz"
-checksum=6e8d416ae0c17ddf52fb530b3dc0cb2b07059fd5985b3c5b953a83e06ce7250e
+checksum=7e514c0a972feea1c44c9074a4b58c14821d93dc91ff6f51066528f12ab42fe5
if [ "$CROSS_BUILD" ]; then
# XXX needs host edje_cc
@@ -106,22 +109,3 @@ efl-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-efl_package() {
- replaces="
- ecore>=0
- evas>=0
- edje>=0
- eio>=0
- eina>=0
- emotion>=0
- eeze>=0
- e_dbus>=0
- eet>=0
- embryo>=0
- efreet>=0
- ethumb>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/eigen2/template b/srcpkgs/eigen2/template
index 5c4ddf85e2..74834d9f12 100644
--- a/srcpkgs/eigen2/template
+++ b/srcpkgs/eigen2/template
@@ -2,8 +2,9 @@
pkgname=eigen2
version=2.0.17
revision=1
-wrksrc="eigen-eigen-b23437e61a07"
create_srcdir=yes
+noarch=yes
+wrksrc="eigen-eigen-b23437e61a07"
build_style=cmake
hostmakedepends="cmake"
short_desc="A lightweight C++ template library for vector and matrix math, a.k.a. linear algebra"
@@ -12,10 +13,3 @@ license="GPL-3"
homepage="http://eigen.tuxfamily.org/index.php?title=Main_Page"
distfiles="http://bitbucket.org/eigen/eigen/get/${version}.tar.bz2"
checksum=7255e856ed367ce6e6e2d4153b0e4e753c8b8d36918bf440dd34ad56aff09960
-
-eigen2_package() {
- noarch=yes
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/elementary/template b/srcpkgs/elementary/template
index f3d13c2288..31195da2cb 100644
--- a/srcpkgs/elementary/template
+++ b/srcpkgs/elementary/template
@@ -1,9 +1,10 @@
# Template file for 'elementary'
pkgname=elementary
-version=1.8.2
+version=1.8.4
revision=1
hostmakedepends="pkg-config"
makedepends="efl-devel>=${version} desktop-file-utils"
+depends="desktop-file-utils"
build_style=gnu-configure
configure_args="--with-tests=none --disable-static --enable-quick-launch --disable-elementary-test"
homepage="http://enlightenment.org"
@@ -11,7 +12,7 @@ short_desc="Enlightenment's widget set"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=958c50fbb3ffa77c0f2792a9787cd3d2022464b449cbb024256cf3442e145990
+checksum=b3597896cd977387172e300c3df43404b6bf48c423610416b350043d4c270cb5
if [ "$CROSS_BUILD" ]; then
# XXX needs host elm_prefs_cc
@@ -33,10 +34,3 @@ elementary-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-elementary_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index e8d88c4622..9cd04674ce 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -29,9 +29,3 @@ elfutils-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-elfutils_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4a479611dd..5d5fe3549a 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -10,9 +10,3 @@ homepage="http://elinks.or.cz"
license="GPL-3"
distfiles="http://elinks.or.cz/download/$pkgname-$version.tar.bz2"
checksum=383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada
-
-elinks_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 23e18e6fa9..1a947e54f4 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -79,9 +79,3 @@ if [ "$build_option_xml" ]; then
else
configure_args+=" --without-xml2"
fi
-
-emacs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/emotion_generic_players/template b/srcpkgs/emotion_generic_players/template
index f378e2ac3b..df25171a67 100644
--- a/srcpkgs/emotion_generic_players/template
+++ b/srcpkgs/emotion_generic_players/template
@@ -1,19 +1,13 @@
# Template file for 'emotion_generic_players'
pkgname=emotion_generic_players
-version=1.8.0
-revision=2
+version=1.8.1
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="vlc-devel efl-devel>=1.8.3"
+makedepends="vlc-devel efl-devel>=1.8.5"
homepage="http://enlightenment.org"
short_desc="Additional generic players for EFL"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=5e1e77d7d833ddd4b8d0125b275dde69804d9ab410a5bab2a10e83e3c6c368e7
-
-emotion_generic_players_package() {
- pkg_install() {
- vmove all
- }
-}
+checksum=e4a104589034f2132430da754a011814329e65fe8807bd1c4a724227a2fcccbb
diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index 8c6fdbbefe..4724f18935 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -17,16 +17,10 @@ makedepends="
webkitgtk-devel>=2.1 libgudev-devel pulseaudio-devel cheese-devel>=3.10
enchant-devel NetworkManager-devel libchamplain-devel>=0.12.5_2
gnutls-devel>=3.1.5 gsettings-desktop-schemas-devel>=3.10 geoclue2 iso-codes"
+depends="gsettings-desktop-schemas>=3.10 geoclue2 iso-codes"
short_desc="GNOME instant messaging client using the Telepathy framework"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/Empathy"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=9d8e082a448f3e9450a31f0ec21f01e34cf1c15b192cfa30842d71537796cfbf
-
-empathy_package() {
- depends="gsettings-desktop-schemas>=3.10 geoclue2 iso-codes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/enca/template b/srcpkgs/enca/template
index dcdc8eb720..823a648d82 100644
--- a/srcpkgs/enca/template
+++ b/srcpkgs/enca/template
@@ -38,9 +38,3 @@ enca-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-enca_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 0089a67f01..d2f1912e2a 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -11,9 +11,3 @@ license="GPL-3"
homepage="http://www.arg0.net/encfs"
distfiles="http://encfs.googlecode.com/files/${pkgname}-${version}.tgz"
checksum=282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8
-
-encfs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/enchant/template b/srcpkgs/enchant/template
index f910de917a..72e405f94a 100644
--- a/srcpkgs/enchant/template
+++ b/srcpkgs/enchant/template
@@ -45,9 +45,3 @@ enchant-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-enchant_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index 5e793d1099..eb6c8c69b8 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -2,8 +2,10 @@
pkgname=encodings
version=1.0.4
revision=3
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config font-utils"
+depends="font-util"
short_desc="X11 Font Index Generator"
homepage="http://xorg.freedesktop.org"
license="Public domain"
@@ -23,11 +25,3 @@ post_install() {
# encodings.dir are generated at pkg post-install time.
find ${DESTDIR} -name encodings.dir -delete
}
-
-encodings_package() {
- depends="font-util"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index 230c21a4d2..d22aa70fd6 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -1,19 +1,22 @@
# Template file for 'enlightenment'
pkgname=enlightenment
-version=0.18.2
+version=0.18.3
revision=1
build_style=gnu-configure
configure_args="--enable-pam"
hostmakedepends="pkg-config efl>=1.8"
makedepends="
- pam-devel efl-devel>=1.8.1 elementary-devel>=1.8.0 evas_generic_loaders>=1.8
+ pam-devel efl-devel>=1.8.5 elementary-devel>=1.8.4 evas_generic_loaders>=1.8
emotion_generic_players>=1.8 hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders>=1.8 emotion_generic_players>=1.8"
+conf_files="/etc/enlightenment/sysactions.conf"
+provides="notification-daemon-0_1"
homepage="http://enlightenment.org"
short_desc="Enlightenment desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a481cccc83c638aeb0b4ae5e0a34ae5cf1cbf366df26a2a6d4378dc2ad02e28e
+checksum=c8f269c0e1d02fdcd5ed74576056a14485ff8ed51b131f1b252faddd2fb66773
post_install() {
vmkdir usr/share/licenses/${pkgname}
@@ -23,19 +26,10 @@ post_install() {
}
enlightenment-devel_package() {
- depends="efl-devel>=1.8.1 elementary-devel>=1.8.0 ${sourcepkg}>=${version}_${revision}"
+ depends="efl-devel>=1.8.5 elementary-devel>=1.8.4 ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-enlightenment_package() {
- conf_files="/etc/enlightenment/sysactions.conf"
- provides="notification-daemon-0_1"
- depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders>=1.8 emotion_generic_players>=1.8"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/enscript/template b/srcpkgs/enscript/template
index f6d4975d74..985decaa5a 100644
--- a/srcpkgs/enscript/template
+++ b/srcpkgs/enscript/template
@@ -2,13 +2,14 @@
pkgname=enscript
version=1.6.5.2
revision=1
-homepage="http://git.savannah.gnu.org/cgit/enscript.git"
-distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
build_style=gnu-configure
makedepends="perl"
+conf_files="/etc/enscript.cfg"
short_desc="Converts text to Postscript, HTML or RTF with syntax highlighting"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
+homepage="http://git.savannah.gnu.org/cgit/enscript.git"
+distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
checksum=db3e33bdb36f9e7252a386ea1faa9b5444cc9ba0ac2dd46fffc1f14887a4cb75
long_desc="
GNU Enscript takes ASCII files (often source code) and converts them to
@@ -18,11 +19,3 @@ long_desc="
It is often used for its syntax highlighting, as it comes with rules for a
wide range of programming languages. New rules can be added using an awk-like
stateful scripting language."
-
-enscript_package() {
- conf_files="/etc/enscript.cfg"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/enventor/template b/srcpkgs/enventor/template
index cbabc26aea..89b51ace9a 100644
--- a/srcpkgs/enventor/template
+++ b/srcpkgs/enventor/template
@@ -5,6 +5,7 @@ revision=1
wrksrc="${pkgname}-${version}.0"
hostmakedepends="pkg-config"
makedepends="efl-devel>=1.8 elementary-devel>=1.8 desktop-file-utils"
+depends="desktop-file-utils"
build_style=gnu-configure
configure_args="--disable-static"
homepage="http://enlightenment.org"
@@ -13,10 +14,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=144ca4eabea0c5b640e338f8f03a5692f60d51f4d667d264fc9299ed4148f67d
-
-enventor_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/envypn-font/template b/srcpkgs/envypn-font/template
index 8f4ef16dbf..a00b378724 100644
--- a/srcpkgs/envypn-font/template
+++ b/srcpkgs/envypn-font/template
@@ -2,6 +2,7 @@
pkgname=envypn-font
version=1.6
revision=1
+noarch="yes"
short_desc="Readable bitmap font inspired by Envy Code R"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
homepage="http://tetedulinuxien.fr/"
@@ -9,6 +10,8 @@ license="MirOS License"
distfiles="http://linuxien.legtux.org/projects/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=85239d176c39f67eece90c8e5730247fe1b38f5fd577269b73476a296284130b
makedepends="font-util mkfontdir"
+depends="${makedepends}"
+font_dirs="/usr/share/fonts/envypn"
do_install() {
vmkdir usr/share/fonts/envypn
@@ -18,12 +21,3 @@ do_install() {
vinstall CHANGELOG 644 usr/share/doc/envypn
vinstall README 644 usr/share/doc/envypn
}
-
-envypn-font_package() {
- depends="${makedepends}"
- noarch="yes"
- font_dirs="/usr/share/fonts/envypn"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index b4257ddf44..7c77c7bfaf 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -7,6 +7,7 @@ hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-intro
makedepends="
gnome-desktop-devel>=3.10 libpeas-devel>=1.9 lcms2-devel exempi-devel
libexif-devel librsvg-devel>=2.39 gnome-icon-theme shared-mime-info"
+depends="hicolor-icon-theme desktop-file-utils gnome-icon-theme shared-mime-info"
short_desc="Eye of GNOME graphics viewer program"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -29,11 +30,3 @@ eog-devel_package() {
vmove usr/share/eog/gir-1.0
}
}
-
-eog_package() {
- depends="hicolor-icon-theme desktop-file-utils
- gnome-icon-theme shared-mime-info"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 66fd6dcb3c..8b23f6fe25 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -4,6 +4,7 @@ version=0.1.8
revision=4
build_style=gnu-configure
makedepends="pkg-config glib-devel>=2.32 gtk+-devel poppler-glib-devel>=0.20"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Lightweight PDF viewer using Poppler and GTK+"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.emma-soft.com/projects/epdfview/"
@@ -23,10 +24,3 @@ post_install() {
usr/share/icons/hicolor/${f}x${f}/apps ${pkgname}.png
done
}
-
-epdfview_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 62bef90849..90ca0f24be 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -9,6 +9,8 @@ makedepends="nss-devel libsoup-gnome-devel>=2.44 libnotify-devel
webkitgtk-devel>=2.1 sqlite-devel libxslt-devel avahi-glib-libs-devel
startup-notification-devel NetworkManager-devel gcr-devel>=3.10
gnome-desktop-devel>=3.10 libsecret-devel libwnck-devel iso-codes"
+depends="webkitgtk>=2.1 libsoup>=2.44 gsettings-desktop-schemas>=3.10 gcr>=3.10
+ ca-certificates hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Intuitive GNOME web browser"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org/projects/epiphany/"
@@ -24,11 +26,3 @@ long_desc="
side by using the WebKitGTK+ rendering engine; and on the user interface side
by closely following the GNOME Human Interface Guidelines (HIG) and by close
integration with the GNOME desktop."
-
-epiphany_package() {
- depends="webkitgtk>=2.1 libsoup>=2.44 gsettings-desktop-schemas>=3.10 gcr>=3.10
- ca-certificates hicolor-icon-theme desktop-file-utils iso-codes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/epson-inkjet-printer-escpr/template b/srcpkgs/epson-inkjet-printer-escpr/template
index 9af5af6189..83f13b0732 100644
--- a/srcpkgs/epson-inkjet-printer-escpr/template
+++ b/srcpkgs/epson-inkjet-printer-escpr/template
@@ -25,9 +25,3 @@ post_install() {
# gzip ppd files.
find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f
}
-
-epson-inkjet-printer-escpr_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ethtool/patches/stdint.patch b/srcpkgs/ethtool/patches/stdint.patch
new file mode 100644
index 0000000000..cf9ae83c2b
--- /dev/null
+++ b/srcpkgs/ethtool/patches/stdint.patch
@@ -0,0 +1,25 @@
+--- ./internal.h.orig
++++ ./internal.h
+@@ -7,6 +7,7 @@
+ #include "ethtool-config.h"
+ #endif
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+@@ -23,10 +24,10 @@
+ #endif
+
+ typedef unsigned long long u64;
+-typedef __uint32_t u32;
+-typedef __uint16_t u16;
+-typedef __uint8_t u8;
+-typedef __int32_t s32;
++typedef uint32_t u32;
++typedef uint16_t u16;
++typedef uint8_t u8;
++typedef int32_t s32;
+
+ #include "ethtool-copy.h"
+ #include "net_tstamp-copy.h"
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index f100fe8cb8..7bfdacbcd6 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
# Template file for 'ethtool'
pkgname=ethtool
-version=3.11
+version=3.12.1
revision=1
build_style=gnu-configure
short_desc="Utility for controlling network drivers and hardware"
@@ -8,10 +8,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org/pub/software/network/ethtool/"
license="GPL-2"
distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d53f5546196a95387f25c2f413d7537aad74b74a5c7b62f0aafd545f9e602fd4
-
-ethtool_package() {
- pkg_install() {
- vmove all
- }
-}
+checksum=616ec632cddcba7240a23582b05380b69f1b359280e8db3fe3bb46498b621149
diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 95c902b96c..bd3de50dfb 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -6,6 +6,7 @@ build_style=cmake
configure_args="-DENABLE_GTK=OFF"
hostmakedepends="cmake flex"
makedepends="ncurses-devel libcurl-devel libltdl-devel libnet-devel libpcap-devel openssl-devel pcre-devel"
+conf_files="/etc/${pkgname}/etter.conf"
short_desc="A network sniffer/interceptor/logger for ethernet LANs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -14,10 +15,3 @@ homepage="http://ettercap.github.com/ettercap/"
do_fetch() {
git clone -b v${version} git://github.com/Ettercap/ettercap.git ${pkgname}-${version}
}
-
-ettercap_package() {
- conf_files="/etc/${pkgname}/etter.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/eudev-libgudev b/srcpkgs/eudev-libgudev
new file mode 120000
index 0000000000..847a5d7862
--- /dev/null
+++ b/srcpkgs/eudev-libgudev
@@ -0,0 +1 @@
+eudev
\ No newline at end of file
diff --git a/srcpkgs/eudev-libgudev-devel b/srcpkgs/eudev-libgudev-devel
new file mode 120000
index 0000000000..847a5d7862
--- /dev/null
+++ b/srcpkgs/eudev-libgudev-devel
@@ -0,0 +1 @@
+eudev
\ No newline at end of file
diff --git a/srcpkgs/eudev-libudev b/srcpkgs/eudev-libudev
new file mode 120000
index 0000000000..847a5d7862
--- /dev/null
+++ b/srcpkgs/eudev-libudev
@@ -0,0 +1 @@
+eudev
\ No newline at end of file
diff --git a/srcpkgs/eudev-libudev-devel b/srcpkgs/eudev-libudev-devel
new file mode 120000
index 0000000000..847a5d7862
--- /dev/null
+++ b/srcpkgs/eudev-libudev-devel
@@ -0,0 +1 @@
+eudev
\ No newline at end of file
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
new file mode 100644
index 0000000000..d71defe2f4
--- /dev/null
+++ b/srcpkgs/eudev/template
@@ -0,0 +1,90 @@
+# Template file for 'eudev'
+
+_UDEV_VERSION="207" # compatible udev version provided
+
+pkgname=eudev
+version=1.3
+revision=2
+conf_files="/etc/udev/udev.conf"
+conflicts="systemd>=0"
+build_style=gnu-configure
+configure_args="--enable-libkmod"
+hostmakedepends="automake libtool pkg-config gperf glib-devel"
+makedepends="libblkid-devel libkmod-devel libglib-devel"
+short_desc="systemd's udev fork (enhanced udev)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://www.gentoo.org/proj/en/eudev/"
+distfiles="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"
+checksum=6f1f0b15971a53c7070a44c902c7c1303f952927aa6370dbdf4d84d8bc09fac2
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ makedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
+
+pre_configure() {
+ autoreconf -fi
+}
+
+eudev-libgudev-devel_package() {
+ provides="libgudev-devel-${_UDEV_VERSION}_${revision}"
+ conflicts="libgudev-devel>=0"
+ depends="eudev-libgudev>=${version}_${revision}"
+ short_desc+=" - gudev development files"
+ pkg_install() {
+ vmove usr/include/gudev-1.0
+ vmove usr/lib/pkgconfig/gudev-1.0.pc
+ vmove usr/lib/libgudev-1.0.a
+ vmove usr/lib/libgudev-1.0.so
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
+
+eudev-libgudev_package() {
+ provides="libgudev-${_UDEV_VERSION}_${revision}"
+ conflicts="libgudev>=0"
+ short_desc+=" - gudev runtime library"
+ pkg_install() {
+ vmove "usr/lib/libgudev-1.0.so.*"
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ fi
+ }
+}
+
+eudev-libudev-devel_package() {
+ provides="libudev-devel-${_UDEV_VERSION}_${revision}"
+ conflicts="libudev-devel>=0"
+ depends="eudev-libudev>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/pkgconfig
+ }
+}
+
+eudev-libudev_package() {
+ provides="libudev-${_UDEV_VERSION}_${revision}"
+ conflicts="libudev>=0"
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
diff --git a/srcpkgs/evas_generic_loaders/template b/srcpkgs/evas_generic_loaders/template
index 7ee66b1f5a..646af35674 100644
--- a/srcpkgs/evas_generic_loaders/template
+++ b/srcpkgs/evas_generic_loaders/template
@@ -1,10 +1,10 @@
# Template file for 'evas_generic_loaders'
pkgname=evas_generic_loaders
version=1.8.1
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="efl-devel>=${version}"
+makedepends="efl-devel>=1.8.5"
homepage="http://enlightenment.org"
short_desc="Additional generic loaders for Evas"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -59,9 +59,3 @@ if [ "$build_option_raw" ]; then
else
configure_args+=" --disable-libraw"
fi
-
-evas_generic_loaders_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/evieext/template b/srcpkgs/evieext/template
index 7975842089..6ceb1409c9 100644
--- a/srcpkgs/evieext/template
+++ b/srcpkgs/evieext/template
@@ -2,6 +2,7 @@
pkgname=evieext
version=1.0.2
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="EvIE extension headers"
homepage="http://xorg.freedesktop.org"
@@ -9,13 +10,3 @@ license="MIT/X11"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
-long_desc="
- This package provides the X11 Event Interception extension (EvIE)
- headers from modular X.org."
-
-evieext_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template
index 3c99ea5108..bfdadecaed 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 <linuxienATlegtuxDOTorg>"
homepage="http://evilwm.sourceforge.net"
@@ -10,18 +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
}
-
-evilwm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template
index ac6f1f1fa4..f501b67f66 100644
--- a/srcpkgs/evince/template
+++ b/srcpkgs/evince/template
@@ -22,6 +22,7 @@ makedepends="tiff-devel libarchive-devel nautilus-devel>=3.10
poppler-glib-devel libxml2-devel djvulibre-devel libgxps-devel
libSM-devel libICE-devel libspectre-devel libsecret-devel
gsettings-desktop-schemas-devel>=3.10 gnome-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme gnome-icon-theme"
libevince_package() {
short_desc+=" - runtime libraries"
@@ -42,10 +43,3 @@ evince-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-evince_package() {
- depends="desktop-file-utils hicolor-icon-theme gnome-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 8adb01b125..17bee7db98 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool flex gperf gobject-introspection"
makedepends="db-devel>=5.3 sqlite-devel mit-krb5-devel nss-devel libical-devel
libsecret-devel libsoup-gnome-devel>=2.44 gcr-devel>=3.10 libldap-devel
libgdata-devel>=0.14 vala-devel>=0.22 libgweather-devel>=3.10"
+depends="libgdata>=0.14 libsoup-gnome>=2.44 libgweather>=3.10"
short_desc="Centralized access to appointments and contacts"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -31,10 +32,3 @@ evolution-data-server-devel_package() {
vmove usr/share/vala
}
}
-
-evolution-data-server_package() {
- depends="libgdata>=0.14 libsoup-gnome>=2.44 libgweather>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index 1a8497a3d6..220ea645a9 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -14,6 +14,7 @@ makedepends="
gtkhtml-devel>=4.6.0 libsoup-gnome-devel>=2.44 gnome-desktop-devel>=3.10
libnotify-devel gstreamer1-devel>=1:1.2 libgweather-devel>=3.10
NetworkManager-devel enchant-devel iso-codes"
+depends="gtkhtml>=4.6 hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="Integrated mail, addressbook and calendaring for GNOME"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -27,10 +28,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/lib/pkgconfig
rm -rf ${DESTDIR}/usr/share/gtk-doc
}
-
-evolution_package() {
- depends="gtkhtml>=4.6 hicolor-icon-theme desktop-file-utils iso-codes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template
index 57c4c78b57..6ac83b8048 100644
--- a/srcpkgs/exempi/template
+++ b/srcpkgs/exempi/template
@@ -29,9 +29,3 @@ exempi-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-exempi_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/exfat-utils/template b/srcpkgs/exfat-utils/template
index 1567d612fd..9b6e3df65c 100644
--- a/srcpkgs/exfat-utils/template
+++ b/srcpkgs/exfat-utils/template
@@ -1,8 +1,8 @@
# Template file for 'exfat-utils'
pkgname=exfat-utils
version=1.0.0
-revision=1
-makedepends="scons"
+revision=2
+hostmakedepends="scons"
short_desc="Utilities for exFAT file system"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -11,16 +11,7 @@ distfiles="http://exfat.googlecode.com/files/${pkgname}-${version}.tar.gz"
checksum=9079c6fa1eea33ca635252985c226141968d88445abf0255a4119bf54028df1d
do_install() {
- scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " \
- DESTDIR="${DESTDIR}/usr/bin" install
-
+ scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " DESTDIR="${DESTDIR}/usr/bin" install
vmkdir usr/share/man/man8
- install -m444 {dump,fsck,mkfs,label}/*.8 \
- ${DESTDIR}/usr/share/man/man8
-}
-
-exfat-utils_package() {
- pkg_install() {
- vmove usr
- }
+ install -m444 {dump,fsck,mkfs,label}/*.8 ${DESTDIR}/usr/share/man/man8
}
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 2f1dd9e595..defbc20f10 100755
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,22 +1,16 @@
# Template build file for 'exiftool'.
pkgname=exiftool
-version=9.45
+version=9.47
revision=1
+noarch="yes"
distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz"
-checksum="aa123e35c7648270418481d64cb9a2dddf4b223e11c93ea5df31e01823a04024"
+checksum="f79c515620fd0eccf16a8afc118252cfc9f0a61773b3d6d8203129c49deb0174"
build_style=perl-module
makedepends="perl>=5.18"
hostmakedepends="${makedepends}"
+depends="${makedepends}"
wrksrc="Image-ExifTool-${version}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/"
license="GPL"
short_desc="Reader and rewriter of EXIF informations that supports raw files"
-
-exiftool_package() {
- noarch="yes"
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template
index b89ac9dcbf..f8dd9f0030 100644
--- a/srcpkgs/exiv2/template
+++ b/srcpkgs/exiv2/template
@@ -16,16 +16,10 @@ long_desc="
exiv2-devel_package() {
depends="zlib-devel expat-devel libstdc++-devel exiv2"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-exiv2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 2d34e2271f..1377bca10e 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -5,6 +5,8 @@ revision=1
build_style=gnu-configure
configure_args="--disable-static"
makedepends="pkg-config intltool gtk+-devel libxfce4util-devel libxfce4ui-devel perl-URI"
+depends="hicolor-icon-theme desktop-file-utils perl-URI"
+conf_files="/etc/xdg/xfce4/helpers.rc"
short_desc="Application library for the Xfce desktop environment"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -14,7 +16,7 @@ checksum=b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce
exo-devel_package() {
depends="gtk+-devel libxfce4util-devel exo-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -23,12 +25,3 @@ exo-devel_package() {
vmove "usr/share/*doc"
}
}
-
-exo_package() {
- depends="hicolor-icon-theme desktop-file-utils perl-URI"
- conf_files="/etc/xdg/xfce4/helpers.rc"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index 53ca4c9f2a..638ec43d71 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -12,7 +12,7 @@ checksum=823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
expat-devel_package() {
depends="expat>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
@@ -20,14 +20,8 @@ expat-devel_package() {
}
}
-expat_package() {
- pkg_install() {
- vmove "usr/lib/*.so*"
- }
-}
-
xmlwf_package() {
- short_desc="${short_desc} -- xmlwf utility"
+ short_desc+=" - xmlwf utility"
pkg_install() {
vmove usr/bin
vmove usr/share
diff --git a/srcpkgs/exquisite/template b/srcpkgs/exquisite/template
index 7c968aaf94..c49a7aeb1e 100644
--- a/srcpkgs/exquisite/template
+++ b/srcpkgs/exquisite/template
@@ -11,9 +11,3 @@ license="BSD"
homepage="http://www.enlightenment.org"
distfiles="http://download.enlightenment.org/releases/exquisite-${version}.tar.gz"
checksum=4b874ca1f57d9fc31436ff11b0d6d35b522b43c665c893341c0feb0ca9fa02fd
-
-exquisite_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/extundelete/template b/srcpkgs/extundelete/template
index 8302fd5715..4b28fea6a5 100644
--- a/srcpkgs/extundelete/template
+++ b/srcpkgs/extundelete/template
@@ -10,9 +10,3 @@ homepage="http://extundelete.sourceforge.net"
license="GPL-2"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4
-
-extundelete_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/eyeD3/template b/srcpkgs/eyeD3/template
index c4b9b61c09..e9103e3957 100644
--- a/srcpkgs/eyeD3/template
+++ b/srcpkgs/eyeD3/template
@@ -2,21 +2,15 @@
pkgname=eyeD3
version=0.7.4
revision=1
+noarch="yes"
distfiles="http://eyed3.nicfit.net/releases/eyeD3-${version}.tgz"
checksum="a138e6e1fd5b8c2b7947a2d22868167ede16bb96e8e02a067951388bf1fb3000"
build_style=python-module
hostmakedepends="python-devel python-distribute"
makedepends="python-devel"
+depends="python>=2.7"
+pycompile_module="eyeD3"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://eyed3.nicfit.net/"
license="GPL"
short_desc="Python tool for working with audio files, specifically mp3 files containing ID3 metadata (i.e. song info)."
-
-eyeD3_package() {
- noarch="yes"
- depends="python>=2.7"
- pycompile_module="eyeD3"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/f2fs-tools/template b/srcpkgs/f2fs-tools/template
index 8239c397f6..3a3099af22 100644
--- a/srcpkgs/f2fs-tools/template
+++ b/srcpkgs/f2fs-tools/template
@@ -19,9 +19,3 @@ do_fetch() {
pre_configure() {
autoreconf -fi
}
-
-f2fs-tools_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/faac/template b/srcpkgs/faac/template
index 8500976183..f25c3f1721 100644
--- a/srcpkgs/faac/template
+++ b/srcpkgs/faac/template
@@ -1,10 +1,11 @@
# Template file for 'faac'
pkgname=faac
version=1.28
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-mp4v2 --disable-static"
-makedepends="automake libtool libmp4v2-devel>=2.0.0"
+hostmakedepends="automake libtool"
+makedepends="libmp4v2-devel>=2.0.0"
short_desc="AAC audio encoder library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.audiocoding.com/"
@@ -23,15 +24,10 @@ post_install() {
}
faac-devel_package() {
- depends="libmp4v2-devel>=2.0.0 faac>=${version}"
- short_desc="${short_desc} -- development files"
+ depends="libmp4v2-devel>=2.0.0 faac>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
- }
-}
-
-faac_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/faad2/template b/srcpkgs/faad2/template
index 5e6660fc0d..7c995bf5db 100644
--- a/srcpkgs/faad2/template
+++ b/srcpkgs/faad2/template
@@ -31,9 +31,3 @@ faad2-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-faad2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fakechroot/template b/srcpkgs/fakechroot/template
index db6979220b..ab23c7adda 100644
--- a/srcpkgs/fakechroot/template
+++ b/srcpkgs/fakechroot/template
@@ -4,6 +4,10 @@ version=2.17.1
revision=2
build_style=gnu-configure
configure_args="--disable-static --sbindir=/usr/bin"
+conf_files="
+ /etc/fakechroot/chroot.env
+ /etc/fakechroot/debootstrap.env
+ /etc/fakechroot/rinse.env"
short_desc="Gives a fake chroot environment"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/dex4er/fakechroot"
@@ -12,13 +16,3 @@ license="LGPL-2.1"
do_fetch() {
git clone -b ${version} git://github.com/dex4er/fakechroot ${pkgname}-${version}
}
-
-fakechroot_package() {
- conf_files="
- /etc/fakechroot/chroot.env
- /etc/fakechroot/debootstrap.env
- /etc/fakechroot/rinse.env"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template
index 1ad113f7b8..45629d0f3e 100644
--- a/srcpkgs/farstream/template
+++ b/srcpkgs/farstream/template
@@ -6,7 +6,9 @@ build_style=gnu-configure
configure_args="--disable-valgrind --disable-debug --disable-static"
makedepends="pkg-config intltool gupnp-igd-devel>=0.2.0 libnice-devel>=0.1.3
gst-plugins-base1-devel python-devel gst-python-devel pygobject2-devel
-gobject-introspection"
+ gobject-introspection"
+depends="gst-python pygobject2 pygtk gst-plugins-good1 gst-plugins-bad1"
+replaces="farsight2>=0"
short_desc="GStreamer modules and libraries for videoconferencing"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -30,11 +32,3 @@ farstream-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-farstream_package() {
- depends="gst-python pygobject2 pygtk gst-plugins-good1 gst-plugins-bad1"
- replaces="farsight2>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fbset/template b/srcpkgs/fbset/template
index cc0757da2b..b84fca81ec 100644
--- a/srcpkgs/fbset/template
+++ b/srcpkgs/fbset/template
@@ -12,6 +12,7 @@ checksum=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338
hostmakedepends="flex"
makedepends="libfl-devel"
+conf_files="/etc/fb.modes"
do_build() {
sed -e 's,$(DESTDIR)/bin,$(DESTDIR)/usr/bin,g' -i Makefile
@@ -21,10 +22,3 @@ do_build() {
do_install() {
make DESTDIR=$DESTDIR PREFIX=/usr install
}
-
-fbset_package() {
- conf_files="/etc/fb.modes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fdupes/template b/srcpkgs/fdupes/template
index a89e682b65..98a79c1624 100644
--- a/srcpkgs/fdupes/template
+++ b/srcpkgs/fdupes/template
@@ -17,9 +17,3 @@ do_install() {
vinstall fdupes 755 usr/bin
vinstall fdupes.1 644 usr/share/man/man1
}
-
-fdupes_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template
index 1a7cf623e1..f58f3a6b73 100644
--- a/srcpkgs/feh/template
+++ b/srcpkgs/feh/template
@@ -4,8 +4,8 @@ version=2.9.1
revision=2
build_style=gnu-makefile
make_build_args="PREFIX=/usr exif=1 help=1"
-make_install_args="PREFIX=/usr"
-makedepends="pkg-config giblib-devel libcurl-devel libexif-devel
+hostmakedepends="pkg-config"
+makedepends="giblib-devel libcurl-devel libexif-devel
libpng-devel>=1.6 libjpeg-turbo-devel libXinerama-devel libXt-devel"
short_desc="Fast and light imlib2-based image viewer"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,9 +13,3 @@ license="MIT"
homepage="http://feh.finalrewind.org/"
distfiles="${homepage}/feh-${version}.tar.bz2"
checksum=4a02d2328c37ae7d7df09c49ccfcbad90458735b132c70937047b3395fb45925
-
-feh_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 803cbbbd1f..75d39057e9 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="python-devel"
makedepends="openssl-devel"
+depends="python"
short_desc="A remote-mail retrieval utility"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://fetchmail.berlios.de/"
distfiles="http://download.berlios.de/$pkgname/${pkgname}-${version}.tar.xz"
checksum=79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850
-
-fetchmail_package() {
- depends="python"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 506f53326f..276b52c07e 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,13 +1,13 @@
# Template file for 'ffmpeg'
pkgname=ffmpeg
-version=2.1.1
+version=2.1.3
revision=1
short_desc="Decoding, encoding and streaming software"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.ffmpeg.org"
distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
-checksum=bef95e5b9aac45adec7ef434537504a63b4bbc22a8ce6a96a68e19c5efbadae2
+checksum=1d332e7fd35f87e1ffb6c9b0405cbfda085ef712ede0133a213793a4e66d13a3
hostmakedepends="pkg-config perl yasm"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -28,7 +28,7 @@ do_configure() {
case "$XBPS_TARGET_MACHINE" in
arm*) _arch="arm";;
mips*) _arch="mips";;
- i686|x86_64) _arch="$XBPS_TARGET_MACHINE";;
+ *) _arch="$XBPS_TARGET_MACHINE";;
esac
_args+=" --enable-cross-compile
@@ -118,9 +118,15 @@ libswresample_package() {
}
ffmpeg-devel_package() {
- depends="libavcodec>=${version} libavdevice>=${version} libavformat>=${version}
- libavutil>=${version} libavfilter>=${version} libpostproc>=${version}
- libswscale>=${version} libswresample>=${version}"
+ depends="
+ libavcodec>=${version}_${revision}
+ libavdevice>=${version}_${revision}
+ libavformat>=${version}_${revision}
+ libavutil>=${version}_${revision}
+ libavfilter>=${version}_${revision}
+ libpostproc>=${version}_${revision}
+ libswscale>=${version}_${revision}
+ libswresample>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -130,9 +136,3 @@ ffmpeg-devel_package() {
vmove usr/share/man/man3
}
}
-
-ffmpeg_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template
index cd0f1174bf..942877d2ed 100644
--- a/srcpkgs/fftw/template
+++ b/srcpkgs/fftw/template
@@ -77,9 +77,3 @@ fftw-devel_package() {
vmove usr/share/info
}
}
-
-fftw_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index 8cdbb17dd1..88d63d94dc 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
configure_args="--disable-schemas-compile --enable-magic --disable-static"
hostmakedepends="which pkg-config intltool gnome-doc-utils itstool"
makedepends="nautilus-devel>=3.10 json-glib-devel libnotify-devel libarchive-devel>=3.1.2"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME Front-end to archiving programs like tar and zip"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/3.10/$pkgname-$version.tar.xz"
checksum=fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790
-
-file-roller_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 0bc0c1d160..7e0e813901 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
configure_args="--enable-static"
makedepends="zlib-devel"
+conflicts="chroot-file>=0"
short_desc="File type identification utility"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.darwinsys.com/file/"
@@ -32,10 +33,3 @@ file-devel_package() {
vmove usr/share/man/man3
}
}
-
-file_package() {
- conflicts="chroot-file>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 1099f2f7ae..17e65189ef 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -7,16 +7,10 @@ configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdat
hostmakedepends="pkg-config"
makedepends="gnutls-devel tinyxml-devel dbus-devel libidn-devel sqlite-devel
gtk+-devel wxGTK-devel xdg-utils hicolor-icon-theme desktop-file-utils"
+depends="xdg-utils hicolor-icon-theme desktop-file-utils"
short_desc="Fast and reliable FTP, FTPS and SFTP client"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://filezilla-project.org/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/FileZilla_${version}_src.tar.bz2"
checksum=2b012970a6033d8ffd4629b1d57b50ace62cd3750efad70001109f25e520c042
-
-filezilla_package() {
- depends="xdg-utils hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index b9b1818dea..a8ea8a7ea7 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -9,9 +9,15 @@ license="MPL-2.1"
long_desc="
This package includes the language packs for the firefox browser."
+noarch=yes
create_wrksrc=yes
create_srcdir=yes
+depends="firefox>=${version}"
+for f in ${_LANG_PACKS}; do
+ depends+=" firefox-i18n-${f}>=${version}"
+done
+
_LANG_PACKS="af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB eo
es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu
hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN
@@ -992,11 +998,3 @@ firefox-i18n-zu_package() {
usr/lib/firefox/browser/extensions langpack-zu@firefox.mozilla.org.xpi
}
}
-
-firefox-i18n_package() {
- depends="firefox>=${version}"
- for f in ${_LANG_PACKS}; do
- depends+=" firefox-i18n-${f}>=${version}"
- done
- noarch=yes
-}
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index c580faf543..ede3680220 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -17,6 +17,7 @@ makedepends="libjpeg-turbo-devel libpng-devel>=1.6 gst-plugins-base-devel
gtk+-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel
startup-notification-devel dbus-glib-devel alsa-lib-devel
hunspell-devel libXScrnSaver-devel libXt-devel"
+depends="desktop-file-utils hicolor-icon-theme"
# Google API key (see http://www.chromium.org/developers/how-tos/api-keys)
# Note: This is for Void Linux use ONLY.
@@ -58,10 +59,3 @@ do_install() {
# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
ln -sf firefox ${DESTDIR}/usr/lib/firefox/firefox-bin
}
-
-firefox_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index b767714e6e..9c675963ed 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -7,6 +7,7 @@ checksum="af527af9d145df5675ca3031c1a87007d4f4753a1cde49da88f4eb883a1cf044"
build_style=gnu-configure
hostmakedepends="autoconf doxygen"
makedepends="ncurses-devel"
+register_shell="/usr/bin/fish"
wrksrc="fish-${version}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://fishshell.com/"
@@ -17,10 +18,3 @@ pre_configure() {
autoconf
autoheader
}
-
-fish-shell_package() {
- register_shell="/usr/bin/fish"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fixesproto/template b/srcpkgs/fixesproto/template
index 0c7893bf18..5e57ddc5f1 100644
--- a/srcpkgs/fixesproto/template
+++ b/srcpkgs/fixesproto/template
@@ -2,22 +2,13 @@
pkgname=fixesproto
version=5.0
revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="xextproto"
+depends="${makedepends}"
short_desc="Fixes extension headers from X.org"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce
-long_desc="
- This provides the Fixes extension headers from modular X.org X11
- project."
-
-fixesproto_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 8f3fc7297e..3a86424f4f 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -50,9 +50,3 @@ libflac-devel_package() {
vmove usr/share/doc
}
}
-
-flac_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template
index 146f006156..5e3464b999 100644
--- a/srcpkgs/flashrom/template
+++ b/srcpkgs/flashrom/template
@@ -20,9 +20,3 @@ do_build() {
do_install() {
make install DESTDIR=${DESTDIR} PREFIX=/usr
}
-
-flashrom_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/flex/template b/srcpkgs/flex/template
index e4fe36cae9..59e1ef403c 100644
--- a/srcpkgs/flex/template
+++ b/srcpkgs/flex/template
@@ -4,6 +4,7 @@ version=2.5.37
revision=2
build_style=gnu-configure
hostmakedepends="help2man bison"
+depends="bison libfl-devel>=${version}"
short_desc="The Fast Lexical Analyzer"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://flex.sourceforge.net"
@@ -26,11 +27,3 @@ libfl-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-flex_package() {
- depends="bison libfl-devel>=${version}"
- pkg_install() {
- vmove usr/bin
- vmove usr/share
- }
-}
diff --git a/srcpkgs/flowcanvas/template b/srcpkgs/flowcanvas/template
index 06fcd973a4..bacdeebe58 100644
--- a/srcpkgs/flowcanvas/template
+++ b/srcpkgs/flowcanvas/template
@@ -24,9 +24,3 @@ flowcanvas-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-flowcanvas_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fltk/template b/srcpkgs/fltk/template
index a9cd026fdc..40fea3b3db 100644
--- a/srcpkgs/fltk/template
+++ b/srcpkgs/fltk/template
@@ -29,9 +29,3 @@ fltk-devel_package() {
vmove usr/share/doc
}
}
-
-fltk_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index f9266d684a..cdade35ba9 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -36,9 +36,3 @@ fluidsynth-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-fluidsynth_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template
index 1d8863218f..5b2c8e38b0 100644
--- a/srcpkgs/fluxbox/template
+++ b/srcpkgs/fluxbox/template
@@ -1,25 +1,26 @@
# Template file for 'fluxbox'
pkgname=fluxbox
-version=1.3.4
+version=1.3.5
revision=1
build_style=gnu-configure
-makedepends="pkg-config libXrender-devel libXft-devel
- libXpm-devel imlib2-devel libXext-devel
- libXinerama-devel libXrandr-devel fribidi-devel"
+configure_args="--enable-randr --enable-nls
+ --with-pkg-exec-prefix=/usr --with-imlib2-prefix=${XBPS_CROSS_BASE}/usr
+ ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
+ ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
+ ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
+ ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes
+ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
+hostmakedepends="pkg-config"
+makedepends="libSM-devel libXrender-devel libXft-devel libXpm-devel imlib2-devel>=1.4.6_2
+ libXext-devel libXinerama-devel libXrandr-devel fribidi-devel"
short_desc="Highly configurable and low resource X11 Window manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.fluxbox.org"
license="MIT"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=8893516ec7743c0b6be8853cec08141ef40bf3d4c6e7e78f5a593b63ced67dc3
+checksum=164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983
post_install() {
vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-fluxbox_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 681c2f5d3f..2f3794e69d 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -11,6 +11,7 @@ hostmakedepends="pkg-config intltool which gobject-introspection"
makedepends="
readline-devel vala-devel>=0.22 telepathy-glib-devel>=0.21 zeitgeist-devel
libgee08-devel>=0.12 evolution-data-server-devel>=3.10 tracker-devel>=0.16_2"
+depends="zeitgeist"
short_desc="GObject Library to aggregate people into metacontacts"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -38,10 +39,3 @@ folks-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-folks_package() {
- depends="zeitgeist"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/font-adobe-100dpi/template b/srcpkgs/font-adobe-100dpi/template
index 6653b90f09..d75f47bd30 100644
--- a/srcpkgs/font-adobe-100dpi/template
+++ b/srcpkgs/font-adobe-100dpi/template
@@ -2,33 +2,18 @@
pkgname=font-adobe-100dpi
version=1.0.3
revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-utils"
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/100dpi"
short_desc="Standard 100dpi Adobe PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="opensource"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054
-long_desc="
- Theses are the PCF versions of the following Adobe fonts for 100dpi displays:
- - Courier
- - Helvetica
- - New Century Schoolbook
- - Symbol
- - Times
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-adobe-100dpi_package() {
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/100dpi"
- depends="font-util"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-adobe-75dpi/template b/srcpkgs/font-adobe-75dpi/template
index d183215ae4..95727cda47 100644
--- a/srcpkgs/font-adobe-75dpi/template
+++ b/srcpkgs/font-adobe-75dpi/template
@@ -2,33 +2,18 @@
pkgname=font-adobe-75dpi
version=1.0.3
revision=2
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-utils"
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/75dpi"
short_desc="Standard 75pi Adobe PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="opensource"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09
-long_desc="
- These are the PCF versions of the following Adobe fonts for 75dpi displays:
- - Courier
- - Helvetica
- - New Century Schoolbook
- - Symbol
- - Times
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-adobe-75dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/75dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-adobe-utopia-100dpi/template b/srcpkgs/font-adobe-utopia-100dpi/template
index a23b787804..96ebc0537b 100644
--- a/srcpkgs/font-adobe-utopia-100dpi/template
+++ b/srcpkgs/font-adobe-utopia-100dpi/template
@@ -2,29 +2,18 @@
pkgname=font-adobe-utopia-100dpi
version=1.0.4
revision=2
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-utils"
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/100dpi"
short_desc="100dpi Adobe Utopia PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="opensource"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5
-long_desc="
- These are the PCF versions of the following Adobe fonts for 100dpi displays:
- - Adobe Utopia
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-adobe-utopia-100dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/100dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-adobe-utopia-75dpi/template b/srcpkgs/font-adobe-utopia-75dpi/template
index 661d45b8b6..41db385a2a 100644
--- a/srcpkgs/font-adobe-utopia-75dpi/template
+++ b/srcpkgs/font-adobe-utopia-75dpi/template
@@ -2,29 +2,18 @@
pkgname=font-adobe-utopia-75dpi
version=1.0.4
revision=2
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/75dpi"
short_desc="100dpi Adobe Utopia PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="opensource"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94
-long_desc="
- These are the PCF versions of the following Adobe fonts for 75dpi displays:
- - Adobe Utopia
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-adobe-utopia-75dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/75dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-adobe-utopia-type1/template b/srcpkgs/font-adobe-utopia-type1/template
index 8997eb67f2..0d3be175ad 100644
--- a/srcpkgs/font-adobe-utopia-type1/template
+++ b/srcpkgs/font-adobe-utopia-type1/template
@@ -1,30 +1,19 @@
# Template build file for 'font-adobe-utopia-type1'.
pkgname=font-adobe-utopia-type1
version=1.0.4
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/Type1"
short_desc="Adobe Utopia Type1 fonts"
homepage="http://xorg.freedesktop.org/"
license="opensource"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077
-long_desc="
- This are the Type1 versions of the following Adobe fonts:
- - Adobe Utopia
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-adobe-utopia-type1_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/Type1"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-alias/template b/srcpkgs/font-alias/template
index c7c47cfdf8..24d72a4a71 100644
--- a/srcpkgs/font-alias/template
+++ b/srcpkgs/font-alias/template
@@ -2,22 +2,11 @@
pkgname=font-alias
version=1.0.3
revision=2
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+noarch="yes"
build_style=gnu-configure
short_desc="Standard aliases for X11 PCF fonts"
license="MIT"
homepage="http://xorg.freedesktop.org/"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a
-long_desc="
- The font-alias package contains a font.alias tables for the various PCF
- packages of modular Xorg. It maps common legacy names to full font
- descriptors. The most important alias is fixed, which is needed for
- the X server to run."
-
-font-alias_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bh-100dpi/template b/srcpkgs/font-bh-100dpi/template
index 00f0749a8c..423081400d 100644
--- a/srcpkgs/font-bh-100dpi/template
+++ b/srcpkgs/font-bh-100dpi/template
@@ -1,32 +1,19 @@
# Template build file for 'font-bh-100dpi'.
pkgname=font-bh-100dpi
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/100dpi"
short_desc="Standard 100dpi Bigelow and Holmes PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481
-long_desc="
- These are the PCF versions of the following Bigelow and Holmes fonts
- for 100dpi displays:
- - Lucida
- - Lucida Bright
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bh-100dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/100dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bh-75dpi/template b/srcpkgs/font-bh-75dpi/template
index d9ee4f5b9a..5f4ff3768e 100644
--- a/srcpkgs/font-bh-75dpi/template
+++ b/srcpkgs/font-bh-75dpi/template
@@ -1,32 +1,19 @@
# Template build file for 'font-bh-75dpi'.
pkgname=font-bh-75dpi
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/75dpi"
short_desc="Standard 75dpi Bigelow and Holmes PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=3486aa51ac92c646a448fe899c5c3dae0024b1fef724d5100d52640d1cac721c
-long_desc="
- These are the PCF versions of the following Bigelow and Holmes fonts
- for 75dpi displays:
- - Lucida
- - Lucida Bright
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bh-75dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/75dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bh-lucidatypewriter-100dpi/template b/srcpkgs/font-bh-lucidatypewriter-100dpi/template
index 949058e50d..129104d698 100644
--- a/srcpkgs/font-bh-lucidatypewriter-100dpi/template
+++ b/srcpkgs/font-bh-lucidatypewriter-100dpi/template
@@ -2,30 +2,18 @@
pkgname=font-bh-lucidatypewriter-100dpi
version=1.0.3
revision=2
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/100dpi"
short_desc="100dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb
-long_desc="
- This are the PCF versions of the following Bigelow and Holmes fonts
- for 100dpi displays:
- - Lucida Typewriter
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bh-lucidatypewriter-100dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/100dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bh-lucidatypewriter-75dpi/template b/srcpkgs/font-bh-lucidatypewriter-75dpi/template
index a88e4dbcd1..1fadab3cd4 100644
--- a/srcpkgs/font-bh-lucidatypewriter-75dpi/template
+++ b/srcpkgs/font-bh-lucidatypewriter-75dpi/template
@@ -1,31 +1,19 @@
# Template build file for 'font-bh-lucidatypewriter-75dpi'.
pkgname=font-bh-lucidatypewriter-75dpi
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/75dpi"
short_desc="75dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=4ac16afbe205480cc5572e2977ea63488c543d05be0ea8e5a94c845a6eebcb31
-long_desc="
- This are the PCF versions of the following Bigelow and Holmes fonts
- for 75dpi displays:
- - Lucida Typewriter
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bh-lucidatypewriter-75dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/75dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bh-ttf/template b/srcpkgs/font-bh-ttf/template
index 901fbb0e30..abd499c709 100644
--- a/srcpkgs/font-bh-ttf/template
+++ b/srcpkgs/font-bh-ttf/template
@@ -1,32 +1,19 @@
# Template build file for 'font-bh-ttf'.
pkgname=font-bh-ttf
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/TTF"
short_desc="Standard Bigelow and Holmes TrueType fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=1b4bea63271b4db0726b5b52c97994c3313b6023510349226908090501abd25f
-long_desc="
- These are the TrueType versions of the following Bigelow and Holmes fonts:
- - Luxi Mono
- - Luxi Sans
- - Luxi Serif
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bh-ttf_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/TTF"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bh-type1/template b/srcpkgs/font-bh-type1/template
index afb6794ecd..07b0b0b9e6 100644
--- a/srcpkgs/font-bh-type1/template
+++ b/srcpkgs/font-bh-type1/template
@@ -1,32 +1,19 @@
# Template build file for 'font-bh-type1'.
pkgname=font-bh-type1
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/Type1"
short_desc="Standard Bigelow and Holmes Type1 fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1
-long_desc="
- This are the Type1 versions of the following Bigelow and Holmes fonts:
- - Luxi Mono
- - Luxi Sans
- - Luxi Serif
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bh-type1_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/Type1"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bitstream-100dpi/template b/srcpkgs/font-bitstream-100dpi/template
index c6141447c8..33a96eb4ab 100644
--- a/srcpkgs/font-bitstream-100dpi/template
+++ b/srcpkgs/font-bitstream-100dpi/template
@@ -1,32 +1,19 @@
# Template build file for 'font-bitstream-100dpi'.
pkgname=font-bitstream-100dpi
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/100dpi"
short_desc="Standard 100dpi Bitstream PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce
-long_desc="
- This are the PCF versions of the following Bitstream fonts for
- 100dpi displays:
- - Charter
- - Terminal
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bitstream-100dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/100dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bitstream-75dpi/template b/srcpkgs/font-bitstream-75dpi/template
index 4187670a4e..2538c42767 100644
--- a/srcpkgs/font-bitstream-75dpi/template
+++ b/srcpkgs/font-bitstream-75dpi/template
@@ -1,32 +1,19 @@
# Template build file for 'font-bitstream-75dpi'.
pkgname=font-bitstream-75dpi
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/75dpi"
short_desc="Standard 100dpi Bitstream PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=ba3f5e4610c07bd5859881660753ec6d75d179f26fc967aa776dbb3d5d5cf48e
-long_desc="
- These are the PCF versions of the following Bitstream fonts for
- 75dpi displays:
- - Charter
- - Terminal
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bitstream-75dpi_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/75dpi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template
index e732c49062..ded1119832 100644
--- a/srcpkgs/font-bitstream-speedo/template
+++ b/srcpkgs/font-bitstream-speedo/template
@@ -2,30 +2,19 @@
pkgname=font-bitstream-speedo
version=1.0.0
revision=2
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf"
makedepends="font-util"
+depends="font-util"
+font_dirs="/usr/lib/X11/fonts/Speedo"
short_desc="Standard Speedo Bitstream PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6
-long_desc="
- These are the PCF versions of the following Speedo Bitstream fonts:
- - Speedo
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bitstream-speedo_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/lib/X11/fonts/Speedo"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-bitstream-type1/template b/srcpkgs/font-bitstream-type1/template
index a19bb31979..865e35e454 100644
--- a/srcpkgs/font-bitstream-type1/template
+++ b/srcpkgs/font-bitstream-type1/template
@@ -1,30 +1,19 @@
# Template build file for 'font-bitstream-type1'.
pkgname=font-bitstream-type1
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/Type1"
short_desc="Standard Type1 Bitstream PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688
-long_desc="
- These are the PCF versions of the following Type1 Bitstream fonts:
- - Type1
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-bitstream-type1_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/Type1"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-cursor-misc/template b/srcpkgs/font-cursor-misc/template
index b3e872b500..0c294dc448 100644
--- a/srcpkgs/font-cursor-misc/template
+++ b/srcpkgs/font-cursor-misc/template
@@ -1,30 +1,19 @@
# Template build file for 'font-cursor-misc'.
pkgname=font-cursor-misc
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/misc"
short_desc="Standard X11 cursors in PCF format"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635
-long_desc="
- The font-cursor-misc package provides around 75 cursors in the
- portable PCF format. These include the X cursor, arrows, clock
- cursor, crosshair, fleur cursor, iron cross, sailboat cursor, and
- many more."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-cursor-misc_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-daewoo-misc/template b/srcpkgs/font-daewoo-misc/template
index b8b6bbcb08..0475563213 100644
--- a/srcpkgs/font-daewoo-misc/template
+++ b/srcpkgs/font-daewoo-misc/template
@@ -1,29 +1,19 @@
# Template build file for 'font-daewoo-misc'.
pkgname=font-daewoo-misc
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/misc"
short_desc="Daewoo Gothic PCF format"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8
-long_desc="
- These are the PCF versions of the Daewoo Gothic fonts for 100dpi displays.
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-daewoo-misc_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-dec-misc/template b/srcpkgs/font-dec-misc/template
index f947a5c5bd..c422c1fe7e 100644
--- a/srcpkgs/font-dec-misc/template
+++ b/srcpkgs/font-dec-misc/template
@@ -1,31 +1,19 @@
# Template build file for 'font-dec-misc'.
pkgname=font-dec-misc
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/misc"
short_desc="DEC cursor and session PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b
-long_desc="
- These are the PCF versions of the following DEC fonts for 100dpi displays:
- - Cursor
- - Session
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-dec-misc_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-ibm-type1/template b/srcpkgs/font-ibm-type1/template
index 2523c2f529..f5f52e41e8 100644
--- a/srcpkgs/font-ibm-type1/template
+++ b/srcpkgs/font-ibm-type1/template
@@ -1,29 +1,19 @@
# Template build file for 'font-ibm-type1'.
pkgname=font-ibm-type1
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/Type1"
short_desc="IBM Courier Type1 fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=fddb28d3db5a07f4b4ca15388488a9680a10e1367a18f358f903b2a608a5d2df
-long_desc="
- These are the Type1 versions of the IBM Courier fonts.
-
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-ibm-type1_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/Type1"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-isas-misc/template b/srcpkgs/font-isas-misc/template
index cea93de310..c96e88cd91 100644
--- a/srcpkgs/font-isas-misc/template
+++ b/srcpkgs/font-isas-misc/template
@@ -1,28 +1,19 @@
# Template build file for 'font-isas-misc'.
pkgname=font-isas-misc
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/misc"
short_desc="72dpi PCF versions of the Chinese Song Ti fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867
-long_desc="
- These are the PCF versions of the Song Si fonts for 72dpi displays.
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-isas-misc_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-misc-misc/template b/srcpkgs/font-misc-misc/template
index 8ffde9c9ae..06fd6a6316 100644
--- a/srcpkgs/font-misc-misc/template
+++ b/srcpkgs/font-misc-misc/template
@@ -1,28 +1,19 @@
# Template build file for 'font-misc-misc'.
pkgname=font-misc-misc
version=1.1.2
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/misc"
short_desc="Standard X11 fixed PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794
-long_desc="
- The standard X11 public domain fixed font that you can
- share and enjoy. It is in PCF format."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-misc-misc_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-mutt-misc/template b/srcpkgs/font-mutt-misc/template
index 73d0808c98..1e42449128 100644
--- a/srcpkgs/font-mutt-misc/template
+++ b/srcpkgs/font-mutt-misc/template
@@ -1,28 +1,19 @@
# Template build file for 'font-mutt-misc'.
pkgname=font-mutt-misc
version=1.0.3
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/share/fonts/X11/misc"
short_desc="100dpi PCF versions of the ClearlyU fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f
-long_desc="
- These are the PCF versions of the ClearlyU fonts for 100dpi displays.
- This is from the modular Xorg project."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-mutt-misc_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-sony-misc/template b/srcpkgs/font-sony-misc/template
index 79d6e55b20..85ca2e08d0 100644
--- a/srcpkgs/font-sony-misc/template
+++ b/srcpkgs/font-sony-misc/template
@@ -1,28 +1,19 @@
# Template build file for 'font-sony-misc'.
pkgname=font-sony-misc
version=1.0.0
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config bdftopcf font-util"
-revision=2
+depends="font-util"
+font_dirs="/usr/lib/X11/fonts/misc"
short_desc="Standard X11 sony PCF fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
checksum=1ae93ae76020b57cb0054ba9f33b4d5aec71342c6596750c07303d5c53452e23
-long_desc="
- The standard X11 sony fonts that you can share and enjoy.
- It is in PCF format."
post_install() {
rm -f ${DESTDIR}/${font_dirs}/fonts.*
}
-
-font-sony-misc_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/lib/X11/fonts/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index e75013f2ca..9603d0cff3 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -3,9 +3,12 @@ pkgname=font-unifont-bdf
version=5.1.20080820
revision=1
create_wrksrc=yes
+noarch=yes
homepage="http://unifoundry.com/unifont.html"
distfiles="http://unifoundry.com/unifont-${version}.bdf.gz"
makedepends="font-util"
+depends="font-util"
+font_dirs="/usr/share/fonts/misc"
short_desc="GNU Unifont Glyphs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, Freeware"
@@ -14,20 +17,9 @@ long_desc="
This page contains GNU Unifont, with glyphs for every printable code point
in the Unicode 5.1 Basic Multilingual Plane (BMP)."
-noarch=yes
-
do_install() {
gunzip -c ${XBPS_SRCDISTDIR}/unifont-${version}.bdf.gz \
> unifont-${version}.bdf
vinstall unifont-${version}.bdf \
644 usr/share/fonts/misc unifont.bdf
}
-
-font-unifont-bdf_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/font-util/template b/srcpkgs/font-util/template
index d7327844f5..134ed54333 100644
--- a/srcpkgs/font-util/template
+++ b/srcpkgs/font-util/template
@@ -4,6 +4,11 @@ version=1.3.0
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config bdftopcf"
+#
+# These aren't really required, but this is to centralize the
+# requirement of dependent packages.
+#
+depends="font-alias expat freetype fontconfig mkfontdir mkfontscale"
short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -16,14 +21,3 @@ long_desc="
and generating truncated BDF font from ISO 10646-1-encoded BDF
font. It also provides mapping-files (character set tables)
and the fontutil pkg-config and autoconf macro files."
-
-font-util_package() {
- #
- # These aren't really required, but this is to centralize the
- # requirement of dependent packages.
- #
- depends="font-alias expat freetype fontconfig mkfontdir mkfontscale"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fontcacheproto/template b/srcpkgs/fontcacheproto/template
index 2f5132818c..d50be71a44 100644
--- a/srcpkgs/fontcacheproto/template
+++ b/srcpkgs/fontcacheproto/template
@@ -1,21 +1,12 @@
# Template build file for 'fontcacheproto'.
pkgname=fontcacheproto
version=0.1.2
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
revision=2
+noarch="yes"
+build_style=gnu-configure
short_desc="Fontcache extension headers from X.org"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9
-long_desc="
- This package provides the Fontcache extension headers from the
- modular X.org X11 project."
-
-fontcacheproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 8f12f13716..cc73ba4e99 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static --enable-docs --with-cache-dir=/var/cache/$pkgname"
hostmakedepends="pkg-config"
makedepends="expat-devel zlib-devel freetype-devel"
+conf_files="/etc/fonts/fonts.conf"
short_desc="Library for configuring and customizing font access"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.fontconfig.org"
@@ -24,10 +25,3 @@ fontconfig-devel_package() {
vmove usr/share/doc
}
}
-
-fontconfig_package() {
- conf_files="/etc/fonts/fonts.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fontsproto/template b/srcpkgs/fontsproto/template
index 15f7645a4d..ce6d9973de 100644
--- a/srcpkgs/fontsproto/template
+++ b/srcpkgs/fontsproto/template
@@ -1,21 +1,12 @@
# Template build file for 'fontsproto'.
pkgname=fontsproto
version=2.1.0
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
revision=2
+noarch="yes"
+build_style=gnu-configure
short_desc="Fonts extension headers from X.org"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=5a9af61dc9142488c9ba6e4ae30a9d970ea0f889a1ab7f59de1c1898c83aeb35
-long_desc="
- This package provides the fonts extension headers from the modular
- X.org X11 project."
-
-fontsproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template
index 66e39cf6ea..785f7df16e 100644
--- a/srcpkgs/foobillard++/template
+++ b/srcpkgs/foobillard++/template
@@ -6,6 +6,7 @@ wrksrc=foobillardplus-${version}
homepage="http://foobillardplus.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/foobillardplus/foobillardplus-$version.tar.gz"
makedepends="freetype-devel libpng-devel>=1.6 MesaLib-devel SDL_net-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="An OpenGL billard game - fork of foobillard"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -36,10 +37,3 @@ do_install() {
vinstall foobillardplus.xbm 644 usr/share/pixmaps
find ${DESTDIR} -depth -type d -name .svn -exec rm -rf {} \;
}
-
-foobillard++_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/foomatic-db-engine/template b/srcpkgs/foomatic-db-engine/template
index 9dd97f6489..bb7143c69b 100644
--- a/srcpkgs/foomatic-db-engine/template
+++ b/srcpkgs/foomatic-db-engine/template
@@ -1,15 +1,16 @@
# Template file for 'foomatic-db-engine'
pkgname=foomatic-db-engine
version=4.0.8
-homepage="https://www.openprinting.org/"
-distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
+revision=1
build_style=gnu-configure
hostmakedepends="wget perl foomatic-db foomatic-filters ghostscript cups"
makedepends="libxml2-devel cups-devel"
-revision=1
+depends="${hostmakedepends}"
short_desc="OpenPrinting printer support - programs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, MIT"
+homepage="https://www.openprinting.org/"
+distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
checksum=f0c4892ae5566ea2efaae8bd58352fd32001d112f2f9dfff63f7de03b46733e1
long_desc="
Foomatic is a printing system designed to make it easier to set up common
@@ -22,10 +23,3 @@ long_desc="
packages. The foomatic-db package includes drivers for most common printers
using Ghostscript as the print processor, as well as some common glue code
used in other filter systems."
-
-foomatic-db-engine_package() {
- depends="${hostmakedepends}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/foomatic-db-nonfree/template b/srcpkgs/foomatic-db-nonfree/template
index f09535049c..a550a56780 100644
--- a/srcpkgs/foomatic-db-nonfree/template
+++ b/srcpkgs/foomatic-db-nonfree/template
@@ -2,6 +2,7 @@
pkgname=foomatic-db-nonfree
version=20130331
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="OpenPrinting printer support - nonfree database"
homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/databasefoomatic"
@@ -19,10 +20,3 @@ long_desc="
manufactured-supplied PPD drivers released under non-free licenses.
You will probably need the foomatic-db-engine package for this package to be
useful."
-
-foomatic-db-nonfree_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/foomatic-db/template b/srcpkgs/foomatic-db/template
index 3fcf337400..179f3a9088 100644
--- a/srcpkgs/foomatic-db/template
+++ b/srcpkgs/foomatic-db/template
@@ -2,6 +2,7 @@
pkgname=foomatic-db
version=20120626
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="OpenPrinting printer support - database"
homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/databasefoomatic"
@@ -18,10 +19,3 @@ long_desc="
This package contains the printer database distributed by OpenPrinting for
most common drivers. You will probably need the foomatic-db-engine package
for this package to be useful."
-
-foomatic-db_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/foomatic-filters/template b/srcpkgs/foomatic-filters/template
index af3942a753..822e956c19 100644
--- a/srcpkgs/foomatic-filters/template
+++ b/srcpkgs/foomatic-filters/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--enable-dbus"
hostmakedepends="pkg-config perl enscript"
makedepends="dbus-devel cups-devel"
+depends="perl"
+conf_files="/etc/foomatic/filter.conf"
short_desc="OpenPrinting printer support - filters"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, MIT"
@@ -23,11 +25,3 @@ long_desc="
printer-specific, but spooler-independent PPD file.
For use with CUPS, you will need the cups package installed on your system."
-
-foomatic-filters_package() {
- depends="perl"
- conf_files="/etc/foomatic/filter.conf"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/foremost/template b/srcpkgs/foremost/template
index 7ffb6f5c3b..556797e2da 100644
--- a/srcpkgs/foremost/template
+++ b/srcpkgs/foremost/template
@@ -2,6 +2,7 @@
pkgname=foremost
version=1.5.7
revision=1
+conf_files="/etc/foremost.conf"
short_desc="Forensic program to recover lost files"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Public domain, GPL-2"
@@ -26,11 +27,3 @@ do_install() {
vinstall foremost.8.gz 644 usr/share/man/man8
vinstall foremost.conf 644 etc
}
-
-foremost_package() {
- conf_files="/etc/foremost.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index aadeb2f0e2..2eaf5fb241 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -28,9 +28,3 @@ do_install() {
# Install license.
vinstall COPYRIGHT-BSD2.txt 644 usr/share/licenses/${pkgname} LICENSE
}
-
-fossil_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fox/template b/srcpkgs/fox/template
index 57e9a80777..c04c3431b5 100644
--- a/srcpkgs/fox/template
+++ b/srcpkgs/fox/template
@@ -35,9 +35,3 @@ fox-utils_package() {
vmove usr/share
}
}
-
-fox_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/freealut/template b/srcpkgs/freealut/template
index f24a2b196d..1795d5bbb0 100644
--- a/srcpkgs/freealut/template
+++ b/srcpkgs/freealut/template
@@ -1,21 +1,20 @@
# Template file for 'freealut'
pkgname=freealut
version=1.1.0
-build_style=gnu-configure
revision=3
-homepage="http://www.openal.org"
-distfiles="http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$version.tar.gz"
-makedepends="pkg-config libopenal-devel"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libopenal-devel"
short_desc="OpenAL Utility Toolkit (ALUT)"
maintainer="davehome <davehome@redthumb.info.tm>"
license="LGPL-2.1"
+homepage="http://www.openal.org"
+distfiles="http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$version.tar.gz"
checksum=60d1ea8779471bb851b89b49ce44eecb78e46265be1a6e9320a28b100c8df44f
-long_desc="
- freealut is a free implementation of OpenAL's ALUT standard."
freealut-devel_package() {
depends="libopenal-devel freealut>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/bin
vmove usr/include
@@ -23,9 +22,3 @@ freealut-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-freealut_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/freefont-ttf/template b/srcpkgs/freefont-ttf/template
index 87c3838b70..3d7b20a933 100644
--- a/srcpkgs/freefont-ttf/template
+++ b/srcpkgs/freefont-ttf/template
@@ -2,9 +2,12 @@
pkgname=freefont-ttf
version=20120503
revision=3
+noarch="yes"
wrksrc=freefont-${version}
hostmakedepends="unzip"
makedepends="font-util xbps-triggers>=0.58"
+depends="${makedepends}"
+font_dirs="/usr/share/fonts/TTF"
short_desc="Free family of scalable outline fonts"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.nongnu.org/freefont/"
@@ -17,12 +20,3 @@ do_install() {
install -m644 ${wrksrc}/*.ttf ${DESTDIR}/usr/share/fonts/TTF
vinstall ${FILESDIR}/conf.avail 644 etc/fonts/conf.avail 69-freefont.conf
}
-
-freefont-ttf_package() {
- depends="${makedepends}"
- noarch="yes"
- font_dirs="/usr/share/fonts/TTF"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/freerdp-devel b/srcpkgs/freerdp-devel
new file mode 120000
index 0000000000..ff5b2c64c0
--- /dev/null
+++ b/srcpkgs/freerdp-devel
@@ -0,0 +1 @@
+freerdp
\ No newline at end of file
diff --git a/srcpkgs/freerdp/patches/ffmpeg2.0.patch b/srcpkgs/freerdp/patches/ffmpeg2.0.patch
new file mode 100644
index 0000000000..63688b7acf
--- /dev/null
+++ b/srcpkgs/freerdp/patches/ffmpeg2.0.patch
@@ -0,0 +1,75 @@
+--- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-01-02 22:46:59.000000000 +0100
++++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-07-22 18:12:18.001576713 +0200
+@@ -28,6 +28,8 @@
+ #include "tsmf_constants.h"
+ #include "tsmf_decoder.h"
+
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++
+ /* Compatibility with older FFmpeg */
+ #if LIBAVUTIL_VERSION_MAJOR < 50
+ #define AVMEDIA_TYPE_VIDEO 0
+@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder
+ ITSMFDecoder iface;
+
+ int media_type;
+- enum CodecID codec_id;
++ enum AVCodecID codec_id;
+ AVCodecContext* codec_context;
+ AVCodec* codec;
+ AVFrame* frame;
+@@ -54,7 +56,7 @@ static boolean tsmf_ffmpeg_init_context(
+ {
+ TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
+
+- mdecoder->codec_context = avcodec_alloc_context();
++ mdecoder->codec_context = avcodec_alloc_context3(NULL);
+ if (!mdecoder->codec_context)
+ {
+ DEBUG_WARN("avcodec_alloc_context failed.");
+@@ -88,16 +90,6 @@ static boolean tsmf_ffmpeg_init_audio_st
+ mdecoder->codec_context->channels = media_type->Channels;
+ mdecoder->codec_context->block_align = media_type->BlockAlign;
+
+-#ifdef AV_CPU_FLAG_SSE2
+- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
+-#else
+-#if LIBAVCODEC_VERSION_MAJOR < 53
+- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
+-#else
+- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
+-#endif
+-#endif
+-
+ return true;
+ }
+
+@@ -174,7 +166,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMF
+ {
+ TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
+
+- if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0)
++ if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0)
+ {
+ DEBUG_WARN("avcodec_open failed.");
+ return false;
+@@ -372,8 +364,9 @@ static boolean tsmf_ffmpeg_decode_audio(
+ av_init_packet(&pkt);
+ pkt.data = (uint8*) src;
+ pkt.size = src_size;
+- len = avcodec_decode_audio3(mdecoder->codec_context,
+- (int16_t*) dst, &frame_size, &pkt);
++ AVFrame * frame = avcodec_alloc_frame ();
++ len = avcodec_decode_audio4(mdecoder->codec_context,
++ frame, &frame_size, &pkt);
+ }
+ #endif
+ if (len <= 0 || frame_size <= 0)
+@@ -499,7 +492,6 @@ TSMFDecoderEntry(void)
+
+ if (!initialized)
+ {
+- avcodec_init();
+ avcodec_register_all();
+ initialized = true;
+ }
diff --git a/srcpkgs/freerdp/patches/patch_numblock.patch b/srcpkgs/freerdp/patches/patch_numblock.patch
new file mode 100644
index 0000000000..11a386f8c8
--- /dev/null
+++ b/srcpkgs/freerdp/patches/patch_numblock.patch
@@ -0,0 +1,11 @@
+--- include/freerdp/kbd/vkcodes.h 2013-09-19 12:46:07.124339712 +0200
++++ include/freerdp/kbd/vkcodes.h 2013-09-19 12:45:51.621005583 +0200
+@@ -434,7 +434,7 @@
+ { 0x00, 0, "VK_SEPARATOR" , NULL },
+ { 0x4A, 0, "VK_SUBTRACT" , "KPSU" },
+ { 0x53, 0, "VK_DECIMAL" , "KPDL" },
+- { 0x35, 0, "VK_DIVIDE" , "KPDV" },
++ { 0x35, 1, "VK_DIVIDE" , "KPDV" },
+ { 0x3B, 0, "VK_F1" , "FK01" },
+ { 0x3C, 0, "VK_F2" , "FK02" },
+ { 0x3D, 0, "VK_F3" , "FK03" },
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
new file mode 100644
index 0000000000..f5e8f360f2
--- /dev/null
+++ b/srcpkgs/freerdp/template
@@ -0,0 +1,35 @@
+# Template file for 'freerdp'
+pkgname=freerdp
+version=1.0.2
+revision=1
+create_srcdir=yes
+wrksrc="FreeRDP-${version}"
+build_style=cmake
+configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON
+ -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XV=ON
+ -DWITH_XKBFILE=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER=OFF -DWITH_ALSA=ON
+ -DWITH_CUPS=OFF -DWITH_PCSC=OFF -DCMAKE_INSTALL_LIBDIR=lib"
+hostmakedepends="pkg-config cmake"
+makedepends="alsa-lib-devel libjpeg-turbo-devel pulseaudio-devel libXinerama-devel
+ libXext-devel libXcursor-devel libXi-devel libXrender-devel libXv-devel
+ libxkbfile-devel ffmpeg-devel openssl-devel"
+short_desc="A Free RDP (Remote Desktop Protocol) client"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="Apache-2.0"
+homepage="http://freerdp.sourceforge.net"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=c0f137df7ab6fb76d7e7d316ae4e0ca6caf356e5bc0b5dadbdfadea5db992df1
+
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+esac
+
+freerdp-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index a2d04b100f..3865945e40 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -32,9 +32,3 @@ freetype-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-freetype_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index 7db46b7b4b..5655d21283 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -22,9 +22,3 @@ fribidi-devel_package() {
vmove usr/share
}
}
-
-fribidi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template
index 487bfcde8b..a54de1f17b 100644
--- a/srcpkgs/fs-uae/template
+++ b/srcpkgs/fs-uae/template
@@ -14,6 +14,7 @@ long_desc="
hostmakedepends="pkg-config"
makedepends="SDL-devel freetype-devel libglib-devel libpng-devel>=1.6 libopenal-devel"
+depends="desktop-file-utils hicolor-icon-theme"
do_build() {
make ${makejobs}
@@ -23,10 +24,3 @@ do_install() {
make prefix=${DESTDIR}/usr install
vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications
}
-
-fs-uae_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fs-utils/template b/srcpkgs/fs-utils/template
index 96fb04ff44..b70fd640dd 100644
--- a/srcpkgs/fs-utils/template
+++ b/srcpkgs/fs-utils/template
@@ -15,9 +15,3 @@ do_fetch() {
msg_normal "Fetching source from $url ...\n"
git clone -b${version} ${url} ${pkgname}-${version}
}
-
-fs-utils_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fsarchiver/template b/srcpkgs/fsarchiver/template
index 21000408fe..1b3e29abd8 100644
--- a/srcpkgs/fsarchiver/template
+++ b/srcpkgs/fsarchiver/template
@@ -12,9 +12,3 @@ license="GPL-2"
homepage="http://www.fsarchiver.org/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=409add97337783cb135f15c07318acf5067f5837f07bd62c7e358f3dcf5dced5
-
-fsarchiver_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ftgl/template b/srcpkgs/ftgl/template
index dde71b579c..ce72bc3286 100644
--- a/srcpkgs/ftgl/template
+++ b/srcpkgs/ftgl/template
@@ -29,9 +29,3 @@ ftgl-devel_package() {
vmove usr/share/doc
}
}
-
-ftgl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ftjam/template b/srcpkgs/ftjam/template
index 9948d9f6d3..9afe0db21a 100644
--- a/srcpkgs/ftjam/template
+++ b/srcpkgs/ftjam/template
@@ -19,11 +19,3 @@ long_desc="
post_install() {
vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/ftjam
}
-
-ftjam_package() {
- replaces="jam>=0"
- provides="jam-${version}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/fuse-archivemount/template b/srcpkgs/fuse-archivemount/template
index e57ffe78cc..7d384fda00 100644
--- a/srcpkgs/fuse-archivemount/template
+++ b/srcpkgs/fuse-archivemount/template
@@ -12,9 +12,3 @@ license="LGPL-2"
homepage="http://www.cybernoia.de/software/archivemount/"
distfiles="${homepage}/${pkgname/fuse-/}-${version}.tar.gz"
checksum=e78899a8b7c9cb43fa4526d08c54a9e171475c00bf095770b8779a33e37661ff
-
-fuse-archivemount_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/fuse-exfat/template b/srcpkgs/fuse-exfat/template
index ff872feb31..6ab40264a4 100644
--- a/srcpkgs/fuse-exfat/template
+++ b/srcpkgs/fuse-exfat/template
@@ -1,9 +1,10 @@
# Template file for 'fuse-exfat'
pkgname=fuse-exfat
version=1.0.0
-revision=1
+revision=2
hostmakedepends="scons"
makedepends="fuse-devel exfat-utils>=${version}"
+depends="exfat-utils>=${version}"
short_desc="Free exFAT file system implementation"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -12,16 +13,6 @@ distfiles="http://exfat.googlecode.com/files/${pkgname}-${version}.tar.gz"
checksum=18c0dafed64596e536c5d47604585ff353a2e4bb067066e3ec5963a5a170f4a5
do_install() {
- scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " \
- DESTDIR="${DESTDIR}/usr/bin" install
-
- install -Dm444 fuse/mount.exfat-fuse.8 \
- ${DESTDIR}/usr/share/man/man8/mount.exfat-fuse.8
-}
-
-fuse-exfat_package() {
- depends="exfat-utils>=${version}"
- pkg_install() {
- vmove usr
- }
+ scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " DESTDIR="${DESTDIR}/usr/bin" install
+ install -Dm444 fuse/mount.exfat-fuse.8 ${DESTDIR}/usr/share/man/man8/mount.exfat-fuse.8
}
diff --git a/srcpkgs/fuse-sshfs/template b/srcpkgs/fuse-sshfs/template
new file mode 100644
index 0000000000..95a5843a73
--- /dev/null
+++ b/srcpkgs/fuse-sshfs/template
@@ -0,0 +1,16 @@
+# Template file for 'fuse-sshfs'
+pkgname=fuse-sshfs
+version=2.5
+revision=1
+wrksrc="sshfs-fuse-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libglib-devel fuse-devel openssh>=6.1p1"
+depends="openssh>=6.1p1"
+replaces="sshfs-fuse>=0"
+short_desc="FUSE client based on the SSH File Transfer Protocol"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://fuse.sourceforge.net/sshfs.html"
+license="GPL-2"
+distfiles="${SOURCEFORGE_SITE}/fuse/sshfs-fuse-$version.tar.gz"
+checksum=e9171452e5d0150b9c6a2158fd2e2dcefb5d5d03ba4d208949e00a3a46c6e63e
diff --git a/srcpkgs/fuse/patches/fuse-headers.patch b/srcpkgs/fuse/patches/fuse-headers.patch
new file mode 100644
index 0000000000..53c791d557
--- /dev/null
+++ b/srcpkgs/fuse/patches/fuse-headers.patch
@@ -0,0 +1,13 @@
+--- include/fuse_common.h
++++ include/fuse_common.h
+@@ -28,8 +28,8 @@
+ #define FUSE_MAKE_VERSION(maj, min) ((maj) * 10 + (min))
+ #define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)
+
+-/* This interface uses 64 bit off_t */
+-#if _FILE_OFFSET_BITS != 64
++/* This interface uses 64 bit off_t, and only glibc has an implementation with 2 different sizes */
++#if defined(__GLIBC__) && _FILE_OFFSET_BITS != 64
+ #error Please add -D_FILE_OFFSET_BITS=64 to your compile flags!
+ #endif
+
diff --git a/srcpkgs/fuse/patches/fuse-lock.patch b/srcpkgs/fuse/patches/fuse-lock.patch
new file mode 100644
index 0000000000..d2d229c143
--- /dev/null
+++ b/srcpkgs/fuse/patches/fuse-lock.patch
@@ -0,0 +1,20 @@
+--- lib/fuse_lowlevel.c
++++ lib/fuse_lowlevel.c
+@@ -24,6 +24,7 @@
+ #include <limits.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <sys/file.h>
+
+ #ifndef F_LINUX_SPECIFIC_BASE
+ #define F_LINUX_SPECIFIC_BASE 1024
+--- lib/fuse.c
++++ lib/fuse.c
+@@ -37,6 +37,7 @@
+ #include <sys/uio.h>
+ #include <sys/time.h>
+ #include <sys/mman.h>
++#include <sys/file.h>
+
+ #define FUSE_NODE_SLAB 1
+
diff --git a/srcpkgs/fuse/patches/fuse-paths.patch b/srcpkgs/fuse/patches/fuse-paths.patch
new file mode 100644
index 0000000000..d24f233f18
--- /dev/null
+++ b/srcpkgs/fuse/patches/fuse-paths.patch
@@ -0,0 +1,20 @@
+--- lib/mount_util.c
++++ lib/mount_util.c
+@@ -16,6 +16,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
++#include <paths.h>
+ #ifndef __NetBSD__
+ #include <mntent.h>
+ #endif
+--- util/fusermount.c
++++ util/fusermount.c
+@@ -20,6 +20,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <pwd.h>
++#include <paths.h>
+ #include <mntent.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
diff --git a/srcpkgs/fuse/template b/srcpkgs/fuse/template
index b3fcb53870..89a798aa5a 100644
--- a/srcpkgs/fuse/template
+++ b/srcpkgs/fuse/template
@@ -1,26 +1,15 @@
# Template file for 'fuse'
pkgname=fuse
version=2.9.3
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--disable-static --enable-lib --enable-util"
+configure_args="--enable-lib --enable-util"
short_desc="Filesystem in Userspace"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://fuse.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c
-long_desc="
- With FUSE it is possible to implement a fully functional filesystem in
- a userspace program. Features include:
-
- * Simple library API
- * Simple installation (no need to patch or recompile the kernel)
- * Secure implementation
- * Userspace - kernel interface is very efficient
- * Usable by non privileged users
- * Runs on Linux kernels 2.4.X and 2.6.X
- * Has proven very stable over time"
post_install() {
# remove obsolete rules file provided by udev.
@@ -31,17 +20,12 @@ post_install() {
}
fuse-devel_package() {
- depends="fuse-${version}_${revision}"
+ depends="fuse>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
-
-fuse_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 616d44fc02..53c12026c3 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -2,23 +2,16 @@
pkgname=gajim
version=0.15.3
revision=1
+noarch=yes
build_style=gnu-configure
configure_args="--enable-site-packages"
+hostmakedepends="intltool python"
+makedepends="dbus-python pygtk-devel pyopenssl pysqlite"
+depends="python dbus-python pysqlite pyopenssl pygtk"
+pycompile_module="gajim"
short_desc="Full featured Jabber/XMPP client"
maintainer="pancake <pancake@nopcode.org>"
homepage="https://www.gajim.org"
license="GPL-3"
distfiles="https://gajim.org/downloads/0.15/gajim-$version.tar.bz2"
checksum=4848e98b25b523e28014528a8b89289bf987d5ce9419dd78ccff74a35aa583f4
-
-hostmakedepends="intltool python"
-makedepends="dbus-python pygtk-devel pyopenssl pysqlite"
-
-gajim_package() {
- noarch=yes
- depends="python dbus-python pysqlite pyopenssl pygtk"
- pycompile_module="gajim"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index 14070f92eb..ff9159c7a5 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
makedepends="glib-devel libxfce4util-devel"
+conf_files="/etc/xdg/menus/xfce-applications.menu"
short_desc="Glib/GIO freedesktop.org compliant menu implementation"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://wiki.xfce.org/dev/garcon"
@@ -32,10 +33,3 @@ garcon-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-garcon_package() {
- conf_files="/etc/xdg/menus/xfce-applications.menu"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index dadc982c0c..dc7c889c7c 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
configure_args="--with-readline"
makedepends="readline-devel"
+conflicts="chroot-gawk>=0"
short_desc="The GNU awk utility"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -16,10 +17,3 @@ pre_configure() {
# Create symlinks for bins and manpages.
sed -i -e "s|\$(LN)|\$(LN_S)|g" Makefile.in doc/Makefile.in
}
-
-gawk_package() {
- conflicts="chroot-gawk>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template
index 00584e5a0d..20ead09a88 100644
--- a/srcpkgs/gc/template
+++ b/srcpkgs/gc/template
@@ -1,24 +1,16 @@
# Template file for 'gc'
pkgname=gc
-_majorver=7.2
-version="${_majorver}e"
+version=7.4.0
revision=1
-wrksrc="gc-${_majorver}"
build_style=gnu-configure
-hostmakedepends="libtool"
+hostmakedepends="pkg-config libtool"
+makedepends="libatomic_ops-devel"
short_desc="A garbage collector for C and C++"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
license="GPL-2"
distfiles="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-$version.tar.gz"
-checksum=09315b48a82d600371207691126ad058c04677281ac318d86fa84c98c3c9af4b
-long_desc="
- The Boehm-Demers-Weiser conservative garbage collector can be used as a
- garbage collecting replacement for C malloc or C++ new. It allows you to
- allocate memory basically as you normally would, without explicitly
- deallocating memory that is no longer useful. The collector automatically
- recycles memory when it determines that it can no longer be otherwise
- accessed."
+checksum=61f8fc6991f8cb003a0d3c7d251c5b9a76093615ef793e0c588a4661e0b5e283
pre_configure() {
libtoolize -f
@@ -35,9 +27,3 @@ gc-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-gc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gcc/files/gcc-4.7.3-musl.diff b/srcpkgs/gcc/files/gcc-4.7.3-musl.diff
new file mode 100644
index 0000000000..e32d1f6272
--- /dev/null
+++ b/srcpkgs/gcc/files/gcc-4.7.3-musl.diff
@@ -0,0 +1,739 @@
+# HG changeset patch
+# Parent f50bb54f331f73405131a30b4f353cfda1c70304
+Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one.
+
+diff -r f50bb54f331f libstdc++-v3/configure.host
+--- a/libstdc++-v3/configure.host Fri Mar 29 16:38:52 2013 -0400
++++ b/libstdc++-v3/configure.host Fri Mar 29 16:41:10 2013 -0400
+@@ -264,6 +264,13 @@
+ os_include_dir="os/bsd/freebsd"
+ ;;
+ gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
++ # check for musl by target
++ case "${host_os}" in
++ *-musl*)
++ os_include_dir="os/generic"
++ ;;
++ *)
++
+ if [ "$uclibc" = "yes" ]; then
+ os_include_dir="os/uclibc"
+ elif [ "$bionic" = "yes" ]; then
+@@ -272,6 +279,9 @@
+ os_include_dir="os/gnu-linux"
+ fi
+ ;;
++
++ esac
++ ;;
+ hpux*)
+ os_include_dir="os/hpux"
+ ;;
+# HG changeset patch
+# Parent 8cd76d5f6674f04c31523971d1dfc81c91388c38
+Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
+
+diff -r 8cd76d5f6674 gcc/config.gcc
+--- a/gcc/config.gcc Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config.gcc Mon Sep 09 12:54:37 2013 -0400
+@@ -522,7 +522,7 @@
+ esac
+
+ # Common C libraries.
+-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
+
+ # Common parts for widely ported systems.
+ case ${target} in
+@@ -625,6 +625,9 @@
+ *-*-*uclibc*)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
+ ;;
++ *-*-*musl*)
++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
++ ;;
+ *)
+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
+ ;;
+diff -r 8cd76d5f6674 gcc/config/linux.h
+--- a/gcc/config/linux.h Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config/linux.h Mon Sep 09 12:54:37 2013 -0400
+@@ -33,10 +33,12 @@
+ #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
+ #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
+ #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL)
+ #else
+ #define OPTION_GLIBC (linux_libc == LIBC_GLIBC)
+ #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
+ #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
++#define OPTION_MUSL (linux_libc == LIBC_MUSL)
+ #endif
+
+ #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
+@@ -54,18 +56,21 @@
+ uClibc or Bionic is the default C library and whether
+ -muclibc or -mglibc or -mbionic has been passed to change the default. */
+
+-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \
+- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \
++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
+
+ #if DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
+ #elif DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
+ #elif DEFAULT_LIBC == LIBC_BIONIC
+-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
+- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif /* DEFAULT_LIBC */
+@@ -85,21 +90,21 @@
+
+ #define GNU_USER_DYNAMIC_LINKER \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
+- BIONIC_DYNAMIC_LINKER)
++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+ #define GNU_USER_DYNAMIC_LINKER32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
+- BIONIC_DYNAMIC_LINKER32)
++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
+- BIONIC_DYNAMIC_LINKER64)
++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+ #define GNU_USER_DYNAMIC_LINKERX32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
+- BIONIC_DYNAMIC_LINKERX32)
++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
+
+ /* Determine whether the entire c99 runtime
+ is present in the runtime library. */
+ #undef TARGET_C99_FUNCTIONS
+-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
+
+ /* Whether we have sincos that follows the GNU extension. */
+ #undef TARGET_HAS_SINCOS
+@@ -108,3 +113,74 @@
+ /* Whether we have Bionic libc runtime */
+ #undef TARGET_HAS_BIONIC
+ #define TARGET_HAS_BIONIC (OPTION_BIONIC)
++
++/* musl avoids problematic includes by rearranging the include directories.
++ * Unfortunately, this is mostly duplicated from cppdefault.c */
++#if DEFAULT_LIBC == LIBC_MUSL
++#define INCLUDE_DEFAULTS_MUSL_GPP \
++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \
++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
++
++#ifdef LOCAL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_LOCAL \
++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \
++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_LOCAL
++#endif
++
++#ifdef PREFIX_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_PREFIX \
++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_PREFIX
++#endif
++
++#ifdef CROSS_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_CROSS \
++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#ifdef TOOL_INCLUDE_DIR
++#define INCLUDE_DEFAULTS_MUSL_TOOL \
++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
++#else
++#define INCLUDE_DEFAULTS_MUSL_TOOL
++#endif
++
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++#define INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \
++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
++#else
++#define INCLUDE_DEFAULTS_MUSL_NATIVE
++#endif
++
++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
++# undef INCLUDE_DEFAULTS_MUSL_LOCAL
++# define INCLUDE_DEFAULTS_MUSL_LOCAL
++# undef INCLUDE_DEFAULTS_MUSL_NATIVE
++# define INCLUDE_DEFAULTS_MUSL_NATIVE
++#else
++# undef INCLUDE_DEFAULTS_MUSL_CROSS
++# define INCLUDE_DEFAULTS_MUSL_CROSS
++#endif
++
++#undef INCLUDE_DEFAULTS
++#define INCLUDE_DEFAULTS \
++ { \
++ INCLUDE_DEFAULTS_MUSL_GPP \
++ INCLUDE_DEFAULTS_MUSL_PREFIX \
++ INCLUDE_DEFAULTS_MUSL_CROSS \
++ INCLUDE_DEFAULTS_MUSL_TOOL \
++ INCLUDE_DEFAULTS_MUSL_NATIVE \
++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
++ { 0, 0, 0, 0, 0, 0 } \
++ }
++#endif
+diff -r 8cd76d5f6674 gcc/config/linux.opt
+--- a/gcc/config/linux.opt Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/config/linux.opt Mon Sep 09 12:54:37 2013 -0400
+@@ -30,3 +30,7 @@
+ muclibc
+ Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
+ Use uClibc C library
++
++mmusl
++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
++Use musl C library
+diff -r 8cd76d5f6674 gcc/ginclude/stddef.h
+--- a/gcc/ginclude/stddef.h Mon Sep 09 12:54:21 2013 -0400
++++ b/gcc/ginclude/stddef.h Mon Sep 09 12:54:37 2013 -0400
+@@ -184,6 +184,7 @@
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__ /* BeOS */
+ #define __SIZE_T__ /* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -200,6 +201,7 @@
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+ || defined(__FreeBSD_kernel__)
+ /* __size_t is a typedef on FreeBSD 5, must not trash it. */
+@@ -215,6 +217,7 @@
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+# HG changeset patch
+# Parent 2b94537ce2496c88e7e797c617e5b95e8d7e4785
+A fix for libgomp to correctly request a POSIX version for time support.
+
+diff -r 2b94537ce249 libgomp/config/posix/time.c
+--- a/libgomp/config/posix/time.c Fri Mar 29 16:41:14 2013 -0400
++++ b/libgomp/config/posix/time.c Fri Mar 29 16:41:17 2013 -0400
+@@ -28,6 +28,8 @@
+ The following implementation uses the most simple POSIX routines.
+ If present, POSIX 4 clocks should be used instead. */
+
++#define _POSIX_C_SOURCE 199309L /* for clocks */
++
+ #include "libgomp.h"
+ #include <unistd.h>
+ #if TIME_WITH_SYS_TIME
+diff -r 2ebb44d1e6f1 libgcc/unwind-dw2-fde-dip.c
+--- a/libgcc/unwind-dw2-fde-dip.c Sun Jul 28 12:15:47 2013 -0400
++++ b/libgcc/unwind-dw2-fde-dip.c Sun Jul 28 12:17:02 2013 -0400
+@@ -47,28 +47,13 @@
+ #include "unwind-compat.h"
+ #include "gthr.h"
+
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
+- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR)
+ # define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(__FreeBSD__) && __FreeBSD__ >= 7
+-# define ElfW __ElfN
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(__OpenBSD__)
+-# define ElfW(type) Elf_##type
+-# define USE_PT_GNU_EH_FRAME
+-#endif
+-
+-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
+- && defined(TARGET_DL_ITERATE_PHDR) \
+- && defined(__sun__) && defined(__svr4__)
+-# define USE_PT_GNU_EH_FRAME
++# ifdef __OpenBSD__
++# define ElfW(type) Elf_##typ
++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7
++# define ElfW __ElfN
++# endif
+ #endif
+
+ #if defined(USE_PT_GNU_EH_FRAME)
+diff -r 75d9c38318a7 gcc/configure
+--- a/gcc/configure Tue Sep 24 06:52:49 2013 -0400
++++ b/gcc/configure Tue Sep 24 06:54:33 2013 -0400
+@@ -26736,6 +26736,9 @@
+ else
+ gcc_cv_libc_provides_ssp=no
+ case "$target" in
++ *-*-musl*)
++ # All versions of musl provide stack protector
++ gcc_cv_libc_provides_ssp=yes;;
+ *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ # glibc 2.4 and later provides __stack_chk_fail and
+ # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -26769,6 +26772,7 @@
+ # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ # simply assert that glibc does provide this, which is true for all
+ # realistically usable GNU/Hurd configurations.
++ # All supported versions of musl provide it as well
+ gcc_cv_libc_provides_ssp=yes;;
+ *-*-darwin* | *-*-freebsd*)
+ ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
+@@ -26851,6 +26855,9 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
++ *-linux-musl*)
++ gcc_cv_target_dl_iterate_phdr=yes
++ ;;
+ esac
+
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+diff -r 75d9c38318a7 gcc/configure.ac
+--- a/gcc/configure.ac Tue Sep 24 06:52:49 2013 -0400
++++ b/gcc/configure.ac Tue Sep 24 06:54:33 2013 -0400
+@@ -4719,6 +4719,9 @@
+ gcc_cv_libc_provides_ssp,
+ [gcc_cv_libc_provides_ssp=no
+ case "$target" in
++ *-*-musl*)
++ # All versions of musl provide stack protector
++ gcc_cv_libc_provides_ssp=yes;;
+ *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ [# glibc 2.4 and later provides __stack_chk_fail and
+ # either __stack_chk_guard, or TLS access to stack guard canary.
+@@ -4752,6 +4755,7 @@
+ # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now
+ # simply assert that glibc does provide this, which is true for all
+ # realistically usable GNU/Hurd configurations.
++ # All supported versions of musl provide it as well
+ gcc_cv_libc_provides_ssp=yes;;
+ *-*-darwin* | *-*-freebsd*)
+ AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],
+@@ -4817,6 +4821,9 @@
+ gcc_cv_target_dl_iterate_phdr=no
+ fi
+ ;;
++ *-linux-musl*)
++ gcc_cv_target_dl_iterate_phdr=yes
++ ;;
+ esac
+ GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
+ if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
+# HG changeset patch
+# Parent 94e435662aff38e86c9ca0dff4bbf451e0190b34
+Get rid of ever-broken fixincludes on musl.
+
+
+diff -r 94e435662aff -r e27957848dc8 fixincludes/mkfixinc.sh
+--- a/fixincludes/mkfixinc.sh Sat Jul 27 23:37:20 2013 -0400
++++ b/fixincludes/mkfixinc.sh Sat Jul 27 23:43:03 2013 -0400
+@@ -19,7 +19,8 @@
+ powerpc-*-eabi* | \
+ powerpc-*-rtems* | \
+ powerpcle-*-eabisim* | \
+- powerpcle-*-eabi* )
++ powerpcle-*-eabi* | \
++ *-musl* )
+ # IF there is no include fixing,
+ # THEN create a no-op fixer and exit
+ (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
+# HG changeset patch
+# Parent 65cd23493c45f2a531ca15ffea563d6110143cdd
+New config.sub for GCC versions too early for the update.
+
+
+diff -r 65cd23493c45 -r 355cec477536 config.sub
+--- a/config.sub Tue Aug 27 15:49:27 2013 -0400
++++ b/config.sub Tue Aug 27 15:51:14 2013 -0400
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ # 2011 Free Software Foundation, Inc.
+
+-timestamp='2011-10-29'
++timestamp='2011-03-23'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -125,6 +125,7 @@
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++ linux-musl* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+@@ -251,17 +252,13 @@
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+- | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+- | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+@@ -295,7 +292,7 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+- | rl78 | rx \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -304,7 +301,7 @@
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
++ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
+@@ -361,7 +358,6 @@
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
+- | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+@@ -370,10 +366,8 @@
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+- | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+- | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -407,7 +401,7 @@
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+- | rl78-* | romp-* | rs6000-* | rx-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+@@ -415,11 +409,10 @@
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+- | tile*-* \
++ | tile-* | tilegx-* \
+ | tron-* \
+ | ubicom32-* \
+- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+- | vax-* \
++ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+@@ -820,10 +813,6 @@
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+- nacl)
+- basic_machine=le32-unknown
+- os=-nacl
+- ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -1132,8 +1121,13 @@
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+- basic_machine=$basic_machine-unknown
++ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1346,6 +1340,7 @@
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
++ | -linux-musl* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+# HG changeset patch
+# Parent 3ea10cd626cb7abdfd56d3fe8d2c9ed58a82797b
+Support for i386-linux-musl and x86_64-linux-musl.
+
+diff -r 3ea10cd626cb gcc/config/i386/linux.h
+--- a/gcc/config/i386/linux.h Fri Mar 29 16:41:17 2013 -0400
++++ b/gcc/config/i386/linux.h Fri Mar 29 16:41:20 2013 -0400
+@@ -21,3 +21,4 @@
+
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+diff -r 3ea10cd626cb gcc/config/i386/linux64.h
+--- a/gcc/config/i386/linux64.h Fri Mar 29 16:41:17 2013 -0400
++++ b/gcc/config/i386/linux64.h Fri Mar 29 16:41:20 2013 -0400
+@@ -30,3 +30,7 @@
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
+diff -r 3ea10cd626cb libitm/config/linux/x86/tls.h
+--- a/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:17 2013 -0400
++++ b/libitm/config/linux/x86/tls.h Fri Mar 29 16:41:20 2013 -0400
+@@ -25,16 +25,19 @@
+ #ifndef LIBITM_X86_TLS_H
+ #define LIBITM_X86_TLS_H 1
+
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ /* Use slots in the TCB head rather than __thread lookups.
+ GLIBC has reserved words 10 through 13 for TM. */
+ #define HAVE_ARCH_GTM_THREAD 1
+ #define HAVE_ARCH_GTM_THREAD_DISP 1
+ #endif
++#endif
+
+ #include "config/generic/tls.h"
+
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
++#if defined(__GLIBC_PREREQ)
++#if __GLIBC_PREREQ(2, 10)
+ namespace GTM HIDDEN {
+
+ #ifdef __x86_64__
+@@ -101,5 +104,6 @@
+
+ } // namespace GTM
+ #endif /* >= GLIBC 2.10 */
++#endif
+
+ #endif // LIBITM_X86_TLS_H
+Support for arm-linux-musl.
+
+diff -r 8801a3f6d050 gcc/config/arm/linux-eabi.h
+--- a/gcc/config/arm/linux-eabi.h Tue Aug 27 15:47:31 2013 -0400
++++ b/gcc/config/arm/linux-eabi.h Tue Aug 27 15:47:37 2013 -0400
+@@ -64,6 +64,23 @@
+ #undef GLIBC_DYNAMIC_LINKER
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
+
++/* For ARM musl currently supports four dynamic linkers:
++ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
++ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
++ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
++ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
++ musl does not support the legacy OABI mode.
++ All the dynamic linkers live in /lib.
++ We default to soft-float, EL. */
++#undef MUSL_DYNAMIC_LINKER
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
++#endif
++#define MUSL_DYNAMIC_LINKER \
++ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
+ use the GNU/Linux version, not the generic BPABI version. */
+ #undef LINK_SPEC
+diff -r 8801a3f6d050 libitm/config/arm/hwcap.cc
+--- a/libitm/config/arm/hwcap.cc Tue Aug 27 15:47:31 2013 -0400
++++ b/libitm/config/arm/hwcap.cc Tue Aug 27 15:47:37 2013 -0400
+@@ -40,7 +40,11 @@
+
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+
+ static void __attribute__((constructor))
+# HG changeset patch
+# Parent 4618ad6f036f1e944a5262ae5875dcdf62c41f8b
+Support for mips-linux-musl.
+
+diff -r 4618ad6f036f gcc/config/mips/linux.h
+--- a/gcc/config/mips/linux.h Thu Sep 19 08:56:47 2013 -0400
++++ b/gcc/config/mips/linux.h Thu Sep 19 09:08:11 2013 -0400
+@@ -18,3 +18,10 @@
+ <http://www.gnu.org/licenses/>. */
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1"
+# HG changeset patch
+# Parent 2ffe76b215fdb082cbbc262536077627757fa9bf
+Support for powerpc-linux-musl.
+
+diff -r 2ffe76b215fd gcc/config.gcc
+--- a/gcc/config.gcc Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config.gcc Fri Mar 29 16:41:28 2013 -0400
+@@ -2112,6 +2112,10 @@
+ powerpc*-*-linux*paired*)
+ tm_file="${tm_file} rs6000/750cl.h" ;;
+ esac
++ case ${target} in
++ *-linux*-musl*)
++ enable_secureplt=yes ;;
++ esac
+ if test x${enable_secureplt} = xyes; then
+ tm_file="rs6000/secureplt.h ${tm_file}"
+ fi
+diff -r 2ffe76b215fd gcc/config/rs6000/linux64.h
+--- a/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/linux64.h Fri Mar 29 16:41:28 2013 -0400
+@@ -364,17 +364,21 @@
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER32 \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
+ #define GNU_USER_DYNAMIC_LINKER64 \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
+
+
+ #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
+diff -r 2ffe76b215fd gcc/config/rs6000/secureplt.h
+--- a/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/secureplt.h Fri Mar 29 16:41:28 2013 -0400
+@@ -18,3 +18,4 @@
+ <http://www.gnu.org/licenses/>. */
+
+ #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
+diff -r 2ffe76b215fd gcc/config/rs6000/sysv4.h
+--- a/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:26 2013 -0400
++++ b/gcc/config/rs6000/sysv4.h Fri Mar 29 16:41:28 2013 -0400
+@@ -551,6 +551,9 @@
+ #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
+ #define CC1_SECURE_PLT_DEFAULT_SPEC ""
+ #endif
++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
++#define LINK_SECURE_PLT_DEFAULT_SPEC ""
++#endif
+
+ /* Pass -G xxx to the compiler and set correct endian mode. */
+ #define CC1_SPEC "%{G*} %(cc1_cpu) \
+@@ -611,7 +614,8 @@
+ %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
+ %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
+ %{mcall-i960-old: --oformat elf32-powerpcle} \
+- }}}}"
++ }}}} \
++%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
+
+ /* Any specific OS flags. */
+ #define LINK_OS_SPEC "\
+@@ -789,15 +793,18 @@
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
++#elif DEFAULT_LIBC == LIBC_MUSL
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
+ #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
+-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
+ #else
+ #error "Unsupported DEFAULT_LIBC"
+ #endif
+ #define GNU_USER_DYNAMIC_LINKER \
+- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
+
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+@@ -923,6 +930,7 @@
+ { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \
+ { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \
+ { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
+ { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
+ { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
+ { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
diff --git a/srcpkgs/gcc/patches/gcc-4.7.0-cloog-0.17.patch b/srcpkgs/gcc/patches/gcc-4.7.0-cloog-0.17.patch
index 48882ef0a3..de80561b86 100644
--- a/srcpkgs/gcc/patches/gcc-4.7.0-cloog-0.17.patch
+++ b/srcpkgs/gcc/patches/gcc-4.7.0-cloog-0.17.patch
@@ -1,5 +1,5 @@
---- configure 2011-12-18 20:03:44.000000000 +1000
-+++ configure 2012-02-03 17:55:14.885990135 +1000
+--- a/configure 2011-12-18 20:03:44.000000000 +1000
++++ b/configure 2012-02-03 17:55:14.885990135 +1000
@@ -6049,8 +6049,8 @@
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
diff --git a/srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch b/srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch
index 5bb65bdf23..c8624b7643 100644
--- a/srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch
+++ b/srcpkgs/gcc/patches/gcc-4.7.1-ppl-1.0.patch
@@ -1,5 +1,5 @@
---- configure.orig 2012-07-01 17:01:26.754771029 +0200
-+++ configure 2012-07-01 17:02:05.402843729 +0200
+--- a/configure.orig 2012-07-01 17:01:26.754771029 +0200
++++ b/configure 2012-07-01 17:02:05.402843729 +0200
@@ -5690,7 +5690,7 @@ int
main ()
{
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a37b2fe01f..8f8beaa07e 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,7 +2,8 @@
pkgname=gcc
_majorver=4.7
version=${_majorver}.3
-revision=7
+revision=10
+patch_args="-Np1"
short_desc="The GNU C Compiler"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://gcc.gnu.org"
@@ -12,6 +13,7 @@ checksum=2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3
hostmakedepends="perl flex"
makedepends="zlib-devel libmpc-devel>=1.0.1_2 ppl-devel>=1.0 cloog-devel isl-devel libfl-devel"
+depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
if [ -z "$CROSS_BUILD" ]; then
# Required by gcj
@@ -19,11 +21,22 @@ if [ -z "$CROSS_BUILD" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i?86) _triplet="${XBPS_TARGET_MACHINE}-pc-linux-gnu";;
- x86_64) _triplet="${XBPS_MACHINE}-unknown-linux-gnu";;
+ i686) _triplet="i686-pc-linux-gnu";;
+ i686-musl) _triplet="i686-pc-linux-musl";;
+ x86_64) _triplet="x86_64-unknown-linux-gnu";;
+ x86_64-musl) _triplet="x86_64-unknown-linux-musl";;
armv6l) _triplet="arm-linux-gnueabihf";;
+ armv7l) _triplet="arm-linux-gnueabihf7";;
+ armv6l-musl) _triplet="arm-linux-musleabi";;
+ armv7l-musl) _triplet="arm-linux-musleabi7";;
esac
+pre_configure() {
+ case "$XBPS_TARGET_MACHINE" in
+ *-musl) patch -Np1 -i ${FILESDIR}/gcc-${version}-musl.diff ;;
+ esac
+}
+
do_configure() {
local _langs _args
@@ -32,19 +45,18 @@ do_configure() {
# Do not run fixincludes
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+ case "$XBPS_TARGET_MACHINE" in
+ armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";;
+ armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";;
+ esac
+
if [ "$CROSS_BUILD" ]; then
export CC_FOR_TARGET="$CC"
export GCC_FOR_TARGET="$CC"
export CXX_FOR_TARGET="$CXX"
_langs="c,c++,lto"
- _args="--disable-multilib"
- if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
- _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard"
- elif [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
- _args+=" --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard"
- fi
- _args+=" --host=$XBPS_CROSS_TRIPLET"
+ _args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET"
else
_langs="c,c++,objc,obj-c++,fortran,go,lto,java"
_args+=" --enable-java-gc=boehm --enable-fast-character"
@@ -78,23 +90,23 @@ do_install() {
# from the same series work automagically.
mv ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} \
${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}
- cd ${DESTDIR}/usr/lib/gcc/${_triplet}
- ln -sf ${_majorver} ${version}
+ ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver} \
+ ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
# Ditto for c++ headers.
mv ${DESTDIR}/usr/include/c++/${version} \
${DESTDIR}/usr/include/c++/${_majorver}
- cd ${DESTDIR}/usr/include/c++
- ln -sf ${_majorver} ${version}
+ ln -sfr ${DESTDIR}/usr/include/c++/${_majorver} \
+ ${DESTDIR}/usr/include/c++/${version}
# cc symlink.
- cd ${DESTDIR}/usr/bin
- ln -sf gcc cc
- # rpcgen wants /lib/cpp, make a symlink.
- cd ${DESTDIR}/usr/lib
- ln -sf ../bin/cpp .
+ ln -sfr ${DESTDIR}/usr/bin/gcc ${DESTDIR}/usr/bin/cc
+ # rpcgen wants /lib/cpp, make a symlink
+ ln -sfr ${DESTDIR}/usr/bin/cpp ${DESTDIR}/usr/lib/cpp
- rm -f ${DESTDIR}/usr/lib64
+ if [ -e ${DESTDIR}/usr/lib64 ]; then
+ rm -f ${DESTDIR}/usr/lib64
+ fi
# Remove libffi stuff.
rm -f ${DESTDIR}/usr/lib/libffi*
@@ -403,17 +415,3 @@ gcc-c++_package() {
vmove usr/share/man/man1/g++.1
}
}
-
-gcc_package() {
- depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
- pkg_install() {
- if [ -d ${DESTDIR}/usr/lib/pkgconfig ]; then
- rmdir ${DESTDIR}/usr/lib/pkgconfig
- fi
- if [ -d ${DESTDIR}/usr/lib/security ]; then
- rmdir ${DESTDIR}/usr/lib/security
- fi
- rm -rf ${DESTDIR}/usr/include/c++
- vmove all
- }
-}
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index 3e2c9fb1cc..d779d2b98d 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -8,6 +8,8 @@ configure_args="--enable-introspection --disable-update-mime
hostmakedepends="which pkg-config intltool gnome-doc-utils
gobject-introspection libtasn1-tools gnupg perl-XML-Parser"
makedepends="gtk+3-devel p11-kit-devel libgcrypt-devel vala-devel"
+depends="hicolor-icon-theme desktop-file-utils"
+replaces="gnome-keyring<3.3.92"
short_desc="GNOME crypto package"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -39,11 +41,3 @@ gcr-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gcr_package() {
- replaces="gnome-keyring<3.3.92"
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template
index bdeef1a0bc..757e8f7e5e 100644
--- a/srcpkgs/gd/template
+++ b/srcpkgs/gd/template
@@ -33,9 +33,3 @@ gd-progs_package() {
vmove usr/bin
}
}
-
-gd_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gdb/patches/gdb-76-linux-low-threaddb.patch b/srcpkgs/gdb/patches/gdb-76-linux-low-threaddb.patch
new file mode 100644
index 0000000000..eb5bb744f7
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-76-linux-low-threaddb.patch
@@ -0,0 +1,32 @@
+this patch fixes compilation of gdbserver on systems that don't have
+thread_db.h. in that case we fall back to gdb's own copy
+"gdb_thread_db.h", so the typedef of the td_thrhandle_t member is
+available, which is accessed in other parts of the code without
+checking whether thread_db.h is available.
+this is by far the cleaner solution, removing the accesses to the
+th member in other parts of the source would either litter it with
+ifdefs or cripple the functionality.
+
+--- gdb-7.6.2.org/gdb/gdbserver/linux-low.h
++++ gdb-7.6.2/gdb/gdbserver/linux-low.h
+@@ -18,6 +18,8 @@
+
+ #ifdef HAVE_THREAD_DB_H
+ #include <thread_db.h>
++#else
++#include "gdb_thread_db.h"
+ #endif
+ #include <signal.h>
+
+@@ -270,11 +272,9 @@
+ int need_step_over;
+
+ int thread_known;
+-#ifdef HAVE_THREAD_DB_H
+ /* The thread handle, used for e.g. TLS access. Only valid if
+ THREAD_KNOWN is set. */
+ td_thrhandle_t th;
+-#endif
+
+ /* Arch-specific additions. */
+ struct arch_lwp_info *arch_private;
diff --git a/srcpkgs/gdb/patches/gdb-76-pid_t.patch b/srcpkgs/gdb/patches/gdb-76-pid_t.patch
new file mode 100644
index 0000000000..7ad3030c43
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-76-pid_t.patch
@@ -0,0 +1,10 @@
+--- gdb-7.6.2.org/gdb/common/linux-ptrace.h
++++ gdb-7.6.2/gdb/common/linux-ptrace.h
+@@ -67,6 +67,7 @@
+ #define __WALL 0x40000000 /* Wait for any child. */
+ #endif
+
++#include <unistd.h> /* for pid_t */
+ extern void linux_ptrace_attach_warnings (pid_t pid, struct buffer *buffer);
+ extern void linux_ptrace_init_warnings (void);
+
diff --git a/srcpkgs/gdb/patches/gdb-amd64-debugreg.patch b/srcpkgs/gdb/patches/gdb-amd64-debugreg.patch
new file mode 100644
index 0000000000..e7d380ee18
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-amd64-debugreg.patch
@@ -0,0 +1,64 @@
+diff -u -r -N gdb-7.3.1-org//gdb/amd64-linux-nat.c gdb-7.3.1-patched//gdb/amd64-linux-nat.c
+--- gdb-7.3.1-org//gdb/amd64-linux-nat.c 1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.3.1-patched//gdb/amd64-linux-nat.c 2011-09-22 22:20:23.438841813 +0000
+@@ -32,7 +32,7 @@
+ #include "elf/common.h"
+ #include <sys/uio.h>
+ #include <sys/ptrace.h>
+-#include <sys/debugreg.h>
++#include "debugreg.h"
+ #include <sys/syscall.h>
+ #include <sys/procfs.h>
+ #include <asm/prctl.h>
+diff -u -r -N gdb-7.3.1-org//gdb/debugreg.h gdb-7.3.1-patched//gdb/debugreg.h
+--- gdb-7.3.1-org//gdb/debugreg.h 1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.3.1-patched//gdb/debugreg.h 2011-09-22 22:20:01.381841813 +0000
+@@ -0,0 +1,48 @@
++#ifndef SYS_DEBUGREG_H
++#define SYS_DEBUGREG_H
++
++#include <stdint.h>
++
++#define DR_FIRSTADDR 0
++#define DR_LASTADDR 3
++
++#define DR_STATUS 6
++#define DR_CONTROL 7
++
++#define DR_TRAP0 (0x1)
++#define DR_TRAP1 (0x2)
++#define DR_TRAP2 (0x4)
++#define DR_TRAP3 (0x8)
++
++#define DR_STEP (0x4000)
++#define DR_SWITCH (0x8000)
++
++#define DR_CONTROL_SHIFT 16
++#define DR_CONTROL_SIZE 4
++
++#define DR_RW_EXECUTE (0x0)
++#define DR_RW_WRITE (0x1)
++#define DR_RW_READ (0x3)
++
++#define DR_LEN_1 (0x0)
++#define DR_LEN_2 (0x4)
++#define DR_LEN_4 (0xC)
++#define DR_LEN_8 (0x8)
++
++#define DR_LOCAL_ENABLE_SHIFT 0
++#define DR_GLOBAL_ENABLE_SHIFT 1
++#define DR_ENABLE_SIZE 2
++
++#define DR_LOCAL_ENABLE_MASK (0x55)
++#define DR_GLOBAL_ENABLE_MASK (0xAA)
++
++
++#if SIZE_MAX > 4294967295
++# define DR_CONTROL_RESERVED (0xFFFFFFFF0000FC00UL)
++#else
++# define DR_CONTROL_RESERVED (0x00FC00U)
++#endif
++#define DR_LOCAL_SLOWDOWN (0x100)
++#define DR_GLOBAL_SLOWDOWN (0x200)
++
++#endif
diff --git a/srcpkgs/gdb/patches/gdb-arm-gentmap.patch b/srcpkgs/gdb/patches/gdb-arm-gentmap.patch
new file mode 100644
index 0000000000..5432bb3520
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-arm-gentmap.patch
@@ -0,0 +1,10 @@
+--- gdb-7.4.org/sim/common/gentmap.c 2012-06-27 16:43:51.032331245 +0000
++++ gdb-7.4/sim/common/gentmap.c 2012-06-27 16:49:12.382319996 +0000
+@@ -2,6 +2,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ struct tdefs {
+ char *symbol;
diff --git a/srcpkgs/gdb/patches/gdb-linux_nat.patch b/srcpkgs/gdb/patches/gdb-linux_nat.patch
new file mode 100644
index 0000000000..f91e16f2c3
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-linux_nat.patch
@@ -0,0 +1,30 @@
+the first chunk fixes build errors,
+the non_stop part below fixes thread debugging being available
+by default without setting any breakpoints or usage of libthread_db.
+
+--- gdb-7.4.org/gdb/linux-nat.c 2013-08-10 05:24:24.651000003 +0000
++++ gdb-7.4/gdb/linux-nat.c 2013-08-10 05:25:50.966000003 +0000
+@@ -71,6 +71,14 @@
+ # endif
+ #endif /* HAVE_PERSONALITY */
+
++#ifndef __SIGRTMIN
++#define __SIGRTMIN SIGRTMIN
++#endif
++
++#ifndef W_STOPCODE
++#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
++#endif
++
+ /* This comment documents high-level logic of this file.
+
+ Waiting for events in sync mode
+@@ -2265,7 +2273,7 @@
+ status = 0;
+ }
+
+- if (non_stop)
++ if (1)
+ {
+ /* Add the new thread to GDB's lists as soon as possible
+ so that:
diff --git a/srcpkgs/gdb/patches/gdb-threaddb.patch b/srcpkgs/gdb/patches/gdb-threaddb.patch
new file mode 100644
index 0000000000..2a2285ac8b
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-threaddb.patch
@@ -0,0 +1,36 @@
+--- gdb-7.4.org/gdb/common/gdb_thread_db.h
++++ gdb-7.4/gdb/common/gdb_thread_db.h
+@@ -1,17 +1,5 @@
+ #ifdef HAVE_THREAD_DB_H
+ #include <thread_db.h>
+-
+-#ifndef LIBTHREAD_DB_SO
+-#define LIBTHREAD_DB_SO "libthread_db.so.1"
+-#endif
+-
+-#ifndef LIBTHREAD_DB_SEARCH_PATH
+-/* $sdir appears before $pdir for some minimal security protection:
+- we trust the system libthread_db.so a bit more than some random
+- libthread_db associated with whatever libpthread the app is using. */
+-#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir"
+-#endif
+-
+ #else
+
+ /* Copyright (C) 1999-2000, 2007-2012 Free Software Foundation, Inc.
+@@ -453,3 +441,15 @@
+ #endif /* thread_db.h */
+
+ #endif /* HAVE_THREAD_DB_H */
++
++#ifndef LIBTHREAD_DB_SO
++#define LIBTHREAD_DB_SO "libthread_db.so.1"
++#endif
++
++#ifndef LIBTHREAD_DB_SEARCH_PATH
++/* $sdir appears before $pdir for some minimal security protection:
++ we trust the system libthread_db.so a bit more than some random
++ libthread_db associated with whatever libpthread the app is using. */
++#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir"
++#endif
++
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 85dfb1d505..23ad8a2294 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,10 +1,13 @@
# Template file for 'gdb'
pkgname=gdb
version=7.6.2
-revision=1
+revision=2
+patch_args="-Np1"
build_style=gnu-configure
-configure_args="--disable-nls --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit"
+configure_args="--disable-werror --disable-nls --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit"
makedepends="ncurses-devel zlib-devel readline-devel"
+conf_files="/etc/gdb/gdbinit"
+pycompile_dirs="usr/share/gdb/python/gdb"
short_desc="The GNU Debugger"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/gdb/"
@@ -42,11 +45,3 @@ post_install() {
rm -f ${DESTDIR}/usr/share/info/${f}.info*
done
}
-
-gdb_package() {
- conf_files="/etc/gdb/gdbinit"
- pycompile_dirs="usr/share/gdb/python/gdb"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template
index 1104a75592..b23629fbb3 100644
--- a/srcpkgs/gdbm/template
+++ b/srcpkgs/gdbm/template
@@ -1,7 +1,7 @@
# Template file for 'gdbm'
pkgname=gdbm
-version=1.10
-revision=5
+version=1.11
+revision=1
build_style=gnu-configure
configure_args="--enable-libgdbm-compat --disable-rpath"
short_desc="GNU database routines"
@@ -9,13 +9,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.gnu.org.ua/software/gdbm/"
distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
-checksum=23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26db773441
+checksum=8d912f44f05d0b15a4a5d96a76f852e905d051bb88022fcdfd98b43be093e3c3
long_desc="
GNU dbm is a set of database routines that use extensible hashing.
It works similar to the standard Unix dbm routines."
if [ "$CROSS_BUILD" ]; then
- hostmakedepends="libtool automake>=1.13.1_2 gettext-devel"
+ hostmakedepends="libtool automake>=1.14.1_2 gettext-devel"
pre_configure() {
autoreconf -fi
}
@@ -31,17 +31,12 @@ post_install() {
gdbm-devel_package() {
short_desc+=" - development files"
+ depends="gdbm>=${version}_${revision}"
pkg_install() {
- vmove usr/bin
vmove usr/include
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/share/info
- vmove usr/share/man
- }
-}
-
-gdbm_package() {
- pkg_install() {
- vmove usr
+ vmove usr/share/man/man3
}
}
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index a2b8ccda3d..b797d8e5cc 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -1,17 +1,18 @@
# Template build file for 'gdk-pixbuf'.
pkgname=gdk-pixbuf
-version=2.30.2
+version=2.30.3
revision=1
build_style=gnu-configure
configure_args="--without-libjasper --with-included-loaders=png --with-x11"
hostmakedepends="perl pkg-config glib-devel"
makedepends="libglib-devel libpng-devel>=1.6 libjpeg-turbo-devel tiff-devel libX11-devel"
+triggers="gtk-pixbuf-loaders"
short_desc="An Image loading library for The GTK+ toolkit (v2)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gtk.org/"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=cababfa075a9a60426809309ec86b82ea28e83f44ef69c898e48c040b6feecbf
+checksum=c229c53f59573eab9410b53690a4b9db770312c80a4d84ecd6295aa894574494
if [ "$CROSS_BUILD" ]; then
# needs glib-mkenums
@@ -39,9 +40,10 @@ else
fi
gdk-pixbuf-devel_package() {
- depends="perl libpng-devel>=1.6 shared-mime-info ${sourcepkg}>=${version}"
+ depends="perl libpng-devel>=1.6 shared-mime-info ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
+ vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
vmove usr/include
vmove "usr/bin/*csource*"
@@ -52,10 +54,3 @@ gdk-pixbuf-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-gdk-pixbuf_package() {
- triggers="gtk-pixbuf-loaders"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gdl/template b/srcpkgs/gdl/template
index f8f61a8f9f..27248c581a 100644
--- a/srcpkgs/gdl/template
+++ b/srcpkgs/gdl/template
@@ -30,9 +30,3 @@ gdl-doc_package() {
vmove usr/share/gtk-doc
}
}
-
-gdl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 080adbffc6..40eb695f71 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -12,6 +12,20 @@ hostmakedepends="pkg-config itstool intltool which gnome-doc-utils gobject-intro
makedepends="pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel
libcanberra-devel systemd-devel xrdb dconf>=0.16 hicolor-icon-theme
xorg-server gnome-session>=3.10 gnome-settings-daemon>=3.10"
+conf_files="
+ /etc/gdm/custom.conf
+ /etc/pam.d/gdm
+ /etc/pam.d/gdm-autologin
+ /etc/pam.d/gdm-fingerprint
+ /etc/pam.d/gdm-password
+ /etc/pam.d/gdm-smartcard
+ /etc/pam.d/gdm-welcome"
+# Create the 'gdm' system user/group.
+system_accounts="gdm"
+gdm_homedir="/var/lib/gdm"
+systemd_services="gdm.service off"
+depends="xrdb xorg-server hicolor-icon-theme
+ dconf>=0.18 gnome-session>=3.10 gnome-settings-daemon>=3.10"
short_desc="GNOME Display Manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -61,23 +75,3 @@ gdm-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gdm_package() {
- conf_files="
- /etc/gdm/custom.conf
- /etc/pam.d/gdm
- /etc/pam.d/gdm-autologin
- /etc/pam.d/gdm-fingerprint
- /etc/pam.d/gdm-password
- /etc/pam.d/gdm-smartcard
- /etc/pam.d/gdm-welcome"
- # Create the 'gdm' system user/group.
- system_accounts="gdm"
- gdm_homedir="/var/lib/gdm"
- systemd_services="gdm.service off"
- depends="xrdb xorg-server hicolor-icon-theme
- dconf>=0.18 gnome-session>=3.10 gnome-settings-daemon>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template
index 8ae6d7f0c9..55077d92f2 100644
--- a/srcpkgs/geany/template
+++ b/srcpkgs/geany/template
@@ -4,6 +4,7 @@ version=1.23
revision=1
build_style=waf
makedepends="pkg-config intltool python gtk+-devel vte-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Fast and lightweight IDE"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -18,7 +19,7 @@ long_desc="
geany-plugins_package() {
depends="geany>=$version"
- short_desc="${short_desc} - builtin plugins"
+ short_desc+=" - builtin plugins"
pkg_install() {
vmove usr/lib/geany
}
@@ -26,16 +27,9 @@ geany-plugins_package() {
geany-devel_package() {
depends="gtk+-devel"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-geany_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index bef64c8d5c..6671c4b8d6 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,23 +1,16 @@
# Template file for 'geary'
pkgname=geary
-version=0.4.2
+version=0.5.1
revision=1
build_style=cmake
+hostmakedepends="pkg-config intltool cmake desktop-file-utils"
+makedepends="vala-devel webkitgtk-devel libgee08-devel libsecret-devel
+ libgnome-keyring-devel gmime-devel libunique-devel sqlite-devel libnotify-devel
+ libcanberra-devel libgirepository-devel hicolor-icon-theme desktop-file-utils"
+depends="gir-freedesktop hicolor-icon-theme desktop-file-utils"
short_desc="A lightweight email program for the GNOME desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://yorba.org/geary/"
-distfiles="http://yorba.org/download/geary/${version%.*}/geary-${version}.tar.xz"
-checksum=e111e1f650afb8fe35d3a9f8ce19f698ee41263d5b21b31bf0b5bd4a24a207b3
-
-hostmakedepends="pkg-config intltool cmake desktop-file-utils"
-makedepends="vala-devel webkitgtk-devel libgee08-devel libsecret-devel
- libgnome-keyring-devel gmime-devel libunique-devel sqlite-devel libnotify-devel
- libcanberra-devel libgirepository-devel"
-
-geary_package() {
- depends="gir-freedesktop hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=12561187c7d2b8aa1115ca52d8959270ff38dd6db774df1cd39c9719a76bb1d1
diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index d18977c14c..137cc00f6d 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool gnome-doc-utils
makedepends="
gtksourceview-devel>=3.10 libpeas-devel>=1.9 enchant-devel pygobject-devel
gsettings-desktop-schemas-devel>=3.10 zeitgeist-devel iso-codes"
+depends="zeitgeist hicolor-icon-theme desktop-file-utils iso-codes"
short_desc="A text editor for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -27,10 +28,3 @@ gedit-devel_package() {
vmove usr/share/gedit/gir-1.0
}
}
-
-gedit_package() {
- depends="zeitgeist hicolor-icon-theme desktop-file-utils iso-codes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index f1d836ac49..56fcf221ec 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
configure_args="--disable-gps"
makedepends="pkg-config intltool gtk+-devel exiv2-devel lcms-devel"
+depends="desktop-file-utils"
short_desc="Lightweight Gtk+ based image viewer"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -19,10 +20,3 @@ long_desc="
geeqie works on files and directories, there is no need to import images
fast preview for many raw image formats
tools for image comparison, sorting and managing photo collection"
-
-geeqie_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 300b9a4d55..0ccc576bb7 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -23,9 +23,3 @@ gegl-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-gegl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 5ac9acb572..d423e40ddf 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -20,9 +20,3 @@ do_install() {
vinstall default.png 644 usr/share/pixmaps
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-gendesk_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/genext2fs/template b/srcpkgs/genext2fs/template
new file mode 100644
index 0000000000..80338175e1
--- /dev/null
+++ b/srcpkgs/genext2fs/template
@@ -0,0 +1,12 @@
+# Template file for 'genext2fs'
+pkgname=genext2fs
+version=1.4.1
+revision=1
+build_style=gnu-configure
+configure_args="ac_cv_have_working_snprintf=yes ac_cv_have_working_vsnprintf=yes"
+short_desc="Generates an ext2 filesystem as a normal (i.e. non-root) user"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://genext2fs.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc
diff --git a/srcpkgs/gengetopt/template b/srcpkgs/gengetopt/template
index beaeac5312..96d018e068 100644
--- a/srcpkgs/gengetopt/template
+++ b/srcpkgs/gengetopt/template
@@ -2,6 +2,7 @@
pkgname=gengetopt
version=2.22.5
revision=1
+disable_parallel_build=yes
build_style=gnu-configure
hostmakedepends="flex"
short_desc="A tool to write cli option parsing code for C programs"
@@ -13,11 +14,3 @@ checksum=3b6fb3240352b0eb0c5b8583b58b62cbba58167cef5a7e82fa08a7f968ed2137
long_desc="
This program generates a C function that uses getopt_long function to parse
the command line options, to validate them and fills a struct."
-
-disable_parallel_build=yes
-
-gengetopt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/geoclue/template b/srcpkgs/geoclue/template
index b10c2b404f..29e8a2db14 100644
--- a/srcpkgs/geoclue/template
+++ b/srcpkgs/geoclue/template
@@ -28,9 +28,3 @@ geoclue-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-geoclue_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template
index 2ecf76d37d..a2a98d591f 100644
--- a/srcpkgs/geoclue2/template
+++ b/srcpkgs/geoclue2/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="json-glib-devel libsoup-gnome-devel>=2.44"
+depends="libsoup>=2.44"
short_desc="The Geoinformation Service (2.x series)"
homepage="http://www.freedesktop.org/wiki/Software/GeoClue"
license="LGPL-2.1"
@@ -17,10 +18,3 @@ long_desc="
Geoclue is a modular geoinformation service built on top of the D-Bus
messaging system. The goal of the Geoclue project is to make creating
location-aware applications as simple as possible."
-
-geoclue2_package() {
- depends="libsoup>=2.44"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template
index 2c7145299f..250fe3be03 100644
--- a/srcpkgs/geocode-glib/template
+++ b/srcpkgs/geocode-glib/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="json-glib-devel>=0.16.2 libsoup-gnome-devel>=2.44"
+depends="json-glib>=0.16.2 libsoup-gnome>=2.44"
short_desc="GLib library for geocoding and reverse geocoding"
homepage="http://www.gnome.org"
license="LGPL-2.1"
@@ -30,10 +31,3 @@ geocode-glib-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-geocode-glib_package() {
- depends="json-glib>=0.16.2 libsoup-gnome>=2.44"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template
index 2f0781fdaf..ce8220f0f0 100644
--- a/srcpkgs/geoip/template
+++ b/srcpkgs/geoip/template
@@ -6,6 +6,7 @@ wrksrc="GeoIP-${version}"
build_style=gnu-configure
configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip"
makedepends="zlib-devel"
+conf_files="/etc/geoip/GeoIP.conf"
short_desc="Non-DNS IP-to-country resolver C library and utilities"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.maxmind.com/app/c"
@@ -19,7 +20,7 @@ long_desc="
real-time."
libgeoip_package() {
- short_desc="${short_desc} (Runtime library)"
+ short_desc+=" - Runtime library"
pkg_install() {
vmove "usr/lib/*.so*"
vmove usr/share/GeoIP
@@ -27,18 +28,10 @@ libgeoip_package() {
}
geoip-devel_package() {
+ short_desc+=" - development files"
depends="zlib-devel libgeoip>=${version}"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
}
}
-
-geoip_package() {
- conf_files="/etc/geoip/GeoIP.conf"
- pkg_install() {
- vmove etc
- vmove usr/bin
- vmove usr/share
- }
-}
diff --git a/srcpkgs/getmail/template b/srcpkgs/getmail/template
index 64ca656bf8..42caed6a88 100644
--- a/srcpkgs/getmail/template
+++ b/srcpkgs/getmail/template
@@ -2,21 +2,15 @@
pkgname=getmail
version=4.43.0
revision=1
+noarch=yes
build_style=python-module
hostmakedepends="python-devel"
makedepends="${hostmakedepends}"
+depends="python"
+pycompile_module="getmailcore"
short_desc="A POP3 mail retriever with reliable Maildir and command delivery"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://pyropus.ca/software/getmail"
distfiles="http://pyropus.ca/software/getmail/old-versions/$pkgname-$version.tar.gz"
checksum=1e22458966344983d38affd2c443929171d48a1107cf8298293e5d291a916c29
-
-getmail_package() {
- pycompile_module="getmailcore"
- depends="python"
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gettext-tiny/template b/srcpkgs/gettext-tiny/template
index 04e8758b9a..d2ed7cceab 100644
--- a/srcpkgs/gettext-tiny/template
+++ b/srcpkgs/gettext-tiny/template
@@ -10,6 +10,7 @@ distfiles="https://github.com/rofl0r/${pkgname}/archive/v${version}.tar.gz"
checksum=70f3aa3874214fe30cdc7159dca08a6ceb253c0cad9acde50f53d3164f43fe52
create_srcdir=yes
+conflicts="gettext>=0"
do_build() {
make ${makejobs} prefix=/usr
@@ -19,13 +20,6 @@ do_install() {
make ${makejobs} prefix=/usr DESTDIR=${DESTDIR} install
}
-gettext-tiny_package() {
- conflicts="gettext>=0"
- pkg_install() {
- vmove usr
- }
-}
-
gettext-tiny-devel_package() {
conflicts="glibc-devel>=0 musl>=0"
short_desc+=" - development files"
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index a90cfd2d5b..6c4707f806 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -7,6 +7,7 @@ configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
--disable-openmp"
makedepends="ncurses-devel libxml2-devel libcroco-devel acl-devel"
+conflicts="chroot-gettext>=0"
short_desc="Internationalized Message Handling Library and tools"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/gettext/"
@@ -39,10 +40,3 @@ gettext-libs_package() {
vmove "usr/lib/*.so*"
}
}
-
-gettext_package() {
- conflicts="chroot-gettext>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index d603c6edfe..972312e7ed 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -13,6 +13,7 @@ disable_parallel_build=yes
hostmakedepends="automake libtool pkg-config"
makedepends="dbus-devel libXext-devel libXt-devel libpng-devel>=1.6
fontconfig-devel jasper-devel tiff-devel lcms2-devel cups-devel"
+depends="gsfonts"
pre_configure() {
# force it to use system libs.
@@ -84,10 +85,3 @@ ghostscript-devel_package() {
vmove usr/share/man/man1/ijs-config.1
}
}
-
-ghostscript_package() {
- depends="gsfonts"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/giblib/template b/srcpkgs/giblib/template
index e87b7bfa75..c8ac68838e 100644
--- a/srcpkgs/giblib/template
+++ b/srcpkgs/giblib/template
@@ -30,9 +30,3 @@ giblib-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-giblib_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 6387d9145a..927d825cb8 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -15,12 +15,13 @@ long_desc="
build_style=gnu-configure
hostmakedepends="pkg-config itstool intltool"
makedepends="gtksourceview-devel>=3.8 vte3-devel"
+depends="desktop-file-utils hicolor-icon-theme"
# Required by glib-2.32.
CFLAGS="-lgmodule-2.0"
libgiggle_package() {
- short_desc="${short_desc} - Runtime libraries"
+ short_desc+=" - Runtime libraries"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -28,17 +29,8 @@ libgiggle_package() {
giggle-devel_package() {
depends="libgiggle>=$version"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
}
}
-
-giggle_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr/bin
- vmove usr/share
- vmove usr/lib/giggle
- }
-}
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index aef667e4ab..07c179fd92 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -12,6 +12,15 @@ makedepends="libpng-devel>=1.6 gtk+-devel lcms-devel
libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel
libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel iso-codes"
short_desc="The GNU image manipulation program"
+conf_files="
+ /etc/gimp/2.0/gimprc
+ /etc/gimp/2.0/gtkrc
+ /etc/gimp/2.0/templaterc
+ /etc/gimp/2.0/unitrc
+ /etc/gimp/2.0/sessionrc
+ /etc/gimp/2.0/controllerrc
+ /etc/gimp/2.0/menurc"
+depends="desktop-file-utils hicolor-icon-theme iso-codes"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gimp.org"
license="GPL-3"
@@ -48,18 +57,3 @@ gimp-python_package() {
vmove "usr/lib/gimp/2.0/plug-ins/*.py"
}
}
-
-gimp_package() {
- conf_files="
- /etc/gimp/2.0/gimprc
- /etc/gimp/2.0/gtkrc
- /etc/gimp/2.0/templaterc
- /etc/gimp/2.0/unitrc
- /etc/gimp/2.0/sessionrc
- /etc/gimp/2.0/controllerrc
- /etc/gimp/2.0/menurc"
- depends="desktop-file-utils hicolor-icon-theme iso-codes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 6467080d97..89bbf9ad67 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,19 +1,21 @@
# Template build file for "git".
pkgname=git
-version=1.8.5.1
+version=1.8.5.3
revision=1
build_style=gnu-configure
configure_args="--with-curl --with-expat --without-tcltk
ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no"
make_install_args="NO_INSTALL_HARDLINKS=1"
hostmakedepends="xmlto>=0.0.25_2 asciidoc perl python"
-makedepends="openssl-devel libcurl-devel expat-devel"
+makedepends="openssl-devel libcurl-devel expat-devel ca-certificates"
+# Required by https://
+depends="ca-certificates"
short_desc="GIT Tree History Storage Tool"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://git-scm.com/"
license="GPL-2"
distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz"
-checksum=1559c4d7af0377ea3133c6dfccc2f32a25bcc8e3255464f4a36ab87416f8ee44
+checksum=3148ee4eab459fe9caf145c1a9b8b27c6a81c66c1868f790f58896054cdfe3a7
post_build() {
make ${makejobs} -C Documentation man
@@ -44,12 +46,3 @@ git-perl_package() {
vmove usr/share/man/man3
}
}
-
-
-git_package() {
- # Required by https://
- depends="ca-certificates"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gitflow/template b/srcpkgs/gitflow/template
index 925990edf8..6cbd55d7b1 100644
--- a/srcpkgs/gitflow/template
+++ b/srcpkgs/gitflow/template
@@ -2,13 +2,14 @@
pkgname=gitflow
version=20120925
revision=1
+noarch="yes"
+depends="git"
short_desc="Git extensions to provide high-level repository operations"
maintainer="pancake <pancake@nopcode.org>"
license="Liberal BSD"
homepage="https://github.com/nvie/gitflow"
checksum=654604b5ead726de0ebb1932b49785a6146c59d312f4931080a04e86b7afb177
-
do_fetch() {
git clone git://github.com/nvie/gitflow.git ${pkgname}-${version}
cd ${pkgname}-${version}
@@ -24,11 +25,3 @@ do_install() {
mkdir -p ${DESTDIR}
make install prefix=${DESTDIR}/usr
}
-
-gitflow_package() {
- noarch="yes"
- depends="git"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index 6bac40ad9d..8d5b241e23 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -26,9 +26,3 @@ gjs-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gjs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index c03690a68e..444e09c4e1 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,44 +1,15 @@
# Template build file for 'gkrellm'.
+LDFLAGS="-lgmodule-2.0"
+
pkgname=gkrellm
version=2.3.5
revision=1
build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
-make_install_args="PREFIX=/usr"
-makedepends="pkg-config openssl-devel gtk+-devel libsensors-devel"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel gtk+-devel libsensors-devel"
short_desc="GTK2 based system monitor"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html"
license="GPL-2"
distfiles="http://members.dslextreme.com/users/billw/gkrellm/$pkgname-$version.tar.bz2"
checksum=702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b
-long_desc="
- With a single process, GKrellM manages multiple stacked monitors and supports
- applying themes to match the monitors appearance to your window manager,
- Gtk, or any other theme.
-
- * SMP CPU, Disk, Proc, and active net interface monitors with LEDs.
- * Internet monitor that displays current and charts historical port hits
- * Memory and swap space usage meters and a system uptime monitor.
- * File system meters show capacity/free space and can mount/umount.
- * A mailbox monitor which can launch mail reader, remote mail fetch.
- * Clock/calendar and hostname display.
- * APM laptop battery monitor.
- * CPU/motherboard temperature display if lm_sensors modules installed.
- * Multiple monitors managed by a single process to reduce system load.
- * Charts are autoscaling with configurable grid line resolution, or
- can be set to a fixed scale mode.
- * Separate colors for "in" and "out" data. The in color is used for
- CPU user time, disk read, forks, and net receive data. The out color
- is used for CPU sys time, disk write, load, and net transmit data.
- * GKrellM is plugin capable so special interest monitors can be created.
- * A different theme can be created with the GIMP.
- * And a lot more..."
-
-LDFLAGS="-lgmodule-2.0"
-
-gkrellm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 561dfad35f..671fd44888 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection"
makedepends="gtk+3-devel libxml2-devel python-devel pygobject-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="An User Interface Designer for GTK+3"
homepage="http://glade.gnome.org/"
license="GPL-2"
@@ -44,10 +45,3 @@ glade3-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-glade3_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/glamor-egl/template b/srcpkgs/glamor-egl/template
index 77a2626334..34ee9bb5d1 100644
--- a/srcpkgs/glamor-egl/template
+++ b/srcpkgs/glamor-egl/template
@@ -1,17 +1,18 @@
# Template build file for 'glamor-egl'.
pkgname=glamor-egl
-version=0.5.1
-revision=2
+version=0.6.0
+revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config xorg-util-macros"
makedepends="libdrm-devel MesaLib-devel xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1"
short_desc="OpenGL based 2D rendering acceleration library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/Glamor/"
license="MIT"
do_fetch() {
- git clone -b v${version} git://anongit.freedesktop.org/xorg/driver/glamor ${pkgname}-${version}
+ git clone -b ${pkgname}-${version} git://anongit.freedesktop.org/xorg/driver/glamor ${pkgname}-${version}
}
pre_configure() {
@@ -27,10 +28,3 @@ glamor-egl-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-glamor-egl_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index f001321536..869edd7d39 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,24 +1,17 @@
# Template file for 'glances'
pkgname=glances
-version=1.7.3
+version=1.7.4
revision=1
+noarch="yes"
+create_srcdir="yes"
distfiles="https://github.com/nicolargo/glances/archive/v${version}.tar.gz"
-checksum="03a5c8193fd3c91b8249c2501bc612008fa81861c14f82464a10b45d08c4ca4f"
-build_style=python-module
+checksum="20960b5f191bc86e6184d937940f00a62100eb51388bcdeb233f30c809b0f1a6"
+build_style="python-module"
hostmakedepends="python-devel"
makedepends="python-distribute"
+depends="python python-psutil ${makedepends}"
+pycompile_module="glances"
maintainer="Steven R <strob AT styez DOT com>"
homepage="https://github.com/nicolargo/glances"
license="LGPL3"
-short_desc="Cross-platform curses-based monitoring tool written in Python."
-
-create_srcdir=yes
-
-glances_package() {
- noarch="yes"
- depends="python python-psutil ${makedepends}"
- pycompile_module="glances"
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
+short_desc="Cross-platform curses-based monitoring tool written in Python"
diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template
index ccaa2b7813..079d32e816 100644
--- a/srcpkgs/glew/template
+++ b/srcpkgs/glew/template
@@ -37,9 +37,3 @@ glew-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-glew_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index f5cac76e18..d587569570 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -10,16 +10,10 @@ hostmakedepends="pkg-config intltool"
makedepends="libglib-devel libproxy-devel libgpg-error-devel
libgcrypt-devel p11-kit-devel gnutls-devel>=3.1.5
gsettings-desktop-schemas-devel>=3.8.0 ca-certificates"
+depends="ca-certificates gsettings-desktop-schemas"
short_desc="Network-related giomodules for glib"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=e8e2fe919d3236169c9bfaec807966ec81b844fc28b11bddc9f8256cfa949fc7
-
-glib-networking_package() {
- depends="ca-certificates gsettings-desktop-schemas"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 5056d7d2b4..5067021245 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -65,9 +65,3 @@ glib-devel_package() {
done
}
}
-
-glib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 1b25bafaf2..c7ba0bbd8e 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
# Template file for 'glibc'
pkgname=glibc
version=2.18
-revision=4
+revision=6
bootstrap=yes
# Force creation of -dbg pkg, required by valgrind.
force_debug_pkgs=yes
@@ -12,6 +12,21 @@ homepage="http://www.gnu.org/software/libc"
license="GPL-2, LGPL-2.1, BSD"
distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz"
checksum=2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
+# Do not strip these files, objcopy errors out.
+nostrip_files="
+ XBS5_ILP32_OFFBIG
+ XBS5_ILP32_OFF32
+ POSIX_V6_ILP32_OFF32
+ POSIX_V6_ILP32_OFFBIG
+ POSIX_V7_ILP32_OFF32
+ POSIX_V7_ILP32_OFFBIG
+ POSIX_V6_LP64_OFF64
+ POSIX_V7_LP64_OFF64
+ XBS5_LP64_OFF64"
+conf_files="
+ /etc/rpc
+ /etc/ld.so.conf"
+depends="base-files glibc-locales>=${version}_${revision}"
if [ "$CHROOT_READY" ]; then
hostmakedepends="bison perl"
@@ -26,15 +41,16 @@ do_configure() {
echo "sbindir=/usr/sbin" >> configparms
echo "rootsbindir=/usr/sbin" >> configparms
- if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ case "$XBPS_TARGET_MACHINE" in
# Build with -mno-tls-direct-seg-refs to avoid performance
# problems with Xen on x86 32bit.
- export CFLAGS+=" -mno-tls-direct-seg-refs"
- elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
+ i686) export CFLAGS+=" -mno-tls-direct-seg-refs";;
# Force hard float ABI.
# To build for soft float: --with-float=soft --without-fp.
- configure_args+=" --with-float=hard"
- fi
+ armv6l*) configure_args+=" --with-march=armv6 --with-fpu=vfp --with-float=hard";;
+ armv7l*) configure_args+=" --with-march=armv7-a --with-fpu=vfpv3 --with-float=hard";;
+ esac
+
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-headers=${XBPS_CROSS_BASE}/usr/include"
else
@@ -48,7 +64,7 @@ do_configure() {
--enable-multi-arch --enable-bind-now \
--disable-profile --enable-kernel=2.6.27 \
--enable-stack-guard-randomization --enable-lock-elision \
- --without-cvs --without-gd
+ --without-selinux --without-cvs --without-gd
}
do_build() {
@@ -89,10 +105,9 @@ do_install() {
rm -f ${DESTDIR}/etc/ld.so.cache
# Create ld-linux.so.3 symlink for ARM.
- if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
- ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 \
- ${DESTDIR}/usr/lib/ld-linux.so.3
- fi
+ case "$XBPS_TARGET_MACHINE" in
+ armv?l) ln -sfr ${DESTDIR}/usr/lib/ld-linux-armhf.so.3 ${DESTDIR}/usr/lib/ld-linux.so.3;;
+ esac
}
glibc-devel_package() {
@@ -101,7 +116,7 @@ glibc-devel_package() {
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
- vmove "usr/lib/*crt1.o"
+ vmove "usr/lib/*.o"
vmove usr/share/info
}
}
@@ -129,24 +144,3 @@ nscd_package() {
vinstall ${FILESDIR}/nscd.conf 644 etc
}
}
-
-glibc_package() {
- # Do not strip these files, objcopy errors out.
- nostrip_files="
- XBS5_ILP32_OFFBIG
- XBS5_ILP32_OFF32
- POSIX_V6_ILP32_OFF32
- POSIX_V6_ILP32_OFFBIG
- POSIX_V7_ILP32_OFF32
- POSIX_V7_ILP32_OFFBIG
- POSIX_V6_LP64_OFF64
- POSIX_V7_LP64_OFF64
- XBS5_LP64_OFF64"
- conf_files="
- /etc/rpc
- /etc/ld.so.conf"
- depends="base-files glibc-locales>=${version}_${revision}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/glibc32/template b/srcpkgs/glibc32/template
index a43563c16e..fee3bdfabf 100644
--- a/srcpkgs/glibc32/template
+++ b/srcpkgs/glibc32/template
@@ -22,8 +22,11 @@ long_desc="
This package installs the 32 bit libraries for x86_64 systems."
only_for_archs=x86_64
+nostrip=yes
+noverifyrdeps=yes
hostmakedepends="bsdtar"
makedepends="zlib32"
+depends="glibc>=$version"
do_install() {
for f in ${distfiles}; do
@@ -56,20 +59,10 @@ glibc32-devel_package() {
nostrip=yes
noverifyrdeps=yes
depends="glibc-devel>=$version glibc32>=$version"
- short_desc+="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib32/*.a"
vmove "usr/lib32/*.o"
}
}
-
-glibc32_package() {
- nostrip=yes
- noverifyrdeps=yes
- depends="glibc>=$version"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template
index 7244390666..3cfed5ef25 100644
--- a/srcpkgs/glibmm/template
+++ b/srcpkgs/glibmm/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool libtool glib-devel>=2.38"
makedepends="libglib-devel>=2.38 libsigc++-devel>=2.2.10"
+depends="glib>=2.38"
short_desc="C++ bindings for GLib"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://gtkmm.sourceforge.net/"
@@ -33,10 +34,3 @@ glibmm-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-glibmm_package() {
- depends="glib>=2.38"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index c2ec1b0e0a..224fe1a39e 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -2,6 +2,8 @@
pkgname=glm
version=0.9.3.4
revision=1
+noarch=yes
+hostmakedepends="unzip"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
short_desc="A C++ mathematics library for graphics programming"
@@ -16,8 +18,6 @@ long_desc="
naming conventions and functionalities than GLSL so that when a programmer
knows GLSL, he knows GLM as well which makes it really easy to use."
-hostmakedepends="unzip"
-
do_install() {
vmkdir usr/include/glm
vmkdir usr/share/doc
@@ -27,10 +27,3 @@ do_install() {
find ${DESTDIR} -type f -exec chmod 644 {} \;
find ${DESTDIR} -type d -exec chmod 755 {} \;
}
-
-glm_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/glproto/template b/srcpkgs/glproto/template
index 0ff19d5bd4..33767bcee4 100644
--- a/srcpkgs/glproto/template
+++ b/srcpkgs/glproto/template
@@ -2,6 +2,7 @@
pkgname=glproto
version=1.4.17
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="GL extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,10 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40
-
-glproto_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/glu/template b/srcpkgs/glu/template
index a26d3bc001..ac2b0ecd49 100644
--- a/srcpkgs/glu/template
+++ b/srcpkgs/glu/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
configure_args="--disable-static"
makedepends="pkg-config MesaLib-devel>=9.0"
+replaces="libGLU<9.0"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
short_desc="Mesa OpenGL utility library (GLU)"
@@ -21,16 +22,9 @@ long_desc="
glu-devel_package() {
depends="MesaLib-devel>=9.0 glu-${version}_${revision}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-glu_package() {
- replaces="libGLU<9.0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 864022c7cc..e2f2baa9e4 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -8,6 +8,13 @@ configure_args="--sbindir=/usr/bin --with-mountutildir=/usr/bin
ac_cv_file__etc_redhat_release=no"
hostmakedepends="pkg-config python flex automake libtool"
makedepends="fuse-devel libxml2-devel libfl-devel openssl-devel readline-devel python"
+# python is required by gsyncd.
+depends="python"
+pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
+systemd_services="glusterd.service on"
+conf_files="
+ /etc/glusterfs/glusterfs-logrotate
+ /etc/glusterfs/glusterd.vol"
short_desc="Distributed file system capable of scaling to several petabytes"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-3"
@@ -40,16 +47,3 @@ libglusterfs_package() {
vmove "usr/lib/*.so.*"
}
}
-
-glusterfs_package() {
- # python is required by gsyncd.
- depends="python"
- pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
- systemd_services="glusterd.service on"
- conf_files="
- /etc/glusterfs/glusterfs-logrotate
- /etc/glusterfs/glusterd.vol"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gmime/files/iconv-detect.h b/srcpkgs/gmime/files/iconv-detect.h
new file mode 100644
index 0000000000..714cb5aa9d
--- /dev/null
+++ b/srcpkgs/gmime/files/iconv-detect.h
@@ -0,0 +1,5 @@
+/* This is an auto-generated header, DO NOT EDIT! */
+
+#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
+#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index 60b60470a0..7185cd5d97 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -1,9 +1,9 @@
# Template file for 'gmime'
pkgname=gmime
version=2.6.19
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--disable-static --disable-mono --enable-smime"
+configure_args="--disable-static --disable-mono --enable-smime --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config intltool"
makedepends="glib-devel gpgme-devel"
short_desc="GNOME Core mime parsing library"
@@ -13,8 +13,20 @@ homepage="http://www.gnome.org/"
distfiles="${GNOME_SITE}/gmime/2.6/gmime-${version}.tar.xz"
checksum=affb402b991519f83fb9c88464a9c07891860df18246c0743689c027d773a14a
+case "$XBPS_TARGET_MACHINE" in
+ # glibc
+ i686|x86_64|armv?l)
+ configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
+ configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes"
+ configure_args+=" am_cv_proto_iconv_arg1="
+ pre_build() {
+ cp ${FILESDIR}/*.h ${wrksrc}
+ }
+ ;;
+esac
+
gmime-devel_package() {
- depends="libglib-devel zlib-devel gmime-${version}_${revision}"
+ depends="libglib-devel zlib-devel gmime>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -23,9 +35,3 @@ gmime-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-gmime_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template
index 2dcdfd8f49..77256d7870 100644
--- a/srcpkgs/gmp/template
+++ b/srcpkgs/gmp/template
@@ -34,9 +34,3 @@ gmp-devel_package() {
vmove usr/share
}
}
-
-gmp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gmtk/template b/srcpkgs/gmtk/template
index dc9601bac5..81e49a1951 100644
--- a/srcpkgs/gmtk/template
+++ b/srcpkgs/gmtk/template
@@ -22,9 +22,3 @@ gmtk-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gmtk_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template
index 2a3004fbcd..ea9eff7fa6 100644
--- a/srcpkgs/gnac/template
+++ b/srcpkgs/gnac/template
@@ -18,11 +18,5 @@ makedepends="which pkg-config intltool gnome-doc-utils glib-devel libxml2-devel
gtk+3-devel gst-plugins-base-devel libunique-devel libnotify-devel
gst-plugins-good gst-plugins-bad gst-plugins-ugly desktop-file-utils
hicolor-icon-theme"
-
-gnac_package() {
- depends="gst-plugins-good gst-plugins-bad gst-plugins-ugly
- desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
+depends="gst-plugins-good gst-plugins-bad gst-plugins-ugly
+ desktop-file-utils hicolor-icon-theme"
diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 58444dd7f9..5200d70cc0 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -2,6 +2,7 @@
pkgname=gnome-backgrounds
version=3.10.1
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
short_desc="Set of background images for the GNOME Desktop"
@@ -10,10 +11,3 @@ homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=cc47e7b21f94464b013e5805baa51c3fa540008df0109717e8d77e48ea003b87
-
-gnome-backgrounds_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index c11f264fd3..72da43c09f 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -7,6 +7,7 @@ configure_args="--disable-desktop-update --disable-schemas-compile
--disable-icon-update"
hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection"
makedepends="libXi-devel gtk+3-devel>=3.8 libnotify-devel dconf-devel>=0.18 gvfs-devel>=1.18 bluez>=5"
+depends="bluez>=5 dconf>=0.18 gvfs>=1.18 hicolor-icon-theme desktop-file-utils"
short_desc="The GNOME Bluetooth Subsystem"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/GnomeBluetooth"
@@ -34,10 +35,3 @@ gnome-bluetooth-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gnome-bluetooth_package() {
- depends="bluez>=5 dconf>=0.18 gvfs>=1.18 hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template
index ed7078bbf1..bd72e652bb 100644
--- a/srcpkgs/gnome-boxes/template
+++ b/srcpkgs/gnome-boxes/template
@@ -9,16 +9,10 @@ makedepends="clutter-gtk-devel>=1.4.4_2 gtk+3-devel gtk-vnc-devel libuuid-devel
libvirt-glib-devel>=0.1.6 libxml2-devel libgudev-devel libosinfo-devel>=0.2.7
tracker-devel spice-gtk-devel>=0.14_4 spice-protocol vala-devel>=0.22
libsoup-devel>=2.44 qemu"
+depends="qemu libvirt-glib>=0.1.6 libosinfo>=0.2.7 desktop-file-utils hicolor-icon-theme shared-mime-info"
short_desc="GNOME 3 application to access remote or virtual systems"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="https://live.gnome.org/Boxes"
license="LGPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=906d5e7aaf4c0d90ea34ce019d5d2cf8665827cea28c21e811e6a2a509a7459e
-
-gnome-boxes_package() {
- depends="qemu libvirt-glib>=0.1.6 libosinfo>=0.2.7 desktop-file-utils hicolor-icon-theme shared-mime-info"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index f7485993d0..dacf6e066e 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -6,17 +6,11 @@ build_style=gnu-configure
hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel>=3.10
hicolor-icon-theme desktop-file-utils"
+depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
+replaces="gcalctool>=0"
short_desc="The GNOME calculator"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=2e583252e9332d8c7be52f1512a113869be1ad27fa829f7b49c89c9ea66d6d3e
-
-gnome-calculator_package() {
- depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
- replaces="gcalctool>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index efdb33c3b0..2d18364e99 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -7,6 +7,7 @@ hostmakedepends="pkg-config intltool itstool gobject-introspection"
makedepends="glib-devel vala-devel>=0.22 gnome-desktop-devel>=3.10
libgweather-devel>=3.10 libcanberra-devel libnotify-devel
geocode-glib-devel geoclue2 desktop-file-utils hicolor-icon-theme"
+depends="geoclue2 desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="https://live.gnome.org/GnomeClocks"
@@ -20,10 +21,3 @@ long_desc="
- View alarms
- Set alarms
- Times/dates in other locations"
-
-gnome-clocks_package() {
- depends="geoclue2 desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-color-manager/template b/srcpkgs/gnome-color-manager/template
index 10767b2d25..d0b59668d1 100644
--- a/srcpkgs/gnome-color-manager/template
+++ b/srcpkgs/gnome-color-manager/template
@@ -10,17 +10,11 @@ makedepends="exiv2-devel colord-devel>=1.0.3 gtk+3-devel
clutter-gtk-devel>=1.4.4_2 libcanberra-devel gnome-desktop-devel>=3.10
libexif-devel vte3-devel colord-gtk-devel mash-devel>=0.2.0_4
shared-color-profiles shared-color-targets"
+depends="desktop-file-utils hicolor-icon-theme colord
+ shared-color-profiles shared-color-targets"
short_desc="Color profile manager for the GNOME desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://projects.gnome.org/gnome-color-manager/"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=2944627f4166aaac08ba9d73614cbd79eba93573bd7d32e17a12082e30fb1399
-
-gnome-color-manager_package() {
- depends="desktop-file-utils hicolor-icon-theme colord
- shared-color-profiles shared-color-targets"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-common/template b/srcpkgs/gnome-common/template
index 3af59dd0f8..b8f0b807c1 100644
--- a/srcpkgs/gnome-common/template
+++ b/srcpkgs/gnome-common/template
@@ -2,19 +2,13 @@
pkgname=gnome-common
version=3.7.4
revision=2
+noarch="yes"
build_style=gnu-configure
hostmakedepends="automake"
+depends="automake"
short_desc="Common scripts and macros to develop with GNOME"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/${pkgname}/3.7/${pkgname}-${version}.tar.xz"
checksum=2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b
-
-gnome-common_package() {
- depends="automake"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template
index 23710806c1..9704b7f799 100644
--- a/srcpkgs/gnome-contacts/template
+++ b/srcpkgs/gnome-contacts/template
@@ -7,16 +7,10 @@ hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="vala-devel>=0.22 telepathy-glib-devel>=0.21
gnome-desktop-devel>=3.10 folks-devel>=0.9.5 libnotify-devel
cheese-devel>=3.10"
+depends="desktop-file-utils"
short_desc="GNOME contacts manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b
-
-gnome-contacts_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index 8ecf998790..ab0045d502 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -25,19 +25,12 @@ makedepends="
colord-gtk-devel>=0.1.24 accountsservice-devel vala-devel>=0.22
libXxf86misc-devel ModemManager-devel iso-codes"
+depends="gsettings-desktop-schemas>=3.10 pulseaudio desktop-file-utils
+ ModemManager hicolor-icon-theme sound-theme-freedesktop apg iso-codes"
+
gnome-control-center-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/share/pkgconfig
}
}
-
-gnome-control-center_package() {
- depends="gsettings-desktop-schemas>=3.10
- pulseaudio desktop-file-utils
- ModemManager hicolor-icon-theme
- sound-theme-freedesktop apg iso-codes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 4361f52e36..409ab43c59 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -7,6 +7,7 @@ configure_args="--with-gnome-distributor=void"
hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection"
makedepends="libxkbfile-devel gtk+3-devel gsettings-desktop-schemas-devel>=3.10
xkeyboard-config iso-codes"
+depends="gsettings-desktop-schemas>=3.10 xkeyboard-config iso-codes"
short_desc="GNOME desktop management utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -26,10 +27,3 @@ gnome-desktop-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gnome-desktop_package() {
- depends="gsettings-desktop-schemas>=3.10 xkeyboard-config iso-codes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template
index 27cbb575f2..85cd8de192 100644
--- a/srcpkgs/gnome-dictionary/template
+++ b/srcpkgs/gnome-dictionary/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--disable-schemas-compile --disable-scrollkeeper"
hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
makedepends="gtk+3-devel gsettings-desktop-schemas-devel>=3.10"
+depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10"
+replaces="gnome-utils>=3.0"
short_desc="Look up words in dictionary sources"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -18,12 +20,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig \
${DESTDIR}/usr/share/gtk-doc
}
-
-gnome-dictionary_package() {
- replaces="gnome-utils>=3.0"
- depends="hicolor-icon-theme desktop-file-utils
- gsettings-desktop-schemas>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index 05618af6ab..802cf00359 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -8,16 +8,10 @@ hostmakedepends="pkg-config intltool gnome-doc-utils"
makedepends="liblzma-devel gtk+3-devel libcanberra-devel udisks2-devel
libdvdread-devel libsecret-devel libpwquality-devel systemd-devel
gnome-settings-daemon-devel>=3.8 libnotify-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME libraries and applications for dealing with storage devices"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa
-
-gnome-disk-utility_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index c1c49b1c5e..3a9c051e3a 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -2,10 +2,13 @@
pkgname=gnome-doc-utils
version=0.20.10
revision=1
+noarch="yes"
build_style=gnu-configure
configure_args="--disable-scrollkeeper"
makedepends="pkg-config intltool libxslt-devel gsettings-desktop-schemas
docbook-xml docbook-xsl rarian python libxml2-python libxslt"
+depends="libxslt docbook-xml docbook-xsl rarian python libxml2-python"
+pycompile_module="xml2po"
short_desc="Documentation utilities for GNOME"
homepage="https://live.gnome.org/GnomeDocUtils"
license="GPL-2, LGPL-2.1"
@@ -17,12 +20,3 @@ long_desc="
project. Notably, it contains utilities for building documentation and
all auxiliary files in your source tree, and it contains the DocBook
XSLT stylesheets that were once distributed with Yelp."
-
-gnome-doc-utils_package() {
- noarch="yes"
- pycompile_module="xml2po"
- depends="libxslt docbook-xml docbook-xsl rarian python libxml2-python"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
index 54e82052bb..6d7286171f 100644
--- a/srcpkgs/gnome-documents/template
+++ b/srcpkgs/gnome-documents/template
@@ -9,16 +9,10 @@ makedepends="
gnome-online-accounts-devel>=3.10 libgdata-devel>=0.14 tracker-devel>=0.16_2
evince-devel>=3.10 gjs-devel>=1.38 libsoup-gnome-devel>=2.44 vala-devel>=0.22
webkitgtk-devel>=2.1"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="Documents Manager for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=26f8234fa74c00afb323f76de7028655b82d285acce057dd07b6ed98943951b2
-
-gnome-documents_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template
index b47ebb43ab..02bd247823 100644
--- a/srcpkgs/gnome-font-viewer/template
+++ b/srcpkgs/gnome-font-viewer/template
@@ -6,17 +6,11 @@ build_style=gnu-configure
configure_args="--disable-schemas-compile --disable-scrollkeeper"
hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
makedepends="gtk+3-devel gnome-desktop-devel>=3.10"
+depends="desktop-file-utils"
+replaces="gnome-utils>=3.0"
short_desc="A font viewer for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652
-
-gnome-font-viewer_package() {
- replaces="gnome-utils>=3.0"
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
index 8247db433e..6cd7ee387b 100644
--- a/srcpkgs/gnome-getting-started-docs/template
+++ b/srcpkgs/gnome-getting-started-docs/template
@@ -2,6 +2,7 @@
pkgname=gnome-getting-started-docs
version=3.10.2
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config intltool itstool gnome-doc-utils"
homepage="http://www.gnome.org"
@@ -10,10 +11,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=a524e623ce79f210235020a553399f59be43a2eb912ffc4ca40d27b4851c4a34
-
-gnome-getting-started-docs_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-icon-theme-extras/template b/srcpkgs/gnome-icon-theme-extras/template
index 9f7a7da057..730ee362ac 100644
--- a/srcpkgs/gnome-icon-theme-extras/template
+++ b/srcpkgs/gnome-icon-theme-extras/template
@@ -2,8 +2,10 @@
pkgname=gnome-icon-theme-extras
version=3.6.2
revision=2
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config intltool icon-naming-utils gnome-icon-theme"
+depends="gnome-icon-theme"
short_desc="GNOME Desktop icon theme (additional icons)"
homepage="http://gnome.org/"
license="GPL-2"
@@ -16,11 +18,3 @@ long_desc="
to represent the different applications, files, directories, and devices.
This package contains additional icons for the default GNOME icon theme."
-
-gnome-icon-theme-extras_package() {
- depends="gnome-icon-theme"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gnome-icon-theme-symbolic/template b/srcpkgs/gnome-icon-theme-symbolic/template
index c40c23ca63..c0a37327da 100644
--- a/srcpkgs/gnome-icon-theme-symbolic/template
+++ b/srcpkgs/gnome-icon-theme-symbolic/template
@@ -3,19 +3,13 @@ pkgname=gnome-icon-theme-symbolic
version=3.10.1
revision=2
build_style=gnu-configure
+noarch="yes"
configure_args="GTK_UPDATE_ICON_CACHE=/bin/true"
hostmakedepends="pkg-config intltool icon-naming-utils gnome-icon-theme>=3.8.0"
+depends="gnome-icon-theme>=3.10.0" # hasn't been updated yet
short_desc="GNOME Desktop icon theme (symbolic icons)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412
-
-gnome-icon-theme-symbolic_package() {
- depends="gnome-icon-theme>=3.10.0" # hasn't been updated yet
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-icon-theme/template b/srcpkgs/gnome-icon-theme/template
index 9aad618de2..c70f0c8618 100644
--- a/srcpkgs/gnome-icon-theme/template
+++ b/srcpkgs/gnome-icon-theme/template
@@ -2,6 +2,7 @@
pkgname=gnome-icon-theme
version=3.10.0
revision=1
+noarch="yes"
build_style=gnu-configure
configure_args="--enable-icon-mapping"
hostmakedepends="pkg-config intltool librsvg icon-naming-utils"
@@ -15,10 +16,3 @@ checksum=c65472b5846c67b97fe75200c5180faccd1347a04caa8390fc0ad23de75b36f6
post_install() {
rm -f ${DESTDIR}/usr/share/icons/gnome/icon-theme.cache
}
-
-gnome-icon-theme_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 252d1303e5..679deb25e3 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -9,6 +9,7 @@ makedepends="NetworkManager-devel accountsservice-devel glib-devel
gnome-online-accounts-devel>=3.10 gdm-devel>=3.10 libpwquality-devel
mit-krb5-devel vala-devel>=0.22 network-manager-applet-devel polkit-devel
ibus-devel iso-codes"
+depends="iso-codes"
short_desc="The GNOME initial setup"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -19,10 +20,3 @@ long_desc="
After acquiring or installing a new system there are a few essential things
to set up before use. gnome-initial-setup aims to provide a simple, easy,
and safe way to prepare a new system."
-
-gnome-initial-setup_package() {
- depends="iso-codes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-js-common/template b/srcpkgs/gnome-js-common/template
index c94f612b8d..f76a6cbbc4 100644
--- a/srcpkgs/gnome-js-common/template
+++ b/srcpkgs/gnome-js-common/template
@@ -2,6 +2,7 @@
pkgname=gnome-js-common
version=0.1.2
revision=2
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
short_desc="GNOME JavaScript common modules"
@@ -10,12 +11,3 @@ license="GPL-3"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${GNOME_SITE}/$pkgname/0.1/$pkgname-$version.tar.bz2"
checksum=1765be99f3d83cc57e1ec13a2bb963469b8e91b60239eeaab61d66d7744496e6
-long_desc="
- This package includes some JavaScript common modules for GNOME."
-
-gnome-js-common_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template
index 3db9e2ec82..8c41aec86c 100644
--- a/srcpkgs/gnome-keyring/template
+++ b/srcpkgs/gnome-keyring/template
@@ -7,17 +7,11 @@ configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile"
hostmakedepends="pkg-config intltool libtasn1-tools libxslt docbook-xsl"
makedepends="dbus-devel libcap-ng-devel pam-devel libcap-devel libtasn1-devel
libgcrypt-devel gcr-devel>=3.10"
+# For setcap(8).
+depends="libcap-progs dconf>=0.18 gcr>=3.10"
short_desc="GNOME password and secret manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL, LGPL"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8
-
-gnome-keyring_package() {
- # For setcap(8).
- depends="libcap-progs dconf>=0.18 gcr>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index 79b315da9b..3b42a071e2 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -2,20 +2,14 @@
pkgname=gnome-maps
version=3.10.2
revision=1
+noarch=yes
build_style=gnu-configure
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="gjs-devel>=1.38 gnome-desktop-devel>=3.10 geocode-glib-devel"
+depends="gjs desktop-file-utils"
short_desc="GNOME maps application"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/Design/Apps/Maps"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=1351967e5530c5fe455233c585362443eda1a6c4a089e6104d4b672087c74bd0
-
-gnome-maps_package() {
- depends="gjs desktop-file-utils"
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template
index 062fe8ae52..c5170c8300 100644
--- a/srcpkgs/gnome-menus/template
+++ b/srcpkgs/gnome-menus/template
@@ -23,9 +23,3 @@ gnome-menus-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gnome-menus_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 02a3d41717..7be96d5ae2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -2,8 +2,11 @@
pkgname=gnome-mime-data
version=2.18.0
revision=3
+noarch="yes"
build_style=gnu-configure
makedepends="intltool shared-mime-info"
+depends="shared-mime-info"
+conf_files="/etc/gnome-vfs-mime-magic"
short_desc="Base MIME and Application database for GNOME"
homepage="http://www.gnome.org"
license="GPL-2"
@@ -13,12 +16,3 @@ checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
long_desc="
$pkgname contains the base MIME and Application database for GNOME.
It is meant to be accessed through the MIME functions in GnomeVFS."
-
-gnome-mime-data_package() {
- depends="shared-mime-info"
- conf_files="/etc/gnome-vfs-mime-magic"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index e4875e55be..39f31a53dd 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -10,16 +10,10 @@ makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel
libgda-devel>=5.1.2_2 libmusicbrainz-devel>=3.0.3_3 desktop-file-utils
hicolor-icon-theme mplayer"
+depends="mplayer desktop-file-utils hicolor-icon-theme"
short_desc="A simple MPlayer GUI for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://gnome-mplayer.googlecode.com/"
distfiles="http://gnome-mplayer.googlecode.com/files/${pkgname}-${version}.tar.gz"
checksum=bbd914ab620341e0c074374d2079c335eaea3c93cde746ebc7357577e7b00414
-
-gnome-mplayer_package() {
- depends="mplayer desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template
index 1151a300d0..d3806e822d 100644
--- a/srcpkgs/gnome-music/template
+++ b/srcpkgs/gnome-music/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="python3-devel pygobject-devel>=3.10.1 dbus-python3>=1.2.0
grilo-devel gnome-desktop-devel>=3.10"
+depends="py3gobject dbus-python3 desktop-file-utils"
short_desc="GNOME music playing application"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/Apps/Music"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=3b75643e8a6e4d9b44b2572f0ddecfa0ec32affd9172c43a4bec909d15ac9d7c
-
-gnome-music_package() {
- depends="py3gobject dbus-python3 desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index 1e3ac03227..450c75c66b 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -6,17 +6,10 @@ build_style=gnu-configure
hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
makedepends="gtk+3-devel gsettings-desktop-schemas-devel>=3.8.0 libgtop-devel
hicolor-icon-theme desktop-file-utils traceroute iputils bind-utils net-tools"
+depends="hicolor-icon-theme desktop-file-utils traceroute iputils bind-utils net-tools"
short_desc="A Collection of GNOME3 Networking Tools"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
-
-gnome-nettool_package() {
- depends="hicolor-icon-theme desktop-file-utils
- traceroute iputils bind-utils net-tools"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index bcd20384ca..148533164b 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
version=3.10.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="
--enable-google --enable-kerberos --enable-flickr --enable-telepathy
--enable-facebook --disable-static --enable-exchange --enable-imap-smtp
- --enable-owncloud --enable-windows-live --enable-twitter --enable-yahoo"
+ --enable-owncloud --enable-windows-live --disable-twitter --enable-yahoo"
hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
makedepends="
libsoup-gnome-devel>=2.44 webkitgtk-devel>=2.1 json-glib-devel
libnotify-devel rest-devel>=0.7.90 gcr-devel>=3.10 libsecret-devel mit-krb5-devel
dbus-glib-devel telepathy-glib-devel"
+depends="libsoup-gnome>=2.44 rest>=0.7.90 gcr>=3.10 webkitgtk>=2.1 hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -30,10 +31,3 @@ gnome-online-accounts-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-gnome-online-accounts_package() {
- depends="libsoup-gnome>=2.44 rest>=0.7.90 gcr>=3.10 webkitgtk>=2.1 hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index e74ec45e47..5fbdc49081 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,21 +1,15 @@
# Template file for 'gnome-online-miners'
pkgname=gnome-online-miners
-version=3.10.2
+version=3.10.3
revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
makedepends="libzapojit-devel>=0.0.3_3 libgdata-devel>=0.14 grilo-devel tracker-devel"
+depends="libzapojit>=0.0.3_3 libgdata>=0.14"
short_desc="GNOME service that crawls through your online content"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=38c9e60cf56b6d0ec32e972256268d6038d15e32521a91aede1ec168f5e31cd9
-
-gnome-online-miners_package() {
- depends="libzapojit>=0.0.3_3 libgdata>=0.14"
- pkg_install() {
- vmove all
- }
-}
+checksum=129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index c7036ef888..4fdeef2dc4 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -9,16 +9,10 @@ makedepends="
gtk+3-devel>=3.8 babl-devel gegl-devel exempi-devel lcms2-devel
tracker-devel>=0.16_2 libexif-devel librsvg-devel grilo-devel>=0.2.7_2
gnome-online-accounts-devel>=3.10 gnome-desktop-devel>=3.10"
+depends="desktop-file-utils"
short_desc="Access, organize, and share your photos on GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975
-
-gnome-photos_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 17d9f30a93..10f57d006e 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool gnome-doc-utils"
makedepends="gtk+3-devel upower-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME power management tool"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org/projects/gnome-power-manager/"
@@ -22,10 +23,3 @@ long_desc="
display brightness, CPU, graphics card and hard disk drive power saving, and can
trigger suspend-to-RAM, hibernate or shutdown events, all integrated to other
components of the GNOME desktop."
-
-gnome-power-manager_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template
index 8e3b3238bc..fb9f96cf13 100644
--- a/srcpkgs/gnome-screenshot/template
+++ b/srcpkgs/gnome-screenshot/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool itstool gnome-doc-utils"
makedepends="gtk+3-devel>=3.8 libcanberra-devel"
+depends="desktop-file-utils"
short_desc="A screenshot capture utility for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=9a4ed8821187e5a6923245508df4c116f28278b3089580eb2c4e6d32d178ba68
-
-gnome-screenshot_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 59ac976abb..d094c40c1b 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -9,17 +9,11 @@ makedepends="upower-devel json-glib-devel gtk+3-devel
startup-notification-devel libXtst-devel systemd-devel
gsettings-desktop-schemas-devel>=3.10 dbus-glib-devel
gnome-desktop-devel>=3.10 libSM-devel"
+depends="gsettings-desktop-schemas>=3.10 dconf>=0.18 alsa-plugins
+ hicolor-icon-theme desktop-file-utils"
short_desc="GNOME session management utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2, LGPL-2.1"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc
-
-gnome-session_package() {
- depends="gsettings-desktop-schemas>=3.10 dconf>=0.18 alsa-plugins
- hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 4f9f9f7f81..cdf679be01 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -12,6 +12,7 @@ makedepends="geocode-glib-devel colord-devel>=0.1.23_3 libxklavier-devel
xf86-input-wacom-devel libwacom-devel>=0.7 systemd-devel librsvg-devel
ibus-devel>=1.4.99 cups-devel libgudev-devel upower-devel polkit-devel
libgweather-devel>=3.10 geoclue2"
+depends="geoclue2 pulseaudio hicolor-icon-theme"
short_desc="GNOME settings daemon"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -27,10 +28,3 @@ gnome-settings-daemon-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-gnome-settings-daemon_package() {
- depends="geoclue2 pulseaudio hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index f21ec7f873..ed16b8acb1 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -2,21 +2,15 @@
pkgname=gnome-shell-extensions
version=3.10.1
revision=1
+noarch="yes"
build_style=gnu-configure
configure_args="--enable-extensions=all"
hostmakedepends="pkg-config intltool"
makedepends="unzip libglib-devel libgtop-devel"
+depends="gnome-shell>=${version} nautilus>=3.10 unzip"
short_desc="Extensions for GNOME shell, including classic mode"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/GnomeShell/Extensions"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=9baa9ddaf4e14cab6d4d7944d8dc009378b25f995acfd0fd72843f599cb5ae43
-
-gnome-shell-extensions_package() {
- noarch="yes"
- depends="gnome-shell>=${version} nautilus>=3.10 unzip"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9c90cc4410..d8decaa954 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
-version=3.10.2.1
-revision=2
+version=3.10.3
+revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection"
@@ -13,21 +13,15 @@ makedepends="
pulseaudio-devel libgudev-devel gst-plugins-base1-devel>=1:1.2 systemd-devel
caribou-devel>=0.4.12 gir-freedesktop gnome-control-center-devel>=3.10
folks-devel>=0.9.5 gnome-menus-devel>=3.8 mutter-wayland-devel glxinfo"
+depends="caribou>=0.4.12 pulseaudio glxinfo desktop-file-utils
+ gir-freedesktop gnome-control-center>=3.10 mutter>=3.10.2"
short_desc="GNOME core user interface"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/GnomeShell"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/3.10/$pkgname-$version.tar.xz"
-checksum=d28cedc4f7dbcbd979ef2a0b80f722ff507989fce193fe59351b1d048d17c44c
+checksum=4b14b9ffde08ccee6d972dea353b5f7ed8bbd12e52cb2252c31bcfe59d8242bc
post_install() {
rm -rf ${DESTDIR}/usr/share/gtk-doc
}
-
-gnome-shell_package() {
- depends="caribou>=0.4.12 pulseaudio glxinfo desktop-file-utils
- gir-freedesktop gnome-control-center>=3.10 mutter>=3.10.2"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index b6cc8ac856..5663dbc53f 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
makedepends="gtk+3-devel>=3.8"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="A system log viewer for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
-
-gnome-system-log_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index de5919fd44..f0e0a962f3 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -7,16 +7,10 @@ configure_args="--disable-schemas-compile --enable-systemd"
hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
makedepends="libwnck-devel gtkmm-devel>=3.9 librsvg-devel systemd-devel libgtop-devel
gnome-icon-theme>=3.10"
+depends="gtkmm>=3.9 gnome-icon-theme>=3.10"
short_desc="Process viewer and system resource monitor for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0
-
-gnome-system-monitor_package() {
- depends="gtkmm>=3.9 gnome-icon-theme>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index a9561987bc..080edd25c9 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -8,16 +8,10 @@ hostmakedepends="which pkg-config intltool itstool gnome-doc-utils"
makedepends="gtk+3-devel>=3.8 vte3-devel dconf-devel>=0.18 libuuid-devel
gsettings-desktop-schemas-devel>=3.10 nautilus-devel>=3.10
GConf-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="The GNOME terminal emulator application"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913
-
-gnome-terminal_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-themes-standard/template b/srcpkgs/gnome-themes-standard/template
index 7466178292..f37a5fad9a 100644
--- a/srcpkgs/gnome-themes-standard/template
+++ b/srcpkgs/gnome-themes-standard/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool librsvg-utils"
makedepends="gtk+-devel gtk+3-devel>=3.8 librsvg-devel>=2.39"
+depends="gtk2-engines"
short_desc="Standard GNOME themes"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -17,10 +18,3 @@ post_install() {
rm -f ${DESTDIR}/${f}/*.cache
done
}
-
-gnome-themes-standard_package() {
- depends="gtk2-engines"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-tweak-tool/template b/srcpkgs/gnome-tweak-tool/template
index 7d37132fd6..9aa794c520 100644
--- a/srcpkgs/gnome-tweak-tool/template
+++ b/srcpkgs/gnome-tweak-tool/template
@@ -2,28 +2,22 @@
pkgname=gnome-tweak-tool
version=3.10.1
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+3-devel pygobject-devel>=3.10 gsettings-desktop-schemas-devel>=3.10
hicolor-icon-theme desktop-file-utils GConf dconf>=0.18"
+depends="python
+ pygobject>=3.10
+ gsettings-desktop-schemas>=3.10
+ dconf>=0.18
+ GConf
+ hicolor-icon-theme
+ desktop-file-utils"
+pycompile_module="gtweak"
short_desc="GNOME3 tool to customize advanced options"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://live.gnome.org/GnomeTweakTool"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec
-
-gnome-tweak-tool_package() {
- noarch="yes"
- pycompile_module="gtweak"
- depends="python
- pygobject>=3.10
- gsettings-desktop-schemas>=3.10
- dconf>=0.18
- GConf
- hicolor-icon-theme
- desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index e3d61548c3..16f1ea1cec 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -2,20 +2,14 @@
pkgname=gnome-user-docs
version=3.10.2
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config intltool itstool gnome-doc-utils"
makedepends="yelp"
+depends="yelp"
homepage="http://www.gnome.org"
short_desc="User documentation for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=a733828428e827fa40f2a240b13447917b2d71f1dce03365ef0344c52476b4d7
-
-gnome-user-docs_package() {
- depends="yelp"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome-video-effects/template b/srcpkgs/gnome-video-effects/template
index e7be67dc15..6beab01019 100644
--- a/srcpkgs/gnome-video-effects/template
+++ b/srcpkgs/gnome-video-effects/template
@@ -1,21 +1,13 @@
# Template build file for 'gnome-video-effects'.
pkgname=gnome-video-effects
version=0.4.0
+revision=1
+noarch="yes"
build_style=gnu-configure
makedepends="pkg-config intltool gstreamer-devel"
-revision=1
short_desc="A collection of GStreamer effects for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz"
checksum=8f7f674b23abab88fac1c10db8eda0cfc7bff1c39413f2959203b9755575bde7
-long_desc="
- This package contains a set of GStreamer video effects for the GNOME desktop."
-
-gnome-video-effects_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template
index 07745ce877..03df89278b 100644
--- a/srcpkgs/gnome-weather/template
+++ b/srcpkgs/gnome-weather/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection"
makedepends="gtk+3-devel>=3.8 gjs-devel>=1.38 libgweather-devel>=3.10"
+depends="desktop-file-utils"
short_desc="Access current weather conditions and forecasts for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=e0f2503c2cc9ced72da7728b262a767342b82852a74196db44377d18f1820fe4
-
-gnome-weather_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 5ff8c6ef0d..a34aa0a66a 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -2,6 +2,7 @@
pkgname=gnome
version=3.10.0
revision=2
+noarch=yes
build_style=meta
makedepends="
gnome-backgrounds>=${version}
@@ -66,12 +67,8 @@ makedepends="
tracker>=0.16.2_2
cantarell-fonts>=0.0.15
xdg-user-dirs-gtk"
+depends="${makedepends}"
short_desc="The GNOME meta-package for Void Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL, LGPL"
-
-gnome_package() {
- noarch="yes"
- depends="${makedepends}"
-}
diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index 3be4d31dc9..33e91d2e7a 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -7,16 +7,10 @@ configure_args="--disable-schemas-compile --disable-static"
hostmakedepends="pkg-config itstool>=1.2.0 intltool"
makedepends="boost-devel libsecret-devel libxslt-devel libuuid-devel
gtkmm-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="GNOME note taking application"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://live.gnome.org/Gnote"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=10dedfde2f7748f67eda4f334505c7e8ff2b86286d2c9feb3c43e7261684b71b
-
-gnote_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
new file mode 100644
index 0000000000..5586914fab
--- /dev/null
+++ b/srcpkgs/gnu-efi-libs/template
@@ -0,0 +1,30 @@
+# Template file for 'gnu-efi-libs'
+pkgname=gnu-efi-libs
+version=3.0u
+revision=1
+wrksrc="gnu-efi-${version/u/}"
+makedepends="pciutils-devel"
+nostrip=yes
+short_desc="Library for building UEFI Applications using GNU toolchain"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://sourceforge.net/projects/gnu-efi/"
+distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi_${version}.orig.tar.gz"
+checksum=3c0d450d5829204ca05dcb3b2aae772e52c379b7c7e09146759c6315606f934e
+
+do_build() {
+ unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+ make
+ make -C apps all
+}
+
+do_install() {
+ make INSTALLROOT=${DESTDIR} PREFIX=/usr LIBDIR=/usr/lib install
+
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) _EFI_ARCH="ia32";;
+ x86_64*) _EFI_ARCH="x86_64";;
+ esac
+ vmkdir usr/share/gnu-efi/apps/${_EFI_ARCH}
+ install -Dm644 apps/*.efi ${DESTDIR}/usr/share/gnu-efi/apps/${_EFI_ARCH}
+}
diff --git a/srcpkgs/gnucash-devel b/srcpkgs/gnucash-devel
new file mode 120000
index 0000000000..66d1f77030
--- /dev/null
+++ b/srcpkgs/gnucash-devel
@@ -0,0 +1 @@
+gnucash
\ No newline at end of file
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
new file mode 100644
index 0000000000..64d1057f98
--- /dev/null
+++ b/srcpkgs/gnucash/template
@@ -0,0 +1,24 @@
+# Template file for 'gnucash'
+pkgname=gnucash
+version=2.6.0
+revision=4
+conf_files="
+ /etc/gnucash/config
+ /etc/gnucash/environment"
+hostmakedepends="pkg-config intltool"
+makedepends="gmp-devel gtk+-devel guile-devel libxml2-devel libxslt-devel libgnomecanvas-devel goffice0.8-devel libgsf-devel GConf-devel webkit-gtk-devel gc-devel"
+build_style="gnu-configure"
+configure_args="--disable-dbi"
+maintainer="Philipp Hirsch <itself@hanspolo.net>"
+license="GPL-3"
+homepage="http://www.gnucash.org/"
+short_desc="Financial-accounting software"
+distfiles="http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=a875abf0ee3e7380fc41bd5bf2795787e4a8946ec579147b16acac665b9affbf
+
+gnucash-devel_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ }
+}
diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index a4447093d1..26784b2873 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -20,9 +20,3 @@ long_desc="
access modules for all kind of public key directories. GnuPG, also known as
GPG, is a command line tool with features for easy integration with other
applications. A wealth of frontend applications and libraries are available."
-
-gnupg_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index c28160f5a0..d1147c0f9a 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -43,9 +43,3 @@ gnutls-tools_package() {
vmove usr/share/man/man1
}
}
-
-gnutls_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 4213950d38..261238a2f6 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,24 +1,17 @@
# Template file for 'go'
pkgname=go
-version=1.1
+version=1.2
revision=1
wrksrc=go
+nostrip=yes
makedepends="ed bison"
+depends="perl gawk"
short_desc="The Go Programming Language"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://golang.org/"
license="BSD"
distfiles="http://go.googlecode.com/files/go${version}.src.tar.gz"
-checksum="bf1d057d8386e840f9cd3f787252e26d8ee196852e9232a6f9ce762337b19cb6"
-long_desc="
- The Go programming language is an open source project to make programmers
- more productive. Go is expressive, concise, clean, and efficient. Its
- concurrency mechanisms make it easy to write programs that get the most out
- of multicore and networked machines, while its novel type system enables
- flexible and modular program construction. Go compiles quickly to machine
- code yet has the convenience of garbage collection and the power of run-time
- reflection. It's a fast, statically typed, compiled language that feels like
- a dynamically typed, interpreted language."
+checksum=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4
do_build() {
cd ${wrksrc}
@@ -58,7 +51,7 @@ do_install() {
vinstall misc/vim/$f 644 usr/share/vim/vimfiles
done
- install -d ${DESTDIR}/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
+ install -d ${DESTDIR}/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site/src}}
cp -r doc misc -t ${DESTDIR}/usr/share/go
ln -s /usr/share/go/doc ${DESTDIR}/usr/lib/go/doc
@@ -68,6 +61,7 @@ do_install() {
cp -a src/cmd ${DESTDIR}/usr/lib/go/src/cmd
cp -a src/lib9 ${DESTDIR}/usr/lib/go/src/
cp -a lib ${DESTDIR}/usr/lib/go/
+ cp -a include ${DESTDIR}/usr/lib/go/
install -Dm644 src/Make.* ${DESTDIR}/usr/lib/go/src
@@ -96,12 +90,3 @@ do_install() {
rm -f ${DESTDIR}/usr/share/go/doc/articles/wiki/get.bin
}
-
-go_package() {
- nostrip=yes
- depends="perl gawk"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 647a102ee0..b1fda02365 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--disable-tests --disable-static"
hostmakedepends="pkg-config flex"
makedepends="libffi-devel libglib-devel python-devel libxml2-devel cairo-devel libtool"
+depends="libtool python libgirepository-devel"
+pycompile_dirs="usr/lib/${pkgname}/giscanner"
short_desc="Introspection system for GObject-based libraries"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/GObjectInstrospection"
@@ -41,11 +43,3 @@ libgirepository-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-gobject-introspection_package() {
- pycompile_dirs="usr/lib/${pkgname}/giscanner"
- depends="libtool python libgirepository-devel"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/goffice-devel b/srcpkgs/goffice-devel
new file mode 120000
index 0000000000..a5e0c738c0
--- /dev/null
+++ b/srcpkgs/goffice-devel
@@ -0,0 +1 @@
+goffice
\ No newline at end of file
diff --git a/srcpkgs/goffice/template b/srcpkgs/goffice/template
new file mode 100644
index 0000000000..5ae626b237
--- /dev/null
+++ b/srcpkgs/goffice/template
@@ -0,0 +1,24 @@
+# Template file for 'goffice'
+pkgname=goffice
+version=0.10.9
+revision=3
+hostmakedepends="pkg-config pcre intltool"
+makedepends="GConf-devel gtk+3-devel librsvg-devel libgsf-devel libxml2-devel pcre-devel"
+build_style="gnu-configure"
+maintainer="Philipp Hirsch <itself@hanspolo.net>"
+license="GPL-2"
+short_desc="Library of document-centric objects and utilities building on top of GLib and Gtk+"
+homepage="http://freecode.com/projects/${pkgname}"
+distfiles="http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=8f21cc656645dfe9da518a672350f5a5a5710b20278fa6a7a5af4d583d148875
+
+goffice-devel_package() {
+ short_desc+=" - development files"
+ depends="libgsf-devel gtk+3-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gtk-doc
+ }
+}
diff --git a/srcpkgs/goffice0.8-devel b/srcpkgs/goffice0.8-devel
new file mode 120000
index 0000000000..d82ea3cb99
--- /dev/null
+++ b/srcpkgs/goffice0.8-devel
@@ -0,0 +1 @@
+goffice0.8
\ No newline at end of file
diff --git a/srcpkgs/goffice0.8/template b/srcpkgs/goffice0.8/template
new file mode 100644
index 0000000000..dbf00bb968
--- /dev/null
+++ b/srcpkgs/goffice0.8/template
@@ -0,0 +1,25 @@
+# Template file for 'goffice0.8'
+pkgname=goffice0.8
+version=0.8.17
+revision=2
+wrksrc="goffice-${version}"
+hostmakedepends="pkg-config pcre intltool"
+makedepends="GConf-devel gtk+-devel librsvg-devel libgsf-devel libxml2-devel pcre-devel"
+build_style="gnu-configure"
+maintainer="Philipp Hirsch <itself@hanspolo.net>"
+license="GPL-2"
+homepage="http://freecode.com/projects/${pkgname}"
+distfiles="http://ftp.gnome.org/pub/GNOME/sources/goffice/${version%.*}/goffice-${version}.tar.xz"
+checksum=165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15
+short_desc="Library of document-centric objects and utilities building on top of GLib and Gtk+ (0.8.x)"
+
+goffice0.8-devel_package() {
+ short_desc+=" - development files"
+ depends="libgsf-devel gtk+-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gtk-doc
+ }
+}
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index 2de98a04a9..2c9a043f1b 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -4,6 +4,10 @@ version=0.40
revision=4
build_style=gnu-configure
configure_args="--enable-ttf-font-dir=/usr/share/fonts/TTF"
+hostmakedepends="pkg-config"
+makedepends="SDL-devel SDL_image-devel glew-devel>=1.9.0
+ freetype-devel boost-devel>=1.54 glm pcre-devel freefont-ttf"
+depends="freefont-ttf"
short_desc="Software version control visualization"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -11,17 +15,6 @@ homepage="https://code.google.com/p/gource/"
distfiles="https://gource.googlecode.com/files/gource-${version}.tar.gz"
checksum=9c890a926bb3bab8ea3e546c1357488e5a5034d1ea9402afc654cb7e00ccd112
-hostmakedepends="pkg-config"
-makedepends="SDL-devel SDL_image-devel glew-devel>=1.9.0
- freetype-devel boost-devel>=1.54 glm pcre-devel freefont-ttf"
-
pre_configure() {
sed -i "s/filesystem3/filesystem/g" src/logmill.cpp
}
-
-gource_package() {
- depends="freefont-ttf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gpart/template b/srcpkgs/gpart/template
index 8d8b5b10e4..8f39df985e 100644
--- a/srcpkgs/gpart/template
+++ b/srcpkgs/gpart/template
@@ -10,9 +10,3 @@ license="GPL-2"
homepage="https://github.com/baruch/gpart"
distfiles="https://github.com/baruch/gpart/releases/download/v${version}/${pkgname}-${version}.tar.gz"
checksum=4efdaf4a557bf1b3fb3379bf684772dc1c0a05c9251eec53299b9f2362ea4e50
-
-gpart_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 2eef537ad4..1ec9ba23d0 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--enable-libparted-dmraid --sbindir=/usr/bin"
hostmakedepends="pkg-config which intltool gnome-doc-utils"
makedepends="libuuid-devel libparted-devel gtkmm2-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Gnome Partition Editor"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://gparted.sourceforge.net"
@@ -32,10 +33,3 @@ post_install() {
vinstall ${FILESDIR}/org.void.pkexec.gparted.policy 644 /usr/share/polkit-1/actions
vinstall ${FILESDIR}/gparted-pkexec 755 usr/bin
}
-
-gparted_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gperf/template b/srcpkgs/gperf/template
index 3c6baec98b..aee1a47e57 100644
--- a/srcpkgs/gperf/template
+++ b/srcpkgs/gperf/template
@@ -23,9 +23,3 @@ long_desc="
post_install() {
touch -f ${DESTDIR}/usr/share/info/dir
}
-
-gperf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index aa4ae0b65a..b7213432cb 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -5,9 +5,11 @@ revision=1
build_style=gnu-configure
configure_args="--enable-fd-passing --with-gpg=/usr/bin/gpg
--with-gpgsm=/usr/bin/gpgsm --with-gpgconf=/usr/bin/gpgconf
- --with-g13=/usr/bin/g13"
+ --with-g13=/usr/bin/g13 --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
+ --with-libassuan-prefix=$XBPS_CROSS_BASE/usr"
hostmakedepends="gnupg"
-makedepends="libgpg-error-devel libassuan-devel"
+makedepends="libgpg-error-devel libassuan-devel gnupg"
+depends="libassuan>=2.0.3 gnupg"
short_desc="GnuPG Made Easy"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -26,11 +28,6 @@ long_desc="
instead. This way bug fixes or improvements can be done at a central place
and every application benefits from this."
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
- --with-libassuan-prefix=$XBPS_CROSS_BASE/usr"
-fi
-
gpgme-devel_package() {
depends="libgpg-error-devel libassuan-devel gpgme>=${version}"
short_desc+=" - development files"
@@ -41,10 +38,3 @@ gpgme-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gpgme_package() {
- depends="libassuan>=2.0.3 gnupg"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 97beeaf2d4..64d5a0169d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,19 +1,18 @@
# Template file for 'gpicview'
pkgname=gpicview
-version=0.2.3
+version=0.2.4
revision=1
build_style=gnu-configure
-makedepends="pkg-config intltool libjpeg-turbo-devel gtk+-devel"
+hostmakedepends="pkg-config intltool"
+makedepends="libjpeg-turbo-devel gtk+-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A Simple and Fast Image Viewer for X"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://lxde.org/"
license="GPL-2"
-distfiles="${DEBIAN_SITE}/main/g/${pkgname}/${pkgname}_${version}.orig.tar.xz"
-checksum=e1cd963e0954677efec3bc08f4318f1214d2b33c1498d402133a7ca35cec0bfd
+distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.gz"
+checksum=99beb7df6765b386cd3f65b3ff77e9a25027a009db432f02bd60be8558f06ceb
-gpicview_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
+pre_configure() {
+ sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
}
diff --git a/srcpkgs/gpm/template b/srcpkgs/gpm/template
index bb26d4637a..f7025bc628 100644
--- a/srcpkgs/gpm/template
+++ b/srcpkgs/gpm/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
hostmakedepends="automake libtool flex"
makedepends="ncurses-devel libfl-devel"
configure_args="--sbindir=/usr/bin"
+systemd_services="gpm.service on"
short_desc="A mouse server for the console and xterm"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.nico.schottelius.org/software/gpm/"
@@ -43,10 +44,3 @@ libgpm_package() {
vmove "usr/lib/*.so.*"
}
}
-
-gpm_package() {
- systemd_services="gpm.service on"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template
index 046fbbd1a1..c89c05e8b6 100644
--- a/srcpkgs/gptfdisk/template
+++ b/srcpkgs/gptfdisk/template
@@ -21,9 +21,3 @@ do_install() {
vinstall ${f}.8 644 usr/share/man/man8
done
}
-
-gptfdisk_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template
index 92ed2306d8..887e4da9df 100644
--- a/srcpkgs/granite/template
+++ b/srcpkgs/granite/template
@@ -3,7 +3,9 @@ pkgname=granite
version=0.1.1
revision=3
build_style=cmake
-makedepends="cmake vala pkg-config gtk+3-devel libgee-devel glib-devel"
+hostmakedepends="cmake vala pkg-config"
+makedepends="gtk+3-devel libgee-devel glib-devel"
+depends="hicolor-icon-theme"
short_desc="GTK+3 extension providing commonly-used widgets"
maintainer="tripledes <tripledes@gmail.com>"
homepage="https://launchpad.net/granite"
@@ -13,17 +15,10 @@ checksum=360a030690d3db1faedf7461fe808b37ed67de7f380532673dae2242f2e7b5e5
granite-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/vala
}
}
-
-granite_package() {
- depends="hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/grantlee/template b/srcpkgs/grantlee/template
index 947d3d3c9f..43e3bbeb05 100644
--- a/srcpkgs/grantlee/template
+++ b/srcpkgs/grantlee/template
@@ -20,9 +20,3 @@ grantlee-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-grantlee_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/graphite/template b/srcpkgs/graphite/template
index bb3c100b4c..2bfaf88a10 100644
--- a/srcpkgs/graphite/template
+++ b/srcpkgs/graphite/template
@@ -24,9 +24,3 @@ graphite-devel_package() {
vmove usr/share
}
}
-
-graphite_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index 70b4c173d6..8f89246688 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -41,9 +41,3 @@ graphviz-devel_package() {
vmove usr/share/man/man3
}
}
-
-graphviz_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 0e3d29a0c7..76e7eeb1a7 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,23 +1,13 @@
# Template build file for 'grep'.
pkgname=grep
-version=2.15
+version=2.16
revision=1
build_style=gnu-configure
makedepends="pcre-devel>=8.30"
+conflicts="chroot-grep>=0"
short_desc="The GNU grep utility"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.gnu.org/software/grep/"
distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.xz"
-checksum=bf5a834e587974c8c64e71b35b9e75cd21c7ff253c0e7fbfb0a78be794965314
-
-post_install() {
- touch ${DESTDIR}/usr/share/info/dir
-}
-
-grep_package() {
- conflicts="chroot-grep>=0"
- pkg_install() {
- vmove all
- }
-}
+checksum=16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 1f02bc9c8c..f5a0b3b82e 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -10,6 +10,7 @@ makedepends="grilo-devel>=0.2.6 gupnp-av-devel json-glib-devel
libquvi-devel rest-devel>=0.7.90 sqlite-devel libgcrypt-devel gmime-devel
tracker-devel>=0.16_2 totem-pl-parser-devel>=3.10 libgdata-devel>=0.14
gnome-online-accounts-devel>=3.10"
+depends="grilo>=${version}"
short_desc="Plugins for Grilo"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -26,10 +27,3 @@ long_desc="
Developers can share efforts and code by writing plugins for the framework
that are application agnostic.
* A flexible API that allows plugin developers to write plugins of various kinds."
-
-grilo-plugins_package() {
- depends="grilo>=0.2.7"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 113b73879a..09cf937261 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -40,9 +40,3 @@ grilo-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-grilo_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index c556f64b55..6eb9752ca9 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -54,15 +54,9 @@ do_install() {
}
groff-doc_package() {
- short_desc="${short_desc} - documentation"
+ short_desco+=" - documentation"
noarch=yes
pkg_install() {
vmove usr/share/doc
}
}
-
-groff_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 4c653bb97c..0649c805f6 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -2,6 +2,11 @@
pkgname=grub
version=2.00
revision=12
+hostmakedepends="flex"
+makedepends="libusb-compat-devel ncurses-devel freetype-devel
+ liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
+depends="os-prober"
+conf_files="/etc/default/grub /etc/grub.d/40_custom"
short_desc="GRand Unified Bootloader 2"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -9,10 +14,6 @@ homepage="http://www.gnu.org/software/grub/"
distfiles="$GNU_SITE/grub/grub-$version.tar.xz"
checksum=784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
-hostmakedepends="flex"
-makedepends="libusb-compat-devel ncurses-devel freetype-devel
- liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
-
do_configure() {
unset CC AS LD RANLIB CPP
@@ -83,22 +84,12 @@ do_install() {
}
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-
-grub-x86_64-efi_package() {
- noarch=yes
- depends="grub>=$version dosfstools efibootmgr"
- short_desc+=" - x86_64 EFI support"
- pkg_install() {
- vmove usr/lib/grub/x86_64-efi
+ grub-x86_64-efi_package() {
+ noarch=yes
+ depends="grub>=$version dosfstools efibootmgr"
+ short_desc+=" - x86_64 EFI support"
+ pkg_install() {
+ vmove usr/lib/grub/x86_64-efi
+ }
}
-}
-
fi # !x86_64
-
-grub_package() {
- conf_files="/etc/default/grub /etc/grub.d/40_custom"
- depends="os-prober"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gsasl/template b/srcpkgs/gsasl/template
index 1a5acf58af..f66795ade3 100644
--- a/srcpkgs/gsasl/template
+++ b/srcpkgs/gsasl/template
@@ -43,9 +43,3 @@ gsasl-devel_package() {
vmove usr/share/man/man3
}
}
-
-gsasl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index b41493f0a8..d174bc10f0 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,9 +1,9 @@
# Template file for 'gsettings-desktop-schemas'
pkgname=gsettings-desktop-schemas
version=3.10.1
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool glib-devel"
makedepends="libglib-devel"
short_desc="Collection of GSettings schemas"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,22 +11,31 @@ license="GPL-2"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=452378c4960a145747ec69f8c6a874e5b7715454df3e2452d1ff1a0a82e76811
-long_desc="
- ${pkgname} contains a collection of GSettings schemas for
- settings shared by various components of a desktop."
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
gsettings-desktop-schemas-devel_package() {
- depends="${sourcepkg}>=${version}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share/pkgconfig
- vmove usr/share/gir-1.0
- }
-}
-
-gsettings-desktop-schemas_package() {
- pkg_install() {
- vmove all
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
}
}
diff --git a/srcpkgs/gsfonts/template b/srcpkgs/gsfonts/template
index 570f1d9d61..40cef3377f 100644
--- a/srcpkgs/gsfonts/template
+++ b/srcpkgs/gsfonts/template
@@ -3,26 +3,18 @@ pkgname=gsfonts
version=8.11
revision=2
wrksrc=fonts
-distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-$version.tar.gz"
+noarch="yes"
makedepends="font-util"
+depends="font-util"
+font_dirs="/usr/share/fonts/Type1"
short_desc="Ghostscript standard Type1 fonts"
homepage="http://sourceforge.net/projects/gs-fonts/"
license="GPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-$version.tar.gz"
checksum=0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401
-long_desc="
- This packages includes the Ghostscript standard Type1 fonts."
do_install() {
install -d ${DESTDIR}/usr/share/fonts/Type1
install -m644 ${wrksrc}/*.[ap]f[bm] ${DESTDIR}/usr/share/fonts/Type1
}
-
-gsfonts_package() {
- depends="font-util"
- noarch="yes"
- font_dirs="/usr/share/fonts/Type1"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gsl/template b/srcpkgs/gsl/template
index d092642a61..d07f907505 100644
--- a/srcpkgs/gsl/template
+++ b/srcpkgs/gsl/template
@@ -23,9 +23,3 @@ gsl-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-gsl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template
index ef35331f75..011ef77f35 100644
--- a/srcpkgs/gssdp/template
+++ b/srcpkgs/gssdp/template
@@ -28,9 +28,3 @@ gssdp-devel_package() {
vmove usr/share/vala
}
}
-
-gssdp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gst-ffmpeg/template b/srcpkgs/gst-ffmpeg/template
index 5ea3d68efc..b89db4dd52 100644
--- a/srcpkgs/gst-ffmpeg/template
+++ b/srcpkgs/gst-ffmpeg/template
@@ -16,9 +16,3 @@ long_desc="
formats through the use of the FFmpeg library. The plugin contains GStreamer
elements for decoding 90+ formats (AVI, MPEG, OGG, Matroska, ASF, ...),
demuxing 30+ formats and colorspace conversion."
-
-gst-ffmpeg_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index d6ed2da106..8d663069ab 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,22 +1,16 @@
# Template file for 'gst-libav'
pkgname=gst-libav
-version=1:1.2.1
+version=1:1.2.2
revision=1
wrksrc="${pkgname}-${version#*:}"
build_style=gnu-configure
configure_args="--with-libav-extra-configure=--enable-runtime-cpudetect"
hostmakedepends="pkg-config yasm python"
makedepends="orc-devel>=0.4.18 gst-plugins-base1-devel>=${version}"
+depends="orc>=0.4.18 gst-plugins-base1>=${version}"
short_desc="GStreamer libav plugin"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://gstreamer.freedesktop.org"
distfiles="${homepage}/src/${pkgname}/${pkgname}-${version#*:}.tar.xz"
-checksum=fd152b7aec56ae76ad58b9759913a8bfe1792bdf64f260d0acaba75b75076676
-
-gst-libav_package() {
- depends="orc>=0.4.18 gst-plugins-base1>=${version}"
- pkg_install() {
- vmove all
- }
-}
+checksum=585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418
diff --git a/srcpkgs/gst-plugins-bad/template b/srcpkgs/gst-plugins-bad/template
index 2bd4203797..5a6f0a9b60 100644
--- a/srcpkgs/gst-plugins-bad/template
+++ b/srcpkgs/gst-plugins-bad/template
@@ -11,6 +11,8 @@ makedepends="libpng-devel>=1.6 alsa-lib-devel celt-devel openssl-devel
faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel
xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel
libvpx-devel libvdpau-devel libgsm-devel librtmp-devel"
+# Requires libgstfft-0.10.so.0 from gst-plugins-base-0.10.36.
+depends="gst-plugins-base>=0.10.36"
short_desc="GStreamer plugins from the bad set"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -38,11 +40,3 @@ gst-plugins-bad-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-gst-plugins-bad_package() {
- # Requires libgstfft-0.10.so.0 from gst-plugins-base-0.10.36.
- depends="gst-plugins-base>=0.10.36"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 9451d0f788..cbbec737f8 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,17 +1,10 @@
# Template file for 'gst-plugins-bad1'.
pkgname=gst-plugins-bad1
-version=1:1.2.1
+version=1:1.2.2
revision=1
-wrksrc="gst-plugins-bad-${version#*:}"
+wrksrc="${pkgname/1/}-${version#*:}"
build_style=gnu-configure
configure_args="--enable-experimental --disable-static"
-short_desc="GStreamer plugins from the bad set (v1.x)"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL-2, LGPL-2.1"
-homepage="http://gstreamer.freedesktop.org"
-distfiles="$homepage/src/gst-plugins-bad/gst-plugins-bad-${version#*:}.tar.xz"
-checksum=f33e7c81fcb742fe50b73ad87ef8a4baa7d6b59c5002a10bf63c8dee22404929
-
hostmakedepends="pkg-config intltool"
makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
gst-plugins-base1-devel>=${version} libdca-devel orc-devel>=0.4.18 libmms-devel
@@ -19,11 +12,17 @@ makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel
xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel
libvpx-devel libvdpau-devel libgsm-devel librtmp-devel libass-devel
- mpg123-devel soundtouch-devel opus-devel libwebp-devel wayland-devel
- libsrtp-devel"
+ mpg123-devel soundtouch-devel opus-devel libwebp-devel wayland-devel libsrtp-devel"
+depends="gst-plugins-base1>=${version}"
+short_desc="GStreamer plugins from the bad set (v1.x)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+homepage="http://gstreamer.freedesktop.org"
+distfiles="$homepage/src/${pkgname/1/}/${pkgname/1/}-${version#*:}.tar.xz"
+checksum=63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c
gst-plugins-bad1-devel_package() {
- depends="gst-plugins-base1-devel>=${version} ${sourcepkg}-${version}_${revision}"
+ depends="gst-plugins-base1-devel>=${version} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -32,10 +31,3 @@ gst-plugins-bad1-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-gst-plugins-bad1_package() {
- depends="gst-plugins-base1>=${version}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template
index 1fe91b73b6..1975a9d9b4 100644
--- a/srcpkgs/gst-plugins-base/template
+++ b/srcpkgs/gst-plugins-base/template
@@ -85,9 +85,3 @@ gst-plugins-base-devel_package() {
fi
}
}
-
-gst-plugins-base_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 2502aff851..b2cfe68d9b 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,38 +1,64 @@
# Template file for 'gst-plugins-base1'.
pkgname=gst-plugins-base1
-version=1:1.2.1
+version=1:1.2.2
revision=1
-wrksrc="gst-plugins-base-${version#*:}"
+wrksrc="${pkgname/1/}-${version#*:}"
build_style=gnu-configure
configure_args="--enable-experimental --disable-static"
-hostmakedepends="pkg-config gobject-introspection"
-makedepends="libgudev-devel
+hostmakedepends="python pkg-config glib-devel"
+makedepends="
gstreamer1-devel>=${version} glib-devel libxml2-devel pango-devel
cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
- libvisual-devel cdparanoia-devel libtheora-devel libvorbis-devel
+ libvisual-devel libgudev-devel libtheora-devel libvorbis-devel
libSM-devel orc-devel>=0.4.18"
+depends="orc>=0.4.18 gstreamer1>=${version}"
short_desc="GStreamer Base Plug-ins (v1.x)"
maintainer="Juan RP <xtraeme@gmail.org>"
homepage="http://gstreamer.freedesktop.org/"
license="GPL-2, LGPL-2.1"
-distfiles="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${version#*:}.tar.xz"
-checksum=de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f
+distfiles="http://gstreamer.freedesktop.org/src/${pkgname/1/}/${pkgname/1/}-${version#*:}.tar.xz"
+checksum=fa90cf21eac0a77f9393100356aef99ae42072c31dc218d3ae2e7f86cd5ced69
+
+# Package build options
+build_options="cdparanoia gir"
+desc_option_cdparanoia="Enable support for CD audio (cdparanoia)"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable options for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="cdparanoia gir"
+else
+ hostmakedepends+=" automake gettext-devel libtool"
+ pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+ }
+fi
+
+if [ "$build_option_cdparanoia" ]; then
+ configure_args+=" --enable-cdparanoia"
+ makedepends+=" cdparanoia-devel"
+else
+ configure_args+=" --disable-cdparanoia"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ makedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
+
gst-plugins-base1-devel_package() {
- depends="gstreamer1-devel>=${version} ${sourcepkg}-${version}_${revision}"
+ depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
- vmove "usr/share/gir*"
- }
-}
-
-gst-plugins-base1_package() {
- depends="orc>=0.4.18 gstreamer1>=${version}"
- pkg_install() {
- vmove all
+ if [ "$build_option_gir" ]; then
+ vmove "usr/share/gir*"
+ fi
}
}
diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template
index 48aa877655..c8e9bf77b6 100644
--- a/srcpkgs/gst-plugins-good/template
+++ b/srcpkgs/gst-plugins-good/template
@@ -33,9 +33,3 @@ post_install() {
gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/gstreamer-0.10.schemas \
--domain ${pkgname}-0.10 ${wrksrc}/*.schemas
}
-
-gst-plugins-good_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 0b2232fa89..2b998bf70d 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,8 +1,8 @@
# Template file for 'gst-plugins-good1'.
pkgname=gst-plugins-good1
-version=1:1.2.1
+version=1:1.2.2
revision=1
-wrksrc="gst-plugins-good-${version#*:}"
+wrksrc="${pkgname/1/}-${version#*:}"
build_style=gnu-configure
configure_args="--with-gudev --with-libv4l2 --enable-experimental
--enable-libcaca --disable-libdv --disable-dv1394 --disable-shout2
@@ -15,16 +15,10 @@ makedepends="
taglib-devel libsoup-gnome-devel gst-plugins-base1-devel>=${version}
GConf-devel pulseaudio-devel orc-devel>=0.4.18 libXv-devel wavpack-devel
v4l-utils-devel jack-devel speex-devel"
+depends="gst-plugins-base1>=${version}"
short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
maintainer="Juan RP <xtraeme@gmail.org>"
homepage="http://gstreamer.freedesktop.org/"
license="LGPL-2.1"
-distfiles="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${version#*:}.tar.xz"
-checksum=660fa02dbe01086fcf702d87acc0ba5dde2559d6a11ecf438874afe504c50517
-
-gst-plugins-good1_package() {
- depends="gst-plugins-base1>=${version}"
- pkg_install() {
- vmove all
- }
-}
+distfiles="http://gstreamer.freedesktop.org/src/${pkgname/1/}/${pkgname/1/}-${version#*:}.tar.xz"
+checksum=6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81
diff --git a/srcpkgs/gst-plugins-ugly/template b/srcpkgs/gst-plugins-ugly/template
index 5b23d07330..79c351ca91 100644
--- a/srcpkgs/gst-plugins-ugly/template
+++ b/srcpkgs/gst-plugins-ugly/template
@@ -25,9 +25,3 @@ long_desc="
This package contains plugins from the ugly set, a set of
good-quality plug-ins that might pose distribution problems."
-
-gst-plugins-ugly_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index 492ff99c2a..7ee6a28203 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,26 +1,19 @@
# Template file for 'gst-plugins-ugly1'.
pkgname=gst-plugins-ugly1
-version=1:1.2.1
+version=1:1.2.2
revision=1
-wrksrc="gst-plugins-ugly-${version#*:}"
+wrksrc="${pkgname/1/}-${version#*:}"
build_style=gnu-configure
configure_args="--enable-experimental"
-short_desc="GStreamer plugins from the ugly set (1.x)"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL-2, LGPL-2.1"
-homepage="http://gstreamer.freedesktop.org"
-distfiles="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${version#*:}.tar.xz"
-checksum=35ae5d45de54827604e24f57f54ab30a5ab2245b4c4120977273eb11d19c2395
-
# XXX add required pkgs for the amr, sid plugins.
hostmakedepends="pkg-config intltool"
makedepends="glib-devel libxml2-devel gst-plugins-base1-devel>=${version}
libcdio-devel libdvdread-devel libmad-devel x264-devel>=20131007.2245_2
orc-devel>=0.4.18 liba52-devel libmpeg2-devel lame-devel"
-
-gst-plugins-ugly1_package() {
- depends="orc>=0.4.18 gst-plugins-base1>=${version}"
- pkg_install() {
- vmove all
- }
-}
+depends="orc>=0.4.18 gst-plugins-base1>=${version}"
+short_desc="GStreamer plugins from the ugly set (1.x)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+homepage="http://gstreamer.freedesktop.org"
+distfiles="http://gstreamer.freedesktop.org/src/${pkgname/1/}/${pkgname/1/}-${version#*:}.tar.xz"
+checksum=4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3
diff --git a/srcpkgs/gst-python/template b/srcpkgs/gst-python/template
index 1931a2ebef..58125a41d5 100644
--- a/srcpkgs/gst-python/template
+++ b/srcpkgs/gst-python/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--disable-static"
makedepends="pkg-config glib-devel python-devel pygobject2-devel
pygtk-devel libxml2-devel gstreamer-devel gst-plugins-base-devel"
+depends="pygobject2 pygtk"
+pycompile_module="gst-0.10"
short_desc="Python bindings for GStreamer 0.10"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -18,18 +20,10 @@ long_desc="
gst-python-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
- short_desc="${sourcepkg} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gst-python
}
}
-
-gst-python_package() {
- depends="pygobject2 pygtk"
- pycompile_module="gst-0.10"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gst123/template b/srcpkgs/gst123/template
index 58f54f4b90..7923854edc 100644
--- a/srcpkgs/gst123/template
+++ b/srcpkgs/gst123/template
@@ -3,18 +3,13 @@ pkgname=gst123
version=0.3.2
revision=1
build_style=gnu-configure
-makedepends="pkg-config ncurses-devel gtk+-devel libxml2-devel
+hostmakedepends="pkg-config"
+makedepends="ncurses-devel gtk+-devel libxml2-devel
gstreamer-devel gst-plugins-base-devel gst-plugins-good"
+depends="gst-plugins-good"
short_desc="GStreamer based CLI player"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://space.twc.de/~stefan/gst123.php/"
license="LGPL-2.1"
distfiles="http://space.twc.de/~stefan/gst123/gst123-$version.tar.bz2"
checksum=51033261967da4cf1beb512e156e9f647572689202a1c2aceb8cd2beb427f53d
-
-gst123_package() {
- depends="gst-plugins-good"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 47e723e069..e4bc37b453 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,6 +1,6 @@
# Template file for 'gstreamer-vaapi'
pkgname=gstreamer-vaapi
-version=0.5.7
+version=0.5.8
revision=1
hostmakedepends="pkg-config"
makedepends="libXrandr-devel libva-devel>=1:1.1.0 MesaLib-devel
@@ -10,13 +10,20 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/"
distfiles="http://www.freedesktop.org/software/vaapi/releases/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=d5a71179669dfc1d529e0248e6929e5136c6b3bbe634826b796f559dae974b88
-long_desc="
- ${pkgname} is a collection of GStreamer plugins and helper libraries that
- allow hardware accelerated video decoding through VA-API."
+checksum=24fee8a1ca4cb99ed7739d876b17a4085e81b28550350867dee5105300d343c6
only_for_archs="i686 x86_64"
+pre_configure() {
+ url1=https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.c
+ url2=https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.h
+
+ for f in ${url1} ${url2}; do
+ $XBPS_FETCH_CMD ${f}
+ cp $(basename ${f}) ext/videoutils/gst-libs/gst/video/
+ done
+}
+
do_configure() {
mkdir build-0.10 build-1.0
@@ -71,9 +78,3 @@ gstreamer-vaapi-devel_package() {
vmove "usr/lib/*-0.10*.so"
}
}
-
-gstreamer-vaapi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gstreamer/template b/srcpkgs/gstreamer/template
index 7b1dae6f90..b8562a6ec3 100644
--- a/srcpkgs/gstreamer/template
+++ b/srcpkgs/gstreamer/template
@@ -56,9 +56,3 @@ gstreamer-devel_package() {
fi
}
}
-
-gstreamer_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 98d363c96d..af5a768480 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,19 +1,40 @@
# Template file for 'gstreamer1'.
pkgname=gstreamer1
-version=1:1.2.1
-revision=1
+version=1:1.2.2
+revision=2
wrksrc="gstreamer-${version#*:}"
build_style=gnu-configure
-configure_args="--disable-debug --disable-valgrind --enable-docbook
+configure_args="--disable-valgrind --enable-docbook
--with-package-origin=http://www.voidlinux.eu"
-hostmakedepends="pkg-config flex python docbook-xsl gobject-introspection"
+hostmakedepends="pkg-config flex python docbook-xsl"
makedepends="libxml2-devel libglib-devel"
short_desc="Core GStreamer libraries and elements (1.x)"
maintainer="Juan RP <xtraeme@gmail.org>"
homepage="http://gstreamer.freedesktop.org/"
license="LGPL-2.1"
distfiles="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${version#*:}.tar.xz"
-checksum=a4523d2471bca6cd0059a32e3b042f50faa4dadc6439852af8b43ca3f17d1fc9
+checksum=b9f12137ab663edc6c37429b38ca7911074b9c2a829267fe855d4e57d916a0b6
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+else
+ hostmakedepends+=" automake gettext-devel libtool glib-devel"
+ pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+ }
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ makedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
gstreamer1-devel_package() {
depends="libxml2-devel libglib-devel ${sourcepkg}-${version}_${revision}"
@@ -24,12 +45,8 @@ gstreamer1-devel_package() {
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
vmove usr/share/aclocal
- vmove "usr/share/gir*"
- }
-}
-
-gstreamer1_package() {
- pkg_install() {
- vmove all
+ if [ "$build_option_gir" ]; then
+ vmove "usr/share/gir*"
+ fi
}
}
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index ad1090d827..9fc0cdc56a 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -17,6 +17,10 @@ makedepends="shared-mime-info glib-devel libXcursor-devel
libXcomposite-devel libXdamage-devel fontconfig-devel
gdk-pixbuf-devel>=2.26.1_2 cairo-devel pango-devel>=1.28.0
atk-devel>=1.32.0 cups-devel>=1.6.1_9 dbus-x11"
+depends="shared-mime-info dbus-x11 gdk-pixbuf>=2.26.1_2
+ gtk-update-icon-cache>=${version}_${revision}"
+conf_files="/etc/gtk-2.0/im-multipress.conf"
+triggers="gtk-immodules"
if [ "$CROSS_BUILD" ]; then
# XXX needs native glib-mkenums and cups-config.
@@ -81,13 +85,3 @@ gtk-update-icon-cache_package() {
vinstall ${wrksrc}/docs/reference/gtk/gtk-update-icon-cache.1 644 usr/share/man/man1
}
}
-
-gtk+_package() {
- depends="shared-mime-info dbus-x11 gdk-pixbuf>=2.26.1_2
- gtk-update-icon-cache>=${version}_${revision}"
- conf_files="/etc/gtk-2.0/im-multipress.conf"
- triggers="gtk-immodules"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index d11ad89ca9..d168a92d9c 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
# Template build file for 'gtk+3'.
pkgname=gtk+3
-version=3.10.6
-revision=2
+version=3.10.7
+revision=1
wrksrc="gtk+-${version}"
build_style=gnu-configure
configure_args="--enable-cups --disable-schemas-compile --enable-gtk2-dependency --enable-colord"
@@ -10,12 +10,15 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gtk.org/"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/gtk+/3.10/gtk+-${version}.tar.xz"
-checksum=3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a
+checksum=b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427
hostmakedepends="pkg-config glib-devel>=2.38"
makedepends="libglib-devel>=2.38 atk-devel>=2.10 at-spi2-atk-devel>=2.8
libpng-devel fontconfig-devel cairo-devel pango-devel>=1.36 gdk-pixbuf-devel>=2.30
gtk+-devel colord-devel>=0.1.23_3 cups-devel"
+depends="gtk-update-icon-cache shared-mime-info glib>=2.38 atk>=2.10 dbus-x11"
+triggers="gtk3-immodules"
+conf_files="/etc/gtk-3.0/im-multipress.conf"
# Package build options
build_options="broadway gir wayland x11"
@@ -55,11 +58,6 @@ else
configure_args+=" --disable-x11-backend"
fi
-pre_configure() {
- # protocols too new; made with a wayland from git, not 1.3.0
- rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c}
-}
-
post_install() {
rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1
# Provide a default (icon)theme.
@@ -97,12 +95,3 @@ gtk+3-demo_package() {
vmove usr/share/gtk-3.0
}
}
-
-gtk+3_package() {
- triggers="gtk3-immodules"
- conf_files="/etc/gtk-3.0/im-multipress.conf"
- depends="gtk-update-icon-cache shared-mime-info glib>=2.38 atk>=2.10 dbus-x11"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gtk-doc/template b/srcpkgs/gtk-doc/template
index 7a2d9e1fd9..a277d3e3f7 100644
--- a/srcpkgs/gtk-doc/template
+++ b/srcpkgs/gtk-doc/template
@@ -2,8 +2,10 @@
pkgname=gtk-doc
version=1.19
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="which pkg-config itstool openjade python docbook-xsl gnome-doc-utils perl>=0"
+depends="docbook-xsl gnome-doc-utils perl>=0"
short_desc="Documentation tool for public library API"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, FDL-"
@@ -13,11 +15,3 @@ checksum=27df247fa828433a9390368e2088cc22f954f2ce1f255ddbd12ab6e027b12e68
long_desc="
These tools extract documentation embedded in GNOME source code, and produce
pretty output via DocBook SGML."
-
-gtk-doc_package() {
- depends="docbook-xsl gnome-doc-utils perl>=0"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtk-engine-murrine/template b/srcpkgs/gtk-engine-murrine/template
index 89df5f86de..64d51757c5 100644
--- a/srcpkgs/gtk-engine-murrine/template
+++ b/srcpkgs/gtk-engine-murrine/template
@@ -12,9 +12,3 @@ maintainer="Steven R <strob AT styez DOT com>"
homepage="http://cimitan.com/murrine/project/murrine"
license="LGPL3"
short_desc="GTK2 engine to make your desktop look like a murrina"
-
-gtk-engine-murrine_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gtk-sharp/template b/srcpkgs/gtk-sharp/template
index af72da7f63..405e9c80e1 100644
--- a/srcpkgs/gtk-sharp/template
+++ b/srcpkgs/gtk-sharp/template
@@ -2,25 +2,18 @@
pkgname=gtk-sharp
version=2.99.2
revision=1
+create_srcdir=yes
distfiles="https://github.com/mono/gtk-sharp/archive/${version}.tar.gz"
checksum="a2f143cfa9a33f7249770b13086e9cfb9c122d8a8b91a231f9343dd91bdb3a0b"
build_style=gnu-configure
hostmakedepends="pkg-config autoconf automake"
makedepends="mono gtk+3-devel libglade-devel libtool which"
+depends="mono gtk+"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://www.mono-project.com/GtkSharp"
license="LGPL"
-short_desc="Gtk# is a Graphical User Interface Toolkit for mono and .Net"
-
-create_srcdir=yes
+short_desc="Graphical User Interface Toolkit for mono and .Net (Gtk#)"
pre_configure() {
./autogen.sh
}
-
-gtk-sharp_package() {
- depends="mono gtk+"
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/gtk-theme-config/template b/srcpkgs/gtk-theme-config/template
index db53c912b6..2c40f5920c 100644
--- a/srcpkgs/gtk-theme-config/template
+++ b/srcpkgs/gtk-theme-config/template
@@ -3,25 +3,17 @@ pkgname=gtk-theme-config
version=20130128
revision=1
build_style=gnu-makefile
-make_build_args="PREFIX=/usr"
-make_install_args="PREFIX=/usr"
makedepends="pkg-config glib-devel vala-devel gtk+3-devel"
+depends="desktop-file-utils"
short_desc="Utility to set GTK Theme Preferences"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3"
homepage="https://github.com/satya164/gtk-theme-config"
-
do_fetch() {
local url="git://github.com/satya164/gtk-theme-config.git"
msg_normal "Fetching source from $url ...\n"
git clone ${url} ${pkgname}-${version}
- cd ${pkgname}-${version} && git checkout aa7d8a3dd2d98e124032b55473599086b7a0828a
-}
-
-gtk-theme-config_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
+ cd ${pkgname}-${version}
+ git checkout aa7d8a3dd2d98e124032b55473599086b7a0828a
}
diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index 74f8b18fd3..6f4e268251 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -82,9 +82,3 @@ gtk-vnc-devel_package() {
vmove usr/share/gir-1.0/GtkVnc-2.0.gir
}
}
-
-gtk-vnc_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtk-xfce-engine/template b/srcpkgs/gtk-xfce-engine/template
index f1cb6269c1..d818660b7f 100644
--- a/srcpkgs/gtk-xfce-engine/template
+++ b/srcpkgs/gtk-xfce-engine/template
@@ -15,9 +15,3 @@ long_desc="
This package contains an Xfce engine for GTK2.0 which makes you able to use
various GTK2.0 themes with Xfce. It also contains some ready themes, but you
are of course free to design your own."
-
-gtk-xfce-engine_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index aff9041764..7d8e1278cc 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -12,11 +12,3 @@ homepage="http://live.gnome.org/GnomeArt"
license="GPL-2"
distfiles="ftp://ftp.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
-long_desc="
- This package contains theme engines for the GTK+2 toolkit."
-
-gtk2-engines_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtkaml/template b/srcpkgs/gtkaml/template
index 637da18175..9052356b92 100644
--- a/srcpkgs/gtkaml/template
+++ b/srcpkgs/gtkaml/template
@@ -4,6 +4,7 @@ version=0.5.94
revision=2
build_style=gnu-configure
makedepends="pkg-config vala-devel>=0.18 glib-devel gtk+-devel>=2.20 libxml2-devel>=2.8"
+depends="pkg-config vala>=0.18"
short_desc="An Application Markup Language for GTK+Vala"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://www.gtkaml.org"
@@ -12,7 +13,7 @@ distfiles="https://$pkgname.googlecode.com/files/$pkgname-$version.tar.bz2"
checksum=93b7656100444b1ac226a5b09b74b86ef66d2ad391a02c8f0a536915461c0a08
libgtkaml_package() {
- short_desc="${short_desc} -- runtime library"
+ short_desc+=" - runtime library"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -20,16 +21,9 @@ libgtkaml_package() {
gtkaml-devel_package() {
depends="vala-devel>=0.18 libgtkaml>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-gtkaml_package() {
- depends="pkg-config vala>=0.18"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtkdialog/template b/srcpkgs/gtkdialog/template
index 77a1c95c50..fddbd6e7f1 100644
--- a/srcpkgs/gtkdialog/template
+++ b/srcpkgs/gtkdialog/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
make_install_args="UPDATE_ICON_CACHE=true"
makedepends="pkg-config flex gtk+-devel libglade-devel vte-devel"
+depends="hicolor-icon-theme"
short_desc="A small utility for fast and easy GUI building"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -16,10 +17,3 @@ post_install() {
vmkdir usr/share/doc/$pkgname
cp -a examples ${DESTDIR}/usr/share/doc/$pkgname/examples
}
-
-gtkdialog_package() {
- depends="hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtkhtml/template b/srcpkgs/gtkhtml/template
index 9f26c26e03..f3cd408270 100644
--- a/srcpkgs/gtkhtml/template
+++ b/srcpkgs/gtkhtml/template
@@ -7,6 +7,7 @@ hostmakedepends="pkg-config intltool"
makedepends="gtk+3-devel>=3.8 enchant-devel ORBit2-devel
libsoup-gnome-devel>=2.40 gsettings-desktop-schemas-devel>=3.8
gnome-icon-theme gsettings-desktop-schemas>=3.6.0 iso-codes"
+depends="gnome-icon-theme gsettings-desktop-schemas>=3.6.0 iso-codes"
short_desc="Layout engine written in C using the GTK+ widget toolkit"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.gnome.org"
@@ -30,10 +31,3 @@ gtkhtml-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gtkhtml_package() {
- depends="gnome-icon-theme gsettings-desktop-schemas>=3.6.0 iso-codes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index 5965845c4a..7df1f8b5dc 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-documentation"
hostmakedepends="pkg-config"
makedepends="gtk+3-devel>=3.10 glibmm-devel>=2.37 atkmm-devel pangomm-devel"
+depends="gtk+3>=3.10"
short_desc="C++ bindings for The GTK+ toolkit (v2)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://gtkmm.sourceforge.net/"
@@ -31,10 +32,3 @@ gtkmm-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gtkmm_package() {
- depends="gtk+3>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gtkmm2/template b/srcpkgs/gtkmm2/template
index b4fd2381a2..43e2cbe0a0 100644
--- a/srcpkgs/gtkmm2/template
+++ b/srcpkgs/gtkmm2/template
@@ -38,9 +38,3 @@ gtkmm2-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gtkmm2_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template
index 596c85596d..c8653a5578 100644
--- a/srcpkgs/gtksourceview/template
+++ b/srcpkgs/gtksourceview/template
@@ -1,6 +1,6 @@
# Template file for 'gtksourceview'
pkgname=gtksourceview
-version=3.10.1
+version=3.10.2
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -11,10 +11,10 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01
+checksum=045d244b1fd6a2d1b91a40712cbbfb18c6e44844c266a0a16ac5ec1800add8f5
gtksourceview-devel_package() {
- depends="gtk+3-devel libxml2-devel ${sourcepkg}-${version}_${revision}"
+ depends="gtk+3-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -24,9 +24,3 @@ gtksourceview-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-gtksourceview_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 0b3c08b832..eaca5baaaa 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -26,9 +26,3 @@ gtksourceview2-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-gtksourceview2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtksourceviewmm/template b/srcpkgs/gtksourceviewmm/template
index 11d2664829..bc30bcdcea 100644
--- a/srcpkgs/gtksourceviewmm/template
+++ b/srcpkgs/gtksourceviewmm/template
@@ -27,9 +27,3 @@ gtksourceviewmm-devel_package() {
vmove usr/lib/gtksourceviewmm-3.0
}
}
-
-gtksourceviewmm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index 2008294989..ef87e7b336 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -18,16 +18,10 @@ long_desc="
gtkspell-devel_package() {
depends="gtk+-devel ${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gtk-doc
}
}
-
-gtkspell_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template
index 48a116348c..df6afc5804 100644
--- a/srcpkgs/gucharmap/template
+++ b/srcpkgs/gucharmap/template
@@ -7,6 +7,7 @@ configure_args="--disable-schemas-compile --enable-introspection"
hostmakedepends="which pkg-config intltool gnome-doc-utils
itstool gobject-introspection"
makedepends="gtk+3-devel hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="GNOME Unicode Charmap"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -27,10 +28,3 @@ gucharmap-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gucharmap_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index 60c0342012..320be58cae 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -4,6 +4,8 @@ version=2.0.9
revision=2
build_style=gnu-configure
configure_args="--disable-static --disable-error-on-warning"
+hostmakedepends="pkg-config texinfo"
+makedepends="libltdl-devel libunistring-devel libffi-devel gc-devel ncurses-devel"
short_desc="A portable, embeddable Scheme implementation written in C"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL"
@@ -14,10 +16,6 @@ long_desc="
Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official
extension language (Scheme) for the GNU operating system."
-hostmakedepends="pkg-config texinfo"
-makedepends="libltdl-devel libunistring-devel libffi-devel gc-devel
-ncurses-devel"
-
guile-devel_package() {
short_desc+=" (Development files)"
depends="guile"
@@ -35,9 +33,3 @@ guile-docs_package() {
vmove usr/share/man
}
}
-
-guile_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gupnp-av/template b/srcpkgs/gupnp-av/template
index 2928a610a1..51a30285ee 100644
--- a/srcpkgs/gupnp-av/template
+++ b/srcpkgs/gupnp-av/template
@@ -23,9 +23,3 @@ gupnp-av-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gupnp-av_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template
index d631c94d72..77fdd90c92 100644
--- a/srcpkgs/gupnp-dlna/template
+++ b/srcpkgs/gupnp-dlna/template
@@ -27,9 +27,3 @@ gupnp-dlna-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-gupnp-dlna_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template
index 404f8f2bc4..7be4c7bc84 100644
--- a/srcpkgs/gupnp-igd/template
+++ b/srcpkgs/gupnp-igd/template
@@ -16,16 +16,10 @@ long_desc="
gupnp-igd-devel_package() {
depends="gupnp-devel gupnp-igd>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share
vmove usr/lib/pkgconfig
}
}
-
-gupnp-igd_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index 1c9f0835ff..4bc30b7b75 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -24,9 +24,3 @@ gupnp-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-gupnp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index c2bb757d17..a94e43076b 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -99,9 +99,3 @@ gvfs-smb_package() {
vmove usr/share/gvfs/mounts/smb.mount
}
}
-
-gvfs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/hamster-applet/template b/srcpkgs/hamster-applet/template
index 642ffa89c4..cea9165949 100644
--- a/srcpkgs/hamster-applet/template
+++ b/srcpkgs/hamster-applet/template
@@ -2,7 +2,12 @@
pkgname=hamster-applet
version=2.91.2
revision=3
+noarch="yes"
build_style=waf
+makedepends="pkg-config intltool gnome-doc-utils glib-devel dbus-glib-devel
+ docbook2x python-devel gnome-control-center pysqlite pyxdg"
+depends="pygtk pyxdg dbus-python python-gconf notify-python pysqlite"
+pycompile_module="hamster"
short_desc="Time tracking application for individuals"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -14,21 +19,9 @@ long_desc="
on how much time you have spent during the day on activities you choose to
track."
-makedepends="pkg-config intltool gnome-doc-utils glib-devel dbus-glib-devel
- docbook2x python-devel gnome-control-center pysqlite pyxdg"
-
post_install() {
mv ${DESTDIR}/etc/gconf ${DESTDIR}/usr/share
# Remove panel applet that incompatible with GNOME Panel 3
rm -r ${DESTDIR}/usr/lib/{bonobo,hamster-applet,python2.7/site-packages/hamster/applet.py}
}
-
-hamster-applet_package() {
- noarch="yes"
- pycompile_module="hamster"
- depends="pygtk pyxdg dbus-python python-gconf notify-python pysqlite"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 0f4286504a..95fc8914e0 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -9,6 +9,7 @@ makedepends="zlib-devel bzip2-devel libnotify-devel gtk+3-devel ncurses-devel
dbus-glib-devel fribidi-devel libass-devel fontconfig-devel libxml2-devel
libogg-devel libtheora-devel libsamplerate-devel libbluray-devel
hicolor-icon-theme desktop-file-utils"
+depends="gst-plugins-good"
short_desc="Multithreaded video transcoder"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -46,10 +47,3 @@ handbrake-cli_package() {
vmove usr/bin/HandBrakeCLI
}
}
-
-handbrake_package() {
- depends="gst-plugins-good"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template
index 321bad0bb6..fe013d4cda 100644
--- a/srcpkgs/hardinfo/template
+++ b/srcpkgs/hardinfo/template
@@ -4,6 +4,7 @@ version=0.5.1
revision=1
hostmakedepends="pkg-config which"
makedepends="gtk+-devel libsoup-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A system information and benchmark tool"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -24,10 +25,3 @@ do_install() {
vmkdir etc
echo "Void Linux" > ${DESTDIR}/etc/hardinfo.distro
}
-
-hardinfo_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index dfccab004e..e6524fc31b 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -37,9 +37,3 @@ harfbuzz-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-harfbuzz_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template
index dfd3025bd4..d083ca34cd 100644
--- a/srcpkgs/hdparm/template
+++ b/srcpkgs/hdparm/template
@@ -13,9 +13,3 @@ checksum=2bbe92274971182192901ab220e94bd2e4896f924fa6b225d0cffd7d8c16b52a
long_desc="
Get/set device parameters for Linux SATA/IDE drives. Primary use is for
enabling irq-unmasking and IDE multiplemode."
-
-hdparm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template
index f8e6b33f29..08c66485bc 100644
--- a/srcpkgs/help2man/template
+++ b/srcpkgs/help2man/template
@@ -4,16 +4,10 @@ version=1.43.3
revision=1
build_style=gnu-configure
hostmakedepends="perl perl-Locale-gettext"
+depends="${hostmakedepends}"
short_desc="GNU conversion tool to create man files"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.gnu.org/software/help2man"
distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
checksum=67978d118980ebd9f0c60be5db129527900a7b997b9568fc795ba9bdb341d303
-
-help2man_package() {
- depends="${hostmakedepends}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index 75b699a25a..d2b121aae2 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -4,6 +4,7 @@ version=0.5.2
revision=2
hostmakedepends="pkg-config"
makedepends="libXinerama-devel libglib-devel"
+conf_files="/etc/xdg/${pkgname}/autostart"
short_desc="A manual tiling window manager for X"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Simplified BSD"
@@ -20,10 +21,3 @@ do_install() {
vmkdir usr/share/bash-completion/completions
mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
}
-
-herbstluftwm_package() {
- conf_files="/etc/xdg/${pkgname}/autostart"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index ce7f3022c6..d364410bab 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -3,20 +3,14 @@ pkgname=hg-git
version=0.3.4
revision=1
wrksrc="durin42-hg-git-586b7aa96466"
+noarch="yes"
build_style=python-module
makedepends="python python-dulwich"
+depends="${makedepends}"
+pycompile_module="hggit"
short_desc="Hg-Git plugin for Mercurial, adding the ability to push and pull to/from Git"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="https://bitbucket.org/durin42/hg-git/"
distfiles="https://bitbucket.org/durin42/hg-git/get/${version}.tar.bz2"
checksum=7931101afe1ae13b0b2196487fe79c5d8ad8f51f08b073ec2fa72ed548b62628
-
-hg-git_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="hggit"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/hicolor-icon-theme/template b/srcpkgs/hicolor-icon-theme/template
index 3fcfe1ad08..3dec5cfa6e 100644
--- a/srcpkgs/hicolor-icon-theme/template
+++ b/srcpkgs/hicolor-icon-theme/template
@@ -2,6 +2,7 @@
pkgname=hicolor-icon-theme
version=0.13
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="Standard icon theme called hicolor"
homepage="http://icon-theme.freedesktop.org/wiki/HicolorTheme"
@@ -9,10 +10,3 @@ license="GPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://icon-theme.freedesktop.org/releases/$pkgname-$version.tar.gz"
checksum=a38b038915480d1ddd4e3c421562560a14d42ace0449a5acc07c50f57f9c3406
-
-hicolor-icon-theme_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index a96ce06737..1137bafdd5 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -4,6 +4,17 @@ version=2.0
revision=1
build_wrksrc=${pkgname}
makedepends="pkg-config libnl3-devel openssl-devel"
+conf_files="
+ /etc/hostapd/hostapd.conf
+ /etc/hostapd/hlr_auc_gw.milenage_db
+ /etc/hostapd/hostapd.accept
+ /etc/hostapd/hostapd.deny
+ /etc/hostapd/hostapd.eap_user
+ /etc/hostapd/hostapd.radius_clients
+ /etc/hostapd/hostapd.sim_db
+ /etc/hostapd/hostapd.vlan
+ /etc/hostapd/hostapd.wpa_psk
+ /etc/hostapd/wired.conf"
short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -32,21 +43,3 @@ do_install() {
vinstall hostapd.8 644 usr/share/man/man8
vinstall hostapd_cli.1 644 usr/share/man/man1
}
-
-hostapd_package() {
- conf_files="
- /etc/hostapd/hostapd.conf
- /etc/hostapd/hlr_auc_gw.milenage_db
- /etc/hostapd/hostapd.accept
- /etc/hostapd/hostapd.deny
- /etc/hostapd/hostapd.eap_user
- /etc/hostapd/hostapd.radius_clients
- /etc/hostapd/hostapd.sim_db
- /etc/hostapd/hostapd.vlan
- /etc/hostapd/hostapd.wpa_psk
- /etc/hostapd/wired.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 0c3ee5d21f..1b3757a1fe 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -2,6 +2,14 @@
pkgname=hplip
version=3.13.11
revision=1
+#XXX: pyqt pkgs for python gui
+hostmakedepends="pkg-config automake libtool"
+makedepends="python-devel libxml2-python cups-devel
+ sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel
+ dbus-devel polkit-devel foomatic-db foomatic-db-engine desktop-file-utils"
+depends="python foomatic-db foomatic-db-engine desktop-file-utils"
+conf_files="/etc/hp/hplip.conf"
+make_dirs="/var/lib/hp 0755 root root"
short_desc="HP Linux Imaging and Printing"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://hplipopensource.com/"
@@ -9,12 +17,6 @@ license="GPL-2"
distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
checksum=1ea0ed020ab54e08620fe6ea7c30e93dbb8be505f2e6994e7222a7be63ca3b34
-#XXX: pyqt pkgs for python gui
-hostmakedepends="pkg-config automake libtool"
-makedepends="python-devel libxml2-python cups-devel
- sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel
- dbus-devel polkit-devel foomatic-db foomatic-db-engine desktop-file-utils"
-
do_configure() {
# https://bugs.archlinux.org/task/30085 - hack found in Gentoo
# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
@@ -51,12 +53,3 @@ do_install() {
rm -rf ${DESTDIR}/usr/share/hal
rm -rf ${DESTDIR}/var
}
-
-hplip_package() {
- depends="python foomatic-db foomatic-db-engine desktop-file-utils"
- conf_files="/etc/hp/hplip.conf"
- make_dirs="/var/lib/hp 0755 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/hsetroot/template b/srcpkgs/hsetroot/template
index 61cf5587ba..b37c1b3e72 100644
--- a/srcpkgs/hsetroot/template
+++ b/srcpkgs/hsetroot/template
@@ -10,9 +10,3 @@ license="GPL-2"
homepage="http://www.thegraveyard.org/hsetroot.php"
distfiles="http://www.thegraveyard.org/files/${pkgname}-${version}.tar.gz"
checksum=d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7
-
-hsetroot_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index 1a0e76761a..cc1123da37 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -15,9 +15,3 @@ checksum=ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1
long_desc="
htop is an interactive process viewer for Linux. It is a text-mode terminal
application (for console or X terminals) and requires ncurses."
-
-htop_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template
index 73daa4d763..7480a555d3 100644
--- a/srcpkgs/hunspell/template
+++ b/srcpkgs/hunspell/template
@@ -34,9 +34,3 @@ hunspell-devel_package() {
vmove usr/share/man/man3
}
}
-
-hunspell_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template
index 1d4b6d79bb..dfe71a0f10 100644
--- a/srcpkgs/hwids/template
+++ b/srcpkgs/hwids/template
@@ -2,6 +2,9 @@
pkgname=hwids
version=20130512
revision=1
+noarch="yes"
+create_wrksrc=yes
+replaces="pciutils<3.1.9_1 usbutils<005_1"
short_desc="Hardware Identification Databases"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/Flameeyes/hwids"
@@ -13,8 +16,6 @@ long_desc="
to require them, without having to bring in either pciutils or usbutils, that
might be unnecessary for most installs."
-create_wrksrc=yes
-
do_extract() {
cd ${wrksrc}
tar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}
@@ -25,11 +26,3 @@ do_install() {
vmkdir usr/share/hwdata
install -m644 *.ids ${DESTDIR}/usr/share/hwdata
}
-
-hwids_package() {
- noarch="yes"
- replaces="pciutils<3.1.9_1 usbutils<005_1"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 75d8fe3ece..c137257659 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -4,6 +4,7 @@ version=0.9.5.1
revision=1
makedepends="pkg-config scons libsndfile-devel libtar-devel
libarchive-devel>=3.1.2 jack-devel qt-devel"
+depends="desktop-file-utils"
short_desc="Advanced drum machine"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -20,10 +21,3 @@ do_build() {
do_install() {
scons DESTDIR=${DESTDIR} install
}
-
-hydrogen_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index 70d4ff24fb..b11dd02c10 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,24 +1,19 @@
# Template file for 'i3'
pkgname=i3
-version=4.7
+version=4.7.2
revision=1
build_style=gnu-makefile
+hostmakedepends="which perl pkg-config asciidoc xmlto"
+makedepends="pcre-devel>=8.30 yajl-devel libxcb-devel libev-devel
+ pango-devel startup-notification-devel>=0.12_3 xcb-util-devel>=0.3.9
+ xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9 xcb-util-cursor-devel"
+conf_files="/etc/i3/config /etc/i3/config.keycodes"
short_desc="Improved tiling window manager"
maintainer="davehome <davehome@redthumb.info.tm>"
license="BSD"
homepage="http://i3wm.org/"
distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=e29acafdf7c7d3483c13ea80e45b407f62244b355e425c7161fdfc915c9f83c5
-long_desc="
- i3 is a tiling window manager, completely written from scratch. The target
- platforms are GNU/Linux and BSD operating systems, our code is Free and Open
- Source Software (FOSS) under the BSD license. i3 is primarily targeted at
- advanced users and developers."
-
-hostmakedepends="which perl pkg-config asciidoc xmlto"
-makedepends="pcre-devel>=8.30 yajl-devel libxcb-devel libev-devel
- pango-devel startup-notification-devel>=0.12_3 xcb-util-devel>=0.3.9
- xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9 xcb-util-cursor-devel"
+checksum=6fe4565e364a5017eb6a89ce104d6bb21afcdb4bb0b3bee9526781fa64b1f393
post_build() {
make ${makejobs} -C man
@@ -35,10 +30,3 @@ i3-devel_package() {
vmove usr/include
}
}
-
-i3_package() {
- conf_files="/etc/i3/config /etc/i3/config.keycodes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/i3lock/template b/srcpkgs/i3lock/template
index 64341694f9..8f551fe4db 100644
--- a/srcpkgs/i3lock/template
+++ b/srcpkgs/i3lock/template
@@ -2,6 +2,10 @@
pkgname=i3lock
version=2.5
revision=1
+hostmakedepends="which pkg-config"
+makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel
+ xcb-util-devel libxkbfile-devel xcb-util-image-devel xcb-util-keysyms-devel"
+conf_files="/etc/pam.d/i3lock"
short_desc="An improved screenlocker based upon XCB and PAM"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -13,10 +17,6 @@ long_desc="
a white screen (you can configure the color/an image). You can return to your
screen by entering your password."
-hostmakedepends="which pkg-config"
-makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel
- xcb-util-devel libxkbfile-devel xcb-util-image-devel xcb-util-keysyms-devel"
-
do_build() {
export CFLAGS="$CFLAGS -std=c99"
make ${makejobs}
@@ -26,10 +26,3 @@ do_install() {
make DESTDIR=${DESTDIR} install
vinstall i3lock.1 644 usr/share/man/man1
}
-
-i3lock_package() {
- conf_files="/etc/pam.d/i3lock"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template
index 9ecc1c410f..91ddd9a50b 100644
--- a/srcpkgs/i3status/template
+++ b/srcpkgs/i3status/template
@@ -1,38 +1,21 @@
# Template file for 'i3status'
pkgname=i3status
-version=2.7
-revision=2
+version=2.8
+revision=1
build_style=gnu-makefile
hostmakedepends="asciidoc pkg-config"
makedepends="yajl-devel confuse-devel wireless_tools-devel alsa-lib-devel libcap-devel"
+depends="libcap-progs"
+conf_files="/etc/i3status.conf"
short_desc="Generates status bar to use with dzen2 or xmobar"
maintainer="davehome <davehome@redthumb.info.tm>"
license="BSD"
homepage="http://i3.zekjur.net/i3status/"
distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
-checksum=073f4e5de3bc5afc1f23c52ea52e2aa4b90ca8a012f28ba2c5fac3c33474a632
-
-do_build() {
- export CFLAGS="$CFLAGS -std=c99"
- if [ "$CROSS_BUILD" ]; then
- export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
- export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
- fi
- make ${makejobs}
-}
-
-do_install() {
- make DESTDIR=${DESTDIR} install
+checksum=ab06c5dd454354e6fc64354082616115082b70dc3906361bce5a02beb0f807fe
+post_install() {
# detect dhcpcd.
sed -i -e "s#dhclient#dhcpcd#g" ${DESTDIR}/etc/i3status.conf
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-i3status_package() {
- conf_files="/etc/i3status.conf"
- depends="libcap-progs"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index fc02a18c0c..94808933cd 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -2,8 +2,8 @@
pkgname=iana-etc
version=2.30
revision=2
+noarch="yes"
build_style=gnu-makefile
-make_build_args="STRIP=yes"
short_desc="Unix /etc/services and /etc/protocols files"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://sethwklein.net/iana-etc.html"
@@ -13,10 +13,3 @@ checksum=b9a6874fb20012836efef75452ef2acae624022d680feeb1994d73facba3f20d
long_desc="
The iana-etc package provides the Unix/Linux /etc/services and
/etc/protocols files."
-
-iana-etc_package() {
- noarch="yes"
- pkg_install() {
- vmove etc
- }
-}
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index 369fe194da..2be5f5034e 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -9,6 +9,8 @@ configure_args="--enable-ui --enable-gtk3 --disable-python
hostmakedepends="pkg-config intltool gobject-introspection GConf-devel"
makedepends="dconf-devel>=0.13.90 librsvg-devel gtk+-devel gtk+3-devel
vala-devel libnotify-devel hicolor-icon-theme iso-codes dbus-x11 pyxdg"
+depends="hicolor-icon-theme iso-codes dbus-x11 pyxdg"
+triggers="gtk-immodules gtk3-immodules"
short_desc="Intelligent Input Bus"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://ibus.googlecode.com"
@@ -31,11 +33,3 @@ ibus-devel_package() {
vmove usr/share/vala
}
}
-
-ibus_package() {
- triggers="gtk-immodules gtk3-immodules"
- depends="hicolor-icon-theme iso-codes dbus-x11 pyxdg"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/iceauth/template b/srcpkgs/iceauth/template
index ba778cce54..0f135f19df 100644
--- a/srcpkgs/iceauth/template
+++ b/srcpkgs/iceauth/template
@@ -14,9 +14,3 @@ checksum=bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4
long_desc="
This package provides iceauth, a program to display and manipulate the
authentication data used by the Inter Client Exchange protocol."
-
-iceauth_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 325aea0b04..492edee2f1 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,12 @@
# Template file for 'icecast'
pkgname=icecast
version=2.3.2
-build_style=gnu-configure
revision=1
-makedepends="pkg-config openssl-devel libcurl-devel speex-devel
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="openssl-devel libcurl-devel speex-devel
libtheora-devel libvorbis-devel libogg-devel libxslt-devel libxml2-devel"
+conf_files="/etc/icecast.xml"
short_desc="Free server software for streaming multimedia"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -17,11 +19,3 @@ long_desc="
privately running jukebox and many things in between. It is very versatile
in that new formats can be added relatively easily and supports open
standards for commuincation and interaction."
-
-icecast_package() {
- conf_files="/etc/icecast.xml"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/icon-naming-utils/template b/srcpkgs/icon-naming-utils/template
index a2dd6aae6b..cb4116bb5c 100644
--- a/srcpkgs/icon-naming-utils/template
+++ b/srcpkgs/icon-naming-utils/template
@@ -2,8 +2,10 @@
pkgname=icon-naming-utils
version=0.8.90
revision=3
+noarch="yes"
build_style=gnu-configure
makedepends="perl-XML-Simple"
+depends="${makedepends}"
short_desc="Adapts GNOME and KDE icon names to the Icon Naming Specification"
homepage="http://tango.freedesktop.org/Standard_Icon_Naming_Specification"
license="GPL-2"
@@ -15,11 +17,3 @@ long_desc="
new naming scheme defined by the Tango project. This utility maps the
icon names used by the GNOME and KDE desktops to the icon names proposed
in the Icon Naming Specification."
-
-icon-naming-utils_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index f1ff73c3aa..a9a5db6c96 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -81,9 +81,3 @@ icu-libs_package() {
vmove "usr/lib/*.so*"
}
}
-
-icu_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template
index 5930c006c3..b431beeed0 100644
--- a/srcpkgs/idjc/template
+++ b/srcpkgs/idjc/template
@@ -9,6 +9,8 @@ makedepends="
libflac-devel libsndfile-devel libmad-devel ffmpeg-devel>=2.1
speex-devel glib-devel pixman-devel lame-devel pygtk-devel>=2.24.0_8
libshout-idjc-devel opus-devel mutagen desktop-file-utils shared-mime-info"
+depends="pygtk mutagen desktop-file-utils shared-mime-info"
+pycompile_module="idjc"
short_desc="Internet DJ Console"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -23,11 +25,3 @@ long_desc="
pre_configure() {
sed -e 's|AVCODEC_MAX_AUDIO_FRAME_SIZE|192000|g' -i c/avcodecdecode.c
}
-
-idjc_package() {
- pycompile_module="idjc"
- depends="pygtk mutagen desktop-file-utils shared-mime-info"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ifenslave/template b/srcpkgs/ifenslave/template
index 2924f95043..ee0b776762 100644
--- a/srcpkgs/ifenslave/template
+++ b/srcpkgs/ifenslave/template
@@ -24,9 +24,3 @@ do_install() {
vinstall ifenslave 755 usr/sbin
vinstall ${FILESDIR}/ifenslave.8 755 usr/share/man/man8
}
-
-ifenslave_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/iftop/template b/srcpkgs/iftop/template
index df3d96e516..5fa31a838b 100644
--- a/srcpkgs/iftop/template
+++ b/srcpkgs/iftop/template
@@ -10,9 +10,3 @@ license="GPL-2"
homepage="http://www.ex-parrot.com/pdw/iftop/"
distfiles="${homepage}/download/$pkgname-$version.tar.gz"
checksum=d032547c708307159ff5fd0df23ebd3cfa7799c31536fa0aea1820318a8e0eac
-
-iftop_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template
index e8b894d62d..0056bb32b2 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 <linuxienATlegtuxDOTorg>"
license="MIT"
@@ -9,18 +11,6 @@ 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
- }
-}
diff --git a/srcpkgs/imlib2-tools b/srcpkgs/imlib2-tools
new file mode 120000
index 0000000000..1c681089c9
--- /dev/null
+++ b/srcpkgs/imlib2-tools
@@ -0,0 +1 @@
+imlib2
\ No newline at end of file
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index eea7614338..e2658a5926 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,43 +1,39 @@
# Template build file for 'imlib2'.
pkgname=imlib2
-version=1.4.5
-revision=6
+version=1.4.6
+revision=2
build_style=gnu-configure
-configure_args="--disable-static --sysconfdir=/etc/imlib2
- --enable-visibility-hiding"
-hostmakedepends="pkg-config"
+configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
+hostmakedepends="libtool pkg-config"
makedepends="freetype-devel libjpeg-turbo-devel libpng-devel>=1.6
- tiff-devel libid3tag-devel giflib-devel>=5.0.1 libXext-devel"
+ tiff-devel libid3tag-devel giflib-devel>=5.0.1 libXext-devel libSM-devel"
short_desc="Image manipulation library"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
homepage="http://sourceforge.net/projects/enlightenment/"
license="BSD"
-checksum=6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0
+checksum=17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e
-if [ "$CROSS_BUILD" ]; then
- # XXX needs freetype-config
- hostmakedepends+=" automake libtool freetype-devel"
- pre_configure() {
- sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
- sed -e 's,AM_PROG_CC_STDC,AC_PROG_CC,g' -i configure.ac
- autoreconf -fi
- }
-fi
+pre_configure() {
+ libtoolize -f
+ sed -e 's,@my_libs@,@LIBS@,g' -i imlib2-config.in
+}
-imlib2-devel_package() {
- depends="imlib2-${version}_${revision}"
- short_desc+=" - development files"
+imlib2-tools_package() {
+ short_desc+=" - utilities"
pkg_install() {
vmove usr/bin
+ }
+}
+
+imlib2-devel_package() {
+ depends="imlib2>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/imlib2-config
vmove usr/include
vmove usr/share
vmove usr/lib/pkgconfig
- }
-}
-
-imlib2_package() {
- pkg_install() {
- vmove all
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index 7bdbf238ae..93bf1ca6b3 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -33,9 +33,3 @@ post_install() {
mv ${DESTDIR}/usr/share/man/man1/hostname.1 \
${DESTDIR}/usr/share/man/man1/${pkgname}-hostname.1
}
-
-inetutils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4c5d953dd6..b48591957d 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool which"
makedepends="
popt-devel libpng-devel>=1.6 gsl-devel gc-devel gtkmm2-devel libxslt-devel
lcms2-devel poppler-glib-devel libxslt-devel boost-devel>=1.54 libmagick-devel>=6.8.7"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="A vector-based drawing program"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://inkscape.org/"
@@ -21,10 +22,3 @@ long_desc="
pre_configure() {
sed -e 's,freetype/freetype.h,freetype.h,g' -i src/libnrtype/FontFactory.h
}
-
-inkscape_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/inputproto/template b/srcpkgs/inputproto/template
index 3e8479c533..46bf438858 100644
--- a/srcpkgs/inputproto/template
+++ b/srcpkgs/inputproto/template
@@ -2,6 +2,7 @@
pkgname=inputproto
version=2.3
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="Input extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,10 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f
-
-inputproto_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/intel-gpu-tools/template b/srcpkgs/intel-gpu-tools/template
index 6c5979e6f7..5441a13514 100644
--- a/srcpkgs/intel-gpu-tools/template
+++ b/srcpkgs/intel-gpu-tools/template
@@ -2,6 +2,10 @@
pkgname=intel-gpu-tools
version=1.5
revision=1
+build_style=gnu-configure
+only_for_archs="i686 x86_64"
+hostmakedepends="pkg-config swig"
+makedepends="python3-devel libXv-devel libXrandr-devel libpciaccess-devel libdrm-devel cairo-devel"
short_desc="Tools for development and testing of the Intel DRM driver"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -9,17 +13,6 @@ homepage="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/"
distfiles="http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${version}.tar.bz2"
checksum=115475b528c78d67741ae6cbedfbfced1d471b356140e48245cbad8fdfaad1d1
-build_style=gnu-configure
-only_for_archs="i686 x86_64"
-hostmakedepends="pkg-config swig"
-makedepends="python3-devel libXv-devel libXrandr-devel libpciaccess-devel libdrm-devel cairo-devel"
-
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-intel-gpu-tools_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index d1c9dcf129..fbbbae512b 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -2,6 +2,8 @@
pkgname=intel-ucode
version=20130906
revision=1
+noarch=yes
+create_wrksrc=yes
short_desc="Microcode update files for Intel CPUs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="INTEL Software License Agreement"
@@ -9,8 +11,6 @@ homepage="http://downloadcenter.intel.com/SearchResult.aspx?lang=eng&keyword=%22
distfiles="http://downloadmirror.intel.com/23166/eng/microcode-${version}.tgz"
checksum=7b6ba0db102581674c29a2e2b859ba51e5cfb11e6cbef9056e4ac6cde2116386
-create_wrksrc=yes
-
do_build() {
cp ${FILESDIR}/*.c .
${CC} -Wall ${CFLAGS} -o intel-microcode2ucode intel-microcode2ucode.c
@@ -22,10 +22,3 @@ do_install() {
vcopy "intel-ucode/*" usr/lib/firmware/intel-ucode
vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/${pkgname}
}
-
-intel-ucode_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/intltool/template b/srcpkgs/intltool/template
index e474bca64e..61ddab372f 100644
--- a/srcpkgs/intltool/template
+++ b/srcpkgs/intltool/template
@@ -2,13 +2,15 @@
pkgname=intltool
version=0.50.2
revision=1
-homepage="https://edge.launchpad.net/intltool"
-distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz"
+noarch="yes"
build_style=gnu-configure
makedepends="perl-XML-Parser>=2.41_1 gettext"
+depends="${makedepends}"
short_desc="Toolbox for internationalisation"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
+homepage="https://edge.launchpad.net/intltool"
+distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz"
checksum=67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406
long_desc="
The intltool collection can be used to do these things:
@@ -27,11 +29,3 @@ long_desc="
scripts and does the other magic to your module. So users building
from tarballs don't need intltool, only folks building from cvs.
(This is modeled on gettextize.)"
-
-intltool_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template
index 6c28baab94..dfb1e0cb26 100644
--- a/srcpkgs/inxi/template
+++ b/srcpkgs/inxi/template
@@ -2,6 +2,11 @@
pkgname=inxi
version=1.9.17
revision=1
+noarch="yes"
+create_srcdir=yes
+create_wrksrc=yes
+makedepends="pciutils"
+depends="${makedepends}"
short_desc="A full featured system information script"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL-3"
@@ -9,19 +14,8 @@ homepage="http://code.google.com/p/inxi/"
distfiles="http://inxi.googlecode.com/svn/trunk/inxi.tar.gz"
checksum=2632a2bc099d6d242a1049b38b7cc47dd09b070f78a56f4be7683513acee8e31
-create_srcdir=yes
-create_wrksrc=yes
-
do_install() {
vinstall inxi 755 usr/bin
vinstall inxi.1.gz 644 usr/share/man/man1
vinstall inxi.changelog 644 usr/share/doc/$pkgname
}
-
-inxi_package() {
- depends="pciutils"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ioquake3-rpi/template b/srcpkgs/ioquake3-rpi/template
index a5ee4ed9eb..4a73e69ca3 100644
--- a/srcpkgs/ioquake3-rpi/template
+++ b/srcpkgs/ioquake3-rpi/template
@@ -75,9 +75,3 @@ do_install() {
# Install Icon File
vinstall ${pkgname}/misc/quake3.png 644 usr/share/pixmaps
}
-
-ioquake3-rpi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 3f4906ef38..5014a41566 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -2,20 +2,14 @@
pkgname=iotop
version=0.6
revision=1
+noarch="yes"
build_style=python-module
makedepends="python>=2.7"
+depends="${makedepends}"
+pycompile_module="iotop"
short_desc="View I/O usage of processes"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://guichaz.free.fr/iotop"
distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"
checksum=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b
-
-iotop_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="iotop"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 8c1a45d765..52d22971e4 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,15 +1,22 @@
# Template file for 'iproute2'
pkgname=iproute2
-version=3.11.0
+version=3.12.0
revision=1
hostmakedepends="pkg-config perl flex"
-makedepends="libfl-devel db-devel>=5.3 iptables-devel>=1.4.18"
+makedepends="libfl-devel db-devel>=5.3 iptables-devel>=1.4.21"
+conf_files="
+ /etc/iproute2/ematch_map
+ /etc/iproute2/rt_dsfield
+ /etc/iproute2/rt_protos
+ /etc/iproute2/rt_realms
+ /etc/iproute2/rt_scopes
+ /etc/iproute2/rt_tables"
short_desc="IP Routing Utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.linux-foundation.org/en/Net:Iproute2"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz"
-checksum=0ab31b52b5fd5ff0d3cf03f2068f05eeb4f0b37d107070fbbaacac94df5e88b7
+checksum=44f600475d27a421688cda2294efec38513473a740c24ead78eb20005f08f111
do_configure() {
./configure
@@ -28,16 +35,3 @@ do_install() {
# Remove devel manpages.
rm -rf ${DESTDIR}/usr/share/man/man3
}
-
-iproute2_package() {
- conf_files="
- /etc/iproute2/ematch_map
- /etc/iproute2/rt_dsfield
- /etc/iproute2/rt_protos
- /etc/iproute2/rt_realms
- /etc/iproute2/rt_scopes
- /etc/iproute2/rt_tables"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/iptables/patches/0503-extension_cppflags.patch b/srcpkgs/iptables/patches/0503-extension_cppflags.patch
deleted file mode 100644
index 5ee8409b47..0000000000
--- a/srcpkgs/iptables/patches/0503-extension_cppflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/GNUmakefile.in 2012-03-27 12:14:05.000000000 -0400
-+++ extensions/GNUmakefile.in 2012-03-27 16:03:48.378790221 -0400
-@@ -21,7 +21,7 @@
- kinclude_CPPFLAGS = @kinclude_CPPFLAGS@
-
- AM_CFLAGS = ${regular_CFLAGS}
--AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
-+AM_CPPFLAGS = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
- AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
- AM_LDFLAGS = @noundef_LDFLAGS@
-
diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template
index 4ff834a72e..bb9a340d68 100644
--- a/srcpkgs/iptables/template
+++ b/srcpkgs/iptables/template
@@ -1,7 +1,7 @@
# Template file for 'iptables'
pkgname=iptables
-version=1.4.20
-revision=3
+version=1.4.21
+revision=1
build_style=gnu-configure
configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler"
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.netfilter.org/"
license="GPL-2"
distfiles="$homepage/projects/iptables/files/$pkgname-$version.tar.bz2"
-checksum=109b8c7ca90b4536bc5de869ae705f6d5efcc0c08ef3003755aad3ed6d2d49ad
+checksum=52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0
if [ "$CROSS_BUILD" ]; then
hostmakedepends="automake libtool gettext-devel pkg-config"
@@ -51,9 +51,3 @@ iptables-devel_package() {
vmove usr/share/man/man3
}
}
-
-iptables_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/iptraf-ng/template b/srcpkgs/iptraf-ng/template
index 4ca377613b..cbcecb7a3a 100644
--- a/srcpkgs/iptraf-ng/template
+++ b/srcpkgs/iptraf-ng/template
@@ -1,10 +1,10 @@
# Template file for 'iptraf-ng'
pkgname=iptraf-ng
version=1.1.4
-revision=1
+revision=2
+LDFLAGS="-lncursesw -lpanelw -lmenuw"
build_style=gnu-configure
configure_args="--sbindir=/usr/bin"
-hostmakedepends="ncurses-devel>=5.9_7"
makedepends="ncurses-devel"
short_desc="IP traffic monitor (iptraf-3.0.0 fork)"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,27 +12,3 @@ license="GPL-2"
homepage="https://fedorahosted.org/iptraf-ng/"
distfiles="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$version.tar.gz"
checksum=79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09
-long_desc="
- $pkgname is a fork of original iptraf-3.0.0.
-
- IPTraf-ng is a console-based network monitoring utility. IPTraf-ng gathers
- data like TCP connection packet and byte counts, interface statistics and
- activity indicators, TCP/UDP traffic breakdowns, and LAN station packet
- and byte counts. IPTraf-ng features include an IP traffic monitor which
- shows TCP flag information, packet and byte counts, ICMP details, OSPF
- packet types, and oversized IP packet warnings; interface statistics showing
- IP, TCP, UDP, ICMP, non-IP and other IP packet counts, IP checksum errors,
- interface activity and packet size counts; a TCP and UDP service monitor
- showing counts of incoming and outgoing packets for common TCP and UDP
- application ports, a LAN statistics module that discovers active hosts and
- displays statistics about their activity; TCP, UDP and other protocol
- display filters so you can view just the traffic you want; logging; support
- for Ethernet, FDDI, ISDN, SLIP, PPP, and loopback interfaces; and
- utilization of the built-in raw socket interface of the Linux kernel, so it
- can be used on a wide variety of supported network cards."
-
-iptraf-ng_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 35408cbecf..39ea79e92f 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -5,6 +5,7 @@ revision=2
patch_args="-Np1"
wrksrc="${pkgname}-s${version}"
makedepends="openssl-devel libcap-devel"
+depends="libcap-progs"
short_desc="IP Configuration Utilities (and ping)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -30,10 +31,3 @@ do_install() {
ln -s tracepath.8 tracepath6.8
}
-
-iputils_package() {
- depends="libcap-progs"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ipw2100-firmware/template b/srcpkgs/ipw2100-firmware/template
index 3266603643..8e3afb8731 100644
--- a/srcpkgs/ipw2100-firmware/template
+++ b/srcpkgs/ipw2100-firmware/template
@@ -5,6 +5,7 @@ version=1.3
revision=3
wrksrc="${_distname}-${version}"
create_wrksrc=yes
+noarch="yes"
short_desc="Firmware for the Intel PRO/Wireless 2100 wifi cards"
homepage="http://ipw2100.sourceforge.net/"
license="Custom"
@@ -21,10 +22,3 @@ do_install() {
install -m644 *.fw ${DESTDIR}/usr/lib/firmware
vinstall LICENSE 644 usr/share/licenses/$pkgname
}
-
-ipw2100-firmware_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ipw2200-firmware/template b/srcpkgs/ipw2200-firmware/template
index 74317c96a4..e039bacd24 100644
--- a/srcpkgs/ipw2200-firmware/template
+++ b/srcpkgs/ipw2200-firmware/template
@@ -3,6 +3,7 @@ pkgname=ipw2200-firmware
_distname=ipw2200-fw
version=3.1
revision=3
+noarch="yes"
wrksrc="${_distname}-${version}"
short_desc="Firmware for the Intel PRO/Wireless 2200BG wifi cards"
homepage="http://ipw2200.sourceforge.net/"
@@ -21,10 +22,3 @@ do_install() {
install -m644 *.fw ${DESTDIR}/usr/lib/firmware
install -m644 LICENSE* ${DESTDIR}/usr/share/licenses/$pkgname
}
-
-ipw2200-firmware_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ired/template b/srcpkgs/ired/template
index d12f7580b7..f098b3881b 100644
--- a/srcpkgs/ired/template
+++ b/srcpkgs/ired/template
@@ -2,23 +2,10 @@
pkgname=ired
version=0.5
revision=1
+build_style=gnu-makefile
short_desc="interactive raw editor (minimalist radare)"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://www.radare.org"
license="LGPL"
distfiles="http://www.radare.org/get/${pkgname}-$version.tar.gz"
checksum=dce25f6b9402b78f183ecf4d94a2d44db1a6946546217d6c60c3f179bfbfff84
-
-do_build() {
- make ${makejobs}
-}
-
-do_install() {
- make install DESTDIR=${DESTDIR} PREFIX=/usr
-}
-
-ired_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/irqbalance/template b/srcpkgs/irqbalance/template
index c9b562aa67..21e6c333d7 100644
--- a/srcpkgs/irqbalance/template
+++ b/srcpkgs/irqbalance/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libglib-devel libcap-ng-devel libnuma-devel"
+systemd_services="irqbalance.service on"
short_desc="Handholding your interrupts for power and performance"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -26,10 +27,3 @@ long_desc="
post_install() {
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
}
-
-irqbalance_package() {
- systemd_services="irqbalance.service on"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/irrlicht/template b/srcpkgs/irrlicht/template
index 35941dc206..fa94d10e7e 100644
--- a/srcpkgs/irrlicht/template
+++ b/srcpkgs/irrlicht/template
@@ -41,9 +41,3 @@ irrlicht-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-irrlicht_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 17e1a13901..e6c62ca38a 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static --with-proxy --with-perl=module"
hostmakedepends="pkg-config perl>=5.16"
makedepends="libglib-devel openssl-devel ncurses-devel"
+conf_files="/etc/irssi.conf"
homepage="http://www.irssi.org"
short_desc="Secure and modular IRC client with text mode user interface"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -37,16 +38,8 @@ fi # !CROSS_BUILD
irssi-devel_package() {
depends="perl>=5.16 glib-devel openssl-devel ncurses-devel"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
}
}
-
-irssi_package() {
- conf_files="/etc/irssi.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template
index 88a330ab57..cfb315aaf6 100644
--- a/srcpkgs/isl/template
+++ b/srcpkgs/isl/template
@@ -1,6 +1,6 @@
# Template file for 'isl'
pkgname=isl
-version=0.12.1
+version=0.12.2
revision=1
build_style=gnu-configure
makedepends="gmp-devel"
@@ -8,8 +8,8 @@ short_desc="Integer Set Library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://freecode.com/projects/isl"
license="LGPL-2.1"
-distfiles="ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/isl-${version}.tar.bz2"
-checksum=43ba8a43c3554a72a7e9e0d913a52dedbc0d712f472f3e62d239517bdd53e7b7
+distfiles="http://isl.gforge.inria.fr/isl-${version}.tar.bz2"
+checksum=f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4
post_install() {
# Remove gdb python files.
@@ -17,7 +17,7 @@ post_install() {
}
isl-devel_package() {
- depends="gmp-devel isl-${version}_${revision}"
+ depends="gmp-devel isl>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -26,9 +26,3 @@ isl-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-isl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template
index 603235b933..b49db8395a 100644
--- a/srcpkgs/iso-codes/template
+++ b/srcpkgs/iso-codes/template
@@ -2,6 +2,7 @@
pkgname=iso-codes
version=3.41
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="List of country, language and currency names"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -17,10 +18,3 @@ long_desc="
The aim of iso-codes is to create a single gettext domain iso-639 which
contains the translations of language names, and one iso-3166 listing the
translations of country names."
-
-iso-codes_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/itstool/template b/srcpkgs/itstool/template
index 17777e45b1..44613b84bb 100644
--- a/srcpkgs/itstool/template
+++ b/srcpkgs/itstool/template
@@ -2,9 +2,11 @@
pkgname=itstool
version=2.0.2
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="python"
makedepends="python libxml2-python"
+depends="python libxml2-python"
short_desc="ITS Tool"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -15,11 +17,3 @@ long_desc="
ITS Tool allows you to translate your XML documents with PO files, using
rules from the W3C Internationalization Tag Set (ITS) to determine what to
translate and how to separate it into PO file messages."
-
-itstool_package() {
- noarch="yes"
- depends="python libxml2-python"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/iw/template b/srcpkgs/iw/template
index ce0ee185bd..d5447ea673 100644
--- a/srcpkgs/iw/template
+++ b/srcpkgs/iw/template
@@ -1,6 +1,6 @@
# Template file for 'iw'
pkgname=iw
-version=3.11
+version=3.13
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config libnl3-devel"
@@ -10,10 +10,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://wireless.kernel.org/en/users/Documentation/iw"
distfiles="http://www.kernel.org/pub/software/network/iw/iw-${version}.tar.xz"
-checksum=e90327323821a8219abac56298919076c4bac6636464ca91356f02cfe40530ff
-
-iw_package() {
- pkg_install() {
- vmove all
- }
-}
+checksum=70c1c0f5145542b4d04dd52ad637920718515245e3dd3b4dc4c8e3b57b110dc6
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 8664d9cb24..6499f59802 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -2,6 +2,9 @@
pkgname=jack
version=1.9.9.5
revision=3
+# XXX libffado (firewire)
+hostmakedepends="pkg-config python"
+makedepends="libsamplerate-devel readline-devel dbus-devel celt-devel"
short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2, LGPL-2.1"
@@ -22,10 +25,6 @@ long_desc="
design focuses on two key areas: synchronous execution of all clients, and
low latency operation."
-# XXX libffado (firewire)
-hostmakedepends="pkg-config python"
-makedepends="libsamplerate-devel readline-devel dbus-devel celt-devel"
-
do_configure() {
if [ "$CROSS_BUILD" ]; then
export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
@@ -65,9 +64,3 @@ jack-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-jack_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/jansson/template b/srcpkgs/jansson/template
index c475cc3d00..45cd7fcc71 100644
--- a/srcpkgs/jansson/template
+++ b/srcpkgs/jansson/template
@@ -24,9 +24,3 @@ jansson-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-jansson_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/jasper/template b/srcpkgs/jasper/template
index fd3a5064a4..4e627fec9e 100644
--- a/srcpkgs/jasper/template
+++ b/srcpkgs/jasper/template
@@ -32,9 +32,3 @@ jasper-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-jasper_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/jbig2dec/template b/srcpkgs/jbig2dec/template
index 0a00efb064..4a8ab90b2f 100644
--- a/srcpkgs/jbig2dec/template
+++ b/srcpkgs/jbig2dec/template
@@ -32,9 +32,3 @@ libjbig2dec_package() {
vmove "usr/lib/*.so.*"
}
}
-
-jbig2dec_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index 37e7a96785..a2d1143ddc 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -5,6 +5,7 @@ _jumbover=5
revision=1
wrksrc=${pkgname}-${version}-jumbo-${_jumbover}
makedepends="libgomp-devel openssl-devel"
+conf_files="/etc/john/john.conf"
short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -63,11 +64,3 @@ do_install() {
ln -s john ssh2john
ln -s john zip2john
}
-
-john_package() {
- conf_files="/etc/john/john.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template
index 61ff4b37dc..c51e4ad374 100644
--- a/srcpkgs/jre/template
+++ b/srcpkgs/jre/template
@@ -1,21 +1,26 @@
# Template file for 'oracle-jre'
pkgname=jre
-_extraversion=1.7.0_40
-version=7u40
+_extraversion=1.7.0_45
+version=7u45
revision=1
wrksrc="jre${_extraversion}"
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/oracle/7/jre-${version}-linux-x64.tar.gz"
- checksum=79ea9f176969421fe94df3a69b8c9618e975844e7667ebc2274c30c2146f45e4
+ distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/7/jre-${version}-linux-x64.tar.gz"
+ checksum=e107d8ca8dcd570207b4eff793e7b83a1ff82f1ed4ea8a80d88f5edc000c74c7
elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/oracle/7/jre-${version}-linux-i586.tar.gz"
- checksum=d2493c882a8bb6ae50d2dc2d43dc1d86870674d383e3e9e9b4e100ba499fab1f
+ distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/7/jre-${version}-linux-i586.tar.gz"
+ checksum=c6cec1ce57bc9b8b425f26e4e57ccdffc9667e4daf8ddca0d695e2db108ab233
fi
short_desc="Oracle's Java Runtime Environment (JRE) - Version 7"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
license="oracle"
+
+nonfree=yes
only_for_archs="i686 x86_64"
+depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info"
+provides="java-runtime-${version}_1"
+replaces="java-runtime>=0"
do_install() {
# Install desktop related items
@@ -68,13 +73,3 @@ do_install() {
echo "/usr/share/java/jre/lib/${_arch}" > \
${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf
}
-
-jre_package() {
- nonfree=yes
- depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info"
- provides="java-runtime-${version}"
- replaces="java-runtime>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/js/template b/srcpkgs/js/template
index f45d5d71ec..6fa3ba4fe6 100644
--- a/srcpkgs/js/template
+++ b/srcpkgs/js/template
@@ -27,9 +27,3 @@ js-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-js_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template
index 5b5731b43e..9ce1e58b84 100644
--- a/srcpkgs/json-c/template
+++ b/srcpkgs/json-c/template
@@ -36,9 +36,3 @@ json-c-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-json-c_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index 3f0df01eb5..f00e85f7d4 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -29,9 +29,3 @@ json-glib-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-json-glib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/jsoncpp/template b/srcpkgs/jsoncpp/template
index cf0312ce58..bd4724bf7e 100644
--- a/srcpkgs/jsoncpp/template
+++ b/srcpkgs/jsoncpp/template
@@ -34,12 +34,6 @@ post_install() {
vinstall ${FILESDIR}/jsoncpp.pc 644 usr/lib/pkgconfig
}
-jsoncpp_package() {
- pkg_install() {
- vmove all
- }
-}
-
jsoncpp-devel_package() {
depends="jsoncpp>=${version}"
short_desc+=" - development files"
diff --git a/srcpkgs/jupp/template b/srcpkgs/jupp/template
new file mode 100644
index 0000000000..9d66c24332
--- /dev/null
+++ b/srcpkgs/jupp/template
@@ -0,0 +1,32 @@
+# Template file for 'jupp'
+pkgname=jupp
+version=3.1jupp26
+revision=1
+build_style=gnu-configure
+configure_args="--disable-dependency-tracking --disable-termidx"
+makedepends="ncurses-devel"
+wrksrc="jupp"
+conf_files="
+ /etc/joe/joerc
+ /etc/joe/rjoerc
+ /etc/joe/jpicorc
+ /etc/joe/jmacsrc
+ /etc/joe/jstarrc
+ /etc/joe/jupprc"
+short_desc="Portable version of JOE’s Own Editor"
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+license="GPL-1"
+homepage="https://www.mirbsd.org/jupp.htm"
+distfiles="https://www.mirbsd.org/MirOS/dist/${pkgname}/joe-${version}.tgz"
+checksum=99985d6f0db5cc59ba45b30291ce6c3ef9626637f0cca039b2e03484cf5dda42
+
+pre_configure() {
+ chmod +x configure
+}
+
+post_install() {
+ vinstall COPYING 644 usr/share/licenses/${pkgname}/LICENSE
+ vinstall INFO 644 usr/share/doc/${pkgname}
+ vinstall LIST 644 usr/share/doc/${pkgname}
+ vinstall NEWS 644 usr/share/doc/${pkgname}
+}
diff --git a/srcpkgs/kactivities/template b/srcpkgs/kactivities/template
index 90a446067d..902f079a2d 100644
--- a/srcpkgs/kactivities/template
+++ b/srcpkgs/kactivities/template
@@ -2,6 +2,11 @@
pkgname=kactivities
version=4.11.4
revision=1
+build_style=cmake
+configure_args="-DKDE4_BUILD_TESTS=OFF"
+hostmakedepends="cmake automoc4 pkg-config"
+makedepends="MesaLib-devel qt-devel phonon-devel kdelibs-devel>=${version}
+ nepomuk-core-devel>=${version} soprano-devel openssl-devel"
short_desc="KDE API for using and interacting with the Activity Manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL, LGPL, FDL"
@@ -9,13 +14,6 @@ homepage="https://projects.kde.org/projects/kde/kactivities"
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
checksum=b1c70ddf8bf20e08b2a32ccbe014a3ebf68b1cf4e7bea6850bfc5d61aaaa1576
-build_style=cmake
-configure_args="-DKDE4_BUILD_TESTS=OFF"
-
-hostmakedepends="cmake automoc4 pkg-config"
-makedepends="MesaLib-devel qt-devel phonon-devel kdelibs-devel>=${version}
- nepomuk-core-devel>=${version} soprano-devel openssl-devel"
-
kactivities-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
@@ -26,9 +24,3 @@ kactivities-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-kactivities_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template
index 59704f9521..fd237fb636 100644
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale"
hostmakedepends="automake libtool gettext-devel flex pkg-config"
makedepends="pam-devel libfl-devel"
+depends="kbd-data"
short_desc="Linux keyboard utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -48,10 +49,3 @@ kbd-data_package() {
vmove usr/share/kbd/unimaps
}
}
-
-kbd_package() {
- depends="kbd-data"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kbproto/template b/srcpkgs/kbproto/template
index d25d5c2146..275781f4f2 100644
--- a/srcpkgs/kbproto/template
+++ b/srcpkgs/kbproto/template
@@ -1,20 +1,12 @@
# Template build file for 'kbproto'.
pkgname=kbproto
version=1.0.4
-build_style=gnu-configure
revision=2
+noarch="yes"
+build_style=gnu-configure
homepage="http://xorg.freedesktop.org"
license="MIT"
short_desc="KB extension headers from X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=1baa29931313d0c3eb81dffd42662768cc76ce49ce94024d5fe32ef5a4e8603c
-long_desc="
- This provides the KB extension headers from modular X.org X11 project."
-
-kbproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/kde-base-artwork/template b/srcpkgs/kde-base-artwork/template
index bc32667096..543f0b7912 100644
--- a/srcpkgs/kde-base-artwork/template
+++ b/srcpkgs/kde-base-artwork/template
@@ -2,6 +2,7 @@
pkgname=kde-base-artwork
version=4.11.4
revision=1
+noarch=yes
build_style=cmake
hostmakedepends="cmake automoc4 pkg-config"
makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version}"
@@ -11,10 +12,3 @@ license="GPL, LGPL, FDL"
homepage="http://www.kde.org"
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
checksum=1464aeeb41d27ad276173c499772d1029ddc07b7a83f970d98856d036d149a45
-
-kde-base-artwork_package() {
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kde-baseapps/template b/srcpkgs/kde-baseapps/template
index 8746c2acd9..d8137d9ba0 100644
--- a/srcpkgs/kde-baseapps/template
+++ b/srcpkgs/kde-baseapps/template
@@ -18,6 +18,7 @@ makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
soprano-devel libXt-devel kdelibs-devel>=${version} nepomuk-core-devel>=${version}
kactivities-devel>=${version} nepomuk-widgets-devel>=${version}
hicolor-icon-theme oxygen-icons"
+depends="hicolor-icon-theme oxygen-icons"
kde-baseapps-devel_package() {
short_desc+=" - development files"
@@ -26,10 +27,3 @@ kde-baseapps-devel_package() {
vmove usr/include
}
}
-
-kde-baseapps_package() {
- depends="hicolor-icon-theme oxygen-icons"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kde-runtime/template b/srcpkgs/kde-runtime/template
index 16b44933b2..bbe7d32888 100644
--- a/srcpkgs/kde-runtime/template
+++ b/srcpkgs/kde-runtime/template
@@ -19,8 +19,8 @@ makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
libjpeg-turbo-devel libpng-devel exiv2-devel alsa-lib-devel samba-devel
pulseaudio-devel libwebp-devel libcanberra-devel NetworkManager-devel
kdelibs-devel>=${version} kdepimlibs-devel>=${version}
- kactivities-devel>=${version} nepomuk-core-devel
- hicolor-icon-theme"
+ kactivities-devel>=${version} nepomuk-core-devel hicolor-icon-theme"
+depends="hicolor-icon-theme"
post_install() {
rm -f ${DESTDIR}/usr/share/icons/hicolor/index.theme
@@ -35,10 +35,3 @@ kde-runtime-devel_package() {
vmove usr/share/apps/cmake
}
}
-
-kde-runtime_package() {
- depends="hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kde-wallpapers/template b/srcpkgs/kde-wallpapers/template
index ad47d6156e..4744c62482 100644
--- a/srcpkgs/kde-wallpapers/template
+++ b/srcpkgs/kde-wallpapers/template
@@ -2,6 +2,7 @@
pkgname=kde-wallpapers
version=4.11.4
revision=1
+noarch=yes
build_style=cmake
hostmakedepends="cmake automoc4 pkg-config"
makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version}"
@@ -11,10 +12,3 @@ license="GPL, LGPL, FDL"
homepage="http://www.kde.org"
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
checksum=8c22c1c777d228dab571b7d09ef6b4d025de9e7ccfe4671c308902eeb17c2d57
-
-kde-wallpapers_package() {
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template
index b59942a459..7d109df588 100644
--- a/srcpkgs/kde-workspace/template
+++ b/srcpkgs/kde-workspace/template
@@ -25,6 +25,19 @@ makedepends="openssl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-dev
akonadi-devel kdepimlibs-devel>=${version} qjson-devel libsensors-devel wayland-devel
NetworkManager-devel pciutils-devel MesaLib-devel pam-devel libusb-compat-devel
libraw1394-devel python-devel kde-wallpapers>=${version} kde-base-artwork>=${version}"
+depends="kde-wallpapers>=${version} kde-base-artwork>=${version}"
+conf_files="
+ /etc/kdm/kdmrc
+ /etc/ksysguarddrc
+ /etc/pam.d/kde-np.pam
+ /etc/pam.d/kde.pam
+ /etc/pam.d/kscreensaver.pam"
+system_accounts="kdm"
+kdm_homedir="/var/lib/kdm"
+make_dirs="
+ /etc/kde/env 0755 root root
+ /etc/kde/shutdown 0755 root root
+ /var/lib/kdm 0755 kdm kdm"
pre_configure() {
sed -e "s,@PKG_SYSCONFDIR@,/etc,g" -i kdm/kcm/main.cpp
@@ -65,22 +78,3 @@ kde-python_package() {
vmove "/usr/share/kde4/services/plasma-scriptengine*"
}
}
-
-kde-workspace_package() {
- depends="kde-wallpapers>=${version} kde-base-artwork>=${version}"
- conf_files="
- /etc/kdm/kdmrc
- /etc/ksysguarddrc
- /etc/pam.d/kde-np.pam
- /etc/pam.d/kde.pam
- /etc/pam.d/kscreensaver.pam"
- system_accounts="kdm"
- kdm_homedir="/var/lib/kdm"
- make_dirs="
- /etc/kde/env 0755 root root
- /etc/kde/shutdown 0755 root root
- /var/lib/kdm 0755 kdm kdm"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kde/template b/srcpkgs/kde/template
index f26e10525a..f56c8a43ac 100644
--- a/srcpkgs/kde/template
+++ b/srcpkgs/kde/template
@@ -2,6 +2,7 @@
pkgname=kde
version=4.11.4
revision=1
+noarch="yes"
build_style=meta
makedepends="
oxygen-icons>=${version}
@@ -19,12 +20,8 @@ makedepends="
phonon-backend-gstreamer
udisks2
polkit-kde"
+depends="${makedepends}"
short_desc="The KDE meta-package for Void Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kde.org"
license="GPL, LGPL, FDL"
-
-kde_package() {
- noarch="yes"
- depends="${makedepends}"
-}
diff --git a/srcpkgs/kdeartwork/template b/srcpkgs/kdeartwork/template
index 58e8c9c017..a9c2e2d27a 100644
--- a/srcpkgs/kdeartwork/template
+++ b/srcpkgs/kdeartwork/template
@@ -18,9 +18,3 @@ makedepends="MesaLib-devel openssl-devel qt-devel phonon-devel strigi-devel
soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version}
nepomuk-core-devel>=${version} kde-workspace-devel>=${version}
libkexiv2-devel>=${version} eigen2"
-
-kdeartwork_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template
index 58439d49bc..9e5fd5d193 100644
--- a/srcpkgs/kdelibs/template
+++ b/srcpkgs/kdelibs/template
@@ -23,6 +23,8 @@ makedepends="openssl-devel libSM-devel libXext-devel libXScrnSaver-devel
libutempter-devel soprano-devel>=2.9.2_2 MesaLib-devel upower udisks2-devel
shared-desktop-ontologies ca-certificates shared-mime-info media-player-info
hicolor-icon-theme"
+depends="docbook-xsl media-player-info shared-mime-info
+ shared-desktop-ontologies upower hicolor-icon-theme ca-certificates"
post_install() {
rm -f ${DESTDIR}/usr/share/apps/kssl/ca-bundle.crt
@@ -38,12 +40,3 @@ kdelibs-devel_package() {
vmove usr/lib/cmake
}
}
-
-kdelibs_package() {
- depends="docbook-xsl media-player-info shared-mime-info
- shared-desktop-ontologies upower hicolor-icon-theme
- ca-certificates"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 240b176cf7..8a29aa4fe5 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -18,9 +18,3 @@ makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version}
kdepimlibs-devel>=${version} akonadi-devel nepomuk-core-devel>=${version}
strigi-devel soprano-devel boost-devel libxml2-devel qjson-devel
libkgapi-devel"
-
-kdepim-runtime_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kdepim/template b/srcpkgs/kdepim/template
index 07c0746c9f..7cf66835e4 100644
--- a/srcpkgs/kdepim/template
+++ b/srcpkgs/kdepim/template
@@ -4,13 +4,6 @@ version=4.11.4
revision=1
build_style=cmake
configure_args="-DKDE4_BUILD_TESTS=OFF"
-short_desc="KDE PIM"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL, LGPL, FDL"
-homepage="https://projects.kde.org/projects/kde/kdepimlibs"
-distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=64250635d9e63b25747919634be976c1666e78154d3ad26d5da65ee0be2f63e6
-
# XXX dblatex, prison
hostmakedepends="cmake automoc4 pkg-config"
makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version}
@@ -18,10 +11,10 @@ makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version}
nepomuk-widgets-devel>=${version} soprano-devel strigi-devel grantlee-devel
libsasl-devel libassuan-devel gpgme-devel boost-devel MesaLib-devel
kdepim-runtime>=${version}"
-
-kdepim_package() {
- depends="kdepim-runtime>=${version}"
- pkg_install() {
- vmove all
- }
-}
+depends="kdepim-runtime>=${version}"
+short_desc="KDE PIM"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL, LGPL, FDL"
+homepage="https://projects.kde.org/projects/kde/kdepimlibs"
+distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=64250635d9e63b25747919634be976c1666e78154d3ad26d5da65ee0be2f63e6
diff --git a/srcpkgs/kdepimlibs/template b/srcpkgs/kdepimlibs/template
index 9f30a084f3..151e22bcea 100644
--- a/srcpkgs/kdepimlibs/template
+++ b/srcpkgs/kdepimlibs/template
@@ -16,6 +16,7 @@ hostmakedepends="cmake automoc4 pkg-config"
makedepends="boost-devel nepomuk-core-devel gpgme-devel qjson-devel libical-devel
kdelibs-devel>=${version} phonon-devel libxslt-devel soprano-devel libldap-devel
akonadi-devel cyrus-sasl shared-mime-info"
+depends="shared-mime-info"
kdepimlibs-devel_package() {
short_desc+=" - development files"
@@ -26,10 +27,3 @@ kdepimlibs-devel_package() {
vmove usr/lib/gpgmepp
}
}
-
-kdepimlibs_package() {
- depends="shared-mime-info"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kdeplasma-addons/template b/srcpkgs/kdeplasma-addons/template
index 6d09e08e0d..c6bde6da6e 100644
--- a/srcpkgs/kdeplasma-addons/template
+++ b/srcpkgs/kdeplasma-addons/template
@@ -28,9 +28,3 @@ kdeplasma-addons-devel_package() {
vmove usr/share/apps/cmake
}
}
-
-kdeplasma-addons_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kdesdk/template b/srcpkgs/kdesdk/template
index 18b3874ef9..068ad9c36c 100644
--- a/srcpkgs/kdesdk/template
+++ b/srcpkgs/kdesdk/template
@@ -10,13 +10,6 @@ distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.t
checksum=e8c076cc83d4e43d021993c4e6ca037762c69486d8fce7c2770c23f55ba13140
build_style=cmake
-
hostmakedepends="cmake automoc4 pkg-config"
makedepends="openssl-devel qt-devel phonon-devel strigi-devel soprano-devel
gettext-devel soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version}"
-
-kdesdk_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/keepassx/template b/srcpkgs/keepassx/template
index 642bb70dcb..3c7fc54fae 100644
--- a/srcpkgs/keepassx/template
+++ b/srcpkgs/keepassx/template
@@ -4,6 +4,7 @@ version=0.4.3
revision=1
hostmakedepends="pkg-config"
makedepends="libXtst-devel qt-devel shared-mime-info"
+depends="shared-mime-info"
short_desc="A password manager to secure personal data"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -20,10 +21,3 @@ do_build() {
do_install() {
make INSTALL_ROOT=${DESTDIR} install
}
-
-keepassx_package() {
- depends="shared-mime-info"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/kernel-headers-rpi b/srcpkgs/kernel-headers-rpi
deleted file mode 120000
index 4d6c80fbef..0000000000
--- a/srcpkgs/kernel-headers-rpi
+++ /dev/null
@@ -1 +0,0 @@
-kernel-rpi
\ No newline at end of file
diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index d92ab69a35..8ad9b041bc 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -3,6 +3,9 @@
pkgname=kernel-libc-headers
version=3.10.6
revision=1
+bootstrap=yes
+nostrip=yes
+noverifyrdeps=yes
wrksrc=linux-${version}
short_desc="The Linux API headers for userland development"
license="GPL-2"
@@ -10,14 +13,12 @@ homepage="http://www.kernel.org"
distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
checksum=ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf
-bootstrap=yes
-
if [ "$CHROOT_READY" ]; then
hostmakedepends="perl"
fi
case "$XBPS_TARGET_MACHINE" in
- i686|x86_64) _arch="x86";;
+ i686*|x86_64*) _arch="x86";;
arm*) _arch="arm";;
*) msg_error "$pkgver: unknown architecture.\n";;
esac
@@ -34,11 +35,3 @@ do_install() {
# Remove drm headers, use libdrm.
rm -rf ${DESTDIR}/usr/include/drm
}
-
-kernel-libc-headers_package() {
- nostrip=yes
- noverifyrdeps=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kernel-manpages/template b/srcpkgs/kernel-manpages/template
index a64d7667b3..c0a890cdc2 100644
--- a/srcpkgs/kernel-manpages/template
+++ b/srcpkgs/kernel-manpages/template
@@ -3,6 +3,7 @@
pkgname=kernel-manpages
version=3.2.6
revision=2
+noarch="yes"
wrksrc=linux-${version}
makedepends="which perl xmlto"
homepage="http://www.kernel.org"
@@ -21,10 +22,3 @@ do_install() {
vmkdir usr/share/man/man9
install -m644 Documentation/DocBook/man/*.9.gz ${DESTDIR}/usr/share/man/man9
}
-
-kernel-manpages_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/kernel-uml/template b/srcpkgs/kernel-uml/template
index cc32cfb48c..57d210538e 100644
--- a/srcpkgs/kernel-uml/template
+++ b/srcpkgs/kernel-uml/template
@@ -3,6 +3,8 @@ pkgname=kernel-uml
version=3.8.5
revision=1
wrksrc=linux-${version}
+makedepends="perl libpcap-devel uml-utilities"
+depends="uml-utilities"
homepage="http://www.kernel.org"
license="GPL-2"
short_desc="Kernel ${version} for User Mode Linux"
@@ -17,8 +19,6 @@ long_desc="
This package contains the kernel itself, as an executable program, and the
associated kernel modules."
-makedepends="perl libpcap-devel uml-utilities"
-
do_build() {
make LDFLAGS= ARCH=um defconfig && make LDFLAGS= ARCH=um ${makejobs}
}
@@ -30,10 +30,3 @@ do_install() {
mv ${DESTDIR}/usr/lib/uml/lib/modules ${DESTDIR}/usr/lib/uml
rmdir ${DESTDIR}/usr/lib/uml/lib
}
-
-kernel-uml_package() {
- depends="uml-utilities"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template
index 9d7e68a902..4cd7e02a12 100644
--- a/srcpkgs/kexec-tools/template
+++ b/srcpkgs/kexec-tools/template
@@ -15,9 +15,3 @@ long_desc="
context of already running kernel without going through BIOS. BIOS can be very
time consuming especially on the big servers with lots of peripherals. This can
save a lot of time for developers who end up booting a machine numerous times."
-
-kexec-tools_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/keychain/template b/srcpkgs/keychain/template
index f6b50165b9..4fe0ed609e 100644
--- a/srcpkgs/keychain/template
+++ b/srcpkgs/keychain/template
@@ -2,6 +2,7 @@
pkgname=keychain
version=2.7.1
revision=2
+noarch="yes"
hostmakedepends="perl"
short_desc="keychain manager for ssh-agent and gpg-agent"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -23,10 +24,3 @@ do_install() {
vinstall keychain 755 usr/bin
vinstall keychain.1 644 usr/share/man/man1
}
-
-keychain_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template
index 245e3bf39c..8b6a471468 100644
--- a/srcpkgs/keyutils/template
+++ b/srcpkgs/keyutils/template
@@ -2,6 +2,7 @@
pkgname=keyutils
version=1.5.5
revision=2
+conf_files="/etc/request-key.conf"
short_desc="Linux Key Management Utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org"
@@ -47,10 +48,3 @@ keyutils-devel_package() {
vmove usr/share/man/man3
}
}
-
-keyutils_package() {
- conf_files="/etc/request-key.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 291275e1fa..048ee8f06d 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -16,9 +16,3 @@ hostmakedepends="cmake automoc4 pkg-config"
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
soprano-devel kdelibs-devel>=${version} kde-baseapps-devel>=${version}
alsa-lib-devel pulseaudio-devel libcanberra-devel"
-
-kmix_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kmod/patches/kmod.patch b/srcpkgs/kmod/patches/kmod.patch
new file mode 100644
index 0000000000..86ef61c2c4
--- /dev/null
+++ b/srcpkgs/kmod/patches/kmod.patch
@@ -0,0 +1,32 @@
+remove non-portable usage of strndupa
+
+usage of strndupa is neither C99 nor POSIX,
+it's a glibc invention, and a dangerous one since
+alloca() is used behind the scenes which does not
+give any guarantuees that it won't overflow the
+stack.
+
+--- libkmod/libkmod-util.c 2013-08-26 16:03:22.239000003 +0000
++++ libkmod/libkmod-util.c 2013-08-26 16:07:26.684000003 +0000
+@@ -28,6 +28,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <string.h>
++#include <limits.h>
+ #include <ctype.h>
+
+ #include "libkmod.h"
+@@ -323,8 +324,11 @@
+ int mkdir_p(const char *path, int len, mode_t mode)
+ {
+ char *start, *end;
+-
+- start = strndupa(path, len);
++ char buf[PATH_MAX+1];
++ snprintf(buf, sizeof buf, "%s", path);
++ assert(len < sizeof(buf));
++ buf[len] = 0;
++ start = buf;
+ end = start + len;
+
+ /*
diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template
index b36889ac5e..1a1797bcc2 100644
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@@ -1,20 +1,22 @@
# Template file for 'kmod'
pkgname=kmod
-version=15
-revision=1
+version=16
+revision=4
build_style=gnu-configure
configure_args="--with-zlib --with-xz"
hostmakedepends="pkg-config libxslt"
makedepends="zlib-devel liblzma-devel"
+make_dirs="
+ /etc/depmod.d 0755 root root
+ /etc/modprobe.d 0755 root root
+ /usr/lib/depmod.d 0755 root root
+ /usr/lib/modprobe.d 0755 root root"
short_desc="Linux kernel module handling"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://git.profusion.mobi/cgit.cgi/kmod.git"
distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz"
-checksum=e8ef0ea7e1929b46aa681fe6ce58c5e62d0026289026ebfc63abae3b8fd5ca9e
-long_desc="
- kmod is a set of tools to handle common tasks with Linux kernel modules like
- insert, remove, list, check properties, resolve dependencies and aliases."
+checksum=63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libtool automake"
@@ -28,8 +30,7 @@ post_install() {
# Add compatibility symlinks.
vmkdir usr/sbin
for tool in {ls,ins,rm,dep}mod mod{info,probe}; do
- cd ${DESTDIR}/usr/sbin
- ln -sf ../bin/kmod $tool
+ ln -sfr ${DESTDIR}/usr/bin/kmod ${DESTDIR}/usr/sbin/${tool}
done
}
@@ -41,7 +42,7 @@ libkmod_package() {
}
libkmod-devel_package() {
- depends="zlib-devel liblzma-devel libkmod>=${version}"
+ depends="zlib-devel liblzma-devel libkmod>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -49,16 +50,3 @@ libkmod-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-kmod_package() {
- make_dirs="
- /etc/depmod.d 0755 root root
- /etc/modprobe.d 0755 root root
- /usr/lib/depmod.d 0755 root root
- /usr/lib/modprobe.d 0755 root root"
- provides="module-init-tools-3.17"
- replaces="module-init-tools>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index a6c2bdea54..6e141bd4bc 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -7,6 +7,7 @@ configure_args="--enable-multi-seat --disable-static"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config"
makedepends="MesaLib-devel pango-devel libtsm-devel libxkbcommon-devel
libpciaccess-devel libudev-devel systemd-devel dbus-devel fuse-devel"
+depends="xkeyboard-config"
short_desc="Terminal emulator based on Kernel Mode Setting (KMS)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -22,10 +23,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/include
rm -rf ${DESTDIR}/usr/lib/pkgconfig
}
-
-kmscon_package() {
- depends="xkeyboard-config"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index c49d4d0b84..0f93fc7ab2 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -15,9 +15,3 @@ configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc"
hostmakedepends="cmake automoc4 pkg-config"
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
soprano-devel kdelibs-devel>=${version} kde-baseapps-devel>=${version}"
-
-konsole_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kuser/template b/srcpkgs/kuser/template
index 2d355b0e6a..aa63d08282 100644
--- a/srcpkgs/kuser/template
+++ b/srcpkgs/kuser/template
@@ -16,10 +16,4 @@ hostmakedepends="cmake automoc4 pkg-config"
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version}
nepomuk-core-devel>=${version}"
-
-kuser_package() {
- replaces="kdeadmin>=0"
- pkg_install() {
- vmove all
- }
-}
+replaces="kdeadmin>=0"
diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index e965041236..e064f4e082 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -16,9 +16,3 @@ hostmakedepends="cmake automoc4 pkg-config"
makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version}
nepomuk-core-devel>=${version}"
-
-kwallet_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kyua-cli/template b/srcpkgs/kyua-cli/template
index f4f98472ef..8603679142 100644
--- a/srcpkgs/kyua-cli/template
+++ b/srcpkgs/kyua-cli/template
@@ -10,6 +10,8 @@ configure_args="
ac_cv_path_GDB=/usr/bin/gdb ac_cv_path_UMOUNT=/usr/bin/umount"
hostmakedepends="pkg-config automake libtool atf-devel doxygen"
makedepends="atf-devel>=0.16 lutok-devel>=0.4 sqlite-devel kyua-testers"
+depends="kyua-testers"
+replaces="kyua>=0"
short_desc="Kyua (automated testing framework) - Command line interface"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Modified BSD"
@@ -26,11 +28,3 @@ long_desc="
pre_configure() {
autoreconf -fi
}
-
-kyua-cli_package() {
- depends="kyua-testers"
- replaces="kyua>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/kyua-testers/template b/srcpkgs/kyua-testers/template
index 2e3a4b0c71..690f5e9747 100644
--- a/srcpkgs/kyua-testers/template
+++ b/srcpkgs/kyua-testers/template
@@ -10,6 +10,8 @@ configure_args="
ac_cv_path_GDB=/usr/bin/gdb ac_cv_path_UMOUNT=/usr/bin/umount"
hostmakedepends="pkg-config automake libtool atf-devel"
makedepends="atf-devel"
+# Needs atf-sh at least.
+depends="atf"
short_desc="Kyua (automated testing framework) - Testers"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -31,11 +33,3 @@ long_desc="
pre_configure() {
autoreconf -fi
}
-
-kyua-testers_package() {
- # Needs atf-sh at least.
- depends="atf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ladish/template b/srcpkgs/ladish/template
index 3343323e44..737ba586f0 100644
--- a/srcpkgs/ladish/template
+++ b/srcpkgs/ladish/template
@@ -7,6 +7,8 @@ configure_args="--enable-liblash --enable-pylash"
makedepends="perl intltool python-devel pkg-config alsa-lib-devel jack-devel
dbus-devel dbus-glib-devel libuuid-devel expat-devel glib-devel gtk+-devel
flowcanvas-devel boost-devel libgnomecanvasmm-devel gtkmm2-devel"
+depends="jack a2jmidid hicolor-icon-theme"
+pycompile_module="lash.py"
short_desc="Session management system for JACK applications"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -32,11 +34,3 @@ ladish-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-ladish_package() {
- pycompile_module="lash.py"
- depends="jack a2jmidid hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/laditools/template b/srcpkgs/laditools/template
index df7a668d9b..bdec543935 100644
--- a/srcpkgs/laditools/template
+++ b/srcpkgs/laditools/template
@@ -3,25 +3,18 @@ pkgname=laditools
version=1.0.rc2
revision=2
wrksrc="ladish-1/${pkgname}"
-homepage="http://www.marcochapeau.org/software/laditools"
-license="GPL-3"
build_style=python-module
makepends="python"
+depends="ladish jack pygtk pyyaml vte"
+pycompile_module="laditools"
short_desc="Linux Audio Desktop Integration Tools"
maintainer="davehome <davehome@redthumb.info.tm>"
+homepage="http://www.marcochapeau.org/software/laditools"
+license="GPL-3"
distfiles="http://ladish.org/download/ladish-1-with-deps.tar.bz2"
checksum=b31b9ca69c42e4e68b5159993a1f505e137d43737430778444bc5e852adeb461
long_desc="
LADITools is a set of tools aiming to achieve the goals of the LADI project to
improve desktop integration and user workflow of Linux audio system based on
JACK and LASH. Those tools take advantage of the DBus interfaces recently added
- to JACK and LASH to ease the configuration and use of those two great
- softwares."
-
-laditools_package() {
- pycompile_module="laditools"
- depends="ladish jack pygtk pyyaml vte"
- pkg_install() {
- vmove usr
- }
-}
+ to JACK and LASH to ease the configuration and use of those two great softwares."
diff --git a/srcpkgs/ladspa-sdk/template b/srcpkgs/ladspa-sdk/template
index 22f0509abb..201e7828eb 100644
--- a/srcpkgs/ladspa-sdk/template
+++ b/srcpkgs/ladspa-sdk/template
@@ -2,6 +2,7 @@
pkgname=ladspa-sdk
version=1.13
revision=2
+noarch=yes
wrksrc=ladspa_sdk
distfiles="http://www.ladspa.org/download/ladspa_sdk.tgz"
makedepends="libsndfile-progs"
@@ -31,7 +32,7 @@ do_install() {
ladspa-sdk-docs_package() {
depends="ladspa-sdk"
- short_desc="${short_desc} (Documentation)"
+ short_desc+="- Documentation"
noarch=yes
pkg_install() {
vmkdir usr/share/doc
@@ -43,7 +44,7 @@ ladspa-sdk-docs_package() {
}
ladspa-sdk-example-plugins_package() {
- short_desc="${short_desc} (Example plugins)"
+ short_desc=+" - Example plugins"
pkg_install() {
vmkdir usr/lib/ladspa
vcopy "${wrksrc}/plugins/*.so*" usr/lib/ladspa
@@ -51,16 +52,9 @@ ladspa-sdk-example-plugins_package() {
}
ladspa-sdk-progs_package() {
- short_desc="${short_desc} (Example programs)"
+ short_desc+=" - Example programs"
pkg_install() {
vmkdir usr
vcopy ${wrksrc}/bin usr
}
}
-
-ladspa-sdk_package() {
- noarch=yes
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lame/template b/srcpkgs/lame/template
index b82f24a38f..f7a9d14f15 100644
--- a/srcpkgs/lame/template
+++ b/srcpkgs/lame/template
@@ -38,9 +38,3 @@ lame-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-lame_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/laptop-mode/template b/srcpkgs/laptop-mode/template
index 41e467ba9c..29da70cb77 100644
--- a/srcpkgs/laptop-mode/template
+++ b/srcpkgs/laptop-mode/template
@@ -2,6 +2,7 @@
pkgname=laptop-mode
version=1.62
revision=4
+noarch="yes"
wrksrc=$pkgname-tools_$version
short_desc="Laptop power saving package for Linux systems"
maintainer="tripledes <tripledes@gmail.com>"
@@ -9,6 +10,36 @@ license="GPL-2"
homepage="http://samwel.tk/laptop_mode/"
distfiles="${homepage}/tools/downloads/$pkgname-tools_$version.tar.gz"
checksum=d40b3d2fb4dc120b4a427ef7dbddc9dd4d9ea0c475685538d36d3457b39158cd
+conf_files="
+ /etc/laptop-mode/lm-profiler.conf
+ /etc/laptop-mode/conf.d/lcd-brightness.conf
+ /etc/laptop-mode/conf.d/video-out.conf
+ /etc/laptop-mode/conf.d/wireless-iwl-power.conf
+ /etc/laptop-mode/conf.d/nmi-watchdog.conf
+ /etc/laptop-mode/conf.d/dpms-standby.conf
+ /etc/laptop-mode/conf.d/runtime-pm.conf
+ /etc/laptop-mode/conf.d/ethernet.conf
+ /etc/laptop-mode/conf.d/eee-superhe.conf
+ /etc/laptop-mode/conf.d/hal-polling.conf
+ /etc/laptop-mode/conf.d/cpufreq.conf
+ /etc/laptop-mode/conf.d/battery-level-polling.conf
+ /etc/laptop-mode/conf.d/intel-hda-powersave.conf
+ /etc/laptop-mode/conf.d/configuration-file-control.conf
+ /etc/laptop-mode/conf.d/bluetooth.conf
+ /etc/laptop-mode/conf.d/usb-autosuspend.conf
+ /etc/laptop-mode/conf.d/wireless-ipw-power.conf
+ /etc/laptop-mode/conf.d/start-stop-programs.conf
+ /etc/laptop-mode/conf.d/ac97-powersave.conf
+ /etc/laptop-mode/conf.d/auto-hibernate.conf
+ /etc/laptop-mode/conf.d/intel-sata-powermgmt.conf
+ /etc/laptop-mode/conf.d/wireless-power.conf
+ /etc/laptop-mode/conf.d/sched-smt-power-savings.conf
+ /etc/laptop-mode/conf.d/sched-mc-power-savings.conf
+ /etc/laptop-mode/conf.d/terminal-blanking.conf
+ /etc/laptop-mode/conf.d/exec-commands.conf
+ /etc/laptop-mode/laptop-mode.conf"
+makedepends="acpid hdparm sdparm wireless_tools xset bluez"
+depends="${makedepends}"
do_install() {
export DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} ACPI=force APM=disabled PMU=disabled INIT_D=none MAN_D=/usr/share/man
@@ -19,40 +50,3 @@ do_install() {
sed -i 's|/sbin/udevadm|/usr/bin/udevadm|g' usr/share/laptop-mode-tools/modules/hdparm
$wrksrc/install.sh
}
-
-laptop-mode_package() {
- conf_files="
- /etc/laptop-mode/lm-profiler.conf
- /etc/laptop-mode/conf.d/lcd-brightness.conf
- /etc/laptop-mode/conf.d/video-out.conf
- /etc/laptop-mode/conf.d/wireless-iwl-power.conf
- /etc/laptop-mode/conf.d/nmi-watchdog.conf
- /etc/laptop-mode/conf.d/dpms-standby.conf
- /etc/laptop-mode/conf.d/runtime-pm.conf
- /etc/laptop-mode/conf.d/ethernet.conf
- /etc/laptop-mode/conf.d/eee-superhe.conf
- /etc/laptop-mode/conf.d/hal-polling.conf
- /etc/laptop-mode/conf.d/cpufreq.conf
- /etc/laptop-mode/conf.d/battery-level-polling.conf
- /etc/laptop-mode/conf.d/intel-hda-powersave.conf
- /etc/laptop-mode/conf.d/configuration-file-control.conf
- /etc/laptop-mode/conf.d/bluetooth.conf
- /etc/laptop-mode/conf.d/usb-autosuspend.conf
- /etc/laptop-mode/conf.d/wireless-ipw-power.conf
- /etc/laptop-mode/conf.d/start-stop-programs.conf
- /etc/laptop-mode/conf.d/ac97-powersave.conf
- /etc/laptop-mode/conf.d/auto-hibernate.conf
- /etc/laptop-mode/conf.d/intel-sata-powermgmt.conf
- /etc/laptop-mode/conf.d/wireless-power.conf
- /etc/laptop-mode/conf.d/sched-smt-power-savings.conf
- /etc/laptop-mode/conf.d/sched-mc-power-savings.conf
- /etc/laptop-mode/conf.d/terminal-blanking.conf
- /etc/laptop-mode/conf.d/exec-commands.conf
- /etc/laptop-mode/laptop-mode.conf"
- noarch="yes"
- depends="acpid hdparm sdparm wireless_tools xset bluez"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/latencytop/template b/srcpkgs/latencytop/template
index c649736910..1f631454af 100644
--- a/srcpkgs/latencytop/template
+++ b/srcpkgs/latencytop/template
@@ -24,9 +24,3 @@ long_desc="
pre_install() {
vmkdir usr/sbin
}
-
-latencytop_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lbreakout2/template b/srcpkgs/lbreakout2/template
index 1b5f979ef0..e0353daf4a 100644
--- a/srcpkgs/lbreakout2/template
+++ b/srcpkgs/lbreakout2/template
@@ -26,9 +26,3 @@ post_install() {
vinstall ${FILESDIR}/lbreakout2.desktop 644 usr/share/applications
vinstall ${FILESDIR}/lbreakout2.png 644 usr/share/pixmaps
}
-
-lbreakout2_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lcms/template b/srcpkgs/lcms/template
index a4b3c2e3c5..cf5049a34d 100644
--- a/srcpkgs/lcms/template
+++ b/srcpkgs/lcms/template
@@ -16,15 +16,9 @@ checksum=80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
lcms-devel_package() {
depends="libjpeg-turbo-devel tiff-devel lcms>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-lcms_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index fe95cfbef1..6d719896de 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -36,9 +36,3 @@ lcms2-tools_package() {
vmove usr/share/man
}
}
-
-lcms2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template
index 5898ee601b..e4b63017e2 100644
--- a/srcpkgs/ldc/template
+++ b/srcpkgs/ldc/template
@@ -6,6 +6,7 @@ wrksrc="$pkgname-$version-src"
build_style=cmake
hostmakedepends="cmake llvm>=3.3"
makedepends="libconfig++-devel"
+conf_files="/etc/ldc2.rebuild.conf /etc/ldc2.conf"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://wiki.dlang.org/LDC"
license="BSD"
@@ -20,10 +21,3 @@ post_install() {
mv ${DESTDIR}/etc/bash_completion.d/* \
${DESTDIR}/usr/share/bash-completion/completions
}
-
-ldc_package() {
- conf_files="/etc/ldc2.rebuild.conf /etc/ldc2.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index 2ffdc634c1..e4cccef451 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -11,9 +11,3 @@ license="GPL-3"
homepage="http://www.greenwoodsoftware.com/less"
distfiles="${homepage}/less-${version}.tar.gz"
checksum=e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fcac
-
-less_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/leveldb/template b/srcpkgs/leveldb/template
index bbc5957683..447d3567be 100644
--- a/srcpkgs/leveldb/template
+++ b/srcpkgs/leveldb/template
@@ -34,15 +34,9 @@ do_install() {
leveldb-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share/doc
}
}
-
-leveldb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 6abb33db86..8d80e2c165 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -7,6 +7,7 @@ configure_args="--with-modules --disable-rpath --without-included-regex
--with-openssl i_cv_posix_fallocate_works=yes"
hostmakedepends="automake libtool pkg-config"
makedepends="ncurses-devel readline-devel openssl-devel expat-devel"
+conf_files="/etc/lftp.conf"
short_desc="Sophisticated FTP/HTTP client"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://lftp.yar.ru/"
@@ -17,10 +18,3 @@ checksum=61ceaefbd476061e728e2b1294c27866402237d1d6539ed9ca98769dba3c9189
pre_configure() {
autoreconf -fi
}
-
-lftp_package() {
- conf_files="/etc/lftp.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lftpfs/template b/srcpkgs/lftpfs/template
index 23a413237d..e4d9a693d0 100644
--- a/srcpkgs/lftpfs/template
+++ b/srcpkgs/lftpfs/template
@@ -2,8 +2,10 @@
pkgname=lftpfs
version=0.4.3
revision=1
+noarch="yes"
build_style=perl-module
makedepends="perl-Fuse perl-IPC-Run lftp"
+depends="${makedepends}"
short_desc="Filesystem with caching based on FUSE and LFTP"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://lftpfs.sourceforge.net/"
@@ -27,11 +29,3 @@ post_install() {
vmkdir usr
mv ${DESTDIR}/usr/lib/perl5/vendor_perl/bin ${DESTDIR}/usr
}
-
-lftpfs_package() {
- depends="perl-Fuse perl-IPC-Run lftp"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lgi/template b/srcpkgs/lgi/template
index 2e7491b491..19b7ae73f7 100644
--- a/srcpkgs/lgi/template
+++ b/srcpkgs/lgi/template
@@ -6,6 +6,7 @@ build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libglib-devel libffi-devel lua-devel>=5.2
gobject-introspection gir-freedesktop"
+depends="lua>=5.2 gir-freedesktop"
short_desc="Lua binadings for gnome/gobject using gobject-introspection library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -22,10 +23,3 @@ do_install() {
vinstall tools/dump-typelib.lua 755 usr/bin dump-typelib
vinstall LICENSE 644 usr/share/licenses/lgi
}
-
-lgi_package() {
- depends="lua>=5.2 gir-freedesktop"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libCello/template b/srcpkgs/libCello/template
index 18c877b7a1..f364fba15b 100644
--- a/srcpkgs/libCello/template
+++ b/srcpkgs/libCello/template
@@ -17,9 +17,3 @@ do_install() {
mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/include
make install DESTDIR=${DESTDIR} PREFIX=/usr
}
-
-libCello_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libHX/template b/srcpkgs/libHX/template
index afddb35998..5621f1934b 100644
--- a/srcpkgs/libHX/template
+++ b/srcpkgs/libHX/template
@@ -20,9 +20,3 @@ libHX-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libHX_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libICE/template b/srcpkgs/libICE/template
index d1736b1c63..34bdf32349 100644
--- a/srcpkgs/libICE/template
+++ b/srcpkgs/libICE/template
@@ -14,7 +14,7 @@ checksum=24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e
libICE-devel_package() {
depends="xtrans xproto libICE-${version}_${revision}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share
@@ -22,9 +22,3 @@ libICE-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libICE_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libIDL/template b/srcpkgs/libIDL/template
index e80e89ae76..8696e0643a 100644
--- a/srcpkgs/libIDL/template
+++ b/srcpkgs/libIDL/template
@@ -48,9 +48,3 @@ libIDL-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libIDL_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template
index 0cb9795fc9..37558ad57b 100644
--- a/srcpkgs/libSM/template
+++ b/srcpkgs/libSM/template
@@ -23,9 +23,3 @@ libSM-devel_package() {
vmove usr/share/doc
}
}
-
-libSM_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 08168e4e57..c21f42ce9a 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -4,7 +4,8 @@ version=1.6.2
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
- --disable-secure-rpc --disable-static ac_cv_func_mmap_fixed_mapped=yes"
+ --disable-secure-rpc --disable-static --enable-malloc0returnsnull
+ ac_cv_func_mmap_fixed_mapped=yes"
hostmakedepends="pkg-config"
makedepends="xproto>=7.0.23 xextproto xtrans xcmiscproto
kbproto bigreqsproto inputproto>=2.2 xf86bigfontproto libxcb-devel"
@@ -36,9 +37,3 @@ libX11-devel_package() {
vmove usr/share/man
}
}
-
-libX11_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXScrnSaver/template b/srcpkgs/libXScrnSaver/template
index 60cc4ba010..a4d449cd5f 100644
--- a/srcpkgs/libXScrnSaver/template
+++ b/srcpkgs/libXScrnSaver/template
@@ -17,7 +17,7 @@ long_desc="
libXScrnSaver-devel_package() {
depends="scrnsaverproto libX11-devel libXext-devel libXScrnSaver>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
@@ -25,9 +25,3 @@ libXScrnSaver-devel_package() {
vmove usr/share
}
}
-
-libXScrnSaver_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template
index 1492224410..bc12956c86 100644
--- a/srcpkgs/libXau/template
+++ b/srcpkgs/libXau/template
@@ -15,16 +15,10 @@ checksum=a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee
libXau-devel_package() {
depends="xproto ${sourcepkg}-${version}_${revision}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/man/man3
}
}
-
-libXau_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXaw/template b/srcpkgs/libXaw/template
index dffb13ce53..14c8412145 100644
--- a/srcpkgs/libXaw/template
+++ b/srcpkgs/libXaw/template
@@ -27,9 +27,3 @@ libXaw-devel_package() {
vmove usr/share
}
}
-
-libXaw_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index 5d382d0a17..a0aabea588 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -15,7 +15,7 @@ checksum=ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178
libXcomposite-devel_package() {
depends="xproto compositeproto libXfixes-devel libX11-devel
${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -23,9 +23,3 @@ libXcomposite-devel_package() {
vmove usr/share
}
}
-
-libXcomposite_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template
index e5cf699999..5943c210fb 100644
--- a/srcpkgs/libXcursor/template
+++ b/srcpkgs/libXcursor/template
@@ -27,9 +27,3 @@ libXcursor-devel_package() {
vmove usr/share
}
}
-
-libXcursor_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template
index 4a06992988..787152235b 100644
--- a/srcpkgs/libXdamage/template
+++ b/srcpkgs/libXdamage/template
@@ -15,16 +15,10 @@ checksum=7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad
libXdamage-devel_package() {
depends="xproto damageproto libX11-devel libXfixes-devel
${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-libXdamage_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXdmcp/template b/srcpkgs/libXdmcp/template
index 47484e26a4..cf05e633b7 100644
--- a/srcpkgs/libXdmcp/template
+++ b/srcpkgs/libXdmcp/template
@@ -15,15 +15,9 @@ checksum=9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e
libXdmcp-devel_package() {
depends="xproto libXdmcp>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-libXdmcp_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXevie/template b/srcpkgs/libXevie/template
index 6097386646..2ee6697bcd 100644
--- a/srcpkgs/libXevie/template
+++ b/srcpkgs/libXevie/template
@@ -25,9 +25,3 @@ libXevie-devel_package() {
vmove usr/share
}
}
-
-libXevie_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXext/template b/srcpkgs/libXext/template
index 2f1e960368..8b08caef4f 100644
--- a/srcpkgs/libXext/template
+++ b/srcpkgs/libXext/template
@@ -22,9 +22,3 @@ libXext-devel_package() {
vmove usr/share/man/man3
}
}
-
-libXext_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index 71a9e39739..9257800902 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -27,9 +27,3 @@ libXfixes-devel_package() {
vmove usr/share
}
}
-
-libXfixes_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template
index d986851d06..9f0bb147aa 100644
--- a/srcpkgs/libXfont/template
+++ b/srcpkgs/libXfont/template
@@ -1,7 +1,9 @@
# Template build file for 'libXfont'.
pkgname=libXfont
-version=1.4.6
+version=1.4.7
revision=1
+hostmakedepends="pkg-config"
+makedepends="xproto xtrans fontcacheproto fontsproto freetype-devel libfontenc-devel"
build_style=gnu-configure
configure_args="--disable-devel-docs"
short_desc="X font Library"
@@ -9,10 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
license="MIT"
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f
-
-hostmakedepends="pkg-config"
-makedepends="xproto xtrans fontcacheproto fontsproto freetype-devel libfontenc-devel"
+checksum=d16ea3541835d296b19cfb05d7e64fc62173d8e7eb93284402ec761b951d1543
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
@@ -20,7 +19,7 @@ post_install() {
libXfont-devel_package() {
depends="xproto fontsproto zlib-devel libfontenc-devel freetype-devel
- libXfont-${version}_${revision}"
+ libXfont>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -29,9 +28,3 @@ libXfont-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libXfont_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXfontcache/template b/srcpkgs/libXfontcache/template
index b1f8c5aa3d..a0524b90e1 100644
--- a/srcpkgs/libXfontcache/template
+++ b/srcpkgs/libXfontcache/template
@@ -22,9 +22,3 @@ libXfontcache-devel_package() {
vmove usr/share
}
}
-
-libXfontcache_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXft/patches/freetype_header.patch b/srcpkgs/libXft/patches/freetype_header.patch
new file mode 100644
index 0000000000..f58575563a
--- /dev/null
+++ b/srcpkgs/libXft/patches/freetype_header.patch
@@ -0,0 +1,30 @@
+From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Mon, 02 Dec 2013 15:26:24 +0000
+Subject: Use FT_*_H macros instead of including <freetype/*.h>
+
+freetype moved its headers around in 2.5.1.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+diff --git a/src/xftglyphs.c b/src/xftglyphs.c
+index 2f3dc5a..4b5fb82 100644
+--- src/xftglyphs.c
++++ src/xftglyphs.c
+@@ -21,10 +21,10 @@
+ */
+
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
+
+-#include <freetype/ftsynth.h>
++#include FT_SYNTHESIS_H
+
+ /*
+ * Validate the memory info for a font
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index 848aa2e3d0..ebf7884cbe 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,7 +1,7 @@
# Template build file for 'libXft'.
pkgname=libXft
-version=2.3.0
-revision=2
+version=2.3.1
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xproto libXrender-devel freetype-devel fontconfig-devel"
@@ -10,32 +10,16 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="${XORG_SITE}"
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=3426393ad72a5c47006536d474e396c7a21c33131bb28f495578e05a5858b044
-long_desc="
- Xft (2.0) provides a client-side font API for X applications. It uses
- Fontconfig to select fonts and the X protocol for rendering them. When
- available, Xft uses the Render extension to accelerate text drawing.
- When Render is not available, Xft uses the core protocol to draw
- client-side glyphs. This provides completely compatible support of
- client-side fonts for all X servers.
-
- Xft (2.0) hides most of the underlying system details so that developers
- can confidently use its API to access client-side fonts in any X
- environment."
+checksum=7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd
libXft-devel_package() {
- depends="xproto libXrender-devel fontconfig-devel freetype-devel libXft>=${version}"
- short_desc="${short_desc} (development files)"
+ depends="xproto libXrender-devel fontconfig-devel freetype-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove "usr/lib/lib*.a"
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
vmove usr/share
}
}
-
-libXft_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template
index 7e0746a4d8..8a348b5c84 100644
--- a/srcpkgs/libXi/template
+++ b/srcpkgs/libXi/template
@@ -23,9 +23,3 @@ libXi-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libXi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libXinerama/template b/srcpkgs/libXinerama/template
index e126c4d567..bf57c4088e 100644
--- a/srcpkgs/libXinerama/template
+++ b/srcpkgs/libXinerama/template
@@ -22,9 +22,3 @@ libXinerama-devel_package() {
vmove usr/share
}
}
-
-libXinerama_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXmu/template b/srcpkgs/libXmu/template
index 41905dd522..e7b2e5fe05 100644
--- a/srcpkgs/libXmu/template
+++ b/srcpkgs/libXmu/template
@@ -29,9 +29,3 @@ libXmu-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libXmu_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXp/template b/srcpkgs/libXp/template
index 58e763c5c9..bc3570fe80 100644
--- a/srcpkgs/libXp/template
+++ b/srcpkgs/libXp/template
@@ -23,9 +23,3 @@ libXp-devel_package() {
vmove usr/share
}
}
-
-libXp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libXpm/template b/srcpkgs/libXpm/template
index 77cf11e6ec..4000ee84c9 100644
--- a/srcpkgs/libXpm/template
+++ b/srcpkgs/libXpm/template
@@ -25,9 +25,3 @@ libXpm-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libXpm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template
index a29d029d0c..efc4112961 100644
--- a/srcpkgs/libXrandr/template
+++ b/srcpkgs/libXrandr/template
@@ -24,9 +24,3 @@ libXrandr-devel_package() {
vmove usr/share
}
}
-
-libXrandr_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXrender/template b/srcpkgs/libXrender/template
index 2189dd76ae..a600e65dea 100644
--- a/srcpkgs/libXrender/template
+++ b/srcpkgs/libXrender/template
@@ -21,9 +21,3 @@ libXrender-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libXrender_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXres/template b/srcpkgs/libXres/template
index 99f56c37f5..d0efb55c6f 100644
--- a/srcpkgs/libXres/template
+++ b/srcpkgs/libXres/template
@@ -28,9 +28,3 @@ libXres-devel_package() {
vmove usr/share
}
}
-
-libXres_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template
index 1f8431ec43..7d765e7b4c 100644
--- a/srcpkgs/libXt/template
+++ b/srcpkgs/libXt/template
@@ -33,9 +33,3 @@ libXt-devel_package() {
vmove usr/share/doc
}
}
-
-libXt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXtst/template b/srcpkgs/libXtst/template
index 85cc816f8d..8e686bd33a 100644
--- a/srcpkgs/libXtst/template
+++ b/srcpkgs/libXtst/template
@@ -22,9 +22,3 @@ libXtst-devel_package() {
vmove usr/share
}
}
-
-libXtst_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXv/template b/srcpkgs/libXv/template
index b42850bdf1..f022e3e24d 100644
--- a/srcpkgs/libXv/template
+++ b/srcpkgs/libXv/template
@@ -23,9 +23,3 @@ libXv-devel_package() {
vmove usr/share
}
}
-
-libXv_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template
index f8c8249bed..e9b311766e 100644
--- a/srcpkgs/libXvMC/template
+++ b/srcpkgs/libXvMC/template
@@ -26,9 +26,3 @@ libXvMC-devel_package() {
vmove usr/share/doc
}
}
-
-libXvMC_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXxf86dga/template b/srcpkgs/libXxf86dga/template
index 35fe05b853..dce582547e 100644
--- a/srcpkgs/libXxf86dga/template
+++ b/srcpkgs/libXxf86dga/template
@@ -26,9 +26,3 @@ libXxf86dga-devel_package() {
vmove usr/share
}
}
-
-libXxf86dga_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXxf86misc/template b/srcpkgs/libXxf86misc/template
index 49d89c8b5b..f52d07d43b 100644
--- a/srcpkgs/libXxf86misc/template
+++ b/srcpkgs/libXxf86misc/template
@@ -26,9 +26,3 @@ libXxf86misc-devel_package() {
vmove usr/share
}
}
-
-libXxf86misc_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libXxf86vm/template b/srcpkgs/libXxf86vm/template
index 4e2d3472ce..7554d3fa93 100644
--- a/srcpkgs/libXxf86vm/template
+++ b/srcpkgs/libXxf86vm/template
@@ -26,9 +26,3 @@ libXxf86vm-devel_package() {
vmove usr/share
}
}
-
-libXxf86vm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/liba52/template b/srcpkgs/liba52/template
index 2adab8524e..c22983bded 100644
--- a/srcpkgs/liba52/template
+++ b/srcpkgs/liba52/template
@@ -39,9 +39,3 @@ liba52-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-liba52_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libao/template b/srcpkgs/libao/template
index 7b7020adf2..b72d7fad3c 100644
--- a/srcpkgs/libao/template
+++ b/srcpkgs/libao/template
@@ -4,6 +4,9 @@ version=1.1.0
revision=2
build_style=gnu-configure
configure_args="--enable-alsa-mmap"
+hostmakedepends="pkg-config"
+makedepends="alsa-lib-devel pulseaudio-devel"
+conf_files="/etc/libao.conf"
homepage="http://xiph.org/ao/"
short_desc="Cross-platform audio output library"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,16 +14,13 @@ license="GPL-2"
distfiles="http://downloads.xiph.org/releases/ao/${pkgname}-${version}.tar.gz"
checksum=29de5bb9b1726ba890455ef7e562d877df87811febb0d99ee69164b88c171bd4
-hostmakedepends="pkg-config"
-makedepends="alsa-lib-devel pulseaudio-devel"
-
post_install() {
vinstall ${FILESDIR}/libao.conf 644 etc
}
libao-devel_package() {
depends="libao>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -28,11 +28,3 @@ libao-devel_package() {
vmove usr/share/aclocal
}
}
-
-libao_package() {
- conf_files="/etc/libao.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/libapp/template b/srcpkgs/libapp/template
index 9c91f7d484..30971f1382 100644
--- a/srcpkgs/libapp/template
+++ b/srcpkgs/libapp/template
@@ -9,7 +9,6 @@ homepage="https://github.com/drotiro/libapp"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=654604b5ead726de0ebb1932b49785a6146c59d312f4931080a04e86b7afb177
-
do_fetch() {
git clone git://github.com/drotiro/libapp.git ${pkgname}-${version}
cd ${pkgname}-${version}
@@ -26,15 +25,9 @@ do_install() {
libapp-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-libapp_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 19424eca9b..f801d99425 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -2,6 +2,7 @@
pkgname=libarchive
version=3.1.2
revision=4
+bootstrap=yes
build_style=gnu-configure
configure_args="--without-xml2 --without-nettle --disable-rpath"
makedepends="zlib-devel bzip2-devel liblzma-devel"
@@ -12,8 +13,6 @@ license="BSD"
distfiles="http://www.libarchive.org/downloads/libarchive-${version}.tar.gz"
checksum=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e
-bootstrap=yes
-
if [ -z "$CHROOT_READY" ]; then
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
@@ -106,9 +105,3 @@ libarchive-devel_package() {
vmove usr/share
}
}
-
-libarchive_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libart/template b/srcpkgs/libart/template
index 6e63f9b65b..c31fee29d8 100644
--- a/srcpkgs/libart/template
+++ b/srcpkgs/libart/template
@@ -35,9 +35,3 @@ libart-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libart_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libass/template b/srcpkgs/libass/template
index 44ad4936a1..9ac6f170a9 100644
--- a/srcpkgs/libass/template
+++ b/srcpkgs/libass/template
@@ -26,9 +26,3 @@ libass-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libass_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template
index 085e3815a1..bd120738e0 100644
--- a/srcpkgs/libassuan/template
+++ b/srcpkgs/libassuan/template
@@ -29,9 +29,3 @@ libassuan-devel_package() {
vmove usr/share
}
}
-
-libassuan_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libasyncns/template b/srcpkgs/libasyncns/template
index 0ddf6a1884..45d173b6b6 100644
--- a/srcpkgs/libasyncns/template
+++ b/srcpkgs/libasyncns/template
@@ -30,9 +30,3 @@ libasyncns-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libasyncns_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libatasmart/template b/srcpkgs/libatasmart/template
index c1f7603036..23fb135bb3 100644
--- a/srcpkgs/libatasmart/template
+++ b/srcpkgs/libatasmart/template
@@ -29,9 +29,3 @@ libatasmart-devel_package() {
vmove usr/share
}
}
-
-libatasmart_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libatomic_ops-devel b/srcpkgs/libatomic_ops-devel
new file mode 120000
index 0000000000..0cdfb4f35b
--- /dev/null
+++ b/srcpkgs/libatomic_ops-devel
@@ -0,0 +1 @@
+libatomic_ops
\ No newline at end of file
diff --git a/srcpkgs/libatomic_ops/template b/srcpkgs/libatomic_ops/template
new file mode 100644
index 0000000000..07e93067d7
--- /dev/null
+++ b/srcpkgs/libatomic_ops/template
@@ -0,0 +1,33 @@
+# Template file for 'libatomic_ops'
+pkgname=libatomic_ops
+version=7.2e
+revision=1
+wrksrc="${pkgname}-${version/e/}"
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Provides semi-portable access to hardware provided atomic memory operations"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, MIT"
+homepage="https://github.com/ivmai/libatomic_ops"
+distfiles="http://www.hpl.hp.com/research/linux/atomic_ops/download/${pkgname}-${version}.tar.gz"
+checksum=e524cdb5603a66e28127bbd767cc6840e9854b449f7b3bcf6585e0f1391e757b
+
+pre_configure() {
+ sed -i 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#' configure.ac
+ sed -i 's#AC_PROG_RANLIB#AC_LIBTOOL_DLOPEN\nAC_PROG_LIBTOOL#' configure.ac
+ sed -i 's#b_L#b_LTL#;s#\.a#.la#g;s#_a_#_la_#' src/Makefile.am
+ sed -i 's#\.a#.so#g;s#\.\./src/#../src/.libs/#g' tests/Makefile.am
+ sed -i 's#pkgdata#doc#' doc/Makefile.am
+ autoreconf -fi
+}
+
+libatomic_ops-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libavcodec53/template b/srcpkgs/libavcodec53/template
index 724cb782bb..f254c06bfb 100644
--- a/srcpkgs/libavcodec53/template
+++ b/srcpkgs/libavcodec53/template
@@ -58,7 +58,9 @@ do_build() {
}
do_install() {
- make DESTDIR=${DESTDIR} install install-man
+ make DESTDIR=install_${pkgname} install install-man
+ vmkdir usr/lib
+ mv install_${pkgname}/libav{format,util,codec}.so.* ${DESTDIR}/usr/lib
}
libavformat53_package() {
@@ -74,9 +76,3 @@ libavutil51_package() {
vmove "usr/lib/libavutil.so.*"
}
}
-
-libavcodec53_package() {
- pkg_install() {
- vmove "usr/lib/libavcodec.so.*"
- }
-}
diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template
index ebff5b2843..ce3cdf1715 100644
--- a/srcpkgs/libbluray/template
+++ b/srcpkgs/libbluray/template
@@ -1,6 +1,6 @@
# Template file for 'libbluray'
pkgname=libbluray
-version=0.4.0
+version=0.5.0
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-bdjava"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.videolan.org/developers/libbluray.html"
license="LGPL-2.1"
distfiles="ftp://ftp.videolan.org/pub/videolan/$pkgname/$version/$pkgname-$version.tar.bz2"
-checksum=63a3218d69f179f4834ef3b48bfa95268ad62c302ff38bfc052e2fc6916ae3f8
+checksum=19213e193e1abc5ed2de65edfb539deda1dbf6cc64dfef03e405524c9c6f7216
libbluray-devel_package() {
depends="${sourcepkg}>=${version}"
@@ -22,9 +22,3 @@ libbluray-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libbluray_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index ad21d29572..41f517a035 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -26,9 +26,3 @@ libbsd-devel_package() {
vmove usr/share
}
}
-
-libbsd_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libburn/template b/srcpkgs/libburn/template
index 23fd629e7c..812643dd62 100644
--- a/srcpkgs/libburn/template
+++ b/srcpkgs/libburn/template
@@ -27,9 +27,3 @@ libburn-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libburn_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template
index 854477e96b..33194e9e33 100644
--- a/srcpkgs/libcaca/template
+++ b/srcpkgs/libcaca/template
@@ -35,9 +35,3 @@ libcaca-devel_package() {
vmove usr/share/man/man1/caca-config.1
}
}
-
-libcaca_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template
index fef3369384..501242a8c7 100644
--- a/srcpkgs/libcanberra/template
+++ b/srcpkgs/libcanberra/template
@@ -29,7 +29,7 @@ long_desc="
libcanberra-devel_package() {
depends="gtk+-devel gtk+3-devel ${sourcepkg}-${version}_${revision}"
- short_desc="${sourcepkg} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -37,9 +37,3 @@ libcanberra-devel_package() {
vmove usr/share/vala
}
}
-
-libcanberra_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcap-ng/patches/pid_t-portability.patch b/srcpkgs/libcap-ng/patches/pid_t-portability.patch
new file mode 100644
index 0000000000..5fe5280c66
--- /dev/null
+++ b/srcpkgs/libcap-ng/patches/pid_t-portability.patch
@@ -0,0 +1,12 @@
+Make this build with musl, uid_t/pid_t are defined in <unistd.h>.
+
+--- utils/proc-llist.h.orig 2014-01-11 11:38:42.960868985 +0100
++++ utils/proc-llist.h 2014-01-11 11:39:01.776988967 +0100
+@@ -24,6 +24,7 @@
+ #ifndef PROC_HEADER
+ #define PROC_HEADER
+
++#include <unistd.h> /* uid_t, pid_t */
+ #include "config.h"
+
+
diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index 7b6f476dfd..1772af8808 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -1,7 +1,7 @@
# Template file for 'libcap-ng'
pkgname=libcap-ng
-version=0.7.1
-revision=2
+version=0.7.3
+revision=1
build_style=gnu-configure
hostmakedepends="python-devel swig"
short_desc="An alternate POSIX capabilities library"
@@ -9,15 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://people.redhat.com/sgrubb/libcap-ng/"
license="GPL-2, LGPL-2.1"
distfiles="http://people.redhat.com/sgrubb/$pkgname/$pkgname-$version.tar.gz"
-checksum=bf74455c9540667a924d2983090c4eb7285f0a4a82a25becd0a496e8bbf3d8ff
-long_desc="
- This library implements the user-space interfaces to the POSIX 1003.1e
- capabilities available in Linux kernels. These capabilities are a
- partitioning of the all powerful root privilege into a set of distinct
- privileges.
-
- The libcap-ng library is intended to make programming with posix capabilities
- much easier than the traditional libcap library."
+checksum=5ca441c8d3a1e4cfe8a8151907977662679457311ccaa7eaac91447c33a35bb1
if [ "$CROSS_BUILD" ]; then
unset hostmakedepends
@@ -25,41 +17,33 @@ if [ "$CROSS_BUILD" ]; then
fi
libcap-ng-devel_package() {
- depends="libcap-ng>=${version}"
- short_desc+=" -- development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/share/man/man3
vmove usr/share/aclocal
}
}
libcap-ng-progs_package() {
- short_desc+=" -- utilities"
+ short_desc+=" - utilities"
pkg_install() {
vmove usr/bin
vmove usr/share
}
}
-libcap-ng_package() {
- pkg_install() {
- vmove usr
- }
-}
-
if [ -z "$CROSS_BUILD" ]; then
-
-libcap-ng-python_package() {
- short_desc+=" -- python bindings"
- depends="python"
- pycompile_module="capng"
- pkg_install() {
- vmove "usr/lib/python*"
+ libcap-ng-python_package() {
+ short_desc+=" - python bindings"
+ depends="python"
+ pycompile_module="capng"
+ pkg_install() {
+ vmove "usr/lib/python*"
+ }
}
-}
-
fi
-
diff --git a/srcpkgs/libcap-pam b/srcpkgs/libcap-pam
deleted file mode 120000
index 4085af6401..0000000000
--- a/srcpkgs/libcap-pam
+++ /dev/null
@@ -1 +0,0 @@
-libcap
\ No newline at end of file
diff --git a/srcpkgs/libcap-pam/template b/srcpkgs/libcap-pam/template
new file mode 100644
index 0000000000..37b4d85516
--- /dev/null
+++ b/srcpkgs/libcap-pam/template
@@ -0,0 +1,30 @@
+# Template file for 'libcap-pam'
+pkgname=libcap-pam
+version=2.24
+revision=1
+wrksrc="libcap-${version}"
+hostmakedepends="gperf perl pam-devel"
+makedepends="pam-devel attr-devel"
+conf_files="/etc/security/capability.conf"
+short_desc="POSIX.1e capabilities suite - PAM module"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://sites.google.com/site/fullycapable/"
+license="GPL-2"
+distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/libcap-$version.tar.xz"
+checksum=cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65
+
+do_build() {
+ make CC="$CC" BUILD_CC=cc
+}
+
+do_install() {
+ _destdir=${wrksrc}/temp_install
+
+ make DESTDIR=${_destdir} MANDIR=${_destdir}/usr/share/man \
+ SBINDIR=${_destdir}/usr/sbin LIBDIR=${_destdir}/usr/lib \
+ RAISE_SETFCAP=no PKGCONFIGDIR=${_destdir}/usr/lib/pkgconfig install
+
+ vinstall pam_cap/capability.conf 644 etc/security
+ vmkdir usr/lib
+ mv ${_destdir}/usr/lib/security ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 69df46542a..4f78eeb661 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,15 +1,15 @@
# Template file for 'libcap'
pkgname=libcap
-version=2.23
+version=2.24
revision=1
-hostmakedepends="gperf perl pam-devel"
-makedepends="pam-devel attr-devel"
+hostmakedepends="gperf perl"
+makedepends="attr-devel"
short_desc="POSIX.1e capabilities suite"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://sites.google.com/site/fullycapable/"
license="GPL-2"
-distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
-checksum=deebc3b9ff44760a281feb4b379adacc641f5e90999089feb3d7717862242355
+distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.xz"
+checksum=cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65
do_build() {
make CC="$CC" BUILD_CC=cc
@@ -20,12 +20,11 @@ do_install() {
SBINDIR=${DESTDIR}/usr/sbin LIBDIR=${DESTDIR}/usr/lib \
RAISE_SETFCAP=no PKGCONFIGDIR=${DESTDIR}/usr/lib/pkgconfig install
- vinstall pam_cap/capability.conf 644 etc/security
chmod 755 ${DESTDIR}/usr/lib/libcap.so.*
}
libcap-devel_package() {
- depends="libcap>=${version}"
+ depends="libcap>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -36,15 +35,6 @@ libcap-devel_package() {
}
}
-libcap-pam_package() {
- conf_files="/etc/security/capability.conf"
- short_desc+=" - PAM module"
- pkg_install() {
- vmove usr/lib/security
- vmove etc
- }
-}
-
libcap-progs_package() {
short_desc+=" - utilities"
pkg_install() {
@@ -52,9 +42,3 @@ libcap-progs_package() {
vmove usr/share
}
}
-
-libcap_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libcddb/template b/srcpkgs/libcddb/template
index 8a426d3c62..43ed390df0 100644
--- a/srcpkgs/libcddb/template
+++ b/srcpkgs/libcddb/template
@@ -25,9 +25,3 @@ libcddb-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libcddb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcdio/template b/srcpkgs/libcdio/template
index 3645dc9559..16939f3c25 100644
--- a/srcpkgs/libcdio/template
+++ b/srcpkgs/libcdio/template
@@ -37,9 +37,3 @@ libcdio-devel_package() {
vmove usr/share
}
}
-
-libcdio_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template
index 29454a7c4f..34d5056e28 100644
--- a/srcpkgs/libcec/template
+++ b/srcpkgs/libcec/template
@@ -43,9 +43,3 @@ libcec-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libcec_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template
index d97dba1de2..adc0a8d1ce 100644
--- a/srcpkgs/libcgroup/template
+++ b/srcpkgs/libcgroup/template
@@ -22,15 +22,9 @@ fi
libcgroup-devel_package() {
depends="libcgroup>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-libcgroup_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template
index 699ee9247d..117c6d3d3f 100644
--- a/srcpkgs/libchamplain/template
+++ b/srcpkgs/libchamplain/template
@@ -31,9 +31,3 @@ libchamplain-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libchamplain_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libconfig/template b/srcpkgs/libconfig/template
index 5a67c77f1c..ef058fbd4a 100644
--- a/srcpkgs/libconfig/template
+++ b/srcpkgs/libconfig/template
@@ -29,7 +29,7 @@ libconfig++-devel_package() {
libconfig-devel_package() {
depends="libconfig>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -37,9 +37,3 @@ libconfig-devel_package() {
vmove usr/share
}
}
-
-libconfig_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcprops/template b/srcpkgs/libcprops/template
index aaf7123f66..a24a21cff6 100644
--- a/srcpkgs/libcprops/template
+++ b/srcpkgs/libcprops/template
@@ -18,16 +18,10 @@ fi
libcprops-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove usr/share
}
}
-
-libcprops_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcroco/template b/srcpkgs/libcroco/template
index 258a17004e..209658843b 100644
--- a/srcpkgs/libcroco/template
+++ b/srcpkgs/libcroco/template
@@ -1,7 +1,7 @@
# Template build file for 'libcroco'.
pkgname=libcroco
version=0.6.8
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libglib-devel libxml2-devel"
@@ -11,26 +11,16 @@ license="LGPL-2.1"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
checksum=ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570
-long_desc="
- The Libcroco project is a generic Cascading Style Sheet (CSS)
- parsing and manipulation toolkit. It provides a Simple Api for CSS
- and Cascading Style Sheet Object Model parser, a CSS2 selection
- engine, and an XML/CSS layout/rendering engine."
libcroco-devel_package() {
- depends="glib-devel libxml2-devel ${sourcepkg}-${version}_${revision}"
- short_desc="${short_desc} -- development files"
+ depends="glib-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
vmove "usr/bin/croco-*config"
}
}
-
-libcroco_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 4f9e6f0657..2cd3d96517 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -8,6 +8,7 @@ configure_args="--disable-static --disable-update-mime-database
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="libSM-devel dbus-glib-devel gtk+3-devel>=3.8 gpgme-devel
libnotify-devel libgnome-keyring-devel>=3.10 gnupg"
+depends="hicolor-icon-theme libgnome-keyring>=3.10 gnupg"
short_desc="GNOME Interface components for OpenPGP"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -29,10 +30,3 @@ libcryptui-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libcryptui_package() {
- depends="hicolor-icon-theme libgnome-keyring>=3.10 gnupg"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template
index b965998a0b..d912234d69 100644
--- a/srcpkgs/libcss/template
+++ b/srcpkgs/libcss/template
@@ -47,9 +47,3 @@ libcss-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libcss_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libcxx-devel b/srcpkgs/libcxx-devel
new file mode 120000
index 0000000000..37fa9ff85c
--- /dev/null
+++ b/srcpkgs/libcxx-devel
@@ -0,0 +1 @@
+libcxx
\ No newline at end of file
diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template
new file mode 100644
index 0000000000..8e02ac75f1
--- /dev/null
+++ b/srcpkgs/libcxx/template
@@ -0,0 +1,21 @@
+# Template file for 'libcxx'
+pkgname=libcxx
+version=3.4
+revision=1
+build_style=cmake
+hostmakedepends="cmake"
+short_desc="New implementation of the C++ standard library, targeting C++11"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://libcxx.llvm.org"
+license="BSD"
+distfiles="http://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.gz"
+checksum=bd9f200279f0eb19fc28ed2d9d607dfd38e2e7d92bf52e7fb2161f89212e0deb
+
+libcxx-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libdaemon/template b/srcpkgs/libdaemon/template
index e2bd3f87bf..6674b78609 100644
--- a/srcpkgs/libdaemon/template
+++ b/srcpkgs/libdaemon/template
@@ -17,16 +17,10 @@ fi
libdaemon-devel_package() {
depends="libdaemon-${version}_${revision}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share
}
}
-
-libdaemon_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libdbusmenu-qt/template b/srcpkgs/libdbusmenu-qt/template
index eb92259db6..d81c4a492e 100644
--- a/srcpkgs/libdbusmenu-qt/template
+++ b/srcpkgs/libdbusmenu-qt/template
@@ -20,9 +20,3 @@ libdbusmenu-qt-devel_package() {
vmove usr/share/doc
}
}
-
-libdbusmenu-qt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libdca/template b/srcpkgs/libdca/template
index 850e031477..c0287247c1 100644
--- a/srcpkgs/libdca/template
+++ b/srcpkgs/libdca/template
@@ -31,9 +31,3 @@ libdca-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libdca_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libdiscid/template b/srcpkgs/libdiscid/template
index 9bd5b19670..e40fc8b033 100644
--- a/srcpkgs/libdiscid/template
+++ b/srcpkgs/libdiscid/template
@@ -24,9 +24,3 @@ libdiscid-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libdiscid_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libdmapsharing/template b/srcpkgs/libdmapsharing/template
index 3c4dcd2721..aff7738842 100644
--- a/srcpkgs/libdmapsharing/template
+++ b/srcpkgs/libdmapsharing/template
@@ -29,9 +29,3 @@ libdmapsharing-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libdmapsharing_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libdmx/template b/srcpkgs/libdmx/template
index f9c5084d99..d90966cf3c 100644
--- a/srcpkgs/libdmx/template
+++ b/srcpkgs/libdmx/template
@@ -22,9 +22,3 @@ libdmx-devel_package() {
vmove usr/share
}
}
-
-libdmx_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
index ed7bc1a2b8..dcbdb0f423 100644
--- a/srcpkgs/libdom/template
+++ b/srcpkgs/libdom/template
@@ -15,7 +15,6 @@ long_desc="
be suitable for use in other projects too. For further details,
see the readme."
-
do_fetch() {
local url="svn://svn.netsurf-browser.org/trunk/libdom"
msg_normal " Fetching source from $url (revision ${_svnrev}) ...\n"
@@ -45,9 +44,3 @@ libdom-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libdom_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libdri2-devel-git b/srcpkgs/libdri2-devel-git
new file mode 120000
index 0000000000..c9920e403e
--- /dev/null
+++ b/srcpkgs/libdri2-devel-git
@@ -0,0 +1 @@
+libdri2-git
\ No newline at end of file
diff --git a/srcpkgs/libdri2-git/template b/srcpkgs/libdri2-git/template
new file mode 100644
index 0000000000..15e8c390ca
--- /dev/null
+++ b/srcpkgs/libdri2-git/template
@@ -0,0 +1,36 @@
+# Template file for 'libdri2-git'
+pkgname=libdri2-git
+version=20140127
+revision=1
+build_style=gnu-configure
+configure_args="--enable-malloc0returnsnull"
+hostmakedepends="automake libtool pkg-config xorg-util-macros"
+makedepends="dri2proto libXfixes-devel libXext-devel libdrm-devel"
+short_desc="Library for the DRI2 extension to the X Window System"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="MIT"
+homepage="https://github.com/robclark/libdri2"
+
+provides="libdri2-1.0_1"
+replaces="libdri2>=0"
+
+do_fetch() {
+ git clone git://github.com/robclark/libdri2 ${pkgname}-${version}
+}
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+libdri2-devel-git_package() {
+ short_desc+=" - development files"
+ depends="libX11-devel libXext-devel ${sourcepkg}>=${version}_${revision}"
+ provides="libdri2-devel-1.0_1"
+ replaces="libdri2-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
+}
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 88f66674d1..f8c9a515b9 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
# Template build file for 'libdrm'.
pkgname=libdrm
-version=2.4.50
+version=2.4.52
revision=1
build_style=gnu-configure
configure_args="--enable-udev"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://dri.freedesktop.org/"
license="MIT"
distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
-checksum=3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045
+checksum=fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1
pre_configure() {
sed -e '/pthread-stubs/d' -i configure.ac
@@ -28,9 +28,3 @@ libdrm-devel_package() {
#vmove usr/share/man/man3
}
}
-
-libdrm_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libdvbpsi/template b/srcpkgs/libdvbpsi/template
index c07c232e51..f86d78cc0c 100644
--- a/srcpkgs/libdvbpsi/template
+++ b/srcpkgs/libdvbpsi/template
@@ -20,9 +20,3 @@ libdvbpsi-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libdvbpsi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libdvdcss/template b/srcpkgs/libdvdcss/template
index 26dc1d3fe0..ea5d8354ff 100644
--- a/srcpkgs/libdvdcss/template
+++ b/srcpkgs/libdvdcss/template
@@ -15,16 +15,10 @@ long_desc="
libdvdcss-devel_package() {
depends="libdvdcss>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-libdvdcss_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libdvdnav/template b/srcpkgs/libdvdnav/template
index 3182fb9883..411c5ee69b 100644
--- a/srcpkgs/libdvdnav/template
+++ b/srcpkgs/libdvdnav/template
@@ -31,9 +31,3 @@ libdvdnav-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libdvdnav_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libdvdread/template b/srcpkgs/libdvdread/template
index fd8a216057..0d0845335c 100644
--- a/srcpkgs/libdvdread/template
+++ b/srcpkgs/libdvdread/template
@@ -26,9 +26,3 @@ libdvdread-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libdvdread_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libeatmydata/template b/srcpkgs/libeatmydata/template
index 921139bb95..0bb526c2c6 100644
--- a/srcpkgs/libeatmydata/template
+++ b/srcpkgs/libeatmydata/template
@@ -9,9 +9,3 @@ license="GPL-3"
homepage="http://www.flamingspork.com/projects/libeatmydata/"
distfiles="http://www.flamingspork.com/projects/libeatmydata/${pkgname}-${version}.tar.gz"
checksum=8a16c1ff04aeceed1891e2772728359d3368347e1807bed60fc6147d8968d5c1
-
-libeatmydata_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libebml/template b/srcpkgs/libebml/template
index 8c40f1f21e..f20f2a520d 100644
--- a/srcpkgs/libebml/template
+++ b/srcpkgs/libebml/template
@@ -28,9 +28,3 @@ libebml-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libebml_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template
index 9dbb6e4276..4d1dad3297 100644
--- a/srcpkgs/libedit/template
+++ b/srcpkgs/libedit/template
@@ -25,9 +25,3 @@ libedit-devel_package() {
vmove usr/share/man/man3
}
}
-
-libedit_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libee/template b/srcpkgs/libee/template
index 0e9a650725..0175ca4a87 100644
--- a/srcpkgs/libee/template
+++ b/srcpkgs/libee/template
@@ -24,9 +24,3 @@ libee-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libee_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libepc/template b/srcpkgs/libepc/template
index 99bb34791e..dbe394d85b 100644
--- a/srcpkgs/libepc/template
+++ b/srcpkgs/libepc/template
@@ -24,16 +24,10 @@ long_desc="
libepc-devel_package() {
depends="gtk+3-devel avahi-glib-libs-devel libsoup-devel libepc>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share/gtk-doc
vmove usr/lib/pkgconfig
}
}
-
-libepc_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template
index 7379e5f470..9b0bbc5b78 100644
--- a/srcpkgs/liberation-fonts-ttf/template
+++ b/srcpkgs/liberation-fonts-ttf/template
@@ -2,6 +2,10 @@
pkgname=liberation-fonts-ttf
version=2.00.0
revision=2
+makedepends="font-util xbps-triggers>=0.58"
+depends="${makedepends}"
+noarch="yes"
+font_dirs="/usr/share/fonts/TTF"
short_desc="TrueType fonts from RedHat"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, ${pkgname}"
@@ -9,8 +13,6 @@ homepage="http://www.redhat.com/promo/fonts/"
distfiles="https://fedorahosted.org/releases/l/i/liberation-fonts/${pkgname}-${version}.tar.gz"
checksum=3b7214e7352b8e4990c71018031ecb0f40d6793f140d7a956d7345997c8c5100
-makedepends="font-util xbps-triggers>=0.58"
-
do_install() {
vmkdir usr/share/fonts/TTF
install -m644 *.ttf ${DESTDIR}/usr/share/fonts/TTF
@@ -25,12 +27,3 @@ do_install() {
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-liberation-fonts-ttf_package() {
- depends="${makedepends}"
- noarch="yes"
- font_dirs="/usr/share/fonts/TTF"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 956ab5a097..4ecdc37a34 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -14,7 +14,7 @@ checksum=d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b
libesmtp-devel_package() {
depends="libesmtp>=${version}"
- short_desc="Manage submission of emails using SMTP protocol - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/bin/libesmtp-config
vmove usr/include
@@ -22,9 +22,3 @@ libesmtp-devel_package() {
vmove "usr/lib/esmtp-plugins/*.a"
}
}
-
-libesmtp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libestr/template b/srcpkgs/libestr/template
index b7417ba951..945aae4596 100644
--- a/srcpkgs/libestr/template
+++ b/srcpkgs/libestr/template
@@ -21,9 +21,3 @@ libestr-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libestr_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libev/template b/srcpkgs/libev/template
index f23e65ba6c..3ea4d7f5ac 100644
--- a/srcpkgs/libev/template
+++ b/srcpkgs/libev/template
@@ -22,15 +22,9 @@ post_install() {
libev-devel_package() {
depends="libev>=${version}"
- short_desc="${short_desc} -- Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
}
}
-
-libev_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libevdev/template b/srcpkgs/libevdev/template
index c81bc7ecb5..963f2c4f0f 100644
--- a/srcpkgs/libevdev/template
+++ b/srcpkgs/libevdev/template
@@ -1,6 +1,6 @@
# Template file for 'libevdev'
pkgname=libevdev
-version=0.4
+version=0.6
revision=1
build_style=gnu-configure
configure_args="--disable-gcov"
@@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="http://www.freedesktop.org/wiki/Software/libevdev/"
distfiles="http://freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
-checksum=ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42
+checksum=1c562ed32252ef9c14aa61e03b38acb886cb3edbbdafbb5181762ff16e010d93
libevdev-devel_package() {
short_desc+=" - development files"
@@ -22,9 +22,3 @@ libevdev-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libevdev_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 8fadd341e8..f9e30987fa 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -15,16 +15,10 @@ checksum=22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5
libevent-devel_package() {
depends="openssl-devel libevent>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/bin
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-libevent_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libewf/template b/srcpkgs/libewf/template
index 678c950ee9..183eed9430 100644
--- a/srcpkgs/libewf/template
+++ b/srcpkgs/libewf/template
@@ -19,9 +19,3 @@ libewf-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libewf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libexif/template b/srcpkgs/libexif/template
index f2bc2415b7..3511ecceb3 100644
--- a/srcpkgs/libexif/template
+++ b/srcpkgs/libexif/template
@@ -24,9 +24,3 @@ libexif-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libexif_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index 714af82c48..a0646e3346 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -13,16 +13,10 @@ checksum=4e6d4541f213c9ab42ea94d49c2573f0a6f54b04f14668530960f1424b04f722
libfetch-devel_package() {
depends="openssl-devel libfetch>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share
vmove "usr/lib/*.a"
}
}
-
-libfetch_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libffi/template b/srcpkgs/libffi/template
index 6b71943660..ddea79da09 100644
--- a/srcpkgs/libffi/template
+++ b/srcpkgs/libffi/template
@@ -20,7 +20,7 @@ post_install() {
libffi-devel_package() {
depends="libffi>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
@@ -28,9 +28,3 @@ libffi-devel_package() {
vmove usr/share
}
}
-
-libffi_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libfm/template b/srcpkgs/libfm/template
index aa5ced9e6c..c93b4e0bfa 100644
--- a/srcpkgs/libfm/template
+++ b/srcpkgs/libfm/template
@@ -1,35 +1,33 @@
# Template file for 'libfm'
pkgname=libfm
-version=1.1.0
-revision=2
+version=1.1.2.2
+revision=1
build_style=gnu-configure
configure_args="--enable-udisks --disable-static"
+hostmakedepends="automake glib-devel gtk-doc gettext-devel libtool pkg-config intltool"
+makedepends="libexif-devel dbus-glib-devel gtk+-devel menu-cache-devel vala-devel udisks"
+depends="desktop-file-utils udisks"
+conf_files="
+ /etc/xdg/libfm/libfm.conf
+ /etc/xdg/libfm/pref-apps.conf"
short_desc="LXDE GLib/GIO based library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pcmanfm.sourceforge.net/"
license="GPL-2"
distfiles="${SOURCEFORGE_SITE}/pcmanfm/$pkgname-$version.tar.gz"
-checksum=b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d
+checksum=158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682
-hostmakedepends="pkg-config intltool"
-makedepends="libexif-devel dbus-glib-devel gtk+-devel
- menu-cache-devel vala-devel"
+pre_configure() {
+ sed -e '/AM_INIT_AUTOMAKE/s/foreign/& subdir-objects/' -i configure.ac
+ autoreconf -fi
+}
libfm-devel_package() {
- depends="gtk+-devel menu-cache-devel libfm-${version}_${revision}"
+ depends="gtk+-devel menu-cache-devel libfm>=${version}_${revision}"
short_desc+=" -- development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-libfm_package() {
- conf_files="
- /etc/xdg/libfm/libfm.conf
- /etc/xdg/libfm/pref-apps.conf"
- depends="desktop-file-utils udisks"
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template
index e4a06d690e..db310b740b 100644
--- a/srcpkgs/libglade/template
+++ b/srcpkgs/libglade/template
@@ -1,44 +1,30 @@
# Template build file for 'libglade'.
pkgname=libglade
version=2.6.4
-revision=10
+revision=11
build_style=gnu-configure
configure_args="--disable-static --without-xml-catalog"
hostmakedepends="pkg-config python"
makedepends="libxml2-devel gtk+-devel xmlcatmgr"
+depends="xmlcatmgr"
short_desc="Runtime interpreter for GLADE GUI files"
homepage="http://www.jamesh.id.au/software/libglade/"
license="LGPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
-long_desc="
- Libglade is a library that performs a similar job to the C source
- output routines in the GLADE user interface builder. Whereas GLADE's
- output routines create C code that can then be compiled, libglade builds
- the interface from an XML file (GLADE's save format) at runtime. This
- way you can change the look of a program without needing to recompile.
- Currently it supports all the widgets in current releases, together
- with support for keyboard accelerators and automatic signal
- connection."
+# Register DTDs with xmlcatmgr.
+xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
libglade-devel_package() {
- depends="libxml2-devel gtk+-devel ${sourcepkg}-${version}_${revision}"
+ depends="libxml2-devel gtk+-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" -- development files"
pkg_install() {
vmove usr/bin
vmove usr/include
vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
}
}
-
-libglade_package() {
- # Register DTDs with xmlcatmgr.
- xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
- depends="xmlcatmgr"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index ca419b7ba3..efb0a429e1 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -24,9 +24,3 @@ libgpg-error-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libgpg-error_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libgphoto2/template b/srcpkgs/libgphoto2/template
index 0510dc94ae..752e15e2e0 100644
--- a/srcpkgs/libgphoto2/template
+++ b/srcpkgs/libgphoto2/template
@@ -39,9 +39,3 @@ libgphoto2-devel_package() {
vmove usr/share/man/man3
}
}
-
-libgphoto2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template
index 6b9620f259..da9641d7c8 100644
--- a/srcpkgs/libgsf/template
+++ b/srcpkgs/libgsf/template
@@ -24,9 +24,3 @@ libgsf-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-libgsf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libgsm/template b/srcpkgs/libgsm/template
index d88aeeb4e4..6d62e83ca8 100644
--- a/srcpkgs/libgsm/template
+++ b/srcpkgs/libgsm/template
@@ -42,9 +42,3 @@ libgsm-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libgsm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libgssglue/template b/srcpkgs/libgssglue/template
index ce46080e27..6f8933ca04 100644
--- a/srcpkgs/libgssglue/template
+++ b/srcpkgs/libgssglue/template
@@ -4,6 +4,7 @@ version=0.4
revision=4
build_style=gnu-configure
configure_args="--disable-static ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
+conf_files="/etc/gssapi_mech.conf"
short_desc="Mechanism-switch gssapi library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -23,10 +24,3 @@ libgssglue-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libgssglue_package() {
- conf_files="/etc/gssapi_mech.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libgtop/template b/srcpkgs/libgtop/template
index c89d0cd7e5..c4bcd2703a 100644
--- a/srcpkgs/libgtop/template
+++ b/srcpkgs/libgtop/template
@@ -31,9 +31,3 @@ libgtop-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-libgtop_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 8853431037..3cee69ced6 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -1,7 +1,7 @@
# Template file for 'libgudev'
. ${XBPS_SRCPKGDIR}/systemd/template
-unset -f systemd_package systemd-libs_package systemd-devel_package
+unset -f systemd-libs_package systemd-devel_package
unset -f libudev_package libudev-devel_package post_install
pkgname=libgudev
@@ -9,10 +9,31 @@ version=208
revision=5
wrksrc="systemd-${version}"
configure_args+=" --enable-gudev --with-python"
-short_desc="GUdev shared library"
hostmakedepends+=" glib-devel python-devel"
makedepends+=" libglib-devel python-devel"
+short_desc="GObject-based wrapper library for libudev"
+depends="libudev>=${version}"
+
+do_install() {
+ # We are only interested in gudev and python bindings.
+ make DESTDIR=${wrksrc}/install_gudev install
+
+ vmkdir usr/lib/pkgconfig
+ vmkdir usr/include
+ vmkdir usr/share
+
+ mv install_gudev/usr/lib/libgudev* ${DESTDIR}/usr/lib
+ if [ -d install_gudev/usr/lib/girepository-1.0 ]; then
+ mv install_gudev/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
+ fi
+ mv install_gudev/usr/include/gudev* ${DESTDIR}/usr/include
+ mv install_gudev/usr/lib/pkgconfig/gudev* ${DESTDIR}/usr/lib/pkgconfig
+ if [ -d install_gudev/usr/share/gir-1.0 ]; then
+ mv install_gudev/usr/share/gir-1.0 ${DESTDIR}/usr/share
+ fi
+ mv install_gudev/usr/lib/python* ${DESTDIR}/usr/lib
+}
# Package build options
build_options="gir"
@@ -30,17 +51,6 @@ else
configure_args+=" --disable-introspection"
fi
-libgudev_package() {
- short_desc="GObject-based wrapper library for libudev"
- depends="libudev>=${version}"
- pkg_install() {
- vmove "usr/lib/libgudev*.so.*"
- if [ "$build_option_gir" ]; then
- vmove usr/lib/girepository-1.0
- fi
- }
-}
-
libgudev-devel_package() {
depends="libglib-devel libudev-devel libgudev>=${version}_${revision}"
short_desc="GObject-based wrapper library for libudev - development files"
diff --git a/srcpkgs/libguess/template b/srcpkgs/libguess/template
index 9090f4dffa..10cfcbf328 100644
--- a/srcpkgs/libguess/template
+++ b/srcpkgs/libguess/template
@@ -38,9 +38,3 @@ libguess-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libguess_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index e0e05a8bfe..bde5498234 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -21,16 +21,10 @@ long_desc="
libgusb-devel_package() {
depends="libudev-devel ${sourcepkg}-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share
vmove usr/lib/pkgconfig
}
}
-
-libgusb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index e686bc3eae..db9bcc80d1 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -7,6 +7,7 @@ configure_args="--disable-schemas-compile
--enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="libxml2-devel libsoup-gnome-devel>=2.44 gtk+3-devel>=3.10 vala-devel gnome-icon-theme"
+depends="libsoup-gnome>=2.44 gnome-icon-theme"
short_desc="GNOME Weather information access library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -30,10 +31,3 @@ libgweather-devel_package() {
vmove usr/share/vala
}
}
-
-libgweather_package() {
- depends="libsoup-gnome>=2.44 gnome-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index d7ed680d57..1031b93b8e 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -23,9 +23,3 @@ libgxps-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libgxps_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template
index a99677ae83..a93b8669f1 100644
--- a/srcpkgs/libhubbub/template
+++ b/srcpkgs/libhubbub/template
@@ -54,9 +54,3 @@ libhubbub-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libhubbub_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 3807f9415d..e89c375a39 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -26,9 +26,3 @@ libical-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libical_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template
index a1db7a01af..6f1a440d72 100644
--- a/srcpkgs/libid3tag/template
+++ b/srcpkgs/libid3tag/template
@@ -28,9 +28,3 @@ libid3tag-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libid3tag_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template
index e19e3d2a4f..b5465cd73a 100644
--- a/srcpkgs/libidn/template
+++ b/srcpkgs/libidn/template
@@ -1,10 +1,10 @@
# Template build file for 'libidn'.
pkgname=libidn
version=1.28
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-csharp --disable-java --disable-static --enable-threads=posix"
-hostmakedepends="perl pkg-config automake"
+hostmakedepends="perl pkg-config automake libtool gettext-devel"
short_desc="Internationalized string handling library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/libidn/"
@@ -12,8 +12,12 @@ license="GPL-3, LGPL-2.1"
distfiles="http://ftp.gnu.org/gnu/libidn/libidn-${version}.tar.gz"
checksum=dd357a968449abc97c7e5fa088a4a384de57cb36564f9d4e0d898ecc6373abfb
+pre_configure() {
+ autoreconf -fi
+}
+
libidn-devel_package() {
- depends="libidn>=${version}"
+ depends="libidn>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -24,9 +28,3 @@ libidn-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libidn_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libieee1284/template b/srcpkgs/libieee1284/template
index 10bcaf8eb5..30c2ac3778 100644
--- a/srcpkgs/libieee1284/template
+++ b/srcpkgs/libieee1284/template
@@ -17,15 +17,9 @@ long_desc="
libieee1284-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share
}
}
-
-libieee1284_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libiodbc/template b/srcpkgs/libiodbc/template
index 48bb8fd123..c6b8e2977c 100644
--- a/srcpkgs/libiodbc/template
+++ b/srcpkgs/libiodbc/template
@@ -29,9 +29,3 @@ libiodbc-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libiodbc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libiptcdata/template b/srcpkgs/libiptcdata/template
index 820318edcf..63c4d6878e 100644
--- a/srcpkgs/libiptcdata/template
+++ b/srcpkgs/libiptcdata/template
@@ -18,16 +18,10 @@ long_desc="
libiptcdata-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gtk-doc
}
}
-
-libiptcdata_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libisofs/template b/srcpkgs/libisofs/template
index dc1c4fd25e..479119e26a 100644
--- a/srcpkgs/libisofs/template
+++ b/srcpkgs/libisofs/template
@@ -21,9 +21,3 @@ libisofs-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libisofs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 593b2c0e1b..1a8827eec5 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -7,6 +7,8 @@ configure_args="--disable-static --with-jpeg8"
if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
hostmakedepends="nasm"
fi
+provides="jpeg-8"
+replaces="jpeg>=0"
short_desc="Derivative of libjpeg which uses SIMD instructions"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -43,11 +45,3 @@ libjpeg-turbo-tools_package() {
vmove usr/share/man
}
}
-
-libjpeg-turbo_package() {
- provides="jpeg-8"
- replaces="jpeg>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libkexiv2/template b/srcpkgs/libkexiv2/template
index e4b1a56b55..1b5f087d69 100644
--- a/srcpkgs/libkexiv2/template
+++ b/srcpkgs/libkexiv2/template
@@ -21,9 +21,3 @@ libkexiv2-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libkexiv2_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index d31684a34d..350dc64a0a 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -23,9 +23,3 @@ libkgapi-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libkgapi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index 61866df82b..24d8f47945 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -20,9 +20,3 @@ libktorrent-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libktorrent_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libldap/template b/srcpkgs/libldap/template
index e680ac73e7..35f33708c1 100644
--- a/srcpkgs/libldap/template
+++ b/srcpkgs/libldap/template
@@ -10,6 +10,7 @@ configure_args="--enable-dynamic --enable-proctitle --with-tls
--with-yielding_select=yes ac_cv_func_memcmp_working=yes"
hostmakedepends="pkg-config groff automake libtool"
makedepends="libsasl-devel openssl-devel"
+conf_files="/etc/openldap/ldap.conf"
short_desc="OpenLDAP (Lightweight Directory Access Protocol) libraries"
license="OpenLDAP License v2.8 - BSD alike"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -45,10 +46,3 @@ libldap-devel_package() {
vmove usr/share/man/man3
}
}
-
-libldap_package() {
- conf_files="/etc/openldap/ldap.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/liblo/template b/srcpkgs/liblo/template
index d34f764970..2ddebfb44f 100644
--- a/srcpkgs/liblo/template
+++ b/srcpkgs/liblo/template
@@ -21,9 +21,3 @@ liblo-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-liblo_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/liblrdf/template b/srcpkgs/liblrdf/template
index 5354faf010..75243b4451 100644
--- a/srcpkgs/liblrdf/template
+++ b/srcpkgs/liblrdf/template
@@ -18,16 +18,10 @@ pre_configure() {
liblrdf-devel_package() {
depends="raptor-devel liblrdf>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig
}
}
-
-liblrdf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmad/template b/srcpkgs/libmad/template
index 428e21cc38..76bc06483f 100644
--- a/srcpkgs/libmad/template
+++ b/srcpkgs/libmad/template
@@ -40,16 +40,10 @@ pre_configure() {
libmad-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig
}
}
-
-libmad_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index b202fc95e7..793ed741cf 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -29,9 +29,3 @@ libmatroska-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libmatroska_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template
index fbcedd2a67..d2699f05bb 100644
--- a/srcpkgs/libmbim/template
+++ b/srcpkgs/libmbim/template
@@ -23,9 +23,3 @@ libmbim-devel_package() {
vmove usr/share
}
}
-
-libmbim_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmcrypt/template b/srcpkgs/libmcrypt/template
index 26321d8122..73d0fbc7a7 100644
--- a/srcpkgs/libmcrypt/template
+++ b/srcpkgs/libmcrypt/template
@@ -28,9 +28,3 @@ libmcrypt-devel_package() {
vmove usr/share
}
}
-
-libmcrypt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template
index 2aa81b4370..df62e7da98 100644
--- a/srcpkgs/libmicrohttpd/template
+++ b/srcpkgs/libmicrohttpd/template
@@ -1,6 +1,6 @@
# Template file for 'libmicrohttpd'
pkgname=libmicrohttpd
-version=0.9.27
+version=0.9.33
revision=1
build_style=gnu-configure
makedepends="libgcrypt-devel gnutls-devel"
@@ -9,21 +9,16 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/libmicrohttpd/"
license="LGPL-2.1"
distfiles="http://ftp.gnu.org/gnu/libmicrohttpd/${pkgname}-${version}.tar.gz"
-checksum=d532edf64c3a9da472114c2d10fc94606e3b31f21b883ec2e796ab8478f7e9cb
+checksum=d9587e8497548f820650cd607daf3615ea3272435779378983032c570f1cd559
libmicrohttpd-devel_package() {
- depends="libgcrypt-devel ${sourcepkg}>=${version}"
+ depends="libgcrypt-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" -- development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/share
}
}
-
-libmicrohttpd_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmikmod/template b/srcpkgs/libmikmod/template
index a7a629c68c..730d40585e 100644
--- a/srcpkgs/libmikmod/template
+++ b/srcpkgs/libmikmod/template
@@ -22,9 +22,3 @@ libmikmod-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libmikmod_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libmms/template b/srcpkgs/libmms/template
index 0e9267c94f..6250d8875b 100644
--- a/srcpkgs/libmms/template
+++ b/srcpkgs/libmms/template
@@ -25,9 +25,3 @@ libmms-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libmms_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmng/template b/srcpkgs/libmng/template
index 3d88cc39fd..fe377560ef 100644
--- a/srcpkgs/libmng/template
+++ b/srcpkgs/libmng/template
@@ -28,9 +28,3 @@ libmng-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libmng_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libmodplug/template b/srcpkgs/libmodplug/template
index 7a8c00c36b..925fdb8f30 100644
--- a/srcpkgs/libmodplug/template
+++ b/srcpkgs/libmodplug/template
@@ -26,9 +26,3 @@ libmodplug-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libmodplug_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 851376ce44..800b65e658 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -23,9 +23,3 @@ libmowgli-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libmowgli_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmp4v2/template b/srcpkgs/libmp4v2/template
index aac1f40314..a080cee9c4 100644
--- a/srcpkgs/libmp4v2/template
+++ b/srcpkgs/libmp4v2/template
@@ -14,19 +14,13 @@ checksum=0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338
libmp4v2-devel_package() {
depends="libmp4v2>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
}
}
-libmp4v2_package() {
- pkg_install() {
- vmove "usr/lib/*.so*"
- }
-}
-
mpeg4ip_package() {
short_desc="MPEG-4 tools from mpeg4ip"
pkg_install() {
diff --git a/srcpkgs/libmpc/template b/srcpkgs/libmpc/template
index 4a3a58827d..cc22c62278 100644
--- a/srcpkgs/libmpc/template
+++ b/srcpkgs/libmpc/template
@@ -1,17 +1,18 @@
# Template build file for 'libmpc'
pkgname=libmpc
-version=1.0.1
-revision=3
+version=1.0.2
+revision=1
wrksrc="mpc-${version}"
build_style=gnu-configure
configure_args="EGREP=egrep"
makedepends="gmp-devel mpfr-devel"
+replaces="mpc-0.9_2"
short_desc="C library for the arithmetic of complex numbers"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.multiprecision.org"
license="LGPL-3"
distfiles="http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz"
-checksum=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff
+checksum=b561f54d8a479cee3bc891ee52735f18ff86712ba30f036f8b8537bae380c488
post_install() {
mv ${DESTDIR}/usr/share/info/{mpc,libmpc}.info
@@ -19,7 +20,7 @@ post_install() {
libmpc-devel_package() {
replaces="mpc-devel>=0"
- depends="gmp-devel mpfr-devel libmpc-${version}_${revision}"
+ depends="gmp-devel mpfr-devel libmpc>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -28,10 +29,3 @@ libmpc-devel_package() {
vmove usr/share
}
}
-
-libmpc_package() {
- replaces="mpc-0.9_2"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmpcdec/template b/srcpkgs/libmpcdec/template
index c55f8ab00d..31de2df7d0 100644
--- a/srcpkgs/libmpcdec/template
+++ b/srcpkgs/libmpcdec/template
@@ -22,15 +22,9 @@ long_desc="
libmpcdec-devel_package() {
depends="libmpcdec>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
}
}
-
-libmpcdec_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmpdclient/template b/srcpkgs/libmpdclient/template
index c8bd30942b..75ac1fd649 100644
--- a/srcpkgs/libmpdclient/template
+++ b/srcpkgs/libmpdclient/template
@@ -22,9 +22,3 @@ libmpdclient-devel_package() {
vmove usr/share/vala
}
}
-
-libmpdclient_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libmpeg2/template b/srcpkgs/libmpeg2/template
index 722baac7d4..8f84bee217 100644
--- a/srcpkgs/libmpeg2/template
+++ b/srcpkgs/libmpeg2/template
@@ -31,9 +31,3 @@ mpeg2dec_package() {
vmove usr/share
}
}
-
-libmpeg2_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index b04d2941b8..71e84037ec 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -38,9 +38,3 @@ libmtp-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libmtp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libmusicbrainz/template b/srcpkgs/libmusicbrainz/template
index 444329beb2..d9bdbc773f 100644
--- a/srcpkgs/libmusicbrainz/template
+++ b/srcpkgs/libmusicbrainz/template
@@ -24,9 +24,3 @@ libmusicbrainz-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libmusicbrainz_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libmusicbrainz5/template b/srcpkgs/libmusicbrainz5/template
index 161c077619..b7ce073608 100644
--- a/srcpkgs/libmusicbrainz5/template
+++ b/srcpkgs/libmusicbrainz5/template
@@ -24,9 +24,3 @@ libmusicbrainz5-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libmusicbrainz5_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libnet/template b/srcpkgs/libnet/template
index 67d8be2ba5..5af850e049 100644
--- a/srcpkgs/libnet/template
+++ b/srcpkgs/libnet/template
@@ -28,9 +28,3 @@ libnet-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libnet_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template
index 3240cd21ee..a1461b315b 100644
--- a/srcpkgs/libnfs/template
+++ b/srcpkgs/libnfs/template
@@ -26,9 +26,3 @@ libnfs-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libnfs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libnfsidmap/template b/srcpkgs/libnfsidmap/template
index 5a5b5a0593..87b2575e71 100644
--- a/srcpkgs/libnfsidmap/template
+++ b/srcpkgs/libnfsidmap/template
@@ -26,9 +26,3 @@ libnfsidmap-devel_package() {
vmove usr/share/man/man3
}
}
-
-libnfsidmap_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index caa9bce93d..71dd8757da 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -33,9 +33,3 @@ libnice-devel_package() {
vmove usr/share
}
}
-
-libnice_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libnl/template b/srcpkgs/libnl/template
index 1ee5ace2ae..159f5b962a 100644
--- a/srcpkgs/libnl/template
+++ b/srcpkgs/libnl/template
@@ -24,9 +24,3 @@ libnl-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libnl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libnl3/template b/srcpkgs/libnl3/template
index 413c31556e..d44a572d23 100644
--- a/srcpkgs/libnl3/template
+++ b/srcpkgs/libnl3/template
@@ -6,6 +6,7 @@ wrksrc=libnl-${version}
build_style=gnu-configure
hostmakedepends="flex libtool"
makedepends="libfl-devel"
+conf_files="/etc/libnl/pktloc /etc/libnl/classid"
short_desc="Netlink Protocol Library Suite"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -36,10 +37,3 @@ libnl3-progs_package() {
vmove usr/lib/libnl
}
}
-
-libnl3_package() {
- conf_files="/etc/libnl/pktloc /etc/libnl/classid"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index 0bbe7633e6..3799561e3d 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -26,9 +26,3 @@ libnotify-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libnotify_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libnotmuch b/srcpkgs/libnotmuch
new file mode 120000
index 0000000000..67778b7eb3
--- /dev/null
+++ b/srcpkgs/libnotmuch
@@ -0,0 +1 @@
+notmuch
\ No newline at end of file
diff --git a/srcpkgs/libnotmuch-devel b/srcpkgs/libnotmuch-devel
new file mode 120000
index 0000000000..67778b7eb3
--- /dev/null
+++ b/srcpkgs/libnotmuch-devel
@@ -0,0 +1 @@
+notmuch
\ No newline at end of file
diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template
index 60f0d2b537..72103e0459 100644
--- a/srcpkgs/libnsbmp/template
+++ b/srcpkgs/libnsbmp/template
@@ -40,9 +40,3 @@ libnsbmp-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libnsbmp_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template
index 3a249defa2..88c581e6f0 100644
--- a/srcpkgs/libnsgif/template
+++ b/srcpkgs/libnsgif/template
@@ -39,9 +39,3 @@ libnsgif-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libnsgif_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/liboauth/template b/srcpkgs/liboauth/template
index e31f276a27..ffbf97c293 100644
--- a/srcpkgs/liboauth/template
+++ b/srcpkgs/liboauth/template
@@ -28,9 +28,3 @@ liboauth-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-liboauth_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libogg/template b/srcpkgs/libogg/template
index 5fa12b95b7..adbd2c5bc6 100644
--- a/srcpkgs/libogg/template
+++ b/srcpkgs/libogg/template
@@ -24,9 +24,3 @@ libogg-devel_package() {
vmove usr/share
}
}
-
-libogg_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/liboil/template b/srcpkgs/liboil/template
index ef0da84ed6..f9ff222c3c 100644
--- a/srcpkgs/liboil/template
+++ b/srcpkgs/liboil/template
@@ -29,9 +29,3 @@ liboil-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-liboil_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template
index ab45fe0a40..2cd1dd87f8 100644
--- a/srcpkgs/libopenal/template
+++ b/srcpkgs/libopenal/template
@@ -25,6 +25,8 @@ long_desc="
hostmakedepends="pkg-config cmake"
makedepends="alsa-lib-devel pulseaudio-devel SDL-devel ffmpeg-devel>=2.1"
+# dlopen(3)d dependencies
+depends="alsa-lib libpulseaudio SDL"
libopenal-devel_package() {
depends="${sourcepkg}>=${version}"
@@ -35,11 +37,3 @@ libopenal-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libopenal_package() {
- # dlopen(3)d dependencies
- depends="alsa-lib libpulseaudio SDL"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libopenobex-devel b/srcpkgs/libopenobex-devel
deleted file mode 120000
index 10a3245240..0000000000
--- a/srcpkgs/libopenobex-devel
+++ /dev/null
@@ -1 +0,0 @@
-openobex
\ No newline at end of file
diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template
index efd6ae0208..aea63506b1 100644
--- a/srcpkgs/libosinfo/template
+++ b/srcpkgs/libosinfo/template
@@ -27,9 +27,3 @@ libosinfo-devel_package() {
vmove usr/share/vala
}
}
-
-libosinfo_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libotr/template b/srcpkgs/libotr/template
index aa89431f69..233e34948c 100644
--- a/srcpkgs/libotr/template
+++ b/srcpkgs/libotr/template
@@ -30,9 +30,3 @@ libotr-devel_package() {
vmove usr/share/aclocal
}
}
-
-libotr_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libotr3/template b/srcpkgs/libotr3/template
index 57fdee7709..5ff5494ba1 100644
--- a/srcpkgs/libotr3/template
+++ b/srcpkgs/libotr3/template
@@ -39,9 +39,3 @@ libotr3-devel_package() {
vmove usr/share/aclocal
}
}
-
-libotr3_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
index 27ddd2ca1e..02ecf647f5 100644
--- a/srcpkgs/libparserutils/template
+++ b/srcpkgs/libparserutils/template
@@ -49,9 +49,3 @@ libparserutils-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libparserutils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template
index 6eb1776691..6c8dac71ba 100644
--- a/srcpkgs/libpcap/template
+++ b/srcpkgs/libpcap/template
@@ -1,37 +1,28 @@
# Template file for 'libpcap'
pkgname=libpcap
-version=1.5.1
-revision=2
+version=1.5.2
+revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --with-libnl --with-pcap=linux"
hostmakedepends="pkg-config flex libnl3-devel"
-makedepends="libfl-devel libnl3-devel dbus-devel"
+makedepends="libfl-devel libnl3-devel"
short_desc="System-independent interface for user-level packet capture"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.tcpdump.org/"
license="BSD"
distfiles="http://www.tcpdump.org/release/$pkgname-$version.tar.gz"
-checksum=259db4fe1e9f0b6b9c43a057ec5916dec7d0a821b00d6d6c4dff7db2445fa7e4
-long_desc="
- This is libpcap, a system-independent interface for user-level packet
- capture. libpcap provides a portable framework for low-level network
- monitoring. Applications include network statistics collection,
- security monitoring, network debugging, etc. Since almost every
- system vendor provides a different interface for packet capture, and
- since we've developed several tools that require this functionality,
- we've created this system-independent API to ease in porting and to
- alleviate the need for several system-dependent packet capture modules
- in each application."
+checksum=806d4ba23b126476d39a458ad1468f73dfe63c92f9586208f7e4e18c13e52ddd
post_install() {
vinstall LICENSE 644 usr/share/licenses/$pkgname
}
# Package build options
-build_options="bluetooth usb"
+build_options="bluetooth dbus usb"
build_options_default="usb"
desc_option_bluetooth="Enable support for bluetooth sniffing"
+desc_option_dbus="Enable support for dbus"
desc_option_usb="Enable support for USB sniffing"
if [ "$build_option_bluetooth" ]; then
@@ -41,6 +32,13 @@ else
configure_args+=" --disable-bluetooth"
fi
+if [ "$build_option_dbus" ]; then
+ configure_args+=" --enable-dbus"
+ makedepends+=" dbus-devel"
+else
+ configure_args+=" --disable-dbus"
+fi
+
if [ "$build_option_usb" ]; then
configure_args+=" --enable-canusb"
makedepends+=" libusb-devel"
@@ -59,9 +57,3 @@ libpcap-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libpcap_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libpciaccess/template b/srcpkgs/libpciaccess/template
index 97fdf4493d..27eb281314 100644
--- a/srcpkgs/libpciaccess/template
+++ b/srcpkgs/libpciaccess/template
@@ -23,9 +23,3 @@ libpciaccess-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libpciaccess_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index 7654fbc3b2..6d92845349 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -7,6 +7,7 @@ configure_args="--without-demo --disable-demo"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="vala-devel>=0.22 libgirepository-devel gjs-devel>=1.38
gtk+3-devel libseed-devel python-devel pygobject-devel"
+depends="pygobject hicolor-icon-theme gjs>=1.38"
short_desc="Gobject-based plugins engine"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gtk.org/"
@@ -39,10 +40,3 @@ libpeas-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-libpeas_package() {
- depends="pygobject hicolor-icon-theme gjs>=1.38"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libpipeline/template b/srcpkgs/libpipeline/template
index 76af918afc..5def7b752c 100644
--- a/srcpkgs/libpipeline/template
+++ b/srcpkgs/libpipeline/template
@@ -20,9 +20,3 @@ libpipeline-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libpipeline_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template
index 302a92fd21..2ce8d983df 100644
--- a/srcpkgs/libplist/template
+++ b/srcpkgs/libplist/template
@@ -1,11 +1,11 @@
# Template file for 'libplist'
pkgname=libplist
version=1.8
-revision=3
+revision=4
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=ON"
hostmakedepends="cmake swig python-devel Cython"
-makedepends="libglib-devel libxml2-devel"
+makedepends="python-devel libglib-devel libxml2-devel"
short_desc="Apple Property List library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -18,7 +18,7 @@ disable_parallel_build=yes
libplist++_package() {
short_desc+=" -- C++ runtime library"
pkg_install() {
- vmove "usr/lib/libplist++.*"
+ vmove "usr/lib/libplist++.so.*"
}
}
@@ -30,16 +30,11 @@ libplist-python_package() {
}
libplist-devel_package() {
- depends="libplist++>=${version} libplist>=${version}"
+ depends="libplist++>=${version}_${revision} libplist>=${version}_${revision}"
short_desc+=" -- development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-libplist_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template
index e48cd5807e..8b8ac93116 100644
--- a/srcpkgs/libpng/template
+++ b/srcpkgs/libpng/template
@@ -1,7 +1,7 @@
# Template build file for 'libpng'.
pkgname=libpng
version=1.6.8
-revision=1
+revision=2
build_style=gnu-configure
configure_args="ac_cv_func_strtod=yes"
makedepends="zlib-devel"
@@ -12,6 +12,10 @@ license="zlib"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz"
checksum=24f73d8b5e1d74a9482c81b65c3f93f96c7da7ed0417b8a948a75d2d99133081
+if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
+ configure_args+=" --disable-arm-neon"
+fi
+
post_install() {
rm -f ${DESTDIR}/usr/lib/*.la
vinstall LICENSE 644 usr/share/licenses/${pkgname}
@@ -36,9 +40,3 @@ libpng-progs_package() {
vmove usr/bin
}
}
-
-libpng_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template
index 00d861d9d1..41f16455df 100644
--- a/srcpkgs/libproxy/template
+++ b/srcpkgs/libproxy/template
@@ -1,50 +1,34 @@
# Template file for 'libproxy'
pkgname=libproxy
version=0.4.10
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_GNOME=0 -DWITH_KDE4=0 -DWITH_MOZJS=0 -DWITH_NM=0
-DWITH_PERL=0 -DWITH_PYTHON=1 -DWITH_WEBKIT=0"
hostmakedepends="pkg-config python cmake"
+makedepends="zlib-devel"
short_desc="A library handling all the details of proxy configuration"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://libproxy.googlecode.com"
license="LGPL-2.1"
distfiles="http://libproxy.googlecode.com/files/$pkgname-$version.tar.gz"
checksum=023e3c1023c522333ac4c414e9cb6db05bc564d3e5d30570e2db07aac100c635
-long_desc="
- libproxy is a library that provides automatic proxy configuration management.
-
- libproxy offers the following features:
-
- * extremely small core footprint (less than 35K)
- * no external dependencies within libproxy core (libproxy plugins may
- have dependencies)
- * only 3 functions in the stable external API
- * dynamic adjustment to changing network topology
- * a standard way of dealing with proxy settings across all scenarios
- * a sublime sense of joy and accomplishment"
libproxy-devel_package() {
- depends="libproxy>=${version}"
- short_desc+=" -- development files"
+ depends="libproxy>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/share
vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
}
}
libproxy-python_package() {
depends="libproxy>=${version} python"
- short_desc+=" -- python bindings"
+ short_desc+=" - python bindings"
pkg_install() {
vmove "usr/lib/python*"
}
}
-
-libproxy_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index 09fad96fc1..09f7678a92 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static --enable-pam --disable-python-bindings
--with-securedir=/usr/lib/security"
makedepends="cracklib-devel pam-devel"
+conf_files="/etc/security/pwquality.conf"
short_desc="Library for password quality checking and generating random passwords"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://fedorahosted.org/libpwquality/"
@@ -29,10 +30,3 @@ libpwquality-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libpwquality_package() {
- conf_files="/etc/security/pwquality.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template
index fca4a55eea..4665ccf21d 100644
--- a/srcpkgs/libqmi/template
+++ b/srcpkgs/libqmi/template
@@ -23,9 +23,3 @@ libqmi-devel_package() {
vmove usr/share
}
}
-
-libqmi_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libquvi-scripts/template b/srcpkgs/libquvi-scripts/template
index 090b83e1d0..4545cd7663 100644
--- a/srcpkgs/libquvi-scripts/template
+++ b/srcpkgs/libquvi-scripts/template
@@ -2,9 +2,11 @@
pkgname=libquvi-scripts
version=0.4.18
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="lua"
+depends="lua"
short_desc="Set of (lua) scripts for libquvi"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -23,11 +25,3 @@ long_desc="
* C API is simple to use
This package contains a set of plugins for use with libquvi and/or quvi."
-
-libquvi-scripts_package() {
- depends="lua"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libquvi/template b/srcpkgs/libquvi/template
index 010cad2360..2a71afd4da 100644
--- a/srcpkgs/libquvi/template
+++ b/srcpkgs/libquvi/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
hostmakedepends="pkg-config"
makedepends="lua-devel>=5.2 libcurl-devel libquvi-scripts>=0.4.1"
+depends="libquvi-scripts>=${version}"
+replaces="quvi<0.4.0"
short_desc="C library that can be used to parse flash media stream URLs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -35,11 +37,3 @@ libquvi-devel_package() {
vmove usr/share
}
}
-
-libquvi_package() {
- depends="libquvi-scripts>=${version}"
- replaces="quvi<0.4.0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libqzeitgeist/template b/srcpkgs/libqzeitgeist/template
index 876bda9dcc..c1e1b4ac24 100644
--- a/srcpkgs/libqzeitgeist/template
+++ b/srcpkgs/libqzeitgeist/template
@@ -21,9 +21,3 @@ libqzeitgeist-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libqzeitgeist_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template
index 05e4075b16..1f24548a82 100644
--- a/srcpkgs/libraw/template
+++ b/srcpkgs/libraw/template
@@ -39,9 +39,3 @@ libraw-progs_package() {
vmove usr/bin
}
}
-
-libraw_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libraw1394/template b/srcpkgs/libraw1394/template
index 613cd7d0b6..a9373ca07b 100644
--- a/srcpkgs/libraw1394/template
+++ b/srcpkgs/libraw1394/template
@@ -28,9 +28,3 @@ libraw1394-progs_package() {
vmove usr/share
}
}
-
-libraw1394_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libreoffice-bin-i18n/template b/srcpkgs/libreoffice-bin-i18n/template
index 40f2b5fcf8..5635bb6d1c 100644
--- a/srcpkgs/libreoffice-bin-i18n/template
+++ b/srcpkgs/libreoffice-bin-i18n/template
@@ -347,7 +347,25 @@ cd74116bd82562335b957242e34ace7a94bb9e2e1f75e348fa77df241cd7ef4b
3c3da1b6845c682643750527a4be2711c231ec09dd3bc12f7cf3cc619c04d7a3
"
+noarch=yes
create_wrksrc=yes
+depends="
+ libreoffice-bin-i18n-af libreoffice-bin-i18n-am libreoffice-bin-i18n-ar libreoffice-bin-i18n-as libreoffice-bin-i18n-ast libreoffice-bin-i18n-be
+ libreoffice-bin-i18n-bg libreoffice-bin-i18n-bn libreoffice-bin-i18n-bn-IN libreoffice-bin-i18n-bo libreoffice-bin-i18n-br libreoffice-bin-i18n-brx libreoffice-bin-i18n-bs
+ libreoffice-bin-i18n-ca libreoffice-bin-i18n-ca-XV libreoffice-bin-i18n-cs libreoffice-bin-i18n-cy libreoffice-bin-i18n-da libreoffice-bin-i18n-de libreoffice-bin-i18n-dgo
+ libreoffice-bin-i18n-dz libreoffice-bin-i18n-el libreoffice-bin-i18n-en-GB libreoffice-bin-i18n-en-US libreoffice-bin-i18n-en-ZA libreoffice-bin-i18n-eo libreoffice-bin-i18n-es
+ libreoffice-bin-i18n-et libreoffice-bin-i18n-eu libreoffice-bin-i18n-fa libreoffice-bin-i18n-fi libreoffice-bin-i18n-fr libreoffice-bin-i18n-ga libreoffice-bin-i18n-gd
+ libreoffice-bin-i18n-gl libreoffice-bin-i18n-gu libreoffice-bin-i18n-he libreoffice-bin-i18n-hi libreoffice-bin-i18n-hr libreoffice-bin-i18n-hu libreoffice-bin-i18n-id
+ libreoffice-bin-i18n-is libreoffice-bin-i18n-it libreoffice-bin-i18n-ja libreoffice-bin-i18n-ka libreoffice-bin-i18n-kk libreoffice-bin-i18n-km libreoffice-bin-i18n-kn
+ libreoffice-bin-i18n-ko libreoffice-bin-i18n-kok libreoffice-bin-i18n-ks libreoffice-bin-i18n-ku libreoffice-bin-i18n-lb libreoffice-bin-i18n-lo libreoffice-bin-i18n-lt
+ libreoffice-bin-i18n-lv libreoffice-bin-i18n-mai libreoffice-bin-i18n-mk libreoffice-bin-i18n-ml libreoffice-bin-i18n-mn libreoffice-bin-i18n-mni libreoffice-bin-i18n-mr
+ libreoffice-bin-i18n-my libreoffice-bin-i18n-nb libreoffice-bin-i18n-ne libreoffice-bin-i18n-nl libreoffice-bin-i18n-nn libreoffice-bin-i18n-nr libreoffice-bin-i18n-nso
+ libreoffice-bin-i18n-oc libreoffice-bin-i18n-om libreoffice-bin-i18n-or libreoffice-bin-i18n-pa-IN libreoffice-bin-i18n-pl libreoffice-bin-i18n-pt libreoffice-bin-i18n-pt-BR
+ libreoffice-bin-i18n-ro libreoffice-bin-i18n-ru libreoffice-bin-i18n-rw libreoffice-bin-i18n-sa-IN libreoffice-bin-i18n-sat libreoffice-bin-i18n-sd libreoffice-bin-i18n-sh
+ libreoffice-bin-i18n-si libreoffice-bin-i18n-sid libreoffice-bin-i18n-sk libreoffice-bin-i18n-sl libreoffice-bin-i18n-sq libreoffice-bin-i18n-sr libreoffice-bin-i18n-ss
+ libreoffice-bin-i18n-st libreoffice-bin-i18n-sv libreoffice-bin-i18n-sw-TZ libreoffice-bin-i18n-ta libreoffice-bin-i18n-te libreoffice-bin-i18n-tg libreoffice-bin-i18n-th
+ libreoffice-bin-i18n-tn libreoffice-bin-i18n-tr libreoffice-bin-i18n-ts libreoffice-bin-i18n-tt libreoffice-bin-i18n-ug libreoffice-bin-i18n-uk libreoffice-bin-i18n-uz
+ libreoffice-bin-i18n-ve libreoffice-bin-i18n-vi libreoffice-bin-i18n-xh libreoffice-bin-i18n-zh-CN libreoffice-bin-i18n-zh-TW libreoffice-bin-i18n-zu"
do_build() {
for i in $distfiles; do
@@ -373,27 +391,6 @@ do_install() {
:
}
-# As you described me in the issue comment: https://github.com/xtraeme/xbps-packages/issues/127#issuecomment-23209002
-libreoffice-bin-i18n_package() {
- depends="libreoffice-bin-i18n-af libreoffice-bin-i18n-am libreoffice-bin-i18n-ar libreoffice-bin-i18n-as libreoffice-bin-i18n-ast libreoffice-bin-i18n-be
- libreoffice-bin-i18n-bg libreoffice-bin-i18n-bn libreoffice-bin-i18n-bn-IN libreoffice-bin-i18n-bo libreoffice-bin-i18n-br libreoffice-bin-i18n-brx libreoffice-bin-i18n-bs
- libreoffice-bin-i18n-ca libreoffice-bin-i18n-ca-XV libreoffice-bin-i18n-cs libreoffice-bin-i18n-cy libreoffice-bin-i18n-da libreoffice-bin-i18n-de libreoffice-bin-i18n-dgo
- libreoffice-bin-i18n-dz libreoffice-bin-i18n-el libreoffice-bin-i18n-en-GB libreoffice-bin-i18n-en-US libreoffice-bin-i18n-en-ZA libreoffice-bin-i18n-eo libreoffice-bin-i18n-es
- libreoffice-bin-i18n-et libreoffice-bin-i18n-eu libreoffice-bin-i18n-fa libreoffice-bin-i18n-fi libreoffice-bin-i18n-fr libreoffice-bin-i18n-ga libreoffice-bin-i18n-gd
- libreoffice-bin-i18n-gl libreoffice-bin-i18n-gu libreoffice-bin-i18n-he libreoffice-bin-i18n-hi libreoffice-bin-i18n-hr libreoffice-bin-i18n-hu libreoffice-bin-i18n-id
- libreoffice-bin-i18n-is libreoffice-bin-i18n-it libreoffice-bin-i18n-ja libreoffice-bin-i18n-ka libreoffice-bin-i18n-kk libreoffice-bin-i18n-km libreoffice-bin-i18n-kn
- libreoffice-bin-i18n-ko libreoffice-bin-i18n-kok libreoffice-bin-i18n-ks libreoffice-bin-i18n-ku libreoffice-bin-i18n-lb libreoffice-bin-i18n-lo libreoffice-bin-i18n-lt
- libreoffice-bin-i18n-lv libreoffice-bin-i18n-mai libreoffice-bin-i18n-mk libreoffice-bin-i18n-ml libreoffice-bin-i18n-mn libreoffice-bin-i18n-mni libreoffice-bin-i18n-mr
- libreoffice-bin-i18n-my libreoffice-bin-i18n-nb libreoffice-bin-i18n-ne libreoffice-bin-i18n-nl libreoffice-bin-i18n-nn libreoffice-bin-i18n-nr libreoffice-bin-i18n-nso
- libreoffice-bin-i18n-oc libreoffice-bin-i18n-om libreoffice-bin-i18n-or libreoffice-bin-i18n-pa-IN libreoffice-bin-i18n-pl libreoffice-bin-i18n-pt libreoffice-bin-i18n-pt-BR
- libreoffice-bin-i18n-ro libreoffice-bin-i18n-ru libreoffice-bin-i18n-rw libreoffice-bin-i18n-sa-IN libreoffice-bin-i18n-sat libreoffice-bin-i18n-sd libreoffice-bin-i18n-sh
- libreoffice-bin-i18n-si libreoffice-bin-i18n-sid libreoffice-bin-i18n-sk libreoffice-bin-i18n-sl libreoffice-bin-i18n-sq libreoffice-bin-i18n-sr libreoffice-bin-i18n-ss
- libreoffice-bin-i18n-st libreoffice-bin-i18n-sv libreoffice-bin-i18n-sw-TZ libreoffice-bin-i18n-ta libreoffice-bin-i18n-te libreoffice-bin-i18n-tg libreoffice-bin-i18n-th
- libreoffice-bin-i18n-tn libreoffice-bin-i18n-tr libreoffice-bin-i18n-ts libreoffice-bin-i18n-tt libreoffice-bin-i18n-ug libreoffice-bin-i18n-uk libreoffice-bin-i18n-uz
- libreoffice-bin-i18n-ve libreoffice-bin-i18n-vi libreoffice-bin-i18n-xh libreoffice-bin-i18n-zh-CN libreoffice-bin-i18n-zh-TW libreoffice-bin-i18n-zu"
- noarch=yes
-}
-
libreoffice-bin-i18n-af_package () {
depends="libreoffice-bin"
noarch=yes
diff --git a/srcpkgs/libreoffice-bin/template b/srcpkgs/libreoffice-bin/template
index 907e9bbe14..28e99580da 100644
--- a/srcpkgs/libreoffice-bin/template
+++ b/srcpkgs/libreoffice-bin/template
@@ -20,6 +20,8 @@ fi
only_for_archs="i686 x86_64"
wrksrc="LibreOffice_${version}.2_Linux_${_arch}_deb"
makedepends="shared-mime-info desktop-file-utils hicolor-icon-theme"
+depends="${makedepends}"
+allow_unknown_shlibs=yes
do_install() {
cd DEBS
@@ -35,11 +37,3 @@ do_install() {
ln -fs /opt/libreoffice4.1/program/$a ${DESTDIR}/usr/bin/$a
done
}
-
-libreoffice-bin_package() {
- depends="${makedepends}"
- allow_unknown_shlibs=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/librlog/template b/srcpkgs/librlog/template
index c67b317e9e..685f4c7ccf 100644
--- a/srcpkgs/librlog/template
+++ b/srcpkgs/librlog/template
@@ -23,9 +23,3 @@ librlog-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-librlog_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/librpcsecgss/template b/srcpkgs/librpcsecgss/template
index 7de0673307..8c62fb7043 100644
--- a/srcpkgs/librpcsecgss/template
+++ b/srcpkgs/librpcsecgss/template
@@ -25,9 +25,3 @@ librpcsecgss-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-librpcsecgss_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 1872a86f6a..3753ad6ec8 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--disable-static --enable-introspection"
hostmakedepends="pkg-config intltool python gobject-introspection"
makedepends="libcroco-devel gtk+3-devel"
+depends="gdk-pixbuf>=2.26.1_2"
+triggers="gtk-pixbuf-loaders"
short_desc="SVG library for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://librsvg.sourceforge.net/"
@@ -39,11 +41,3 @@ librsvg-utils_package() {
vmove usr/share/man/man1/rsvg-convert.1
}
}
-
-librsvg_package() {
- depends="gdk-pixbuf>=2.26.1_2"
- triggers="gtk-pixbuf-loaders"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/librsync/template b/srcpkgs/librsync/template
index efe0a7d2e7..b4750c8f39 100644
--- a/srcpkgs/librsync/template
+++ b/srcpkgs/librsync/template
@@ -13,16 +13,10 @@ license="GPL"
short_desc="A free software library that implements the rsync remote-delta algorithm (rdiff)"
librsync-devel_package() {
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
depends="librsync-${version}_${revision}"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
}
}
-
-librsync_package() {
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/libsamplerate/template b/srcpkgs/libsamplerate/template
index 9bc4f44159..f68be1dedd 100644
--- a/srcpkgs/libsamplerate/template
+++ b/srcpkgs/libsamplerate/template
@@ -24,7 +24,7 @@ long_desc="
libsamplerate-devel_package() {
depends="libsndfile-devel ${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -32,9 +32,3 @@ libsamplerate-devel_package() {
vmove usr/share/doc
}
}
-
-libsamplerate_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 6331b3a890..307679cdfb 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -42,9 +42,3 @@ libsasl-devel_package() {
vmove usr/include
}
}
-
-libsasl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libseccomp/template b/srcpkgs/libseccomp/template
index 0866fe67cf..86869fdeaf 100644
--- a/srcpkgs/libseccomp/template
+++ b/srcpkgs/libseccomp/template
@@ -29,9 +29,3 @@ libseccomp-devel_package() {
vmove usr/share
}
}
-
-libseccomp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libsecret/template b/srcpkgs/libsecret/template
index ea04ebb152..f185efce64 100644
--- a/srcpkgs/libsecret/template
+++ b/srcpkgs/libsecret/template
@@ -25,9 +25,3 @@ libsecret-devel_package() {
vmove usr/share/vala
}
}
-
-libsecret_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libsexy/template b/srcpkgs/libsexy/template
index d6d162d400..3947d5ac29 100644
--- a/srcpkgs/libsexy/template
+++ b/srcpkgs/libsexy/template
@@ -26,9 +26,3 @@ libsexy-devel_package() {
vmove usr/share
}
}
-
-libsexy_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libshout-idjc/template b/srcpkgs/libshout-idjc/template
index 3f3a2107a0..d61716e0cc 100644
--- a/srcpkgs/libshout-idjc/template
+++ b/srcpkgs/libshout-idjc/template
@@ -26,9 +26,3 @@ libshout-idjc-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libshout-idjc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libsigc++/template b/srcpkgs/libsigc++/template
index b6ead460a9..9185eca859 100644
--- a/srcpkgs/libsigc++/template
+++ b/srcpkgs/libsigc++/template
@@ -32,9 +32,3 @@ libsigc++-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libsigc++_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template
index 08f3e22a30..8437117b60 100644
--- a/srcpkgs/libsmbios/template
+++ b/srcpkgs/libsmbios/template
@@ -44,9 +44,3 @@ libsmbios-utils_package() {
vmove usr/sbin
}
}
-
-libsmbios_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template
index 36708423ca..c376a34f80 100644
--- a/srcpkgs/libsndfile/template
+++ b/srcpkgs/libsndfile/template
@@ -17,7 +17,7 @@ long_desc="
through one standard library interface."
libsndfile-progs_package() {
- short_desc+=" -- bundled cmdline apps"
+ short_desc+=" - bundled cmdline apps"
pkg_install() {
vmove usr/bin
vmove usr/share/man
@@ -26,7 +26,7 @@ libsndfile-progs_package() {
libsndfile-devel_package() {
depends="alsa-lib-devel libvorbis-devel libflac-devel ${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -34,9 +34,3 @@ libsndfile-devel_package() {
vmove usr/share/doc
}
}
-
-libsndfile_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template
index 292dd0f972..1e62a2fbc9 100644
--- a/srcpkgs/libsoup/template
+++ b/srcpkgs/libsoup/template
@@ -1,11 +1,12 @@
# Template file for 'libsoup'
pkgname=libsoup
version=2.44.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
-hostmakedepends="pkg-config intltool gobject-introspection"
-makedepends="libxml2-devel sqlite-devel glib-networking"
+hostmakedepends="pkg-config intltool glib-devel libtool"
+makedepends="libglib-devel libxml2-devel sqlite-devel glib-networking"
+depends="glib-networking"
short_desc="HTTP library implementation in C"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -13,12 +14,34 @@ license="LGPL-2.1"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
+
+pre_configure() {
+ libtoolize -f
+}
+
libsoup-devel_package() {
depends="libglib-devel libxml2-devel libsoup>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/lib/pkgconfig/libsoup-2.4.pc
- vmove usr/share/gir-1.0/Soup-2.4.gir
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/Soup-2.4.gir
+ fi
vmove usr/include/libsoup-2.4
vmove usr/share/gtk-doc
vmove "usr/lib/libsoup-2.4.so"
@@ -31,7 +54,9 @@ libsoup-gnome-devel_package() {
pkg_install() {
vmove "usr/include/libsoup-gnome*"
vmove "usr/lib/pkgconfig/*gnome*"
- vmove "usr/share/gir-1.0/SoupGNOME*"
+ if [ "$build_option_gir" ]; then
+ vmove "usr/share/gir-1.0/SoupGNOME*"
+ fi
vmove "usr/lib/libsoup-gnome*.so"
}
}
@@ -40,13 +65,8 @@ libsoup-gnome_package() {
short_desc+=" - GNOME libraries"
pkg_install() {
vmove "usr/lib/libsoup-gnome*.so.*"
- vmove "usr/lib/girepository-1.0/SoupGNOME*"
- }
-}
-
-libsoup_package() {
- depends="glib-networking"
- pkg_install() {
- vmove all
+ if [ "$build_option_gir" ]; then
+ vmove "usr/lib/girepository-1.0/SoupGNOME*"
+ fi
}
}
diff --git a/srcpkgs/libspectre/template b/srcpkgs/libspectre/template
index e11be65a85..ab89958cb7 100644
--- a/srcpkgs/libspectre/template
+++ b/srcpkgs/libspectre/template
@@ -18,15 +18,9 @@ long_desc="
libspectre-devel_package() {
depends="libspectre>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-libspectre_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libsrtp/template b/srcpkgs/libsrtp/template
index f0117b15e6..b5303d5a16 100644
--- a/srcpkgs/libsrtp/template
+++ b/srcpkgs/libsrtp/template
@@ -23,14 +23,8 @@ post_install() {
ln -sf libsrtp.so.0.0.0 ${DESTDIR}/usr/lib/libsrtp.so.0
}
-libsrtp_package() {
- pkg_install() {
- vmove all
- }
-}
-
libsrtp-devel_package() {
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
diff --git a/srcpkgs/libssh/patches/fix-includes.patch b/srcpkgs/libssh/patches/fix-includes.patch
new file mode 100644
index 0000000000..bdd2fb6c0b
--- /dev/null
+++ b/srcpkgs/libssh/patches/fix-includes.patch
@@ -0,0 +1,10 @@
+--- include/libssh/libssh.h
++++ include/libssh/libssh.h
+@@ -57,6 +57,7 @@
+ typedef unsigned long long uint64_t;
+ typedef int mode_t;
+ #else /* _MSC_VER */
++ #include <sys/types.h>
+ #include <unistd.h>
+ #include <inttypes.h>
+ #endif /* _MSC_VER */
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index c0b851902d..0d7f256b5c 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,19 +1,14 @@
# Template file for 'libssh'
pkgname=libssh
-version=0.5.5
+version=0.6.0
revision=1
build_style=cmake
hostmakedepends="cmake"
makedepends="zlib-devel openssl-devel"
-short_desc="The SSH library"
+short_desc="Multiplatform C library implementing SSHv1 and SSHv2 protocols"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
homepage="http://www.libssh.org/"
-long_desc="
- libssh is a mulitplatform C library implementing the SSHv2 and SSHv1 protocol
- on client and server side. With libssh, you can remotely execute programs,
- transfer files, use a secure and transparent tunnel for your remote applications."
-
do_fetch() {
git clone -b${pkgname}-${version} \
@@ -29,9 +24,3 @@ libssh-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libssh_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index a7bdb46ec9..bc756403c2 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -29,9 +29,3 @@ libssh2-devel_package() {
vmove usr/share
}
}
-
-libssh2_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libstatgrab/template b/srcpkgs/libstatgrab/template
index 95e3bd1626..1d17a822b2 100644
--- a/srcpkgs/libstatgrab/template
+++ b/srcpkgs/libstatgrab/template
@@ -25,9 +25,3 @@ libstatgrab-devel_package() {
vmove usr/share/man/man3
}
}
-
-libstatgrab_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
index c97bb1520b..4f6ca347f1 100644
--- a/srcpkgs/libtaginfo/template
+++ b/srcpkgs/libtaginfo/template
@@ -23,9 +23,3 @@ libtaginfo-devel_package() {
vmove usr/share
}
}
-
-libtaginfo_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libtar/template b/srcpkgs/libtar/template
index eebea6f17e..238e7f667b 100644
--- a/srcpkgs/libtar/template
+++ b/srcpkgs/libtar/template
@@ -22,9 +22,3 @@ libtar-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libtar_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libtasn1/template b/srcpkgs/libtasn1/template
index 62e704e728..f9ad497ea4 100644
--- a/srcpkgs/libtasn1/template
+++ b/srcpkgs/libtasn1/template
@@ -1,48 +1,33 @@
# Template build file for 'libtasn1'.
pkgname=libtasn1
-version=3.2
-revision=2
+version=3.4
+revision=1
build_style=gnu-configure
-configure_args="--disable-static"
+hostmakedepends="perl"
short_desc="ASN.1 structure parser library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/libtasn1/"
license="GPL-3, LGPL-2.1"
distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
-checksum=672ee08108a0f98b006377ab9e5e926ed6d7e4811f18538f838c457e7db36f3f
-long_desc="
- libtasn1 library was developed for ASN1 (Abstract Syntax Notation One)
- structures management.
-
- The main features of this library are:
- - on-line ASN1 structure management that does not require any C
- code file generation.
- - off-line ASN1 structure management with C code file generation
- containing an array.
- - DER (Distinguish Encoding Rules) encoding.
- - no limits for INTEGER and ENUMERATED values."
+checksum=f353507a458fe2372b791016a056c95946eebfc7256b49013851f134a5e6acc8
libtasn1-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc+=" -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/share/man/man3
vmove usr/share/info
}
}
libtasn1-tools_package() {
- short_desc+=" -- ASN.1 tools"
+ short_desc+=" - ASN.1 tools"
pkg_install() {
vmove usr/bin
vmove usr/share
}
}
-
-libtasn1_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libtheora/template b/srcpkgs/libtheora/template
index e4167ca58b..edd8f08693 100644
--- a/srcpkgs/libtheora/template
+++ b/srcpkgs/libtheora/template
@@ -1,7 +1,7 @@
# Template file for 'libtheora'.
pkgname=libtheora
version=1.1.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-examples --disable-vorbistest --disable-sdltest"
hostmakedepends="pkg-config"
@@ -12,27 +12,15 @@ homepage="http://www.xiph.org"
license="BSD"
distfiles="http://downloads.xiph.org/releases/theora/$pkgname-$version.tar.xz"
checksum=f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61
-long_desc="
- Theora is Xiph.Org first publicly released video codec, intended
- for use within the Ogg project Ogg multimedia streaming system.
- Theora is derived directly from On2 VP3 codec; Currently the two are
- nearly identical, varying only in encapsulating decoder tables in the
- bitstream headers, but Theora will make use of this extra freedom
- in the future to improve over what is possible with VP3."
libtheora-devel_package() {
- depends="libogg-devel libtheora>=${version}"
- short_desc="${short_desc} - development files"
+ depends="libogg-devel libtheora>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/share
}
}
-
-libtheora_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template
index 7dbcaad8dc..48c1899222 100644
--- a/srcpkgs/libtirpc/template
+++ b/srcpkgs/libtirpc/template
@@ -1,11 +1,12 @@
# Template file for 'libtirpc'
pkgname=libtirpc
version=0.2.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config mit-krb5-devel"
makedepends="mit-krb5-devel libgssglue-devel"
+conf_files="/etc/netconfig"
short_desc="Transport Independent RPC library (SunRPC replacement)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -13,8 +14,12 @@ homepage="http://libtirpc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
checksum=45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1
+post_install() {
+ vinstall ${wrksrc}/doc/netconfig 644 etc
+}
+
libtirpc-devel_package() {
- depends="libgssglue-devel libtirpc>=${version}"
+ depends="libgssglue-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -23,11 +28,3 @@ libtirpc-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libtirpc_package() {
- conf_files="/etc/netconfig"
- pkg_install() {
- vmove all
- vinstall ${wrksrc}/doc/netconfig 644 etc
- }
-}
diff --git a/srcpkgs/libtomcrypt/template b/srcpkgs/libtomcrypt/template
index 5ecc770de7..b9e807b86c 100644
--- a/srcpkgs/libtomcrypt/template
+++ b/srcpkgs/libtomcrypt/template
@@ -41,9 +41,3 @@ libtomcrypt-devel_package() {
vmove usr/share/man/man3
}
}
-
-libtomcrypt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 53686f35c2..86fd3e0042 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -2,7 +2,9 @@
pkgname=libtool
version=2.4.2
revision=7
+noarch=yes
hostmakedepends="perl automake help2man"
+depends="tar sed"
build_style=gnu-configure
homepage="http://www.gnu.org/software/libtool"
distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version.tar.xz"
@@ -33,11 +35,3 @@ libltdl_package() {
vmove "usr/lib/libltdl.so*"
}
}
-
-libtool_package() {
- noarch=yes
- depends="tar sed"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index b71d0546b4..0398fc039f 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -29,16 +29,10 @@ long_desc="
libtorrent-devel_package() {
depends="libtorrent>=$version"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-libtorrent_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libtsm/template b/srcpkgs/libtsm/template
index b01df2a876..918a480af2 100644
--- a/srcpkgs/libtsm/template
+++ b/srcpkgs/libtsm/template
@@ -22,9 +22,3 @@ libtsm-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libtsm_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libtxc_dxtn/template b/srcpkgs/libtxc_dxtn/template
index a5ac6a08fa..30fc2e2167 100644
--- a/srcpkgs/libtxc_dxtn/template
+++ b/srcpkgs/libtxc_dxtn/template
@@ -11,9 +11,3 @@ license="MIT"
homepage="http://dri.freedesktop.org/wiki/S3TC"
distfiles="http://people.freedesktop.org/~cbrill/$pkgname/$pkgname-${version}.tar.bz2"
checksum=45290d12cdca529a3f41e7fc35c4250fc1b6d2fc16b56680f8401f6aa792ae60
-
-libtxc_dxtn_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libunique/template b/srcpkgs/libunique/template
index 03fc03e91f..936cf23871 100644
--- a/srcpkgs/libunique/template
+++ b/srcpkgs/libunique/template
@@ -33,9 +33,3 @@ libunique-devel_package() {
vmove usr/share
}
}
-
-libunique_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libunique1/template b/srcpkgs/libunique1/template
index 19821ea33d..a644e8d835 100644
--- a/srcpkgs/libunique1/template
+++ b/srcpkgs/libunique1/template
@@ -48,9 +48,3 @@ libunique1-devel_package() {
vmove usr/share
}
}
-
-libunique1_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libunistring/template b/srcpkgs/libunistring/template
index b9788069c0..2f784ac340 100644
--- a/srcpkgs/libunistring/template
+++ b/srcpkgs/libunistring/template
@@ -28,9 +28,3 @@ libunistring-docs_package() {
vmove usr/share
}
}
-
-libunistring_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index e3de42f464..71cdc845a5 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -27,9 +27,3 @@ libunwind-devel_package() {
vmove usr/share
}
}
-
-libunwind_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index 06be502b5a..d257e58303 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -27,9 +27,3 @@ libupnp-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libupnp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libusb-compat/template b/srcpkgs/libusb-compat/template
index 25df98040e..06afd6335d 100644
--- a/srcpkgs/libusb-compat/template
+++ b/srcpkgs/libusb-compat/template
@@ -4,7 +4,7 @@ version=0.1.5
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="libusbx-devel"
+makedepends="libusb-devel"
short_desc="A libusb-0.1 compatibility library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -27,9 +27,3 @@ libusb-compat-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libusb-compat_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libusb/patches/portability-fixes.patch b/srcpkgs/libusb/patches/portability-fixes.patch
new file mode 100644
index 0000000000..2f58447426
--- /dev/null
+++ b/srcpkgs/libusb/patches/portability-fixes.patch
@@ -0,0 +1,16 @@
+--- libusb/io.c.orig 2014-01-11 16:34:55.811463881 +0100
++++ libusb/io.c 2014-01-11 16:35:26.138281377 +0100
+@@ -34,6 +34,13 @@
+ #include <sys/timerfd.h>
+ #endif
+
++#ifndef TIMESPEC_TO_TIMEVAL
++#define TIMESPEC_TO_TIMEVAL(tv, ts) { \
++ (tv)->tv_sec = (ts)->tv_sec; \
++ (tv)->tv_usec = (ts)->tv_nsec / 1000; \
++}
++#endif
++
+ #include "libusbi.h"
+
+ /**
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 077677ee41..8841901c44 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,29 +1,26 @@
# Template file for 'libusb'
pkgname=libusb
-version=1.0.9
-build_style=gnu-configure
+version=1.0.18
revision=2
+replaces="libusbx>=0"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libudev-devel"
short_desc="A library which allows userspace access to USB devices"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
homepage="http://libusb.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b
-long_desc="
- This package provides a way for applications to access USB devices."
+checksum=c73f5cec45a5de94418da4e151b7232958571926984acfb9bce02b9424e83720
libusb-devel_package() {
- depends="libusb>=${version}"
+ replaces="libusbx-devel>=0"
+ depends="libusb>=${version}_${revision}"
short_desc+=" -- development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}
-
-libusb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libusbx-devel b/srcpkgs/libusbx-devel
deleted file mode 120000
index 59e741ddfd..0000000000
--- a/srcpkgs/libusbx-devel
+++ /dev/null
@@ -1 +0,0 @@
-libusbx
\ No newline at end of file
diff --git a/srcpkgs/libusbx/template b/srcpkgs/libusbx/template
deleted file mode 100644
index a193f89c5a..0000000000
--- a/srcpkgs/libusbx/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'libusbx'
-pkgname=libusbx
-version=1.0.17
-revision=1
-build_style=gnu-configure
-makedepends="libudev-devel"
-short_desc="Library that provides generic access to USB devices"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="LGPL-2.1"
-homepage="http://libusbx.org"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=876f8d2c3fee73840a89cb78f3e384c0ab73a67f9155a010b1a5a73ece5145b8
-
-libusbx-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- provides="libusb-devel-${version}_${revision}"
- replaces="libusb-devel>=0"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
- }
-}
-
-libusbx_package() {
- provides="libusb-${version}_${revision}"
- replaces="libusb>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libutempter/template b/srcpkgs/libutempter/template
index 6f450e4ca0..4327f38e46 100644
--- a/srcpkgs/libutempter/template
+++ b/srcpkgs/libutempter/template
@@ -15,16 +15,10 @@ long_desc="
libutempter-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove usr/share
}
}
-
-libutempter_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libva-intel-driver/template b/srcpkgs/libva-intel-driver/template
index 9a57663cd6..7b93dd2cc0 100644
--- a/srcpkgs/libva-intel-driver/template
+++ b/srcpkgs/libva-intel-driver/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libX11-devel libva-devel>=1:1.2.0 libdrm-devel"
+depends="libva>=1:1.2.0"
short_desc="Video Acceleration (VA) API - Intel Graphics backend"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://freedesktop.org/wiki/Software/vaapi"
@@ -23,10 +24,3 @@ long_desc="
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-libva-intel-driver_package() {
- depends="libva>=1:1.2.0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 514cb2808b..a51454d519 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -33,9 +33,3 @@ libva-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libva_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libvdpau-sunxi-git/template b/srcpkgs/libvdpau-sunxi-git/template
new file mode 100644
index 0000000000..df7710ac82
--- /dev/null
+++ b/srcpkgs/libvdpau-sunxi-git/template
@@ -0,0 +1,19 @@
+# Template file for 'libvdpau-sunxi-git'
+pkgname=libvdpau-sunxi-git
+version=20140127
+revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="libvdpau-devel"
+short_desc="Experimental VDPAU for Allwinner sunxi SoCs"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="LGPL-2.1"
+homepage="https://github.com/linux-sunxi/libvdpau-sunxi"
+
+only_for_archs="armv7l"
+provides="libvdpau-sunxi-1.0_1"
+replaces="libvdpau-sunix>=0"
+
+do_fetch() {
+ git clone git://github.com/linux-sunxi/libvdpau-sunxi ${pkgname}-${version}
+}
diff --git a/srcpkgs/libvdpau-va-gl/template b/srcpkgs/libvdpau-va-gl/template
index 7a6b41a629..d1769e1cf7 100644
--- a/srcpkgs/libvdpau-va-gl/template
+++ b/srcpkgs/libvdpau-va-gl/template
@@ -1,6 +1,6 @@
# Template file for 'libvdpau-va-gl'
pkgname=libvdpau-va-gl
-version=0.2.1
+version=0.3.2
revision=1
build_style=cmake
hostmakedepends="pkg-config cmake"
@@ -13,9 +13,3 @@ homepage="https://github.com/i-rinat/libvdpau-va-gl"
do_fetch() {
git clone -b v${version} git://github.com/i-rinat/${pkgname}.git ${pkgname}-${version}
}
-
-libvdpau-va-gl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template
index b87f2092ff..7f51ad5428 100644
--- a/srcpkgs/libvdpau/template
+++ b/srcpkgs/libvdpau/template
@@ -25,9 +25,3 @@ libvdpau-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libvdpau_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index ce68cdc529..6eba420742 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -40,9 +40,3 @@ libvirt-glib-python_package() {
vmove "usr/lib/python*"
}
}
-
-libvirt-glib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 5adb8c9255..79542bd3e0 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -22,6 +22,25 @@ makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel
libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel
python-devel libssh2-devel libnuma-devel libcap-ng-devel fuse-devel
lvm2 parted"
+depends="lvm2 parted"
+conf_files="
+ /etc/libvirt/libvirt.conf
+ /etc/libvirt/libvirtd.conf
+ /etc/libvirt/lxc.conf
+ /etc/libvirt/qemu.conf
+ /etc/libvirt/qemu-lockd.conf
+ /etc/sasl2/libvirt.conf"
+make_dirs="
+ /var/cache/libvirt/qemu 0755 root root
+ /var/lib/libvirt/boot 0755 root root
+ /var/lib/libvirt/filesystems 0755 root root
+ /var/lib/libvirt/images 0755 root root
+ /var/lib/libvirt/network 0755 root root
+ /var/lib/libvirt/qemu 0755 root root
+ /var/lib/libvirt/lockd/files 0755 root root
+ /var/lib/libvirt/lxc 0755 root root
+ /var/lib/libvirt/dnsmasq 0755 root root
+ /var/lib/libvirt/uml 0755 root root"
post_install() {
# Move everything to /usr.
@@ -56,28 +75,3 @@ libvirt-python_package() {
vmove "usr/share/doc/libvirt-python*"
}
}
-
-libvirt_package() {
- depends="lvm2 parted"
- conf_files="
- /etc/libvirt/libvirt.conf
- /etc/libvirt/libvirtd.conf
- /etc/libvirt/lxc.conf
- /etc/libvirt/qemu.conf
- /etc/libvirt/qemu-lockd.conf
- /etc/sasl2/libvirt.conf"
- make_dirs="
- /var/cache/libvirt/qemu 0755 root root
- /var/lib/libvirt/boot 0755 root root
- /var/lib/libvirt/filesystems 0755 root root
- /var/lib/libvirt/images 0755 root root
- /var/lib/libvirt/network 0755 root root
- /var/lib/libvirt/qemu 0755 root root
- /var/lib/libvirt/lockd/files 0755 root root
- /var/lib/libvirt/lxc 0755 root root
- /var/lib/libvirt/dnsmasq 0755 root root
- /var/lib/libvirt/uml 0755 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libvisual/template b/srcpkgs/libvisual/template
index 8e5b625bf6..2019f80bf9 100644
--- a/srcpkgs/libvisual/template
+++ b/srcpkgs/libvisual/template
@@ -37,9 +37,3 @@ libvisual-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libvisual_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index b43ac6d7e0..6bd53ba2f0 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -25,9 +25,3 @@ libvncserver-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libvncserver_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template
index 2e8fdb0f49..76db8fecca 100644
--- a/srcpkgs/libvorbis/template
+++ b/srcpkgs/libvorbis/template
@@ -1,45 +1,30 @@
# Template file for 'libvorbis'.
pkgname=libvorbis
-version=1.3.3
-revision=2
+version=1.3.4
+revision=1
build_style=gnu-configure
-hostmakedepends="pkg-config"
+configure_args="ac_cv_func_memcmp_working=yes"
+hostmakedepends="automake libtool pkg-config"
makedepends="libogg-devel"
short_desc="The Vorbis General Audio Compression Codec"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
homepage="http://www.xiph.org/vorbis/"
distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
-checksum=6d747efe7ac4ad249bf711527882cef79fb61d9194c45b5ca5498aa60f290762
-long_desc="
- Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free,
- general-purpose compressed audio format for audio and music at fixed
- and variable bitrates from 16 to 128 kbps/channel.
+checksum=eee09a0a13ec38662ff949168fe897a25d2526529bc7e805305f381c219a1ecb
- The libvorbis package contains runtime libraries for use in programs
- that support Ogg Vorbis."
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" libtool automake"
- pre_configure() {
- sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
- ./autogen.sh
- }
-fi
+pre_configure() {
+ autoreconf -fi -I m4
+}
libvorbis-devel_package() {
- depends="libogg-devel libvorbis>=${version}"
- short_desc="${short_desc} - development files"
+ depends="libogg-devel libvorbis>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/share
}
}
-
-libvorbis_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx-tools
new file mode 120000
index 0000000000..230e0dffa9
--- /dev/null
+++ b/srcpkgs/libvpx-tools
@@ -0,0 +1 @@
+libvpx
\ No newline at end of file
diff --git a/srcpkgs/libvpx/template b/srcpkgs/libvpx/template
index 3f32bfe837..e4b605c9c1 100644
--- a/srcpkgs/libvpx/template
+++ b/srcpkgs/libvpx/template
@@ -1,22 +1,15 @@
# Template file for 'libvpx'
pkgname=libvpx
-version=1.1.0
-revision=3
-wrksrc="libvpx-v${version}"
+version=1.2.0
+revision=2
+wrksrc="${pkgname}-v${version}"
hostmakedepends="which perl yasm"
-short_desc="The VP8 Codec SDK"
+short_desc="The VP8 Codec"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.webmproject.org"
license="BSD"
distfiles="http://webm.googlecode.com/files/${pkgname}-v${version}.tar.bz2"
-checksum=9ce074cf4b3bcd9a49ff93e05485b71c273bfc3685a305e55a0e7fa51beb72c5
-long_desc="
- WebM is an open, royalty-free, media file format designed for the web.
-
- WebM defines the file container structure, video and audio formats. WebM
- files consist of video streams compressed with the VP8 video codec and audio
- streams compressed with the Vorbis audio codec. The WebM file structure is
- based on the Matroska container."
+checksum=5ef0c650b2daa62085eb8105a7a4273f3e987db53c5ec97fd51d1b6511e5aa06
do_configure() {
export LD="$CC" AS=
@@ -25,6 +18,7 @@ do_configure() {
sed -e "s,generic-gnu,$XBPS_CROSS_TRIPLET," -i configure
_cross="--target=$XBPS_CROSS_TRIPLET"
fi
+ CFLAGS+=" -fPIC"
./configure --enable-vp8 --enable-runtime-cpu-detect --enable-shared \
--enable-postproc --enable-pic --disable-install-docs \
@@ -41,18 +35,20 @@ do_install() {
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-libvpx-devel_package() {
- depends="libvpx>=$version"
- short_desc="${short_desc} - development files"
+libvpx-tools_package() {
+ short_desc+=" - tools"
pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove usr/lib/pkgconfig
+ vmove usr/bin
}
}
-libvpx_package() {
+libvpx-devel_package() {
+ depends="libvpx>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
- vmove usr
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
}
}
diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 1ef50cb972..5990c3f9b0 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -26,9 +26,3 @@ libwacom-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libwacom_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libwapcaplet/template b/srcpkgs/libwapcaplet/template
index 0c77fc3d73..8038f85901 100644
--- a/srcpkgs/libwapcaplet/template
+++ b/srcpkgs/libwapcaplet/template
@@ -40,9 +40,3 @@ libwapcaplet-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libwapcaplet_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template
index 80a50fbd9e..72efa4238a 100644
--- a/srcpkgs/libwebp/template
+++ b/srcpkgs/libwebp/template
@@ -31,9 +31,3 @@ libwebp-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libwebp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libwmf/template b/srcpkgs/libwmf/template
index 847e242822..7cf1b7f24f 100644
--- a/srcpkgs/libwmf/template
+++ b/srcpkgs/libwmf/template
@@ -9,6 +9,8 @@ configure_args="--with-gsfontdir=/usr/share/fonts/Type1
hostmakedepends="automake libtool pkg-config gsfonts freetype-devel"
makedepends="zlib-devel freetype-devel libjpeg-turbo-devel libpng-devel>=1.6
expat-devel glib-devel gtk+-devel gd-devel gsfonts"
+depends="gsfonts"
+triggers="gtk-pixbuf-loaders"
short_desc="Library for reading and converting WMF (Windows Meta Files)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://wvware.sourceforge.net/libwmf.html"
@@ -34,11 +36,3 @@ libwmf-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libwmf_package() {
- depends="gsfonts"
- triggers="gtk-pixbuf-loaders"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 61811f988a..2f5c4eabba 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -23,9 +23,3 @@ libwnck-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-libwnck_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index a53aa234c1..964b3b376e 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,10 +1,10 @@
# Template build file for 'libwnck2'.
pkgname=libwnck2
version=2.30.7
-revision=4
-wrksrc=libwnck-${version}
+revision=5
+wrksrc="${pkgname/2/}-${version}"
build_style=gnu-configure
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool gdk-pixbuf-devel"
makedepends="startup-notification-devel libXres-devel gtk+-devel"
short_desc="Library for layout and rendering of text (GTK+2)"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,30 +12,38 @@ homepage="http://www.gnome.org/"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/libwnck/2.30/libwnck-$version.tar.bz2"
checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
-long_desc="
- libwnck is Window Navigator Construction Kit, i.e. a library to use
- for writing pagers and taskslists and stuff.
- This package is based in the GTK+2 Toolkit."
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
post_install() {
rm -rf ${DESTDIR}/usr/bin
}
libwnck2-devel_package() {
- depends="gtk+-devel startup-notification-devel libXres-devel libwnck2>=${version}"
+ depends="gtk+-devel startup-notification-devel libXres-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" -- development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
- vmove usr/share/gir-1.0
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
vmove usr/share/gtk-doc
}
}
-
-libwnck2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 37d185bccc..b8bbbc63c5 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -22,9 +22,3 @@ libx86-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libx86_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index b44c225b66..e58143fd4d 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -31,9 +31,3 @@ libxcb-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libxcb_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libxdg-basedir/template b/srcpkgs/libxdg-basedir/template
index 385cbd508d..b553672e8a 100644
--- a/srcpkgs/libxdg-basedir/template
+++ b/srcpkgs/libxdg-basedir/template
@@ -20,9 +20,3 @@ libxdg-basedir-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libxdg-basedir_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 169d84aebe..38e7f2dbc3 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -7,6 +7,7 @@ configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel libxfce4util-devel xfconf-devel dbus-glib-devel
libxml2-devel startup-notification-devel libSM-devel"
+conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
short_desc="Replacement of the old libxfcegui4 library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -34,10 +35,3 @@ libxfce4ui-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-libxfce4ui_package() {
- conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 5b2d69bef5..89140a74a2 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -21,9 +21,3 @@ libxfce4util-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-libxfce4util_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxfcegui4/template b/srcpkgs/libxfcegui4/template
index 8023892239..a6e1f906e5 100644
--- a/srcpkgs/libxfcegui4/template
+++ b/srcpkgs/libxfcegui4/template
@@ -15,21 +15,15 @@ checksum=2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel libxml2-devel libxfce4util-devel
startup-notification-devel libglade-devel libxklavier-devel"
+depends="hicolor-icon-theme"
+conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
libxfcegui4-devel_package() {
depends="libxfce4util-devel libxfcegui4-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/gtk-doc
}
}
-
-libxfcegui4_package() {
- conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
- depends="hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 182da8688d..cf23b8552e 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config flex xkeyboard-config"
+depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xkbcommon.org/"
@@ -29,10 +30,3 @@ libxkbcommon-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libxkbcommon_package() {
- depends="xkeyboard-config"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxkbfile/template b/srcpkgs/libxkbfile/template
index db7a6ae4bf..262fdde291 100644
--- a/srcpkgs/libxkbfile/template
+++ b/srcpkgs/libxkbfile/template
@@ -13,16 +13,10 @@ checksum=8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a
libxkbfile-devel_package() {
depends="kbproto libX11-devel libxkbfile>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig
}
}
-
-libxkbfile_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxkbui/template b/srcpkgs/libxkbui/template
index fa3543eb50..a20c2ea416 100644
--- a/srcpkgs/libxkbui/template
+++ b/srcpkgs/libxkbui/template
@@ -14,16 +14,10 @@ checksum=20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214
libxkbui-devel_package() {
depends="libxkbui-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-libxkbui_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxklavier/template b/srcpkgs/libxklavier/template
index eae1f62899..5633e6d733 100644
--- a/srcpkgs/libxklavier/template
+++ b/srcpkgs/libxklavier/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config gobject-introspection"
makedepends="libglib-devel libxkbfile-devel libxml2-devel>=2.7.8 libXi-devel xkeyboard-config iso-codes"
+depends="xkeyboard-config iso-codes"
short_desc="Library providing high-level API for X Keyboard Extension"
homepage="http://freedesktop.org/wiki/Software/LibXklavier"
license="LGPL-2"
@@ -27,10 +28,3 @@ libxklavier-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-libxklavier_package() {
- depends="xkeyboard-config iso-codes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxml++/template b/srcpkgs/libxml++/template
index dd00c3f7a2..de9ecb1734 100644
--- a/srcpkgs/libxml++/template
+++ b/srcpkgs/libxml++/template
@@ -29,16 +29,10 @@ pre_install() {
libxml++-devel_package() {
depends="libxml2-devel ${sourcepkg}-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/libxml++-2.6/include
}
}
-
-libxml++_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxml2/patches/libxml2-pthread.patch b/srcpkgs/libxml2/patches/libxml2-pthread.patch
new file mode 100644
index 0000000000..b0467f15a5
--- /dev/null
+++ b/srcpkgs/libxml2/patches/libxml2-pthread.patch
@@ -0,0 +1,53 @@
+--- threads.c 2013-07-24 03:30:55.160000003 +0000
++++ threads.c 2013-07-24 03:33:50.323000003 +0000
+@@ -47,49 +47,7 @@
+ #ifdef HAVE_PTHREAD_H
+
+ static int libxml_is_threaded = -1;
+-#ifdef __GNUC__
+-#ifdef linux
+-#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3)
+-extern int pthread_once (pthread_once_t *__once_control,
+- void (*__init_routine) (void))
+- __attribute((weak));
+-extern void *pthread_getspecific (pthread_key_t __key)
+- __attribute((weak));
+-extern int pthread_setspecific (pthread_key_t __key,
+- __const void *__pointer)
+- __attribute((weak));
+-extern int pthread_key_create (pthread_key_t *__key,
+- void (*__destr_function) (void *))
+- __attribute((weak));
+-extern int pthread_key_delete (pthread_key_t __key)
+- __attribute((weak));
+-extern int pthread_mutex_init ()
+- __attribute((weak));
+-extern int pthread_mutex_destroy ()
+- __attribute((weak));
+-extern int pthread_mutex_lock ()
+- __attribute((weak));
+-extern int pthread_mutex_unlock ()
+- __attribute((weak));
+-extern int pthread_cond_init ()
+- __attribute((weak));
+-extern int pthread_cond_destroy ()
+- __attribute((weak));
+-extern int pthread_cond_wait ()
+- __attribute((weak));
+-extern int pthread_equal ()
+- __attribute((weak));
+-extern pthread_t pthread_self ()
+- __attribute((weak));
+-extern int pthread_key_create ()
+- __attribute((weak));
+-extern int pthread_key_delete ()
+- __attribute((weak));
+-extern int pthread_cond_signal ()
+- __attribute((weak));
+-#endif
+-#endif /* linux */
+-#endif /* __GNUC__ */
++
+ #endif /* HAVE_PTHREAD_H */
+
+ /*
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index dd3e26f04d..cfd3fd02fb 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
# Template build file for 'libxml2'.
pkgname=libxml2
version=2.9.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --with-threads --with-history"
makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel python-devel"
@@ -28,7 +28,7 @@ post_install() {
}
libxml2-devel_package() {
- depends="zlib-devel libxml2>=${version}"
+ depends="zlib-devel libxml2>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -40,6 +40,7 @@ libxml2-devel_package() {
vmove usr/share/doc/${sourcepkg}-${version}
vmove "usr/share/man/man1/xml2-config*"
vmove usr/share/man/man3
+ vmove "usr/lib/*.so"
}
}
@@ -50,9 +51,3 @@ libxml2-python_package() {
vmove usr/share/doc/${sourcepkg}-python-${version}
}
}
-
-libxml2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libxshmfence/template b/srcpkgs/libxshmfence/template
index 22d3c00633..2edf6ca2ce 100644
--- a/srcpkgs/libxshmfence/template
+++ b/srcpkgs/libxshmfence/template
@@ -26,9 +26,3 @@ libxshmfence-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-libxshmfence_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index cf888baaba..73382889ae 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -37,7 +37,7 @@ post_install() {
libxslt-devel_package() {
depends="libxml2-devel libxslt-${version}_${revision}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/bin/xslt-config
vmove usr/lib/xsltConf.sh
@@ -50,16 +50,10 @@ libxslt-devel_package() {
}
libxslt-python_package() {
- short_desc="${short_desc} -- python extension"
+ short_desc+=" - python extension"
pycompile_module="libxslt.py"
pkg_install() {
vmove "usr/lib/python*"
vmove usr/share/doc/${sourcepkg}-python-${version}
}
}
-
-libxslt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libyaml/template b/srcpkgs/libyaml/template
index 3655a2e4ba..43f0db6386 100644
--- a/srcpkgs/libyaml/template
+++ b/srcpkgs/libyaml/template
@@ -20,16 +20,10 @@ post_install() {
libyaml-devel_package() {
depends="libyaml>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-libyaml_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libzapojit/template b/srcpkgs/libzapojit/template
index 0192ecfc91..850abfc425 100644
--- a/srcpkgs/libzapojit/template
+++ b/srcpkgs/libzapojit/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="json-glib-devel rest-devel>=0.7.90 gnome-online-accounts-devel>=3.10"
+depends="rest>=0.7.90"
short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -25,10 +26,3 @@ libzapojit-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-libzapojit_package() {
- depends="rest>=0.7.90"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libzeitgeist/template b/srcpkgs/libzeitgeist/template
index 6844960467..546fc55fd4 100644
--- a/srcpkgs/libzeitgeist/template
+++ b/srcpkgs/libzeitgeist/template
@@ -23,7 +23,7 @@ post_install() {
libzeitgeist-devel_package() {
depends="${sourcepkg}>=$version"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -31,9 +31,3 @@ libzeitgeist-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-libzeitgeist_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 3434cab773..b454eb0a1b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,29 +1,29 @@
# Template file for 'libzip'
pkgname=libzip
-version=0.10.1
+version=0.11.2
revision=1
build_style=gnu-configure
+makedepends="zlib-devel"
short_desc="C library for reading, creating, and modifying zip archives"
maintainer="pancake <pancake@nopcode.org>"
license="GPL-2"
homepage="http://www.nih.at/libzip/"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
-checksum=a7cdb5112004db5147f330f16c0f0e732922c342b9f0cda422c45e254590b617
+checksum=83db1fb43a961ff7d1d1b50e1c6bea09c67e6af867686d1fc92ecb7dc6cf98d5
+
+post_install() {
+ ln -sfr ${DESTDIR}/usr/lib/libzip/include/zipconf.h ${DESTDIR}/usr/include/zipconf.h
+}
libzip-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/share/man/man3
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/lib/libzip
}
}
-
-libzip_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 2800c0eb5a..3888c3c464 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -6,18 +6,12 @@ build_style=gnu-configure
configure_args="--disable-static --with-gtk2"
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel lightdm-devel>=1.8 libxklavier-devel"
+depends="lightdm"
+conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
+conflicts="lightdm-gtk3-greeter>=0"
short_desc="Light Display Manager GTK+ Greeter (GTK+ 2.x)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3, LGPL-3"
homepage="https://launchpad.net/lightdm-gtk-greeter"
distfiles="https://launchpad.net/lightdm-gtk-greeter/${version%.*}/${version}/+download/$pkgname-$version.tar.gz"
checksum=1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9
-
-lightdm-gtk-greeter_package() {
- conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
- conflicts="lightdm-gtk3-greeter>=0"
- depends="lightdm"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template
index 5e23ce56a7..ee3c2b8771 100644
--- a/srcpkgs/lightdm-gtk3-greeter/template
+++ b/srcpkgs/lightdm-gtk3-greeter/template
@@ -7,18 +7,12 @@ build_style=gnu-configure
configure_args="--disable-static --with-gtk3"
hostmakedepends="pkg-config intltool"
makedepends="gtk+3-devel lightdm-devel>=1.8 libxklavier-devel"
+depends="lightdm"
+conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
+conflicts="lightdm-gtk-greeter>=0"
short_desc="Light Display Manager GTK+ Greeter (GTK+ 3.x)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3, LGPL-3"
homepage="https://launchpad.net/lightdm-gtk-greeter"
distfiles="https://launchpad.net/lightdm-gtk-greeter/${version%.*}/${version}/+download/${pkgname/3/}-${version}.tar.gz"
checksum=1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9
-
-lightdm-gtk3-greeter_package() {
- conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
- conflicts="lightdm-gtk-greeter>=0"
- depends="lightdm"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lightdm/INSTALL b/srcpkgs/lightdm/INSTALL
index 5680ddf187..0fc905273b 100644
--- a/srcpkgs/lightdm/INSTALL
+++ b/srcpkgs/lightdm/INSTALL
@@ -1,5 +1,8 @@
case ${ACTION} in
post)
+ # polkit rules must be owned by the polkit user
+ chown -R polkitd:polkitd usr/share/polkit-1/rules.d
+
cat <<_EOF
==========================================================================
To make lightdm work a greeter package must be installed:
diff --git a/srcpkgs/lightdm/files/xsession b/srcpkgs/lightdm/files/xsession
index 5da041e6d7..589dc704c0 100644
--- a/srcpkgs/lightdm/files/xsession
+++ b/srcpkgs/lightdm/files/xsession
@@ -52,18 +52,6 @@ if [ -d "$xinitdir" ]; then
done
fi
-# Load Xsession scripts
-xsessionddir="/etc/X11/Xsession.d"
-if [ -d "$xsessionddir" ]; then
- for i in `ls $xsessionddir`; do
- script="$xsessionddir/$i"
- echo "Loading X session script $script"
- if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
- . "$script"
- fi
- done
-fi
-
echo "X session wrapper complete, running session $@"
exec $@
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index a00563d64c..9eaf3d9b32 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,7 +1,7 @@
# Template file for 'lightdm'
pkgname=lightdm
version=1.8.5
-revision=1
+revision=3
build_style=gnu-configure
configure_args="--with-greeter-session=lightdm-gtk-greeter
--with-greeter-user=lightdm --disable-static --disable-tests"
@@ -11,18 +11,23 @@ license="GPL-3, LGPL-3"
homepage="https://launchpad.net/lightdm"
distfiles="https://launchpad.net/lightdm/${version%.*}/$version/+download/$pkgname-$version.tar.xz"
checksum=c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2
-long_desc="
- An X display manager that:
- * Has a lightweight codebase
- * Is standards compliant (PAM, ConsoleKit, etc)
- * Has a well defined interface between the server and user interface
- * Fully themeable (easiest with the webkit interface)
- * Cross-desktop (greeters can be written in any toolkit)"
hostmakedepends="pkg-config intltool itstool gobject-introspection which"
makedepends="dbus-glib-devel libxklavier-devel libxml2-devel
qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
- libgcrypt-devel gnome-icon-theme dbus"
+ libgcrypt-devel gnome-icon-theme dbus accountsservice-devel"
+depends="gnome-icon-theme dbus accountsservice"
+conf_files="
+ /etc/lightdm/keys.conf
+ /etc/lightdm/lightdm.conf
+ /etc/lightdm/users.conf
+ /etc/pam.d/lightdm
+ /etc/pam.d/lightdm-greeter
+ /etc/pam.d/lightdm-autologin"
+system_accounts="lightdm"
+lightdm_homedir="/var/cache/lightdm"
+systemd_services="lightdm.service off"
+make_dirs="/var/cache/lightdm 0755 lightdm lightdm"
post_install() {
# Remove provided init file and use our own.
@@ -51,8 +56,8 @@ liblightdm-qt_package() {
}
lightdm-devel_package() {
- depends="libglib-devel liblightdm-gobject-${version}_${revision}
- liblightdm-qt-${version}_${revision}"
+ depends="libglib-devel liblightdm-gobject>=${version}_${revision}
+ liblightdm-qt>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -63,21 +68,3 @@ lightdm-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-lightdm_package() {
- conf_files="
- /etc/lightdm/keys.conf
- /etc/lightdm/lightdm.conf
- /etc/lightdm/users.conf
- /etc/pam.d/lightdm
- /etc/pam.d/lightdm-greeter
- /etc/pam.d/lightdm-autologin"
- system_accounts="lightdm"
- lightdm_homedir="/var/cache/lightdm"
- systemd_services="lightdm.service off"
- make_dirs="/var/cache/lightdm 0755 lightdm lightdm"
- depends="gnome-icon-theme dbus accountsservice upower"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lightspark/template b/srcpkgs/lightspark/template
index 1cb8e62e61..2f00230e64 100644
--- a/srcpkgs/lightspark/template
+++ b/srcpkgs/lightspark/template
@@ -12,17 +12,11 @@ makedepends="zlib-devel pcre-devel>=8.30 libffi-devel libX11-devel
MesaLib-devel ftgl-devel glew-devel>=1.9.0 libxml2-devel libxml++-devel
glibmm-devel gtk+-devel libjpeg-turbo-devel pulseaudio-devel llvm>=3.2
librtmp-devel liblzma-devel libcurl-devel"
+depends="hicolor-icon-theme desktop-file-utils"
+conf_files="/etc/xdg/lightspark.conf"
short_desc="Modern, free, open-source flash player implementation"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://lightspark.github.com/"
license="LGPL-3"
distfiles="http://launchpad.net/lightspark/trunk/$pkgname-$version/+download/$pkgname-$version.tar.gz"
checksum=70479bac90f3455a5ff6d0aaf6bccaedfbaac3c70bd602680f68ce75eab2dd1b
-
-lightspark_package() {
- conf_files="/etc/xdg/lightspark.conf"
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lilv/template b/srcpkgs/lilv/template
index dbad656e6a..27d328276d 100644
--- a/srcpkgs/lilv/template
+++ b/srcpkgs/lilv/template
@@ -18,7 +18,7 @@ long_desc="
faster and have minimal dependencies."
liblilv_package() {
- short_desc="${short_desc} - Runtime library"
+ short_desc+=" - Runtime library"
pkg_install() {
vmove "usr/lib/*.so*"
chmod 755 ${PKGDESTDIR}/usr/lib/*.so*
@@ -27,7 +27,7 @@ liblilv_package() {
lilv-bash-completion_package() {
depends="bash-completion lilv"
- short_desc="${short_desc} - Bash completion for Lilv"
+ short_desc+=" - Bash completion for Lilv"
pkg_install() {
vmove usr/etc
}
@@ -35,15 +35,9 @@ lilv-bash-completion_package() {
lilv-devel_package() {
depends="sord-devel liblilv>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-lilv_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 82c4334a1d..84f6d4eb9f 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -2,10 +2,16 @@
pkgname=linux-firmware
version=20131028
revision=1
+noarch=yes
short_desc="Binary firmware blobs for the Linux kernel"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org/"
license="See /usr/share/licenses/${pkgname}"
+replaces="kernel-firmware>=0 radeon-firmware>=0 iwl1000-firmware>=0
+ iwl3945-firmware>=0 iwl4965-firmware>=0 iwl5000-firmware>=0
+ iwl5150-firmware>=0 iwl6000-firmware>=0 rt73usb-firmware>=0
+ rt2800usb>=0 rt61-firmware>=0 ar9170-firmware>=0 amd-ucode>=0"
+depends="${pkgname}-network-${version}_${revision}"
do_fetch() {
url="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
@@ -40,15 +46,3 @@ linux-firmware-network_package() {
vmove usr/lib/firmware/ti-connectivity
}
}
-
-linux-firmware_package() {
- replaces="kernel-firmware>=0 radeon-firmware>=0 iwl1000-firmware>=0
- iwl3945-firmware>=0 iwl4965-firmware>=0 iwl5000-firmware>=0
- iwl5150-firmware>=0 iwl6000-firmware>=0 rt73usb-firmware>=0
- rt2800usb>=0 rt61-firmware>=0 ar9170-firmware>=0 amd-ucode>=0"
- depends="${pkgname}-network-${version}_${revision}"
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 7fc89fe260..3d3e7deb63 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,6 +7,7 @@ short_desc="Linux kernel tools"
hostmakedepends="flex perl asciidoc xmlto python automake libtool"
makedepends="pciutils-devel libnuma-devel python-devel libglib-devel libsysfs-devel
elfutils-devel libunwind-devel"
+depends="cpupower>=${version} perf>=${version} usbip>=${version} x86_energy_perf_policy>=${version}"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.kernel.org"
@@ -149,10 +150,3 @@ usbip_package() {
vmove usr/lib/systemd/system/usbipd.service
}
}
-
-linux-tools_package() {
- depends="cpupower>=${version} perf>=${version} usbip>=${version} x86_energy_perf_policy>=${version}"
- pkg_install() {
- vmkdir usr
- }
-}
diff --git a/srcpkgs/linux-user-chroot/template b/srcpkgs/linux-user-chroot/template
index 289a4dc76d..946f59e327 100644
--- a/srcpkgs/linux-user-chroot/template
+++ b/srcpkgs/linux-user-chroot/template
@@ -15,7 +15,6 @@ long_desc="
NOTE: Only users in the wheel group can use this tool."
-
do_fetch() {
local url="git://git.gnome.org/linux-user-chroot"
msg_normal "Fetching source from $url ...\n"
@@ -25,9 +24,3 @@ do_fetch() {
pre_configure() {
./autogen.sh
}
-
-linux-user-chroot_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template
index bb7a24efbb..f97352a9e0 100644
--- a/srcpkgs/linux/template
+++ b/srcpkgs/linux/template
@@ -1,32 +1,23 @@
# Template file for 'linux'
pkgname=linux
version=3.10
-revision=1
+revision=2
build_style=meta
homepage="http://www.voidlinux.eu/"
short_desc="Linux kernel meta package"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Public domain"
-if [ "$XBPS_TARGET_ARCH" = "i686" -o "$XBPS_TARGET_ARCH" = "x86_64" ]; then
- makedepends="linux3.10 linux-firmware dracut"
-elif [ "$XBPS_TARGET_ARCH" = "armv6l" ]; then
- makedepends="kernel-rpi"
-fi
-
-linux_package() {
- if [ "$XBPS_TARGET_ARCH" = "armv6l" ]; then
- depends="kernel-rpi"
- else
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*)
+ makedepends="linux3.10 linux-firmware dracut"
depends="linux3.10"
- fi
-}
+ _depends_headers="linux3.10-headers"
+ ;;
+ *) msg_error "${pkgname}-${version}: unsupported target machine.\n";;
+esac
linux-headers_package() {
short_desc="Linux kernel headers meta package"
- if [ "$XBPS_TARGET_ARCH" = "armv6l" ]; then
- depends="kernel-rpi-headers"
- else
- depends="linux3.10-headers"
- fi
+ depends="${_depends_headers}"
}
diff --git a/srcpkgs/linux3.10/template b/srcpkgs/linux3.10/template
index de997cb854..93e89468d8 100644
--- a/srcpkgs/linux3.10/template
+++ b/srcpkgs/linux3.10/template
@@ -1,7 +1,7 @@
# Template file for 'linux3.10'
#
pkgname=linux3.10
-version=3.10.25
+version=3.10.28
revision=1
wrksrc="linux-${version}"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,11 +9,27 @@ homepage="http://www.kernel.org"
license="GPL-2"
short_desc="The Linux kernel and modules (3.10 series)"
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
-checksum=a6c46d88deaf4f0af9038d2d23b4ed617f901c5de38f1886b865c432f22ac7cd
+checksum=b89a76ed4bf38faf0594d8c4013d387c3f2e5bb1fa23415fe728728f47de9fae
+
+_kernver="${version}_${revision}"
+
+nostrip=yes
+noverifyrdeps=yes
+preserve=yes
only_for_archs="i686 x86_64"
makedepends="bc perl kmod>=11_2 openssl which elfutils"
-_kernver="${version}_${revision}"
+depends="dracut linux-firmware kmod>=11_2"
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
do_configure() {
# If there's a file called <arch>-dotconfig, use it to
@@ -201,23 +217,3 @@ linux3.10-headers_package() {
vmove usr/lib/modules/${_kernver}/build
}
}
-
-linux3.10_package() {
- nostrip=yes
- noverifyrdeps=yes
- preserve=yes
- triggers="kernel-hooks"
- depends="dracut linux-firmware kmod>=11_2"
- # These files could be modified when an external module is built.
- mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/linux3.11-headers b/srcpkgs/linux3.11-headers
deleted file mode 120000
index 0c4ca85836..0000000000
--- a/srcpkgs/linux3.11-headers
+++ /dev/null
@@ -1 +0,0 @@
-linux3.11
\ No newline at end of file
diff --git a/srcpkgs/linux3.12/template b/srcpkgs/linux3.12/template
index 24cbecb56c..dd84562ac1 100644
--- a/srcpkgs/linux3.12/template
+++ b/srcpkgs/linux3.12/template
@@ -1,7 +1,7 @@
# Template file for 'linux3.12'
#
pkgname=linux3.12
-version=3.12.6
+version=3.12.9
revision=1
wrksrc="linux-${version}"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,11 +9,26 @@ homepage="http://www.kernel.org"
license="GPL-2"
short_desc="The Linux kernel and modules (3.12 series)"
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
-checksum=085c4d6663f7e85afe8ae196231f291b28187d4237e46492fa63e1726db04412
+checksum=6a3e9f1abbaeaad34cddf0ddd69d60877765003faccf151b99d33e073566f5cb
+_kernver="${version}_${revision}"
+
+nostrip=yes
+noverifyrdeps=yes
+preserve=yes
only_for_archs="i686 x86_64"
makedepends="bc perl kmod>=11_2 openssl which elfutils"
-_kernver="${version}_${revision}"
+depends="dracut linux-firmware kmod>=11_2"
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
do_configure() {
# If there's a file called <arch>-dotconfig, use it to
@@ -201,23 +216,3 @@ linux3.12-headers_package() {
vmove usr/lib/modules/${_kernver}/build
}
}
-
-linux3.12_package() {
- nostrip=yes
- noverifyrdeps=yes
- preserve=yes
- triggers="kernel-hooks"
- depends="dracut linux-firmware kmod>=11_2"
- # These files could be modified when an external module is built.
- mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/linux3.13-headers b/srcpkgs/linux3.13-headers
new file mode 120000
index 0000000000..b76083b4c4
--- /dev/null
+++ b/srcpkgs/linux3.13-headers
@@ -0,0 +1 @@
+linux3.13
\ No newline at end of file
diff --git a/srcpkgs/linux3.11/files/i386-dotconfig b/srcpkgs/linux3.13/files/i386-dotconfig
similarity index 96%
rename from srcpkgs/linux3.11/files/i386-dotconfig
rename to srcpkgs/linux3.13/files/i386-dotconfig
index b1d59cdcc1..b91f70e9ce 100644
--- a/srcpkgs/linux3.11/files/i386-dotconfig
+++ b/srcpkgs/linux3.13/files/i386-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0 Kernel Configuration
+# Linux/x86 3.13.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -38,7 +38,6 @@ CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
@@ -50,7 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
@@ -72,12 +71,10 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_FHANDLE=y
# CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
#
# IRQ subsystem
#
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
@@ -164,8 +161,10 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -232,7 +231,6 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_KPROBES_ON_FTRACE=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
@@ -267,6 +265,7 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -289,6 +288,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CMDLINE_PARSER=y
#
# Partition Types
@@ -313,6 +313,7 @@ CONFIG_LDM_PARTITION=y
# CONFIG_KARMA_PARTITION is not set
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+CONFIG_CMDLINE_PARTITION=y
#
# IO Schedulers
@@ -354,6 +355,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=64
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
CONFIG_KVM_GUEST=y
+CONFIG_KVM_DEBUG_FS=y
# CONFIG_LGUEST_GUEST is not set
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
@@ -460,6 +462,7 @@ CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
@@ -477,6 +480,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
CONFIG_ZBUD=y
CONFIG_ZSWAP=y
# CONFIG_HIGHPTE is not set
@@ -536,16 +540,13 @@ CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
-# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_I2C=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_HOTPLUG_CPU=y
@@ -553,7 +554,6 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
# CONFIG_ACPI_CUSTOM_DSDT is not set
CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=y
CONFIG_X86_PM_TIMER=y
@@ -568,6 +568,7 @@ CONFIG_ACPI_APEI_GHES=y
CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_EINJ=m
CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
CONFIG_SFI=y
# CONFIG_APM is not set
@@ -575,7 +576,6 @@ CONFIG_SFI=y
# CPU Frequency scaling
#
CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
@@ -614,6 +614,10 @@ CONFIG_X86_P4_CLOCKMOD=m
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=m
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -645,7 +649,6 @@ CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_POWERSAVE is not set
CONFIG_PCIEASPM_PERFORMANCE=y
CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
CONFIG_PCI_STUB=m
@@ -705,6 +708,7 @@ CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
+CONFIG_X86_SYSFB=y
#
# Executable file formats / Emulations
@@ -718,7 +722,6 @@ CONFIG_HAVE_AOUT=y
CONFIG_BINFMT_MISC=m
CONFIG_COREDUMP=y
CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
CONFIG_NET=y
#
@@ -755,7 +758,6 @@ CONFIG_IP_MROUTE=y
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
@@ -787,7 +789,6 @@ CONFIG_DEFAULT_RENO=y
CONFIG_DEFAULT_TCP_CONG="reno"
CONFIG_TCP_MD5SIG=y
CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -801,6 +802,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_VTI=m
CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
@@ -860,7 +862,18 @@ CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -951,7 +964,9 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
@@ -1001,6 +1016,11 @@ CONFIG_IP_VS_PE_SIP=m
#
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -1008,6 +1028,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1031,6 +1052,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1044,11 +1068,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1161,6 +1187,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1179,6 +1206,7 @@ CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_CLS_BPF=m
# CONFIG_NET_EMATCH is not set
CONFIG_NET_CLS_ACT=y
CONFIG_NET_ACT_POLICE=m
@@ -1202,11 +1230,13 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
CONFIG_VSOCKETS=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
@@ -1358,6 +1388,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
CONFIG_NFC_NCI=m
CONFIG_NFC_NCI_SPI=y
CONFIG_NFC_HCI=m
@@ -1370,6 +1401,7 @@ CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
CONFIG_NFC_MEI_PHY=m
CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
CONFIG_NFC_PN544=m
CONFIG_NFC_PN544_MEI=m
CONFIG_NFC_MICROREAD=m
@@ -1482,6 +1514,7 @@ CONFIG_BCH_CONST_T=4
# CONFIG_MTD_LPDDR is not set
# CONFIG_MTD_UBI is not set
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -1498,10 +1531,10 @@ CONFIG_PNP=y
#
CONFIG_PNPACPI=y
CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
CONFIG_BLK_DEV_FD=m
# CONFIG_PARIDE is not set
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
# CONFIG_CISS_SCSI_TAPE is not set
CONFIG_BLK_DEV_DAC960=m
@@ -1599,6 +1632,14 @@ CONFIG_ALTERA_STAPL=m
CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=m
CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1678,6 +1719,7 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1862,7 +1904,6 @@ CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
@@ -1877,8 +1918,8 @@ CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_CLEANER=m
CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
@@ -1947,6 +1988,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
CONFIG_RIONET=m
CONFIG_RIONET_TX_SIZE=128
CONFIG_RIONET_RX_SIZE=128
@@ -2092,6 +2134,7 @@ CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
# CONFIG_IXGBE_DCB is not set
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_IP1000=m
CONFIG_JME=m
@@ -2108,7 +2151,6 @@ CONFIG_MLX4_EN_DCB=y
CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_DEBUG=y
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
CONFIG_KS8851=m
@@ -2136,6 +2178,7 @@ CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_QLA3XXX=m
CONFIG_QLCNIC=m
CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
CONFIG_QLGE=m
CONFIG_NETXEN_NIC=m
CONFIG_NET_VENDOR_REALTEK=y
@@ -2252,8 +2295,10 @@ CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2309,6 +2354,7 @@ CONFIG_ATH9K_PCI=y
# CONFIG_ATH9K_AHB is not set
# CONFIG_ATH9K_DEBUGFS is not set
CONFIG_ATH9K_LEGACY_RATE_CONTROL=y
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2326,6 +2372,8 @@ CONFIG_ATH10K=m
CONFIG_ATH10K_PCI=m
# CONFIG_ATH10K_DEBUG is not set
# CONFIG_ATH10K_DEBUGFS is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_B43=m
CONFIG_B43_BCMA=y
CONFIG_B43_SSB=y
@@ -2381,7 +2429,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_P2P=y
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2424,10 +2471,12 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
CONFIG_RT2X00_LIB_MMIO=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_USB=m
@@ -2663,7 +2712,9 @@ CONFIG_TOUCHSCREEN_W90X900=m
# CONFIG_TOUCHSCREEN_PCAP is not set
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUR40=m
CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
@@ -2690,7 +2741,6 @@ CONFIG_INPUT_RETU_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
CONFIG_INPUT_DA9052_ONKEY=m
# CONFIG_INPUT_WM831X_ON is not set
@@ -2702,6 +2752,7 @@ CONFIG_INPUT_IMS_PCU=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -2717,6 +2768,7 @@ CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -2832,14 +2884,18 @@ CONFIG_RAW_DRIVER=m
CONFIG_MAX_RAW_DEVS=256
CONFIG_HPET=y
CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_ST33_I2C=m
+CONFIG_TCG_XEN=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
CONFIG_I2C=m
@@ -2854,6 +2910,7 @@ CONFIG_I2C_MUX=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX_PCA9541=m
CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_SMBUS=m
CONFIG_I2C_ALGOBIT=m
@@ -2987,9 +3044,17 @@ CONFIG_PTP_1588_CLOCK=m
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
#
CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
CONFIG_GPIO_ACPI=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_GENERIC=m
@@ -3001,6 +3066,7 @@ CONFIG_GPIO_MAX730X=m
#
CONFIG_GPIO_GENERIC_PLATFORM=m
CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_F7188X=m
CONFIG_GPIO_TS5500=m
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
@@ -3025,7 +3091,7 @@ CONFIG_GPIO_ADP5588=m
#
CONFIG_GPIO_CS5535=m
CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_LANGWELL=y
+# CONFIG_GPIO_INTEL_MID is not set
CONFIG_GPIO_PCH=m
CONFIG_GPIO_ML_IOH=m
CONFIG_GPIO_TIMBERDALE=y
@@ -3042,7 +3108,12 @@ CONFIG_GPIO_74X164=m
#
# AC97 GPIO expanders:
#
-CONFIG_GPIO_UCB1400=y
+CONFIG_GPIO_UCB1400=m
+
+#
+# LPC GPIO expanders:
+#
+CONFIG_GPIO_KEMPLD=m
#
# MODULbus GPIO expanders:
@@ -3107,8 +3178,9 @@ CONFIG_CHARGER_LP8727=m
CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_MANAGER=y
CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24735=m
CONFIG_CHARGER_SMB347=m
-CONFIG_BATTERY_GOLDFISH=m
# CONFIG_POWER_RESET is not set
CONFIG_POWER_AVS=y
CONFIG_HWMON=m
@@ -3157,6 +3229,7 @@ CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_GPIO_FAN=m
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3362,6 +3435,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
@@ -3427,30 +3501,32 @@ CONFIG_MFD_WM831X=y
CONFIG_MFD_WM831X_SPI=y
CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_DUMMY is not set
CONFIG_REGULATOR_FIXED_VOLTAGE=m
CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_GPIO=m
CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARIZONA=m
CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9210=m
CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_GPIO=m
CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
CONFIG_REGULATOR_MAX1586=m
CONFIG_REGULATOR_MAX8649=m
CONFIG_REGULATOR_MAX8660=m
CONFIG_REGULATOR_MAX8952=m
CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP8755=m
CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PFUZE100=m
CONFIG_REGULATOR_TPS51632=m
CONFIG_REGULATOR_TPS6105X=m
CONFIG_REGULATOR_TPS62360=m
@@ -3570,6 +3646,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3599,8 +3676,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
# Analog/digital TV USB devices
@@ -3709,6 +3787,7 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_BT848=m
@@ -3746,11 +3825,13 @@ CONFIG_VIDEO_TIMBERDALE=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_VIDEO_RCAR_VIN=m
CONFIG_VIDEO_SH_MOBILE_CSI2=m
CONFIG_VIDEO_SH_MOBILE_CEU=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_V4L_TEST_DRIVERS is not set
#
@@ -3759,6 +3840,7 @@ CONFIG_VIDEO_SH_VEU=m
CONFIG_SMS_SDIO_DRV=m
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3801,7 +3883,6 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -3880,7 +3961,7 @@ CONFIG_VIDEO_UPD64031A=m
CONFIG_VIDEO_UPD64083=m
#
-# Miscelaneous helper chips
+# Miscellaneous helper chips
#
CONFIG_VIDEO_M52790=m
@@ -3974,6 +4055,7 @@ CONFIG_DVB_TUNER_CX24113=m
CONFIG_DVB_TDA826X=m
CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_TS2020=m
CONFIG_DVB_DS3000=m
@@ -4085,6 +4167,7 @@ CONFIG_VGA_SWITCHEROO=y
CONFIG_DRM=m
CONFIG_DRM_USB=m
CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
CONFIG_DRM_TTM=m
@@ -4104,6 +4187,8 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
+CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4194,6 +4279,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
CONFIG_EXYNOS_VIDEO=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
@@ -4222,11 +4308,14 @@ CONFIG_BACKLIGHT_SAHARA=m
CONFIG_BACKLIGHT_ADP8860=m
CONFIG_BACKLIGHT_ADP8870=m
CONFIG_BACKLIGHT_PCF50633=m
-CONFIG_BACKLIGHT_LM3630=m
+CONFIG_BACKLIGHT_LM3630A=m
CONFIG_BACKLIGHT_LM3639=m
CONFIG_BACKLIGHT_LP855X=m
CONFIG_BACKLIGHT_OT200=m
CONFIG_BACKLIGHT_TPS65217=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
#
# Console display driver support
@@ -4289,7 +4378,6 @@ CONFIG_SND_AC97_POWER_SAVE=y
CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
CONFIG_SND_SB_COMMON=m
CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
@@ -4403,6 +4491,7 @@ CONFIG_SND_USB_6FIRE=m
CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
# CONFIG_SND_FIREWIRE_SPEAKERS is not set
# CONFIG_SND_ISIGHT is not set
CONFIG_SND_SCS1X=m
@@ -4410,7 +4499,6 @@ CONFIG_SND_SOC=m
CONFIG_SND_ATMEL_SOC=m
CONFIG_SND_DESIGNWARE_I2S=m
CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_SI476X=m
CONFIG_SND_SIMPLE_CARD=m
# CONFIG_SOUND_PRIME is not set
@@ -4483,6 +4571,7 @@ CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
CONFIG_HID_SPEEDLINK=m
CONFIG_HID_STEELSERIES=m
CONFIG_HID_SUNPLUS=m
@@ -4498,6 +4587,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
@@ -4514,6 +4604,7 @@ CONFIG_USB_HIDDEV=y
# I2C HID support
#
CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4540,7 +4631,6 @@ CONFIG_USB_WUSB_CBAF=m
CONFIG_USB_C67X00_HCD=m
CONFIG_USB_XHCI_HCD=m
CONFIG_USB_XHCI_PLATFORM=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -4551,13 +4641,11 @@ CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PCI=m
CONFIG_USB_OHCI_HCD_SSB=y
CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_U132_HCD=m
CONFIG_USB_SL811_HCD=m
@@ -4568,12 +4656,12 @@ CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
CONFIG_USB_HCD_BCMA=m
CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
# CONFIG_USB_MUSB_HOST is not set
# CONFIG_USB_MUSB_GADGET is not set
CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_UX500=m
# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
@@ -4620,9 +4708,21 @@ CONFIG_USB_DWC3=m
# CONFIG_USB_DWC3_HOST is not set
# CONFIG_USB_DWC3_GADGET is not set
CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_PCI=m
+
+#
+# Debugging features
+#
# CONFIG_USB_DWC3_DEBUG is not set
CONFIG_USB_CHIPIDEA=m
# CONFIG_USB_CHIPIDEA_UDC is not set
+CONFIG_USB_CHIPIDEA_HOST=y
# CONFIG_USB_CHIPIDEA_DEBUG is not set
#
@@ -4631,6 +4731,7 @@ CONFIG_USB_CHIPIDEA=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4641,7 +4742,6 @@ CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_IPAQ=m
CONFIG_USB_SERIAL_IR=m
@@ -4672,17 +4772,14 @@ CONFIG_USB_SERIAL_METRO=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
CONFIG_USB_SERIAL_NAVMAN=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_USB_SERIAL_SYMBOL=m
CONFIG_USB_SERIAL_TI=m
@@ -4692,15 +4789,11 @@ CONFIG_USB_SERIAL_WWAN=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_ZIO=m
CONFIG_USB_SERIAL_WISHBONE=m
CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4725,6 +4818,7 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
@@ -4734,10 +4828,12 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-CONFIG_OMAP_CONTROL_USB=m
-CONFIG_OMAP_USB3=m
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -4780,6 +4876,7 @@ CONFIG_USB_F_PHONET=m
CONFIG_USB_F_EEM=m
CONFIG_USB_F_SUBSET=m
CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
CONFIG_USB_CONFIGFS=m
# CONFIG_USB_CONFIGFS_SERIAL is not set
# CONFIG_USB_CONFIGFS_ACM is not set
@@ -4790,6 +4887,7 @@ CONFIG_USB_CONFIGFS=m
# CONFIG_USB_CONFIGFS_RNDIS is not set
# CONFIG_USB_CONFIGFS_EEM is not set
# CONFIG_USB_CONFIGFS_PHONET is not set
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
CONFIG_GADGET_UAC1=y
@@ -4861,6 +4959,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
#
# MemoryStick Host Controller Drivers
@@ -4887,9 +4986,11 @@ CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA9685=m
# CONFIG_LEDS_WM831X_STATUS is not set
CONFIG_LEDS_DA9052=m
CONFIG_LEDS_DAC124S085=m
@@ -4900,7 +5001,6 @@ CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_RENESAS_TPU=y
CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_LM355x=m
CONFIG_LEDS_OT200=m
@@ -5052,6 +5152,7 @@ CONFIG_RTC_DRV_PCF50633=m
#
CONFIG_RTC_DRV_PCAP=m
CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MOXART=m
#
# HID Sensor RTC drivers
@@ -5076,9 +5177,9 @@ CONFIG_DMA_ACPI=y
#
# DMA Clients
#
-CONFIG_NET_DMA=y
CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
CONFIG_DCA=m
CONFIG_AUXDISPLAY=y
CONFIG_KS0108=m
@@ -5088,13 +5189,13 @@ CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
CONFIG_UIO=m
CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
CONFIG_UIO_DMEM_GENIRQ=m
CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
+CONFIG_UIO_MF624=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
@@ -5159,6 +5260,8 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_SSV_DNP=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_WATCHDOG=m
@@ -5191,10 +5294,8 @@ CONFIG_COMEDI_CONTEC_PCI_DIO=m
CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_GSC_HPDI=m
CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_DAQBOARD2000=m
CONFIG_COMEDI_JR3_PCI=m
CONFIG_COMEDI_KE_COUNTER=m
@@ -5214,7 +5315,6 @@ CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_USB_DRIVERS=y
@@ -5230,7 +5330,6 @@ CONFIG_COMEDI_AMPLC_PC236=m
CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_TIO=m
-CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
CONFIG_PANEL_PROFILE=5
@@ -5243,6 +5342,9 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
@@ -5313,7 +5415,6 @@ CONFIG_AD9951=m
# Digital gyroscope sensors
#
CONFIG_ADIS16060=m
-CONFIG_ADIS16260=m
#
# Network Analyzer, Impedance Converters
@@ -5375,15 +5476,11 @@ CONFIG_FT1000_USB=m
#
CONFIG_SPEAKUP=m
CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
CONFIG_SPEAKUP_SYNTH_APOLLO=m
CONFIG_SPEAKUP_SYNTH_AUDPTR=m
CONFIG_SPEAKUP_SYNTH_BNS=m
CONFIG_SPEAKUP_SYNTH_DECTLK=m
CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
CONFIG_SPEAKUP_SYNTH_LTLK=m
CONFIG_SPEAKUP_SYNTH_SOFT=m
CONFIG_SPEAKUP_SYNTH_SPKOUT=m
@@ -5401,6 +5498,7 @@ CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
CONFIG_VIDEO_GO7007_LOADER=m
CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_USB_MSI3101=m
# CONFIG_SOLO6X10 is not set
# CONFIG_LIRC_STAGING is not set
@@ -5416,23 +5514,33 @@ CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
# CONFIG_WIMAX_GDM72XX_USB_PM is not set
+CONFIG_LTE_GDM724X=m
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=y
-# CONFIG_ZCACHE_DEBUG is not set
CONFIG_USB_DWC2=m
# CONFIG_USB_DWC2_DEBUG is not set
# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
+CONFIG_LNET_XPRT_IB=m
CONFIG_USB_BTMTK=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ASUS_LAPTOP=m
-CONFIG_CHROMEOS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -5479,6 +5587,8 @@ CONFIG_APPLE_GMUX=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_SMARTCONNECT=m
CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
@@ -5547,11 +5657,12 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
#
# Accelerometers
#
+CONFIG_BMA180=m
CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_KXSD9=m
CONFIG_IIO_ST_ACCEL_3AXIS=m
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
#
# Analog to digital converters
@@ -5559,13 +5670,15 @@ CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
CONFIG_AD_SIGMA_DELTA=m
CONFIG_AD7266=m
CONFIG_AD7298=m
-CONFIG_AD7923=m
+CONFIG_AD7476=m
CONFIG_AD7791=m
CONFIG_AD7793=m
-CONFIG_AD7476=m
CONFIG_AD7887=m
+CONFIG_AD7923=m
CONFIG_MAX1363=m
CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_NAU7802=m
CONFIG_TI_ADC081C=m
CONFIG_TI_AM335X_ADC=m
CONFIG_VIPERBOARD_ADC=m
@@ -5580,7 +5693,6 @@ CONFIG_AD8366=m
#
CONFIG_HID_SENSOR_IIO_COMMON=m
CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS is not set
CONFIG_IIO_ST_SENSORS_I2C=m
CONFIG_IIO_ST_SENSORS_SPI=m
CONFIG_IIO_ST_SENSORS_CORE=m
@@ -5592,14 +5704,14 @@ CONFIG_AD5064=m
CONFIG_AD5360=m
CONFIG_AD5380=m
CONFIG_AD5421=m
-CONFIG_AD5624R_SPI=m
CONFIG_AD5446=m
CONFIG_AD5449=m
CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_AD5686=m
CONFIG_AD5755=m
CONFIG_AD5764=m
CONFIG_AD5791=m
-CONFIG_AD5686=m
CONFIG_AD7303=m
CONFIG_MAX517=m
CONFIG_MCP4725=m
@@ -5624,6 +5736,7 @@ CONFIG_ADF4350=m
CONFIG_ADIS16080=m
CONFIG_ADIS16130=m
CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
CONFIG_ADXRS450=m
CONFIG_HID_SENSOR_GYRO_3D=m
CONFIG_IIO_ST_GYRO_3AXIS=m
@@ -5644,15 +5757,21 @@ CONFIG_INV_MPU6050_IIO=m
# Light sensors
#
CONFIG_ADJD_S311=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_VCNL4000=m
+CONFIG_APDS9300=m
+CONFIG_CM36651=m
+CONFIG_GP2AP020A00F=m
CONFIG_HID_SENSOR_ALS=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL4531=m
+CONFIG_VCNL4000=m
#
# Magnetometer sensors
#
CONFIG_AK8975=m
+CONFIG_MAG3110=m
CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
CONFIG_IIO_ST_MAGN_3AXIS=m
CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
@@ -5665,11 +5784,17 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
CONFIG_IIO_SYSFS_TRIGGER=m
#
-# Pressure Sensors
+# Pressure sensors
#
CONFIG_IIO_ST_PRESS=m
CONFIG_IIO_ST_PRESS_I2C=m
CONFIG_IIO_ST_PRESS_SPI=m
+
+#
+# Temperature sensors
+#
+CONFIG_TMP006=m
+CONFIG_NTB=m
CONFIG_VME_BUS=m
#
@@ -5700,6 +5825,14 @@ CONFIG_FMC_TRIVIAL=m
CONFIG_FMC_WRITE_EEPROM=m
CONFIG_FMC_CHARDEV=m
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+
#
# Firmware Drivers
#
@@ -5720,6 +5853,7 @@ CONFIG_ISCSI_IBFT=m
CONFIG_EFI_VARS=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_UEFI_CPER=y
#
# File systems
@@ -5774,6 +5908,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5850,6 +5985,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
# CONFIG_HFS_FS is not set
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
@@ -5857,6 +5993,11 @@ CONFIG_HFSPLUS_FS=m
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_ZLIB=y
CONFIG_SQUASHFS_LZO=y
@@ -5885,6 +6026,7 @@ CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
@@ -5900,6 +6042,7 @@ CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_OBJLAYOUT=m
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5920,6 +6063,7 @@ CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_SUNRPC_DEBUG is not set
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -6029,6 +6173,7 @@ CONFIG_DEBUG_FS=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
# CONFIG_FRAME_POINTER is not set
CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
# CONFIG_DEBUG_KERNEL is not set
#
@@ -6092,6 +6237,7 @@ CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
CONFIG_DEBUG_SET_MODULE_RONX=y
CONFIG_DOUBLEFAULT=y
# CONFIG_IOMMU_STRESS is not set
@@ -6111,6 +6257,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# Security options
#
CONFIG_KEYS=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -6154,7 +6302,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=y
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=y
+CONFIG_CRYPTO_ABLK_HELPER=y
CONFIG_CRYPTO_GLUE_HELPER_X86=y
#
@@ -6190,6 +6338,7 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
@@ -6247,6 +6396,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6265,6 +6415,7 @@ CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -6299,8 +6450,9 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
+# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
@@ -6332,6 +6484,7 @@ CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
diff --git a/srcpkgs/linux3.11/files/x86_64-dotconfig b/srcpkgs/linux3.13/files/x86_64-dotconfig
similarity index 96%
rename from srcpkgs/linux3.11/files/x86_64-dotconfig
rename to srcpkgs/linux3.13/files/x86_64-dotconfig
index 1825eff3c9..8e01c57992 100644
--- a/srcpkgs/linux3.11/files/x86_64-dotconfig
+++ b/srcpkgs/linux3.13/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0 Kernel Configuration
+# Linux/x86 3.13.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -39,7 +39,6 @@ CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
@@ -51,7 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="_1"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
@@ -73,12 +72,10 @@ CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_FHANDLE=y
# CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
#
# IRQ subsystem
#
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
@@ -102,17 +99,17 @@ CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ_COMMON=y
# CONFIG_HZ_PERIODIC is not set
-# CONFIG_NO_HZ_IDLE is not set
-CONFIG_NO_HZ_FULL=y
-CONFIG_NO_HZ_FULL_ALL=y
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
#
# CPU/Task time and stats accounting
#
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
+# CONFIG_TICK_CPU_ACCOUNTING is not set
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_TASKSTATS=y
@@ -138,12 +135,15 @@ CONFIG_RCU_BOOST=y
CONFIG_RCU_BOOST_PRIO=1
CONFIG_RCU_BOOST_DELAY=500
CONFIG_RCU_NOCB_CPU=y
+# CONFIG_RCU_NOCB_CPU_NONE is not set
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
CONFIG_RCU_NOCB_CPU_ALL=y
CONFIG_IKCONFIG=m
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_INT128=y
CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
CONFIG_ARCH_USES_NUMA_PROT_NONE=y
CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -172,8 +172,10 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -240,7 +242,6 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_KPROBES_ON_FTRACE=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
@@ -261,10 +262,12 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_HAVE_ARCH_SOFT_DIRTY=y
CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
@@ -276,6 +279,7 @@ CONFIG_COMPAT_OLD_SIGACTION=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
CONFIG_BASE_SMALL=0
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
@@ -297,6 +301,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CMDLINE_PARSER=y
#
# Partition Types
@@ -321,6 +326,7 @@ CONFIG_LDM_PARTITION=y
# CONFIG_KARMA_PARTITION is not set
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+CONFIG_CMDLINE_PARTITION=y
CONFIG_BLOCK_COMPAT=y
#
@@ -363,6 +369,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
CONFIG_KVM_GUEST=y
+CONFIG_KVM_DEBUG_FS=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
CONFIG_NO_BOOTMEM=y
@@ -450,6 +457,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
CONFIG_MEMORY_HOTREMOVE=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
@@ -469,6 +477,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
CONFIG_ZBUD=y
CONFIG_ZSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -528,16 +537,13 @@ CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
-# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_I2C=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_HOTPLUG_CPU=y
@@ -546,7 +552,6 @@ CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_NUMA=y
# CONFIG_ACPI_CUSTOM_DSDT is not set
CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_PCI_SLOT=y
CONFIG_X86_PM_TIMER=y
@@ -562,13 +567,13 @@ CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_ACPI_APEI_MEMORY_FAILURE=y
CONFIG_ACPI_APEI_EINJ=m
CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_ACPI_EXTLOG=m
CONFIG_SFI=y
#
# CPU Frequency scaling
#
CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
@@ -598,6 +603,10 @@ CONFIG_X86_P4_CLOCKMOD=m
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=m
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -630,7 +639,6 @@ CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_POWERSAVE is not set
CONFIG_PCIEASPM_PERFORMANCE=y
CONFIG_PCIE_PME=y
-CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
CONFIG_PCI_STUB=m
@@ -683,6 +691,7 @@ CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
+CONFIG_X86_SYSFB=y
#
# Executable file formats / Emulations
@@ -702,7 +711,6 @@ CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
CONFIG_X86_DEV_DMA_OPS=y
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -741,7 +749,6 @@ CONFIG_IP_MROUTE=y
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
CONFIG_NET_IPVTI=m
CONFIG_INET_AH=m
@@ -773,7 +780,6 @@ CONFIG_DEFAULT_RENO=y
CONFIG_DEFAULT_TCP_CONG="reno"
CONFIG_TCP_MD5SIG=y
CONFIG_IPV6=y
-CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -787,6 +793,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_VTI=m
CONFIG_IPV6_SIT=m
CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_NDISC_NODETYPE=y
@@ -846,7 +853,18 @@ CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_EXTHDR=m
+CONFIG_NFT_META=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_RBTREE=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_COMPAT=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -937,7 +955,9 @@ CONFIG_IP_SET_HASH_IP=m
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m
CONFIG_IP_SET_HASH_NETIFACE=m
CONFIG_IP_SET_LIST_SET=m
@@ -987,6 +1007,11 @@ CONFIG_IP_VS_PE_SIP=m
#
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_TABLES_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NF_TABLES_ARP=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
@@ -994,6 +1019,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1017,6 +1043,9 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_TABLES_IPV6=m
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1030,11 +1059,13 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_NF_NAT_IPV6=m
CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1147,6 +1178,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1165,6 +1197,7 @@ CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_FLOW=m
# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_CLS_BPF=m
# CONFIG_NET_EMATCH is not set
CONFIG_NET_CLS_ACT=y
CONFIG_NET_ACT_POLICE=m
@@ -1188,11 +1221,13 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
CONFIG_VSOCKETS=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
CONFIG_NET_MPLS_GSO=m
+CONFIG_HSR=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
@@ -1344,6 +1379,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
CONFIG_NFC_NCI=m
CONFIG_NFC_NCI_SPI=y
CONFIG_NFC_HCI=m
@@ -1356,6 +1392,7 @@ CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
CONFIG_NFC_MEI_PHY=m
CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
CONFIG_NFC_PN544=m
CONFIG_NFC_PN544_MEI=m
CONFIG_NFC_MICROREAD=m
@@ -1469,6 +1506,7 @@ CONFIG_BCH_CONST_T=4
# CONFIG_MTD_LPDDR is not set
# CONFIG_MTD_UBI is not set
CONFIG_PARPORT=m
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -1485,10 +1523,10 @@ CONFIG_PNP=y
#
CONFIG_PNPACPI=y
CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
CONFIG_BLK_DEV_FD=m
# CONFIG_PARIDE is not set
CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_BLK_CPQ_DA=m
CONFIG_BLK_CPQ_CISS_DA=m
# CONFIG_CISS_SCSI_TAPE is not set
CONFIG_BLK_DEV_DAC960=m
@@ -1501,6 +1539,7 @@ CONFIG_BLK_DEV_DRBD=m
# CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_RAM=m
@@ -1586,6 +1625,16 @@ CONFIG_ALTERA_STAPL=m
CONFIG_INTEL_MEI=m
CONFIG_INTEL_MEI_ME=m
CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC Host Driver
+#
+CONFIG_INTEL_MIC_HOST=m
+
+#
+# Intel MIC Card Driver
+#
+CONFIG_INTEL_MIC_CARD=m
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1665,6 +1714,7 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1847,7 +1897,6 @@ CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_EDEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
@@ -1862,8 +1911,8 @@ CONFIG_DM_CACHE=m
CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_CLEANER=m
CONFIG_DM_MIRROR=m
-CONFIG_DM_RAID=m
CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_QL=m
@@ -2078,6 +2127,7 @@ CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
# CONFIG_IXGBE_DCB is not set
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_IP1000=m
CONFIG_JME=m
@@ -2094,7 +2144,6 @@ CONFIG_MLX4_EN_DCB=y
CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
CONFIG_MLX5_CORE=m
-CONFIG_MLX5_DEBUG=y
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
CONFIG_KS8851=m
@@ -2122,6 +2171,7 @@ CONFIG_NET_VENDOR_QLOGIC=y
CONFIG_QLA3XXX=m
CONFIG_QLCNIC=m
CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
CONFIG_QLGE=m
CONFIG_NETXEN_NIC=m
CONFIG_NET_VENDOR_REALTEK=y
@@ -2238,8 +2288,10 @@ CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
CONFIG_USB_NET_CDC_MBIM=m
CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2295,6 +2347,7 @@ CONFIG_ATH9K_PCI=y
# CONFIG_ATH9K_AHB is not set
# CONFIG_ATH9K_DEBUGFS is not set
CONFIG_ATH9K_LEGACY_RATE_CONTROL=y
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2312,6 +2365,8 @@ CONFIG_ATH10K=m
CONFIG_ATH10K_PCI=m
# CONFIG_ATH10K_DEBUG is not set
# CONFIG_ATH10K_DEBUGFS is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
CONFIG_B43=m
CONFIG_B43_BCMA=y
CONFIG_B43_SSB=y
@@ -2367,7 +2422,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
# Debugging Options
#
# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLWIFI_P2P=y
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -2410,10 +2464,12 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
CONFIG_RT2X00_LIB_MMIO=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_USB=m
@@ -2649,7 +2705,9 @@ CONFIG_TOUCHSCREEN_W90X900=m
# CONFIG_TOUCHSCREEN_PCAP is not set
CONFIG_TOUCHSCREEN_ST1232=m
CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUR40=m
CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_AD714X=m
CONFIG_INPUT_AD714X_I2C=m
@@ -2675,7 +2733,6 @@ CONFIG_INPUT_RETU_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_PCF50633_PMU=m
CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
CONFIG_INPUT_DA9052_ONKEY=m
# CONFIG_INPUT_WM831X_ON is not set
@@ -2687,6 +2744,7 @@ CONFIG_INPUT_IMS_PCU=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -2702,6 +2760,7 @@ CONFIG_SERIO_RAW=m
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -2813,14 +2872,18 @@ CONFIG_RAW_DRIVER=m
CONFIG_MAX_RAW_DEVS=256
CONFIG_HPET=y
CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
CONFIG_HANGCHECK_TIMER=m
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_ST33_I2C=m
+CONFIG_TCG_XEN=m
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
CONFIG_I2C=m
@@ -2835,6 +2898,7 @@ CONFIG_I2C_MUX=m
CONFIG_I2C_MUX_GPIO=m
CONFIG_I2C_MUX_PCA9541=m
CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_SMBUS=m
CONFIG_I2C_ALGOBIT=m
@@ -2967,9 +3031,17 @@ CONFIG_PTP_1588_CLOCK=m
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
#
CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_PINCTRL=y
+
+#
+# Pin controllers
+#
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
CONFIG_GPIO_ACPI=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_GENERIC=m
@@ -2981,6 +3053,7 @@ CONFIG_GPIO_MAX730X=m
#
CONFIG_GPIO_GENERIC_PLATFORM=m
CONFIG_GPIO_IT8761E=m
+CONFIG_GPIO_F7188X=m
CONFIG_GPIO_TS5500=m
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
@@ -3005,7 +3078,7 @@ CONFIG_GPIO_ADP5588=m
#
CONFIG_GPIO_CS5535=m
CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_LANGWELL=y
+# CONFIG_GPIO_INTEL_MID is not set
CONFIG_GPIO_PCH=m
CONFIG_GPIO_ML_IOH=m
CONFIG_GPIO_TIMBERDALE=y
@@ -3022,7 +3095,12 @@ CONFIG_GPIO_74X164=m
#
# AC97 GPIO expanders:
#
-CONFIG_GPIO_UCB1400=y
+CONFIG_GPIO_UCB1400=m
+
+#
+# LPC GPIO expanders:
+#
+CONFIG_GPIO_KEMPLD=m
#
# MODULbus GPIO expanders:
@@ -3087,8 +3165,9 @@ CONFIG_CHARGER_LP8727=m
CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_MANAGER=y
CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24735=m
CONFIG_CHARGER_SMB347=m
-CONFIG_BATTERY_GOLDFISH=m
# CONFIG_POWER_RESET is not set
CONFIG_POWER_AVS=y
CONFIG_HWMON=m
@@ -3137,6 +3216,7 @@ CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_GPIO_FAN=m
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3341,6 +3421,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
@@ -3406,30 +3487,32 @@ CONFIG_MFD_WM831X=y
CONFIG_MFD_WM831X_SPI=y
CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_DUMMY is not set
CONFIG_REGULATOR_FIXED_VOLTAGE=m
CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-CONFIG_REGULATOR_GPIO=m
CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_ARIZONA=m
CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9210=m
CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_GPIO=m
CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
CONFIG_REGULATOR_MAX1586=m
CONFIG_REGULATOR_MAX8649=m
CONFIG_REGULATOR_MAX8660=m
CONFIG_REGULATOR_MAX8952=m
CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
CONFIG_REGULATOR_PCAP=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP8755=m
CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PFUZE100=m
CONFIG_REGULATOR_TPS51632=m
CONFIG_REGULATOR_TPS6105X=m
CONFIG_REGULATOR_TPS62360=m
@@ -3549,6 +3632,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3578,8 +3662,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
# Analog/digital TV USB devices
@@ -3688,6 +3773,7 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_BT848=m
@@ -3725,11 +3811,13 @@ CONFIG_VIDEO_TIMBERDALE=m
CONFIG_SOC_CAMERA=m
CONFIG_SOC_CAMERA_SCALE_CROP=m
CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_VIDEO_RCAR_VIN=m
CONFIG_VIDEO_SH_MOBILE_CSI2=m
CONFIG_VIDEO_SH_MOBILE_CEU=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_V4L_TEST_DRIVERS is not set
#
@@ -3738,6 +3826,7 @@ CONFIG_VIDEO_SH_VEU=m
CONFIG_SMS_SDIO_DRV=m
# CONFIG_MEDIA_PARPORT_SUPPORT is not set
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3780,7 +3869,6 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -3859,7 +3947,7 @@ CONFIG_VIDEO_UPD64031A=m
CONFIG_VIDEO_UPD64083=m
#
-# Miscelaneous helper chips
+# Miscellaneous helper chips
#
CONFIG_VIDEO_M52790=m
@@ -3953,6 +4041,7 @@ CONFIG_DVB_TUNER_CX24113=m
CONFIG_DVB_TDA826X=m
CONFIG_DVB_TUA6100=m
CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
CONFIG_DVB_SI21XX=m
CONFIG_DVB_TS2020=m
CONFIG_DVB_DS3000=m
@@ -4058,6 +4147,7 @@ CONFIG_VGA_SWITCHEROO=y
CONFIG_DRM=m
CONFIG_DRM_USB=m
CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
CONFIG_DRM_TTM=m
@@ -4077,6 +4167,8 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+CONFIG_DRM_I915_FBDEV=y
+CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4165,6 +4257,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
CONFIG_EXYNOS_VIDEO=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
@@ -4193,11 +4286,14 @@ CONFIG_BACKLIGHT_SAHARA=m
CONFIG_BACKLIGHT_ADP8860=m
CONFIG_BACKLIGHT_ADP8870=m
CONFIG_BACKLIGHT_PCF50633=m
-CONFIG_BACKLIGHT_LM3630=m
+CONFIG_BACKLIGHT_LM3630A=m
CONFIG_BACKLIGHT_LM3639=m
CONFIG_BACKLIGHT_LP855X=m
CONFIG_BACKLIGHT_OT200=m
CONFIG_BACKLIGHT_TPS65217=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
#
# Console display driver support
@@ -4260,7 +4356,6 @@ CONFIG_SND_AC97_POWER_SAVE=y
CONFIG_SND_AC97_POWER_SAVE_DEFAULT=1
CONFIG_SND_SB_COMMON=m
CONFIG_SND_SB16_DSP=m
-CONFIG_SND_TEA575X=m
CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
@@ -4373,6 +4468,7 @@ CONFIG_SND_USB_6FIRE=m
CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
# CONFIG_SND_FIREWIRE_SPEAKERS is not set
# CONFIG_SND_ISIGHT is not set
CONFIG_SND_SCS1X=m
@@ -4380,7 +4476,6 @@ CONFIG_SND_SOC=m
CONFIG_SND_ATMEL_SOC=m
CONFIG_SND_DESIGNWARE_I2S=m
CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_SI476X=m
CONFIG_SND_SIMPLE_CARD=m
# CONFIG_SOUND_PRIME is not set
@@ -4453,6 +4548,7 @@ CONFIG_HID_ROCCAT=m
CONFIG_HID_SAITEK=m
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
CONFIG_HID_SPEEDLINK=m
CONFIG_HID_STEELSERIES=m
CONFIG_HID_SUNPLUS=m
@@ -4468,6 +4564,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
@@ -4484,6 +4581,7 @@ CONFIG_USB_HIDDEV=y
# I2C HID support
#
CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4510,7 +4608,6 @@ CONFIG_USB_WUSB_CBAF=m
CONFIG_USB_C67X00_HCD=m
CONFIG_USB_XHCI_HCD=m
CONFIG_USB_XHCI_PLATFORM=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -4521,13 +4618,11 @@ CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PCI=m
CONFIG_USB_OHCI_HCD_SSB=y
CONFIG_USB_OHCI_HCD_PLATFORM=m
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_U132_HCD=m
CONFIG_USB_SL811_HCD=m
@@ -4538,12 +4633,12 @@ CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
CONFIG_USB_HCD_BCMA=m
CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
# CONFIG_USB_MUSB_HOST is not set
# CONFIG_USB_MUSB_GADGET is not set
CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_UX500=m
# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
@@ -4590,9 +4685,21 @@ CONFIG_USB_DWC3=m
# CONFIG_USB_DWC3_HOST is not set
# CONFIG_USB_DWC3_GADGET is not set
CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_PCI=m
+
+#
+# Debugging features
+#
# CONFIG_USB_DWC3_DEBUG is not set
CONFIG_USB_CHIPIDEA=m
# CONFIG_USB_CHIPIDEA_UDC is not set
+CONFIG_USB_CHIPIDEA_HOST=y
# CONFIG_USB_CHIPIDEA_DEBUG is not set
#
@@ -4601,6 +4708,7 @@ CONFIG_USB_CHIPIDEA=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4611,7 +4719,6 @@ CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_IPAQ=m
CONFIG_USB_SERIAL_IR=m
@@ -4642,17 +4749,14 @@ CONFIG_USB_SERIAL_METRO=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
CONFIG_USB_SERIAL_NAVMAN=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_QCAUX=m
CONFIG_USB_SERIAL_QUALCOMM=m
CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_USB_SERIAL_SYMBOL=m
CONFIG_USB_SERIAL_TI=m
@@ -4662,15 +4766,11 @@ CONFIG_USB_SERIAL_WWAN=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OMNINET=m
CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
CONFIG_USB_SERIAL_XSENS_MT=m
-CONFIG_USB_SERIAL_ZIO=m
CONFIG_USB_SERIAL_WISHBONE=m
CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4695,6 +4795,7 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
@@ -4704,10 +4805,12 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-CONFIG_OMAP_CONTROL_USB=m
-CONFIG_OMAP_USB3=m
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -4750,6 +4853,7 @@ CONFIG_USB_F_PHONET=m
CONFIG_USB_F_EEM=m
CONFIG_USB_F_SUBSET=m
CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
CONFIG_USB_CONFIGFS=m
# CONFIG_USB_CONFIGFS_SERIAL is not set
# CONFIG_USB_CONFIGFS_ACM is not set
@@ -4760,6 +4864,7 @@ CONFIG_USB_CONFIGFS=m
# CONFIG_USB_CONFIGFS_RNDIS is not set
# CONFIG_USB_CONFIGFS_EEM is not set
# CONFIG_USB_CONFIGFS_PHONET is not set
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
CONFIG_GADGET_UAC1=y
@@ -4832,6 +4937,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
#
# MemoryStick Host Controller Drivers
@@ -4858,9 +4964,11 @@ CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_PCA9685=m
# CONFIG_LEDS_WM831X_STATUS is not set
CONFIG_LEDS_DA9052=m
CONFIG_LEDS_DAC124S085=m
@@ -4871,7 +4979,6 @@ CONFIG_LEDS_INTEL_SS4200=m
CONFIG_LEDS_LT3593=m
CONFIG_LEDS_DELL_NETBOOKS=m
CONFIG_LEDS_MC13783=m
-CONFIG_LEDS_RENESAS_TPU=y
CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_LM355x=m
CONFIG_LEDS_OT200=m
@@ -5024,6 +5131,7 @@ CONFIG_RTC_DRV_PCF50633=m
#
CONFIG_RTC_DRV_PCAP=m
CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MOXART=m
#
# HID Sensor RTC drivers
@@ -5048,9 +5156,9 @@ CONFIG_DMA_ACPI=y
#
# DMA Clients
#
-CONFIG_NET_DMA=y
CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
CONFIG_DCA=m
CONFIG_AUXDISPLAY=y
CONFIG_KS0108=m
@@ -5060,13 +5168,13 @@ CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
CONFIG_UIO=m
CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
CONFIG_UIO_PDRV_GENIRQ=m
CONFIG_UIO_DMEM_GENIRQ=m
CONFIG_UIO_AEC=m
CONFIG_UIO_SERCOS3=m
CONFIG_UIO_PCI_GENERIC=m
CONFIG_UIO_NETX=m
+CONFIG_UIO_MF624=m
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
@@ -5132,6 +5240,7 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_WATCHDOG=m
@@ -5164,10 +5273,8 @@ CONFIG_COMEDI_CONTEC_PCI_DIO=m
CONFIG_COMEDI_DAS08_PCI=m
CONFIG_COMEDI_DT3000=m
CONFIG_COMEDI_DYNA_PCI10XX=m
-CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_GSC_HPDI=m
CONFIG_COMEDI_ICP_MULTI=m
-CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_DAQBOARD2000=m
CONFIG_COMEDI_JR3_PCI=m
CONFIG_COMEDI_KE_COUNTER=m
@@ -5187,7 +5294,6 @@ CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_USB_DRIVERS=y
@@ -5203,7 +5309,6 @@ CONFIG_COMEDI_AMPLC_PC236=m
CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_TIO=m
-CONFIG_ASUS_OLED=m
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
CONFIG_PANEL_PROFILE=5
@@ -5216,6 +5321,9 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
@@ -5286,7 +5394,6 @@ CONFIG_AD9951=m
# Digital gyroscope sensors
#
CONFIG_ADIS16060=m
-CONFIG_ADIS16260=m
#
# Network Analyzer, Impedance Converters
@@ -5348,15 +5455,11 @@ CONFIG_FT1000_USB=m
#
CONFIG_SPEAKUP=m
CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m
CONFIG_SPEAKUP_SYNTH_APOLLO=m
CONFIG_SPEAKUP_SYNTH_AUDPTR=m
CONFIG_SPEAKUP_SYNTH_BNS=m
CONFIG_SPEAKUP_SYNTH_DECTLK=m
CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_DECPC=m
-CONFIG_SPEAKUP_SYNTH_DTLK=m
-CONFIG_SPEAKUP_SYNTH_KEYPC=m
CONFIG_SPEAKUP_SYNTH_LTLK=m
CONFIG_SPEAKUP_SYNTH_SOFT=m
CONFIG_SPEAKUP_SYNTH_SPKOUT=m
@@ -5374,6 +5477,7 @@ CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
CONFIG_VIDEO_GO7007_LOADER=m
CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_USB_MSI3101=m
# CONFIG_SOLO6X10 is not set
# CONFIG_LIRC_STAGING is not set
@@ -5389,23 +5493,33 @@ CONFIG_WIMAX_GDM72XX=m
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
# CONFIG_WIMAX_GDM72XX_USB_PM is not set
+CONFIG_LTE_GDM724X=m
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=y
-# CONFIG_ZCACHE_DEBUG is not set
CONFIG_USB_DWC2=m
# CONFIG_USB_DWC2_DEBUG is not set
# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
+CONFIG_LNET_XPRT_IB=m
CONFIG_USB_BTMTK=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ASUS_LAPTOP=m
-CONFIG_CHROMEOS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -5451,6 +5565,8 @@ CONFIG_APPLE_GMUX=m
CONFIG_INTEL_RST=m
CONFIG_INTEL_SMARTCONNECT=m
CONFIG_PVPANIC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
@@ -5522,11 +5638,12 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
#
# Accelerometers
#
+CONFIG_BMA180=m
CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_KXSD9=m
CONFIG_IIO_ST_ACCEL_3AXIS=m
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
#
# Analog to digital converters
@@ -5534,13 +5651,15 @@ CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
CONFIG_AD_SIGMA_DELTA=m
CONFIG_AD7266=m
CONFIG_AD7298=m
-CONFIG_AD7923=m
+CONFIG_AD7476=m
CONFIG_AD7791=m
CONFIG_AD7793=m
-CONFIG_AD7476=m
CONFIG_AD7887=m
+CONFIG_AD7923=m
CONFIG_MAX1363=m
CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_NAU7802=m
CONFIG_TI_ADC081C=m
CONFIG_TI_AM335X_ADC=m
CONFIG_VIPERBOARD_ADC=m
@@ -5555,7 +5674,6 @@ CONFIG_AD8366=m
#
CONFIG_HID_SENSOR_IIO_COMMON=m
CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS is not set
CONFIG_IIO_ST_SENSORS_I2C=m
CONFIG_IIO_ST_SENSORS_SPI=m
CONFIG_IIO_ST_SENSORS_CORE=m
@@ -5567,14 +5685,14 @@ CONFIG_AD5064=m
CONFIG_AD5360=m
CONFIG_AD5380=m
CONFIG_AD5421=m
-CONFIG_AD5624R_SPI=m
CONFIG_AD5446=m
CONFIG_AD5449=m
CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_AD5686=m
CONFIG_AD5755=m
CONFIG_AD5764=m
CONFIG_AD5791=m
-CONFIG_AD5686=m
CONFIG_AD7303=m
CONFIG_MAX517=m
CONFIG_MCP4725=m
@@ -5599,6 +5717,7 @@ CONFIG_ADF4350=m
CONFIG_ADIS16080=m
CONFIG_ADIS16130=m
CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
CONFIG_ADXRS450=m
CONFIG_HID_SENSOR_GYRO_3D=m
CONFIG_IIO_ST_GYRO_3AXIS=m
@@ -5619,15 +5738,21 @@ CONFIG_INV_MPU6050_IIO=m
# Light sensors
#
CONFIG_ADJD_S311=m
-CONFIG_SENSORS_LM3533=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_VCNL4000=m
+CONFIG_APDS9300=m
+CONFIG_CM36651=m
+CONFIG_GP2AP020A00F=m
CONFIG_HID_SENSOR_ALS=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL4531=m
+CONFIG_VCNL4000=m
#
# Magnetometer sensors
#
CONFIG_AK8975=m
+CONFIG_MAG3110=m
CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
CONFIG_IIO_ST_MAGN_3AXIS=m
CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
@@ -5640,11 +5765,16 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
CONFIG_IIO_SYSFS_TRIGGER=m
#
-# Pressure Sensors
+# Pressure sensors
#
CONFIG_IIO_ST_PRESS=m
CONFIG_IIO_ST_PRESS_I2C=m
CONFIG_IIO_ST_PRESS_SPI=m
+
+#
+# Temperature sensors
+#
+CONFIG_TMP006=m
CONFIG_NTB=m
CONFIG_VME_BUS=m
@@ -5676,6 +5806,14 @@ CONFIG_FMC_TRIVIAL=m
CONFIG_FMC_WRITE_EEPROM=m
CONFIG_FMC_CHARDEV=m
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+
#
# Firmware Drivers
#
@@ -5696,6 +5834,7 @@ CONFIG_ISCSI_IBFT=m
CONFIG_EFI_VARS=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_UEFI_CPER=y
#
# File systems
@@ -5750,6 +5889,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5827,6 +5967,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
# CONFIG_HFS_FS is not set
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
@@ -5834,6 +5975,11 @@ CONFIG_HFSPLUS_FS=m
CONFIG_LOGFS=m
CONFIG_CRAMFS=m
CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_MULTI=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_ZLIB=y
CONFIG_SQUASHFS_LZO=y
@@ -5862,6 +6008,7 @@ CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_CHECK_FS=y
CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
@@ -5877,6 +6024,7 @@ CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_OBJLAYOUT=m
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5897,6 +6045,7 @@ CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_SUNRPC_DEBUG is not set
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -6006,6 +6155,7 @@ CONFIG_DEBUG_FS=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
# CONFIG_FRAME_POINTER is not set
CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
# CONFIG_DEBUG_KERNEL is not set
#
@@ -6070,6 +6220,7 @@ CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK_EFI=y
CONFIG_DEBUG_SET_MODULE_RONX=y
CONFIG_DOUBLEFAULT=y
# CONFIG_IOMMU_STRESS is not set
@@ -6089,6 +6240,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# Security options
#
CONFIG_KEYS=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
@@ -6132,7 +6285,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_ABLK_HELPER=m
CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
@@ -6168,6 +6321,8 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
@@ -6239,6 +6394,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_USER_API=m
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -6256,6 +6412,7 @@ CONFIG_KVM_MMIO=y
CONFIG_KVM_ASYNC_PF=y
CONFIG_HAVE_KVM_MSI=y
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
@@ -6276,6 +6433,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
@@ -6289,8 +6447,9 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
+# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
@@ -6322,6 +6481,7 @@ CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_BTREE=y
+CONFIG_ASSOCIATIVE_ARRAY=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
diff --git a/srcpkgs/linux3.11/template b/srcpkgs/linux3.13/template
similarity index 87%
rename from srcpkgs/linux3.11/template
rename to srcpkgs/linux3.13/template
index ef3fcf8520..592db1e63e 100644
--- a/srcpkgs/linux3.11/template
+++ b/srcpkgs/linux3.13/template
@@ -1,19 +1,34 @@
-# Template file for 'linux3.11'
+# Template file for 'linux3.13'
#
-pkgname=linux3.11
-version=3.11.10
+pkgname=linux3.13
+version=3.13.1
revision=1
wrksrc="linux-${version}"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org"
license="GPL-2"
-short_desc="The Linux kernel and modules (3.11 series)"
+short_desc="The Linux kernel and modules (3.13 series)"
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
-checksum=cb7f1b137c53446a65b257f2e52f50ced5a0314694b6fa53fddf572de7cae401
+checksum=784b4400294bbef76bc60cce3cba84d81d5e41a2302a05764e079a63fe9a713e
+_kernver="${version}_${revision}"
+
+nostrip=yes
+noverifyrdeps=yes
+preserve=yes
only_for_archs="i686 x86_64"
makedepends="bc perl kmod>=11_2 openssl which elfutils"
-_kernver="${version}_${revision}"
+depends="dracut linux-firmware kmod>=11_2"
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
do_configure() {
# If there's a file called <arch>-dotconfig, use it to
@@ -191,7 +206,7 @@ do_install() {
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
}
-linux3.11-headers_package() {
+linux3.13-headers_package() {
preserve=yes
nostrip=yes
noverifyrdeps=yes
@@ -201,23 +216,3 @@ linux3.11-headers_package() {
vmove usr/lib/modules/${_kernver}/build
}
}
-
-linux3.11_package() {
- nostrip=yes
- noverifyrdeps=yes
- preserve=yes
- triggers="kernel-hooks"
- depends="dracut linux-firmware kmod>=11_2"
- # These files could be modified when an external module is built.
- mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/linux3.2-grsec/template b/srcpkgs/linux3.2-grsec/template
index 1f9fb20664..c1864ff6cb 100644
--- a/srcpkgs/linux3.2-grsec/template
+++ b/srcpkgs/linux3.2-grsec/template
@@ -14,9 +14,25 @@ short_desc="The Linux kernel and modules (3.2 series) (hardened kernel with grse
distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
checksum=c848e595ea6f7f42cffca8e586219db8c968e2cbb875dc31e8c92be8b519e979
+_kernver="${version}-grsec_${revision}"
+
+nostrip=yes
+noverifyrdeps=yes
+preserve=yes
only_for_archs="i686 x86_64"
makedepends="perl kmod>=11_2 openssl which elfutils"
-_kernver="${version}-grsec_${revision}"
+depends="dracut linux-firmware kmod>=11_2"
+triggers="kernel-hooks"
+kernel_hooks_version="${_kernver}"
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
pre_configure() {
local url="http://grsecurity.net/stable/grsecurity-${_grsecurity}-${version}-${_grsecurity_date}.patch"
@@ -176,24 +192,3 @@ linux3.2-grsec-headers_package() {
vmove usr/lib/modules/${_kernver}/build
}
}
-
-linux3.2-grsec_package() {
- nostrip=yes
- noverifyrdeps=yes
- preserve=yes
- triggers="kernel-hooks"
- kernel_hooks_version="${_kernver}"
- depends="dracut linux-firmware kmod>=11_2"
- # These files could be modified when an external module is built.
- mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 8805da96f4..21648a530c 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -25,9 +25,3 @@ do_install() {
vinstall contrib/debian/manpages/bitcoin.conf.5 644 usr/share/man/man5/litecoin.conf.5
vinstall COPYING 644 usr/share/licenses/$pkgname
}
-
-litecoin_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/llvm/patches/cross-internal-compiler-error.patch b/srcpkgs/llvm/patches/cross-internal-compiler-error.patch
new file mode 100644
index 0000000000..8449d7ca30
--- /dev/null
+++ b/srcpkgs/llvm/patches/cross-internal-compiler-error.patch
@@ -0,0 +1,22 @@
+For unknown reasons llvm_unreachable() causes a GCC internal compiler error
+when cross compiling it for ARM:
+
+/builddir/llvm-3.4/lib/LTO/LTOCodeGenerator.cpp: In member function 'void LTOCodeGenerator::setCodePICModel(lto_codegen_model)':
+/builddir/llvm-3.4/lib/LTO/LTOCodeGenerator.cpp:166:1: internal compiler error: in merge_if_block, at ifcvt.c:3193
+Please submit a full bug report,
+with preprocessed source if appropriate.
+See <http://gcc.gnu.org/bugs.html> for instructions.
+
+Comment it out for now as workaround.
+
+--- lib/LTO/LTOCodeGenerator.cpp.orig 2014-01-07 12:14:22.401871342 +0100
++++ lib/LTO/LTOCodeGenerator.cpp 2014-01-07 12:14:44.050019574 +0100
+@@ -162,7 +162,7 @@ void LTOCodeGenerator::setCodePICModel(l
+ CodeModel = model;
+ return;
+ }
+- llvm_unreachable("Unknown PIC model!");
++ //llvm_unreachable("Unknown PIC model!");
+ }
+
+ bool LTOCodeGenerator::writeMergedModules(const char *path,
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index b4aeb04be4..13f5ae068e 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,45 +1,41 @@
# Template file for 'llvm'
pkgname=llvm
-version=3.3
-wrksrc="llvm-${version}.src"
-revision=4
+version=3.4
+wrksrc="llvm-${version}"
+revision=1
configure_args="--disable-expensive-checks --disable-debug-runtime
--enable-bindings=none --enable-optimize --enable-shared --enable-libffi
- --enable-llvmc-dynamic --disable-assertions --enable-experimental-targets=R600"
+ --enable-llvmc-dynamic --disable-assertions --enable-keep-symbols"
short_desc="Low Level Virtual Machine"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.llvm.org"
license="BSD"
distfiles="
http://www.llvm.org/releases/${version}/llvm-${version}.src.tar.gz
- http://www.llvm.org/releases/${version}/cfe-${version}.src.tar.gz
+ http://www.llvm.org/releases/${version}/clang-${version}.src.tar.gz
http://www.llvm.org/releases/${version}/compiler-rt-${version}.src.tar.gz"
checksum="
- 68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578
- b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996
- 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423"
+ 25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628
+ 22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b
+ f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c"
# XXX Investigate ocaml bindings.
-hostmakedepends="groff bsdtar perl python"
+hostmakedepends="groff perl python zlib-devel libffi-devel"
makedepends="zlib-devel libffi-devel"
post_extract() {
# Move clang files into the llvm source.
- if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then
- mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang
+ if [ -d ${XBPS_BUILDDIR}/clang-${version} ]; then
+ mv ${XBPS_BUILDDIR}/clang-${version} ${wrksrc}/tools/clang
fi
# Move compiler-rt files into the llvm source.
- if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then
- mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src \
- ${wrksrc}/projects/compiler-rt
+ if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version} ]; then
+ mv ${XBPS_BUILDDIR}/compiler-rt-${version} ${wrksrc}/projects/compiler-rt
fi
}
do_configure() {
- unset CC CXX CPP AR AS RANLIB CFLAGS LDFLAGS CPPFLAGS
-
- # Don't let llvm strip bins.
- sed -e '/Install.StripFlag += -s/d' -i Makefile.rules
+ unset CC CXX CPP AR AS RANLIB CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
# Fix installation directories, ./configure doesn't seem to set them right
sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
@@ -52,7 +48,7 @@ do_configure() {
}
do_build() {
- unset CC CXX CPP AR AS RANLIB CFLAGS LDFLAGS CPPFLAGS
+ unset CC CXX CPP AR AS RANLIB CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
cd build
make ${makejobs}
@@ -90,8 +86,8 @@ clang-analyzer_package() {
short_desc="Low-Level Virtual Machine (LLVM) - A source code analysis framework"
homepage="http://clang-analyzer.llvm.org/"
pkg_install() {
- install -d ${PKGDESTDIR}/usr/bin
- install -d ${PKGDESTDIR}/usr/lib/clang-analyzer
+ vmkdir usr/bin
+ vmkdir usr/lib/clang-analyzer
for f in build view; do
cp -r ${wrksrc}/tools/clang/tools/scan-${f} ${PKGDESTDIR}/usr/lib/clang-analyzer
@@ -132,9 +128,3 @@ libllvm_package() {
vmove usr/lib/libLLVM-${version}.so
}
}
-
-llvm_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lm-sensors/template b/srcpkgs/lm-sensors/template
index 5ef89bf9c8..3a49e70043 100644
--- a/srcpkgs/lm-sensors/template
+++ b/srcpkgs/lm-sensors/template
@@ -4,6 +4,7 @@ version=3.3.4
revision=1
wrksrc="lm_sensors-${version}"
hostmakedepends="which flex perl"
+conf_files="/etc/sensors3.conf"
short_desc="Utilities to read temperature/voltage/fan sensors"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -38,10 +39,3 @@ libsensors-devel_package() {
vmove usr/share/man/man3
}
}
-
-lm-sensors_package() {
- conf_files="/etc/sensors3.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lmdb/template b/srcpkgs/lmdb/template
index 04c056afcd..10c78f7175 100644
--- a/srcpkgs/lmdb/template
+++ b/srcpkgs/lmdb/template
@@ -32,9 +32,3 @@ lmdb-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-lmdb_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lockdev/template b/srcpkgs/lockdev/template
index 91bf480ba9..bdb7bae68f 100644
--- a/srcpkgs/lockdev/template
+++ b/srcpkgs/lockdev/template
@@ -34,9 +34,3 @@ lockdev-devel_package() {
vmove usr/share
}
}
-
-lockdev_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template
index e84c6ddba7..82abe602cb 100644
--- a/srcpkgs/logrotate/template
+++ b/srcpkgs/logrotate/template
@@ -3,6 +3,7 @@ pkgname=logrotate
version=3.8.1
revision=1
makedepends="popt-devel"
+conf_files="/etc/logrotate.conf"
short_desc="Log file rotation and periodic maintenance"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://fedorahosted.org/logrotate/"
@@ -30,11 +31,3 @@ do_install() {
vinstall ${FILESDIR}/logrotate.conf 644 etc
vinstall ${FILESDIR}/logrotate.cron-daily 744 etc/cron.daily logrotate
}
-
-logrotate_package() {
- conf_files="/etc/logrotate.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index 3e47a5c436..04cd4772db 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -29,9 +29,3 @@ liblrzip_package() {
vmove "usr/lib/*.so.*"
}
}
-
-lrzip_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lrzsz/template b/srcpkgs/lrzsz/template
index 612e8bcfe0..b925ad30b0 100644
--- a/srcpkgs/lrzsz/template
+++ b/srcpkgs/lrzsz/template
@@ -20,9 +20,3 @@ do_build() {
do_install() {
make DESTDIR=$DESTDIR install
}
-
-lrzsz_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ls++-git/template b/srcpkgs/ls++-git/template
index 61930778b5..c8134f407d 100644
--- a/srcpkgs/ls++-git/template
+++ b/srcpkgs/ls++-git/template
@@ -2,9 +2,12 @@
pkgname=ls++-git
version=20131123
revision=1
+noarch="yes"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl-Term-ExtendedColor"
+depends="perl-Term-ExtendedColor"
+conf_files="/etc/ls++.conf"
short_desc="Colorized ls on steroids"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL-2"
@@ -16,12 +19,6 @@ do_fetch() {
git clone ${url} ${pkgname}-${version}
}
-ls++-git_package() {
- depends="perl-Term-ExtendedColor"
- conf_files="/etc/ls++.conf"
- noarch="yes"
- pkg_install() {
- vinstall ${wrksrc}/ls++.conf 644 etc
- vmove all
- }
+post_install() {
+ vinstall ${wrksrc}/ls++.conf 644 etc
}
diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template
index 53e74ec6ee..0cdaf7c2d7 100644
--- a/srcpkgs/lsof/template
+++ b/srcpkgs/lsof/template
@@ -35,9 +35,3 @@ do_install() {
vinstall lsof.8 644 usr/share/man/man8
vinstall ${FILESDIR}/license.txt 644 usr/share/licenses/lsof
}
-
-lsof_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ltrace/template b/srcpkgs/ltrace/template
index e2062172b1..1f0936a520 100644
--- a/srcpkgs/ltrace/template
+++ b/srcpkgs/ltrace/template
@@ -4,6 +4,7 @@ version=0.7.3
revision=1
build_style=gnu-configure
makedepends="elfutils-devel"
+conf_files="/etc/ltrace.conf"
short_desc="Tracks runtime library calls in dynamically linked programs"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://ltrace.alioth.debian.org/"
@@ -14,10 +15,3 @@ long_desc="
ltrace intercepts and records dynamic library calls which are called by an
executed process and the signals received by that process. It can also
intercept and print the system calls executed by the program."
-
-ltrace_package() {
- conf_files="/etc/ltrace.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index 61e32a155a..e47d7bc5e9 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -17,10 +17,3 @@ long_desc="
rectangular playing field and can be moved sideways or rotated by 90 degree
units with the aim of building lines without gaps which then disappear
(causing any block above the deleted line to fall down)."
-
-ltris_package() {
- pkg_install() {
- vmove usr
- vmove var
- }
-}
diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template
index 172e64b7bb..88734891e6 100644
--- a/srcpkgs/lua/template
+++ b/srcpkgs/lua/template
@@ -1,24 +1,17 @@
# Template file for 'lua'
pkgname=lua
-version=5.2.2
-revision=2
+version=5.2.3
+revision=1
makedepends="ncurses-devel readline-devel"
short_desc="Powerful, fast, lightweight, embeddable scripting language"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.lua.org"
license="MIT"
distfiles="http://www.lua.org/ftp/$pkgname-$version.tar.gz"
-checksum=3fd67de3f5ed133bf312906082fa524545c6b9e1b952e8215ffbd27113f49f00
-long_desc="
- Lua combines simple procedural syntax with powerful data description
- constructs based on associative arrays and extensible semantics. Lua
- is dynamically typed, runs by interpreting bytecode for a register-based
- virtual machine, and has automatic memory management with incremental
- garbage collection, making it ideal for configuration, scripting, and
- rapid prototyping."
+checksum=13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d
do_build() {
- sed "s/%VER%/${version%.*}/g;s/%REL%/$version/g" ${FILESDIR}/lua.pc > lua.pc
+ sed "s/%VER%/${version%.*}/g;s/%REL%/${version}/g" ${FILESDIR}/lua.pc > lua.pc
make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" \
CC="$CC" RANLIB="$RANLIB" \
INSTALL_DATA="cp -d" LUA_SO=liblua.so ${makejobs} linux
@@ -26,7 +19,7 @@ do_build() {
do_install() {
make INSTALL_DATA="cp -d" INSTALL_TOP="${DESTDIR}/usr" \
- TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.1" \
+ TO_LIB="liblua.a liblua.so liblua.so.${version%.*} liblua.so.${version}" \
INSTALL_MAN="${DESTDIR}/usr/share/man/man1" install
vinstall lua.pc 644 usr/lib/pkgconfig
@@ -37,7 +30,7 @@ do_install() {
}
lua-devel_package() {
- depends="ncurses-devel readline-devel lua>=${version}"
+ depends="ncurses-devel readline-devel lua>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -47,9 +40,3 @@ lua-devel_package() {
vmove usr/share/doc
}
}
-
-lua_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template
index 7e4278e6c7..da935370b7 100644
--- a/srcpkgs/lua51/template
+++ b/srcpkgs/lua51/template
@@ -59,9 +59,3 @@ lua51-devel_package() {
vmove usr/share/doc
}
}
-
-lua51_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/luafilesystem/template b/srcpkgs/luafilesystem/template
index e7fb22d75b..bc773361bc 100644
--- a/srcpkgs/luafilesystem/template
+++ b/srcpkgs/luafilesystem/template
@@ -3,6 +3,7 @@ pkgname=luafilesystem
version=1.6.2
revision=2
makedepends="lua51-devel"
+depends="lua51"
short_desc="File System Library for the Lua Programming Language"
maintainer="davehome <davehome@redthumb.info.tm>"
license="MIT"
@@ -23,10 +24,3 @@ do_build() {
do_install() {
make PREFIX=${DESTDIR}/usr install
}
-
-luafilesystem_package() {
- depends="lua51"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template
index bbc016e9e9..4562efecd8 100644
--- a/srcpkgs/luakit/template
+++ b/srcpkgs/luakit/template
@@ -5,13 +5,22 @@ _patchver=r1
version=${_distver}.${_patchver}
revision=1
hostmakedepends="pkg-config help2man"
-makedepends="webkit-gtk-devel lua-devel luafilesystem libunique1-devel sqlite-devel desktop-file-utils LuaJIT-devel"
+makedepends="webkit-gtk-devel lua-devel luafilesystem libunique1-devel sqlite-devel
+ desktop-file-utils LuaJIT-devel"
+depends="luafilesystem"
+conf_files="
+ /etc/xdg/luakit/webview.lua
+ /etc/xdg/luakit/binds.lua
+ /etc/xdg/luakit/globals.lua
+ /etc/xdg/luakit/rc.lua
+ /etc/xdg/luakit/modes.lua
+ /etc/xdg/luakit/window.lua
+ /etc/xdg/luakit/theme.lua"
short_desc="Fast, small, webkit based browser framework extensible by Lua"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://mason-larobina.github.com/luakit"
-
do_fetch() {
git clone -b${_distver}-${_patchver} git://github.com/mason-larobina/luakit.git ${pkgname}-${version}
}
@@ -29,18 +38,3 @@ do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
chmod -x ${DESTDIR}/usr/share/pixmaps/luakit.png
}
-
-luakit_package() {
- depends="luafilesystem"
- conf_files="
- /etc/xdg/luakit/webview.lua
- /etc/xdg/luakit/binds.lua
- /etc/xdg/luakit/globals.lua
- /etc/xdg/luakit/rc.lua
- /etc/xdg/luakit/modes.lua
- /etc/xdg/luakit/window.lua
- /etc/xdg/luakit/theme.lua"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/luaposix/template b/srcpkgs/luaposix/template
index 7d60761f0e..63288da9e2 100644
--- a/srcpkgs/luaposix/template
+++ b/srcpkgs/luaposix/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--libdir=/usr/lib/lua/5.1 --datadir=/usr/share/lua/5.1"
hostmakedepends="perl"
makedepends="lua-devel"
+depends="lua"
short_desc="A POSIX library for Lua programming language"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2, LGPL-2.1"
@@ -22,10 +23,3 @@ post_install() {
vmkdir usr/share/$pkgname/examples
vcopy "*.lua" usr/share/$pkgname/examples
}
-
-luaposix_package() {
- depends="lua"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/luasocket/template b/srcpkgs/luasocket/template
index 0893bbc077..4956451e15 100644
--- a/srcpkgs/luasocket/template
+++ b/srcpkgs/luasocket/template
@@ -4,6 +4,7 @@ version=2.0.2
revision=2
build_style=gnu-makefile
makedepends="lua51-devel"
+depends="lua51"
short_desc="Network support for the Lua language "
maintainer="davehome <davehome@redthumb.info.tm>"
license="MIT"
@@ -19,10 +20,3 @@ long_desc="
do_build() {
make LUAINC=-I/usr/include/lua5.1 ${makejobs}
}
-
-luasocket_package() {
- depends="lua51"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lutok/template b/srcpkgs/lutok/template
index dee7429ad9..92da2c56ee 100644
--- a/srcpkgs/lutok/template
+++ b/srcpkgs/lutok/template
@@ -31,9 +31,3 @@ lutok-devel_package() {
vmove usr/share/doc
}
}
-
-lutok_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 89d301f736..d2b41fe02a 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -5,6 +5,9 @@ revision=1
build_style=waf
homepage="http://lv2plug.in"
makedepends="python libsndfile-devel gtk+-devel"
+replaces="lv2core>=0 lv2-ui>=0"
+provides="lv2core-999 lv2-ui-999"
+conflicts="lv2core>=0 lv2-ui>=0"
short_desc="Plugin standard for audio systems"
maintainer="davehome <davehome@redthumb.info.tm>"
license="LGPL-2.1, BSD"
@@ -17,12 +20,3 @@ long_desc="
post_install() {
vinstall COPYING 0644 usr/share/licenses/${pkgname}
}
-
-lv2_package() {
- replaces="lv2core>=0 lv2-ui>=0"
- provides="lv2core-999 lv2-ui-999"
- conflicts="lv2core>=0 lv2-ui>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index c29d67bfa2..6eb259de4a 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -1,6 +1,6 @@
# Template file for 'lvm2'
pkgname=lvm2
-version=2.02.104
+version=2.02.105
revision=1
wrksrc=LVM2.${version}
build_style=gnu-configure
@@ -13,13 +13,19 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig
--with-default-locking-dir=/run/lock/lvm --enable-lvmetad
ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
hostmakedepends="pkg-config"
-makedepends="readline-devel libudev-devel>=183"
+# By using eudev we avoid a cyclic dependency:
+# device-mapper -> libudev -> cryptsetup -> device-mapper
+makedepends="readline-devel eudev-libudev-devel"
+make_dirs="
+ /etc/lvm/archive 0755 root root
+ /etc/lvm/backup 0755 root root"
+conf_files="/etc/lvm/lvm.conf"
short_desc="Logical Volume Manager 2 utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://sourceware.org/lvm2/"
license="GPL-2, LGPL-2.1"
distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
-checksum=0d68b5a5d751a1e595f60ae55babbbf131ac3ace5dcfc7ac35a9eb85ee8647f5
+checksum=d0700c7000ff6375c1c36cb2a89b97b9ae6757f4219fa9ec65f313d13d71e51e
post_install() {
vinstall ${FILESDIR}/lvm2.tmpfiles 644 usr/lib/tmpfiles.d lvm2.conf
@@ -84,13 +90,3 @@ liblvm2app_package() {
vmove "usr/lib/liblvm2app.so.*"
}
}
-
-lvm2_package() {
- make_dirs="
- /etc/lvm/archive 0755 root root
- /etc/lvm/backup 0755 root root"
- conf_files="/etc/lvm/lvm.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index a3146e9edb..bdf9a33ba9 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,24 +1,18 @@
# Template file for 'lxappearance'
pkgname=lxappearance
-version=0.5.3
+version=0.5.4
revision=1
build_style=gnu-configure
configure_args="--enable-dbus"
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel dbus-glib-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="LXDE Theme Switcher"
homepage="http://lxde.org/"
license="GPL2"
maintainer="Juan RP <xtraeme@gmail.com>"
-distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
-checksum=258069e61a1c898d1a095af25e386b3fcb79dc11024e4a0d9231a4316bfd1a2d
+distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.xz"
+checksum=beffc2553084ad32ab7bb424b9440c606410ca584770910a1c6ce2f9812ce5e8
long_desc="
LXAppearance is the standard theme switcher of LXDE. Users are able to
change the theme, icons, and fonts used by applications easily."
-
-lxappearance_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 324033e4b4..63458c3dd9 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,43 +1,44 @@
# Template file for 'lxc'
-pkgname=lxc
-version=0.8.0
-revision=2
-build_style=gnu-configure
-configure_args="--disable-apparmor"
-makedepends="libcap-devel"
-short_desc="LinuX Containers"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://lxc.sourceforge.net"
-license="LGPL-2.1"
-distfiles="http://lxc.sourceforge.net/download/lxc/lxc-${version}.tar.gz"
-checksum=eac833730b94e423d4bef6834bc4a716437d2abd6ab8b24334c506aaaa08692c
-long_desc="
- The container technology is actively being pushed into the mainstream linux
- kernel. It provides the resource management through the control groups aka
- process containers and resource isolation through the namespaces.
+_desc="Linux Containers"
- The linux containers, lxc, aims to use these new functionalities to provide
- an userspace container object which provides full resource isolation and
- resource control for an application or a system."
+pkgname=lxc
+version=0.9.0
+revision=2
+conf_files="/etc/lxc/default.conf"
+build_style=gnu-configure
+configure_args="--enable-doc --enable-seccomp --disable-apparmor --with-distro=none
+ --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log"
+hostmakedepends="pkg-config docbook2x"
+makedepends="libcap-devel libseccomp-devel"
+short_desc="${_desc} - utilities"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://linuxcontainers.org"
+license="LGPL-2.1"
+distfiles="http://linuxcontainers.org/downloads/lxc-${version}.tar.gz"
+checksum=1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120
+
+make_dirs="
+ /var/lib/lxc 0755 root root
+ /var/lxc/containers 0755 root root
+ /var/lxc/log 0755 root root"
+
+pre_configure() {
+ sed -e 's,docbook2x-man,docbook2man,g' -i configure
+}
liblxc_package() {
- short_desc="${short_desc} - shared library"
+ short_desc="${_desc} - shared library"
pkg_install() {
- vmove "usr/lib/*.so*"
+ vmove "usr/lib/*.so.*"
}
}
lxc-devel_package() {
- depends="libcap-devel liblxc-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ depends="libcap-devel liblxc>=${version}_${revision}"
+ short_desc="${_desc} - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-lxc_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/lxde-common/template b/srcpkgs/lxde-common/template
index 7f58a3df4f..770bf6e0ea 100644
--- a/srcpkgs/lxde-common/template
+++ b/srcpkgs/lxde-common/template
@@ -2,7 +2,12 @@
pkgname=lxde-common
version=0.5.5
revision=1
+noarch="yes"
build_style=gnu-configure
+conf_files="
+ /etc/xdg/pcmanfm/LXDE/pcmanfm.conf
+ /etc/xdg/lxsession/LXDE/config
+ /etc/xdg/lxsession/LXDE/autostart"
short_desc="LXDE configuration data"
license="GPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -27,15 +32,3 @@ Features:
- Easy-to-use, the user interface is simple, but usable enough
- Desktop independent (suprise! Every component can be used without LXDE)
- Standard compliant, follows the specs on freedesktop.org"
-
-lxde-common_package() {
- conf_files="
- /etc/xdg/pcmanfm/LXDE/pcmanfm.conf
- /etc/xdg/lxsession/LXDE/config
- /etc/xdg/lxsession/LXDE/autostart"
- noarch="yes"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/lxde-icon-theme/template b/srcpkgs/lxde-icon-theme/template
index 9a9ff5e271..5594210ef7 100644
--- a/srcpkgs/lxde-icon-theme/template
+++ b/srcpkgs/lxde-icon-theme/template
@@ -2,20 +2,14 @@
pkgname=lxde-icon-theme
version=0.5.0
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtk+-devel"
+depends="gtk-update-icon-cache"
short_desc="LXDE default default icon theme based on nuoveXT2"
homepage="http://lxde.org/"
license="GPL2"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.bz2"
checksum=49dc61c46c4a0ca9298f9e0866bcf7212a08ddaa71f15bfabfb0220fe1efa848
-
-lxde-icon-theme_package() {
- noarch="yes"
- depends="gtk-update-icon-cache"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lxde/template b/srcpkgs/lxde/template
index a17b2a458d..812b78494f 100644
--- a/srcpkgs/lxde/template
+++ b/srcpkgs/lxde/template
@@ -1,18 +1,26 @@
# Template file for 'lxde'
pkgname=lxde
version=0.5.0
-revision=4
+revision=5
build_style=meta
-makedepends="openbox pcmanfm lxde-icon-theme lxde-common lxappearance lxsession
- lxterminal lxlauncher lxinput lxrandr lxpanel lxtask gpicview xdg-utils xdg-user-dirs"
-short_desc="LXDE meta-package"
+makedepends="
+ openbox
+ pcmanfm
+ lxde-icon-theme
+ lxde-common
+ lxappearance
+ lxsession
+ lxterminal
+ lxlauncher
+ lxinput
+ lxrandr
+ lxpanel
+ lxtask
+ gpicview
+ xdg-utils
+ xdg-user-dirs"
+depends="${makedepends}"
+short_desc="The LXDE meta-package"
homepage="http://lxde.org"
license="GPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
-long_desc="
- This package installs all required packages for the LXDE desktop system."
-
-lxde_package() {
- depends="${makedepends}"
- noarch="yes"
-}
diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template
index 884db61dd8..a23420e59e 100644
--- a/srcpkgs/lxdm/template
+++ b/srcpkgs/lxdm/template
@@ -7,6 +7,19 @@ build_style=gnu-configure
configure_args="--with-pam"
hostmakedepends="pkg-config intltool automake libtool gettext-devel"
makedepends="pam-devel gtk+-devel systemd-devel iso-codes"
+depends="shadow"
+conf_files="
+ /etc/lxdm/LoginReady
+ /etc/lxdm/PostLogin
+ /etc/lxdm/PostLogout
+ /etc/lxdm/PreLogin
+ /etc/lxdm/PreReboot
+ /etc/lxdm/PreShutdown
+ /etc/lxdm/Xsession
+ /etc/lxdm/lxdm.conf
+ /etc/pam.d/lxdm"
+system_groups="lxdm"
+systemd_services="lxdm.service off"
short_desc="GUI login manager for LXDE"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -26,22 +39,3 @@ post_install() {
vmkdir var/lib/lxdm
echo 'GDK_CORE_DEVICE_EVENTS=true' > ${DESTDIR}/var/lib/lxdm/.pam_environment
}
-
-lxdm_package() {
- depends="shadow"
- conf_files="
- /etc/lxdm/LoginReady
- /etc/lxdm/PostLogin
- /etc/lxdm/PostLogout
- /etc/lxdm/PreLogin
- /etc/lxdm/PreReboot
- /etc/lxdm/PreShutdown
- /etc/lxdm/Xsession
- /etc/lxdm/lxdm.conf
- /etc/pam.d/lxdm"
- system_groups="lxdm"
- systemd_services="lxdm.service off"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index 5334f26e09..6a02aa4726 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="LXDE Keyboad/Mouse configurator"
homepage="http://lxde.org/"
license="GPL2"
@@ -19,10 +20,3 @@ long_desc="
* Enable/Disable beeps of keyboard input error
* Swap left and right mouse buttons
* Mouse acceleration and sensitivity"
-
-lxinput_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index f9d5c4c09c..d97e4a27b2 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -5,6 +5,10 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel startup-notification-devel menu-cache-devel"
+conf_files="
+ /etc/xdg/lxlauncher/gtkrc
+ /etc/xdg/lxlauncher/settings.conf
+ /etc/xdg/menus/lxlauncher-applications.menu"
short_desc="LXDE ASUS EEPC launcher"
homepage="http://lxde.org/"
license="GPL2"
@@ -15,14 +19,3 @@ long_desc="
The LXLauncher is the optional launcher for application programs developed
for the 7-10.2 screens. LXLauncher enables the LXDE desktop to be a topic
oriented groupping specific application programs to one view under tabs."
-
-lxlauncher_package() {
- conf_files="
- /etc/xdg/lxlauncher/gtkrc
- /etc/xdg/lxlauncher/settings.conf
- /etc/xdg/menus/lxlauncher-applications.menu"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/lxmenu-data/template b/srcpkgs/lxmenu-data/template
index 237d2fa26d..7625a86bc2 100644
--- a/srcpkgs/lxmenu-data/template
+++ b/srcpkgs/lxmenu-data/template
@@ -2,6 +2,7 @@
pkgname=lxmenu-data
version=0.1.2
revision=2
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
short_desc="LXDE freedesktop menu required files"
@@ -13,10 +14,3 @@ checksum=34c285a0430404e815263a4bb33a79eb47b168c56469be0f7ffb19730a57a045
long_desc="
This package provides files required to build freedesktop.org menu
spec-compliant desktop menus for LXDE."
-
-lxmenu-data_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lxpanel/template b/srcpkgs/lxpanel/template
index ae080cc456..684e0f0a9c 100644
--- a/srcpkgs/lxpanel/template
+++ b/srcpkgs/lxpanel/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="alsa-lib-devel gtk+-devel menu-cache-devel libwnck2-devel
wireless_tools-devel lxmenu-data>=0.1.2"
+depends="lxmenu-data>=0.1.2"
short_desc="LXDE Standard panel"
homepage="http://lxde.org/"
license="GPL2"
@@ -26,10 +27,3 @@ lxpanel-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-lxpanel_package() {
- depends="lxmenu-data>=0.1.2"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lxpolkit/template b/srcpkgs/lxpolkit/template
index 1fb024f104..3c4a1259ee 100644
--- a/srcpkgs/lxpolkit/template
+++ b/srcpkgs/lxpolkit/template
@@ -13,9 +13,3 @@ distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz"
checksum=511affca8f55adc67031fb3627b9889064c685e4b983737d8deecdf4f94f008b
long_desc="
LXPolkit is a simple PolicyKit authentication agent."
-
-lxpolkit_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lxrandr/template b/srcpkgs/lxrandr/template
index 8f66a0e850..5b00698a45 100644
--- a/srcpkgs/lxrandr/template
+++ b/srcpkgs/lxrandr/template
@@ -5,6 +5,7 @@ build_style=gnu-configure
revision=2
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="LXDE Monitor configuration tool"
homepage="http://lxde.org/"
license="GPL2"
@@ -22,10 +23,3 @@ long_desc="
is very suitable for laptop users who frequently uses projectors or external
monitor and just want to get their work done without reading a lot of
geek-centered manuals or command line tutorials."
-
-lxrandr_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lxsession/template b/srcpkgs/lxsession/template
index 45d44c0305..bf3680d04d 100644
--- a/srcpkgs/lxsession/template
+++ b/srcpkgs/lxsession/template
@@ -5,6 +5,7 @@ revision=4
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="dbus-devel gtk+-devel upower hicolor-icon-theme"
+depends="upower hicolor-icon-theme"
short_desc="LXDE X11 Session Manager"
homepage="http://lxde.org/"
license="GPL2"
@@ -25,10 +26,3 @@ long_desc="
LXSession has also a built-in lightweight Xsettings daemon, which can
configure GTK+ themes, keyboard, and mouse for you on session startup."
-
-lxsession_package() {
- depends="upower hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/lxtask/template b/srcpkgs/lxtask/template
index a4431eba13..d8158aa07a 100644
--- a/srcpkgs/lxtask/template
+++ b/srcpkgs/lxtask/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="LXDE Task Manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -15,10 +16,3 @@ long_desc="
LXTask - lightweight and desktop-independent task manager derived from
xfce4-taskmanager with all dependencies on xfce removed, new features,
and some improvement of the user interface."
-
-lxtask_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lxterminal/template b/srcpkgs/lxterminal/template
index 0bf13e3a38..9a1d32114c 100644
--- a/srcpkgs/lxterminal/template
+++ b/srcpkgs/lxterminal/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel vte-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="LXDE Terminal emulator"
homepage="http://lxde.org/"
license="GPL2"
@@ -18,10 +19,3 @@ long_desc="
In order to reduce memory usage and increase the performance, all instances
of the terminal are sharing a single process."
-
-lxterminal_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lzip/template b/srcpkgs/lzip/template
index 944b93bc7a..3323a9b75d 100644
--- a/srcpkgs/lzip/template
+++ b/srcpkgs/lzip/template
@@ -13,9 +13,3 @@ checksum=7ff5cc521560edb2a0a6cdf258cf3afdaeb1dbcc354d96d011d0dd7ec584cbe7
do_configure() {
./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS"
}
-
-lzip_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/lzo/template b/srcpkgs/lzo/template
index dd06d67b1b..6d51f747ef 100644
--- a/srcpkgs/lzo/template
+++ b/srcpkgs/lzo/template
@@ -27,9 +27,3 @@ lzo-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-lzo_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index 38559ccbc5..dd99d676b4 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -21,9 +21,3 @@ long_desc="
pre_configure() {
sed -i -e '/gets is a/d' lib/stdio.in.h
}
-
-m4_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 0034073cff..ccdfbc9779 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -5,6 +5,9 @@ revision=4
patch_args="-Np1"
wrksrc="mailx-${version}"
makedepends="openssl-devel mit-krb5-devel"
+conf_files="/etc/mail.rc"
+provides="mail-${version}"
+replaces="mail>=0"
short_desc="Feature-rich BSD mail(1)"
homepage="http://heirloom.sourceforge.net/mailx.html"
license="BSD"
@@ -34,12 +37,3 @@ do_install() {
ln -s mailx ${DESTDIR}/usr/bin/mail
ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/mail.1
}
-
-mailx_package() {
- conf_files="/etc/mail.rc"
- provides="mail-${version}"
- replaces="mail>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/make/template b/srcpkgs/make/template
index 8e4d8ac440..df9bbc7137 100644
--- a/srcpkgs/make/template
+++ b/srcpkgs/make/template
@@ -2,6 +2,7 @@
pkgname=make
version=4.0
revision=1
+conflicts="chroot-make>=0"
build_style=gnu-configure
configure_args="--without-guile"
short_desc="The GNU make system"
@@ -10,10 +11,3 @@ homepage="http://www.gnu.org/software/make"
license="GPL-3"
distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2"
checksum=e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb
-
-make_package() {
- conflicts="chroot-make>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/makedepend/template b/srcpkgs/makedepend/template
index 70bb862780..97b7082ac7 100644
--- a/srcpkgs/makedepend/template
+++ b/srcpkgs/makedepend/template
@@ -19,9 +19,3 @@ long_desc="
include, directives would be used in a compilation. Any include,
directives can reference files having other include directives, and parsing
will occur in these files as well."
-
-makedepend_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/makeself/template b/srcpkgs/makeself/template
index d8302faf37..28f20939af 100644
--- a/srcpkgs/makeself/template
+++ b/srcpkgs/makeself/template
@@ -2,6 +2,8 @@
pkgname=makeself
version=2.1.5
revision=2
+noarch="yes"
+depends="tar gzip bzip2"
short_desc="Make self-extractable archives on Unix"
homepage="http://www.megastep.org/makeself/"
license="GPL-2+"
@@ -32,11 +34,3 @@ do_install() {
done
install -m644 *.1 ${DESTDIR}/usr/share/man/man1
}
-
-makeself_package() {
- depends="tar gzip bzip2"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index 8a2b04edbe..90e207c5c0 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,6 +1,6 @@
# Template file for 'man-db'
pkgname=man-db
-version=2.6.5
+version=2.6.6
revision=1
build_style=gnu-configure
configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip
@@ -8,23 +8,17 @@ configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip
--with-lzma=/usr/bin/lzma --with-xz=/usr/bin/xz --disable-setuid
--without-included-regex --enable-automatic-create"
hostmakedepends="pkg-config groff"
-makedepends="gdbm-devel zlib-devel libpipeline-devel"
+makedepends="gdbm-devel zlib-devel libpipeline-devel groff"
+depends="bzip2 gzip less groff grep coreutils"
+conf_files="/etc/man_db.conf"
short_desc="The on-line manual database"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
homepage="http://www.nongnu.org/man-db/"
distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=97ec8a2a580574f18978101d6d10de43c00c3b5093a6b8679664ada660e42112
+checksum=7da90f8d8df91e0e682769d50f4bdb905f525b5d0f01e7e5b8cc3c6da45f66c3
post_install() {
# Install the cron daily job.
vinstall ${FILESDIR}/man-db.cron-daily 744 etc/cron.daily man-db
}
-
-man-db_package() {
- conf_files="/etc/man_db.conf"
- depends="bzip2 gzip less groff grep coreutils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/man-pages-posix/template b/srcpkgs/man-pages-posix/template
index 3067d99290..717b71f043 100644
--- a/srcpkgs/man-pages-posix/template
+++ b/srcpkgs/man-pages-posix/template
@@ -1,25 +1,19 @@
# Template file for 'man-pages-posix'
pkgname=man-pages-posix
-_distver=2003
+_distver=2013
_revver=a
wrksrc="${pkgname}-${_distver}-${_revver}"
version=${_distver}${_revver}
revision=1
+noarch="yes"
short_desc="Manual pages about POSIX systems"
maintainer="Juan RP <xtraeme@gmail.com>"
license="POSIX-COPYRIGHT"
homepage="https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/"
distfiles="${KERNEL_SITE}/docs/man-pages/$pkgname/$pkgname-${_distver}-${_revver}.tar.xz"
-checksum=9a832c25e9ec6693f5189e5c005f323d7fc76c7f49d4575009062daf23630ec1
+checksum=19633a5c75ff7deab35b1d2c3d5b7748e7bd4ef4ab598b647bb7e7f60b90a808
do_install() {
make all prefix=${DESTDIR}/usr
vinstall POSIX-COPYRIGHT 644 usr/share/licenses/${pkgname}
}
-
-man-pages-posix_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index acb8ddba38..130dd9c2d5 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,13 +1,14 @@
# Template file for 'man-pages'
pkgname=man-pages
-version=3.55
+version=3.56
revision=1
+noarch="yes"
short_desc="Linux Documentation Project (LDP) manual pages"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://man7.org/linux/man-pages/index.html"
distfiles="${KERNEL_SITE}/docs/man-pages/$pkgname-$version.tar.xz"
-checksum=91b57467a5464ec8c0a089277a7a7960b316c75c5a0c91dcf002df6d8bf1e818
+checksum=a0cbdf5e90e21138d4e5cb0b932d51f34907e4e0d2d200c77b2bababc93828aa
do_install() {
make all prefix=${DESTDIR}/usr
@@ -34,10 +35,3 @@ do_install() {
# From attr-devel.
rm -f man2/*xattr.2
}
-
-man-pages_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 4574cfac03..fbc4edaa54 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -20,6 +20,13 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
-DSTACK_DIRECTION=1"
hostmakedepends="perl cmake bison ncurses-devel"
makedepends="zlib-devel ncurses-devel openssl-devel readline-devel"
+depends="shadow mariadb-client"
+provides="mysql-${version}_${revision}"
+replaces="mysql>=0"
+conf_files="/etc/mysql/my.cnf"
+systemd_services="mysqld.service on"
+system_accounts="mysql"
+mysqld_homedir="/var/lib/mysql"
short_desc="Fast SQL database server, drop-in replacement for MySQL"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://mariadb.org/"
@@ -115,16 +122,3 @@ mariadb-client_package() {
done
}
}
-
-mariadb_package() {
- depends="shadow mariadb-client"
- provides="mysql-${version}_${revision}"
- replaces="mysql>=0"
- conf_files="/etc/mysql/my.cnf"
- systemd_services="mysqld.service on"
- system_accounts="mysql"
- mysqld_homedir="/var/lib/mysql"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template
index c14e3967bc..68969a9257 100644
--- a/srcpkgs/mash/template
+++ b/srcpkgs/mash/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--enable-introspection --disable-static"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="clutter-devel>=1.16"
+depends="clutter>=1.16"
short_desc="A small library for using 3D models within a Clutter scene"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.clutter-project.org"
@@ -29,10 +30,3 @@ mash-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-mash_package() {
- depends="clutter>=1.16"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mawk/template b/srcpkgs/mawk/template
index 69e8c67fe4..edc00e35de 100644
--- a/srcpkgs/mawk/template
+++ b/srcpkgs/mawk/template
@@ -11,9 +11,3 @@ homepage="http://invisible-island.net/mawk/mawk.html"
distfiles="http://invisible-island.net/datafiles/release/${pkgname}.tar.gz"
checksum=a44e2294a4ea7ac33a212cc23a681631b3af49bf3be533c6d33da9ed27d79f7d
wrksrc=${pkgname}-${_vers}
-
-mawk_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 16b8546957..1b8ffb8139 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -6,6 +6,17 @@ build_style=gnu-configure
configure_args="--with-screen=ncurses --without-x"
hostmakedepends="pkg-config perl"
makedepends="libglib-devel e2fsprogs-devel ncurses-devel libssh2-devel"
+conf_files="
+ /etc/mc/filehighlight.ini
+ /etc/mc/mc.ext
+ /etc/mc/mcedit.menu
+ /etc/mc/sfs.ini
+ /etc/mc/mc.keymap.default
+ /etc/mc/mc.menu
+ /etc/mc/edit.indent.rc
+ /etc/mc/mc.keymap
+ /etc/mc/mc.menu.sr
+ /etc/mc/mc.keymap.emac"
short_desc="User-friendly file manager and visual shell"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -13,20 +24,3 @@ homepage="http://www.ibiblio.org/mc/"
#distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=a53d8ecebba9112ffbd2bf502f0f8c358bafcd0538083a4922fe4573c3bccc1c
-
-mc_package() {
- conf_files="
- /etc/mc/filehighlight.ini
- /etc/mc/mc.ext
- /etc/mc/mcedit.menu
- /etc/mc/sfs.ini
- /etc/mc/mc.keymap.default
- /etc/mc/mc.menu
- /etc/mc/edit.indent.rc
- /etc/mc/mc.keymap
- /etc/mc/mc.menu.sr
- /etc/mc/mc.keymap.emac"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mcpp/template b/srcpkgs/mcpp/template
index 804adb8e8d..2f6807cfd2 100644
--- a/srcpkgs/mcpp/template
+++ b/srcpkgs/mcpp/template
@@ -32,7 +32,7 @@ long_desc="
* It is probably number one C/C++ preprocessor now available in the world."
libmcpp_package() {
- short_desc="${short_desc} - Runtime library"
+ short_desc+=" - Runtime library"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -40,15 +40,9 @@ libmcpp_package() {
mcpp-devel_package() {
depends="mcpp>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
}
}
-
-mcpp_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mcwm-git/template b/srcpkgs/mcwm-git/template
index c710951ef4..ad241865ba 100644
--- a/srcpkgs/mcwm-git/template
+++ b/srcpkgs/mcwm-git/template
@@ -4,12 +4,13 @@ version=20130828
revision=1
build_style=gnu-makefile
makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel"
+provides="mcwm-${version}"
+replaces="mcwm>=0"
short_desc="A minimalist stacking X window manager based on XCB"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="ISC"
homepage="http://hack.org/mc/projects/mcwm/"
-
do_fetch() {
local url="git://hack.org/mcwm"
msg_normal "Fetching source from $url ...\n"
@@ -31,11 +32,3 @@ do_install() {
vinstall scripts/mcmenu 755 usr/bin
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-mcwm-git_package() {
- provides="mcwm-${version}"
- replaces="mcwm>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template
index 954d774565..9e22e483c6 100644
--- a/srcpkgs/mcwm/template
+++ b/srcpkgs/mcwm/template
@@ -29,9 +29,3 @@ do_install() {
vinstall scripts/mcmenu 755 usr/bin
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-mcwm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mda-lv2/template b/srcpkgs/mda-lv2/template
index 55e85564bd..7bcdc6765e 100644
--- a/srcpkgs/mda-lv2/template
+++ b/srcpkgs/mda-lv2/template
@@ -6,6 +6,7 @@ build_style=waf
homepage="http://drobilla.net/software/mda-lv2/"
distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
makedepends="pkg-config lv2 python"
+depends="lv2 python"
short_desc="LV2 port of the MDA plugins by Paul Kellett."
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-3"
@@ -19,10 +20,3 @@ long_desc="
toggle ports (> 0.0 is on, rather than 0.5). All the plugins have been tested,
and thanks to several bug fixes this collection should be more reliable than
the original."
-
-mda-lv2_package() {
- depends="lv2 python"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mdbtools/template b/srcpkgs/mdbtools/template
index b3718cee5a..3a00e30145 100644
--- a/srcpkgs/mdbtools/template
+++ b/srcpkgs/mdbtools/template
@@ -36,9 +36,3 @@ libmdb_package() {
vmove "usr/lib/*.so.*"
}
}
-
-mdbtools_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 65764879b0..1a2fb4de49 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -3,6 +3,8 @@ pkgname=mdocml
version=1.12.1
revision=2
makedepends="db-devel>=5.3"
+conflicts="groff>=0 man-db>=0"
+provides="man-${version} roff-${version} apropos-${version} whatis-${version}"
short_desc="mdoc macro compiler"
maintainer="Juan RP <xtraeme@gmail.com>"
license="ISC"
@@ -40,11 +42,3 @@ do_install() {
# Create mandoc -> man symlink.
ln -sfr ${DESTDIR}/usr/bin/mandoc ${DESTDIR}/usr/bin/man
}
-
-mdocml_package() {
- conflicts="groff>=0 man-db>=0"
- provides="man-${version} roff-${version} apropos-${version} whatis-${version}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/media-player-info/template b/srcpkgs/media-player-info/template
index 31fd1ece24..0f10bbe415 100644
--- a/srcpkgs/media-player-info/template
+++ b/srcpkgs/media-player-info/template
@@ -2,6 +2,7 @@
pkgname=media-player-info
version=17
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="systemd-devel"
@@ -11,10 +12,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.gz"
checksum=ceab4699e27b683dec4f985be5667b684e1502728243a1bb711590a58ee31e46
-
-media-player-info_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index e5d95cb357..05290d7c60 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -2,11 +2,14 @@
pkgname=meld
version=1.8.0
revision=1
+noarch="yes"
build_style=gnu-makefile
make_build_args="prefix=/usr"
make_install_args="prefix=/usr"
hostmakedepends="pkg-config intltool gnome-doc-utils"
makedepends="pygtk pygtksourceview desktop-file-utils hicolor-icon-theme"
+depends="${makedepends}"
+pycompile_dirs="usr/lib/meld/meld/"
short_desc="Visual diff and merge tool"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://meldmerge.org/"
@@ -21,12 +24,3 @@ long_desc="
Meld helps you review code changes and understand patches. It might even help
you to figure out what is going on in that merge you keep avoiding."
-
-meld_package() {
- noarch="yes"
- pycompile_dirs="usr/lib/meld/meld/"
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template
index ef564e567b..b5f9e37649 100644
--- a/srcpkgs/memcached/template
+++ b/srcpkgs/memcached/template
@@ -14,9 +14,3 @@ makedepends="libevent-devel"
post_install() {
rm -rf ${DESTDIR}/usr/include
}
-
-memcached_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index c5e045afe7..2966653c4a 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -22,6 +22,8 @@ long_desc="
to memtest86 available from various sources."
only_for_archs="i686 x86_64"
+nostrip=yes
+noverifyrdeps=yes
do_build() {
make ${makejobs}
@@ -31,11 +33,3 @@ do_install() {
vinstall memtest.bin 755 boot memtest86+
vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
}
-
-memtest86+_package() {
- nostrip=yes
- noverifyrdeps=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/menu-cache/template b/srcpkgs/menu-cache/template
index c9cd1db19d..259081a400 100644
--- a/srcpkgs/menu-cache/template
+++ b/srcpkgs/menu-cache/template
@@ -32,9 +32,3 @@ menu-cache-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-menu-cache_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template
index bcda171da6..6f18bf770b 100644
--- a/srcpkgs/menumaker/template
+++ b/srcpkgs/menumaker/template
@@ -2,20 +2,14 @@
pkgname=menumaker
version=0.99.7
revision=1
+noarch=yes
build_style=gnu-configure
makedepends="python-devel"
+depends="python"
+pycompile_dirs="/usr/lib/menumaker"
short_desc="Menu generation utility"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
homepage="http://menumaker.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=dc319aa063aa8ec017af3f736cc6e4f7578e145289976c109a4cb19df3b3c445
-
-menumaker_package() {
- noarch=yes
- depends="python"
- pycompile_dirs="/usr/lib/menumaker"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 3cb60ee8e9..cb39416ac5 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -5,6 +5,7 @@ revision=1
build_style=python-module
hostmakedepends="python-devel"
makedepends="python-devel"
+pycompile_module="mercurial hgext"
short_desc="Fast, lightweight source control management system"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -18,10 +19,3 @@ post_install() {
install -m644 doc/*.1 ${DESTDIR}/usr/share/man/man1
install -m644 doc/*.5 ${DESTDIR}/usr/share/man/man5
}
-
-mercurial_package() {
- pycompile_module="mercurial hgext"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template
index dfa93a9d1f..1245f60986 100644
--- a/srcpkgs/mesa-demos/template
+++ b/srcpkgs/mesa-demos/template
@@ -25,9 +25,3 @@ glxinfo_package() {
vmove usr/bin/glxinfo
}
}
-
-mesa-demos_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template
index cd3efaae55..895e5db036 100644
--- a/srcpkgs/mg/template
+++ b/srcpkgs/mg/template
@@ -25,9 +25,3 @@ do_install() {
vinstall mg 755 usr/bin
vinstall mg.1 644 usr/share/man/man1
}
-
-mg_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/midori/template b/srcpkgs/midori/template
index 794356890c..b702ccbe5d 100644
--- a/srcpkgs/midori/template
+++ b/srcpkgs/midori/template
@@ -8,6 +8,10 @@ hostmakedepends="pkg-config intltool librsvg-utils cmake"
makedepends="gtk+3-devel libxml2-devel vala-devel libzeitgeist-devel
dbus-glib-devel librsvg-devel libnotify-devel libsoup-gnome-devel
webkitgtk-devel sqlite-devel libunique-devel libXScrnSaver-devel gcr-devel"
+depends="hicolor-icon-theme desktop-file-utils"
+conf_files="
+ /etc/xdg/midori/search
+ /etc/xdg/midori/extensions/adblock/config"
short_desc="Lightweight web browser using WebKit GTK+"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://twotoasts.de/index.php/midori/"
@@ -24,13 +28,3 @@ long_desc="
* Custom context menu actions
* User scripts and user styles support
* Extensible via Javascript"
-
-midori_package() {
- conf_files="
- /etc/xdg/midori/search
- /etc/xdg/midori/extensions/adblock/config"
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mime-types/template b/srcpkgs/mime-types/template
index 3dda42cdea..9b98ec7539 100644
--- a/srcpkgs/mime-types/template
+++ b/srcpkgs/mime-types/template
@@ -2,6 +2,9 @@
pkgname=mime-types
version=9
revision=1
+noarch=yes
+conf_files="/etc/mime.types"
+replaces="mutt<1.5.22"
short_desc="Provides a shared /etc/mime.types file"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -12,12 +15,3 @@ checksum=b4638a734f121be30a546ed092aec16bf74e9b88ed7921fba89cf7e2c0462b5e
do_install() {
vinstall mime.types 644 etc
}
-
-mime-types_package() {
- conf_files="/etc/mime.types"
- replaces="mutt<1.5.22"
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/minecraft/template b/srcpkgs/minecraft/template
index f2630b575f..17bf7d995d 100644
--- a/srcpkgs/minecraft/template
+++ b/srcpkgs/minecraft/template
@@ -2,6 +2,9 @@
pkgname=minecraft
version=0.3
revision=2
+nonfree="yes"
+noarch="yes"
+depends="wmname wget"
short_desc="Launcher for the famous Minecraft game"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://www.minecraft.net/"
@@ -16,16 +19,6 @@ over a blocky ocean. I's pretty. Brave players battle terrible things
in The Nether, which is more scary than pretty. You can also visit a
land of mushrooms if it sounds more like your cup of tea."
-
do_install() {
vinstall ${FILESDIR}/minecraft 755 usr/bin
}
-
-minecraft_package() {
- nonfree="yes"
- noarch="yes"
- depends="wmname wget"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template
index 3e6a11a7ab..220e30b11c 100644
--- a/srcpkgs/minetest/template
+++ b/srcpkgs/minetest/template
@@ -9,20 +9,13 @@ short_desc="An InfiniMiner/Minecraft inspired game"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
homepage="http://www.minetest.org"
-
hostmakedepends="cmake pkg-config"
makedepends="
sqlite-devel libcurl-devel lua-devel libjpeg-turbo-devel libpng-devel
LuaJIT-devel freetype-devel MesaLib-devel libopenal-devel libvorbis-devel
irrlicht-devel hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils"
do_fetch() {
git clone -b${version} git://github.com/minetest/minetest ${pkgname}-${version}
}
-
-minetest_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mingw-w64-binutils/template b/srcpkgs/mingw-w64-binutils/template
index 4e5819bdfe..48ffca74cc 100644
--- a/srcpkgs/mingw-w64-binutils/template
+++ b/srcpkgs/mingw-w64-binutils/template
@@ -73,9 +73,3 @@ do_install() {
# The mingw-w64 faq advises to create a symlink here
cd ${DESTDIR}/${_mingwprefix} && ln -sf ${_mingwtriplet} mingw
}
-
-mingw-w64-binutils_package() {
- pkg_install() {
- vmove opt
- }
-}
diff --git a/srcpkgs/mingw-w64-crt/template b/srcpkgs/mingw-w64-crt/template
index ce33b65a2b..54b4daa442 100644
--- a/srcpkgs/mingw-w64-crt/template
+++ b/srcpkgs/mingw-w64-crt/template
@@ -62,9 +62,3 @@ do_install() {
export PATH=$SAVEDPATH
}
-
-mingw-w64-crt_package() {
- pkg_install() {
- vmove opt
- }
-}
diff --git a/srcpkgs/mingw-w64-gcc/template b/srcpkgs/mingw-w64-gcc/template
index 7e1c9f1c26..bc73cec3c3 100644
--- a/srcpkgs/mingw-w64-gcc/template
+++ b/srcpkgs/mingw-w64-gcc/template
@@ -70,9 +70,3 @@ do_install() {
# Remove useless manpages
rm -rf ${DESTDIR}/${_mingwprefix}/share
}
-
-mingw-w64-gcc_package() {
- pkg_install() {
- vmove opt
- }
-}
diff --git a/srcpkgs/mingw-w64-headers/template b/srcpkgs/mingw-w64-headers/template
index f0e7d9cabf..5d855459e6 100644
--- a/srcpkgs/mingw-w64-headers/template
+++ b/srcpkgs/mingw-w64-headers/template
@@ -30,10 +30,3 @@ pre_install() {
vmkdir usr/${_mingwtriplet}/usr/include
ln -sfr ${DESTDIR}/usr/${_mingwtriplet}/usr/include ${DESTDIR}/usr/${_mingwtriplet}/include
}
-
-mingw-w64-headers_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mingw-w64-libgcc/template b/srcpkgs/mingw-w64-libgcc/template
index 1b166156a1..0614ac0cfd 100644
--- a/srcpkgs/mingw-w64-libgcc/template
+++ b/srcpkgs/mingw-w64-libgcc/template
@@ -87,9 +87,3 @@ do_install() {
# Remove useless manpages
rm -rf ${DESTDIR}/${_mingwprefix}/share
}
-
-mingw-w64-libgcc_package() {
- pkg_install() {
- vmove opt
- }
-}
diff --git a/srcpkgs/minicom/template b/srcpkgs/minicom/template
index 51b8780890..444dc524f0 100644
--- a/srcpkgs/minicom/template
+++ b/srcpkgs/minicom/template
@@ -1,6 +1,6 @@
# Template file for 'minicom'
pkgname=minicom
-version=2.6.1
+version=2.7
revision=1
makedepends="ncurses-devel"
build_style=gnu-configure
@@ -8,14 +8,8 @@ short_desc="Menu driven communications program"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://alioth.debian.org/projects/minicom/"
-distfiles="http://alioth.debian.org/frs/download.php/3700/${pkgname}-${version}.tar.gz"
-checksum=a6e7bf533c3796f3a67a7d109f328d46497c687ed13885bd1be4ce0548fc4f56
+distfiles="https://www.alioth.debian.org/frs/download.php/latestfile/3/${pkgname}-${version}.tar.gz"
+checksum=9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4
long_desc="
Minicom is a menu driven communications program. It emulates ANSI and VT102
terminals. It has a dialing directory and auto zmodem download."
-
-minicom_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template
index 2fd818e29a..a53a7f3077 100644
--- a/srcpkgs/minitube/template
+++ b/srcpkgs/minitube/template
@@ -4,6 +4,7 @@ version=2.1.3
revision=1
wrksrc=$pkgname
makedepends="qt-devel phonon-devel desktop-file-utils hicolor-icon-theme phonon-backend-gstreamer"
+depends="phonon-backend desktop-file-utils hicolor-icon-theme"
short_desc="A native YouTube client in QT. Watch YouTube videos without Flash Player"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -18,10 +19,3 @@ do_build() {
do_install() {
make INSTALL_ROOT=${DESTDIR} install
}
-
-minitube_package() {
- depends="phonon-backend desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/miniupnpc/template b/srcpkgs/miniupnpc/template
index 4e581d83b3..9ece95a22e 100644
--- a/srcpkgs/miniupnpc/template
+++ b/srcpkgs/miniupnpc/template
@@ -37,9 +37,3 @@ miniupnpc-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-miniupnpc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/minizip/template b/srcpkgs/minizip/template
index 77d790a587..ec8a9da9eb 100644
--- a/srcpkgs/minizip/template
+++ b/srcpkgs/minizip/template
@@ -17,14 +17,8 @@ pre_configure() {
autoreconf -i
}
-minizip_package() {
- pkg_install() {
- vmove all
- }
-}
-
minizip-devel_package() {
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 8ca539c99a..e423eb2552 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -18,6 +18,8 @@ configure_args="--disable-rpath --with-system-et --without-system-verto
hostmakedepends="perl flex"
makedepends="db-devel>=5.3 e2fsprogs-devel openssl-devel"
+depends="mit-krb5-client>=${version}_${revision}"
+conflicts="heimdal>=0"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" e2fsprogs-devel"
@@ -69,11 +71,3 @@ mit-krb5-libs_package() {
vmove "usr/lib/*.so.*"
}
}
-
-mit-krb5_package() {
- depends="mit-krb5-client>=${version}_${revision}"
- conflicts="heimdal>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mkfontdir/template b/srcpkgs/mkfontdir/template
index 21a98fb3fe..2f62f02b11 100644
--- a/srcpkgs/mkfontdir/template
+++ b/srcpkgs/mkfontdir/template
@@ -2,8 +2,10 @@
pkgname=mkfontdir
version=1.0.7
revision=1
+noarch="yes"
build_style=gnu-configure
makedepends="mkfontscale"
+depends="${makedepends}"
short_desc="X11 Font Index Generator"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -14,11 +16,3 @@ long_desc="
The mkfontdir tool uses mkfontscale to create an index of X font
files (such as PCF, SNF, or BDF) in a directory. The X server
and font server use the generated "fonts.dir" file to find font files."
-
-mkfontdir_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mkfontscale/template b/srcpkgs/mkfontscale/template
index 221f724f5d..4156d5ff8b 100644
--- a/srcpkgs/mkfontscale/template
+++ b/srcpkgs/mkfontscale/template
@@ -15,9 +15,3 @@ checksum=244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731
long_desc="
This package contains the mkfontscale, a program to generate legacy X11
font indices for scalable fonts."
-
-mkfontscale_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mksh/files/TaC-mksh.txt b/srcpkgs/mksh/files/TaC-mksh.txt
index 206d1bce4d..fe7b7b39e0 100644
--- a/srcpkgs/mksh/files/TaC-mksh.txt
+++ b/srcpkgs/mksh/files/TaC-mksh.txt
@@ -95,14 +95,15 @@ libbsd package. The files are not compiled into the resulting binary
if their respective functionality is already provided.
-The following files belong to mksh in a less close way, as they pro-
-vide additional functionality less closely coupled or not always de-
-sired. These are not included in the mksh distfile:
+The following files belong to mksh in a less close way, as the files
+provide additional functionality less closely coupled, or not always
+desired. These are not included in the mksh distfile:
- source code
- * src/usr.bin/printf/printf.c (slightly modified UCB printf utili-
- ty code - for the optional, undesired printf(1) builtin)
- *DO NOT* INCLUDE printf AS A SHELL BUILT-IN UNLESS YOU ABSOLUTE-
- LY MUST (otherwise, the preferrable /usr/bin/printf is called)
+ * src/usr.bin/printf/printf.c (UCB printf(1) utility that has been
+ slightly modified, for the optional, undesired printf builtin)
+
+ *DO NOT* INCLUDE printf AS A SHELL BUILT-IN UNLESS IT ABSOLUTELY
+ IS REQUIRED (or else the preferable /usr/bin/printf gets called)
The printf.c file is covered by the UCB three-clause BSD licence, as
shown in Appendix B below.
@@ -242,4 +243,4 @@ possible, the text shown above is to be included.
__________________________________________________________________
-$MirOS: www/files/TaC-mksh.txt,v 1.17 2013/08/12 18:38:29 tg Exp $
+$MirOS: www/files/TaC-mksh.txt,v 1.18 2013/09/10 16:12:59 tg Exp $
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index 779b0a190e..95ed5e1f2f 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,29 +1,23 @@
# Template file for 'mksh'
pkgname=mksh
-version=R48b
-revision=2
+version=R49
+revision=1
+wrksrc=mksh
+register_shell="/bin/mksh"
short_desc="The MirBSD Korn Shell"
maintainer="pancake <xtraeme@gmail.com>"
homepage="https://www.mirbsd.org/mksh.htm"
license="MirOS"
distfiles="https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$version.tgz"
-checksum="e67686187ba6dfbf99b7f6b5f841dfb5cd9f980504f8b631d7d3bfd98d345792"
-wrksrc=mksh
+checksum="4dd6c37fe2b8603be3d59744d7866d72913fca49d8a68d3254d064b12eb3da49"
do_build() {
- sh ./Build.sh
+ sh ./Build.sh -r -c lto
}
do_install() {
vinstall mksh 755 usr/bin
vinstall mksh.1 644 usr/share/man/man1
- vinstall lksh.1 644 usr/share/man/man1
+ vinstall dot.mkshrc 644 usr/share/doc/$pkgname/examples
vinstall ${FILESDIR}/TaC-mksh.txt 644 usr/share/licenses/$pkgname
}
-
-mksh_package() {
- register_shell="/bin/mksh"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template
index 10b9cd28da..78c4728b74 100644
--- a/srcpkgs/mobile-broadband-provider-info/template
+++ b/srcpkgs/mobile-broadband-provider-info/template
@@ -2,6 +2,7 @@
pkgname=mobile-broadband-provider-info
version=20120614
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="Database of mobile broadband service providers"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,10 +15,3 @@ long_desc="
broadband providers in different countries. Its functioning through Network
Manager makes it easy for users to choose their mobile broadband service
provider."
-
-mobile-broadband-provider-info_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template
index 0a420ab4a7..e7aef6a741 100644
--- a/srcpkgs/mod_wsgi/template
+++ b/srcpkgs/mod_wsgi/template
@@ -16,9 +16,3 @@ long_desc="
module would be suitable for use in hosting high performance production web
sites, as well as your average self managed personal sites running on web
hosting services."
-
-mod_wsgi_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 349ed90132..7cf5025db6 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -3,6 +3,7 @@ pkgname=mongoose
version=3.7
revision=2
wrksrc=$pkgname
+makedepends="openssl-devel"
short_desc="An Easy to use Web server"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -13,8 +14,6 @@ long_desc="
Mongoose is easy to use web server. It also can be used as embedded web server
library to provide web interface to applications."
-makedepends="openssl-devel"
-
do_build() {
COPT="-DNO_SSL_DL -lcrypto -lssl" make linux
}
@@ -37,9 +36,3 @@ libmongoose_package() {
vmove usr/lib
}
}
-
-mongoose_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mono/template b/srcpkgs/mono/template
index 8eb7ec3674..a2c3fb07ff 100644
--- a/srcpkgs/mono/template
+++ b/srcpkgs/mono/template
@@ -2,21 +2,15 @@
pkgname=mono
version=3.2.3
revision=1
+patch_args="-Np1"
build_style=gnu-configure
+# XXX: figure out how to split this up into subpkgs.
hostmakedepends="libtool perl"
makedepends="zlib-devel libX11-devel libgdiplus-devel"
-patch_args="-Np1"
+depends="libgdiplus>=0"
short_desc="Free implementation of the .NET platform including runtime and compiler"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://www.go-mono.org"
license="GPL-2, LGPL-2, MPL, MITX11"
distfiles="http://download.mono-project.com/sources/mono/$pkgname-$version.tar.bz2"
checksum=b8c2f97d6a5232dbf5a8180e5c38d4722b81af748893649d7d9e82c5cf8ef41a
-
-# XXX: figure out how to split this up into subpkgs.
-mono_package() {
- depends="libgdiplus>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/monsterwm-git/template b/srcpkgs/monsterwm-git/template
index 80b2453e44..1d6a17c869 100644
--- a/srcpkgs/monsterwm-git/template
+++ b/srcpkgs/monsterwm-git/template
@@ -1,34 +1,25 @@
# 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 <linuxienATlegtuxDOTorg>"
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
- }
-}
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index a276579373..fae7e21af7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="ncurses-devel protobuf-devel>=2.5.0 libutempter-devel openssl-devel perl-IO-Tty"
+depends="perl-IO-Tty"
short_desc="MObile SHell"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -17,10 +18,3 @@ long_desc="
Mosh is a replacement for SSH. It's more robust and responsive, especially over
Wi-Fi, cellular, and long-distance links."
-
-mosh_package() {
- depends="perl-IO-Tty"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 18832b74f6..f54bd4a265 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -5,16 +5,10 @@ revision=1
build_style=gnu-configure
makedepends="pkg-config intltool gtk+-devel libxfce4util-devel
libxfcegui4-devel gtksourceview2-devel dbus-glib-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Simple text editor for Xfce based on Leafpad"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://xfce.org"
distfiles="http://archive.se.xfce.org/src/apps/${pkgname}/0.3/${pkgname}-${version}.tar.bz2"
checksum=10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d
-
-mousepad_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mousetweaks/template b/srcpkgs/mousetweaks/template
index eabdfc3ca7..f2b0a29cf3 100644
--- a/srcpkgs/mousetweaks/template
+++ b/srcpkgs/mousetweaks/template
@@ -5,16 +5,10 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="gsettings-desktop-schemas-devel>=3.10 gtk+3-devel>=3.10 libXtst-devel"
+depends="gsettings-desktop-schemas>=3.10 desktop-file-utils"
short_desc="Mouse accessibility enhancements for the GNOME desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="FDL, GPL-3"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=12fa50eca2e442057a1b816b4aa78d0b8a17f854cf01f4d339d82ff0172b57dd
-
-mousetweaks_package() {
- depends="gsettings-desktop-schemas>=3.10 desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mozjs17/template b/srcpkgs/mozjs17/template
index 1b16c669af..adb1f8d6cd 100644
--- a/srcpkgs/mozjs17/template
+++ b/srcpkgs/mozjs17/template
@@ -1,12 +1,11 @@
# Template file for 'mozjs17'
pkgname=mozjs17
version=17.0.0
-revision=1
+revision=2
wrksrc="mozjs${version}"
build_wrksrc="js/src"
build_style=gnu-configure
-configure_args="--with-system-nspr --enable-threadsafe"
-hostmakedepends="zip python perl"
+hostmakedepends="zip python perl nspr-devel"
makedepends="zlib-devel nspr-devel libedit-devel libffi-devel"
short_desc="Mozilla JavaScript interpreter and library"
homepage="http://www.mozilla.org/js/"
@@ -14,14 +13,24 @@ license="MPL-1.1, GPL-2, LGPL-2.1"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${MOZILLA_SITE}/js/mozjs${version}.tar.gz"
checksum=321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba
-long_desc="
- JavaScript is the Netscape-developed object scripting language used in millions
- of web pages and server applications worldwide. Netscape's JavaScript is a
- superset of the ECMA-262 Edition 3 (ECMAScript) standard scripting language,
- with only mild differences from the published standard."
+
+do_configure() {
+ local _args
+
+ if [ "$CROSS_BUILD" ]; then
+ export HOST_CFLAGS="-Os"
+ export HOST_CXXFLAGS="-Os"
+ _args+=" --target=$XBPS_CROSS_TRIPLET"
+ fi
+
+ ./configure --prefix=/usr --with-system-nspr \
+ --enable-threadsafe ${_args}
+
+ sed -e 's,-L/usr/lib,,g' -i config/autoconf.mk
+}
mozjs17-devel_package() {
- depends="nspr-devel ${sourcepkg}>=${version}"
+ depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/js17-config
@@ -30,9 +39,3 @@ mozjs17-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-mozjs17_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template
index 8babd6a5e5..3d5e1fec7a 100644
--- a/srcpkgs/mpc/template
+++ b/srcpkgs/mpc/template
@@ -15,9 +15,3 @@ checksum=70cfa4f734a275a3c76df481ec5222872362ed8f58a4175459cae65d66acaf24
post_install() {
vinstall doc/mpc-completion.bash 644 usr/share/bash-completion/completions mpc
}
-
-mpc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 49df9e3bba..d70563ece0 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -14,6 +14,11 @@ makedepends="
yajl-devel>=2.0.4 libogg-devel libflac-devel libsoup-devel bzip2-devel
libmikmod-devel libsndfile-devel alsa-lib-devel mpg123-devel libsamplerate-devel
libcdio-devel systemd-devel zziplib-devel libmpdclient-devel"
+conf_files="/etc/mpd.conf"
+system_accounts="mpd"
+systemd_services="mpd.service on"
+mpd_homedir="/var/lib/mpd"
+make_dirs="/var/lib/mpd/playlists 0755 mpd mpd"
short_desc="Flexible, powerful, server-side application for playing music"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -79,14 +84,3 @@ if [ "$build_option_wavpack" ]; then
else
configure_args+=" --disable-wavpack"
fi
-
-mpd_package() {
- conf_files="/etc/mpd.conf"
- system_accounts="mpd"
- systemd_services="mpd.service on"
- mpd_homedir="/var/lib/mpd"
- make_dirs="/var/lib/mpd/playlists 0755 mpd mpd"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mpfr/template b/srcpkgs/mpfr/template
index fb0593391f..7164e9c8f3 100644
--- a/srcpkgs/mpfr/template
+++ b/srcpkgs/mpfr/template
@@ -22,9 +22,3 @@ mpfr-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-mpfr_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template
index 2d7afc8ff3..e68c64e698 100644
--- a/srcpkgs/mpg123/template
+++ b/srcpkgs/mpg123/template
@@ -1,23 +1,19 @@
# Template file for 'mpg123'
pkgname=mpg123
-version=1.17.0
+version=1.18.0
revision=1
build_style=gnu-configure
configure_args="--with-module-suffix=.so --with-optimization=4
--with-default-audio=alsa --enable-ipv6=yes --enable-network=yes"
hostmakedepends="pkg-config"
makedepends="alsa-lib-devel libltdl-devel jack-devel pulseaudio-devel SDL-devel"
+depends="mpg123-alsa>=${version}"
short_desc="Fast console MPEG audio decoder/player"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.mpg123.de/"
license="LGPL-2.1"
distfiles="http://www.${pkgname}.de/download/${pkgname}-${version}.tar.bz2"
-checksum=b22e2b1f8700ff2d0998a80d6251988ac472a643b3c4a04fad4777d80c32f5f9
-long_desc="
- This is the fast and Free (LGPL license) real time MPEG Audio Layer 1, 2 and
- 3 decoding library and console player. It uses floating point or integer
- math, along with several special optimizations (3DNow, SSE, ARM, ...) to make
- it most efficient."
+checksum=45612282d585afbdf83267b0be477ca42d8a82d77a17af687f8fc1e371617cce
mpg123-jack_package() {
depends="libmpg123>=${version}"
@@ -58,24 +54,18 @@ mpg123-alsa_package() {
libmpg123_package() {
short_desc+=" - Runtime library"
pkg_install() {
- vmove "usr/lib/*.so*"
+ vmove "usr/lib/*.so.*"
vmove usr/lib/mpg123/output_dummy.so
vmove usr/lib/mpg123/output_oss.so
}
}
mpg123-devel_package() {
- depends="libmpg123>=${version}"
+ depends="libmpg123>=${version}_${revision}"
short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-mpg123_package() {
- depends="mpg123-alsa>=${version}"
- pkg_install() {
- vmove all
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template
index 677ae73f87..d5e74ea048 100644
--- a/srcpkgs/mplayer/template
+++ b/srcpkgs/mplayer/template
@@ -36,6 +36,9 @@ makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6
libcdio-devel libdvdnav-devel libsysfs-devel libusb-compat-devel libass-devel
sqlite-devel librsvg-devel libtheora-devel speex-devel pulseaudio-devel
libmodplug-devel libva-devel v4l-utils-devel"
+conf_files="
+ /etc/mplayer/input.conf
+ /etc/mplayer/codecs.conf"
pre_configure() {
if [ "$XBPS_MACHINE" = "i686" ]; then
@@ -55,13 +58,3 @@ post_install() {
vinstall ${FILESDIR}/mplayer.desktop 644 usr/share/applications
vinstall etc/mplayer256x256.png 644 usr/share/pixmaps mplayer.png
}
-
-
-mplayer_package() {
- conf_files="
- /etc/mplayer/input.conf
- /etc/mplayer/codecs.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index 01f2f804fc..a3e513d373 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
# Template file for 'mpv'
pkgname=mpv
-version=0.2.4
+version=0.3.4
revision=1
short_desc="Video player based on MPlayer/mplayer2"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -8,7 +8,8 @@ license="GPL-2"
homepage="http://mpv.io"
build_style=configure
-configure_args="--prefix=/usr --confdir=/etc/mpv --disable-lircc --disable-joystick
+configure_script="./old-configure"
+configure_args="--prefix=/usr --confdir=/etc/mpv --enable-joystick
--disable-radio --disable-radio-capture --disable-radio-v4l2 --disable-rpath
--disable-libbs2b --disable-direct3d --disable-corevideo --disable-cocoa
--disable-coreaudio --disable-portaudio --disable-ossaudio --disable-sdl
@@ -19,14 +20,8 @@ makedepends="ffmpeg-devel>=2.1 libass-devel lcms2-devel libXinerama-devel libquv
mpg123-devel libXv-devel libxkbcommon-devel libva-devel libvdpau-devel alsa-lib-devel
libbluray-devel libcdio-devel libdvdread-devel pulseaudio-devel MesaLib-devel
harfbuzz-devel libXScrnSaver-devel jack-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
do_fetch() {
git clone -b v${version} git://github.com/mpv-player/mpv.git mpv-${version}
}
-
-mpv_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ms-sys/template b/srcpkgs/ms-sys/template
index fc65b683c5..53fbfbd639 100644
--- a/srcpkgs/ms-sys/template
+++ b/srcpkgs/ms-sys/template
@@ -15,9 +15,3 @@ long_desc="
The program does the same as Microsoft \"fdisk /mbr\" to a hard disk or \"sys d:\"
to a floppy or FAT partition except that it does not copy any system files,
only the boot record is written."
-
-ms-sys_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 669c742144..82bcc1c5e2 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -28,12 +28,6 @@ long_desc="
- LMTP support.
- Support for multiple accounts."
-msmtp_package() {
- pkg_install() {
- vmove all
- }
-}
-
# Package build options
build_options="openssl gnutls idn sasl gnome"
desc_option_openssl="Enable support for SSL with OpenSSL"
diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index c2fb4622e8..3c49b31d1e 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -29,9 +29,3 @@ do_install() {
make DESTDIR=${DESTDIR} install
fi
}
-
-mtd-utils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mtdev/template b/srcpkgs/mtdev/template
index 3e7127fd2b..ea4f98b464 100644
--- a/srcpkgs/mtdev/template
+++ b/srcpkgs/mtdev/template
@@ -29,9 +29,3 @@ mtdev-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-mtdev_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template
index b3e932538a..c96443ca02 100644
--- a/srcpkgs/mtools/template
+++ b/srcpkgs/mtools/template
@@ -4,6 +4,7 @@ version=4.0.17
revision=1
build_style=gnu-configure
makedepends="acl-devel"
+conf_files="/etc/mtools.conf"
short_desc="A collection of utilities to access MS-DOS disks"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -20,11 +21,3 @@ long_desc="
post_install() {
vinstall mtools.conf 644 etc
}
-
-mtools_package() {
- conf_files="/etc/mtools.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/mtpfs/template b/srcpkgs/mtpfs/template
index bf74e4d17d..8d573607b7 100644
--- a/srcpkgs/mtpfs/template
+++ b/srcpkgs/mtpfs/template
@@ -11,9 +11,3 @@ license="GPL-3"
homepage="http://www.adebenham.com/mtpfs/"
distfiles="http://www.adebenham.com/files/mtp/mtpfs-${version}.tar.gz"
checksum=1baf357de16995a5f0b5bc1b6833517a77456481d861cdba70f1ce1316ce4c1d
-
-mtpfs_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mtr/template b/srcpkgs/mtr/template
index a87ccef5d8..dce4647de7 100644
--- a/srcpkgs/mtr/template
+++ b/srcpkgs/mtr/template
@@ -17,9 +17,3 @@ create_srcdir=yes
pre_configure() {
./bootstrap.sh
}
-
-mtr_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 0dff667b68..df05b9be50 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -9,7 +9,8 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
gettext-devel intltool which gnome-doc-utils"
makedepends="clutter-devel startup-notification-devel libcanberra-devel
cinnamon-desktop-devel libXinerama-devel libSM-devel dconf zenity"
-maintainer="Roelof Wobben <rwobben@hotmail.com>"
+depends="dconf zenity"
+maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -30,11 +31,3 @@ muffin-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-muffin_package() {
- depends="dconf zenity"
- pkg_install() {
- vmove all
- }
-}
-
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 7f95f122d5..8b6a6d1807 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,6 +6,8 @@ hostmakedepends="pkg-config"
makedepends="libcap-devel Ice-devel>=3.5 protobuf-devel>=2.5.0 libXi-devel qt-devel openssl-devel
speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
avahi-compat-libs-devel MesaLib-devel libstdc++-devel libogg-devel boost-devel"
+depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
+replaces="libmumble<=1.2.3"
short_desc="Open source, low-latency, high quality voice chat for gaming"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://mumble.sourceforge.net/"
@@ -57,17 +59,9 @@ do_install() {
murmur_package() {
depends="mumble>=${version}"
- short_desc="${short_desc} - The murmur server (for mumble)"
+ short_desc+=" - The murmur server (for mumble)"
pkg_install() {
vmove usr/bin/murmurd
vmove "usr/share/man/man1/murmurd*"
}
}
-
-mumble_package() {
- replaces="libmumble<=1.2.3"
- depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mumble122/template b/srcpkgs/mumble122/template
index 0d04fee3f8..c79e558501 100644
--- a/srcpkgs/mumble122/template
+++ b/srcpkgs/mumble122/template
@@ -6,6 +6,9 @@ hostmakedepends="pkg-config"
makedepends="protobuf-devel>=2.5.0 libXi-devel qt-devel openssl-devel speex-devel
jack-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel
avahi-compat-libs-devel MesaLib-devel libogg-devel boost-devel"
+depends="jack qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
+replaces="libmumble<=1.2.3 mumble>=0"
+provides="mumble-999"
short_desc="Open source, low-latency, high quality voice chat for gaming"
maintainer="davehome <davehome@redthumb.info.tm>"
license="BSD"
@@ -55,12 +58,3 @@ do_install() {
cp ${wrksrc}/man/mumble{,11x}.1 ${DESTDIR}/usr/share/man/man1
cp ${wrksrc}/icons/mumble.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps
}
-
-mumble122_package() {
- replaces="libmumble<=1.2.3 mumble>=0"
- provides="mumble-999"
- depends="jack qt-plugin-sqlite desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 4f6aa65412..4a2190a316 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -5,6 +5,7 @@ revision=1
wrksrc="${pkgname}-${version}-source"
hostmakedepends="pkg-config"
makedepends="zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="Lightweight PDF and XPS viewer"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -43,10 +44,3 @@ mupdf-devel_package() {
vmove usr/lib
}
}
-
-mupdf_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index d6a26aae7a..0695b6546c 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -5,6 +5,7 @@ revision=1
wrksrc="mupen64plus-bundle-src-${version}"
hostmakedepends="pkg-config which"
makedepends="boost-devel SDL-devel freetype-devel glu-devel libpng-devel libsamplerate-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A Nintendo64 Emulator"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL"
@@ -21,10 +22,3 @@ do_install() {
# Remove devel files, not interested on it.
rm -rf ${DESTDIR}/usr/include
}
-
-mupen64plus_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 7e7380b2c3..ec30e826fa 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -1,6 +1,6 @@
# Template file for 'musl-bootstrap'.
pkgname=musl-bootstrap
-version=0.9.14
+version=0.9.15
revision=1
wrksrc="musl-${version}"
build_style=configure
@@ -10,20 +10,10 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=982e9de1287cf95f9aa526adba008660d8885bfccc41faf5c613ea47f1922872
-long_desc="
- A new standard library to power a new generation of Linux-based devices.
- musl is lightweight, fast, simple, free, and strives to be correct in the
- sense of standards-conformance and safety."
+checksum=4a7baab8f295511196dee48d33b8b82a159a81233facb89433707c792033cbe7
post_install() {
mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib/
vmkdir usr/bin
ln -sfr ${DESTDIR}/usr/lib/musl/bin/musl-gcc ${DESTDIR}/usr/bin/musl-gcc
}
-
-musl-bootstrap_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 04d46db9ff..7404f1f87e 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -1,19 +1,16 @@
# Template file for 'musl'.
pkgname=musl
-version=0.9.12
+version=0.9.15
revision=1
build_style=gnu-configure
configure_args="--prefix=/usr --disable-gcc-wrapper"
+conflicts="glibc>=0"
short_desc="The musl C library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
-checksum=72353f9e1f2fdaf5e88223dcd1cfa5555f5a364eb5e4a9967de1fd44cc4c6d3e
-long_desc="
- A new standard library to power a new generation of Linux-based devices.
- musl is lightweight, fast, simple, free, and strives to be correct in the
- sense of standards-conformance and safety."
+checksum=4a7baab8f295511196dee48d33b8b82a159a81233facb89433707c792033cbe7
do_install() {
# Move everything to /usr.
@@ -22,10 +19,3 @@ do_install() {
make DESTDIR=${DESTDIR} install
rm ${DESTDIR}/lib
}
-
-musl_package() {
- conflicts="glibc>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mutagen/template b/srcpkgs/mutagen/template
index d60d89b511..d506481cb1 100644
--- a/srcpkgs/mutagen/template
+++ b/srcpkgs/mutagen/template
@@ -1,16 +1,19 @@
# Template file for 'mutagen'
pkgname=mutagen
-version=1.21
+version=1.22
revision=1
+noarch="yes"
build_style=python-module
hostmakedepends="python-devel"
makedepends="python-devel"
+depends="python"
+pycompile_module="mutagen"
short_desc="Python multimedia tagging library"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://code.google.com/p/${pkgname}/"
license="GPL-2"
distfiles="http://${pkgname}.googlecode.com/files/${pkgname}-${version}.tar.gz"
-checksum=4dd30af3a291c0a152838f2bbf1d592bf6ede752b11a159cbf84e75815bcc2b5
+checksum=ddf2907bcaf4827b044a3d70b2fb3c1b58954497d86133f16715fc6c407d494e
long_desc="
Mutagen is a Python module to handle audio metadata. It supports ASF, FLAC,
M4A, Monkey's Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg Theora, Ogg
@@ -19,12 +22,3 @@ long_desc="
headers to accurately calculate the bitrate and length of MP3s. ID3 and APEv2
tags can be edited regardless of audio format. It can also manipulate Ogg
streams on an individual packet/page level."
-
-mutagen_package() {
- depends="python"
- noarch="yes"
- pycompile_module="mutagen"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/mutt-kz/template b/srcpkgs/mutt-kz/template
index 0aec8f1d28..60cf297fa3 100644
--- a/srcpkgs/mutt-kz/template
+++ b/srcpkgs/mutt-kz/template
@@ -1,28 +1,38 @@
# Template file for 'mutt-kz'
pkgname=mutt-kz
-version=20130402
+version=20140128
revision=1
-hostmakedepends="pkg-config automake"
-makedepends="openssl-devel ncurses-devel libidn-devel"
build_style=gnu-configure
+configure_args="--enable-notmuch --enable-pop --enable-imap --enable-smtp
+ --enable-gpgme --with-idn --with-ssl --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr
+ --with-gdbm=${XBPS_CROSS_BASE}/usr mutt_cv_regex_broken=no"
+hostmakedepends="perl pkg-config libidn-devel automake"
+makedepends="ncurses-devel openssl-devel libidn-devel gpgme-devel mime-types libnotmuch-devel"
+depends="notmuch mime-types"
+conf_files="/etc/Muttrc"
+conflicts="mutt>=0"
short_desc="mutt fork with notmuch support and another improvements"
maintainer="pancake <pancake@nopcode.org>"
license="GPL-3"
homepage="https://github.com/karelzak/mutt-kz/"
-
do_fetch() {
- _githead=29d1357c66ef09642fd0fa8660b3f8173639d6c2
+ # latest commit as of ${version}
+ _githead=be196028c755d3ffff184e9781ac933fbacbd562
+
git clone git://github.com/karelzak/mutt-kz.git ${pkgname}-${version}
- cd ${pkgname}-${version} ; git reset --hard ${_githead}
+ cd ${pkgname}-${version}
+ git reset --hard ${_githead}
}
pre_configure() {
autoreconf -fi
}
-mutt-kz_package() {
- pkg_install() {
- vmove usr
- }
+post_install() {
+ # provided by mime-types.
+ rm ${DESTDIR}/etc/mime.*
+ # move dist to examples dir.
+ vmkdir usr/share/examples/${pkgname}
+ mv ${DESTDIR}/etc/Muttrc.dist ${DESTDIR}/usr/share/examples/${pkgname}
}
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 7b23671ca8..295e6061ef 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -8,6 +8,8 @@ configure_args="--enable-pop --enable-imap --enable-smtp
--with-gdbm=${XBPS_CROSS_BASE}/usr mutt_cv_regex_broken=no"
hostmakedepends="perl pkg-config libidn-devel"
makedepends="ncurses-devel openssl-devel libidn-devel gpgme-devel mime-types"
+depends="mime-types"
+conf_files="/etc/Muttrc"
short_desc="The Mutt Mail Client"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-2"
@@ -28,11 +30,3 @@ post_install() {
rm ${DESTDIR}/usr/share/man/man1/{flea,muttbug}.1
vinstall contrib/gpg.rc 644 etc Muttrc.gpg.dist
}
-
-mutt_package() {
- conf_files="/etc/Muttrc"
- depends="mime-types"
- pkg_install(){
- vmove all
- }
-}
diff --git a/srcpkgs/mutter-wayland/template b/srcpkgs/mutter-wayland/template
index a938247d48..f86abd8773 100644
--- a/srcpkgs/mutter-wayland/template
+++ b/srcpkgs/mutter-wayland/template
@@ -9,6 +9,7 @@ makedepends="gtk+3-devel>=3.10 startup-notification-devel libcanberra-devel
clutter-devel>=1.16.0_3 gsettings-desktop-schemas-devel>=3.10 libSM-devel
dbus-glib-devel upower-devel gnome-desktop-devel>=3.10 systemd-devel
pam-devel zenity desktop-file-utils"
+depends="zenity>=3.8 desktop-file-utils"
short_desc="GNOME Lightweight GTK+3 window manager for Wayland"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -33,10 +34,3 @@ mutter-wayland-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-mutter-wayland_package() {
- depends="zenity>=3.8 desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 0bbc5b066d..0fbd3d5d64 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
-version=3.10.2
+version=3.10.3
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile --disable-static"
@@ -10,16 +10,17 @@ makedepends="
clutter-devel>=1.16 gsettings-desktop-schemas-devel>=3.10
upower-devel gnome-desktop-devel>=3.10
zenity>=3.8.0 libICE-devel libSM-devel desktop-file-utils"
+depends="zenity>=3.8 desktop-file-utils"
short_desc="Lightweight GTK+3 window manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/3.10/$pkgname-$version.tar.xz"
-checksum=438163bc7fbab88366b589cab895a1df79eeac389e012c6e26ec559316651100
+checksum=7b19eda620d11e0638e3be33455998d65bdee3ff6556b562df937978efb8830c
mutter-devel_package() {
depends="gsettings-desktop-schemas>=3.10 gtk+3-devel>=3.10
- clutter-devel>=1.16 libX11-devel mutter-${version}_${revision}"
+ clutter-devel>=1.16 libX11-devel mutter>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -29,10 +30,3 @@ mutter-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-mutter_package() {
- depends="zenity>=3.8 desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template
index a8fcd2ad35..2276eb5248 100644
--- a/srcpkgs/mysql/template
+++ b/srcpkgs/mysql/template
@@ -19,6 +19,11 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
-DSTACK_DIRECTION=1"
hostmakedepends="perl cmake bison ncurses-devel"
makedepends="zlib-devel ncurses-devel openssl-devel readline-devel"
+depends="shadow mysql-client"
+conf_files="/etc/mysql/my.cnf"
+systemd_services="mysqld.service on"
+system_accounts="mysql"
+mysqld_homedir="/var/lib/mysql"
short_desc="The world's most popular open source database"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://www.mysql.com/products/community/"
@@ -116,14 +121,3 @@ mysql-client_package() {
done
}
}
-
-mysql_package() {
- depends="shadow mysql-client"
- conf_files="/etc/mysql/my.cnf"
- systemd_services="mysqld.service on"
- system_accounts="mysql"
- mysqld_homedir="/var/lib/mysql"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index f0e26ea204..f09bb3d21d 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -16,9 +16,3 @@ long_desc="
of the Pine email suite from The University of Washington. It aims to
'emulate Pico as closely as possible and perhaps include extra
functionality'."
-
-nano_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template
index 9be7482a51..00293cdcf8 100644
--- a/srcpkgs/nasm/template
+++ b/srcpkgs/nasm/template
@@ -26,9 +26,3 @@ do_install() {
touch ${DESTDIR}/usr/share/info/dir
vinstall LICENSE 644 usr/share/licenses/nasm
}
-
-nasm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/nautilus-dropbox/template b/srcpkgs/nautilus-dropbox/template
index 8bad410f90..e4ef6839a4 100644
--- a/srcpkgs/nautilus-dropbox/template
+++ b/srcpkgs/nautilus-dropbox/template
@@ -4,6 +4,7 @@ version=1.4.0
revision=1
hostmakedepends="pkg-config"
makedepends="nautilus-devel pygtk-devel python-docutils"
+depends="pygtk"
build_style=gnu-configure
configure_args="--disable-static"
short_desc="dropbox plugin for nautilus"
@@ -12,10 +13,3 @@ license="GPL-2"
homepage="http://www.dropbox.com"
distfiles="https://linux.dropbox.com/packages/${pkgname}-${version}.tar.bz2"
checksum=3412554d31a4a819a45edcb96bb1ab071a3e2d781817b90a14df8010137cb802
-
-nautilus-dropbox_package() {
- depends="pygtk"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
index 5e11628800..a979234a6a 100644
--- a/srcpkgs/nautilus-sendto/template
+++ b/srcpkgs/nautilus-sendto/template
@@ -21,9 +21,3 @@ long_desc="
Nautilus Send To also provides the option of compressing the files
(tar.bz2, tar.gz, or zip) before sending."
-
-nautilus-sendto_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template
index f5b5188ea0..bbb27635b8 100644
--- a/srcpkgs/nautilus/template
+++ b/srcpkgs/nautilus/template
@@ -8,6 +8,7 @@ configure_args="--disable-update-mimedb --disable-debug
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="gtk+3-devel libnotify-devel libexif-devel exempi-devel
libxml2-devel tracker-devel>=0.16 gnome-desktop-devel>=3.10"
+depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10"
short_desc="The GNOME file manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -38,10 +39,3 @@ nautilus-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-nautilus_package() {
- depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nbd/files/config b/srcpkgs/nbd/files/config
new file mode 100644
index 0000000000..777f0ef245
--- /dev/null
+++ b/srcpkgs/nbd/files/config
@@ -0,0 +1,33 @@
+[generic]
+ # The [generic] section is required, even if nothing is specified
+ # there.
+ # When either of these options are specified, nbd-server drops
+ # privileges to the given user and group after opening ports, but
+ # _before_ opening files.
+ user = nbd
+ group = nbd
+ # Since version 2.9.17, nbd-server will do exports on a name
+ # basis (the used name is the name of the section in which the
+ # export is specified). This however required an incompatible
+ # protocol change. To enable backwards-compatible port-based
+ # exports, uncomment the following line:
+ # oldstyle = true
+[export1]
+ exportname = /export/nbd/export1-file
+ # The following line will be ignored unless the
+ # "oldstyle = true" line in the generic section above is
+ # enabled.
+ #port = 12345
+ authfile = /export/nbd/export1-authfile
+ timeout = 30
+ filesize = 10000000
+ readonly = false
+ multifile = false
+ copyonwrite = false
+ prerun = dd if=/dev/zero of=%s bs=1k count=500
+ postrun = rm -f %s
+[otherexport]
+ exportname = /export/nbd/experiment
+ # The other options are all optional, except this one in case
+ # the oldstyle option is used in [generic]:
+ # port = 12346
diff --git a/srcpkgs/nbd/files/nbd.service b/srcpkgs/nbd/files/nbd.service
new file mode 100644
index 0000000000..3d580514cf
--- /dev/null
+++ b/srcpkgs/nbd/files/nbd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Network Block Device Server
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/nbd-server
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template
new file mode 100644
index 0000000000..edce65c134
--- /dev/null
+++ b/srcpkgs/nbd/template
@@ -0,0 +1,22 @@
+# Template file for 'nbd'
+pkgname=nbd
+version=3.7
+revision=1
+build_style=gnu-configure
+configure_args="--enable-syslog --sbindir=/usr/bin"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+system_accounts="nbd"
+conf_files="/etc/nbd-server/config"
+short_desc="Network Block Device utilities"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://nbd.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz"
+checksum=a10523e02d2517b17c26120969544283094137c3989c9f39980b75de64894b61
+
+post_install() {
+ vinstall ${FILESDIR}/config 644 etc/nbd-server
+ vinstall ${FILESDIR}/nbd.service 644 usr/lib/systemd/system
+ vinstall doc/README 644 usr/share/doc/nbd
+}
diff --git a/srcpkgs/ncdu/template b/srcpkgs/ncdu/template
index a83c49605c..08da5a7e5b 100644
--- a/srcpkgs/ncdu/template
+++ b/srcpkgs/ncdu/template
@@ -14,9 +14,3 @@ long_desc="
Ncdu is a ncurses-based du viewer. It provides a fast and easy-to-use
interface through famous du utility. It allows to browse through the
directories and show percentages of disk usage with ncurses library."
-
-ncdu_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index f1e50e6805..d8e55312fc 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -20,9 +20,3 @@ if [ "$CROSS_BUILD" ]; then
sed -e 's,-L/usr/lib,,g' -i src/Makefile
}
fi
-
-ncmpcpp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index d37a5b7563..7d2ecb2247 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -23,6 +23,7 @@ if [ "$CROSS_BUILD" ]; then
# needs host tic(1)
hostmakedepends="ncurses"
fi
+depends="ncurses-base>=${version}"
do_configure() {
mkdir ncurses-build ncursesw-build
@@ -93,14 +94,6 @@ do_install() {
${DESTDIR}/usr/bin/ncurses5-config
}
-ncurses_package() {
- depends="ncurses-base>=${version}"
- pkg_install() {
- vmove usr/bin
- vmove usr/share/man/man1
- }
-}
-
ncurses-libs_package() {
short_desc+=" -- shared libraries"
replaces="ncursesw>=0"
diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template
index 5b895db393..75f2188917 100644
--- a/srcpkgs/ne/template
+++ b/srcpkgs/ne/template
@@ -26,9 +26,3 @@ do_build() {
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
}
-
-ne_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 325ed22212..02be48eb0e 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -11,6 +11,7 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection
makedepends="libexif-devel gvfs-devel dconf-devel exempi-devel cinnamon-desktop-devel
libnotify-devel tracker-devel libxml2-devel gnome-icon-theme cinnamon-translations
desktop-file-utils hicolor-icon-theme"
+depends="gvfs dconf gnome-icon-theme cinnamon-translations"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://cinnamon.linuxmint.com/"
@@ -46,10 +47,3 @@ nemo-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-nemo_package() {
- depends="gvfs dconf gnome-icon-theme cinnamon-translations"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 637ee7732b..c4fa1a5ee6 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -8,6 +8,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
hostmakedepends="pkg-config"
makedepends="expat-devel openssl-devel>=1.0.1 mit-krb5-devel libproxy-devel
ca-certificates"
+depends="ca-certificates"
short_desc="HTTP and WebDAV client library, with a C interface"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.webdav.org/neon/"
@@ -44,10 +45,3 @@ neon-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-neon_package() {
- depends="ca-certificates"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nepomuk-core/template b/srcpkgs/nepomuk-core/template
index 3a97bdced2..3628448bd7 100644
--- a/srcpkgs/nepomuk-core/template
+++ b/srcpkgs/nepomuk-core/template
@@ -25,9 +25,3 @@ nepomuk-core-devel_package() {
vmove usr/lib/cmake
}
}
-
-nepomuk-core_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nepomuk-widgets/template b/srcpkgs/nepomuk-widgets/template
index aafeb4bc94..d9ec42e262 100644
--- a/srcpkgs/nepomuk-widgets/template
+++ b/srcpkgs/nepomuk-widgets/template
@@ -24,9 +24,3 @@ nepomuk-widgets-devel_package() {
vmove usr/lib/cmake
}
}
-
-nepomuk-widgets_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index e33d41bdf8..0c7898d42a 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -4,6 +4,7 @@ version=5.7.1
revision=4
makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
python-devel python-distribute perl>=5.16"
+depends="python perl>=5.16"
short_desc="Simple Network Management Protocol (SNMP) suite"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.net-snmp.org/"
@@ -35,7 +36,7 @@ do_install() {
}
libnet-snmp_package() {
- short_desc="${short_desc} - shared libraries"
+ short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -43,17 +44,10 @@ libnet-snmp_package() {
net-snmp-devel_package() {
depends="libnet-snmp>=$version"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/bin/net-snmp-config
vmove usr/include
vmove usr/share/man/man3
}
}
-
-net-snmp_package() {
- depends="python perl>=5.16"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template
index 18649975a1..59ba5c2d11 100644
--- a/srcpkgs/net-tools/template
+++ b/srcpkgs/net-tools/template
@@ -27,9 +27,3 @@ do_install() {
vmove "bin/*" usr/bin
vmove "sbin/*" usr/sbin
}
-
-net-tools_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template
index 69ea2a4d85..9d66796451 100644
--- a/srcpkgs/netbsd-rumpkernel/template
+++ b/srcpkgs/netbsd-rumpkernel/template
@@ -1,6 +1,6 @@
# Template file for 'netbsd-rumpkernel'.
pkgname=netbsd-rumpkernel
-version=20131206
+version=20140103
revision=1
wrksrc="buildrump-${version}"
short_desc="NetBSD rump kernel"
@@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
homepage="https://github.com/anttikantee/buildrump.sh"
distfiles="${SOURCEFORGE_SITE}/rumpkernel/buildrump-${version}.tar.xz"
-checksum=9ee6b0657a787228c7f9a06e47a7c165d69217de02e71111286422c0587fa31c
+checksum=fac213939c1ec5d6ba183e8192cc8ab031e125955a434620eec9e9a107a32d57
long_desc="
This package provides NetBSD kernel drivers which have been built from
unmodified kernel source code as userspace libraries. Examples of
@@ -42,9 +42,3 @@ netbsd-rumpkernel-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-netbsd-rumpkernel_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template
index 57b9cdc19c..21b9c7a484 100644
--- a/srcpkgs/netbsd-wtf/template
+++ b/srcpkgs/netbsd-wtf/template
@@ -2,6 +2,7 @@
pkgname=netbsd-wtf
version=20131125
revision=1
+noarch="yes"
build_style=gnu-makefile
make_build_args="DATADIR=/usr/share"
make_install_args="PREFIX=/usr DATADIR=/usr/share"
@@ -19,10 +20,3 @@ do_fetch() {
msg_normal " Fetching source from $url ...\n"
git clone ${url} ${pkgname}-${version}
}
-
-netbsd-wtf_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/netcat/template b/srcpkgs/netcat/template
index b40dfc8a3f..e8ffe791c5 100644
--- a/srcpkgs/netcat/template
+++ b/srcpkgs/netcat/template
@@ -17,9 +17,3 @@ long_desc="
feature-rich network debugging and exploration tool, since it can create
almost any kind of connection you would need and has several interesting
built-in capabilities."
-
-netcat_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/netctl/template b/srcpkgs/netctl/template
index 01478ecc89..30a9f7919b 100644
--- a/srcpkgs/netctl/template
+++ b/srcpkgs/netctl/template
@@ -4,6 +4,11 @@ version=1.4
revision=1
hostmakedepends="pkg-config"
makedepends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd-devel"
+depends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd"
+noarch="yes"
+make_dirs="
+ /etc/netctl/interfaces 0750 root root
+ /etc/netctl/hooks 0750 root root"
short_desc="Profile based systemd network management"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
homepage="http://projects.archlinux.org/netctl.git/"
@@ -16,14 +21,3 @@ do_install() {
vinstall contrib/bash-completion 644 usr/share/bash-completion/completions/netctl
vinstall contrib/zsh-completion 644 usr/share/zsh/site-functions/_netctl
}
-
-netctl_package() {
- depends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd"
- noarch="yes"
- make_dirs="
- /etc/netctl/interfaces 0750 root root
- /etc/netctl/hooks 0750 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nethogs/template b/srcpkgs/nethogs/template
index f43f3700ce..61ccf27737 100644
--- a/srcpkgs/nethogs/template
+++ b/srcpkgs/nethogs/template
@@ -20,9 +20,3 @@ do_install() {
vinstall nethogs 755 usr/sbin
vinstall nethogs.8 644 usr/share/man/man8
}
-
-nethogs_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index bfe6a052fa..e7d2e52881 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -47,9 +47,3 @@ libnetpgp-devel_package() {
vmove usr/share/man/man3
}
}
-
-netpgp_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index daa9e18832..c563df6bae 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -7,6 +7,7 @@ makedepends="pkg-config perl libjpeg-turbo-devel libmng-devel
lcms-devel libwebp-devel libparserutils-devel libwapcaplet-devel
libhubbub-devel libcss-devel libnsbmp-devel libnsgif-devel gtk+-devel
libglade-devel"
+depends="desktop-file-utils shared-mime-info"
short_desc="Free, open source web browser written in C."
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2, MIT"
@@ -37,10 +38,3 @@ do_install() {
vinstall "${wrksrc}/${pkgname}-${version}/COPYING" \
0644 "/usr/share/licenses/${pkgname}"
}
-
-netsurf_package() {
- depends="desktop-file-utils shared-mime-info"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template
index 7e305a92c9..76fbfeafb6 100644
--- a/srcpkgs/nettle/template
+++ b/srcpkgs/nettle/template
@@ -33,9 +33,3 @@ nettle-tools_package() {
vmove usr/bin
}
}
-
-nettle_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 15e6fa4067..e0615ee568 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="GConf-devel libgnome-keyring-devel libsecret-devel
NetworkManager-devel>=${version} gnome-bluetooth-devel>=3.10 libnotify-devel
ModemManager-devel polkit-devel libgudev-devel iso-codes"
+depends="iso-codes NetworkManager>=${version} hicolor-icon-theme"
short_desc="NetworkManager panel applet for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org/projects/NetworkManager/"
@@ -35,10 +36,3 @@ network-manager-applet-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-network-manager-applet_package() {
- depends="iso-codes NetworkManager>=${version} hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index e432addedc..dbfe21281e 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -10,6 +10,15 @@ configure_args="
--with-systemdsystemunitdir=/lib/systemd/system"
hostmakedepends="pkg-config"
makedepends="avahi-libs-devel openssl-devel libusb-compat-devel systemd-devel neon-devel"
+depends="shadow"
+system_accounts="nut"
+conf_files="
+ /etc/ups/ups.conf
+ /etc/ups/upsd.users
+ /etc/ups/upsmon.conf
+ /etc/ups/upsd.conf
+ /etc/ups/upssched.conf
+ /etc/ups/nut.conf"
short_desc="NUT provides UPS control and monitoring features"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL-2"
@@ -27,18 +36,3 @@ post_install() {
done
mv ${DESTDIR}/etc/ups/upsd.users{.sample,}
}
-
-network-ups-tools_package() {
- system_accounts="nut"
- depends="shadow"
- conf_files="
- /etc/ups/ups.conf
- /etc/ups/upsd.users
- /etc/ups/upsmon.conf
- /etc/ups/upsd.conf
- /etc/ups/upssched.conf
- /etc/ups/nut.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/neverball/template b/srcpkgs/neverball/template
index 541bc2740f..7269fcb473 100644
--- a/srcpkgs/neverball/template
+++ b/srcpkgs/neverball/template
@@ -4,6 +4,7 @@ version=1.5.4
revision=9
makedepends="libpng-devel>=1.6 libjpeg-turbo-devel libvorbis-devel
SDL_ttf-devel physfs-devel"
+depends="desktop-file-utils"
short_desc="Puzzle/action game similar to Super Monkey Ball"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.neverball.org"
@@ -42,10 +43,3 @@ do_install() {
install -d ${DESTDIR}/usr/share/man/man6
install -m644 dist/*.6 ${DESTDIR}/usr/share/man/man6
}
-
-neverball_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template
index b6c88641ff..ee926fe50f 100644
--- a/srcpkgs/newlisp/template
+++ b/srcpkgs/newlisp/template
@@ -37,9 +37,3 @@ do_install() {
# Create newlisp symlink;
ln -sfr ${DESTDIR}/usr/bin/newlisp-${version} ${DESTDIR}/usr/bin/newlisp
}
-
-newlisp_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index f14b3fdbc9..7ac464390b 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -14,6 +14,11 @@ makedepends="libblkid-devel libmount-devel libtirpc-devel
librpcsecgss-devel>=0.19_3 libnfsidmap-devel>=0.25_3 keyutils-devel
libevent-devel device-mapper-devel libcap-devel mit-krb5-devel
libblkid-devel sqlite-devel rpcbind"
+depends="rpcbind"
+conf_files="/etc/idmapd.conf"
+make_dirs="
+ /var/lib/nfs/rpc_pipefs 0755 root root
+ /var/lib/nfs/sm 0750 root root"
do_configure() {
configure_args+=" --with-statduser=nobody --enable-gss --enable-nfsv4
@@ -73,14 +78,3 @@ nfs-utils-server_package() {
vmove usr/lib/systemd/system/proc-fs-nfsd.mount
}
}
-
-nfs-utils_package() {
- conf_files="/etc/idmapd.conf"
- make_dirs="
- /var/lib/nfs/rpc_pipefs 0755 root root
- /var/lib/nfs/sm 0750 root root"
- depends="rpcbind"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index e9913bb441..7297224fec 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -2,7 +2,25 @@
pkgname=nginx
version=1.4.4
revision=1
-makedepends="pcre-devel>=8.30 openssl-devel"
+makedepends="pcre-devel>=8.30 openssl-devel shadow"
+depends="shadow"
+conf_files="
+ /etc/nginx/fastcgi.conf
+ /etc/nginx/fastcgi_params
+ /etc/nginx/koi-win
+ /etc/nginx/koi-utf
+ /etc/nginx/mime.types
+ /etc/nginx/nginx.conf
+ /etc/nginx/scgi_params
+ /etc/nginx/uwsgi_params
+ /etc/nginx/win-utf"
+system_accounts="nginx"
+nginx_homedir="/var/tmp/nginx"
+systemd_services="nginx.service on"
+make_dirs="
+ /var/log/nginx 0750 root root
+ /var/tmp 1777 root root
+ /var/tmp/nginx 0750 root root"
short_desc="A high performance web and reverse proxy server"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Simplified BSD"
@@ -58,27 +76,3 @@ do_install() {
vinstall ${FILESDIR}/nginx.service 644 usr/lib/systemd/system
vinstall LICENSE 644 usr/share/licenses/nginx
}
-
-nginx_package() {
- conf_files="
- /etc/nginx/fastcgi.conf
- /etc/nginx/fastcgi_params
- /etc/nginx/koi-win
- /etc/nginx/koi-utf
- /etc/nginx/mime.types
- /etc/nginx/nginx.conf
- /etc/nginx/scgi_params
- /etc/nginx/uwsgi_params
- /etc/nginx/win-utf"
- depends="shadow"
- system_accounts="nginx"
- nginx_homedir="/var/tmp/nginx"
- systemd_services="nginx.service on"
- make_dirs="
- /var/log/nginx 0750 root root
- /var/tmp 1777 root root
- /var/tmp/nginx 0750 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index d3f5f768d9..0474236019 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--enable-ipv6 --without-ident"
hostmakedepends="pkg-config"
makedepends="zlib-devel"
+conf_files="/etc/ngircd.conf"
homepage="http://ngircd.barton.de/"
short_desc="Free, portable and lightweight Internet Relay Chat server"
maintainer="pancake <pancake@nopcode.org>"
@@ -30,10 +31,3 @@ fi
post_install() {
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
}
-
-ngircd_package() {
- conf_files="/etc/ngircd.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index 1cb81e8d78..c517a72aec 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -33,9 +33,3 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
}
-
-ngrep_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index 1848721d09..d386f3e660 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -8,6 +8,7 @@ configure_args="--sbindir=/usr/bin --enable-libmount
make_install_args="sbindir=/usr/bin"
hostmakedepends="automake libtool"
makedepends="libuuid-devel libmount-devel"
+conf_files="/etc/nilfs_cleanerd.conf"
short_desc="A log-structured file system for Linux - userspace utils"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -41,10 +42,3 @@ nilfs-utils-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-nilfs-utils_package() {
- conf_files="/etc/nilfs_cleanerd.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nitrogen/template b/srcpkgs/nitrogen/template
index b476364d5e..3b7939c507 100644
--- a/srcpkgs/nitrogen/template
+++ b/srcpkgs/nitrogen/template
@@ -11,12 +11,6 @@ distfiles="http://projects.l3ib.org/${pkgname}/files/${pkgname}-${version}.tar.g
checksum=60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2
hostmakedepends="pkg-config intltool"
makedepends="gtkmm2-devel libXinerama-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
LDFLAGS+="-lX11"
-
-nitrogen_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 909714d485..ba9fcec5be 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,18 +1,43 @@
# Template file for 'nix'
pkgname=nix
-version=1.6
-revision=2
+version=1.6.1
+revision=1
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
configure_args="--localstatedir=/nix/var"
hostmakedepends="pkg-config flex"
makedepends="bzip2-devel openssl-devel sqlite-devel gc-devel curl perl-WWW-Curl perl-DBD-SQLite"
+# Default configuration file.
+conf_files="/etc/nix/nix.conf"
+# Extra run-time dependencies.
+depends="curl perl-WWW-Curl perl-DBD-SQLite"
+# Create required build users/groups.
+system_groups="nixbld"
+for f in $(seq 10); do
+ system_accounts+=" nixbld${f}"
+ eval export nixbld\${f}_homedir="/var/empty"
+ eval export nixbld\${f}_groups="nixbld"
+done
+# Register systemd service by default.
+systemd_services="nix-daemon.service on"
+# Create required run-time directories.
+make_dirs="
+ /nix/var/log/nix/drvs 0755 root root
+ /nix/var/nix/profiles 0755 root root
+ /nix/var/nix/profiles/per-user 1777 root root
+ /nix/var/nix/gcroots/per-user 1777 root root
+ /nix/var/nix/temproots 0755 root root
+ /nix/var/nix/gcroots 0755 root root
+ /nix/var/nix/manifests 0755 root root
+ /nix/var/nix/userpool 0755 root root
+ /nix/var/nix/db 0755 root root
+ /nix/store 1775 root nixbld"
short_desc="A purely functional package manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="http://nixos.org/nix/"
distfiles="http://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"
-checksum=2e451a6ad0b43997d8df71d29a7d20ef42f7715fe16efbf4b53bdcdd1d5227fe
+checksum=31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84
post_install() {
# Remove unused stuff.
@@ -27,34 +52,3 @@ post_install() {
# Install our profile.d/nix for multi-user by default.
vinstall ${FILESDIR}/nix.sh 644 etc/profile.d
}
-
-nix_package() {
- # Default configuration file.
- conf_files="/etc/nix/nix.conf"
- # Extra run-time dependencies.
- depends="curl perl-WWW-Curl perl-DBD-SQLite"
- # Create required build users/groups.
- system_groups="nixbld"
- for f in $(seq 10); do
- system_accounts+=" nixbld${f}"
- eval export nixbld\${f}_homedir="/var/empty"
- eval export nixbld\${f}_groups="nixbld"
- done
- # Register systemd service by default.
- systemd_services="nix-daemon.service on"
- # Create required run-time directories.
- make_dirs="
- /nix/var/log/nix/drvs 0755 root root
- /nix/var/nix/profiles 0755 root root
- /nix/var/nix/profiles/per-user 1777 root root
- /nix/var/nix/gcroots/per-user 1777 root root
- /nix/var/nix/temproots 0755 root root
- /nix/var/nix/gcroots 0755 root root
- /nix/var/nix/manifests 0755 root root
- /nix/var/nix/userpool 0755 root root
- /nix/var/nix/db 0755 root root
- /nix/store 1775 root nixbld"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index df6f10bd24..375a14f659 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -70,9 +70,3 @@ nmapfe_package() {
}
fi #!CROSS_BUILD
-
-nmap_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 39ca836fee..f852299084 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,6 +5,7 @@ revision=1
wrksrc=node-v${version}
hostmakedepends="which pkg-config python"
makedepends="openssl-devel zlib-devel"
+depends="python"
short_desc="Evented I/O for V8 javascript"
maintainer="davehome <davehome@redthumb.info.tm>"
license="MIT"
@@ -37,10 +38,3 @@ do_install() {
make LD="$CXX" DESTDIR="$DESTDIR" install
vinstall LICENSE 644 usr/share/licenses/${pkgname}
}
-
-nodejs_package() {
- depends="python"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/notification-daemon/template b/srcpkgs/notification-daemon/template
index f37adec17f..973bad365d 100644
--- a/srcpkgs/notification-daemon/template
+++ b/srcpkgs/notification-daemon/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
makedepends="libglib-devel gtk+3-devel libcanberra-devel"
+depends="desktop-file-utils"
+replaces="notification-daemon>=0"
short_desc="Shows notification messages on the desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.galago-project.org/specs/notification/"
@@ -16,11 +18,3 @@ long_desc="
notification-daemon is an application that shows notifications sent by
other applications on your desktop in the form of popups. It is based
on the libnotify library."
-
-notification-daemon_package() {
- replaces="notification-daemon>=0"
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/notify-python/template b/srcpkgs/notify-python/template
index 585d09fe38..f1198e4a4e 100644
--- a/srcpkgs/notify-python/template
+++ b/srcpkgs/notify-python/template
@@ -5,6 +5,8 @@ revision=8
patch_args="-Np1"
build_style=gnu-configure
makedepends="pkg-config libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel"
+depends="pygtk"
+pycompile_module="gtk-2.0/pynotify"
short_desc="Python bindings for libnotify"
homepage="http://www.galago-project.org/"
license="LGPL-2.1"
@@ -18,11 +20,3 @@ long_desc="
getting in the user's way.
$pkgname provides just the Python bindings for libnotify."
-
-notify-python_package() {
- pycompile_module="gtk-2.0/pynotify"
- depends="pygtk"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
new file mode 100644
index 0000000000..cebee6bd3f
--- /dev/null
+++ b/srcpkgs/notmuch/template
@@ -0,0 +1,30 @@
+# Template file for 'notmuch'
+pkgname=notmuch
+version=0.17
+revision=2
+hostmakedepends="pkg-config"
+makedepends="xapian-core-devel gmime-devel talloc-devel"
+build_style=gnu-configure
+configure_args="--bashcompletiondir=/usr/share/bash-completion/completions"
+short_desc="notmuch -- the mail indexer"
+maintainer="Jan S. <jan.schreib@gmail.com>"
+license="GPL-3"
+homepage="http://notmuchmail.org"
+distfiles="http://notmuchmail.org/releases/notmuch-0.17.tar.gz"
+checksum=d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95
+
+libnotmuch-devel_package() {
+ short_desc+=" - development files"
+ depends="libnotmuch>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ }
+}
+
+libnotmuch_package() {
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template
index 00f41692a7..9b0b282a7b 100644
--- a/srcpkgs/nspr/template
+++ b/srcpkgs/nspr/template
@@ -1,11 +1,9 @@
# Template file for 'nspr'
pkgname=nspr
version=4.10.2
-revision=1
+revision=2
build_style=gnu-configure
build_wrksrc="nspr"
-configure_args="--libdir=/usr/lib --includedir=/usr/include/nspr
- --enable-optimize --disable-debug --with-pthreads"
makedepends="zlib-devel"
short_desc="NetScape Portable Runtime"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,15 +11,21 @@ homepage="http://www.mozilla.org/projects/nspr/"
license="GPL-2, MPL-1.1"
distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz"
checksum=4d09ee67a6fb57d3c646098b0ac7fd1e31be1c2c2ca57cd2ad28b42e6d3cf400
-long_desc="
- Netscape Portable Runtime (NSPR) provides a platform-neutral API for system
- level and libc like functions. The API is used in the Mozilla client, many of
- Netscape/AOL/iPlanet's and other software offerings."
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
- configure_args+=" --enable-64bit"
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ _args+=" --target=$XBPS_CROSS_TRIPLET"
+ fi
+ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+ _args+=" --enable-64bit"
+ fi
+
+ unset CFLAGS
+ ./configure --prefix=/usr --libdir=/usr/lib \
+ --includedir=/usr/include/nspr --enable-optimize \
+ --disable-debug --with-pthreads ${_args}
+}
-fi
post_install() {
ln -s nspr.pc ${DESTDIR}/usr/lib/pkgconfig/mozilla-nspr.pc
rm -r ${DESTDIR}/usr/bin/{compile-et.pl,prerr.properties} \
@@ -39,9 +43,3 @@ nspr-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-nspr_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nss-mdns/template b/srcpkgs/nss-mdns/template
index 075618e25f..69367c0578 100644
--- a/srcpkgs/nss-mdns/template
+++ b/srcpkgs/nss-mdns/template
@@ -5,16 +5,10 @@ revision=4
build_style=gnu-configure
configure_args="--enable-avahi --disable-lynx"
makedepends="avahi"
+depends="avahi"
short_desc="NSS module for Multicast DNS name resolution"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://0pointer.de/lennart/projects/$pkgname"
license="LGPL-2.1"
distfiles="${homepage}/$pkgname-$version.tar.gz"
checksum=1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d
-
-nss-mdns_package() {
- depends="avahi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 5c64233eee..bd1d2dab8a 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,15 +1,15 @@
# Template file for 'nss'
pkgname=nss
version=3.15.3
-_distver="3_15_3"
-revision=1
+revision=2
hostmakedepends="perl"
makedepends="zlib-devel nspr-devel>=4.10 sqlite-devel"
+depends="nspr>=4.10"
short_desc="Mozilla Network Security Services"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.mozilla.org/projects/security/pki/nss/"
license="GPL-2, MPL-1.1"
-distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${_distver}_RTM/src/nss-${version}.tar.gz"
+distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//./_/}_RTM/src/nss-${version}.tar.gz"
checksum=ec5f01f7d9f42cf8ad3f95c7f8921bde583df9297c83dc9062930462e3717a18
do_build() {
@@ -20,18 +20,42 @@ do_build() {
export BUILD_OPT=1
export NSS_USE_SYSTEM_SQLITE=1
export NSS_ENABLE_ECC=1
- export NSPR_INCLUDE_DIR=/usr/include/nspr
- export NSPR_LIB_DIR=/usr/lib
- export XCFLAGS="${CFLAGS}"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
- export USE_64=1
+ _use64="USE_64=1"
fi
cd nss
- make -C coreconf
- make -C lib/dbm
- make
+ # Build nsinstall for host.
+ make ${_use64} -C coreconf
+
+ if [ "$CROSS_BUILD" ]; then
+ case "$XBPS_TARGET_MACHINE" in
+ arm*) _ARCH="arm";;
+ mips*) _ARCH="mips";;
+ *) msg_error "$pkgver: unknown target machine\n";;
+ esac
+ # ... and then copy it to $wrksrc.
+ find ${wrksrc} -type f -name nsinstall -exec cp {} ${wrksrc} \;
+ make clean
+
+ export NSPR_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/nspr
+ export NSPR_LIB_DIR=${XBPS_CROSS_BASE}/usr/lib
+ export XCFLAGS="${CFLAGS}"
+
+ make CROSS_COMPILE=1 OS_TEST="${_ARCH}" NSINSTALL="${wrksrc}/nsinstall" \
+ CC="$CC" CCC="$CXX" RANLIB="$RANLIB" -C lib/dbm
+ make CROSS_COMPILE=1 OS_TEST="${_ARCH}" NSINSTALL="${wrksrc}/nsinstall" \
+ CC="$CC" CCC="$CXX" RANLIB="$RANLIB"
+ else
+ # native build
+ export NSPR_INCLUDE_DIR=/usr/include/nspr
+ export NSPR_LIB_DIR=/usr/lib
+ export XCFLAGS="${CFLAGS}"
+
+ make ${_use64} -C lib/dbm
+ make ${_use64}
+ fi
}
do_install() {
@@ -72,7 +96,6 @@ do_install() {
done
install -m644 dist/*.OBJ/lib/libcrmf.a ${DESTDIR}/usr/lib
- install -m644 dist/*.OBJ/lib/*.chk ${DESTDIR}/usr/lib
for f in certutil cmsutil crlutil modutil pk12util shlibsign \
signtool signver ssltap; do
@@ -90,13 +113,5 @@ nss-devel_package() {
vmove usr/lib/pkgconfig
vmove usr/include
vmove "usr/lib/*.a"
- vmove "usr/lib/*.chk"
- }
-}
-
-nss_package() {
- depends="nspr>=4.10"
- pkg_install() {
- vmove all
}
}
diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template
index ad05cdf0c2..3848e09c66 100644
--- a/srcpkgs/ntfs-3g/template
+++ b/srcpkgs/ntfs-3g/template
@@ -1,13 +1,15 @@
# Template file for 'ntfs-3g'
pkgname=ntfs-3g
version=2013.1.13
-revision=2
+revision=3
wrksrc="${pkgname}_ntfsprogs-${version}"
build_style=gnu-configure
configure_args="--exec-prefix=/usr --disable-static --with-fuse=external
--enable-posix-acls --enable-xattr-mappings"
hostmakedepends="pkg-config"
makedepends="libuuid-devel fuse-devel"
+provides="ntfsprogs-${version}"
+replaces="ntfsprogs>=0"
short_desc="Stable Read/Write NTFS Driver in userspace"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.tuxera.com/community/ntfs-3g-download/"
@@ -21,19 +23,12 @@ post_install() {
}
ntfs-3g-devel_package() {
- depends="fuse-devel ntfs-3g>=${version}"
- short_desc="${short_desc} -- development files"
+ depends="fuse-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
replaces="ntfsprogs-devel>=0"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-ntfs-3g_package() {
- provides="ntfsprogs-${version}"
- replaces="ntfsprogs>=0"
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index 5941be2dda..a3e501165d 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -6,6 +6,12 @@ build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --with-lineeditlibs=readline"
hostmakedepends="bison perl-HTML-Parser"
makedepends="readline-devel openssl-devel libcap-devel"
+depends="shadow"
+conf_files="/etc/ntp.conf"
+systemd_services="ntpdate.service on ntpd.service on"
+system_accounts="ntpd"
+provides="ntp-daemon-0"
+replaces="ntp-daemon>=0"
short_desc="The Network Time Protocol daemon and utilities"
license="BSD"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -40,15 +46,3 @@ ntp-perl_package() {
done
}
}
-
-ntp_package() {
- depends="shadow"
- conf_files="/etc/ntp.conf"
- systemd_services="ntpdate.service on ntpd.service on"
- system_accounts="ntpd"
- provides="ntp-daemon-0"
- replaces="ntp-daemon>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template
index 0a40888102..87facd90bc 100644
--- a/srcpkgs/numactl/template
+++ b/srcpkgs/numactl/template
@@ -35,9 +35,3 @@ libnuma-devel_package() {
vmove usr/share/man/man3
}
}
-
-numactl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template
index 742a01afc4..e2866dcf94 100644
--- a/srcpkgs/nvi/template
+++ b/srcpkgs/nvi/template
@@ -24,9 +24,3 @@ post_install() {
# remove cat pages.
rm -rf ${DESTDIR}/usr/share/man/cat1
}
-
-nvi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index f19bfe2995..62ddea46ce 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -1,23 +1,29 @@
# Template file for 'nvidia'
+
+_desc="NVIDIA drivers for linux"
+
pkgname=nvidia
-version=331.20
+version=331.38
revision=1
-short_desc="NVIDIA drivers for linux"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
only_for_archs="i686 x86_64"
+nonfree=yes
create_wrksrc=yes
+short_desc="${_desc} - Libraries and Utilities"
+depends="xserver-abi-video<15 nvidia-dkms-${version}_${revision} pkg-config"
+conflicts="catalyst>=0"
if [ "$XBPS_MACHINE" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"
- checksum=7ad6b05d31e790a938474ce832488f3c68e2f388503b20f7995bdb7bb5ab9745
+ checksum=396e4d8fffacd271937ef57dd90ec2dea3ff32ee9f1de73ce5370a6e29382bf4
else
_pkg="NVIDIA-Linux-x86_64-${version}"
distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}.run"
- checksum=b8803906402354d201d3b9bc21938a0fe8a7d76e93e486fddaab340df18092ec
+ checksum=1015ac65a85ba39bdbe9e6bac54ae7ce3b2441fc7512909074e991242a46cf34
fi
do_extract() {
@@ -146,7 +152,7 @@ do_install() {
}
nvidia-dkms_package() {
- short_desc+=" - DKMS kernel module"
+ short_desc="${_desc} - DKMS kernel module"
triggers="dkms"
dkms_modules="nvidia ${version}"
depends="dkms"
@@ -159,8 +165,8 @@ nvidia-dkms_package() {
}
nvidia-opencl_package() {
- short_desc+=" - OpenCL implementation"
- provides="libOpenCL-${version}"
+ short_desc="${_desc} - OpenCL implementation"
+ provides="libOpenCL-${version}_${revision}"
replaces="libOpenCL>=0"
nonfree=yes
pkg_install() {
@@ -170,13 +176,3 @@ nvidia-opencl_package() {
vmove etc/OpenCL
}
}
-
-nvidia_package() {
- short_desc+=" - Libraries and Utilities"
- depends="xserver-abi-video<15 nvidia-dkms-${version}_${revision} pkg-config"
- conflicts="catalyst>=0"
- nonfree=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index fc1f07df46..58d05d87a1 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -1,14 +1,21 @@
# Template file for 'nvidia304'
+_desc="NVIDIA drivers for linux (304.xx series)"
+
pkgname=nvidia304
version=304.117
revision=1
-short_desc="NVIDIA drivers for linux (304.xx series)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary NVIDIA license"
homepage="http://www.nvidia.com"
+nonfree=yes
create_wrksrc=yes
only_for_archs="i686 x86_64"
+short_desc="${_desc} - Libraries and Utilities"
+depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision} pkg-config"
+provides="nvidia-${version}_${revision}"
+replaces="nvidia>=0"
+conflicts="catalyst>=0"
if [ "${XBPS_MACHINE}" = "i686" ]; then
_pkg="NVIDIA-Linux-x86-${version}"
@@ -139,7 +146,7 @@ do_install() {
}
nvidia304-dkms_package() {
- short_desc+=" - DKMS kernel module"
+ short_desc="${_desc} - DKMS kernel module"
depends="dkms"
triggers="dkms"
dkms_modules="nvidia ${version}"
@@ -154,7 +161,7 @@ nvidia304-dkms_package() {
}
nvidia304-opencl_package() {
- short_desc+=" - OpenCL implementation"
+ short_desc="${_desc} - OpenCL implementation"
provides="nvidia-opencl-${version}_${revision} libOpenCL-${version}_${revision}"
replaces="nvidia-openctl>=0 libOpenCL>=0"
nonfree=yes
@@ -165,15 +172,3 @@ nvidia304-opencl_package() {
vmove etc/OpenCL
}
}
-
-nvidia304_package() {
- short_desc+=" - Libraries and Utilities"
- depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision} pkg-config"
- provides="nvidia-${version}_${revision}"
- replaces="nvidia>=0"
- conflicts="catalyst>=0"
- nonfree=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/obconf/template b/srcpkgs/obconf/template
index d2f9ef5e56..4b748311e9 100644
--- a/srcpkgs/obconf/template
+++ b/srcpkgs/obconf/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="gtk+-devel libglade-devel libSM-devel imlib2-devel openbox-devel>=3.5.2
startup-notification-devel desktop-file-utils shared-mime-info"
+depends="desktop-file-utils shared-mime-info"
short_desc="A GTK2 based configuration tool for the Openbox windowmanager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://openbox.org/wiki/ObConf:About"
distfiles="http://openbox.org/dist/obconf/obconf-${version}.tar.gz"
checksum=71a3e5f4ee246a27421ba85044f09d449f8de22680944ece9c471cd46a9356b9
-
-obconf_package() {
- depends="desktop-file-utils shared-mime-info"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/obex-data-server/template b/srcpkgs/obex-data-server/template
deleted file mode 100644
index 1c2f336113..0000000000
--- a/srcpkgs/obex-data-server/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'obex-data-server'
-pkgname=obex-data-server
-version=0.4.6
-revision=4
-build_style=gnu-configure
-configure_args="--enable-bip=gdk-pixbuf --enable-system-config"
-makedepends="libglib-devel libusb-compat-devel dbus-glib-devel
- libbluetooth-devel libopenobex-devel gdk-pixbuf-devel"
-short_desc="D-Bus service providing high-level OBEX functionality"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://wiki.muiline.com/obex-data-server"
-license="GPL-2"
-distfiles="http://tadas.dailyda.com/software/$pkgname-$version.tar.gz"
-checksum=b399465ddbd6d0217abedd9411d9d74a820effa0a6a142adc448268d3920094f
-long_desc="
- $pkgname is D-Bus service providing high-level OBEX client and server side
- functionality (currently supports OPP, FTP, BIP profiles, Bluetooth, USB
- and TTY transports)."
-
-obex-data-server_package() {
- conf_files="
- /etc/obex-data-server/capability.xml
- /etc/obex-data-server/imaging_capabilities.xml"
- replaces="obexd>=0"
- conflicts="obexd>=0"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/objfw/template b/srcpkgs/objfw/template
index e2f4ce4de9..ea8c68dd53 100644
--- a/srcpkgs/objfw/template
+++ b/srcpkgs/objfw/template
@@ -22,9 +22,3 @@ objfw-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-objfw_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/obmenu/template b/srcpkgs/obmenu/template
new file mode 100644
index 0000000000..dd54de1571
--- /dev/null
+++ b/srcpkgs/obmenu/template
@@ -0,0 +1,16 @@
+# Template file for 'obmenu'
+pkgname=obmenu
+version=1.0
+revision=2
+noarch=yes
+pycompile_module="obxml.py"
+build_style=python-module
+hostmakedepends="python"
+makedepends="python pygtk>=2.24_10 openbox"
+depends="${makedepends}"
+short_desc="An Openbox menu editor"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://obmenu.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=c9cea64d40d461a34ea3bdaec9867487c819d5f9814e1cc54db607d4d3c20e27
diff --git a/srcpkgs/ocaml-camomile/template b/srcpkgs/ocaml-camomile/template
index 95691288e6..e414c91658 100644
--- a/srcpkgs/ocaml-camomile/template
+++ b/srcpkgs/ocaml-camomile/template
@@ -19,9 +19,3 @@ do_install() {
sed -e "s|ocamlfind install|ocamlfind install -destdir '${DESTDIR}$(ocamlfind printconf destdir)'|" -i Makefile
make install
}
-
-ocaml-camomile_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 860fc4ab4e..f237ba2263 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -25,10 +25,3 @@ do_build() {
do_install() {
make prefix=${DESTDIR} install
}
-
-
-ocaml-findlib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ocaml-lidl/template b/srcpkgs/ocaml-lidl/template
index 9396c5f0c4..62be29f3f6 100644
--- a/srcpkgs/ocaml-lidl/template
+++ b/srcpkgs/ocaml-lidl/template
@@ -38,9 +38,3 @@ archive(native) = "com.cmxa"
archive(byte,mt_vm) = "com.cma"
EOF
}
-
-ocaml-lidl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index f314d192ed..d75dbf15e0 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -56,9 +56,3 @@ ocaml-compiler-libs_package() {
rm -f ${PKGDESTDIR}/usr/lib/ocaml/compiler-libs/typing/outcometree.{cmi,mli}
}
}
-
-ocaml_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/odroid-u2-base/INSTALL b/srcpkgs/odroid-u2-base/INSTALL
new file mode 100644
index 0000000000..bbc03e5146
--- /dev/null
+++ b/srcpkgs/odroid-u2-base/INSTALL
@@ -0,0 +1,6 @@
+case "$ACTION" in
+post)
+ # enable odroid-led, sshd, ntpdate, ntpd and dhcpcd services.
+ systemctl enable odroid-led.service sshd.service ntpdate.service ntpd.service dhcpcd.service
+ ;;
+esac
diff --git a/srcpkgs/odroid-u2-base/files/odroid-led b/srcpkgs/odroid-u2-base/files/odroid-led
new file mode 100644
index 0000000000..06a622afba
--- /dev/null
+++ b/srcpkgs/odroid-u2-base/files/odroid-led
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+usage() {
+ cat >&2 <<EOF
+usage: $0 [enable|disable]
+EOF
+ exit 1;
+}
+
+die() {
+ echo $@ >&2
+ exit 1;
+}
+
+LED=/sys/class/leds/led1/brightness
+MAXLED=/sys/class/leds/led1/max_brightness
+
+
+
+if [ $# -eq 1 ]; then
+ [ -z "$1" ] && usage
+ behavior=$1
+elif [ $# -gt 1 ]; then
+ usage;
+elif [ -f /etc/default/odroid-led ]; then
+ . /etc/default/odroid-led
+ behavior=$LED_BOOT_BEHAVIOR
+ auto_config=1
+else
+ exit 1
+fi
+
+
+case "$behavior" in
+ enable)
+ [ -f $LED -a -f $MAXLED ] || die "LED control file can not be found"
+ echo 0 > $LED
+ cat $MAXLED > $LED
+ ;;
+ disable)
+ [ -f $LED ] || die "LED control file can not be found"
+ echo 0 > $LED
+ ;;
+ *)
+ [ "$auto_config" ] || usage
+ exit 0;
+ ;;
+esac
diff --git a/srcpkgs/odroid-u2-base/files/odroid-led.default b/srcpkgs/odroid-u2-base/files/odroid-led.default
new file mode 100644
index 0000000000..2c098a32da
--- /dev/null
+++ b/srcpkgs/odroid-u2-base/files/odroid-led.default
@@ -0,0 +1,5 @@
+# LED_BOOT_BEHAVIOR: Control the behavior of the blue LED on boot
+# enable: turn LED on
+# disable: turn LED off
+# auto: do nothing (LED will blink)
+LED_BOOT_BEHAVIOR=enable
diff --git a/srcpkgs/odroid-u2-base/files/odroid-led.service b/srcpkgs/odroid-u2-base/files/odroid-led.service
new file mode 100644
index 0000000000..13d4aef5f9
--- /dev/null
+++ b/srcpkgs/odroid-u2-base/files/odroid-led.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Sets Odroids LED on boot
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/odroid-led
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/odroid-u2-base/template b/srcpkgs/odroid-u2-base/template
new file mode 100644
index 0000000000..84d4b85657
--- /dev/null
+++ b/srcpkgs/odroid-u2-base/template
@@ -0,0 +1,30 @@
+# Template file for 'odroid-u2-base'
+pkgname=odroid-u2-base
+version=1.6
+revision=1
+build_style=meta
+homepage="http://www.voidlinux.eu"
+short_desc="Void Linux Odroid U2 platform package"
+maintainer="Enno Boland <eb@s01.de>"
+license="Public Domain"
+
+only_for_archs="armv7l"
+makedepends="ntp?ntp-daemon dhcpcd openssh-server odroid-u2-kernel odroid-u2-uboot odroid-u2-boot-fw"
+depends="${makedepends}"
+
+conf_files=/etc/default/odroid-led
+
+# Allow upgrades for compatibility.
+provides="odroid-u2-ubootcfg-${version}_${revision}"
+replaces="odroid-u2-ubootcfg>=0"
+
+do_install() {
+ # Set proper perms to some devices.
+ vmkdir usr/lib/udev/rules.d
+ echo 'KERNEL=="disp|cedar_dev|mali|ump", MODE="0660", GROUP="video"' > ${DESTDIR}/usr/lib/udev/rules.d/50-odroid-u2.rules
+
+ # Install LED utilities
+ vinstall ${FILESDIR}/odroid-led 744 /usr/sbin
+ vinstall ${FILESDIR}/odroid-led.default 744 /etc/default odroid-led
+ vinstall ${FILESDIR}/odroid-led.service 644 /usr/lib/systemd/system
+}
diff --git a/srcpkgs/odroid-u2-boot-fw/template b/srcpkgs/odroid-u2-boot-fw/template
new file mode 100644
index 0000000000..73d30ec5b4
--- /dev/null
+++ b/srcpkgs/odroid-u2-boot-fw/template
@@ -0,0 +1,21 @@
+# Template file for 'odroid-u2-uboot'
+pkgname=odroid-u2-boot-fw
+version=1.0
+revision=1
+build_style=meta
+wrksrc="boot"
+short_desc="Odroid U2 proprietary boot files"
+maintainer="Enno Boland <eb@s01.de>"
+license="proprietary"
+homepage="http://dev.odroid.com/projects/4412boot/wiki/FrontPage"
+distfiles="http://dev.odroid.com/projects/4412boot/wiki/FrontPage?action=download&value=boot.tar.gz"
+checksum="e0db737d9e49f937425e4778b0ab892623bcc389d7c26329ba2e97ae7bb475c4"
+
+create_srcdir=yes
+only_for_archs="armv7l"
+
+do_install() {
+ vinstall E4412_S.bl1.HardKernel.bin 600 boot
+ vinstall bl2.signed.bin 600 boot
+ vinstall E4412_S.tzsw.signed.bin 600 boot
+}
diff --git a/srcpkgs/odroid-u2-kernel-headers b/srcpkgs/odroid-u2-kernel-headers
new file mode 120000
index 0000000000..61543d3a45
--- /dev/null
+++ b/srcpkgs/odroid-u2-kernel-headers
@@ -0,0 +1 @@
+odroid-u2-kernel
\ No newline at end of file
diff --git a/srcpkgs/odroid-u2-kernel/files/u2-dotconfig-custom b/srcpkgs/odroid-u2-kernel/files/u2-dotconfig-custom
new file mode 100644
index 0000000000..15de959b0e
--- /dev/null
+++ b/srcpkgs/odroid-u2-kernel/files/u2-dotconfig-custom
@@ -0,0 +1,4020 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 3.8.13.14 Kernel Configuration
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_NO_IOPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_NEED_MACH_GPIO_H=y
+CONFIG_NEED_MACH_MEMORY_H=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_INIT_PASS_ALL_PARAMS is not set
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION="-ARCH"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_VERSION_SIGNATURE=""
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_FHANDLE=y
+# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_BOOST is not set
+# CONFIG_RCU_NOCB_CPU is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EXPERT=y
+CONFIG_HAVE_UID16=y
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_EMBEDDED=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_JUMP_LABEL=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_MODULE_SIG is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_BLK_DEV_THROTTLING is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+# CONFIG_MINIX_SUBPARTITION is not set
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CFQ_GROUP_IOSCHED is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+CONFIG_MMU=y
+# CONFIG_ARCH_MULTIPLATFORM is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_MXS is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_S5P64X0 is not set
+# CONFIG_ARCH_S5PC100 is not set
+# CONFIG_ARCH_S5PV210 is not set
+CONFIG_ARCH_EXYNOS=y
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_U300 is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_NOMADIK is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP1 is not set
+# CONFIG_ARCH_VT8500_SINGLE is not set
+CONFIG_GPIO_PCA953X=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_PLAT_SAMSUNG=y
+CONFIG_PLAT_S5P=y
+
+#
+# Boot options
+#
+# CONFIG_S3C_BOOT_ERROR_RESET is not set
+CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
+CONFIG_S3C_LOWLEVEL_UART_PORT=1
+CONFIG_SAMSUNG_CLOCK=y
+CONFIG_SAMSUNG_CLKSRC=y
+CONFIG_S5P_CLOCK=y
+CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
+CONFIG_S5P_IRQ=y
+CONFIG_S5P_GPIO_INT=y
+CONFIG_SAMSUNG_GPIOLIB_4BIT=y
+CONFIG_S5P_GPIO_DRVSTR=y
+CONFIG_SAMSUNG_GPIO_EXTRA=16
+CONFIG_S3C_GPIO_SPACE=0
+CONFIG_S3C_GPIO_TRACK=y
+# CONFIG_S3C_ADC is not set
+CONFIG_S3C_DEV_HSMMC=y
+CONFIG_S3C_DEV_HSMMC1=y
+CONFIG_S3C_DEV_HSMMC2=y
+CONFIG_S3C_DEV_HSMMC3=y
+CONFIG_S3C_DEV_I2C1=y
+CONFIG_S3C_DEV_I2C3=y
+CONFIG_S3C_DEV_I2C7=y
+CONFIG_S3C_DEV_USB_HSOTG=y
+CONFIG_S3C_DEV_WDT=y
+CONFIG_S3C_DEV_RTC=y
+CONFIG_SAMSUNG_DEV_ADC=y
+CONFIG_S3C64XX_DEV_SPI0=y
+CONFIG_S3C64XX_DEV_SPI1=y
+CONFIG_S3C64XX_DEV_SPI2=y
+CONFIG_SAMSUNG_DEV_KEYPAD=y
+CONFIG_SAMSUNG_DEV_PWM=y
+CONFIG_SAMSUNG_DEV_BACKLIGHT=y
+CONFIG_S5P_DEV_CSIS0=y
+CONFIG_S5P_DEV_FIMC0=y
+CONFIG_S5P_DEV_FIMC1=y
+CONFIG_S5P_DEV_FIMC2=y
+CONFIG_S5P_DEV_FIMC3=y
+CONFIG_S5P_DEV_FIMD0=y
+CONFIG_S5P_DEV_G2D=y
+CONFIG_S5P_DEV_I2C_HDMIPHY=y
+CONFIG_S5P_DEV_JPEG=y
+CONFIG_S5P_DEV_MFC=y
+CONFIG_S5P_DEV_TV=y
+CONFIG_S5P_DEV_USB_EHCI=y
+CONFIG_S3C24XX_PWM=y
+CONFIG_SAMSUNG_DMADEV=y
+
+#
+# Power management
+#
+# CONFIG_SAMSUNG_PM_DEBUG is not set
+# CONFIG_SAMSUNG_PM_CHECK is not set
+CONFIG_S5P_PM=y
+CONFIG_S5P_SLEEP=y
+CONFIG_DEBUG_S3C_UART=0
+
+#
+# SAMSUNG EXYNOS SoCs Support
+#
+CONFIG_ARCH_EXYNOS4=y
+# CONFIG_ARCH_EXYNOS5 is not set
+
+#
+# EXYNOS SoCs
+#
+# CONFIG_CPU_EXYNOS4210 is not set
+CONFIG_SOC_EXYNOS4212=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_EXYNOS4_MCT=y
+CONFIG_EXYNOS_DEV_DMA=y
+CONFIG_EXYNOS_DEV_DRM=y
+CONFIG_EXYNOS4_SETUP_FIMD0=y
+CONFIG_EXYNOS_DEV_SYSMMU=y
+CONFIG_EXYNOS4_DEV_DWMCI=y
+CONFIG_EXYNOS4_DEV_USB_OHCI=y
+CONFIG_EXYNOS4_SETUP_I2C1=y
+CONFIG_EXYNOS4_SETUP_I2C3=y
+CONFIG_EXYNOS4_SETUP_I2C7=y
+CONFIG_EXYNOS4_SETUP_KEYPAD=y
+CONFIG_EXYNOS4_SETUP_SDHCI=y
+CONFIG_EXYNOS4_SETUP_SDHCI_GPIO=y
+CONFIG_EXYNOS4_SETUP_DWMCI=y
+CONFIG_EXYNOS4_SETUP_DWMCI_GPIO=y
+CONFIG_EXYNOS4_SETUP_FIMC=y
+CONFIG_EXYNOS4_SETUP_USB_PHY=y
+CONFIG_EXYNOS_SETUP_SPI=y
+
+#
+# EXYNOS4210 Boards
+#
+# CONFIG_MACH_SMDKC210 is not set
+# CONFIG_MACH_SMDKV310 is not set
+# CONFIG_MACH_ARMLEX4210 is not set
+# CONFIG_MACH_UNIVERSAL_C210 is not set
+# CONFIG_MACH_NURI is not set
+# CONFIG_MACH_ORIGEN is not set
+
+#
+# EXYNOS4212 Boards
+#
+CONFIG_MACH_SMDK4212=y
+
+#
+# EXYNOS4412 Boards
+#
+CONFIG_MACH_SMDK4412=y
+CONFIG_MACH_HKDK4412=y
+# CONFIG_ODROID_X is not set
+# CONFIG_ODROID_X2 is not set
+CONFIG_ODROID_U2=y
+
+#
+# Flattened Device Tree based board for EXYNOS SoCs
+#
+# CONFIG_MACH_EXYNOS4_DT is not set
+
+#
+# Configuration for HSMMC 8-bit bus width
+#
+CONFIG_EXYNOS4_SDHCI_CH0_8BIT=y
+CONFIG_EXYNOS4_SDHCI_CH2_8BIT=y
+# CONFIG_ARCH_VT8500 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_LPAE is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+# CONFIG_ARM_VIRT_EXT is not set
+CONFIG_SWP_EMULATE=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_KUSER_HELPERS=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_CACHE_L2X0=y
+CONFIG_CACHE_PL310=y
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARM_NR_BANKS=8
+CONFIG_MULTI_IRQ_HANDLER=y
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# CONFIG_ARM_ERRATA_742230 is not set
+# CONFIG_ARM_ERRATA_742231 is not set
+# CONFIG_PL310_ERRATA_588369 is not set
+# CONFIG_ARM_ERRATA_643719 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+# CONFIG_PL310_ERRATA_727915 is not set
+# CONFIG_ARM_ERRATA_743622 is not set
+# CONFIG_ARM_ERRATA_751472 is not set
+# CONFIG_PL310_ERRATA_753970 is not set
+# CONFIG_ARM_ERRATA_754322 is not set
+# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_PL310_ERRATA_769419 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
+CONFIG_ARM_GIC=y
+CONFIG_GIC_NON_BANKED=y
+
+#
+# Bus support
+#
+CONFIG_ARM_AMBA=y
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_HAVE_SMP=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_HAVE_ARM_SCU=y
+# CONFIG_ARM_ARCH_TIMER is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_NR_CPUS=4
+CONFIG_HOTPLUG_CPU=y
+CONFIG_LOCAL_TIMERS=y
+CONFIG_ARCH_NR_GPIO=0
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_HZ=200
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HIGHMEM=y
+# CONFIG_HIGHPTE is not set
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_SECCOMP is not set
+CONFIG_CC_STACKPROTECTOR=y
+
+#
+# Boot options
+#
+# CONFIG_USE_OF is not set
+CONFIG_ATAGS=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_CMDLINE="console=tty1 console=ttySAC1,115200 mem=2047M fbcon=map:1111111111111111111111111111"
+# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
+CONFIG_CMDLINE_EXTEND=y
+# CONFIG_CMDLINE_FORCE is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_AUTO_ZRELADDR is not set
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# ARM CPU frequency scaling drivers
+#
+CONFIG_ARM_EXYNOS_CPUFREQ=y
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
+CONFIG_ARM_EXYNOS4x12_DVFS_HOTPLUG=y
+# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+# CONFIG_FPE_FASTFPE is not set
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_APM_EMULATION is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
+CONFIG_CPU_PM=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_DIAG is not set
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=y
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+# CONFIG_IP_ROUTE_MULTIPATH is not set
+# CONFIG_IP_ROUTE_VERBOSE is not set
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_NET_IPVTI is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_INET_UDP_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_ZONES is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+# CONFIG_NF_CT_PROTO_DCCP is not set
+CONFIG_NF_CT_PROTO_GRE=m
+# CONFIG_NF_CT_PROTO_SCTP is not set
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NF_CT_NETLINK_HELPER is not set
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+# CONFIG_NETFILTER_TPROXY is not set
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+# CONFIG_NETFILTER_XT_SET is not set
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+# CONFIG_DEV_APPLETALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_PHONET=y
+# CONFIG_IEEE802154 is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+# CONFIG_NET_EMATCH_NBYTE is not set
+# CONFIG_NET_EMATCH_U32 is not set
+# CONFIG_NET_EMATCH_META is not set
+# CONFIG_NET_EMATCH_TEXT is not set
+CONFIG_NET_EMATCH_IPSET=m
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=m
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+# CONFIG_NETPRIO_CGROUP is not set
+CONFIG_BQL=y
+# CONFIG_BPF_JIT is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_MCS_FIR is not set
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+# CONFIG_BT_MRVL_SDIO is not set
+CONFIG_BT_ATH3K=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+CONFIG_NL80211_TESTMODE=y
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+# CONFIG_MAC80211_RC_PID is not set
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
+CONFIG_RFKILL_GPIO=m
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+CONFIG_HAVE_BPF_JIT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE="edid/1024x768.bin edid/1280x1024.bin edid/1280x720.bin edid/1680x1050.bin edid/1920x1080.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=128
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+
+#
+# Bus devices
+#
+CONFIG_CONNECTOR=m
+# CONFIG_MTD is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+# CONFIG_MG_DISK is not set
+# CONFIG_BLK_DEV_RBD is not set
+
+#
+# Misc devices
+#
+# CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_ATMEL_PWM is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+CONFIG_SENSORS_BH1780=m
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_BMP085_I2C is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=y
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=y
+CONFIG_ISCSI_BOOT_SYSFS=y
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_ATA is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MULTICORE_RAID456=y
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_DEBUG_BLOCK_STACK_TRACING=y
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+# CONFIG_DM_UEVENT is not set
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+# CONFIG_BONDING is not set
+# CONFIG_DUMMY is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_MII=y
+CONFIG_NET_TEAM=m
+# CONFIG_NET_TEAM_MODE_BROADCAST is not set
+# CONFIG_NET_TEAM_MODE_ROUNDROBIN is not set
+# CONFIG_NET_TEAM_MODE_ACTIVEBACKUP is not set
+# CONFIG_NET_TEAM_MODE_LOADBALANCE is not set
+CONFIG_MACVLAN=m
+# CONFIG_MACVTAP is not set
+# CONFIG_VXLAN is not set
+CONFIG_NETCONSOLE=m
+# CONFIG_NETCONSOLE_DYNAMIC is not set
+CONFIG_NETPOLL=y
+CONFIG_NETPOLL_TRAP=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_NET_DSA_MV88E6XXX is not set
+# CONFIG_NET_DSA_MV88E6060 is not set
+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
+# CONFIG_NET_DSA_MV88E6131 is not set
+# CONFIG_NET_DSA_MV88E6123_61_65 is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_CADENCE is not set
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+CONFIG_NET_VENDOR_CIRRUS=y
+# CONFIG_CS89x0 is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_FARADAY=y
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTGMAC100 is not set
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_MARVELL=y
+# CONFIG_MVMDIO is not set
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_8390=y
+# CONFIG_AX88796 is not set
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_SEEQ=y
+# CONFIG_SEEQ8005 is not set
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=m
+CONFIG_SMC911X=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
+CONFIG_NET_VENDOR_STMICRO=y
+# CONFIG_STMMAC_ETH is not set
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_AT803X_PHY=m
+# CONFIG_AMD_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+CONFIG_DAVICOM_PHY=m
+# CONFIG_QSEMI_PHY is not set
+CONFIG_LXT_PHY=m
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+# CONFIG_BCM87XX_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOE=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_WLAN=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AT76C50X_USB=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_MAC80211_HWSIM=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
+CONFIG_ATH_DEBUG=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_HTC=m
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+# CONFIG_ATH6KL_SDIO is not set
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+CONFIG_AR5523=m
+CONFIG_B43=m
+CONFIG_B43_SSB=y
+# CONFIG_B43_SDIO is not set
+CONFIG_B43_PIO=y
+# CONFIG_B43_PHY_N is not set
+CONFIG_B43_PHY_LP=y
+# CONFIG_B43_PHY_HT is not set
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+# CONFIG_B43LEGACY is not set
+# CONFIG_BRCMFMAC is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_SDIO is not set
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS_MESH is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT53XX=y
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL8192C_COMMON=m
+# CONFIG_WL_TI is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_USB=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# CONFIG_WAN is not set
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_SPARSEKMAP is not set
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+# CONFIG_TOUCHSCREEN_EETI is not set
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+# CONFIG_TOUCHSCREEN_WM97XX is not set
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+# CONFIG_TOUCHSCREEN_USB_GOTOP is not set
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_W90X900=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+# CONFIG_INPUT_AD714X_I2C is not set
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_KXTJ9_POLLED_MODE=y
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF8574=m
+# CONFIG_INPUT_PWM_BEEPER is not set
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+# CONFIG_INPUT_ADXL34X_I2C is not set
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_CMA3000=m
+# CONFIG_INPUT_CMA3000_I2C is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_AMBAKMI is not set
+CONFIG_SERIO_LIBPS2=m
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+CONFIG_GAMEPORT=m
+# CONFIG_GAMEPORT_NS558 is not set
+# CONFIG_GAMEPORT_L4 is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+CONFIG_DEVKMEM=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_EM is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_AMBA_PL010 is not set
+# CONFIG_SERIAL_AMBA_PL011 is not set
+# CONFIG_SERIAL_KGDB_NMI is not set
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_UARTS_4=y
+CONFIG_SERIAL_SAMSUNG_UARTS=4
+# CONFIG_SERIAL_SAMSUNG_DEBUG is not set
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_ARC is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+CONFIG_HW_RANDOM_EXYNOS=y
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+CONFIG_I2C_GPIO=y
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_HAVE_S3C2410_I2C=y
+CONFIG_I2C_S3C2410=y
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+CONFIG_SPI_DEBUG=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_GPIO=y
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+CONFIG_SPI_S3C64XX=y
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=y
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+# CONFIG_PTP_1588_CLOCK is not set
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+# CONFIG_PTP_1588_CLOCK_PCH is not set
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO drivers:
+#
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_TS5500 is not set
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_ADP5588 is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
+
+#
+# AC97 GPIO expanders:
+#
+
+#
+# MODULbus GPIO expanders:
+#
+
+#
+# USB GPIO expanders:
+#
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_POWER_RESET is not set
+# CONFIG_POWER_AVS is not set
+# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_FAIR_SHARE is not set
+CONFIG_STEP_WISE=y
+# CONFIG_USER_SPACE is not set
+CONFIG_CPU_THERMAL=y
+CONFIG_EXYNOS_THERMAL=y
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+# CONFIG_SSB_SDIOHOST is not set
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_LP8788 is not set
+CONFIG_MFD_MAX77686=y
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_AS3711 is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+# CONFIG_REGULATOR_DUMMY is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_FAN53555 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+CONFIG_REGULATOR_MAX77686=y
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_MEDIA_SUPPORT=y
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=y
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_DMA_CONTIG=y
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_DVB_CORE=y
+CONFIG_DVB_NET=y
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+
+#
+# Media drivers
+#
+CONFIG_RC_CORE=y
+CONFIG_RC_MAP=y
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_USB_SN9C102=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_PVRUSB2=m
+# CONFIG_VIDEO_PVRUSB2_SYSFS is not set
+CONFIG_VIDEO_PVRUSB2_DVB=y
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_AC97=y
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+# CONFIG_VIDEO_TM6000_ALSA is not set
+# CONFIG_VIDEO_TM6000_DVB is not set
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+# CONFIG_DVB_USB_PCTV452E is not set
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG=y
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+# CONFIG_VIDEO_TIMBERDALE is not set
+# CONFIG_SOC_CAMERA is not set
+CONFIG_VIDEO_SAMSUNG_S5P_FIMC=y
+CONFIG_VIDEO_S5P_FIMC=y
+# CONFIG_VIDEO_S5P_MIPI_CSIS is not set
+CONFIG_VIDEO_EXYNOS_FIMC_LITE=y
+# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
+CONFIG_VIDEO_SAMSUNG_S5P_G2D=y
+# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+CONFIG_VIDEO_SAMSUNG_S5P_MFC=y
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+# CONFIG_SMS_SDIO_DRV is not set
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+# CONFIG_I2C_SI470X is not set
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+# CONFIG_I2C_SI4713 is not set
+# CONFIG_RADIO_SI4713 is not set
+CONFIG_USB_KEENE=m
+# CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_SAA7706H is not set
+# CONFIG_RADIO_TEF6862 is not set
+# CONFIG_RADIO_WL1273 is not set
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+# CONFIG_RADIO_WL128X is not set
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_IR_I2C=y
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+
+#
+# RDS decoders
+#
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
+CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+
+#
+# Miscelaneous helper chips
+#
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=y
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
+CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+CONFIG_MALI400=y
+CONFIG_MALI400_DEBUG=y
+CONFIG_MALI400_UMP=y
+# CONFIG_MALI_DVFS is not set
+CONFIG_UMP=y
+CONFIG_UMP_MEM_SIZE=512
+# CONFIG_UMP_DEBUG is not set
+CONFIG_UMP_USING_OS_MEMORY=y
+
+#
+# Graphics support
+#
+CONFIG_DRM=y
+CONFIG_DRM_USB=m
+CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+CONFIG_DRM_MALI=y
+CONFIG_DRM_EXYNOS=y
+CONFIG_DRM_EXYNOS_DMABUF=y
+CONFIG_DRM_EXYNOS_HDMI=y
+# CONFIG_DRM_EXYNOS_VIDI is not set
+CONFIG_DRM_EXYNOS_G2D=y
+# CONFIG_DRM_EXYNOS_IPP is not set
+CONFIG_DRM_UDL=m
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_TMIO is not set
+CONFIG_FB_S3C=y
+# CONFIG_FB_S3C_DEBUG_REGWRITE is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=y
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+CONFIG_LCD_LP101WH1=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+# CONFIG_BACKLIGHT_PWM is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=y
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_RAWMIDI_SEQ=m
+# CONFIG_SND_OPL3_LIB_SEQ is not set
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+# CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_TEA575X=m
+CONFIG_SND_ARM=y
+# CONFIG_SND_ARMAACI is not set
+# CONFIG_SND_SPI is not set
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+# CONFIG_SND_USB_CAIAQ_INPUT is not set
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_SOC=y
+# CONFIG_SND_DESIGNWARE_I2S is not set
+CONFIG_SND_SOC_SAMSUNG=y
+CONFIG_SND_SAMSUNG_I2S=y
+# CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
+# CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF is not set
+# CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
+CONFIG_SND_SOC_HKDK_MAX98090=y
+CONFIG_MAX98090_HEADSET=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_MAX98090=y
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=y
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+# CONFIG_HID_ICADE is not set
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+# CONFIG_HID_PICOLCD_CIR is not set
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+# CONFIG_HID_SENSOR_HUB is not set
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=y
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+# CONFIG_I2C_HID is not set
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB_ARCH_HAS_XHCI is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_S5P=y
+CONFIG_USB_S5P_HSIC0=y
+CONFIG_USB_S5P_HSIC1=y
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_ISP1362_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_EXYNOS=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_U132_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_CHIPIDEA is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=y
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_STORAGE_ENE_UB6250=y
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIEMENS_MPI=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
+CONFIG_USB_SERIAL_ZIO=m
+# CONFIG_USB_SERIAL_ZTE is not set
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=y
+
+#
+# USB Physical Layer drivers
+#
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_RCAR_PHY is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_ARMMMCI is not set
+CONFIG_MMC_SDHCI=y
+# CONFIG_MMC_SDHCI_PLTFM is not set
+CONFIG_MMC_SDHCI_S3C=y
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+# CONFIG_MMC_SDHCI_PXAV2 is not set
+# CONFIG_MMC_SDHCI_S3C_DMA is not set
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_IDMAC=y
+# CONFIG_MMC_VUB300 is not set
+# CONFIG_MMC_USHC is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=y
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_OT200 is not set
+# CONFIG_LEDS_BLINKM is not set
+CONFIG_LEDS_TRIGGERS=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX77686 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_HAVE_S3C_RTC=y
+CONFIG_RTC_DRV_S3C=y
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+# CONFIG_AMBA_PL08X is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_TIMB_DMA is not set
+CONFIG_PL330_DMA=y
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
+CONFIG_UIO=y
+# CONFIG_UIO_PDRV is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_DMEM_GENIRQ is not set
+
+#
+# Virtio drivers
+#
+# CONFIG_VIRTIO_MMIO is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_STAGING=y
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_W35UND=m
+CONFIG_PRISM2_USB=m
+# CONFIG_ECHO is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_RTLLIB is not set
+CONFIG_R8712U=m
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16204 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADIS16220 is not set
+# CONFIG_ADIS16240 is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_LIS3L02DQ is not set
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7291 is not set
+# CONFIG_AD7606 is not set
+# CONFIG_AD799X is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7816 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_ADT7410 is not set
+# CONFIG_AD7280 is not set
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# CONFIG_AD7152 is not set
+# CONFIG_AD7746 is not set
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD5930 is not set
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# CONFIG_AD9850 is not set
+# CONFIG_AD9852 is not set
+# CONFIG_AD9910 is not set
+# CONFIG_AD9951 is not set
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16060 is not set
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+
+#
+# Light sensors
+#
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2x7x is not set
+
+#
+# Magnetometer sensors
+#
+# CONFIG_SENSORS_AK8975 is not set
+# CONFIG_SENSORS_HMC5843 is not set
+
+#
+# Active energy metering IC
+#
+# CONFIG_ADE7753 is not set
+# CONFIG_ADE7754 is not set
+# CONFIG_ADE7758 is not set
+# CONFIG_ADE7759 is not set
+# CONFIG_ADE7854 is not set
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
+# CONFIG_ZSMALLOC is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+CONFIG_STAGING_MEDIA=y
+# CONFIG_DVB_AS102 is not set
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_ODROID=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_USB_WPAN_HCD=m
+# CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_CSR_WIFI is not set
+# CONFIG_CED1401 is not set
+# CONFIG_DGRP is not set
+CONFIG_CLKDEV_LOOKUP=y
+
+#
+# Hardware Spinlock drivers
+#
+# CONFIG_MAILBOX is not set
+CONFIG_IOMMU_SUPPORT=y
+# CONFIG_EXYNOS_IOMMU is not set
+
+#
+# Remoteproc drivers (EXPERIMENTAL)
+#
+# CONFIG_STE_MODEM_RPROC is not set
+
+#
+# Rpmsg drivers (EXPERIMENTAL)
+#
+# CONFIG_VIRT_DRIVERS is not set
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_MEMORY is not set
+CONFIG_IIO=y
+# CONFIG_IIO_BUFFER is not set
+# CONFIG_IIO_TRIGGER is not set
+
+#
+# Accelerometers
+#
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7266 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_TI_ADC081C is not set
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+
+#
+# Hid Sensor IIO Common
+#
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD5686 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MCP4725 is not set
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16136 is not set
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16480 is not set
+
+#
+# Light sensors
+#
+# CONFIG_ADJD_S311 is not set
+# CONFIG_VCNL4000 is not set
+
+#
+# Magnetometer sensors
+#
+CONFIG_PWM=y
+CONFIG_PWM_SAMSUNG=y
+# CONFIG_IPACK_BUS is not set
+
+#
+# Hardkernel Specific Hardware
+#
+CONFIG_ODROID_U2_FAN=y
+CONFIG_VIDEO_SAMSUNG_S5P_HDMI_CEC=y
+
+#
+# Ubuntu Supplied Third-Party Device Drivers
+#
+CONFIG_DM_RAID45=m
+# CONFIG_AUFS_FS is not set
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+CONFIG_NILFS2_FS=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+CONFIG_QFMT_V1=y
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+# CONFIG_OVERLAYFS_FS is not set
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+# CONFIG_CACHEFILES is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+# CONFIG_HFS_FS is not set
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_LOGFS is not set
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+CONFIG_ROMFS_ON_BLOCK=y
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_FSCACHE is not set
+CONFIG_NFS_USE_LEGACY_DNS=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_FAULT_INJECTION=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_SMB2=y
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=6
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_PREEMPT is not set
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_PI_LIST=y
+# CONFIG_RT_MUTEX_TESTER is not set
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_VERBOSE=y
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_PROBE_EVENTS is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+# CONFIG_KGDB_TESTS is not set
+# CONFIG_KGDB_KDB is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_ARM_UNWIND=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_S3C_UART0=y
+# CONFIG_DEBUG_S3C_UART1 is not set
+# CONFIG_DEBUG_S3C_UART2 is not set
+# CONFIG_DEBUG_S3C_UART3 is not set
+# CONFIG_DEBUG_LL_UART_NONE is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_SEMIHOSTING is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_EARLY_PRINTK=y
+# CONFIG_OC_ETM is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_ARM=y
+CONFIG_CRYPTO_SHA256=m
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_ARM=y
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_FCRYPT=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=y
+CONFIG_CRYPTO_LZO=y
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=y
+# CONFIG_CRC8 is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
+# CONFIG_CORDIC is not set
+# CONFIG_DDR is not set
diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
new file mode 100644
index 0000000000..0409c234aa
--- /dev/null
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -0,0 +1,166 @@
+# Template file for 'odroid-u2-kernel'
+#
+# Latest commit as of 20140123
+_githash="85ea95926152bdc049063102e745dc48c4fab86e"
+_gitshort="${_githash:0:7}"
+
+pkgname=odroid-u2-kernel
+version=3.8.13.16
+revision=1
+maintainer="Enno Boland <eb@s01.de>"
+homepage="http://www.kernel.org"
+license="GPL-2"
+short_desc="The Linux kernel and modules for the Odroid U2/U3 (${version%.*} series [git ${_gitshort}])"
+create_srcdir=yes
+distfiles="https://github.com/hardkernel/linux/archive/${_githash}.tar.gz"
+checksum=43ff8b6b128d5f0ff425fe4b1462810a10b6bc7dc9b76a0ae6c2ce6a817aae9e
+wrksrc="linux-${_githash}"
+provides="kernel-odroid-u2-${version}_${revision}"
+replaces="kernel-odroid-u2>=0"
+
+_kernver="${version}_${revision}"
+
+nostrip=yes
+noverifyrdeps=yes
+only_for_archs="armv7l"
+hostmakedepends="perl python kmod>=11_2 uboot-mkimage openssl which elfutils bc"
+makedepends="ncurses-devel"
+depends="kmod>=11_2"
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
+
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+ fi
+
+ unset LDFLAGS
+ cp ${FILESDIR}/u2-dotconfig-custom .config
+
+ # Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
+ sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
+}
+
+do_build() {
+ if [ "$CROSS_BUILD" ]; then
+ _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+ fi
+ unset LDFLAGS
+ make ${makejobs} ${_args} ARCH=arm prepare
+ make ${makejobs} ${_args} ARCH=arm zImage modules
+}
+
+do_install() {
+ local hdrdest
+
+ # Run depmod after compressing modules.
+ sed -i '2iexit 0' scripts/depmod.sh
+
+ # Install kernel, firmware and modules
+ make ARCH=arm INSTALL_MOD_PATH=${DESTDIR} modules_install
+
+ vinstall arch/arm/boot/zImage 644 boot
+
+ hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
+
+ # Switch to /usr.
+ vmkdir usr
+ mv ${DESTDIR}/lib ${DESTDIR}/usr
+
+ cd ${DESTDIR}/usr/lib/modules/${_kernver}
+ rm -f source build
+ ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
+
+ cd ${wrksrc}
+
+ # Remove firmware stuff provided by the "linux-firmware" pkg.
+ rm -rf ${DESTDIR}/usr/lib/firmware
+
+ mkdir -p ${hdrdest}/include
+ for i in acpi asm-generic config crypto drm generated linux math-emu \
+ media net pcmcia scsi sound trace video xen; do
+ [ -d include/$i ] && cp -a include/$i ${hdrdest}/include
+ done
+
+ cd ${wrksrc}
+ # Copy files necessary for later builds.
+ cp Module.symvers ${hdrdest}
+ cp -a scripts ${hdrdest}
+
+ # fix permissions on scripts dir
+ chmod og-w -R ${hdrdest}/scripts
+
+ # copy arch includes for external modules
+ mkdir -p ${hdrdest}/arch/arm/mach-exynos
+ mkdir -p ${hdrdest}/arch/arm/plat-samsung
+
+ cp -a arch/arm/include ${hdrdest}/arch/arm
+ cp -a arch/arm/mach-exynos/include ${hdrdest}/arch/arm/mach-exynos
+ cp -a arch/arm/plat-samsung/include ${hdrdest}/arch/arm/plat-samsung
+
+ mkdir -p ${hdrdest}/arch/arm/kernel
+
+ cp arch/arm/Makefile ${hdrdest}/arch/arm
+ if [ "$MACHINE_ARCH" = "i686" ]; then
+ cp arch/arm/Makefile_32.cpu ${hdrdest}/arch/arm
+ fi
+ cp arch/arm/kernel/asm-offsets.s ${hdrdest}/arch/arm/kernel
+
+ # Add docbook makefile
+ install -Dm644 Documentation/DocBook/Makefile \
+ ${hdrdest}/Documentation/DocBook/Makefile
+
+ # Add md headers
+ mkdir -p ${hdrdest}/drivers/md
+ cp drivers/md/*.h ${hdrdest}/drivers/md
+
+ # Add inotify.h
+ mkdir -p ${hdrdest}/include/linux
+ cp include/linux/inotify.h ${hdrdest}/include/linux
+
+ # Add wireless headers
+ mkdir -p ${hdrdest}/net/mac80211/
+ cp net/mac80211/*.h ${hdrdest}/net/mac80211
+
+ # add dvb headers for external modules
+ mkdir -p ${hdrdest}/include/config/dvb/
+ cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
+
+ # Copy in Kconfig files
+ for i in $(find . -name "Kconfig*"); do
+ mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
+ cp $i ${hdrdest}/$i
+ done
+
+ # Remove unneeded architectures
+ for arch in alpha arm26 avr32 blackfin cris frv h8300 \
+ ia64 m* p* s* um v850 x86 xtensa; do
+ rm -rf ${hdrdest}/arch/${arch}
+ done
+
+ # Compress all modules with xz to save a few MBs.
+ msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
+ find ${DESTDIR} -name '*.ko' -exec gzip -9 {} \;
+
+ # ... and run depmod again.
+ depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
+}
+
+odroid-u2-kernel-headers_package() {
+ nostrip=yes
+ noverifyrdeps=yes
+ short_desc="Linux kernel headers for the Odroid U2/U3 (${version%.*} series [${_gitshort}])"
+ pkg_install() {
+ vmove usr/src
+ vmove usr/lib/modules/${_kernver}/build
+ }
+}
+
diff --git a/srcpkgs/odroid-u2-uboot/files/boot-1024x768-noedid.ini b/srcpkgs/odroid-u2-uboot/files/boot-1024x768-noedid.ini
new file mode 100644
index 0000000000..f04278a8f8
--- /dev/null
+++ b/srcpkgs/odroid-u2-uboot/files/boot-1024x768-noedid.ini
@@ -0,0 +1,6 @@
+setenv initrd_high "0xffffffff"
+setenv fdt_high "0xffffffff"
+setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
+setenv edid_load "drm_kms_helper.edid_firmware=edid/1024x768.bin"
+setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
+boot
diff --git a/srcpkgs/odroid-u2-uboot/files/boot-1080p-edid.ini b/srcpkgs/odroid-u2-uboot/files/boot-1080p-edid.ini
new file mode 100644
index 0000000000..00feab1719
--- /dev/null
+++ b/srcpkgs/odroid-u2-uboot/files/boot-1080p-edid.ini
@@ -0,0 +1,6 @@
+setenv initrd_high "0xffffffff"
+setenv fdt_high "0xffffffff"
+setenv drm_video_mode "HDMI-A-1:1920x1080@60"
+setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
+setenv bootargs "console=tty1 console=ttySAC1,115200n8 video=${drm_video_mode} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
+boot
diff --git a/srcpkgs/odroid-u2-uboot/files/boot-1080p-noedid.ini b/srcpkgs/odroid-u2-uboot/files/boot-1080p-noedid.ini
new file mode 100644
index 0000000000..3b051d8596
--- /dev/null
+++ b/srcpkgs/odroid-u2-uboot/files/boot-1080p-noedid.ini
@@ -0,0 +1,6 @@
+setenv initrd_high "0xffffffff"
+setenv fdt_high "0xffffffff"
+setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
+setenv edid_load "drm_kms_helper.edid_firmware=edid/1920x1080.bin"
+setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
+boot
diff --git a/srcpkgs/odroid-u2-uboot/files/boot-720p-edid.ini b/srcpkgs/odroid-u2-uboot/files/boot-720p-edid.ini
new file mode 100644
index 0000000000..994a8cf080
--- /dev/null
+++ b/srcpkgs/odroid-u2-uboot/files/boot-720p-edid.ini
@@ -0,0 +1,6 @@
+setenv initrd_high "0xffffffff"
+setenv fdt_high "0xffffffff"
+setenv drm_video_mode "HDMI-A-1:1280x720M@60"
+setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
+setenv bootargs "console=tty1 console=ttySAC1,115200n8 video=${drm_video_mode} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
+boot
diff --git a/srcpkgs/odroid-u2-uboot/files/boot-720p-noedid.ini b/srcpkgs/odroid-u2-uboot/files/boot-720p-noedid.ini
new file mode 100644
index 0000000000..b8692e27d4
--- /dev/null
+++ b/srcpkgs/odroid-u2-uboot/files/boot-720p-noedid.ini
@@ -0,0 +1,6 @@
+setenv initrd_high "0xffffffff"
+setenv fdt_high "0xffffffff"
+setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
+setenv edid_load "drm_kms_helper.edid_firmware=edid/1280x720.bin"
+setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
+boot
diff --git a/srcpkgs/odroid-u2-uboot/files/boot-auto_edid.ini b/srcpkgs/odroid-u2-uboot/files/boot-auto_edid.ini
new file mode 100644
index 0000000000..b795f1be8c
--- /dev/null
+++ b/srcpkgs/odroid-u2-uboot/files/boot-auto_edid.ini
@@ -0,0 +1,5 @@
+setenv initrd_high "0xffffffff"
+setenv fdt_high "0xffffffff"
+setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; bootm 0x40008000"
+setenv bootargs "console=tty1 console=ttySAC1,115200n8 root=/dev/mmcblk0p2 rootwait ro mem=2047M"
+boot
diff --git a/srcpkgs/odroid-u2-uboot/files/config.patch b/srcpkgs/odroid-u2-uboot/files/config.patch
new file mode 100644
index 0000000000..d98d83a5e8
--- /dev/null
+++ b/srcpkgs/odroid-u2-uboot/files/config.patch
@@ -0,0 +1,13 @@
+diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk
+index 7f9b171..788caaa 100644
+--- a/arch/arm/cpu/armv7/config.mk
++++ b/arch/arm/cpu/armv7/config.mk
+@@ -20,7 +20,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ # MA 02111-1307 USA
+ #
+-PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float
++PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -mfloat-abi=hard -mfpu=vfpv3
+
+ # Make ARMv5 to allow more compilers to work, even though its v7a.
+ PLATFORM_CPPFLAGS += -march=armv7-a
diff --git a/srcpkgs/odroid-u2-uboot/template b/srcpkgs/odroid-u2-uboot/template
new file mode 100644
index 0000000000..a863f42c4a
--- /dev/null
+++ b/srcpkgs/odroid-u2-uboot/template
@@ -0,0 +1,52 @@
+# Template file for 'odroid-u2-uboot'
+_githash=89f2ab95e7304fe02e5267f1282fbc178550d528
+pkgname=odroid-u2-uboot
+version=v2010.12
+revision=1
+wrksrc="u-boot-${_githash}"
+hostmakedepends="uboot-mkimage"
+short_desc="Odroid U2 U-Boot files for SD booting"
+maintainer="Enno Boland <eb@s01.de>"
+license="GPL-2"
+homepage="https://github.com/hardkernel/u-boot"
+distfiles="https://github.com/hardkernel/u-boot/archive/${_githash}.tar.gz"
+checksum="29593e636a0d908230910522aab74c09a35b92fee71b165d088f561e85ba3e1d"
+
+create_srcdir=yes
+only_for_archs="armv7l"
+
+_default_scr="boot-auto_edid.scr"
+
+do_configure() {
+ make mrproper
+ patch -p1 < ${FILESDIR}/config.patch
+ make smdk4412_config
+}
+
+do_build() {
+ unset CFLAGS CXXFLAGS LDFLAGS
+
+ if [ "$CROSS_BUILD" ]; then
+ make ARCH=arm CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
+ else
+ make ARCH=arm
+ fi
+
+ # Building uboot scr's
+ for source in ${FILESDIR}/*.ini; do
+ name=$(basename ${source%.ini})
+ mkimage -A arm -T script -C none -n "${name}" -d $source ${name}.scr
+ done
+
+ cp ${_default_scr} boot.scr
+}
+
+do_install() {
+ vinstall u-boot.bin 600 boot
+
+ # Install uboot scr's
+ for scr in *.scr; do
+ echo $scr
+ vinstall $scr 600 boot
+ done
+}
diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template
index 8620e22562..2866a445e8 100644
--- a/srcpkgs/omxplayer/template
+++ b/srcpkgs/omxplayer/template
@@ -1,7 +1,8 @@
# Template file for 'omxplayer'
+_githash=f666a5d
+
pkgname=omxplayer
-_githash=9b52cee
-version=20131124
+version=20140120
revision=1
short_desc="Commandline OMX player for the Raspberry Pi (git ${_githash})"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,6 +14,7 @@ only_for_archs="armv6l"
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="rpi-firmware>=20130913 pcre-devel boost-devel freetype-devel ffmpeg-devel>=2.1 dbus-devel"
+depends="rpi-firmware>=20130913 freefont-ttf"
do_fetch() {
local url="git://github.com/popcornmix/omxplayer.git"
@@ -27,14 +29,3 @@ pre_build() {
mkdir -p /opt/vc/lib
sed -e "s|@CROSSBASE@|${XBPS_CROSS_BASE}|g" -i Makefile.include
}
-
-do_build() {
- make CC="$CC" CXX="$CXX" LD="$LD" ${makejobs}
-}
-
-omxplayer_package() {
- depends="rpi-firmware>=20130913 freefont-ttf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index a5be3edb21..17534bc342 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -7,6 +7,11 @@ configure_args="--enable-startup-notification"
hostmakedepends="pkg-config"
makedepends="startup-notification-devel libxml2-devel libXrandr-devel
libXcursor-devel>=1.1.14_2 libXinerama-devel libSM-devel imlib2-devel pango-devel"
+conf_files="
+ /etc/xdg/openbox/menu.xml
+ /etc/xdg/openbox/rc.xml
+ /etc/xdg/openbox/environment
+ /etc/xdg/openbox/autostart"
short_desc="Standards compliant, fast, light-weight, extensible window manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -77,14 +82,3 @@ libopenbox_package() {
vmove "usr/lib/*.so.*"
}
}
-
-openbox_package() {
- conf_files="
- /etc/xdg/openbox/menu.xml
- /etc/xdg/openbox/rc.xml
- /etc/xdg/openbox/environment
- /etc/xdg/openbox/autostart"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/opencl-headers/template b/srcpkgs/opencl-headers/template
index e232b43ca3..6e862d6327 100644
--- a/srcpkgs/opencl-headers/template
+++ b/srcpkgs/opencl-headers/template
@@ -4,6 +4,7 @@ _openclver=1.2
_distver=20121114
version=${_openclver}.${_distver}
revision=1
+noarch="yes"
short_desc="OpenCL (Open Computing Language) header files"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -17,10 +18,3 @@ do_install() {
vmkdir usr/include/CL
install -m644 *.h *.hpp ${DESTDIR}/usr/include/CL
}
-
-opencl-headers_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/openjade/template b/srcpkgs/openjade/template
index ecd446fa9e..8623c0f9fc 100644
--- a/srcpkgs/openjade/template
+++ b/srcpkgs/openjade/template
@@ -8,6 +8,8 @@ configure_args="
--enable-splibdir=/usr/lib"
revision=2
makedepends="perl opensp-devel"
+depends="xmlcatmgr"
+sgml_entries="CATALOG /usr/share/sgml/openjade/catalog --"
short_desc="SGML/XML parser toolkit and DSSSL engine, successor to "jade""
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://openjade.sourceforge.net/"
@@ -34,11 +36,3 @@ post_install() {
rm -f ${DESTDIR}/usr/lib/*.a
}
-
-openjade_package() {
- sgml_entries="CATALOG /usr/share/sgml/openjade/catalog --"
- depends="xmlcatmgr"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 1cb4109ee4..aec70e12ea 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -4,6 +4,10 @@ version=1.4.1
revision=4
build_style=gnu-configure
makedepends="zlib-devel libgomp-devel"
+conf_files="
+ /etc/openmpi-default-hostfile
+ /etc/openmpi-mca-params.conf
+ /etc/openmpi-totalview.tcl"
short_desc="A High Performance Message Passing Library"
homepage="http://www.open-mpi.org/"
license="Custom"
@@ -19,21 +23,10 @@ long_desc="
openmpi-devel_package() {
depends="libstdc++-devel zlib-devel openmpi>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove usr/share/man/man3
}
}
-
-openmpi_package() {
- conf_files="
- /etc/openmpi-default-hostfile
- /etc/openmpi-mca-params.conf
- /etc/openmpi-totalview.tcl"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template
index aea3ae4b2f..306f217fa0 100644
--- a/srcpkgs/openmsx/template
+++ b/srcpkgs/openmsx/template
@@ -26,9 +26,3 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
}
-
-openmsx_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/libopenobex b/srcpkgs/openobex-devel
similarity index 100%
rename from srcpkgs/libopenobex
rename to srcpkgs/openobex-devel
diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template
index 1bf4186927..2e6bcab78f 100644
--- a/srcpkgs/openobex/template
+++ b/srcpkgs/openobex/template
@@ -1,45 +1,32 @@
# Template file for 'openobex'
pkgname=openobex
-version=1.5
-revision=7
-build_style=gnu-configure
-configure_args="--enable-apps --enable-irda --enable-bluetooth --enable-usb"
-makedepends="pkg-config libusb-compat-devel libbluetooth-devel"
-short_desc="OpenOBEX applications"
+version=1.7.1
+revision=1
+wrksrc="${pkgname}-${version}-Source"
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_INSTALL_SBINDIR=/usr/bin"
+hostmakedepends="pkg-config cmake libxslt docbook-xsl"
+makedepends="systemd-devel libusb-devel libbluetooth-devel"
+replaces="libopenobex>=0"
+short_desc="OBEX protocol implementation"
homepage="http://dev.zuckschwerdt.org/openobex/"
license="LGPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
-distfiles="http://ftp.osuosl.org/pub/linux/bluetooth/$pkgname-$version.tar.bz2"
-checksum=13996a1e3c69d857f1c7b1d0d9f1c674ccd395355dcae1442a91386b4d75254c
-long_desc="
- The Object Exchange protocol can best be described as binary HTTP. OBEX
- is optimised for ad-hoc wireless links and can be used to exchange all kind
- of objects like files, pictures, calendar entries (vCal) and business cards
- (vCard).
+distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}-${version}-Source.tar.gz"
+checksum=3b264665d90901ea4ff720332ffb9b6d1d8f67187463d3a3279caddc7205ea57
- OBEX is builtin in devices like PDA's like the Palm Pilot, and mobile phones
- like the Ericsson R320, Siemens S25, Siemens S45, Siemens ME45, Nokia NM207
- and Nokia 9110 Communicator."
-
-libopenobex_package() {
- short_desc="OBEX protocol library"
- pkg_install() {
- vmove "usr/lib/libopenobex.so*"
- }
+pre_configure() {
+ sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' udev/openobex.rules.in
}
-libopenobex-devel_package() {
- depends="libbluetooth-devel libusb-compat-devel libopenobex>=${version}"
- short_desc="OBEX protocol library (development files)"
+openobex-devel_package() {
+ depends="libusb-devel ${sourcepkg}>=${version}_${revision}"
+ replaces="libopenobex-devel>=0"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove "usr/lib/*.a"
- }
-}
-
-openobex_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
}
}
diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template
index bc439dadc7..966d04051c 100644
--- a/srcpkgs/openresolv/template
+++ b/srcpkgs/openresolv/template
@@ -2,6 +2,7 @@
pkgname=openresolv
version=3.5.5
revision=1
+noarch="yes"
build_style=gnu-configure
configure_args="--prefix=/usr --sysconfdir=/etc
--bindir=/usr/bin --libexecdir=/usr/lib/resolvconf"
@@ -16,10 +17,3 @@ makedepends="systemd"
do_install() {
make DESTDIR=$DESTDIR install
}
-
-openresolv_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index ac534c2646..529a30d9ac 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -10,6 +10,13 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
--with-ca-file=/etc/ssl/certs/ca-certificates.crt"
hostmakedepends="pkg-config bison"
makedepends="zlib-devel openssl-devel libevent-devel db-devel ca-certificates"
+depends="ca-certificates"
+conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
+system_accounts="smtpd smtpq"
+systemd_services="smtpd.socket on"
+smtpq_homedir="/var/spool/mail"
+provides="smtp-forwarder-0_1 smtp-server-0_1"
+replaces="smtp-forwarder>=0 smtp-server>=0"
short_desc="Free implementation of the server-side SMTP protocol"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD, ISC, MIT"
@@ -31,16 +38,3 @@ post_install() {
vinstall ${FILESDIR}/smtpd.socket 644 usr/lib/systemd/system
vinstall /dev/null 644 etc/smtpd aliases
}
-
-opensmtpd_package() {
- depends="ca-certificates"
- conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
- system_accounts="smtpd smtpq"
- systemd_services="smtpd.socket on"
- smtpq_homedir="/var/spool/mail"
- provides="smtp-forwarder-0_1 smtp-server-0_1"
- replaces="smtp-forwarder>=0 smtp-server>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template
index c256d4c030..4edfe473dd 100644
--- a/srcpkgs/opensonic/template
+++ b/srcpkgs/opensonic/template
@@ -2,9 +2,10 @@
pkgname=opensonic
version=0.1.4
revision=2
+wrksrc="opensnc-src-${version}"
hostmakedepends="cmake"
makedepends="allegro4-devel libpng-devel libvorbis-devel desktop-file-utils"
-wrksrc="opensnc-src-${version}"
+depends="desktop-file-utils"
short_desc="Open-source game based on the Sonic the Hedgehog universe"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -27,10 +28,3 @@ do_install() {
vinstall ${FILESDIR}/opensonic.sh 755 usr/bin opensonic
vinstall ${FILESDIR}/opensonic.desktop 644 usr/share/applications
}
-
-opensonic_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/opensp/template b/srcpkgs/opensp/template
index e40d819ccd..e0f74b6893 100644
--- a/srcpkgs/opensp/template
+++ b/srcpkgs/opensp/template
@@ -6,6 +6,8 @@ wrksrc="OpenSP-${version}"
build_style=gnu-configure
configure_args="--enable-http --enable-default-catalog=/usr/share/sgml/catalog"
makedepends="xmlto docbook-xsl xmlcatmgr"
+depends="xmlcatmgr"
+sgml_entries="CATALOG /usr/share/OpenSP/catalog --"
short_desc="SGML parser, successor to sp"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://openjade.sourceforge.net/"
@@ -29,17 +31,9 @@ post_install() {
opensp-devel_package() {
depends="libstdc++-devel opensp>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
}
}
-
-opensp_package() {
- sgml_entries="CATALOG /usr/share/OpenSP/catalog --"
- depends="xmlcatmgr"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/openssh/files/sshdgenkeys.service b/srcpkgs/openssh/files/sshdgenkeys.service
index 10ebbe801a..0962d84485 100644
--- a/srcpkgs/openssh/files/sshdgenkeys.service
+++ b/srcpkgs/openssh/files/sshdgenkeys.service
@@ -1,11 +1,13 @@
[Unit]
Description=OpenSSH server Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_key
-ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_key
+ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index ad7bae140f..69fa1c298b 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,6 +1,8 @@
# Template file for 'openssh'
+_desc="The OpenSSH implementation of SSH protocol"
+
pkgname=openssh
-version=6.4p1
+version=6.5p1
revision=1
build_style=gnu-configure
configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
@@ -10,12 +12,14 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
--with-pid-dir=/run --with-pam LD=$CC"
hostmakedepends="perl"
makedepends="zlib-devel openssl-devel pam-devel mit-krb5-devel"
-short_desc="The OpenSSH implementation of SSH protocol"
+short_desc="${_desc} - client"
+replaces="openssh-client<6.1p1"
+conf_files="/etc/ssh/moduli /etc/ssh/ssh_config"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.openssh.org"
license="BSD"
distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
-checksum=5530f616513b14aea3662c4c373bafd6a97a269938674c006377e381f68975d2
+checksum=a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-kerberos5=$XBPS_CROSS_BASE"
@@ -45,7 +49,7 @@ openssh-server_package() {
conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
make_dirs="/var/chroot/ssh 0755 root root"
depends="openssh>=$version"
- short_desc+=" - server"
+ short_desc="${_desc} - server"
pkg_install() {
vmove usr/libexec/sftp-server
vmove etc/ssh/sshd_config
@@ -60,12 +64,3 @@ openssh-server_package() {
${PKGDESTDIR}/usr/lib/systemd/system
}
}
-
-openssh_package() {
- short_desc+=" - client"
- replaces="openssh-client<6.1p1"
- conf_files="/etc/ssh/moduli /etc/ssh/ssh_config"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/openssl/patches/openssl-1.0.1e-fix_pod_syntax-1.patch b/srcpkgs/openssl/patches/openssl-1.0.1f-perl-5.18.patch
similarity index 60%
rename from srcpkgs/openssl/patches/openssl-1.0.1e-fix_pod_syntax-1.patch
rename to srcpkgs/openssl/patches/openssl-1.0.1f-perl-5.18.patch
index fe95706cd4..d730770ab2 100644
--- a/srcpkgs/openssl/patches/openssl-1.0.1e-fix_pod_syntax-1.patch
+++ b/srcpkgs/openssl/patches/openssl-1.0.1f-perl-5.18.patch
@@ -1,12 +1,12 @@
-Submitted By: Martin Ward <macros_the_black at ntlworld dot com>
-Date: 2013-06-18
-Initial Package Version: 1.0.1e
-Upstream Status: Unknown
-Origin: self, based on fedora
-Description: Fixes install with perl-5.18.
+Forward-ported from openssl-1.0.1e-perl-5.18.patch
+Fixes install with perl-5.18.
---- doc/apps/cms.pod 2013-06-06 14:35:15.867871879 +0100
-+++ doc/apps/cms.pod 2013-06-06 14:35:25.791747119 +0100
+https://bugs.gentoo.org/show_bug.cgi?id=497286
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- doc/apps/cms.pod
++++ doc/apps/cms.pod
@@ -450,28 +450,28 @@
=over 4
@@ -42,8 +42,8 @@ Description: Fixes install with perl-5.18.
the message was verified correctly but an error occurred writing out
the signers certificates.
---- doc/apps/smime.pod 2013-06-06 14:35:15.867871879 +0100
-+++ doc/apps/smime.pod 2013-06-06 14:35:25.794747082 +0100
+--- doc/apps/smime.pod
++++ doc/apps/smime.pod
@@ -308,28 +308,28 @@
=over 4
@@ -79,36 +79,26 @@ Description: Fixes install with perl-5.18.
the message was verified correctly but an error occurred writing out
the signers certificates.
---- doc/crypto/X509_STORE_CTX_get_error.pod 2013-06-06 14:35:15.874871791 +0100
-+++ doc/crypto/X509_STORE_CTX_get_error.pod 2013-06-06 14:37:13.826388940 +0100
-@@ -278,6 +278,8 @@
- an application specific error. This will never be returned unless explicitly
- set by an application.
-
-+=back
-+
- =head1 NOTES
-
- The above functions should be used instead of directly referencing the fields
---- doc/ssl/SSL_accept.pod 2013-06-06 14:35:15.871871829 +0100
-+++ doc/ssl/SSL_accept.pod 2013-06-06 14:35:25.796747057 +0100
-@@ -44,12 +44,12 @@
+--- doc/ssl/SSL_accept.pod
++++ doc/ssl/SSL_accept.pod
+@@ -44,13 +44,13 @@
=over 4
--=item 1
-+=item C<1>
-
- The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
- established.
-
-=item 0
+=item C<0>
The TLS/SSL handshake was not successful but was shut down controlled and
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
---- doc/ssl/SSL_clear.pod 2013-06-06 14:35:15.871871829 +0100
-+++ doc/ssl/SSL_clear.pod 2013-06-06 14:35:25.803746969 +0100
+ return value B<ret> to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- doc/ssl/SSL_clear.pod
++++ doc/ssl/SSL_clear.pod
@@ -56,12 +56,12 @@
=over 4
@@ -124,8 +114,8 @@ Description: Fixes install with perl-5.18.
The SSL_clear() operation was successful.
---- doc/ssl/SSL_COMP_add_compression_method.pod 2013-06-06 14:35:15.870871842 +0100
-+++ doc/ssl/SSL_COMP_add_compression_method.pod 2013-06-06 14:35:25.806746931 +0100
+--- doc/ssl/SSL_COMP_add_compression_method.pod
++++ doc/ssl/SSL_COMP_add_compression_method.pod
@@ -53,11 +53,11 @@
=over 4
@@ -140,25 +130,26 @@ Description: Fixes install with perl-5.18.
The operation failed. Check the error queue to find out the reason.
---- doc/ssl/SSL_connect.pod 2013-06-06 14:35:15.869871854 +0100
-+++ doc/ssl/SSL_connect.pod 2013-06-06 14:35:25.808746906 +0100
-@@ -41,12 +41,12 @@
+--- doc/ssl/SSL_connect.pod
++++ doc/ssl/SSL_connect.pod
+@@ -41,13 +41,13 @@
=over 4
--=item 1
-+=item C<1>
-
- The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
- established.
-
-=item 0
+=item C<0>
The TLS/SSL handshake was not successful but was shut down controlled and
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
---- doc/ssl/SSL_CTX_add_session.pod 2013-06-06 14:35:15.871871829 +0100
-+++ doc/ssl/SSL_CTX_add_session.pod 2013-06-06 14:35:25.816746805 +0100
+ return value B<ret> to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- doc/ssl/SSL_CTX_add_session.pod
++++ doc/ssl/SSL_CTX_add_session.pod
@@ -52,13 +52,13 @@
=over 4
@@ -175,8 +166,8 @@ Description: Fixes install with perl-5.18.
The operation succeeded.
---- doc/ssl/SSL_CTX_load_verify_locations.pod 2013-06-06 14:35:15.870871842 +0100
-+++ doc/ssl/SSL_CTX_load_verify_locations.pod 2013-06-06 14:35:25.818746780 +0100
+--- doc/ssl/SSL_CTX_load_verify_locations.pod
++++ doc/ssl/SSL_CTX_load_verify_locations.pod
@@ -100,13 +100,13 @@
=over 4
@@ -193,24 +184,26 @@ Description: Fixes install with perl-5.18.
The operation succeeded.
---- doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-06-06 14:35:15.871871829 +0100
-+++ doc/ssl/SSL_CTX_set_client_CA_list.pod 2013-06-06 14:35:25.821746742 +0100
-@@ -66,11 +66,11 @@
+--- doc/ssl/SSL_CTX_set_client_CA_list.pod
++++ doc/ssl/SSL_CTX_set_client_CA_list.pod
+@@ -66,13 +66,13 @@
=over 4
--=item 1
-+=item C<1>
-
- The operation succeeded.
-
-=item 0
+=item C<0>
A failure while manipulating the STACK_OF(X509_NAME) object occurred or
the X509_NAME could not be extracted from B<cacert>. Check the error stack
---- doc/ssl/SSL_CTX_set_session_id_context.pod 2013-06-06 14:35:15.871871829 +0100
-+++ doc/ssl/SSL_CTX_set_session_id_context.pod 2013-06-06 14:35:25.828746654 +0100
+ to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The operation succeeded.
+
+--- doc/ssl/SSL_CTX_set_session_id_context.pod
++++ doc/ssl/SSL_CTX_set_session_id_context.pod
@@ -64,13 +64,13 @@
=over 4
@@ -227,8 +220,8 @@ Description: Fixes install with perl-5.18.
The operation succeeded.
---- doc/ssl/SSL_CTX_set_ssl_version.pod 2013-06-06 14:35:15.871871829 +0100
-+++ doc/ssl/SSL_CTX_set_ssl_version.pod 2013-06-06 14:35:25.831746617 +0100
+--- doc/ssl/SSL_CTX_set_ssl_version.pod
++++ doc/ssl/SSL_CTX_set_ssl_version.pod
@@ -42,11 +42,11 @@
=over 4
@@ -243,18 +236,9 @@ Description: Fixes install with perl-5.18.
The operation succeeded.
---- doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-06-06 14:35:15.870871842 +0100
-+++ doc/ssl/SSL_CTX_use_psk_identity_hint.pod 2013-06-06 14:36:42.456783309 +0100
-@@ -81,6 +81,8 @@
-
- Return values from the server callback are interpreted as follows:
-
-+=over
-+
- =item > 0
-
- PSK identity was found and the server callback has provided the PSK
-@@ -94,9 +96,11 @@
+--- doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -96,7 +96,7 @@
connection will fail with decryption_error before it will be finished
completely.
@@ -263,29 +247,26 @@ Description: Fixes install with perl-5.18.
PSK identity was not found. An "unknown_psk_identity" alert message
will be sent and the connection setup fails.
-
-+=back
-+
- =cut
---- doc/ssl/SSL_do_handshake.pod 2013-06-06 14:35:15.869871854 +0100
-+++ doc/ssl/SSL_do_handshake.pod 2013-06-06 14:35:25.839746516 +0100
-@@ -45,12 +45,12 @@
+--- doc/ssl/SSL_do_handshake.pod
++++ doc/ssl/SSL_do_handshake.pod
+@@ -45,13 +45,13 @@
=over 4
--=item 1
-+=item C<1>
-
- The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
- established.
-
-=item 0
+=item C<0>
The TLS/SSL handshake was not successful but was shut down controlled and
by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
---- doc/ssl/SSL_read.pod 2013-06-06 14:35:15.871871829 +0100
-+++ doc/ssl/SSL_read.pod 2013-06-06 14:35:25.847746415 +0100
+ return value B<ret> to find out the reason.
+
+-=item 1
++=item C<1>
+
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- doc/ssl/SSL_read.pod
++++ doc/ssl/SSL_read.pod
@@ -86,7 +86,7 @@
The read operation was successful; the return value is the number of
bytes actually read from the TLS/SSL connection.
@@ -295,8 +276,8 @@ Description: Fixes install with perl-5.18.
The read operation was not successful. The reason may either be a clean
shutdown due to a "close notify" alert sent by the peer (in which case
---- doc/ssl/SSL_session_reused.pod 2013-06-06 14:35:15.871871829 +0100
-+++ doc/ssl/SSL_session_reused.pod 2013-06-06 14:35:25.849746390 +0100
+--- doc/ssl/SSL_session_reused.pod
++++ doc/ssl/SSL_session_reused.pod
@@ -27,11 +27,11 @@
=over 4
@@ -311,8 +292,8 @@ Description: Fixes install with perl-5.18.
A session was reused.
---- doc/ssl/SSL_set_fd.pod 2013-06-06 14:35:15.869871854 +0100
-+++ doc/ssl/SSL_set_fd.pod 2013-06-06 14:35:25.852746353 +0100
+--- doc/ssl/SSL_set_fd.pod
++++ doc/ssl/SSL_set_fd.pod
@@ -35,11 +35,11 @@
=over 4
@@ -327,8 +308,8 @@ Description: Fixes install with perl-5.18.
The operation succeeded.
---- doc/ssl/SSL_set_session.pod 2013-06-06 14:35:15.870871842 +0100
-+++ doc/ssl/SSL_set_session.pod 2013-06-06 14:35:25.855746315 +0100
+--- doc/ssl/SSL_set_session.pod
++++ doc/ssl/SSL_set_session.pod
@@ -37,11 +37,11 @@
=over 4
@@ -343,25 +324,27 @@ Description: Fixes install with perl-5.18.
The operation succeeded.
---- doc/ssl/SSL_shutdown.pod 2013-06-06 14:35:15.870871842 +0100
-+++ doc/ssl/SSL_shutdown.pod 2013-06-06 14:35:25.857746290 +0100
-@@ -92,12 +92,12 @@
+--- doc/ssl/SSL_shutdown.pod
++++ doc/ssl/SSL_shutdown.pod
+@@ -92,14 +92,14 @@
=over 4
--=item 1
-+=item C<1>
-
- The shutdown was successfully completed. The "close notify" alert was sent
- and the peer's "close notify" alert was received.
-
-=item 0
+=item C<0>
The shutdown is not yet finished. Call SSL_shutdown() for a second time,
if a bidirectional shutdown shall be performed.
---- doc/ssl/SSL_write.pod 2013-06-06 14:35:15.870871842 +0100
-+++ doc/ssl/SSL_write.pod 2013-06-06 14:35:25.865746189 +0100
+ The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
+ erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
+
+-=item 1
++=item C<1>
+
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
+--- doc/ssl/SSL_write.pod
++++ doc/ssl/SSL_write.pod
@@ -79,7 +79,7 @@
The write operation was successful, the return value is the number of
bytes actually written to the TLS/SSL connection.
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 833ce2b629..844e55f08d 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,41 +1,39 @@
# Template file for 'openssl'
pkgname=openssl
_openssl_version=1.0.1
-version=${_openssl_version}e
-revision=5
-makedepends="zlib-devel"
+version=${_openssl_version}f
+revision=1
+bootstrap=yes
short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
homepage="http://www.openssl.org/"
distfiles="https://www.openssl.org/source/$pkgname-$version.tar.gz"
-checksum=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3
-
-bootstrap=yes
+checksum=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a
if [ "$CHROOT_READY" ]; then
hostmakedepends="perl"
fi
+depends="perl"
+makedepends="zlib-devel"
+
+conf_files="/etc/ssl/openssl.cnf"
+make_dirs="
+ /etc/ssl/certs 0755 root root
+ /etc/ssl/private 0750 root root"
+
+
do_configure() {
local _opts
- case "$XBPS_TARGET_ARCH" in
+ case "$XBPS_TARGET_MACHINE" in
arm*) _target="linux-armv4";;
+ i686*) _target="linux-elf";;
+ x86_64*) _target="linux-x86_64"; _opts="enable-ec_nistp_64_gcc_128";;
mips*) msg_error "$pkgver: unknow cross arch\n";;
esac
- if [ -z "${_target}" ]; then
- if [ "$XBPS_MACHINE" = "x86_64" ]; then
- _target="linux-x86_64"
- _opts="enable-ec_nistp_64_gcc_128"
- elif [ "$XBPS_MACHINE" = "i686" ]; then
- _target="linux-elf"
- elif [ "$XBPS_MACHINE" = "armv6l" ]; then
- _target="linux-armv4"
- fi
- fi
-
sed -i '/^"linux-armv4/s/-DTERMIO/-DTERMIOS/' Configure
sed -i '/^"linux-x86_64/s/-DTERMIO/-DTERMIOS/' Configure
sed -i '/^"linux-elf/s/-DTERMIO/-DTERMIOS/' Configure
@@ -70,7 +68,7 @@ do_install() {
}
openssl-devel_package() {
- depends="zlib-devel libssl>=$version"
+ depends="zlib-devel libssl>=${version}_${revision}"
short_desc="Secure Socket Layer and cryptographic library - development files"
pkg_install() {
vmove usr/include
@@ -81,17 +79,6 @@ openssl-devel_package() {
}
}
-openssl_package() {
- depends="perl"
- conf_files="/etc/ssl/openssl.cnf"
- make_dirs="
- /etc/ssl/certs 0755 root root
- /etc/ssl/private 0750 root root"
- pkg_install() {
- vmove all
- }
-}
-
libssl_package() {
short_desc="Secure Sockets Layer and Cryptographic library"
pkg_install() {
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index bf55eb59fe..78f5dea782 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -19,9 +19,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/include
}
-
-openvpn_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template
index 3fed34de07..2b2df7a904 100644
--- a/srcpkgs/oprofile/template
+++ b/srcpkgs/oprofile/template
@@ -5,7 +5,11 @@ revision=2
build_style=gnu-configure
configure_args="--with-x --enable-gui=qt4 --disable-static"
hostmakedepends="pkg-config"
-makedepends="popt-devel binutils-devel icu-devel qt-devel"
+makedepends="popt-devel binutils-devel icu-devel qt-devel shadow"
+depends="shadow"
+system_accounts="oprofile"
+oprofile_homedir="/var/lib/oprofile"
+make_dirs="/var/lib/oprofile 0750 oprofile oprofile"
short_desc="Transparent low-overhead system-wide profiler for Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -29,13 +33,3 @@ oprofile-qt4-gui_package() {
vmove usr/bin/oprof_start
}
}
-
-oprofile_package() {
- depends="shadow"
- system_accounts="oprofile"
- oprofile_homedir="/var/lib/oprofile"
- make_dirs="/var/lib/oprofile 0750 oprofile oprofile"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/optipng/template b/srcpkgs/optipng/template
index 536040b8da..f0d7043b56 100644
--- a/srcpkgs/optipng/template
+++ b/srcpkgs/optipng/template
@@ -22,9 +22,3 @@ do_build() {
do_install() {
make LD="$CC" DESTDIR=$DESTDIR install
}
-
-optipng_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/opus-tools/template b/srcpkgs/opus-tools/template
index f022e0a4a5..cd097de7f4 100644
--- a/srcpkgs/opus-tools/template
+++ b/srcpkgs/opus-tools/template
@@ -15,9 +15,3 @@ checksum=cc86dbc2a4d76da7e1ed9afee85448c8f798c465a5412233f178783220f3a2c1
post_install() {
vinstall COPYING 644 usr/share/licenses/opus
}
-
-opus-tools_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/opus/template b/srcpkgs/opus/template
index 5c0c7311b2..0ca7c01e23 100644
--- a/srcpkgs/opus/template
+++ b/srcpkgs/opus/template
@@ -26,9 +26,3 @@ opus-devel_package() {
vmove usr/share/aclocal
}
}
-
-opus_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 357824e5ca..88b984c352 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,17 +1,16 @@
# Template file for 'opusfile'
pkgname=opusfile
-version=0.2
-revision=2
+version=0.5
+revision=1
build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libogg-devel opus-devel openssl-devel"
short_desc="Library for opening, seeking, and decoding .opus files"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.opus-codec.org/"
license="BSD"
distfiles="http://downloads.xiph.org/releases/opus/${pkgname}-${version}.tar.gz"
-checksum=b4a678b3b6c4adfb6aff1f67ef658becfe146ea7c7ff228e99543762171557f9
-
-hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel openssl-devel"
+checksum=2ce52d006aeeec9f10260dbe3073c4636954a1ab19c82b8baafefe0180aa4a39
post_install() {
rm -rf ${DESTDIR}/usr/share
@@ -19,17 +18,12 @@ post_install() {
}
opusfile-devel_package() {
- depends="libogg-devel openssl-devel opus-devel ${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ depends="libogg-devel openssl-devel opus-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
- }
-}
-
-opusfile_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index c4ac7af571..ec777dd33e 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
hostmakedepends="pkg-config intltool flex"
makedepends="libical-devel libnotify-devel gtk+-devel dbus-glib-devel
popt-devel xfce4-panel-devel libxfce4util-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Simple calendar application for Xfce"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.xfce.org/projects/orage/"
license="GPL-2"
distfiles="http://archive.be.xfce.org/src/apps/orage/4.8/orage-$version.tar.bz2"
checksum=9a5805c8a70de0cae67ae1a6282463bbd059d6a4d080f93ffb13f92aaacdbf2e
-
-orage_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index c31a5fb4e9..a51728b4d6 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -35,9 +35,3 @@ orc-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-orc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template
index 7710b82bba..1e51d09538 100644
--- a/srcpkgs/os-prober/template
+++ b/srcpkgs/os-prober/template
@@ -2,6 +2,7 @@
pkgname=os-prober
version=1.63
revision=3
+make_dirs="/var/lib/os-prober 0755 root root"
short_desc="Utility to detect other OSes on a set of drives"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://packages.debian.org/sid/os-prober"
@@ -26,10 +27,3 @@ do_install() {
done
vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted
}
-
-os-prober_package() {
- make_dirs="/var/lib/os-prober 0755 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/oxygen-icons/template b/srcpkgs/oxygen-icons/template
index 2ef3a555ad..910a55ef98 100644
--- a/srcpkgs/oxygen-icons/template
+++ b/srcpkgs/oxygen-icons/template
@@ -2,6 +2,7 @@
pkgname=oxygen-icons
version=4.11.4
revision=1
+noarch="yes"
build_style=cmake
hostmakedepends="cmake automoc4"
short_desc="The Oxygen Icon Theme for KDE"
@@ -10,10 +11,3 @@ license="GPL-3"
homepage="http://www.${pkgname}.org"
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
checksum=f85bf4438ebd82c38b74c3c552001b41beab105afd0b97cb6b6a96ebbbb0bef0
-
-oxygen-icons_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index e6942ced36..515abfa0dd 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -1,31 +1,25 @@
# Template file for 'p11-kit'
pkgname=p11-kit
-version=0.20.1
+version=0.20.2
revision=1
build_style=gnu-configure
configure_args="--with-module-path=/usr/lib/pkcs11 --without-trust-paths"
+hostmakedepends="pkg-config"
+makedepends="libtasn1-devel libffi-devel"
+conf_files="/etc/pkcs11/pkcs11.conf"
short_desc="Provides a way to load and enumerate PKCS#11 modules"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
homepage="http://p11-glue.freedesktop.org"
distfiles="$homepage/releases/$pkgname-$version.tar.gz"
-checksum=524548f0a3bfa1b5712721165b49f0300fb244c907533677e88a9c9743eb4a53
-long_desc="
- Provides a standard configuration setup for installing PKCS#11 modules in
- such a way that they're discoverable.
-
- Also solves problems with coordinating the use of PKCS#11 by different
- components or libraries living in the same process."
-
-hostmakedepends="pkg-config"
-makedepends="libtasn1-devel libffi-devel"
+checksum=04ed51d92fc46c2b632e13d73e0293090e9f8aa29c8aa8c6bc95c12475e5ef7c
post_install() {
mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example ${DESTDIR}/etc/pkcs11/pkcs11.conf
}
p11-kit-devel_package() {
- depends="p11-kit>=${version}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -34,10 +28,3 @@ p11-kit-devel_package() {
vmove usr/share
}
}
-
-p11-kit_package() {
- conf_files="/etc/pkcs11/pkcs11.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/p7zip/template b/srcpkgs/p7zip/template
index f119dc76a8..163e683e19 100644
--- a/srcpkgs/p7zip/template
+++ b/srcpkgs/p7zip/template
@@ -32,9 +32,3 @@ do_install() {
sed "s|${DESTDIR}/usr|/usr|g" -i ${DESTDIR}/usr/bin/7z{,a,r}
}
-
-p7zip_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pam/patches/portability-fixes.patch b/srcpkgs/pam/patches/portability-fixes.patch
new file mode 100644
index 0000000000..2fde63c6c5
--- /dev/null
+++ b/srcpkgs/pam/patches/portability-fixes.patch
@@ -0,0 +1,106 @@
+--- modules/pam_group/pam_group.c.orig 2014-01-11 12:45:09.910924835 +0100
++++ modules/pam_group/pam_group.c 2014-01-11 12:46:31.598451777 +0100
+@@ -656,7 +656,11 @@ static int check_account(pam_handle_t *p
+ }
+ /* If buffer starts with @, we are using netgroups */
+ if (buffer[0] == '@')
++#ifdef HAVE_INNETGR
+ good &= innetgr (&buffer[1], NULL, user, NULL);
++#else
++ good = 0;
++#endif
+ /* otherwise, if the buffer starts with %, it's a UNIX group */
+ else if (buffer[0] == '%')
+ good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]);
+--- modules/pam_time/pam_time.c.orig 2014-01-11 12:47:00.534638461 +0100
++++ modules/pam_time/pam_time.c 2014-01-11 12:47:35.470863839 +0100
+@@ -555,7 +555,11 @@ check_account(pam_handle_t *pamh, const
+ }
+ /* If buffer starts with @, we are using netgroups */
+ if (buffer[0] == '@')
++#ifdef HAVE_INNETGR
+ good &= innetgr (&buffer[1], NULL, user, NULL);
++#else
++ good = 0;
++#endif
+ else
+ good &= logic_field(pamh, user, buffer, count, is_same);
+ D(("with user: %s", good ? "passes":"fails" ));
+--- modules/pam_succeed_if/pam_succeed_if.c.orig 2014-01-11 12:47:51.391966546 +0100
++++ modules/pam_succeed_if/pam_succeed_if.c 2014-01-11 12:48:31.519225435 +0100
+@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh,
+ static int
+ evaluate_innetgr(const char *host, const char *user, const char *group)
+ {
++#ifdef HAVE_INNETGR
+ if (innetgr(group, host, user, NULL) == 1)
+ return PAM_SUCCESS;
++#endif
+ return PAM_AUTH_ERR;
+ }
+ /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
+ static int
+ evaluate_notinnetgr(const char *host, const char *user, const char *group)
+ {
++#ifdef HAVE_INNETGR
+ if (innetgr(group, host, user, NULL) == 0)
+ return PAM_SUCCESS;
++#endif
+ return PAM_AUTH_ERR;
+ }
+
+--- modules/pam_lastlog/pam_lastlog.c.orig 2014-01-11 12:56:15.735248391 +0100
++++ modules/pam_lastlog/pam_lastlog.c 2014-01-11 12:57:33.142756424 +0100
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#include <paths.h>
+
+ #if defined(hpux) || defined(sunos) || defined(solaris)
+ # ifndef _PATH_LASTLOG
+@@ -403,7 +404,9 @@ last_login_write(pam_handle_t *pamh, int
+
+ if (announce & LASTLOG_WTMP) {
+ /* write wtmp entry for user */
++#ifdef HAVE_LOGWTMP
+ logwtmp(last_login.ll_line, user, remote_host);
++#endif
+ }
+
+ /* cleanup */
+@@ -713,7 +716,9 @@ pam_sm_close_session (pam_handle_t *pamh
+ terminal_line = get_tty(pamh);
+
+ /* Wipe out utmp logout entry */
++#ifdef HAVE_LOGWTMP
+ logwtmp(terminal_line, "", "");
++#endif
+
+ return PAM_SUCCESS;
+ }
+--- modules/pam_rhosts/pam_rhosts.c.orig 2014-01-11 12:58:40.263196779 +0100
++++ modules/pam_rhosts/pam_rhosts.c 2014-01-11 12:59:25.182491398 +0100
+@@ -113,8 +113,10 @@ int pam_sm_authenticate (pam_handle_t *p
+
+ #ifdef HAVE_RUSEROK_AF
+ retval = ruserok_af (rhost, as_root, ruser, luser, PF_UNSPEC);
+-#else
++#elif HAVE_RUSEROK
+ retval = ruserok (rhost, as_root, ruser, luser);
++#else
++ retval = 1;
+ #endif
+ if (retval != 0) {
+ if (!opt_silent || opt_debug)
+--- configure.in.orig 2014-01-11 13:09:06.207296880 +0100
++++ configure.in 2014-01-11 13:14:56.237585380 +0100
+@@ -404,7 +404,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" =
+ [crypt_libs="crypt"])
+
+ BACKUP_LIBS=$LIBS
+-AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
++AC_SEARCH_LIBS([crypt],[$crypt_libs], [test -n "$ac_lib" && LIBCRYPT="-l$ac_lib"], LIBCRYPT="")
+ AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
+ LIBS=$BACKUP_LIBS
+ AC_SUBST(LIBCRYPT)
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index ea898298bd..d50aba4df8 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,12 +1,24 @@
# Template file for 'pam'
pkgname=pam
version=1.1.8
-revision=1
+revision=2
wrksrc="Linux-PAM-$version"
build_style=gnu-configure
configure_args="--libdir=/usr/lib --sbindir=/usr/sbin --docdir=/usr/share/doc/pam --disable-nis"
-hostmakedepends="flex"
+hostmakedepends="automake gettext-devel flex libtool pkg-config"
makedepends="libfl-devel cracklib-devel db-devel>=5.3"
+depends="cracklib"
+conf_files="
+ /etc/environment
+ /etc/security/access.conf
+ /etc/security/group.conf
+ /etc/security/limits.conf
+ /etc/security/namespace.conf
+ /etc/security/pam_env.conf
+ /etc/security/time.conf"
+makedirs="
+ /etc/security/limits.d 0755 root root
+ /etc/security/namespace.d 0755 root root"
short_desc="A flexible mechanism for authenticating users"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org/pub/linux/libs/pam/"
@@ -14,12 +26,9 @@ license="GPL-2"
distfiles="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${version}.tar.bz2"
checksum=c4b1f23a236d169e2496fea20721578d864ba00f7242d2b41d81050ac87a1e55
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" automake gettext-devel pkg-config libtool"
- pre_configure() {
- autoreconf -fi
- }
-fi
+pre_configure() {
+ autoreconf -fi
+}
post_install() {
# Fix unix_chkpwd perms.
@@ -59,21 +68,3 @@ pam-userdb_package() {
vmove usr/share/man/man8/pam_userdb.8
}
}
-
-pam_package() {
- conf_files="
- /etc/environment
- /etc/security/access.conf
- /etc/security/group.conf
- /etc/security/limits.conf
- /etc/security/namespace.conf
- /etc/security/pam_env.conf
- /etc/security/time.conf"
- makedirs="
- /etc/security/limits.d 0755 root root
- /etc/security/namespace.d 0755 root root"
- depends="cracklib"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index dc7e371ddf..26c1f2b4fc 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -7,6 +7,8 @@ configure_args="--with-included-modules=basic-fc"
hostmakedepends="pkg-config glib-devel"
# XXX Add missing dependency libthai.
makedepends="libglib-devel>=2.38 cairo-devel libXft-devel harfbuzz-devel>=0.9.9"
+depends="libharfbuzz>=0.9.9 fontconfig>=2.10.91"
+triggers="pango-modules"
short_desc="Library for layout and rendering of text"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.pango.org/"
@@ -50,11 +52,3 @@ pango-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-pango_package() {
- depends="libharfbuzz>=0.9.9 fontconfig>=2.10.91"
- triggers="pango-modules"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pangomm/template b/srcpkgs/pangomm/template
index 7bfb2dd524..d38306162f 100644
--- a/srcpkgs/pangomm/template
+++ b/srcpkgs/pangomm/template
@@ -20,16 +20,10 @@ long_desc="
pangomm-devel_package() {
depends="glibmm-devel cairomm-devel pango-devel pangomm>=${version}"
- short_desc="C++ bindings for the pango library -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/pango*"
}
}
-
-pangomm_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pangox-compat/template b/srcpkgs/pangox-compat/template
index c66e1f2cdf..b7956a55a4 100644
--- a/srcpkgs/pangox-compat/template
+++ b/srcpkgs/pangox-compat/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="pango-devel"
+replaces="pango<1.32"
short_desc="Library for layout and rendering of text (pangox compat library)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.pango.org/"
@@ -25,10 +26,3 @@ pangox-compat-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-pangox-compat_package() {
- replaces="pango<1.32"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/papyon/template b/srcpkgs/papyon/template
index 35c9fd4f47..1cfcd825b5 100644
--- a/srcpkgs/papyon/template
+++ b/srcpkgs/papyon/template
@@ -2,8 +2,11 @@
pkgname=papyon
version=0.5.6
revision=2
+noarch="yes"
build_style=python-module
makedepends="farstream-devel gst-python-devel pygobject pyopenssl pycrypto"
+depends="gst-python farstream pygobject pyopenssl pycrypto"
+pycompile_module="papyon tests"
short_desc="MSN library purely written in Python"
homepage="http://www.freedesktop.org/wiki/Software/papyon"
license="GPL-2"
@@ -27,12 +30,3 @@ long_desc="
used to support deltas in the AddressBook later)
- Very solid and extensible architecture
- Solid networking through a new sublibrary : gnet"
-
-papyon_package() {
- noarch="yes"
- pycompile_module="papyon tests"
- depends="gst-python farstream pygobject pyopenssl pycrypto"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/par2cmdline/template b/srcpkgs/par2cmdline/template
new file mode 100644
index 0000000000..70a79adf63
--- /dev/null
+++ b/srcpkgs/par2cmdline/template
@@ -0,0 +1,18 @@
+# Template file for 'par2cmdline'
+pkgname=par2cmdline
+version=0.6.4
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake"
+short_desc="PAR 2.0 compatible file verification and repair tool"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="https://github.com/BlackIkeEagle/par2cmdline"
+
+do_fetch() {
+ git clone -b v${version} git://github.com/BlackIkeEagle/par2cmdline ${pkgname}-${version}
+}
+
+pre_configure() {
+ autoreconf -fi
+}
diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 0ed30e018a..7ebfc93af3 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -2,19 +2,13 @@
pkgname=parallel
version=20130522
revision=2
+noarch="yes"
build_style=gnu-configure
hostmakedepends="perl"
+depends="perl"
short_desc="A shell tool for executing jobs in parallel"
maintainer="graysky <graysky AT archlinux DOT us>"
license="GPL-3"
homepage="http://www.gnu.org/software/parallel"
distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.bz2"
checksum=e9ea6fa2644e8504a85a518edb246783f2ccace58f21d101712b28bf781d7d2b
-
-parallel_package() {
- noarch="yes"
- depends="perl"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template
index 425cd34bfd..94d523a756 100644
--- a/srcpkgs/parted/template
+++ b/srcpkgs/parted/template
@@ -18,7 +18,7 @@ long_desc="
operating systems, reorganising disk usage, and copying data to new hard disks."
libparted_package() {
- short_desc="${short_desc} - shared library"
+ short_desc+=" - shared library"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -26,16 +26,10 @@ libparted_package() {
libparted-devel_package() {
depends="libparted-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-parted_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/patch/template b/srcpkgs/patch/template
index 16168f5edf..084d83e720 100644
--- a/srcpkgs/patch/template
+++ b/srcpkgs/patch/template
@@ -4,18 +4,12 @@ version=2.7.1
revision=3
build_style=gnu-configure
makedepends="attr-devel ed"
+# Required by patch -e functionality.
+depends="ed"
+conflicts="chroot-patch>=0"
short_desc="Patch files using diff output"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/patch/patch.html"
license="GPL-3"
distfiles="http://ftp.gnu.org/gnu/patch/patch-$version.tar.bz2"
checksum=aae676de9e95051f425af4507fcc9a019941a2a1f78405e7dbd40bccf786aa11
-
-patch_package() {
- # Required by patch -e functionality.
- depends="ed"
- conflicts="chroot-patch>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/patchage/template b/srcpkgs/patchage/template
index afe33cac85..2e85e07bad 100644
--- a/srcpkgs/patchage/template
+++ b/srcpkgs/patchage/template
@@ -8,6 +8,7 @@ makedepends="pkg-config python dbus-devel dbus-glib-devel gtkmm2-devel
libgnomecanvasmm-devel libglade-devel libglademm-devel flowcanvas-devel
alsa-lib-devel jack-devel raul-devel boost-devel
graphviz jack hicolor-icon-theme"
+depends="graphviz jack hicolor-icon-theme"
short_desc="Modular patch bay for audio and MIDI based on JACK and ALSA."
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -15,12 +16,4 @@ homepage="http://drobilla.net/software/patchage/"
distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2"
checksum=9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2
long_desc="
- Patchage is a modular patch bay for audio and MIDI systems based on JACK and
- ALSA."
-
-patchage_package() {
- depends="graphviz jack hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
+ Patchage is a modular patch bay for audio and MIDI systems based on JACK and ALSA."
diff --git a/srcpkgs/patchelf/template b/srcpkgs/patchelf/template
index 6163af9256..f813e03daa 100644
--- a/srcpkgs/patchelf/template
+++ b/srcpkgs/patchelf/template
@@ -16,9 +16,3 @@ long_desc="
* Change the dynamic loader (ELF interpreter) of executables
* Change the RPATH of executables and libraries
* Shrink the RPATH of executables and libraries"
-
-patchelf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template
index e728fe0335..cfef5cd007 100644
--- a/srcpkgs/pavucontrol/template
+++ b/srcpkgs/pavucontrol/template
@@ -16,9 +16,3 @@ long_desc="
tool (mixer) for the PulseAudio sound server. In contrast to classic mixer
tools this one allows you to control both the volume of hardware devices and
of each playback stream separately."
-
-pavucontrol_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pbzip2/template b/srcpkgs/pbzip2/template
index 23e77b03d0..63fdf7e83b 100644
--- a/srcpkgs/pbzip2/template
+++ b/srcpkgs/pbzip2/template
@@ -23,9 +23,3 @@ post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-pbzip2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pcc-libs/template b/srcpkgs/pcc-libs/template
index 99c7dd13f4..60c5604032 100644
--- a/srcpkgs/pcc-libs/template
+++ b/srcpkgs/pcc-libs/template
@@ -26,9 +26,3 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
}
-
-pcc-libs_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pcc/template b/srcpkgs/pcc/template
index c9e04758ea..5e988dd5e2 100644
--- a/srcpkgs/pcc/template
+++ b/srcpkgs/pcc/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
configure_args="--enable-tls"
makedepends="flex pcc-libs"
+depends="pcc-libs"
short_desc="Portable C Compiler"
homepage="http://pcc.ludd.ltu.se/"
license="Custom (BSD-like)"
@@ -23,10 +24,3 @@ post_install() {
mv ${DESTDIR}/usr/share/man/man1/cpp.1 \
${DESTDIR}/usr/share/man/man1/pcc-cpp.1
}
-
-pcc_package() {
- depends="pcc-libs"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pciutils/template b/srcpkgs/pciutils/template
index 176b4a277b..ef9f3b0efd 100644
--- a/srcpkgs/pciutils/template
+++ b/srcpkgs/pciutils/template
@@ -1,18 +1,16 @@
# Template file for 'pciutils'
pkgname=pciutils
-version=3.2.0
-revision=3
+version=3.2.1
+revision=1
hostmakedepends="pkg-config which"
makedepends="hwids zlib-devel libkmod-devel"
+depends="hwids"
short_desc="PCI bus related utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://mj.ucw.cz/pciutils.html"
distfiles="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${version}.tar.gz"
-checksum=84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71
-long_desc="
- The $pkgname package contains various utilities for inspecting and
- setting devices connected to the PCI bus."
+checksum=b31131b721fa26378b4af61b1c49986ff40fe590bc210545b210b6b774337858
do_build() {
make OPT="${CFLAGS} -fPIC -DPIC" SHARED=no AR=${AR} \
@@ -41,19 +39,13 @@ do_install() {
}
pciutils-devel_package() {
- depends="pciutils>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
vmove usr/share/man/man7
}
}
-
-pciutils_package() {
- depends="hwids"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pcmanfm/template b/srcpkgs/pcmanfm/template
index 86d2dd3061..dff1bbde85 100644
--- a/srcpkgs/pcmanfm/template
+++ b/srcpkgs/pcmanfm/template
@@ -1,27 +1,21 @@
# Template file for 'pcmanfm'
pkgname=pcmanfm
-version=1.1.0
-revision=2
+version=1.1.2
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
-makedepends="gtk+-devel libfm-devel>=1.1.0"
+makedepends="gtk+-devel libfm-devel>=1.1.0 desktop-file-utils"
+depends="libfm>=1.1.0 desktop-file-utils"
+conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf"
short_desc="LXDE file manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pcmanfm.sourceforge.net/"
license="GPL-2"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=1f6301f330ad648f3322708ec6c0f680a8695a9453932fe19653bab6731e5582
+checksum=23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950
post_install() {
vmkdir usr/share/lxde/pcmanfm
ln -sf /etc/xdg/pcmanfm/default/pcmanfm.conf \
${DESTDIR}/usr/share/lxde/pcmanfm/pcmanfm.conf
}
-
-pcmanfm_package() {
- conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf"
- depends="libfm>=1.1.0 desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template
index d42c9ea0b9..eb4f720732 100644
--- a/srcpkgs/pcre/template
+++ b/srcpkgs/pcre/template
@@ -1,12 +1,11 @@
# Template file for 'pcre'
pkgname=pcre
version=8.34
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-utf8 --enable-unicode-properties --with-pic
--enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-newline-is-anycrlf
--enable-pcretest-libreadline --enable-jit --enable-static"
-hostmakedepends="libtool automake"
makedepends="zlib-devel bzip2-devel readline-devel"
short_desc="Perl Compatible Regular Expressions"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,9 +15,12 @@ license="BSD"
distfiles="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"
checksum=b6043ae1ff2720be665ffa28dc22b7c637cdde96f389a116c0c3020caeae583f
-pre_configure() {
- autoreconf -fi
-}
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends="automake libtool"
+ pre_configure() {
+ autoreconf -fi
+ }
+fi
libpcrecpp_package() {
short_desc+=" - C++ shared libraries"
@@ -38,7 +40,7 @@ libpcre_package() {
pcre-devel_package() {
depends="zlib-devel bzip2-devel libpcre>=${version}_${revision} libpcrecpp>=${version}_${revision}"
- short_desci+=" - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/bin/pcre-config
vmove usr/include
@@ -50,9 +52,3 @@ pcre-devel_package() {
vmove usr/share/doc
}
}
-
-pcre_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pcsxr/template b/srcpkgs/pcsxr/template
index 0b05b343a6..f09fafac16 100644
--- a/srcpkgs/pcsxr/template
+++ b/srcpkgs/pcsxr/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
configure_args="--enable-libcdio --enable-opengl"
hostmakedepends="pkg-config automake libtool intltool gettext-devel nasm"
makedepends="libXv-devel libcdio-devel SDL-devel gtk+3-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A Sony PlayStation (PSX) emulator based on the PCSX-df project"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL"
@@ -18,10 +19,3 @@ pre_configure() {
autoreconf -fi
intltoolize -f
}
-
-pcsxr_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template
index a758b9580e..cba21c29ff 100644
--- a/srcpkgs/pekwm/template
+++ b/srcpkgs/pekwm/template
@@ -1,8 +1,14 @@
# Template build file for 'pekwm'.
pkgname=pekwm
version=0.1.17
-revision=1
+revision=2
build_style=gnu-configure
+configure_args="--with-pkg-exec-prefix=/usr
+ ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
+ ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
+ ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
+ ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes
+ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
short_desc="Window manager based on aewm++"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -12,23 +18,17 @@ checksum=8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00
hostmakedepends="pkg-config"
makedepends="libjpeg-turbo-devel libpng-devel>=1.6 libXinerama-devel
- libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
-
-pekwm_package() {
- conf_files="
- /etc/pekwm/vars
- /etc/pekwm/mouse
- /etc/pekwm/menu
- /etc/pekwm/start
- /etc/pekwm/keys
- /etc/pekwm/autoproperties_typerules
- /etc/pekwm/config
- /etc/pekwm/autoproperties
- /etc/pekwm/mouse_system
- /etc/pekwm/mouse_sloppy
- /etc/pekwm/mouse_click
- /etc/pekwm/config_system"
- pkg_install() {
- vmove all
- }
-}
+ libSM-devel libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
+conf_files="
+ /etc/pekwm/vars
+ /etc/pekwm/mouse
+ /etc/pekwm/menu
+ /etc/pekwm/start
+ /etc/pekwm/keys
+ /etc/pekwm/autoproperties_typerules
+ /etc/pekwm/config
+ /etc/pekwm/autoproperties
+ /etc/pekwm/mouse_system
+ /etc/pekwm/mouse_sloppy
+ /etc/pekwm/mouse_click
+ /etc/pekwm/config_system"
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 1acb50be64..f568e309f6 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -9,18 +9,11 @@ hostmakedepends="python-distribute"
makedepends="python-devel python-feedgenerator python-jinja
python-Pygments python-docutils python-blinker python-Unidecode
python-Markdown"
+depends="${makedepends}"
+pycompile_module="pelican"
short_desc="Static site generator, written in Python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/getpelican/pelican"
license="AGPL-3"
distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
checksum=d7e2f83a0168ab9b3fd7c7380abbe58f0a95088221e1ecc0a610d72902d39cd8
-
-pelican_package() {
- noarch="yes"
- pycompile_module="pelican"
- depends="${makedepends}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 05c791f0ec..c443fb3916 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -16,9 +16,3 @@ long_desc="
outside and automatically detects servers that are down and distributes
clients among the available servers. This gives high availability and
scalable performance."
-
-pen_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Archive-Zip/template b/srcpkgs/perl-Archive-Zip/template
index 6454e765a8..0cee6f616b 100644
--- a/srcpkgs/perl-Archive-Zip/template
+++ b/srcpkgs/perl-Archive-Zip/template
@@ -5,17 +5,11 @@ revision=2
wrksrc="Archive-Zip-${version}"
build_style=perl-module
makedepends="perl>=5.18"
+noarch="yes"
+depends="${makedepends}"
short_desc="Provide a perl interface to ZIP archive files"
maintainer="pancake <pancake@nopcode.org>"
license="GPL, PerlArtistic"
homepage="http://search.cpan.org/dist/Archive-Zip/"
distfiles="http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-${version}.tar.gz"
checksum=f8b472ff77b7238e423bcb351968accc562f9d20700fbf2d8ed2a65fa0fa6318
-
-perl-Archive-Zip_package() {
- noarch="yes"
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Crypt-Blowfish/template b/srcpkgs/perl-Crypt-Blowfish/template
index 53cfb2bf34..9ba5fdc7ae 100644
--- a/srcpkgs/perl-Crypt-Blowfish/template
+++ b/srcpkgs/perl-Crypt-Blowfish/template
@@ -6,16 +6,10 @@ wrksrc="Crypt-Blowfish-${version}"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
short_desc="Crypt::Blowfish - Blowfish cryptography algorithm interface"
maintainer="Juan RP <xtraeme@gmail.com"
homepage="http://search.cpan.org/dist/Crypt-Blowfish"
license="GPL-2"
distfiles="${CPAN_SITE}/Crypt/Crypt-Blowfish-${version}.tar.gz"
checksum=46b3431ffb6bf5b9cb359f79565d48407e652ad2b04fdf5ca62a69e7197a67b1
-
-perl-Crypt-Blowfish_package() {
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Crypt-DH/template b/srcpkgs/perl-Crypt-DH/template
index f21b2a21c3..961564a9e8 100644
--- a/srcpkgs/perl-Crypt-DH/template
+++ b/srcpkgs/perl-Crypt-DH/template
@@ -6,6 +6,8 @@ revision=2
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl>=5.18 perl-Math-BigInt-GMP"
+depends="${makedepends}"
+noarch="yes"
short_desc="Crypt::DH - Diffie-Hellman key exchange system"
maintainer="Juan RP <xtraeme@gmail.com"
homepage="http://search.cpan.org/dist/Crypt-DH"
@@ -18,11 +20,3 @@ long_desc="
a shared secret key, known only to them. The secret is negotiated over
an insecure network without the two parties ever passing the actual
shared secret, or their private keys, between them."
-
-perl-Crypt-DH_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 14d1fa3c91..07120409b0 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -6,6 +6,7 @@ revision=2
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl>=5.18 openssl-devel"
+depends="${hostmakedepends}"
short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum"
@@ -19,10 +20,3 @@ long_desc="
OpenSSL provides are exposed to perl. In addition, this module can be
used to provide access to bignum values produced by other OpenSSL
modules, such as key parameters from Crypt::OpenSSL::RSA."
-
-perl-Crypt-OpenSSL-Bignum_package() {
- depends="${hostmakedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-DBD-SQLite/template b/srcpkgs/perl-DBD-SQLite/template
index 12d7fee7bf..753a70f8dc 100644
--- a/srcpkgs/perl-DBD-SQLite/template
+++ b/srcpkgs/perl-DBD-SQLite/template
@@ -6,16 +6,10 @@ wrksrc="DBD-SQLite-${version}"
build_style=perl-module
hostmakedepends="perl>=5.8"
makedepends="perl>=5.8 perl-DBI"
+depends="${makedepends}"
short_desc="DBD::SQLite - Self-contained RDBMS in a DBI driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://search.cpan.org/dist/DBD-SQLite"
license="GPL-2"
distfiles="${CPAN_SITE}/DBD/DBD-SQLite-$version.tar.gz"
checksum=21fb65e740b6265512c82232b4ad8f75c19ac84c216830112656274eb8e375fb
-
-perl-DBD-SQLite_package() {
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-DBI/template b/srcpkgs/perl-DBI/template
index 8f98cd0880..ebf4aa6014 100644
--- a/srcpkgs/perl-DBI/template
+++ b/srcpkgs/perl-DBI/template
@@ -6,16 +6,10 @@ wrksrc="DBI-${version}"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
short_desc="Database independent interface for Perl"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://search.cpan.org/dist/DBI"
license="GPL-2"
distfiles="${CPAN_SITE}/DBI/DBI-$version.tar.gz"
checksum=46c834f4ba1b28c8d8a2db8095835a67fc69a9585761523aea3a74437a969b52
-
-perl-DBI_package() {
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Encode-Locale/template b/srcpkgs/perl-Encode-Locale/template
index 6ebc3fdcfb..3e623096d9 100644
--- a/srcpkgs/perl-Encode-Locale/template
+++ b/srcpkgs/perl-Encode-Locale/template
@@ -6,6 +6,8 @@ wrksrc="Encode-Locale-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="Encode::Locale - Determine the locale encoding"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/Encode-Locale"
@@ -25,11 +27,3 @@ long_desc="
encoding under the name locale. It means bytes obtained from the environment
can be converted to Unicode strings by calling Encode::encode(locale =>
$bytes) and converted back again with Encode::decode(locale => $string)."
-
-perl-Encode-Locale_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-ExtUtils-Depends/template b/srcpkgs/perl-ExtUtils-Depends/template
index 5866e3410e..569d3bd064 100644
--- a/srcpkgs/perl-ExtUtils-Depends/template
+++ b/srcpkgs/perl-ExtUtils-Depends/template
@@ -6,6 +6,8 @@ wrksrc="ExtUtils-Depends-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="Easily build XS extensions that depend on XS extensions"
homepage="http://gtk2-perl.sourceforge.net/"
license="GPL-2"
@@ -17,11 +19,3 @@ long_desc="
functions and typemaps provided by other perl extensions. This means
that a perl extension is treated like a shared library that provides
also a C and an XS interface besides the perl one."
-
-perl-ExtUtils-Depends_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-ExtUtils-PkgConfig/template b/srcpkgs/perl-ExtUtils-PkgConfig/template
index e302bb91e5..a880b5b5b2 100644
--- a/srcpkgs/perl-ExtUtils-PkgConfig/template
+++ b/srcpkgs/perl-ExtUtils-PkgConfig/template
@@ -6,6 +6,8 @@ wrksrc="ExtUtils-PkgConfig-$version"
build_style=perl-module
hostmakedepends="perl>=5.18 pkg-config"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="Simplistic perl interface to pkg-config"
homepage="http://search.cpan.org/~xaoc/"
license="LGPL-2.1"
@@ -20,11 +22,3 @@ long_desc="
intended for use in the Makefile.PL of perl extensions which bind
libraries that pkg-config knows. It is really just boilerplate code
that you would've written yourself."
-
-perl-ExtUtils-PkgConfig_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-File-Listing/template b/srcpkgs/perl-File-Listing/template
index 620b187104..4c40d0aa68 100644
--- a/srcpkgs/perl-File-Listing/template
+++ b/srcpkgs/perl-File-Listing/template
@@ -6,6 +6,8 @@ wrksrc="File-Listing-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends} perl-HTTP-Date"
+depends="${makedepends}"
+noarch="yes"
short_desc="File::Listing - parse directory listing"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/File-Listing"
@@ -15,11 +17,3 @@ checksum=1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5
long_desc="
This module exports a single function called parse_dir(), which can be used
to parse directory listings."
-
-perl-File-Listing_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Fuse/template b/srcpkgs/perl-Fuse/template
index b7a805d062..333abcf073 100644
--- a/srcpkgs/perl-Fuse/template
+++ b/srcpkgs/perl-Fuse/template
@@ -6,6 +6,7 @@ wrksrc="Fuse-$version"
build_style=perl-module
hostmakedepends="pkg-config perl>=5.18"
makedepends="fuse-devel perl>=5.18"
+depends="perl>=5.18"
short_desc="Write filesystems in Perl using FUSE"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://search.cpan.org/~dpavlin/Fuse-0.13/Fuse.pm"
@@ -15,10 +16,3 @@ checksum=30a939fe5816b00ba9cabb6cd811f894e6a74361ce29d786ae1811b0021d7aa1
long_desc="
This lets you implement filesystems in perl, through the FUSE
(Filesystem in USErspace) kernel/lib interface."
-
-perl-Fuse_package() {
- depends="perl>=5.18"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Glib/template b/srcpkgs/perl-Glib/template
index a26fc27fc4..11b0d7787d 100644
--- a/srcpkgs/perl-Glib/template
+++ b/srcpkgs/perl-Glib/template
@@ -6,6 +6,7 @@ wrksrc="Glib-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl-ExtUtils-Depends>=0.300 perl-ExtUtils-PkgConfig>=1.00 glib-devel"
+depends="${hostmakedepends}"
short_desc="Perl bindings for Glib 2"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://gtk2-perl.sourceforge.net/"
@@ -19,10 +20,3 @@ long_desc="
these libraries are used as the foundation for many of the libraries
that make up the Gnome environment, and are used in many unrelated
projects."
-
-perl-Glib_package() {
- depends="${hostmakedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-HTML-Form/template b/srcpkgs/perl-HTML-Form/template
index a13912aff5..f175437c99 100644
--- a/srcpkgs/perl-HTML-Form/template
+++ b/srcpkgs/perl-HTML-Form/template
@@ -6,6 +6,8 @@ wrksrc="HTML-Form-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl-HTML-Parser perl-URI perl-HTTP-Message"
+depends="${makedepends}"
+noarch="yes"
short_desc="HTML::Form - Class that represents an HTML form element"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/~gaas/HTML-Form/lib/HTML/Form.pm"
@@ -18,11 +20,3 @@ long_desc="
can take on various values. The state of a form can be tweaked and it can
then be asked to provide HTTP::Request objects that can be passed to the
request() method of LWP::UserAgent."
-
-perl-HTML-Form_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-HTML-Parser/template b/srcpkgs/perl-HTML-Parser/template
index b6b33b5ea5..41acc60914 100644
--- a/srcpkgs/perl-HTML-Parser/template
+++ b/srcpkgs/perl-HTML-Parser/template
@@ -6,6 +6,7 @@ wrksrc="HTML-Parser-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl-HTML-Tagset"
+depends="${makedepends}"
short_desc="HTML::Parser - HTML parser class"
homepage="http://search.cpan.org/~gaas/HTML-Parser-3.68/Parser.pm"
license="GPL-1+/Artistic"
@@ -15,10 +16,3 @@ checksum=a9a18c79b1d2b315daedafe7598dc1068d562eaeaa5bd46265a6ebd2805446c1
long_desc="
The HTML-Parser distribution is is a collection of modules that parse and
extract information from HTML documents."
-
-perl-HTML-Parser_package() {
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-HTML-Tagset/template b/srcpkgs/perl-HTML-Tagset/template
index dfcb71830a..a13042bc0e 100644
--- a/srcpkgs/perl-HTML-Tagset/template
+++ b/srcpkgs/perl-HTML-Tagset/template
@@ -6,6 +6,8 @@ wrksrc="HTML-Tagset-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="HTML::Tagset - data tables useful in parsing HTML"
homepage="http://search.cpan.org/~petdance/HTML-Tagset-3.20/Tagset.pm"
license="GPL-1+/Artistic"
@@ -15,11 +17,3 @@ checksum=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2
long_desc="
This module contains several data tables useful in various kinds of HTML
parsing operations."
-
-perl-HTML-Tagset_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-HTTP-Cookies/template b/srcpkgs/perl-HTTP-Cookies/template
index 3f87623652..d2ad843890 100644
--- a/srcpkgs/perl-HTTP-Cookies/template
+++ b/srcpkgs/perl-HTTP-Cookies/template
@@ -6,6 +6,8 @@ wrksrc="HTTP-Cookies-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl-HTTP-Message"
+depends="${makedepends}"
+noarch="yes"
short_desc="HTTP::Cookies - HTTP cookie jars"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/HTTP-Cookies"
@@ -27,11 +29,3 @@ long_desc="
Set-Cookie2: and Set-Cookie: headers and are able to use this information to
initialize Cookie-headers in HTTP::Request objects. The state of a
HTTP::Cookies object can be saved in and restored from files."
-
-perl-HTTP-Cookies_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-HTTP-Daemon/template b/srcpkgs/perl-HTTP-Daemon/template
index ca3e89cedf..466adfdda0 100644
--- a/srcpkgs/perl-HTTP-Daemon/template
+++ b/srcpkgs/perl-HTTP-Daemon/template
@@ -6,6 +6,8 @@ wrksrc="HTTP-Daemon-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl-HTTP-Message perl-LWP-MediaTypes"
+depends="${makedepends}"
+noarch="yes"
short_desc="HTTP::Daemon - a simple http server class"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/HTTP-Message"
@@ -16,11 +18,3 @@ long_desc="
Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen on a
socket for incoming requests. The HTTP::Daemon is a subclass of
IO::Socket::INET, so you can perform socket operations directly on it too."
-
-perl-HTTP-Daemon_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-HTTP-Date/template b/srcpkgs/perl-HTTP-Date/template
index 48d71312a6..ea5398896d 100644
--- a/srcpkgs/perl-HTTP-Date/template
+++ b/srcpkgs/perl-HTTP-Date/template
@@ -6,6 +6,8 @@ wrksrc="HTTP-Date-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="HTTP::Date - date conversion routines"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/HTTP-Date"
@@ -16,11 +18,3 @@ long_desc="
This module provides functions that deal the date formats used by the HTTP
protocol (and then some more). Only the first two functions, time2str() and
str2time(), are exported by default."
-
-perl-HTTP-Date_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-HTTP-Message/template b/srcpkgs/perl-HTTP-Message/template
index 6f6349b7f2..fa7a6ec1d9 100644
--- a/srcpkgs/perl-HTTP-Message/template
+++ b/srcpkgs/perl-HTTP-Message/template
@@ -6,6 +6,8 @@ wrksrc="HTTP-Message-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl-LWP-MediaTypes perl-Encode-Locale perl-URI perl-HTTP-Date perl-HTML-Parser"
+depends="${makedepends}"
+noarch="yes"
short_desc="HTTP::Message - HTTP style message (base class)"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/HTTP-Message"
@@ -19,11 +21,3 @@ long_desc='
$mess = HTTP::Message->new
$mess = HTTP::Message->new( $headers )
$mess = HTTP::Message->new( $headers, $content )'
-
-perl-HTTP-Message_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-HTTP-Negotiate/template b/srcpkgs/perl-HTTP-Negotiate/template
index c9aeb4c031..3be57fc54d 100644
--- a/srcpkgs/perl-HTTP-Negotiate/template
+++ b/srcpkgs/perl-HTTP-Negotiate/template
@@ -6,6 +6,8 @@ wrksrc="HTTP-Negotiate-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="perl-HTTP-Message"
+depends="${makedepends}"
+noarch="yes"
short_desc="HTTP::Negotiate - choose a variant to serve"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/HTTP-Negotiate"
@@ -18,11 +20,3 @@ long_desc="
Content negotiation allows for the selection of a preferred content
representation based upon attributes of the negotiable variants and the value
of the various Accept* header fields in the request."
-
-perl-HTTP-Negotiate_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-IO-Tty/template b/srcpkgs/perl-IO-Tty/template
index f618c6c037..feb5e10631 100644
--- a/srcpkgs/perl-IO-Tty/template
+++ b/srcpkgs/perl-IO-Tty/template
@@ -6,16 +6,10 @@ wrksrc="IO-Tty-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
short_desc="IO::Tty - Perl interface to Low-level allocate a pseudo-Tty"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/IO-Tty/"
license="GPL-2"
distfiles="${CPAN_SITE}/IO/IO-Tty-$version.tar.gz"
checksum=31a6e21ad187ec5ea93c2b898d6b3519647c5fce9f394b6d3c05a1f7c3f6f8b1
-
-perl-IO-Tty_package() {
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-IPC-Run/template b/srcpkgs/perl-IPC-Run/template
index 8a6444ba34..a80cbb6b8a 100644
--- a/srcpkgs/perl-IPC-Run/template
+++ b/srcpkgs/perl-IPC-Run/template
@@ -6,6 +6,8 @@ wrksrc="IPC-Run-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="system() and background procs w/ piping, redirs, ptys"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://search.cpan.org/dist/IPC-Run"
@@ -17,11 +19,3 @@ long_desc="
pipes, and pseudo-ttys. Both system()-style and scripted usages are
supported and may be mixed. Likewise, functional and OO API styles are
both supported and may be mixed."
-
-perl-IPC-Run_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-LWP-MediaTypes/template b/srcpkgs/perl-LWP-MediaTypes/template
index 9be1c73dbb..3247d1e3c4 100644
--- a/srcpkgs/perl-LWP-MediaTypes/template
+++ b/srcpkgs/perl-LWP-MediaTypes/template
@@ -6,6 +6,8 @@ wrksrc="LWP-MediaTypes-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="LWP::MediaTypes - guess media type for a file or a URL"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="https://metacpan.org/release/LWP-MediaTypes"
@@ -17,11 +19,3 @@ long_desc="
and encodings. The mapping from file extensions to media types is defined by
the media.types file. If the ~/.media.types file exists it is used instead.
For backwards compatibility we will also look for ~/.mime.types."
-
-perl-LWP-MediaTypes_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index 2e7797269a..56ea9d2ba6 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -9,6 +9,8 @@ makedepends="
perl-URI perl-LWP-MediaTypes perl-Encode-Locale perl-HTTP-Message
perl-File-Listing perl-HTTP-Negotiate perl-HTTP-Daemon perl-Net-HTTP
perl-HTTP-Cookies perl-WWW-RobotRules"
+depends="${makedepends}"
+noarch="yes"
short_desc="LWP - The World-Wide Web library for Perl (libwww-perl)"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/libwww-perl/lib/LWP.pm"
@@ -26,11 +28,3 @@ long_desc="
requests sent and responses received from the WWW server are all represented
by objects. This makes a simple and powerful interface to these services. The
interface is easy to extend and customize for your own needs."
-
-perl-LWP_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Lchown/template b/srcpkgs/perl-Lchown/template
index df776b2feb..c7acfd16f5 100644
--- a/srcpkgs/perl-Lchown/template
+++ b/srcpkgs/perl-Lchown/template
@@ -6,16 +6,10 @@ revision=2
build_style=perl-ModuleBuild
hostmakedepends="perl>=5.18"
makedepends="${makedepends}"
+depends="${makedepends}"
short_desc="Perl module interface to the lchown() system call"
maintainer="Juan RP <xtraeme@gmail.com"
homepage="http://search.cpan.org/dist/Lchown"
license="GPL-2"
distfiles="http://search.cpan.org/CPAN/authors/id/N/NC/NCLEATON/Lchown-${version}.tar.gz"
checksum=9c0a13e279ad92208fb8fac73001635b0689251dd41b597522e1b3501ba0f76f
-
-perl-Lchown_package() {
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Locale-gettext/template b/srcpkgs/perl-Locale-gettext/template
index c2bbd38a38..5d93397320 100644
--- a/srcpkgs/perl-Locale-gettext/template
+++ b/srcpkgs/perl-Locale-gettext/template
@@ -6,16 +6,10 @@ wrksrc="gettext-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
short_desc="Permits access from Perl to the gettext() family of functions"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/gettext"
license="GPL-2"
distfiles="http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${version}.tar.gz"
checksum=27367f3dc1be79c9ed178732756e37e4cfce45f9e2a27ebf26e1f40d80124694
-
-perl-Locale-gettext_package() {
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Math-BigInt-GMP/template b/srcpkgs/perl-Math-BigInt-GMP/template
index 65c18609ae..80c88b9a9a 100644
--- a/srcpkgs/perl-Math-BigInt-GMP/template
+++ b/srcpkgs/perl-Math-BigInt-GMP/template
@@ -6,16 +6,10 @@ wrksrc="Math-BigInt-GMP-${version}"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends} gmp-devel"
+depends="${hostmakedepends}"
short_desc="Math::BigInt::GMP - Use the GMP library for Math::BigInt routines"
maintainer="Juan RP <xtraeme@gmail.com"
homepage="http://search.cpan.org/dist/Math-BigInt-GMP"
license="GPL-2"
distfiles="${CPAN_SITE}/Math/Math-BigInt-GMP-${version}.tar.gz"
checksum=3134f1aef29a78f2014866facf8a91bea0f09b0b41c9954388d5ff4428930fc2
-
-perl-Math-BigInt-GMP_package() {
- depends="${hostmakedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Net-HTTP/template b/srcpkgs/perl-Net-HTTP/template
index ff45c99566..de52e2ba10 100644
--- a/srcpkgs/perl-Net-HTTP/template
+++ b/srcpkgs/perl-Net-HTTP/template
@@ -6,6 +6,8 @@ wrksrc="Net-HTTP-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="Net::HTTP - Low-level HTTP connection (client)"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/Net-HTTP"
@@ -16,11 +18,3 @@ long_desc="
The Net::HTTP class is a low-level HTTP client. An instance of the
Net::HTTP class represents a connection to an HTTP server. The HTTP protocol
is described in RFC 2616. The Net::HTTP class supports HTTP/1.0 and HTTP/1.1."
-
-perl-Net-HTTP_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-Parse-CPAN-Meta/template b/srcpkgs/perl-Parse-CPAN-Meta/template
index b4e725a124..e5b5876ec9 100644
--- a/srcpkgs/perl-Parse-CPAN-Meta/template
+++ b/srcpkgs/perl-Parse-CPAN-Meta/template
@@ -4,6 +4,8 @@ version=1.4404
revision=2
wrksrc="Parse-CPAN-Meta-${version}"
makedepends="perl-CPAN-Meta-YAML"
+depends="${makedepends}"
+noarch="yes"
build_style=perl-module
short_desc="Parse::CPAN::Meta - Parse META.yml and META.json CPAN metadata files"
maintainer="tripledes <tripledes@gmail.com>"
@@ -11,11 +13,3 @@ homepage="http://search.cpan.org/dist/Parse-CPAN-Meta"
license="GPL-1, Artistic"
distfiles="${CPAN_SITE}/Parse/${pkgname#perl-}-${version}.tar.gz"
checksum=b03ad539129a30fc76311a4d341878172a5aade8338c4d7a0184ce5961c995f8
-
-perl-Parse-CPAN-Meta_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/perl-Term-ExtendedColor/template b/srcpkgs/perl-Term-ExtendedColor/template
index 1be46e7f49..cce9d45f80 100644
--- a/srcpkgs/perl-Term-ExtendedColor/template
+++ b/srcpkgs/perl-Term-ExtendedColor/template
@@ -6,17 +6,11 @@ wrksrc="Term-ExtendedColor-${version}"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${hostmakedepends}"
+noarch="yes"
short_desc="Color screen output using 256 colors"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL-1+PerlArtistic"
homepage="http://search.cpan.org/dist/Term-ExtendedColor/"
distfiles="http://search.cpan.org/CPAN/authors/id/W/WO/WOLDRICH/Term-ExtendedColor-${version}.tar.gz"
checksum=be3b4b323c0ef9eaca490a43c47e9e44d866b106c4471cfa98c8ab4ed8f80dcb
-
-perl-Term-ExtendedColor_package() {
- depends="${hostmakedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-URI/template b/srcpkgs/perl-URI/template
index a80e49f6b7..abed37519c 100644
--- a/srcpkgs/perl-URI/template
+++ b/srcpkgs/perl-URI/template
@@ -5,6 +5,8 @@ revision=5
wrksrc="URI-$version"
build_style=perl-module
hostmakedepends="perl>=5.8"
+depends="${hostmakedepends}"
+noarch="yes"
short_desc="Perl Uniform Resource Identifiers class (URI, RFC 2396)"
homepage="http://search.cpan.org/~gaas/URI-1.58/URI.pm"
license="GPL-1+/Artisti"
@@ -24,11 +26,3 @@ long_desc="
with libwww-perl. This package contains an emulation of the old
URI::URL interface. The emulated URI::URL implements both the old and
the new interface."
-
-perl-URI_package() {
- depends="${hostmakedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-WWW-Curl/template b/srcpkgs/perl-WWW-Curl/template
index 4e60b3a93c..bbcd35b95d 100644
--- a/srcpkgs/perl-WWW-Curl/template
+++ b/srcpkgs/perl-WWW-Curl/template
@@ -6,16 +6,10 @@ wrksrc="WWW-Curl-${version}"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends} libcurl-devel"
+depends="${hostmakedepends}"
short_desc="WWW::Curl - Perl extension interface for libcurl"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://search.cpan.org/dist/WWW-Curl/"
license="GPL-2"
distfiles="${CPAN_SITE}/WWW/WWW-Curl-$version.tar.gz"
checksum=3ef40494537a1ce7f848f3b524f5690cf47db458c0bb662e15c4642dc13c5fa1
-
-perl-WWW-Curl_package() {
- depends="${hostmakedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-WWW-RobotRules/template b/srcpkgs/perl-WWW-RobotRules/template
index 5edbea4a58..4c66d3e169 100644
--- a/srcpkgs/perl-WWW-RobotRules/template
+++ b/srcpkgs/perl-WWW-RobotRules/template
@@ -6,6 +6,8 @@ wrksrc="WWW-RobotRules-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends} perl-URI"
+depends="${makedepends}"
+noarch="yes"
short_desc="WWW::RobotRules - database of robots.txt-derived permissions"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://search.cpan.org/dist/WWW-RobotRules"
@@ -22,11 +24,3 @@ long_desc="
provides methods to check if access to a given URL is prohibited. The same
WWW::RobotRules object can be used for one or more parsed /robots.txt files
on any number of hosts."
-
-perl-WWW-RobotRules_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-XML-NamespaceSupport/template b/srcpkgs/perl-XML-NamespaceSupport/template
index 5b0df9bb70..2408ebcdb1 100644
--- a/srcpkgs/perl-XML-NamespaceSupport/template
+++ b/srcpkgs/perl-XML-NamespaceSupport/template
@@ -6,6 +6,8 @@ wrksrc="XML-NamespaceSupport-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="Perl module to the SAX2 NamespaceSupport class"
homepage="http://search.cpan.org/~perigrin/XML-NamespaceSupport-1.11/"
license="GPL+ or Artistic"
@@ -17,11 +19,3 @@ long_desc="
from within any application that may need them. It also helps
maintain a prefix to namespace URI map, and provides a number of
basic checks."
-
-perl-XML-NamespaceSupport_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template
index dcf34e1199..584e324e7e 100644
--- a/srcpkgs/perl-XML-Parser/template
+++ b/srcpkgs/perl-XML-Parser/template
@@ -1,25 +1,15 @@
# Template build file for 'perl-XML-Parser'.
pkgname=perl-XML-Parser
version=2.41
-revision=2
-wrksrc="XML-Parser-$version"
-homepage="http://search.cpan.org/dist/XML-Parser/"
-distfiles="${CPAN_SITE}/XML/XML-Parser-$version.tar.gz"
+revision=3
+wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
-hostmakedepends="perl>=5.18"
-makedepends="${hostmakedepends} expat-devel"
+hostmakedepends="perl>=5.18 expat-devel"
+makedepends="${hostmakedepends}"
+depends="perl>=5.18"
short_desc="Perl extension interface to James Clark's XML parser, expat"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
+homepage="http://search.cpan.org/dist/${pkgname/perl-/}/"
+distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz"
checksum=b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9
-long_desc="
- This module provides ways to parse XML documents. It is built on top of
- XML::Parser::Expat, which is a lower level interface to James Clark's
- expat library."
-
-perl-XML-Parser_package() {
- depends="${hostmakedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-XML-SAX-Base/template b/srcpkgs/perl-XML-SAX-Base/template
index e475bc828d..67835ea85c 100644
--- a/srcpkgs/perl-XML-SAX-Base/template
+++ b/srcpkgs/perl-XML-SAX-Base/template
@@ -6,6 +6,8 @@ wrksrc="${pkgname#perl-}-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends}"
+depends="${makedepends}"
+noarch="yes"
short_desc="Perl Base class SAX Drivers and Filters"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://search.cpan.org/dist/XML-SAX-Base"
@@ -17,11 +19,3 @@ long_desc="
and filters. Its default behaviour is to pass the input directly to the output
unchanged. It can be useful to use this module as a base class so you don't
have to, for example, implement the characters() callback."
-
-perl-XML-SAX-Base_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-XML-SAX/template b/srcpkgs/perl-XML-SAX/template
index a3e136707a..f735011aad 100644
--- a/srcpkgs/perl-XML-SAX/template
+++ b/srcpkgs/perl-XML-SAX/template
@@ -6,6 +6,8 @@ wrksrc="XML-SAX-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends} perl-XML-NamespaceSupport perl-XML-SAX-Base"
+depends="${makedepends}"
+noarch="yes"
short_desc="Perl interface to the SAX2 XML Parser"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://search.cpan.org/dist/XML-SAX"
@@ -16,11 +18,3 @@ long_desc="
This module provides ways to parse XML documents. It is built on top of
XML::SAX::Expat, which is a lower level interface to James Clark's
expat library."
-
-perl-XML-SAX_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl-XML-Simple/template b/srcpkgs/perl-XML-Simple/template
index 0e5fc8ebb6..e5194fc8ce 100644
--- a/srcpkgs/perl-XML-Simple/template
+++ b/srcpkgs/perl-XML-Simple/template
@@ -6,6 +6,8 @@ wrksrc="XML-Simple-$version"
build_style=perl-module
hostmakedepends="perl>=5.18"
makedepends="${hostmakedepends} expat perl-XML-Parser perl-XML-SAX"
+depends="${makedepends}"
+noarch="yes"
short_desc="Easy Perl API to read/write XML"
homepage="http://search.cpan.org/dist/XML-Simple/"
license="GPL-1+/Artistic"
@@ -15,11 +17,3 @@ checksum=5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a
long_desc="
This Perl module provides an easy API to read and write XML
(especially configuration files)."
-
-perl-XML-Simple_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/perl/files/arm-linux-gnueabihf/bitcount.h b/srcpkgs/perl/files/cross/bitcount.h
similarity index 100%
rename from srcpkgs/perl/files/arm-linux-gnueabihf/bitcount.h
rename to srcpkgs/perl/files/cross/bitcount.h
diff --git a/srcpkgs/perl/files/arm-linux-gnueabihf/config.h b/srcpkgs/perl/files/cross/config.h
similarity index 100%
rename from srcpkgs/perl/files/arm-linux-gnueabihf/config.h
rename to srcpkgs/perl/files/cross/config.h
diff --git a/srcpkgs/perl/files/arm-linux-gnueabihf/config.sh b/srcpkgs/perl/files/cross/config.sh
similarity index 96%
rename from srcpkgs/perl/files/arm-linux-gnueabihf/config.sh
rename to srcpkgs/perl/files/cross/config.sh
index de5c6e5f64..d04536f960 100644
--- a/srcpkgs/perl/files/arm-linux-gnueabihf/config.sh
+++ b/srcpkgs/perl/files/cross/config.sh
@@ -14,7 +14,7 @@
: Configure command line arguments.
config_arg0='./Configure'
-config_args='-des -Dusethreads -Duseshrplib -Dprefix=/usr -Dvendorprefix=/usr -Dprivlib=/usr/share/perl5/core_perl -Darchlib=/usr/lib/perl5/core_perl -Dsitelib=/usr/share/perl5/site_perl -Dsitearch=/usr/lib/perl5/site_perl -Dvendorlib=/usr/share/perl5/vendor_perl -Dvendorarch=/usr/lib/perl5/vendor_perl -Dscriptdir=/usr/bin -Dvendorscript=/usr/bin -Dinc_version_list=none -Dman1ext=1p -Dman3ext=3p -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3 -Dcccdlflags=-fPIC -Doptimize=-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard'
+config_args='-des -Dusethreads -Duseshrplib -Dprefix=/usr -Dvendorprefix=/usr -Dprivlib=/usr/share/perl5/core_perl -Darchlib=/usr/lib/perl5/core_perl -Dsitelib=/usr/share/perl5/site_perl -Dsitearch=/usr/lib/perl5/site_perl -Dvendorlib=/usr/share/perl5/vendor_perl -Dvendorarch=/usr/lib/perl5/vendor_perl -Dscriptdir=/usr/bin -Dvendorscript=/usr/bin -Dinc_version_list=none -Dman1ext=1p -Dman3ext=3p -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3 -Dcccdlflags=-fPIC -Doptimize=-O2 @@XBPS_CROSS_CFLAGS@@'
config_argc=20
config_arg1='-des'
config_arg2='-Dusethreads'
@@ -35,7 +35,7 @@ config_arg16='-Dman3ext=3p'
config_arg17='-Dman1dir=/usr/share/man/man1'
config_arg18='-Dman3dir=/usr/share/man/man3'
config_arg19='-Dcccdlflags=-fPIC'
-config_arg20='-Doptimize=-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard'
+config_arg20='-Doptimize=-O2 @@XBPS_CROSS_CFLAGS@@'
Author=''
Date='$Date'
@@ -63,7 +63,7 @@ ar='ar'
archlib='/usr/lib/perl5/core_perl'
archlibexp='/usr/lib/perl5/core_perl'
archname64=''
-archname='armv6l-linux-thread-multi'
+archname='@@XBPS_CROSS_ARCH@@-linux-thread-multi'
archobjs=''
asctime_r_proto='REENTRANT_PROTO_B_SB'
awk='awk'
@@ -79,7 +79,7 @@ byteorder='1234'
c=''
castflags='1'
cat='cat'
-cc='arm-linux-gnueabihf-gcc'
+cc='@@XBPS_CROSS_TRIPLET@@-gcc'
cccdlflags='-fPIC'
ccdlflags='-Wl,-E -Wl,-rpath,/usr/lib/perl5/core_perl/CORE'
ccflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
@@ -758,7 +758,7 @@ i_vfork='undef'
ignore_versioned_solibs='y'
inc_version_list=' '
inc_version_list_init='0'
-incpath='/usr/arm-linux-gnueabihf/usr/include'
+incpath='/usr/@@XBPS_CROSS_TRIPLET@@/usr/include'
inews=''
initialinstalllocation='/usr/bin'
installarchlib='/usr/lib/perl5/core_perl'
@@ -796,22 +796,22 @@ ivsize='4'
ivtype='long'
known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap arybase attributes mro re threads threads/shared '
ksh=''
-ld='arm-linux-gnueabihf-gcc'
+ld='@@XBPS_CROSS_TRIPLET@@-gcc'
ld_can_script='define'
-lddlflags='-shared -O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard -L/usr/arm-linux-gnueabihf/usr/lib -fstack-protector'
-ldflags=' -fstack-protector -L/usr/arm-linux-gnueabihf/usr/lib'
+lddlflags='-shared @@XBPS_CROSS_CFLAGS@@ -L/usr/@@XBPS_CROSS_TRIPLET@@/usr/lib -fstack-protector'
+ldflags=' -fstack-protector -L/usr/@@XBPS_CROSS_TRIPLET@@/usr/lib'
ldflags_uselargefiles=''
ldlibpthname='LD_LIBRARY_PATH'
less='less'
lib_ext='.a'
-libc='/usr/arm-linux-gnueabihf/usr/lib/libc-2.18.so'
+libc='/usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libc-2.18.so'
libperl='libperl.so'
-libpth='/usr/arm-linux-gnueabihf/usr/lib /usr/local/lib /usr/lib'
+libpth='/usr/@@XBPS_CROSS_TRIPLET@@/usr/lib /usr/local/lib /usr/lib'
libs='-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat'
-libsdirs=' /usr/arm-linux-gnueabihf/usr/lib'
+libsdirs=' /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib'
libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so libgdbm_compat.so'
-libsfound=' /usr/arm-linux-gnueabihf/usr/lib/libnsl.so /usr/arm-linux-gnueabihf/usr/lib/libgdbm.so /usr/arm-linux-gnueabihf/usr/lib/libdb.so /usr/arm-linux-gnueabihf/usr/lib/libdl.so /usr/arm-linux-gnueabihf/usr/lib/libm.so /usr/arm-linux-gnueabihf/usr/lib/libcrypt.so /usr/arm-linux-gnueabihf/usr/lib/libutil.so /usr/arm-linux-gnueabihf/usr/lib/libpthread.so /usr/arm-linux-gnueabihf/usr/lib/libc.so /usr/arm-linux-gnueabihf/usr/lib/libgdbm_compat.so'
-libspath=' /usr/arm-linux-gnueabihf/usr/lib /usr/lib'
+libsfound=' /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libnsl.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libgdbm.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libdb.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libdl.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libm.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libcrypt.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libutil.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libpthread.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libc.so /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib/libgdbm_compat.so'
+libspath=' /usr/@@XBPS_CROSS_TRIPLET@@/usr/lib /usr/lib'
libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD gdbm_compat'
libswanted_uselargefiles=''
line=''
@@ -883,7 +883,7 @@ nvtype='double'
o_nonblock='O_NONBLOCK'
obj_ext='.o'
old_pthread_create_joinable=''
-optimize='-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard'
+optimize='-O2 @@XBPS_CROSS_CFLAGS@@'
orderlib='false'
osname='linux'
osvers='3.10.18_4'
@@ -903,7 +903,7 @@ perlpath='/usr/bin/perl'
pg='pg'
phostname='hostname'
pidtype='pid_t'
-plibpth='/lib/arm-linux-gnueabihf/4.7.3 /lib /usr/lib/arm-linux-gnueabihf/4.7.3 /usr/lib'
+plibpth='/lib/@@XBPS_CROSS_TRIPLET@@/4.7.3 /lib /usr/lib/@@XBPS_CROSS_TRIPLET@@/4.7.3 /usr/lib'
pmake=''
pr=''
prefix='/usr'
diff --git a/srcpkgs/perl/files/arm-linux-gnueabihf/mg_data.h b/srcpkgs/perl/files/cross/mg_data.h
similarity index 100%
rename from srcpkgs/perl/files/arm-linux-gnueabihf/mg_data.h
rename to srcpkgs/perl/files/cross/mg_data.h
diff --git a/srcpkgs/perl/files/arm-linux-gnueabihf/uudmap.h b/srcpkgs/perl/files/cross/uudmap.h
similarity index 100%
rename from srcpkgs/perl/files/arm-linux-gnueabihf/uudmap.h
rename to srcpkgs/perl/files/cross/uudmap.h
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 8004b75679..82df94c7c4 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,6 +1,6 @@
# Template build file for 'perl'.
pkgname=perl
-version=5.18.1
+version=5.18.2
revision=1
hostmakedepends="which less"
makedepends="zlib-devel bzip2-devel gdbm-devel db-devel>=5.3"
@@ -8,9 +8,147 @@ short_desc="Practical Extraction and Report Language"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.perl.org"
license="GPL-2"
-#distfiles="http://www.cpan.org/src/5.0/perl-${version}.tar.bz2"
-distfiles="http://ftp.freebsd.org/pub/FreeBSD/distfiles/perl/perl-${version}.tar.bz2"
-checksum=bf46c732c68fb160ea276b4b0cda26971646a206e31951abb8623a60f0ee5249
+distfiles="http://www.cpan.org/src/5.0/perl-${version}.tar.gz"
+checksum=7cbed5ef11900e8f68041215eea0de5e443d53393f84c41d5c9c69c150a4982f
+
+provides="
+perl-Archive-Extract-0.68_1
+perl-Archive-Tar-1.90_1
+perl-Attribute-Handlers-0.94_1
+perl-AutoLoader-5.73_1
+perl-B-Debug-1.18_1
+perl-B-Deparse-1.20_1
+perl-B-Lint-1.17_1
+perl-CGI-3.63_1
+perl-CPAN-2.00_1
+perl-CPAN-Meta-2.120921_1
+perl-CPAN-Meta-Requirements-2.122_1
+perl-CPAN-Meta-YAML-0.008_1
+perl-CPANPLUS-0.9135_1
+perl-CPANPLUS-Dist-Build-0.70_1
+perl-Carp-1.29_1
+perl-Compress-Raw-Bzip2-2.060_1
+perl-Compress-Raw-Zlib-2.060_1
+perl-Config-Perl-V-0.17_1
+perl-DB_File-1.827_1
+perl-Data-Dumper-2.145_1
+perl-Devel-PPPort-3.20_1
+perl-Devel-SelfStubber-1.05_1
+perl-Digest-1.17_1
+perl-Digest-MD5-2.52_1
+perl-Digest-SHA-5.84_01_1
+perl-Dumpvalue-1.17_1
+perl-Encode-2.49_1
+perl-Env-1.04_1
+perl-Exporter-5.68_1
+perl-ExtUtils-CBuilder-0.280210_1
+perl-ExtUtils-Command-1.17_1
+perl-ExtUtils-Constant-0.23_1
+perl-ExtUtils-Install-1.59_1
+perl-ExtUtils-MakeMaker-6.66_1
+perl-ExtUtils-Manifest-1.63_1
+perl-ExtUtils-ParseXS-3.18_1
+perl-File-CheckTree-4.42_1
+perl-File-Fetch-0.38_1
+perl-File-Path-2.09_1
+perl-File-Temp-0.23_1
+perl-Filter-Simple-0.89_1
+perl-Filter-Util-Call-1.45_1
+perl-Getopt-Long-2.39_1
+perl-HTTP-Tiny-0.025_1
+perl-I18N-Collate-1.02_1
+perl-I18N-LangTags-0.39_1
+perl-IO-1.28_1
+perl-IO-Compress-2.060_1
+perl-IO-Zlib-1.10_1
+perl-IPC-Cmd-0.80_1
+perl-IPC-SysV-2.03_1
+perl-JSON-PP-2.27202_1
+perl-Locale-Codes-3.25_1
+perl-Locale-Maketext-1.23_1
+perl-Locale-Maketext-Simple-0.21_1
+perl-Log-Message-0.06_1
+perl-Log-Message-Simple-0.10_1
+perl-MIME-Base64-3.13_1
+perl-Math-BigInt-1.9991_1
+perl-Math-BigInt-FastCalc-0.30_1
+perl-Math-BigRat-0.2604_1
+perl-Math-Complex-1.59_1
+perl-Memoize-1.03_1
+perl-Module-Build-0.4003_1
+perl-Module-CoreList-3.03_1
+perl-Module-Load-0.24_1
+perl-Module-Load-Conditional-0.54_1
+perl-Module-Loaded-0.08_1
+perl-Module-Metadata-1.000011_1
+perl-Module-Pluggable-4.7_1
+perl-NEXT-0.65_1
+perl-Net-Ping-2.41_1
+perl-Object-Accessor-0.46_1
+perl-Package-Constants-0.02_1
+perl-Params-Check-0.36_1
+perl-Parse-CPAN-Meta-1.4404_1
+perl-PathTools-3.40_1
+perl-Perl-OSType-1.003_1
+perl-PerlIO-via-QuotedPrint-0.07_1
+perl-Pod-Checker-1.60_1
+perl-Pod-Escapes-1.04_1
+perl-Pod-LaTeX-0.61_1
+perl-Pod-Parser-1.60_1
+perl-Pod-Perldoc-3.19_1
+perl-Pod-Simple-3.28_1
+perl-Pod-Usage-1.61_1
+perl-Safe-2.35_1
+perl-Scalar-List-Utils-1.27_1
+perl-Search-Dict-1.07_1
+perl-SelfLoader-1.21_1
+perl-Socket-2.009_1
+perl-Storable-2.41_1
+perl-Sys-Syslog-0.32_1
+perl-Term-ANSIColor-4.02_1
+perl-Term-Cap-1.13_1
+perl-Term-Complete-1.402_1
+perl-Term-ReadLine-1.12_1
+perl-Term-UI-0.34_1
+perl-Test-1.26_1
+perl-Test-Harness-3.26_1
+perl-Test-Simple-0.98_1
+perl-Text-Abbrev-1.02_1
+perl-Text-Balanced-2.02_1
+perl-Text-ParseWords-3.28_1
+perl-Text-Soundex-3.04_1
+perl-Text-Tabs+Wrap-2012.0818_1
+perl-Thread-Queue-3.02_1
+perl-Thread-Semaphore-2.12_1
+perl-Tie-File-0.99_1
+perl-Tie-RefHash-1.39_1
+perl-Time-HiRes-1.9725_1
+perl-Time-Local-1.2300_1
+perl-Time-Piece-1.20_01_1
+perl-Unicode-Collate-0.97_1
+perl-Unicode-Normalize-1.16_1
+perl-Win32-0.47_1
+perl-Win32API-File-0.1201_1
+perl-XSLoader-0.16_1
+perl-autodie-2.13_1
+perl-autouse-1.07_1
+perl-base-2.18_1
+perl-bignum-0.33_1
+perl-constant-1.27_1
+perl-encoding-warnings-0.11_1
+perl-if-0.0602_1
+perl-lib-0.63_1
+perl-libnet-1.22_1
+perl-parent-0.225_1
+perl-perlfaq-5.0150042_1
+perl-podlators-2.5.1_1
+perl-threads-1.86_1
+perl-threads-shared-1.43_1
+perl-version-0.9902_1
+"
+for f in ${provides}; do
+ replaces+=" $($XBPS_UHELPER_CMD getpkgname ${f})>=0"
+done
# Before updating this package to a new major version, run ${FILESDIR}/provides.pl
# against ${wrksrc} to find the list of built in packages.
@@ -33,16 +171,15 @@ do_configure() {
-Dman3dir=/usr/share/man/man3"
if [ "$CROSS_BUILD" ]; then
- # Copy target files
- if [ ! -d $FILESDIR/$XBPS_CROSS_TRIPLET ]; then
- msg_error "$pkgver: cannot be cross built for $XBPS_CROSS_TRIPLET, contact $maintainer.\n"
- fi
- cp -f ${FILESDIR}/${XBPS_CROSS_TRIPLET}/* .
+ cp -f ${FILESDIR}/cross/* .
cp -f ${FILESDIR}/Configure.cross .
# substitute some required strings in generated config.sh
- sed -e "s|@@PERL_VERSION@@|${version}|g" \
- -e "s|@@PERL_SUBVERSION@@|${version##*.}|g" \
+ sed -e "s,@@XBPS_CROSS_ARCH@@,${XBPS_CROSS_ARCH},g" \
+ -e "s,@@XBPS_CROSS_TRIPLET@@,${XBPS_CROSS_TRIPLET},g" \
+ -e "s,@@XBPS_CROSS_CFLAGS@@,${XBPS_CROSS_CFLAGS},g" \
+ -e "s,@@PERL_VERSION@@,${version},g" \
+ -e "s,@@PERL_SUBVERSION@@,${version##*.},g" \
-i config.sh
sh ./Configure.cross
@@ -127,148 +264,3 @@ do_install() {
cd ${DESTDIR}/usr/lib && \
ln -sf ./perl5/core_perl/CORE/libperl.so libperl.so
}
-
-perl_package() {
- provides="
-perl-Archive-Extract-0.68_1
-perl-Archive-Tar-1.90_1
-perl-Attribute-Handlers-0.94_1
-perl-AutoLoader-5.73_1
-perl-B-Debug-1.18_1
-perl-B-Deparse-1.20_1
-perl-B-Lint-1.17_1
-perl-CGI-3.63_1
-perl-CPAN-2.00_1
-perl-CPAN-Meta-2.120921_1
-perl-CPAN-Meta-Requirements-2.122_1
-perl-CPAN-Meta-YAML-0.008_1
-perl-CPANPLUS-0.9135_1
-perl-CPANPLUS-Dist-Build-0.70_1
-perl-Carp-1.29_1
-perl-Compress-Raw-Bzip2-2.060_1
-perl-Compress-Raw-Zlib-2.060_1
-perl-Config-Perl-V-0.17_1
-perl-DB_File-1.827_1
-perl-Data-Dumper-2.145_1
-perl-Devel-PPPort-3.20_1
-perl-Devel-SelfStubber-1.05_1
-perl-Digest-1.17_1
-perl-Digest-MD5-2.52_1
-perl-Digest-SHA-5.84_01_1
-perl-Dumpvalue-1.17_1
-perl-Encode-2.49_1
-perl-Env-1.04_1
-perl-Exporter-5.68_1
-perl-ExtUtils-CBuilder-0.280210_1
-perl-ExtUtils-Command-1.17_1
-perl-ExtUtils-Constant-0.23_1
-perl-ExtUtils-Install-1.59_1
-perl-ExtUtils-MakeMaker-6.66_1
-perl-ExtUtils-Manifest-1.63_1
-perl-ExtUtils-ParseXS-3.18_1
-perl-File-CheckTree-4.42_1
-perl-File-Fetch-0.38_1
-perl-File-Path-2.09_1
-perl-File-Temp-0.23_1
-perl-Filter-Simple-0.89_1
-perl-Filter-Util-Call-1.45_1
-perl-Getopt-Long-2.39_1
-perl-HTTP-Tiny-0.025_1
-perl-I18N-Collate-1.02_1
-perl-I18N-LangTags-0.39_1
-perl-IO-1.28_1
-perl-IO-Compress-2.060_1
-perl-IO-Zlib-1.10_1
-perl-IPC-Cmd-0.80_1
-perl-IPC-SysV-2.03_1
-perl-JSON-PP-2.27202_1
-perl-Locale-Codes-3.25_1
-perl-Locale-Maketext-1.23_1
-perl-Locale-Maketext-Simple-0.21_1
-perl-Log-Message-0.06_1
-perl-Log-Message-Simple-0.10_1
-perl-MIME-Base64-3.13_1
-perl-Math-BigInt-1.9991_1
-perl-Math-BigInt-FastCalc-0.30_1
-perl-Math-BigRat-0.2604_1
-perl-Math-Complex-1.59_1
-perl-Memoize-1.03_1
-perl-Module-Build-0.4003_1
-perl-Module-CoreList-2.96_1
-perl-Module-Load-0.24_1
-perl-Module-Load-Conditional-0.54_1
-perl-Module-Loaded-0.08_1
-perl-Module-Metadata-1.000011_1
-perl-Module-Pluggable-4.7_1
-perl-NEXT-0.65_1
-perl-Net-Ping-2.41_1
-perl-Object-Accessor-0.46_1
-perl-Package-Constants-0.02_1
-perl-Params-Check-0.36_1
-perl-Parse-CPAN-Meta-1.4404_1
-perl-PathTools-3.40_1
-perl-Perl-OSType-1.003_1
-perl-PerlIO-via-QuotedPrint-0.07_1
-perl-Pod-Checker-1.60_1
-perl-Pod-Escapes-1.04_1
-perl-Pod-LaTeX-0.61_1
-perl-Pod-Parser-1.60_1
-perl-Pod-Perldoc-3.19_1
-perl-Pod-Simple-3.28_1
-perl-Pod-Usage-1.61_1
-perl-Safe-2.35_1
-perl-Scalar-List-Utils-1.27_1
-perl-Search-Dict-1.07_1
-perl-SelfLoader-1.21_1
-perl-Socket-2.009_1
-perl-Storable-2.41_1
-perl-Sys-Syslog-0.32_1
-perl-Term-ANSIColor-4.02_1
-perl-Term-Cap-1.13_1
-perl-Term-Complete-1.402_1
-perl-Term-ReadLine-1.12_1
-perl-Term-UI-0.34_1
-perl-Test-1.26_1
-perl-Test-Harness-3.26_1
-perl-Test-Simple-0.98_1
-perl-Text-Abbrev-1.02_1
-perl-Text-Balanced-2.02_1
-perl-Text-ParseWords-3.28_1
-perl-Text-Soundex-3.04_1
-perl-Text-Tabs+Wrap-2012.0818_1
-perl-Thread-Queue-3.02_1
-perl-Thread-Semaphore-2.12_1
-perl-Tie-File-0.99_1
-perl-Tie-RefHash-1.39_1
-perl-Time-HiRes-1.9725_1
-perl-Time-Local-1.2300_1
-perl-Time-Piece-1.20_01_1
-perl-Unicode-Collate-0.97_1
-perl-Unicode-Normalize-1.16_1
-perl-Win32-0.47_1
-perl-Win32API-File-0.1201_1
-perl-XSLoader-0.16_1
-perl-autodie-2.13_1
-perl-autouse-1.07_1
-perl-base-2.18_1
-perl-bignum-0.33_1
-perl-constant-1.27_1
-perl-encoding-warnings-0.11_1
-perl-if-0.0602_1
-perl-lib-0.63_1
-perl-libnet-1.22_1
-perl-parent-0.225_1
-perl-perlfaq-5.0150042_1
-perl-podlators-2.5.1_1
-perl-threads-1.86_1
-perl-threads-shared-1.43_1
-perl-version-0.9902_1
-"
- for f in ${provides}; do
- replaces+=" $($XBPS_UHELPER_CMD getpkgname ${f})>=0"
- done
-
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/phonon-backend-gstreamer/template b/srcpkgs/phonon-backend-gstreamer/template
index a249309098..095ab4d198 100644
--- a/srcpkgs/phonon-backend-gstreamer/template
+++ b/srcpkgs/phonon-backend-gstreamer/template
@@ -6,18 +6,12 @@ build_style=cmake
hostmakedepends="cmake automoc4 pkg-config"
makedepends="openssl-devel MesaLib-devel qt-devel phonon-devel
gst-plugins-base-devel gst-plugins-good gst-ffmpeg"
+depends="desktop-file-utils hicolor-icon-theme gst-plugins-good gst-ffmpeg"
+provides="phonon-backend-0_1"
+replaces="phonon-backend>=0"
short_desc="Phonon GStreamer backend"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
homepage="http://phonon.kde.org/"
distfiles="http://download.kde.org/stable/phonon/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
checksum=55e273f113e309f2fc3f316baf4b220562cc8fb37b25193ac257ff1eae7aaf58
-
-phonon-backend-gstreamer_package() {
- provides="phonon-backend-0_1"
- replaces="phonon-backend>=0"
- depends="desktop-file-utils hicolor-icon-theme gst-plugins-good gst-ffmpeg"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template
index bacac984d7..9b8773ed25 100644
--- a/srcpkgs/phonon/template
+++ b/srcpkgs/phonon/template
@@ -29,9 +29,3 @@ phonon-devel_package() {
vmove usr/share/qt
}
}
-
-phonon_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 81c9bf8e2c..ffdf9cd5da 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -3,7 +3,9 @@ pkgname=phoronix-test-suite
version=4.8.5
revision=1
wrksrc="${pkgname}"
+noarch="yes"
makedepends="php"
+depends="php"
short_desc="The most comprehensive testing and benchmarking platform available for Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -17,11 +19,3 @@ do_install() {
vmkdir usr/share/${pkgname}/pts-core
vcopy "pts-core/*" usr/share/${pkgname}/pts-core
}
-
-phoronix-test-suite_package() {
- noarch="yes"
- depends="php"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/phorward/template b/srcpkgs/phorward/template
index 40c7f35cea..582f770c41 100644
--- a/srcpkgs/phorward/template
+++ b/srcpkgs/phorward/template
@@ -37,9 +37,3 @@ phorward-docs_package() {
vmove usr/share/man
}
}
-
-phorward_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index e6f6e9ee98..13445053b6 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -13,6 +13,7 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel
libcurl-devel libxslt-devel openssl-devel bzip2-devel zlib-devel db-devel
gmp-devel gdbm-devel freetype-devel systemd-devel apache-devel
readline-devel libmysqlclient-devel"
+conf_files="/etc/php/php.ini"
distfiles="http://www.php.net/distributions/php-${version}.tar.bz2"
checksum=a9b7d291199d7e6b90ef1d78eb791d738944d66856e76bde9463ce2645b0e4a4
@@ -163,13 +164,6 @@ do_install() {
rm -f ${DESTDIR}/usr/lib/php/modules/*.a
}
-php_package() {
- conf_files="/etc/php/php.ini"
- pkg_install() {
- vmove all
- }
-}
-
php-devel_package() {
short_desc+=" - development files"
pkg_install() {
diff --git a/srcpkgs/physfs/template b/srcpkgs/physfs/template
index 99a7c78211..439c6e19c0 100644
--- a/srcpkgs/physfs/template
+++ b/srcpkgs/physfs/template
@@ -26,9 +26,3 @@ physfs-devel_package() {
vmove usr/include
}
}
-
-physfs_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pidgin-gpg/template b/srcpkgs/pidgin-gpg/template
index 51f69448c5..295634dd9b 100644
--- a/srcpkgs/pidgin-gpg/template
+++ b/srcpkgs/pidgin-gpg/template
@@ -11,9 +11,3 @@ license="GPL-3"
homepage="http://github.com/segler-alex/Pidgin-GPG"
distfiles="http://github.com/downloads/segler-alex/Pidgin-GPG/${pkgname}-${version}.tar.gz"
checksum=736681cb25da31eb8ced96055d4150d649fe6ef6e523b6f65846c3446ac09a96
-
-pidgin-gpg_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 5a3e0870de..9ffc04b8a4 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -11,9 +11,3 @@ license="GPL-2"
homepage="http://www.cypherpunks.ca/otr/"
distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
checksum=d56b3f092dbe9ee6597641c7d2dd294884dc04ba47aaf4ec571cd54977df4691
-
-pidgin-otr_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch
deleted file mode 100644
index b177654b29..0000000000
--- a/srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpurple/protocols/irc/Makefile.am 2013-02-14 02:44:47.000000000 +0200
-+++ libpurple/protocols/irc/Makefile.am 2013-02-14 02:49:58.000000000 +0200
-@@ -27,7 +27,7 @@ else
- st =
- pkg_LTLIBRARIES = libirc.la
- libirc_la_SOURCES = $(IRCSOURCES)
--libirc_la_LIBADD = $(GLIB_LIBS)
-+libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS)
-
- endif
-
diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index 9ecf9724e0..775ac85ded 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,22 +1,18 @@
# Template file for 'pidgin'
pkgname=pidgin
-version=2.10.7
-revision=2
+version=2.10.8
+revision=1
build_style=gnu-configure
configure_args="--disable-schemas-install --disable-meanwhile
--enable-cyrus-sasl --disable-doxygen --enable-nm --disable-vv
- --with-system-ssl-certs=/etc/ssl/certs --disable-tk
- --disable-gnutls --disable-tcl
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+ --with-system-ssl-certs=/etc/ssl/certs --disable-tk --disable-tcl
+ --disable-gnutls"
short_desc="Multi-protocol instant messaging client"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://pidgin.im/"
distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192
-long_desc="
- Pidgin is an easy to use and free chat client used by millions. Connect to
- AIM, MSN, Yahoo, and more chat networks all at once."
+checksum=b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227
hostmakedepends="pkg-config intltool automake libtool gettext-devel"
makedepends="libglib-devel gtk+-devel libXext-devel
@@ -24,6 +20,7 @@ makedepends="libglib-devel gtk+-devel libXext-devel
libxml2-devel GConf-devel gst-plugins-base-devel libidn-devel python-devel
avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel
libsasl-devel libXext-devel libSM-devel"
+depends="cyrus-sasl-modules"
pre_configure() {
# Create this to make configure happy.
@@ -32,29 +29,27 @@ pre_configure() {
}
post_install() {
- mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
- gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/purple.schemas \
- --domain purple ${wrksrc}/*.schemas
+ rm -rf ${DESTDIR}/etc/gconf
}
libpurple_package() {
short_desc="IM library extracted from Pidgin"
pkg_install() {
vmove "usr/bin/purple-*"
- vmove "usr/lib/libpurple*.so*"
+ vmove "usr/lib/libpurple*.so.*"
vmove usr/lib/purple-2
vmove usr/share/purple
vmove usr/share/sounds/purple
- vmove usr/share/gconf
}
}
libpurple-devel_package() {
- depends="libglib-devel libpurple>=${version}"
- short_desc="IM library extracted from Pidgin -- development files"
+ depends="libglib-devel libpurple>=${version}_${revision}"
+ short_desc="IM library extracted from Pidgin - development files"
pkg_install() {
vmove usr/include/libpurple
vmove usr/lib/pkgconfig/purple.pc
+ vmove usr/lib/libpurple.so
vmove usr/share/aclocal/purple.m4
vmove usr/share/man/man3/Purple.3p
}
@@ -70,11 +65,12 @@ libgnt_package() {
}
libgnt-devel_package() {
- depends="libglib-devel libgnt>=${version}"
- short_desc="IM library extracted from Pidgin (GNT) -- development files"
+ depends="libglib-devel libgnt>=${version}_${revision}"
+ short_desc="IM library extracted from Pidgin (GNT) - development files"
pkg_install() {
vmove usr/include/gnt
vmove usr/lib/pkgconfig/gnt.pc
+ vmove usr/lib/libgnt.so
}
}
@@ -87,8 +83,8 @@ finch_package() {
}
finch-devel_package() {
- depends="libgnt-devel>=${version} libpurple-devel>=${version}"
- short_desc="A ncurses-based messaging client -- development files"
+ depends="libgnt-devel>=${version} libpurple-devel>=${version}_${revision}"
+ short_desc="A ncurses-based messaging client - development files"
pkg_install() {
vmove usr/include/finch
vmove usr/lib/pkgconfig/finch.pc
@@ -96,18 +92,11 @@ finch-devel_package() {
}
pidgin-devel_package() {
- depends="gtk+-devel libpurple-devel>=${version}"
- short_desc="${short_desc} -- development files"
+ depends="gtk+-devel libpurple-devel>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/man/man3/Pidgin.3p
}
}
-
-pidgin_package() {
- depends="cyrus-sasl-modules"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pigz/template b/srcpkgs/pigz/template
index 30ef36b801..2ef24d8c28 100644
--- a/srcpkgs/pigz/template
+++ b/srcpkgs/pigz/template
@@ -19,9 +19,3 @@ do_install() {
vinstall pigz 755 usr/bin
vinstall pigz.1 644 usr/share/man/man1
}
-
-pigz_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pingus/template b/srcpkgs/pingus/template
index edafc91e9c..2603aa8bc2 100644
--- a/srcpkgs/pingus/template
+++ b/srcpkgs/pingus/template
@@ -19,9 +19,3 @@ do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
vinstall ${FILESDIR}/pingus.desktop 644 usr/share/applications
}
-
-pingus_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 6db38d183f..0af990ccb0 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -26,9 +26,3 @@ pixman-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-pixman_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pixz/template b/srcpkgs/pixz/template
index f3fe74c745..26ad3a1e79 100644
--- a/srcpkgs/pixz/template
+++ b/srcpkgs/pixz/template
@@ -22,9 +22,3 @@ do_install() {
vinstall pixz 755 usr/bin
vinstall pixz.1 644 usr/share/man/man1
}
-
-pixz_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pkg-config/template b/srcpkgs/pkg-config/template
index 23d2b6446f..48b6a0b9f5 100644
--- a/srcpkgs/pkg-config/template
+++ b/srcpkgs/pkg-config/template
@@ -21,9 +21,3 @@ if [ "$CROSS_BUILD" ]; then
ac_cv_func_posix_getgrgid_r=yes
ac_cv_func_posix_getgrgid_r=yes"
fi
-
-pkg-config_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 7fa3bf2150..f5ce63b5f0 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -11,9 +11,3 @@ license="GPL-3"
homepage="http://www.poedit.net/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=24535cac22c8f7fb4f995710f6638ebc26825056076a04210ee66e19d65c0f78
-
-poedit_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/polarssl/template b/srcpkgs/polarssl/template
index add8dc9f7e..52a97d80e6 100644
--- a/srcpkgs/polarssl/template
+++ b/srcpkgs/polarssl/template
@@ -28,9 +28,3 @@ polarssl-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-polarssl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/polipo/template b/srcpkgs/polipo/template
index 21ccc0782c..ca03463e4b 100644
--- a/srcpkgs/polipo/template
+++ b/srcpkgs/polipo/template
@@ -2,6 +2,7 @@
pkgname=polipo
version=1.0.4.1
revision=2
+systemd_services="polipo.service on"
short_desc="A small and fast caching web proxy"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -30,10 +31,3 @@ do_install() {
# systemd service
vinstall ${FILESDIR}/polipo.service 644 usr/lib/systemd/system
}
-
-polipo_package() {
- systemd_services="polipo.service on"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index 623f96a691..5806dd2aec 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -20,9 +20,3 @@ long_desc="
method) for unprivileged (desktop) applications.
This package contains the glue to integrate with the GNOME desktop."
-
-polkit-gnome_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/polkit-kde/template b/srcpkgs/polkit-kde/template
index ab43c8f1db..cbb4da96f2 100644
--- a/srcpkgs/polkit-kde/template
+++ b/srcpkgs/polkit-kde/template
@@ -3,6 +3,8 @@ pkgname=polkit-kde
version=0.99.0
revision=1
build_style=cmake
+hostmakedepends="cmake automoc4"
+makedepends="qt-devel phonon-devel polkit-qt-devel kdelibs-devel"
wrksrc="${pkgname}-agent-1-${version}"
short_desc="Daemon providing a polkit authentication UI for KDE"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -10,12 +12,3 @@ homepage="https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1"
license="GPL-2"
distfiles="http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-agent-1-${version}.tar.bz2"
checksum=e371ff2698431decc825bb146d638de432f5fffd09046e225270c30dbac1b467
-
-hostmakedepends="cmake automoc4"
-makedepends="qt-devel phonon-devel polkit-qt-devel kdelibs-devel"
-
-polkit-kde_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/polkit-qt/template b/srcpkgs/polkit-qt/template
index d9ee229cbf..192a11f71f 100644
--- a/srcpkgs/polkit-qt/template
+++ b/srcpkgs/polkit-qt/template
@@ -25,16 +25,10 @@ long_desc="
polkit-qt-devel_package() {
depends="qt-devel polkit-devel polkit-qt>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/cmake
}
}
-
-polkit-qt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 919d143e84..3126953038 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,10 +1,11 @@
# Template file for 'polkit'
pkgname=polkit
version=0.112
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-systemd=yes --with-authfw=pam
- --with-systemdsystemunitdir=/usr/lib/systemd/system"
+ --with-systemdsystemunitdir=/usr/lib/systemd/system --with-os-type=void
+ --with-mozjs=mozjs-17.0 --enable-libsystemd-login=yes"
short_desc="Authorization Toolkit"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/polkit"
@@ -12,34 +13,57 @@ license="GPL-2"
distfiles="http://www.freedesktop.org/software/polkit/releases/polkit-${version}.tar.gz"
checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6
-hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
-makedepends="glib-devel expat-devel pam-devel systemd-devel js-devel shadow"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
+makedepends="libglib-devel expat-devel pam-devel systemd-devel mozjs17-devel shadow"
+depends="shadow"
+system_accounts="polkitd"
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" automake libtool gettext-devel gtk-doc gobject-introspection"
+else
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ autoreconf -fi
+ fi
# Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF.
sed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure
}
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ sed -e "s,/usr/include/js-17.0,${XBPS_CROSS_BASE}/usr/include/js-17.0," -i src/polkitbackend/Makefile
+ fi
+}
+
post_install() {
vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1
vinstall ${FILESDIR}/polkit.tmpfiles 644 usr/lib/tmpfiles.d polkit.conf
}
polkit-devel_package() {
- depends="libglib-devel polkit>=${version}"
+ depends="libglib-devel polkit>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/share/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove "usr/share/gir-*"
+ fi
vmove "usr/lib/*.so"
}
}
-
-polkit_package() {
- system_accounts="polkitd"
- depends="shadow"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/polysh/template b/srcpkgs/polysh/template
index a3507ee0e2..ecc38a42e7 100644
--- a/srcpkgs/polysh/template
+++ b/srcpkgs/polysh/template
@@ -2,7 +2,11 @@
pkgname=polysh
version=0.4
revision=2
+noarch="yes"
build_style=python-module
+makedepends="python-devel"
+depends="python>=2.7<3.0 openssh"
+pycompile_module="polysh"
short_desc="Execute a command in multiple remote shells at once"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -12,14 +16,3 @@ checksum=0456c25c664dad80ebf7bf748a1661fddf5fbea0a3788328621029c4d0b8b04f
long_desc="
Polysh is a tool to aggregate several remote shells into one. It is used to
launch an interactive remote shell on many machines at once."
-
-makedepends="python-devel"
-
-polysh_package() {
- noarch="yes"
- pycompile_module="polysh"
- depends="python>=2.7<3.0 openssh"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template
index 5cd9e76c71..98837702cd 100644
--- a/srcpkgs/poppler-qt4/template
+++ b/srcpkgs/poppler-qt4/template
@@ -12,6 +12,7 @@ configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
hostmakedepends="pkg-config"
makedepends="libpng-devel>=1.5.10 tiff-devel lcms2-devel libcurl-devel
fontconfig-devel cairo-devel qt-devel>=4.8.2_2"
+depends="poppler-data qt>=4.8.2_2"
short_desc="PDF rendering library - QT bindings"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -45,10 +46,3 @@ poppler-qt4-devel_package() {
rm -rf ${DESTDIR}/usr/include
}
}
-
-poppler-qt4_package() {
- depends="poppler-data qt>=4.8.2_2"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index a67105adf3..feeb5e767a 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -8,6 +8,7 @@ configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
--enable-xpdf-headers --disable-poppler-qt4 --disable-gtk-test"
hostmakedepends="pkg-config poppler-data"
makedepends="libpng-devel>=1.6 glib-devel cairo-devel tiff-devel lcms2-devel libcurl-devel"
+depends="poppler-data"
short_desc="PDF rendering library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -113,10 +114,3 @@ poppler-utils_package() {
vmove usr/share/man
}
}
-
-poppler_package() {
- depends="poppler-data"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/popt/template b/srcpkgs/popt/template
index e824492e6e..c392be8e56 100644
--- a/srcpkgs/popt/template
+++ b/srcpkgs/popt/template
@@ -1,9 +1,8 @@
# Template file for 'popt'
pkgname=popt
version=1.16
-revision=4
+revision=6
build_style=gnu-configure
-configure_args="--disable-static --disable-rpath"
short_desc="Command line option parsing library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://rpm5.org"
@@ -12,17 +11,13 @@ distfiles="http://rpm5.org/files/$pkgname/$pkgname-$version.tar.gz"
checksum=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8
popt-devel_package() {
- depends="popt>=${version}"
- short_desc="${short_desc} -- development files"
+ depends="popt>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
vmove usr/share/man/man3
}
}
-
-popt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/portaudio/template b/srcpkgs/portaudio/template
index e79ec561fb..f88ce32004 100644
--- a/srcpkgs/portaudio/template
+++ b/srcpkgs/portaudio/template
@@ -23,7 +23,7 @@ makedepends="alsa-lib-devel jack-devel"
portaudio-devel_package() {
depends="portaudio>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove "usr/include/*.h"
vmove usr/lib/pkgconfig/portaudio-2.0.pc
@@ -31,7 +31,7 @@ portaudio-devel_package() {
}
portaudiocpp_package() {
- short_desc="${short_desc} - C++ Bindings"
+ short_desc+=" - C++ Bindings"
pkg_install() {
vmove "usr/lib/libportaudiocpp.so*"
}
@@ -39,16 +39,10 @@ portaudiocpp_package() {
portaudiocpp-devel_package() {
depends="portaudiocpp>=${version} portaudio-devel>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include/portaudiocpp
vmove usr/lib/pkgconfig/portaudiocpp.pc
vmove "usr/lib/libportaudiocpp.a*"
}
}
-
-portaudio_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index b44ea08f08..26bfaadc03 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -11,13 +11,49 @@ checksum=f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4
hostmakedepends="perl"
makedepends="openssl-devel db-devel>=5.3 pcre-devel>=8.30 libsasl-devel
- libldap-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel sqlite-devel"
+ libldap-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel
+ sqlite-devel shadow"
if [ "$CROSS_BUILD" ]; then
# XXX postfix-install needs native binaries.
hostmakedepends+=" ${pkgname}>=2.10.2"
fi
+conf_files="
+ /etc/postfix/access
+ /etc/postfix/aliases
+ /etc/postfix/canonical
+ /etc/postfix/generic
+ /etc/postfix/header_checks
+ /etc/postfix/main.cf
+ /etc/postfix/master.cf
+ /etc/postfix/relocated
+ /etc/postfix/transport
+ /etc/postfix/virtual"
+depends="shadow"
+systemd_services="postfix.service true"
+system_accounts="postfix"
+postfix_homedir="/var/spool/postfix"
+system_groups="postdrop"
+provides="smtp-server-0_1"
+replaces="smtp-server>=0"
+make_dirs="
+ /var/lib/postfix 0750 postfix root
+ /var/spool/postfix/active 0750 postfix root
+ /var/spool/postfix/bounce 0750 postfix root
+ /var/spool/postfix/corrupt 0750 postfix root
+ /var/spool/postfix/defer 0750 postfix root
+ /var/spool/postfix/deferred 0750 postfix root
+ /var/spool/postfix/flush 0750 postfix root
+ /var/spool/postfix/hold 0750 postfix root
+ /var/spool/postfix/incoming 0750 postfix root
+ /var/spool/postfix/private 0750 postfix root
+ /var/spool/postfix/maildrop 0750 postfix postdrop
+ /var/spool/postfix/public 0750 postfix postdrop
+ /var/spool/postfix/pid 0750 root root
+ /var/spool/postfix/saved 0750 postfix root
+ /var/spool/postfix/trace 0750 postfix root"
+
do_build() {
sed -e "s,\(/usr/include/db.h\),${XBPS_CROSS_BASE}/\1,g" -i makedefs
@@ -71,43 +107,3 @@ do_install() {
# systemd.
vinstall ${FILESDIR}/postfix.service 644 usr/lib/systemd/system
}
-
-postfix_package() {
- conf_files="
- /etc/postfix/access
- /etc/postfix/aliases
- /etc/postfix/canonical
- /etc/postfix/generic
- /etc/postfix/header_checks
- /etc/postfix/main.cf
- /etc/postfix/master.cf
- /etc/postfix/relocated
- /etc/postfix/transport
- /etc/postfix/virtual"
- depends="shadow"
- systemd_services="postfix.service true"
- system_accounts="postfix"
- postfix_homedir="/var/spool/postfix"
- system_groups="postdrop"
- provides="smtp-server-0_1"
- replaces="smtp-server>=0"
- make_dirs="
- /var/lib/postfix 0750 postfix root
- /var/spool/postfix/active 0750 postfix root
- /var/spool/postfix/bounce 0750 postfix root
- /var/spool/postfix/corrupt 0750 postfix root
- /var/spool/postfix/defer 0750 postfix root
- /var/spool/postfix/deferred 0750 postfix root
- /var/spool/postfix/flush 0750 postfix root
- /var/spool/postfix/hold 0750 postfix root
- /var/spool/postfix/incoming 0750 postfix root
- /var/spool/postfix/private 0750 postfix root
- /var/spool/postfix/maildrop 0750 postfix postdrop
- /var/spool/postfix/public 0750 postfix postdrop
- /var/spool/postfix/pid 0750 root root
- /var/spool/postfix/saved 0750 postfix root
- /var/spool/postfix/trace 0750 postfix root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index d74221cd82..af6ea03816 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -22,7 +22,18 @@ long_desc="
hostmakedepends="flex"
makedepends="libfl-devel readline-devel openssl-devel perl>=5.16
- tcl-devel>=8.6 python-devel libxml2-devel libxslt-devel pam-devel"
+ tcl-devel>=8.6 python-devel libxml2-devel libxslt-devel pam-devel shadow"
+depends="shadow"
+conf_files="
+ /etc/default/${pkgname}
+ /etc/pam.d/${pkgname}
+ /etc/${pkgname}/${pkgname}.conf"
+systemd_services="${pkgname}.service on"
+# Create 'postgres' user for the server.
+system_accounts="postgres"
+postgres_homedir="/var/lib/${pkgname}"
+postgres_shell="/bin/sh"
+postgres_descr="PostgreSQL database server user"
if [ "$CROSS_BUILD" ]; then
CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/libxml2"
@@ -144,20 +155,3 @@ postgresql-client_package() {
${PKGDESTDIR}/usr/share/postgresql
}
}
-
-postgresql_package() {
- conf_files="
- /etc/default/${pkgname}
- /etc/pam.d/${pkgname}
- /etc/${pkgname}/${pkgname}.conf"
- systemd_services="${pkgname}.service on"
- # Create 'postgres' user for the server.
- system_accounts="postgres"
- postgres_homedir="/var/lib/${pkgname}"
- postgres_shell="/bin/sh"
- postgres_descr="PostgreSQL database server user"
- depends="shadow"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/potrace/template b/srcpkgs/potrace/template
index 5242f3893f..0809f8a7cf 100644
--- a/srcpkgs/potrace/template
+++ b/srcpkgs/potrace/template
@@ -36,9 +36,3 @@ potrace-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-potrace_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 35769f6e69..0b68a85e67 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -11,9 +11,3 @@ license="GPL-2"
homepage="https://01.org/powertop/"
distfiles="http://01.org/powertop/sites/default/files/downloads/${pkgname}-${version}.tar.gz"
checksum=8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b
-
-powertop_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template
index 70777ff4e1..27f1058dd8 100644
--- a/srcpkgs/ppl/template
+++ b/srcpkgs/ppl/template
@@ -33,9 +33,3 @@ ppl-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-ppl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 365ccb4ced..361386ffc8 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -15,6 +15,12 @@ long_desc="
CFLAGS="-D_GNU_SOURCE"
makedepends="libpcap-devel"
+conf_files="
+ /etc/ppp/ip-up
+ /etc/ppp/chap-secrets
+ /etc/ppp/options
+ /etc/ppp/ip-down
+ /etc/ppp/pap-secrets"
do_configure() {
# Custom CFLAGS.
@@ -85,16 +91,3 @@ ppp-devel_package() {
vmove usr/include
}
}
-
-ppp_package() {
- conf_files="
- /etc/ppp/ip-up
- /etc/ppp/chap-secrets
- /etc/ppp/options
- /etc/ppp/ip-down
- /etc/ppp/pap-secrets"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/prelink/template b/srcpkgs/prelink/template
index 6c8dcb03a6..a8f0a785d6 100644
--- a/srcpkgs/prelink/template
+++ b/srcpkgs/prelink/template
@@ -16,9 +16,3 @@ long_desc="
POSIX-compliant operating systems, principally Linux (because it modifies ELF
executables). It is intended to speed up a system by reducing the time a
program needs to begin."
-
-prelink_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/presentproto/template b/srcpkgs/presentproto/template
index 1dbb684888..feaa9ea8a8 100644
--- a/srcpkgs/presentproto/template
+++ b/srcpkgs/presentproto/template
@@ -2,6 +2,7 @@
pkgname=presentproto
version=1.0
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="Present extension headers from X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,10 +10,3 @@ homepage="http://xorg.freedesktop.org"
license="MIT"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=812c7d48721f909a0f7a2cb1e91f6eead76159a36c4712f4579ca587552839ce
-
-presentproto_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/primus/template b/srcpkgs/primus/template
index bc693d8fad..bf68a045a3 100644
--- a/srcpkgs/primus/template
+++ b/srcpkgs/primus/template
@@ -25,9 +25,3 @@ do_install() {
vinstall primusrun.1 644 usr/share/man/man1
vinstall LICENSE.txt 644 usr/share/licenses/$pkgname LICENSE
}
-
-primus_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/printproto/template b/srcpkgs/printproto/template
index f06c307ffb..a09a2796c9 100644
--- a/srcpkgs/printproto/template
+++ b/srcpkgs/printproto/template
@@ -2,6 +2,7 @@
pkgname=printproto
version=1.0.4
revision=3
+noarch="yes"
build_style=gnu-configure
short_desc="Print extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,12 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be
-long_desc="
- Definitions needed by the X Print server, library, and clients."
-
-printproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template
index c75117591f..34d4369afc 100644
--- a/srcpkgs/procps-ng/template
+++ b/srcpkgs/procps-ng/template
@@ -9,6 +9,7 @@ configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin
ac_cv_func_strtod=yes ac_cv_func_mmap_fixed_mapped=yes"
hostmakedepends="pkg-config"
makedepends="ncurses-devel systemd-devel"
+conflicts="coreutils<8.21_3"
short_desc="Utilities for monitoring your system and its processes"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -26,10 +27,3 @@ post_install() {
${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig
rm -f ${DESTDIR}/usr/lib/*.so
}
-
-procps-ng_package() {
- conflicts="coreutils<8.21_3"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/profile-cleaner/template b/srcpkgs/profile-cleaner/template
index fa7cf5c6c4..7763163d3d 100644
--- a/srcpkgs/profile-cleaner/template
+++ b/srcpkgs/profile-cleaner/template
@@ -2,9 +2,11 @@
pkgname=profile-cleaner
version=2.25
revision=1
+noarch="yes"
build_style=gnu-makefile
short_desc="Reduces profile size by cleaning their sqlite databases"
makedepends="sqlite bc parallel findutils"
+depends="sqlite bc parallel findutils"
maintainer="graysky <graysky AT archlinux DOT us>"
license="MIT"
homepage="https://github.com/graysky2/profile-cleaner"
@@ -14,11 +16,3 @@ checksum=6fa00d24253910bb460d4b60969d65079efbf9208286e6c641d722f9874412f6
post_install() {
vinstall LICENSE 644 usr/share/licenses/$pkgname
}
-
-profile-cleaner_package() {
- noarch="yes"
- depends="sqlite bc parallel findutils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/profile-sync-daemon/template b/srcpkgs/profile-sync-daemon/template
index a1e2fd89d8..e82b9e0b7f 100644
--- a/srcpkgs/profile-sync-daemon/template
+++ b/srcpkgs/profile-sync-daemon/template
@@ -1,13 +1,17 @@
# Template file for 'profile-sync-daemon'
pkgname=profile-sync-daemon
-version=5.44
+version=5.45.1
revision=1
+noarch="yes"
+conf_files="/etc/psd.conf"
+makedepends="rsync"
+depends="${makedepends}"
short_desc="Syncs browser profiles to tmpfs"
maintainer="graysky <graysky AT archlinux DOT us>"
license="MIT"
homepage="https://github.com/graysky2/profile-sync-daemon"
distfiles="http://repo-ck.com/source/$pkgname/$pkgname-$version.tar.xz"
-checksum=a77c3bc67a841b2922ebd98c8671a8a676066e2583513923f0baa81276cad57d
+checksum=5f93e77c6ad4d7688a9503f9d426f9e29b6af64196e110a7e85f4f4f799f8487
long_desc="
profile-sync-daemon symlinks and sync browser profiles to RAM (tmpfs) thus
reducing SSD/HDD calls and speeding-up browsers."
@@ -16,12 +20,3 @@ do_install() {
make DESTDIR="$DESTDIR" install-systemd-all
install -Dm644 MIT "$DESTDIR/usr/share/licenses/$pkgname/LICENSE"
}
-
-profile-sync-daemon_package() {
- noarch="yes"
- conf_files="/etc/psd.conf"
- depends="rsync"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/proot/template b/srcpkgs/proot/template
index 54362270d6..38e6bf3d7f 100644
--- a/srcpkgs/proot/template
+++ b/srcpkgs/proot/template
@@ -23,9 +23,3 @@ do_install() {
vinstall src/proot 755 usr/bin
vinstall doc/proot.1 644 usr/share/man/man1
}
-
-proot_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/proplib/template b/srcpkgs/proplib/template
index 77c942a8bb..35b15e3985 100644
--- a/srcpkgs/proplib/template
+++ b/srcpkgs/proplib/template
@@ -21,9 +21,3 @@ proplib-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-proplib_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/protobuf-vala/template b/srcpkgs/protobuf-vala/template
index 3a70959fcd..e888ae479c 100644
--- a/srcpkgs/protobuf-vala/template
+++ b/srcpkgs/protobuf-vala/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
configure_args="--disable-static"
makedepends="pkg-config libgee08-devel protobuf-devel vala-devel"
+depends="pkg-config glib-devel"
short_desc="A plugin for the Google protocol buffer compiler to generate Vala code"
maintainer="pancake <pancake@nopcode.org>"
license="GPL-3"
@@ -15,15 +16,8 @@ checksum=c12547813fa22ee2b15967f17146b08e2a4d90800810fe63730332aea6777c48
disable_parallel_build=yes
libprotobuf-vala_package() {
- short_desc="${short_desc} -- shared library"
+ short_desc+=" - shared library"
pkg_install() {
vmove "usr/lib/*.so*"
}
}
-
-protobuf-vala_package() {
- depends="pkg-config glib-devel"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index dfc5b14af9..76ae30269f 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -32,9 +32,3 @@ protobuf-lite_package() {
vmove "usr/lib/libprotobuf-lite.so*"
}
}
-
-protobuf_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/psmisc/template b/srcpkgs/psmisc/template
index 8a24b5b901..37c429170a 100644
--- a/srcpkgs/psmisc/template
+++ b/srcpkgs/psmisc/template
@@ -3,6 +3,9 @@ pkgname=psmisc
version=22.20
revision=1
build_style=gnu-configure
+configure_args="ac_cv_func_malloc_0_nonnull=yes
+ ac_cv_func_realloc_0_nonnull=yes
+ ac_cv_func_memcmp_working=yes"
makedepends="ncurses-devel"
short_desc="Small set of utilities that use the linux proc filesystem"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -10,13 +13,3 @@ homepage="http://psmisc.sourceforge.net/index.html"
license="GPL-2"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=b17224e2385f6a799ffebba27eb7870771d42555e86814ef56b6d7e955765514
-
-configure_args="ac_cv_func_malloc_0_nonnull=yes
- ac_cv_func_realloc_0_nonnull=yes
- ac_cv_func_memcmp_working=yes"
-
-psmisc_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index a1d642f3dd..1a1b058475 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -14,6 +14,12 @@ makedepends="zlib-devel libltdl-devel glib-devel libudev-devel speex-devel libXi
libsamplerate-devel json-c-devel>=0.11_2 orc-devel jack-devel fftw-devel
systemd-devel webrtc-audio-processing-devel sbc-devel
libcap-progs libxcb-devel libXtst-devel libSM-devel rtkit"
+depends="rtkit"
+conf_files="
+ /etc/pulse/system.pa
+ /etc/pulse/daemon.conf
+ /etc/pulse/client.conf
+ /etc/pulse/default.pa"
short_desc="A featureful, general-purpose sound server"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/PulseAudio"
@@ -75,15 +81,3 @@ pulseaudio-devel_package() {
vmove usr/share/vala
}
}
-
-pulseaudio_package() {
- depends="rtkit"
- conf_files="
- /etc/pulse/system.pa
- /etc/pulse/daemon.conf
- /etc/pulse/client.conf
- /etc/pulse/default.pa"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template
index 71c7627177..34bdb2bb96 100644
--- a/srcpkgs/putty/template
+++ b/srcpkgs/putty/template
@@ -11,9 +11,3 @@ license="MIT"
homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz"
checksum=81e8eaaf31be7d9a46b4f3fb80d1d9540776f142cd89d0a11f2f8082dc68f8b5
-
-putty_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/py2cairo/files/python-config b/srcpkgs/py2cairo/files/python-config
new file mode 100644
index 0000000000..ee6ce9e04a
--- /dev/null
+++ b/srcpkgs/py2cairo/files/python-config
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# python wrapper for cross compilation in xbps
+# we simply fake the output of --includes with the cross prefix.
+if [ "$1" = "--includes" ]; then
+ echo "-I${XBPS_CROSS_BASE}/usr/include/python2.7"
+fi
+
+exit 0
diff --git a/srcpkgs/py2cairo/template b/srcpkgs/py2cairo/template
index 535ced8862..0f4ed4365f 100644
--- a/srcpkgs/py2cairo/template
+++ b/srcpkgs/py2cairo/template
@@ -2,9 +2,12 @@
pkgname=py2cairo
version=1.10.0
revision=2
-build_style=waf
-hostmakedepends="pkg-config which"
+build_style=gnu-configure
+hostmakedepends="automake libtool pkg-config which python-devel"
makedepends="cairo-devel python-devel"
+depends="python"
+replaces="pycairo<1.10"
+pycompile_module="cairo"
short_desc="Python2 bindings for the cairo graphics library"
homepage="http://cairographics.org/pycairo/"
license="LGPL-3"
@@ -12,21 +15,26 @@ maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://cairographics.org/releases/$pkgname-$version.tar.bz2"
checksum=d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431
+pre_configure() {
+ touch ChangeLog
+ NOCONFIGURE=1 autoreconf -fi
+}
+
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ # create a python-config wrapper to fake --includes
+ install -m755 ${FILESDIR}/python-config ${wrksrc}
+ export PATH=${wrksrc}:$PATH
+ fi
+ env PYTHON=python ./configure ${configure_args}
+}
+
py2cairo-devel_package() {
replaces="pycairo-devel<1.10"
- depends="python-devel ${sourcepkg}>=${version}"
+ depends="python-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-py2cairo_package() {
- replaces="pycairo<1.10"
- depends="python"
- pycompile_module="cairo"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pyatspi/template b/srcpkgs/pyatspi/template
index 10c65cb9af..cc238337a8 100644
--- a/srcpkgs/pyatspi/template
+++ b/srcpkgs/pyatspi/template
@@ -2,21 +2,15 @@
pkgname=pyatspi
version=2.10.0
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="at-spi2-core-devel>=2.10 pygobject-devel>=3.10"
+depends="at-spi2-core>=2.10 pygobject>=3.10"
+pycompile_module="pyatspi"
short_desc="Python bindings for AT-SPI"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=42f89ddb9a236448503573e4cd1ddb174e233e005316de9acdb957eb1aa9ad84
-
-pyatspi_package() {
- noarch="yes"
- pycompile_module="pyatspi"
- depends="at-spi2-core>=2.10 pygobject>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pycairo/template b/srcpkgs/pycairo/template
index 783c85f140..09c84dd796 100644
--- a/srcpkgs/pycairo/template
+++ b/srcpkgs/pycairo/template
@@ -20,9 +20,3 @@ pycairo-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-pycairo_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pycrypto/template b/srcpkgs/pycrypto/template
index a8c39f3dd4..f476e8db11 100644
--- a/srcpkgs/pycrypto/template
+++ b/srcpkgs/pycrypto/template
@@ -5,6 +5,7 @@ revision=1
build_style=python-module
hostmakedepends="python"
makedepends="gmp-devel python-devel"
+pycompile_module="Crypto"
short_desc="The Python Cryptography Toolkit"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://www.dlitz.net/software/pycrypto/"
@@ -22,10 +23,3 @@ pre_build() {
fi
CC= CFLAGS= ./configure ${configure_args}
}
-
-pycrypto_package() {
- pycompile_module="Crypto"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pycups/template b/srcpkgs/pycups/template
index 8b6ffa27e3..fd187a5f77 100644
--- a/srcpkgs/pycups/template
+++ b/srcpkgs/pycups/template
@@ -11,9 +11,3 @@ homepage="http://cyberelk.net/tim/software/pycups/"
license="GPL-2"
distfiles="http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=7cad7d676d6e4b759d07ecefe2519cb438a7d074e67b4103efdeff8247cc51ab
-
-pycups_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pycurl/template b/srcpkgs/pycurl/template
index 01f2959daa..e6ae622ae5 100644
--- a/srcpkgs/pycurl/template
+++ b/srcpkgs/pycurl/template
@@ -4,6 +4,7 @@ version=7.19.0
revision=3
build_style=python-module
makedepends="openssl-devel libcurl-devel python-devel"
+pycompile_module="curl"
short_desc="Python interface to the CURL library"
homepage="http://pycurl.sourceforge.net/"
license="LGPL-2.1/MIT"
@@ -14,10 +15,3 @@ long_desc="
PycURL is a Python interface to libcurl. PycURL can be used to fetch objects
identified by a URL from a Python program, similar to the urllib Python
module. PycURL is mature, very fast, and supports a lot of features."
-
-pycurl_package() {
- pycompile_module="curl"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pygobject/template b/srcpkgs/pygobject/template
index d77ce1ede4..019e090e08 100644
--- a/srcpkgs/pygobject/template
+++ b/srcpkgs/pygobject/template
@@ -4,6 +4,8 @@ version=3.10.2
revision=1
hostmakedepends="which pkg-config gobject-introspection>=1.38"
makedepends="py2cairo-devel>=1.10.0_2 pycairo-devel>=1.10.0_3 libglib-devel"
+depends="py2cairo>=1.10.0_2"
+pycompile_module="gi pygtkcompat"
short_desc="Python bindings for GObject"
homepage="http://www.pygtk.org/"
license="LGPL-2.1"
@@ -63,14 +65,6 @@ pygobject-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-pygobject_package() {
- pycompile_module="gi pygtkcompat"
- depends="py2cairo>=1.10.0_2"
- pkg_install() {
rm -rf ${DESTDIR}/python3
- vmove all
}
}
diff --git a/srcpkgs/pygobject2/template b/srcpkgs/pygobject2/template
index b7a778c077..06160d1311 100644
--- a/srcpkgs/pygobject2/template
+++ b/srcpkgs/pygobject2/template
@@ -1,12 +1,15 @@
# Template file for 'pygobject2'
pkgname=pygobject2
version=2.28.6
-revision=7
+revision=8
wrksrc=${pkgname%2}-${version}
build_style=gnu-configure
configure_args="--disable-introspection"
-hostmakedepends="pkg-config"
+hostmakedepends="automake libtool pkg-config python-devel which glib-devel"
makedepends="libffi-devel libglib-devel cairo-devel python-devel py2cairo-devel"
+depends="cairo python py2cairo"
+pycompile_module="glib gobject gtk-2.0 pygtk"
+replaces="pygobject<3.0.0"
short_desc="Python bindings for GObject (GLib 2.x)"
homepage="http://www.pygtk.org/"
license="LGPL-2.1"
@@ -14,8 +17,22 @@ maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${GNOME_SITE}/${pkgname%2}/2.28/${pkgname%2}-$version.tar.xz"
checksum=fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
+pre_configure() {
+ NOCONFIGURE=1 autoreconf -fi
+}
+
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ # XXX share python-config wrapper for all pkgs.
+ # create a python-config wrapper to fake --includes
+ install -m755 ${XBPS_SRCPKGDIR}/py2cairo/files/python-config ${wrksrc}
+ sed -e 's,^PYTHON_CONFIG=.*,PYTHON_CONFIG=./python-config,g' -i configure
+ fi
+ ./configure ${configure_args}
+}
+
pygobject2-devel_package() {
- depends="libffi-devel libglib-devel py2cairo-devel pygobject2>=${version}"
+ depends="libffi-devel libglib-devel py2cairo-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pycompile_module="usr/share/pygobject/2.0/codegen"
replaces="pygobject-devel<3.0.0"
@@ -25,12 +42,3 @@ pygobject2-devel_package() {
vmove usr/share
}
}
-
-pygobject2_package() {
- depends="cairo python py2cairo"
- pycompile_module="glib gobject gtk-2.0 pygtk"
- replaces="pygobject<3.0.0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index 9e84e6a935..e11c87eb07 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -1,11 +1,13 @@
# Template file for 'pygtk'
pkgname=pygtk
version=2.24.0
-revision=8
+revision=10
build_style=gnu-configure
# XXX: missing python-numpy build dep
-hostmakedepends="pkg-config"
-makedepends="python-devel gtk+-devel libxml2-devel pygobject2-devel>=2.28.6_6"
+hostmakedepends="pkg-config pygobject2-devel>=2.28.6_6"
+makedepends="python-devel gtk+-devel libxml2-devel libglade-devel pygobject2-devel>=2.28.6_6"
+depends="python pygobject2 py2cairo"
+pycompile_module="gtk-2.0/gtk"
short_desc="Python bindings for the GTK+ toolkit"
homepage="http://www.pygtk.org"
license="LGPL-2.1"
@@ -13,12 +15,22 @@ maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
checksum=cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ # XXX share python-config wrapper for all pkgs.
+ # create a python-config wrapper to fake --includes
+ install -m755 ${XBPS_SRCPKGDIR}/py2cairo/files/python-config ${wrksrc}
+ export PATH=${wrksrc}:$PATH
+ fi
+ env PYTHON=python ./configure ${configure_args}
+}
+
post_install() {
vinstall gtk/gtk-extrafuncs.defs 644 usr/share/pygtk/2.0/defs
}
pygtk-devel_package() {
- depends="python-devel gtk+-devel pygobject2-devel py2cairo-devel pygtk>=${version}_${revision}"
+ depends="python-devel gtk+-devel pygobject2-devel py2cairo-devel libglade-devel pygtk>=${version}_${revision}"
short_desc+=" - development files"
pycompile_module="demos"
pkg_install() {
@@ -29,11 +41,3 @@ pygtk-devel_package() {
vmove usr/lib/pygtk
}
}
-
-pygtk_package() {
- depends="python pygobject2 py2cairo"
- pycompile_module="gtk-2.0/gtk"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pygtksourceview/template b/srcpkgs/pygtksourceview/template
index d4f75e3de0..b526556aa3 100644
--- a/srcpkgs/pygtksourceview/template
+++ b/srcpkgs/pygtksourceview/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-docs"
makedepends="pkg-config intltool gtksourceview2-devel>=2.10.5_2 pygtk-devel"
+depends="pygtk"
short_desc="Python bindings for gtksourceview2"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -17,10 +18,3 @@ long_desc="
highlighting and other features typical of a source editor.
This package contains the python bindings for gtksourceview (GTK+2)."
-
-pygtksourceview_package() {
- depends="pygtk"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pyopenssl/template b/srcpkgs/pyopenssl/template
index da83afcdc5..b37bfe407b 100644
--- a/srcpkgs/pyopenssl/template
+++ b/srcpkgs/pyopenssl/template
@@ -4,7 +4,9 @@ version=0.11
revision=3
wrksrc="pyOpenSSL-${version}"
build_style=python-module
+hostmakedepends="python-devel"
makedepends="openssl-devel python-devel"
+pycompile_module="OpenSSL"
short_desc="Python interface to the OpenSSL library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://launchpad.net/pyopenssl"
@@ -15,10 +17,3 @@ long_desc="
Includes: SSL Context objects, SSL Connection objects, using Python sockets
as transport layer. The Connection object wraps all the socket methods and
can therefore be used interchangeably."
-
-pyopenssl_package() {
- pycompile_module="OpenSSL"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pypy/template b/srcpkgs/pypy/template
index 2db5372f0b..e0eb494b56 100644
--- a/srcpkgs/pypy/template
+++ b/srcpkgs/pypy/template
@@ -19,9 +19,3 @@ do_install() {
mkdir -p ${DESTDIR}/usr/bin
cp -f pypy-c ${DESTDIR}/usr/bin
}
-
-pypy_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pysmbc/template b/srcpkgs/pysmbc/template
index aa8c91559d..1b71b1b5d2 100644
--- a/srcpkgs/pysmbc/template
+++ b/srcpkgs/pysmbc/template
@@ -11,9 +11,3 @@ homepage="http://pypi.python.org/pypi/pysmbc/"
license="GPL-2"
distfiles="http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=479fbb70d97fb64208d95975dc745f06f75661f954a8cbb988fe8b5bce4f379b
-
-pysmbc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pysqlite/template b/srcpkgs/pysqlite/template
index 45c1f5d1e1..97b9b96d9a 100644
--- a/srcpkgs/pysqlite/template
+++ b/srcpkgs/pysqlite/template
@@ -4,6 +4,7 @@ version=2.6.0
revision=3
build_style=python-module
makedepends="sqlite-devel python-devel"
+pycompile_module="pysqlite2"
short_desc="DB-API 2.0 interface for SQLite databases"
homepage="https://code.google.com/p/pysqlite/"
license="MIT"
@@ -16,10 +17,3 @@ long_desc="
post_install() {
rm -r ${DESTDIR}/usr/pysqlite*
}
-
-pysqlite_package() {
- pycompile_module="pysqlite2"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index b73d76f024..42d945e7ce 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -6,18 +6,12 @@ wrksrc="Markdown-${version}"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+noarch="yes"
+pycompile_module="markdown"
+depends="python>=2.7"
short_desc="Python implementation of John Gruber's Markdown"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/Markdown"
license="BSD"
distfiles="http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz"
checksum=f8b9a1efceab71afe9336a7c456fde36bfb0f505fb664ebb7f3dd44eddab44b6
-
-python-Markdown_package() {
- noarch="yes"
- pycompile_module="markdown"
- depends="python>=2.7"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template
index d73162aa29..cd54431999 100644
--- a/srcpkgs/python-MarkupSafe/template
+++ b/srcpkgs/python-MarkupSafe/template
@@ -6,16 +6,10 @@ wrksrc="MarkupSafe-${version}"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+pycompile_module="markupsafe"
short_desc="Implements a XML/HTML/XHTML Markup safe string for Python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/MarkupSafe"
license="MIT"
distfiles="http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
checksum=339ec04d20ad9cdccbfe9f38dce6182cc504ce789e5d0f9647eaa752f0f95300
-
-python-MarkupSafe_package() {
- pycompile_module="markupsafe"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-Pygments/template b/srcpkgs/python-Pygments/template
index 06911ccfd4..daed40dbda 100644
--- a/srcpkgs/python-Pygments/template
+++ b/srcpkgs/python-Pygments/template
@@ -5,18 +5,12 @@ revision=1
wrksrc="Pygments-${version}"
build_style=python-module
makedepends="python-devel python-distribute"
+noarch="yes"
+pycompile_module="pygments"
+depends="python>=2.7 python-distribute"
short_desc="Python syntax highlighter"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pygments.org/"
license="BSD"
distfiles="http://pypi.python.org/packages/source/P/Pygments/Pygments-${version}.tar.gz"
checksum=799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0
-
-python-Pygments_package() {
- noarch="yes"
- pycompile_module="pygments"
- depends="python>=2.7 python-distribute"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-Unidecode/template b/srcpkgs/python-Unidecode/template
index d97ace9bbe..dc753efd95 100644
--- a/srcpkgs/python-Unidecode/template
+++ b/srcpkgs/python-Unidecode/template
@@ -6,18 +6,12 @@ wrksrc="Unidecode-${version}"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+noarch="yes"
+pycompile_module="unidecode"
+depends="python>=2.7"
short_desc="Python ASCII transliterations of Unicode text"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/Unidecode"
license="GPL"
distfiles="https://pypi.python.org/packages/source/U/Unidecode/Unidecode-${version}.tar.gz"
checksum="ca58bf0ce984a20ad3a5d7fdbb7e773d8d1e5fd1570951e47c1908eed8fe0442"
-
-python-Unidecode_package() {
- noarch="yes"
- pycompile_module="unidecode"
- depends="python>=2.7"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-audioread/template b/srcpkgs/python-audioread/template
index ec5183458b..d22bc1a4d3 100644
--- a/srcpkgs/python-audioread/template
+++ b/srcpkgs/python-audioread/template
@@ -2,22 +2,16 @@
pkgname=python-audioread
version=1.0.1
revision=1
+noarch="yes"
distfiles="https://github.com/sampsyo/audioread/archive/v${version}.tar.gz"
checksum="0e6d0f13bdb8e462a84722050f02538eade9e5c6d8da94aa7cdfa2552af15df6"
build_style=python-module
hostmakedepends="python-devel python-distribute"
makedepends="python-devel"
+depends="python>=2.7 gst-python"
+pycompile_module="audioread"
wrksrc="audioread-${version}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="https://github.com/sampsyo/audioread"
license="MIT"
short_desc="Cross-library (GStreamer + Core Audio + MAD + FFmpeg) audio decoding for Python"
-
-python-audioread_package() {
- noarch="yes"
- depends="python>=2.7 gst-python"
- pycompile_module="audioread"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-babel/template b/srcpkgs/python-babel/template
index ea9241580a..22664c19fb 100644
--- a/srcpkgs/python-babel/template
+++ b/srcpkgs/python-babel/template
@@ -2,20 +2,14 @@
pkgname=python-babel
version=0.9.6
revision=2
+noarch=yes
wrksrc="Babel-${version}"
build_style=python-module
makedepends="python-devel python-distribute"
+pycompile_module="babel"
short_desc="A collection of tools for internationalizing Python applications"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://babel.edgewall.org/"
license="BSD"
distfiles="http://ftp.edgewall.com/pub/babel/Babel-${version}.tar.gz"
checksum=4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f
-
-python-babel_package() {
- noarch=yes
- pycompile_module="babel"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-blinker/template b/srcpkgs/python-blinker/template
index 11fe58fefe..9ee7900e9f 100644
--- a/srcpkgs/python-blinker/template
+++ b/srcpkgs/python-blinker/template
@@ -6,18 +6,12 @@ wrksrc="blinker-${version}"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+depends="python>=2.7"
+noarch="yes"
+pycompile_module="blinker"
short_desc="Fast, simple object-to-object and broadcast signaling for Python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://discorporate.us/projects/Blinker/"
license="MIT"
distfiles="http://pypi.python.org/packages/source/b/blinker/blinker-${version}.tar.gz"
checksum=7062c05e9f724e2208835e335df5ffdc169004fe372ca91fb6408cd0f8e3aa85
-
-python-blinker_package() {
- noarch="yes"
- pycompile_module="blinker"
- depends="python>=2.7"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-decorator/template b/srcpkgs/python-decorator/template
index dd9c3b379e..ff46270c43 100644
--- a/srcpkgs/python-decorator/template
+++ b/srcpkgs/python-decorator/template
@@ -5,20 +5,12 @@ revision=1
wrksrc="decorator-${version}"
build_style=python-module
makedepends="python-devel"
+noarch="yes"
+depends="python"
+pycompile_module="decorator.py"
short_desc="Python Decorator module"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/decorator"
license="BSD"
distfiles="http://pypi.python.org/packages/source/d/decorator/decorator-$version.tar.gz"
checksum=c878e3c9a4015893fddcc7a145017bd54bd51cda0eb234cab6a20fa02540cb1f
-long_desc="
- This package contains $pkgname: a Python Decorator module."
-
-python-decorator_package() {
- noarch="yes"
- depends="python"
- pycompile_module="decorator.py"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-distribute/template b/srcpkgs/python-distribute/template
index 78c8a3a6a5..1dddc7afea 100644
--- a/srcpkgs/python-distribute/template
+++ b/srcpkgs/python-distribute/template
@@ -5,20 +5,12 @@ revision=1
wrksrc="distribute-${version}"
build_style=python-module
makedepends="python-devel"
+noarch="yes"
+depends="python"
+pycompile_module="pkg_resources.py easy_install.py site.py setuptools"
short_desc="A collection of extensions to the Python distutils"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/distribute"
license="PSF"
distfiles="http://pypi.python.org/packages/source/d/distribute/distribute-$version.tar.gz"
checksum=a42e897551aeb7600708f4aa6a0c02acb4458613976234b7d4fad7ae841a8d63
-long_desc="
- Extensions to the python-distutils for large or complex distributions."
-
-python-distribute_package() {
- noarch="yes"
- depends="python"
- pycompile_module="pkg_resources.py easy_install.py site.py setuptools"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-distutils-extra/template b/srcpkgs/python-distutils-extra/template
index bffe3c7fc3..55afdb7cfc 100644
--- a/srcpkgs/python-distutils-extra/template
+++ b/srcpkgs/python-distutils-extra/template
@@ -4,6 +4,9 @@ version=2.37
revision=1
build_style=python-module
makedepends="python-distribute intltool"
+depends="python python-distribute"
+noarch="yes"
+pycompile_module="DistUtilsExtra"
short_desc="Enhancements to the Python build system"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="https://launchpad.net/python-distutils-extra"
@@ -15,12 +18,3 @@ long_desc="
Enables you to easily integrate gettext support, themed icons and
scrollkeeper-based documentation into Python's distutils."
-
-python-distutils-extra_package() {
- depends="python python-distribute"
- noarch="yes"
- pycompile_module="DistUtilsExtra"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
index 3b44f8e47d..ed63ca4cf4 100644
--- a/srcpkgs/python-docutils/template
+++ b/srcpkgs/python-docutils/template
@@ -5,18 +5,12 @@ wrksrc="docutils-${version}"
revision=1
build_style=python-module
makedepends="python"
+depends="${makedepends}"
+noarch="yes"
+pycompile_module="docutils"
short_desc="Text processing system to convert to various formats"
maintainer="pancake <pancake@nopcode.org>"
homepage="http://docutils.sourceforge.net"
license="GPL-3"
distfiles="${SOURCEFORGE_SITE}/docutils/docutils-${version}.tar.gz"
checksum=370624e61b6773da2f2fb17cc2a4eaea4bb596c3585d13f75ff193c1c738603e
-
-python-docutils_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="docutils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-dulwich/template b/srcpkgs/python-dulwich/template
index 19fcaabf3c..4788a77e50 100644
--- a/srcpkgs/python-dulwich/template
+++ b/srcpkgs/python-dulwich/template
@@ -5,16 +5,10 @@ revision=1
wrksrc="dulwich-${version}"
build_style=python-module
makedepends="python-devel"
+pycompile_module="dulwich"
short_desc="Python implementation of the Git file formats and protocols"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://samba.org/~jelmer/dulwich/"
license="GPL-2"
distfiles="http://samba.org/~jelmer/dulwich/dulwich-${version}.tar.gz"
checksum=546d2840199500dc270da5bda456df68de4d1733f8b184bf425c5e560f988b6a
-
-python-dulwich_package() {
- pycompile_module="dulwich"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-e_dbus-devel b/srcpkgs/python-e_dbus-devel
deleted file mode 120000
index ef972f55cd..0000000000
--- a/srcpkgs/python-e_dbus-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-e_dbus
\ No newline at end of file
diff --git a/srcpkgs/python-ecdsa/template b/srcpkgs/python-ecdsa/template
index 219f4ac59b..fb0401f30b 100644
--- a/srcpkgs/python-ecdsa/template
+++ b/srcpkgs/python-ecdsa/template
@@ -6,17 +6,11 @@ wrksrc="${pkgname/python-/}-${version}"
build_style=python-module
hostmakedepends="python"
makedepends="python-devel python-setuptools"
+noarch="yes"
+pycompile_module="ecdsa"
short_desc="Python Implementation of ECDSA"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/warner/python-ecdsa"
license="MIT"
distfiles="http://pypi.python.org/packages/source/e/ecdsa/ecdsa-$version.tar.gz"
checksum=67dae9e1af2b0fd71bc9a378654f7dc89211c1c5aee71e160f8cfce1fa6d6980
-
-python-ecdsa_package() {
- noarch="yes"
- pycompile_module="ecdsa"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-ecore-devel b/srcpkgs/python-ecore-devel
deleted file mode 120000
index 14988b88db..0000000000
--- a/srcpkgs/python-ecore-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-ecore
\ No newline at end of file
diff --git a/srcpkgs/python-edje-devel b/srcpkgs/python-edje-devel
deleted file mode 120000
index 00afdbc832..0000000000
--- a/srcpkgs/python-edje-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-edje
\ No newline at end of file
diff --git a/srcpkgs/python-efl/template b/srcpkgs/python-efl/template
index c220ab336e..2ffb20850a 100644
--- a/srcpkgs/python-efl/template
+++ b/srcpkgs/python-efl/template
@@ -1,24 +1,18 @@
# Template file for 'python-efl'
pkgname=python-efl
-version=1.8.0
+version=1.8.1
revision=1
build_style=python-module
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config python-devel"
makedepends="efl-devel>=${version} elementary-devel>=${version} dbus-python-devel"
+depends="dbus-python"
+pycompile_modules="evas efl edje emotion ecore elementary e_dbus"
+for f in evas ecore edje elementary e_dbus; do
+ replaces+="python-${f}>=0 python-${f}-devel>=0 "
+done
homepage="http://enlightenment.org"
short_desc="Python2 bindings for Enlightenment Foundation Libraries"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/bindings/python/${pkgname}-${version}.tar.gz"
-checksum=8f883c325e30ee3eb2fa38822fa353a22207441b385f4e167cf9c1cf855638f7
-
-python-efl_package() {
- depends="dbus-python"
- pycompile_modules="evas efl edje emotion ecore elementary e_dbus"
- for f in evas ecore edje elementary e_dbus; do
- replaces+="python-${f}>=0 python-${f}-devel>=0 "
- done
- pkg_install() {
- vmove all
- }
-}
+checksum=90ea20d0a90448fd1dcd56210bf34cb9a78905852d83620617bf164f1cef5edc
diff --git a/srcpkgs/python-elementary-devel b/srcpkgs/python-elementary-devel
deleted file mode 120000
index a56cd91f19..0000000000
--- a/srcpkgs/python-elementary-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-elementary
\ No newline at end of file
diff --git a/srcpkgs/python-evas-devel b/srcpkgs/python-evas-devel
deleted file mode 120000
index c863a4d00f..0000000000
--- a/srcpkgs/python-evas-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-evas
\ No newline at end of file
diff --git a/srcpkgs/python-feedgenerator/template b/srcpkgs/python-feedgenerator/template
index 053a2c9f0b..d2273c50e5 100644
--- a/srcpkgs/python-feedgenerator/template
+++ b/srcpkgs/python-feedgenerator/template
@@ -6,18 +6,12 @@ wrksrc="feedgenerator-${version}"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+noarch="yes"
+pycompile_module="feedgenerator"
+depends="python>=2.7 python-pytz python-six"
short_desc="Python Standalone version of django.utils.feedgenerator"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/feedgenerator"
license="MIT"
distfiles="http://pypi.python.org/packages/source/f/feedgenerator/feedgenerator-${version}.tar.gz"
checksum=7bc7dae02d5ca37f305311ca1696f2945625b08db70056b35f18727894bc5a3e
-
-python-feedgenerator_package() {
- noarch="yes"
- pycompile_module="feedgenerator"
- depends="python>=2.7 python-pytz python-six"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-gconf/template b/srcpkgs/python-gconf/template
index e92ab28bc9..6c7155a807 100644
--- a/srcpkgs/python-gconf/template
+++ b/srcpkgs/python-gconf/template
@@ -9,6 +9,8 @@ configure_args="--enable-gconf --disable-gnome --disable-gnomeui
--disable-pyvfsmodule --disable-bonobo_activation --disable-bonobo
--disable-bonoboui"
makedepends="pkg-config python-devel pygobject2-devel pygtk-devel GConf-devel"
+pycompile_dirs="usr/share/pygtk/2.0"
+depends="pygobject2 pygtk"
short_desc="Python bindings for interacting with GConf"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -22,11 +24,3 @@ long_desc="
post_install() {
rm -rf ${DESTDIR}/usr/lib/pkgconfig
}
-
-python-gconf_package() {
- pycompile_dirs="usr/share/pygtk/2.0"
- depends="pygobject2 pygtk"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-httplib2/template b/srcpkgs/python-httplib2/template
index fdfd613460..fc4a7f699d 100644
--- a/srcpkgs/python-httplib2/template
+++ b/srcpkgs/python-httplib2/template
@@ -24,11 +24,5 @@ long_desc="
* Unit Tested"
makedepends="python-devel python-distribute openssl-devel"
-
-python-httplib2_package() {
- noarch="yes"
- pycompile_module="httplib2"
- pkg_install() {
- vmove usr
- }
-}
+noarch="yes"
+pycompile_module="httplib2"
diff --git a/srcpkgs/python-imaging/template b/srcpkgs/python-imaging/template
index b85d3ef319..947624aeb8 100644
--- a/srcpkgs/python-imaging/template
+++ b/srcpkgs/python-imaging/template
@@ -5,6 +5,7 @@ revision=2
wrksrc="Imaging-${version}"
build_style=python-module
makedepends="python-devel libjpeg-turbo-devel freetype-devel lcms-devel"
+pycompile_module="PIL"
short_desc="PIL. Provides image processing capabilities for python"
maintainer="Juan RP <xtraeme@gmail.com>"
license="PIL"
@@ -15,10 +16,3 @@ checksum=895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211
post_install() {
vinstall README 644 usr/share/licenses/${pkgname}/LICENSE
}
-
-python-imaging_package() {
- pycompile_module="PIL"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-inotify/template b/srcpkgs/python-inotify/template
index cc1a6b2674..56ed6ffc30 100644
--- a/srcpkgs/python-inotify/template
+++ b/srcpkgs/python-inotify/template
@@ -5,6 +5,9 @@ revision=1
build_style=python-module
hostmakedepends="python"
makedepends="python-devel"
+noarch=yes
+pycompile_module="pyinotify.py"
+depends="python"
short_desc="Python module used for monitoring filesystems events on Linux platforms with inotify"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://github.com/seb-m/pyinotify"
@@ -13,12 +16,3 @@ license="MIT"
do_fetch() {
git clone -b ${version} git://github.com/seb-m/pyinotify ${pkgname}-${version}
}
-
-python-inotify_package() {
- noarch=yes
- pycompile_module="pyinotify.py"
- depends="python"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-isodate/template b/srcpkgs/python-isodate/template
index a664d3bb02..b87ddeddd8 100644
--- a/srcpkgs/python-isodate/template
+++ b/srcpkgs/python-isodate/template
@@ -5,6 +5,9 @@ revision=1
wrksrc="isodate-${version}"
build_style=python-module
makedepends="python-devel"
+noarch="yes"
+pycompile_module="isodate"
+depends="python>=2.7<3.0"
short_desc="An ISO 8601 date/time/duration parser and formater"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -15,12 +18,3 @@ long_desc="
This module implements ISO 8601 date, time and duration parsing. The
implementation follows ISO8601:2004 standard, and implements only date/time
representations mentioned in the standard."
-
-python-isodate_package() {
- noarch="yes"
- pycompile_module="isodate"
- depends="python>=2.7<3.0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-jinja/template b/srcpkgs/python-jinja/template
index 1686c5657a..7252f1bba4 100644
--- a/srcpkgs/python-jinja/template
+++ b/srcpkgs/python-jinja/template
@@ -1,33 +1,17 @@
# Template file for 'python-jinja'
pkgname=python-jinja
-version=2.7.1
+version=2.7.2
revision=1
wrksrc="Jinja2-${version}"
build_style=python-module
-makedepends="python python-MarkupSafe python-distribute"
+hostmakedepends="python python-setuptools"
+makedepends="python-setuptools python-MarkupSafe"
+depends="${makedepends}"
+noarch="yes"
+pycompile_module="jinja2"
short_desc="Modern and designer friendly templating language for Python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://jinja.pocoo.org/"
license="BSD"
distfiles="http://pypi.python.org/packages/source/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=5cc0a087a81dca1c08368482fb7a92fe2bdd8cfbb22bc0fccfe6c85affb04c8b
-long_desc="
- Features:
-
- * sandboxed execution
- * powerful automatic HTML escaping system for XSS prevention
- * template inheritance
- * compiles down to the optimal python code just in time
- * optional ahead of time template compilation
- * easy to debug. Line numbers of exceptions directly point to the correct
- line in the template.
- * configurable syntax"
-
-python-jinja_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="jinja2"
- pkg_install() {
- vmove usr
- }
-}
+checksum=310a35fbccac3af13ebf927297f871ac656b9da1d248b1fe6765affa71b53235
diff --git a/srcpkgs/python-lockfile/template b/srcpkgs/python-lockfile/template
index 9b6e0eb44e..b25b0febd8 100644
--- a/srcpkgs/python-lockfile/template
+++ b/srcpkgs/python-lockfile/template
@@ -5,18 +5,12 @@ wrksrc="lockfile-${version}"
revision=1
build_style=python-module
makedepends="python"
+depends="${makedepends}"
+noarch="yes"
+pycompile_module="lockfile"
short_desc="Platform-independent file locking module for python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/pylockfile/"
license="MIT"
distfiles="https://pypi.python.org/packages/source/l/lockfile/lockfile-${version}.tar.gz"
checksum=23da589c91f59cb7c644d5ce5df539d448341bd479917d6dde973f82e2719147
-
-python-lockfile_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="lockfile"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
index 78122223fb..73ec8a290e 100644
--- a/srcpkgs/python-lxml/template
+++ b/srcpkgs/python-lxml/template
@@ -5,6 +5,7 @@ revision=1
wrksrc="lxml-${version}"
build_style=python-module
makedepends="python-devel libxslt-devel"
+pycompile_module="lxml"
short_desc="Python binding for the libxml2 and libxslt libraries"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -16,10 +17,3 @@ long_desc="
libxslt. It is unique in that it combines the speed and XML feature completeness
of these libraries with the simplicity of a native Python API, mostly compatible
but superior to the well-known ElementTree API."
-
-python-lxml_package() {
- pycompile_module="lxml"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-munkres/template b/srcpkgs/python-munkres/template
index 37f6bd9827..6a77fd819e 100644
--- a/srcpkgs/python-munkres/template
+++ b/srcpkgs/python-munkres/template
@@ -7,17 +7,11 @@ checksum="c78f803b9b776bfb20a25c9c7bb44adbf0f9202c2024d51aa5969d21e560208d"
build_style=python-module
hostmakedepends="python-devel"
makedepends="python-distribute"
+noarch="yes"
+depends="python>=2.7"
+pycompile_module="munkres"
wrksrc="munkres-${version}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://bmc.github.com/munkres/"
license="BSD"
short_desc="Algorithm for the Assignment Problem"
-
-python-munkres_package() {
- noarch="yes"
- depends="python>=2.7"
- pycompile_module="munkres"
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/python-musicbrainzngs/template b/srcpkgs/python-musicbrainzngs/template
index 3bafcedebe..96a69b7791 100644
--- a/srcpkgs/python-musicbrainzngs/template
+++ b/srcpkgs/python-musicbrainzngs/template
@@ -7,17 +7,11 @@ checksum="1a1b7c3cce851c491d5ad71b501bbed2bd653098e33565a0534050d4b922265a"
build_style=python-module
hostmakedepends="python-devel"
makedepends="python-distribute"
+noarch="yes"
+depends="python>=2.7"
+pycompile_module="musicbrainzngs"
wrksrc="musicbrainzngs-${version}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="https://github.com/alastair/python-musicbrainz-ngs"
license="BSD"
short_desc="Python bindings for the Musicbrainz NGS webservice interface"
-
-python-musicbrainzngs_package() {
- noarch="yes"
- depends="python>=2.7"
- pycompile_module="musicbrainzngs"
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/python-pam/template b/srcpkgs/python-pam/template
index 7cdbc50e4b..ca7d52a3f8 100644
--- a/srcpkgs/python-pam/template
+++ b/srcpkgs/python-pam/template
@@ -6,18 +6,12 @@ wrksrc="${pkgname/python-}-${version}"
build_style=python-module
hostmakedepends="python python-distribute"
makedepends="python-devel pam-devel"
+noarch=yes
+pycompile_module="pam.py"
+depends="python pam"
short_desc="Python module for PAM authentication"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://atlee.ca/software/pam/"
license="MIT"
distfiles="http://pypi.python.org/packages/source/p/pam/${pkgname/python-/}-${version}.tar.gz"
checksum=35e88575afc37a2a5f96e20b22fa55d3e3213370d4ce640af1597c2a1dde226b
-
-python-pam_package() {
- noarch=yes
- pycompile_module="pam.py"
- depends="python pam"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-paramiko/template b/srcpkgs/python-paramiko/template
index 035fc3ca39..fa13c43639 100644
--- a/srcpkgs/python-paramiko/template
+++ b/srcpkgs/python-paramiko/template
@@ -6,18 +6,12 @@ wrksrc="${pkgname/python-/}-${version}"
build_style=python-module
hostmakedepends="python"
makedepends="python-devel python-ecdsa pycrypto"
+noarch="yes"
+pycompile_module="paramiko"
+depends="python python-ecdsa pycrypto"
short_desc="Python module that implements the SSH2 protocol"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/paramiko/paramiko"
license="MIT"
distfiles="http://pypi.python.org/packages/source/p/paramiko/paramiko-$version.tar.gz"
checksum=cc0c0549f611ccc1358a0e1c760e00074990adba723d4d647a2637a1fadbdd71
-
-python-paramiko_package() {
- noarch="yes"
- pycompile_module="paramiko"
- depends="python python-ecdsa pycrypto"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python-parsing/template
index 8d4712d809..67c091e05b 100644
--- a/srcpkgs/python-parsing/template
+++ b/srcpkgs/python-parsing/template
@@ -5,6 +5,9 @@ revision=2
wrksrc="pyparsing-${version}"
build_style=python-module
makedepends="python-devel"
+noarch="yes"
+pycompile_module="pyparsing.py"
+depends="python>=2.7<3.0"
short_desc="General parsing module for Python"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
@@ -16,12 +19,3 @@ long_desc="
simple grammars, vs. the traditional lex/yacc approach, or the use of regular
expressions. The pyparsing module provides a library of classes that client
code uses to construct the grammar directly in Python code."
-
-python-parsing_package() {
- noarch="yes"
- pycompile_module="pyparsing.py"
- depends="python>=2.7<3.0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-pexpect/template b/srcpkgs/python-pexpect/template
index 94dffe1e95..85938796c2 100644
--- a/srcpkgs/python-pexpect/template
+++ b/srcpkgs/python-pexpect/template
@@ -6,18 +6,12 @@ wrksrc="${pkgname/python-}-${version}"
build_style=python-module
hostmakedepends="python"
makedepends="python-devel"
+noarch=yes
+pycompile_module="screen.py pxssh.py ANSI.py FSM.py fdpexpect.py pyexpect"
+depends="python"
short_desc="Python module for spawning child applications and controlling them"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pexpect.readthedocs.org/en/latest/"
license="MIT"
distfiles="http://pypi.python.org/packages/source/p/${pkgname/python-/}/${pkgname/python-/}-${version}.tar.gz"
checksum=1d6cee0fa5ab212f9ddac9852bab0df5fff11a173ed1bfde9346d5c8aa42d14c
-
-python-pexpect_package() {
- noarch=yes
- pycompile_module="screen.py pxssh.py ANSI.py FSM.py fdpexpect.py pyexpect"
- depends="python"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
index 21a5a4132a..33f729f31a 100644
--- a/srcpkgs/python-pip/template
+++ b/srcpkgs/python-pip/template
@@ -6,18 +6,12 @@ wrksrc="pip-${version}"
build_style=python-module
hostmakedepends="python python-setuptools"
makedepends="python-devel"
+noarch="yes"
+depends="python python-setuptools"
+pycompile_module="pip"
short_desc="An easy_install replacement for installing pypi python packages"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/pip"
license="PSF"
distfiles="http://pypi.python.org/packages/source/p/pip/pip-$version.tar.gz"
checksum=4e7a06554711a624c35d0c646f63674b7f6bfc7f80221bf1eb1f631bd890d04e
-
-python-pip_package() {
- noarch="yes"
- depends="python python-setuptools"
- pycompile_module="pip"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-psutil/template b/srcpkgs/python-psutil/template
index 863d1095dd..772d7ba2e8 100644
--- a/srcpkgs/python-psutil/template
+++ b/srcpkgs/python-psutil/template
@@ -7,16 +7,10 @@ checksum="508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45"
build_style=python-module
hostmakedepends="python-devel python-distribute"
makedepends="python-devel"
+depends="python>=2.7"
+pycompile_module="psutil"
wrksrc="psutil-${version}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://code.google.com/p/psutil/"
license="BSD"
short_desc="A cross-platform process and system utilities module for Python"
-
-python-psutil_package() {
- depends="python>=2.7"
- pycompile_module="psutil"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-pyacoustid/template b/srcpkgs/python-pyacoustid/template
index 1b8b8f624b..de19d9ec86 100644
--- a/srcpkgs/python-pyacoustid/template
+++ b/srcpkgs/python-pyacoustid/template
@@ -7,17 +7,11 @@ checksum="31900428e7b344dca0c2da594b387e88620c319298e3a6400a968078194407d4"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+noarch="yes"
+pycompile_module="pyacoustid"
+depends="python>=2.7"
maintainer="Steven R <strob AT styez DOT com>"
homepage="https://github.com/sampsyo/pyacoustid"
license="MIT"
short_desc="Bindings for Chromaprint acoustic fingerprinting and the Acoustid API"
wrksrc="pyacoustid-${version}"
-
-python-pyacoustid_package() {
- noarch="yes"
- pycompile_module="pyacoustid"
- depends="python>=2.7"
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/python-pylastfp/template b/srcpkgs/python-pylastfp/template
index 3acbd9d5ae..9ae505ac13 100644
--- a/srcpkgs/python-pylastfp/template
+++ b/srcpkgs/python-pylastfp/template
@@ -7,16 +7,10 @@ checksum="5f9a32e532ab62e5663298b4b3b1db86f5466404f111ccaa9030c23ffee140f7"
build_style=python-module
hostmakedepends="python-devel python-distribute"
makedepends="python-devel libsamplerate-devel fftw-devel"
+depends="python>=2.7 gst-python"
+pycompile_module="pylastfp"
wrksrc="pylastfp-${version}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="https://github.com/sampsyo/pylastfp"
license="GPL"
short_desc="Python interface to Last.fm's acoustic fingerprinting library (called fplib) and its related API services"
-
-python-pylastfp_package() {
- depends="python>=2.7 gst-python"
- pycompile_module="pylastfp"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template
index 2fd0ca5b09..5f453c1a99 100644
--- a/srcpkgs/python-pytz/template
+++ b/srcpkgs/python-pytz/template
@@ -6,18 +6,12 @@ wrksrc="pytz-${version}"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+noarch="yes"
+pycompile_module="pytz"
+depends="python>=2.7"
short_desc="Python timezone library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/pytz"
license="BSD"
distfiles="http://pypi.python.org/packages/source/p/pytz/pytz-${version}.tar.gz"
checksum=f075a63a330eae21b040a5148b8c4b64d7696a017de5ec62dc1604191efa791c
-
-python-pytz_package() {
- noarch="yes"
- pycompile_module="pytz"
- depends="python>=2.7"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template
index 076bd98909..b28c8d3773 100644
--- a/srcpkgs/python-rdflib/template
+++ b/srcpkgs/python-rdflib/template
@@ -5,6 +5,9 @@ revision=1
wrksrc="rdflib-${version}"
build_style=python-module
makedepends="python-devel python-distribute python-isodate"
+noarch="yes"
+pycompile_module="rdflib"
+depends="python>=2.7<3.0 python-isodate"
short_desc="Python library for working with RDF"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -20,12 +23,3 @@ long_desc="
The library presents a Graph interface which can be backed by
any one of a number of Store implementations."
-
-python-rdflib_package() {
- noarch="yes"
- pycompile_module="rdflib"
- depends="python>=2.7<3.0 python-isodate"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template
index 0ae663dd16..28abf8dc5f 100644
--- a/srcpkgs/python-requests/template
+++ b/srcpkgs/python-requests/template
@@ -1,23 +1,17 @@
# Template file for 'python-requests'
pkgname=python-requests
-version=2.1.0
+version=2.2.1
revision=1
distfiles="https://pypi.python.org/packages/source/r/requests/requests-${version}.tar.gz"
-checksum="a57307f3a5f35ec9e1254aaf3e0484063ee3ee6b5f123fb35c5b2673492efa71"
+checksum="1266921f1bed5fbf364cd83cf239b6d7b3ea5c32ccccbc93980d9ba12cdcfd02"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+noarch="yes"
+pycompile_module="requests"
+depends="python>=2.7"
wrksrc="requests-${version}"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://docs.python-requests.org/en/latest/"
license="Apache-2.0"
short_desc="Python HTTP for Humans."
-
-python-requests_package() {
- noarch="yes"
- pycompile_module="requests"
- depends="python>=2.7"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-setproctitle/template b/srcpkgs/python-setproctitle/template
index 25c98144e0..d9b9aa2994 100644
--- a/srcpkgs/python-setproctitle/template
+++ b/srcpkgs/python-setproctitle/template
@@ -5,6 +5,8 @@ revision=1
wrksrc="setproctitle-${version}"
build_style=python-module
makedepends="python-devel"
+depends="python"
+pycompile_module="setproctitle"
short_desc="A library to allow customization of the process title"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://code.google.com/p/py-setproctitle/"
@@ -23,11 +25,3 @@ long_desc="
The procedure is hardly portable across different systems. PostgreSQL provides
a good multi-platform implementation: this module is a Python wrapper around
PostgreSQL code."
-
-python-setproctitle_package() {
- depends="python"
- pycompile_module="setproctitle"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template
index 9f590b4141..c73d7695be 100644
--- a/srcpkgs/python-setuptools/template
+++ b/srcpkgs/python-setuptools/template
@@ -5,20 +5,14 @@ revision=2
wrksrc="setuptools-${version}"
build_style=python-module
makedepends="python-devel"
+noarch="yes"
+depends="python"
+pycompile_module="easy_install.py pkg_resources.py _markerlib setuptools"
+provides="python-distribute-${version}_1"
+replaces="python-distribute>=0"
short_desc="Easily download, build, install, upgrade, and uninstall Python packages"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/setuptools"
license="PSF"
distfiles="http://pypi.python.org/packages/source/s/setuptools/setuptools-$version.tar.gz"
checksum=56dde93a410389fc6cb86e9c115249a3414f8982c96d99aeac43a7717dd05b5e
-
-python-setuptools_package() {
- noarch="yes"
- depends="python"
- pycompile_module="easy_install.py pkg_resources.py _markerlib setuptools"
- provides="python-distribute-${version}_1"
- replaces="python-distribute>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python-simplejson/template
index 6f837dcfa4..7bd78ab52d 100644
--- a/srcpkgs/python-simplejson/template
+++ b/srcpkgs/python-simplejson/template
@@ -3,22 +3,17 @@ pkgname=python-simplejson
version=2.5.2
revision=2
build_style=python-module
-makedepends="python-devel"
+hostmakedepends="python-devel"
+makedepends="${hostmakedepends}"
+pycompile_module="simplejson"
short_desc="Simple, fast, extensible JSON encoder/decoder for Python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://undefined.org/python/#simplejson"
license="MIT"
-
do_fetch() {
local url="git://github.com/simplejson/simplejson.git"
git clone $url $pkgname-$version
- cd $pkgname-$version && git checkout v${version}
-}
-
-python-simplejson_package() {
- pycompile_module="simplejson"
- pkg_install() {
- vmove usr
- }
+ cd $pkgname-$version
+ git checkout v${version}
}
diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template
index 92b45b34b9..2ccb441961 100644
--- a/srcpkgs/python-six/template
+++ b/srcpkgs/python-six/template
@@ -6,18 +6,12 @@ wrksrc="six-${version}"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+noarch="yes"
+pycompile_module="six.py"
+depends="python>=2.7"
short_desc="Python 2 and 3 compatibility utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/six"
license="MIT"
distfiles="http://pypi.python.org/packages/source/s/six/six-${version}.tar.gz"
checksum=4a86d87623f75811524f30832e092914d65af7ff2eb1d403e01ec235b0e19cb3
-
-python-six_package() {
- noarch="yes"
- pycompile_module="six.py"
- depends="python>=2.7"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-sqlalchemy/template b/srcpkgs/python-sqlalchemy/template
index 9e15cea56a..a408102aec 100644
--- a/srcpkgs/python-sqlalchemy/template
+++ b/srcpkgs/python-sqlalchemy/template
@@ -6,6 +6,7 @@ wrksrc="SQLAlchemy-${version}"
build_style=python-module
hostmakedepends="python-devel"
makedepends="python-devel"
+pycompile_module="sqlalchemy"
short_desc="The Python SQL Toolkit and Object Relational Mapper"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.sqlalchemy.org/"
@@ -19,10 +20,3 @@ long_desc="
It provides a full suite of well known enterprise-level persistence patterns,
designed for efficient and high-performing database access, adapted into a
simple and Pythonic domain language."
-
-python-sqlalchemy_package() {
- pycompile_module="sqlalchemy"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template
index 970bb9814f..e6497ced3b 100644
--- a/srcpkgs/python-tempita/template
+++ b/srcpkgs/python-tempita/template
@@ -5,20 +5,12 @@ revision=1
wrksrc="Tempita-${version}"
build_style=python-module
makedepends="python-distribute"
+noarch="yes"
+pycompile_module="tempita"
+depends="python"
short_desc="A lightweight unicode templating language"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pythonpaste.org/tempita/"
license="MIT"
distfiles="http://pypi.python.org/packages/source/T/Tempita/Tempita-$version.tar.gz"
checksum=0ebe6938ca7401db79bac279849fffcb5752029150bcb6f3c3edbe7aa9a077d8
-long_desc="
- This package contains $pkgname: $short_desc."
-
-python-tempita_package() {
- noarch="yes"
- pycompile_module="tempita"
- depends="python"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-termcolor/template b/srcpkgs/python-termcolor/template
index df6194034c..8f2c03b514 100644
--- a/srcpkgs/python-termcolor/template
+++ b/srcpkgs/python-termcolor/template
@@ -6,18 +6,12 @@ wrksrc="termcolor-${version}"
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+noarch="yes"
+pycompile_module="termcolor"
+depends="python>=2.7"
short_desc="Python ANSII Color formatting for output in terminal"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/termcolor"
license="MIT"
distfiles="http://pypi.python.org/packages/source/t/termcolor/termcolor-${version}.tar.gz"
checksum=1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b
-
-python-termcolor_package() {
- noarch="yes"
- pycompile_module="termcolor"
- depends="python>=2.7"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python-urwid/template b/srcpkgs/python-urwid/template
index 92574dc2d1..189e4b1cad 100644
--- a/srcpkgs/python-urwid/template
+++ b/srcpkgs/python-urwid/template
@@ -5,6 +5,7 @@ revision=1
wrksrc="urwid-${version}"
build_style=python-module
makedepends="python-devel"
+pycompile_module="urwid"
short_desc="Console user interface library for Python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://excess.org/urwid/"
@@ -28,10 +29,3 @@ long_desc="
Buttons, check boxes and radio boxes
Customizable layout for all widgets
Easy interface for creating HTML screen shots"
-
-python-urwid_package() {
- pycompile_module="urwid"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/python/patches/python-fix-posix-close-clash.patch b/srcpkgs/python/patches/python-fix-posix-close-clash.patch
new file mode 100644
index 0000000000..700e70b598
--- /dev/null
+++ b/srcpkgs/python/patches/python-fix-posix-close-clash.patch
@@ -0,0 +1,20 @@
+--- Modules/posixmodule.c
++++ Modules/posixmodule.c
+@@ -6582,7 +6582,7 @@
+ Close a file descriptor (for low level IO).");
+
+ static PyObject *
+-posix_close(PyObject *self, PyObject *args)
++posix_closex(PyObject *self, PyObject *args)
+ {
+ int fd, res;
+ if (!PyArg_ParseTuple(args, "i:close", &fd))
+@@ -8960,7 +8960,7 @@
+ {"tcsetpgrp", posix_tcsetpgrp, METH_VARARGS, posix_tcsetpgrp__doc__},
+ #endif /* HAVE_TCSETPGRP */
+ {"open", posix_open, METH_VARARGS, posix_open__doc__},
+- {"close", posix_close, METH_VARARGS, posix_close__doc__},
++ {"close", posix_closex, METH_VARARGS, posix_close__doc__},
+ {"closerange", posix_closerange, METH_VARARGS, posix_closerange__doc__},
+ {"dup", posix_dup, METH_VARARGS, posix_dup__doc__},
+ {"dup2", posix_dup2, METH_VARARGS, posix_dup2__doc__},
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index c1d9ce9112..818413f64e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,7 +1,7 @@
# Template build file for 'python'.
pkgname=python
version=2.7.6
-revision=3
+revision=4
wrksrc="Python-${version}"
short_desc="Interpreted, interactive, object-oriented programming language"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,6 +13,7 @@ checksum=1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1
hostmakedepends="pkg-config"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
expat-devel sqlite-devel bzip2-devel zlib-devel"
+pycompile_dirs="usr/lib/python2.7"
configure_args="
--with-threads --enable-ipv6 --with-signal-module --enable-shared
@@ -50,6 +51,8 @@ do_build() {
do_install() {
export PATH="$PATH:$wrksrc/hostpython"
make DESTDIR=${DESTDIR} altinstall
+ ln -sf /usr/bin/python2.7 ${DESTDIR}/usr/bin/python2
+ ln -sf /usr/bin/python2.7 ${DESTDIR}/usr/bin/python
}
post_install() {
@@ -59,15 +62,6 @@ post_install() {
rm -rf ${DESTDIR}/usr/lib/python2.7/test
}
-python_package() {
- pycompile_dirs="usr/lib/python2.7"
- pkg_install() {
- vmove all
- ln -sf /usr/bin/python2.7 ${PKGDESTDIR}/usr/bin/python2
- ln -sf /usr/bin/python2.7 ${PKGDESTDIR}/usr/bin/python
- }
-}
-
python-devel_package() {
depends="python>=${version}_${revision}"
short_desc+=" - development files"
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 8992bc26bb..f7032363b3 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -63,9 +63,3 @@ python3-devel_package() {
${DESTDIR}/usr/include/python3.3m
}
}
-
-python3_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/pyxdg/template b/srcpkgs/pyxdg/template
index 8e758d3cb1..8df82633cb 100644
--- a/srcpkgs/pyxdg/template
+++ b/srcpkgs/pyxdg/template
@@ -4,6 +4,9 @@ version=0.23
revision=1
build_style=python-module
makedepends="python-devel"
+noarch="yes"
+pycompile_module="xdg"
+depends="python>=2.7<3.0"
short_desc="Python library to access freedesktop.org standards"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -21,11 +24,3 @@ long_desc="
Recent File Spec 0.2
Shared-MIME-Database Specification 0.13
"
-pyxdg_package() {
- noarch="yes"
- pycompile_module="xdg"
- depends="python>=2.7<3.0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/pyyaml/template b/srcpkgs/pyyaml/template
index 7c4a03c83a..82b7573259 100644
--- a/srcpkgs/pyyaml/template
+++ b/srcpkgs/pyyaml/template
@@ -5,6 +5,7 @@ revision=1
wrksrc="PyYAML-${version}"
build_style=python-module
makedepends="libyaml-devel python-devel"
+pycompile_module="pyyaml"
short_desc="YAML parser and emitter for Python."
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://pyyaml.org/wiki/PyYAML"
@@ -27,10 +28,3 @@ long_desc="
is provided.
- both pure-Python and fast LibYAML-based parsers and emitters.
- relatively sensible error messages."
-
-pyyaml_package() {
- pycompile_module="pyyaml"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/qca/template b/srcpkgs/qca/template
index 0b3621cb36..36aea75be2 100644
--- a/srcpkgs/qca/template
+++ b/srcpkgs/qca/template
@@ -7,6 +7,7 @@ configure_args="--prefix=/usr --disable-tests --release --no-separate-debug-info
--certstore-path=/etc/ssl/certs/ca-certificates.crt"
hostmakedepends="which"
makedepends="qt-devel ca-certificates"
+depends="ca-certificates"
short_desc="Qt Cryptographic Architecture"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -26,10 +27,3 @@ qca-devel_package() {
vmove usr/share/qt
}
}
-
-qca_package() {
- depends="ca-certificates"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 222c1ecb78..74c68db28e 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -34,9 +34,3 @@ do_install() {
mv ${f} ${f}-static
done
}
-
-qemu-user-static_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 42734fb36b..d00dc8ede3 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -15,12 +15,18 @@ license="GPL-2, LGPL-2.1"
distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2"
checksum=31f333a85f2d14c605a77679904a9668eaeb1b6dc7da53a1665230f46bc21314
+nostrip=yes
hostmakedepends="pkg-config perl python automake libtool flex"
makedepends="attr-devel libpng-devel>=1.6 libjpeg-turbo-devel pixman-devel
libuuid-devel libX11-devel alsa-lib-devel gnutls-devel>=3.1.5 SDL-devel
libsasl-devel libglib-devel ncurses-devel libseccomp-devel>=2.1.0 nss-devel
libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel vde2-devel
- libbluetooth-devel libssh2-devel libusbx-devel pulseaudio-devel"
+ libbluetooth-devel libssh2-devel libusb-devel pulseaudio-devel"
+depends="libusb>=1.0.15"
+conf_files="/etc/qemu/target-x86_64.conf"
+replaces="qemu-kvm>=0"
+provides="qemu-kvm-${version}"
+conflicts="qemu-kvm>=0"
post_install() {
vinstall ${FILESDIR}/65-kvm.rules 644 usr/lib/udev/rules.d
@@ -45,15 +51,3 @@ libcacard_package() {
vmove "usr/lib/*.so.*"
}
}
-
-qemu_package() {
- nostrip=yes
- conf_files="/etc/qemu/target-x86_64.conf"
- replaces="qemu-kvm>=0"
- provides="qemu-kvm-${version}"
- conflicts="qemu-kvm>=0"
- depends="libusb>=1.0.15"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/qimageblitz/template b/srcpkgs/qimageblitz/template
index 200f46789a..0568f2786c 100644
--- a/srcpkgs/qimageblitz/template
+++ b/srcpkgs/qimageblitz/template
@@ -21,9 +21,3 @@ qimageblitz-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-qimageblitz_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index a381ffbb87..2f1de45693 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
configure_args="--enable-jack-version"
makedepends="pkg-config libX11-devel qt-devel jack-devel"
+depends="desktop-file-utils hicolor-icon-theme jack"
short_desc="JACK Audio Connection Kit - Qt GUI Interface"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -22,10 +23,3 @@ long_desc="
are properly saved between sessions, and a way control of the status of the
audio server daemon. With time, this primordial interface has become richer by
including a enhanced patchbay and connection control features."
-
-qjackctl_package() {
- depends="desktop-file-utils hicolor-icon-theme jack"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/qjson/template b/srcpkgs/qjson/template
index 8f9aad8263..6d89ba56fe 100644
--- a/srcpkgs/qjson/template
+++ b/srcpkgs/qjson/template
@@ -10,7 +10,6 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://qjson.sourceforge.net"
-
do_fetch() {
git clone -b${version} git://github.com/flavio/qjson.git ${pkgname}-${version}
}
@@ -25,9 +24,3 @@ qjson-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-qjson_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/qoauth/template b/srcpkgs/qoauth/template
index f41aeef8ca..c42e79ca85 100644
--- a/srcpkgs/qoauth/template
+++ b/srcpkgs/qoauth/template
@@ -31,9 +31,3 @@ qoauth-devel_package() {
vmove usr/share/qt
}
}
-
-qoauth_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index ad7b1ba026..65ef72f398 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -20,7 +20,7 @@ long_desc="
of a PDF file to learn more about how they work."
libqpdf_package() {
- short_desc="${short_desc} -- shared library"
+ short_desc+=" - shared library"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -28,15 +28,9 @@ libqpdf_package() {
libqpdf-devel_package() {
depends="libqpdf>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-qpdf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/qrencode/template b/srcpkgs/qrencode/template
index 6aabc4b256..687d8d03ea 100644
--- a/srcpkgs/qrencode/template
+++ b/srcpkgs/qrencode/template
@@ -28,9 +28,3 @@ libqrencode_package() {
vmove "usr/lib/*.so.*"
}
}
-
-qrencode_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index 679c82f351..0c2c6e1d49 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -4,6 +4,7 @@ version=0.3.6
revision=1
build_style=gnu-configure
makedepends="pkg-config qt-devel jack-devel fluidsynth-devel desktop-file-utils hicolor-icon-theme"
+depends="jack desktop-file-utils hicolor-icon-theme"
short_desc="Qt GUI Interface for FluidSynth"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -17,10 +18,3 @@ long_desc="
command line softsynth but for the moment it wraps the excellent FluidSynth.
FluidSynth is a command line software synthesiser based on the Soundfont
specification."
-
-qsynth_package() {
- depends="jack desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 267f6559ab..2b7269dd60 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -164,9 +164,3 @@ qt-qtconfig_package() {
vmove "usr/share/qt/translations/qtconfig*"
}
}
-
-qt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index 1045b7a094..38a9d56cf8 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -8,16 +8,10 @@ makedepends="pkg-config jack-devel alsa-lib-devel libsndfile-devel
libvorbis-devel libmad-devel libsamplerate-devel qt-devel lv2
liblo-devel rubberband-devel vamp-plugin-sdk-devel ladspa-sdk dssi-devel
lilv-devel suil-devel serd-devel sord-devel sratom-devel"
+depends="jack dssi lv2 desktop-file-utils hicolor-icon-theme"
short_desc="Audio/MIDI multi-track sequencer application written in C++/Qt4"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
homepage="http://qtractor.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=09708652b2b8b12dbc28a9ec1e0f2d105ee0cb4ed29b8d33c477f4455be1600d
-
-qtractor_package() {
- depends="jack dssi lv2 desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/quvi/template b/srcpkgs/quvi/template
index 3d0f46c701..52b24952f6 100644
--- a/srcpkgs/quvi/template
+++ b/srcpkgs/quvi/template
@@ -22,9 +22,3 @@ long_desc="
* Easy to extend: uses lua for scripting
* Supports 40+ websites
* C API is simple to use"
-
-quvi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/r2-bindings-git/template b/srcpkgs/r2-bindings-git/template
deleted file mode 100644
index 2ba09d3f69..0000000000
--- a/srcpkgs/r2-bindings-git/template
+++ /dev/null
@@ -1,51 +0,0 @@
-# Template file for 'r2-bindings-git'
-pkgname=r2-bindings-git
-version=20130927
-revision=1
-short_desc="Advanced command line debugger and hexadecimal editor (bindings, git snapshot)"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="LGPL-3"
-homepage="http://radare.org"
-long_desc="
- It is composed by an hexadecimal editor (radare) with a wrapped IO layer
- supporting multiple backends for local/remote files, accessing filesystems,
- debugger (osx,bsd,linux,w32), stream analyzer, assembler/disassembler
- (rasm) for x86,arm,ppc,m68k,java,msil,sparc, etc.
-
- This package contains the radare2 bindings for multiple languages."
-
-makedepends="pkg-config swig>=2.0.7 valabind-git>=${version}
- python-devel radare2-devel-git>=${version}"
-
-do_fetch() {
- local url="git://github.com/radare/radare2"
- msg_normal "Fetching source from $url ...\n"
- git clone ${url} ${pkgname}-${version}
-}
-
-do_configure() {
- cd r2-bindings
- ./configure --prefix=/usr --enable=python --enable-devel
-}
-
-do_build() {
- cd r2-bindings
- make ${makejobs}
-}
-
-do_install() {
- cd r2-bindings
- make DESTDIR=${DESTDIR} install
-}
-
-
-r2-bindings-git_package() {
- replaces="r2-bindings>=0"
- provides="r2-bindings-9999"
- depends="radare2-git>=${version} python>=2.7.3"
- pycompile_module="r2"
- noverifyrdeps=yes
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/r2-bindings/template b/srcpkgs/r2-bindings/template
index c506f2c681..fa81332991 100644
--- a/srcpkgs/r2-bindings/template
+++ b/srcpkgs/r2-bindings/template
@@ -19,6 +19,9 @@ long_desc="
makedepends="pkg-config swig>=2.0.7 valabind>=0.7.2
python-devel radare2-devel>=${version}"
+pycompile_module="r2"
+depends="radare2-devel-${version}*"
+noverifyrdeps=1
do_configure() {
cd r2-bindings
@@ -34,12 +37,3 @@ do_install() {
cd r2-bindings
make DESTDIR=${DESTDIR} install
}
-
-r2-bindings_package() {
- pycompile_module="r2"
- depends="radare2-devel-${version}*"
- noverifyrdeps=1
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/radare2-devel-git b/srcpkgs/radare2-devel-git
deleted file mode 120000
index 3b3980b3f7..0000000000
--- a/srcpkgs/radare2-devel-git
+++ /dev/null
@@ -1 +0,0 @@
-radare2-git
\ No newline at end of file
diff --git a/srcpkgs/radare2-git/template b/srcpkgs/radare2-git/template
deleted file mode 100644
index d723b45e8a..0000000000
--- a/srcpkgs/radare2-git/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'radare2-git'
-pkgname=radare2-git
-version=20130812
-revision=1
-build_style=gnu-configure
-short_desc="Advanced command line debugger and hexadecimal editor (git snapshot)"
-maintainer="pancake <pancake@nopcode.org>"
-license="LGPL-3"
-homepage="http://radare.org"
-
-
-do_fetch() {
- local url="git://github.com/radare/radare2"
- msg_normal "Fetching source from $url ...\n"
- git clone ${url} ${pkgname}-${version}
-}
-
-radare2-devel-git_package() {
- replaces="radare2-devel>=0"
- provides="radare2-devel-9999"
- depends="radare2-git>=$version"
- short_desc="${short_desc} - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
- }
-}
-
-radare2-git_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 9b1ee1c218..20f21d2a9c 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -20,9 +20,3 @@ radare2-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-radare2_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/randrproto/template b/srcpkgs/randrproto/template
index 45b102222b..4714c94b7e 100644
--- a/srcpkgs/randrproto/template
+++ b/srcpkgs/randrproto/template
@@ -2,6 +2,7 @@
pkgname=randrproto
version=1.4.0
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="Randr extension headers from modular X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,12 +10,3 @@ homepage="http://xorg.freedesktop.org"
license="MIT"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf
-long_desc="
- This provides the Randr extension headers from X.org X11 project."
-
-randrproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ranger/template b/srcpkgs/ranger/template
index 179ec5243c..7b59ee686b 100644
--- a/srcpkgs/ranger/template
+++ b/srcpkgs/ranger/template
@@ -5,18 +5,12 @@ revision=1
build_style=python-module
hostmakedepends="python"
makedepends="python-devel"
+noarch="yes"
+depends="python"
+pycompile_module="$pkgname"
short_desc="File manager with an ncurses frontend written in Python"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://ranger.nongnu.org"
distfiles="http://ranger.nongnu.org/${pkgname}-${version}.tar.gz"
checksum=ccb230a5d2d71ca11612b5af1ca515f9d490b51b1546678828e306252677db5e
-
-ranger_package() {
- noarch="yes"
- depends="python"
- pycompile_module="$pkgname"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template
index 96d3013a5d..5047c2a713 100644
--- a/srcpkgs/raptor/template
+++ b/srcpkgs/raptor/template
@@ -40,9 +40,3 @@ raptor-devel_package() {
vmove usr/share/man/man3
}
}
-
-raptor_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rarian/template b/srcpkgs/rarian/template
index 894ec9607b..5cb7815201 100644
--- a/srcpkgs/rarian/template
+++ b/srcpkgs/rarian/template
@@ -4,6 +4,7 @@ version=0.8.1
build_style=gnu-configure
revision=4
hostmakedepends="pkg-config libxslt"
+depends="bash"
short_desc="Documentation metadata library"
homepage="http://rarian.freedesktop.org/"
license="LGPL-2.1"
@@ -27,11 +28,3 @@ rarian-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-rarian_package() {
- depends="bash"
- pkg_install() {
- vmove usr
- vmove var
- }
-}
diff --git a/srcpkgs/rasqal/template b/srcpkgs/rasqal/template
index c93314900d..ece16a1820 100644
--- a/srcpkgs/rasqal/template
+++ b/srcpkgs/rasqal/template
@@ -41,9 +41,3 @@ rasqal-devel_package() {
vmove usr/share/man/man3
}
}
-
-rasqal_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/raul/template b/srcpkgs/raul/template
index 42bf6566d7..70496f1428 100644
--- a/srcpkgs/raul/template
+++ b/srcpkgs/raul/template
@@ -16,15 +16,9 @@ long_desc="
raul-devel_package() {
depends="libglib-devel raul>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-raul_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rawtherapee/template b/srcpkgs/rawtherapee/template
index db0301d2aa..0e72d034f9 100644
--- a/srcpkgs/rawtherapee/template
+++ b/srcpkgs/rawtherapee/template
@@ -5,6 +5,7 @@ revision=3
build_style=cmake
makedepends="cmake pkg-config libpng-devel>=1.6 gtkmm2-devel
lcms2-devel libiptcdata-devel libgomp-devel mercurial"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="Free RAW converter and digital photo processing software"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://rawtherapee.com/"
@@ -22,10 +23,3 @@ long_desc="
processing is done in 16 bit/channel mode. Different to other RAW converters it
can use EAHD as demosaicing algorithm. The raw loading engine of RawTherapee is
based on dcraw."
-
-rawtherapee_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/razor-qt/template b/srcpkgs/razor-qt/template
index daa499c2c4..1c71fcfff9 100644
--- a/srcpkgs/razor-qt/template
+++ b/srcpkgs/razor-qt/template
@@ -21,26 +21,19 @@ makedepends="cmake pkg-config qt-devel polkit-qt-devel>=0.103.0_2
libudev-devel libXrender-devel libXcomposite-devel libXcursor-devel
libXdamage-devel libstatgrab-devel libsensors-devel pulseaudio-devel
alsa-lib-devel lightdm-devel openbox upower udisks oxygen-icons"
+depends="openbox upower udisks oxygen-icons"
+conf_files="
+ /etc/razor/session.conf
+ /etc/razor/razor.conf
+ /etc/razor/windowmanagers.conf
+ /etc/razor/razor-panel
+ /etc/razor/razor-panel/panel.conf
+ /etc/razor/desktop.conf"
razor-qt-devel_package() {
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-razor-qt_package() {
- conf_files="
- /etc/razor/session.conf
- /etc/razor/razor.conf
- /etc/razor/windowmanagers.conf
- /etc/razor/razor-panel
- /etc/razor/razor-panel/panel.conf
- /etc/razor/desktop.conf"
- depends="openbox upower udisks oxygen-icons"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 902ea1b781..4604eae5f7 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -13,9 +13,3 @@ license="GPL-3"
homepage="http://www.rdesktop.org/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246
-
-rdesktop_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index 5ef2ec7c0b..cff4d35ea2 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -9,7 +9,6 @@ maintainer="pancake <pancake@nopcode.org>"
license="GPL-3"
homepage="http://rainbowsandpwnies.com/rdis/"
-
do_fetch() {
git clone git://github.com/endeav0r/rdis.git ${pkgname}-${version}
}
@@ -21,9 +20,3 @@ do_build() {
do_install() {
vinstall src/rdis 755 usr/bin
}
-
-rdis-git_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template
index f7f4ef3eb3..8203e734d9 100644
--- a/srcpkgs/re2/template
+++ b/srcpkgs/re2/template
@@ -12,14 +12,8 @@ homepage="https://code.google.com/p/re2/"
checksum=a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe
distfiles="https://${pkgname}.googlecode.com/files/${pkgname}-${version}.tgz"
-re2_package() {
- pkg_install() {
- vmove all
- }
-}
-
re2-devel_package() {
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template
index a1edbbec80..fb86f67c65 100644
--- a/srcpkgs/readline/template
+++ b/srcpkgs/readline/template
@@ -48,9 +48,3 @@ readline-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-readline_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/recode/template b/srcpkgs/recode/template
index a9eab7c41f..4cc9969680 100644
--- a/srcpkgs/recode/template
+++ b/srcpkgs/recode/template
@@ -45,9 +45,3 @@ recode-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-recode_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/recordproto/template b/srcpkgs/recordproto/template
index 63ffd3e3eb..17e38dcb3b 100644
--- a/srcpkgs/recordproto/template
+++ b/srcpkgs/recordproto/template
@@ -2,6 +2,7 @@
pkgname=recordproto
version=1.14
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="Record extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,13 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=1bd2375bd2bdaa3ea90aa0a70cf1657a2d61877b6eb7e3fe3e6f1d289e69d067
-long_desc="
- This provides the Record extension headers from modular X.org X11
- project."
-
-recordproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 17c9e1f8fc..fdb977d937 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -1,4 +1,6 @@
# Template file for 'redland'
+_desc="Redland Resource Description Framework (RDF)"
+
pkgname=redland
version=1.0.16
revision=3
@@ -8,8 +10,8 @@ configure_args="--disable-static --enable-release --with-raptor=system
hostmakedepends="pkg-config perl"
makedepends="libltdl-devel db-devel rasqal-devel libmysqlclient-devel
postgresql-libs-devel sqlite-devel unixodbc-devel"
-short_desc="Redland Resource Description Framework (RDF)"
maintainer="Juan RP <xtraeme@gmail.com>"
+short_desc="${_desc} - Utilities"
license="GPL-2, LGPL-2.1"
homepage="http://librdf.org"
distfiles="http://librdf.org/dist/source/redland-${version}.tar.gz"
@@ -22,35 +24,35 @@ long_desc="
their applications as well as for RDF developers to experiment with the technology."
librdf_package() {
- short_desc+=" - library"
+ short_desc="${_desc} - library"
pkg_install() {
vmove "usr/lib/*.so.*"
}
}
redland-storage-mysql_package() {
- short_desc+=" - MySQL storage backend"
+ short_desc="${_desc} - MySQL storage backend"
pkg_install() {
vmove usr/lib/redland/librdf_storage_mysql.so
}
}
redland-storage-pgsql_package() {
- short_desc+=" - PostgreSQL storage backend"
+ short_desc="${_desc} - PostgreSQL storage backend"
pkg_install() {
vmove usr/lib/redland/librdf_storage_postgresql.so
}
}
redland-storage-sqlite_package() {
- short_desc+=" - SQLite storage backend"
+ short_desc="${_desc} - SQLite storage backend"
pkg_install() {
vmove usr/lib/redland/librdf_storage_sqlite.so
}
}
redland-storage-virtuoso_package() {
- short_desc+=" - virtuoso storage backend"
+ short_desc="${_desc} - virtuoso storage backend"
pkg_install() {
vmove usr/lib/redland/librdf_storage_virtuoso.so
}
@@ -58,7 +60,7 @@ redland-storage-virtuoso_package() {
redland-devel_package() {
depends="db-devel rasqal-devel librdf-${version}_${revision}"
- short_desc+=" - development files"
+ short_desc="${_desc} - development files"
pkg_install() {
vmove usr/bin/redland-config
vmove usr/share/man/man1/redland-config.1
@@ -69,10 +71,3 @@ redland-devel_package() {
vmove usr/share/man/man3
}
}
-
-redland_package() {
- short_desc+=" - Utilities"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template
index 90b887350a..52d7560c7c 100644
--- a/srcpkgs/redshift/template
+++ b/srcpkgs/redshift/template
@@ -30,9 +30,3 @@ redshift-gtk_package() {
vmove usr/share/icons
}
}
-
-redshift_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template
index cd9139f007..5e8970b760 100644
--- a/srcpkgs/reminiscence/template
+++ b/srcpkgs/reminiscence/template
@@ -20,9 +20,3 @@ do_install() {
vinstall rs 755 usr/bin
vinstall README 644 usr/share/doc/${pkgname}
}
-
-reminiscence_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/renderproto/template b/srcpkgs/renderproto/template
index df7fa008a8..e9f02e362b 100644
--- a/srcpkgs/renderproto/template
+++ b/srcpkgs/renderproto/template
@@ -2,6 +2,7 @@
pkgname=renderproto
version=0.11.1
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="Render extension headers from modular X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,10 +10,3 @@ homepage="http://xorg.freedesktop.org"
license="MIT"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537
-
-renderproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/resourceproto/template b/srcpkgs/resourceproto/template
index 75d9daf011..b8e551ab92 100644
--- a/srcpkgs/resourceproto/template
+++ b/srcpkgs/resourceproto/template
@@ -2,6 +2,7 @@
pkgname=resourceproto
version=1.2.0
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="Resource extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,12 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818
-long_desc="
- This provides the Resource extension headers from X.org."
-
-resourceproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template
index 9c27b471fa..5b2403d170 100644
--- a/srcpkgs/rest/template
+++ b/srcpkgs/rest/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config gobject-introspection"
makedepends="libglib-devel libsoup-gnome-devel>=2.44 libxml2-devel"
+depends="libsoup-gnome>=2.44"
short_desc="RESTful library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -29,10 +30,3 @@ rest-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-rest_package() {
- depends="libsoup-gnome>=2.44"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rfkill/template b/srcpkgs/rfkill/template
index d5c140ea56..e506cf213a 100644
--- a/srcpkgs/rfkill/template
+++ b/srcpkgs/rfkill/template
@@ -9,9 +9,3 @@ license="Public domain"
homepage="http://wireless.kernel.org/en/users/Documentation/rfkill"
distfiles="https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$version.tar.bz2"
checksum=3e160cca504a53679f2b3254f31c53a4fb38a021bc50fed8eb57a436d33dfa07
-
-rfkill_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rgb/template b/srcpkgs/rgb/template
index 1108174daf..5aa43941f1 100644
--- a/srcpkgs/rgb/template
+++ b/srcpkgs/rgb/template
@@ -11,9 +11,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=162111c0192c8f78e99a6ee9a3df5eb149251c5800896c993399da005ec7fe95
-
-rgb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template
index db9882ae83..b8e7f75dde 100644
--- a/srcpkgs/rhythmbox/template
+++ b/srcpkgs/rhythmbox/template
@@ -14,6 +14,7 @@ makedepends="gtk+3-devel libsoup-gnome-devel>=2.44 totem-pl-parser-devel>=3.10
webkitgtk-devel>=2.1 grilo-devel gst-plugins-base1-devel>=1:1.2 clutter-gtk-devel>=1.4.4_2
python3-devel pygobject-devel libdmapsharing-devel>=2.9.17
desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="GNOME integrated music management application, inspired by Apple's iTunes"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -57,10 +58,3 @@ rhythmbox-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-rhythmbox_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template
index 3d0438a560..8c24b5553a 100644
--- a/srcpkgs/ristretto/template
+++ b/srcpkgs/ristretto/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel libexif-devel xfconf-devel
dbus-glib-devel libxfce4ui-devel exo-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Picture-viewer for the Xfce desktop environment"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -15,10 +16,3 @@ checksum=2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79
long_desc="
Ristretto is a fast and lightweight picture-viewer for the Xfce desktop
environment."
-
-ristretto_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rox/template b/srcpkgs/rox/template
index 0022b877b9..6dd5602ddd 100644
--- a/srcpkgs/rox/template
+++ b/srcpkgs/rox/template
@@ -5,6 +5,7 @@ revision=1
wrksrc="rox-filer-${version}"
hostmakedepends="pkg-config librsvg"
makedepends="gtk+-devel libxml2-devel libSM-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A small and fast file manager which can optionally manage the desktop background and panels"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -31,10 +32,3 @@ do_install() {
vinstall ${FILESDIR}/rox.svg 644 usr/share/pixmaps
vinstall rox.png 644 usr/share/pixmaps
}
-
-rox_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/roxterm/template b/srcpkgs/roxterm/template
index 1e20df890a..03840b145a 100644
--- a/srcpkgs/roxterm/template
+++ b/srcpkgs/roxterm/template
@@ -5,6 +5,7 @@ revision=1
hostmakedepends="python-lockfile pkg-config docbook-xsl xmlto libtool"
makedepends="dbus-glib-devel libSM-devel vte3-devel
libmagick-devel librsvg-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="Tabbed, VTE-based terminal emulator"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -24,10 +25,3 @@ do_build() {
do_install() {
python2 mscript.py install --destdir=${DESTDIR}
}
-
-roxterm_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rpcbind/template b/srcpkgs/rpcbind/template
index 29a1fe744e..c1486575a4 100644
--- a/srcpkgs/rpcbind/template
+++ b/srcpkgs/rpcbind/template
@@ -5,7 +5,10 @@ revision=1
build_style=gnu-configure
configure_args="--enable-warmstarts --with-statedir=/run --with-rpcuser=rpc"
hostmakedepends="pkg-config"
-makedepends="libtirpc-devel"
+makedepends="libtirpc-devel shadow"
+depends="shadow"
+systemd_services="${pkgname}.service on"
+system_accounts="rpc"
short_desc="Converts RPC program numbers into universal addresses"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://rpcbind.sourceforge.net"
@@ -26,12 +29,3 @@ post_install() {
vinstall man/rpcinfo.8 644 usr/share/man/man8
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
}
-
-rpcbind_package() {
- depends="shadow"
- systemd_services="${pkgname}.service on"
- system_accounts="rpc"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rpi-base-files/template b/srcpkgs/rpi-base-files/template
deleted file mode 100644
index 2cc2384080..0000000000
--- a/srcpkgs/rpi-base-files/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'rpi-base-files'
-pkgname=rpi-base-files
-version=0.1
-revision=1
-short_desc="Void Linux base system files for the Raspberry Pi"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://www.voidlinux.eu"
-license="Public domain"
-
-# XXX only for rpi
-only_for_archs="armv6l"
-makedepends="ntp?ntp-daemon dhcpcd openssh-server"
-
-do_install() {
- # Load the audio module by default.
- vmkdir usr/lib/modules-load.d
- echo snd-bcm2835 > ${DESTDIR}/usr/lib/modules-load.d/snd_bcm2835.conf
- # Fix permissions for the vchiq device.
- vmkdir usr/lib/udev/rules.d
- echo 'SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"' > \
- ${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules
-}
-
-rpi-base-files_package() {
- # enable dhcpcd and sshd by default.
- systemd_services="dhcpcd.service on sshd.service on"
- replaces="base-system<0.77"
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rpi-base/INSTALL b/srcpkgs/rpi-base/INSTALL
new file mode 100644
index 0000000000..5cf298084d
--- /dev/null
+++ b/srcpkgs/rpi-base/INSTALL
@@ -0,0 +1,6 @@
+case "$ACTION" in
+post)
+ # enable sshd, ntpdate, ntpd and dhcpcd services.
+ systemctl enable sshd.service ntpdate.service ntpd.service dhcpcd.service
+ ;;
+esac
diff --git a/srcpkgs/rpi-base/files/bcm_host.pc b/srcpkgs/rpi-base/files/bcm_host.pc
new file mode 100644
index 0000000000..3cb841caba
--- /dev/null
+++ b/srcpkgs/rpi-base/files/bcm_host.pc
@@ -0,0 +1,11 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bcm_host
+Description: Broadcom VideoCore host API library
+Version: 1
+Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
+Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
+
diff --git a/srcpkgs/rpi-base/files/egl.pc b/srcpkgs/rpi-base/files/egl.pc
new file mode 100644
index 0000000000..52f4a515fb
--- /dev/null
+++ b/srcpkgs/rpi-base/files/egl.pc
@@ -0,0 +1,12 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: EGL
+Description: Fake EGL package for RPi
+Version: 10
+Requires: bcm_host
+Libs: -L${libdir} -lEGL
+Cflags: -I${includedir}
+
diff --git a/srcpkgs/rpi-base/files/glesv2.pc b/srcpkgs/rpi-base/files/glesv2.pc
new file mode 100644
index 0000000000..901d3306fa
--- /dev/null
+++ b/srcpkgs/rpi-base/files/glesv2.pc
@@ -0,0 +1,12 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: GLESv2
+Description: Fake GL ES 2 package for RPi
+Version: 10
+Requires: bcm_host
+Libs: -L${libdir} -lGLESv2
+Cflags: -I${includedir}
+
diff --git a/srcpkgs/rpi-base/template b/srcpkgs/rpi-base/template
new file mode 100644
index 0000000000..6aeb639e43
--- /dev/null
+++ b/srcpkgs/rpi-base/template
@@ -0,0 +1,28 @@
+# Template file for 'rpi-base'
+pkgname=rpi-base
+version=1.4
+revision=1
+homepage="http://www.voidlinux.eu"
+short_desc="Void Linux RaspberryPi base files"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="Public Domain"
+
+only_for_archs="armv6l"
+makedepends="ntp?ntp-daemon dhcpcd openssh-server rpi-firmware rpi-kernel"
+depends="${makedepends}"
+
+# Allow upgrades for compatibility.
+provides="rpi-base-files-${version}_${revision}"
+replaces="rpi-base-files>=0"
+
+do_install() {
+ # Load the audio module by default.
+ vmkdir usr/lib/modules-load.d
+ echo snd-bcm2835 > ${DESTDIR}/usr/lib/modules-load.d/snd_bcm2835.conf
+ # Fix permissions for the vchiq device.
+ vmkdir usr/lib/udev/rules.d
+ echo 'SUBSYSTEM=="vchiq|input", GROUP="video", MODE="0660"' > \
+ ${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules
+ echo 'KERNEL=="mouse*|mice|event*", GROUP="video", MODE="0770"' >> \
+ ${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules
+}
diff --git a/srcpkgs/rpi-firmware-pcfiles/template b/srcpkgs/rpi-firmware-pcfiles/template
index b01b92ceef..e627629599 100644
--- a/srcpkgs/rpi-firmware-pcfiles/template
+++ b/srcpkgs/rpi-firmware-pcfiles/template
@@ -7,18 +7,12 @@ short_desc="Raspberry Pi pkg-config files for GLESv2/EGL"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Public domain"
+noarch=yes
makedepends="rpi-firmware"
+depends="rpi-firmware"
+conflicts="MesaLib-devel>=0"
do_install() {
vmkdir usr/lib/pkgconfig
install -m644 ${FILESDIR}/*.pc ${DESTDIR}/usr/lib/pkgconfig
}
-
-rpi-firmware-pcfiles_package() {
- noarch=yes
- depends="rpi-firmware"
- conflicts="MesaLib-devel>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 2d1695151a..e84145db7f 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,12 +1,18 @@
# Template file for 'rpi-firmware'
+_githash="c27ddfa"
+
pkgname=rpi-firmware
-version=20131201
+version=20140129
revision=1
-_githash="f7e9bcd"
+noarch=yes
short_desc="Firmware files for the Raspberry Pi (git ${_githash})"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary - see /usr/share/licences/${pkgname}/"
homepage="https://github.com/raspberrypi/firmware"
+conf_files="/boot/cmdline.txt /boot/config.txt"
+
+provides="libEGL-1.0_1 libGLES-1.0_1"
+replaces="libEGL>=0 libGLES>=0"
do_fetch() {
local url="git://github.com/raspberrypi/firmware.git"
@@ -37,11 +43,3 @@ do_install() {
vinstall ${FILESDIR}/cmdline.txt 644 boot
vinstall ${FILESDIR}/config.txt 644 boot
}
-
-rpi-firmware_package() {
- conf_files="/boot/cmdline.txt /boot/config.txt"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rpi-kernel-headers b/srcpkgs/rpi-kernel-headers
new file mode 120000
index 0000000000..3b4ec07333
--- /dev/null
+++ b/srcpkgs/rpi-kernel-headers
@@ -0,0 +1 @@
+rpi-kernel
\ No newline at end of file
diff --git a/srcpkgs/kernel-rpi/files/args-uncompressed.txt b/srcpkgs/rpi-kernel/files/args-uncompressed.txt
similarity index 100%
rename from srcpkgs/kernel-rpi/files/args-uncompressed.txt
rename to srcpkgs/rpi-kernel/files/args-uncompressed.txt
diff --git a/srcpkgs/kernel-rpi/files/boot-uncompressed.txt b/srcpkgs/rpi-kernel/files/boot-uncompressed.txt
similarity index 100%
rename from srcpkgs/kernel-rpi/files/boot-uncompressed.txt
rename to srcpkgs/rpi-kernel/files/boot-uncompressed.txt
diff --git a/srcpkgs/kernel-rpi/files/imagetool-uncompressed.py b/srcpkgs/rpi-kernel/files/imagetool-uncompressed.py
similarity index 100%
rename from srcpkgs/kernel-rpi/files/imagetool-uncompressed.py
rename to srcpkgs/rpi-kernel/files/imagetool-uncompressed.py
diff --git a/srcpkgs/kernel-rpi/template b/srcpkgs/rpi-kernel/template
similarity index 75%
rename from srcpkgs/kernel-rpi/template
rename to srcpkgs/rpi-kernel/template
index 8b5f9f84a5..2bd68fcbdc 100644
--- a/srcpkgs/kernel-rpi/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,27 +1,43 @@
-# Template file for 'kernel-rpi'
+# Template file for 'rpi-kernel'
#
-# Latest commit as of 20131218
-_githash="ff9f6d8"
+# Latest commit as of 20140120
+_githash="e79a3f89627c9ff65d5d183229bc68ecc51e6e2f"
+_gitshort="${_githash:0:7}"
-pkgname=kernel-rpi
-version=3.10.24
+pkgname=rpi-kernel
+version=3.10.28
revision=1
+wrksrc="linux-${_githash}"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org"
license="GPL-2"
-short_desc="The Linux kernel and modules for the Raspberry Pi (3.10 series [git ${_githash}])"
+short_desc="The Linux kernel and modules for the Raspberry Pi (${version%.*} series [git ${_gitshort}])"
+distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
+checksum=63976cbafe60da85c2aa048ab59c005dae9a4a637101f6df7b9ea4e1efa547df
_kernver="${version}_${revision}"
+
+create_srcdir=yes
+nostrip=yes
+noverifyrdeps=yes
+
+only_for_archs="armv6l"
hostmakedepends="perl python kmod>=11_2 uboot-mkimage openssl which elfutils bc"
makedepends="ncurses-devel"
-only_for_archs="armv6l"
+depends="kmod>=11_2"
+replaces="kernel-rpi>=0"
+triggers="kernel-hooks"
+# These files could be modified when an external module is built.
+mutable_files="
+ /usr/lib/modules/${_kernver}/modules.dep
+ /usr/lib/modules/${_kernver}/modules.dep.bin
+ /usr/lib/modules/${_kernver}/modules.symbols
+ /usr/lib/modules/${_kernver}/modules.symbols.bin
+ /usr/lib/modules/${_kernver}/modules.alias
+ /usr/lib/modules/${_kernver}/modules.alias.bin
+ /usr/lib/modules/${_kernver}/modules.devname"
-do_fetch() {
- url="git://github.com/raspberrypi/linux.git"
- msg_normal "Cloning from $url ...\n"
- git clone --depth 1 $url ${pkgname}-${version}
- cd ${pkgname}-${version}
- git checkout ${_githash}
+pre_configure() {
# Remove .git directory, otherwise scripts/setkernelversion.sh
# modifies KERNELRELEASE and appends + to it.
rm -rf .git
@@ -67,7 +83,7 @@ do_install() {
cd ${wrksrc}
vinstall arch/arm/boot/kernel.img 644 boot
- hdrdest=${DESTDIR}/usr/src/kernel-headers-rpi-${_kernver}
+ hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
# Switch to /usr.
vmkdir usr
@@ -75,7 +91,7 @@ do_install() {
cd ${DESTDIR}/usr/lib/modules/${_kernver}
rm -f source build
- ln -sf ../../../src/kernel-headers-rpi-${_kernver} build
+ ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
cd ${wrksrc}
# Install required headers to build external modules
@@ -108,9 +124,6 @@ do_install() {
mkdir -p ${hdrdest}/arch/arm/kernel
cp arch/arm/Makefile ${hdrdest}/arch/arm
- if [ "$MACHINE_ARCH" = "i686" ]; then
- cp arch/arm/Makefile_32.cpu ${hdrdest}/arch/arm
- fi
cp arch/arm/kernel/asm-offsets.s ${hdrdest}/arch/arm/kernel
# Add docbook makefile
@@ -153,31 +166,13 @@ do_install() {
depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
}
-kernel-headers-rpi_package() {
+rpi-kernel-headers_package() {
nostrip=yes
noverifyrdeps=yes
- short_desc="Linux kernel headers for the RaspberryPI (3.10 series [${_githash}])"
+ replaces="kernel-rpi-headers>=0"
+ short_desc="The Linux kernel headers for the Raspberry Pi (${version%.*} series [git ${_gitshort}])"
pkg_install() {
vmove usr/src
vmove usr/lib/modules/${_kernver}/build
}
}
-
-kernel-rpi_package() {
- nostrip=yes
- noverifyrdeps=yes
- triggers="kernel-hooks"
- depends="kmod>=11_2"
- # These files could be modified when an external module is built.
- mutable_files="
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rpmextract/template b/srcpkgs/rpmextract/template
index 125dde9f2a..34a31fb7fb 100644
--- a/srcpkgs/rpmextract/template
+++ b/srcpkgs/rpmextract/template
@@ -6,17 +6,10 @@ short_desc="Script to convert or extract RPM archives (contains rpm2cpio)"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL"
homepage="http://www.archlinux.org"
-
+depends="bash bsdtar coreutils"
+noarch="yes"
do_install() {
vinstall ${FILESDIR}/rpm2cpio 755 usr/bin
vinstall ${FILESDIR}/rpmextract 755 usr/bin
}
-
-rpmextract_package() {
- depends="bash bsdtar coreutils"
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rsnapshot/template b/srcpkgs/rsnapshot/template
index c13637ec37..e2023d00e0 100644
--- a/srcpkgs/rsnapshot/template
+++ b/srcpkgs/rsnapshot/template
@@ -5,6 +5,9 @@ revision=1
build_style=gnu-configure
hostmakedepends="perl"
makedepends="perl-Lchown rsync openssh"
+depends="perl perl-Lchown rsync openssh"
+conf_files="/etc/${pkgname}.conf"
+noarch="yes"
short_desc="A remote filesystem snapshot utility"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -12,19 +15,6 @@ homepage="http://www.rsnapshot.org"
distfiles="http://www.rsnapshot.org/downloads/${pkgname}-${version}.tar.gz"
checksum=94b6c77e40628935f42a191bdc28ad93b1f132fde456ee76ee87763f1eddc75e
-pre_build() {
- sed -i 's:/usr/bin/pod2man:/usr/lib/perl5/core_perl/bin/pod2man:' Makefile
-}
-
post_install() {
mv ${DESTDIR}/etc/rsnapshot.conf.default ${DESTDIR}/etc/rsnapshot.conf
}
-
-rsnapshot_package() {
- depends="perl perl-Lchown rsync openssh"
- conf_files="/etc/${pkgname}.conf"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index d96bea2c7b..3b2f2c5446 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -21,9 +21,3 @@ long_desc="
sets of files are present at one of the ends of the link beforehand. At
first glance this may seem impossible because the calculation of diffs
between two files normally requires local access to both files."
-
-rsync_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 72e0e57752..196fe261cf 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -16,6 +16,11 @@ hostmakedepends="pkg-config"
makedepends="json-c-devel gnutls-devel>=3.1.5 postgresql-libs-devel
libmysqlclient-devel>=5.5.27 mit-krb5-devel libestr-devel>=0.1.9
libee-devel>=0.4.1 systemd-devel"
+conf_files="/etc/rsyslog.conf"
+systemd_services="rsyslog.service on"
+provides="syslog-daemon-0"
+replaces="syslog-daemon>=0"
+make_dirs="/etc/rsyslog.d 0755 root root"
short_desc="An Enhanced multi-threaded syslog daemon"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -88,14 +93,3 @@ rsyslog-postgresql_package() {
vmove usr/lib/rsyslog/ompgsql.so
}
}
-
-rsyslog_package() {
- conf_files="/etc/rsyslog.conf"
- systemd_services="rsyslog.service on"
- provides="syslog-daemon-0"
- replaces="syslog-daemon>=0"
- make_dirs="/etc/rsyslog.d 0755 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template
index c28fefd1b7..db06d06210 100644
--- a/srcpkgs/rtkit/template
+++ b/srcpkgs/rtkit/template
@@ -13,6 +13,9 @@ checksum=68859108cff6410901502b58365eb7607da37110a06b837762f771735f58acd0
hostmakedepends="pkg-config"
makedepends="dbus-devel libcap-devel shadow"
+depends="shadow"
+system_accounts="rtkit"
+rtkit_homedir="/proc"
post_install() {
# DBus configuration
@@ -20,12 +23,3 @@ post_install() {
# ControlGroup is obsolete since systemd>=205.
sed -e '/^ControlGroup.*/d' -i ${DESTDIR}/usr/lib/systemd/system/rtkit-daemon.service
}
-
-rtkit_package() {
- depends="shadow"
- system_accounts="rtkit"
- rtkit_homedir="/proc"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index 4ada33ef45..689171f033 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -23,7 +23,7 @@ do_install() {
}
librtmp_package() {
- short_desc="${short_desc} -- shared library"
+ short_desc+=" - shared library"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -31,16 +31,10 @@ librtmp_package() {
librtmp-devel_package() {
depends="openssl-devel librtmp>=$version"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-rtmpdump_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template
index 917eec02ea..b5daae9bef 100644
--- a/srcpkgs/rtorrent/template
+++ b/srcpkgs/rtorrent/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-debug"
hostmakedepends="automake pkg-config"
makedepends="libcurl-devel libsigc++-devel libtorrent-devel>=0.13.2 ncurses-devel"
+depends="libtorrent>=0.13.2"
short_desc="Ncurses BitTorrent client based on libTorrent"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://libtorrent.rakshasa.no"
@@ -22,10 +23,3 @@ pre_configure() {
sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
autoreconf -fi
}
-
-rtorrent_package() {
- depends="libtorrent>=0.13.2"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rubberband/template b/srcpkgs/rubberband/template
index 1bfa04d635..ef8e862dfb 100644
--- a/srcpkgs/rubberband/template
+++ b/srcpkgs/rubberband/template
@@ -4,6 +4,7 @@ version=1.6.0
revision=3
build_style=gnu-configure
makedepends="pkg-config ladspa-sdk libsamplerate-devel vamp-plugin-sdk-devel fftw-devel"
+depends="libvamp-plugin-sdk"
short_desc="Time-stretching and pitch-shifting audio library"
maintainer="davehome <davehome@redthumb.info.tm>"
license="GPL-2"
@@ -17,7 +18,7 @@ long_desc="
of one another."
librubberband_package() {
- short_desc="${short_desc} - Runtime libraries"
+ short_desc+=" - Runtime libraries"
pkg_install() {
vmove "usr/lib/*.so*"
vmove usr/lib/vamp
@@ -27,17 +28,10 @@ librubberband_package() {
rubberband-devel_package() {
depends="librubberband>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig
}
}
-
-rubberband_package() {
- depends="libvamp-plugin-sdk"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 549518520b..1fcd727750 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -94,9 +94,3 @@ ruby-ri_package() {
vmove "usr/share/man/man1/ri*"
}
}
-
-ruby_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/run-parts/template b/srcpkgs/run-parts/template
index d447425349..6bf2a42bbe 100644
--- a/srcpkgs/run-parts/template
+++ b/srcpkgs/run-parts/template
@@ -22,9 +22,3 @@ do_install() {
vinstall run-parts 755 usr/bin
vinstall run-parts.8 644 usr/share/man/man8
}
-
-run-parts_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 78b9d16c52..7eee06c689 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -38,9 +38,3 @@ post_install() {
cd ${DESTDIR}/usr
chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so
}
-
-rust_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index cca54740fe..b6cc384974 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -57,9 +57,3 @@ if [ "$build_option_startup_notification" ]; then
else
configure_args+=" --disable-startup-notification"
fi
-
-rxvt-unicode_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 50066f5745..4b88b16a59 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -8,6 +8,8 @@ hostmakedepends="pkg-config intltool"
makedepends="sqlite-devel vala-devel>=0.22 gtk+3-devel>=3.8
libsoup-devel>=2.44 libgee08-devel>=0.12 gupnp-av-devel>=0.12.1
gupnp-dlna-devel>=0.10 tracker-devel>=0.16_2"
+depends="hicolor-icon-theme desktop-file-utils"
+conf_files="/etc/rygel.conf"
short_desc="GNOME home media solution"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -34,11 +36,3 @@ librygel_package() {
vmove "usr/lib/*.so.*"
}
}
-
-rygel_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- conf_files="/etc/rygel.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index d1c33fe40f..c5e0773b68 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,15 +1,17 @@
# Template file for 's-nail'
pkgname=s-nail
-version=14.5.1
-_version="14_5_1"
-revision=2
+version=14.5.2
+revision=1
makedepends="openssl-devel libidn-devel"
+conf_files="/etc/mail.rc"
+provides="mail-${version}_${revision}"
+replaces="mail>=0"
short_desc="Mail processing system with a command syntax reminiscent of ed"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="BSD"
homepage="http://s-nail.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${_version}.tar.gz"
-checksum=5db746771d1cd33350ff6dc3a1249cf7b7a5b025fc5b90f9ff21a917f599501a
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version//./_}.tar.gz"
+checksum=ee347c71f902c0a65bd9185b0eb348f1c7126f58d857c7deed3b3e29953145ab
do_build() {
make PREFIX=/usr SYSCONFDIR=/etc SID= NAIL=mail BINDIR=/usr/bin \
@@ -21,12 +23,3 @@ do_install() {
make DESTDIR=$DESTDIR packager-install
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-s-nail_package() {
- conf_files="/etc/mail.rc"
- provides="mail-${version}"
- replaces="mail>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 3ceccdd76e..bd19cdd2bd 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -19,6 +19,7 @@ homepage="http://www.samba.org"
distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz"
checksum=6b960abee66058a9390be036ae42efc463790b2cf4c53f842660fa36a3dc979e
+conf_files="/etc/pam.d/samba"
hostmakedepends="pkg-config perl python-devel"
makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel
mit-krb5-devel>=1.10.1 libldap-devel pam-devel acl-devel avahi-libs-devel
@@ -114,10 +115,3 @@ samba-devel_package() {
vmove usr/lib/libsmbclient.so
}
}
-
-samba_package() {
- conf_files="/etc/pam.d/samba"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index ff532822db..b28293345f 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -8,6 +8,86 @@ configure_args="--disable-locking --enable-avahi --with-docdir=/usr/share/doc/sa
--disable-latex --enable-libusb_1_0 --enable-pthread"
makedepends="pkg-config avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
v4l-utils-devel libusb-devel net-snmp-devel libieee1284-devel"
+depends="net-snmp"
+systemd_services="saned.socket on"
+conf_files="
+ /etc/sane.d/abaton.conf
+ /etc/sane.d/agfafocus.conf
+ /etc/sane.d/apple.conf
+ /etc/sane.d/artec.conf
+ /etc/sane.d/artec_eplus48u.conf
+ /etc/sane.d/avision.conf
+ /etc/sane.d/bh.conf
+ /etc/sane.d/canon.conf
+ /etc/sane.d/canon630u.conf
+ /etc/sane.d/canon_dr.conf
+ /etc/sane.d/canon_pp.conf
+ /etc/sane.d/cardscan.conf
+ /etc/sane.d/coolscan.conf
+ /etc/sane.d/coolscan2.conf
+ /etc/sane.d/coolscan3.conf
+ /etc/sane.d/dc210.conf
+ /etc/sane.d/dc240.conf
+ /etc/sane.d/dc25.conf
+ /etc/sane.d/dell1600n_net.conf
+ /etc/sane.d/dll.conf
+ /etc/sane.d/dmc.conf
+ /etc/sane.d/epjitsu.conf
+ /etc/sane.d/epson.conf
+ /etc/sane.d/epson2.conf
+ /etc/sane.d/fujitsu.conf
+ /etc/sane.d/genesys.conf
+ /etc/sane.d/gphoto2.conf
+ /etc/sane.d/gt68xx.conf
+ /etc/sane.d/hp.conf
+ /etc/sane.d/hp3900.conf
+ /etc/sane.d/hp4200.conf
+ /etc/sane.d/hp5400.conf
+ /etc/sane.d/hpsj5s.conf
+ /etc/sane.d/hs2p.conf
+ /etc/sane.d/ibm.conf
+ /etc/sane.d/kodak.conf
+ /etc/sane.d/kodakaio.conf
+ /etc/sane.d/leo.conf
+ /etc/sane.d/lexmark.conf
+ /etc/sane.d/ma1509.conf
+ /etc/sane.d/magicolor.conf
+ /etc/sane.d/matsushita.conf
+ /etc/sane.d/microtek.conf
+ /etc/sane.d/microtek2.conf
+ /etc/sane.d/mustek.conf
+ /etc/sane.d/mustek_pp.conf
+ /etc/sane.d/mustek_usb.conf
+ /etc/sane.d/nec.conf
+ /etc/sane.d/net.conf
+ /etc/sane.d/p5.conf
+ /etc/sane.d/pie.conf
+ /etc/sane.d/pixma.conf
+ /etc/sane.d/plustek.conf
+ /etc/sane.d/plustek_pp.conf
+ /etc/sane.d/qcam.conf
+ /etc/sane.d/ricoh.conf
+ /etc/sane.d/rts8891.conf
+ /etc/sane.d/s9036.conf
+ /etc/sane.d/saned.conf
+ /etc/sane.d/sceptre.conf
+ /etc/sane.d/sharp.conf
+ /etc/sane.d/sm3840.conf
+ /etc/sane.d/snapscan.conf
+ /etc/sane.d/sp15c.conf
+ /etc/sane.d/st400.conf
+ /etc/sane.d/stv680.conf
+ /etc/sane.d/tamarack.conf
+ /etc/sane.d/teco1.conf
+ /etc/sane.d/teco2.conf
+ /etc/sane.d/teco3.conf
+ /etc/sane.d/test.conf
+ /etc/sane.d/u12.conf
+ /etc/sane.d/umax.conf
+ /etc/sane.d/umax1220u.conf
+ /etc/sane.d/umax_pp.conf
+ /etc/sane.d/v4l.conf
+ /etc/sane.d/xerox_mfp.conf"
short_desc="Scanner Access Now Easy"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.sane-project.org/"
@@ -33,7 +113,7 @@ post_install() {
}
libsane_package() {
- short_desc="${short_desc} - runtime shared library"
+ short_desc+=" - runtime shared library"
pkg_install() {
vmove "usr/lib/libsane.so*"
}
@@ -41,7 +121,7 @@ libsane_package() {
sane-devel_package() {
depends="libsane>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/bin/sane-config
@@ -49,90 +129,3 @@ sane-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-sane_package() {
- depends="net-snmp"
- systemd_services="saned.socket on"
- conf_files="
- /etc/sane.d/abaton.conf
- /etc/sane.d/agfafocus.conf
- /etc/sane.d/apple.conf
- /etc/sane.d/artec.conf
- /etc/sane.d/artec_eplus48u.conf
- /etc/sane.d/avision.conf
- /etc/sane.d/bh.conf
- /etc/sane.d/canon.conf
- /etc/sane.d/canon630u.conf
- /etc/sane.d/canon_dr.conf
- /etc/sane.d/canon_pp.conf
- /etc/sane.d/cardscan.conf
- /etc/sane.d/coolscan.conf
- /etc/sane.d/coolscan2.conf
- /etc/sane.d/coolscan3.conf
- /etc/sane.d/dc210.conf
- /etc/sane.d/dc240.conf
- /etc/sane.d/dc25.conf
- /etc/sane.d/dell1600n_net.conf
- /etc/sane.d/dll.conf
- /etc/sane.d/dmc.conf
- /etc/sane.d/epjitsu.conf
- /etc/sane.d/epson.conf
- /etc/sane.d/epson2.conf
- /etc/sane.d/fujitsu.conf
- /etc/sane.d/genesys.conf
- /etc/sane.d/gphoto2.conf
- /etc/sane.d/gt68xx.conf
- /etc/sane.d/hp.conf
- /etc/sane.d/hp3900.conf
- /etc/sane.d/hp4200.conf
- /etc/sane.d/hp5400.conf
- /etc/sane.d/hpsj5s.conf
- /etc/sane.d/hs2p.conf
- /etc/sane.d/ibm.conf
- /etc/sane.d/kodak.conf
- /etc/sane.d/kodakaio.conf
- /etc/sane.d/leo.conf
- /etc/sane.d/lexmark.conf
- /etc/sane.d/ma1509.conf
- /etc/sane.d/magicolor.conf
- /etc/sane.d/matsushita.conf
- /etc/sane.d/microtek.conf
- /etc/sane.d/microtek2.conf
- /etc/sane.d/mustek.conf
- /etc/sane.d/mustek_pp.conf
- /etc/sane.d/mustek_usb.conf
- /etc/sane.d/nec.conf
- /etc/sane.d/net.conf
- /etc/sane.d/p5.conf
- /etc/sane.d/pie.conf
- /etc/sane.d/pixma.conf
- /etc/sane.d/plustek.conf
- /etc/sane.d/plustek_pp.conf
- /etc/sane.d/qcam.conf
- /etc/sane.d/ricoh.conf
- /etc/sane.d/rts8891.conf
- /etc/sane.d/s9036.conf
- /etc/sane.d/saned.conf
- /etc/sane.d/sceptre.conf
- /etc/sane.d/sharp.conf
- /etc/sane.d/sm3840.conf
- /etc/sane.d/snapscan.conf
- /etc/sane.d/sp15c.conf
- /etc/sane.d/st400.conf
- /etc/sane.d/stv680.conf
- /etc/sane.d/tamarack.conf
- /etc/sane.d/teco1.conf
- /etc/sane.d/teco2.conf
- /etc/sane.d/teco3.conf
- /etc/sane.d/test.conf
- /etc/sane.d/u12.conf
- /etc/sane.d/umax.conf
- /etc/sane.d/umax1220u.conf
- /etc/sane.d/umax_pp.conf
- /etc/sane.d/v4l.conf
- /etc/sane.d/xerox_mfp.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/sbc/template b/srcpkgs/sbc/template
index f4fdfcac20..cc68e3a520 100644
--- a/srcpkgs/sbc/template
+++ b/srcpkgs/sbc/template
@@ -21,9 +21,3 @@ sbc-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-sbc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template
index 9dca873c20..d5000df2f7 100644
--- a/srcpkgs/scons/template
+++ b/srcpkgs/scons/template
@@ -4,6 +4,9 @@ version=2.3.0
revision=1
build_style=python-module
hostmakedepends="python"
+depends="python"
+noarch="yes"
+pycompile_module="SCons"
make_install_args="--standard-lib --install-data=/usr/share"
short_desc="A software construction tool"
maintainer="davehome <davehome@redthumb.info.tm>"
@@ -18,12 +21,3 @@ long_desc="
SCons is implemented as a Python script and set of modules, and SCons
configuration files are actually executed as Python scripts. This gives
SCons many powerful capabilities not found in other software build tools."
-
-scons_package() {
- depends="python"
- noarch="yes"
- pycompile_module="SCons"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index 6f00a8d5b7..ea368492c2 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--with-sys-screenrc=/etc/screenrc -enable-pam --enable-colors256
--enable-locale -with-socket-dir=/run/screens --with-pty-group=5"
makedepends="pam-devel ncurses-devel"
+conf_files="/etc/screenrc /etc/skel/.screenrc"
short_desc="The GNU screen utility"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.gnu.org/s/screen/"
@@ -35,10 +36,3 @@ post_install() {
vinstall etc/screenrc 0644 etc
vinstall etc/etcscreenrc 0644 etc/skel .screenrc
}
-
-screen_package() {
- conf_files="/etc/screenrc /etc/skel/.screenrc"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/scrnsaverproto/template b/srcpkgs/scrnsaverproto/template
index 799b6f185e..02e9817079 100644
--- a/srcpkgs/scrnsaverproto/template
+++ b/srcpkgs/scrnsaverproto/template
@@ -2,6 +2,7 @@
pkgname=scrnsaverproto
version=1.2.0
revision=3
+noarch="yes"
build_style=gnu-configure
short_desc="ScrnSaver extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,10 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=deaf0a3212617e0dab353a3c3a66e0a1f2398306eca0fd882ac15996b0e44d99
-
-scrnsaverproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 4ce5c0361d..b15ce3da0a 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -14,9 +14,3 @@ checksum=613d1cf524c2b62ce3c65f1232ea4f05c7daf248d5e82ff2a6892c98093994f2
long_desc="
scrot is a commandline screen capture util like "import",
but using imlib2."
-
-scrot_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 8b7114e7b0..cf7b78ff45 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -15,9 +15,3 @@ long_desc="
Tarsnap online backup system and is designed to be far more secure against
hardware brute-force attacks than alternative functions such as PBKDF2 or
bcrypt."
-
-scrypt_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 1cd7034819..928a9ce6b8 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -37,9 +37,3 @@ do_install() {
vinstall icons/scummvm.xpm 644 usr/share/pixmaps
vinstall gui/themes/scummmodern.zip 644 usr/share/scummvm
}
-
-scummvm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sdb/template b/srcpkgs/sdb/template
index bb518294ae..99bf40ec94 100644
--- a/srcpkgs/sdb/template
+++ b/srcpkgs/sdb/template
@@ -35,9 +35,3 @@ sdb-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-sdb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sdlmame/template b/srcpkgs/sdlmame/template
index ee9351da2b..5945eb342c 100644
--- a/srcpkgs/sdlmame/template
+++ b/srcpkgs/sdlmame/template
@@ -15,6 +15,8 @@ checksum=78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321
makedepends="unzip perl pkg-config SDL-devel>=1.2.15_4 SDL_ttf-devel
libXinerama-devel gtk+-devel GConf-devel alsa-lib-devel python
liberation-fonts-ttf"
+depends="liberation-fonts-ttf"
+nonfree="yes"
do_extract() {
# mame source code is double-zipped to save space.
@@ -71,11 +73,3 @@ do_install() {
# Include the license
vinstall docs/license.txt 644 usr/share/licenses/${pkgname}
}
-
-sdlmame_package() {
- depends="liberation-fonts-ttf"
- nonfree="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template
index 714efbba36..5f6d761c6f 100644
--- a/srcpkgs/sdparm/template
+++ b/srcpkgs/sdparm/template
@@ -24,9 +24,3 @@ long_desc="
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-sdparm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template
index e8e5ab3045..1ac4b10199 100644
--- a/srcpkgs/seahorse-nautilus/template
+++ b/srcpkgs/seahorse-nautilus/template
@@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool gnome-doc-utils"
makedepends="gtk+3-devel>=3.8 nautilus-devel>=3.10 libnotify-devel
gpgme-devel libcryptui-devel>=3.10 gcr-devel>=3.10
libgnome-keyring-devel>=3.10 gnupg"
+depends="gnupg desktop-file-utils"
short_desc="A Nautilus plugin for OpenPGP file encryption/decryption"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org/projects/seahorse/"
@@ -29,10 +30,3 @@ long_desc="
This package contains a plugin for the GNOME file manager, Nautilus to
encrypt or decrypt OpenPGP files with GnuPG."
-
-seahorse-nautilus_package() {
- depends="gnupg desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index 1ad6a4fc1b..e0e985c0d9 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -4,8 +4,8 @@ version=3.6.1
revision=2
build_style=gnu-configure
makedepends="pkg-config intltool gnome-doc-utils gtk+3-devel>=3.6.1
- gpgme-devel libsoup-devel>=2.40 avahi-glib-libs-devel libSM-devel
- gnupg"
+ gpgme-devel libsoup-devel>=2.40 avahi-glib-libs-devel libSM-devel gnupg"
+depends="gnupg"
short_desc="Sharing of PGP public keys via DNS-SD and HKP"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org/projects/seahorse/"
@@ -27,10 +27,3 @@ long_desc="
This package contains additional functionality for GNOME's Seahorse
to share PGP public keys via DNS-SD and HKP."
-
-seahorse-sharing_package() {
- depends="gnupg"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index d39c518331..332977c3f1 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,36 +1,17 @@
# Template file for 'seahorse'
pkgname=seahorse
-version=3.10.1
+version=3.10.2
revision=1
build_style=gnu-configure
-configure_args="--disable-schemas-compile
- --enable-ldap --enable-hkp --disable-debug"
+configure_args="--disable-schemas-compile --enable-ldap --enable-hkp"
hostmakedepends="which pkg-config intltool gnome-doc-utils itstool"
makedepends="gtk+3-devel>=3.8 gcr-devel>=3.10 libsecret-devel
gpgme-devel libldap-devel libsoup-devel avahi-glib-libs-devel
openssh>=6.1p1"
-short_desc="Encryption Made Easy"
+depends="hicolor-icon-theme desktop-file-utils gcr>=3.10 openssh>=6.1p1"
+short_desc="GNOME application for managing encryption keys"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://projects.gnome.org/seahorse/"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=1df307481988c272d5648a335b2e8bb545b568a00c3f2ca2f3aa732badb46985
-long_desc="
- Seahorse is a GNOME application for managing encryption keys. It also
- integrates with nautilus, gedit and other places for encryption operations.
-
- With seahorse you can...
-
- * Create and manage PGP keys
- * Create and manage SSH keys
- * Publish and retrieve keys from key servers
- * Cache your passphrase so you don't have to keep typing it
- * Backup your keys and keyring
- * more..."
-
-seahorse_package() {
- depends="hicolor-icon-theme desktop-file-utils gcr>=3.10 openssh>=6.1p1"
- pkg_install() {
- vmove all
- }
-}
+checksum=89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16
diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template
index c90b64d58e..afe23ccc57 100644
--- a/srcpkgs/sed/template
+++ b/srcpkgs/sed/template
@@ -5,6 +5,7 @@ revision=3
build_style=gnu-configure
configure_args="--enable-acl"
makedepends="acl-devel"
+conflicts="chroot-sed>=0"
short_desc="The GNU stream editor"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -16,10 +17,3 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" ac_cv_func_aclsort=yes"
LDFLAGS="-L${XBPS_CROSS_BASE}/lib -lacl"
fi
-
-sed_package() {
- conflicts="chroot-sed>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/seed/template b/srcpkgs/seed/template
index 27bd5a788e..cd51f4d592 100644
--- a/srcpkgs/seed/template
+++ b/srcpkgs/seed/template
@@ -7,6 +7,7 @@ configure_args="--disable-static"
makedepends="pkg-config intltool readline-devel gobject-introspection
libsoup-devel webkitgtk-devel sqlite-devel dbus-glib-devel
gir-freedesktop gnome-js-common"
+depends="gir-freedesktop gnome-js-common"
short_desc="GObject JavaScript bindings for the webkit engine - Interpreter"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://live.gnome.org/Seed/"
@@ -39,10 +40,3 @@ libseed_package() {
vmove usr/share/seed-gtk3
}
}
-
-seed_package() {
- depends="gir-freedesktop gnome-js-common"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/serd/template b/srcpkgs/serd/template
index fce94ae4ea..b08b07977e 100644
--- a/srcpkgs/serd/template
+++ b/srcpkgs/serd/template
@@ -21,7 +21,7 @@ long_desc="
serd-devel_package() {
depends="libserd>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -29,14 +29,8 @@ serd-devel_package() {
}
libserd_package() {
- short_desc="${short_desc} - Runtime library"
+ short_desc+=" - Runtime library"
pkg_install() {
vmove "usr/lib/*.so*"
}
}
-
-serd_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index 67c187ce52..2fa30b949d 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -30,9 +30,3 @@ serf-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-serf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sessreg/template b/srcpkgs/sessreg/template
index 775959ae02..39850c3cbd 100644
--- a/srcpkgs/sessreg/template
+++ b/srcpkgs/sessreg/template
@@ -14,9 +14,3 @@ checksum=73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190
long_desc="
Sessreg is a simple program to manage utmp/wtmp entries for
xdm sessions and other clients not started from init."
-
-sessreg_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template
index 72b0a78d71..36c8f5e84e 100644
--- a/srcpkgs/setxkbmap/template
+++ b/srcpkgs/setxkbmap/template
@@ -14,9 +14,3 @@ checksum=999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39
long_desc="
The setxkbmap command maps the keyboard to use the layout determined
by the options specified on the command line."
-
-setxkbmap_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sexy-python/template b/srcpkgs/sexy-python/template
index 4d39816ff7..deb793b702 100644
--- a/srcpkgs/sexy-python/template
+++ b/srcpkgs/sexy-python/template
@@ -5,18 +5,10 @@ revision=4
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libsexy-devel pygtk-devel"
+depends="pygtk"
short_desc="Python bindings for libsexy"
homepage="http://blog.chipx86.com/category/open-source/libsexy/"
license="LGPL-2.1+"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://releases.chipx86.com/libsexy/$pkgname/$pkgname-$version.tar.gz"
checksum=2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15
-long_desc="
- This packages provides the libsexy Python bindings."
-
-sexy-python_package() {
- depends="pygtk"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sg3_utils/template b/srcpkgs/sg3_utils/template
index 3ac5090cc7..7927debd77 100644
--- a/srcpkgs/sg3_utils/template
+++ b/srcpkgs/sg3_utils/template
@@ -13,7 +13,7 @@ distfiles="http://sg.danny.cz/sg/p/$pkgname-$version.tgz"
checksum=385e73a3acc961efd50a610db9c737f14ccc98ba8488e54355be1f08417e08af
libsgutils_package() {
- short_desc="${short_desc} --- shared library"
+ short_desc+=" - shared library"
replaces="sg3_utils<1.31"
pkg_install() {
vmove "usr/lib/*.so*"
@@ -22,14 +22,8 @@ libsgutils_package() {
sg3_utils-devel_package() {
depends="libsgutils>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
}
}
-
-sg3_utils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index 81e56aed76..6705bda313 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -7,6 +7,23 @@ configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
--libdir=/usr/lib --enable-shared --disable-static
--with-libpam --without-selinux --with-acl --with-attr"
makedepends="acl-devel pam-devel"
+depends="pam"
+conf_files="
+ /etc/pam.d/usermod
+ /etc/pam.d/userdel
+ /etc/pam.d/useradd
+ /etc/pam.d/passwd
+ /etc/pam.d/newusers
+ /etc/pam.d/groupmod
+ /etc/pam.d/groupmems
+ /etc/pam.d/groupdel
+ /etc/pam.d/groupadd
+ /etc/pam.d/chpasswd
+ /etc/pam.d/chgpasswd
+ /etc/pam.d/chage
+ /etc/pam.d/other
+ /etc/defaults/useradd
+ /etc/login.defs"
short_desc="Shadow password file utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -21,6 +38,13 @@ if [ "$CROSS_BUILD" ]; then
}
fi
+pre_configure() {
+ case "$XBPS_TARGET_MACHINE" in
+ # Completely disable unportable ruserok().
+ *-musl) sed '/RUSEROK/d' -i configure;;
+ esac
+}
+
do_build() {
# Don't install groups(1), we use the one from coreutils.
sed -i 's/groups$(EXEEXT) //' src/Makefile
@@ -76,26 +100,3 @@ post_install() {
vinstall $FILESDIR/LICENSE 644 usr/share/licenses/shadow
}
-
-shadow_package() {
- conf_files="
- /etc/pam.d/usermod
- /etc/pam.d/userdel
- /etc/pam.d/useradd
- /etc/pam.d/passwd
- /etc/pam.d/newusers
- /etc/pam.d/groupmod
- /etc/pam.d/groupmems
- /etc/pam.d/groupdel
- /etc/pam.d/groupadd
- /etc/pam.d/chpasswd
- /etc/pam.d/chgpasswd
- /etc/pam.d/chage
- /etc/pam.d/other
- /etc/defaults/useradd
- /etc/login.defs"
- depends="pam"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/shared-color-profiles/template b/srcpkgs/shared-color-profiles/template
index 1690184463..9fb31f403f 100644
--- a/srcpkgs/shared-color-profiles/template
+++ b/srcpkgs/shared-color-profiles/template
@@ -2,6 +2,7 @@
pkgname=shared-color-profiles
version=0.1.5
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="Color profiles from contributors for color calibration"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,10 +16,3 @@ long_desc="
These include a Adobe RGB compatible and sRGB compatible, as well as various
user or manufacturer supplied profiles."
-
-shared-color-profiles_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/shared-color-targets/template b/srcpkgs/shared-color-targets/template
index e716b362b6..4177d404c6 100644
--- a/srcpkgs/shared-color-targets/template
+++ b/srcpkgs/shared-color-targets/template
@@ -2,6 +2,7 @@
pkgname=shared-color-targets
version=0.1.1
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="Shared color targets for creating color profiles"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,10 +13,3 @@ checksum=656dd3c467ebbaf953ffa37075a58a8410ad54bf348f95055451e9b7689a6b29
long_desc="
$pkgname contains target files for popular scanner calibration targets.
These include the IT 8.7 targets from http://www.targets.coloraid.de/"
-
-shared-color-targets_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/shared-desktop-ontologies/template b/srcpkgs/shared-desktop-ontologies/template
index 1ebb9e6f96..9eac752304 100644
--- a/srcpkgs/shared-desktop-ontologies/template
+++ b/srcpkgs/shared-desktop-ontologies/template
@@ -2,6 +2,7 @@
pkgname=shared-desktop-ontologies
version=0.11.0
revision=1
+noarch=yes
build_style=cmake
hostmakedepends="cmake"
short_desc="Provide RDF vocabularies for the Semantic Desktop"
@@ -10,10 +11,3 @@ license="GPL-2"
homepage="http://sourceforge.net/apps/trac/oscaf/"
distfiles="${SOURCEFORGE_SITE}/oscaf/${pkgname}-${version}.tar.bz2"
checksum=82afe6c24cf574f242c1fa85a5daff8c3631cc9b4cbcb80379dce6f364b4bbd4
-
-shared-desktop-ontologies_package() {
- noarch=yes
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index 5015727821..e22c103cbc 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -26,9 +26,3 @@ long_desc="
update-mime-database command used to extend it."
disable_parallel_build=yes
-
-shared-mime-info_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 5f5cc7969d..fe70cebb6a 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -17,6 +17,56 @@ license="GPL"
short_desc="An iptables-based firewall for Linux systems"
create_wrksrc=yes
+noarch="yes"
+conf_files="
+ /etc/shorewall/accounting
+ /etc/shorewall/actions
+ /etc/shorewall/blrules
+ /etc/shorewall/clear
+ /etc/shorewall/conntrack
+ /etc/shorewall/ecn
+ /etc/shorewall/findgw
+ /etc/shorewall/hosts
+ /etc/shorewall/init
+ /etc/shorewall/initdone
+ /etc/shorewall/interfaces
+ /etc/shorewall/lib.private
+ /etc/shorewall/maclist
+ /etc/shorewall/masq
+ /etc/shorewall/nat
+ /etc/shorewall/netmap
+ /etc/shorewall/params
+ /etc/shorewall/policy
+ /etc/shorewall/providers
+ /etc/shorewall/proxyarp
+ /etc/shorewall/refresh
+ /etc/shorewall/refreshed
+ /etc/shorewall/restored
+ /etc/shorewall/routes
+ /etc/shorewall/stoppedrules
+ /etc/shorewall/rtrules
+ /etc/shorewall/rules
+ /etc/shorewall/scfilter
+ /etc/shorewall/secmarks
+ /etc/shorewall/shorewall.conf
+ /etc/shorewall/start
+ /etc/shorewall/started
+ /etc/shorewall/stop
+ /etc/shorewall/stopped
+ /etc/shorewall/tcclasses
+ /etc/shorewall/tcclear
+ /etc/shorewall/tcdevices
+ /etc/shorewall/tcfilters
+ /etc/shorewall/tcinterfaces
+ /etc/shorewall/tcpri
+ /etc/shorewall/tcrules
+ /etc/shorewall/tos
+ /etc/shorewall/tunnels
+ /etc/shorewall/zones"
+
+depends="shorewall-core perl"
+systemd_services="${pkgname}.service off"
+make_dirs="/var/lib/${pkgname} 0755 0 0"
do_build(){
for product in ${pkgname}{-core,6,}-${version}; do
@@ -26,23 +76,10 @@ do_build(){
}
do_install() {
- :
-}
-
-shorewall_package() {
- noarch="yes"
- depends="shorewall-core perl"
- systemd_services="${pkgname}.service off"
- make_dirs="/var/lib/${pkgname} 0755 0 0"
- pkg_install() {
- cd ${wrksrc}/${pkgname}-${version}
- DESTDIR="${PKGDESTDIR}" ./install.sh
- vmkdir usr/share/doc/${pkgname}
- cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
- }
- for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
- conf_files+="${f##${PKGDESTDIR}} "
- done
+ cd ${wrksrc}/${pkgname}-${version}
+ DESTDIR="${DESTDIR}" ./install.sh
+ vmkdir usr/share/doc/${pkgname}
+ cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
}
shorewall-core_package() {
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index ab40e26efd..0a012f844d 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -10,6 +10,7 @@ makedepends="vala-devel>=0.22 libgee08-devel libraw-devel>=0.15
libgphoto2-devel libgexiv2-devel>=0.6.0 libunique-devel rest-devel
sqlite-devel gtk+3-devel webkitgtk-devel libgudev-devel json-glib-devel
gst-plugins-base1-devel"
+depends="hicolor-icon-theme desktop-file-utils libgexiv2>=0.6.0"
short_desc="Open source photo manager for GNOME"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -21,10 +22,3 @@ long_desc="
environment. It allows you to import photos from disk or camera,
organize them in various ways, view them in full-window or fullscreen
mode, and export them to share with others."
-
-shotwell_package() {
- depends="hicolor-icon-theme desktop-file-utils libgexiv2>=0.6.0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/sic-git/template b/srcpkgs/sic-git/template
index a519682a85..2f805c015e 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 <linuxienATlegtuxDOTorg>"
license="MIT"
@@ -13,18 +15,7 @@ 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
- }
-}
diff --git a/srcpkgs/silc-client/template b/srcpkgs/silc-client/template
index 1326fc3795..49ccbd1a10 100644
--- a/srcpkgs/silc-client/template
+++ b/srcpkgs/silc-client/template
@@ -7,6 +7,7 @@ configure_args="--enable-debug --enable-ipv6 --disable-optimizations
ac_cv_func_pthread_rwlock_init=set ac_cv_func_epoll_wait=set"
makedepends="silc-toolkit-devel ncurses-devel pcre-devel glib-devel"
hostmakedepends="pkg-config"
+conf_files="/etc/silc.conf"
short_desc="Secure Internet Live Conferencing client"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL"
@@ -29,10 +30,3 @@ else
rm -rf ${DESTDIR}/usr/share/silc/scripts
}
fi
-
-silc-client_package() {
- conf_files="/etc/silc.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/silc-toolkit/template b/srcpkgs/silc-toolkit/template
index 05622aac1d..8e24edcaba 100644
--- a/srcpkgs/silc-toolkit/template
+++ b/srcpkgs/silc-toolkit/template
@@ -31,9 +31,3 @@ silc-toolkit-devel_package() {
vmove usr/share/doc
}
}
-
-silc-toolkit_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/silc/template b/srcpkgs/silc/template
index 20e66a8faa..6fc4674b95 100644
--- a/srcpkgs/silc/template
+++ b/srcpkgs/silc/template
@@ -13,9 +13,3 @@ homepage="http://www.silcnet.org/"
distfiles="http://www.silcnet.org/download/server/sources/$pkgname-server-$version.tar.gz"
checksum=fcb278f22cea61ba6e3d6e49af9de50111f5c8565408054d828af262fc0fe293
wrksrc="$pkgname-server-$version"
-
-silc_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template
index b1073fe23c..b911a6dd54 100644
--- a/srcpkgs/simple-scan/template
+++ b/srcpkgs/simple-scan/template
@@ -7,6 +7,7 @@ configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config itstool intltool"
makedepends="colord-devel>=0.1.23_3 gtk+3-devel>=3.6.0_3 sqlite-devel
dconf-devel sane-devel libgudev-devel"
+depends="hicolor-icon-theme sane"
short_desc="Simple scanning utility"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -19,10 +20,3 @@ long_desc="
Simple Scan is basically a frontend for SANE - which is the same backend as
XSANE uses. This means that all existing scanners will work and the interface
is well tested."
-
-simple-scan_package() {
- depends="hicolor-icon-theme sane"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index aa670125f9..b3538ed470 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -24,7 +24,10 @@ long_desc="
# XXX no multiarch for now.
only_for_archs="i686"
+nonfree="yes"
+nostrip="yes"
makedepends="qt>=4.8.4_4 hicolor-icon-theme desktop-file-utils"
+depends="${makedepends}"
do_install() {
# Executable
@@ -54,12 +57,3 @@ do_install() {
vinstall LICENSE 644 usr/share/licenses/skype
vinstall "third-party_attributions.txt" 644 usr/share/licenses/skype
}
-
-skype_package() {
- nonfree="yes"
- nostrip="yes"
- depends="${makedepends}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/skypetab-ng/template b/srcpkgs/skypetab-ng/template
index 8196bc626e..0c15c8922b 100644
--- a/srcpkgs/skypetab-ng/template
+++ b/srcpkgs/skypetab-ng/template
@@ -4,6 +4,7 @@ version=20130719
revision=1
hostmakedepends="pkg-config"
makedepends="libX11-devel qt-devel"
+depends="skype"
short_desc="A program that adds tabs to Skype for Linux"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://keks-n.net/skypetab"
@@ -36,10 +37,3 @@ do_install() {
make ${makejobs} INSTALL_ROOT=${DESTDIR} install
chmod +x "${DESTDIR}/usr/share/applications/${pkgname}.desktop"
}
-
-skypetab-ng_package() {
- depends="skype"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index 4f4ec8558f..df6cd30da3 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -1,11 +1,13 @@
# Template file for 'slim'
pkgname=slim
version=1.3.6
-revision=2
+revision=3
build_style=cmake
-configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no"
+configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2"
hostmakedepends="cmake pkg-config"
-makedepends="libpng-devel>=1.6 libjpeg-turbo-devel libXrandr-devel libXmu-devel libXft-devel pam-devel"
+makedepends="libpng-devel>=1.6 freetype-devel libjpeg-turbo-devel libXrandr-devel libXmu-devel libXft-devel pam-devel"
+conf_files="/etc/slim.conf /etc/pam.d/slim"
+systemd_services="slim.service off"
short_desc="Desktop-independent graphical login manager for X11"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -22,11 +24,3 @@ post_install() {
sed -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt01|' \
-e 's|/var/run/slim.lock|/var/lock/slim.lock|' -i ${DESTDIR}/etc/slim.conf
}
-
-slim_package() {
- conf_files="/etc/slim.conf /etc/pam.d/slim"
- systemd_services="slim.service off"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/sloccount/template b/srcpkgs/sloccount/template
index 320c2050ab..bb0763e1f6 100644
--- a/srcpkgs/sloccount/template
+++ b/srcpkgs/sloccount/template
@@ -3,6 +3,7 @@ pkgname=sloccount
version=2.26
revision=1
hostmakedepends="flex"
+depends="perl"
short_desc="Tool to count physical source lines of code in many languages"
maintainer="pancake <pancake@nopcode.org>"
license="GPL-2"
@@ -21,10 +22,3 @@ do_install() {
${DESTDIR}/usr/share/doc/sloccount
chmod 644 ${DESTDIR}/usr/share/doc/sloccount/*
}
-
-sloccount_package() {
- depends="perl"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template
index 7ab2115b6c..ececfca3f4 100644
--- a/srcpkgs/slock/template
+++ b/srcpkgs/slock/template
@@ -26,9 +26,3 @@ do_install() {
make PREFIX=/usr DESTDIR=$DESTDIR install
vinstall LICENSE 644 usr/share/licenses/$pkgname
}
-
-slock_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/smali/template b/srcpkgs/smali/template
index 3b2c6fc0d6..3b36758b18 100644
--- a/srcpkgs/smali/template
+++ b/srcpkgs/smali/template
@@ -19,9 +19,3 @@ do_install() {
vinstall ${FILESDIR}/smali 755 usr/bin
vinstall ${FILESDIR}/baksmali 755 usr/bin
}
-
-smali_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/smartmontools/template b/srcpkgs/smartmontools/template
index 594e95841c..bdebd2eb85 100644
--- a/srcpkgs/smartmontools/template
+++ b/srcpkgs/smartmontools/template
@@ -7,6 +7,9 @@ configure_args="--enable-drivedb --with-libcap-ng=yes
--with-systemdsystemunitdir=/usr/lib/systemd/system
--with-drivedbdir=/var/db/${pkgname}"
makedepends="libcap-ng-devel"
+conf_files="/etc/smartd.conf"
+mutable_files="/var/db/smartmontools/drivedb.h"
+systemd_services="smartd.service on"
short_desc="S.M.A.R.T Monitoring Tools"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -19,12 +22,3 @@ long_desc="
and Reporting Technology System (SMART) built into most modern ATA and SCSI
harddisks. In many cases, these utilities will provide advanced warning of
disk degradation and failure."
-
-smartmontools_package() {
- conf_files="/etc/smartd.conf"
- mutable_files="/var/db/smartmontools/drivedb.h"
- systemd_services="smartd.service on"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template
index 39520f47f7..d79df5c4cb 100644
--- a/srcpkgs/smpeg/template
+++ b/srcpkgs/smpeg/template
@@ -24,7 +24,7 @@ post_install() {
smpeg-devel_package() {
depends="SDL-devel smpeg>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/bin
vmove usr/include
@@ -32,9 +32,3 @@ smpeg-devel_package() {
vmove usr/share
}
}
-
-smpeg_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index caa755c3f3..0fbeb8a7c7 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -3,6 +3,7 @@ pkgname=smplayer
version=0.8.5
revision=1
makedepends="mplayer qt-devel hicolor-icon-theme desktop-file-utils"
+depends="mplayer hicolor-icon-theme desktop-file-utils"
short_desc="A complete front-end for MPlayer"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -18,10 +19,3 @@ do_build() {
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install
}
-
-smplayer_package() {
- depends="mplayer hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/smproxy/template b/srcpkgs/smproxy/template
index 97341b8bdc..6a5ee08eab 100644
--- a/srcpkgs/smproxy/template
+++ b/srcpkgs/smproxy/template
@@ -14,9 +14,3 @@ checksum=c72ccb094e4971ec2339ee06439114e86ffdcdf449a6accd5552e817142fd609
long_desc="
smproxy allows X applications that do not support X11R6 session
management to participate in an X11R6 session."
-
-smproxy_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/smu-git/template b/srcpkgs/smu-git/template
index fc1a35e2ee..3a38505e1c 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 <linuxienATlegtuxDOTorg>"
license="MIT"
@@ -13,17 +15,6 @@ 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
- }
-}
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 9666e58844..1b4a2040b1 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-zypp --with-conf=/etc/conf.d"
hostmakedepends="pkg-config automake libtool libxml2-devel libxslt docbook-xsl"
makedepends="zlib-devel boost-devel>=1.54 dbus-devel libxml2-devel pam-devel"
+conf_files="/etc/conf.d/snapper"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -47,10 +48,3 @@ snapper-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-snapper_package() {
- conf_files="/etc/conf.d/snapper"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/snappy/template b/srcpkgs/snappy/template
index af9b725b31..15e1dd0d45 100644
--- a/srcpkgs/snappy/template
+++ b/srcpkgs/snappy/template
@@ -20,9 +20,3 @@ snappy-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-snappy_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 5932a7ffe5..3684aee1ed 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,27 +1,13 @@
# Template file for 'socat'
pkgname=socat
-version=1.7.2.2
+version=1.7.2.3
revision=1
build_style=gnu-configure
configure_args="--disable-libwrap --enable-fips"
makedepends="readline-devel openssl-devel"
-short_desc="Multipurpose relay"
+short_desc="Relay for bidirectional data transfer between two independent data channels"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.dest-unreach.org/socat/"
distfiles="http://www.dest-unreach.org/socat/download/socat-$version.tar.bz2"
-checksum=9a167af11a4d3809cbc66f5e2dcb39b6e371251282ef5de6ea6ff0c4be8a953c
-long_desc="
- socat is a relay for bidirectional data transfer between two independent data
- channels. Each of these data channels may be a file, pipe, device (serial line
- etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, UDP, TCP), an
- SSL socket, proxy CONNECT connection, a file descriptor (stdin etc.), the GNU
- line editor (readline), a program, or a combination of two of these.
- These modes include generation of "listening" sockets, named pipes, and pseudo
- terminals."
-
-socat_package() {
- pkg_install() {
- vmove usr
- }
-}
+checksum=0598ac54af7b138cda9e3c141bcf0cc63eeb2ab31f468a772dc3f7eb3896aad0
diff --git a/srcpkgs/soprano/template b/srcpkgs/soprano/template
index 2da09b2e80..7b784e5374 100644
--- a/srcpkgs/soprano/template
+++ b/srcpkgs/soprano/template
@@ -6,6 +6,7 @@ build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=OFF -DSOPRANO_DISABLE_CLUCENE_INDEX=ON"
hostmakedepends="cmake pkg-config"
makedepends="qt-devel raptor-devel redland-devel libiodbc-devel virtuoso-base"
+depends="virtuoso-base"
short_desc="Highly usable object-oriented C++/Qt4 framework for RDF data"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -22,10 +23,3 @@ soprano-devel_package() {
vmove usr/share/soprano/cmake
}
}
-
-soprano_package() {
- depends="virtuoso-base"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sord/template b/srcpkgs/sord/template
index 71833d645d..99fbfe931a 100644
--- a/srcpkgs/sord/template
+++ b/srcpkgs/sord/template
@@ -15,7 +15,7 @@ long_desc="
sord-devel_package() {
depends="serd-devel libsord>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -23,14 +23,8 @@ sord-devel_package() {
}
libsord_package() {
- short_desc="${short_desc} - Runtime library"
+ short_desc+=" - Runtime library"
pkg_install() {
vmove "usr/lib/*.so*"
}
}
-
-sord_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sound-juicer/template b/srcpkgs/sound-juicer/template
index de5ffeaf53..1afd70bd71 100644
--- a/srcpkgs/sound-juicer/template
+++ b/srcpkgs/sound-juicer/template
@@ -9,6 +9,7 @@ makedepends="which pkg-config intltool gnome-doc-utils glib-devel
GConf-devel brasero-devel>=3.6.0 libdiscid-devel libmusicbrainz5-devel
libcanberra-devel gst-plugins-base1-devel gst-plugins-good1"
short_desc="CD ripping tool using GTK+ and GStreamer"
+depends="hicolor-icon-theme desktop-file-utils gst-plugins-good1"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://burtonini.com/blog/computers/sound-juicer"
license="GPL-2"
@@ -23,10 +24,3 @@ post_install() {
gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \
--domain ${pkgname} ${wrksrc}/*.schemas
}
-
-sound-juicer_package() {
- depends="hicolor-icon-theme desktop-file-utils gst-plugins-good1"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sound-theme-freedesktop/template b/srcpkgs/sound-theme-freedesktop/template
index c3237b09ad..b12226cbd4 100644
--- a/srcpkgs/sound-theme-freedesktop/template
+++ b/srcpkgs/sound-theme-freedesktop/template
@@ -2,6 +2,7 @@
pkgname=sound-theme-freedesktop
version=0.7
revision=2
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
short_desc="Freedesktop sound theme"
@@ -14,10 +15,3 @@ long_desc="
This is all kinds of sounds stolen from gnome-audio, KDE, Ekiga,
Pidgin/Purple, ALSA, put together as XDG sound theme.
This goes well along with libcanberra."
-
-sound-theme-freedesktop_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template
index 161988faef..f5d1a31859 100644
--- a/srcpkgs/soundtouch/template
+++ b/srcpkgs/soundtouch/template
@@ -33,16 +33,10 @@ post_install() {
soundtouch-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/aclocal
}
}
-
-soundtouch_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index 86fc37d57f..a53d029b55 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -40,9 +40,3 @@ source-highlight-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-source-highlight_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index f6ed795d17..11d11705bb 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -5,16 +5,10 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel startup-notification-devel libudev-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Multi-panel tabbed file manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://ignorantguru.github.com/spacefm/"
distfiles="https://github.com/IgnorantGuru/spacefm/raw/pkg/${version}/spacefm-${version}.tar.xz"
checksum=a47861b395ee991bc56e367238f2c3070c308a2b635be1099b0a6d2eda0f1795
-
-spacefm_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 556567442b..61ef9edf16 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -10,35 +10,29 @@ homepage="http://devel.freebsoft.org/speechd"
checksum=0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2
distfiles="http://devel.freebsoft.org/pub/projects/speechd/${pkgname}-${version}.tar.gz"
makedepends="intltool libltdl-devel pkg-config glib-devel dotconf-devel"
-
-speech-dispatcher_package() {
- conf_files="
- /etc/speech-dispatcher/speechd.conf
- /etc/speech-dispatcher/clients/emacs.conf
- /etc/speech-dispatcher/clients/gnome-speech.conf
- /etc/speech-dispatcher/modules/ibmtts.conf
- /etc/speech-dispatcher/modules/espeak-mbrola-generic.conf
- /etc/speech-dispatcher/modules/ivona.conf
- /etc/speech-dispatcher/modules/festival.conf
- /etc/speech-dispatcher/modules/swift-generic.conf
- /etc/speech-dispatcher/modules/espeak-generic.conf
- /etc/speech-dispatcher/modules/flite.conf
- /etc/speech-dispatcher/modules/llia_phon-generic.conf
- /etc/speech-dispatcher/modules/dtk-generic.conf
- /etc/speech-dispatcher/modules/epos-generic.conf
- /etc/speech-dispatcher/modules/espeak.conf
- /etc/speech-dispatcher/modules/cicero.conf"
- pkg_install() {
- vmove all
- }
-}
+conf_files="
+ /etc/speech-dispatcher/speechd.conf
+ /etc/speech-dispatcher/clients/emacs.conf
+ /etc/speech-dispatcher/clients/gnome-speech.conf
+ /etc/speech-dispatcher/modules/ibmtts.conf
+ /etc/speech-dispatcher/modules/espeak-mbrola-generic.conf
+ /etc/speech-dispatcher/modules/ivona.conf
+ /etc/speech-dispatcher/modules/festival.conf
+ /etc/speech-dispatcher/modules/swift-generic.conf
+ /etc/speech-dispatcher/modules/espeak-generic.conf
+ /etc/speech-dispatcher/modules/flite.conf
+ /etc/speech-dispatcher/modules/llia_phon-generic.conf
+ /etc/speech-dispatcher/modules/dtk-generic.conf
+ /etc/speech-dispatcher/modules/epos-generic.conf
+ /etc/speech-dispatcher/modules/espeak.conf
+ /etc/speech-dispatcher/modules/cicero.conf"
speech-dispatcher-devel_package() {
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
-}
\ No newline at end of file
+}
diff --git a/srcpkgs/speex/template b/srcpkgs/speex/template
index 2dc3917a33..f532953ef7 100644
--- a/srcpkgs/speex/template
+++ b/srcpkgs/speex/template
@@ -39,9 +39,3 @@ speex-devel_package() {
vmove usr/share/aclocal
}
}
-
-speex_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 9941fa0ca8..ed11596047 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="dbus-glib-devel vala-devel pixman-devel
celt051-devel openssl-devel libsasl-devel gtk+3-devel pulseaudio-devel
libjpeg-turbo-devel polkit-devel hwids"
+depends="hwids"
homepage="http://spice-space.org"
license="LGPL-2.1"
short_desc="GTK+2/3 SPICE widget"
@@ -30,10 +31,3 @@ spice-gtk-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-spice-gtk_package() {
- depends="hwids"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/spice-protocol/template b/srcpkgs/spice-protocol/template
index a95ba1dca6..fb332755e3 100644
--- a/srcpkgs/spice-protocol/template
+++ b/srcpkgs/spice-protocol/template
@@ -2,6 +2,7 @@
pkgname=spice-protocol
version=0.12.6
revision=1
+noarch="yes"
build_style=gnu-configure
configure_args="--datarootdir=/usr/lib"
short_desc="Spice Protocol headers"
@@ -10,10 +11,3 @@ homepage="http://www.spicespace.org/"
license="BSD"
distfiles="http://www.spicespace.org/download/releases/$pkgname-$version.tar.bz2"
checksum=9d4745602eb2ab1d1c1ab98b4babf587574870993b4faefe354ac57bb5e8259b
-
-spice-protocol_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/spice-vdagent/template b/srcpkgs/spice-vdagent/template
index c83e1f69ac..4d695bb7c9 100644
--- a/srcpkgs/spice-vdagent/template
+++ b/srcpkgs/spice-vdagent/template
@@ -8,6 +8,8 @@ hostmakedepends="pkg-config"
makedepends="libglib-devel dbus-devel libXfixes-devel libXrandr-devel
libXinerama-devel libpciaccess-devel spice-protocol>=0.12.6 systemd-devel
desktop-file-utils"
+depends="dbus"
+systemd_services="spice-vdagentd.service on"
short_desc="Spice agent for Linux"
homepage="http://spice-space.org/"
license="GPL-3"
@@ -27,11 +29,3 @@ long_desc="
post_install() {
rm -rf ${DESTDIR}/var
}
-
-spice-vdagent_package() {
- systemd_services="spice-vdagentd.service on"
- depends="dbus"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 0fd8c44476..5621a1c1e7 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -25,9 +25,3 @@ spice-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-spice_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template
index eb72be1a6c..3ec9291e24 100644
--- a/srcpkgs/splint/template
+++ b/srcpkgs/splint/template
@@ -18,9 +18,3 @@ long_desc="
standard lint."
disable_parallel_build=yes
-
-splint_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sqlalchemy-migrate/template b/srcpkgs/sqlalchemy-migrate/template
index 6679f4877d..5a713b697f 100644
--- a/srcpkgs/sqlalchemy-migrate/template
+++ b/srcpkgs/sqlalchemy-migrate/template
@@ -3,7 +3,11 @@ pkgname=sqlalchemy-migrate
version=0.7.2
revision=2
build_style=python-module
-makedepends="python-distribute"
+noarch="yes"
+pycompile_module="migrate"
+hostmakedepends="python-setuptools"
+makedepends="python-setuptools python-sqlalchemy python-decorator python-tempita"
+depends="python python-sqlalchemy python-decorator python-tempita"
short_desc="SQLAlchemy Schema Migration Tools"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://code.google.com/p/sqlalchemy-migrate/"
@@ -14,12 +18,3 @@ long_desc="
Schema migration tools for SQLAlchemy, designed to support an agile approach to
database design, and make it easier to keep development and production databases
in sync, as schema changes are required."
-
-sqlalchemy-migrate_package() {
- noarch="yes"
- pycompile_module="migrate"
- depends="python python-sqlalchemy python-decorator python-tempita"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 393e88ecca..7e92040a8c 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -32,9 +32,3 @@ sqlite-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-sqlite_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 1b34109e36..ab63db47d3 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -34,9 +34,3 @@ do_install() {
install -d ${DESTDIR}/usr/bin
install -m755 {mk,un}squashfs ${DESTDIR}/usr/bin
}
-
-squashfs-tools_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sratom/template b/srcpkgs/sratom/template
index bf837f65b2..70bceabe4b 100644
--- a/srcpkgs/sratom/template
+++ b/srcpkgs/sratom/template
@@ -16,15 +16,9 @@ long_desc="
sratom-devel_package() {
depends="serd-devel>=0.18.0 sord-devel lv2 sratom>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-sratom_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sshfs-fuse/template b/srcpkgs/sshfs-fuse/template
deleted file mode 100644
index ee560e7a54..0000000000
--- a/srcpkgs/sshfs-fuse/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'sshfs-fuse'
-pkgname=sshfs-fuse
-version=2.3
-revision=2
-build_style=gnu-configure
-makedepends="pkg-config glib-devel fuse-devel openssh>=6.1p1"
-short_desc="FUSE client based on the SSH File Transfer Protocol"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://fuse.sourceforge.net/sshfs.html"
-license="GPL-2"
-distfiles="${SOURCEFORGE_SITE}/fuse/$pkgname-$version.tar.gz"
-checksum=ce229f87869d136c8347cca646f1dd6394c604127d021507a57205668d9288bb
-long_desc="
- This is a filesystem client based on the SSH File Transfer Protocol. Since
- most SSH servers already support this protocol it is very easy to set up:
- i.e. on the server side there's nothing to do. On the client side mounting
- the filesystem is as easy as logging into the server with ssh."
-
-sshfs-fuse_package() {
- depends="openssh>=6.1p1"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/st/template b/srcpkgs/st/template
index 31501a9016..77d5053fd8 100644
--- a/srcpkgs/st/template
+++ b/srcpkgs/st/template
@@ -3,6 +3,7 @@ pkgname=st
version=0.4
revision=1
makedepends="pkg-config libX11-devel libXinerama-devel libXft-devel terminus-font"
+depends="terminus-font"
short_desc="simple terminal implementation for X"
maintainer="pancake <pancake@nopcode.org>"
license="MIT"
@@ -19,10 +20,3 @@ do_install() {
vinstall st 755 usr/bin
vinstall st.1 644 usr/share/man/man1
}
-
-st_package() {
- depends="terminus-font"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/startup-notification/template b/srcpkgs/startup-notification/template
index 3dd3f9f6fc..e8374f55a3 100644
--- a/srcpkgs/startup-notification/template
+++ b/srcpkgs/startup-notification/template
@@ -26,9 +26,3 @@ startup-notification-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-startup-notification_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index 596185bad1..15241b4a73 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -7,6 +7,8 @@ version=1.0.0.45
revision=1
wrksrc=steam
makedepends="hicolor-icon-theme desktop-file-utils liberation-fonts-ttf"
+depends="${makedepends}"
+nonfree="yes"
short_desc="Digital distribution client bootstrap package - Valve's steam client"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary license"
@@ -25,11 +27,3 @@ do_install() {
# Ignore steamdeps.
ln -sf /bin/true ${DESTDIR}/usr/bin/steamdeps
}
-
-steam_package() {
- depends="${makedepends}"
- nonfree="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/strace/patches/use-sys-ptrace.h.patch b/srcpkgs/strace/patches/use-sys-ptrace.h.patch
new file mode 100644
index 0000000000..a6095a6c44
--- /dev/null
+++ b/srcpkgs/strace/patches/use-sys-ptrace.h.patch
@@ -0,0 +1,13 @@
+Otherwise struct ptrace_peeksiginfo_args is redefined.
+
+--- process.c.orig 2014-01-08 18:07:14.306950549 +0100
++++ process.c 2014-01-08 18:07:19.585917125 +0100
+@@ -63,7 +63,7 @@
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ # define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
+-# include <linux/ptrace.h>
++# include <sys/ptrace.h>
+ # undef ia64_fpreg
+ # undef pt_all_user_regs
+ #endif
diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 1dee1f5953..a78caeff9f 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -12,9 +12,3 @@ checksum=f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8
long_desc="
strace is a system call tracer, i.e. a debugging tool which prints out
a trace of all the system calls made by a process/program."
-
-strace_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/strigi/template b/srcpkgs/strigi/template
index 79a9fe1c43..906105a466 100644
--- a/srcpkgs/strigi/template
+++ b/srcpkgs/strigi/template
@@ -30,9 +30,3 @@ strigi-devel_package() {
vmove usr/lib/cmake
}
}
-
-strigi_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index 6369840c25..d8ebaa5ba2 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -11,6 +11,8 @@ short_desc="Sophisticated text editor for code, markup and prose"
wrksrc="sublime_text_3"
only_for_archs="x86_64"
+nonfree="yes"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
do_install() {
vmkdir "usr/bin"
@@ -23,11 +25,3 @@ do_install() {
ln -s /usr/share/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/share/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop
}
-
-sublime-text3_package() {
- nonfree="yes"
- depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index ca0c0cb5ec..f081e96dc3 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -14,6 +14,7 @@ makedepends="db-devel>=5.3 perl>=5.18 python-devel swig apr-util-devel
libldap-devel serf-devel gdbm-devel expat-devel apr-devel libuuid-devel
sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel
qt-devel kdelibs-devel apache-devel ca-certificates"
+depends="ca-certificates"
do_configure() {
./configure ${configure_args} \
@@ -115,10 +116,3 @@ subversion-perl_package() {
vmove usr/share/man/man3
}
}
-
-subversion_package() {
- depends="ca-certificates"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 9944e671b9..0415bc992a 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,18 +1,19 @@
# Template build file for 'sudo'.
pkgname=sudo
-version=1.8.8
+version=1.8.9p4
revision=1
build_style=gnu-configure
configure_args="--with-ignore-dot -with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
--with-logfac=auth --disable-root-mailer"
makedepends="zlib-devel pam-devel"
+conf_files="/etc/pam.d/sudo /etc/sudoers"
short_desc="Allow others to run commands as root"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gratisoft.us/sudo/"
license="ISC, BSD, zlib"
distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version.tar.gz"
-checksum=9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9
+checksum=1943f9e9409c6542935d2e2d862c48d0d69dcf27288b294b8b537c02f52ac7a7
post_install() {
vinstall ${FILESDIR}/sudo.pam 644 etc/pam.d sudo
@@ -22,10 +23,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/share/doc
rm -rf ${DESTDIR}/usr/include
}
-
-sudo_package() {
- conf_files="/etc/pam.d/sudo /etc/sudoers"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template
index aeb0ff9245..2b16724c6e 100644
--- a/srcpkgs/suil/template
+++ b/srcpkgs/suil/template
@@ -27,15 +27,9 @@ long_desc="
suil-devel_package() {
depends="suil>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-suil_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sunxi-mali-devel b/srcpkgs/sunxi-mali-devel
new file mode 120000
index 0000000000..89528eb87c
--- /dev/null
+++ b/srcpkgs/sunxi-mali-devel
@@ -0,0 +1 @@
+sunxi-mali
\ No newline at end of file
diff --git a/srcpkgs/sunxi-mali/patches/make-tabs.patch b/srcpkgs/sunxi-mali/patches/make-tabs.patch
new file mode 100644
index 0000000000..796dd3ae62
--- /dev/null
+++ b/srcpkgs/sunxi-mali/patches/make-tabs.patch
@@ -0,0 +1,29 @@
+--- lib/mali/Makefile.split.orig 2014-01-29 13:32:24.446817426 +0100
++++ lib/mali/Makefile.split 2014-01-29 13:33:03.822133629 +0100
+@@ -1,16 +1,16 @@
+ # Makefile for when everything is split up nicely.
+
+ install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
+- $(INSTALL_DATA) $^ $(libdir)
++ $(INSTALL_DATA) $^ $(libdir)
+
+- $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
+- $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
+- $(LN) libEGL.so.1 $(libdir)libEGL.so
++ $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
++ $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
++ $(LN) libEGL.so.1 $(libdir)libEGL.so
+
+- $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
+- $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
+- $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
++ $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
++ $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
++ $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
+
+- $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
+- $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
+- $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
++ $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
++ $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
++ $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
diff --git a/srcpkgs/sunxi-mali/template b/srcpkgs/sunxi-mali/template
new file mode 100644
index 0000000000..e8cf6ac334
--- /dev/null
+++ b/srcpkgs/sunxi-mali/template
@@ -0,0 +1,42 @@
+# Template file for 'sunxi-mali'
+pkgname=sunxi-mali
+version=20140127
+revision=3
+build_style=gnu-makefile
+short_desc="Linux sunxi MALI userpace propietary libraries"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="MIT"
+homepage="https://github.com/linux-sunxi/sunxi-mali"
+
+# Use our own tarball because chroot-git does not have support for https.
+wrksrc="${pkgname}"
+distfiles="http://xbps.nopcode.org/distfiles/${pkgname}-${version}.tar.xz"
+checksum=9ec11a65f61980f542f7b079bb9975bba6939efca0647cc0f73a64df55e5a8a4
+
+only_for_archs="armv7l"
+hostmakedepends="pkg-config perl"
+makedepends="libXfixes-devel libdri2-devel-git libdrm-devel"
+provides="libump-1.0_1 libEGL-1.0_1 libGLES-1.0_1"
+replaces="libump>=0 libump-git>=0 libEGL>=0 libGLES>=0"
+
+do_build() {
+ VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
+ make ${makejobs}
+}
+
+do_install() {
+ vmkdir usr/lib
+ make DESTDIR=${DESTDIR} install
+}
+
+sunxi-mali-devel_package() {
+ short_desc+=" - development files"
+ depends="libXfixes-devel libdri2-devel-git libdrm-devel ${sourcepkg}>=${version}_${revision}"
+ provides="libump-devel-1.0_1"
+ replaces="libump-devel>=0 libump-devel-git>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/libEGL*.so"
+ vmove "usr/lib/libGLES*.so"
+ }
+}
diff --git a/srcpkgs/sunxi-tools/template b/srcpkgs/sunxi-tools/template
new file mode 100644
index 0000000000..b2c8d2c9dc
--- /dev/null
+++ b/srcpkgs/sunxi-tools/template
@@ -0,0 +1,26 @@
+# Template file for 'sunxi-tools'
+pkgname=sunxi-tools
+version=20140125
+revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="libusb-devel"
+short_desc="Tools to help hacking Allwinner AXX (aka sunxi) based devices"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="https://github.com/linux-sunxi/sunxi-tools"
+
+do_fetch() {
+ git clone git://github.com/linux-sunxi/sunxi-tools ${pkgname}-${version}
+}
+
+do_install() {
+ vinstall README 644 usr/share/doc/${pkgname}
+
+ for f in fexc bootinfo fel usb-boot fel-gpio pio nand-part; do
+ vinstall ${f} 755 usr/bin
+ done
+ cd ${DESTDIR}/usr/bin
+ ln -s fexc fex2bin
+ ln -s fexc bin2fex
+}
diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template
index 7fa67a8ed7..1c812e0b3e 100644
--- a/srcpkgs/surf/template
+++ b/srcpkgs/surf/template
@@ -12,9 +12,3 @@ license="MIT"
homepage="http://surf.suckless.org"
distfiles="http://dl.suckless.org/surf/$pkgname-$version.tar.gz"
checksum=fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805
-
-surf_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template
index 98faf92b02..3ba69542be 100644
--- a/srcpkgs/sushi/template
+++ b/srcpkgs/sushi/template
@@ -14,9 +14,3 @@ license="GPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8
-
-sushi_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/swh-lv2/template b/srcpkgs/swh-lv2/template
index e68c0af318..9d46b32511 100644
--- a/srcpkgs/swh-lv2/template
+++ b/srcpkgs/swh-lv2/template
@@ -17,9 +17,3 @@ long_desc="
pre_build() {
sed -i -e "s|/usr/local|$DESTDIR/usr|" Makefile
}
-
-swh-lv2_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/swig/template b/srcpkgs/swig/template
index 0111490cec..b1d7abe58d 100644
--- a/srcpkgs/swig/template
+++ b/srcpkgs/swig/template
@@ -17,9 +17,3 @@ long_desc="
generate the wrapper code that scripting languages need to access the
underlying C/C++ code. In addition, SWIG provides a variety of customization
features that let you tailor the wrapping process to suit your application."
-
-swig_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/sxhkd-git/template b/srcpkgs/sxhkd-git/template
index 4da1abcfcc..f8572120a1 100644
--- a/srcpkgs/sxhkd-git/template
+++ b/srcpkgs/sxhkd-git/template
@@ -1,32 +1,24 @@
# 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 <linuxienATlegtuxDOTorg>"
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
- }
-}
diff --git a/srcpkgs/sxiv-git/template b/srcpkgs/sxiv-git/template
index 27596d3026..69b1030795 100644
--- a/srcpkgs/sxiv-git/template
+++ b/srcpkgs/sxiv-git/template
@@ -1,8 +1,10 @@
# Template file for 'sxiv-git'
pkgname=sxiv-git
-version=20131221
+version=20131230
revision=1
-makedepends="libX11-devel imlib2-devel giflib-devel"
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="Simple X Image Viewer"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL-2"
@@ -14,21 +16,10 @@ 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
- }
-}
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 090b7415ed..d4add20c92 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -33,9 +33,3 @@ long_desc="
post_install() {
rm -rf ${DESTDIR}/usr/include
}
-
-sylpheed_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 02edd0a5e2..1cc735d430 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -56,9 +56,3 @@ synergy-gui_package() {
vmove usr/share/applications
}
}
-
-synergy_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/sysfsutils/template b/srcpkgs/sysfsutils/template
index ef947e1ba7..e151001385 100644
--- a/srcpkgs/sysfsutils/template
+++ b/srcpkgs/sysfsutils/template
@@ -28,9 +28,3 @@ libsysfs-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-sysfsutils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/syslinux/INSTALL b/srcpkgs/syslinux/INSTALL
new file mode 100644
index 0000000000..27096aeef3
--- /dev/null
+++ b/srcpkgs/syslinux/INSTALL
@@ -0,0 +1,16 @@
+case "${ACTION}" in
+post)
+ cat <<_EOF
+=======================================================================
+
+Some optional packages must be installed for additional functionality:
+
+ - mtools: mkdiskimage and syslinux support
+ - gptfdisk: GPT support
+ - efibootmgr: EFI support
+ - dosfstools: EFI support
+
+=======================================================================
+_EOF
+ ;;
+esac
diff --git a/srcpkgs/syslinux/patches/syslinux-6.02-fix-bios-isolinux.patch b/srcpkgs/syslinux/patches/syslinux-6.02-fix-bios-isolinux.patch
new file mode 100644
index 0000000000..75c871ea16
--- /dev/null
+++ b/srcpkgs/syslinux/patches/syslinux-6.02-fix-bios-isolinux.patch
@@ -0,0 +1,10 @@
+--- core/isolinux.asm
++++ core/isolinux.asm
+@@ -420,7 +420,7 @@ MaxLMA equ 384*1024 ; Reasonable limit (384K)
+ call getlinsec
+ pop eax
+ pop cx
+- mov dx,cx
++ movzx edx,cx
+ pop bp
+ pop bx
diff --git a/srcpkgs/syslinux/patches/syslinux-6.02-fix-chainloading.patch b/srcpkgs/syslinux/patches/syslinux-6.02-fix-chainloading.patch
new file mode 100644
index 0000000000..6f513f364a
--- /dev/null
+++ b/srcpkgs/syslinux/patches/syslinux-6.02-fix-chainloading.patch
@@ -0,0 +1,45 @@
+Reported-by: Dark Raven <drdarkraven at gmail.com>
+Signed-off-by: Raphael S. Carvalho <raphael.scarv at gmail.com>
+---
+ com32/lib/syslinux/disk.c | 22 ++++++++++++++--------
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+
+--- com32/lib/syslinux/disk.c
++++ com32/lib/syslinux/disk.c
+@@ -171,22 +171,28 @@ out:
+ static void *ebios_setup(const struct disk_info *const diskinfo, com32sys_t *inreg,
+ uint64_t lba, uint8_t count, uint8_t op_code)
+ {
+- static __lowmem struct disk_ebios_dapa dapa;
++ static struct disk_ebios_dapa *dapa = NULL;
+ void *buf;
+
++ if (!dapa) {
++ dapa = lmalloc(sizeof *dapa);
++ if (!dapa)
++ return NULL;
++ }
++
+ buf = lmalloc(count * diskinfo->bps);
+ if (!buf)
+ return NULL;
+
+- dapa.len = sizeof(dapa);
+- dapa.count = count;
+- dapa.off = OFFS(buf);
+- dapa.seg = SEG(buf);
+- dapa.lba = lba;
++ dapa->len = sizeof(*dapa);
++ dapa->count = count;
++ dapa->off = OFFS(buf);
++ dapa->seg = SEG(buf);
++ dapa->lba = lba;
+
+ inreg->eax.b[1] = op_code;
+- inreg->esi.w[0] = OFFS(&dapa);
+- inreg->ds = SEG(&dapa);
++ inreg->esi.w[0] = OFFS(dapa);
++ inreg->ds = SEG(dapa);
+ inreg->edx.b[0] = diskinfo->disk;
+
+ return buf;
diff --git a/srcpkgs/syslinux/patches/syslinux-dont-build-dos-windows-targets.patch b/srcpkgs/syslinux/patches/syslinux-dont-build-dos-windows-targets.patch
deleted file mode 100644
index 2c88f8e044..0000000000
--- a/srcpkgs/syslinux/patches/syslinux-dont-build-dos-windows-targets.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile 2010-07-21 21:33:13.000000000 +0200
-+++ Makefile 2010-07-22 11:14:03.325522937 +0200
-@@ -54,7 +54,7 @@
- # files that depend only on the B phase, but may have to be regenerated
- # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
-- diag libinstaller dos win32 win64 dosutil txt
-+ libinstaller txt
- ITARGET =
- IOBJECTS = $(ITARGET) \
- utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/srcpkgs/syslinux/template b/srcpkgs/syslinux/template
index c4f4b63763..e4753b3801 100644
--- a/srcpkgs/syslinux/template
+++ b/srcpkgs/syslinux/template
@@ -1,28 +1,41 @@
# Template file for 'syslinux'
pkgname=syslinux
-version=5.01
+version=6.02
revision=1
-makedepends="perl nasm libuuid-devel"
+hostmakedepends="perl python nasm"
+makedepends="gnu-efi-libs libuuid-devel"
short_desc="A boot loader for the Linux operating system"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
-checksum=41320ae9c8211bb99b1322fdbf98a83d3bdc0f9a78291ad27f8512b12e16b411
+checksum=afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478
+
+pre_build() {
+ # Do not try to build the Windows or DOS installers and DIAG files
+ sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i Makefile
+ sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i Makefile
+ sed 's|dosutil/*.com dosutil/*.sys||g' -i Makefile
+ sed 's|dos/syslinux.com||g' -i Makefile
+ sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i Makefile
+ sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i Makefile
+ # Fix FHS manpage path
+ sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
+}
do_build() {
unset CFLAGS LDFLAGS
- sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) sed -e 's,^firmware =.*,firmware = bios efi32,g' -i Makefile;;
+ x86_64*) sed -e 's,^firmware =.*,firmware = bios efi64,g' -i Makefile;;
+ esac
make installer
}
do_install() {
make INSTALLROOT=${DESTDIR} install
- vmove "sbin/*" usr/bin
-}
-
-syslinux_package() {
- pkg_install() {
- vmove usr
- }
+ mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
+ # Remove completely development stuff.
+ rm -r ${DESTDIR}/usr/share/syslinux/com32/include
+ rm ${DESTDIR}/usr/share/syslinux/com32/*.a
}
diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template
index bf015f2ac3..ed38628330 100644
--- a/srcpkgs/sysprof/template
+++ b/srcpkgs/sysprof/template
@@ -18,9 +18,3 @@ long_desc="
Load and Save profiles
Fast, no-nonsense graphical user interface
Command line tool included"
-
-sysprof_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/system-config-printer/template b/srcpkgs/system-config-printer/template
index cf86c08c23..8137295bc6 100644
--- a/srcpkgs/system-config-printer/template
+++ b/srcpkgs/system-config-printer/template
@@ -10,19 +10,13 @@ hostmakedepends="pkg-config intltool xmlto desktop-file-utils"
makedepends="gtk+3-devel cups-devel libusbx-devel systemd-devel
pycups dbus-python notify-python pycurl pysmbc pygobject gir-freedesktop
gnome-keyring"
+depends="python pycups dbus-python notify-python pycurl pysmbc pygobject
+ gir-freedesktop gnome-keyring"
+pycompile_module="cupshelpers"
+pycompile_dirs="/usr/share/system-config-printer"
short_desc="A CUPS printer configuration tool and status applet"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://cyberelk.net/tim/software/system-config-printer/"
distfiles="http://cyberelk.net/tim/data/${pkgname}/${version%*.*}/${pkgname}-${version}.tar.xz"
checksum=4e22413f3581fc1cf38af648573fa90bb7783a2c3b8be3aadf47beda101e04f8
-
-system-config-printer_package() {
- pycompile_module="cupshelpers"
- pycompile_dirs="/usr/share/system-config-printer"
- depends="python pycups dbus-python notify-python pycurl pysmbc pygobject
- gir-freedesktop gnome-keyring"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index 0b87122d1d..a0347e4d19 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -23,6 +23,20 @@ hostmakedepends="which pkg-config automake gettext-devel intltool gperf libxslt
docbook-xsl libtool libgcrypt-devel"
makedepends="acl-devel dbus-devel>=1.6.10_2 libcap-devel libkmod-devel
liblzma-devel cryptsetup-devel libblkid-devel libgcrypt-devel pam-devel"
+depends="xbps-triggers>=0.64 dbus kbd libcap-progs shadow"
+# Create systemd-journal (gid 24) system group.
+system_groups="systemd-journal:24"
+replaces="nss-myhostname>=0 systemd-analyze>0"
+conf_files="
+ /etc/hostname
+ /etc/vconsole.conf
+ /etc/locale.conf
+ /etc/systemd/system.conf
+ /etc/systemd/user.conf
+ /etc/systemd/journald.conf
+ /etc/systemd/logind.conf
+ /etc/systemd/bootchart.conf
+ /etc/udev/udev.conf"
pre_configure() {
autoreconf -fi
@@ -146,23 +160,3 @@ systemd-libs_package() {
vmove "usr/lib/libsystemd*.so.*"
}
}
-
-systemd_package() {
- # Create systemd-journal (gid 24) system group.
- system_groups="systemd-journal:24"
- replaces="nss-myhostname>=0 systemd-analyze>0"
- conf_files="
- /etc/hostname
- /etc/vconsole.conf
- /etc/locale.conf
- /etc/systemd/system.conf
- /etc/systemd/user.conf
- /etc/systemd/journald.conf
- /etc/systemd/logind.conf
- /etc/systemd/bootchart.conf
- /etc/udev/udev.conf"
- depends="xbps-triggers>=0.64 dbus kbd libcap-progs shadow"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/t1lib/template b/srcpkgs/t1lib/template
index acb8c88cdc..d6742888c9 100644
--- a/srcpkgs/t1lib/template
+++ b/srcpkgs/t1lib/template
@@ -32,9 +32,3 @@ t1lib-devel_package() {
vmove "usr/lib/*.a"
}
}
-
-t1lib_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tabbed-git/template b/srcpkgs/tabbed-git/template
index 6d9890c65b..f1d14ed2b9 100644
--- a/srcpkgs/tabbed-git/template
+++ b/srcpkgs/tabbed-git/template
@@ -1,8 +1,12 @@
# 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"
+provides="tabbed-${version}"
+replaces="tabbed>=0"
short_desc="Simple generic tabbed fronted to xembed aware applications"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="MIT"
@@ -14,23 +18,13 @@ 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
}
-
-tabbed-git_package() {
- provides="tabbed-${version}"
- replaces="tabbed>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tabbed/template b/srcpkgs/tabbed/template
index 52ef24d096..f0a5afc6a5 100644
--- a/srcpkgs/tabbed/template
+++ b/srcpkgs/tabbed/template
@@ -1,10 +1,14 @@
# 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"
+provides="tabbed-${version}"
+replaces="tabbed>=0"
short_desc="Tab interface for application supporting Xembed"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="MIT"
@@ -12,22 +16,13 @@ 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() {
- replaces="tabbed>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/taglib-sharp/template b/srcpkgs/taglib-sharp/template
index 18d696d889..7c141e2343 100644
--- a/srcpkgs/taglib-sharp/template
+++ b/srcpkgs/taglib-sharp/template
@@ -18,9 +18,3 @@ wrksrc="taglib-sharp-taglib-sharp-${version}"
pre_configure() {
./autogen.sh
}
-
-taglib-sharp_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index 34edf57f1e..1404de8e9f 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -27,9 +27,3 @@ taglib-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-taglib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template
index 03bc2f356a..d5ccbbc11a 100644
--- a/srcpkgs/talloc/template
+++ b/srcpkgs/talloc/template
@@ -38,9 +38,3 @@ talloc-devel_package() {
vmove usr/share/man/man3
}
}
-
-talloc_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template
index 0714c287e6..8484d124f8 100644
--- a/srcpkgs/tar/template
+++ b/srcpkgs/tar/template
@@ -3,16 +3,10 @@ pkgname=tar
version=1.27.1
revision=1
build_style=gnu-configure
+conflicts="chroot-tar>=0"
short_desc="The GNU tape archiver with remote magnetic tape support"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/tar/"
license="GPL-3"
distfiles="http://ftp.gnu.org/gnu/tar/$pkgname-$version.tar.xz"
checksum=574210bccbcf9eec889f73234a63ad6863f5b8644ac1f3d7f13871372295b7c7
-
-tar_package() {
- conflicts="chroot-tar>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/task/template b/srcpkgs/task/template
index 5878452ea6..67ea0d29fb 100644
--- a/srcpkgs/task/template
+++ b/srcpkgs/task/template
@@ -11,9 +11,3 @@ homepage="http://taskwarrior.org/projects/taskwarrior"
distfiles="http://www.taskwarrior.org/download/${pkgname}-${version}.tar.gz"
checksum=39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14
short_desc="a command-line todo list manager"
-
-task_package() {
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/tcc/template b/srcpkgs/tcc/template
index a48432d6ac..a5f25bd568 100644
--- a/srcpkgs/tcc/template
+++ b/srcpkgs/tcc/template
@@ -10,9 +10,3 @@ homepage="http://bellard.org/tcc/"
license="LGPL-2.1"
distfiles="${NONGNU_SITE}/tinycc/tcc-$version.tar.bz2"
checksum=521e701ae436c302545c3f973a9c9b7e2694769c71d9be10f70a2460705b6d71
-
-tcc_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index 607a853e86..1ebf5e3249 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -45,9 +45,3 @@ tcl-devel_package() {
vmove usr/share/man/mann
}
}
-
-tcl_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/tcp_wrappers/template b/srcpkgs/tcp_wrappers/template
index f04bf9ad6d..201ee41136 100644
--- a/srcpkgs/tcp_wrappers/template
+++ b/srcpkgs/tcp_wrappers/template
@@ -30,7 +30,7 @@ pre_install() {
tcp_wrappers-devel_package() {
depends="tcp_wrappers-libs>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
@@ -39,7 +39,7 @@ tcp_wrappers-devel_package() {
}
tcp_wrappers-libs_package() {
- short_desc="${short_desc} -- shared libraries"
+ short_desc+=" - shared libraries"
conf_files="/etc/hosts.allow /etc/hosts.deny"
pkg_install() {
vmove "usr/lib/*.so*"
@@ -47,9 +47,3 @@ tcp_wrappers-libs_package() {
vmove etc
}
}
-
-tcp_wrappers_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index 96155ea4df..3a59a38d51 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -15,9 +15,3 @@ checksum=14ab39657128f3a650aed4cf455f76c7590601087b6101c253d698f6e73f0b96
if [ "$CROSS_BUILD" ]; then
configure_args+=" ac_cv_linux_vers=$(uname -r 2>&1 | sed -n -e '$s/.* //' -e '$s/\..*//p') td_cv_buggygetaddrinfo=no"
fi
-
-tcpdump_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template
index 2cc0e22ca2..458ec8f046 100644
--- a/srcpkgs/tdb/template
+++ b/srcpkgs/tdb/template
@@ -46,9 +46,3 @@ libtdb_package() {
vmove "usr/lib/*.so*"
}
}
-
-tdb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/telepathy-butterfly/template b/srcpkgs/telepathy-butterfly/template
index 29796832ec..8bbabb278a 100644
--- a/srcpkgs/telepathy-butterfly/template
+++ b/srcpkgs/telepathy-butterfly/template
@@ -4,6 +4,9 @@ version=0.5.15
revision=2
build_style=gnu-configure
makedepends="python papyon telepathy-python"
+depends="${makedepends}"
+noarch="yes"
+pycompile_module="butterfly"
short_desc="A MSN connection manager for Telepathy"
homepage="http://telepathy.freedesktop.org"
license="GPL-2"
@@ -15,12 +18,3 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
-
-telepathy-butterfly_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="butterfly"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/telepathy-farstream/template b/srcpkgs/telepathy-farstream/template
index 39bcab5f27..a772c62e9a 100644
--- a/srcpkgs/telepathy-farstream/template
+++ b/srcpkgs/telepathy-farstream/template
@@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool libxslt"
makedepends="vala-devel gobject-introspection
dbus-glib-devel telepathy-glib-devel>=0.19.9 farstream-devel>=0.2.0
python-devel pygobject2-devel gst-python-devel"
+replaces="telepathy-farsight>=0"
short_desc="Telepathy library that uses Farstream to handle Call channels"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -31,10 +32,3 @@ telepathy-farstream-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-telepathy-farstream_package() {
- replaces="telepathy-farsight>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index d4be66afca..9533fb6f5d 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -9,6 +9,7 @@ hostmakedepends="python pkg-config libxslt"
makedepends="glib-devel dbus-glib-devel libxml2-devel
sqlite-devel gnutls-devel>=3.1.5 telepathy-glib-devel>=0.21 libsoup-devel
libnice-devel ca-certificates"
+depends="telepathy-glib>=0.21 ca-certificates"
short_desc="A Jabber/XMPP connection manager for Telepathy"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -20,10 +21,3 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
-
-telepathy-gabble_package() {
- depends="telepathy-glib>=0.21 ca-certificates"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template
index 40af3c1ea5..06c9009376 100644
--- a/srcpkgs/telepathy-glib/template
+++ b/srcpkgs/telepathy-glib/template
@@ -1,38 +1,45 @@
# Template file for 'telepathy-glib'
pkgname=telepathy-glib
-version=0.22.0
+version=0.22.1
revision=1
build_style=gnu-configure
configure_args="--enable-vala-bindings --disable-static"
-hostmakedepends="pkg-config intltool libxslt gobject-introspection"
+hostmakedepends="pkg-config intltool libxslt"
makedepends="dbus-glib-devel vala-devel"
short_desc="Library for GLib-based Telepathy components"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
homepage="http://telepathy.freedesktop.org"
distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
-checksum=62081bac04d3d390793d08f6763880b522fbad632a08bf41a9191cfe95c01957
-long_desc="
- Telepathy is a D-Bus framework for unifying real time communication,
- including instant messaging, voice calls and video calls. It abstracts
- differences between protocols to provide a unified interface for
- applications."
+checksum=e82891404793b88407f3696ffb540b28d5949c4ed6f70a9aefb69477606ec26d
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
telepathy-glib-devel_package() {
- depends="vala-devel dbus-glib-devel ${sourcepkg}-${version}_${revision}"
+ depends="vala-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/share/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
vmove usr/share/gtk-doc
vmove usr/share/vala
vmove "usr/lib/*.so"
}
}
-
-telepathy-glib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/telepathy-haze/template b/srcpkgs/telepathy-haze/template
index 88330f3a5e..d34be56814 100644
--- a/srcpkgs/telepathy-haze/template
+++ b/srcpkgs/telepathy-haze/template
@@ -11,9 +11,3 @@ license="LGPL-2.1"
homepage="http://telepathy.freedesktop.org"
distfiles="${homepage}/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=3e76049c05f2cd5900c5c0c1cfebdf7ae79eec987a599f1090946673c5b8f9c9
-
-telepathy-haze_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/telepathy-idle/template b/srcpkgs/telepathy-idle/template
index a08aa60f27..a3a4cd42a1 100644
--- a/srcpkgs/telepathy-idle/template
+++ b/srcpkgs/telepathy-idle/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config python libxslt"
makedepends="openssl-devel dbus-glib-devel telepathy-glib-devel>=0.22"
+depends="telepathy-glib>=0.22"
short_desc="An IRC connection manager for Telepathy"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -16,10 +17,3 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
-
-telepathy-idle_package() {
- depends="telepathy-glib>=0.22"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/telepathy-logger/template b/srcpkgs/telepathy-logger/template
index 75f0f4bbf8..729084a439 100644
--- a/srcpkgs/telepathy-logger/template
+++ b/srcpkgs/telepathy-logger/template
@@ -20,7 +20,7 @@ long_desc="
telepathy-logger-devel_package() {
depends="libxml2-devel telepathy-glib-devel ${sourcepkg}-${version}_${revision}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -28,9 +28,3 @@ telepathy-logger-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-telepathy-logger_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template
index c0d1294f56..1f76fc0da9 100644
--- a/srcpkgs/telepathy-mission-control/template
+++ b/srcpkgs/telepathy-mission-control/template
@@ -9,6 +9,7 @@ configure_args="--disable-static --enable-gnome-keyring
hostmakedepends="pkg-config python-devel intltool libxslt glib-devel"
makedepends="libglib-devel telepathy-glib-devel>=0.22 NetworkManager-devel
upower-devel libgnome-keyring-devel>=3.10"
+depends="telepathy-glib>=0.22"
short_desc="Telepathy component providing abstraction for details of connection managers"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -30,10 +31,3 @@ telepathy-mission-control-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-telepathy-mission-control_package() {
- depends="telepathy-glib>=0.22"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/telepathy-python/template b/srcpkgs/telepathy-python/template
index 6498c4ff5a..66e5fd7cc2 100644
--- a/srcpkgs/telepathy-python/template
+++ b/srcpkgs/telepathy-python/template
@@ -5,6 +5,9 @@ revision=3
build_style=gnu-configure
hostmakedepends="libxslt"
makedepends="python dbus-python"
+depends="python dbus-python"
+noarch="yes"
+pycompile_module="telepathy"
short_desc="Python libraries for use in Telepathy clients and connection managers"
homepage="http://telepathy.freedesktop.org"
license="LGPL-2.1"
@@ -16,12 +19,3 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
-
-telepathy-python_package() {
- depends="python dbus-python"
- noarch="yes"
- pycompile_module="telepathy"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index 0ba3b77c97..b107148df0 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -8,6 +8,7 @@ configure_args="--disable-tests --disable-plugins --with-tls=openssl
hostmakedepends="pkg-config xmldiff"
makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
openssl-devel libuuid-devel sqlite-devel"
+depends="avahi"
short_desc="A link-local XMPP connection manager for Telepathy"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://telepathy.freedesktop.org"
@@ -19,10 +20,3 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
-
-telepathy-salut_package() {
- depends="avahi"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template
index f20f55e880..69022e029b 100644
--- a/srcpkgs/terminology/template
+++ b/srcpkgs/terminology/template
@@ -4,6 +4,7 @@ version=0.4.0
revision=2
hostmakedepends="pkg-config efl>=1.8"
makedepends="efl-devel>=1.8.1 elementary-devel>=1.8 desktop-file-utils xdg-utils"
+depends="xdg-utils"
build_style=gnu-configure
homepage="http://enlightenment.org"
short_desc="Enlightenment's terminal emulator"
@@ -11,10 +12,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=1e833a74f1311be2d80b2334d210d2c0099a521e61703c49f4f6a95c13cd1c6d
-
-terminology_package() {
- depends="xdg-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template
index 453c856b3e..5841ae64f6 100644
--- a/srcpkgs/terminus-font/template
+++ b/srcpkgs/terminus-font/template
@@ -10,6 +10,9 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7
makedepends="perl bdftopcf font-util xbps-triggers>=0.58"
+depends="font-util xbps-triggers>=0.58"
+noarch="yes"
+font_dirs="/usr/share/fonts/X11/misc"
do_configure() {
sh ./configure --prefix=/usr --x11dir=/usr/share/fonts/X11/misc \
@@ -25,12 +28,3 @@ do_install() {
vinstall OFL.TXT 644 usr/share/licenses/${pkgname} LICENSE
}
-
-terminus-font_package() {
- depends="font-util xbps-triggers>=0.58"
- noarch="yes"
- font_dirs="/usr/share/fonts/X11/misc"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 4c2681ed67..b7116149b9 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
openssl-devel ntfs-3g-devel>=2013.1.13 ncurses-devel sudo"
+depends="sudo"
short_desc="Powerful free data recovery software"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.cgsecurity.org/"
distfiles="http://www.cgsecurity.org/$pkgname-$version.tar.bz2"
checksum=a597c3ebc375acdf0ff60f44ed8935a301132aae78ec00f64f091637d055326c
-
-testdisk_package() {
- depends="sudo"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template
index 46df18a358..6bfc3aeb22 100644
--- a/srcpkgs/texinfo/template
+++ b/srcpkgs/texinfo/template
@@ -4,6 +4,8 @@ version=4.13a
revision=10
wrksrc="$pkgname-4.13"
makedepends="ncurses-devel"
+conflicts="chroot-texinfo>=0"
+depends="gzip"
short_desc="The GNU Documentation System"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -34,11 +36,3 @@ do_install() {
# Compress manually info files.
gzip -9 ${DESTDIR}/usr/share/info/*
}
-
-texinfo_package() {
- conflicts="chroot-texinfo>=0"
- depends="gzip"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tftp-hpa/template b/srcpkgs/tftp-hpa/template
index 5b861acff2..5547226100 100644
--- a/srcpkgs/tftp-hpa/template
+++ b/srcpkgs/tftp-hpa/template
@@ -14,9 +14,3 @@ hostmakedepends="autoconf"
do_install() {
make INSTALLROOT=${DESTDIR} install
}
-
-tftp-hpa_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
index ed7cdf1abb..1b6806da15 100644
--- a/srcpkgs/thttpd/template
+++ b/srcpkgs/thttpd/template
@@ -38,9 +38,3 @@ do_install() {
mv ${DESTDIR}/usr/share/man/man1/htpasswd.1 \
${DESTDIR}/usr/share/man/man1/thttpd-htpasswd.1
}
-
-thttpd_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 6e1aab5e76..af4badd734 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel libgudev-devel libnotify-devel libxfce4util-devel
libxfce4ui-devel xfconf-devel exo-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Thunar Volume Manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -19,10 +20,3 @@ long_desc="
plug in your digital camera, it will automatically launch your preferred
photo application and import the new pictures from the camera into your
photo collection."
-
-thunar-volman_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index c692546e62..eda2cd91d1 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -7,9 +7,15 @@ short_desc="Thunderbird language packs"
maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="MPL-2.1"
+noarch=yes
create_wrksrc=yes
create_srcdir=yes
+depends="thunderbird>=${version}"
+for f in ${_LANG_PACKS}; do
+ depends+=" thunderbird-i18n-${f}>=${version}"
+done
+
_LANG_PACKS="ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et
eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO
pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW"
@@ -688,14 +694,3 @@ thunderbird-i18n-zh-TW_package() {
usr/lib/thunderbird/extensions langpack-zh-TW@thunderbird.mozilla.org.xpi
}
}
-
-thunderbird-i18n_package() {
- depends="thunderbird>=${version}"
- for f in ${_LANG_PACKS}; do
- depends+=" thunderbird-i18n-${f}>=${version}"
- done
- noarch=yes
- pkg_install() {
- vmkdir usr
- }
-}
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 10cf612367..00f2724e64 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -16,6 +16,7 @@ makedepends="python-devel libjpeg-turbo-devel hunspell-devel
gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel
startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel
wireless_tools-devel libXScrnSaver-devel libSM-devel libXt-devel"
+depends="desktop-file-utils hicolor-icon-theme"
do_build() {
cp -f ${FILESDIR}/mozconfig .mozconfig
@@ -42,10 +43,3 @@ do_install() {
# We don't want the development stuff
rm -r ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl}
}
-
-thunderbird_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index bf46d922b5..933d1c7fd1 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -21,7 +21,7 @@ fi
tiff-devel_package() {
depends="zlib-devel libjpeg-turbo-devel tiff>=$version"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
@@ -30,9 +30,3 @@ tiff-devel_package() {
vmove usr/share/doc
}
}
-
-tiff_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index 0095627609..3c0e899572 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
make_install_args="install-doc-man"
hostmakedepends="xmlto asciidoc"
makedepends="ncurses-devel git"
+depends="git"
short_desc="Text-mode interface for Git"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -27,10 +28,3 @@ post_install() {
vinstall contrib/tig-completion.bash 644 \
usr/share/bash-completion/completions tig
}
-
-tig_package() {
- depends="git"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/time/template b/srcpkgs/time/template
index f264c8c167..8f233620d7 100644
--- a/srcpkgs/time/template
+++ b/srcpkgs/time/template
@@ -19,9 +19,3 @@ long_desc="
do_install() {
make exec_prefix="${DESTDIR}/usr" infodir="${DESTDIR}/usr/share/info" install
}
-
-time_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 951e740e2a..4c10558ed4 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -14,9 +14,3 @@ checksum=4739dd1ec11070ea14aefa0e78e55957d343714a3c29815dd5487fc0a22c5c2c
post_install() {
vinstall ${FILESDIR}/tincd@.service 644 usr/lib/systemd/system
}
-
-tinc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/tint2/template b/srcpkgs/tint2/template
index e469b3c9c1..424dc3f0b8 100644
--- a/srcpkgs/tint2/template
+++ b/srcpkgs/tint2/template
@@ -5,16 +5,10 @@ revision=2
build_style=cmake
hostmakedepends="cmake pkg-config"
makedepends="libXdamage-devel libXcomposite-devel libXinerama-devel libXrandr-devel gtk+-devel imlib2-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A basic, good-looking task manager for WMs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://code.google.com/p/tint2/"
distfiles="http://$pkgname.googlecode.com/files/$pkgname-${version}.tar.bz2"
checksum=fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d
-
-tint2_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template
index b1102efec6..33b8f4d4f5 100644
--- a/srcpkgs/tinyxml/template
+++ b/srcpkgs/tinyxml/template
@@ -35,14 +35,8 @@ do_install() {
tinyxml-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include usr
}
}
-
-tinyxml_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tiv/template b/srcpkgs/tiv/template
index 6bf675cfc1..51ccabd46d 100644
--- a/srcpkgs/tiv/template
+++ b/srcpkgs/tiv/template
@@ -14,9 +14,3 @@ checksum=4aeae8b132ff507084ed1365652dda96ee245e003a4b409d3a304ce0871802f3
pre_install() {
vmkdir usr/bin
}
-
-tiv_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template
index 61e195e1cd..6d80ac74fe 100644
--- a/srcpkgs/tk/template
+++ b/srcpkgs/tk/template
@@ -53,9 +53,3 @@ tk-devel_package() {
vmove usr/share/man/mann
}
}
-
-tk_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/tlp/template b/srcpkgs/tlp/template
index 82b0ce8933..96e01f41c0 100644
--- a/srcpkgs/tlp/template
+++ b/srcpkgs/tlp/template
@@ -3,12 +3,15 @@ pkgname=tlp
version=0.3.10.1
revision=1
makedepends="hdparm bash iw rfkill ethtool upower"
+depends="${makedepends}"
+conf_files="/etc/default/tlp"
+conflicts="laptop-mode>=0"
+noarch="yes"
short_desc="Advanced power management tool for Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"
-
do_fetch() {
git clone -b${version} git://github.com/linrunner/TLP.git tlp-${version}
}
@@ -39,13 +42,3 @@ do_install() {
rm -rf ${DESTDIR}/etc/init.d ${DESTDIR}/usr/lib/pm-utils
}
-
-tlp_package() {
- conf_files="/etc/default/tlp"
- conflicts="laptop-mode>=0"
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index 21a0c90caa..c6d1429e5b 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -17,9 +17,3 @@ long_desc="
created, accessed, and controlled from a single screen. tmux may be
detached from a screen and continue running in the background, then later
reattached."
-
-tmux_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index cb62044bdd..792a8d6699 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -4,6 +4,12 @@ version=0.2.3.25
revision=1
build_style=gnu-configure
makedepends="zlib-devel openssl-devel libevent-devel ca-certificates tsocks"
+depends="shadow ca-certificates tsocks"
+conf_files="/etc/tor/tor-tsocks.conf /etc/tor/torrc"
+system_accounts="tor"
+tor_homedir="/var/lib/tor"
+systemd_services="tor.service on"
+make_dirs="/var/lib/tor 0700 tor tor"
short_desc="Anonymity Online"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -25,16 +31,3 @@ post_install() {
# Install systemd service.
vinstall ${FILESDIR}/tor.service 644 usr/lib/systemd/system
}
-
-tor_package() {
- depends="shadow ca-certificates tsocks"
- conf_files="/etc/tor/tor-tsocks.conf /etc/tor/torrc"
- system_accounts="tor"
- tor_homedir="/var/lib/tor"
- systemd_services="tor.service on"
- make_dirs="/var/lib/tor 0700 tor tor"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/torsocks/template b/srcpkgs/torsocks/template
index db79399fb4..dcdb50fa20 100644
--- a/srcpkgs/torsocks/template
+++ b/srcpkgs/torsocks/template
@@ -5,6 +5,7 @@ revision=3
build_style=gnu-configure
configure_args="--disable-static --enable-oldmethod
--datarootdir=/usr/share/${pkgname}"
+conf_files="/etc/torsocks.conf"
short_desc="A transparent socks proxy for use with tor"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -15,11 +16,3 @@ long_desc="
Torsocks allows you to use most socks-friendly applications in a safe way
with Tor. It ensures that DNS requests are handled safely and explicitly
rejects UDP traffic from the application you're using."
-
-torsocks_package() {
- conf_files="/etc/torsocks.conf"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template
index 35420903e7..40c0f74ea7 100644
--- a/srcpkgs/totem-pl-parser/template
+++ b/srcpkgs/totem-pl-parser/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
configure_args="--disable-static --enable-libarchive --enable-libgcrypt"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="libsoup-gnome-devel>=2.44 gmime-devel libarchive-devel>=3.1.2 libgcrypt-devel"
+depends="libsoup-gnome>=2.44"
short_desc="Totem playlist parser library"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -26,10 +27,3 @@ totem-pl-parser-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-totem-pl-parser_package() {
- depends="libsoup-gnome>=2.44"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index c1a850cca6..e2fe3da449 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -23,6 +23,8 @@ makedepends="gnutls-devel gst-plugins-base1-devel>=1:1.2 totem-pl-parser-devel>=
libpeas-devel>=1.9 libXtst-devel grilo-devel>=0.2.7 libepc-devel vala-devel>=0.22
gst-plugins-bad1-devel>=1:1.2 gsettings-desktop-schemas-devel>=3.10
nautilus-devel>=3.10 gst-plugins-ugly1>=1:1.2 gst-plugins-good1>=1:1.2"
+depends="grilo-plugins>=0.2.9 hicolor-icon-theme desktop-file-utils
+ gst-libav>=1:1.2 gst-plugins-ugly1>=1:1.2 gst-plugins-good1>=1:1.2"
# XXX xulrunner plugin.
# XXX reenable python plugin if pylint pkg exists.
@@ -55,11 +57,3 @@ totem-mozilla-plugin_package() {
vmove usr/lib/mozilla
}
}
-
-totem_package() {
- depends="grilo-plugins>=0.2.9 hicolor-icon-theme desktop-file-utils
- gst-libav>=1:1.2 gst-plugins-ugly1>=1:1.2 gst-plugins-good1>=1:1.2"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template
index 5f3cd81239..4785911d5a 100644
--- a/srcpkgs/traceroute/template
+++ b/srcpkgs/traceroute/template
@@ -23,9 +23,3 @@ do_install() {
vinstall traceroute/traceroute 755 usr/bin
vinstall traceroute/traceroute.8 644 usr/share/man/man8
}
-
-traceroute_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index a83046c73d..afd2bf1c28 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -47,9 +47,3 @@ libtracker_package() {
vmove usr/lib/girepository-1.0
}
}
-
-tracker_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 4e79172347..0f03cc563f 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -48,9 +48,3 @@ transmission-qt_package() {
vinstall ${wrksrc}/qt/transmission-qt.desktop 644 usr/share/applications
}
}
-
-transmission_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template
index bcc8f33858..5fa8310a60 100644
--- a/srcpkgs/tree/template
+++ b/srcpkgs/tree/template
@@ -21,9 +21,3 @@ do_install() {
make MANDIR=${DESTDIR}/usr/share/man/man1 \
BINDIR=${DESTDIR}/usr/bin install
}
-
-tree_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tsocks/template b/srcpkgs/tsocks/template
index 3da317c290..b713b5c477 100644
--- a/srcpkgs/tsocks/template
+++ b/srcpkgs/tsocks/template
@@ -30,9 +30,3 @@ post_install() {
vmkdir usr/share/examples/tsocks
install -m644 *.example ${DESTDIR}/usr/share/examples/tsocks
}
-
-tsocks_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tty-clock-git/template b/srcpkgs/tty-clock-git/template
index 67c2bfa4cc..9c18dcd178 100644
--- a/srcpkgs/tty-clock-git/template
+++ b/srcpkgs/tty-clock-git/template
@@ -9,7 +9,6 @@ maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL"
homepage="https://github.com/xorg62/tty-clock"
-
do_fetch() {
local url="git://github.com/xorg62/tty-clock"
msg_normal "Fetching source from $url ...\n"
@@ -23,9 +22,3 @@ do_build() {
do_install() {
make INSTALLPATH=/usr/bin/ DESTDIR=${DESTDIR} install
}
-
-tty-clock-git_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 683c354a52..965d34d90e 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -24,9 +24,3 @@ tumbler-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-tumbler_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index ee3ba5a476..3e0b16ea88 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -17,9 +17,3 @@ checksum=36a8d19fcff0e54475f709bc4d83cfea5f782ee546086ee9e16d2b1aa23ca32f
post_install() {
mv ${DESTDIR}/usr/README.txt ${DESTDIR}/usr/share/doc/${pkgname}
}
-
-turbovnc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 70c10e9598..ce0bf9e335 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -4,6 +4,7 @@ wrksrc=${pkgname}
create_wrksrc=yes
version=2013i
revision=1
+noarch="yes"
homepage="http://www.iana.org/time-zones"
short_desc="Time zone and daylight-saving time data"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -29,10 +30,3 @@ do_install() {
zic -y ./yearistype -d ${DESTDIR}/usr/share/zoneinfo -p America/New_York
install -m444 -t ${DESTDIR}/usr/share/zoneinfo iso3166.tab zone.tab
}
-
-tzdata_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/uboot-mkimage/template b/srcpkgs/uboot-mkimage/template
index f049f07776..76babbf794 100644
--- a/srcpkgs/uboot-mkimage/template
+++ b/srcpkgs/uboot-mkimage/template
@@ -1,6 +1,6 @@
# Template file for 'uboot-mkimage'
pkgname=uboot-mkimage
-version=2013.01
+version=2014.01
revision=1
wrksrc="u-boot-${version}"
short_desc="The U-Boot mkimage utility"
@@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.denx.de/wiki/U-Boot/WebHome"
distfiles="http://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=9ca0f35f4394281312d03c581e24a263cf3e0d9703f15103ff2ead5e5aa43f90
+checksum=cdaf8c81583abfa2e73da46cfcf87b0cbd9741d9aa766f3b905376e3652d543d
do_build() {
if [ -n "$XBPS_CROSS_TRIPLET" ]; then
@@ -22,9 +22,3 @@ do_install() {
vinstall tools/mkimage 755 usr/bin
vinstall doc/mkimage.1 644 usr/share/man/man1
}
-
-uboot-mkimage_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/ucl/template b/srcpkgs/ucl/template
index f6392a30f6..98f006fe7d 100644
--- a/srcpkgs/ucl/template
+++ b/srcpkgs/ucl/template
@@ -9,9 +9,3 @@ homepage="http://www.oberhumer.com/opensource/ucl/"
license="GPL-2"
distfiles="http://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz"
checksum=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
-
-ucl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 6b810ed73f..0b7d1a29e3 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="libglib-devel libudev-devel"
+conf_files="/etc/udevil/udevil.conf"
short_desc="CLI which mounts and unmounts removable devices without a password"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -19,10 +20,3 @@ post_install() {
# make udevil setuid.
chmod 4755 ${DESTDIR}/usr/bin/udevil
}
-
-udevil_package() {
- conf_files="/etc/udevil/udevil.conf"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/udis86/template b/srcpkgs/udis86/template
index 4d5ab2ba53..62f4692d93 100644
--- a/srcpkgs/udis86/template
+++ b/srcpkgs/udis86/template
@@ -11,16 +11,10 @@ distfiles=${SOURCEFORGE_SITE}/udis86/${pkgname}-${version}.tar.gz
checksum=6128d266abcabed6077fdeebd2fbb7fb48eb599efbdae98922de2f6acd82ce3a
udis86-devel_package() {
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
depends="${sourcepkg}>=${version}"
pkg_install() {
vmove usr/include
vmove usr/lib
}
}
-
-udis86_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/udisks/template b/srcpkgs/udisks/template
index 3fe76c4b17..bf7675f99f 100644
--- a/srcpkgs/udisks/template
+++ b/srcpkgs/udisks/template
@@ -1,28 +1,20 @@
# Template file for 'udisks'
pkgname=udisks
version=1.0.4
-revision=12
+revision=13
build_style=gnu-configure
configure_args="--disable-static --enable-lvm2"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel dbus-glib-devel"
makedepends="libglib-devel device-mapper-devel
liblvm2app-devel libparted-devel libatasmart-devel polkit-devel
dbus-glib-devel libgudev-devel>=183 sg3_utils-devel"
+make_dirs="/var/lib/udisks 0750 root root"
short_desc="Disk Management Service"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/udisks"
license="GPL-2"
distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz"
checksum=854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5
-long_desc="
- The udisks project provides:
-
- * a storage daemon that implements well-defined D-Bus interfaces that
- can be used to query and manipulate storage devices.
- * a command-line tool, udisks, that can be used to query and use the daemon
-
- The actions that a user can perform using udisks are restricted using
- PolicyKit."
pre_configure() {
# Switch to /usr.
@@ -39,10 +31,3 @@ post_install() {
echo "SystemdService=udisks.service" \
>> ${DESTDIR}/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service
}
-
-udisks_package() {
- make_dirs="/var/lib/udisks 0750 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template
index e368a38fea..b7412f1dfc 100644
--- a/srcpkgs/udisks2/template
+++ b/srcpkgs/udisks2/template
@@ -1,14 +1,15 @@
# Template file for 'udisks2'
pkgname=udisks2
version=2.1.1
-revision=1
+revision=2
wrksrc="udisks-${version}"
build_style=gnu-configure
configure_args="--disable-static --with-udevdir=/usr/lib/udev
--with-systemdsystemunitdir=/usr/lib/systemd/system"
-hostmakedepends="pkg-config intltool gobject-introspection libxslt docbook-xsl"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
makedepends="acl-devel device-mapper-devel liblvm2app-devel libparted-devel
libatasmart-devel polkit-devel libgudev-devel sg3_utils-devel systemd-devel"
+make_dirs="/var/lib/udisks2 0750 root root"
short_desc="Disk Management Service, version 2"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/udisks"
@@ -16,21 +17,32 @@ license="GPL-2"
distfiles="http://udisks.freedesktop.org/releases/udisks-${version}.tar.bz2"
checksum=013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
+
udisks2-devel_package() {
- depends="libglib-devel udisks2>=$version"
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
- vmove usr/share/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
vmove usr/share/gtk-doc
}
}
-
-udisks2_package() {
- make_dirs="/var/lib/udisks2 0750 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index 58f66f01d7..544492bc4b 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -4,6 +4,10 @@ version=0.33
revision=1
build_style=python-module
makedepends="iptables python"
+depends="${makedepends}"
+conf_files="/etc/default/ufw /etc/ufw/ufw.conf"
+noarch="yes"
+pycompile_module="ufw"
short_desc="Uncomplicated Firewall"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://launchpad.net/ufw"
@@ -19,14 +23,3 @@ post_install() {
vinstall ${FILESDIR}/ufw.service 644 usr/lib/systemd/system
vmove "lib/*" usr/lib
}
-
-ufw_package() {
- depends="${makedepends}"
- conf_files="/etc/default/ufw /etc/ufw/ufw.conf"
- noarch="yes"
- pycompile_module="ufw"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/uml-utilities/template b/srcpkgs/uml-utilities/template
index 03990b473b..244fab3fa7 100644
--- a/srcpkgs/uml-utilities/template
+++ b/srcpkgs/uml-utilities/template
@@ -23,9 +23,3 @@ long_desc="
pre_build() {
sed -i -e "s|lib64|lib|" Makefile
}
-
-uml-utilities_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/unicc/template b/srcpkgs/unicc/template
index 94e542315c..5fdede7468 100644
--- a/srcpkgs/unicc/template
+++ b/srcpkgs/unicc/template
@@ -2,6 +2,7 @@
pkgname=unicc
version=1.0.0
revision=1
+wrksrc="${pkgname}-${version}-source"
build_style=gnu-configure
configure_args="--with-trace"
makedepends="phorward-devel"
@@ -11,11 +12,3 @@ homepage="http://www.phorward-software.com"
license="BSD"
distfiles="${homepage}/products/${pkgname}/${pkgname}-${version}-source.tar.gz"
checksum=1a9166e8b78b5e6ee7764fd878b2d8c8e4314683358192942149641b030b0d97
-
-wrksrc="${pkgname}-${version}-source"
-
-unicc_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template
index b3cc8e26ed..858bb5290c 100644
--- a/srcpkgs/unixodbc/template
+++ b/srcpkgs/unixodbc/template
@@ -5,6 +5,7 @@ revision=1
wrksrc="unixODBC-${version}"
build_style=gnu-configure
makedepends="libltdl-devel readline-devel"
+conf_files="/etc/odbcinst.ini /etc/odbc.ini"
short_desc="Basic ODBC tools"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1"
@@ -27,10 +28,3 @@ unixodbc-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-unixodbc_package() {
- conf_files="/etc/odbcinst.ini /etc/odbc.ini"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index c414a1d33f..40153d34ba 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -3,6 +3,7 @@ pkgname=unrar
version=4.2.4
revision=1
wrksrc=unrar
+nonfree="yes"
homepage="http://www.rarlab.com/rar"
distfiles="${homepage}/unrarsrc-${version}.tar.gz"
short_desc="Unarchiver for .rar files (non-free version)"
@@ -22,10 +23,3 @@ do_install() {
vinstall unrar 755 usr/bin
vinstall license.txt 644 usr/share/licenses/unrar
}
-
-unrar_package() {
- nonfree="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/unzip/template b/srcpkgs/unzip/template
index 0f92ced5e1..64a7a6ccbf 100644
--- a/srcpkgs/unzip/template
+++ b/srcpkgs/unzip/template
@@ -29,9 +29,3 @@ do_install() {
vmkdir usr/share
mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share
}
-
-unzip_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index a586a32e64..4e49c74919 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,13 +1,15 @@
# Template file for 'upower'
pkgname=upower
version=0.9.23
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --with-backend=linux
--without-idevice --with-systemdutildir=/usr/lib/systemd
--with-systemdsystemunitdir=/usr/lib/systemd/system"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl"
makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel"
+conf_files="/etc/UPower/UPower.conf"
+make_dirs="/var/lib/upower 0755 root root"
short_desc="Abstraction for enumerating power devices"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -15,9 +17,21 @@ homepage="http://upower.freedesktop.org"
distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
checksum=433252b0a8e9ab4bed7e17ee3ee5b7cef6d527b1f5401ee32212d82a9682981b
-pre_configure() {
- sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-}
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
upower-devel_package() {
depends="dbus-glib-devel upower>=${version}_${revision}"
@@ -25,15 +39,9 @@ upower-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/share/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
vmove "usr/lib/*.so"
}
}
-
-upower_package() {
- conf_files="/etc/UPower/UPower.conf"
- make_dirs="/var/lib/upower 0755 root root"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template
index 951674c764..d37e0453e9 100644
--- a/srcpkgs/upx/template
+++ b/srcpkgs/upx/template
@@ -13,16 +13,11 @@ checksum=c6d873925ef0d5422b9320c7075ef9be5981a6f99418469ce067becd68de65eb
do_build() {
make ${makejobs} all
- cd doc && make upx.1
+ cd doc
+ make upx.1
}
do_install() {
vinstall src/upx.out 755 usr/bin upx
vinstall doc/upx.1 644 usr/share/man/man1
}
-
-upx_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/urlgrabber/template b/srcpkgs/urlgrabber/template
index 8081c36722..cfce11e12e 100644
--- a/srcpkgs/urlgrabber/template
+++ b/srcpkgs/urlgrabber/template
@@ -4,6 +4,9 @@ version=3.9.1
revision=2
build_style=python-module
makedepends="python pycurl"
+depends="${makedepends}"
+noarch="yes"
+pycompile_module="urlgrabber"
short_desc="A high-level cross-protocol url-grabber and Python library"
homepage="http://urlgrabber.baseurl.org/"
license="LGPL-2.1"
@@ -18,12 +21,3 @@ long_desc="
protocol-independant file-access. Best of all, urlgrabber takes care of all
those pesky file-fetching details, and lets you focus on whatever it is that
your program is written to do!"
-
-urlgrabber_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="urlgrabber"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template
index 96276479f2..91e51ab9d0 100644
--- a/srcpkgs/usbutils/template
+++ b/srcpkgs/usbutils/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--datadir=/usr/share/hwdata --disable-zlib"
hostmakedepends="pkg-config which hwids"
makedepends="libusb-devel"
+depends="hwids"
homepage="http://linux-usb.sourceforge.net/"
short_desc="Linux USB utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -24,10 +25,3 @@ post_install() {
# Remove update-usbids.sh - handled by hwids
rm -f ${DESTDIR}/usr/sbin/update-usbids.sh
}
-
-usbutils_package() {
- depends="hwids"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 8b519ae41d..82be8299eb 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,16 +1,30 @@
# Template file for 'util-linux'
pkgname=util-linux
-version=2.24
-revision=3
+version=2.24.1
+revision=1
short_desc="Miscellaneous linux utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.24/${pkgname}-${version}.tar.xz"
-checksum=30add9a8869cef9e5a76755214f074689b6294cea63f4569711faeb099aecc06
+checksum=835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410
hostmakedepends="pkg-config"
makedepends="zlib-devel ncurses-devel pam-devel>=1.1.6_3 libcap-ng-devel"
+depends="coreutils shadow>=4.1.5.1_3"
+# Create uuidd system account for uuidd.
+system_accounts="uuidd"
+uuidd_homedir="/run/uuidd"
+systemd_services="uuidd.socket on"
+conf_files="
+ /etc/pam.d/chfn
+ /etc/pam.d/chsh
+ /etc/pam.d/su
+ /etc/pam.d/su-l
+ /etc/pam.d/login"
+conflicts="chroot-util-linux>=0 coreutils<8.21_3 shadow<4.1.5.1_14"
+replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3"
+provides="eject-${version}"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libtool"
@@ -109,23 +123,3 @@ libuuid-devel_package() {
vmove usr/share/man/man3
}
}
-
-util-linux_package() {
- # Create uuidd system account for uuidd.
- system_accounts="uuidd"
- uuidd_homedir="/run/uuidd"
- systemd_services="uuidd.socket on"
- conf_files="
- /etc/pam.d/chfn
- /etc/pam.d/chsh
- /etc/pam.d/su
- /etc/pam.d/su-l
- /etc/pam.d/login"
- conflicts="chroot-util-linux>=0 coreutils<8.21_3 shadow<4.1.5.1_14"
- replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3"
- provides="eject-${version}"
- depends="coreutils shadow>=4.1.5.1_3"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 658ec1bd1c..4a6a13f4e3 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -4,6 +4,7 @@ version=1.2.4
revision=2
build_style=python-module
makedepends="sqlite-devel python-devel python-distribute libxml2-devel"
+pycompile_module="uwsgidecorators.py"
short_desc="Fast, self-healing application container server"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -21,10 +22,3 @@ long_desc="
It uses the uwsgi (all lowercase, already included by default in the Nginx
and Cherokee releases) protocol for all the networking/interprocess communications,
but it can speak other protocols as well (http, fastcgi, mongrel2...)"
-
-uwsgi_package() {
- pycompile_module="uwsgidecorators.py"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template
index 27a3b277aa..f558b308cc 100644
--- a/srcpkgs/v4l-utils/template
+++ b/srcpkgs/v4l-utils/template
@@ -6,6 +6,8 @@ build_style=gnu-configure
configure_args="--with-udevdir=/usr/lib/udev"
hostmakedepends="which pkg-config"
makedepends="libjpeg-turbo-devel libsysfs-devel qt-devel"
+depends="sysfsutils"
+conf_files="/etc/rc_maps.cfg"
short_desc="Userspace tools and libraries for Video 4 Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://freshmeat.net/projects/libv4l"
@@ -36,11 +38,3 @@ qv4l2_package() {
vmove usr/share/icons
}
}
-
-v4l-utils_package() {
- depends="sysfsutils"
- conf_files="/etc/rc_maps.cfg"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/v8/template b/srcpkgs/v8/template
index f81070bcb0..7226926307 100644
--- a/srcpkgs/v8/template
+++ b/srcpkgs/v8/template
@@ -88,9 +88,3 @@ libv8_package() {
vmove usr/lib/libv8.so.${_sonamever}
}
}
-
-v8_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index b89d6c3034..4ac41eb104 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -36,9 +36,3 @@ vala-devel_package() {
vmove usr/share/devhelp
}
}
-
-vala_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/valabind-git/template b/srcpkgs/valabind-git/template
deleted file mode 100644
index df6727d9af..0000000000
--- a/srcpkgs/valabind-git/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'valabind-git'
-pkgname=valabind-git
-version=20130812
-revision=1
-build_style=gnu-makefile
-hostmakedepends="pkg-config vala-devel>=0.18"
-makedepends="vala-devel>=0.18 libglib-devel"
-short_desc="Tool to transform vala source files to swig, GIR or GEAR (git snapshot)"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="LGPL-3"
-homepage="http://radare.org"
-distfiles="$homepage/get/$pkgname-$version.tar.gz"
-checksum=161641fc4a6ed0e22fcc82c85c8f91e41f18ae02260151f19293ee36c7c4b751
-long_desc="
- Valabind is a tool to parse vala[1] or vapi files to transform
- them into swig interface files, C++ source files, GIR or GEAR.
-
- With swig, you can create language bindings for any API
- written in vala or C with a vapi interface.
-
- It can also generate bindings for C++ and v8-GearBox."
-
-
-do_fetch() {
- local url="git://github.com/radare/valabind"
- msg_normal "Fetching source from $url ...\n"
- git clone ${url} ${pkgname}-${version}
-}
-
-valabind-git_package() {
- replaces="valabind>=0"
- provides="valabind-9999"
- depends="glib-devel vala-devel>=0.18"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index 23550fddbf..4da07c53a3 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,29 +1,14 @@
# Template file for 'valabind'
pkgname=valabind
-version=0.7.2
-revision=2
+version=0.7.4
+revision=1
build_style=gnu-makefile
-hostmakedepends="pkg-config"
-makedepends="vala-devel>=0.20 glib-devel"
-depends="vala-devel>=0.20"
+hostmakedepends="pkg-config vala-devel"
+makedepends="vala-devel glib-devel"
+depends="vala-devel"
short_desc="Tool to transform vala source files to swig, GIR or GEAR"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-3"
homepage="http://radare.org"
distfiles="${homepage}/get/${pkgname}-${version}.tar.gz"
-checksum=99bebad1ab8d44111b862aa8569a53f41a9c183954100467e30f77e29aa36102
-long_desc="
- Valabind is a tool to parse vala[1] or vapi files to transform
- them into swig interface files, C++ source files, GIR or GEAR.
-
- With swig, you can create language bindings for any API
- written in vala or C with a vapi interface.
-
- It can also generate bindings for C++ and v8-GearBox."
-
-valabind_package() {
- depends="vala-devel>=0.20"
- pkg_install() {
- vmove usr
- }
-}
+checksum=854c75a5375122445c266e0c54e5d1949d6eedc30d1c4cbc530060047f3fea4d
diff --git a/srcpkgs/valadoc-git/template b/srcpkgs/valadoc-git/template
index 5c9251333f..620f377c84 100644
--- a/srcpkgs/valadoc-git/template
+++ b/srcpkgs/valadoc-git/template
@@ -5,12 +5,13 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config libtool automake which"
makedepends="libglib-devel vala-devel>=0.20 libgee08-devel graphviz-devel"
+replaces="valadoc>=0"
+provides="valadoc-20130328"
short_desc="Documentation tool for the vala project"
maintainer="pancake <pancake@nopcode.org>"
license="LGPL-3"
homepage="https://live.gnome.org/Valadoc"
-
do_fetch() {
local url="git://git.gnome.org/valadoc"
msg_normal "Fetching source from $url ...\n"
@@ -20,11 +21,3 @@ do_fetch() {
pre_configure() {
./autogen.sh
}
-
-valadoc-git_package() {
- replaces="valadoc>=0"
- provides="valadoc-20130328"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 8cb24c8f94..22cbe078da 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -2,11 +2,12 @@
pkgname=valgrind
version=3.9.0
revision=1
-only_for_archs="i686 x86_64"
+only_for_archs="i686 x86_64 armv7l"
build_style=gnu-configure
configure_args="--enable-tls --with-mpicc=/dev/null"
hostmakedepends="perl pkg-config"
makedepends="libgomp-devel"
+depends="perl glibc>=2.18<2.19 glibc-dbg>=2.18<2.19"
short_desc="Tool for finding memory management bugs in programs"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://valgrind.org/"
@@ -14,6 +15,10 @@ license="GPL-2"
distfiles="http://www.valgrind.org/downloads/${pkgname}-${version}.tar.bz2"
checksum=e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0
+if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+ configure_args+=" ac_cv_host=armv7l-unknown-linux-gnueabihf"
+fi
+
valgrind-devel_package() {
depends="valgrind>=${version}"
short_desc+=" - development files"
@@ -24,10 +29,3 @@ valgrind-devel_package() {
vmove usr/share/doc
}
}
-
-valgrind_package() {
- depends="perl glibc>=2.18<2.19 glibc-dbg>=2.18<2.19"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/vamp-plugin-sdk/template b/srcpkgs/vamp-plugin-sdk/template
index 7f547e8f89..246665af0f 100644
--- a/srcpkgs/vamp-plugin-sdk/template
+++ b/srcpkgs/vamp-plugin-sdk/template
@@ -20,7 +20,7 @@ post_install() {
}
libvamp-plugin-sdk_package() {
- short_desc="${short_desc} - Runtime libraries"
+ short_desc+=" - Runtime libraries"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -28,16 +28,10 @@ libvamp-plugin-sdk_package() {
vamp-plugin-sdk-devel_package() {
depends="libsndfile-devel libvamp-plugin-sdk>=${version}"
- short_desc="${short_desc} - Development files"
+ short_desc+=" - Development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig
}
}
-
-vamp-plugin-sdk_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index aada56c889..29035740f9 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -19,9 +19,3 @@ do_install() {
vinstall vanitygen 755 usr/bin
vinstall keyconv 755 usr/bin
}
-
-vanitygen_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index 82a2cec98b..b64ad75d69 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -5,6 +5,9 @@ revision=3
build_style=gnu-configure
configure_args="--disable-static"
makedepends="pkg-config pcre-devel readline-devel"
+conf_files="/etc/varnish/default.vcl"
+systemd_services="varnish.service on"
+make_dirs="/var/varnish 750 nobody nogroup"
short_desc="A fast caching HTTP reverse proxy"
maintainer="Juan RP <xtraeme@gmail.com>"
license="Simplified BSD"
@@ -27,7 +30,7 @@ post_install() {
}
libvarnishapi_package() {
- short_desc="${short_desc} -- API runtime library"
+ short_desc+=" - API runtime library"
pkg_install() {
vmove "usr/lib/*.so*"
}
@@ -35,20 +38,10 @@ libvarnishapi_package() {
libvarnishapi-devel_package() {
depends="libvarnishapi>=${version}"
- short_desc="${short_desc} -- API development files"
+ short_desc+=" - API development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/man/man3
}
}
-
-varnish_package() {
- conf_files="/etc/varnish/default.vcl"
- systemd_services="varnish.service on"
- make_dirs="/var/varnish 750 nobody nogroup"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/vbetool/template b/srcpkgs/vbetool/template
index 077336e363..224c8c1550 100644
--- a/srcpkgs/vbetool/template
+++ b/srcpkgs/vbetool/template
@@ -5,6 +5,7 @@ revision=3
build_style=gnu-configure
make_build_args="LIBS=-lpci"
makedepends="zlib-devel libx86-devel pciutils-devel"
+depends="pciutils"
short_desc="Run real-mode video BIOS code to alter hardware state"
homepage="http://www.codon.org.uk/~mjg59/vbetool/"
license="GPL-2"
@@ -15,10 +16,3 @@ long_desc="
vbetool uses lrmi in order to run code from the video BIOS. Currently, it is
able to alter DPMS states, save/restore video card state and attempt to
initialize the video card from scratch."
-
-vbetool_package() {
- depends="pciutils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 4d2c90b930..e295823890 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,52 +1,49 @@
# Template file for 'vde2'
pkgname=vde2
version=2.3.2
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-static --enable-experimental
---disable-python --enable-kernel-switch"
+ --disable-python --enable-kernel-switch
+ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
+hostmakedepends="automake libtool"
makedepends="libpcap-devel openssl-devel"
+conf_files="
+ /etc/vdecmd
+ /etc/libvdemgmt/asyncrecv.rc
+ /etc/libvdemgmt/closemachine.rc
+ /etc/libvdemgmt/openmachine.rc
+ /etc/libvdemgmt/sendcmd.rc"
short_desc="Virtual Distributed Ethernet"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1, BSD"
homepage="http://sourceforge.net/projects/vde/"
distfiles="${SOURCEFORGE_SITE}/vde/vde2-$version.tar.bz2"
checksum=cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542
-long_desc="
- VDE is an ethernet compliant virtual network that can be spawned over a set of
- physical computer over the Internet."
disable_parallel_build=yes
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vinstall COPYING.slirpvde 644 usr/share/licenses/vde2
}
libvde2_package() {
- short_desc="${short_desc} -- runtime libraries"
+ short_desc+=" - runtime libraries"
pkg_install() {
- vmove "usr/lib/*.so*"
+ vmove "usr/lib/*.so.*"
}
}
vde2-devel_package() {
- depends="libvde2-${version}_${revision}"
- short_desc="${short_desc} -- development files"
+ depends="libvde2>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-vde2_package() {
- conf_files="
- /etc/vdecmd
- /etc/libvdemgmt/asyncrecv.rc
- /etc/libvdemgmt/closemachine.rc
- /etc/libvdemgmt/openmachine.rc
- /etc/libvdemgmt/sendcmd.rc"
- pkg_install() {
- vmove etc
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/vdpau-video/template b/srcpkgs/vdpau-video/template
index 4ef2995e9b..c06a8ee3d5 100644
--- a/srcpkgs/vdpau-video/template
+++ b/srcpkgs/vdpau-video/template
@@ -10,11 +10,3 @@ license="GPL-2"
homepage="http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/"
distfiles="${homepage}/$pkgname-$version.tar.gz"
checksum=28f66adc7d87a513a765dd79fda469e895b76692173d2aa79a26f4a618f91266
-long_desc="
- vdpau-video consists in a VDPAU-based backend for VA-API."
-
-vdpau-video_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/vdpauinfo/template b/srcpkgs/vdpauinfo/template
index 6fe7348ad9..dd56491dcb 100644
--- a/srcpkgs/vdpauinfo/template
+++ b/srcpkgs/vdpauinfo/template
@@ -11,9 +11,3 @@ license="MIT"
homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo"
distfiles="http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${version}.tar.gz"
checksum=b0c856a6933e306f3f783717a29124c7d145d6027a3175e197249696f5d5019f
-
-vdpauinfo_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 3099663143..6e00b6f99b 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -24,9 +24,3 @@ if [ "$build_option_pulseaudio" ]; then
else
configure_args+=" --without-pulse"
fi
-
-vice_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/vicious/template b/srcpkgs/vicious/template
index 5be89eb8a1..9d3dd6f378 100644
--- a/srcpkgs/vicious/template
+++ b/srcpkgs/vicious/template
@@ -1,10 +1,12 @@
# Template file for 'vicious'
pkgname=vicious
-version=2.1.2
+version=2.1.3
revision=1
makedepends="lua-devel>=5.2"
+noarch="yes"
+depends="lua>=5.2"
distfiles="http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz"
-checksum="42075ba024d6912064dd4c0e5ed888006f7fbcc70448560ea2b6c5298e0e5a9d"
+checksum="97ffb824af89f2d205b0f0909601a32d761c0c02353b59b4314fd2cc47b2a387"
maintainer="Steven R <strob AT styez DOT com>"
homepage="http://git.sysphere.org/vicious/about/"
license="GPL-2"
@@ -21,11 +23,3 @@ do_install() {
install -m644 widgets/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/widgets"
install -m644 contrib/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/contrib"
}
-
-vicious_package() {
- noarch="yes"
- depends="lua>=5.2"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/videoproto/template b/srcpkgs/videoproto/template
index 8e9d8b15b7..7fa587952c 100644
--- a/srcpkgs/videoproto/template
+++ b/srcpkgs/videoproto/template
@@ -2,6 +2,7 @@
pkgname=videoproto
version=2.3.0
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="Video extension headers from modular X.org X11"
homepage="http://xorg.freedesktop.org"
@@ -9,12 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=4f2bc94e5a1b60d6f35a9a2589ca98949e8841997f6a9acf4e85f46c1f34045f
-long_desc="
- Video extension headers from modular X.org X11 project."
-
-videoproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/viewnior/template b/srcpkgs/viewnior/template
index bf7ffc16c2..60324a848d 100644
--- a/srcpkgs/viewnior/template
+++ b/srcpkgs/viewnior/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="The Elegant Image Viewer"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -25,10 +26,3 @@ long_desc="
Configurable mouse actions"
LDFLAGS="-lm"
-
-viewnior_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 1e7e36c5da..36a0e6af4d 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,18 +1,17 @@
# Template file for 'vim'
pkgname=vim
_distver=7.4
-_patchver=016
+_patchver=135
version=${_distver}.${_patchver}
revision=1
hostmakedepends="mercurial pkg-config"
-makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel
- desktop-file-utils hicolor-icon-theme"
+makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
+depends="vim-common>=$version"
short_desc="Vim editor (vi clone)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.vim.org"
license="GPL-2"
-
do_fetch() {
local url="http://code.google.com/p/vim/"
hg clone -u v${_distver/./-}-${_patchver} ${url} ${pkgname}-${version}
@@ -88,7 +87,7 @@ vim-common_package() {
vim-x11_package() {
depends="vim-common-${version}_${revision}"
- provides="vim-${version}"
+ provides="vim-${version}_${revision}"
replaces="vim>=0"
short_desc+=" - X11 version"
pkg_install() {
@@ -112,10 +111,3 @@ gvim_package() {
vinstall ${FILESDIR}/gvim.desktop 644 usr/share/applications
}
}
-
-vim_package() {
- depends="vim-common>=$version"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/vinagre/template b/srcpkgs/vinagre/template
index a83f197731..3ccac001df 100644
--- a/srcpkgs/vinagre/template
+++ b/srcpkgs/vinagre/template
@@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool itstool gnome-doc-utils"
makedepends="libxml2-devel libsecret-devel avahi-ui-libs-devel
spice-devel avahi-glib-libs-devel telepathy-glib-devel vte3-devel
gtk-vnc-devel openssh>=6.1p1 gnome-icon-theme"
+depends="openssh>=6.1p1 gnome-icon-theme desktop-file-utils hicolor-icon-theme"
short_desc="VNC client for the GNOME desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://projects.gnome.org/vinagre"
@@ -22,10 +23,3 @@ long_desc="
You can browse your network for VNC servers, we like avahi
You don't need to supply the password on every connection, we like GNOME Keyring
"
-
-vinagre_package() {
- depends="openssh>=6.1p1 gnome-icon-theme desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template
index 9aad0dfb45..835e684d3c 100644
--- a/srcpkgs/vino/template
+++ b/srcpkgs/vino/template
@@ -9,16 +9,10 @@ makedepends="libjpeg-turbo-devel gtk+3-devel>=3.10
libnotify-devel avahi-glib-libs-devel dbus-glib-devel telepathy-glib-devel
libsoup-devel>=2.44 libXtst-devel NetworkManager-devel libsecret-devel
gnutls-devel>=3.1.5 libSM-devel desktop-file-utils"
+depends="libsoup>=2.44 desktop-file-utils"
short_desc="VNC server for the GNOME desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=faf10d667c43d00cd37dc6343b44012456de9d2e39d8ce679c719e65d2dfbe46
-
-vino_package() {
- depends="libsoup>=2.44 desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template
index f15fda246d..59a57fa5f5 100644
--- a/srcpkgs/virt-manager/template
+++ b/srcpkgs/virt-manager/template
@@ -12,6 +12,10 @@ distfiles="http://virt-manager.et.redhat.com/download/sources/$pkgname/$pkgname-
checksum=dc8c553beeb15bb30cd5517b2105bcc47cf482b03523e522733c52b0e5df0fc0
makedepends="pkg-config intltool GConf-devel"
+noarch="yes"
+pycompile_dirs="/usr/share/virt-manager"
+depends="dbus-python pygtk libvirt-python virtinst gtk2-vnc-python
+ python-gconf netcat libxml2-python"
post_install() {
# Set-up schema file in correct location
@@ -20,13 +24,3 @@ post_install() {
${DESTDIR}/etc/gconf/schemas/*.schemas
rm -rf ${DESTDIR}/etc/gconf
}
-
-virt-manager_package() {
- noarch="yes"
- pycompile_dirs="/usr/share/virt-manager"
- depends="dbus-python pygtk libvirt-python virtinst gtk2-vnc-python
- python-gconf netcat libxml2-python"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/virtinst/template b/srcpkgs/virtinst/template
index 2b0e00006e..646cde8ad3 100644
--- a/srcpkgs/virtinst/template
+++ b/srcpkgs/virtinst/template
@@ -5,6 +5,9 @@ revision=1
noarch=yes
build_style=python-module
makedepends="python libvirt-python urlgrabber"
+depends="${makedepends}"
+noarch="yes"
+pycompile_module="virtinst virtconv"
short_desc="Virtual Machine Installation module"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://virt-manager.et.redhat.com"
@@ -17,12 +20,3 @@ long_desc="
machines. It supports both paravirt guests (for which only FC and
RHEL guests are currently supported) as well as fully virtualized
guests. It uses libvirt (http://www.libvirt.org) for starting things."
-
-virtinst_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="virtinst virtconv"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 7e81194e3d..2e595c07c9 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -19,12 +19,19 @@ makedepends="openssl-devel libcurl-devel libpng-devel>=1.6 libvpx-devel
alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel
libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel
pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.15<1.16
- device-mapper-devel docbook-xsl"
+ device-mapper-devel docbook-xsl shadow"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-c++-multilib"
fi
+depends="
+ virtualbox-ose-dkms-${version}_${revision}
+ hicolor-icon-theme
+ desktop-file-utils
+ shadow"
+system_groups="vboxusers"
+
do_configure() {
# Use our path for dri drivers.
sed -e 's,/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri,/usr/lib/xorg/modules/drivers,g' \
@@ -181,15 +188,3 @@ virtualbox-ose-guest-dkms_package() {
usr/lib/udev/rules.d 60-virtualbox-ose-guest-dkms.rules
}
}
-
-virtualbox-ose_package() {
- depends="
- virtualbox-ose-dkms-${version}_${revision}
- hicolor-icon-theme
- desktop-file-utils
- shadow"
- system_groups="vboxusers"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 8b1d4a766a..b467423845 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=2.1.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--disable-lua --disable-live555 --disable-fluidsynth
@@ -26,6 +26,7 @@ makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 libupnp-devel
libcdio-devel libdvdnav-devel libsysfs-devel libmtp-devel>=1.1.4
sqlite-devel libtheora-devel speex-devel pulseaudio-devel libxml2-devel
opus-devel libbluray-devel faad2-devel jack-devel libSM-devel freefont-ttf"
+depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
if [ "$XBPS_TARGET_MACHINE" = "i686" ] || [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
configure_args+=" --enable-vdpau --enable-libva"
@@ -130,17 +131,10 @@ libvlc_package() {
vlc-devel_package() {
short_desc+=" - development files"
- depends+="libvlc>=${version}_${revision}"
+ depends+=" libvlc>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}
-
-vlc_package() {
- depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template
index 210da0d792..3cf6f68bac 100644
--- a/srcpkgs/void-artwork/template
+++ b/srcpkgs/void-artwork/template
@@ -2,25 +2,16 @@
pkgname=void-artwork
version=20130603
revision=1
-short_desc="Void GNU/Linux artwork"
+noarch=yes
+short_desc="Void Linux artwork"
maintainer="xtraeme and davehome"
license="Public domain"
homepage="http://code.google.com/p/xbps"
long_desc="
- $pkgname contains artwork images for Void GNU/Linux: splash images,
- logos, etc."
-
-noarch=yes
+ $pkgname contains artwork images for Void GNU/Linux: splash images, logos, etc"
do_install() {
vinstall ${FILESDIR}/splash.png 644 usr/share/void-artwork
vinstall ${FILESDIR}/splashwhite.png 644 usr/share/void-artwork
vinstall ${FILESDIR}/void-logo.png 644 usr/share/void-artwork
}
-
-void-artwork_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/void-mklive/template b/srcpkgs/void-mklive/template
index 9f723024c1..1261904e40 100644
--- a/srcpkgs/void-mklive/template
+++ b/srcpkgs/void-mklive/template
@@ -1,6 +1,6 @@
# Template file for 'void-mklive'
pkgname=void-mklive
-version=20131114
+version=20140114
revision=1
short_desc="The Void Linux live/rootfs image maker and installer"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -8,20 +8,14 @@ license="Simplified BSD"
homepage="https://www.voidlinux.eu"
only_for_archs="i686 x86_64"
+noarch="yes"
build_style=gnu-makefile
make_install_args="PREFIX=/usr"
-makedepends="dracut>=027 grub-x86_64-efi squashfs-tools syslinux>=5 dosfstools xorriso xbps>=0.25 parted"
+makedepends="dracut>=027 grub-x86_64-efi squashfs-tools syslinux dosfstools xorriso xbps>=0.29 parted"
+depends="${makedepends}"
do_fetch() {
local url="git://github.com/voidlinux/void-mklive"
msg_normal "Fetching source from $url ...\n"
git clone ${url} ${pkgname}-${version}
}
-
-void-mklive_package() {
- noarch="yes"
- depends="${makedepends}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index b4009c688b..075bab841d 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -20,9 +20,3 @@ long_desc="
Configurable external mixer
Volume Slider
Hotkey support"
-
-volumeicon_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/vorbis-tools/template b/srcpkgs/vorbis-tools/template
new file mode 100644
index 0000000000..b978f0e2a5
--- /dev/null
+++ b/srcpkgs/vorbis-tools/template
@@ -0,0 +1,13 @@
+# Template file for 'vorbis-tools'
+pkgname=vorbis-tools
+version=1.4.0
+revision=1
+hostmakedepends="pkg-config"
+makedepends="libogg-devel libvorbis-devel"
+build_style="gnu-configure"
+maintainer="Philipp Hirsch <itself@hanspolo.net>"
+license="GPL-2"
+homepage="http://www.vorbis.com/"
+distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
+checksum=a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc
+short_desc="Tools for Vorbis-Codecs e.g. oggenc and oggdec"
diff --git a/srcpkgs/vte/template b/srcpkgs/vte/template
index f35be6ea77..1fa7f989e8 100644
--- a/srcpkgs/vte/template
+++ b/srcpkgs/vte/template
@@ -1,19 +1,31 @@
# Template build file for 'vte'.
pkgname=vte
version=0.28.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--disable-static --with-gtk=2.0"
-makedepends="pkg-config intltool gtk+-devel ncurses-devel pygtk-devel"
+hostmakedepends="automake gettext-devel gtk-doc gobject-introspection libtool pkg-config intltool python-devel glib-devel pygtk-devel"
+makedepends="gtk+-devel ncurses-devel pygtk-devel"
short_desc="Terminal widget with improved accessibility and I18N support"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
license="LGPL-2.1"
distfiles="${GNOME_SITE}/vte/0.28/$pkgname-$version.tar.bz2"
checksum=8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903
-long_desc="
- Terminal widget with improved font, internationalization and
- accessibility support for the GNOME 2 desktop."
+
+pre_configure() {
+ NOCONFIGURE=1 autoreconf -fi
+}
+
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ # XXX share python-config wrapper for all pkgs.
+ # create a python-config wrapper to fake --includes
+ install -m755 ${XBPS_SRCPKGDIR}/py2cairo/files/python-config ${wrksrc}
+ export PATH=${wrksrc}:$PATH
+ fi
+ env PYTHON=python ./configure ${configure_args}
+}
vte-python_package() {
depends="pygtk"
@@ -25,17 +37,12 @@ vte-python_package() {
}
vte-devel_package() {
- depends="libglib-devel pango-devel cairo-devel gtk+-devel vte-${version}_${revision}"
+ depends="libglib-devel pango-devel cairo-devel gtk+-devel vte>=${version}_${revision}"
short_desc+=" -- development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
}
}
-
-vte_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 1ff16b56b2..6c4bb6b39b 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -8,6 +8,7 @@ configure_args="--with-gtk=3.0 --enable-introspection
--disable-gnome-pty-helper --disable-static"
hostmakedepends="pkg-config intltool gobject-introspection"
makedepends="gtk+3-devel ncurses-devel vte"
+depends="vte"
short_desc="Terminal widget with improved accessibility and I18N support"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -29,10 +30,3 @@ vte3-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-vte3_package() {
- depends="vte"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index b35ee535aa..72a63dbb24 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -25,9 +25,3 @@ pre_build() {
sed -e 's,./mktable$(EXT),./host-mktable$(EXT),g' -i Makefile
fi
}
-
-w3m_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/warsow-data/template b/srcpkgs/warsow-data/template
index 3c1621d062..c25eda2dfb 100644
--- a/srcpkgs/warsow-data/template
+++ b/srcpkgs/warsow-data/template
@@ -2,6 +2,7 @@
pkgname=warsow-data
version=1.02
revision=1
+noarch="yes"
wrksrc="warsow_${version}"
short_desc="Warsow FPS data files"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -19,10 +20,3 @@ do_install() {
vcopy "basewsw/*" usr/share/warsow/basewsw
vinstall docs/license.txt 644 usr/share/licenses/warsow
}
-
-warsow-data_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/warsow/template b/srcpkgs/warsow/template
index 9dfb189142..8288ec3f73 100644
--- a/srcpkgs/warsow/template
+++ b/srcpkgs/warsow/template
@@ -7,6 +7,8 @@ makedepends="pkg-config libcurl-devel libvorbis-devel libtheora-devel
libjpeg-turbo-devel libpng-devel>=1.6 SDL-devel libopenal-devel MesaLib-devel
libXext-devel libXinerama-devel libXrandr-devel libXxf86vm-devel
libXxf86dga-devel>=1.1.3 fontconfig-devel"
+# libopenal is dlopen(3)ed at runtime.
+depends="desktop-file-utils warsow-data>=1.0 libopenal"
short_desc="Free online multiplayer competitive FPS based on the Qfusion engine"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -30,11 +32,3 @@ do_install() {
vinstall ${FILESDIR}/warsow.desktop 644 usr/share/applications
vinstall ${FILESDIR}/warsow.png 644 usr/share/pixmaps
}
-
-warsow_package() {
- # libopenal is dlopen(3)ed at runtime.
- depends="desktop-file-utils warsow-data>=1.0 libopenal"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 472819bd9e..5b90fbd5c8 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -16,16 +16,10 @@ makedepends="
physfs-devel
qt-devel
desktop-file-utils"
+depends="desktop-file-utils"
short_desc="3D realtime strategy game on a future Earth"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://wz2100.net/"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz"
checksum=c937a2e2c7afdad00b00767636234bbec4d8b18efb008073445439d32edb76cf
-
-warzone2100_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/wavpack/template b/srcpkgs/wavpack/template
index 5c71cb5218..b87a0081de 100644
--- a/srcpkgs/wavpack/template
+++ b/srcpkgs/wavpack/template
@@ -37,9 +37,3 @@ wavpack-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-wavpack_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template
index b34ba2b442..b03c32e69b 100644
--- a/srcpkgs/wayland/template
+++ b/srcpkgs/wayland/template
@@ -1,6 +1,6 @@
# Template file for 'wayland'.
pkgname=wayland
-version=1.3.0
+version=1.4.0
revision=1
build_style=gnu-configure
configure_args="--disable-documentation --disable-static"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://wayland.freedesktop.org/"
license="MIT"
distfiles="http://wayland.freedesktop.org/releases/wayland-${version}.tar.xz"
-checksum=2e817685f68a26acd19964d69ddbc4549ba5412114ad95e1a9f5934cce470d6e
+checksum=18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libtool wayland-devel"
@@ -25,7 +25,7 @@ if [ "$CROSS_BUILD" ]; then
fi
wayland-devel_package() {
- depends="${sourcepkg}>=${version}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin
@@ -35,9 +35,3 @@ wayland-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-wayland_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/webkit-gtk/template b/srcpkgs/webkit-gtk/template
index bdcfc186d6..0b573300fd 100644
--- a/srcpkgs/webkit-gtk/template
+++ b/srcpkgs/webkit-gtk/template
@@ -28,9 +28,3 @@ webkit-gtk-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-webkit-gtk_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template
index 4694002d01..b9da2169d3 100644
--- a/srcpkgs/webkitgtk/template
+++ b/srcpkgs/webkitgtk/template
@@ -1,23 +1,39 @@
# Template file for 'webkitgtk'
pkgname=webkitgtk
-version=2.2.3
+version=2.2.4
revision=1
build_style=gnu-configure
-configure_args="--with-gtk=3.0 --enable-introspection"
+configure_args="--with-gtk=3.0"
short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://webkitgtk.org/"
license="LGPL-2.1, Simplified BSD (2 clause)"
distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605
+checksum=5e1aee1bfca3602cb02920d6984c584c775c661b30c33955e35ff9a21b4c4d74
-hostmakedepends="perl pkg-config intltool which gperf flex ruby gobject-introspection"
+hostmakedepends="perl pkg-config intltool which gperf flex ruby"
makedepends="
libjpeg-turbo-devel libpng-devel>=1.6 sqlite-devel harfbuzz-devel>=0.9.19
gst-plugins-base1-devel libsoup-devel>=2.42 libxslt-devel icu-devel>=49
enchant-devel dbus-glib-devel geoclue-devel libwebp-devel libsecret-devel
gtk+-devel gtk+3-devel>=3.8 libgudev-devel libXt-devel"
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+ configure_args+=" --enable-introspection"
+ hostmakedepends+=" gobject-introspection"
+else
+ configure_args+=" --disable-introspection"
+fi
+
webkitgtk-devel_package() {
replaces="webkit-gtk3-devel>=0"
provides="webkit-gtk3-devel-${version}"
@@ -26,14 +42,10 @@ webkitgtk-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/share/gir-1.0
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
}
}
-
-webkitgtk_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/webrtc-audio-processing/template b/srcpkgs/webrtc-audio-processing/template
index fd05169b6f..cc31aeb67d 100644
--- a/srcpkgs/webrtc-audio-processing/template
+++ b/srcpkgs/webrtc-audio-processing/template
@@ -23,16 +23,10 @@ post_install() {
webrtc-audio-processing-devel_package() {
depends="${sourcepkg}>=${version}"
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
}
}
-
-webrtc-audio-processing_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index f09fe82306..759e04a31c 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,11 +1,11 @@
# Template file for 'weechat'
pkgname=weechat
version=0.4.2
-revision=2
+revision=3
build_style=cmake
hostmakedepends="cmake pkg-config python-devel libgcrypt-devel"
makedepends="tcl-devel>=8.6 aspell-devel libgcrypt-devel gnutls-devel>=3.1.5
- python-devel ruby-devel>=2.0 lua-devel>=5.2 libcurl-devel perl"
+ python-devel ruby-devel>=2.0 lua-devel>=5.2 libcurl-devel perl>=5.18"
short_desc="Fast, light and extensible IRC client (curses UI)"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
@@ -74,9 +74,3 @@ weechat-lua_package() {
vmove usr/lib/weechat/plugins/lua.so
}
}
-
-weechat_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 4cf2bcb4d0..2eaa95c92d 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,20 +1,22 @@
# Template file for 'weston'.
pkgname=weston
-version=1.3.1
-revision=3
+version=1.4.0
+revision=1
build_style=gnu-configure
short_desc="Reference implementation of a Wayland compositor"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://wayland.freedesktop.org/"
license="MIT"
distfiles="http://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=f7141334b141ae1a6435bd03bfdb01b7fb628f39259164f201e7e71c8d815bc7
+checksum=74a2319d98e9cdb1acf24659699719aa89ac268cf549759271e326edc5f9ed64
-hostmakedepends="pkg-config wayland-devel"
-makedepends="libpng-devel>=1.6 wayland-devel libxkbcommon-devel
+hostmakedepends="pkg-config wayland-devel>=${version}"
+makedepends="libpng-devel>=1.6 wayland-devel>=${version} libxkbcommon-devel
libxcb-devel>=1.10 xcb-util-keysyms-devel pixman-devel pango-devel
cairo-devel>=1.12.14_5 mtdev-devel libwebp-devel poppler-glib-devel pam-devel
systemd-devel libunwind-devel lcms2-devel libudev-devel libdrm-devel"
+# cairo built with gles2 option.
+depends="cairo>=1.12.14_5"
case "$XBPS_TARGET_MACHINE" in
armv6l) # Assume RPi for now.
@@ -40,11 +42,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/include
rm -rf ${DESTDIR}/usr/lib/pkgconfig
}
-
-weston_package() {
- # cairo built with gles2 option.
- depends="cairo>=1.12.14_5"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 3461631b44..06fb9569f6 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,32 +1,20 @@
# Template file for 'wget'
pkgname=wget
-version=1.14
-revision=3
+version=1.15
+revision=1
build_style=gnu-configure
-configure_args="--with-ssl=openssl --without-included-regex"
+configure_args="--with-ssl=openssl --with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
+hostmakedepends="perl"
+makedepends="openssl-devel libidn-devel ca-certificates libuuid-devel pcre-devel"
+depends="ca-certificates"
+conf_files="/etc/wgetrc"
short_desc="The GNU wget utility"
maintainer="Juan RP <xtraeme@gmail.org>"
homepage="http://www.gnu.org/software/wget/wget.html"
license="GPL-3"
distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
-checksum=f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269
-
-hostmakedepends="perl"
-makedepends="openssl-devel libidn-devel ca-certificates"
-
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" --with-libssl-prefix=$XBPS_CROSS_BASE"
-fi
+checksum=52126be8cf1bddd7536886e74c053ad7d0ed2aa89b4b630f76785bac21695fcd
post_install() {
- echo "ca_certificate=/etc/ssl/certs/ca-certificates.crt" \
- >> ${DESTDIR}/etc/wgetrc
-}
-
-wget_package() {
- conf_files="/etc/wgetrc"
- depends="ca-certificates"
- pkg_install() {
- vmove all
- }
+ echo "ca_certificate=/etc/ssl/certs/ca-certificates.crt" >> ${DESTDIR}/etc/wgetrc
}
diff --git a/srcpkgs/wgetpaste/template b/srcpkgs/wgetpaste/template
index 782e2fef18..233eea1158 100644
--- a/srcpkgs/wgetpaste/template
+++ b/srcpkgs/wgetpaste/template
@@ -3,6 +3,8 @@ pkgname=wgetpaste
version=2.22
revision=1
makedepends="bash wget"
+depends="${makedepends}"
+noarch="yes"
short_desc="A script that automates pasting to a number of pastebin services"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://wgetpaste.zlin.dk/"
@@ -16,11 +18,3 @@ do_install() {
vinstall ${FILESDIR}/${pkgname}.example 644 \
usr/share/examples/${pkgname} ${pkgname}.conf.example
}
-
-wgetpaste_package() {
- depends="${makedepends}"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/which/template b/srcpkgs/which/template
index 12ec03bff8..6d7df0b0cc 100644
--- a/srcpkgs/which/template
+++ b/srcpkgs/which/template
@@ -9,9 +9,3 @@ homepage="http://www.xs4all.nl/~carlo17/which/"
license="GPL-3"
distfiles="http://www.xs4all.nl/~carlo17/which/which-$version.tar.gz"
checksum=d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8
-
-which_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 28841ead7c..0851c30cce 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -21,9 +21,3 @@ do_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-whois_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template
index 036422a53c..c20f988fd4 100644
--- a/srcpkgs/wicd/template
+++ b/srcpkgs/wicd/template
@@ -2,8 +2,17 @@
pkgname=wicd
version=1.7.2.4
revision=3
+noarch=yes
makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-glib dbus-python
rfkill pygobject2 python-urwid>=0.9.9 python-distribute python-babel"
+depends="dbus-glib dhcpcd ethtool net-tools dbus-python pygobject2 python-urwid
+ rfkill wireless_tools wpa_supplicant"
+pycompile_module="wicd"
+pycompile_dirs="usr/lib/wicd usr/share/wicd"
+conf_files="
+ /etc/dbus-1/system.d/wicd.conf
+ /etc/wicd/encryption/templates/active"
+systemd_services="wicd.service on"
short_desc="Open source wired and wireless network manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://wicd.sourceforge.net"
@@ -68,18 +77,3 @@ wicd-gtk_package() {
vmove usr/share/man/nl/man1/wicd-client.1
}
}
-
-wicd_package() {
- noarch=yes
- depends="dbus-glib dhcpcd ethtool net-tools dbus-python pygobject2 python-urwid
- rfkill wireless_tools wpa_supplicant"
- pycompile_module="wicd"
- pycompile_dirs="usr/lib/wicd usr/share/wicd"
- conf_files="
- /etc/dbus-1/system.d/wicd.conf
- /etc/wicd/encryption/templates/active"
- systemd_services="wicd.service on"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/wifi-firmware/template b/srcpkgs/wifi-firmware/template
index 36747b8a47..334ec38cb3 100644
--- a/srcpkgs/wifi-firmware/template
+++ b/srcpkgs/wifi-firmware/template
@@ -4,6 +4,8 @@ version=1.2
revision=2
build_style=meta
makedepends="ipw2100-firmware ipw2200-firmware zd1211-firmware"
+depends="${makedepends}"
+noarch="yes"
short_desc="WiFi firmware meta-package"
homepage="http://kernel.org/"
license="Custom"
@@ -11,8 +13,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
long_desc="
This is the wifi-firmware meta-package for installing the required firmware
files for some WiFi drivers in the Linux kernel."
-
-wifi-firmware_package() {
- depends="${makedepends}"
- noarch="yes"
-}
diff --git a/srcpkgs/wine-gecko/template b/srcpkgs/wine-gecko/template
index 6ff1e8f8fe..760dff779e 100644
--- a/srcpkgs/wine-gecko/template
+++ b/srcpkgs/wine-gecko/template
@@ -22,6 +22,7 @@ long_desc="
# XXX there's no support for multilib pkgs yet, so restrict it to x86 for now.
only_for_archs="i686"
create_wrksrc=yes
+depends="wine"
do_extract() {
# This is to avoid re-downloading it everytime this template is
@@ -37,10 +38,3 @@ do_install() {
mv -v "wine_gecko-${version}-${gecko_arch}.msi" \
"${DESTDIR}/usr/share/wine/gecko"
}
-
-wine-gecko_package() {
- depends="wine"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template
index 14a18059af..fc0630ac99 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -14,6 +14,7 @@ long_desc="
noarch=yes
create_wrksrc=yes
+depends="wine"
do_extract() {
# This is to avoid re-downloading it everytime this template is
@@ -27,11 +28,3 @@ do_install() {
mkdir -pv "${DESTDIR}/usr/share/wine/mono"
mv -v "${pkgname}-${version}.msi" "${DESTDIR}/usr/share/wine/mono"
}
-
-wine-mono_package() {
- noarch="yes"
- depends="wine"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 6d59434be1..e33e312086 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -28,6 +28,8 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
cups-devel dbus-devel"
makedepends+=" desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig"
+depends="libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf"
+replaces="wine-unstable>=0"
# Otherwise, throws a nasty warning.
pre_configure() {
@@ -52,11 +54,3 @@ wine-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-wine_package() {
- depends="libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf"
- replaces="wine-unstable>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template
index 39838e56b7..b6ac1196f6 100644
--- a/srcpkgs/wineasio/template
+++ b/srcpkgs/wineasio/template
@@ -1,4 +1,8 @@
# Template file for 'wineasio'
+nonfree="yes"
+only_for_archs=i686
+wrksrc=${pkgname}
+
pkgname=wineasio
version="0.9.2"
revision=1
@@ -6,6 +10,7 @@ homepage="http://sourceforge.net/projects/wineasio"
distfiles="${SOURCEFORGE_SITE}/wineasio/${pkgname}-${version}.tar.gz"
checksum=9fbc2d10a4cec307dc0558bed82b887c864424d16da40a80f1d80f907d92af0b
makedepends="wine>=1.6 wine-devel>=1.6 jack-devel"
+depends="jack"
short_desc="JACK driver for WINE to provide Windows Apps with ASIO support"
maintainer="davehome <davehome@redthumb.info.tm>"
license="LGPL"
@@ -13,10 +18,6 @@ long_desc="
WineASIO provides an ASIO to JACK driver for WINE. ASIO is the most common
Windows low-latency driver, so is commonly used in audio workstation programs."
-only_for_archs=i686
-
-wrksrc=${pkgname}
-
do_build() {
local url="http://redthumb.info.tm/asio.h"
msg_normal " Fetching ${url} ...\n"
@@ -28,11 +29,3 @@ do_build() {
do_install() {
vinstall wineasio.dll.so 755 usr/lib/wine
}
-
-wineasio_package() {
- nonfree="yes"
- depends="jack"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/winusb/template b/srcpkgs/winusb/template
index 03cbec1b45..5359f0fec2 100644
--- a/srcpkgs/winusb/template
+++ b/srcpkgs/winusb/template
@@ -6,15 +6,9 @@ build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="wxGTK-devel ntfs-3g parted grub-x86_64-efi desktop-file-utils hicolor-icon-theme"
short_desc="Simple tool that enable you to create your own usb stick windows installer"
+depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g grub-x86_64-efi"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://en.congelli.eu/prog_info_winusb.html"
distfiles="http://en.congelli.eu/directdl/winusb/winusb-${version}.tar.gz"
checksum=7bd8d2e63651134bd4173dcf358708fb9e6de1677c088e67d45995a1d5066bc9
-
-winusb_package() {
- depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g grub-x86_64-efi"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/wireless_tools/template b/srcpkgs/wireless_tools/template
index 0671205771..ae5a8427a5 100644
--- a/srcpkgs/wireless_tools/template
+++ b/srcpkgs/wireless_tools/template
@@ -28,9 +28,3 @@ wireless_tools-devel_package() {
vmove usr/include
}
}
-
-wireless_tools_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/wmfs/template b/srcpkgs/wmfs/template
index 5f38dcd3ad..407b180e4e 100644
--- a/srcpkgs/wmfs/template
+++ b/srcpkgs/wmfs/template
@@ -4,7 +4,9 @@ version=201104
revision=3
build_style=configure
configure_args="--prefix /usr --man-prefix /usr/share/man --xdg-config-dir /etc/xdg"
-makedepends="pkg-config libXft-devel libXrender-devel fontconfig-devel libXinerama-devel libXrandr-devel imlib2-devel"
+hostmakedepends="pkg-config"
+makedepends="libXft-devel libXrender-devel fontconfig-devel libXinerama-devel libXrandr-devel imlib2-devel"
+conf_files="/etc/xdg/wmfs/wmfsrc"
short_desc="Window Manager From Scratch"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -22,11 +24,3 @@ long_desc="
post_install() {
vinstall COPYING 644 usr/share/licenses/wmfs
}
-
-wmfs_package() {
- conf_files="/etc/xdg/wmfs/wmfsrc"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/wmname/template b/srcpkgs/wmname/template
index 02b3146690..2824b14ad0 100644
--- a/srcpkgs/wmname/template
+++ b/srcpkgs/wmname/template
@@ -13,9 +13,3 @@ checksum=559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5
do_install() {
make install DESTDIR=${DESTDIR} PREFIX=/usr
}
-
-wmname_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/wok/template b/srcpkgs/wok/template
index 6d5e522041..d6e5b9dfe9 100644
--- a/srcpkgs/wok/template
+++ b/srcpkgs/wok/template
@@ -6,18 +6,12 @@ create_srcdir=yes
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel python-jinja pyyaml python-docutils python-Markdown python-Pygments"
+noarch="yes"
+pycompile_module="wok"
+depends="python>=2.7 python-jinja pyyaml python-docutils python-Markdown python-Pygments"
short_desc="A simple static site generator in python"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="https://github.com/mythmon/wok"
license="MIT"
distfiles="https://github.com/mythmon/wok/archive/v${version}.tar.gz"
checksum=e5c5d24dbda05d396e5d22aeac05ce40bf4f362da9ca04a82c04c80ebade12b8
-
-wok_package() {
- noarch="yes"
- pycompile_module="wok"
- depends="python>=2.7 python-jinja pyyaml python-docutils python-Markdown python-Pygments"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index d0ac6532d7..cb93965b5a 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
# Template file for 'wpa_supplicant'
pkgname=wpa_supplicant
version=2.0
-revision=2
+revision=3
build_wrksrc=$pkgname
short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,15 +12,15 @@ checksum=2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09
hostmakedepends="pkg-config"
makedepends="libnl3-devel openssl-devel dbus-devel readline-devel"
+conf_files="/etc/wpa_supplicant.conf"
-do_build() {
+pre_build() {
sed -i 's|/usr/local|$(PREFIX)|g' Makefile
cp -f ${FILESDIR}/config .config
+}
- if [ "$CROSS_BUILD" ]; then
- export CFLAGS="-I$XBPS_CROSS_BASE/usr/include/libnl3 $CFLAGS"
- fi
-
+do_build() {
+ CFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/libnl3"
make ${make_build_args} V=1 PREFIX=/usr
}
@@ -49,11 +49,9 @@ do_install() {
# Fix wpa_supplicant@.service to respect instance name.
sed -e 's,wpa_supplicant@wlan0.service,wpa_supplicant@%i.service,' -i \
${DESTDIR}/usr/lib/systemd/system/wpa_supplicant@.service
-}
-wpa_supplicant_package() {
- conf_files="/etc/wpa_supplicant.conf"
- pkg_install() {
- vmove all
- }
+ vmkdir usr/bin
+ mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
+ sed -e 's,/usr/sbin/,/usr/bin,g' -i \
+ ${DESTDIR}/usr/lib/systemd/system/*.service
}
diff --git a/srcpkgs/wv/template b/srcpkgs/wv/template
index f755ccb403..720b056cd6 100644
--- a/srcpkgs/wv/template
+++ b/srcpkgs/wv/template
@@ -34,9 +34,3 @@ wv-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-wv_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/wxGTK/template b/srcpkgs/wxGTK/template
index aef102aa15..cb093e540c 100644
--- a/srcpkgs/wxGTK/template
+++ b/srcpkgs/wxGTK/template
@@ -45,9 +45,3 @@ wxGTK-devel_package() {
vmove usr/bin
}
}
-
-wxGTK_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template
index f49a51c320..5939af83b7 100644
--- a/srcpkgs/wxPython/template
+++ b/srcpkgs/wxPython/template
@@ -7,6 +7,8 @@ hostmakedepends="pkg-config"
makedepends="zlib-devel libpng-devel libjpeg-turbo-devel libXpm-devel
tiff-devel expat-devel libX11-devel libXinerama-devel GConf-devel cairo-devel
gtk+-devel MesaLib-devel glu-devel wxGTK-devel python-devel"
+depends="python"
+pycompile_module="wx-2.8-gtk2-unicode"
short_desc="The wxWidgets GUI toolkit library (Python Bindings)"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://www.wxwidgets.org/"
@@ -45,11 +47,3 @@ wxPython-devel_package() {
vmove usr/include
}
}
-
-wxPython_package() {
- depends="python"
- pycompile_module="wx-2.8-gtk2-unicode"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/x11perf/template b/srcpkgs/x11perf/template
index 6f1148f05f..e51e4808dd 100644
--- a/srcpkgs/x11perf/template
+++ b/srcpkgs/x11perf/template
@@ -14,9 +14,3 @@ checksum=a1fd752abd3496568614c2f2209d21452bdd5b8c9a5c14a5705725bd8c298e12
long_desc="
The x11perf program runs one or more performance tests and reports how
fast an X server can execute the tests."
-
-x11perf_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index 47d94b63b2..ce5ac9def6 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -45,9 +45,3 @@ x264-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-x264_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template
index 680786b776..c12e4be731 100644
--- a/srcpkgs/xapian-core/template
+++ b/srcpkgs/xapian-core/template
@@ -39,9 +39,3 @@ libxapian_package() {
vmove "usr/lib/*.so*"
}
}
-
-xapian-core_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index d89a71c1ca..e87b2ab20e 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -27,14 +27,8 @@ post_install() {
xar-devel_package() {
depends="xar>=$version"
- short_desc="${short_desc} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
}
}
-
-xar_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index be08cde30a..f409060b6b 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -5,6 +5,7 @@ revision=3
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel xdg-utils desktop-file-utils hicolor-icon-theme"
+depends="xdg-utils desktop-file-utils hicolor-icon-theme"
short_desc="GTK+2 lightweight desktop independent archive manager"
homepage="http://xarchiver.sourceforge.net/"
license="GPL-2"
@@ -18,10 +19,3 @@ long_desc="
line rather than API calls. Xarchiver has been designed from the ground up
to be fast and easy-to-use. Its user interface is clean and intuitive, and
does not include any confusing or useless options."
-
-xarchiver_package() {
- depends="xdg-utils desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template
index c54a685a77..119c275eec 100644
--- a/srcpkgs/xauth/template
+++ b/srcpkgs/xauth/template
@@ -14,9 +14,3 @@ checksum=a8696ae7a50c699d5fb3a41408b60d98843d19ea46e9f09e391cb98c8f7fd4f7
long_desc="
This package provides xauth, a program to display and manipulate the
authentication data used by the X11 clients."
-
-xauth_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xbacklight/template b/srcpkgs/xbacklight/template
index c0dffec439..e71de6ed84 100644
--- a/srcpkgs/xbacklight/template
+++ b/srcpkgs/xbacklight/template
@@ -15,9 +15,3 @@ long_desc="
Xbacklight is used to adjust the backlight brightness where supported.
It finds all outputs on the X server supporting backlight brightness
control and changes them all in the same way."
-
-xbacklight_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xbitmaps/template b/srcpkgs/xbitmaps/template
index 2a57af5d00..892d9d27aa 100644
--- a/srcpkgs/xbitmaps/template
+++ b/srcpkgs/xbitmaps/template
@@ -2,6 +2,7 @@
pkgname=xbitmaps
version=1.0.1
revision=3
+noarch="yes"
build_style=gnu-configure
short_desc="Common X11 bitmaps"
homepage="http://xorg.freedesktop.org"
@@ -9,12 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/data/$pkgname-$version.tar.bz2"
checksum=5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
-long_desc="
- This package contains the common X11 bitmaps for direct inclusion in C."
-
-xbitmaps_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xbmc-rpi/INSTALL b/srcpkgs/xbmc-rpi/INSTALL
new file mode 100644
index 0000000000..9f9deaf270
--- /dev/null
+++ b/srcpkgs/xbmc-rpi/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+ mkdir -p var/lib/xbmc
+ chown xbmc:xbmc var/lib/xbmc
+ ;;
+esac
diff --git a/srcpkgs/xbmc-rpi/REMOVE b/srcpkgs/xbmc-rpi/REMOVE
new file mode 100644
index 0000000000..83d2c7e376
--- /dev/null
+++ b/srcpkgs/xbmc-rpi/REMOVE
@@ -0,0 +1,5 @@
+case "${ACTION}" in
+purge)
+ rm -rf var/lib/xbmc
+ ;;
+esac
diff --git a/srcpkgs/xbmc-rpi/files/polkit.rules b/srcpkgs/xbmc-rpi/files/polkit.rules
new file mode 100644
index 0000000000..b10fb07ea7
--- /dev/null
+++ b/srcpkgs/xbmc-rpi/files/polkit.rules
@@ -0,0 +1,11 @@
+polkit.addRule(function(action, subject) {
+ if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("video")) {
+ return polkit.Result.YES;
+ }
+});
+
+polkit.addRule(function(action, subject) {
+ if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("video")) {
+ return polkit.Result.YES;
+ }
+});
diff --git a/srcpkgs/xbmc-rpi/files/xbmc.service b/srcpkgs/xbmc-rpi/files/xbmc.service
new file mode 100644
index 0000000000..23e448cea5
--- /dev/null
+++ b/srcpkgs/xbmc-rpi/files/xbmc.service
@@ -0,0 +1,13 @@
+[Unit]
+Description = XBMC Media Center for Raspberry Pi service
+After = remote-fs.target
+
+[Service]
+User = xbmc
+Group = xbmc
+Type = simple
+ExecStart = /usr/bin/xbmc-standalone -l /run/lirc/lircd
+Restart = always
+
+[Install]
+WantedBy = multi-user.target
diff --git a/srcpkgs/xbmc-rpi/patches/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch b/srcpkgs/xbmc-rpi/patches/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
new file mode 100644
index 0000000000..113e0f79e7
--- /dev/null
+++ b/srcpkgs/xbmc-rpi/patches/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
@@ -0,0 +1,169 @@
+diff -Naur xbmc-frodo-0ff0d2e/configure.in xbmc-frodo-0ff0d2e.patch/configure.in
+--- xbmc-frodo-0ff0d2e/configure.in 2012-10-11 15:45:44.000000000 +0200
++++ xbmc-frodo-0ff0d2e.patch/configure.in 2012-10-11 16:49:08.872850880 +0200
+@@ -452,6 +452,12 @@
+ [use_texturepacker=$enableval],
+ [use_texturepacker=auto])
+
++AC_ARG_WITH([texturepacker-root],
++ [AS_HELP_STRING([--with-texturepacker-root],
++ [root dir to search for librarys and includes if building native TexturePacker (default is \$prefix)])],
++ [use_texturepacker_root=$withval],
++ [use_texturepacker_root=$prefix])
++
+ AC_ARG_WITH([lirc-device],
+ [AS_HELP_STRING([--with-lirc-device=file],
+ [specify the default LIRC device (default is /dev/lircd)])],
+@@ -2000,13 +2006,13 @@
+
+ USE_TEXTUREPACKER_NATIVE=0
+ if test "x$use_texturepacker" != "xno"; then
+- final_message="$final_message\n TexturePacker:Yes"
+ USE_TEXTUREPACKER=1
+- if test "x$use_texturepacker_native" = "xyes"; then
++ if test "x$cross_compiling" = "xyes"; then
+ USE_TEXTUREPACKER_NATIVE=1
+- if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then
+- USE_TEXTUREPACKER_NATIVE_ROOT=
+- fi
++ USE_TEXTUREPACKER_NATIVE_ROOT="$use_texturepacker_root"
++ final_message="$final_message\n TexturePacker:Native ($USE_TEXTUREPACKER_NATIVE_ROOT)"
++ else
++ final_message="$final_message\n TexturePacker:Yes"
+ fi
+ else
+ final_message="$final_message\n TexturePacker:No"
+diff -Naur xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in
+--- xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in 2012-10-11 15:47:26.000000000 +0200
++++ xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in 2012-10-11 16:49:08.873850900 +0200
+@@ -11,26 +11,25 @@
+ singlecolourfit.cpp \
+ squish.cpp
+
+-CXXFLAGS+=-I.
+-
+-LIB=libsquish.a
+-
+-ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+-NATIVE_LIB=libsquish-native.so
+-CLEAN_FILES+=$(NATIVE_LIB)
++LIB = libsquish.a
++NATIVE_LIB = libsquish-native.so
++CLEAN_FILES += $(NATIVE_LIB)
++
++HOST_CXX ?= g++
++CXXFLAGS += -I.
++HOST_CXXFLAGS += -I.
+
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+-NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
++ HOST_CXXFLAGS += @DARWIN_NATIVE_ARCH@
+ endif
+
+-all: $(LIB) $(NATIVE_LIB)
++$(LIB): $(SRCS)
+ # TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
+ $(NATIVE_LIB): $(SRCS)
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+- g++ $(NATIVE_ARCH) -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
++ $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
+ else
+- g++ -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
+-endif
++ $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
+ endif
+
+ include ../../Makefile.include
+diff -Naur xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in
+--- xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in 2012-10-11 15:47:05.000000000 +0200
++++ xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in 2012-10-11 16:49:08.874850920 +0200
+@@ -1,56 +1,54 @@
+-DEFINES += -D_LINUX -DUSE_LZO_PACKING
++DEFINES += -D_LINUX -DUSE_LZO_PACKING
+ ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),)
+-DEFINES += -DHOST_BIGENDIAN
++DEFINES += -DHOST_BIGENDIAN
+ endif
+
+-CXXFLAGS+= \
++SRCS = \
++ md5.cpp \
++ SDL_anigif.cpp \
++ XBTFWriter.cpp \
++ XBMCTex.cpp \
++ @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
++
++TARGET = TexturePacker
++CLEAN_FILES = $(TARGET)
++
++all: $(TARGET)
++
++HOST_CXX ?= g++
++HOST_ROOT_PATH = @USE_TEXTUREPACKER_NATIVE_ROOT@
++
++LIBS += -lSDL_image -lSDL -llzo2
++LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
++HOST_LIBS += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2
++HOST_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
++
++CXXFLAGS += \
+ -I. \
+ -I@abs_top_srcdir@/lib \
+ -I@abs_top_srcdir@/xbmc \
+ -I@abs_top_srcdir@/xbmc/linux
+
+-RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib
++HOST_CXXFLAGS += \
++ -I. \
++ -I@abs_top_srcdir@/lib \
++ -I@abs_top_srcdir@/xbmc \
++ -I@abs_top_srcdir@/xbmc/linux \
++ -I$(HOST_ROOT_PATH)/include
++
++RPATH=-Wl,-rpath=$(HOST_ROOT_PATH)/lib
+
+-ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+-NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
+-ifdef NATIVE_ROOT_PATH
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+ DEFINES += -DTARGET_DARWIN
+ NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
+ RPATH=
+ endif
+-NATIVE_CXXFLAGS+= -I. \
+- -I$(NATIVE_ROOT_PATH)/include \
+- -I@abs_top_srcdir@/lib \
+- -I@abs_top_srcdir@/xbmc \
+- -I@abs_top_srcdir@/xbmc/linux
+-NATIVE_LIBS += -L$(NATIVE_ROOT_PATH)/lib
+-endif
+-NATIVE_LIBS += -lSDL_image -lSDL -llzo2
+-NATIVE_LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
+-else
+-LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
+-endif
+-
+-LIBS += -lSDL_image -lSDL -llzo2
+-
+-SRCS = \
+- md5.cpp \
+- SDL_anigif.cpp \
+- XBTFWriter.cpp \
+- XBMCTex.cpp \
+- @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
+-
+-
+-TARGET = TexturePacker
+-CLEAN_FILES=$(TARGET)
+-
+-all: $(TARGET)
+
+ ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+ # TexturePacker run native on build system, build it with native tools
+ $(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h
+- g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET)
++ make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so
++ $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) $(RPATH) -o $(TARGET)
+ clean:
+ rm -f $(TARGET)
+ else
diff --git a/srcpkgs/xbmc-rpi/template b/srcpkgs/xbmc-rpi/template
new file mode 100644
index 0000000000..18cd65d253
--- /dev/null
+++ b/srcpkgs/xbmc-rpi/template
@@ -0,0 +1,116 @@
+# Template file for 'xbmc-rpi'
+pkgname=xbmc-rpi
+version=12.3
+revision=1
+patch_args="-Np1"
+wrksrc="xbmc-${version}-Frodo"
+short_desc="XBMC Media Center for the Raspberry Pi"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.xbmc.org"
+license="GPL-2"
+distfiles="http://mirrors.xbmc.org/releases/source/xbmc-$version.tar.gz"
+checksum=3e15c960d034efdea5f92a7b74716cb48094842d077b076025fd8640754ede73
+
+only_for_archs="armv6l"
+# Due to bootstrap requiring java, it's only possible currently to cross
+# compile it from x86.
+if [ "$XBPS_MACHINE" != "i686" -a "$XBPS_MACHINE" != "x86_64" ]; then
+ msg_error "${pkgname}-${version}: can only be cross built on x86."
+fi
+
+#broken_as_needed=yes
+
+hostmakedepends="
+ automake libtool pkg-config gperf cmake zip unzip nasm yasm
+ swig jre which gettext-devel libltdl-devel python-devel libmysqlclient-devel
+ SDL_image-devel lzo-devel"
+makedepends="
+ libudev-devel>=183 pcre-devel>=8.30 expat-devel libpng-devel>=1.6 libjpeg-turbo-devel
+ avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel>=5.5.27
+ libmpeg2-devel wavpack-devel zlib-devel lzo-devel fribidi-devel sqlite-devel freetype-devel
+ jasper-devel faac-devel faad2-devel libmodplug-devel openssl-devel libass-devel
+ libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel
+ enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel
+ tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel systemd-devel
+ libcec-devel libbluray-devel libmicrohttpd-devel libcdio-devel python-devel
+ libdvdread-devel libssh-devel rpi-firmware"
+makedepends+=" udisks2 upower hicolor-icon-theme desktop-file-utils"
+# The following dependencies are dlopen(3)ed.
+depends="libbluray libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist"
+depends+=" udisks2 upower hicolor-icon-theme desktop-file-utils"
+
+provides="xbmc-${version}_${revision}"
+# Create xbmc system user to launch xbmc-standalone.
+system_accounts="xbmc"
+xbmc_homedir="/var/lib/xbmc"
+xbmc_groups="audio,video"
+
+pre_configure() {
+ . /etc/profile.d/jre.sh
+ ./bootstrap
+
+ # fix lsb_release dependency
+ sed -i -e 's:/usr/bin/lsb_release -d:/bin/true:' xbmc/utils/SystemInfo.cpp
+
+ # Use cross prefix for python include/libdir.
+ sed -e "s,-L\$ac_python_libdir,-L${XBPS_CROSS_BASE}/usr/lib,g" -i configure
+ sed -e "s,PYTHON_CPPFLAGS=\$python_path,PYTHON_CPPFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" -i configure
+}
+
+do_configure() {
+ . /etc/profile.d/jre.sh
+ CFLAGS="-O3 -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux"
+ CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/ -I${XBPS_CROSS_BASE}/opt/vc/include/IL"
+ CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vcos/pthreads"
+ CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include/interface/vmcs_host/linux"
+ CXXFLAGS="$CFLAGS"
+ LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib"
+
+ export CFLAGS CXXFLAGS LDFLAGS
+
+ ./configure ${configure_args} \
+ --disable-gl \
+ --enable-gles \
+ --disable-sdl \
+ --disable-x11 \
+ --disable-xrandr \
+ --disable-openmax \
+ --disable-joystick \
+ --disable-debug \
+ --disable-crystalhd \
+ --disable-vtbdecoder \
+ --disable-vaapi \
+ --disable-vdpau \
+ --disable-pulse \
+ --disable-projectm \
+ --with-platform=raspberry-pi \
+ --enable-dvdcss \
+ --enable-optical-drive \
+ --enable-libbluray \
+ --enable-optimizations \
+ --enable-libcec \
+ --enable-player=omxplayer
+
+ sed -e "s,\$(DVDREAD_CFLAGS),,g;s,AR=ar,AR=$AR,g;s,LD=ld,LD=$LD,g;s,RANLIB=ranlib,RANLIB=$RANLIB,g" -i lib/libdvd/libdvd{nav,read}/Makefile
+ sed -e 's,-L/usr/lib,,g' -i lib/cmyth/Makefile
+}
+
+do_build() {
+ make ${makejobs}
+}
+
+do_install() {
+ make DESTDIR=${DESTDIR} install
+
+ # Remove checks that don't apply to the raspberry pi
+ head -n 171 ${DESTDIR}/usr/share/xbmc/FEH.py > ${DESTDIR}/usr/share/xbmc/FEH.py.new
+ mv ${DESTDIR}/usr/share/xbmc/FEH.py.new ${DESTDIR}/usr/share/xbmc/FEH.py
+
+ vinstall tools/Linux/xbmc.desktop 644 usr/share/applications
+ vinstall tools/Linux/xbmc-48x48.png 644 usr/share/pixmaps xbmc.png
+
+ rm -f ${DESTDIR}/usr/share/icons/hicolor/icon-theme.cache
+
+ vinstall ${FILESDIR}/xbmc.service 0644 usr/lib/systemd/system
+ vinstall ${FILESDIR}/polkit.rules 0644 etc/polkit-1/rules.d 10-xbmc.rules
+}
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index cecfe43855..2ae74f2854 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -27,8 +27,10 @@ makedepends="
libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel
taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel systemd-devel
libcec-devel"
-
makedepends+=" udisks2 upower hicolor-icon-theme desktop-file-utils glxinfo"
+# The following dependencies are dlopen(3)ed.
+depends="libbluray libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist"
+depends+=" glxinfo udisks2 upower hicolor-icon-theme desktop-file-utils"
pre_configure() {
. /etc/profile.d/jre.sh
@@ -68,12 +70,3 @@ do_install() {
rm -f ${DESTDIR}/usr/share/icons/hicolor/icon-theme.cache
}
-
-xbmc_package() {
- # The following dependencies are dlopen(3)ed.
- depends="libbluray libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist"
- depends+=" glxinfo udisks2 upower hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index 08a697989e..35538e8abe 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,16 +1,24 @@
# Template file for 'xbps-git'
pkgname=xbps-git
-version=20131226
-revision=1
-build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-debug --enable-static --enable-tests"
-hostmakedepends="which pkg-config"
-makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
+version=20140201
+revision=2
short_desc="The XBPS package system (development branch)"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.voidlinux.eu/xbps"
license="Simplified BSD"
+build_style=configure
+configure_script="env HAVE_VASPRINTF=1 ./configure"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-debug --enable-static --enable-tests"
+
+hostmakedepends="which pkg-config"
+makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
+
+depends="xbps-triggers libxbps-git-${version}_${revision}"
+provides="xbps-${version}_${revision}"
+replaces="xbps>=0 xbps-devel>=0"
+conf_files="/etc/xbps/xbps.conf"
+
do_fetch() {
local url="git://github.com/xtraeme/xbps"
msg_normal "Fetching source from $url ...\n"
@@ -19,7 +27,7 @@ do_fetch() {
libxbps-git_package() {
short_desc+=" - runtime library"
- provides="libxbps-${version}"
+ provides="libxbps-${version}_${revision}"
replaces="libxbps>=0 xbps-devel>=0"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -29,7 +37,7 @@ libxbps-git_package() {
libxbps-devel-git_package() {
short_desc+=" - runtime library (development files)"
depends="zlib-devel libarchive-devel libxbps>=${version}"
- provides="libxbps-devel-${version}"
+ provides="libxbps-devel-${version}_${revision}"
replaces="libxbps-devel>=0"
pkg_install() {
vmove usr/include
@@ -40,7 +48,7 @@ libxbps-devel-git_package() {
}
xbps-static-git_package() {
- provides="xbps-static-${version}"
+ provides="xbps-static-${version}_${revision}"
replaces="xbps-static>=0 xbps-devel-static>=0"
depends="xbps-triggers"
short_desc+=" - static binaries"
@@ -52,19 +60,9 @@ xbps-static-git_package() {
xbps-tests-git_package() {
short_desc+=" - Kyua testsuite"
depends="libxbps>=${version}"
- provides="xbps-tests-${version}"
+ provides="xbps-tests-${version}_${revision}"
replaces="xbps-tests>=0"
pkg_install() {
vmove usr/tests
}
}
-
-xbps-git_package() {
- provides="xbps-${version}"
- replaces="xbps>=0 xbps-devel>=0"
- conf_files="/etc/xbps/xbps.conf"
- depends="xbps-triggers libxbps-git-${version}_${revision}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xbps-src-utils/template b/srcpkgs/xbps-src-utils/template
index 9b5111f98c..6fbfd45648 100644
--- a/srcpkgs/xbps-src-utils/template
+++ b/srcpkgs/xbps-src-utils/template
@@ -1,12 +1,14 @@
# Template build file for 'xbps-src-utils'.
pkgname=xbps-src-utils
-version=20131027
+version=20140103
revision=1
-homepage="https://github.com/davehome/xbps-src-utils"
+build_style=configure
+configure_args="--prefix=/usr --etcdir=/etc"
hostmakedepends="pkg-config"
makedepends="libxbps-devel>=0.25"
short_desc="Various tools for xbps-src in C (like repo-checkvers)"
maintainer="davehome <davehome@redthumb.info.tm>"
+homepage="https://github.com/davehome/xbps-src-utils"
license="GPL-2"
long_desc="
Various tools for xbps-src in C (like repo-checkvers)
@@ -21,21 +23,3 @@ do_fetch() {
msg_normal " Fetching source from $url ...\n"
git clone ${url} ${pkgname}-${version}
}
-
-do_configure() {
- ./configure --prefix=/usr --etcdir=/etc
-}
-
-do_build() {
- make
-}
-
-do_install() {
- make DESTDIR=${DESTDIR} install
-}
-
-xbps-src-utils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xbps-src/INSTALL b/srcpkgs/xbps-src/INSTALL
new file mode 100644
index 0000000000..990701f06d
--- /dev/null
+++ b/srcpkgs/xbps-src/INSTALL
@@ -0,0 +1,7 @@
+case "${ACTION}" in
+post)
+ # Setup correct permissions to the chroot helper.
+ chgrp xbuilder usr/libexec/xbps-src-chroot-helper
+ chmod 4750 usr/libexec/xbps-src-chroot-helper
+ ;;
+esac
diff --git a/srcpkgs/xbps-src/template b/srcpkgs/xbps-src/template
index 389b6f20b2..d036f298ca 100644
--- a/srcpkgs/xbps-src/template
+++ b/srcpkgs/xbps-src/template
@@ -1,8 +1,10 @@
# Template file for 'xbps-src'
pkgname=xbps-src
-version=20131219
-revision=1
+version=20140201
+revision=4
bootstrap=yes
+conf_files="/etc/xbps/xbps-src.conf"
+depends="bash xbps-triggers>=0.54 fakeroot"
build_style=gnu-makefile
make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"
@@ -16,11 +18,3 @@ do_fetch() {
msg_normal "Fetching source from $url ...\n"
git clone ${url} ${pkgname}-${version}
}
-
-xbps-src_package() {
- conf_files="/etc/xbps/xbps-src.conf"
- depends="bash xbps-triggers>=0.54 fakeroot"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 859a1f7281..7ee794cc83 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,7 +1,8 @@
# Template file for 'xbps-triggers'
pkgname=xbps-triggers
-version=0.73
+version=0.74
revision=1
+noarch=yes
bootstrap=yes
short_desc="The XBPS triggers for Void Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -21,10 +22,3 @@ do_install() {
cd ${DESTDIR}/var/db/xbps
ln -sf ../../../${_triggersdir} triggers
}
-
-xbps-triggers_package() {
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xbps/patches/0001-xbps-rindex-8-fix-24-and-added-an-ATF-test-case.patch b/srcpkgs/xbps/patches/0001-xbps-rindex-8-fix-24-and-added-an-ATF-test-case.patch
deleted file mode 100644
index 871011fc69..0000000000
--- a/srcpkgs/xbps/patches/0001-xbps-rindex-8-fix-24-and-added-an-ATF-test-case.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 7c57918950de56d700c255f2524443becb5280be Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Fri, 29 Nov 2013 17:30:45 +0100
-Subject: [PATCH] xbps-rindex(8): fix #24 and added an ATF test case.
-
----
- NEWS | 2 ++
- bin/xbps-rindex/index-add.c | 22 +++++++++++-----------
- tests/xbps/xbps-rindex/Kyuafile | 1 +
- tests/xbps/xbps-rindex/Makefile | 2 +-
- tests/xbps/xbps-rindex/add_test.sh | 35 +++++++++++++++++++++++++++++++++++
- 5 files changed, 50 insertions(+), 12 deletions(-)
- create mode 100644 tests/xbps/xbps-rindex/add_test.sh
-
-diff --git a/bin/xbps-rindex/index-add.c b/bin/xbps-rindex/index-add.c
-index 2289897..572e2a4 100644
---- bin/xbps-rindex/index-add.c
-+++ bin/xbps-rindex/index-add.c
-@@ -49,8 +49,8 @@ index_add(struct xbps_handle *xhp, int argc, char **argv, bool force)
- xbps_object_t obj, fileobj;
- struct xbps_repo *repo;
- struct stat st;
-- const char *oldpkgver, *arch, *oldarch;
-- char *pkgver, *pkgname, *sha256, *repodir, *buf;
-+ const char *arch;
-+ char *pkgver, *opkgver, *oarch, *pkgname, *sha256, *repodir;
- char *tmprepodir;
- int rv = 0, ret = 0;
- bool flush = false, found = false;
-@@ -116,17 +116,17 @@ index_add(struct xbps_handle *xhp, int argc, char **argv, bool force)
- }
- } else if (!force) {
- /* Only check version if !force */
-- xbps_dictionary_get_cstring_nocopy(curpkgd,
-- "pkgver", &oldpkgver);
-- xbps_dictionary_get_cstring_nocopy(curpkgd,
-- "architecture", &oldarch);
-- ret = xbps_cmpver(pkgver, oldpkgver);
-+ xbps_dictionary_get_cstring(curpkgd, "pkgver", &opkgver);
-+ xbps_dictionary_get_cstring(curpkgd, "architecture", &oarch);
-+ ret = xbps_cmpver(pkgver, opkgver);
- if (ret <= 0) {
- /* Same version or index version greater */
- fprintf(stderr, "index: skipping `%s' "
- "(%s), already registered.\n",
- pkgver, arch);
- xbps_object_release(newpkgd);
-+ free(opkgver);
-+ free(oarch);
- free(pkgver);
- free(pkgname);
- continue;
-@@ -135,11 +135,11 @@ index_add(struct xbps_handle *xhp, int argc, char **argv, bool force)
- * Current package version is greater than
- * index version.
- */
-- buf = xbps_xasprintf("`%s' (%s)", oldpkgver, oldarch);
- xbps_dictionary_remove(idx, pkgname);
-- xbps_dictionary_remove(idxfiles, oldpkgver);
-- printf("index: removed obsolete entry %s.\n", buf);
-- free(buf);
-+ xbps_dictionary_remove(idxfiles, opkgver);
-+ printf("index: removed obsolete entry `%s' (%s).\n", opkgver, oarch);
-+ free(opkgver);
-+ free(oarch);
- }
- /*
- * We have the dictionary now, add the required
-diff --git a/tests/xbps/xbps-rindex/Kyuafile b/tests/xbps/xbps-rindex/Kyuafile
-index 2cf4d6a..f5061b0 100644
---- tests/xbps/xbps-rindex/Kyuafile
-+++ tests/xbps/xbps-rindex/Kyuafile
-@@ -1,4 +1,5 @@
- syntax("kyuafile", 1)
-
- test_suite("xbps-rindex")
-+atf_test_program{name="add_test"}
- atf_test_program{name="clean_test"}
-diff --git a/tests/xbps/xbps-rindex/Makefile b/tests/xbps/xbps-rindex/Makefile
-index b31c71c..6456ed9 100644
---- tests/xbps/xbps-rindex/Makefile
-+++ tests/xbps/xbps-rindex/Makefile
-@@ -1,7 +1,7 @@
- TOPDIR = ../../..
- -include $(TOPDIR)/config.mk
-
--TESTSHELL = clean_test
-+TESTSHELL = add_test clean_test
- TESTSSUBDIR = xbps/xbps-rindex
- EXTRA_FILES = Kyuafile
-
-diff --git a/tests/xbps/xbps-rindex/add_test.sh b/tests/xbps/xbps-rindex/add_test.sh
-new file mode 100644
-index 0000000..158ca02
---- /dev/null
-+++ tests/xbps/xbps-rindex/add_test.sh
-@@ -0,0 +1,35 @@
-+#! /usr/bin/env atf-sh
-+# Test that xbps-rindex(8) -a (add mode) works as expected.
-+
-+# 1st test: test that update mode work as expected.
-+atf_test_case update
-+
-+update_head() {
-+ atf_set "descr" "xbps-rindex(8) -a: update test"
-+}
-+
-+update_body() {
-+ mkdir -p some_repo pkg_A
-+ touch pkg_A/file00
-+ cd some_repo
-+ xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A
-+ atf_check_equal $? 0
-+ xbps-rindex -a *.xbps
-+ atf_check_equal $? 0
-+ xbps-create -A noarch -n foo-1.1_1 -s "foo pkg" ../pkg_A
-+ atf_check_equal $? 0
-+ xbps-rindex -a *.xbps
-+ atf_check_equal $? 0
-+ cd ..
-+ result="$(xbps-query --repository=some_repo -o \*)"
-+ expected="foo-1.1_1: /file00 (some_repo)"
-+ rv=0
-+ if [ "$result" != "$expected" ]; then
-+ rv=1
-+ fi
-+ atf_check_equal $rv 0
-+}
-+
-+atf_init_test_cases() {
-+ atf_add_test_case update
-+}
---
-1.8.4.1
-
diff --git a/srcpkgs/xbps/patches/0001-xbps-rindex-fix-25-sign-unnecessarily-regenerates-ar.patch b/srcpkgs/xbps/patches/0001-xbps-rindex-fix-25-sign-unnecessarily-regenerates-ar.patch
deleted file mode 100644
index 76ee8caf3e..0000000000
--- a/srcpkgs/xbps/patches/0001-xbps-rindex-fix-25-sign-unnecessarily-regenerates-ar.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e86f9def03b4330363ac0604e660ff4f0a980a39 Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Sat, 30 Nov 2013 08:04:37 +0100
-Subject: [PATCH] xbps-rindex: fix #25 (--sign unnecessarily regenerates
- <arch>-repodata).
-
----
- NEWS | 2 ++
- bin/xbps-rindex/sign.c | 9 +++++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/bin/xbps-rindex/sign.c b/bin/xbps-rindex/sign.c
-index 1f791e1..510b326 100644
---- bin/xbps-rindex/sign.c
-+++ bin/xbps-rindex/sign.c
-@@ -188,7 +188,16 @@ sign_repo(struct xbps_handle *xhp, const char *repodir,
- meta = xbps_dictionary_create();
- xbps_dictionary_set_cstring_nocopy(meta, "signature-by", signedby);
- xbps_dictionary_set_cstring_nocopy(meta, "signature-type", "rsa");
-+ /*
-+ * If the signature in repo has not changed do not generate the
-+ * repodata file again.
-+ */
- data = xbps_data_create_data_nocopy(sig, siglen);
-+ if (xbps_data_equals_data(data, sig, siglen)) {
-+ fprintf(stderr, "Not signing again, matched signature found.\n");
-+ rv = 0;
-+ goto out;
-+ }
- xbps_dictionary_set(meta, "signature", data);
-
- buf = pubkey_from_privkey(rsa);
---
-1.8.4.1
-
diff --git a/srcpkgs/xbps/patches/0002-Fix-25-correctly-compare-against-repo-signature.patch b/srcpkgs/xbps/patches/0002-Fix-25-correctly-compare-against-repo-signature.patch
deleted file mode 100644
index 3b6506b02b..0000000000
--- a/srcpkgs/xbps/patches/0002-Fix-25-correctly-compare-against-repo-signature.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From d98468515a2f96c3a6c5bd824aada6817912a2ea Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Sat, 30 Nov 2013 08:30:25 +0100
-Subject: [PATCH] Fix #25 correctly: compare against repo->signature.
-
----
- bin/xbps-rindex/sign.c | 18 +++++++++---------
- lib/repo.c | 3 ---
- 2 files changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/bin/xbps-rindex/sign.c b/bin/xbps-rindex/sign.c
-index 510b326..6e67838 100644
---- bin/xbps-rindex/sign.c
-+++ bin/xbps-rindex/sign.c
-@@ -149,7 +149,7 @@ sign_repo(struct xbps_handle *xhp, const char *repodir,
- repo = xbps_repo_open(xhp, repodir);
- if (repo == NULL) {
- fprintf(stderr, "cannot read repository data: %s\n", strerror(errno));
-- goto out;
-+ return -1;
- }
- if (xbps_dictionary_count(repo->idx) == 0) {
- fprintf(stderr, "invalid number of objects in repository index!\n");
-@@ -183,21 +183,21 @@ sign_repo(struct xbps_handle *xhp, const char *repodir,
- goto out;
- }
- /*
-- * Prepare the XBPS_REPOIDX_META for our repository data.
-- */
-- meta = xbps_dictionary_create();
-- xbps_dictionary_set_cstring_nocopy(meta, "signature-by", signedby);
-- xbps_dictionary_set_cstring_nocopy(meta, "signature-type", "rsa");
-- /*
- * If the signature in repo has not changed do not generate the
- * repodata file again.
- */
-- data = xbps_data_create_data_nocopy(sig, siglen);
-- if (xbps_data_equals_data(data, sig, siglen)) {
-+ if (xbps_data_equals_data(repo->signature, sig, siglen)) {
- fprintf(stderr, "Not signing again, matched signature found.\n");
- rv = 0;
- goto out;
- }
-+ /*
-+ * Prepare the XBPS_REPOIDX_META for our repository data.
-+ */
-+ meta = xbps_dictionary_create();
-+ xbps_dictionary_set_cstring_nocopy(meta, "signature-by", signedby);
-+ xbps_dictionary_set_cstring_nocopy(meta, "signature-type", "rsa");
-+ data = xbps_data_create_data_nocopy(sig, siglen);
- xbps_dictionary_set(meta, "signature", data);
-
- buf = pubkey_from_privkey(rsa);
-diff --git a/lib/repo.c b/lib/repo.c
-index 6e9f237..34bdfa7 100644
---- lib/repo.c
-+++ lib/repo.c
-@@ -156,9 +156,6 @@ xbps_repo_open(struct xbps_handle *xhp, const char *url)
- repo = NULL;
- goto out;
- }
-- if (!is_remote)
-- goto out;
--
- if ((meta = repo_get_dict(repo, XBPS_REPOIDX_META))) {
- repo->is_signed = true;
- repo->signature = xbps_dictionary_get(meta, "signature");
---
-1.8.4.1
-
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index adf4298abe..cfceb569f6 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,11 +1,16 @@
# Template file for 'xbps'
pkgname=xbps
-version=0.27
-revision=4
+version=0.31
+revision=1
+#patch_args="-Np1"
bootstrap=yes
+conf_files="/etc/xbps/xbps.conf"
+replaces="xbps>=0"
build_style=configure
+configure_script="env HAVE_VASPRINTF=1 ./configure"
configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug"
makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel"
+depends="xbps-triggers"
short_desc="The XBPS package system utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.voidlinux.eu/xbps"
@@ -19,13 +24,13 @@ else
makedepends+=" atf-devel"
configure_args+=" --enable-tests"
-xbps-tests_package() {
- short_desc+=" - Kyua testsuite"
- replaces="xbps<0.16.3_2 xbps-tests>=0"
- pkg_install() {
- vmove usr/tests
+ xbps-tests_package() {
+ short_desc+=" - Kyua testsuite"
+ replaces="xbps<0.16.3_2 xbps-tests>=0"
+ pkg_install() {
+ vmove usr/tests
+ }
}
-}
fi
@@ -61,12 +66,3 @@ xbps-static_package() {
vmove "usr/sbin/*.static"
}
}
-
-xbps_package() {
- depends="xbps-triggers"
- conf_files="/etc/xbps/xbps.conf"
- replaces="xbps>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xcalib/template b/srcpkgs/xcalib/template
index 8790bdd38d..994f04d6ad 100644
--- a/srcpkgs/xcalib/template
+++ b/srcpkgs/xcalib/template
@@ -17,9 +17,3 @@ do_install() {
vinstall "$file" 644 usr/share/xcalib
done
}
-
-xcalib_package() {
- pkg_install() {
- vmove all
- }
-}
\ No newline at end of file
diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template
index 2fc81660b6..1cc003c647 100644
--- a/srcpkgs/xcb-proto/template
+++ b/srcpkgs/xcb-proto/template
@@ -5,18 +5,12 @@ revision=1
build_style=gnu-configure
hostmakedepends="python"
makedepends="libxml2"
+depends="python"
+noarch="yes"
+pycompile_module="xcbgen"
short_desc="XML-XCB (X C Bindings) protocol descriptions"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xcb.freedesktop.org"
license="MIT"
distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
checksum=7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05
-
-xcb-proto_package() {
- depends="python"
- noarch="yes"
- pycompile_module="xcbgen"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xcb-util-cursor/template b/srcpkgs/xcb-util-cursor/template
index 0ad73ee571..ad5068c04f 100644
--- a/srcpkgs/xcb-util-cursor/template
+++ b/srcpkgs/xcb-util-cursor/template
@@ -22,9 +22,3 @@ xcb-util-cursor-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-xcb-util-cursor_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xcb-util-image/template b/srcpkgs/xcb-util-image/template
index 3158c41fae..634bddb4c2 100644
--- a/srcpkgs/xcb-util-image/template
+++ b/srcpkgs/xcb-util-image/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
+replaces="xcb-util<0.3.9"
short_desc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xcb.freedesktop.org"
@@ -17,16 +18,9 @@ long_desc="
xcb-util-image-devel_package() {
depends="libxcb-devel xcb-util-image>=${version}"
- short_desc="${sourcepkg} -- development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-xcb-util-image_package() {
- replaces="xcb-util<0.3.9"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xcb-util-keysyms/template b/srcpkgs/xcb-util-keysyms/template
index c57046c53d..306cc9ac4e 100644
--- a/srcpkgs/xcb-util-keysyms/template
+++ b/srcpkgs/xcb-util-keysyms/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
+replaces="xcb-util<0.3.9"
short_desc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xcb.freedesktop.org"
@@ -18,16 +19,9 @@ long_desc="
xcb-util-keysyms-devel_package() {
depends="libxcb-devel xcb-util-keysyms>=${version}"
- short_desc="${sourcepkg} -- development files"
+ short_desco+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
}
}
-
-xcb-util-keysyms_package() {
- replaces="xcb-util<0.3.9"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xcb-util-renderutil/template b/srcpkgs/xcb-util-renderutil/template
index c71eaa1977..438eb1e66a 100644
--- a/srcpkgs/xcb-util-renderutil/template
+++ b/srcpkgs/xcb-util-renderutil/template
@@ -22,9 +22,3 @@ xcb-util-renderutil-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-xcb-util-renderutil_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xcb-util-wm/template b/srcpkgs/xcb-util-wm/template
index dd0218f830..6852cdc79e 100644
--- a/srcpkgs/xcb-util-wm/template
+++ b/srcpkgs/xcb-util-wm/template
@@ -1,32 +1,25 @@
# Template build for 'xcb-util-wm'.
pkgname=xcb-util-wm
-version=0.3.9
-revision=2
+version=0.4.0
+revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
+replaces="xcb-util<0.3.9"
short_desc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xcb.freedesktop.org"
license="GPL-2"
distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
-checksum=038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030
-long_desc="
- This package provides client and window-manager helpers for ICCCM for XCB."
+checksum=66f97c18f7d98d3c873fe5db5842d2fca34519274c31ee668551ab8995a2f51f
xcb-util-wm-devel_package() {
- depends="libxcb-devel xcb-util-wm>=${version}"
- short_desc="${sourcepkg} -- development files"
+ depends="libxcb-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- }
-}
-
-xcb-util-wm_package() {
- replaces="xcb-util<0.3.9"
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index 9ff00b71b4..8ffa6b8f51 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -28,9 +28,3 @@ xcb-util-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-xcb-util_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xclip/template b/srcpkgs/xclip/template
index 79fbd8a620..daef775f5c 100644
--- a/srcpkgs/xclip/template
+++ b/srcpkgs/xclip/template
@@ -10,9 +10,3 @@ maintainer="Steven R <strob AT styez DOT com>"
homepage="http://sourceforge.net/projects/xclip/"
license="GPLv2"
short_desc="Command line interface to the X11 clipboard"
-
-xclip_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xcmiscproto/template b/srcpkgs/xcmiscproto/template
index eb9f715f64..9509750fde 100644
--- a/srcpkgs/xcmiscproto/template
+++ b/srcpkgs/xcmiscproto/template
@@ -2,6 +2,7 @@
pkgname=xcmiscproto
version=1.2.0
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="XCMisc extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,12 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e
-long_desc="
- This provides the XCMisc extension headers from modular X.org project."
-
-xcmiscproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xcmsdb/template b/srcpkgs/xcmsdb/template
index 5306cba82a..d4deb19a05 100644
--- a/srcpkgs/xcmsdb/template
+++ b/srcpkgs/xcmsdb/template
@@ -15,9 +15,3 @@ long_desc="
$pkgname is used to load, query, or remove Device Color Characterization
data stored in properties on the root window of the screen as specified
in section 7, Device Color Characterization, of the ICCCM."
-
-xcmsdb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xcursorgen/template b/srcpkgs/xcursorgen/template
index 793aecc795..153544721c 100644
--- a/srcpkgs/xcursorgen/template
+++ b/srcpkgs/xcursorgen/template
@@ -11,11 +11,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=de2adb2f44ffee906024e53322aeb728d46061e6ca8e6f5a7e0da2c00d6f5f1d
-long_desc="
- $pkgname creates an X cursor file from a collection of PNG images."
-
-xcursorgen_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xdelta3/template b/srcpkgs/xdelta3/template
index 6851d21cda..3a400ad5a4 100644
--- a/srcpkgs/xdelta3/template
+++ b/srcpkgs/xdelta3/template
@@ -14,9 +14,3 @@ long_desc="
Xdelta is a tool and library for differential compression. Xdelta release
version 3 supports VCDIFF encoding and decoding. Supports compressing 64 bit
files on Windows, Linux, etc."
-
-xdelta3_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index b834a09d84..4b3d8818e0 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -5,16 +5,10 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+3-devel xdg-user-dirs"
+depends="xdg-user-dirs"
short_desc="GTK+ tool to help manage user directories"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.xz"
checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
-
-xdg-user-dirs-gtk_package() {
- depends="xdg-user-dirs"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xdg-user-dirs/template b/srcpkgs/xdg-user-dirs/template
index bef7c04f50..5392d34ae7 100644
--- a/srcpkgs/xdg-user-dirs/template
+++ b/srcpkgs/xdg-user-dirs/template
@@ -4,6 +4,9 @@ version=0.15
revision=1
build_style=gnu-configure
hostmakedepends="libxslt docbook-xsl"
+conf_files="
+ /etc/xdg/user-dirs.conf
+ /etc/xdg/user-dirs.defaults"
short_desc="Tool to help manage user directories"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -14,12 +17,3 @@ long_desc="
$pkgname is a tool to help manage well known user directories like
the desktop folder and the music folder. It also handles localization
(i.e. translation) of the filenames."
-
-xdg-user-dirs_package() {
- conf_files="
- /etc/xdg/user-dirs.conf
- /etc/xdg/user-dirs.defaults"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template
index c5bfc2f24f..8652eb5f47 100644
--- a/srcpkgs/xdg-utils/template
+++ b/srcpkgs/xdg-utils/template
@@ -2,6 +2,7 @@
pkgname=xdg-utils
version=1.0.2
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="Tools to assist applications with various desktop integration tasks"
homepage="http://portland.freedesktop.org/"
@@ -9,34 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="http://portland.freedesktop.org/download/$pkgname-$version.tgz"
checksum=21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
-long_desc="
- The xdg-utils package is a set of simple scripts that provide basic
- desktop integration functions for any Free Desktop, such as Linux.
-
- They are intended to provide a set of defacto standards. This means that:
-
- * Third party software developers can rely on these xdg-utils for
- all of their simple integration needs.
-
- * Developers of desktop environments can make sure that their
- environments are well supported.
-
- If a desktop developer wants to be certain that their environment
- functions with all third party software, then can simply make sure
- that these utilities work properly in their environment. This will
- hopefully mean that 'third tier' window managers such as XFCE and
- Blackbox can reach full parity with Gnome and KDE in terms of third
- party ISV support.
-
- * Distribution vendors can provide custom versions of these utilities
-
- If a distribution vendor wishes to have unusual systems, they can
- provide custom scripts, and the third party software should still
- continue to work."
-
-xdg-utils_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xdot/template b/srcpkgs/xdot/template
index d1fa3933da..0f242dc2a9 100644
--- a/srcpkgs/xdot/template
+++ b/srcpkgs/xdot/template
@@ -4,23 +4,16 @@ version=20130128
revision=1
build_style=python-module
makedepends="graphviz pygtk python-distribute xbps-triggers>=0.46"
+depends="${makedepends}"
+noarch="yes"
+pycompile_module="xdot.py"
short_desc="Interactive viewer for Graphviz dot files"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="https://code.google.com/p/jrfonseca/wiki/XDot"
-
do_fetch() {
local url="https://code.google.com/p/jrfonseca.xdot"
msg_normal "Fetching source from $url ...\n"
git clone ${url} xdot-${version}
}
-
-xdot_package() {
- depends="${makedepends}"
- noarch="yes"
- pycompile_module="xdot.py"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template
index a328230aac..08b9abbcd8 100644
--- a/srcpkgs/xdpyinfo/template
+++ b/srcpkgs/xdpyinfo/template
@@ -13,11 +13,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce
-long_desc="
- This package provides xdpyinfo, a display information utility for X."
-
-xdpyinfo_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xdriinfo/template b/srcpkgs/xdriinfo/template
index 8cf8b731d3..a3cb8e53f7 100644
--- a/srcpkgs/xdriinfo/template
+++ b/srcpkgs/xdriinfo/template
@@ -15,9 +15,3 @@ long_desc="
The xdriinfo utility prints an XML description of a DRI driver. The driver
can be specified directly by driver name or indirectly by screen number.
No X connection is needed if the driver name is explicitly specified."
-
-xdriinfo_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index fd14da15f0..9aa6e52ca9 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -25,6 +25,24 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
fi
+depends="iproute2 bridge-utils xen-hypervisor"
+
+make_dirs="
+ /var/lib/xenstored 755 root root
+ /var/lib/xen/xenpaging 755 root root
+ /var/xen/dump 755 root root
+ /etc/xen/auto 755 root root"
+conf_files="
+ /etc/default/xendomains
+ /etc/default/xencommons
+ /etc/xen/xl.conf"
+nostrip_files="
+ openbios-ppc
+ openbios-sparc32
+ openbios-sparc64
+ palcode-clipper"
+pycompile_module="xen grub"
+
do_configure() {
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
./configure ${configure_args}
@@ -125,25 +143,3 @@ xen-libs_package() {
vmove "usr/lib/*.so.*"
}
}
-
-xen_package() {
- make_dirs="
- /var/lib/xenstored 755 root root
- /var/lib/xen/xenpaging 755 root root
- /var/xen/dump 755 root root
- /etc/xen/auto 755 root root"
- conf_files="
- /etc/default/xendomains
- /etc/default/xencommons
- /etc/xen/xl.conf"
- nostrip_files="
- openbios-ppc
- openbios-sparc32
- openbios-sparc64
- palcode-clipper"
- pycompile_module="xen grub"
- depends="iproute2 bridge-utils xen-hypervisor"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xen4.2/template b/srcpkgs/xen4.2/template
index 48f9f58896..b9343db312 100644
--- a/srcpkgs/xen4.2/template
+++ b/srcpkgs/xen4.2/template
@@ -26,6 +26,26 @@ if [ "${XBPS_MACHINE}" = "x86_64" ]; then
makedepends+=" gcc-multilib"
fi
+depends="iproute2 bridge-utils xen-hypervisor"
+
+make_dirs="
+ /var/lib/xenstored 755 root root
+ /var/lib/xen/xenpaging 755 root root
+ /var/xen/dump 755 root root
+ /etc/xen/auto 755 root root"
+conf_files="
+ /etc/default/xendomains
+ /etc/default/xencommons
+ /etc/xen/xl.conf"
+nostrip_files="
+ openbios-ppc
+ openbios-sparc32
+ openbios-sparc64
+ palcode-clipper"
+pycompile_module="xen grub"
+provides="xen-${version}_${revision}"
+replaces="xen>=0"
+
do_configure() {
unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS
./configure ${configure_args}
@@ -124,27 +144,3 @@ xen4.2-libs_package() {
vmove "usr/lib/*.so.*"
}
}
-
-xen4.2_package() {
- make_dirs="
- /var/lib/xenstored 755 root root
- /var/lib/xen/xenpaging 755 root root
- /var/xen/dump 755 root root
- /etc/xen/auto 755 root root"
- conf_files="
- /etc/default/xendomains
- /etc/default/xencommons
- /etc/xen/xl.conf"
- nostrip_files="
- openbios-ppc
- openbios-sparc32
- openbios-sparc64
- palcode-clipper"
- pycompile_module="xen grub"
- depends="iproute2 bridge-utils xen-hypervisor"
- provides="xen-${version}_${revision}"
- replaces="xen>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xev/template b/srcpkgs/xev/template
index 3ae8592339..853fc6543b 100644
--- a/srcpkgs/xev/template
+++ b/srcpkgs/xev/template
@@ -16,9 +16,3 @@ long_desc="
to an existing window) and then asks the X server to send it events
whenever anything happens to the window (such as it being moved,
resized, typed in, clicked in, etc cetera)."
-
-xev_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xextproto/template b/srcpkgs/xextproto/template
index 1d319ce79b..88f6ca6251 100644
--- a/srcpkgs/xextproto/template
+++ b/srcpkgs/xextproto/template
@@ -2,6 +2,7 @@
pkgname=xextproto
version=7.3.0
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="xmlto"
short_desc="XExt extension headers from X.org"
@@ -10,10 +11,3 @@ homepage="http://xorg.freedesktop.org"
license="MIT"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0
-
-xextproto_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template
index 429caaf528..0ac0d3aaa4 100644
--- a/srcpkgs/xf86-input-evdev/template
+++ b/srcpkgs/xf86-input-evdev/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.15<1.16 mtdev-devel"
+depends="xserver-abi-input-20_1"
short_desc="Xorg event device input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@@ -20,10 +21,3 @@ xf86-input-evdev-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-xf86-input-evdev_package() {
- depends="xserver-abi-input-20_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template
index 13ac5ba960..d6b6bc4895 100644
--- a/srcpkgs/xf86-input-joystick/template
+++ b/srcpkgs/xf86-input-joystick/template
@@ -5,6 +5,7 @@ revision=4
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-input-20_1"
short_desc="Joystick Input driver for Xorg"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@@ -23,10 +24,3 @@ xf86-input-joystick-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-xf86-input-joystick_package() {
- depends="xserver-abi-input-20_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template
index 8df8328cc8..73b7309eb9 100644
--- a/srcpkgs/xf86-input-synaptics/template
+++ b/srcpkgs/xf86-input-synaptics/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libX11-devel libXtst-devel mtdev-devel
pixman-devel libpciaccess-devel xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-input-20_1"
short_desc="Xorg synaptics touchpad input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.x.org/"
@@ -20,10 +21,3 @@ xf86-input-synaptics-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-xf86-input-synaptics_package() {
- depends="xserver-abi-input-20_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template
index 7e905ddb4c..8d77b46097 100644
--- a/srcpkgs/xf86-input-vmmouse/template
+++ b/srcpkgs/xf86-input-vmmouse/template
@@ -5,6 +5,7 @@ revision=3
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-input-20_1"
short_desc="Xorg VMware virtual mouse input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@@ -16,10 +17,3 @@ post_install() {
# Remove HAL stuff, it's obsolete.
rm -rf ${DESTDIR}/usr/{lib,share}/hal
}
-
-xf86-input-vmmouse_package() {
- depends="xserver-abi-input-20_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template
index faa573902f..091611774f 100644
--- a/srcpkgs/xf86-input-wacom/template
+++ b/srcpkgs/xf86-input-wacom/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--with-xorg-conf-dir=/etc/X11/xorg.conf.d"
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.15<1.16 libXrandr-devel libXinerama-devel libXi-devel"
+depends="xserver-abi-input-20_1"
short_desc="Xorg Wacom tablet input driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@@ -24,10 +25,3 @@ xf86-input-wacom-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-xf86-input-wacom_package() {
- depends="xserver-abi-input-20_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template
index 5157a5e22f..edff69617e 100644
--- a/srcpkgs/xf86-video-ati/template
+++ b/srcpkgs/xf86-video-ati/template
@@ -1,24 +1,19 @@
# Template build file for 'xf86-video-ati'.
pkgname=xf86-video-ati
-version=7.2.0
-revision=3
+version=7.3.0
+revision=2
+only_for_archs="i686 x86_64"
build_style=gnu-configure
configure_args="--enable-glamor"
hostmakedepends="pkg-config"
makedepends="xf86driproto libudev-devel>=183 libpciaccess-devel
libdrm-devel pixman-devel MesaLib-devel>=9.0.2 glamor-egl-devel
xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1 mesa-ati-dri"
+replaces="xf86-video-ati>=0"
short_desc="Xorg ATI Radeon video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
license="MIT"
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
-checksum=f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4
-
-xf86-video-ati_package() {
- replaces="xf86-video-ati>=0"
- depends="xserver-abi-video-15_1 mesa-ati-dri"
- pkg_install() {
- vmove all
- }
-}
+checksum=107c072c4919a996e04f47afdb53d5946a3ad574f270b8c560ef8b3a032046fe
diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template
index c83a429d91..9b522bd921 100644
--- a/srcpkgs/xf86-video-cirrus/template
+++ b/srcpkgs/xf86-video-cirrus/template
@@ -5,16 +5,10 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1"
short_desc="Xorg Cirrus Logic video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7
-
-xf86-video-cirrus_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template
index 3fee7cbc2a..f331fc124d 100644
--- a/srcpkgs/xf86-video-fbdev/template
+++ b/srcpkgs/xf86-video-fbdev/template
@@ -5,6 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1"
short_desc="Xorg framebuffer video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
@@ -15,10 +16,3 @@ checksum=9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b
if [ "$CROSS_BUILD" ]; then
CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg"
fi
-
-xf86-video-fbdev_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-fbturbo-git/template b/srcpkgs/xf86-video-fbturbo-git/template
deleted file mode 100644
index 126d621283..0000000000
--- a/srcpkgs/xf86-video-fbturbo-git/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template build file for 'xf86-video-fbturbo-git'.
-pkgname=xf86-video-fbturbo-git
-version=20131218
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config xorg-util-macros xorg-server-devel>=1.15<1.16"
-makedepends="libXrandr-devel xorg-server-devel>=1.15<1.16"
-short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices"
-homepage="http://github.com/ssvb/xf86-video-fbturbo"
-license="MIT, GPL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-
-only_for_archs="armv6l"
-
-do_fetch() {
- git clone git://github.com/ssvb/xf86-video-fbturbo ${pkgname}-${version}
-}
-
-pre_configure() {
- cp /usr/include/xorg/dri2.h src
- autoreconf -fi
-}
-
-xf86-video-fbturbo-git_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-fbturbo/template b/srcpkgs/xf86-video-fbturbo/template
new file mode 100644
index 0000000000..7dcc696f35
--- /dev/null
+++ b/srcpkgs/xf86-video-fbturbo/template
@@ -0,0 +1,30 @@
+# Template build file for 'xf86-video-fbturbo'.
+pkgname=xf86-video-fbturbo
+version=0.4.0
+revision=3
+build_style=gnu-configure
+short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices"
+homepage="http://github.com/ssvb/xf86-video-fbturbo"
+license="MIT, GPL"
+maintainer="Juan RP <xtraeme@gmail.com>"
+create_srcdir=yes
+distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz"
+checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f
+
+only_for_archs="armv6l armv7l"
+hostmakedepends="pkg-config xorg-server-devel>=1.14"
+makedepends="libXrandr-devel xorg-server-devel>=1.14"
+depends="xserver-abi-video-14_1"
+replaces="xf86-video-fbturbo>=0"
+
+if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+ makedepends+=" sunxi-mali-devel>=20140127_2"
+fi
+
+pre_configure() {
+ cp /usr/include/xorg/dri2.h src
+}
+
+post_install() {
+ vinstall xorg.conf 644 etc/X11/xorg.conf.d 99-fbturbo.conf
+}
diff --git a/srcpkgs/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template
index d2f7dda08e..82fa19cfb6 100644
--- a/srcpkgs/xf86-video-geode/template
+++ b/srcpkgs/xf86-video-geode/template
@@ -3,20 +3,13 @@ pkgname=xf86-video-geode
version=2.11.14
revision=4
build_style=gnu-configure
+# This is x86 specific.
+only_for_archs=i686
+makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1"
short_desc="Xorg AMD Geode GX/LX video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
homepage="http://xorg.freedesktop.org/"
license="MIT"
checksum=4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc
-
-# This is x86 specific.
-only_for_archs=i686
-makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.15<1.16"
-
-xf86-video-geode_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index 0c682a5e5d..839d1ce5db 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -7,6 +7,8 @@ configure_args="--with-default-accel=sna --enable-kms-only --enable-sna"
makedepends="pkg-config dri2proto>=2.6 libudev-devel>=183 libdrm-devel
libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel
xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video>=15_1 mesa-intel-dri"
+only_for_archs="i686 x86_64"
short_desc="Xorg DDX Intel video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@@ -14,15 +16,6 @@ license="MIT"
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
checksum=2d9343ce0257f82612ab6cb4a18ebfdcb2bc76a226d8442b2f7f210cc4f63cd6
-only_for_archs="i686 x86_64"
-
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-xf86-video-intel_package() {
- depends="xserver-abi-video>=15_1 mesa-intel-dri"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-modesetting/template b/srcpkgs/xf86-video-modesetting/template
index ff8bd83867..589ad12134 100644
--- a/srcpkgs/xf86-video-modesetting/template
+++ b/srcpkgs/xf86-video-modesetting/template
@@ -5,16 +5,10 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1"
short_desc="X.org generic modesetting video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
license="MIT"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca
-
-xf86-video-modesetting_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index dfc03b350f..da14c84bf7 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -5,16 +5,10 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1 mesa-nouveau-dri"
short_desc="Xorg opensource NVIDIA video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://nouveau.freedesktop.org/wiki/"
license="GPL-2"
distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${version}.tar.bz2"
checksum=c1bab3160bae96d485fc93a048d19775398aa85b407bac53020675f7e995db9d
-
-xf86-video-nouveau_package() {
- depends="xserver-abi-video-15_1 mesa-nouveau-dri"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template
index 1e882c2340..6c2d2331b3 100644
--- a/srcpkgs/xf86-video-openchrome/template
+++ b/srcpkgs/xf86-video-openchrome/template
@@ -7,16 +7,10 @@ build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel
MesaLib-devel xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1"
short_desc="Xorg VIA Unichromes video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=eb459a86e20fa090577315a0d9964bf3f94abc5241c5408453f326eaf8915ce7
-
-xf86-video-openchrome_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template
index 8db23c75b1..ce81bc1977 100644
--- a/srcpkgs/xf86-video-sisusb/template
+++ b/srcpkgs/xf86-video-sisusb/template
@@ -5,6 +5,7 @@ revision=4
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1"
short_desc="Xorg SiS USB video driver"
homepage="http://xorg.freedesktop.org/"
license="Custom"
@@ -15,10 +16,3 @@ checksum=73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046
long_desc="
This is the video driver for SiS (Silicon Integrated Systems) video chips
that are connected via a Net2280-based USB dongle for the Xorg X11 server."
-
-xf86-video-sisusb_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template
index a4d8a592e0..ba9763b123 100644
--- a/srcpkgs/xf86-video-vesa/template
+++ b/srcpkgs/xf86-video-vesa/template
@@ -6,6 +6,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1"
short_desc="Xorg VESA video driver"
homepage="http://xorg.freedesktop.org"
license="MIT"
@@ -16,10 +17,3 @@ checksum=ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8
if [ "$CROSS_BUILD" ]; then
CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg"
fi
-
-xf86-video-vesa_package() {
- depends="xserver-abi-video-15_1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template
index 0588f40c8e..216dcdb4f5 100644
--- a/srcpkgs/xf86-video-vmware/template
+++ b/srcpkgs/xf86-video-vmware/template
@@ -8,6 +8,7 @@ build_style=gnu-configure
configure_args="--enable-vmwarectrl-client"
hostmakedepends="automake libtool pkg-config xorg-util-macros"
makedepends="libdrm-devel MesaLib-devel>=10.0.0_2 xorg-server-devel>=1.15<1.16"
+depends="xserver-abi-video-15_1 mesa-vmwgfx-dri"
short_desc="Modular Xorg VMware virtual video driver"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@@ -18,10 +19,3 @@ checksum=802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
pre_configure() {
autoreconf -fi
}
-
-xf86-video-vmware_package() {
- depends="xserver-abi-video-15_1 mesa-vmwgfx-dri"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xf86bigfontproto/template b/srcpkgs/xf86bigfontproto/template
index 0647dfb597..b48262f41c 100644
--- a/srcpkgs/xf86bigfontproto/template
+++ b/srcpkgs/xf86bigfontproto/template
@@ -2,6 +2,7 @@
pkgname=xf86bigfontproto
version=1.2.0
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="XF86BigFont extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,12 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648
-long_desc="
- This provides the XF86BigFont extension headers from modular X.org X11 project."
-
-xf86bigfontproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xf86dgaproto/template b/srcpkgs/xf86dgaproto/template
index 4110639540..f316b86f7c 100644
--- a/srcpkgs/xf86dgaproto/template
+++ b/srcpkgs/xf86dgaproto/template
@@ -2,6 +2,7 @@
pkgname=xf86dgaproto
version=2.1
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="XF86DGA extension headers"
homepage="http://xorg.freedesktop.org"
@@ -9,12 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050
-long_desc="
- This package provides the XF86DGA extension headers from modular X.org."
-
-xf86dgaproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xf86driproto/template b/srcpkgs/xf86driproto/template
index e38e83db88..7b38480189 100644
--- a/srcpkgs/xf86driproto/template
+++ b/srcpkgs/xf86driproto/template
@@ -2,6 +2,7 @@
pkgname=xf86driproto
version=2.1.1
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="XF86DRI extension headers from modular X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,21 +10,3 @@ homepage="${XORG_HOME}"
license="MIT"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f
-long_desc="
- This provides the XF86DRI extension headers from modular X.org X11
- project.
-
- The headers contain the types and functions that define the interface
- between a DRI (direct rendering infrastructure) driver and driver
- loader."
-
-post_install() {
- vinstall COPYING 644 usr/share/licenses/${pkgname}
-}
-
-xf86driproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xf86miscproto/template b/srcpkgs/xf86miscproto/template
index 02e5d1d750..cfa8621fc9 100644
--- a/srcpkgs/xf86miscproto/template
+++ b/srcpkgs/xf86miscproto/template
@@ -2,6 +2,7 @@
pkgname=xf86miscproto
version=0.9.2
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="XF86Misc extension headers from modular X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,13 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6
-long_desc="
- This provides the XF86Misc extension headers from modular X.org X11
- project."
-
-xf86miscproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xf86vidmodeproto/template b/srcpkgs/xf86vidmodeproto/template
index 5bc437a880..808fbbfe21 100644
--- a/srcpkgs/xf86vidmodeproto/template
+++ b/srcpkgs/xf86vidmodeproto/template
@@ -2,6 +2,7 @@
pkgname=xf86vidmodeproto
version=2.3
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="XF86VidMode extension headers from modular X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,13 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
-long_desc="
- This provides the XF86VidMode extension headers from modular X.org X11
- project."
-
-xf86vidmodeproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 4f6716d669..ecab164abb 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -7,6 +7,7 @@ configure_args="--enable-gstreamer --enable-dbus --disable-hal"
depends="desktop-file-utils hicolor-icon-theme"
makedepends="intltool pkg-config libburn-devel libisofs-devel gtk+-devel
libxfcegui4-devel>=4.10.0_2 exo-devel gst-plugins-base-devel"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="CD-burner application for Xfce Desktop Environment"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://goodies.xfce.org/projects/applications/xfburn"
@@ -23,10 +24,3 @@ long_desc="
pre_configure() {
sed -i '1 i#include <glib-object.h>' xfburn/xfburn-settings.h
}
-
-xfburn_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfce-utils/template b/srcpkgs/xfce-utils/template
index 595a566c3b..d6ab002a72 100644
--- a/srcpkgs/xfce-utils/template
+++ b/srcpkgs/xfce-utils/template
@@ -7,18 +7,10 @@ hostmakedepends="pkg-config intltool"
makedepends="libxfce4ui-devel libxfce4util-devel gtk+-devel dbus-glib-devel"
# xfconf-perl is required by the xfconf-migration script.
makedepends+=" xfconf-perl hicolor-icon-theme desktop-file-utils"
+depends="xfconf-perl hicolor-icon-theme desktop-file-utils"
short_desc="Utilities for the Xfce Desktop Environment"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.xfce.org/"
license="GPL-2"
distfiles="http://archive.se.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$version.tar.bz2"
checksum=a12b708b0cd19ffa07afb2ab2cd1bf9377ff7fbbfbe16d7493a5bb973bcb0aa5
-long_desc="
- This package includes utilities for the Xfce Desktop Environment."
-
-xfce-utils_package() {
- depends="xfconf-perl hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index c90f1d8245..73d74df7d8 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -6,18 +6,10 @@ build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel garcon-devel libxfce4util-devel libxfce4ui-devel xfconf-devel
desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="Appfinder for the Xfce Desktop Environment"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://xfce.org"
distfiles="http://archive.se.xfce.org/src/xfce/xfce4-appfinder/4.10/$pkgname-$version.tar.bz2"
checksum=65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77
-long_desc="
- xfce-appfinder shows system wide installed applications."
-
-xfce4-appfinder_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index 2ccae3ac13..657d0439ce 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -2,20 +2,14 @@
pkgname=xfce4-dev-tools
version=4.10.0
revision=1
+noarch=yes
build_style=gnu-configure
hostmakedepends="automake libtool gtk-doc intltool pkg-config"
makedepends="libglib-devel"
+depends="${hostmakedepends}"
short_desc="Xfce developer tools"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://xfce.org"
distfiles="http://archive.se.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8
-
-xfce4-dev-tools_package() {
- depends="${hostmakedepends}"
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfce4-mixer/template b/srcpkgs/xfce4-mixer/template
index 8d8977d9cf..8ddda0c8c8 100644
--- a/srcpkgs/xfce4-mixer/template
+++ b/srcpkgs/xfce4-mixer/template
@@ -7,17 +7,9 @@ makedepends="pkg-config intltool gtk+-devel gstreamer-devel
gst-plugins-base-devel libxfce4util-devel libxfce4ui-devel
xfconf-devel xfce4-panel-devel libunique1-devel"
short_desc="Sound mixer for the Xfce Desktop Environment"
+depends="desktop-file-utils hicolor-icon-theme"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.xfce.org/"
license="GPL-2"
distfiles="http://archive.se.xfce.org/src/apps/$pkgname/4.10/$pkgname-$version.tar.bz2"
checksum=a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade
-long_desc="
- This package includes a sound mixer for the XFce Desktop Environment."
-
-xfce4-mixer_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index be287e04f6..df9b17e229 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -5,6 +5,10 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="libnotify-devel libxfce4util-devel libxfce4ui-devel hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils"
+provides="notification-daemon-${version}"
+conflicts="notification-daemon>=0"
+replaces="notification-daemon>=0"
short_desc="Simple, visually-appealing notification daemon for Xfce"
homepage="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
license="GPL-2"
@@ -14,13 +18,3 @@ checksum=dd40f64c9db22b0b971e81e8e74a4ab6afe6d0bb819ab5d0badee89e13faa63b
long_desc="
Xfce4-notifyd is a simple, visually-appealing notification daemon for Xfce
that implements the Freedesktop.org Desktop Notifications Specification."
-
-xfce4-notifyd_package() {
- provides="notification-daemon-${version}"
- conflicts="notification-daemon>=0"
- replaces="notification-daemon>=0"
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 80cdcc9f28..f8ededdfb9 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -23,9 +23,3 @@ xfce4-panel-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-xfce4-panel_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index b398e29a94..73a3732303 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -9,18 +9,10 @@ hostmakedepends="pkg-config intltool"
makedepends="libxfce4ui-devel libxfce4util-devel xfconf-devel libnotify-devel
gtk+-devel libXrandr-devel dbus-glib-devel xfce4-panel-devel NetworkManager-devel"
makedepends+=" upower udisks hicolor-icon-theme desktop-file-utils"
+depends="upower udisks hicolor-icon-theme desktop-file-utils"
short_desc="Xfce power manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://xfce.org"
distfiles="http://archive.se.xfce.org/src/xfce/xfce4-power-manager/1.2/$pkgname-$version.tar.bz2"
checksum=d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9
-long_desc="
- $pkgname is the power manager for the Xfce desktop environment."
-
-xfce4-power-manager_package() {
- depends="upower udisks hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 5d5a979054..a48f555414 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -6,16 +6,10 @@ build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel libxfce4ui-devel xfce4-panel-devel exo-devel
libsoup-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
short_desc="Plugin that makes screenshots for the Xfce panel"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
license="GPL-2"
distfiles="http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$version.tar.bz2"
checksum=40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492
-
-xfce4-screenshooter_package() {
- depends="desktop-file-utils hicolor-icon-theme"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 5f3ef8e988..5c2a790bce 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
makedepends="libsensors-devel libxfce4ui-devel xfce4-panel-devel libnotify-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="XFCE sensors plugin"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
@@ -17,10 +18,3 @@ long_desc="
Linux and requires libsensors to display your mainboard sensors and fan
speeds. Furthermore, it supports hddtemp to surveil your hard disk’s
temperature values."
-
-xfce4-sensors-plugin_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 4875faba2c..162fd707ef 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -8,6 +8,8 @@ hostmakedepends="pkg-config intltool xfce4-dev-tools gettext-devel"
makedepends="libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel
libwnck2-devel xfce4-panel-devel systemd-devel polkit-devel desktop-file-utils
libgnome-keyring-devel libSM-devel iceauth upower udisks hicolor-icon-theme"
+depends="upower hicolor-icon-theme desktop-file-utils"
+conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
short_desc="The session manager for the XFCE desktop environment"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -28,11 +30,3 @@ xfce4-session-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-xfce4-session_package() {
- depends="upower hicolor-icon-theme desktop-file-utils"
- conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 812caaffc6..d1bf86df02 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -6,17 +6,11 @@ build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="dbus-glib-devel exo-devel vte-devel gtk+-devel libxfce4ui-devel
hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils"
+replaces="Terminal>=0"
short_desc="A modern terminal emulator primarly for the Xfce desktop environment"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.xfce.org"
license="GPL-2"
distfiles="http://archive.se.xfce.org/src/apps/${pkgname}/0.6/${pkgname}-${version}.tar.bz2"
checksum=912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08
-
-xfce4-terminal_package() {
- replaces="Terminal>=0"
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 4953c24cb3..1123289e87 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -5,6 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel libxfce4ui-devel xfce4-panel-devel libxml2-devel"
+depends="hicolor-icon-theme"
short_desc="XFCE panel plagin to show temperature and weather"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
@@ -14,10 +15,3 @@ checksum=a03a001065afdd8a167a44b96885d70013290b88d82e7deec45a2d294411077d
long_desc="
This panel plugin shows the current temperature and weather condition,
using weather data provided by xoap.weather.com."
-
-xfce4-weather-plugin_package() {
- depends="hicolor-icon-theme"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfce4/template b/srcpkgs/xfce4/template
index 4aa9cdbf9b..07c7efc11a 100644
--- a/srcpkgs/xfce4/template
+++ b/srcpkgs/xfce4/template
@@ -9,12 +9,9 @@ makedepends="xfce4-appfinder>=4.10.0 xfce4-mixer>=4.8.0_3 xfce4-panel>=4.10.0
Thunar>=1.4.0 thunar-volman>=0.8.0 exo>=0.8.0 orage>=4.8.3_1 ristretto>=0.6.0
gtk-xfce-engine>=3.0.0 notification-daemon>=0.2.2_1 tumbler>=0.1.25
xdg-user-dirs-gtk"
+depends="${makedepends}"
+noarch="yes"
short_desc="The XFCE desktop environment meta package"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1, BSD"
homepage="http://xfce.org"
-
-xfce4_package() {
- noarch="yes"
- depends="${makedepends}"
-}
diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index be0a44e997..4bb06586df 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -27,6 +27,12 @@ else
configure_args+=" --disable-perl-bindings"
fi
+if [ "$build_option_perl" ]; then
+ replaces="xfconf-perl>=0"
+ provides="xfconf-perl-${version}"
+ depends="perl-Glib>=1.242_1"
+fi
+
xfconf-devel_package() {
depends="dbus-glib-devel xfconf>=$version"
short_desc+=" - development files"
@@ -36,14 +42,3 @@ xfconf-devel_package() {
vmove usr/share/gtk-doc
}
}
-
-xfconf_package() {
- if [ "$build_option_perl" ]; then
- replaces="xfconf-perl>=0"
- provides="xfconf-perl-${version}"
- depends="perl-Glib>=1.242_1"
- fi
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfd/template b/srcpkgs/xfd/template
index 2c1cf57c28..dfb88d2489 100644
--- a/srcpkgs/xfd/template
+++ b/srcpkgs/xfd/template
@@ -12,14 +12,8 @@ maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759
long_desc="
- The xfd utility creates a window containing the name of the font being
+ The xfd utility creates a window containing the name of the font being
displayed, a row of command buttons, several lines of text for display-
ing character metrics, and a grid containing one glyph per cell.
The characters are shown in increasing order from left to right, top to
bottom."
-
-xfd_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index a88e5730fb..159a41b4c4 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -7,18 +7,10 @@ makedepends="pkg-config intltool"
makedepends="xfconf-devel libxfce4ui-devel exo-devel gtk+-devel
libxfce4util-devel libnotify-devel libwnck2-devel garcon-devel
Thunar-devel dbus-glib-devel"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Desktop manager for the XFce Desktop Environment"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://xfce.org"
distfiles="http://archive.se.xfce.org/src/xfce/xfdesktop/4.10/$pkgname-$version.tar.bz2"
checksum=897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b
-long_desc="
- This package includes a desktop manager for the XFce Desktop Environment."
-
-xfdesktop_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfe/template b/srcpkgs/xfe/template
index 11bad9e91f..2c39bb7267 100644
--- a/srcpkgs/xfe/template
+++ b/srcpkgs/xfe/template
@@ -5,16 +5,10 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="startup-notification-devel libpng-devel fox-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="The X File Explorer"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://roland65.free.fr/xfe/"
distfiles="${SOURCEFORGE_SITE}/xfe/xfe-${version}.tar.gz"
checksum=4dbb2e24b18a63d78afd0219232f05cd7401370750e2db5f8fa70a6fef022abd
-
-xfe_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xfontsel/template b/srcpkgs/xfontsel/template
index 7e68225590..579940e6b7 100644
--- a/srcpkgs/xfontsel/template
+++ b/srcpkgs/xfontsel/template
@@ -11,12 +11,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=170d8550b96fb47b04db6181b947e6f6b8b97f4df5d691c351a278480cc931bf
-long_desc="
- This package provides xfontsel, a program to query and display
- X11 fonts."
-
-xfontsel_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index a78bda621c..076efa9428 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -1,8 +1,9 @@
# Template file for 'xfsprogs'
pkgname=xfsprogs
version=3.1.11
-revision=1
+revision=2
makedepends="libuuid-devel libblkid-devel readline-devel"
+replaces="xfsprogs-libs>=0"
short_desc="Utilities for managing the XFS filesystem"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -12,7 +13,7 @@ checksum=adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be
do_configure() {
export DEBUG=-DNDEBUG
- configure_args+=" --enable-readline=yes --enable-blkid=yes --enable-lib64=no "
+ configure_args+=" --bindir=/usr/bin --sbindir=/usr/bin --enable-readline=yes --enable-blkid=yes --enable-lib64=no "
./configure ${configure_args}
}
@@ -28,22 +29,16 @@ do_install() {
rm -f ${DESTDIR}/lib/*.{a,la}
rm -f ${DESTDIR}/usr/lib/*.{a,so}
# Move stuff to /usr.
- mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
+ mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib
}
xfsprogs-devel_package() {
- depends="libuuid-devel xfsprogs>=${version}"
+ depends="libuuid-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove "usr/lib/*.so"
vmove usr/share/man/man3
}
}
-
-xfsprogs_package() {
- replaces="xfsprogs-libs>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfwm4-themes/template b/srcpkgs/xfwm4-themes/template
index e6fcd8ca27..6b785074fd 100644
--- a/srcpkgs/xfwm4-themes/template
+++ b/srcpkgs/xfwm4-themes/template
@@ -2,6 +2,7 @@
pkgname=xfwm4-themes
version=4.10.0
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="Themes for the XFCE window manager"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -9,12 +10,3 @@ license="GPL-2"
homepage="http://xfce.org"
distfiles="http://archive.se.xfce.org/src/art/$pkgname/4.10/$pkgname-$version.tar.bz2"
checksum=3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada66fd575
-long_desc="
- xfwm4-themes is a collection of themes for the XFCE window manager."
-
-xfwm4-themes_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 84b4300da4..9fd72aaa99 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -8,16 +8,10 @@ makedepends="libxfce4ui-devel gtk+-devel libxfce4util-devel xfconf-devel
startup-notification-devel libXcomposite-devel libXdamage-devel
libXfixes-devel libXrandr-devel libXrender-devel dbus-glib-devel
libwnck2-devel hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils"
short_desc="Next generation window manager for Xfce"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://xfce.org"
distfiles="http://archive.se.xfce.org/src/xfce/xfwm4/4.10/xfwm4-$version.tar.bz2"
checksum=380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740
-
-xfwm4_package() {
- depends="hicolor-icon-theme desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xgamma/template b/srcpkgs/xgamma/template
index 41aa15bc5f..d66c2d568e 100644
--- a/srcpkgs/xgamma/template
+++ b/srcpkgs/xgamma/template
@@ -14,9 +14,3 @@ checksum=7dc8334882a060bcc90042bceac5132dd87d5acc8d043b16311ef2134aea8e16
long_desc="
This package provides xgamma, a program to alter the gamma correction of
the monitor."
-
-xgamma_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xhost/template b/srcpkgs/xhost/template
index c661229e41..27aa0dc379 100644
--- a/srcpkgs/xhost/template
+++ b/srcpkgs/xhost/template
@@ -11,9 +11,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=a6f5b922df0a7be5d3ba43f525fa8e69c539c738418f013a0b7adaa423a89dc2
-
-xhost_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index 5e82c38dce..3600d9655e 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -47,9 +47,3 @@ xine-lib-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-xine-lib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xineramaproto/template b/srcpkgs/xineramaproto/template
index 65a4a412e2..df2eb38335 100644
--- a/srcpkgs/xineramaproto/template
+++ b/srcpkgs/xineramaproto/template
@@ -2,6 +2,7 @@
pkgname=xineramaproto
version=1.2
revision=2
+noarch="yes"
build_style=gnu-configure
short_desc="Xinerama extension headers from X.org"
homepage="http://xorg.freedesktop.org"
@@ -9,13 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=58e88087ceec7201d918f94d6b1247325adca2a9903fed11291b412427a7ba64
-long_desc="
- This provides the Xinerama extension headers from modular X.org X11
- project."
-
-xineramaproto_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index 019d535fcf..54662d3540 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -6,6 +6,11 @@ build_style=gnu-configure
configure_args="--with-xinitdir=/etc/X11/xinit"
hostmakedepends="pkg-config"
makedepends="libX11-devel"
+conf_files="
+ /etc/X11/xinit/xinitrc
+ /etc/X11/xinit/xserverrc
+ /etc/skel/.xinitrc
+ /etc/skel/.xsession"
short_desc="X init program"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org/"
@@ -26,14 +31,3 @@ post_install() {
vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-xinit_package() {
- conf_files="
- /etc/X11/xinit/xinitrc
- /etc/X11/xinit/xserverrc
- /etc/skel/.xinitrc
- /etc/skel/.xsession"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xinput/template b/srcpkgs/xinput/template
index b355f6d736..0f453e00a3 100644
--- a/srcpkgs/xinput/template
+++ b/srcpkgs/xinput/template
@@ -14,9 +14,3 @@ checksum=b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f
long_desc="
xinput is a utility to list available input devices, query information about
a device and change input device settings."
-
-xinput_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xkbcomp/template b/srcpkgs/xkbcomp/template
index 3a3658335b..c84c72d05a 100644
--- a/srcpkgs/xkbcomp/template
+++ b/srcpkgs/xkbcomp/template
@@ -17,9 +17,3 @@ long_desc="
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
}
-
-xkbcomp_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xkbevd/template b/srcpkgs/xkbevd/template
index ea3c031901..4a9b2d3a7c 100644
--- a/srcpkgs/xkbevd/template
+++ b/srcpkgs/xkbevd/template
@@ -14,9 +14,3 @@ checksum=cd62946c9feb3eb2fe0baef1ce5c0f4ab14148099264ecbce6e039b17880eb63
long_desc="
$pkgname event daemon listens for specified XKB events and executes
requested commands if they occur."
-
-xkbevd_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xkbutils/template b/srcpkgs/xkbutils/template
index 3088d390b2..2e31adac36 100644
--- a/srcpkgs/xkbutils/template
+++ b/srcpkgs/xkbutils/template
@@ -14,9 +14,3 @@ checksum=e409af0730788aa94ee22711750792546465a8f4729a0084d31a32c3ef0849bd
long_desc="
The xkbutils package provides some XKB related utilities for
XKB-capable X servers."
-
-xkbutils_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 5a57b4754e..dd00c0c62b 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,22 +1,16 @@
# Template build file for 'xkeyboard-config'.
pkgname=xkeyboard-config
-version=2.10.1
+version=2.11
revision=1
+noarch="yes"
build_style=gnu-configure
configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules"
hostmakedepends="pkg-config libxslt intltool"
makedepends="libX11-devel xkbcomp"
+depends="xkbcomp"
short_desc="X Keyboard Configuration Database"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
license="MIT"
distfiles="http://xorg.freedesktop.org/releases/individual/data/$pkgname/$pkgname-$version.tar.bz2"
-checksum=7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b
-
-xkeyboard-config_package() {
- depends="xkbcomp"
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
+checksum=e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76
diff --git a/srcpkgs/xkill/template b/srcpkgs/xkill/template
index 75505aec47..048105300a 100644
--- a/srcpkgs/xkill/template
+++ b/srcpkgs/xkill/template
@@ -15,9 +15,3 @@ long_desc="
Xkill is a utility for forcing the X server to close connections to
clients. This program is very dangerous, but is useful for aborting
programs that have displayed undesired windows on a user's screen."
-
-xkill_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xlsatoms/template b/srcpkgs/xlsatoms/template
index be3b2d3638..369d080b32 100644
--- a/srcpkgs/xlsatoms/template
+++ b/srcpkgs/xlsatoms/template
@@ -15,9 +15,3 @@ long_desc="
$pkgname lists the interned atoms. By default, all atoms starting from 1
(the lowest atom value defined by the protocol) are listed until unknown
atom is found."
-
-xlsatoms_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xmag/template b/srcpkgs/xmag/template
index babf79f56a..23bb293fc8 100644
--- a/srcpkgs/xmag/template
+++ b/srcpkgs/xmag/template
@@ -11,9 +11,3 @@ license="MIT"
homepage="http://xorg.freedesktop.org/"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=4ace8795cf756be4ba387f30366045594ce26adda2f5ffe1f8e896825d0932c6
-
-xmag_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template
index f6450e6b89..2d179beec6 100644
--- a/srcpkgs/xmlcatmgr/template
+++ b/srcpkgs/xmlcatmgr/template
@@ -3,6 +3,11 @@ pkgname=xmlcatmgr
version=2.2
revision=2
build_style=gnu-configure
+conf_files="
+ /etc/sgml/catalog
+ /etc/xml/catalog
+ /usr/share/sgml/catalog
+ /usr/share/xml/catalog"
short_desc="XML and SGML catalog manager"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xmlcatmgr.sourceforge.net"
@@ -20,8 +25,8 @@ long_desc="
local files or URIs. This allows you to tell the parser where to look
for entities without having to modify the original document source."
-if [ -n "$CROSS_BUILD" ]; then
- makedepends="xmlcatmgr"
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends="xmlcatmgr"
fi
pre_install() {
@@ -50,15 +55,3 @@ post_install() {
install -Dm644 catalog.xml ${DESTDIR}/usr/share/xml/catalog
install -Dm644 catalog.etc.xml ${DESTDIR}/etc/xml/catalog
}
-
-xmlcatmgr_package() {
- conf_files="
- /etc/sgml/catalog
- /etc/xml/catalog
- /usr/share/sgml/catalog
- /usr/share/xml/catalog"
- pkg_install() {
- vmove etc
- vmove usr
- }
-}
diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template
index eb369c858d..5512194209 100644
--- a/srcpkgs/xmldiff/template
+++ b/srcpkgs/xmldiff/template
@@ -4,6 +4,8 @@ version=0.6.10
revision=2
build_style=python-module
makedepends="python-devel libxslt openjade"
+depends="libxslt openjade"
+pycompile_module="xmldiff"
short_desc="Python classes to diff XML files"
homepage="http://www.logilab.org/project/xmldiff/"
license="GPL-2"
@@ -17,11 +19,3 @@ post_install() {
vmkdir usr/share/man/man1
install -m644 man/*.1 ${DESTDIR}/usr/share/man/man1
}
-
-xmldiff_package() {
- pycompile_module="xmldiff"
- depends="libxslt openjade"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xmlto/template b/srcpkgs/xmlto/template
index 8c0559fe1c..633bc65e83 100644
--- a/srcpkgs/xmlto/template
+++ b/srcpkgs/xmlto/template
@@ -6,6 +6,7 @@ homepage="http://cyberelk.net/tim/software/xmlto/"
distfiles="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$version.tar.bz2"
build_style=gnu-configure
makedepends="libxslt docbook-xsl>=1.77.1_2"
+depends="${makedepends}"
short_desc="Tool to help transform XML documents into other formats"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -19,10 +20,3 @@ post_install() {
# Requires bash!
sed -i "s|^#!/bin/sh|#!/bin/bash|" ${DESTDIR}/usr/bin/xmlto
}
-
-xmlto_package() {
- depends="${makedepends}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xmodmap/template b/srcpkgs/xmodmap/template
index fbaa04b380..07559d7d74 100644
--- a/srcpkgs/xmodmap/template
+++ b/srcpkgs/xmodmap/template
@@ -11,9 +11,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3
-
-xmodmap_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template
index 3abf623229..ab5111e803 100644
--- a/srcpkgs/xnoise/template
+++ b/srcpkgs/xnoise/template
@@ -7,6 +7,7 @@ hostmakedepends="pkg-config intltool"
makedepends="gtk+3-devel libtaginfo-devel>=0.1.6 sqlite-devel>=3.8.0_3
libnotify-devel libsoup-devel gst-plugins-base1-devel gst-plugins-good1
desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1"
short_desc="Media player for GTK+ with a slick GUI"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -31,10 +32,3 @@ xnoise-devel_package() {
vmove usr/share/vala
}
}
-
-xnoise_package() {
- depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xombrero/template b/srcpkgs/xombrero/template
index 1159c11375..208ab47be0 100644
--- a/srcpkgs/xombrero/template
+++ b/srcpkgs/xombrero/template
@@ -4,6 +4,7 @@ version=1.6.3
revision=1
hostmakedepends="pkg-config perl groff"
makedepends="libbsd-devel gtk+3-devel gnutls-devel webkitgtk-devel desktop-file-utils"
+depends="desktop-file-utils"
short_desc="A minimalists web browser, vi-like but with traditional web browser behavior"
maintainer="Juan RP <xtraeme@gmail.com>"
license="ISC"
@@ -27,10 +28,3 @@ do_install() {
make -C linux PREFIX=/usr DESTDIR=${DESTDIR} install
vinstall xombrero.conf 644 etc/skel .xombrero.conf
}
-
-xombrero_package() {
- depends="desktop-file-utils"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xonotic-data-low/template b/srcpkgs/xonotic-data-low/template
index c086b1c791..e09739d999 100644
--- a/srcpkgs/xonotic-data-low/template
+++ b/srcpkgs/xonotic-data-low/template
@@ -1,33 +1,21 @@
# Template file for 'xonotic-data-low'
pkgname=xonotic-data-low
version=0.7.0
-revision=1
+revision=2
wrksrc="Xonotic"
homepage="http://xonotic.org"
license="GPL-2, GPL-3"
distfiles="http://dl.xonotic.org/xonotic-${version}-low.zip"
makedepends="unzip"
-short_desc="A free, fast-paced crossplatform FPS (LQ data files)"
+noarch="yes"
+replaces="xonotic-data>=0"
+provides="xonotic-data-${version}_${revision}"
+short_desc="A free, fast-paced crossplatform FPS (Lower Quality data files)"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=35a0e3c299ded3ee0e0b60cba94fed0ea844055972bb2e0a770497018a21711b
-long_desc="
- This package contains the lower quality data files.
-
- Uses JPEG texture compression instead of using DDS textures compiled with S3TC.
- This build has smaller file size and has better support for opensource/legacy
- drivers, but the textures take slightly longer while loading the game."
do_install() {
vmkdir usr/share/xonotic
cp -a data ${DESTDIR}/usr/share/xonotic
vinstall key_0.d0pk 644 usr/share/xonotic
}
-
-xonotic-data-low_package() {
- noarch="yes"
- replaces="xonotic-data>=0"
- provides="xonotic-data-${version}"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template
index e59c893e93..5164422e8c 100644
--- a/srcpkgs/xonotic-data/template
+++ b/srcpkgs/xonotic-data/template
@@ -7,6 +7,8 @@ homepage="http://xonotic.org"
license="GPL-2, GPL-3"
distfiles="http://dl.xonotic.org/xonotic-${version}.zip"
makedepends="unzip"
+noarch="yes"
+replaces="xonotic-data>=0"
short_desc="A free, fast-paced crossplatform first-person shooter (data files)"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=21a5fb5493c269cd3843789cb8598f952d4196e8bc71804b9bd5808b646542c6
@@ -16,11 +18,3 @@ do_install() {
cp -a data ${DESTDIR}/usr/share/xonotic
vinstall key_0.d0pk 644 usr/share/xonotic
}
-
-xonotic-data_package() {
- noarch="yes"
- replaces="xonotic-data>=0"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template
index 7b568e4b0a..b5dd757573 100644
--- a/srcpkgs/xonotic/template
+++ b/srcpkgs/xonotic/template
@@ -1,7 +1,7 @@
# Template file for 'xonotic'
pkgname=xonotic
version=0.7.0
-revision=1
+revision=2
wrksrc="Xonotic"
homepage="http://xonotic.org"
license="GPL-2, GPL-3"
@@ -14,6 +14,7 @@ hostmakedepends="unzip automake libtool"
makedepends="gmp-devel MesaLib-devel SDL-devel libcurl-devel alsa-lib-devel
libmodplug-devel libvorbis-devel libXpm-devel libjpeg-turbo-devel
xonotic-data>=${version}"
+depends="desktop-file-utils xonotic-data>=${version}"
do_build() {
make ${makejobs} -C source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" \
@@ -48,10 +49,3 @@ do_install() {
# Remove devel stuff
rm -rf $DESTDIR/usr/include $DESTDIR/usr/lib/pkgconfig $DESTDIR/usr/lib/*.a
}
-
-xonotic_package() {
- depends="desktop-file-utils xonotic-data>=${version}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xorg-apps/template b/srcpkgs/xorg-apps/template
index 99275de1f4..66dea87a81 100644
--- a/srcpkgs/xorg-apps/template
+++ b/srcpkgs/xorg-apps/template
@@ -11,6 +11,9 @@ makedepends="iceauth>=1.0.4 sessreg>=1.0.6 setxkbmap>=1.2.0 smproxy>=1.0.4
xlsatoms>=1.1.0 xlsclients>=1.1.1 xmodmap>=1.0.5 xpr>=1.0.3 xprop>=1.2.0
xrandr>=1.3.4 xrdb>=1.0.7 xrefresh>=1.0.4 xset>=1.2.1 xsetroot>=1.1.0
xvinfo>=1.1.1 xwd>=1.0.4 xwininfo>=1.1.1 xwud>=1.0.3 xinit>=1.1.1"
+depends="${makedepends}"
+noarch="yes"
+replaces="xorg-server-utils>=0"
short_desc="X.org applications"
homepage="http://xorg.freedesktop.org/"
license="MIT"
@@ -18,9 +21,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
long_desc="
This is the Xorg applications meta-package for installing various
applications from the modular Xorg project."
-
-xorg-apps_package() {
- depends="${makedepends}"
- noarch="yes"
- replaces="xorg-server-utils>=0"
-}
diff --git a/srcpkgs/xorg-fonts/template b/srcpkgs/xorg-fonts/template
index 0a321ba111..a9841c856a 100644
--- a/srcpkgs/xorg-fonts/template
+++ b/srcpkgs/xorg-fonts/template
@@ -12,6 +12,8 @@ makedepends="encodings>=1.0.4 font-adobe-100dpi>=1.0.3 font-adobe-75dpi>=1.0.3
font-daewoo-misc>=1.0.3 font-dec-misc>=1.0.3 font-ibm-type1>=1.0.3
font-isas-misc>=1.0.3 font-jis-misc>=1.0.3 font-misc-misc>=1.1.2
font-mutt-misc>=1.0.3 dejavu-fonts-ttf"
+depends="${makedepends}"
+noarch="yes"
short_desc="Modular Xorg Fonts"
homepage="http://xorg.freedesktop.org/"
license="MIT"
@@ -19,8 +21,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
long_desc="
This is the modular Xorg font meta-package for installing the various
font packages from the modular Xorg project."
-
-xorg-fonts_package() {
- depends="${makedepends}"
- noarch="yes"
-}
diff --git a/srcpkgs/xorg-input-drivers/template b/srcpkgs/xorg-input-drivers/template
index 04e3ef153f..2034b5f89d 100644
--- a/srcpkgs/xorg-input-drivers/template
+++ b/srcpkgs/xorg-input-drivers/template
@@ -5,6 +5,8 @@ revision=2
build_style=meta
makedepends="xf86-input-evdev>=2.5.0 xf86-input-synaptics>=1.3.0
xf86-input-vmmouse>=12.6.10 xf86-input-wacom>=0.14.0"
+depends="${makedepends}"
+noarch="yes"
short_desc="X.org input drivers meta-package"
homepage="http://xorg.freedesktop.org/"
license="MIT"
@@ -12,8 +14,3 @@ maintainer="Juan RP <xtraeme@gmail.com>"
long_desc="
This is the Xorg meta-package for installing the various
X.org xserver input drivers from the modular Xorg X11 project."
-
-xorg-input-drivers_package() {
- depends="${makedepends}"
- noarch="yes"
-}
diff --git a/srcpkgs/xorg-minimal/template b/srcpkgs/xorg-minimal/template
index 72dbf7d7ae..c3e6fc419c 100644
--- a/srcpkgs/xorg-minimal/template
+++ b/srcpkgs/xorg-minimal/template
@@ -4,6 +4,8 @@ version=1.0
revision=1
build_style=meta
makedepends="xorg-server xauth xinit xf86-input-evdev"
+depends="${makedepends}"
+noarch="yes"
short_desc="Xorg meta-package including xorg-xserver and needed tools"
homepage="http://xorg.freedesktop.org/"
license="MIT"
@@ -11,8 +13,3 @@ maintainer="Ypnose <linuxienATlegtuxDOTorg>"
long_desc="
This is the modular Xorg server meta-package for installing X server
and needed packages like xauth, xinit and evdev driver."
-
-xorg-minimal_package() {
- depends="${makedepends}"
- noarch="yes"
-}
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 9a706d8c45..b6d7a2b62d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -28,21 +28,48 @@ makedepends="libfl-devel damageproto inputproto>=2.2 glproto>=1.4.17 xproto>=7.0
libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel xkeyboard-config"
+# See hw/xfree86/common/xf86Module.h. Only care for the major version.
+depends="xkeyboard-config"
+provides="xserver-abi-extension-8_1 xserver-abi-input-20_1 xserver-abi-video-15_1"
# Package build options
-build_options="opengl"
+build_options="dri dri2 opengl"
+desc_option_dri="Enable support for the DRI extension"
+desc_option_dri2="Enable support for the DRI2 extension"
desc_option_opengl="Enable support for OpenGL/GLX and DRI"
-# Enable gl by default on x86.
+# enable dri2 for all platforms via libdri2.
+build_options_default="dri2"
+
if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
- build_options_default="opengl"
+ # Enable dri/opengl by default on x86.
+ build_options_default+=" dri opengl"
+fi
+
+if [ "$build_option_dri" ]; then
+ configure_args+=" --enable-dri"
+ case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) makedepends+=" MesaLib-devel>=10.0";;
+ esac
+else
+ configure_args+=" --disable-dri"
+fi
+
+if [ "$build_option_dri2" ]; then
+ configure_args+=" --enable-dri2"
+ case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*) makedepends+=" MesaLib-devel>=10.0";;
+ *) makedepends+=" dri2proto libdri2-devel-git";;
+ esac
+else
+ configure_args+=" --disable-dri2"
fi
if [ "$build_option_opengl" ]; then
- configure_args+=" --enable-dri --enable-dri2 --enable-glx-tls --enable-glx"
+ configure_args+=" --enable-glx-tls --enable-glx"
makedepends+=" MesaLib-devel>=10.0"
else
- configure_args+=" --disable-dri --disable-dri2 --disable-glx"
+ configure_args+=" --disable-glx"
fi
post_install() {
@@ -101,12 +128,3 @@ xorg-server-devel_package() {
vmove usr/share/aclocal
}
}
-
-xorg-server_package() {
- # See hw/xfree86/common/xf86Module.h. Only care for the major version.
- provides="xserver-abi-extension-8_1 xserver-abi-input-20_1 xserver-abi-video-15_1"
- depends="xkeyboard-config"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template
index cca05d1e05..bbda9a41f6 100644
--- a/srcpkgs/xorg-util-macros/template
+++ b/srcpkgs/xorg-util-macros/template
@@ -3,6 +3,7 @@ pkgname=xorg-util-macros
version=1.18.0
revision=1
wrksrc="${pkgname/xorg-/}-${version}"
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config"
short_desc="Xorg autotool macros"
@@ -11,10 +12,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2"
checksum=e5e3d132a852f0576ea2cf831a9813c54a58810a59cdb198f56b884c5a78945b
-
-xorg-util-macros_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template
index 7f63c2dcfb..64a48112d2 100644
--- a/srcpkgs/xorg-video-drivers/template
+++ b/srcpkgs/xorg-video-drivers/template
@@ -3,15 +3,11 @@ pkgname=xorg-video-drivers
version=7.6
revision=10
build_style=meta
+makedepends="xf86-video-ati>=7.0 xf86-video-intel>=2.20.13
+ xf86-video-vesa>=1:2.3.2 xf86-video-nouveau>=1.0.4
+ xf86-video-modesetting>=0.6.0"
+depends="${makedepends}"
short_desc="X.org video drivers meta-package"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.voidlinux.eu"
license="Public domain"
-
-makedepends="xf86-video-ati>=7.0 xf86-video-intel>=2.20.13
- xf86-video-vesa>=1:2.3.2 xf86-video-nouveau>=1.0.4
- xf86-video-modesetting>=0.6.0"
-
-xorg-video-drivers_package() {
- depends="${makedepends}"
-}
diff --git a/srcpkgs/xorg/template b/srcpkgs/xorg/template
index 152b934e50..0c4de104ce 100644
--- a/srcpkgs/xorg/template
+++ b/srcpkgs/xorg/template
@@ -5,6 +5,8 @@ revision=2
build_style=meta
makedepends="xorg-fonts>=7.6 xorg-server>=1.9.3 xorg-apps>=7.6
xorg-input-drivers>=7.6 xorg-video-drivers>=7.6"
+depends="${makedepends}"
+noarch="yes"
short_desc="X.org meta-package"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
@@ -12,8 +14,3 @@ license="MIT"
long_desc="
This is the Xorg meta-package for installing the various X.org
meta-packages (server, clients, fonts, etc) from the X.org project."
-
-xorg_package() {
- noarch="yes"
- depends="${makedepends}"
-}
diff --git a/srcpkgs/xorriso/template b/srcpkgs/xorriso/template
index a3d2dc3b9e..757b4921e1 100644
--- a/srcpkgs/xorriso/template
+++ b/srcpkgs/xorriso/template
@@ -10,9 +10,3 @@ license="GPL-3"
homepage="https://www.gnu.org/software/xorriso"
distfiles="https://www.gnu.org/software/xorriso/xorriso-$version.tar.gz"
checksum=9d64173bf9cc94ee7baf152a234ebadb28cbd0b6e7f714715dacf976e75e7d73
-
-xorriso_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 514945a613..7a445330b5 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -7,6 +7,7 @@ make_install_args="desktop-install"
hostmakedepends="autoconf automake pkg-config"
makedepends="gtk+-devel libgnomecanvas-devel>=2.30.3_1 poppler-glib-devel zlib-devel ghostscript-devel"
makedepends+=" hicolor-icon-theme desktop-file-utils"
+depends="hicolor-icon-theme desktop-file-utils ghostscript"
short_desc="Xournal: GPL Notetaking, sketching, and journal-keeping."
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://xournal.sourceforge.net/"
@@ -24,10 +25,3 @@ long_desc="
overall functionality.
Supports PDF import and export."
-
-xournal_package() {
- depends="hicolor-icon-theme desktop-file-utils ghostscript"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xplanet/template b/srcpkgs/xplanet/template
index 159ff39295..f9d1028454 100644
--- a/srcpkgs/xplanet/template
+++ b/srcpkgs/xplanet/template
@@ -12,9 +12,3 @@ license="GPL-2"
homepage="http://xplanet.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=44fb742bb93e5661ea8b11ccabcc12896693e051f3dd5083c9227224c416b442
-
-xplanet_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xpr/template b/srcpkgs/xpr/template
index ea99def26a..c1513a9fde 100644
--- a/srcpkgs/xpr/template
+++ b/srcpkgs/xpr/template
@@ -16,9 +16,3 @@ long_desc="
it for output on PostScript printers, the Digital LN03 or LA100, the IBM
PP3812 page printer, the HP LaserJet (or other PCL printers), or the HP
PaintJet."
-
-xpr_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xprop/template b/srcpkgs/xprop/template
index 036667a133..6044376932 100644
--- a/srcpkgs/xprop/template
+++ b/srcpkgs/xprop/template
@@ -14,9 +14,3 @@ checksum=07907a189099b8a000406b5ca6c5346df238a9e1fe3b32dc59f48fe0ad12f1a3
long_desc="
This package provides xprop, a property displayer for X.
This is from the modular X.org X11 project."
-
-xprop_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xproto/template b/srcpkgs/xproto/template
index 7199918899..5408f1f33d 100644
--- a/srcpkgs/xproto/template
+++ b/srcpkgs/xproto/template
@@ -2,6 +2,7 @@
pkgname=xproto
version=7.0.25
revision=1
+noarch="yes"
build_style=gnu-configure
short_desc="X protocol and ancillary headers from Xorg X11"
homepage="http://xorg.freedesktop.org"
@@ -9,10 +10,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
checksum=92247485dc4ffc3611384ba84136591923da857212a7dc29f4ad7797e13909fe
-
-xproto_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xrandr/template b/srcpkgs/xrandr/template
index db899d670f..cf60f416da 100644
--- a/srcpkgs/xrandr/template
+++ b/srcpkgs/xrandr/template
@@ -11,9 +11,3 @@ homepage="http://xorg.freedesktop.org"
license="MIT"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=67b554ab975652778bef587f86dab7fec8cb95dfd21c11d98a203dac5c241e50
-
-xrandr_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index 1681eaafce..b403b790eb 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -11,9 +11,3 @@ license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b
-
-xrdb_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template
index 4fff6c6ea9..1ec29f185b 100644
--- a/srcpkgs/xrefresh/template
+++ b/srcpkgs/xrefresh/template
@@ -12,11 +12,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
checksum=069502eb485ea128a0bebf94302d5cbb271ad9d31ae51691abd6d64914ff9d7b
long_desc="
- This package contains xrefresh, a program to repaint all or part
- off a screen."
-
-xrefresh_package() {
- pkg_install() {
- vmove usr
- }
-}
+ This package contains xrefresh, a program to repaint all or part off a screen."
diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template
index 7f255aa0a6..0f87fc5f48 100644
--- a/srcpkgs/xsel/template
+++ b/srcpkgs/xsel/template
@@ -11,9 +11,3 @@ maintainer="Steven R <strob AT styez DOT com>"
homepage="http://www.vergenet.net/~conrad/software/xsel/"
license="Custom"
short_desc="Command-line program for getting and setting the contents of the X selection"
-
-xsel_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xset/template b/srcpkgs/xset/template
index 8062e5f2c1..35577cb414 100644
--- a/srcpkgs/xset/template
+++ b/srcpkgs/xset/template
@@ -16,9 +16,3 @@ long_desc="
the X11 display and environment, such as the bell, key clicks,
DPMS, font paths, keyboard LEDs, mouse pointer, pixel colors,
keyboard autorepeat, and screen saver."
-
-xset_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xsetmode/template b/srcpkgs/xsetmode/template
index ba411e0dd4..15636acf31 100644
--- a/srcpkgs/xsetmode/template
+++ b/srcpkgs/xsetmode/template
@@ -14,9 +14,3 @@ checksum=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
long_desc="
The xsetmode program is used to switch XInput devices between absolute
and relative positioning."
-
-xsetmode_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xsetroot/template b/srcpkgs/xsetroot/template
index b635095d59..d592b8845a 100644
--- a/srcpkgs/xsetroot/template
+++ b/srcpkgs/xsetroot/template
@@ -14,9 +14,3 @@ checksum=88f13e949e7aea126239e5c9b3fe7bb7c2ecf70c70774ae41218789d9cfe5fad
long_desc="
The xsetroot program is used to tailor the appearance of the background
window of the X server."
-
-xsetroot_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xstow/template b/srcpkgs/xstow/template
index 6b0a3ee7cc..27213aae21 100644
--- a/srcpkgs/xstow/template
+++ b/srcpkgs/xstow/template
@@ -1,7 +1,7 @@
# Template build file for 'xstow'.
pkgname=xstow
-version=1.0.0
-revision=2
+version=1.0.1
+revision=1
build_style=gnu-configure
configure_args="--with-regex --with-fnmatch --with-curses"
short_desc="Replacement of GNU Stow written in C++"
@@ -9,15 +9,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xstow.sourceforge.net"
license="GPL-2"
distfiles="$SOURCEFORGE_SITE/xstow/xstow-$version.tar.bz2"
-checksum=0109f10fb25a474803ec357a38c17d806dd9a21eac39b21d79b48c2af571c0fe
-long_desc="
- XStow as GNU Stow, are programs for managing the installation of
- software packages, keeping them separate (/usr/local/stow/emacs vs.
- /usr/local/stow/perl, for example) while making them appear to be
- installed in the same place (/usr/local)."
-
-xstow_package() {
- pkg_install() {
- vmove usr
- }
-}
+checksum=b25279134689519c15fa5caea3d437c0e8c49d9cfa0c91cc45fb842025b1bf35
diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 6fa38ab844..fa4a1d2dfb 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -18,9 +18,3 @@ homepage="http://invisible-island.net/xterm/"
license="MIT/X11"
distfiles="ftp://invisible-island.net/xterm/$pkgname-$version.tgz"
checksum=81ae4e5efc9d5d3911a39c8ef2e2f883954764ac85ddfebeffa25c8ce7531ebf
-
-xterm_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/xtrans/template b/srcpkgs/xtrans/template
index 187c7f5eb3..150b21993e 100644
--- a/srcpkgs/xtrans/template
+++ b/srcpkgs/xtrans/template
@@ -1,7 +1,8 @@
# Template build file for 'xtrans'.
pkgname=xtrans
-version=1.3.2
+version=1.3.3
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config"
short_desc="Network API translation layer to insulate X"
@@ -9,11 +10,4 @@ homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=94177c89b74f594bcddc6a12825e9b464e17ab1977de671d25f67a4ea922cb87
-
-xtrans_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
+checksum=622db4adce224581a44fbe41321bbb0bdc0c78aec586ba83548f1f1c6e8a09bf
diff --git a/srcpkgs/xvidcore/template b/srcpkgs/xvidcore/template
index 55acf1494a..9ae0a700d4 100644
--- a/srcpkgs/xvidcore/template
+++ b/srcpkgs/xvidcore/template
@@ -1,7 +1,7 @@
# Template file for 'xvidcore'
pkgname=xvidcore
version=1.3.2
-revision=1
+revision=2
wrksrc="$pkgname"
build_wrksrc="build/generic"
build_style=gnu-configure
@@ -12,10 +12,6 @@ homepage="http://www.xvid.org"
license="GPL-2"
distfiles="http://downloads.xvid.org/downloads/$pkgname-$version.tar.bz2"
checksum=d6c11334e1e771f9e4722eff454762325fd0989f6a4217abca296d6770160bf4
-long_desc="
- XviD is an ISO MPEG-4 compliant video codec library. It's no product,
- it's an open source project which is developed and maintained by lots of
- people from all over the world."
post_install() {
# Fix dynamic libraries
@@ -27,16 +23,11 @@ post_install() {
}
xvidcore-devel_package() {
- depends="xvidcore>=${version}"
- short_desc="${short_desc} -- development files"
+ depends="xvidcore>=${version}_${revision}"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
- }
-}
-
-xvidcore_package() {
- pkg_install() {
- vmove usr
+ vmove "usr/lib/*.so"
}
}
diff --git a/srcpkgs/xvinfo/template b/srcpkgs/xvinfo/template
index a872c62823..67e1d2d547 100644
--- a/srcpkgs/xvinfo/template
+++ b/srcpkgs/xvinfo/template
@@ -14,9 +14,3 @@ checksum=60c74aa190bcf1e244f6f1576dc43869018a8ed5ba319703a5c198d3466a3985
long_desc="
This package provides xvinfo, a program to query the capability of the
video adaptor accessible through the X-Video extension."
-
-xvinfo_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template
index c189a964cb..eea0737aa9 100644
--- a/srcpkgs/xwd/template
+++ b/srcpkgs/xwd/template
@@ -16,9 +16,3 @@ long_desc="
store window images in a specially formatted dump file. This file can
then be read by various other X utilities for redisplay, printing, editing,
formatting, archiving, image processing, etc."
-
-xwd_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xwininfo/template b/srcpkgs/xwininfo/template
index 5b35ca9646..7856f2b974 100644
--- a/srcpkgs/xwininfo/template
+++ b/srcpkgs/xwininfo/template
@@ -14,9 +14,3 @@ checksum=645a57be4870fb6aba459e7dc96f4d8eaafa3b31bbcd42c997ac4cb021a2343d
long_desc="
This package provides xwininfo, a program to query the X server for
information about windows."
-
-xwininfo_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xwud/template b/srcpkgs/xwud/template
index ec21013d69..e6fc7f989f 100644
--- a/srcpkgs/xwud/template
+++ b/srcpkgs/xwud/template
@@ -15,9 +15,3 @@ long_desc="
Xwud is an X Window System image undumping utility. Xwud allows X users
to display in a window an image saved in a specially formatted dump file,
such as produced by xwd(1)."
-
-xwud_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template
index ffc7b697ce..b11c41c7f1 100644
--- a/srcpkgs/xz/template
+++ b/srcpkgs/xz/template
@@ -3,6 +3,7 @@ pkgname=xz
version=5.0.5
revision=2
bootstrap=yes
+replaces="chroot-xz>=0"
build_style=gnu-configure
short_desc="The XZ utilities"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -30,10 +31,3 @@ liblzma-devel_package() {
vmove usr/lib/pkgconfig
}
}
-
-xz_package() {
- replaces="chroot-xz>=0"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/yajl/template b/srcpkgs/yajl/template
index d4b79b87cd..960c9a3d78 100644
--- a/srcpkgs/yajl/template
+++ b/srcpkgs/yajl/template
@@ -13,7 +13,6 @@ long_desc="
YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a
small validating JSON generator. YAJL is released under the ISC license."
-
do_fetch() {
git clone -b${version} git://github.com/lloyd/yajl.git yajl-${version}
}
@@ -33,9 +32,3 @@ yajl-devel_package() {
vmove usr/include
}
}
-
-yajl_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/yasm/template b/srcpkgs/yasm/template
index c5aec3cb94..ece1ace53b 100644
--- a/srcpkgs/yasm/template
+++ b/srcpkgs/yasm/template
@@ -22,9 +22,3 @@ post_install() {
rm -rf ${DESTDIR}/usr/lib
rm -rf ${DESTDIR}/usr/include
}
-
-yasm_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 9490c82825..cbcac81bcb 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -2,6 +2,7 @@
pkgname=yelp-xsl
version=3.10.1
revision=1
+noarch="yes"
build_style=gnu-configure
hostmakedepends="pkg-config intltool itstool libxslt"
makedepends="libxslt-devel"
@@ -11,10 +12,3 @@ license="GPL-2"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887
-
-yelp-xsl_package() {
- noarch="yes"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 09a5304a2f..39b36e4218 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -8,6 +8,8 @@ hostmakedepends="pkg-config intltool itstool"
makedepends="bzip2-devel liblzma-devel sqlite-devel libgpg-error-devel
libgcrypt-devel libxslt-devel libsoup-devel>=2.44 webkitgtk-devel>=2.1
yelp-xsl>=${version}"
+depends="libsoup>=2.44 webkitgtk>=2.1 dconf>=0.18 hicolor-icon-theme
+ desktop-file-utils yelp-xsl>=${version}"
short_desc="Help browser for GNOME desktop"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org"
@@ -24,10 +26,3 @@ yelp-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-yelp_package() {
- depends="libsoup>=2.44 webkitgtk>=2.1 dconf>=0.18 hicolor-icon-theme desktop-file-utils yelp-xsl>=${version}"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index 2811beda1e..a0c8ca739b 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,26 +1,20 @@
# Template file for 'youtube-dl'
pkgname=youtube-dl
-version=2013.12.23.4
+version=2014.01.23.4
revision=1
wrksrc="${pkgname}"
makedepends="python"
+depends="python"
+noarch="yes"
short_desc="Tool to download youtube videos"
maintainer="pancake <pancake@nopcode.org>"
license="Public Domain"
homepage="http://rg3.github.com/youtube-dl/"
distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=8e5c09a36f0e2ff8a628e27f86cd135e0e1244819f5c6c16862c08b558081a1f
+checksum=a96d562be51aeb817b9952bff8c65ecab737575b7104381ce62185397408dc72
do_install() {
vinstall ${pkgname} 755 usr/bin
vinstall ${pkgname}.1 644 usr/share/man/man1
vinstall ${pkgname}.bash-completion 644 usr/share/bash-completion/completions ${pkgname}
}
-
-youtube-dl_package() {
- noarch="yes"
- depends="python"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/yt-play/template b/srcpkgs/yt-play/template
new file mode 100644
index 0000000000..d51cde08a2
--- /dev/null
+++ b/srcpkgs/yt-play/template
@@ -0,0 +1,15 @@
+# Template file for 'yt-play'
+pkgname=yt-play
+version=20130117
+revision=1
+noarch=yes
+build_style=gnu-makefile
+makedepends="youtube-dl curl"
+short_desc="Useful scripts to play youtube videos from command line"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL"
+homepage="https://github.com/trufae/yt-play"
+
+do_fetch() {
+ git clone git://github.com/trufae/yt-play ${pkgname}-${version}
+}
diff --git a/srcpkgs/zd1211-firmware/template b/srcpkgs/zd1211-firmware/template
index 2d48680250..f55a257b87 100644
--- a/srcpkgs/zd1211-firmware/template
+++ b/srcpkgs/zd1211-firmware/template
@@ -3,6 +3,7 @@ pkgname=zd1211-firmware
version=1.4
revision=3
wrksrc=${pkgname}
+noarch="yes"
short_desc="Firmware for the Zydas 1211 wifi cards"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://zd1211.wiki.sourceforge.net/"
@@ -14,10 +15,3 @@ do_install() {
vmkdir usr/lib/firmware/zd1211
install -m644 zd1211* ${DESTDIR}/usr/lib/firmware/zd1211
}
-
-zd1211-firmware_package() {
- noarch="yes"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template
index 5278cdcc9b..cb87881505 100644
--- a/srcpkgs/zeitgeist/template
+++ b/srcpkgs/zeitgeist/template
@@ -8,6 +8,8 @@ makedepends="
json-glib-devel>=0.16.2 gtk+3-devel telepathy-glib-devel
pygobject-devel>=3.10 vala-devel dbus-devel raptor xapian-core-devel
python-rdflib"
+depends="python>=2.7<3 dbus-python pygobject>=3.10"
+pycompile_module="zeitgeist"
short_desc="logs the users’ activities and events"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://zeitgeist-project.com"
@@ -44,11 +46,3 @@ zeitgeist-devel_package() {
vmove usr/share/gir-1.0
}
}
-
-zeitgeist_package() {
- pycompile_module="zeitgeist"
- depends="python>=2.7<3 dbus-python pygobject>=3.10"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template
index 1f50f76474..5c1d2acd5f 100644
--- a/srcpkgs/zenity/template
+++ b/srcpkgs/zenity/template
@@ -16,9 +16,3 @@ long_desc="
which allows you to display dialog boxes from the command line
and shell scripts. If you understand, things are just as they
are. If you don't understand, things are just as they are."
-
-zenity_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/zerofree/template b/srcpkgs/zerofree/template
index 35b708819b..b85ca5c0a6 100644
--- a/srcpkgs/zerofree/template
+++ b/srcpkgs/zerofree/template
@@ -2,6 +2,7 @@
pkgname=zerofree
version=1.0.3
revision=2
+makedepends="e2fsprogs-devel"
short_desc="A tool to zero free blocks in an ext2 filesystem"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -12,8 +13,6 @@ long_desc="
zerofree is a tool to zero free blocks in an ext2 filesystems; ext3 and
ext4 filesystems are also supported."
-makedepends="e2fsprogs-devel"
-
do_build() {
make
}
@@ -21,9 +20,3 @@ do_build() {
do_install() {
vinstall zerofree 755 usr/sbin
}
-
-zerofree_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template
index 4aecf085e8..a76980cfb8 100644
--- a/srcpkgs/zeroinstall-injector/template
+++ b/srcpkgs/zeroinstall-injector/template
@@ -2,9 +2,12 @@
pkgname=zeroinstall-injector
version=2.3.3
revision=2
+noarch=yes
wrksrc="0install-${version}"
build_style=python-module
makedepends="python gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
+depends="${makedepends}"
+pycompile_module="zeroinstall"
short_desc="A cross-distribution software installation system"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -15,12 +18,3 @@ checksum=80fbd8cd6144f1bda32415201c8978297a3ac95304e7fc73c1cc02eb8d1aca5e
pre_configure() {
sed -i "s|man/|share/&|" setup.py
}
-
-zeroinstall-injector_package() {
- pycompile_module="zeroinstall"
- depends="${makedepends}"
- noarch=yes
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/zeromq/template b/srcpkgs/zeromq/template
index 0f1ab8e8b1..c9995a266c 100644
--- a/srcpkgs/zeromq/template
+++ b/srcpkgs/zeromq/template
@@ -27,9 +27,3 @@ zeromq-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-zeromq_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/zip/template b/srcpkgs/zip/template
index a9cf8f712b..1ce1ca12f4 100644
--- a/srcpkgs/zip/template
+++ b/srcpkgs/zip/template
@@ -17,9 +17,3 @@ long_desc="
PKZIP 2.04g (Phil Katz ZIP) for MSDOS systems. There is a companion to zip
called unzip (of course) which you should be able to find the same place
you got zip."
-
-zip_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/zisofs-tools/template b/srcpkgs/zisofs-tools/template
index 49acd429c7..bd198fc741 100644
--- a/srcpkgs/zisofs-tools/template
+++ b/srcpkgs/zisofs-tools/template
@@ -21,9 +21,3 @@ long_desc="
do_install() {
make INSTALLROOT=${DESTDIR} install
}
-
-zisofs-tools_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 2231e36d4b..8fdd28b00f 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -30,9 +30,3 @@ zlib-devel_package() {
vmove usr/share
}
}
-
-zlib_package() {
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/zlib32/template b/srcpkgs/zlib32/template
index ed5dc74fd5..a887db4dbe 100644
--- a/srcpkgs/zlib32/template
+++ b/srcpkgs/zlib32/template
@@ -21,6 +21,9 @@ long_desc="
This package installs the 32 bit libraries for x86_64 systems."
only_for_archs=x86_64
+nostrip=yes
+noverifyrdeps=yes
+depends="glibc32"
do_install() {
for f in ${distfiles}; do
@@ -35,17 +38,8 @@ do_install() {
zlib32-devel_package() {
depends="glibc32-devel zlib32>=${version}"
nostrip=yes
- short_desc="${short_desc} - development files"
+ short_desc+=" - development files"
pkg_install() {
vmove usr/lib32/libz.a
}
}
-
-zlib32_package() {
- depends="glibc32"
- nostrip=yes
- noverifyrdeps=yes
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/zope.interface/template b/srcpkgs/zope.interface/template
index 0557b34b46..35439e7ba0 100644
--- a/srcpkgs/zope.interface/template
+++ b/srcpkgs/zope.interface/template
@@ -5,16 +5,10 @@ revision=2
build_style=python-module
hostmakedepends="python-distribute"
makedepends="python-devel"
+pycompile_module="zope/interface"
short_desc="zope.interface package from Zope 3"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://pypi.python.org/pypi/zope.interface"
license="ZPL"
distfiles="http://pypi.python.org/packages/source/z/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=b9f4b92c91ac4defbf0269ec891c3528110224259019b009a24d50e0ebebe9c9
-
-zope.interface_package() {
- pycompile_module="zope/interface"
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/zsh/patches/xattr-build-fix.patch b/srcpkgs/zsh/patches/xattr-build-fix.patch
new file mode 100644
index 0000000000..f775e50c71
--- /dev/null
+++ b/srcpkgs/zsh/patches/xattr-build-fix.patch
@@ -0,0 +1,20 @@
+Make this build by adding <sys/xattr.h> before <sys/capability.h>.
+
+--- Src/Modules/attr.c.orig 2014-01-06 12:26:00.886670913 +0100
++++ Src/Modules/attr.c 2014-01-06 12:26:10.597587472 +0100
+@@ -27,12 +27,12 @@
+ *
+ */
+
+-#include "attr.mdh"
+-#include "attr.pro"
+-
+ #include <sys/types.h>
+ #include <sys/xattr.h>
+
++#include "attr.mdh"
++#include "attr.pro"
++
+ static ssize_t
+ xgetxattr(const char *path, const char *name, void *value, size_t size, int symlink)
+ {
diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template
index 1d636be666..ec54798f76 100644
--- a/srcpkgs/zsh/template
+++ b/srcpkgs/zsh/template
@@ -1,9 +1,9 @@
# Template file for 'zsh'
pkgname=zsh
-version=5.0.3
-revision=2
+version=5.0.5
+revision=1
build_style=gnu-configure
-make_build_args="info"
+make_build_target="all info"
make_install_args="install.info"
configure_args="--enable-etcdir=/etc/zsh --enable-zshenv=/etc/zsh/zshenv
--enable-zlogin=/etc/zsh/zlogin --enable-zlogout=/etc/zsh/zlogout
@@ -14,12 +14,13 @@ configure_args="--enable-etcdir=/etc/zsh --enable-zshenv=/etc/zsh/zshenv
--enable-multibyte --enable-cap --with-tcsetpgrp"
hostmakedepends="pcre-devel>=8.30"
makedepends="gdbm-devel pcre-devel>=8.30 libcap-devel ncurses-devel"
+register_shell="/bin/zsh"
short_desc="The Z SHell"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.zsh.org"
license="zsh"
distfiles="http://www.zsh.org/pub/zsh-$version.tar.bz2"
-checksum=14c7685d5e5acbfe9436f2fe9578c17e0dbb00dfbd7d88c72b49930af91136cf
+checksum=6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83acfceba7ec82826cfa8eaf
pre_configure() {
# Set correct keymap path
@@ -38,10 +39,3 @@ pre_configure() {
post_install() {
vinstall LICENCE 644 usr/share/licenses/zsh
}
-
-zsh_package() {
- register_shell="/bin/zsh"
- pkg_install() {
- vmove all
- }
-}
diff --git a/srcpkgs/zsync/template b/srcpkgs/zsync/template
index cba332e9e2..c8fdf8e4b3 100644
--- a/srcpkgs/zsync/template
+++ b/srcpkgs/zsync/template
@@ -18,9 +18,3 @@ long_desc="
a control file (.zsync file) that describes the file to be downloaded, which
it uses to determine the blocks to fetch. This file is created once on the
server (and not for each request) and sits next to actual file to download."
-
-zsync_package() {
- pkg_install() {
- vmove usr
- }
-}
diff --git a/srcpkgs/zziplib/template b/srcpkgs/zziplib/template
index a4dd82b815..02c8d3f79c 100644
--- a/srcpkgs/zziplib/template
+++ b/srcpkgs/zziplib/template
@@ -29,9 +29,3 @@ zziplib-devel_package() {
vmove usr/share
}
}
-
-zziplib_package() {
- pkg_install() {
- vmove usr
- }
-}