From 5deff56dc368c8b3955c1be25cb7db7d33260892 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Wed, 22 Feb 2012 21:36:11 -0700
Subject: [PATCH 01/24] New package: libnsbmp-0.0.3 (for netsurf)

---
 srcpkgs/libnsbmp-devel                   |  1 +
 srcpkgs/libnsbmp/depends                 |  2 ++
 srcpkgs/libnsbmp/libnsbmp-devel.template | 21 +++++++++++++++++
 srcpkgs/libnsbmp/template                | 30 ++++++++++++++++++++++++
 4 files changed, 54 insertions(+)
 create mode 120000 srcpkgs/libnsbmp-devel
 create mode 100644 srcpkgs/libnsbmp/depends
 create mode 100644 srcpkgs/libnsbmp/libnsbmp-devel.template
 create mode 100644 srcpkgs/libnsbmp/template

diff --git a/srcpkgs/libnsbmp-devel b/srcpkgs/libnsbmp-devel
new file mode 120000
index 00000000000..4be7d867219
--- /dev/null
+++ b/srcpkgs/libnsbmp-devel
@@ -0,0 +1 @@
+libnsbmp
\ No newline at end of file
diff --git a/srcpkgs/libnsbmp/depends b/srcpkgs/libnsbmp/depends
new file mode 100644
index 00000000000..12f980f59d1
--- /dev/null
+++ b/srcpkgs/libnsbmp/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.0.3"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template
new file mode 100644
index 00000000000..41be0ed257c
--- /dev/null
+++ b/srcpkgs/libnsbmp/libnsbmp-devel.template
@@ -0,0 +1,21 @@
+# Template file for 'libnsbmp-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libnsbmp
+
+do_install() {
+	mkdir -p ${DESTDIR}/usr/lib/pkgconfig
+
+	sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \
+		-e 's#MINOR#0#' -e 's#PATCH#3#' \
+		-e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \
+		${wrksrc}/libnsbmp.pc.in \
+		> ${DESTDIR}/usr/lib/pkgconfig/libnsbmp.pc
+
+
+	mv ${wrksrc}/include ${DESTDIR}/usr
+}
diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template
new file mode 100644
index 00000000000..61eeca858d5
--- /dev/null
+++ b/srcpkgs/libnsbmp/template
@@ -0,0 +1,30 @@
+# Template build file for 'libnsbmp'.
+pkgname=libnsbmp
+version=0.0.3
+distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="Decoding library for BMP and ICO images in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=e0ccf851bf6dc9398b587f1b3f919773a49d7d2eb082b99ab5898217d73e47a2
+long_desc="
+ libnsbmp is a decoding library for BMP and ICO image file formats, written
+ in C. It was developed as part of the NetSurf project and is available for
+ use by other software under the MIT licence.
+
+ * Features
+ 	Decodes BMP files
+ 	Decodes ICO files"
+
+subpackages="${pkgname}-devel"
+
+wrksrc=${pkgname}-${version}-src
+
+Add_dependency build sed
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	vinstall "build-Linux-Linux-release-lib-static/libnsbmp.a" \
+		0644 "usr/lib"
+}

From 7e772d57d5917c9b379fe22c05ec8744f2d1addd Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Wed, 22 Feb 2012 21:43:57 -0700
Subject: [PATCH 02/24] New package: libnsgif-0.0.3 (for netsurf)

---
 srcpkgs/libnsgif-devel                   |  1 +
 srcpkgs/libnsgif/depends                 |  2 ++
 srcpkgs/libnsgif/libnsgif-devel.template | 21 +++++++++++++++++
 srcpkgs/libnsgif/template                | 29 ++++++++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 120000 srcpkgs/libnsgif-devel
 create mode 100644 srcpkgs/libnsgif/depends
 create mode 100644 srcpkgs/libnsgif/libnsgif-devel.template
 create mode 100644 srcpkgs/libnsgif/template

diff --git a/srcpkgs/libnsgif-devel b/srcpkgs/libnsgif-devel
new file mode 120000
index 00000000000..acaa2be89f7
--- /dev/null
+++ b/srcpkgs/libnsgif-devel
@@ -0,0 +1 @@
+libnsgif
\ No newline at end of file
diff --git a/srcpkgs/libnsgif/depends b/srcpkgs/libnsgif/depends
new file mode 100644
index 00000000000..12f980f59d1
--- /dev/null
+++ b/srcpkgs/libnsgif/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.0.3"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template
new file mode 100644
index 00000000000..ab0178a1283
--- /dev/null
+++ b/srcpkgs/libnsgif/libnsgif-devel.template
@@ -0,0 +1,21 @@
+# Template file for 'libnsgif-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libnsgif
+
+do_install() {
+	mkdir -p ${DESTDIR}/usr/lib/pkgconfig
+
+	sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \
+		-e 's#MINOR#0#' -e 's#PATCH#3#' \
+		-e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \
+		${wrksrc}/libnsgif.pc.in \
+		> ${DESTDIR}/usr/lib/pkgconfig/libnsgif.pc
+
+
+	mv ${wrksrc}/include ${DESTDIR}/usr
+}
diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template
new file mode 100644
index 00000000000..6cec3d7c2b2
--- /dev/null
+++ b/srcpkgs/libnsgif/template
@@ -0,0 +1,29 @@
+# Template build file for 'libnsgif'.
+pkgname=libnsgif
+version=0.0.3
+distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="Decoding library for the GIF image file format, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=1f53bb6cc449c3b108d7653ce876ec58745f184d5a6675a95f1fa8c937dfc6d5
+long_desc="
+ libnsgif is a decoding library for the GIF image file format, written
+ in C. It was developed as part of the NetSurf project and is available
+ for use by other software under the MIT licence.
+
+ * Features
+ 	Decodes GIF files"
+
+subpackages="${pkgname}-devel"
+
+wrksrc=${pkgname}-${version}-src
+
+Add_dependency build sed
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	vinstall "build-Linux-Linux-release-lib-static/libnsgif.a" \
+		0644 "usr/lib"
+}

From 60e2f2932445f8d0bec36367ca0b9371276b910c Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Wed, 22 Feb 2012 22:08:21 -0700
Subject: [PATCH 03/24] New package: libparserutils-0.1.1 (for netsurf)

---
 srcpkgs/libparserutils-devel                  |  1 +
 srcpkgs/libparserutils/depends                |  2 ++
 .../libparserutils-devel.template             | 15 ++++++++
 srcpkgs/libparserutils/template               | 36 +++++++++++++++++++
 4 files changed, 54 insertions(+)
 create mode 120000 srcpkgs/libparserutils-devel
 create mode 100644 srcpkgs/libparserutils/depends
 create mode 100644 srcpkgs/libparserutils/libparserutils-devel.template
 create mode 100644 srcpkgs/libparserutils/template

