Merge branch 'master' of git://git.alpinelinux.org/aports

138 files changed, 939 insertions, 639 deletions

diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 2f4d931028f..f912b0db283 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-alpine-baselayout
-pkgver=0.5.2
+pkgver=0.5.3
 pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-baselayout"
 url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="08b5ef1254cd43655bd234c84adcb1ca  acf-alpine-baselayout-0.5.2.tar.bz2"
+md5sums="e2f476665cfeb73cd3dbbab859c36d6f  acf-alpine-baselayout-0.5.3.tar.bz2"
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 9228bacd75d..684362d4582 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-openssh
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=0
 pkgdesc="A web-based system administration interface for openssh"
 url="http://git.alpinelinux.org/cgit/acf-openssh"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="aa975654ce91969a978cc100dc046c63  acf-openssh-0.2.0.tar.bz2"
+md5sums="10e355b5d64a3a50f947dce34df5ecf0  acf-openssh-0.2.1.tar.bz2"
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 3a5a6f87948..7e428e2113d 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.14.3
-pkgrel=0
+pkgrel=3
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 license="GPL-2"
@@ -11,7 +11,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	$pkgname-1.11.1-bb.patch
 	0001-install-compat-fix-for-mode-of-created-files.patch
 	bb-tar-numeric-owner.patch
