summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/abuild/APKBUILD4
-rw-r--r--core/openssh/APKBUILD6
-rw-r--r--core/parted/APKBUILD26
-rw-r--r--core/parted/nocxx.patch15
-rw-r--r--core/uclibc/APKBUILD4
-rw-r--r--core/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch137
-rw-r--r--extra/clamsmtp/APKBUILD2
-rw-r--r--extra/libsoup/APKBUILD26
-rw-r--r--extra/python/APKBUILD6
-rw-r--r--extra/squid/APKBUILD10
-rw-r--r--extra/squid/squid.logrotate11
-rw-r--r--testing/gross-svn/APKBUILD2
-rw-r--r--testing/wpa_supplicant/APKBUILD38
-rw-r--r--testing/wpa_supplicant/config308
-rw-r--r--x11/dbus-glib/APKBUILD2
-rw-r--r--x11/dbus/APKBUILD2
-rw-r--r--x11/desktop-file-utils/APKBUILD14
-rw-r--r--x11/desktop-file-utils/nocxx.patch15
-rw-r--r--x11/font-adobe-100dpi/APKBUILD4
-rw-r--r--x11/font-adobe-75dpi/APKBUILD4
-rw-r--r--x11/font-adobe-utopia-100dpi/APKBUILD4
-rw-r--r--x11/font-adobe-utopia-75dpi/APKBUILD4
-rw-r--r--x11/font-adobe-utopia-type1/APKBUILD25
-rw-r--r--x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-install8
l---------x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-upgrade1
-rw-r--r--x11/font-arabic-misc/APKBUILD25
-rw-r--r--x11/font-arabic-misc/font-arabic-misc.post-install8
l---------x11/font-arabic-misc/font-arabic-misc.post-upgrade1
-rw-r--r--x11/font-bh-100dpi/APKBUILD4
-rw-r--r--x11/font-bh-75dpi/APKBUILD4
-rw-r--r--x11/font-bh-lucidatypewriter-100dpi/APKBUILD4
-rw-r--r--x11/font-bh-lucidatypewriter-75dpi/APKBUILD4
-rw-r--r--x11/font-bh-ttf/APKBUILD25
-rw-r--r--x11/font-bh-ttf/font-bh-ttf.post-install8
l---------x11/font-bh-ttf/font-bh-ttf.post-upgrade1
-rw-r--r--x11/font-bh-type1/APKBUILD25
-rw-r--r--x11/font-bh-type1/font-bh-type1.post-install8
l---------x11/font-bh-type1/font-bh-type1.post-upgrade1
-rw-r--r--x11/font-bitstream-100dpi/APKBUILD4
-rw-r--r--x11/font-bitstream-75dpi/APKBUILD4
-rw-r--r--x11/font-bitstream-speedo/APKBUILD25
-rw-r--r--x11/font-bitstream-speedo/font-bitstream-speedo.post-install8
l---------x11/font-bitstream-speedo/font-bitstream-speedo.post-upgrade1
-rw-r--r--x11/font-bitstream-type1/APKBUILD25
-rw-r--r--x11/font-bitstream-type1/font-bitstream-type1.post-install8
l---------x11/font-bitstream-type1/font-bitstream-type1.post-upgrade1
-rw-r--r--x11/font-cronyx-cyrillic/APKBUILD25
-rw-r--r--x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-install8
l---------x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-upgrade1
-rw-r--r--x11/font-cursor-misc/APKBUILD25
-rw-r--r--x11/font-cursor-misc/font-cursor-misc.post-install8
l---------x11/font-cursor-misc/font-cursor-misc.post-upgrade1
-rw-r--r--x11/font-daewoo-misc/APKBUILD25
-rw-r--r--x11/font-daewoo-misc/font-daewoo-misc.post-install8
l---------x11/font-daewoo-misc/font-daewoo-misc.post-upgrade1
-rw-r--r--x11/font-dec-misc/APKBUILD25
-rw-r--r--x11/font-dec-misc/font-dec-misc.post-install8
l---------x11/font-dec-misc/font-dec-misc.post-upgrade1
-rw-r--r--x11/font-ibm-type1/APKBUILD25
-rw-r--r--x11/font-ibm-type1/font-ibm-type1.post-install8
l---------x11/font-ibm-type1/font-ibm-type1.post-upgrade1
-rw-r--r--x11/font-isas-misc/APKBUILD25
-rw-r--r--x11/font-isas-misc/font-isas-misc.post-install8
l---------x11/font-isas-misc/font-isas-misc.post-upgrade1
-rw-r--r--x11/font-jis-misc/APKBUILD25
-rw-r--r--x11/font-jis-misc/font-jis-misc.post-install8
l---------x11/font-jis-misc/font-jis-misc.post-upgrade1
-rw-r--r--x11/font-micro-misc/APKBUILD25
-rw-r--r--x11/font-micro-misc/font-micro-misc.post-install8
l---------x11/font-micro-misc/font-micro-misc.post-upgrade1
-rw-r--r--x11/font-misc-cyrillic/APKBUILD25
-rw-r--r--x11/font-misc-cyrillic/font-misc-cyrillic.post-install8
l---------x11/font-misc-cyrillic/font-misc-cyrillic.post-upgrade1
-rw-r--r--x11/font-misc-ethiopic/APKBUILD25
-rw-r--r--x11/font-misc-ethiopic/font-misc-ethiopic.post-install8
l---------x11/font-misc-ethiopic/font-misc-ethiopic.post-upgrade1
-rw-r--r--x11/font-misc-meltho/APKBUILD25
-rw-r--r--x11/font-misc-meltho/font-misc-meltho.post-install8
l---------x11/font-misc-meltho/font-misc-meltho.post-upgrade1
-rw-r--r--x11/font-misc-misc/APKBUILD25
-rw-r--r--x11/font-misc-misc/font-misc-misc.post-install8
l---------x11/font-misc-misc/font-misc-misc.post-upgrade1
-rw-r--r--x11/font-mutt-misc/APKBUILD25
-rw-r--r--x11/font-mutt-misc/font-mutt-misc.post-install8
l---------x11/font-mutt-misc/font-mutt-misc.post-upgrade1
-rw-r--r--x11/font-schumacher-misc/APKBUILD25
-rw-r--r--x11/font-schumacher-misc/font-schumacher-misc.post-install8
l---------x11/font-schumacher-misc/font-schumacher-misc.post-upgrade1
-rw-r--r--x11/font-screen-cyrillic/APKBUILD25
-rw-r--r--x11/font-screen-cyrillic/font-screen-cyrillic.post-install8
l---------x11/font-screen-cyrillic/font-screen-cyrillic.post-upgrade1
-rw-r--r--x11/font-sony-misc/APKBUILD25
-rw-r--r--x11/font-sony-misc/font-sony-misc.post-install8
l---------x11/font-sony-misc/font-sony-misc.post-upgrade1
-rw-r--r--x11/font-sun-misc/APKBUILD25
-rw-r--r--x11/font-sun-misc/font-sun-misc.post-install8
l---------x11/font-sun-misc/font-sun-misc.post-upgrade1
-rw-r--r--x11/font-winitzki-cyrillic/APKBUILD25
-rw-r--r--x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-install8
l---------x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-upgrade1
-rw-r--r--x11/font-xfree86-type1/APKBUILD25
-rw-r--r--x11/font-xfree86-type1/font-xfree86-type1.post-install8
l---------x11/font-xfree86-type1/font-xfree86-type1.post-upgrade1
-rw-r--r--x11/gtk+/APKBUILD6
-rw-r--r--x11/libsoup/APKBUILD2
-rw-r--r--x11/midori/APKBUILD55
-rw-r--r--x11/midori/midori-0.1.5-fpic.patch53
-rw-r--r--x11/midori/midori.post-deinstall5
-rw-r--r--x11/midori/midori.post-install4
l---------x11/midori/midori.post-upgrade1
-rw-r--r--x11/webkit/APKBUILD18
-rw-r--r--x11/xorg-server/APKBUILD80
-rw-r--r--x11/xorg-server/nocxx.patch15
113 files changed, 1668 insertions, 89 deletions
diff --git a/core/abuild/APKBUILD b/core/abuild/APKBUILD
index 5bc22802d..a21c20514 100644
--- a/core/abuild/APKBUILD
+++ b/core/abuild/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
-pkgver=1.12
+pkgver=1.14
pkgrel=0
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
@@ -15,4 +15,4 @@ build() {
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
-md5sums="43b2be241db52c064191a70f103cd7ec abuild-1.12.tar.bz2"
+md5sums="25463a14946eab5b120851e8077679a5 abuild-1.14.tar.bz2"
diff --git a/core/openssh/APKBUILD b/core/openssh/APKBUILD
index 94965d5d2..1971d5dd6 100644
--- a/core/openssh/APKBUILD
+++ b/core/openssh/APKBUILD
@@ -1,7 +1,8 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=openssh
pkgver=5.1_p1
_myver=5.1p1
-pkgrel=1
+pkgrel=2
pkgdesc="Port of OpenBSD's free SSH release"
url="http://www.openssh.org/portable.html"
license="as-is"
@@ -16,6 +17,9 @@ source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.
build ()
{
cd $startdir/src/$pkgname-$_myver
+ sed -i -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
+ pathnames.h || return 1
+
./configure --prefix=/usr \
--with-mantype=man \
--mandir=/usr/share/man \
diff --git a/core/parted/APKBUILD b/core/parted/APKBUILD
new file mode 100644
index 000000000..dd1f2c967
--- /dev/null
+++ b/core/parted/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=parted
+pkgver=1.8.8
+pkgrel=0
+pkgdesc="Utility to create, destroy, resize, check and copy partitions"
+url="http://www.gnu.org/software/parted/parted.html"
+license="GPL3"
+subpackages="$pkgname-dev $pkgname-doc"
+depends="libuuid uclibc readline ncurses"
+makedepends="pkgconfig e2fsprogs-dev uclibc readline-dev ncurses-dev"
+source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+ nocxx.patch"
+
+build ()
+{
+ cd "$srcdir"/$pkgname-$pkgver
+ patch configure < ../nocxx.patch || return 1
+
+ ./configure --prefix=/usr \
+ --disable-debug \
+ --disable-Werror
+ make || return 1
+ make DESTDIR="$pkgdir" install
+}
+md5sums="0d494591731082ec57cc18627728124a parted-1.8.8.tar.gz
+28513788ba4d556ccd538867dc6205ab nocxx.patch"
diff --git a/core/parted/nocxx.patch b/core/parted/nocxx.patch
new file mode 100644
index 000000000..beb1ab900
--- /dev/null
+++ b/core/parted/nocxx.patch
@@ -0,0 +1,15 @@
+--- a/configure 2004-12-07 21:34:23.205172545 +0000
++++ b/configure 2004-12-07 21:37:17.726654782 +0000
+@@ -5148,10 +5148,8 @@
+ :
+ else
+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++See \`config.log' for more details." >&5;}
++ { echo "C++ sucks, ignoring ..." >&5; }; }
+ fi
+
+ ac_ext=cc
diff --git a/core/uclibc/APKBUILD b/core/uclibc/APKBUILD
index 8632ef896..cab1cb38a 100644
--- a/core/uclibc/APKBUILD
+++ b/core/uclibc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=uclibc
pkgver=0.9.30.1
-pkgrel=3
+pkgrel=4
pkgdesc="C library for developing embedded Linux systems"
url=http://uclibc.org
license="LGPL-2"
@@ -12,6 +12,7 @@ depends_dev="linux-headers"
source="http://uclibc.org/downloads/$_mynamever.tar.bz2
$pkgname-0.9.30.1-resolv.patch
+ uclibc-0.9.30.1-pthread_getattr_np.patch
uclibcconfig
"
@@ -44,4 +45,5 @@ build() {
md5sums="1a4b84e5536ad8170563ffa88c34679c uClibc-0.9.30.1.tar.bz2
ea91460617601b6e084ead66bc3948f5 uclibc-0.9.30.1-resolv.patch
+cf80c0d44a41e02f389be427ee615d61 uclibc-0.9.30.1-pthread_getattr_np.patch
a4512d5594f1b450ffbf2ff9eda6263b uclibcconfig"
diff --git a/core/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch b/core/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch
new file mode 100644
index 000000000..28469be23
--- /dev/null
+++ b/core/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch
@@ -0,0 +1,137 @@
+--- uClibc-0.9.30.1.orig/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h 2009-03-30 15:01:48.000000000 +0000
++++ uClibc-0.9.30.1/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h 2009-03-30 15:48:16.000000000 +0000
+@@ -288,16 +288,12 @@
+ __attr, size_t *__restrict __stacksize)
+ __THROW;
+
+-#if 0
+-/* Not yet implemented in uClibc! */
+-
+ #ifdef __USE_GNU
+ /* Initialize thread attribute *ATTR with attributes corresponding to the
+ already running thread TH. It shall be called on uninitialized ATTR
+ and destroyed with pthread_attr_destroy when no longer needed. */
+ extern int pthread_getattr_np (pthread_t __th, pthread_attr_t *__attr) __THROW;
+ #endif
+-#endif
+
+ /* Functions for scheduling control. */
+
+@@ -599,6 +595,11 @@
+ cancelled. */
+ extern void pthread_testcancel (void);
+
++/* Return the previously set address for the stack. */
++extern int pthread_attr_getstack (__const pthread_attr_t *__restrict __attr,
++ void **__restrict __stackaddr,
++ size_t *__restrict __stacksize) __THROW;
++
+
+ /* Install a cleanup handler: ROUTINE will be called with arguments ARG
+ when the thread is cancelled or calls pthread_exit. ROUTINE will also
+--- a/libpthread/linuxthreads.old/attr.c.orig 2007-11-22 16:55:08.000000000 +0000
++++ b/libpthread/linuxthreads.old/attr.c 2009-03-30 19:15:51.000000000 +0000
+@@ -38,6 +38,14 @@
+ libpthread_hidden_proto(pthread_attr_getscope)
+ libpthread_hidden_proto(pthread_attr_setscope)
+
++#include <sys/resource.h>
++#include <inttypes.h>
++#include <stdio.h>
++#include <stdio_ext.h>
++#include <stdlib.h>
++#include <sys/resource.h>
++
++
+ /* NOTE: With uClibc I don't think we need this versioning stuff.
+ * Therefore, define the function pthread_attr_init() here using
+ * a strong symbol. */
+@@ -235,4 +243,88 @@
+ *stacksize = attr->__stacksize;
+ return 0;
+ }
++
++
++extern int *__libc_stack_end;
++
+ weak_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize)
++int pthread_getattr_np(pthread_t thread, pthread_attr_t *attr)
++{
++ static void *stackBase = 0;
++ static size_t stackSize = 0;
++ int ret = 0;
++ /* Stack size limit. */
++ struct rlimit rl;
++
++ /* The safest way to get the top of the stack is to read
++ /proc/self/maps and locate the line into which
++ __libc_stack_end falls. */
++ FILE *fp = fopen("/proc/self/maps", "rc");
++ if (fp == NULL)
++ ret = errno;
++ /* We need the limit of the stack in any case. */
++ else if (getrlimit (RLIMIT_STACK, &rl) != 0)
++ ret = errno;
++ else {
++ /* We need no locking. */
++ __fsetlocking (fp, FSETLOCKING_BYCALLER);
++
++ /* Until we found an entry (which should always be the case)
++ mark the result as a failure. */
++ ret = ENOENT;
++
++ char *line = NULL;
++ size_t linelen = 0;
++ uintptr_t last_to = 0;
++
++ while (! feof_unlocked (fp)) {
++ if (getdelim (&line, &linelen, '\n', fp) <= 0)
++ break;
++
++ uintptr_t from;
++ uintptr_t to;
++ if (sscanf (line, "%x-%x", &from, &to) != 2)
++ continue;
++ if (from <= (uintptr_t) __libc_stack_end
++ && (uintptr_t) __libc_stack_end < to) {
++ /* Found the entry. Now we have the info we need. */
++ attr->__stacksize = rl.rlim_cur;
++#ifdef _STACK_GROWS_UP
++ /* Don't check to enforce a limit on the __stacksize */
++ attr->__stackaddr = (void *) from;
++#else
++ attr->__stackaddr = (void *) to;
++
++ /* The limit might be too high. */
++ if ((size_t) attr->__stacksize > (size_t) attr->__stackaddr - last_to)
++ attr->__stacksize = (size_t) attr->__stackaddr - last_to;
++#endif
++
++ /* We succeed and no need to look further. */
++ ret = 0;
++ break;
++ }
++ last_to = to;
++ }
++
++ fclose (fp);
++ free (line);
++ }
++ return ret;
++}
++
++int __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
++ size_t *stacksize)
++{
++ /* XXX This function has a stupid definition. The standard specifies
++ no error value but what is if no stack address was set? We simply
++ return the value we have in the member. */
++#ifndef _STACK_GROWS_UP
++ *stackaddr = (char *) attr->__stackaddr - attr->__stacksize;
++#else
++ *stackaddr = attr->__stackaddr;
++#endif
++ *stacksize = attr->__stacksize;
++ return 0;
++}
++weak_alias (__pthread_attr_getstack, pthread_attr_getstack)
diff --git a/extra/clamsmtp/APKBUILD b/extra/clamsmtp/APKBUILD
index 2620e611e..5402d0936 100644
--- a/extra/clamsmtp/APKBUILD
+++ b/extra/clamsmtp/APKBUILD
@@ -31,4 +31,4 @@ build() {
md5sums="b068ba6e444859782bbdd88f290c1abf clamsmtp-1.10.tar.gz
e84205681f64c07af9ec5b6a3dd8bc38 clamsmtp.confd
-601d13d29f4426735be9a0599bb94a77 clamsmtp.initd"
+161baf2fb444b67d8a08fbfe4375a12c clamsmtp.initd"
diff --git a/extra/libsoup/APKBUILD b/extra/libsoup/APKBUILD
deleted file mode 100644
index 59165b192..000000000
--- a/extra/libsoup/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libsoup
-pkgver=2.26.0
-pkgrel=0
-pkgdesc="Gnome HTTP Library"
-url="http://www.gnome.org"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="glib gnutls libxml2 uclibc libiconv"
-makedepends="glib-dev gnutls-dev libxml2-dev libiconv-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev libxml2-dev gnutls-dev"
-build ()
-{
- cd "$srcdir"/$pkgname-$pkgver
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --without-gnome \
- || return 1
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="9df9d2b3304213641d3214a774d75ee1 libsoup-2.26.0.tar.bz2"
diff --git a/extra/python/APKBUILD b/extra/python/APKBUILD
index f0fd187d5..852fb889b 100644
--- a/extra/python/APKBUILD
+++ b/extra/python/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=python
pkgver=2.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="A high-level scripting language"
url="http://www.python.org"
license="custom"
subpackages="$pkgname-dev $pkgname-doc"
-depends="db expat openssl zlib ncurses"
-makedepends="db-dev expat-dev openssl-dev zlib-dev ncurses-dev"
+depends="db expat openssl zlib ncurses uclibc"
+makedepends="db-dev expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev !gettext"
source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.bz2
$pkgname-2.6-internal-expat.patch
"
diff --git a/extra/squid/APKBUILD b/extra/squid/APKBUILD
index a4f72a5cc..62a8b6304 100644
--- a/extra/squid/APKBUILD
+++ b/extra/squid/APKBUILD
@@ -3,11 +3,11 @@
pkgname=squid
pkgver=2.7.6
_ver=2.7.STABLE6
-pkgrel=1
+pkgrel=2
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
license="GPL-2"
-depends="openssl $pkgname-errors-english"
+depends="openssl $pkgname-errors-english logrotate"
makedepends="openssl-dev perl-dev"
subpackages="$pkgname-doc
$pkgname-errors-armenian:errors_armenian
@@ -49,6 +49,7 @@ source="http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${_ver}.tar.bz2
squid.initd
squid.confd
squid-2.7-gentoo.patch
+ $pkgname.logrotate
"
build() {
@@ -76,6 +77,8 @@ build() {
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+ install -m644 -D "$srcdir"/$pkgname.logrotate \
+ "$pkgdir"/etc/logrotate.d/squid
}
@@ -262,4 +265,5 @@ errors_ukrainian_utf8() {
md5sums="6de3a6a7a56a7ecae092f2d31a04f039 squid-2.7.STABLE6.tar.bz2
d31f293cf10a90bc3d60aa6428889db5 squid.initd
44b052db7910f386ef88ddcf69c9ba4e squid.confd
-1d33108353d788b238d9a8877bf2e401 squid-2.7-gentoo.patch"
+1d33108353d788b238d9a8877bf2e401 squid-2.7-gentoo.patch
+58823e0b86bc2dc71d270208b7b284b4 squid.logrotate"
diff --git a/extra/squid/squid.logrotate b/extra/squid/squid.logrotate
new file mode 100644
index 000000000..fb3279e01
--- /dev/null
+++ b/extra/squid/squid.logrotate
@@ -0,0 +1,11 @@
+/var/log/squid/*.log {
+ daily
+ compress
+ rotate 5
+ missingok
+ nocreate
+ sharedscripts
+ postrotate
+ /usr/sbin/squid -k rotate
+ endscript
+}
diff --git a/testing/gross-svn/APKBUILD b/testing/gross-svn/APKBUILD
index 5c1b32d1d..c96d44069 100644
--- a/testing/gross-svn/APKBUILD
+++ b/testing/gross-svn/APKBUILD
@@ -31,7 +31,7 @@ build() {
}
md5sums="f2488ced5b47f359c3a1127d9ba3453c gross-svn-511.tar.bz2
-f553899b62bea50c25baf6f88afe69af gross-svn.initd
+37b83bd0d94f66c733d5562c0327b70f gross-svn.initd
5ca1c6e51c3243236e6564480b20279b gross-svn.confd
4b55d1c5534167946cc11376d1b05c34 gross-svn.post-install
8f6e45b98888dbb9971f7681bf431f6f gross-svn.pre-install"
diff --git a/testing/wpa_supplicant/APKBUILD b/testing/wpa_supplicant/APKBUILD
new file mode 100644
index 000000000..72c388d31
--- /dev/null
+++ b/testing/wpa_supplicant/APKBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=wpa_supplicant
+pkgver=0.5.11
+pkgrel=0
+pkgdesc="A utility providing key negotiation for WPA wireless networks"
+url="http://hostap.epitest.fi/wpa_supplicant"
+license="GPL"
+subpackages="$pkgname-doc"
+depends="openssl uclibc"
+makedepends="openssl-dev"
+source="http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
+ config
+ "
+
+build ()
+{
+ cd "$srcdir"/$pkgname-$pkgver
+ cp ../config ./.config
+ sed -i 's@/usr/local@$(PREFIX)@g' Makefile
+ sed -i 's@dynamic_eap_methods@@g' Makefile
+ make || return 1
+ make PREFIX=/usr DESTDIR="$pkgdir" install || return 1
+ install -Dm644 wpa_supplicant.conf "$pkgdir"/etc/wpa_supplicant.conf
+ install -Dm644 doc/docbook/wpa_supplicant.conf.5 \
+ "$pkgdir"/usr/share/man/man5/wpa_supplicant.conf.5 || return 1
+
+ for i in wpa_background wpa_cli wpa_passphrase wpa_supplicant; do
+ install -Dm644 doc/docbook/$i.8 \
+ "$pkgdir"/usr/share/man/man8/$i.8 || return 1
+ done
+# install -m755 -d ""$pkgdir"/usr/share/dbus-1/system-services"
+# install -m644 dbus-wpa_supplicant.service ""$pkgdir"/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" || return 1
+# sed -e 's/sbin/usr\/sbin/' -i ""$pkgdir"/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service" || return 1
+# install -m755 -d ""$pkgdir"/etc/dbus-1/system.d"
+# install -m644 dbus-wpa_supplicant.conf ""$pkgdir"/etc/dbus-1/system.d/fi.epitest.hostap.WPASupplicant.conf" || return 1
+}
+md5sums="ad320af63f735531878e592f1ffd9b06 wpa_supplicant-0.5.11.tar.gz
+3db583801e91fb409a5994a08ea31838 config"
diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config
new file mode 100644
index 000000000..315ee3a31
--- /dev/null
+++ b/testing/wpa_supplicant/config
@@ -0,0 +1,308 @@
+# Example wpa_supplicant build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cases, these lines should use += in order not
+# to override previous values of the variables.
+
+
+# Uncomment following two lines and fix the paths if you have installed OpenSSL
+# or GnuTLS in non-default location
+#CFLAGS += -I/usr/local/openssl/include
+#LIBS += -L/usr/local/openssl/lib
+
+# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
+# the kerberos files are not in the default include path. Following line can be
+# used to fix build issues on such systems (krb5.h not found).
+#CFLAGS += -I/usr/include/kerberos
+
+# Example configuration for various cross-compilation platforms
+
+#### sveasoft (e.g., for Linksys WRT54G) ######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
+#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
+###############################################################################
+
+#### openwrt (e.g., for Linksys WRT54G) #######################################
+#CC=mipsel-uclibc-gcc
+#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
+#CFLAGS += -Os
+#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
+# -I../WRT54GS/release/src/include
+#LIBS = -lssl
+###############################################################################
+
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for Agere driver
+#CONFIG_DRIVER_HERMES=y
+# Change include directories to match with the local setup
+#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
+#CFLAGS += -I../../include/wireless
+
+# Driver interface for madwifi driver
+#CONFIG_DRIVER_MADWIFI=y
+# Change include directories to match with the local setup
+#CFLAGS += -I../madwifi
+
+# Driver interface for Prism54 driver
+# (Note: Prism54 is not yet supported, i.e., this will not work as-is and is
+# for developers only)
+CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for ndiswrapper
+CONFIG_DRIVER_NDISWRAPPER=y
+
+# Driver interface for Atmel driver
+CONFIG_DRIVER_ATMEL=y
+
+# Driver interface for Broadcom driver
+#CONFIG_DRIVER_BROADCOM=y
+# Example path for wlioctl.h; change to match your configuration
+#CFLAGS += -I/opt/WRT54GS/release/src/include
+
+# Driver interface for Intel ipw2100/2200 driver
+CONFIG_DRIVER_IPW=y
+
+# Driver interface for generic Linux wireless extensions
+CONFIG_DRIVER_WEXT=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# Driver interface for Windows NDIS
+#CONFIG_DRIVER_NDIS=y
+#CFLAGS += -I/usr/include/w32api/ddk
+#LIBS += -L/usr/local/lib
+# For native build using mingw
+#CONFIG_NATIVE_WINDOWS=y
+# Additional directories for cross-compilation on Linux host for mingw target
+#CFLAGS += -I/opt/mingw/mingw32/include/ddk
+#LIBS += -L/opt/mingw/mingw32/lib
+#CC=mingw32-gcc
+# By default, driver_ndis uses WinPcap for low-level operations. This can be
+# replaced with the following option which replaces WinPcap calls with NDISUIO.
+# However, this requires that WZC is disabled (net stop wzcsvc) before starting
+# wpa_supplicant.
+# CONFIG_USE_NDISUIO=y
+
+# Driver interface for development testing
+#CONFIG_DRIVER_TEST=y
+
+# Driver interface for wired Ethernet drivers
+CONFIG_DRIVER_WIRED=y
+
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
+# included)
+CONFIG_IEEE8021X_EAPOL=y
+
+# EAP-MD5
+CONFIG_EAP_MD5=y
+
+# EAP-MSCHAPv2
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-TLS
+CONFIG_EAP_TLS=y
+
+# EAL-PEAP
+CONFIG_EAP_PEAP=y
+
+# EAP-TTLS
+CONFIG_EAP_TTLS=y
+
+# EAP-GTC
+CONFIG_EAP_GTC=y
+
+# EAP-OTP
+CONFIG_EAP_OTP=y
+
+# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
+#CONFIG_EAP_SIM=y
+
+# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
+#CONFIG_EAP_PSK=y
+
+# EAP-PAX
+#CONFIG_EAP_PAX=y
+
+# LEAP
+CONFIG_EAP_LEAP=y
+
+# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
+#CONFIG_EAP_AKA=y
+
+# EAP-SAKE
+#CONFIG_EAP_SAKE=y
+
+# EAP-GPSK
+#CONFIG_EAP_GPSK=y
+# Include support for optional SHA256 cipher suite in EAP-GPSK
+#CONFIG_EAP_GPSK_SHA256=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
+# engine.
+CONFIG_SMARTCARD=y
+
+# PC/SC interface for smartcards (USIM, GSM SIM)
+# Enable this if EAP-SIM or EAP-AKA is included
+#CONFIG_PCSC=y
+
+# Development testing
+#CONFIG_EAPOL_TEST=y
+
+# Replace native Linux implementation of packet sockets with libdnet/libpcap.
+# This will be automatically set for non-Linux OS.
+#CONFIG_DNET_PCAP=y
+
+# Select control interface backend for external programs, e.g, wpa_cli:
+# unix = UNIX domain sockets (default for Linux/*BSD)
+# udp = UDP sockets (default for Windows)
+# y = use default (backwards compatibility)
+# If this option is commented out, control interface is not included in the
+# build.
+CONFIG_CTRL_IFACE=y
+
+# Include support for GNU Readline and History Libraries in wpa_cli.
+# When building a wpa_cli binary for distribution, please note that these
+# libraries are licensed under GPL and as such, BSD license may not apply for
+# the resulting binary.
+#CONFIG_READLINE=y
+
+# Remove debugging code that is printing out debug message to stdout.
+# This can be used to reduce the size of the wpa_supplicant considerably
+# if debugging code is not needed. The size reduction can be around 35%
+# (e.g., 90 kB).
+#CONFIG_NO_STDOUT_DEBUG=y
+
+# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
+# 35-50 kB in code size.
+#CONFIG_NO_WPA=y
+
+# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
+# save about 1 kB in code size when building only WPA-Personal (no EAP support)
+# or 6 kB if building for WPA-Enterprise.
+#CONFIG_NO_WPA2=y
+
+# Remove AES extra functions. This can be used to reduce code size by about
+# 1.5 kB by removing extra AES modes that are not needed for commonly used
+# client configurations (they are needed for some EAP types).
+#CONFIG_NO_AES_EXTRAS=y
+
+# Select configuration backend:
+# file = text file (e.g., wpa_supplicant.conf)
+# winreg = Windows registry (see win_example.reg for an example)
+CONFIG_BACKEND=file
+
+# Select program entry point implementation:
+# main = UNIX/POSIX like main() function (default)
+# main_winsvc = Windows service (read parameters from registry)
+# main_none = Very basic example (development use only)
+#CONFIG_MAIN=main
+
+# Select wrapper for operatins system and C library specific functions
+# unix = UNIX/POSIX like systems (default)
+# win32 = Windows systems
+# none = Empty template
+#CONFIG_OS=unix
+
+# Select event loop implementation
+# eloop = select() loop (default)
+# eloop_win = Windows events and WaitForMultipleObject() loop
+# eloop_none = Empty template
+#CONFIG_ELOOP=eloop
+
+# Select layer 2 packet implementation
+# linux = Linux packet socket (default)
+# pcap = libpcap/libdnet/WinPcap
+# freebsd = FreeBSD libpcap
+# winpcap = WinPcap with receive thread
+# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
+# none = Empty template
+#CONFIG_L2_PACKET=linux
+
+# IEEE 802.11i/IEEE 802.11e STAKey negotiation for direct link connection
+#CONFIG_STAKEY=y
+
+# Proposed replacement for STAKey negotiation: PeerKey handshake for
+# Station to Station Link
+CONFIG_PEERKEY=y
+
+# Select TLS implementation
+# openssl = OpenSSL (default)
+# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
+# internal = Internal TLSv1 implementation (experimental)
+# none = Empty template
+#CONFIG_TLS=openssl
+
+# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
+# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
+# even though the core GnuTLS library is released under LGPL, this extra
+# library uses GPL and as such, the terms of GPL apply to the combination
+# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
+# apply for distribution of the resulting binary.
+#CONFIG_GNUTLS_EXTRA=y
+
+# If CONFIG_TLS=internal is used, additional library and include paths are
+# needed for LibTomCrypt and TomsFastMath.
+#LTC_PATH=/usr/src/libtomcrypt-1.11
+#TFM_PATH=/usr/src/tomsfastmath-0.09
+#CFLAGS += -I$(LTC_PATH)/src/headers
+#LIBS += -L$(LTC_PATH) -L$(TFM_PATH)
+#LIBS_p += -L$(LTC_PATH) -L$(TFM_PATH)
+
+# Integrate ndis_events.exe functionality into wpa_supplicant.
+# This is only for Windows builds and requires WMI-related header files and
+# WbemUuid.Lib from Platform SDK even when building with MinGW.
+#CONFIG_NDIS_EVENTS_INTEGRATED=y
+#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
+
+# Add support for DBus control interface
+#CONFIG_CTRL_IFACE_DBUS=y
+
+# Add support for loading EAP methods dynamically as shared libraries.
+# When this option is enabled, each EAP method can be either included
+# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
+# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
+# be loaded in the beginning of the wpa_supplicant configuration file
+# (see load_dynamic_eap parameter in the example file) before being used in
+# the network blocks.
+#
+# Note that some shared parts of EAP methods are included in the main program
+# and in order to be able to use dynamic EAP methods using these parts, the
+# main program must have been build with the EAP method enabled (=y or =dyn).
+# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
+# unless at least one of them was included in the main build to force inclusion
+# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
+# in the main build to be able to load these methods dynamically.
+#
+# Please also note that using dynamic libraries will increase the total binary
+# size. Thus, it may not be the best option for targets that have limited
+# amount of memory/flash.
+CONFIG_DYNAMIC_EAP_METHODS=y
+
+# Include client MLME (management frame processing).
+# This can be used to move MLME processing of Devicescape IEEE 802.11 stack
+# into user space.
+#CONFIG_CLIENT_MLME=y
+# Currently, driver_devicescape.c build requires some additional parameters
+# to be able to include some of the kernel header files. Following lines can
+# be used to set these (WIRELESS_DEV must point to the root directory of the
+# wireless-dev.git tree).
+WIRELESS_DEV=/lib/modules/2.6.27-ARCH/build
+CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
diff --git a/x11/dbus-glib/APKBUILD b/x11/dbus-glib/APKBUILD
index cf583b15a..b0e68bd98 100644
--- a/x11/dbus-glib/APKBUILD
+++ b/x11/dbus-glib/APKBUILD
@@ -7,7 +7,7 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings"
license="GPL"
subpackages="$pkgname-dev $pkgname-doc"
depends="dbus glib libiconv expat gettext"
-makedepends="pkgconfig dbus-dev glib-dev libiconv-dev gettext-dev"
+makedepends="pkgconfig dbus-dev glib-dev libiconv-dev gettext-dev g++ expat-dev"
source="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
depends_dev="glib-dev dbus-dev"
diff --git a/x11/dbus/APKBUILD b/x11/dbus/APKBUILD
index 399b1fe95..102ff98d5 100644
--- a/x11/dbus/APKBUILD
+++ b/x11/dbus/APKBUILD
@@ -7,7 +7,7 @@ url="http://www.freedesktop.org/Software/dbus"
license="GPL custom"
subpackages="$pkgname-dev $pkgname-doc"
depends="uclibc expat libx11"
-makedepends="expat-dev libx11-dev pkgconfig"
+makedepends="expat-dev libx11-dev pkgconfig g++"
install="$pkgname.pre-install"
source="http://$pkgname.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
$pkgname.initd
diff --git a/x11/desktop-file-utils/APKBUILD b/x11/desktop-file-utils/APKBUILD
index 6c65eb147..7ff0ee308 100644
--- a/x11/desktop-file-utils/APKBUILD
+++ b/x11/desktop-file-utils/APKBUILD
@@ -5,15 +5,19 @@ pkgrel=0
pkgdesc="Command line utilities for working with desktop entries"
url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
license="GPL"
-depends="glib uclibc libiconv"
-makedepends="glib-dev libiconv-dev"
-source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz"
+depends="glib uclibc libiconv gettext"
+makedepends="glib-dev libiconv-dev gettext-dev pkgconfig"
+source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz
+ nocxx.patch"
build ()
{
- cd "$srcdir/desktop-file-utils-$pkgver"
+ cd "$srcdir"/desktop-file-utils-$pkgver
+ patch configure < ../nocxx.patch || return 1
+
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="2fe8ebe222fc33cd4a959415495b7eed desktop-file-utils-0.15.tar.gz"
+md5sums="2fe8ebe222fc33cd4a959415495b7eed desktop-file-utils-0.15.tar.gz
+28513788ba4d556ccd538867dc6205ab nocxx.patch"
diff --git a/x11/desktop-file-utils/nocxx.patch b/x11/desktop-file-utils/nocxx.patch
new file mode 100644
index 000000000..beb1ab900
--- /dev/null
+++ b/x11/desktop-file-utils/nocxx.patch
@@ -0,0 +1,15 @@
+--- a/configure 2004-12-07 21:34:23.205172545 +0000
++++ b/configure 2004-12-07 21:37:17.726654782 +0000
+@@ -5148,10 +5148,8 @@
+ :
+ else
+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++See \`config.log' for more details." >&5;}
++ { echo "C++ sucks, ignoring ..." >&5; }; }
+ fi
+
+ ac_ext=cc
diff --git a/x11/font-adobe-100dpi/APKBUILD b/x11/font-adobe-100dpi/APKBUILD
index ad0827f99..8e4d7a9f9 100644
--- a/x11/font-adobe-100dpi/APKBUILD
+++ b/x11/font-adobe-100dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-100dpi
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.org adobe 100dpi font"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/100dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="443acfe70e26716282f9068730fe92c4 font-adobe-100dpi-1.0.0.tar.bz2
diff --git a/x11/font-adobe-75dpi/APKBUILD b/x11/font-adobe-75dpi/APKBUILD
index 253728ceb..d261ccf46 100644
--- a/x11/font-adobe-75dpi/APKBUILD
+++ b/x11/font-adobe-75dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-75dpi
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.org adobe 75dpi font"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/75dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="813b5d3723c84388a938ab6732e1329c font-adobe-75dpi-1.0.0.tar.bz2
diff --git a/x11/font-adobe-utopia-100dpi/APKBUILD b/x11/font-adobe-utopia-100dpi/APKBUILD
index adddf48da..317207525 100644
--- a/x11/font-adobe-utopia-100dpi/APKBUILD
+++ b/x11/font-adobe-utopia-100dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-utopia-100dpi
pkgver=1.0.1
-pkgrel=0
+pkgrel=1
pkgdesc="X.org adobe 100dpi font"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/100dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="5d28a30efef966f8dbbaff9a6619f01a font-adobe-utopia-100dpi-1.0.1.tar.bz2
diff --git a/x11/font-adobe-utopia-75dpi/APKBUILD b/x11/font-adobe-utopia-75dpi/APKBUILD
index 48f1df488..444100f9b 100644
--- a/x11/font-adobe-utopia-75dpi/APKBUILD
+++ b/x11/font-adobe-utopia-75dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-adobe-utopia-75dpi
pkgver=1.0.1
-pkgrel=0
+pkgrel=1
pkgdesc="X.org adobe 75dpi font"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/75dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="dd912284e4750023f9682812532fa033 font-adobe-utopia-75dpi-1.0.1.tar.bz2
diff --git a/x11/font-adobe-utopia-type1/APKBUILD b/x11/font-adobe-utopia-type1/APKBUILD
new file mode 100644
index 000000000..e336226be
--- /dev/null
+++ b/x11/font-adobe-utopia-type1/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-adobe-utopia-type1
+pkgver=1.0.1
+pkgrel=0
+pkgdesc="X.org adobe utopia-type1 fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/utopia-type1
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="aa7ff4bd20b961afda9c15d103b972a5 font-adobe-utopia-type1-1.0.1.tar.bz2
+0d164813aa81019f31f2e3ac7c0c82bf font-adobe-utopia-type1.post-install
+0d164813aa81019f31f2e3ac7c0c82bf font-adobe-utopia-type1.post-upgrade"
diff --git a/x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-install b/x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-install
new file mode 100644
index 000000000..f5162235c
--- /dev/null
+++ b/x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/utopia-type1
+mkfontdir /usr/share/fonts/utopia-type1
+echo "done."
+
diff --git a/x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-upgrade b/x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-upgrade
new file mode 120000
index 000000000..da36a1f83
--- /dev/null
+++ b/x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-upgrade
@@ -0,0 +1 @@
+font-adobe-utopia-type1.post-install \ No newline at end of file
diff --git a/x11/font-arabic-misc/APKBUILD b/x11/font-arabic-misc/APKBUILD
new file mode 100644
index 000000000..754008eab
--- /dev/null
+++ b/x11/font-arabic-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-arabic-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="81595016e2ff859716fc256ebb136ba6 font-arabic-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-arabic-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-arabic-misc.post-upgrade"
diff --git a/x11/font-arabic-misc/font-arabic-misc.post-install b/x11/font-arabic-misc/font-arabic-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-arabic-misc/font-arabic-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-arabic-misc/font-arabic-misc.post-upgrade b/x11/font-arabic-misc/font-arabic-misc.post-upgrade
new file mode 120000
index 000000000..bdd62b20d
--- /dev/null
+++ b/x11/font-arabic-misc/font-arabic-misc.post-upgrade
@@ -0,0 +1 @@
+font-arabic-misc.post-install \ No newline at end of file
diff --git a/x11/font-bh-100dpi/APKBUILD b/x11/font-bh-100dpi/APKBUILD
index 81bf2c6d2..b6fb27efe 100644
--- a/x11/font-bh-100dpi/APKBUILD
+++ b/x11/font-bh-100dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bh-100dpi
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org Bigelow & Holmes bitmap fonts"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/100dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="e5592de74a5c04e3a2608800dd079197 font-bh-100dpi-1.0.0.tar.bz2
diff --git a/x11/font-bh-75dpi/APKBUILD b/x11/font-bh-75dpi/APKBUILD
index bc0bba01d..504762bf7 100644
--- a/x11/font-bh-75dpi/APKBUILD
+++ b/x11/font-bh-75dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bh-75dpi
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org Bigelow & Holmes bitmap fonts"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/75dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="6e51cd02f4ce32e1393e34ab17a9b211 font-bh-75dpi-1.0.0.tar.bz2
diff --git a/x11/font-bh-lucidatypewriter-100dpi/APKBUILD b/x11/font-bh-lucidatypewriter-100dpi/APKBUILD
index 0db4578dd..7f6e81587 100644
--- a/x11/font-bh-lucidatypewriter-100dpi/APKBUILD
+++ b/x11/font-bh-lucidatypewriter-100dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bh-lucidatypewriter-100dpi
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org Bigelow & Holmes Lucida bitmap fonts"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/100dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="c44d3f730564da465993e9292a33c235 font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
diff --git a/x11/font-bh-lucidatypewriter-75dpi/APKBUILD b/x11/font-bh-lucidatypewriter-75dpi/APKBUILD
index be28db49f..fe6e32784 100644
--- a/x11/font-bh-lucidatypewriter-75dpi/APKBUILD
+++ b/x11/font-bh-lucidatypewriter-75dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bh-lucidatypewriter-75dpi
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org Bigelow & Holmes Lucida bitmap fonts"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/75dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="fdd9be5b9db94ef363a33e39b7977e2b font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
diff --git a/x11/font-bh-ttf/APKBUILD b/x11/font-bh-ttf/APKBUILD
new file mode 100644
index 000000000..e019aa2f6
--- /dev/null
+++ b/x11/font-bh-ttf/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-bh-ttf
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org bh TTF fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/TTF
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="ad43cf739b3d46ba1e7dc778a0608a52 font-bh-ttf-1.0.0.tar.bz2
+63cff3d913fb3aecdb43942649ffedf4 font-bh-ttf.post-install
+63cff3d913fb3aecdb43942649ffedf4 font-bh-ttf.post-upgrade"
diff --git a/x11/font-bh-ttf/font-bh-ttf.post-install b/x11/font-bh-ttf/font-bh-ttf.post-install
new file mode 100644
index 000000000..562441683
--- /dev/null
+++ b/x11/font-bh-ttf/font-bh-ttf.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/TTF
+mkfontdir /usr/share/fonts/TTF
+echo "done."
+
diff --git a/x11/font-bh-ttf/font-bh-ttf.post-upgrade b/x11/font-bh-ttf/font-bh-ttf.post-upgrade
new file mode 120000
index 000000000..d05854397
--- /dev/null
+++ b/x11/font-bh-ttf/font-bh-ttf.post-upgrade
@@ -0,0 +1 @@
+font-bh-ttf.post-install \ No newline at end of file
diff --git a/x11/font-bh-type1/APKBUILD b/x11/font-bh-type1/APKBUILD
new file mode 100644
index 000000000..c0388e7bd
--- /dev/null
+++ b/x11/font-bh-type1/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-bh-type1
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org bh Type1 fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/Type1
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="46588b22678e440741d6220bc3945cbf font-bh-type1-1.0.0.tar.bz2
+633c958b3dbebf92fb122eb5033e9557 font-bh-type1.post-install
+633c958b3dbebf92fb122eb5033e9557 font-bh-type1.post-upgrade"
diff --git a/x11/font-bh-type1/font-bh-type1.post-install b/x11/font-bh-type1/font-bh-type1.post-install
new file mode 100644
index 000000000..0d2105713
--- /dev/null
+++ b/x11/font-bh-type1/font-bh-type1.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/Type1
+mkfontdir /usr/share/fonts/Type1
+echo "done."
+
diff --git a/x11/font-bh-type1/font-bh-type1.post-upgrade b/x11/font-bh-type1/font-bh-type1.post-upgrade
new file mode 120000
index 000000000..f687ceadf
--- /dev/null
+++ b/x11/font-bh-type1/font-bh-type1.post-upgrade
@@ -0,0 +1 @@
+font-bh-type1.post-install \ No newline at end of file
diff --git a/x11/font-bitstream-100dpi/APKBUILD b/x11/font-bitstream-100dpi/APKBUILD
index c68ef3b46..57962adf0 100644
--- a/x11/font-bitstream-100dpi/APKBUILD
+++ b/x11/font-bitstream-100dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bitstream-100dpi
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org Bitstream bitmap fonts"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/100dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="173352ddec3d26e2b91df1edcf1ae85b font-bitstream-100dpi-1.0.0.tar.bz2
diff --git a/x11/font-bitstream-75dpi/APKBUILD b/x11/font-bitstream-75dpi/APKBUILD
index b89f2fdb6..738b5f926 100644
--- a/x11/font-bitstream-75dpi/APKBUILD
+++ b/x11/font-bitstream-75dpi/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=font-bitstream-75dpi
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org Bitstream bitmap fonts"
url="http://xorg.freedesktop.org/"
license="custom"
@@ -17,7 +17,7 @@ build() {
--with-mapfiles=/usr/share/fonts/util \
--with-fontdir=/usr/share/fonts/75dpi
make || return 1
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
}
md5sums="beb476657d50d07d17eef7c325a5ed08 font-bitstream-75dpi-1.0.0.tar.bz2
diff --git a/x11/font-bitstream-speedo/APKBUILD b/x11/font-bitstream-speedo/APKBUILD
new file mode 100644
index 000000000..e87648a78
--- /dev/null
+++ b/x11/font-bitstream-speedo/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-bitstream-speedo
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org bitstream Speedo fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/Speedo
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="1399dc18aeb9571b0951d9570ea1059d font-bitstream-speedo-1.0.0.tar.bz2
+13b0e85f86cbb1b434f366b82727b805 font-bitstream-speedo.post-install
+13b0e85f86cbb1b434f366b82727b805 font-bitstream-speedo.post-upgrade"
diff --git a/x11/font-bitstream-speedo/font-bitstream-speedo.post-install b/x11/font-bitstream-speedo/font-bitstream-speedo.post-install
new file mode 100644
index 000000000..fabb00b41
--- /dev/null
+++ b/x11/font-bitstream-speedo/font-bitstream-speedo.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/Speedo
+mkfontdir /usr/share/fonts/Speedo
+echo "done."
+
diff --git a/x11/font-bitstream-speedo/font-bitstream-speedo.post-upgrade b/x11/font-bitstream-speedo/font-bitstream-speedo.post-upgrade
new file mode 120000
index 000000000..0174eb090
--- /dev/null
+++ b/x11/font-bitstream-speedo/font-bitstream-speedo.post-upgrade
@@ -0,0 +1 @@
+font-bitstream-speedo.post-install \ No newline at end of file
diff --git a/x11/font-bitstream-type1/APKBUILD b/x11/font-bitstream-type1/APKBUILD
new file mode 100644
index 000000000..647307043
--- /dev/null
+++ b/x11/font-bitstream-type1/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-bitstream-type1
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org bitstream Type1 fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/Type1
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="6610475e2e231242f8f2122a709c3695 font-bitstream-type1-1.0.0.tar.bz2
+633c958b3dbebf92fb122eb5033e9557 font-bitstream-type1.post-install
+633c958b3dbebf92fb122eb5033e9557 font-bitstream-type1.post-upgrade"
diff --git a/x11/font-bitstream-type1/font-bitstream-type1.post-install b/x11/font-bitstream-type1/font-bitstream-type1.post-install
new file mode 100644
index 000000000..0d2105713
--- /dev/null
+++ b/x11/font-bitstream-type1/font-bitstream-type1.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/Type1
+mkfontdir /usr/share/fonts/Type1
+echo "done."
+
diff --git a/x11/font-bitstream-type1/font-bitstream-type1.post-upgrade b/x11/font-bitstream-type1/font-bitstream-type1.post-upgrade
new file mode 120000
index 000000000..691d0bf97
--- /dev/null
+++ b/x11/font-bitstream-type1/font-bitstream-type1.post-upgrade
@@ -0,0 +1 @@
+font-bitstream-type1.post-install \ No newline at end of file
diff --git a/x11/font-cronyx-cyrillic/APKBUILD b/x11/font-cronyx-cyrillic/APKBUILD
new file mode 100644
index 000000000..c36eb9149
--- /dev/null
+++ b/x11/font-cronyx-cyrillic/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-cronyx-cyrillic
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org cronyx cyrillic fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/cyrillic
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="22b451e7230b8c003cfc496ee2d360cc font-cronyx-cyrillic-1.0.0.tar.bz2
+e738ad911ff453b7c957007832845f21 font-cronyx-cyrillic.post-install
+e738ad911ff453b7c957007832845f21 font-cronyx-cyrillic.post-upgrade"
diff --git a/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-install b/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-install
new file mode 100644
index 000000000..0d2f0d77c
--- /dev/null
+++ b/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/cyrillic
+mkfontdir /usr/share/fonts/cyrillic
+echo "done."
+
diff --git a/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-upgrade b/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-upgrade
new file mode 120000
index 000000000..1198ffd25
--- /dev/null
+++ b/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-upgrade
@@ -0,0 +1 @@
+font-cronyx-cyrillic.post-install \ No newline at end of file
diff --git a/x11/font-cursor-misc/APKBUILD b/x11/font-cursor-misc/APKBUILD
new file mode 100644
index 000000000..7a819cd84
--- /dev/null
+++ b/x11/font-cursor-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-cursor-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="305fa22cdfefb8f80babd711051a534b font-cursor-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-cursor-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-cursor-misc.post-upgrade"
diff --git a/x11/font-cursor-misc/font-cursor-misc.post-install b/x11/font-cursor-misc/font-cursor-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-cursor-misc/font-cursor-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-cursor-misc/font-cursor-misc.post-upgrade b/x11/font-cursor-misc/font-cursor-misc.post-upgrade
new file mode 120000
index 000000000..becaa73e3
--- /dev/null
+++ b/x11/font-cursor-misc/font-cursor-misc.post-upgrade
@@ -0,0 +1 @@
+font-cursor-misc.post-install \ No newline at end of file
diff --git a/x11/font-daewoo-misc/APKBUILD b/x11/font-daewoo-misc/APKBUILD
new file mode 100644
index 000000000..deeeaaaf5
--- /dev/null
+++ b/x11/font-daewoo-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-daewoo-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="61f9eab48c619af5494d3e384d8d7d79 font-daewoo-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-daewoo-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-daewoo-misc.post-upgrade"
diff --git a/x11/font-daewoo-misc/font-daewoo-misc.post-install b/x11/font-daewoo-misc/font-daewoo-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-daewoo-misc/font-daewoo-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-daewoo-misc/font-daewoo-misc.post-upgrade b/x11/font-daewoo-misc/font-daewoo-misc.post-upgrade
new file mode 120000
index 000000000..cba2bf1f0
--- /dev/null
+++ b/x11/font-daewoo-misc/font-daewoo-misc.post-upgrade
@@ -0,0 +1 @@
+font-daewoo-misc.post-install \ No newline at end of file
diff --git a/x11/font-dec-misc/APKBUILD b/x11/font-dec-misc/APKBUILD
new file mode 100644
index 000000000..6b6a79bf0
--- /dev/null
+++ b/x11/font-dec-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-dec-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="284e554db1c64fb7580a06df01444a2b font-dec-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-dec-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-dec-misc.post-upgrade"
diff --git a/x11/font-dec-misc/font-dec-misc.post-install b/x11/font-dec-misc/font-dec-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-dec-misc/font-dec-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-dec-misc/font-dec-misc.post-upgrade b/x11/font-dec-misc/font-dec-misc.post-upgrade
new file mode 120000
index 000000000..80c5b14b6
--- /dev/null
+++ b/x11/font-dec-misc/font-dec-misc.post-upgrade
@@ -0,0 +1 @@
+font-dec-misc.post-install \ No newline at end of file
diff --git a/x11/font-ibm-type1/APKBUILD b/x11/font-ibm-type1/APKBUILD
new file mode 100644
index 000000000..880105ffc
--- /dev/null
+++ b/x11/font-ibm-type1/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-ibm-type1
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org ibm Type1 fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/Type1
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="8e8733051371e2b51123376b49f5d3ea font-ibm-type1-1.0.0.tar.bz2
+633c958b3dbebf92fb122eb5033e9557 font-ibm-type1.post-install
+633c958b3dbebf92fb122eb5033e9557 font-ibm-type1.post-upgrade"
diff --git a/x11/font-ibm-type1/font-ibm-type1.post-install b/x11/font-ibm-type1/font-ibm-type1.post-install
new file mode 100644
index 000000000..0d2105713
--- /dev/null
+++ b/x11/font-ibm-type1/font-ibm-type1.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/Type1
+mkfontdir /usr/share/fonts/Type1
+echo "done."
+
diff --git a/x11/font-ibm-type1/font-ibm-type1.post-upgrade b/x11/font-ibm-type1/font-ibm-type1.post-upgrade
new file mode 120000
index 000000000..4fff34efb
--- /dev/null
+++ b/x11/font-ibm-type1/font-ibm-type1.post-upgrade
@@ -0,0 +1 @@
+font-ibm-type1.post-install \ No newline at end of file
diff --git a/x11/font-isas-misc/APKBUILD b/x11/font-isas-misc/APKBUILD
new file mode 100644
index 000000000..6acb846d8
--- /dev/null
+++ b/x11/font-isas-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-isas-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="ec709a96b64b497a5cb5658c93bd38dc font-isas-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-isas-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-isas-misc.post-upgrade"
diff --git a/x11/font-isas-misc/font-isas-misc.post-install b/x11/font-isas-misc/font-isas-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-isas-misc/font-isas-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-isas-misc/font-isas-misc.post-upgrade b/x11/font-isas-misc/font-isas-misc.post-upgrade
new file mode 120000
index 000000000..ce06bdb3d
--- /dev/null
+++ b/x11/font-isas-misc/font-isas-misc.post-upgrade
@@ -0,0 +1 @@
+font-isas-misc.post-install \ No newline at end of file
diff --git a/x11/font-jis-misc/APKBUILD b/x11/font-jis-misc/APKBUILD
new file mode 100644
index 000000000..b19caf81b
--- /dev/null
+++ b/x11/font-jis-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-jis-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="61febb49a71065723a1fba17cbf23c67 font-jis-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-jis-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-jis-misc.post-upgrade"
diff --git a/x11/font-jis-misc/font-jis-misc.post-install b/x11/font-jis-misc/font-jis-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-jis-misc/font-jis-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-jis-misc/font-jis-misc.post-upgrade b/x11/font-jis-misc/font-jis-misc.post-upgrade
new file mode 120000
index 000000000..a1e2ce0df
--- /dev/null
+++ b/x11/font-jis-misc/font-jis-misc.post-upgrade
@@ -0,0 +1 @@
+font-jis-misc.post-install \ No newline at end of file
diff --git a/x11/font-micro-misc/APKBUILD b/x11/font-micro-misc/APKBUILD
new file mode 100644
index 000000000..17285c268
--- /dev/null
+++ b/x11/font-micro-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-micro-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="8c8bffd7540f05caa0dbb4e6e1d6c58e font-micro-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-micro-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-micro-misc.post-upgrade"
diff --git a/x11/font-micro-misc/font-micro-misc.post-install b/x11/font-micro-misc/font-micro-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-micro-misc/font-micro-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-micro-misc/font-micro-misc.post-upgrade b/x11/font-micro-misc/font-micro-misc.post-upgrade
new file mode 120000
index 000000000..8c6b42ccb
--- /dev/null
+++ b/x11/font-micro-misc/font-micro-misc.post-upgrade
@@ -0,0 +1 @@
+font-micro-misc.post-install \ No newline at end of file
diff --git a/x11/font-misc-cyrillic/APKBUILD b/x11/font-misc-cyrillic/APKBUILD
new file mode 100644
index 000000000..ccbc3c3d3
--- /dev/null
+++ b/x11/font-misc-cyrillic/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-misc-cyrillic
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org misc cyrillic fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/cyrillic
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="3596907d7a2a99c81d8de99bc4552b6a font-misc-cyrillic-1.0.0.tar.bz2
+e738ad911ff453b7c957007832845f21 font-misc-cyrillic.post-install
+e738ad911ff453b7c957007832845f21 font-misc-cyrillic.post-upgrade"
diff --git a/x11/font-misc-cyrillic/font-misc-cyrillic.post-install b/x11/font-misc-cyrillic/font-misc-cyrillic.post-install
new file mode 100644
index 000000000..0d2f0d77c
--- /dev/null
+++ b/x11/font-misc-cyrillic/font-misc-cyrillic.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/cyrillic
+mkfontdir /usr/share/fonts/cyrillic
+echo "done."
+
diff --git a/x11/font-misc-cyrillic/font-misc-cyrillic.post-upgrade b/x11/font-misc-cyrillic/font-misc-cyrillic.post-upgrade
new file mode 120000
index 000000000..ca0af793d
--- /dev/null
+++ b/x11/font-misc-cyrillic/font-misc-cyrillic.post-upgrade
@@ -0,0 +1 @@
+font-misc-cyrillic.post-install \ No newline at end of file
diff --git a/x11/font-misc-ethiopic/APKBUILD b/x11/font-misc-ethiopic/APKBUILD
new file mode 100644
index 000000000..9de203b45
--- /dev/null
+++ b/x11/font-misc-ethiopic/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-misc-ethiopic
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org misc ethiopic fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/ethiopic
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="0b271fc617087d77560bdca20c0cdbb0 font-misc-ethiopic-1.0.0.tar.bz2
+da6076d83300b9ae75263939b0ae751d font-misc-ethiopic.post-install
+da6076d83300b9ae75263939b0ae751d font-misc-ethiopic.post-upgrade"
diff --git a/x11/font-misc-ethiopic/font-misc-ethiopic.post-install b/x11/font-misc-ethiopic/font-misc-ethiopic.post-install
new file mode 100644
index 000000000..ebd2bbfad
--- /dev/null
+++ b/x11/font-misc-ethiopic/font-misc-ethiopic.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/ethiopic
+mkfontdir /usr/share/fonts/ethiopic
+echo "done."
+
diff --git a/x11/font-misc-ethiopic/font-misc-ethiopic.post-upgrade b/x11/font-misc-ethiopic/font-misc-ethiopic.post-upgrade
new file mode 120000
index 000000000..cf8f78d4d
--- /dev/null
+++ b/x11/font-misc-ethiopic/font-misc-ethiopic.post-upgrade
@@ -0,0 +1 @@
+font-misc-ethiopic.post-install \ No newline at end of file
diff --git a/x11/font-misc-meltho/APKBUILD b/x11/font-misc-meltho/APKBUILD
new file mode 100644
index 000000000..f63fb9bc8
--- /dev/null
+++ b/x11/font-misc-meltho/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-misc-meltho
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org misc meltho fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/meltho
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="ccb212a7badf7aefdc9f9a92af428d32 font-misc-meltho-1.0.0.tar.bz2
+e522903aeb3ae73669a389bdf9f0f087 font-misc-meltho.post-install
+e522903aeb3ae73669a389bdf9f0f087 font-misc-meltho.post-upgrade"
diff --git a/x11/font-misc-meltho/font-misc-meltho.post-install b/x11/font-misc-meltho/font-misc-meltho.post-install
new file mode 100644
index 000000000..9424edc7e
--- /dev/null
+++ b/x11/font-misc-meltho/font-misc-meltho.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/meltho
+mkfontdir /usr/share/fonts/meltho
+echo "done."
+
diff --git a/x11/font-misc-meltho/font-misc-meltho.post-upgrade b/x11/font-misc-meltho/font-misc-meltho.post-upgrade
new file mode 120000
index 000000000..97a56879f
--- /dev/null
+++ b/x11/font-misc-meltho/font-misc-meltho.post-upgrade
@@ -0,0 +1 @@
+font-misc-meltho.post-install \ No newline at end of file
diff --git a/x11/font-misc-misc/APKBUILD b/x11/font-misc-misc/APKBUILD
new file mode 100644
index 000000000..abbd6e8e4
--- /dev/null
+++ b/x11/font-misc-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-misc-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="2a57f6188c41d4bc1b88ca3d08ad011d font-misc-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-misc-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-misc-misc.post-upgrade"
diff --git a/x11/font-misc-misc/font-misc-misc.post-install b/x11/font-misc-misc/font-misc-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-misc-misc/font-misc-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-misc-misc/font-misc-misc.post-upgrade b/x11/font-misc-misc/font-misc-misc.post-upgrade
new file mode 120000
index 000000000..e2e3545af
--- /dev/null
+++ b/x11/font-misc-misc/font-misc-misc.post-upgrade
@@ -0,0 +1 @@
+font-misc-misc.post-install \ No newline at end of file
diff --git a/x11/font-mutt-misc/APKBUILD b/x11/font-mutt-misc/APKBUILD
new file mode 100644
index 000000000..3cf00aedd
--- /dev/null
+++ b/x11/font-mutt-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-mutt-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="648b409b7eb78ad1cd5f6d7fac3eef88 font-mutt-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-mutt-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-mutt-misc.post-upgrade"
diff --git a/x11/font-mutt-misc/font-mutt-misc.post-install b/x11/font-mutt-misc/font-mutt-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-mutt-misc/font-mutt-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-mutt-misc/font-mutt-misc.post-upgrade b/x11/font-mutt-misc/font-mutt-misc.post-upgrade
new file mode 120000
index 000000000..b23625ff3
--- /dev/null
+++ b/x11/font-mutt-misc/font-mutt-misc.post-upgrade
@@ -0,0 +1 @@
+font-mutt-misc.post-install \ No newline at end of file
diff --git a/x11/font-schumacher-misc/APKBUILD b/x11/font-schumacher-misc/APKBUILD
new file mode 100644
index 000000000..1f455b752
--- /dev/null
+++ b/x11/font-schumacher-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-schumacher-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="f1c6063d2fadc57e696a0aab69afd6e0 font-schumacher-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-schumacher-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-schumacher-misc.post-upgrade"
diff --git a/x11/font-schumacher-misc/font-schumacher-misc.post-install b/x11/font-schumacher-misc/font-schumacher-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-schumacher-misc/font-schumacher-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-schumacher-misc/font-schumacher-misc.post-upgrade b/x11/font-schumacher-misc/font-schumacher-misc.post-upgrade
new file mode 120000
index 000000000..453ab67fd
--- /dev/null
+++ b/x11/font-schumacher-misc/font-schumacher-misc.post-upgrade
@@ -0,0 +1 @@
+font-schumacher-misc.post-install \ No newline at end of file
diff --git a/x11/font-screen-cyrillic/APKBUILD b/x11/font-screen-cyrillic/APKBUILD
new file mode 100644
index 000000000..07965a703
--- /dev/null
+++ b/x11/font-screen-cyrillic/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-screen-cyrillic
+pkgver=1.0.1
+pkgrel=0
+pkgdesc="X.org screen cyrillic fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/cyrillic
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="c8d5aef01c906c7aaea329702a8b1b63 font-screen-cyrillic-1.0.1.tar.bz2
+e738ad911ff453b7c957007832845f21 font-screen-cyrillic.post-install
+e738ad911ff453b7c957007832845f21 font-screen-cyrillic.post-upgrade"
diff --git a/x11/font-screen-cyrillic/font-screen-cyrillic.post-install b/x11/font-screen-cyrillic/font-screen-cyrillic.post-install
new file mode 100644
index 000000000..0d2f0d77c
--- /dev/null
+++ b/x11/font-screen-cyrillic/font-screen-cyrillic.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/cyrillic
+mkfontdir /usr/share/fonts/cyrillic
+echo "done."
+
diff --git a/x11/font-screen-cyrillic/font-screen-cyrillic.post-upgrade b/x11/font-screen-cyrillic/font-screen-cyrillic.post-upgrade
new file mode 120000
index 000000000..123449b9f
--- /dev/null
+++ b/x11/font-screen-cyrillic/font-screen-cyrillic.post-upgrade
@@ -0,0 +1 @@
+font-screen-cyrillic.post-install \ No newline at end of file
diff --git a/x11/font-sony-misc/APKBUILD b/x11/font-sony-misc/APKBUILD
new file mode 100644
index 000000000..c6c465014
--- /dev/null
+++ b/x11/font-sony-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-sony-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="0dfddd1a946e4497f009094c0ae1bdd5 font-sony-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-sony-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-sony-misc.post-upgrade"
diff --git a/x11/font-sony-misc/font-sony-misc.post-install b/x11/font-sony-misc/font-sony-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-sony-misc/font-sony-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-sony-misc/font-sony-misc.post-upgrade b/x11/font-sony-misc/font-sony-misc.post-upgrade
new file mode 120000
index 000000000..f066810b0
--- /dev/null
+++ b/x11/font-sony-misc/font-sony-misc.post-upgrade
@@ -0,0 +1 @@
+font-sony-misc.post-install \ No newline at end of file
diff --git a/x11/font-sun-misc/APKBUILD b/x11/font-sun-misc/APKBUILD
new file mode 100644
index 000000000..ea8fd1218
--- /dev/null
+++ b/x11/font-sun-misc/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-sun-misc
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="X.org misc font"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/misc
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="e17d43a7c6c0d862cfba0908ff132ffa font-sun-misc-1.0.0.tar.bz2
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-sun-misc.post-install
+ccf8ff4d45ebd2be8d6d05882d02cfeb font-sun-misc.post-upgrade"
diff --git a/x11/font-sun-misc/font-sun-misc.post-install b/x11/font-sun-misc/font-sun-misc.post-install
new file mode 100644
index 000000000..e9dc2acda
--- /dev/null
+++ b/x11/font-sun-misc/font-sun-misc.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/misc
+mkfontdir /usr/share/fonts/misc
+echo "done."
+
diff --git a/x11/font-sun-misc/font-sun-misc.post-upgrade b/x11/font-sun-misc/font-sun-misc.post-upgrade
new file mode 120000
index 000000000..bfd74ce37
--- /dev/null
+++ b/x11/font-sun-misc/font-sun-misc.post-upgrade
@@ -0,0 +1 @@
+font-sun-misc.post-install \ No newline at end of file
diff --git a/x11/font-winitzki-cyrillic/APKBUILD b/x11/font-winitzki-cyrillic/APKBUILD
new file mode 100644
index 000000000..7343eb2ef
--- /dev/null
+++ b/x11/font-winitzki-cyrillic/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-winitzki-cyrillic
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="X.org winitzki cyrillic fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/cyrillic
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="b99b02aff36a88ca3379715423c60303 font-winitzki-cyrillic-1.0.0.tar.bz2
+e738ad911ff453b7c957007832845f21 font-winitzki-cyrillic.post-install
+e738ad911ff453b7c957007832845f21 font-winitzki-cyrillic.post-upgrade"
diff --git a/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-install b/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-install
new file mode 100644
index 000000000..0d2f0d77c
--- /dev/null
+++ b/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/cyrillic
+mkfontdir /usr/share/fonts/cyrillic
+echo "done."
+
diff --git a/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-upgrade b/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-upgrade
new file mode 120000
index 000000000..a0928865f
--- /dev/null
+++ b/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-upgrade
@@ -0,0 +1 @@
+font-winitzki-cyrillic.post-install \ No newline at end of file
diff --git a/x11/font-xfree86-type1/APKBUILD b/x11/font-xfree86-type1/APKBUILD
new file mode 100644
index 000000000..0852e7cf7
--- /dev/null
+++ b/x11/font-xfree86-type1/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-xfree86-type1
+pkgver=1.0.1
+pkgrel=0
+pkgdesc="X.org xfree86 Type1 fonts"
+url="http://xorg.freedesktop.org/"
+license="custom"
+depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+makedepends="pkgconfig font-util-dev bdftopcf"
+install="$pkgname.post-install $pkgname.post-upgrade"
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2
+ $install"
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-mapfiles=/usr/share/fonts/util \
+ --with-fontdir=/usr/share/fonts/Type1
+ make || return 1
+ make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
+}
+
+md5sums="d7e965776c7f0c30b0f09742176fb77a font-xfree86-type1-1.0.1.tar.bz2
+633c958b3dbebf92fb122eb5033e9557 font-xfree86-type1.post-install
+633c958b3dbebf92fb122eb5033e9557 font-xfree86-type1.post-upgrade"
diff --git a/x11/font-xfree86-type1/font-xfree86-type1.post-install b/x11/font-xfree86-type1/font-xfree86-type1.post-install
new file mode 100644
index 000000000..0d2105713
--- /dev/null
+++ b/x11/font-xfree86-type1/font-xfree86-type1.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo -n "Updating font cache (TODO: implement triggers in apk)... "
+fc-cache -f > /dev/null
+mkfontscale /usr/share/fonts/Type1
+mkfontdir /usr/share/fonts/Type1
+echo "done."
+
diff --git a/x11/font-xfree86-type1/font-xfree86-type1.post-upgrade b/x11/font-xfree86-type1/font-xfree86-type1.post-upgrade
new file mode 120000
index 000000000..5362f29a2
--- /dev/null
+++ b/x11/font-xfree86-type1/font-xfree86-type1.post-upgrade
@@ -0,0 +1 @@
+font-xfree86-type1.post-install \ No newline at end of file
diff --git a/x11/gtk+/APKBUILD b/x11/gtk+/APKBUILD
index c8de1e5b9..1276255a8 100644
--- a/x11/gtk+/APKBUILD
+++ b/x11/gtk+/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk+
pkgver=2.16.0
-pkgrel=1
+pkgrel=2
pkgdesc="The GTK+ Toolkit (v2)"
url="http://www.gtk.org/"
license="LGPL"
@@ -19,6 +19,7 @@ depends="atk
libxfixes
libxrandr
pango
+ tiff
uclibc"
makedepends="pkgconfig
atk-dev
@@ -34,7 +35,8 @@ makedepends="pkgconfig
libxfixes-dev
libxrandr-dev
libxi-dev
- pango-dev"
+ pango-dev
+ tiff-dev"
# libxinerama libcups>=1.3.9 libxcomposite heimdal>=1.2.1 gnutls>=2.6.3"
#install=gtk2.install
source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.bz2"
diff --git a/x11/libsoup/APKBUILD b/x11/libsoup/APKBUILD
index 59165b192..91acb9fae 100644
--- a/x11/libsoup/APKBUILD
+++ b/x11/libsoup/APKBUILD
@@ -7,7 +7,7 @@ url="http://www.gnome.org"
license="LGPL"
subpackages="$pkgname-dev $pkgname-doc"
depends="glib gnutls libxml2 uclibc libiconv"
-makedepends="glib-dev gnutls-dev libxml2-dev libiconv-dev"
+makedepends="pkgconfig glib-dev gnutls-dev libxml2-dev libiconv-dev g++"
source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
depends_dev="glib-dev libxml2-dev gnutls-dev"
diff --git a/x11/midori/APKBUILD b/x11/midori/APKBUILD
new file mode 100644
index 000000000..4c1d7ea9e
--- /dev/null
+++ b/x11/midori/APKBUILD
@@ -0,0 +1,55 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=midori
+pkgver=0.1.5
+pkgrel=0
+pkgdesc="A lightweight web browser based on Gtk WebKit"
+url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+license="GPL"
+depends="
+ desktop-file-utils
+ gettext
+ hicolor-icon-theme
+ libidn
+ uclibc
+ webkit
+ "
+makedepends="
+ g++
+ git
+ intltool
+ pkgconfig
+ python
+ gettext-dev
+ libidn-dev
+ libxml2-dev
+ webkit-dev
+ "
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+ midori-0.1.5-fpic.patch
+ $install"
+
+build ()
+{
+ cd "$srcdir"/$pkgname-$pkgver
+ for i in ../*.patch; do
+ msg "Applying $i..."
+ patch -p1 < $i || return 1
+ done
+ ./configure --prefix=/usr \
+ --jobs=${MAKEFLAGS/-j/} \
+ --enable-libidn \
+ --enable-sqlite \
+ --enable-addons \
+ --disable-hildon \
+ --disable-unique \
+ --enable-nls \
+ || return 1
+ make || return 1
+ make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="dccaddeb49d7def8a19cf497cb7eabf8 midori-0.1.5.tar.bz2
+8f36ef6716f2fc8ae9924471f3647e94 midori-0.1.5-fpic.patch
+a373e86256d1cd179791e486d2862d44 midori.post-install
+a373e86256d1cd179791e486d2862d44 midori.post-upgrade
+e962d246f1861faf94b70b37b0d3ef66 midori.post-deinstall"
diff --git a/x11/midori/midori-0.1.5-fpic.patch b/x11/midori/midori-0.1.5-fpic.patch
new file mode 100644
index 000000000..82dc761dd
--- /dev/null
+++ b/x11/midori/midori-0.1.5-fpic.patch
@@ -0,0 +1,53 @@
+From ed2a35d70b78232562aeb1ba0158fe785916c96b Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian@twotoasts.de>
+Date: Sun, 29 Mar 2009 22:14:43 +0000
+Subject: Don't expressly use libkatze in extensions to avoid -fPIC problem
+
+---
+diff --git a/extensions/wscript_build b/extensions/wscript_build
+index 8ce7027..1ea845d 100644
+--- a/extensions/wscript_build
++++ b/extensions/wscript_build
+@@ -26,5 +26,4 @@ for extension in extensions:
+ obj.includes = '..'
+ obj.source = source
+ obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
+- obj.uselib_local = 'katze'
+ obj.install_path = '${LIBDIR}/midori'
+diff --git a/katze/wscript_build b/katze/wscript_build
+index 27a24fc..52c282d 100644
+--- a/katze/wscript_build
++++ b/katze/wscript_build
+@@ -12,6 +12,3 @@ obj.find_sources_in_dirs ('.')
+ obj.add_marshal_file ('marshal.list', 'katze_cclosure_marshal')
+ obj.uselib = 'M GMODULE LIBSOUP GTK LIBXML'
+ obj.install_path = None
+-
+-if platform.architecture ()[0] == '64bit':
+- obj.env.append_value ('CCFLAGS', '-fPIC')
+diff --git a/midori/wscript_build b/midori/wscript_build
+index 91f5302..87eba0e 100644
+--- a/midori/wscript_build
++++ b/midori/wscript_build
+@@ -14,9 +14,6 @@ obj.uselib = 'UNIQUE LIBSOUP LIBIDN GIO GTK SQLITE WEBKIT LIBXML HILDON'
+ obj.uselib_local = 'katze'
+ obj.install_path = None
+
+-if platform.architecture ()[0] == '64bit':
+- obj.env.append_value ('CCFLAGS', '-fPIC')
+-
+ obj = bld.new_task_gen ('cc', 'staticlib')
+ obj.name = 'panels'
+ obj.target = 'panels'
+@@ -26,9 +23,6 @@ obj.uselib = 'UNIQUE LIBSOUP GMODULE GTHREAD GIO GTK SQLITE WEBKIT LIBXML'
+ obj.uselib_local = 'midori'
+ obj.install_path = None
+
+-if platform.architecture ()[0] == '64bit':
+- obj.env.append_value ('CCFLAGS', '-fPIC')
+-
+ obj = bld.new_task_gen ('cc', 'program')
+ obj.target = 'midori'
+ obj.includes = '. .. ../panels'
+--
+cgit v0.8.2-1-g6063
diff --git a/x11/midori/midori.post-deinstall b/x11/midori/midori.post-deinstall
new file mode 100644
index 000000000..00ebf0b31
--- /dev/null
+++ b/x11/midori/midori.post-deinstall
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+update-desktop-database -q
+gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+
diff --git a/x11/midori/midori.post-install b/x11/midori/midori.post-install
new file mode 100644
index 000000000..9f24aeca9
--- /dev/null
+++ b/x11/midori/midori.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+update-desktop-database -q
diff --git a/x11/midori/midori.post-upgrade b/x11/midori/midori.post-upgrade
new file mode 120000
index 000000000..41bc70a93
--- /dev/null
+++ b/x11/midori/midori.post-upgrade
@@ -0,0 +1 @@
+midori.post-install \ No newline at end of file
diff --git a/x11/webkit/APKBUILD b/x11/webkit/APKBUILD
index 8bb00f5e5..cd74e81fd 100644
--- a/x11/webkit/APKBUILD
+++ b/x11/webkit/APKBUILD
@@ -1,16 +1,18 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=webkit
-pkgver=1.1.3
+pkgver=1.1.4
pkgrel=0
-pkgdesc="A webbrowser engine"
-url="http://webkit.org/"
+pkgdesc="portable web rendering engine WebKit for GTK+"
+url="http://webkitgtk.org/"
license="LGPL BSD"
depends="uclibc libsoup pango gtk+ libjpeg libpng libxml2 gperf icu cairo
- atk gnutls sqlite libxslt libxt libiconv"
+ atk gnutls sqlite libxslt libxt libiconv gettext zlib libgcrypt
+ libgpg-error expat libuuid"
makedepends="
libsoup-dev pango-dev gtk+-dev libjpeg-dev libpng-dev libxml2-dev
gperf pkgconfig bison flex uclibc++-dev icu-dev cairo-dev atk-dev
- gnutls-dev sqlite-dev libxslt-dev libxt-dev libiconv-dev
+ gnutls-dev sqlite-dev libxslt-dev libxt-dev libiconv-dev gettext-dev
+ zlib-dev libgcrypt-dev libgpg-error-dev expat-dev e2fsprogs-dev
"
install=
subpackages="$pkgname-dev gtklauncher"
@@ -20,10 +22,12 @@ depends_dev="gtk+-dev libsoup-dev"
build() {
cd "$srcdir"/$pkgname-$pkgver
+ # html5 video requires gstreamer, we turn off for now
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --infodir=/usr/share/info
+ --infodir=/usr/share/info \
+ --disable-video
make || return 1
make DESTDIR="$pkgdir" install
}
@@ -36,4 +40,4 @@ gtklauncher() {
"$subpkgdir"/usr/bin/GtkLauncher
}
-md5sums="9c1dcba372e2a56d6011ad807abc80e6 webkit-1.1.3.tar.gz"
+md5sums="2c941eb9ad9e791fba9b57bf252e3f04 webkit-1.1.4.tar.gz"
diff --git a/x11/xorg-server/APKBUILD b/x11/xorg-server/APKBUILD
index b23dd0ec0..369434ff9 100644
--- a/x11/xorg-server/APKBUILD
+++ b/x11/xorg-server/APKBUILD
@@ -1,25 +1,59 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xorg-server
pkgver=1.6.0
-pkgrel=0
+pkgrel=2
pkgdesc="X.Org X servers"
url="http://xorg.freedesktop.org"
license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="libx11 libxfont openssl libxxf86misc libpciaccess libxv pixman"
-makedepends="pkgconfig libx11-dev libxfont-dev openssl-dev libxxf86misc
- libpciaccess-dev libxv-dev pixman-dev libxkbfile-dev randrproto
- fixesproto renderproto damageproto xcmiscproto xextproto xtrans
- bigreqsproto resourceproto inputproto libxkbui-dev
+subpackages="$pkgname-dev $pkgname-doc xfbdev xephyr"
+depends="
+ libpciaccess
+ libx11
+ libxdamage
+ libxfont
+ libxv
+ libxxf86dga
+ libxxf86misc
+ openssl
+ pixman
+ uclibc
+ "
+makedepends="
+ libpciaccess-dev
+ libx11-dev
+ libxdamage-dev
+ libxfont-dev
+ libxkbfile-dev
+ libxkbui-dev
+ libxv-dev
+ libxxf86dga-dev
+ libxxf86misc-dev
+ openssl-dev
+ pixman-dev
+
+ bigreqsproto
+ damageproto
+ fixesproto
+ inputproto
+ pkgconfig
+ randrproto
+ renderproto
+ resourceproto
+ xcmiscproto
+ xextproto
+ xtrans
"
# hal>=0.5.11 xcursor-themes xkeyboard-config>=1.3
# xorg-server-utils xorg-utils xorg-fonts-misc xbitmaps libdrm>=2.3.1
# diffutils xf86-input-evdev"
-source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
+ nocxx.patch"
build () {
cd "$srcdir"/$pkgname-$pkgver
+ patch configure < ../nocxx.patch || return 1
+
./configure --prefix=/usr \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
@@ -27,6 +61,10 @@ build () {
--enable-xfbdev \
--enable-kdrive \
--enable-kdrive-vesa \
+ --enable-randr \
+ --enable-xorg \
+ --enable-xv \
+ --enable-xephyr \
--disable-composite \
--disable-config-dbus \
--disable-config-hal \
@@ -39,21 +77,17 @@ build () {
--disable-xfree86-utils \
--disable-xinerama \
--disable-xnest \
- --disable-xorg \
--disable-xorgcfg \
--disable-xsdl \
--disable-xvfb \
--disable-aiglx \
--disable-xres \
- --disable-xv \
--disable-xvmc \
--disable-screensaver \
--disable-glx \
--disable-xinerama \
--disable-xace \
--disable-dbe \
- --disable-dpms \
- --disable-randr \
|| return 1
# --enable-xnest \
@@ -98,10 +132,28 @@ build () {
# --enable-xfree86-utils Build xfree86 DDX utilities (default: enabled)
make || return 1
- make DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" install || return 1
install -m755 -d "$pkgdir"/etc/X11 || return 1
install -m755 -d "$pkgdir"/var/lib/xkb || return 1
install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-md5sums="aafe73f5807ce8bb534727ecb72467c7 xorg-server-1.6.0.tar.bz2"
+
+
+xfbdev() {
+ pkgdesc="X.org server for framebuffer"
+ depends="libxfont libxau pixman libxdmcp openssl uclibc"
+ mkdir -p "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/Xfbdev "$subpkgdir"/usr/bin/
+}
+
+xephyr() {
+ pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer"
+ depends="pixman openssl libx11 libxext libxfont libxau libxdmcp libxv
+ uclibc"
+ mkdir -p "$subpkgdir"/usr/bin
+ mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
+}
+
+md5sums="aafe73f5807ce8bb534727ecb72467c7 xorg-server-1.6.0.tar.bz2
+28513788ba4d556ccd538867dc6205ab nocxx.patch"
diff --git a/x11/xorg-server/nocxx.patch b/x11/xorg-server/nocxx.patch
new file mode 100644
index 000000000..beb1ab900
--- /dev/null
+++ b/x11/xorg-server/nocxx.patch
@@ -0,0 +1,15 @@
+--- a/configure 2004-12-07 21:34:23.205172545 +0000
++++ b/configure 2004-12-07 21:37:17.726654782 +0000
+@@ -5148,10 +5148,8 @@
+ :
+ else
+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++See \`config.log' for more details." >&5;}
++ { echo "C++ sucks, ignoring ..." >&5; }; }
+ fi
+
+ ac_ext=cc