diff --git a/srcpkgs/libparserutils-devel b/srcpkgs/libparserutils-devel
new file mode 120000
index 00000000000..76bd945de12
--- /dev/null
+++ b/srcpkgs/libparserutils-devel
@@ -0,0 +1 @@
+libparserutils
\ No newline at end of file
diff --git a/srcpkgs/libparserutils/depends b/srcpkgs/libparserutils/depends
new file mode 100644
index 00000000000..56fb9e056a7
--- /dev/null
+++ b/srcpkgs/libparserutils/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.1"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libparserutils/libparserutils-devel.template b/srcpkgs/libparserutils/libparserutils-devel.template
new file mode 100644
index 00000000000..b42678aaaae
--- /dev/null
+++ b/srcpkgs/libparserutils/libparserutils-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'libparserutils-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libparserutils
+
+do_install() {
+
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+
+}
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
new file mode 100644
index 00000000000..fdcddfc1431
--- /dev/null
+++ b/srcpkgs/libparserutils/template
@@ -0,0 +1,36 @@
+# Template build file for 'libnsgif'.
+pkgname=libparserutils
+version=0.1.1
+distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="Library for building efficient parsers, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=8b79ba58d6fa63fa9c74b71482d93f2c5b2c22badac77265f3cc47f3f603f87d
+long_desc="
+ LibParserUtils is a library for building efficient parsers, written
+ in C. It was developed as part of the NetSurf project and is available
+ for use by other software under the MIT licence.
+
+ * Features
+ 	No mandatory dependencies (iconv() implementation optional for
+ 		enhanced charset support)
+ 	A number of built-in character set converters
+ 	Mapping of character set names to/from MIB enum values
+ 	UTF-8 and UTF-16 (host endian) support functions
+ 	Various simple data structures (resizeable buffer, stack, vector)
+ 	A UTF-8 input stream
+ 	Simple C API
+ 	Portable
+ 	Shared library"
+
+subpackages="${pkgname}-devel"
+
+Add_dependency build sed
+Add_dependency build perl
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make ${makejobs} PREFIX=/usr DESTDIR=${DESTDIR} install
+}

From 8dd7686e11857ff303958e70d5b5539be748fbbf Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 12:24:43 -0700
Subject: [PATCH 04/24] libnsbmp: fix to build/install properly.

---
 srcpkgs/libnsbmp/libnsbmp-devel.template | 14 ++++----------
 srcpkgs/libnsbmp/libnsbmp.rshlibs        |  1 +
 srcpkgs/libnsbmp/template                | 10 +++++++---
 3 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/libnsbmp/libnsbmp.rshlibs

diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template
index 41be0ed257c..d769c31f000 100644
--- a/srcpkgs/libnsbmp/libnsbmp-devel.template
+++ b/srcpkgs/libnsbmp/libnsbmp-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libnsbmp-devel'.
 #
+revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
@@ -8,14 +9,7 @@ long_desc="${long_desc}
 Add_dependency run libnsbmp
 
 do_install() {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig
-
-	sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \
-		-e 's#MINOR#0#' -e 's#PATCH#3#' \
-		-e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \
-		${wrksrc}/libnsbmp.pc.in \
-		> ${DESTDIR}/usr/lib/pkgconfig/libnsbmp.pc
-
-
-	mv ${wrksrc}/include ${DESTDIR}/usr
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/libnsbmp/libnsbmp.rshlibs b/srcpkgs/libnsbmp/libnsbmp.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libnsbmp/libnsbmp.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template
index 61eeca858d5..284d35871e0 100644
--- a/srcpkgs/libnsbmp/template
+++ b/srcpkgs/libnsbmp/template
@@ -1,6 +1,7 @@
 # Template build file for 'libnsbmp'.
 pkgname=libnsbmp
 version=0.0.3
+revision=1
 distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
 short_desc="Decoding library for BMP and ICO images in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -21,10 +22,13 @@ wrksrc=${pkgname}-${version}-src
 Add_dependency build sed
 
 do_build() {
-	make ${makejobs}
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
 }
 
 do_install() {
-	vinstall "build-Linux-Linux-release-lib-static/libnsbmp.a" \
-		0644 "usr/lib"
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		DESTDIR=${DESTDIR} PREFIX=/usr install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		DESTDIR=${DESTDIR} PREFIX=/usr install
 }

From 6d6a68fc383692d44eed102c74a06991ac0bf5aa Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 12:25:00 -0700
Subject: [PATCH 05/24] libnsgif: fix to build/install properly.

---
 srcpkgs/libnsgif/libnsgif-devel.template | 14 ++++----------
 srcpkgs/libnsgif/libnsgif.rshlibs        |  1 +
 srcpkgs/libnsgif/template                | 10 +++++++---
 3 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/libnsgif/libnsgif.rshlibs

diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template
index ab0178a1283..5a5ecfcb948 100644
--- a/srcpkgs/libnsgif/libnsgif-devel.template
+++ b/srcpkgs/libnsgif/libnsgif-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libnsgif-devel'.
 #
+revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
@@ -8,14 +9,7 @@ long_desc="${long_desc}
 Add_dependency run libnsgif
 
 do_install() {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig
-
-	sed -e 's#PREFIX#/usr#' -e 's#MAJOR#0#' \
-		-e 's#MINOR#0#' -e 's#PATCH#3#' \
-		-e 's#VERSION#0.0.3#' -e 's#REQUIRED##' \
-		${wrksrc}/libnsgif.pc.in \
-		> ${DESTDIR}/usr/lib/pkgconfig/libnsgif.pc
-
-
-	mv ${wrksrc}/include ${DESTDIR}/usr
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/libnsgif/libnsgif.rshlibs b/srcpkgs/libnsgif/libnsgif.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libnsgif/libnsgif.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template
index 6cec3d7c2b2..edc220a15c9 100644
--- a/srcpkgs/libnsgif/template
+++ b/srcpkgs/libnsgif/template
@@ -1,6 +1,7 @@
 # Template build file for 'libnsgif'.
 pkgname=libnsgif
 version=0.0.3
+revision=1
 distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
 short_desc="Decoding library for the GIF image file format, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -20,10 +21,13 @@ wrksrc=${pkgname}-${version}-src
 Add_dependency build sed
 
 do_build() {
-	make ${makejobs}
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
 }
 
 do_install() {
-	vinstall "build-Linux-Linux-release-lib-static/libnsgif.a" \
-		0644 "usr/lib"
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		DESTDIR=${DESTDIR} PREFIX=/usr install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		DESTDIR=${DESTDIR} PREFIX=/usr install
 }

From 884806b8101160f929aff49fb46eb448deab91fa Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 12:25:30 -0700
Subject: [PATCH 06/24] libparserutils: fix to build/install properly.

---
 srcpkgs/libparserutils/libparserutils-devel.template | 3 ++-
 srcpkgs/libparserutils/libparserutils.rshlibs        | 1 +
 srcpkgs/libparserutils/template                      | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/libparserutils/libparserutils.rshlibs

diff --git a/srcpkgs/libparserutils/libparserutils-devel.template b/srcpkgs/libparserutils/libparserutils-devel.template
index b42678aaaae..be063de3b88 100644
--- a/srcpkgs/libparserutils/libparserutils-devel.template
+++ b/srcpkgs/libparserutils/libparserutils-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libparserutils-devel'.
 #
+revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
@@ -11,5 +12,5 @@ do_install() {
 
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
-
+	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/libparserutils/libparserutils.rshlibs b/srcpkgs/libparserutils/libparserutils.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libparserutils/libparserutils.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
index fdcddfc1431..c8d8f2a65eb 100644
--- a/srcpkgs/libparserutils/template
+++ b/srcpkgs/libparserutils/template
@@ -1,6 +1,7 @@
 # Template build file for 'libnsgif'.
 pkgname=libparserutils
 version=0.1.1
+revision=1
 distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
 short_desc="Library for building efficient parsers, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
@@ -28,9 +29,13 @@ Add_dependency build sed
 Add_dependency build perl
 
 do_build() {
-	make ${makejobs}
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
 }
 
 do_install() {
-	make ${makejobs} PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
 }

From 797d8927d263923d888912b555a34bce3ad13a53 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 12:36:14 -0700
Subject: [PATCH 07/24] New package: libwapcaplet-0.1.0 (for netsurf)

---
 srcpkgs/libwapcaplet-devel                    |  1 +
 srcpkgs/libwapcaplet/depends                  |  2 ++
 .../libwapcaplet/libwapcaplet-devel.template  | 14 +++++++++
 srcpkgs/libwapcaplet/libwapcaplet.rshlibs     |  1 +
 srcpkgs/libwapcaplet/template                 | 31 +++++++++++++++++++
 5 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/libwapcaplet-devel
 create mode 100644 srcpkgs/libwapcaplet/depends
 create mode 100644 srcpkgs/libwapcaplet/libwapcaplet-devel.template
 create mode 100644 srcpkgs/libwapcaplet/libwapcaplet.rshlibs
 create mode 100644 srcpkgs/libwapcaplet/template

diff --git a/srcpkgs/libwapcaplet-devel b/srcpkgs/libwapcaplet-devel
new file mode 120000
index 00000000000..c12e300eeec
--- /dev/null
+++ b/srcpkgs/libwapcaplet-devel
@@ -0,0 +1 @@
+libwapcaplet
\ No newline at end of file
diff --git a/srcpkgs/libwapcaplet/depends b/srcpkgs/libwapcaplet/depends
new file mode 100644
index 00000000000..140f5aa7a9d
--- /dev/null
+++ b/srcpkgs/libwapcaplet/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libwapcaplet/libwapcaplet-devel.template b/srcpkgs/libwapcaplet/libwapcaplet-devel.template
new file mode 100644
index 00000000000..bb549e76331
--- /dev/null
+++ b/srcpkgs/libwapcaplet/libwapcaplet-devel.template
@@ -0,0 +1,14 @@
+# Template file for 'libwapcaplet-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libwapcaplet
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libwapcaplet/libwapcaplet.rshlibs b/srcpkgs/libwapcaplet/libwapcaplet.rshlibs
new file mode 100644
index 00000000000..631aa1dda40
--- /dev/null
+++ b/srcpkgs/libwapcaplet/libwapcaplet.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libwapcaplet/template b/srcpkgs/libwapcaplet/template
new file mode 100644
index 00000000000..35d095287af
--- /dev/null
+++ b/srcpkgs/libwapcaplet/template
@@ -0,0 +1,31 @@
+# Template build file for 'libwapcaplet'.
+pkgname=libwapcaplet
+version=0.1.0
+distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="String internment library, written in C"
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7
+long_desc="
+ LibWapcaplet is a string internment library, written in C. It provides
+ reference counted string interment and rapid string comparison
+ functionality. It was developed as part of the NetSurf project and is
+ available for use by other software under the MIT licence. For further
+ details, see the readme."
+
+subpackages="${pkgname}-devel"
+
+Add_dependency build sed
+
+wrksrc=${pkgname}-${version}-src
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+}

From e502e60d0bd2f6e114dccb673fcbb0a7ace0c1d1 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 12:44:52 -0700
Subject: [PATCH 08/24] New package: libcss-0.1.1 (for netsurf)

---
 srcpkgs/libcss-devel                 |  1 +
 srcpkgs/libcss/depends               |  2 ++
 srcpkgs/libcss/libcss-devel.template | 14 ++++++++++
 srcpkgs/libcss/libcss.rshlibs        |  3 +++
 srcpkgs/libcss/template              | 40 ++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+)
 create mode 120000 srcpkgs/libcss-devel
 create mode 100644 srcpkgs/libcss/depends
 create mode 100644 srcpkgs/libcss/libcss-devel.template
 create mode 100644 srcpkgs/libcss/libcss.rshlibs
 create mode 100644 srcpkgs/libcss/template

diff --git a/srcpkgs/libcss-devel b/srcpkgs/libcss-devel
new file mode 120000
index 00000000000..f97cea8fc36
--- /dev/null
+++ b/srcpkgs/libcss-devel
@@ -0,0 +1 @@
+libcss
\ No newline at end of file
diff --git a/srcpkgs/libcss/depends b/srcpkgs/libcss/depends
new file mode 100644
index 00000000000..56fb9e056a7
--- /dev/null
+++ b/srcpkgs/libcss/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.1"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libcss/libcss-devel.template b/srcpkgs/libcss/libcss-devel.template
new file mode 100644
index 00000000000..1d19c6e58e2
--- /dev/null
+++ b/srcpkgs/libcss/libcss-devel.template
@@ -0,0 +1,14 @@
+# Template file for 'libcss-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libcss
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libcss/libcss.rshlibs b/srcpkgs/libcss/libcss.rshlibs
new file mode 100644
index 00000000000..2b2a01e2bf3
--- /dev/null
+++ b/srcpkgs/libcss/libcss.rshlibs
@@ -0,0 +1,3 @@
+libparserutils.so.0
+libwapcaplet.so.0
+libc.so.6
diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template
new file mode 100644
index 00000000000..5604372492e
--- /dev/null
+++ b/srcpkgs/libcss/template
@@ -0,0 +1,40 @@
+# Template build file for 'libcss'.
+pkgname=libcss
+version=0.1.1
+distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+short_desc="CSS parser and selection engine, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0
+long_desc="
+ LibCSS is a CSS (Cascading Style Sheet) parser and selection engine,
+ written in C. It was developed as part of the NetSurf project and is
+ available for use by other software under the MIT licence. For further
+ details, see the readme.
+
+ * Features
+ 	Parses CSS, good and bad
+ 	Simple C API
+ 	Low memory usage
+ 	Fast selection engine
+ 	Portable
+ 	Shared library"
+
+subpackages="${pkgname}-devel"
+
+Add_dependency build sed
+Add_dependency build pkg-config
+Add_dependency build perl
+Add_dependency build libparserutils-devel 
+Add_dependency build libwapcaplet-devel
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+}

From d4c1afde91af90ecffc0f8fdb48013611ef4ecf8 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 12:49:32 -0700
Subject: [PATCH 09/24] New package: libhubbub-0.1.1 (for netsurf)