-	$install
+	busybox-sed-3.patch
 	busyboxconfig"
 
 build() {
@@ -48,6 +48,5 @@ md5sums="d170bf5f97a41aec3a505eab690d5699  busybox-1.14.3.tar.bz2
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
 73d39c57483084298c7e46bdbbbea8d1  0001-install-compat-fix-for-mode-of-created-files.patch
 0b5b2d7db201f90cd08f4a3164ee29a1  bb-tar-numeric-owner.patch
-56b78c358797cd15fb64719a48939267  busybox.post-install
-56b78c358797cd15fb64719a48939267  busybox.post-upgrade
+b75c3f419f8392dfdadd92aa24fdba8c  busybox-sed-3.patch
 0be49dc673a849b5bf5e670db8c8c7b6  busyboxconfig"
diff --git a/main/busybox/busybox-sed-3.patch b/main/busybox/busybox-sed-3.patch
new file mode 100644
index 00000000000..f916ce29112
--- /dev/null
+++ b/main/busybox/busybox-sed-3.patch
@@ -0,0 +1,120 @@
+diff -d -urpN busybox.2/editors/sed.c busybox.3/editors/sed.c
+--- busybox.2/editors/sed.c	2009-08-08 01:40:42.000000000 +0200
++++ busybox.3/editors/sed.c	2009-08-17 01:32:00.000000000 +0200
+@@ -589,7 +589,7 @@ static void pipe_putc(char c)
+ 
+ static void do_subst_w_backrefs(char *line, char *replace)
+ {
+-	int i,j;
++	int i, j;
+ 
+ 	/* go through the replacement string */
+ 	for (i = 0; replace[i]; i++) {
+@@ -624,23 +624,24 @@ static void do_subst_w_backrefs(char *li
+ 	}
+ }
+ 
+-static int do_subst_command(sed_cmd_t *sed_cmd, char **line)
++static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
+ {
+-	char *oldline = *line;
++	char *line = *line_p;
+ 	int altered = 0;
+ 	unsigned match_count = 0;
+ 	regex_t *current_regex;
+ 
++	current_regex = sed_cmd->sub_match;
+ 	/* Handle empty regex. */
+-	if (sed_cmd->sub_match == NULL) {
++	if (!current_regex) {
+ 		current_regex = G.previous_regex_ptr;
+ 		if (!current_regex)
+ 			bb_error_msg_and_die("no previous regexp");
+-	} else
+-		G.previous_regex_ptr = current_regex = sed_cmd->sub_match;
++	}
++	G.previous_regex_ptr = current_regex;
+ 
+ 	/* Find the first match */
+-	if (REG_NOMATCH == regexec(current_regex, oldline, 10, G.regmatch, 0))
++	if (REG_NOMATCH == regexec(current_regex, line, 10, G.regmatch, 0))
+ 		return 0;
+ 
+ 	/* Initialize temporary output buffer. */
+@@ -657,7 +658,7 @@ static int do_subst_command(sed_cmd_t *s
+ 		   The match_count check is so not to break
+ 		   echo "hi" | busybox sed 's/^/!/g' */
+ 		if (!G.regmatch[0].rm_so && !G.regmatch[0].rm_eo && match_count) {
+-			pipe_putc(*oldline++);
++			pipe_putc(*line++);
+ 			continue;
+ 		}
+ 
+@@ -669,35 +670,41 @@ static int do_subst_command(sed_cmd_t *s
+ 		 && (sed_cmd->which_match != match_count)
+ 		) {
+ 			for (i = 0; i < G.regmatch[0].rm_eo; i++)
+-				pipe_putc(*oldline++);
++				pipe_putc(*line++);
+ 			continue;
+ 		}
+ 
+ 		/* print everything before the match */
+ 		for (i = 0; i < G.regmatch[0].rm_so; i++)
+-			pipe_putc(oldline[i]);
++			pipe_putc(line[i]);
+ 
+ 		/* then print the substitution string */
+-		do_subst_w_backrefs(oldline, sed_cmd->string);
++		do_subst_w_backrefs(line, sed_cmd->string);
+ 
+ 		/* advance past the match */
+-		oldline += G.regmatch[0].rm_eo;
++		line += G.regmatch[0].rm_eo;
+ 		/* flag that something has changed */
+ 		altered++;
+ 
+ 		/* if we're not doing this globally, get out now */
+ 		if (sed_cmd->which_match)
+ 			break;
+-	} while (*oldline && (regexec(current_regex, oldline, 10, G.regmatch, 0) != REG_NOMATCH));
+ 
+-	/* Copy rest of string into output pipeline */
++		if (*line == '\0')
++			break;
++//maybe (G.regmatch[0].rm_eo ? REG_NOTBOL : 0) instead of unconditional REG_NOTBOL?
++	} while (regexec(current_regex, line, 10, G.regmatch, REG_NOTBOL) != REG_NOMATCH);
+ 
+-	while (*oldline)
+-		pipe_putc(*oldline++);
+-	pipe_putc(0);
++	/* Copy rest of string into output pipeline */
++	while (1) {
++		char c = *line++;
++		pipe_putc(c);
++		if (c == '\0')
++			break;
++	}
+ 
+-	free(*line);
+-	*line = G.pipeline.buf;
++	free(*line_p);
++	*line_p = G.pipeline.buf;
+ 	return altered;
+ }
+ 
+diff -d -urpN busybox.2/testsuite/sed.tests busybox.3/testsuite/sed.tests
+--- busybox.2/testsuite/sed.tests	2009-08-08 01:40:44.000000000 +0200
++++ busybox.3/testsuite/sed.tests	2009-08-17 01:29:01.000000000 +0200
+@@ -241,4 +241,11 @@ testing "sed 2d;2,1p (gnu compat)" \
+ 	"third\n" "" \
+ 	"first\nsecond\nthird\nfourth\n"
+ 
++# Regex means: "match / at BOL or nothing, then one or more not-slashes".
++# The bug was that second slash in /usr/lib was treated as "at BOL" too.
++testing "sed beginning (^) matches only once" \
++	"sed 's,\(^/\|\)[^/][^/]*,>\0<,g'" \
++	">/usr</>lib<\n" "" \
++	"/usr/lib\n"
++
+ exit $FAILCOUNT
diff --git a/main/docbook-xml/APKBUILD b/main/docbook-xml/APKBUILD
new file mode 100644
index 00000000000..5b62dea35e4
--- /dev/null
+++ b/main/docbook-xml/APKBUILD
@@ -0,0 +1,257 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=docbook-xml
+pkgver=4.5
+pkgrel=1
+pkgdesc="A widely used XML scheme for writing documentation and help"
+url="http://scrollkeeper.sourceforge.net/docbook.shtml"
+license="MIT"
+depends="libxml2"
+makedepends=
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+source="http://www.docbook.org/xml/$pkgver/$pkgname-$pkgver.zip
+	http://www.docbook.org/xml/4.4/$pkgname-4.4.zip
+	http://www.docbook.org/xml/4.3/$pkgname-4.3.zip
+	http://www.docbook.org/xml/4.2/$pkgname-4.2.zip
+	http://www.docbook.org/xml/4.1.2/docbkx412.zip
+	"
+
+unpack() {
+	# we unpack the zip's in subdirs in build()
+	:
+}
+
+build ()
+{
+	for ver in 4.1.2 4.2 4.3 4.4 4.5; do
+		case $ver in
+			4.1.2) _pv=412;;
+			*) _pv=$ver;;
+		esac
+		mkdir -p "$srcdir"/docbook-xml-${ver}
+		cd "$srcdir"/docbook-xml-${ver}
+		unzip "$srcdir"/docbook-xml-${_pv}.zip
+		mkdir -p "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}
+		cp -af docbook.cat *.dtd ent/ *.mod "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}/
+	done
+	mkdir -p "$pkgdir"/etc/xml
+	xmlcatalog --noout --create "$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add \
+		"public" \
+		"-//OASIS//DTD DocBook XML V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook CALS Table Model V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Notations V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.2" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.2" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.2" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.2" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Notations V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.3" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.3" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.3" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.3" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Notations V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.4" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.4" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.4" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.4" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.5//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.5" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5" \
+		"$pkgdir"/etc/xml/docbook-xml
+	xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.5" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5" \
+		"$pkgdir"/etc/xml/docbook-xml
+}
+md5sums="03083e288e87a7e829e437358da7ef9e  docbook-xml-4.5.zip
+cbb04e9a700955d88c50962ef22c1634  docbook-xml-4.4.zip
+ab200202b9e136a144db1e0864c45074  docbook-xml-4.3.zip
+73fe50dfe74ca631c1602f558ed8961f  docbook-xml-4.2.zip
+900d7609fb7e6d78901b357e4acfbc17  docbkx412.zip"
diff --git a/main/docbook-xml/docbook-xml.post-deinstall b/main/docbook-xml/docbook-xml.post-deinstall
new file mode 100644
index 00000000000..925378617f0
--- /dev/null
+++ b/main/docbook-xml/docbook-xml.post-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog
diff --git a/main/docbook-xml/docbook-xml.post-install b/main/docbook-xml/docbook-xml.post-install
new file mode 100644
index 00000000000..fa5f2a997b3
--- /dev/null
+++ b/main/docbook-xml/docbook-xml.post-install
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ ! -e etc/xml/catalog ]; then
+	xmlcatalog --noout --create etc/xml/catalog
+fi
+  
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file:///etc/xml/docbook-xml" \
+    etc/xml/catalog
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook XML" \
+    "file:///etc/xml/docbook-xml" \
+    etc/xml/catalog
+xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook-xml" \
+    etc/xml/catalog
+xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook-xml" \
+    etc/xml/catalog
+
diff --git a/main/docbook-xml/docbook-xml.post-upgrade b/main/docbook-xml/docbook-xml.post-upgrade
new file mode 100644
index 00000000000..79bb90e7c38
--- /dev/null
+++ b/main/docbook-xml/docbook-xml.post-upgrade
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog
+
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file:///etc/xml/docbook-xml" \
+    etc/xml/catalog
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook XML" \
+    "file:///etc/xml/docbook-xml" \
+    etc/xml/catalog
+xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook-xml" \
+    etc/xml/catalog
+xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook-xml" \
+    etc/xml/catalog
+
diff --git a/main/docbook-xsl/APKBUILD b/main/docbook-xsl/APKBUILD
new file mode 100644
index 00000000000..0c9eb9b9f94
--- /dev/null
+++ b/main/docbook-xsl/APKBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=docbook-xsl
+pkgver=1.74.0
+pkgrel=0
+pkgdesc="XML stylesheets for Docbook-xml transformations."
+url="http://scrollkeeper.sourceforge.net/docbook.shtml"
+license="custom"
+depends="libxml2 libxslt docbook-xml"
+makedepends=""
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+source="http://downloads.sourceforge.net/sourceforge/docbook/$pkgname-$pkgver.tar.bz2"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	_dest="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver
+	mkdir -p "$_dest"/common
+	for i in xml xsl dtd ent; do
+		install -m644 common/*.$i "$_dest"/common/
+	done
+	mkdir -p "$_dest"/params
+	install -m644 params/*.xml "$_dest"/params/
+	for fn in fo highlighting html roundtrip; do
+		mkdir -p "$_dest"/$fn
+		install -m644 ${fn}/*.xml "$_dest"/$fn/
+		install -m644 ${fn}/*.xsl "$_dest"/$fn/
+	done
+	for fn in eclipse htmlhelp javahelp lib manpages profiling template website xhtml; do
+		mkdir -p "$_dest"/$fn
+		install -m644 ${fn}/*.xsl "$_dest"/$fn/ 
+	done
+	mkdir -p "$pkgdir"/etc/xml
+	install -m644 VERSION  "$_dest"/
+	install -m644 -D COPYING \
+		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+md5sums="a56b598decd006d5d39e4544c0bfbc6a  docbook-xsl-1.74.0.tar.bz2"
diff --git a/main/docbook-xsl/docbook-xsl.install b/main/docbook-xsl/docbook-xsl.install
new file mode 100644
index 00000000000..a8ea3e72b2c
--- /dev/null
+++ b/main/docbook-xsl/docbook-xsl.install
@@ -0,0 +1,47 @@
+post_install() {
+  if [ ! -f /etc/xml/catalog ]; then
+    xmlcatalog --noout --create /etc/xml/catalog
+  fi
+  _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
+
+  xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
+  xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog &&
+
+  xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/current" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog &&
+
+  xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/current" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+}
+
+post_upgrade() {
+  post_remove $2
+  post_install $1
+}
+
+post_remove() {
+  _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
+  xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog
+
+  if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then
+    xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog
+    xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog
+  fi
+}
+
+op=$1
+shift
+
+$op $*
+
diff --git a/main/docbook-xsl/docbook-xsl.post-deinstall b/main/docbook-xsl/docbook-xsl.post-deinstall
new file mode 100644
index 00000000000..1d042b04d9e
--- /dev/null
+++ b/main/docbook-xsl/docbook-xsl.post-deinstall
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+_OLD=${1%-r[0-9]*}
+
+xmlcatalog --noout --del \
+	"/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
+	etc/xml/catalog
diff --git a/main/docbook-xsl/docbook-xsl.post-install b/main/docbook-xsl/docbook-xsl.post-install
new file mode 100644
index 00000000000..6afae6abe62
--- /dev/null
+++ b/main/docbook-xsl/docbook-xsl.post-install
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+if [ ! -f /etc/xml/catalog ]; then
+    xmlcatalog --noout --create /etc/xml/catalog
+fi
+
+
+_NEW=${1%-r[0-9]*}
+
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog &&
+
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/current" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog &&
+
+xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/current" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
diff --git a/main/docbook-xsl/docbook-xsl.post-upgrade b/main/docbook-xsl/docbook-xsl.post-upgrade
new file mode 100644
index 00000000000..d481480fc23
--- /dev/null
+++ b/main/docbook-xsl/docbook-xsl.post-upgrade
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+if [ ! -f /etc/xml/catalog ]; then
+    xmlcatalog --noout --create /etc/xml/catalog
+fi
+
+_NEW=${1%-r[0-9]*}
+_OLD=${2%-r[0-9]*}
+
+xmlcatalog --noout --del \
+	"/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
+	etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/current" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
+xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/current" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
+    etc/xml/catalog
+
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index eedabbffa7a..41ad9a0bd39 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,20 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=e2fsprogs
 pkgver=1.41.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Standard Ext2/3/4 filesystem utilities"
 url="http://e2fsprogs.sourceforge.net"
 license="GPL LGPL MIT"
 depends=
-subpackages="$pkgname-dev $pkgname-doc libuuid libcom_err libblkid"
+makedepends="util-linux-ng-dev pkgconfig"
+subpackages="$pkgname-dev $pkgname-doc libcom_err"
 source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz"
 
+depends_dev="util-linux-ng-dev"
+
 build () { 
 	cd ${srcdir}/${pkgname}-${pkgver}
 	./configure \
 		--mandir=/usr/share/man \
 		--enable-elf-shlibs \
+		--disable-fsck \
 		--disable-uuidd \
+		--disable-libuuid \
+		--disable-libblkid \
 		--disable-tls \
 		--disable-nls
 
@@ -22,22 +28,10 @@ build () {
 	make LDCONFIG=: DESTDIR=${pkgdir} install install-libs || return 1
 }
 
-libuuid() {
-	depends=
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/
-}
-
 libcom_err() {
 	depends=
 	mkdir -p "$subpkgdir"/lib
 	mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
 }
 
-libblkid() {
-	depends=
-	mkdir -p "$subpkgdir"/lib 
-	mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
-}
-
 md5sums="6708cc8e484809fc5cfb232882e48489  e2fsprogs-1.41.8.tar.gz"
diff --git a/main/taglib/APKBUILD b/main/taglib/APKBUILD
new file mode 100644
index 00000000000..ff03066ef98
--- /dev/null
+++ b/main/taglib/APKBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=taglib
+pkgver=1.5
+pkgrel=0
+pkgdesc="library for reading and editing the meta-data of several popular audio formats."
+url="http://ktown.kde.org/~wheeler/taglib.html"
+license="GPL2"
+makedepends="zlib-dev cmake"
+depends=
+source="http://ktown.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-dev"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+	make VERBOSE=1 || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz"
diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD
new file mode 100644
index 00000000000..68641051819
--- /dev/null
+++ b/main/util-linux-ng/APKBUILD
@@ -0,0 +1,65 @@
+# Contributor: Leonardo Arena <rnalrd@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=util-linux-ng
+pkgver=2.16
+pkgrel=1
+pkgdesc="Random collection of Linux utilities"
+arch=""
+url="http://kernel.org/~kzak/util-linux-ng/"
+license="GPL-2 GPL Public Domain"
+depends=
+# use GNU sed til bb sed is fixed
+makedepends="zlib-dev sed"
+install=
+source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk"
+replaces="e2fsprogs"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	sed -e 's/versionsort/alphasort/g'\
+		-e 's/strverscmp.h/dirent.h/g' \
+		-i mount/lomount.c
+
+	./configure --prefix=/usr \
+		--disable-uuidd \
+		--disable-nls \
+		--disable-tls \
+		--disable-kill \
+		--disable-init \
+		--without-ncurses \
+		--without-pam
+		
+	make || return 1
+	make -j1 install DESTDIR="$pkgdir"
+	# use pkg-config
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+dev() {
+	default_dev
+	replaces="e2fsprogs-dev"
+}
+
+libuuid() {
+	pkgdesc="DCE compatible Universally Unique Identifier library"
+	depends=
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/
+}
+
+libblkid() {
+	pkgdesc="Block device identification library from util-linux-ng"
+	depends=
+	mkdir -p "$subpkgdir"/lib 
+	mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
+}
+
+sfdisk() {
+	pkgdesk="Partition table manipulator from util-linux-ng"
+	depends=
+	mkdir -p "$subpkgdir"/sbin
+	mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/
+}
+
+md5sums="f6aba93a43b7736782d7aaa3718c45e3  util-linux-ng-2.16.tar.gz"
diff --git a/testing/util-linux-ng/APKBUILD b/testing/util-linux-ng/APKBUILD
deleted file mode 100644
index 37c67548eb3..00000000000
--- a/testing/util-linux-ng/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=util-linux-ng
-pkgver=2.14.2
-pkgrel=0
-pkgdesc="Random collection of Linux utilities"
-arch=""
-url="http://kernel.org/~kzak/util-linux-ng/"
-license="GPL-2 GPL Public Domain"
-depends="uclibc e2fsprogs libuuid zlib"
-makedepends="e2fsprogs-dev zlib-dev"
-install=$pkgname.post-deinstall
-source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.14/$pkgname-$pkgver.tar.gz
-	$install"
-subpackages="$pkgname-doc"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -e 's/versionsort/alphasort/g'\
-		-e 's/strverscmp.h/dirent.h/g' \
-		-i mount/lomount.c
-
-	./configure --prefix=/usr \
-		--disable-nls \
-		--disable-kill \
-		--enable-init \
-		--without-ncurses \
-		--without-pam
-		
-	make || return 1
-	make install DESTDIR=$pkgdir
-}
-
-md5sums="8e5897e214292e83aa842fe3a3ec626f  util-linux-ng-2.14.2.tar.gz
-d4bfc6c5612df4fd8118032175aa2201  util-linux-ng.post-deinstall"
diff --git a/testing/util-linux-ng/util-linux-ng.post-deinstall b/testing/util-linux-ng/util-linux-ng.post-deinstall
deleted file mode 100644
index f5c46058fef..00000000000
--- a/testing/util-linux-ng/util-linux-ng.post-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-busybox --install -sh
diff --git a/x11/font-adobe-100dpi/APKBUILD b/x11/font-adobe-100dpi/APKBUILD
index 8e4d7a9f96a..c56dc913fe9 100644
--- a/x11/font-adobe-100dpi/APKBUILD
+++ b/x11/font-adobe-100dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-100dpi
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org adobe 100dpi 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="443acfe70e26716282f9068730fe92c4  font-adobe-100dpi-1.0.0.tar.bz2
-8212908634d4a7ad9cd52486f2ba2cde  font-adobe-100dpi.post-install
-8212908634d4a7ad9cd52486f2ba2cde  font-adobe-100dpi.post-upgrade"
+md5sums="443acfe70e26716282f9068730fe92c4  font-adobe-100dpi-1.0.0.tar.bz2"
diff --git a/x11/font-adobe-100dpi/font-adobe-100dpi.post-install b/x11/font-adobe-100dpi/font-adobe-100dpi.post-install
deleted file mode 100644
index 279e9e0042c..00000000000
--- a/x11/font-adobe-100dpi/font-adobe-100dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/100dpi
-mkfontdir /usr/share/fonts/100dpi
-echo "done."
-
diff --git a/x11/font-adobe-100dpi/font-adobe-100dpi.post-upgrade b/x11/font-adobe-100dpi/font-adobe-100dpi.post-upgrade
deleted file mode 120000
index eac4a405fdf..00000000000
--- a/x11/font-adobe-100dpi/font-adobe-100dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-adobe-100dpi.post-install
\ No newline at end of file
diff --git a/x11/font-adobe-75dpi/APKBUILD b/x11/font-adobe-75dpi/APKBUILD
index d261ccf4685..aaa7e3cc416 100644
--- a/x11/font-adobe-75dpi/APKBUILD
+++ b/x11/font-adobe-75dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-75dpi
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org adobe 75dpi 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="813b5d3723c84388a938ab6732e1329c  font-adobe-75dpi-1.0.0.tar.bz2
-a24308692d7112b79a5a188c0b5c2e41  font-adobe-75dpi.post-install
-a24308692d7112b79a5a188c0b5c2e41  font-adobe-75dpi.post-upgrade"
+md5sums="813b5d3723c84388a938ab6732e1329c  font-adobe-75dpi-1.0.0.tar.bz2"
diff --git a/x11/font-adobe-75dpi/font-adobe-75dpi.post-install b/x11/font-adobe-75dpi/font-adobe-75dpi.post-install
deleted file mode 100644
index 887dedc802c..00000000000
--- a/x11/font-adobe-75dpi/font-adobe-75dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/75dpi
-mkfontdir /usr/share/fonts/75dpi
-echo "done."
-
diff --git a/x11/font-adobe-75dpi/font-adobe-75dpi.post-upgrade b/x11/font-adobe-75dpi/font-adobe-75dpi.post-upgrade
deleted file mode 120000
index 337e479e0e0..00000000000
--- a/x11/font-adobe-75dpi/font-adobe-75dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-adobe-75dpi.post-install
\ No newline at end of file
diff --git a/x11/font-adobe-utopia-100dpi/APKBUILD b/x11/font-adobe-utopia-100dpi/APKBUILD
index 3172075252b..54bfa807bb9 100644
--- a/x11/font-adobe-utopia-100dpi/APKBUILD
+++ b/x11/font-adobe-utopia-100dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-100dpi
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org adobe 100dpi 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="5d28a30efef966f8dbbaff9a6619f01a  font-adobe-utopia-100dpi-1.0.1.tar.bz2
-8212908634d4a7ad9cd52486f2ba2cde  font-adobe-utopia-100dpi.post-install
-8212908634d4a7ad9cd52486f2ba2cde  font-adobe-utopia-100dpi.post-upgrade"
+md5sums="5d28a30efef966f8dbbaff9a6619f01a  font-adobe-utopia-100dpi-1.0.1.tar.bz2"
diff --git a/x11/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.post-install b/x11/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.post-install
deleted file mode 100644
index 279e9e0042c..00000000000
--- a/x11/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/100dpi
-mkfontdir /usr/share/fonts/100dpi
-echo "done."
-
diff --git a/x11/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.post-upgrade b/x11/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.post-upgrade
deleted file mode 120000
index b433f3f3b7f..00000000000
--- a/x11/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-adobe-utopia-100dpi.post-install
\ No newline at end of file
diff --git a/x11/font-adobe-utopia-75dpi/APKBUILD b/x11/font-adobe-utopia-75dpi/APKBUILD
index 444100f9be7..9ef0813a7e7 100644
--- a/x11/font-adobe-utopia-75dpi/APKBUILD
+++ b/x11/font-adobe-utopia-75dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-75dpi
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org adobe 75dpi 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="dd912284e4750023f9682812532fa033  font-adobe-utopia-75dpi-1.0.1.tar.bz2
-a24308692d7112b79a5a188c0b5c2e41  font-adobe-utopia-75dpi.post-install
-a24308692d7112b79a5a188c0b5c2e41  font-adobe-utopia-75dpi.post-upgrade"
+md5sums="dd912284e4750023f9682812532fa033  font-adobe-utopia-75dpi-1.0.1.tar.bz2"
diff --git a/x11/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.post-install b/x11/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.post-install
deleted file mode 100644
index 887dedc802c..00000000000
--- a/x11/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/75dpi
-mkfontdir /usr/share/fonts/75dpi
-echo "done."
-
diff --git a/x11/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.post-upgrade b/x11/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.post-upgrade
deleted file mode 120000
index 418bf247188..00000000000
--- a/x11/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-adobe-utopia-75dpi.post-install
\ No newline at end of file
diff --git a/x11/font-adobe-utopia-type1/APKBUILD b/x11/font-adobe-utopia-type1/APKBUILD
index e336226beb5..81303c535bb 100644
--- a/x11/font-adobe-utopia-type1/APKBUILD
+++ b/x11/font-adobe-utopia-type1/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-type1
 pkgver=1.0.1
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="aa7ff4bd20b961afda9c15d103b972a5  font-adobe-utopia-type1-1.0.1.tar.bz2"
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
deleted file mode 100644
index f5162235c8f..00000000000
--- a/x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index da36a1f83b4..00000000000
--- a/x11/font-adobe-utopia-type1/font-adobe-utopia-type1.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 754008eabb7..53b3ac8c600 100644
--- a/x11/font-arabic-misc/APKBUILD
+++ b/x11/font-arabic-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-arabic-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="81595016e2ff859716fc256ebb136ba6  font-arabic-misc-1.0.0.tar.bz2"
diff --git a/x11/font-arabic-misc/font-arabic-misc.post-install b/x11/font-arabic-misc/font-arabic-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-arabic-misc/font-arabic-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index bdd62b20d1b..00000000000
--- a/x11/font-arabic-misc/font-arabic-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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 b6fb27efec9..37f4cd1f36d 100644
--- a/x11/font-bh-100dpi/APKBUILD
+++ b/x11/font-bh-100dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-100dpi
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Bigelow & Holmes bitmap 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="e5592de74a5c04e3a2608800dd079197  font-bh-100dpi-1.0.0.tar.bz2
-8212908634d4a7ad9cd52486f2ba2cde  font-bh-100dpi.post-install
-8212908634d4a7ad9cd52486f2ba2cde  font-bh-100dpi.post-upgrade"
+md5sums="e5592de74a5c04e3a2608800dd079197  font-bh-100dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bh-100dpi/font-bh-100dpi.post-install b/x11/font-bh-100dpi/font-bh-100dpi.post-install
deleted file mode 100644
index 279e9e0042c..00000000000
--- a/x11/font-bh-100dpi/font-bh-100dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/100dpi
-mkfontdir /usr/share/fonts/100dpi
-echo "done."
-
diff --git a/x11/font-bh-100dpi/font-bh-100dpi.post-upgrade b/x11/font-bh-100dpi/font-bh-100dpi.post-upgrade
deleted file mode 120000
index f2e823e1f38..00000000000
--- a/x11/font-bh-100dpi/font-bh-100dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-bh-100dpi.post-install
\ No newline at end of file
diff --git a/x11/font-bh-75dpi/APKBUILD b/x11/font-bh-75dpi/APKBUILD
index 504762bf740..dd22ad8c745 100644
--- a/x11/font-bh-75dpi/APKBUILD
+++ b/x11/font-bh-75dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-75dpi
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Bigelow & Holmes bitmap 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="6e51cd02f4ce32e1393e34ab17a9b211  font-bh-75dpi-1.0.0.tar.bz2
-a24308692d7112b79a5a188c0b5c2e41  font-bh-75dpi.post-install
-a24308692d7112b79a5a188c0b5c2e41  font-bh-75dpi.post-upgrade"
+md5sums="6e51cd02f4ce32e1393e34ab17a9b211  font-bh-75dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bh-75dpi/font-bh-75dpi.post-install b/x11/font-bh-75dpi/font-bh-75dpi.post-install
deleted file mode 100644
index 887dedc802c..00000000000
--- a/x11/font-bh-75dpi/font-bh-75dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/75dpi
-mkfontdir /usr/share/fonts/75dpi
-echo "done."
-
diff --git a/x11/font-bh-75dpi/font-bh-75dpi.post-upgrade b/x11/font-bh-75dpi/font-bh-75dpi.post-upgrade
deleted file mode 120000
index c427af8c542..00000000000
--- a/x11/font-bh-75dpi/font-bh-75dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-bh-75dpi.post-install
\ No newline at end of file
diff --git a/x11/font-bh-lucidatypewriter-100dpi/APKBUILD b/x11/font-bh-lucidatypewriter-100dpi/APKBUILD
index 7f6e815873b..b1bb4fc2b1f 100644
--- a/x11/font-bh-lucidatypewriter-100dpi/APKBUILD
+++ b/x11/font-bh-lucidatypewriter-100dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-lucidatypewriter-100dpi
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Bigelow & Holmes Lucida bitmap 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="c44d3f730564da465993e9292a33c235  font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
-8212908634d4a7ad9cd52486f2ba2cde  font-bh-lucidatypewriter-100dpi.post-install
-8212908634d4a7ad9cd52486f2ba2cde  font-bh-lucidatypewriter-100dpi.post-upgrade"
+md5sums="c44d3f730564da465993e9292a33c235  font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.post-install b/x11/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.post-install
deleted file mode 100644
index 279e9e0042c..00000000000
--- a/x11/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/100dpi
-mkfontdir /usr/share/fonts/100dpi
-echo "done."
-
diff --git a/x11/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.post-upgrade b/x11/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.post-upgrade
deleted file mode 120000
index d8c76e3e355..00000000000
--- a/x11/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-bh-lucidatypewriter-100dpi.post-install
\ No newline at end of file
diff --git a/x11/font-bh-lucidatypewriter-75dpi/APKBUILD b/x11/font-bh-lucidatypewriter-75dpi/APKBUILD
index fe6e3278448..cd5ee83e4af 100644
--- a/x11/font-bh-lucidatypewriter-75dpi/APKBUILD
+++ b/x11/font-bh-lucidatypewriter-75dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-lucidatypewriter-75dpi
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Bigelow & Holmes Lucida bitmap 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="fdd9be5b9db94ef363a33e39b7977e2b  font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
-a24308692d7112b79a5a188c0b5c2e41  font-bh-lucidatypewriter-75dpi.post-install
-a24308692d7112b79a5a188c0b5c2e41  font-bh-lucidatypewriter-75dpi.post-upgrade"
+md5sums="fdd9be5b9db94ef363a33e39b7977e2b  font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.post-install b/x11/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.post-install
deleted file mode 100644
index 887dedc802c..00000000000
--- a/x11/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/75dpi
-mkfontdir /usr/share/fonts/75dpi
-echo "done."
-
diff --git a/x11/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.post-upgrade b/x11/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.post-upgrade
deleted file mode 120000
index 937c6b15062..00000000000
--- a/x11/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-bh-lucidatypewriter-75dpi.post-install
\ No newline at end of file
diff --git a/x11/font-bh-ttf/APKBUILD b/x11/font-bh-ttf/APKBUILD
index e019aa2f6fc..31cd28b6a95 100644
--- a/x11/font-bh-ttf/APKBUILD
+++ b/x11/font-bh-ttf/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-ttf
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="ad43cf739b3d46ba1e7dc778a0608a52  font-bh-ttf-1.0.0.tar.bz2"
diff --git a/x11/font-bh-ttf/font-bh-ttf.post-install b/x11/font-bh-ttf/font-bh-ttf.post-install
deleted file mode 100644
index 5624416832d..00000000000
--- a/x11/font-bh-ttf/font-bh-ttf.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index d05854397a4..00000000000
--- a/x11/font-bh-ttf/font-bh-ttf.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index c0388e7bdaf..43b55663315 100644
--- a/x11/font-bh-type1/APKBUILD
+++ b/x11/font-bh-type1/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-type1
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="46588b22678e440741d6220bc3945cbf  font-bh-type1-1.0.0.tar.bz2"
diff --git a/x11/font-bh-type1/font-bh-type1.post-install b/x11/font-bh-type1/font-bh-type1.post-install
deleted file mode 100644
index 0d210571358..00000000000
--- a/x11/font-bh-type1/font-bh-type1.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index f687ceadfa4..00000000000
--- a/x11/font-bh-type1/font-bh-type1.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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 57962adf0d2..c27cd047699 100644
--- a/x11/font-bitstream-100dpi/APKBUILD
+++ b/x11/font-bitstream-100dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-100dpi
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Bitstream bitmap 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="173352ddec3d26e2b91df1edcf1ae85b  font-bitstream-100dpi-1.0.0.tar.bz2
-8212908634d4a7ad9cd52486f2ba2cde  font-bitstream-100dpi.post-install
-8212908634d4a7ad9cd52486f2ba2cde  font-bitstream-100dpi.post-upgrade"
+md5sums="173352ddec3d26e2b91df1edcf1ae85b  font-bitstream-100dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bitstream-100dpi/font-bitstream-100dpi.post-install b/x11/font-bitstream-100dpi/font-bitstream-100dpi.post-install
deleted file mode 100644
index 279e9e0042c..00000000000
--- a/x11/font-bitstream-100dpi/font-bitstream-100dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/100dpi
-mkfontdir /usr/share/fonts/100dpi
-echo "done."
-
diff --git a/x11/font-bitstream-100dpi/font-bitstream-100dpi.post-upgrade b/x11/font-bitstream-100dpi/font-bitstream-100dpi.post-upgrade
deleted file mode 120000
index 5b8e4163d0f..00000000000
--- a/x11/font-bitstream-100dpi/font-bitstream-100dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-bitstream-100dpi.post-install
\ No newline at end of file
diff --git a/x11/font-bitstream-75dpi/APKBUILD b/x11/font-bitstream-75dpi/APKBUILD
index 738b5f926df..8fcc05b2e2b 100644
--- a/x11/font-bitstream-75dpi/APKBUILD
+++ b/x11/font-bitstream-75dpi/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-75dpi
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Bitstream bitmap 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
 }
 
-md5sums="beb476657d50d07d17eef7c325a5ed08  font-bitstream-75dpi-1.0.0.tar.bz2
-a24308692d7112b79a5a188c0b5c2e41  font-bitstream-75dpi.post-install
-a24308692d7112b79a5a188c0b5c2e41  font-bitstream-75dpi.post-upgrade"
+md5sums="beb476657d50d07d17eef7c325a5ed08  font-bitstream-75dpi-1.0.0.tar.bz2"
diff --git a/x11/font-bitstream-75dpi/font-bitstream-75dpi.post-install b/x11/font-bitstream-75dpi/font-bitstream-75dpi.post-install
deleted file mode 100644
index 887dedc802c..00000000000
--- a/x11/font-bitstream-75dpi/font-bitstream-75dpi.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo -n "Updating font cache (TODO: implement triggers in apk)... "
-fc-cache -f > /dev/null
-mkfontscale /usr/share/fonts/75dpi
-mkfontdir /usr/share/fonts/75dpi
-echo "done."
-
diff --git a/x11/font-bitstream-75dpi/font-bitstream-75dpi.post-upgrade b/x11/font-bitstream-75dpi/font-bitstream-75dpi.post-upgrade
deleted file mode 120000
index 07ad9e00f0b..00000000000
--- a/x11/font-bitstream-75dpi/font-bitstream-75dpi.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-bitstream-75dpi.post-install
\ No newline at end of file
diff --git a/x11/font-bitstream-speedo/APKBUILD b/x11/font-bitstream-speedo/APKBUILD
index e87648a786a..0dbbab1ba8f 100644
--- a/x11/font-bitstream-speedo/APKBUILD
+++ b/x11/font-bitstream-speedo/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-speedo
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="1399dc18aeb9571b0951d9570ea1059d  font-bitstream-speedo-1.0.0.tar.bz2"
diff --git a/x11/font-bitstream-speedo/font-bitstream-speedo.post-install b/x11/font-bitstream-speedo/font-bitstream-speedo.post-install
deleted file mode 100644
index fabb00b412c..00000000000
--- a/x11/font-bitstream-speedo/font-bitstream-speedo.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 0174eb090ea..00000000000
--- a/x11/font-bitstream-speedo/font-bitstream-speedo.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 6473070438a..12f38f0413f 100644
--- a/x11/font-bitstream-type1/APKBUILD
+++ b/x11/font-bitstream-type1/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-type1
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="6610475e2e231242f8f2122a709c3695  font-bitstream-type1-1.0.0.tar.bz2"
diff --git a/x11/font-bitstream-type1/font-bitstream-type1.post-install b/x11/font-bitstream-type1/font-bitstream-type1.post-install
deleted file mode 100644
index 0d210571358..00000000000
--- a/x11/font-bitstream-type1/font-bitstream-type1.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 691d0bf9709..00000000000
--- a/x11/font-bitstream-type1/font-bitstream-type1.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index c36eb9149cf..e4b155815eb 100644
--- a/x11/font-cronyx-cyrillic/APKBUILD
+++ b/x11/font-cronyx-cyrillic/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-cronyx-cyrillic
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="22b451e7230b8c003cfc496ee2d360cc  font-cronyx-cyrillic-1.0.0.tar.bz2"
diff --git a/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-install b/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-install
deleted file mode 100644
index 0d2f0d77cdf..00000000000
--- a/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 1198ffd2575..00000000000
--- a/x11/font-cronyx-cyrillic/font-cronyx-cyrillic.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 7a819cd842b..3b3ca078dc3 100644
--- a/x11/font-cursor-misc/APKBUILD
+++ b/x11/font-cursor-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-cursor-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="305fa22cdfefb8f80babd711051a534b  font-cursor-misc-1.0.0.tar.bz2"
diff --git a/x11/font-cursor-misc/font-cursor-misc.post-install b/x11/font-cursor-misc/font-cursor-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-cursor-misc/font-cursor-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index becaa73e31d..00000000000
--- a/x11/font-cursor-misc/font-cursor-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index deeeaaaf54c..9f8719f4c6b 100644
--- a/x11/font-daewoo-misc/APKBUILD
+++ b/x11/font-daewoo-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-daewoo-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="61f9eab48c619af5494d3e384d8d7d79  font-daewoo-misc-1.0.0.tar.bz2"
diff --git a/x11/font-daewoo-misc/font-daewoo-misc.post-install b/x11/font-daewoo-misc/font-daewoo-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-daewoo-misc/font-daewoo-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index cba2bf1f020..00000000000
--- a/x11/font-daewoo-misc/font-daewoo-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 6b6a79bf09a..c8d7b07c806 100644
--- a/x11/font-dec-misc/APKBUILD
+++ b/x11/font-dec-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-dec-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="284e554db1c64fb7580a06df01444a2b  font-dec-misc-1.0.0.tar.bz2"
diff --git a/x11/font-dec-misc/font-dec-misc.post-install b/x11/font-dec-misc/font-dec-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-dec-misc/font-dec-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 80c5b14b6f0..00000000000
--- a/x11/font-dec-misc/font-dec-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 880105ffca3..34a9e264415 100644
--- a/x11/font-ibm-type1/APKBUILD
+++ b/x11/font-ibm-type1/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-ibm-type1
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="8e8733051371e2b51123376b49f5d3ea  font-ibm-type1-1.0.0.tar.bz2"
diff --git a/x11/font-ibm-type1/font-ibm-type1.post-install b/x11/font-ibm-type1/font-ibm-type1.post-install
deleted file mode 100644
index 0d210571358..00000000000
--- a/x11/font-ibm-type1/font-ibm-type1.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 4fff34efbc0..00000000000
--- a/x11/font-ibm-type1/font-ibm-type1.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 6acb846d883..2a3fcd3f98e 100644
--- a/x11/font-isas-misc/APKBUILD
+++ b/x11/font-isas-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-isas-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="ec709a96b64b497a5cb5658c93bd38dc  font-isas-misc-1.0.0.tar.bz2"
diff --git a/x11/font-isas-misc/font-isas-misc.post-install b/x11/font-isas-misc/font-isas-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-isas-misc/font-isas-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index ce06bdb3db5..00000000000
--- a/x11/font-isas-misc/font-isas-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index b19caf81bd6..70071bfcc1e 100644
--- a/x11/font-jis-misc/APKBUILD
+++ b/x11/font-jis-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-jis-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="61febb49a71065723a1fba17cbf23c67  font-jis-misc-1.0.0.tar.bz2"
diff --git a/x11/font-jis-misc/font-jis-misc.post-install b/x11/font-jis-misc/font-jis-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-jis-misc/font-jis-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index a1e2ce0df74..00000000000
--- a/x11/font-jis-misc/font-jis-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 17285c2684a..d2ca0977b36 100644
--- a/x11/font-micro-misc/APKBUILD
+++ b/x11/font-micro-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-micro-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="8c8bffd7540f05caa0dbb4e6e1d6c58e  font-micro-misc-1.0.0.tar.bz2"
diff --git a/x11/font-micro-misc/font-micro-misc.post-install b/x11/font-micro-misc/font-micro-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-micro-misc/font-micro-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 8c6b42ccb13..00000000000
--- a/x11/font-micro-misc/font-micro-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index ccbc3c3d318..d49c2cf9465 100644
--- a/x11/font-misc-cyrillic/APKBUILD
+++ b/x11/font-misc-cyrillic/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-cyrillic
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="3596907d7a2a99c81d8de99bc4552b6a  font-misc-cyrillic-1.0.0.tar.bz2"
diff --git a/x11/font-misc-cyrillic/font-misc-cyrillic.post-install b/x11/font-misc-cyrillic/font-misc-cyrillic.post-install
deleted file mode 100644
index 0d2f0d77cdf..00000000000
--- a/x11/font-misc-cyrillic/font-misc-cyrillic.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index ca0af793d22..00000000000
--- a/x11/font-misc-cyrillic/font-misc-cyrillic.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 9de203b45ca..cf2a54984d7 100644
--- a/x11/font-misc-ethiopic/APKBUILD
+++ b/x11/font-misc-ethiopic/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-ethiopic
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="0b271fc617087d77560bdca20c0cdbb0  font-misc-ethiopic-1.0.0.tar.bz2"
diff --git a/x11/font-misc-ethiopic/font-misc-ethiopic.post-install b/x11/font-misc-ethiopic/font-misc-ethiopic.post-install
deleted file mode 100644
index ebd2bbfad36..00000000000
--- a/x11/font-misc-ethiopic/font-misc-ethiopic.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index cf8f78d4d80..00000000000
--- a/x11/font-misc-ethiopic/font-misc-ethiopic.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index f63fb9bc847..1ba95b9bb9c 100644
--- a/x11/font-misc-meltho/APKBUILD
+++ b/x11/font-misc-meltho/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-meltho
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="ccb212a7badf7aefdc9f9a92af428d32  font-misc-meltho-1.0.0.tar.bz2"
diff --git a/x11/font-misc-meltho/font-misc-meltho.post-install b/x11/font-misc-meltho/font-misc-meltho.post-install
deleted file mode 100644
index 9424edc7eae..00000000000
--- a/x11/font-misc-meltho/font-misc-meltho.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 97a56879f67..00000000000
--- a/x11/font-misc-meltho/font-misc-meltho.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index abbd6e8e4e5..63038836c4e 100644
--- a/x11/font-misc-misc/APKBUILD
+++ b/x11/font-misc-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="2a57f6188c41d4bc1b88ca3d08ad011d  font-misc-misc-1.0.0.tar.bz2"
diff --git a/x11/font-misc-misc/font-misc-misc.post-install b/x11/font-misc-misc/font-misc-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-misc-misc/font-misc-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index e2e3545af7c..00000000000
--- a/x11/font-misc-misc/font-misc-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 3cf00aeddd0..63c63f49e7a 100644
--- a/x11/font-mutt-misc/APKBUILD
+++ b/x11/font-mutt-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-mutt-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="648b409b7eb78ad1cd5f6d7fac3eef88  font-mutt-misc-1.0.0.tar.bz2"
diff --git a/x11/font-mutt-misc/font-mutt-misc.post-install b/x11/font-mutt-misc/font-mutt-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-mutt-misc/font-mutt-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index b23625ff362..00000000000
--- a/x11/font-mutt-misc/font-mutt-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 1f455b752bc..5693c516878 100644
--- a/x11/font-schumacher-misc/APKBUILD
+++ b/x11/font-schumacher-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-schumacher-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="f1c6063d2fadc57e696a0aab69afd6e0  font-schumacher-misc-1.0.0.tar.bz2"
diff --git a/x11/font-schumacher-misc/font-schumacher-misc.post-install b/x11/font-schumacher-misc/font-schumacher-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-schumacher-misc/font-schumacher-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 453ab67fdab..00000000000
--- a/x11/font-schumacher-misc/font-schumacher-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 07965a70337..5f2b143af43 100644
--- a/x11/font-screen-cyrillic/APKBUILD
+++ b/x11/font-screen-cyrillic/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-screen-cyrillic
 pkgver=1.0.1
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="c8d5aef01c906c7aaea329702a8b1b63  font-screen-cyrillic-1.0.1.tar.bz2"
diff --git a/x11/font-screen-cyrillic/font-screen-cyrillic.post-install b/x11/font-screen-cyrillic/font-screen-cyrillic.post-install
deleted file mode 100644
index 0d2f0d77cdf..00000000000
--- a/x11/font-screen-cyrillic/font-screen-cyrillic.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 123449b9f18..00000000000
--- a/x11/font-screen-cyrillic/font-screen-cyrillic.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index c6c46501402..cc346436a9f 100644
--- a/x11/font-sony-misc/APKBUILD
+++ b/x11/font-sony-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-sony-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="0dfddd1a946e4497f009094c0ae1bdd5  font-sony-misc-1.0.0.tar.bz2"
diff --git a/x11/font-sony-misc/font-sony-misc.post-install b/x11/font-sony-misc/font-sony-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-sony-misc/font-sony-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index f066810b0d2..00000000000
--- a/x11/font-sony-misc/font-sony-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index ea8fd121874..9f50fc326c3 100644
--- a/x11/font-sun-misc/APKBUILD
+++ b/x11/font-sun-misc/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-sun-misc
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="e17d43a7c6c0d862cfba0908ff132ffa  font-sun-misc-1.0.0.tar.bz2"
diff --git a/x11/font-sun-misc/font-sun-misc.post-install b/x11/font-sun-misc/font-sun-misc.post-install
deleted file mode 100644
index e9dc2acdad5..00000000000
--- a/x11/font-sun-misc/font-sun-misc.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index bfd74ce3740..00000000000
--- a/x11/font-sun-misc/font-sun-misc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 7343eb2efb0..fe1a60d0bef 100644
--- a/x11/font-winitzki-cyrillic/APKBUILD
+++ b/x11/font-winitzki-cyrillic/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-winitzki-cyrillic
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="b99b02aff36a88ca3379715423c60303  font-winitzki-cyrillic-1.0.0.tar.bz2"
diff --git a/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-install b/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-install
deleted file mode 100644
index 0d2f0d77cdf..00000000000
--- a/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index a0928865f26..00000000000
--- a/x11/font-winitzki-cyrillic/font-winitzki-cyrillic.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-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
index 0852e7cf7ed..42b22285bef 100644
--- a/x11/font-xfree86-type1/APKBUILD
+++ b/x11/font-xfree86-type1/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-xfree86-type1
 pkgver=1.0.1
-pkgrel=0
+pkgrel=2
 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"
+install=
+source="http://xorg.freedesktop.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 build() { 
 	cd "$srcdir"/$pkgname-$pkgver
@@ -20,6 +19,4 @@ build() {
 	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"
+md5sums="d7e965776c7f0c30b0f09742176fb77a  font-xfree86-type1-1.0.1.tar.bz2"
diff --git a/x11/font-xfree86-type1/font-xfree86-type1.post-install b/x11/font-xfree86-type1/font-xfree86-type1.post-install
deleted file mode 100644
index 0d210571358..00000000000
--- a/x11/font-xfree86-type1/font-xfree86-type1.post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 120000
index 5362f29a285..00000000000
--- a/x11/font-xfree86-type1/font-xfree86-type1.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-font-xfree86-type1.post-install
\ No newline at end of file
diff --git a/x11/fontconfig/APKBUILD b/x11/fontconfig/APKBUILD
index b315afea118..1147f0d107a 100644
--- a/x11/fontconfig/APKBUILD
+++ b/x11/fontconfig/APKBUILD
@@ -2,13 +2,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fontconfig
 pkgver="2.6.0"
-pkgrel=1
+pkgrel=2
 pkgdesc="The Fontconfig package is a library for configuring and customizing font access."
 url="http://fontconfig.org"
 license="GPL"
 depends=
 makedepends="pkgconfig freetype-dev expat-dev zlib-dev"
 install=
+triggers="$pkgname.trigger:/usr/share/fonts/*"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://fontconfig.org/release/${pkgname}-${pkgver}.tar.gz"
 depends_dev="freetype-dev expat-dev"
diff --git a/x11/fontconfig/fontconfig.trigger b/x11/fontconfig/fontconfig.trigger
new file mode 100644
index 00000000000..35f3d37ebf5
--- /dev/null
+++ b/x11/fontconfig/fontconfig.trigger
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+fc-cache -f > /dev/null
+
diff --git a/x11/gnome-doc-utils/APKBUILD b/x11/gnome-doc-utils/APKBUILD
new file mode 100644
index 00000000000..9641482c7f3
--- /dev/null
+++ b/x11/gnome-doc-utils/APKBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gnome-doc-utils
+pkgver=0.16.1
+pkgrel=0
+pkgdesc="Documentation utilities for Gnome"
+url="http://www.gnome.org"
+license="GPL LGPL"
+depends="python docbook-xml rarian"
+makedepends="libxslt-dev libxml2-dev perl-xml-parser rarian-dev pkgconfig
+	gettext-dev"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.16/$pkgname-$pkgver.tar.bz2"
+
+build () 
+{ 
+	cd ""$srcdir"/$pkgname-$pkgver"
+	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --localstatedir=/var --disable-scrollkeeper || return 1
+	make || return 1
+	make DESTDIR=""$pkgdir"" install || return 1
+}
+md5sums="85d4bba44773f6162de72e81e8bd0ab0  gnome-doc-utils-0.16.1.tar.bz2"
diff --git a/x11/gst-plugins-base/APKBUILD b/x11/gst-plugins-base/APKBUILD
index 5e1896776ac..b364033747b 100644
--- a/x11/gst-plugins-base/APKBUILD
+++ b/x11/gst-plugins-base/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-plugins-base
-pkgver=0.10.23
+pkgver=0.10.24
 pkgrel=0
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
 url="http://gstreamer.freedesktop.org/"
@@ -9,7 +9,7 @@ subpackages="$pkgname-dev $pkgname-doc"
 depends=
 makedepends="pkgconfig gstreamer-dev alsa-lib-dev libvorbis-dev liboil-dev
 	perl libogg-dev gtk+-dev libtheora-dev libice-dev libsm-dev libxv-dev
-	e2fsprogs-dev expat-dev"
+	util-linux-ng-dev expat-dev"
 # cdparanoia>=10.2 libvisual libtheora"
 source="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2"
 
@@ -27,7 +27,7 @@ build ()
 		--with-package-origin="http://www.alpinelinux.org/" \
 		|| return 1
 	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
+	make -j1 DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="641cc7def2d8667b9b4df15e69dba25f  gst-plugins-base-0.10.23.tar.bz2"
+md5sums="a3ec977c9c6602caacc2d3a7c12a17bf  gst-plugins-base-0.10.24.tar.bz2"
diff --git a/x11/gst-plugins-good/APKBUILD b/x11/gst-plugins-good/APKBUILD
index a929d81dcdd..7d4dd526236 100644
--- a/x11/gst-plugins-good/APKBUILD
+++ b/x11/gst-plugins-good/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-plugins-good
 pkgver=0.10.15
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 url="http://gstreamer.freedesktop.org/"
 license="LGPL"
 subpackages="$pkgname-dev"
 depends=
-makedepends="gstreamer-dev glib-dev gst-plugins-base liboil-dev
-	gst-plugins-base-dev libsoup-dev flac-dev libogg-dev"
+makedepends="gstreamer-dev glib-dev liboil-dev gst-plugins-base-dev
+	libsoup-dev flac-dev libogg-dev taglib-dev"
 
 # might consider those:
 #libavc1394
@@ -17,14 +17,15 @@ makedepends="gstreamer-dev glib-dev gst-plugins-base liboil-dev
 #libshout
 #libdv
 #wavpack
-#taglib
 #libv4l
 #libcaca
 
 source="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.bz2"
 
-build () 
-{ 
+depends_dev="gstreamer-dev gst-plugins-base-dev"
+
+build ()
+{
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
diff --git a/x11/gstreamer/APKBUILD b/x11/gstreamer/APKBUILD
index 139ab108617..6568c9166f3 100644
--- a/x11/gstreamer/APKBUILD
+++ b/x11/gstreamer/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gstreamer
-pkgver=0.10.23
+pkgver=0.10.24
 pkgrel=0
 pkgdesc="GStreamer Multimedia Framework"
 url="http://gstreamer.freedesktop.org/"
@@ -23,4 +23,4 @@ build ()
 	make DESTDIR="$pkgdir" install || return 1
 	cd "$pkgdir"/usr/bin
 }
-md5sums="f7b2e300d2d85756407ec529424ab237  gstreamer-0.10.23.tar.bz2"
+md5sums="178d3326c96c360c9a15751bd5d73a6c  gstreamer-0.10.24.tar.bz2"
diff --git a/x11/gtk-doc/APKBUILD b/x11/gtk-doc/APKBUILD
new file mode 100644
index 00000000000..2a00cb6afc3
--- /dev/null
+++ b/x11/gtk-doc/APKBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gtk-doc
+pkgver=1.11
+pkgrel=1
+pkgdesc="Documentation tool for public library API"
+url="http://www.gtk.org/gtk-doc/"
+license="GPL FDL"
+depends="docbook-xsl gnome-doc-utils perl pkgconfig"
+makedepends="rarian-dev"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr || return 1
+	make || return 1
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="b5e268c71fa90aad890cf53715664d0a  gtk-doc-1.11.tar.bz2"
diff --git a/x11/intltool/APKBUILD b/x11/intltool/APKBUILD
index 9b817d3428e..bf231ce6143 100644
--- a/x11/intltool/APKBUILD
+++ b/x11/intltool/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=intltool
 pkgver=0.40.6
-pkgrel=1
+pkgrel=2
 pkgdesc="The internationalization tool collection"
 url="http://freedesktop.org/wiki/Software/intltool"
 license="GPL"
diff --git a/x11/mkfontdir/APKBUILD b/x11/mkfontdir/APKBUILD
index 6d9bb5f899e..e2cd6c6a457 100644
--- a/x11/mkfontdir/APKBUILD
+++ b/x11/mkfontdir/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkfontdir
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="create an index of X font files in a directory"
 url="http://xorg.freedesktop.org/"
 license="custom"
@@ -9,6 +9,7 @@ subpackages="$pkgname-doc"
 depends="uclibc mkfontscale"
 makedepends="pkgconfig"
 install=
+triggers="$pkgname.trigger:/usr/share/fonts/*"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() { 
diff --git a/x11/mkfontdir/mkfontdir.trigger b/x11/mkfontdir/mkfontdir.trigger
new file mode 100644
index 00000000000..4fce36a1183
--- /dev/null
+++ b/x11/mkfontdir/mkfontdir.trigger
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for i in "$@"; do
+	mkfontdir "$i"
+done
+
diff --git a/x11/mkfontscale/APKBUILD b/x11/mkfontscale/APKBUILD
index b020cf463ef..cad4e8e703a 100644
--- a/x11/mkfontscale/APKBUILD
+++ b/x11/mkfontscale/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkfontscale
 pkgver=1.0.6
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org font scale"
 url="http://xorg.freedesktop.org/"
 license="custom"
 subpackages="$pkgname-doc"
-depends="libfontenc freetype zlib uclibc"
+depends=
 makedepends="pkgconfig libfontenc-dev freetype-dev xproto zlib-dev"
 install=
+triggers="$pkgname.trigger:/usr/share/fonts/*"
 source="http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() { 
diff --git a/x11/mkfontscale/mkfontscale.trigger b/x11/mkfontscale/mkfontscale.trigger
new file mode 100644
index 00000000000..2357e06dc0c
--- /dev/null
+++ b/x11/mkfontscale/mkfontscale.trigger
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for i in "$@"; do
+	mkfontscale "$i"
+done
+
diff --git a/x11/rarian/APKBUILD b/x11/rarian/APKBUILD
new file mode 100644
index 00000000000..76495449056
--- /dev/null
+++ b/x11/rarian/APKBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=rarian
+pkgver=0.8.1
+pkgrel=1
+pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper."
+url="http://rarian.freedesktop.org/"
+license="GPL"
+subpackages="$pkgname-dev"
+depends="bash"
+makedepends="libxslt-dev"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
+	user-segfault.patch"
+
+build ()
+{
+	cd "$srcdir"/$pkgname-$pkgver
+	patch -p0 -i "$srcdir"/user-segfault.patch || return 1
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-scrollkeeper-compat \
+		--disable-static || return 1
+	make || return 1
+	make -j1 DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="75091185e13da67a0ff4279de1757b94  rarian-0.8.1.tar.bz2
+457e9827197009cfa360911fe49a5ad7  user-segfault.patch"
diff --git a/x11/rarian/user-segfault.patch b/x11/rarian/user-segfault.patch
new file mode 100644
index 00000000000..3311cecdd29
--- /dev/null
+++ b/x11/rarian/user-segfault.patch
@@ -0,0 +1,14 @@
+--- util/rarian-sk-get-cl.cpp~	2008-07-28 19:23:28.000000000 +0200
++++ util/rarian-sk-get-cl.cpp	2008-07-28 19:23:28.000000000 +0200
+@@ -160,6 +160,11 @@
+ {
+   char *filename = NULL;
+   char *user = getenv ("USERNAME");
++
++  if (user == NULL) {
++    user = getenv ("USER");
++  }
++
+   char *basepath = NULL;
+   int i=0;
+   int last = 0;
diff --git a/x11/xfce4-dev-tools/APKBUILD b/x11/xfce4-dev-tools/APKBUILD
index 0cc2340ac9e..80ca610d754 100644
--- a/x11/xfce4-dev-tools/APKBUILD
+++ b/x11/xfce4-dev-tools/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-dev-tools
 pkgver=4.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Xfce developer tools"
 url="http://www.xfce.org/"
 license="GPL2"
-depends="automake autoconf make intltool pkgconfig"
+depends="automake autoconf make intltool pkgconfig gtk-doc"
 makedepends=
 source="http://mocha.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2"