---
 srcpkgs/libhubbub-devel                    |  1 +
 srcpkgs/libhubbub/depends                  |  2 +
 srcpkgs/libhubbub/libhubbub-devel.template | 14 +++++++
 srcpkgs/libhubbub/libhubbub.rshlibs        |  2 +
 srcpkgs/libhubbub/template                 | 48 ++++++++++++++++++++++
 5 files changed, 67 insertions(+)
 create mode 120000 srcpkgs/libhubbub-devel
 create mode 100644 srcpkgs/libhubbub/depends
 create mode 100644 srcpkgs/libhubbub/libhubbub-devel.template
 create mode 100644 srcpkgs/libhubbub/libhubbub.rshlibs
 create mode 100644 srcpkgs/libhubbub/template

diff --git a/srcpkgs/libhubbub-devel b/srcpkgs/libhubbub-devel
new file mode 120000
index 00000000000..a298af8da53
--- /dev/null
+++ b/srcpkgs/libhubbub-devel
@@ -0,0 +1 @@
+libhubbub
\ No newline at end of file
diff --git a/srcpkgs/libhubbub/depends b/srcpkgs/libhubbub/depends
new file mode 100644
index 00000000000..56fb9e056a7
--- /dev/null
+++ b/srcpkgs/libhubbub/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.1.1"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libhubbub/libhubbub-devel.template b/srcpkgs/libhubbub/libhubbub-devel.template
new file mode 100644
index 00000000000..e654d432987
--- /dev/null
+++ b/srcpkgs/libhubbub/libhubbub-devel.template
@@ -0,0 +1,14 @@
+# Template file for 'libhubbub-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libhubbub
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libhubbub/libhubbub.rshlibs b/srcpkgs/libhubbub/libhubbub.rshlibs
new file mode 100644
index 00000000000..c9ad5d604b3
--- /dev/null
+++ b/srcpkgs/libhubbub/libhubbub.rshlibs
@@ -0,0 +1,2 @@
+libparserutils.so.0
+libc.so.6
diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template
new file mode 100644
index 00000000000..a34fb0f7aa5
--- /dev/null
+++ b/srcpkgs/libhubbub/template
@@ -0,0 +1,48 @@
+# Template build file for 'libhubbub'.
+pkgname=libhubbub
+version=0.1.1
+distfiles="http://www.netsurf-browser.org/projects/releases/hubbub-${version}-src.tar.gz"
+short_desc="HTML5 compliant parsing library, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+checksum=363f1acf1ca3b3362bb84fc8ed9544b2207e7cb706ac176477ad00dc0d56782b
+long_desc="
+ Hubbub is an HTML5 compliant parsing library, written in C. It was
+ developed as part of the NetSurf project and is available for use
+ by other software under the MIT licence.
+
+ The HTML5 specification defines a parsing algorithm, based on the
+ behaviour of mainstream browsers, which provides instructions for
+ how to parse all markup, both valid and invalid. As a result, Hubbub
+ parses web content well.
+
+ * Features
+ 	Parses HTML, good and bad
+ 	Simple C API
+ 	Fast
+ 	Character encoding detection
+ 	Well-tested (~90% test coverage)
+ 	Portable
+ 	Shared library"
+
+subpackages="${pkgname}-devel"
+
+Add_dependency build sed
+Add_dependency build perl
+Add_dependency build pkg-config
+Add_dependency build libxslt-devel
+Add_dependency build json-c-devel
+Add_dependency build libparserutils-devel
+
+wrksrc=hubbub-${version}
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+}

From 5b6105df369deb0b82d50c23cc1e9744cf225939 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 13:10:37 -0700
Subject: [PATCH 10/24] New package: libdom-20120223 (for netsurf)

---
 srcpkgs/libdom-devel                 |  1 +
 srcpkgs/libdom/libdom-devel.template | 14 ++++++++++
 srcpkgs/libdom/libdom.rshlibs        |  5 ++++
 srcpkgs/libdom/template              | 42 ++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 120000 srcpkgs/libdom-devel
 create mode 100644 srcpkgs/libdom/libdom-devel.template
 create mode 100644 srcpkgs/libdom/libdom.rshlibs
 create mode 100644 srcpkgs/libdom/template

diff --git a/srcpkgs/libdom-devel b/srcpkgs/libdom-devel
new file mode 120000
index 00000000000..7a4d19a9f6f
--- /dev/null
+++ b/srcpkgs/libdom-devel
@@ -0,0 +1 @@
+libdom
\ No newline at end of file
diff --git a/srcpkgs/libdom/libdom-devel.template b/srcpkgs/libdom/libdom-devel.template
new file mode 100644
index 00000000000..1ce61d69375
--- /dev/null
+++ b/srcpkgs/libdom/libdom-devel.template
@@ -0,0 +1,14 @@
+# Template file for 'libdom-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libdom
+
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/libdom/libdom.rshlibs b/srcpkgs/libdom/libdom.rshlibs
new file mode 100644
index 00000000000..1ba7d36222a
--- /dev/null
+++ b/srcpkgs/libdom/libdom.rshlibs
@@ -0,0 +1,5 @@
+libparserutils.so.0
+libwapcaplet.so.0
+libxml2.so.2
+libhubbub.so.0
+libc.so.6
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
new file mode 100644
index 00000000000..e5e8e60457b
--- /dev/null
+++ b/srcpkgs/libdom/template
@@ -0,0 +1,42 @@
+# Template build file for 'libdom'.
+pkgname=libdom
+version="$(date -u +%Y%m%d)"
+short_desc="Implementation of the W3C DOM, written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+long_desc="
+ LibDOM is an implementation of the W3C DOM, written in C. It is
+ currently in development for use with NetSurf and is intended to
+ be suitable for use in other projects too. For further details,
+ see the readme."
+
+subpackages="${pkgname}-devel"
+
+nofetch=yes
+noextract=yes
+
+Add_dependency build sed
+Add_dependency build pkg-config
+Add_dependency build perl
+Add_dependency build subversion
+Add_dependency build libxml2-devel
+Add_dependency build libparserutils-devel
+Add_dependency build libwapcaplet-devel
+Add_dependency build libhubbub-devel
+
+do_fetch() {
+	local url="svn://svn.netsurf-browser.org/trunk/libdom"
+	msg_normal " Fetching source from $url ...\n"
+	svn co ${url} ${pkgname}-${version}
+}
+
+do_build() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared
+	make ${makejobs} COMPONENT_TYPE=lib-static
+}
+
+do_install() {
+	make ${makejobs} COMPONENT_TYPE=lib-shared \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+	make ${makejobs} COMPONENT_TYPE=lib-static \
+		PREFIX=/usr DESTDIR=${DESTDIR} install
+}

From c6be28c08fc6e267b14cfa4ad4f0f1ea8c73f5c5 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 14:30:08 -0700
Subject: [PATCH 11/24] New package: netsurf-2.8 - Lighweight webbrowser.

---
 srcpkgs/netsurf/files/netsurf.desktop | 127 ++++++++++++++++++++++++++
 srcpkgs/netsurf/netsurf.rshlibs       |  28 ++++++
 srcpkgs/netsurf/template              |  80 ++++++++++++++++
 3 files changed, 235 insertions(+)
 create mode 100644 srcpkgs/netsurf/files/netsurf.desktop
 create mode 100644 srcpkgs/netsurf/netsurf.rshlibs
 create mode 100644 srcpkgs/netsurf/template

diff --git a/srcpkgs/netsurf/files/netsurf.desktop b/srcpkgs/netsurf/files/netsurf.desktop
new file mode 100644
index 00000000000..fcc39c4e80d
--- /dev/null
+++ b/srcpkgs/netsurf/files/netsurf.desktop
@@ -0,0 +1,127 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Netsurf
+Name[ar]=صافي تصفح
+Name[ast]=Netsurf
+Name[ca]=Netsurf
+Name[cs]=Netsurf
+Name[da]=Netsurf
+Name[de]=Netsurf
+Name[el]=καθαρού σερφ
+Name[en_GB]=Netsurf
+Name[es]=Netsurf
+Name[et]=Netsurf
+Name[fi]=Netsurf
+Name[fr]=Netsurf
+Name[gl]=Netsurf
+Name[he]=Netsurf
+Name[hr]=Netsurf
+Name[hu]=Netsurf
+Name[id]=Netsurf
+Name[it]=Netsurf
+Name[ja]=Netsurf
+Name[ko]=인터넷 서핑
+Name[lt]=Netsurf
+Name[nl]=Netsurf
+Name[no]=Netsurf
+Name[pl]=Netsurf
+Name[pt]=Netsurf
+Name[pt_BR]=Netsurf
+Name[ro]=Netsurf
+Name[ru]=Netsurf
+Name[sk]=Netsurf
+Name[sr]=нетсурф
+Name[sr@latin]=Netsurf
+Name[sv]=Netsurf
+Name[tr]=Netsurf
+Name[ug]=Netsurf
+Name[uk]=Інтернет серфінгу
+Name[zh_CN]=Netsurf 网冲浪
+Name[zh_TW]=Netsurf 網衝浪
+GenericName=Web Browser
+GenericName[ar]=متصفح الوب
+GenericName[ast]=Restolador
+GenericName[ca]=Navegador web
+GenericName[cs]=Internetový prohlížeč
+GenericName[da]=Webbrowser
+GenericName[de]=Internetbetrachter
+GenericName[el]=Περιηγητής Ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=Verkkoselain
+GenericName[fr]=Navigateur Internet
+GenericName[gl]=Navegador web
+GenericName[he]=דפדפן
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[id]=Peramban Web
+GenericName[it]=Browser web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Interneto naršyklė
+GenericName[nl]=Webbrowser
+GenericName[no]=Nettleser
+GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+GenericName[pl]=Przeglądarka internetowa
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador web
+GenericName[ro]=Navigator web
+GenericName[ru]=Интернет-обозреватель
+GenericName[sk]=Internetový prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[sr@latin]=Internet preglednik
+GenericName[sv]=Webbläsare
+GenericName[tr]=Web Tarayıcı
+GenericName[ug]=توركۆرگۈ
+GenericName[uk]=Переглядач Веб
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+Comment=Lightweight web browser
+Comment[ar]=منصفح الوب الخفيف
+Comment[ast]=Restolador llixeru
+Comment[ca]=Navegador web lleuger
+Comment[cs]=Odlehčený prohlížeč
+Comment[da]=Letvægtig webbrowser
+Comment[de]=Schlanker Internetbetrachter
+Comment[el]=Ελαφρύς περιηγητής ιστού
+Comment[en_GB]=Lightweight web browser
+Comment[es]=Navegador web ligero
+Comment[et]=Kergekaaluline veebibrauser
+Comment[fi]=Kevyt verkkoselain
+Comment[fr]=Navigateur Internet léger
+Comment[gl]=Navegador web lixeiro
+Comment[he]=דפדפן קל משקל
+Comment[hr]=Lagani web preglednik
+Comment[hu]=Könnyűsúlyú webböngésző
+Comment[id]=Peramban web ringan
+Comment[it]=Browser web leggero
+Comment[ja]=軽量級ウェブブラウザ
+Comment[ko]=가벼운 웹 브라우저
+Comment[lt]=Paprasta interneto naršyklė
+Comment[nl]=Lichtgewicht webbrowser
+Comment[no]=Lettvektig nettleser
+Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej
+Comment[pt]=Navegador Web rápido
+Comment[pt_BR]=Navegador web leve
+Comment[ro]=Mic navigator web
+Comment[ru]=Легковесный Интернет-обозреватель
+Comment[sk]=Ľahký internetový prehliadač
+Comment[sr]=Једноставан Интернет прегледник
+Comment[sr@latin]=Jednostavan Internet preglednik
+Comment[sv]=Resurssnål webbläsare
+Comment[tr]=Hafif web tarayıcı
+Comment[ug]=يېنىك توركۆرگۈ
+Comment[uk]=Легкий переглядач Веб
+Comment[zh_CN]=轻量级网页浏览器
+Comment[zh_TW]=輕量級網頁瀏覽器
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;
+Exec=netsurf %U
+Icon=netsurf
+Terminal=false
+StartupNotify=true
+X-Osso-Type=application/x-executable
+X-Osso-Service=netsurf
diff --git a/srcpkgs/netsurf/netsurf.rshlibs b/srcpkgs/netsurf/netsurf.rshlibs
new file mode 100644
index 00000000000..beb7081f8f7
--- /dev/null
+++ b/srcpkgs/netsurf/netsurf.rshlibs
@@ -0,0 +1,28 @@
+libjpeg.so.8
+libmng.so.1
+libz.so.1
+libxml2.so.2
+libcurl.so.4
+libhubbub.so.0
+libcss.so.0
+libparserutils.so.0
+libwapcaplet.so.0
+libssl.so.1
+libcrypto.so.1
+librsvg-2.so.2
+libm.so.6
+libgdk_pixbuf-2.0.so.0
+libcairo.so.2
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libnsbmp.so.0
+libnsgif.so.0
+libpng14.so.14
+libwebp.so.2
+libglade-2.0.so.0
+libgtk-x11-2.0.so.0
+libgdk-x11-2.0.so.0
+libpangocairo-1.0.so.0
+libpango-1.0.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
new file mode 100644
index 00000000000..f42a10f0ed2
--- /dev/null
+++ b/srcpkgs/netsurf/template
@@ -0,0 +1,80 @@
+# Template build file for 'netsurf'.
+pkgname=netsurf
+version=2.8
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/downloads/releases/${pkgname}-${version}-full-src.tar.gz"
+short_desc="Free, open source web browser written in C."
+maintainer="davehome <davehome@redthumb.info.tm>"
+LICENSE="GPL-2, MIT"
+checksum=2055d52764faed054892670101fc95c1bf0bddc2370495250192f1855117b718
+long_desc="
+ Small as a mouse, fast as a cheetah and available for free. NetSurf is
+ a multi-platform web browser for RISC OS, UNIX-like platforms (including
+ Linux), Mac OS X, and more.
+
+ Written in C, this award winning open source project features its own
+ layout engine. It is licensed under GPL version 2.
+
+ * Web standards: HTML 4.01 and CSS 2.1
+ * Image formats: PNG, GIF, JPEG, SVG, JNG, MNG and BMP
+ * HTTPS for secure online transactions
+ * Unicode text
+ * Web page thumbnailing
+ * Local history trees
+ * Global history
+ * Hotlist manager (bookmarks)
+ * Cookie manager
+ * URL completion
+ * Text selection
+ * Scale view
+ * Search-as-you-type text search highlighting
+ * Save pages complete with images
+ * Fast, lightweight layout and rendering engine"
+
+gtk_iconcache_dirs="/usr/share/pixmaps"
+
+Add_dependency build sed
+Add_dependency build pkg-config
+Add_dependency build perl
+Add_dependency build jpeg-devel
+Add_dependency build libmng-devel
+Add_dependency build libpng-devel
+Add_dependency build librsvg-devel
+Add_dependency build libxml2-devel
+Add_dependency build libcurl-devel
+Add_dependency build lcms-devel
+Add_dependency build libwebp-devel
+Add_dependency build libparserutils-devel
+Add_dependency build libwapcaplet-devel
+Add_dependency build libhubbub-devel
+Add_dependency build libcss-devel
+Add_dependency build libnsbmp-devel
+Add_dependency build libnsgif-devel
+Add_dependency build gtk+-devel
+Add_dependency build libglade-devel
+
+Add_dependency full desktop-file-utils
+Add_dependency full shared-mime-info
+
+do_build() {
+	make ${makejobs} --directory=${pkgname}-${version} \
+		PREFIX=/usr TARGET=gtk NETSURF_USE_WEBP=YES
+}
+
+do_install() {
+	make ${makejobs} --directory=${pkgname}-${version} \
+		PREFIX=/usr DESTDIR=${DESTDIR} TARGET=gtk \
+		NETSURF_USE_WEBP=YES install
+
+	# Install app icon
+	vinstall "${DESTDIR}/usr/share/${pkgname}/${pkgname}.xpm" \
+		0644 usr/share/pixmaps
+
+	# Install .desktop file (from Arch)
+	vinstall "${FILESDIR}/${pkgname}.desktop" \
+		0644 usr/share/applications
+
+	# Install license
+	vinstall "${wrksrc}/${pkgname}-${version}/COPYING" \
+		0644 "/usr/share/licenses/${pkgname}"
+}

From a4a39bdfbf14884d1dc197f2217f1ebc94163bf9 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:25:30 -0700
Subject: [PATCH 12/24] netsurf: fix launcher icon

---
 srcpkgs/netsurf/files/netsurf.png | Bin 0 -> 16513 bytes
 srcpkgs/netsurf/template          |   5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/netsurf/files/netsurf.png

diff --git a/srcpkgs/netsurf/files/netsurf.png b/srcpkgs/netsurf/files/netsurf.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6526d8b161a02937b3c6a06aaaf86c55e6a0095
GIT binary patch
literal 16513
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
Dc478#

literal 0
HcmV?d00001

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index f42a10f0ed2..1f6e8e2e83c 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,6 +1,7 @@
 # Template build file for 'netsurf'.
 pkgname=netsurf
 version=2.8
+revision=1
 homepage="http://www.netsurf-browser.org"
 distfiles="${homepage}/downloads/releases/${pkgname}-${version}-full-src.tar.gz"
 short_desc="Free, open source web browser written in C."
@@ -66,8 +67,8 @@ do_install() {
 		PREFIX=/usr DESTDIR=${DESTDIR} TARGET=gtk \
 		NETSURF_USE_WEBP=YES install
 
-	# Install app icon
-	vinstall "${DESTDIR}/usr/share/${pkgname}/${pkgname}.xpm" \
+	# Install app icon (from Ubuntu)
+	vinstall "${FILESDIR}/${pkgname}.png" \
 		0644 usr/share/pixmaps
 
 	# Install .desktop file (from Arch)

From 34f26237dcebc39825f1d294ec068a89e1a19978 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:26:08 -0700
Subject: [PATCH 13/24] shlibs: add all netsurf stuff

---
 common/shlibs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 066b71aa5b9..bdde41594a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -959,3 +959,10 @@ libsystemd-journal.so.0 	systemd-libs		systemd-devel
 libsystemd-login.so.0 		systemd-libs		systemd-devel
 libplist.so.1			libplist		libplist-devel
 libplist++.so.1			libplist++		libplist-devel
+libnsbmp.so.0			libnsbmp		libnsbmp-devel
+libnsgif.so.0			libnsgif		libnsgif-devel
+libparserutils.so.0		libparserutils		libparserutils-devel
+libwapcaplet.so.0		libwapcaplet		libwapcaplet-devel
+libcss.so.0			libcss			libcss-devel
+libhubbub.so.0			libhubbub		libhubbub-devel
+libdom.so.0			libdom			libdom-devel

From 0e8d7c7ff56baa7e4503765311daed40e950d9c6 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:28:56 -0700
Subject: [PATCH 14/24] libnsbmp: set homepage/license.

---
 srcpkgs/libnsbmp/libnsbmp-devel.template | 2 +-
 srcpkgs/libnsbmp/template                | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libnsbmp/libnsbmp-devel.template b/srcpkgs/libnsbmp/libnsbmp-devel.template
index d769c31f000..534b1df1a37 100644
--- a/srcpkgs/libnsbmp/libnsbmp-devel.template
+++ b/srcpkgs/libnsbmp/libnsbmp-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libnsbmp-devel'.
 #
-revision=1
+revision=2
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template
index 284d35871e0..4f9da1e1243 100644
--- a/srcpkgs/libnsbmp/template
+++ b/srcpkgs/libnsbmp/template
@@ -1,11 +1,13 @@
 # Template build file for 'libnsbmp'.
 pkgname=libnsbmp
 version=0.0.3
-revision=1
-distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+revision=2
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
 short_desc="Decoding library for BMP and ICO images in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=e0ccf851bf6dc9398b587f1b3f919773a49d7d2eb082b99ab5898217d73e47a2
+license="MIT"
 long_desc="
  libnsbmp is a decoding library for BMP and ICO image file formats, written
  in C. It was developed as part of the NetSurf project and is available for
@@ -31,4 +33,6 @@ do_install() {
 		DESTDIR=${DESTDIR} PREFIX=/usr install
 	make ${makejobs} COMPONENT_TYPE=lib-static \
 		DESTDIR=${DESTDIR} PREFIX=/usr install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
 }

From b07379c218809df06af87f08ff01cfe689ab6677 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:32:19 -0700
Subject: [PATCH 15/24] libnsgif: set homepage/license

---
 srcpkgs/libnsgif/libnsgif-devel.template | 2 +-
 srcpkgs/libnsgif/template                | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libnsgif/libnsgif-devel.template b/srcpkgs/libnsgif/libnsgif-devel.template
index 5a5ecfcb948..8618293454a 100644
--- a/srcpkgs/libnsgif/libnsgif-devel.template
+++ b/srcpkgs/libnsgif/libnsgif-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libnsgif-devel'.
 #
-revision=1
+revision=2
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template
index edc220a15c9..9d9d6783b38 100644
--- a/srcpkgs/libnsgif/template
+++ b/srcpkgs/libnsgif/template
@@ -1,11 +1,13 @@
 # Template build file for 'libnsgif'.
 pkgname=libnsgif
 version=0.0.3
-revision=1
-distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+revision=2
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
 short_desc="Decoding library for the GIF image file format, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=1f53bb6cc449c3b108d7653ce876ec58745f184d5a6675a95f1fa8c937dfc6d5
+license="MIT"
 long_desc="
  libnsgif is a decoding library for the GIF image file format, written
  in C. It was developed as part of the NetSurf project and is available
@@ -30,4 +32,6 @@ do_install() {
 		DESTDIR=${DESTDIR} PREFIX=/usr install
 	make ${makejobs} COMPONENT_TYPE=lib-static \
 		DESTDIR=${DESTDIR} PREFIX=/usr install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
 }

From c92d6c81f35f34f5602d27ac3c1cd979137977f0 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:36:28 -0700
Subject: [PATCH 16/24] libwapcaplet: add homepage/license

---
 srcpkgs/libwapcaplet/libwapcaplet-devel.template | 1 +
 srcpkgs/libwapcaplet/template                    | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libwapcaplet/libwapcaplet-devel.template b/srcpkgs/libwapcaplet/libwapcaplet-devel.template
index bb549e76331..453c738f3bd 100644
--- a/srcpkgs/libwapcaplet/libwapcaplet-devel.template
+++ b/srcpkgs/libwapcaplet/libwapcaplet-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libwapcaplet-devel'.
 #
+revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/libwapcaplet/template b/srcpkgs/libwapcaplet/template
index 35d095287af..65ae6bf12b9 100644
--- a/srcpkgs/libwapcaplet/template
+++ b/srcpkgs/libwapcaplet/template
@@ -1,10 +1,13 @@
 # Template build file for 'libwapcaplet'.
 pkgname=libwapcaplet
 version=0.1.0
-distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+revision=1
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
 short_desc="String internment library, written in C"
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7
+license="MIT"
 long_desc="
  LibWapcaplet is a string internment library, written in C. It provides
  reference counted string interment and rapid string comparison
@@ -28,4 +31,6 @@ do_install() {
 		PREFIX=/usr DESTDIR=${DESTDIR} install
 	make ${makejobs} COMPONENT_TYPE=lib-static \
 		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
 }

From 2bb6f9b2320a43ca64cf06513fb11c698e7994bb Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:36:42 -0700
Subject: [PATCH 17/24] libparserutils: add homepage/license

---
 srcpkgs/libparserutils/libparserutils-devel.template | 2 +-
 srcpkgs/libparserutils/template                      | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libparserutils/libparserutils-devel.template b/srcpkgs/libparserutils/libparserutils-devel.template
index be063de3b88..7c2ca876006 100644
--- a/srcpkgs/libparserutils/libparserutils-devel.template
+++ b/srcpkgs/libparserutils/libparserutils-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libparserutils-devel'.
 #
-revision=1
+revision=2
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template
index c8d8f2a65eb..96b5fca453a 100644
--- a/srcpkgs/libparserutils/template
+++ b/srcpkgs/libparserutils/template
@@ -1,11 +1,13 @@
 # Template build file for 'libnsgif'.
 pkgname=libparserutils
 version=0.1.1
-revision=1
-distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+revision=2
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
 short_desc="Library for building efficient parsers, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=8b79ba58d6fa63fa9c74b71482d93f2c5b2c22badac77265f3cc47f3f603f87d
+license="MIT"
 long_desc="
  LibParserUtils is a library for building efficient parsers, written
  in C. It was developed as part of the NetSurf project and is available
@@ -38,4 +40,6 @@ do_install() {
 		PREFIX=/usr DESTDIR=${DESTDIR} install
 	make ${makejobs} COMPONENT_TYPE=lib-static \
 		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/license/${pkgname}"
 }

From 8fe126cb62c4d06b817913bc7a0600ef62fd16eb Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:40:36 -0700
Subject: [PATCH 18/24] libcss: set homepage/license

---
 srcpkgs/libcss/libcss-devel.template | 1 +
 srcpkgs/libcss/template              | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcss/libcss-devel.template b/srcpkgs/libcss/libcss-devel.template
index 1d19c6e58e2..f931c3d7ade 100644
--- a/srcpkgs/libcss/libcss-devel.template
+++ b/srcpkgs/libcss/libcss-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libcss-devel'.
 #
+revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template
index 5604372492e..9ab5b58496f 100644
--- a/srcpkgs/libcss/template
+++ b/srcpkgs/libcss/template
@@ -1,10 +1,13 @@
 # Template build file for 'libcss'.
 pkgname=libcss
 version=0.1.1
-distfiles="http://www.netsurf-browser.org/projects/releases/${pkgname}-${version}-src.tar.gz"
+revision=1
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/${pkgname}-${version}-src.tar.gz"
 short_desc="CSS parser and selection engine, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0
+license="MIT"
 long_desc="
  LibCSS is a CSS (Cascading Style Sheet) parser and selection engine,
  written in C. It was developed as part of the NetSurf project and is
@@ -37,4 +40,6 @@ do_install() {
 		PREFIX=/usr DESTDIR=${DESTDIR} install
 	make ${makejobs} COMPONENT_TYPE=lib-static \
 		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
 }

From d93a8ab88cb0c613bc8e73f5983ad9ea3f2b4a36 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:43:26 -0700
Subject: [PATCH 19/24] libhubbub: set homepage/license

---
 srcpkgs/libhubbub/libhubbub-devel.template | 1 +
 srcpkgs/libhubbub/template                 | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libhubbub/libhubbub-devel.template b/srcpkgs/libhubbub/libhubbub-devel.template
index e654d432987..a31330b6aa0 100644
--- a/srcpkgs/libhubbub/libhubbub-devel.template
+++ b/srcpkgs/libhubbub/libhubbub-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libhubbub-devel'.
 #
+revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template
index a34fb0f7aa5..581c2038670 100644
--- a/srcpkgs/libhubbub/template
+++ b/srcpkgs/libhubbub/template
@@ -1,10 +1,13 @@
 # Template build file for 'libhubbub'.
 pkgname=libhubbub
 version=0.1.1
-distfiles="http://www.netsurf-browser.org/projects/releases/hubbub-${version}-src.tar.gz"
+revision=1
+homepage="http://www.netsurf-browser.org"
+distfiles="${homepage}/projects/releases/hubbub-${version}-src.tar.gz"
 short_desc="HTML5 compliant parsing library, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=363f1acf1ca3b3362bb84fc8ed9544b2207e7cb706ac176477ad00dc0d56782b
+license="MIT"
 long_desc="
  Hubbub is an HTML5 compliant parsing library, written in C. It was
  developed as part of the NetSurf project and is available for use
@@ -45,4 +48,6 @@ do_install() {
 		PREFIX=/usr DESTDIR=${DESTDIR} install
 	make ${makejobs} COMPONENT_TYPE=lib-static \
 		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 0644 "usr/share/licenses/${pkgname}"
 }

From 2aa7bb655c46e3d66ee85ee0d75dfb8fb1c1783a Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:50:17 -0700
Subject: [PATCH 20/24] libdom: set homepage/license

---
 srcpkgs/libdom/libdom-devel.template | 1 +
 srcpkgs/libdom/template              | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/srcpkgs/libdom/libdom-devel.template b/srcpkgs/libdom/libdom-devel.template
index 1ce61d69375..4709a93c720 100644
--- a/srcpkgs/libdom/libdom-devel.template
+++ b/srcpkgs/libdom/libdom-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'libdom-devel'.
 #
+revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
index e5e8e60457b..6b71ac3b4b1 100644
--- a/srcpkgs/libdom/template
+++ b/srcpkgs/libdom/template
@@ -1,8 +1,11 @@
 # Template build file for 'libdom'.
 pkgname=libdom
 version="$(date -u +%Y%m%d)"
+revision=1
+homepage="http://www.netsurf-browser.org"
 short_desc="Implementation of the W3C DOM, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
+license="MIT"
 long_desc="
  LibDOM is an implementation of the W3C DOM, written in C. It is
  currently in development for use with NetSurf and is intended to
@@ -39,4 +42,6 @@ do_install() {
 		PREFIX=/usr DESTDIR=${DESTDIR} install
 	make ${makejobs} COMPONENT_TYPE=lib-static \
 		PREFIX=/usr DESTDIR=${DESTDIR} install
+
+	vinstall "${wrksrc}/COPYING" 644 "usr/share/license/${pkgname}"
 }

From 5d8f8740ab3142dfeafd6daebf73fbe4485f46c8 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 16:50:53 -0700
Subject: [PATCH 21/24] netsurf: fix license.

---
 srcpkgs/netsurf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 1f6e8e2e83c..91acadb6c1a 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,12 +1,12 @@
 # Template build file for 'netsurf'.
 pkgname=netsurf
 version=2.8
-revision=1
+revision=2
 homepage="http://www.netsurf-browser.org"
 distfiles="${homepage}/downloads/releases/${pkgname}-${version}-full-src.tar.gz"
 short_desc="Free, open source web browser written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"
-LICENSE="GPL-2, MIT"
+license="GPL-2, MIT"
 checksum=2055d52764faed054892670101fc95c1bf0bddc2370495250192f1855117b718
 long_desc="
  Small as a mouse, fast as a cheetah and available for free. NetSurf is

From c0ff1140442f5784a9d5180fc96c03d7ee61012c Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 17:09:38 -0700
Subject: [PATCH 22/24] wine-unstable: fix version number

---
 srcpkgs/wine-unstable/libwine-unstable.template    |  2 +-
 srcpkgs/wine-unstable/template                     | 11 +++++++----
 srcpkgs/wine-unstable/wine-unstable-devel.template |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template
index 2ee780cf573..b9c13a47c4e 100644
--- a/srcpkgs/wine-unstable/libwine-unstable.template
+++ b/srcpkgs/wine-unstable/libwine-unstable.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the wine runtime."
 
 only_for_archs=i686
-replaces="libwine>=0"
+replaces="libwine>=0 libwine-unstable>=1.4-rc4"
 provides="libwine-$version"
 conflicts="libwine>=0"
 
diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index b7c9cdfe3c6..7df0ba00efb 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -1,12 +1,15 @@
 # Template file for 'wine-unstable'
 __pkgname=wine
 pkgname=${__pkgname}-unstable
-version=1.4-rc4
-wrksrc=${__pkgname}-$version
+__majminver=1.4
+__rcver=rc4
+__otherversion=${__magminver}-${__rcver}
+version=${__majminver}.${__rcver}
+wrksrc=${__pkgname}-${__otherversion}
 build_style=gnu-configure
 configure_args="--with-x"
 homepage="http://www.winehq.org/"
-distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${version}.tar.bz2"
+distfiles="http://ibiblio.org/pub/linux/system/emulators/${__pkgname}/${__pkgname}-${__otherversion}.tar.bz2"
 short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="LGPL-2.1"
@@ -18,7 +21,7 @@ long_desc="
 
 only_for_archs=i686
 build_requires=11
-replaces="wine>=0"
+replaces="wine>=0 wine-unstable>=1.4-rc4"
 provides="wine-$version"
 conflicts="wine>=0"
 subpackages="lib$pkgname $pkgname-devel"
diff --git a/srcpkgs/wine-unstable/wine-unstable-devel.template b/srcpkgs/wine-unstable/wine-unstable-devel.template
index 456ca4b891a..e70d7a7cab9 100644
--- a/srcpkgs/wine-unstable/wine-unstable-devel.template
+++ b/srcpkgs/wine-unstable/wine-unstable-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 only_for_archs=i686
-replaces="wine-devel>=0"
+replaces="wine-devel>=0 wine-unstable-devel>=1.4-rc4"
 provides="wine-devel-$version"
 conflicts="wine-devel>=0"
 

From 91bb970ac2b9b314495bf494c1fb8f36fc752c43 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 17:32:21 -0700
Subject: [PATCH 23/24] wine-unstable: fix version again.

---
 srcpkgs/wine-unstable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template
index 7df0ba00efb..4f8c04d33a5 100644
--- a/srcpkgs/wine-unstable/template
+++ b/srcpkgs/wine-unstable/template
@@ -3,7 +3,7 @@ __pkgname=wine
 pkgname=${__pkgname}-unstable
 __majminver=1.4
 __rcver=rc4
-__otherversion=${__magminver}-${__rcver}
+__otherversion=${__majminver}-${__rcver}
 version=${__majminver}.${__rcver}
 wrksrc=${__pkgname}-${__otherversion}
 build_style=gnu-configure

From 644e66c00d110da38f855298c4f804c9051415f6 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Thu, 23 Feb 2012 17:37:23 -0700
Subject: [PATCH 24/24] libdom: remove revision, new day == new pkg

---
 srcpkgs/libdom/libdom-devel.template | 1 -
 srcpkgs/libdom/template              | 1 -
 2 files changed, 2 deletions(-)

diff --git a/srcpkgs/libdom/libdom-devel.template b/srcpkgs/libdom/libdom-devel.template
index 4709a93c720..1ce61d69375 100644
--- a/srcpkgs/libdom/libdom-devel.template
+++ b/srcpkgs/libdom/libdom-devel.template
@@ -1,6 +1,5 @@
 # Template file for 'libdom-devel'.
 #
-revision=1
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template
index 6b71ac3b4b1..d24134f2c22 100644
--- a/srcpkgs/libdom/template
+++ b/srcpkgs/libdom/template
@@ -1,7 +1,6 @@
 # Template build file for 'libdom'.
 pkgname=libdom
 version="$(date -u +%Y%m%d)"
-revision=1
 homepage="http://www.netsurf-browser.org"
 short_desc="Implementation of the W3C DOM, written in C."
 maintainer="davehome <davehome@redthumb.info.tm>"