Tue Apr 3 14:54:45 UTC 2012

author: Parabola <dev@list.parabolagnulinux.org> 2012-04-03 14:54:55 +0000
committer: Parabola <dev@list.parabolagnulinux.org> 2012-04-03 14:54:55 +0000
commit: b618c3d0693aec564c6746238fd05d94e31d3b76 (patch)
tree: 4a4834f3097bba25dba1adeba4324080c1b4bf7b /extra
parent: 8cb5196780766f47b595410eed8ddbee2e8add08 (diff)
166 files changed, 0 insertions, 22831 deletions
diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
deleted file mode 100644
index b02d1bc68..000000000
--- a/extra/abiword/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 148668 2012-02-05 11:46:18Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Maël Lavault <moimael@neuf.fr>
-
-pkgbase=abiword
-pkgname=('abiword' 'abiword-plugins')
-pkgver=2.8.6
-pkgrel=7
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.abisource.com"
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 
-             'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup')
-options=('!makeflags' '!libtool')
-source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz"
-        'compat_libwpg_0_9.patch'
-	'abiword-2.8.6-no-undefined.patch'
-        'abiword-2.8.6-libpng15.patch')
-md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
-         '09446a2ebba8288fc611e88f7cf17298'
-         '42e2614b6e0aad457d91f6ce20b6f225'
-         '40e370e7e88c5437140ef18037abfbd3')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
-  # fix a gcc 4.6.x build issue, patch from Fedora
-  patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
-  patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
-
-  libtoolize --force
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --enable-clipart \
-              --enable-templates \
-              --enable-collab-backend-xmpp \
-              --enable-collab-backend-tcp \
-              --enable-collab-backend-service \
-              --disable-collab-backend-sugar \
-              --enable-plugins --without-gnomevfs \
-              --with-gio \
-              --with-goffice \
-              --disable-static \
-              --with-psiconv-config=/nothere
-  make
-}
-
-package_abiword() {
-  pkgdesc="A fully-featured word processor"
-  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
-  install=$pkgname.install
-  optdepends=('abiword-plugins')
-  conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i plugins/Makefile \
-      -e 's/ collab / /' \
-      -e 's/ wpg / /' \
-      -e 's/ wmf / /' \
-      -e 's/ grammar / /' \
-      -e 's/ mathview / /' \
-      -e 's/ aiksaurus / /' \
-      -e 's/ latex / /' \
-      -e 's/ ots / /' \
-      -e 's/ wordperfect / /'
-  make DESTDIR="${pkgdir}" install
-}
-
-package_abiword-plugins() {
-  pkgdesc="Additional plugins for Abiword"
-  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
-           'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
-  for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-}
diff --git a/extra/abiword/abiword-2.8.6-libpng15.patch b/extra/abiword/abiword-2.8.6-libpng15.patch
deleted file mode 100644
index 7eded4c83..000000000
--- a/extra/abiword/abiword-2.8.6-libpng15.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp
-@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
- 
- 	/* Clean Up Memory Used */
- 		
--	FREEP(m_pPNGInfo->palette);
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
-+	FREEP(palette);
- 	DELETEP(pBB);
- 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-    
-@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
- 	{
- 		/* Reset error handling for libpng */
--		if (setjmp(m_pPNG->jmpbuf))
-+		if (setjmp(png_jmpbuf(m_pPNG)))
- 		{
- 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 			return UT_ERROR;
-@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
- {
- 	/* Reset error handling for libpng */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 		return UT_ERROR;
-
-$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
-+++ plugins/garble/xp/abiword-garble-png.cpp
-@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
- 		png_set_strip_alpha( png_ptr );
- 		png_set_interlace_handling( png_ptr );
- 		png_set_bgr( png_ptr );
--		rowbytes = info_ptr->rowbytes;
-+		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
- 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
- 	}
- 
-$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
-@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		DELETEP(m_pPngBB);
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
-+++ src/af/util/xp/ut_png.cpp
-@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch
deleted file mode 100644
index c07000edb..000000000
--- a/extra/abiword/abiword-2.8.6-no-undefined.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
-+++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic \
- 	-headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
- 	$(platform_ldflags) \
--	--no-undefined      \
-+	-Wl,--no-undefined      \
- 	-avoid-version      \
- 	-export-dynamic
- 
diff --git a/extra/abiword/abiword.install b/extra/abiword/abiword.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/extra/abiword/abiword.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/abiword/compat_libwpg_0_9.patch b/extra/abiword/compat_libwpg_0_9.patch
deleted file mode 100644
index cf36e188e..000000000
--- a/extra/abiword/compat_libwpg_0_9.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4
---- abiword-2.8.6.orig//plugin-configure.m4	2010-06-13 14:17:27.000000000 -0700
-+++ abiword-2.8.6/plugin-configure.m4	2010-12-06 13:59:43.083048588 -0800
-@@ -794,7 +794,7 @@
- AC_SUBST([OPENXML_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1497,8 +1497,8 @@
- AC_SUBST([EML_LIBS])
- 
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4
---- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,6 +1,6 @@
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-02-06 13:06:11.000000000 -0800
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-12-06 13:59:53.926381921 -0800
-@@ -60,7 +60,7 @@
- 
- // Stream class
- 
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- 
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
-@@ -70,12 +70,7 @@
- #include <libwps/libwps.h>
- #endif
- 
--class AbiWordperfectInputStream :
--#ifdef HAVE_LIBWPS
--	public WPSInputStream
--#else
--    public WPXInputStream
--#endif
-+class AbiWordperfectInputStream : public WPXInputStream
- {
- public:
- 	AbiWordperfectInputStream(GsfInput *input);
-@@ -86,7 +81,7 @@
- 
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
- 
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -98,11 +93,7 @@
- };
- 
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
--#ifdef HAVE_LIBWPS
--	WPSInputStream(),
--#else
--	WPXInputStream(true),
--#endif
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -117,9 +108,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -256,19 +247,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
-+	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPD_CONFIDENCE_NONE:
--		// libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
--		// however, we'll let the text importer handle such cases
--		case WPD_CONFIDENCE_POOR: 
- 			return UT_CONFIDENCE_ZILCH;
--		case WPD_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPD_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPD_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-@@ -328,7 +312,7 @@
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- 	AbiWordperfectInputStream gsfInput(input);
--	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
- 
- 	if (error != WPD_OK)
- 	{
-@@ -381,9 +365,9 @@
- 	float marginLeft = 1.0f, marginRight = 1.0f;
- 
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
- 		/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
-@@ -456,15 +440,15 @@
- 	float marginTop = 0.0f, marginBottom = 0.0f;
- 	float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
- 	if (propList["fo:margin-top"])
--	    marginTop = propList["fo:margin-top"]->getFloat();
-+	    marginTop = propList["fo:margin-top"]->getDouble();
- 	if (propList["fo:margin-bottom"])
--	    marginBottom = propList["fo:margin-bottom"]->getFloat();
-+	    marginBottom = propList["fo:margin-bottom"]->getDouble();
- 	if (propList["fo:margin-left"])
--	    marginLeft = propList["fo:margin-left"]->getFloat();
-+	    marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--	    marginRight = propList["fo:margin-right"]->getFloat();
-+	    marginRight = propList["fo:margin-right"]->getDouble();
- 	if (propList["fo:text-indent"])
--	    textIndent = propList["fo:text-indent"]->getFloat();
-+	    textIndent = propList["fo:text-indent"]->getDouble();
- 
- 	m_topMargin = marginTop;
- 	m_bottomMargin = marginBottom;
-@@ -487,7 +471,7 @@
- 
- 	float lineSpacing = 1.0f;
- 	if (propList["fo:line-height"])
--		lineSpacing = propList["fo:line-height"]->getFloat();
-+		lineSpacing = propList["fo:line-height"]->getDouble();
- 	
- 	UT_String tmpBuffer;
- 	UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
-@@ -504,7 +488,7 @@
- 			propBuffer += tmpBuffer;
- 			if (i()["style:position"])
- 			{
--				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
-+				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
- 				propBuffer += tmpBuffer;
- 			}
- 
-@@ -640,9 +624,9 @@
- 
- 	// TODO: support spaceAfter
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
- 		m_bSectionChanged = true;
-@@ -709,9 +693,9 @@
- 	if (propList["style:num-format"])
- 		listType = propList["style:num-format"]->getStr().cstr()[0];
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || 
- 		m_pCurrentListDefinition->getOutlineHash() != listID ||
-@@ -749,9 +733,9 @@
- 	if (propList["libwpd:level"])
- 		level = propList["libwpd:level"]->getInt();
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
- 	{
-@@ -871,10 +855,10 @@
- 
- 	UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
- 					+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 	UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 
- 	listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
-@@ -1263,7 +1247,7 @@
-     virtual UT_Error _loadFile(GsfInput * input)
- 	{
- 		AbiWordperfectInputStream gsfInput(input);
--		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
- 
- 		if (error != WPS_OK)
- 			{
-@@ -1302,18 +1286,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
-+	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPS_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPS_CONFIDENCE_POOR: 
--			return UT_CONFIDENCE_POOR;
--		case WPS_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPS_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPS_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h	2009-06-19 01:55:49.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h	2010-12-06 13:59:53.929715254 -0800
-@@ -30,13 +30,7 @@
- #define IE_IMP_WP_H
- 
- #include <stdio.h>
--#ifdef _WIN32
--#define POINT WPX_POINT
--#endif
- #include <libwpd/libwpd.h>
--#ifdef _WIN32
--#undef POINT
--#endif
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -98,7 +92,7 @@
- 					IE_Imp ** ppie);
- };
- 
--class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
-+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
- {
- public:
-     IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -154,6 +148,21 @@
-     virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
-     virtual void closeTable();
- 
-+    virtual void definePageStyle(const WPXPropertyList&) {}
-+    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void defineCharacterStyle(const WPXPropertyList&) {}
-+    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void insertSpace() {}
-+    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
-+    virtual void openComment(const WPXPropertyList&) {}
-+    virtual void closeComment() {}
-+    virtual void openTextBox(const WPXPropertyList&) {}
-+    virtual void closeTextBox() {}
-+    virtual void openFrame(const WPXPropertyList&) {}
-+    virtual void closeFrame() {}
-+    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
-+    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+
-     
- protected:
- 	virtual UT_Error _loadFile(GsfInput * input);
-diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4
---- abiword-2.8.6.orig//plugins/wpg/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,5 +1,5 @@
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp
---- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp	2008-08-15 14:52:32.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp	2010-12-06 13:59:53.923048588 -0800
-@@ -31,11 +31,10 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- #include "xap_Module.h"
- 
- using libwpg::WPGraphics;
--using libwpg::WPGString;
- 
- ABI_PLUGIN_DECLARE("WPG")
- 
-@@ -48,7 +47,7 @@
- 	virtual bool isOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -60,7 +59,7 @@
- };
- 
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
--	WPXInputStream(true),
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -75,9 +74,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -245,10 +244,10 @@
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- 	AbiWordPerfectGraphicsInputStream gsfInput(input);
--	WPGString svgOutput;
-+	WPXString svgOutput;
- 	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
- 	{
--		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
-+		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
- 		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
- 		g_object_unref(svgInput);
- 		return result;
diff --git a/extra/acpi/PKGBUILD b/extra/acpi/PKGBUILD
deleted file mode 100644
index f967c9530..000000000
--- a/extra/acpi/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 148028 2012-01-30 03:41:59Z dan $
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=acpi
-pkgver=1.6
-pkgrel=1
-pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/acpiclient"
-depends=('glibc')
-source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz)
-license=('GPL2')
-sha256sums=('ed61d20400c4fd3965dde9b49ab3ac74da02f8eca1a55454f7a1ac3fa1fd5c31')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
deleted file mode 100644
index ae5cfc9e0..000000000
--- a/extra/acpid/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 145167 2011-12-18 19:59:26Z eric $
-# Maintainer:
-# Contributor: xduugu
-# Contributor: Manolis Tzanidakis
-# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
-
-pkgname=acpid
-pkgver=2.0.14
-pkgrel=1
-pkgdesc="A daemon for delivering ACPI power management events with netlink support"
-arch=('i686' 'x86_64')
-url="http://tedfelix.com/linux/acpid-netlink.html"
-license=('GPL')
-depends=('bash')
-replaces=('acpid2')
-backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
-        'acpid'
-        'anything'
-        'handler.sh'
-        'acpid.conf.d')
-md5sums=('14fc1eabc3489f3ded9347fcd55f158a'
-         'd69203a032c4583f9abaafcf21a7ed84'
-         '2d37b98d6e74bab815604b8b48c6cfd4'
-         'd411b758e8531adee191b66bcbc2892d'
-         '929c6d2e91295c22ed9ec6212d7eabef')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid"
-  install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything"
-  install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh"
-  install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid"
-
-  chmod 755 "${pkgdir}"/usr/sbin/acpid
-}
diff --git a/extra/acpid/acpid b/extra/acpid/acpid
deleted file mode 100644
index 288ac078d..000000000
--- a/extra/acpid/acpid
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid
-
-PID=`pidof -o %PPID /usr/sbin/acpid`
-case "$1" in
-  start)
-    stat_busy "Starting acpid"
-    [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon acpid
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping acpid"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon acpid
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/acpid/acpid.conf.d b/extra/acpid/acpid.conf.d
deleted file mode 100644
index b60103a2d..000000000
--- a/extra/acpid/acpid.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the acpid daemon
-#
-
-ACPID_ARGS=""
diff --git a/extra/acpid/anything b/extra/acpid/anything
deleted file mode 100644
index d1828989b..000000000
--- a/extra/acpid/anything
+++ /dev/null
@@ -1,3 +0,0 @@
-# Pass all events to our one handler script
-event=.*
-action=/etc/acpi/handler.sh %e
diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh
deleted file mode 100644
index 505ed7c11..000000000
--- a/extra/acpid/handler.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-# Default acpi script that takes an entry for all actions
-
-minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq`
-maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq`
-setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
-
-set $*
-
-case "$1" in
-    button/power)
-        #echo "PowerButton pressed!">/dev/tty5
-        case "$2" in
-            PBTN|PWRF)  logger "PowerButton pressed: $2" ;;
-            *)          logger "ACPI action undefined: $2" ;;
-        esac
-        ;;
-    button/sleep)
-        case "$2" in
-            SLPB)   echo -n mem >/sys/power/state ;;
-            *)      logger "ACPI action undefined: $2" ;;
-        esac
-        ;;
-    ac_adapter)
-        case "$2" in
-            AC|ACAD|ADP0)
-                case "$4" in
-                    00000000)
-                        echo -n $minspeed >$setspeed
-                        #/etc/laptop-mode/laptop-mode start
-                    ;;
-                    00000001)
-                        echo -n $maxspeed >$setspeed
-                        #/etc/laptop-mode/laptop-mode stop
-                    ;;
-                esac
-                ;;
-            *)  logger "ACPI action undefined: $2" ;;
-        esac
-        ;;
-    battery)
-        case "$2" in
-            BAT0)
-                case "$4" in
-                    00000000)   #echo "offline" >/dev/tty5
-                    ;;
-                    00000001)   #echo "online"  >/dev/tty5
-                    ;;
-                esac
-                ;;
-            CPU0)	
-                ;;
-            *)  logger "ACPI action undefined: $2" ;;
-        esac
-        ;;
-    button/lid)
-       	case "$3" in
-	    close)
-		#echo "LID closed!">/dev/tty5
-		;;
-	    open)
-		#echo "LID opened!">/dev/tty5
-        	;;
-	esac
-	;;
-
-    *)
-        logger "ACPI group/action undefined: $1 / $2"
-        ;;
-esac
diff --git a/extra/alex/PKGBUILD b/extra/alex/PKGBUILD
deleted file mode 100644
index 32b9ebb2f..000000000
--- a/extra/alex/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151870 2012-03-03 16:05:52Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Philip Nilsson <pnilsson@nullref.se>
-
-pkgname=alex
-pkgver=3.0.1
-pkgrel=1
-pkgdesc='a lexical analyser generator for Haskell'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/alex/'
-license=('custom:BSD3')
-depends=('gmp')
-makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1')
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('5dec239c89165d159faa2154bc0724cd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname
-  runghc Setup.lhs build
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs copy --destdir=$pkgdir
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3
-
-  # doc/ contains only license which already installed into proper place
-  rm -rf $pkgdir/usr/share/doc
-}
diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
deleted file mode 100644
index ed8cbd042..000000000
--- a/extra/allegro/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148670 2012-02-05 11:46:21Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: arjan <arjan@archlinux.org>
-
-pkgname=allegro
-pkgver=5.0.5
-pkgrel=2
-pkgdesc="Portable library mainly aimed at video game and multimedia programming"
-arch=('i686' 'x86_64')
-url="http://alleg.sourceforge.net/"
-license=('custom')
-depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg')
-makedepends=('cmake' 'mesa' 'freetype2')
-source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4d879afe7062f7dc9b8913cba2e44bdf')
-
-build() {
-  cd "${srcdir}"
-  mkdir build && cd build
-
-  cmake "../${pkgname}-${pkgver}" \
-  	-DCMAKE_BUILD_TYPE=Release \
-  	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DWANT_DOCS=OFF
-
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/alsa-utils/alsaconf.patch b/extra/alsa-utils/alsaconf.patch
deleted file mode 100644
index 48037fd3e..000000000
--- a/extra/alsa-utils/alsaconf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in
---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2005-03-24 00:24:52.000000000 -0800
-+++ alsa-utils-1.0.9a/alsaconf/alsaconf.in	2005-07-18 09:25:02.000000000 -0700
-@@ -58,6 +58,8 @@
-   distribution="redhat"
- elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then
-   distribution="fedora"
-+elif test -f /etc/arch-release; then
-+  distribution="arch"
- elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then
-   distribution="slackware"
- else
-@@ -382,6 +384,8 @@
-     rcalsasound=/etc/rc.d/init.d/alsasound
- elif [ -x /etc/init.d/alsa ]; then
-     rcalsasound=/etc/init.d/alsa
-+elif [ -x /etc/rc.d/alsa ]; then
-+    rcalsasound=/etc/rc.d/alsa
- else
-     rcalsasound=rcalsasound
- fi
---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2010-01-03 19:44:08.000000000 +0100
-+++ alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2010-01-03 19:44:08.000000000 +0100
-@@ -315,7 +315,7 @@
- 	3.[789]*)
- 	  ;;
- 	*)
--	  cfgout="/etc/modprobe.d/sound"
-+	  cfgout="/etc/modprobe.d/sound.conf"
- 	  cfgoldout=""
- 	  ;;
- 	esac
diff --git a/extra/audacity/audacity-1.3.13-ffmpeg.patch b/extra/audacity/audacity-1.3.13-ffmpeg.patch
deleted file mode 100644
index e76d2422b..000000000
--- a/extra/audacity/audacity-1.3.13-ffmpeg.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-Index: src/FFmpeg.h
-===================================================================
---- src/FFmpeg.h	(revision 11286)
-+++ src/FFmpeg.h	(working copy)
-@@ -47,6 +47,21 @@
-    #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 94, 1)
-    #define AVSampleFormat SampleFormat
-    #endif
-+
-+   #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 120, 0)
-+   #define CodecType AVMediaType
-+   #define CODEC_TYPE_UNKNOWN    AVMEDIA_TYPE_UNKNOWN
-+   #define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
-+   #define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
-+   #define CODEC_TYPE_DATA       AVMEDIA_TYPE_DATA
-+   #define CODEC_TYPE_SUBTITLE   AVMEDIA_TYPE_SUBTITLE
-+   #define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
-+   #define CODEC_TYPE_NB         AVMEDIA_TYPE_NB
-+   #endif
-+
-+   #ifndef PKT_FLAG_KEY
-+   #define PKT_FLAG_KEY          AV_PKT_FLAG_KEY
-+   #endif  
- }
- #endif
- 
-@@ -505,20 +520,23 @@
-       (AVCodecContext *avctx, AVCodec *codec),
-       (avctx, codec);
-    );
-+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
-    FFMPEG_FUNCTION_WITH_RETURN(
-       int,
-+      avcodec_decode_audio3,
-+      (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
-+      (avctx, samples, frame_size_ptr, avpkt)
-+   );
-+#else
-+   FFMPEG_FUNCTION_WITH_RETURN(
-+      int,
-       avcodec_decode_audio2,
-       (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, const uint8_t *buf, int buf_size),
-       (avctx, samples, frame_size_ptr, buf, buf_size)
-    );
-+#endif
-    FFMPEG_FUNCTION_WITH_RETURN(
-       int,
--      avcodec_decode_audio3,
--      (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
--      (avctx, samples, frame_size_ptr, avpkt)
--   );
--   FFMPEG_FUNCTION_WITH_RETURN(
--      int,
-       avcodec_encode_audio,
-       (AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples),
-       (avctx, buf, buf_size, samples)
-@@ -556,13 +574,22 @@
-       (void),
-       ()
-    );
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
-    FFMPEG_FUNCTION_WITH_RETURN(
-       void*,
-       av_fast_realloc,
-       (void *ptr, unsigned int *size, unsigned int min_size),
-       (ptr, size, min_size)
-    );
-+#else
-    FFMPEG_FUNCTION_WITH_RETURN(
-+      void*,
-+      av_fast_realloc,
-+      (void *ptr, unsigned int *size, size_t min_size),
-+      (ptr, size, min_size)
-+   );
-+#endif
-+   FFMPEG_FUNCTION_WITH_RETURN(
-       int,
-       av_open_input_stream,
-       (AVFormatContext **ic_ptr, AVIOContext *pb, const char *filename, AVInputFormat *fmt, AVFormatParameters *ap),
-@@ -744,12 +771,21 @@
-       (AVFifoBuffer *f),
-       (f)
-    );
-+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 0, 0)
-    FFMPEG_FUNCTION_WITH_RETURN(
-       void*,
-       av_malloc,
-       (unsigned int size),
-       (size)
-    );
-+#else
-+   FFMPEG_FUNCTION_WITH_RETURN(
-+      void*,
-+      av_malloc,
-+      (size_t size),
-+      (size)
-+   );
-+#endif
-    FFMPEG_FUNCTION_NO_RETURN(
-       av_freep,
-       (void *ptr),
-@@ -761,11 +797,16 @@
-       (int64_t a, AVRational bq, AVRational cq),
-       (a, bq, cq)
-    );
-+
-+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
-    FFMPEG_FUNCTION_NO_RETURN(
-       av_free_packet,
-       (AVPacket *pkt),
-       (pkt)
-    );
-+#endif
-+
-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
-    FFMPEG_FUNCTION_WITH_RETURN(
-       AVFifoBuffer*,
-       av_fifo_alloc,
-@@ -778,8 +819,22 @@
-       (AVFifoBuffer *f, void *buf, int buf_size, void (*func)(void*, void*, int)),
-       (f, buf, buf_size, func)
-    );
-+#else
-    FFMPEG_FUNCTION_WITH_RETURN(
-       int,
-+      av_fifo_init,
-+      (AVFifoBuffer *f, unsigned int size),
-+      (f, size)
-+   );
-+   FFMPEG_FUNCTION_WITH_RETURN(
-+      int,
-+      av_fifo_generic_read,
-+      (AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest),
-+      (f, buf_size, func, dest)
-+   );
-+#endif
-+   FFMPEG_FUNCTION_WITH_RETURN(
-+      int,
-       av_fifo_realloc2,
-       (AVFifoBuffer *f, unsigned int size),
-       (f, size)
-Index: src/FFmpeg.cpp
-===================================================================
---- src/FFmpeg.cpp	(revision 11286)
-+++ src/FFmpeg.cpp	(working copy)
-@@ -186,9 +186,15 @@
-       return AVERROR(ENOMEM);
-    }
- 
--   if (flags & URL_RDWR) {
-+   // LLL:  These really should be logical AND tests, but on 2011/04/28, the URL_ open flags
-+   //       changed in the FFmpeg source to values that were not compatible with previous
-+   //       values.
-+   //
-+   //       Since Audacity doesn't use any other open flags (there aren't any others defined
-+   //       anyway), making equality tests works for older and new FFmpeg headers.
-+   if (flags == URL_RDWR) {
-       mode = wxFile::read_write;
--   } else if (flags & URL_WRONLY) {
-+   } else if (flags == URL_WRONLY) {
-       mode = wxFile::write;
-    } else {
-       mode = wxFile::read;
-@@ -222,6 +228,10 @@
- {
-    wxSeekMode mode = wxFromStart;
- 
-+#if !defined(AVSEEK_FORCE)
-+#define AVSEEK_FORCE 0
-+#endif
-+
-    switch (whence & ~AVSEEK_FORCE)
-    {
-    case (SEEK_SET):
-@@ -316,7 +326,7 @@
-    pd.buf_size = 0;
-    pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
-    if (pd.buf == NULL) {
--      err = AVERROR_NOMEM;
-+      err = AVERROR(ENOMEM);
-       goto fail;
-    }
- 
-@@ -381,7 +391,7 @@
- 
-    // Didn't find a suitable format, so bail
-    if (!fmt) {
--      err = AVERROR_NOFMT;
-+      err = AVERROR(EILSEQ);
-       goto fail;
-    }
- 
-@@ -847,39 +857,53 @@
-    FFMPEG_INITALT(avformat, av_guess_format, guess_format);
-    FFMPEG_INITALT(avformat, av_match_ext, match_ext);
- 
--   FFMPEG_INITDYN(codec, av_init_packet);
--   FFMPEG_INITDYN(codec, av_free_packet);
--   FFMPEG_INITDYN(codec, avcodec_init);
--   FFMPEG_INITDYN(codec, avcodec_find_encoder);
--   FFMPEG_INITDYN(codec, avcodec_find_encoder_by_name);
--   FFMPEG_INITDYN(codec, avcodec_find_decoder);
--   FFMPEG_INITDYN(codec, avcodec_get_context_defaults);
--   FFMPEG_INITDYN(codec, avcodec_open);
--   FFMPEG_INITDYN(codec, avcodec_decode_audio2);
--   FFMPEG_INITDYN(codec, avcodec_decode_audio3);
--   FFMPEG_INITDYN(codec, avcodec_encode_audio);
--   FFMPEG_INITDYN(codec, avcodec_close);
--   FFMPEG_INITDYN(codec, avcodec_register_all);
--   FFMPEG_INITDYN(codec, avcodec_version);
--   FFMPEG_INITDYN(codec, av_fast_realloc);
--   FFMPEG_INITDYN(codec, av_codec_next);
--   FFMPEG_INITDYN(codec, av_get_bits_per_sample_format);
-+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 58, 0)
-+   FFMPEG_INITDYN(avcodec, av_init_packet);
-+#else
-+   FFMPEG_INITDYN(avformat, av_init_packet);
-+#endif
- 
-+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
-+   FFMPEG_INITDYN(avcodec, av_free_packet);
-+#endif
-+   FFMPEG_INITDYN(avcodec, avcodec_init);
-+   FFMPEG_INITDYN(avcodec, avcodec_find_encoder);
-+   FFMPEG_INITDYN(avcodec, avcodec_find_encoder_by_name);
-+   FFMPEG_INITDYN(avcodec, avcodec_find_decoder);
-+   FFMPEG_INITDYN(avcodec, avcodec_get_context_defaults);
-+   FFMPEG_INITDYN(avcodec, avcodec_open);
-+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
-+   FFMPEG_INITDYN(avcodec, avcodec_decode_audio3);
-+#else
-+   FFMPEG_INITDYN(avcodec, avcodec_decode_audio2);
-+#endif
-+   FFMPEG_INITDYN(avcodec, avcodec_encode_audio);
-+   FFMPEG_INITDYN(avcodec, avcodec_close);
-+   FFMPEG_INITDYN(avcodec, avcodec_register_all);
-+   FFMPEG_INITDYN(avcodec, avcodec_version);
-+   FFMPEG_INITDYN(avcodec, av_fast_realloc);
-+   FFMPEG_INITDYN(avcodec, av_codec_next);
-+   FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);
-+
-    FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);
- 
--   FFMPEG_INITDYN(util, av_free);
--   FFMPEG_INITDYN(util, av_log_set_callback);
--   FFMPEG_INITDYN(util, av_log_default_callback);
--   FFMPEG_INITDYN(util, av_fifo_alloc);
--   FFMPEG_INITDYN(util, av_fifo_generic_read);
--   FFMPEG_INITDYN(util, av_fifo_realloc2);
--   FFMPEG_INITDYN(util, av_fifo_free);
--   FFMPEG_INITDYN(util, av_fifo_size);
--   FFMPEG_INITDYN(util, av_malloc);
--   FFMPEG_INITDYN(util, av_fifo_generic_write);
--   FFMPEG_INITDYN(util, av_freep);
--   FFMPEG_INITDYN(util, av_rescale_q);
--   FFMPEG_INITDYN(util, avutil_version);
-+   FFMPEG_INITDYN(avutil, av_free);
-+   FFMPEG_INITDYN(avutil, av_log_set_callback);
-+   FFMPEG_INITDYN(avutil, av_log_default_callback);
-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
-+   FFMPEG_INITDYN(avutil, av_fifo_alloc);
-+#else
-+   FFMPEG_INITDYN(avutil, av_fifo_init);
-+#endif
-+   FFMPEG_INITDYN(avutil, av_fifo_generic_read);
-+   FFMPEG_INITDYN(avutil, av_fifo_realloc2);
-+   FFMPEG_INITDYN(avutil, av_fifo_free);
-+   FFMPEG_INITDYN(avutil, av_fifo_size);
-+   FFMPEG_INITDYN(avutil, av_malloc);
-+   FFMPEG_INITDYN(avutil, av_fifo_generic_write);
-+   FFMPEG_INITDYN(avutil, av_freep);
-+   FFMPEG_INITDYN(avutil, av_rescale_q);
-+   FFMPEG_INITDYN(avutil, avutil_version);
- 
-    //FFmpeg initialization
-    wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));
-Index: src/import/ImportFFmpeg.cpp
-===================================================================
---- src/import/ImportFFmpeg.cpp	(revision 11286)
-+++ src/import/ImportFFmpeg.cpp	(working copy)
-@@ -808,9 +808,12 @@
-       }
-    }
- 
-+
-+   sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
-+
-+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
-    // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but
-    // also returns the number of bytes it decoded in the same parameter.
--   sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
-    AVPacket avpkt;
-    av_init_packet(&avpkt);
-    avpkt.data = pDecode;
-@@ -820,7 +823,16 @@
-                             (int16_t *)sc->m_decodedAudioSamples,    // out
-                             &sc->m_decodedAudioSamplesValidSiz,      // in/out
-                             &avpkt);                                 // in
--
-+#else
-+   // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but
-+   // also returns the number of bytes it decoded in the same parameter.
-+   nBytesDecoded =
-+      avcodec_decode_audio2(sc->m_codecCtx, 
-+                            (int16_t *) sc->m_decodedAudioSamples,   // out
-+                            &sc->m_decodedAudioSamplesValidSiz,      // in/out
-+                            pDecode,                                 // in
-+                            nDecodeSiz);                             // in
-+#endif
-    if (nBytesDecoded < 0)
-    {
-       // Decoding failed. Don't stop.
-Index: src/export/ExportFFmpeg.cpp
-===================================================================
---- src/export/ExportFFmpeg.cpp	(revision 11286)
-+++ src/export/ExportFFmpeg.cpp	(working copy)
-@@ -154,6 +154,10 @@
-    AVFifoBuffer	 * mEncAudioFifo;				// FIFO to write incoming audio samples into
-    uint8_t         *	mEncAudioFifoOutBuf;		// buffer to read _out_ of the FIFO into
- 
-+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
-+   AVFifoBuffer      mEncAudioFifoBuffer;    // FIFO to write incoming audio samples into
-+#endif
-+
-    wxString          mName;
- 
-    int               mSubFormat;
-@@ -174,6 +178,11 @@
-    #define MAX_AUDIO_PACKET_SIZE (128 * 1024)
-    mEncAudioEncodedBufSiz = 4*MAX_AUDIO_PACKET_SIZE;
-    mEncAudioFifoOutBuf = NULL;	// buffer to read _out_ of the FIFO into
-+   
-+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
-+   mEncAudioFifo = &mEncAudioFifoBuffer;
-+#endif
-+
-    mSampleRate = 0;
-    mSupportsUTF8 = true;
- 
-@@ -350,7 +359,6 @@
-    mEncAudioCodecCtx = mEncAudioStream->codec;
-   
-    avcodec_get_context_defaults(mEncAudioCodecCtx);
--
-    mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
-    mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
-    mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
-@@ -403,7 +411,9 @@
-       mEncAudioCodecCtx->flags2 = 0;
-       if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
-       if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
-       mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
-+#endif
-       mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
-       mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
-       mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
-@@ -487,7 +497,11 @@
-    // The encoder may require a minimum number of raw audio samples for each encoding but we can't
-    // guarantee we'll get this minimum each time an audio frame is decoded from the input file so 
-    // we use a FIFO to store up incoming raw samples until we have enough for one call to the codec.
-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
-    mEncAudioFifo = av_fifo_alloc(1024);
-+#else
-+   av_fifo_init(mEncAudioFifo, 1024);
-+#endif
- 
-    // Allocate a buffer to read OUT of the FIFO into. The FIFO maintains its own buffer internally.
-    if ((mEncAudioFifoOutBuf = (uint8_t*)av_malloc(2*MAX_AUDIO_PACKET_SIZE)) == NULL)
-@@ -544,7 +558,11 @@
-                nFifoBytes, mEncAudioCodecCtx->frame_size);
- 
-             // Pull the bytes out from the FIFO and feed them to the encoder.
-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
-             if (av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nFifoBytes, NULL) == 0)
-+#else
-+            if (av_fifo_generic_read(mEncAudioFifo, nFifoBytes, NULL, mEncAudioFifoOutBuf) == 0)
-+#endif
-             {
-                if (mEncAudioCodecCtx->frame_size != 1)
-                   nEncodedBytes = avcodec_encode_audio(mEncAudioCodecCtx, mEncAudioEncodedBuf, mEncAudioEncodedBufSiz, (int16_t*)mEncAudioFifoOutBuf);
-@@ -609,7 +627,10 @@
-       av_free(mEncAudioFifoOutBuf);
- 
-    av_fifo_free(mEncAudioFifo);
-+
-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
-    mEncAudioFifo = NULL;
-+#endif
- 
-    return true;
- }
-@@ -635,7 +656,11 @@
-    // Read raw audio samples out of the FIFO in nAudioFrameSizeOut byte-sized groups to encode.
-    while ((ret = av_fifo_size(mEncAudioFifo)) >= nAudioFrameSizeOut)
-    {
-+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
-       ret = av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nAudioFrameSizeOut, NULL);
-+#else
-+      ret = av_fifo_generic_read(mEncAudioFifo, nAudioFrameSizeOut, NULL, mEncAudioFifoOutBuf);
-+#endif
- 
-       av_init_packet(&pkt);
- 
diff --git a/extra/bluez/fix-a2dp.patch b/extra/bluez/fix-a2dp.patch
deleted file mode 100644
index e4bb1372a..000000000
--- a/extra/bluez/fix-a2dp.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Thu, 26 Jan 2012 23:39:02 +0200
-Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket
- is disabled
-
-Local endpoints can only be used when UNIX socket API is available.
----
- audio/a2dp.c |   15 +++++++--------
- 1 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/audio/a2dp.c b/audio/a2dp.c
-index 5ca105c..bbb91ce 100644
---- a/audio/a2dp.c
-+++ b/audio/a2dp.c
-@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
- 
- int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- {
--	int sbc_srcs = 1, sbc_sinks = 1;
-+	int sbc_srcs = 0, sbc_sinks = 0;
- 	int mpeg12_srcs = 0, mpeg12_sinks = 0;
--	gboolean source = TRUE, sink = FALSE, socket = TRUE;
-+	gboolean source = TRUE, sink = FALSE, socket = FALSE;
- 	gboolean delay_reporting = FALSE;
- 	char *str;
- 	GError *err = NULL;
-@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 			source = TRUE;
- 		if (strstr(str, "Source"))
- 			sink = TRUE;
-+		if (strstr(str, "Socket"))
-+			socket = TRUE;
- 		g_free(str);
- 	}
- 
-@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	}
- 
- 	/* Don't register any local sep if Socket is disabled */
--	if (socket == FALSE) {
--		sbc_srcs = 0;
--		sbc_sinks = 0;
--		mpeg12_srcs = 0;
--		mpeg12_sinks = 0;
-+	if (socket == FALSE)
- 		goto proceed;
--	}
- 
- 	str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_srcs = 1;
- 	} else {
- 		sbc_srcs = atoi(str);
- 		g_free(str);
-@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_sinks = 1;
- 	} else {
- 		sbc_sinks = atoi(str);
- 		g_free(str);
--- 
-1.7.6.5
-
diff --git a/extra/bluez/fix-compile-issue.patch b/extra/bluez/fix-compile-issue.patch
deleted file mode 100644
index ddb5d94e8..000000000
--- a/extra/bluez/fix-compile-issue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4002cf271e3939714296c535a1ed8d4f0d5ac005 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@intel.com>
-Date: Mon, 16 Jan 2012 11:11:55 +0100
-Subject: [PATCH] lib: Fix compile issue when using in C++
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-The compiler error is:
- /usr/include/bluetooth/bluetooth.h::131:9:âerror:âinvalidâconversion fromâ'void*'âtoâ'bt_get_le64(void*)::<anonymousâstruct>*'
- ...
-
-The reason is that C++, in contrast to C, does not allow conversion of
-void * to anything, and this code gets compiled as C++ when the app is
-written in C++. The macro with the assignment itself is older, but only
-recent Bluez starts to use it in inline functions, thus triggering the
-problem.
-
-This patch keeps the "struct __attribute__((packed))" magic and merely
-changes the typecast so that it works in C and C++. Like the existing
-macro this patch relies on support for typeof.
----
- lib/bluetooth.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/bluetooth.h b/lib/bluetooth.h
-index ea7373d..0541842 100644
---- a/lib/bluetooth.h
-+++ b/lib/bluetooth.h
-@@ -141,7 +141,7 @@ enum {
- ({						\
- 	struct __attribute__((packed)) {	\
- 		typeof(*(ptr)) __v;		\
--	} *__p = (void *) (ptr);		\
-+	} *__p = (typeof(__p)) (ptr);		\
- 	__p->__v;				\
- })
- 
-@@ -149,7 +149,7 @@ enum {
- do {						\
- 	struct __attribute__((packed)) {	\
- 		typeof(*(ptr)) __v;		\
--	} *__p = (void *) (ptr);		\
-+	} *__p = (typeof(__p)) (ptr);		\
- 	__p->__v = (val);			\
- } while(0)
- 
--- 
-1.7.6.5
-
diff --git a/extra/boost/BOOST_FOREACH.patch b/extra/boost/BOOST_FOREACH.patch
deleted file mode 100644
index 12cf08800..000000000
--- a/extra/boost/BOOST_FOREACH.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: /trunk/boost/foreach_fwd.hpp
-===================================================================
---- /trunk/boost/foreach_fwd.hpp	(revision 62661)
-+++ /trunk/boost/foreach_fwd.hpp	(revision 75540)
-@@ -15,4 +15,6 @@
- #define BOOST_FOREACH_FWD_HPP
- 
-+#include <utility> // for std::pair
-+
- // This must be at global scope, hence the uglified name
- enum boost_foreach_argument_dependent_lookup_hack
-@@ -26,4 +28,7 @@
- namespace foreach
- {
-+    template<typename T>
-+    std::pair<T, T> in_range(T begin, T end);
-+
-     ///////////////////////////////////////////////////////////////////////////////
-     // boost::foreach::tag
-@@ -47,4 +52,22 @@
- } // namespace foreach
- 
-+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
-+namespace BOOST_FOREACH
-+{
-+    using foreach::in_range;
-+    using foreach::tag;
-+
-+    template<typename T>
-+    struct is_lightweight_proxy
-+      : foreach::is_lightweight_proxy<T>
-+    {};
-+
-+    template<typename T>
-+    struct is_noncopyable
-+      : foreach::is_noncopyable<T>
-+    {};
-+
-+} // namespace BOOST_FOREACH
-+
- } // namespace boost
- 
-Index: /trunk/boost/foreach.hpp
-===================================================================
---- /trunk/boost/foreach.hpp	(revision 75077)
-+++ /trunk/boost/foreach.hpp	(revision 75540)
-@@ -166,5 +166,5 @@
- //   at the global namespace for your type.
- template<typename T>
--inline boost::foreach::is_lightweight_proxy<T> *
-+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
- boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
- 
-@@ -191,5 +191,5 @@
- //   at the global namespace for your type.
- template<typename T>
--inline boost::foreach::is_noncopyable<T> *
-+inline boost::BOOST_FOREACH::is_noncopyable<T> *
- boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
- 
diff --git a/extra/capi4k-utils/PKGBUILD b/extra/capi4k-utils/PKGBUILD
deleted file mode 100644
index 07ec42be0..000000000
--- a/extra/capi4k-utils/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 137697 2011-09-10 12:45:15Z pierre $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=capi4k-utils
-pkgver=050718
-pkgrel=8
-pkgdesc="capi utils for isdn cards"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="ftp://ftp.in-berlin.de/pub/capi4linux/"
-makedepends=('ppp')
-depends=('glibc' 'bash')
-backup=('etc/capi.conf')
-source=('ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz'
-        'ppp-2.4.4.patch'
-        'config'
-        'capi.conf'
-        'capiinit.rc'
-        'capi-compile.patch')
-options=('!libtool')
-md5sums=('c745759b6b3d64e19763727176648cdf'
-         'c5416b8b1b76a82c4bcaad76140369e1'
-         '146aa9e06588511c447d7e81dafec86a'
-         'c88940f0ace5759b7a0e8b267ca77ce2'
-         'aa59439a70299290a4d9bcdfaeafed72'
-         '4fa27c5b7b1ee60524fce875bb54bca8')
-
-build() {
-  cd $srcdir/$pkgname
-  patch -Np1 -i ../ppp-2.4.4.patch
-  # fix compiling with gcc 4.2
-  patch -Np1 -i ../capi-compile.patch
-  cp ../config .config
-  # fix pppd plugin
-  sed -i -e 's/2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3/2.4.4/g' $srcdir/$pkgname/pppdcapiplugin/Makefile
-  # patch all Makefile.* and Rules.make to use our CFLAGS
-  sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make
-  # Arch64 fix from Gentoo
-  # patch capi20/Makefile.* to use -fPIC for shared library
-  [ "$CARCH" = "x86_64" ] &&  (sed -i -e "s:^\(CFLAGS.*\):\1 -fPIC:g" capi20/Makefile.*)
-  cd capi20
-  aclocal
-  libtoolize --copy --force
-  cd $srcdir/$pkgname
-  make subconfig
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname
-  make DESTDIR=$pkgdir install
-  install -m755 -D $srcdir/capiinit.rc $pkgdir/etc/rc.d/capiinit
-  install -m644 $srcdir/capi.conf $pkgdir/etc
-  cd $pkgdir/usr/lib
-  ln -s libcapi20 libcapi20.so.2
-  # fix wrong manpage permission
-  chmod 644 $pkgdir/usr/share/man/man8/capiplugin.8
-}
diff --git a/extra/capi4k-utils/capi-compile.patch b/extra/capi4k-utils/capi-compile.patch
deleted file mode 100644
index e6b3acb3b..000000000
--- a/extra/capi4k-utils/capi-compile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- capi4k-utils/capi20/capi20.h~	2000-11-19 11:15:01.000000000 +0100
-+++ capi4k-utils/capi20/capi20.h	2007-11-12 12:07:30.000000000 +0100
-@@ -21,6 +21,7 @@
- #define __CAPI20_H__
- 
- #include <sys/time.h>
-+#include <sys/types.h>
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/extra/capi4k-utils/capi.conf b/extra/capi4k-utils/capi.conf
deleted file mode 100644
index c6b35751f..000000000
--- a/extra/capi4k-utils/capi.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# card		file	proto	io	irq	mem	cardnr	options
-#b1isa		b1.t4	DSS1	0x150	7	-	-	P2P
-#b1pci		b1.t4	DSS1	-	-	-	-
-#c4		c4.bin	DSS1	-	-	-	-
-#c4		-	DSS1	-	-	-	-
-#c4		-	DSS1	-	-	-	-	P2P
-#c4		-	DSS1	-	-	-	-	P2P
-#c2		c2.bin	DSS1	-	-	-	-
-#c2		-	DSS1	-	-	-	-
-#t1isa		t1.t4	DSS1	0x340	9	-	0
-#t1pci		t1.t4	DSS1	-	-	-	-
-#fcpci		-	-	-	-	-	-
-#fcclassic	-	-	0x150	10	-	-
-#fcpcmcia	-	-	-	-	-	-
-\ No newline at end of file
diff --git a/extra/capi4k-utils/capiinit.rc b/extra/capi4k-utils/capiinit.rc
deleted file mode 100755
index 841be67f3..000000000
--- a/extra/capi4k-utils/capiinit.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/capiinit`
-case "$1" in
-  start)
-    stat_busy "Starting capiinit"
-    [ -f /proc/capi/capi20 ] || /sbin/modprobe -s capi
-
-    CNT=0  # wait for udev
-	while [ ! -e /dev/capi20 -a $CNT -lt 10 ]; do
-		sleep 1; : $((CNT++))
-	done
-
-    if [ -z "$PID" ]; then
-       /usr/sbin/capiinit 2>/dev/null start
-    fi
-    
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon capiinit
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping capiinit"
-    /usr/sbin/capiinit 2>/dev/null stop
-    /sbin/modprobe -sqr capi
-    rm_daemon capiinit
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/capi4k-utils/config b/extra/capi4k-utils/config
deleted file mode 100644
index 6ca0dfd61..000000000
--- a/extra/capi4k-utils/config
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Automatically generated by make menuconfig: don't edit
-#
-CONFIG_KERNELDIR='/usr/src/$(uname -r)'
-CONFIG_BINDIR='/usr/bin'
-CONFIG_SBINDIR='/usr/sbin'
-CONFIG_MANDIR='/usr/share/man'
-CONFIG_AVMCAPICTRL=y
-CONFIG_CAPIFAX=y
-CONFIG_RCAPID=y
-CONFIG_PPPDCAPIPLUGIN=y
diff --git a/extra/capi4k-utils/ppp-2.4.4.patch b/extra/capi4k-utils/ppp-2.4.4.patch
deleted file mode 100644
index 24a06a63b..000000000
--- a/extra/capi4k-utils/ppp-2.4.4.patch
+++ /dev/null
@@ -1,1874 +0,0 @@
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/Makefile capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/Makefile
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/Makefile	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,14 @@
-+# Makefile for the capiplugin for pppd(8).
-+#
-+# Copyright 2000 Carsten Paeth (calle@calle.in-berlin.de)
-+# Copyright 2000 AVM GmbH Berlin (info@avm.de)
-+#
-+#  This program is free software; you can redistribute it and/or
-+#  modify it under the terms of the GNU General Public License
-+#  as published by the Free Software Foundation; either version
-+#  2 of the License, or (at your option) any later version.
-+
-+PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+
-+include $(TOPDIR)/Rules.make
-+
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,4 @@
-+/* $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $ */
-+
-+#define VERSION		"2.4.4"
-+#define DATE		"28 June 2006"
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,909 @@
-+/*
-+ * pppd.h - PPP daemon global declarations.
-+ *
-+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name "Carnegie Mellon University" must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission. For permission or any legal
-+ *    details, please contact
-+ *      Office of Technology Transfer
-+ *      Carnegie Mellon University
-+ *      5000 Forbes Avenue
-+ *      Pittsburgh, PA  15213-3890
-+ *      (412) 268-4387, fax: (412) 268-7395
-+ *      tech-transfer@andrew.cmu.edu
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ *    acknowledgment:
-+ *    "This product includes software developed by Computing Services
-+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $
-+ */
-+
-+/*
-+ * TODO:
-+ */
-+
-+#ifndef __PPPD_H__
-+#define __PPPD_H__
-+
-+#include <stdio.h>		/* for FILE */
-+#include <limits.h>		/* for NGROUPS_MAX */
-+#include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
-+#include <sys/types.h>		/* for u_int32_t, if defined */
-+#include <sys/time.h>		/* for struct timeval */
-+#include <net/ppp_defs.h>
-+#include "patchlevel.h"
-+
-+#if defined(__STDC__)
-+#include <stdarg.h>
-+#define __V(x)	x
-+#else
-+#include <varargs.h>
-+#define __V(x)	(va_alist) va_dcl
-+#define const
-+#define volatile
-+#endif
-+
-+#ifdef INET6
-+#include "eui64.h"
-+#endif
-+
-+/*
-+ * Limits.
-+ */
-+
-+#define NUM_PPP		1	/* One PPP interface supported (per process) */
-+#define MAXWORDLEN	1024	/* max length of word in file (incl null) */
-+#define MAXARGS		1	/* max # args to a command */
-+#define MAXNAMELEN	256	/* max length of hostname or name for auth */
-+#define MAXSECRETLEN	256	/* max length of password or secret */
-+
-+/*
-+ * Option descriptor structure.
-+ */
-+
-+typedef unsigned char	bool;
-+
-+enum opt_type {
-+	o_special_noarg = 0,
-+	o_special = 1,
-+	o_bool,
-+	o_int,
-+	o_uint32,
-+	o_string,
-+	o_wild
-+};
-+
-+typedef struct {
-+	char	*name;		/* name of the option */
-+	enum opt_type type;
-+	void	*addr;
-+	char	*description;
-+	unsigned int flags;
-+	void	*addr2;
-+	int	upper_limit;
-+	int	lower_limit;
-+	const char *source;
-+	short int priority;
-+	short int winner;
-+} option_t;
-+
-+/* Values for flags */
-+#define OPT_VALUE	0xff	/* mask for presupplied value */
-+#define OPT_HEX		0x100	/* int option is in hex */
-+#define OPT_NOARG	0x200	/* option doesn't take argument */
-+#define OPT_OR		0x400	/* OR in argument to value */
-+#define OPT_INC		0x800	/* increment value */
-+#define OPT_A2OR	0x800	/* for o_bool, OR arg to *(u_char *)addr2 */
-+#define OPT_PRIV	0x1000	/* privileged option */
-+#define OPT_STATIC	0x2000	/* string option goes into static array */
-+#define OPT_LLIMIT	0x4000	/* check value against lower limit */
-+#define OPT_ULIMIT	0x8000	/* check value against upper limit */
-+#define OPT_LIMITS	(OPT_LLIMIT|OPT_ULIMIT)
-+#define OPT_ZEROOK	0x10000	/* 0 value is OK even if not within limits */
-+#define OPT_HIDE	0x10000	/* for o_string, print value as ?????? */
-+#define OPT_A2LIST	0x10000 /* for o_special, keep list of values */
-+#define OPT_A2CLRB	0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */
-+#define OPT_NOINCR	0x20000	/* value mustn't be increased */
-+#define OPT_ZEROINF	0x40000	/* with OPT_NOINCR, 0 == infinity */
-+#define OPT_PRIO	0x80000	/* process option priorities for this option */
-+#define OPT_PRIOSUB	0x100000 /* subsidiary member of priority group */
-+#define OPT_ALIAS	0x200000 /* option is alias for previous option */
-+#define OPT_A2COPY	0x400000 /* addr2 -> second location to rcv value */
-+#define OPT_ENABLE	0x800000 /* use *addr2 as enable for option */
-+#define OPT_A2CLR	0x1000000 /* clear *(bool *)addr2 */
-+#define OPT_PRIVFIX	0x2000000 /* user can't override if set by root */
-+#define OPT_INITONLY	0x4000000 /* option can only be set in init phase */
-+#define OPT_DEVEQUIV	0x8000000 /* equiv to device name */
-+#define OPT_DEVNAM	(OPT_INITONLY | OPT_DEVEQUIV)
-+#define OPT_A2PRINTER	0x10000000 /* *addr2 is a fn for printing option */
-+#define OPT_A2STRVAL	0x20000000 /* *addr2 points to current string value */
-+#define OPT_NOPRINT	0x40000000 /* don't print this option at all */
-+
-+#define OPT_VAL(x)	((x) & OPT_VALUE)
-+
-+/* Values for priority */
-+#define OPRIO_DEFAULT	0	/* a default value */
-+#define OPRIO_CFGFILE	1	/* value from a configuration file */
-+#define OPRIO_CMDLINE	2	/* value from the command line */
-+#define OPRIO_SECFILE	3	/* value from options in a secrets file */
-+#define OPRIO_ROOT	100	/* added to priority if OPT_PRIVFIX && root */
-+
-+#ifndef GIDSET_TYPE
-+#define GIDSET_TYPE	gid_t
-+#endif
-+
-+/* Structure representing a list of permitted IP addresses. */
-+struct permitted_ip {
-+    int		permit;		/* 1 = permit, 0 = forbid */
-+    u_int32_t	base;		/* match if (addr & mask) == base */
-+    u_int32_t	mask;		/* base and mask are in network byte order */
-+};
-+
-+/*
-+ * Unfortunately, the linux kernel driver uses a different structure
-+ * for statistics from the rest of the ports.
-+ * This structure serves as a common representation for the bits
-+ * pppd needs.
-+ */
-+struct pppd_stats {
-+    unsigned int	bytes_in;
-+    unsigned int	bytes_out;
-+    unsigned int	pkts_in;
-+    unsigned int	pkts_out;
-+};
-+
-+/* Used for storing a sequence of words.  Usually malloced. */
-+struct wordlist {
-+    struct wordlist	*next;
-+    char		*word;
-+};
-+
-+/* An endpoint discriminator, used with multilink. */
-+#define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
-+struct epdisc {
-+    unsigned char	class;
-+    unsigned char	length;
-+    unsigned char	value[MAX_ENDP_LEN];
-+};
-+
-+/* values for epdisc.class */
-+#define EPD_NULL	0	/* null discriminator, no data */
-+#define EPD_LOCAL	1
-+#define EPD_IP		2
-+#define EPD_MAC		3
-+#define EPD_MAGIC	4
-+#define EPD_PHONENUM	5
-+
-+typedef void (*notify_func) __P((void *, int));
-+
-+struct notifier {
-+    struct notifier *next;
-+    notify_func	    func;
-+    void	    *arg;
-+};
-+
-+/*
-+ * Global variables.
-+ */
-+
-+extern int	hungup;		/* Physical layer has disconnected */
-+extern int	ifunit;		/* Interface unit number */
-+extern char	ifname[];	/* Interface name */
-+extern char	hostname[];	/* Our hostname */
-+extern u_char	outpacket_buf[]; /* Buffer for outgoing packets */
-+extern int	devfd;		/* fd of underlying device */
-+extern int	fd_ppp;		/* fd for talking PPP */
-+extern int	phase;		/* Current state of link - see values below */
-+extern int	baud_rate;	/* Current link speed in bits/sec */
-+extern char	*progname;	/* Name of this program */
-+extern int	redirect_stderr;/* Connector's stderr should go to file */
-+extern char	peer_authname[];/* Authenticated name of peer */
-+extern int	auth_done[NUM_PPP]; /* Methods actually used for auth */
-+extern int	privileged;	/* We were run by real-uid root */
-+extern int	need_holdoff;	/* Need holdoff period after link terminates */
-+extern char	**script_env;	/* Environment variables for scripts */
-+extern int	detached;	/* Have detached from controlling tty */
-+extern GIDSET_TYPE groups[NGROUPS_MAX];	/* groups the user is in */
-+extern int	ngroups;	/* How many groups valid in groups */
-+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
-+extern int	link_stats_valid; /* set if link_stats is valid */
-+extern unsigned	link_connect_time; /* time the link was up for */
-+extern int	using_pty;	/* using pty as device (notty or pty opt.) */
-+extern int	log_to_fd;	/* logging to this fd as well as syslog */
-+extern bool	log_default;	/* log_to_fd is default (stdout) */
-+extern char	*no_ppp_msg;	/* message to print if ppp not in kernel */
-+extern volatile int status;	/* exit status for pppd */
-+extern bool	devnam_fixed;	/* can no longer change devnam */
-+extern int	unsuccess;	/* # unsuccessful connection attempts */
-+extern int	do_callback;	/* set if we want to do callback next */
-+extern int	doing_callback;	/* set if this is a callback */
-+extern int	error_count;	/* # of times error() has been called */
-+extern char	ppp_devnam[MAXPATHLEN];
-+extern char     remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
-+extern int      ppp_session_number; /* Session number (eg PPPoE session) */
-+extern int	fd_devnull;	/* fd open to /dev/null */
-+
-+extern int	listen_time;	/* time to listen first (ms) */
-+extern bool	doing_multilink;
-+extern bool	multilink_master;
-+extern bool	bundle_eof;
-+extern bool	bundle_terminating;
-+
-+extern struct notifier *pidchange;   /* for notifications of pid changing */
-+extern struct notifier *phasechange; /* for notifications of phase changes */
-+extern struct notifier *exitnotify;  /* for notification that we're exiting */
-+extern struct notifier *sigreceived; /* notification of received signal */
-+extern struct notifier *ip_up_notifier; /* IPCP has come up */
-+extern struct notifier *ip_down_notifier; /* IPCP has gone down */
-+extern struct notifier *auth_up_notifier; /* peer has authenticated */
-+extern struct notifier *link_down_notifier; /* link has gone down */
-+extern struct notifier *fork_notifier;	/* we are a new child process */
-+
-+/* Values for do_callback and doing_callback */
-+#define CALLBACK_DIALIN		1	/* we are expecting the call back */
-+#define CALLBACK_DIALOUT	2	/* we are dialling out to call back */
-+
-+/*
-+ * Variables set by command-line options.
-+ */
-+
-+extern int	debug;		/* Debug flag */
-+extern int	kdebugflag;	/* Tell kernel to print debug messages */
-+extern int	default_device;	/* Using /dev/tty or equivalent */
-+extern char	devnam[MAXPATHLEN];	/* Device name */
-+extern int	crtscts;	/* Use hardware flow control */
-+extern bool	modem;		/* Use modem control lines */
-+extern int	inspeed;	/* Input/Output speed requested */
-+extern u_int32_t netmask;	/* IP netmask to set on interface */
-+extern bool	lockflag;	/* Create lock file to lock the serial dev */
-+extern bool	nodetach;	/* Don't detach from controlling tty */
-+extern bool	updetach;	/* Detach from controlling tty when link up */
-+extern char	*initializer;	/* Script to initialize physical link */
-+extern char	*connect_script; /* Script to establish physical link */
-+extern char	*disconnect_script; /* Script to disestablish physical link */
-+extern char	*welcomer;	/* Script to welcome client after connection */
-+extern char	*ptycommand;	/* Command to run on other side of pty */
-+extern int	maxconnect;	/* Maximum connect time (seconds) */
-+extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
-+extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
-+extern bool	auth_required;	/* Peer is required to authenticate */
-+extern bool	persist;	/* Reopen link after it goes down */
-+extern bool	uselogin;	/* Use /etc/passwd for checking PAP */
-+extern char	our_name[MAXNAMELEN];/* Our name for authentication purposes */
-+extern char	remote_name[MAXNAMELEN]; /* Peer's name for authentication */
-+extern bool	explicit_remote;/* remote_name specified with remotename opt */
-+extern bool	demand;		/* Do dial-on-demand */
-+extern char	*ipparam;	/* Extra parameter for ip up/down scripts */
-+extern bool	cryptpap;	/* Others' PAP passwords are encrypted */
-+extern int	idle_time_limit;/* Shut down link if idle for this long */
-+extern int	holdoff;	/* Dead time before restarting */
-+extern bool	holdoff_specified; /* true if user gave a holdoff value */
-+extern bool	notty;		/* Stdin/out is not a tty */
-+extern char	*pty_socket;	/* Socket to connect to pty */
-+extern char	*record_file;	/* File to record chars sent/received */
-+extern bool	sync_serial;	/* Device is synchronous serial device */
-+extern int	maxfail;	/* Max # of unsuccessful connection attempts */
-+extern char	linkname[MAXPATHLEN]; /* logical name for link */
-+extern bool	tune_kernel;	/* May alter kernel settings as necessary */
-+extern int	connect_delay;	/* Time to delay after connect script */
-+extern int	max_data_rate;	/* max bytes/sec through charshunt */
-+extern int	req_unit;	/* interface unit number to use */
-+extern char	path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
-+extern char	path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */
-+extern bool	multilink;	/* enable multilink operation */
-+extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
-+extern char	*bundle_name;	/* bundle name for multilink */
-+extern bool	dump_options;	/* print out option values */
-+extern bool	dryrun;		/* check everything, print options, exit */
-+extern int	child_wait;	/* # seconds to wait for children at end */
-+
-+#ifdef MAXOCTETS
-+extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
-+extern int       maxoctets_dir;      /* Direction :
-+				      0 - in+out (default)
-+				      1 - in 
-+				      2 - out
-+				      3 - max(in,out) */
-+extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
-+#define PPP_OCTETS_DIRECTION_SUM        0
-+#define PPP_OCTETS_DIRECTION_IN         1
-+#define PPP_OCTETS_DIRECTION_OUT        2
-+#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
-+/* same as previos, but little different on RADIUS side */
-+#define PPP_OCTETS_DIRECTION_MAXSESSION 4	
-+#endif
-+
-+#ifdef PPP_FILTER
-+extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
-+extern struct	bpf_program active_filter; /* Filter for link-active pkts */
-+#endif
-+
-+#ifdef MSLANMAN
-+extern bool	ms_lanman;	/* Use LanMan password instead of NT */
-+				/* Has meaning only with MS-CHAP challenges */
-+#endif
-+
-+/* Values for auth_pending, auth_done */
-+#define PAP_WITHPEER	0x1
-+#define PAP_PEER	0x2
-+#define CHAP_WITHPEER	0x4
-+#define CHAP_PEER	0x8
-+#define EAP_WITHPEER	0x10
-+#define EAP_PEER	0x20
-+
-+/* Values for auth_done only */
-+#define CHAP_MD5_WITHPEER	0x40
-+#define CHAP_MD5_PEER		0x80
-+#define CHAP_MS_SHIFT		8	/* LSB position for MS auths */
-+#define CHAP_MS_WITHPEER	0x100
-+#define CHAP_MS_PEER		0x200
-+#define CHAP_MS2_WITHPEER	0x400
-+#define CHAP_MS2_PEER		0x800
-+
-+extern char *current_option;	/* the name of the option being parsed */
-+extern int  privileged_option;	/* set iff the current option came from root */
-+extern char *option_source;	/* string saying where the option came from */
-+extern int  option_priority;	/* priority of current options */
-+
-+/*
-+ * Values for phase.
-+ */
-+#define PHASE_DEAD		0
-+#define PHASE_INITIALIZE	1
-+#define PHASE_SERIALCONN	2
-+#define PHASE_DORMANT		3
-+#define PHASE_ESTABLISH		4
-+#define PHASE_AUTHENTICATE	5
-+#define PHASE_CALLBACK		6
-+#define PHASE_NETWORK		7
-+#define PHASE_RUNNING		8
-+#define PHASE_TERMINATE		9
-+#define PHASE_DISCONNECT	10
-+#define PHASE_HOLDOFF		11
-+#define PHASE_MASTER		12
-+
-+/*
-+ * The following struct gives the addresses of procedures to call
-+ * for a particular protocol.
-+ */
-+struct protent {
-+    u_short protocol;		/* PPP protocol number */
-+    /* Initialization procedure */
-+    void (*init) __P((int unit));
-+    /* Process a received packet */
-+    void (*input) __P((int unit, u_char *pkt, int len));
-+    /* Process a received protocol-reject */
-+    void (*protrej) __P((int unit));
-+    /* Lower layer has come up */
-+    void (*lowerup) __P((int unit));
-+    /* Lower layer has gone down */
-+    void (*lowerdown) __P((int unit));
-+    /* Open the protocol */
-+    void (*open) __P((int unit));
-+    /* Close the protocol */
-+    void (*close) __P((int unit, char *reason));
-+    /* Print a packet in readable form */
-+    int  (*printpkt) __P((u_char *pkt, int len,
-+			  void (*printer) __P((void *, char *, ...)),
-+			  void *arg));
-+    /* Process a received data packet */
-+    void (*datainput) __P((int unit, u_char *pkt, int len));
-+    bool enabled_flag;		/* 0 iff protocol is disabled */
-+    char *name;			/* Text name of protocol */
-+    char *data_name;		/* Text name of corresponding data protocol */
-+    option_t *options;		/* List of command-line options */
-+    /* Check requested options, assign defaults */
-+    void (*check_options) __P((void));
-+    /* Configure interface for demand-dial */
-+    int  (*demand_conf) __P((int unit));
-+    /* Say whether to bring up link for this pkt */
-+    int  (*active_pkt) __P((u_char *pkt, int len));
-+};
-+
-+/* Table of pointers to supported protocols */
-+extern struct protent *protocols[];
-+
-+/*
-+ * This struct contains pointers to a set of procedures for
-+ * doing operations on a "channel".  A channel provides a way
-+ * to send and receive PPP packets - the canonical example is
-+ * a serial port device in PPP line discipline (or equivalently
-+ * with PPP STREAMS modules pushed onto it).
-+ */
-+struct channel {
-+	/* set of options for this channel */
-+	option_t *options;
-+	/* find and process a per-channel options file */
-+	void (*process_extra_options) __P((void));
-+	/* check all the options that have been given */
-+	void (*check_options) __P((void));
-+	/* get the channel ready to do PPP, return a file descriptor */
-+	int  (*connect) __P((void));
-+	/* we're finished with the channel */
-+	void (*disconnect) __P((void));
-+	/* put the channel into PPP `mode' */
-+	int  (*establish_ppp) __P((int));
-+	/* take the channel out of PPP `mode', restore loopback if demand */
-+	void (*disestablish_ppp) __P((int));
-+	/* set the transmit-side PPP parameters of the channel */
-+	void (*send_config) __P((int, u_int32_t, int, int));
-+	/* set the receive-side PPP parameters of the channel */
-+	void (*recv_config) __P((int, u_int32_t, int, int));
-+	/* cleanup on error or normal exit */
-+	void (*cleanup) __P((void));
-+	/* close the device, called in children after fork */
-+	void (*close) __P((void));
-+};
-+
-+extern struct channel *the_channel;
-+
-+/*
-+ * Prototypes.
-+ */
-+
-+/* Procedures exported from main.c. */
-+void set_ifunit __P((int));	/* set stuff that depends on ifunit */
-+void detach __P((void));	/* Detach from controlling tty */
-+void die __P((int));		/* Cleanup and exit */
-+void quit __P((void));		/* like die(1) */
-+void novm __P((char *));	/* Say we ran out of memory, and die */
-+void timeout __P((void (*func)(void *), void *arg, int s, int us));
-+				/* Call func(arg) after s.us seconds */
-+void untimeout __P((void (*func)(void *), void *arg));
-+				/* Cancel call to func(arg) */
-+void record_child __P((int, char *, void (*) (void *), void *));
-+pid_t safe_fork __P((int, int, int));	/* Fork & close stuff in child */
-+int  device_script __P((char *cmd, int in, int out, int dont_wait));
-+				/* Run `cmd' with given stdin and stdout */
-+pid_t run_program __P((char *prog, char **args, int must_exist,
-+		       void (*done)(void *), void *arg, int wait));
-+				/* Run program prog with args in child */
-+void reopen_log __P((void));	/* (re)open the connection to syslog */
-+void print_link_stats __P((void)); /* Print stats, if available */
-+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */
-+void update_link_stats __P((int)); /* Get stats at link termination */
-+void script_setenv __P((char *, char *, int));	/* set script env var */
-+void script_unsetenv __P((char *));		/* unset script env var */
-+void new_phase __P((int));	/* signal start of new phase */
-+void add_notifier __P((struct notifier **, notify_func, void *));
-+void remove_notifier __P((struct notifier **, notify_func, void *));
-+void notify __P((struct notifier *, int));
-+int  ppp_send_config __P((int, int, u_int32_t, int, int));
-+int  ppp_recv_config __P((int, int, u_int32_t, int, int));
-+const char *protocol_name __P((int));
-+void remove_pidfiles __P((void));
-+void lock_db __P((void));
-+void unlock_db __P((void));
-+
-+/* Procedures exported from tty.c. */
-+void tty_init __P((void));
-+
-+/* Procedures exported from utils.c. */
-+void log_packet __P((u_char *, int, char *, int));
-+				/* Format a packet and log it with syslog */
-+void print_string __P((char *, int,  void (*) (void *, char *, ...),
-+		void *));	/* Format a string for output */
-+int slprintf __P((char *, int, char *, ...));		/* sprintf++ */
-+int vslprintf __P((char *, int, char *, va_list));	/* vsprintf++ */
-+size_t strlcpy __P((char *, const char *, size_t));	/* safe strcpy */
-+size_t strlcat __P((char *, const char *, size_t));	/* safe strncpy */
-+void dbglog __P((char *, ...));	/* log a debug message */
-+void info __P((char *, ...));	/* log an informational message */
-+void notice __P((char *, ...));	/* log a notice-level message */
-+void warn __P((char *, ...));	/* log a warning message */
-+void error __P((char *, ...));	/* log an error message */
-+void fatal __P((char *, ...));	/* log an error message and die(1) */
-+void init_pr_log __P((char *, int));	/* initialize for using pr_log */
-+void pr_log __P((void *, char *, ...));	/* printer fn, output to syslog */
-+void end_pr_log __P((void));	/* finish up after using pr_log */
-+void dump_packet __P((const char *, u_char *, int));
-+				/* dump packet to debug log if interesting */
-+ssize_t complete_read __P((int, void *, size_t));
-+				/* read a complete buffer */
-+
-+/* Procedures exported from auth.c */
-+void link_required __P((int));	  /* we are starting to use the link */
-+void start_link __P((int));	  /* bring the link up now */
-+void link_terminated __P((int));  /* we are finished with the link */
-+void link_down __P((int));	  /* the LCP layer has left the Opened state */
-+void upper_layers_down __P((int));/* take all NCPs down */
-+void link_established __P((int)); /* the link is up; authenticate now */
-+void start_networks __P((int));   /* start all the network control protos */
-+void continue_networks __P((int)); /* start network [ip, etc] control protos */
-+void np_up __P((int, int));	  /* a network protocol has come up */
-+void np_down __P((int, int));	  /* a network protocol has gone down */
-+void np_finished __P((int, int)); /* a network protocol no longer needs link */
-+void auth_peer_fail __P((int, int));
-+				/* peer failed to authenticate itself */
-+void auth_peer_success __P((int, int, int, char *, int));
-+				/* peer successfully authenticated itself */
-+void auth_withpeer_fail __P((int, int));
-+				/* we failed to authenticate ourselves */
-+void auth_withpeer_success __P((int, int, int));
-+				/* we successfully authenticated ourselves */
-+void auth_check_options __P((void));
-+				/* check authentication options supplied */
-+void auth_reset __P((int));	/* check what secrets we have */
-+int  check_passwd __P((int, char *, int, char *, int, char **));
-+				/* Check peer-supplied username/password */
-+int  get_secret __P((int, char *, char *, char *, int *, int));
-+				/* get "secret" for chap */
-+int  get_srp_secret __P((int unit, char *client, char *server, char *secret,
-+    int am_server));
-+int  auth_ip_addr __P((int, u_int32_t));
-+				/* check if IP address is authorized */
-+int  auth_number __P((void));	/* check if remote number is authorized */
-+int  bad_ip_adrs __P((u_int32_t));
-+				/* check if IP address is unreasonable */
-+
-+/* Procedures exported from demand.c */
-+void demand_conf __P((void));	/* config interface(s) for demand-dial */
-+void demand_block __P((void));	/* set all NPs to queue up packets */
-+void demand_unblock __P((void)); /* set all NPs to pass packets */
-+void demand_discard __P((void)); /* set all NPs to discard packets */
-+void demand_rexmit __P((int, u_int32_t)); /* retransmit saved frames for an NP*/
-+int  loop_chars __P((unsigned char *, int)); /* process chars from loopback */
-+int  loop_frame __P((unsigned char *, int)); /* should we bring link up? */
-+
-+/* Procedures exported from multilink.c */
-+#ifdef HAVE_MULTILINK
-+void mp_check_options __P((void)); /* Check multilink-related options */
-+int  mp_join_bundle __P((void));  /* join our link to an appropriate bundle */
-+void mp_exit_bundle __P((void));  /* have disconnected our link from bundle */
-+void mp_bundle_terminated __P((void));
-+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */
-+int  str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */
-+#else
-+#define mp_bundle_terminated()	/* nothing */
-+#define mp_exit_bundle()	/* nothing */
-+#define doing_multilink		0
-+#define multilink_master	0
-+#endif
-+
-+/* Procedures exported from sys-*.c */
-+void sys_init __P((void));	/* Do system-dependent initialization */
-+void sys_cleanup __P((void));	/* Restore system state before exiting */
-+int  sys_check_options __P((void)); /* Check options specified */
-+void sys_close __P((void));	/* Clean up in a child before execing */
-+int  ppp_available __P((void));	/* Test whether ppp kernel support exists */
-+int  get_pty __P((int *, int *, char *, int));	/* Get pty master/slave */
-+int  open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
-+int  tty_establish_ppp __P((int));  /* Turn serial port into a ppp interface */
-+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
-+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
-+int  generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
-+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
-+int  bundle_attach __P((int));	/* Attach link to existing bundle */
-+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
-+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */
-+void clean_check __P((void));	/* Check if line was 8-bit clean */
-+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
-+void restore_tty __P((int));	/* Restore port's original parameters */
-+void setdtr __P((int, int));	/* Raise or lower port's DTR line */
-+void output __P((int, u_char *, int)); /* Output a PPP packet */
-+void wait_input __P((struct timeval *));
-+				/* Wait for input, with timeout */
-+void add_fd __P((int));		/* Add fd to set to wait for */
-+void remove_fd __P((int));	/* Remove fd from set to wait for */
-+int  read_packet __P((u_char *)); /* Read PPP packet */
-+int  get_loop_output __P((void)); /* Read pkts from loopback */
-+void tty_send_config __P((int, u_int32_t, int, int));
-+				/* Configure i/f transmit parameters */
-+void tty_set_xaccm __P((ext_accm));
-+				/* Set extended transmit ACCM */
-+void tty_recv_config __P((int, u_int32_t, int, int));
-+				/* Configure i/f receive parameters */
-+int  ccp_test __P((int, u_char *, int, int));
-+				/* Test support for compression scheme */
-+void ccp_flags_set __P((int, int, int));
-+				/* Set kernel CCP state */
-+int  ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
-+int  get_idle_time __P((int, struct ppp_idle *));
-+				/* Find out how long link has been idle */
-+int  get_ppp_stats __P((int, struct pppd_stats *));
-+				/* Return link statistics */
-+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
-+int  netif_get_mtu __P((int));      /* Get PPP interface MTU */
-+int  sifvjcomp __P((int, int, int, int));
-+				/* Configure VJ TCP header compression */
-+int  sifup __P((int));		/* Configure i/f up for one protocol */
-+int  sifnpmode __P((int u, int proto, enum NPmode mode));
-+				/* Set mode for handling packets for proto */
-+int  sifdown __P((int));	/* Configure i/f down for one protocol */
-+int  sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
-+				/* Configure IPv4 addresses for i/f */
-+int  cifaddr __P((int, u_int32_t, u_int32_t));
-+				/* Reset i/f IP addresses */
-+#ifdef INET6
-+int  sif6addr __P((int, eui64_t, eui64_t));
-+				/* Configure IPv6 addresses for i/f */
-+int  cif6addr __P((int, eui64_t, eui64_t));
-+				/* Remove an IPv6 address from i/f */
-+#endif
-+int  sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt));
-+				/* Create default route through i/f */
-+int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
-+				/* Delete default route through i/f */
-+int  sifproxyarp __P((int, u_int32_t));
-+				/* Add proxy ARP entry for peer */
-+int  cifproxyarp __P((int, u_int32_t));
-+				/* Delete proxy ARP entry for peer */
-+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
-+int  lock __P((char *));	/* Create lock file for device */
-+int  relock __P((int));		/* Rewrite lock file with new pid */
-+void unlock __P((void));	/* Delete previously-created lock file */
-+void logwtmp __P((const char *, const char *, const char *));
-+				/* Write entry to wtmp file */
-+int  get_host_seed __P((void));	/* Get host-dependent random number seed */
-+int  have_route_to __P((u_int32_t)); /* Check if route to addr exists */
-+#ifdef PPP_FILTER
-+int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
-+				/* Set filter programs in kernel */
-+#endif
-+#ifdef IPX_CHANGE
-+int  sipxfaddr __P((int, unsigned long, unsigned char *));
-+int  cipxfaddr __P((int));
-+#endif
-+int  get_if_hwaddr __P((u_char *addr, char *name));
-+char *get_first_ethernet __P((void));
-+
-+/* Procedures exported from options.c */
-+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
-+int  parse_args __P((int argc, char **argv));
-+				/* Parse options from arguments given */
-+int  options_from_file __P((char *filename, int must_exist, int check_prot,
-+			    int privileged));
-+				/* Parse options from an options file */
-+int  options_from_user __P((void)); /* Parse options from user's .ppprc */
-+int  options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
-+int  options_from_list __P((struct wordlist *, int privileged));
-+				/* Parse options from a wordlist */
-+int  getword __P((FILE *f, char *word, int *newlinep, char *filename));
-+				/* Read a word from a file */
-+void option_error __P((char *fmt, ...));
-+				/* Print an error message about an option */
-+int int_option __P((char *, int *));
-+				/* Simplified number_option for decimal ints */
-+void add_options __P((option_t *)); /* Add extra options */
-+void check_options __P((void));	/* check values after all options parsed */
-+int  override_value __P((const char *, int, const char *));
-+				/* override value if permitted by priority */
-+void print_options __P((void (*) __P((void *, char *, ...)), void *));
-+				/* print out values of all options */
-+
-+int parse_dotted_ip __P((char *, u_int32_t *));
-+
-+/*
-+ * Hooks to enable plugins to change various things.
-+ */
-+extern int (*new_phase_hook) __P((int));
-+extern int (*idle_time_hook) __P((struct ppp_idle *));
-+extern int (*holdoff_hook) __P((void));
-+extern int (*pap_check_hook) __P((void));
-+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
-+				 struct wordlist **paddrs,
-+				 struct wordlist **popts));
-+extern void (*pap_logout_hook) __P((void));
-+extern int (*pap_passwd_hook) __P((char *user, char *passwd));
-+extern int (*allowed_address_hook) __P((u_int32_t addr));
-+extern void (*ip_up_hook) __P((void));
-+extern void (*ip_down_hook) __P((void));
-+extern void (*ip_choose_hook) __P((u_int32_t *));
-+
-+extern int (*chap_check_hook) __P((void));
-+extern int (*chap_passwd_hook) __P((char *user, char *passwd));
-+
-+/* Let a plugin snoop sent and received packets.  Useful for L2TP */
-+extern void (*snoop_recv_hook) __P((unsigned char *p, int len));
-+extern void (*snoop_send_hook) __P((unsigned char *p, int len));
-+
-+/*
-+ * Inline versions of get/put char/short/long.
-+ * Pointer is advanced; we assume that both arguments
-+ * are lvalues and will already be in registers.
-+ * cp MUST be u_char *.
-+ */
-+#define GETCHAR(c, cp) { \
-+	(c) = *(cp)++; \
-+}
-+#define PUTCHAR(c, cp) { \
-+	*(cp)++ = (u_char) (c); \
-+}
-+
-+
-+#define GETSHORT(s, cp) { \
-+	(s) = *(cp)++ << 8; \
-+	(s) |= *(cp)++; \
-+}
-+#define PUTSHORT(s, cp) { \
-+	*(cp)++ = (u_char) ((s) >> 8); \
-+	*(cp)++ = (u_char) (s); \
-+}
-+
-+#define GETLONG(l, cp) { \
-+	(l) = *(cp)++ << 8; \
-+	(l) |= *(cp)++; (l) <<= 8; \
-+	(l) |= *(cp)++; (l) <<= 8; \
-+	(l) |= *(cp)++; \
-+}
-+#define PUTLONG(l, cp) { \
-+	*(cp)++ = (u_char) ((l) >> 24); \
-+	*(cp)++ = (u_char) ((l) >> 16); \
-+	*(cp)++ = (u_char) ((l) >> 8); \
-+	*(cp)++ = (u_char) (l); \
-+}
-+
-+#define INCPTR(n, cp)	((cp) += (n))
-+#define DECPTR(n, cp)	((cp) -= (n))
-+
-+/*
-+ * System dependent definitions for user-level 4.3BSD UNIX implementation.
-+ */
-+
-+#define TIMEOUT(r, f, t)	timeout((r), (f), (t), 0)
-+#define UNTIMEOUT(r, f)		untimeout((r), (f))
-+
-+#define BCOPY(s, d, l)		memcpy(d, s, l)
-+#define BZERO(s, n)		memset(s, 0, n)
-+#define	BCMP(s1, s2, l)		memcmp(s1, s2, l)
-+
-+#define PRINTMSG(m, l)		{ info("Remote message: %0.*v", l, m); }
-+
-+/*
-+ * MAKEHEADER - Add Header fields to a packet.
-+ */
-+#define MAKEHEADER(p, t) { \
-+    PUTCHAR(PPP_ALLSTATIONS, p); \
-+    PUTCHAR(PPP_UI, p); \
-+    PUTSHORT(t, p); }
-+
-+/*
-+ * Exit status values.
-+ */
-+#define EXIT_OK			0
-+#define EXIT_FATAL_ERROR	1
-+#define EXIT_OPTION_ERROR	2
-+#define EXIT_NOT_ROOT		3
-+#define EXIT_NO_KERNEL_SUPPORT	4
-+#define EXIT_USER_REQUEST	5
-+#define EXIT_LOCK_FAILED	6
-+#define EXIT_OPEN_FAILED	7
-+#define EXIT_CONNECT_FAILED	8
-+#define EXIT_PTYCMD_FAILED	9
-+#define EXIT_NEGOTIATION_FAILED	10
-+#define EXIT_PEER_AUTH_FAILED	11
-+#define EXIT_IDLE_TIMEOUT	12
-+#define EXIT_CONNECT_TIME	13
-+#define EXIT_CALLBACK		14
-+#define EXIT_PEER_DEAD		15
-+#define EXIT_HANGUP		16
-+#define EXIT_LOOPBACK		17
-+#define EXIT_INIT_FAILED	18
-+#define EXIT_AUTH_TOPEER_FAILED	19
-+#ifdef MAXOCTETS
-+#define EXIT_TRAFFIC_LIMIT	20
-+#endif
-+#define EXIT_CNID_AUTH_FAILED	21
-+
-+/*
-+ * Debug macros.  Slightly useful for finding bugs in pppd, not particularly
-+ * useful for finding out why your connection isn't being established.
-+ */
-+#ifdef DEBUGALL
-+#define DEBUGMAIN	1
-+#define DEBUGFSM	1
-+#define DEBUGLCP	1
-+#define DEBUGIPCP	1
-+#define DEBUGIPV6CP	1
-+#define DEBUGUPAP	1
-+#define DEBUGCHAP	1
-+#endif
-+
-+#ifndef LOG_PPP			/* we use LOG_LOCAL2 for syslog by default */
-+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
-+  || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
-+  || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
-+#define LOG_PPP LOG_LOCAL2
-+#else
-+#define LOG_PPP LOG_LOCAL2
-+#endif
-+#endif /* LOG_PPP */
-+
-+#ifdef DEBUGMAIN
-+#define MAINDEBUG(x)	if (debug) dbglog x
-+#else
-+#define MAINDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGSYS
-+#define SYSDEBUG(x)	if (debug) dbglog x
-+#else
-+#define SYSDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGFSM
-+#define FSMDEBUG(x)	if (debug) dbglog x
-+#else
-+#define FSMDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGLCP
-+#define LCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define LCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPCP
-+#define IPCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define IPCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPV6CP
-+#define IPV6CPDEBUG(x)  if (debug) dbglog x
-+#else
-+#define IPV6CPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGUPAP
-+#define UPAPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define UPAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGCHAP
-+#define CHAPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define CHAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPXCP
-+#define IPXCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define IPXCPDEBUG(x)
-+#endif
-+
-+#ifndef SIGTYPE
-+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE)
-+#define SIGTYPE void
-+#else
-+#define SIGTYPE int
-+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */
-+#endif /* SIGTYPE */
-+
-+#ifndef MIN
-+#define MIN(a, b)	((a) < (b)? (a): (b))
-+#endif
-+#ifndef MAX
-+#define MAX(a, b)	((a) > (b)? (a): (b))
-+#endif
-+
-+#ifndef offsetof
-+#define offsetof(type, member) ((size_t) &((type *)0)->member)
-+#endif
-+
-+#endif /* __PPP_H__ */
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/Makefile capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/Makefile
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/Makefile	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,14 @@
-+# Makefile for the capiplugin for pppd(8).
-+#
-+# Copyright 2000 Carsten Paeth (calle@calle.in-berlin.de)
-+# Copyright 2000 AVM GmbH Berlin (info@avm.de)
-+#
-+#  This program is free software; you can redistribute it and/or
-+#  modify it under the terms of the GNU General Public License
-+#  as published by the Free Software Foundation; either version
-+#  2 of the License, or (at your option) any later version.
-+
-+PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
-+
-+include $(TOPDIR)/Rules.make
-+
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,4 @@
-+/* $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $ */
-+
-+#define VERSION		"2.4.4b1"
-+#define DATE		"5 December 2005"
-diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h
---- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h	2006-12-30 16:14:35.000000000 +0100
-@@ -0,0 +1,905 @@
-+/*
-+ * pppd.h - PPP daemon global declarations.
-+ *
-+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name "Carnegie Mellon University" must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission. For permission or any legal
-+ *    details, please contact
-+ *      Office of Technology Transfer
-+ *      Carnegie Mellon University
-+ *      5000 Forbes Avenue
-+ *      Pittsburgh, PA  15213-3890
-+ *      (412) 268-4387, fax: (412) 268-7395
-+ *      tech-transfer@andrew.cmu.edu
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ *    acknowledgment:
-+ *    "This product includes software developed by Computing Services
-+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $
-+ */
-+
-+/*
-+ * TODO:
-+ */
-+
-+#ifndef __PPPD_H__
-+#define __PPPD_H__
-+
-+#include <stdio.h>		/* for FILE */
-+#include <limits.h>		/* for NGROUPS_MAX */
-+#include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
-+#include <sys/types.h>		/* for u_int32_t, if defined */
-+#include <sys/time.h>		/* for struct timeval */
-+#include <net/ppp_defs.h>
-+#include "patchlevel.h"
-+
-+#if defined(__STDC__)
-+#include <stdarg.h>
-+#define __V(x)	x
-+#else
-+#include <varargs.h>
-+#define __V(x)	(va_alist) va_dcl
-+#define const
-+#define volatile
-+#endif
-+
-+#ifdef INET6
-+#include "eui64.h"
-+#endif
-+
-+/*
-+ * Limits.
-+ */
-+
-+#define NUM_PPP		1	/* One PPP interface supported (per process) */
-+#define MAXWORDLEN	1024	/* max length of word in file (incl null) */
-+#define MAXARGS		1	/* max # args to a command */
-+#define MAXNAMELEN	256	/* max length of hostname or name for auth */
-+#define MAXSECRETLEN	256	/* max length of password or secret */
-+
-+/*
-+ * Option descriptor structure.
-+ */
-+
-+typedef unsigned char	bool;
-+
-+enum opt_type {
-+	o_special_noarg = 0,
-+	o_special = 1,
-+	o_bool,
-+	o_int,
-+	o_uint32,
-+	o_string,
-+	o_wild
-+};
-+
-+typedef struct {
-+	char	*name;		/* name of the option */
-+	enum opt_type type;
-+	void	*addr;
-+	char	*description;
-+	unsigned int flags;
-+	void	*addr2;
-+	int	upper_limit;
-+	int	lower_limit;
-+	const char *source;
-+	short int priority;
-+	short int winner;
-+} option_t;
-+
-+/* Values for flags */
-+#define OPT_VALUE	0xff	/* mask for presupplied value */
-+#define OPT_HEX		0x100	/* int option is in hex */
-+#define OPT_NOARG	0x200	/* option doesn't take argument */
-+#define OPT_OR		0x400	/* OR in argument to value */
-+#define OPT_INC		0x800	/* increment value */
-+#define OPT_A2OR	0x800	/* for o_bool, OR arg to *(u_char *)addr2 */
-+#define OPT_PRIV	0x1000	/* privileged option */
-+#define OPT_STATIC	0x2000	/* string option goes into static array */
-+#define OPT_LLIMIT	0x4000	/* check value against lower limit */
-+#define OPT_ULIMIT	0x8000	/* check value against upper limit */
-+#define OPT_LIMITS	(OPT_LLIMIT|OPT_ULIMIT)
-+#define OPT_ZEROOK	0x10000	/* 0 value is OK even if not within limits */
-+#define OPT_HIDE	0x10000	/* for o_string, print value as ?????? */
-+#define OPT_A2LIST	0x10000 /* for o_special, keep list of values */
-+#define OPT_A2CLRB	0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */
-+#define OPT_NOINCR	0x20000	/* value mustn't be increased */
-+#define OPT_ZEROINF	0x40000	/* with OPT_NOINCR, 0 == infinity */
-+#define OPT_PRIO	0x80000	/* process option priorities for this option */
-+#define OPT_PRIOSUB	0x100000 /* subsidiary member of priority group */
-+#define OPT_ALIAS	0x200000 /* option is alias for previous option */
-+#define OPT_A2COPY	0x400000 /* addr2 -> second location to rcv value */
-+#define OPT_ENABLE	0x800000 /* use *addr2 as enable for option */
-+#define OPT_A2CLR	0x1000000 /* clear *(bool *)addr2 */
-+#define OPT_PRIVFIX	0x2000000 /* user can't override if set by root */
-+#define OPT_INITONLY	0x4000000 /* option can only be set in init phase */
-+#define OPT_DEVEQUIV	0x8000000 /* equiv to device name */
-+#define OPT_DEVNAM	(OPT_INITONLY | OPT_DEVEQUIV)
-+#define OPT_A2PRINTER	0x10000000 /* *addr2 is a fn for printing option */
-+#define OPT_A2STRVAL	0x20000000 /* *addr2 points to current string value */
-+#define OPT_NOPRINT	0x40000000 /* don't print this option at all */
-+
-+#define OPT_VAL(x)	((x) & OPT_VALUE)
-+
-+/* Values for priority */
-+#define OPRIO_DEFAULT	0	/* a default value */
-+#define OPRIO_CFGFILE	1	/* value from a configuration file */
-+#define OPRIO_CMDLINE	2	/* value from the command line */
-+#define OPRIO_SECFILE	3	/* value from options in a secrets file */
-+#define OPRIO_ROOT	100	/* added to priority if OPT_PRIVFIX && root */
-+
-+#ifndef GIDSET_TYPE
-+#define GIDSET_TYPE	gid_t
-+#endif
-+
-+/* Structure representing a list of permitted IP addresses. */
-+struct permitted_ip {
-+    int		permit;		/* 1 = permit, 0 = forbid */
-+    u_int32_t	base;		/* match if (addr & mask) == base */
-+    u_int32_t	mask;		/* base and mask are in network byte order */
-+};
-+
-+/*
-+ * Unfortunately, the linux kernel driver uses a different structure
-+ * for statistics from the rest of the ports.
-+ * This structure serves as a common representation for the bits
-+ * pppd needs.
-+ */
-+struct pppd_stats {
-+    unsigned int	bytes_in;
-+    unsigned int	bytes_out;
-+    unsigned int	pkts_in;
-+    unsigned int	pkts_out;
-+};
-+
-+/* Used for storing a sequence of words.  Usually malloced. */
-+struct wordlist {
-+    struct wordlist	*next;
-+    char		*word;
-+};
-+
-+/* An endpoint discriminator, used with multilink. */
-+#define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
-+struct epdisc {
-+    unsigned char	class;
-+    unsigned char	length;
-+    unsigned char	value[MAX_ENDP_LEN];
-+};
-+
-+/* values for epdisc.class */
-+#define EPD_NULL	0	/* null discriminator, no data */
-+#define EPD_LOCAL	1
-+#define EPD_IP		2
-+#define EPD_MAC		3
-+#define EPD_MAGIC	4
-+#define EPD_PHONENUM	5
-+
-+typedef void (*notify_func) __P((void *, int));
-+
-+struct notifier {
-+    struct notifier *next;
-+    notify_func	    func;
-+    void	    *arg;
-+};
-+
-+/*
-+ * Global variables.
-+ */
-+
-+extern int	hungup;		/* Physical layer has disconnected */
-+extern int	ifunit;		/* Interface unit number */
-+extern char	ifname[];	/* Interface name */
-+extern char	hostname[];	/* Our hostname */
-+extern u_char	outpacket_buf[]; /* Buffer for outgoing packets */
-+extern int	devfd;		/* fd of underlying device */
-+extern int	fd_ppp;		/* fd for talking PPP */
-+extern int	phase;		/* Current state of link - see values below */
-+extern int	baud_rate;	/* Current link speed in bits/sec */
-+extern char	*progname;	/* Name of this program */
-+extern int	redirect_stderr;/* Connector's stderr should go to file */
-+extern char	peer_authname[];/* Authenticated name of peer */
-+extern int	auth_done[NUM_PPP]; /* Methods actually used for auth */
-+extern int	privileged;	/* We were run by real-uid root */
-+extern int	need_holdoff;	/* Need holdoff period after link terminates */
-+extern char	**script_env;	/* Environment variables for scripts */
-+extern int	detached;	/* Have detached from controlling tty */
-+extern GIDSET_TYPE groups[NGROUPS_MAX];	/* groups the user is in */
-+extern int	ngroups;	/* How many groups valid in groups */
-+extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
-+extern int	link_stats_valid; /* set if link_stats is valid */
-+extern unsigned	link_connect_time; /* time the link was up for */
-+extern int	using_pty;	/* using pty as device (notty or pty opt.) */
-+extern int	log_to_fd;	/* logging to this fd as well as syslog */
-+extern bool	log_default;	/* log_to_fd is default (stdout) */
-+extern char	*no_ppp_msg;	/* message to print if ppp not in kernel */
-+extern volatile int status;	/* exit status for pppd */
-+extern bool	devnam_fixed;	/* can no longer change devnam */
-+extern int	unsuccess;	/* # unsuccessful connection attempts */
-+extern int	do_callback;	/* set if we want to do callback next */
-+extern int	doing_callback;	/* set if this is a callback */
-+extern int	error_count;	/* # of times error() has been called */
-+extern char	ppp_devnam[MAXPATHLEN];
-+extern char     remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
-+extern int      ppp_session_number; /* Session number (eg PPPoE session) */
-+extern int	fd_devnull;	/* fd open to /dev/null */
-+
-+extern int	listen_time;	/* time to listen first (ms) */
-+extern bool	doing_multilink;
-+extern bool	multilink_master;
-+extern bool	bundle_eof;
-+extern bool	bundle_terminating;
-+
-+extern struct notifier *pidchange;   /* for notifications of pid changing */
-+extern struct notifier *phasechange; /* for notifications of phase changes */
-+extern struct notifier *exitnotify;  /* for notification that we're exiting */
-+extern struct notifier *sigreceived; /* notification of received signal */
-+extern struct notifier *ip_up_notifier; /* IPCP has come up */
-+extern struct notifier *ip_down_notifier; /* IPCP has gone down */
-+extern struct notifier *auth_up_notifier; /* peer has authenticated */
-+extern struct notifier *link_down_notifier; /* link has gone down */
-+extern struct notifier *fork_notifier;	/* we are a new child process */
-+
-+/* Values for do_callback and doing_callback */
-+#define CALLBACK_DIALIN		1	/* we are expecting the call back */
-+#define CALLBACK_DIALOUT	2	/* we are dialling out to call back */
-+
-+/*
-+ * Variables set by command-line options.
-+ */
-+
-+extern int	debug;		/* Debug flag */
-+extern int	kdebugflag;	/* Tell kernel to print debug messages */
-+extern int	default_device;	/* Using /dev/tty or equivalent */
-+extern char	devnam[MAXPATHLEN];	/* Device name */
-+extern int	crtscts;	/* Use hardware flow control */
-+extern bool	modem;		/* Use modem control lines */
-+extern int	inspeed;	/* Input/Output speed requested */
-+extern u_int32_t netmask;	/* IP netmask to set on interface */
-+extern bool	lockflag;	/* Create lock file to lock the serial dev */
-+extern bool	nodetach;	/* Don't detach from controlling tty */
-+extern bool	updetach;	/* Detach from controlling tty when link up */
-+extern char	*initializer;	/* Script to initialize physical link */
-+extern char	*connect_script; /* Script to establish physical link */
-+extern char	*disconnect_script; /* Script to disestablish physical link */
-+extern char	*welcomer;	/* Script to welcome client after connection */
-+extern char	*ptycommand;	/* Command to run on other side of pty */
-+extern int	maxconnect;	/* Maximum connect time (seconds) */
-+extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
-+extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
-+extern bool	auth_required;	/* Peer is required to authenticate */
-+extern bool	persist;	/* Reopen link after it goes down */
-+extern bool	uselogin;	/* Use /etc/passwd for checking PAP */
-+extern char	our_name[MAXNAMELEN];/* Our name for authentication purposes */
-+extern char	remote_name[MAXNAMELEN]; /* Peer's name for authentication */
-+extern bool	explicit_remote;/* remote_name specified with remotename opt */
-+extern bool	demand;		/* Do dial-on-demand */
-+extern char	*ipparam;	/* Extra parameter for ip up/down scripts */
-+extern bool	cryptpap;	/* Others' PAP passwords are encrypted */
-+extern int	idle_time_limit;/* Shut down link if idle for this long */
-+extern int	holdoff;	/* Dead time before restarting */
-+extern bool	holdoff_specified; /* true if user gave a holdoff value */
-+extern bool	notty;		/* Stdin/out is not a tty */
-+extern char	*pty_socket;	/* Socket to connect to pty */
-+extern char	*record_file;	/* File to record chars sent/received */
-+extern bool	sync_serial;	/* Device is synchronous serial device */
-+extern int	maxfail;	/* Max # of unsuccessful connection attempts */
-+extern char	linkname[MAXPATHLEN]; /* logical name for link */
-+extern bool	tune_kernel;	/* May alter kernel settings as necessary */
-+extern int	connect_delay;	/* Time to delay after connect script */
-+extern int	max_data_rate;	/* max bytes/sec through charshunt */
-+extern int	req_unit;	/* interface unit number to use */
-+extern bool	multilink;	/* enable multilink operation */
-+extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
-+extern char	*bundle_name;	/* bundle name for multilink */
-+extern bool	dump_options;	/* print out option values */
-+extern bool	dryrun;		/* check everything, print options, exit */
-+extern int	child_wait;	/* # seconds to wait for children at end */
-+
-+#ifdef MAXOCTETS
-+extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
-+extern int       maxoctets_dir;      /* Direction :
-+				      0 - in+out (default)
-+				      1 - in 
-+				      2 - out
-+				      3 - max(in,out) */
-+extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
-+#define PPP_OCTETS_DIRECTION_SUM        0
-+#define PPP_OCTETS_DIRECTION_IN         1
-+#define PPP_OCTETS_DIRECTION_OUT        2
-+#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
-+/* same as previos, but little different on RADIUS side */
-+#define PPP_OCTETS_DIRECTION_MAXSESSION 4	
-+#endif
-+
-+#ifdef PPP_FILTER
-+extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
-+extern struct	bpf_program active_filter; /* Filter for link-active pkts */
-+#endif
-+
-+#ifdef MSLANMAN
-+extern bool	ms_lanman;	/* Use LanMan password instead of NT */
-+				/* Has meaning only with MS-CHAP challenges */
-+#endif
-+
-+/* Values for auth_pending, auth_done */
-+#define PAP_WITHPEER	0x1
-+#define PAP_PEER	0x2
-+#define CHAP_WITHPEER	0x4
-+#define CHAP_PEER	0x8
-+#define EAP_WITHPEER	0x10
-+#define EAP_PEER	0x20
-+
-+/* Values for auth_done only */
-+#define CHAP_MD5_WITHPEER	0x40
-+#define CHAP_MD5_PEER		0x80
-+#define CHAP_MS_SHIFT		8	/* LSB position for MS auths */
-+#define CHAP_MS_WITHPEER	0x100
-+#define CHAP_MS_PEER		0x200
-+#define CHAP_MS2_WITHPEER	0x400
-+#define CHAP_MS2_PEER		0x800
-+
-+extern char *current_option;	/* the name of the option being parsed */
-+extern int  privileged_option;	/* set iff the current option came from root */
-+extern char *option_source;	/* string saying where the option came from */
-+extern int  option_priority;	/* priority of current options */
-+
-+/*
-+ * Values for phase.
-+ */
-+#define PHASE_DEAD		0
-+#define PHASE_INITIALIZE	1
-+#define PHASE_SERIALCONN	2
-+#define PHASE_DORMANT		3
-+#define PHASE_ESTABLISH		4
-+#define PHASE_AUTHENTICATE	5
-+#define PHASE_CALLBACK		6
-+#define PHASE_NETWORK		7
-+#define PHASE_RUNNING		8
-+#define PHASE_TERMINATE		9
-+#define PHASE_DISCONNECT	10
-+#define PHASE_HOLDOFF		11
-+#define PHASE_MASTER		12
-+
-+/*
-+ * The following struct gives the addresses of procedures to call
-+ * for a particular protocol.
-+ */
-+struct protent {
-+    u_short protocol;		/* PPP protocol number */
-+    /* Initialization procedure */
-+    void (*init) __P((int unit));
-+    /* Process a received packet */
-+    void (*input) __P((int unit, u_char *pkt, int len));
-+    /* Process a received protocol-reject */
-+    void (*protrej) __P((int unit));
-+    /* Lower layer has come up */
-+    void (*lowerup) __P((int unit));
-+    /* Lower layer has gone down */
-+    void (*lowerdown) __P((int unit));
-+    /* Open the protocol */
-+    void (*open) __P((int unit));
-+    /* Close the protocol */
-+    void (*close) __P((int unit, char *reason));
-+    /* Print a packet in readable form */
-+    int  (*printpkt) __P((u_char *pkt, int len,
-+			  void (*printer) __P((void *, char *, ...)),
-+			  void *arg));
-+    /* Process a received data packet */
-+    void (*datainput) __P((int unit, u_char *pkt, int len));
-+    bool enabled_flag;		/* 0 iff protocol is disabled */
-+    char *name;			/* Text name of protocol */
-+    char *data_name;		/* Text name of corresponding data protocol */
-+    option_t *options;		/* List of command-line options */
-+    /* Check requested options, assign defaults */
-+    void (*check_options) __P((void));
-+    /* Configure interface for demand-dial */
-+    int  (*demand_conf) __P((int unit));
-+    /* Say whether to bring up link for this pkt */
-+    int  (*active_pkt) __P((u_char *pkt, int len));
-+};
-+
-+/* Table of pointers to supported protocols */
-+extern struct protent *protocols[];
-+
-+/*
-+ * This struct contains pointers to a set of procedures for
-+ * doing operations on a "channel".  A channel provides a way
-+ * to send and receive PPP packets - the canonical example is
-+ * a serial port device in PPP line discipline (or equivalently
-+ * with PPP STREAMS modules pushed onto it).
-+ */
-+struct channel {
-+	/* set of options for this channel */
-+	option_t *options;
-+	/* find and process a per-channel options file */
-+	void (*process_extra_options) __P((void));
-+	/* check all the options that have been given */
-+	void (*check_options) __P((void));
-+	/* get the channel ready to do PPP, return a file descriptor */
-+	int  (*connect) __P((void));
-+	/* we're finished with the channel */
-+	void (*disconnect) __P((void));
-+	/* put the channel into PPP `mode' */
-+	int  (*establish_ppp) __P((int));
-+	/* take the channel out of PPP `mode', restore loopback if demand */
-+	void (*disestablish_ppp) __P((int));
-+	/* set the transmit-side PPP parameters of the channel */
-+	void (*send_config) __P((int, u_int32_t, int, int));
-+	/* set the receive-side PPP parameters of the channel */
-+	void (*recv_config) __P((int, u_int32_t, int, int));
-+	/* cleanup on error or normal exit */
-+	void (*cleanup) __P((void));
-+	/* close the device, called in children after fork */
-+	void (*close) __P((void));
-+};
-+
-+extern struct channel *the_channel;
-+
-+/*
-+ * Prototypes.
-+ */
-+
-+/* Procedures exported from main.c. */
-+void set_ifunit __P((int));	/* set stuff that depends on ifunit */
-+void detach __P((void));	/* Detach from controlling tty */
-+void die __P((int));		/* Cleanup and exit */
-+void quit __P((void));		/* like die(1) */
-+void novm __P((char *));	/* Say we ran out of memory, and die */
-+void timeout __P((void (*func)(void *), void *arg, int s, int us));
-+				/* Call func(arg) after s.us seconds */
-+void untimeout __P((void (*func)(void *), void *arg));
-+				/* Cancel call to func(arg) */
-+void record_child __P((int, char *, void (*) (void *), void *));
-+pid_t safe_fork __P((int, int, int));	/* Fork & close stuff in child */
-+int  device_script __P((char *cmd, int in, int out, int dont_wait));
-+				/* Run `cmd' with given stdin and stdout */
-+pid_t run_program __P((char *prog, char **args, int must_exist,
-+		       void (*done)(void *), void *arg));
-+				/* Run program prog with args in child */
-+void reopen_log __P((void));	/* (re)open the connection to syslog */
-+void print_link_stats __P((void)); /* Print stats, if available */
-+void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */
-+void update_link_stats __P((int)); /* Get stats at link termination */
-+void script_setenv __P((char *, char *, int));	/* set script env var */
-+void script_unsetenv __P((char *));		/* unset script env var */
-+void new_phase __P((int));	/* signal start of new phase */
-+void add_notifier __P((struct notifier **, notify_func, void *));
-+void remove_notifier __P((struct notifier **, notify_func, void *));
-+void notify __P((struct notifier *, int));
-+int  ppp_send_config __P((int, int, u_int32_t, int, int));
-+int  ppp_recv_config __P((int, int, u_int32_t, int, int));
-+void remove_pidfiles __P((void));
-+void lock_db __P((void));
-+void unlock_db __P((void));
-+
-+/* Procedures exported from tty.c. */
-+void tty_init __P((void));
-+
-+/* Procedures exported from utils.c. */
-+void log_packet __P((u_char *, int, char *, int));
-+				/* Format a packet and log it with syslog */
-+void print_string __P((char *, int,  void (*) (void *, char *, ...),
-+		void *));	/* Format a string for output */
-+int slprintf __P((char *, int, char *, ...));		/* sprintf++ */
-+int vslprintf __P((char *, int, char *, va_list));	/* vsprintf++ */
-+size_t strlcpy __P((char *, const char *, size_t));	/* safe strcpy */
-+size_t strlcat __P((char *, const char *, size_t));	/* safe strncpy */
-+void dbglog __P((char *, ...));	/* log a debug message */
-+void info __P((char *, ...));	/* log an informational message */
-+void notice __P((char *, ...));	/* log a notice-level message */
-+void warn __P((char *, ...));	/* log a warning message */
-+void error __P((char *, ...));	/* log an error message */
-+void fatal __P((char *, ...));	/* log an error message and die(1) */
-+void init_pr_log __P((char *, int));	/* initialize for using pr_log */
-+void pr_log __P((void *, char *, ...));	/* printer fn, output to syslog */
-+void end_pr_log __P((void));	/* finish up after using pr_log */
-+void dump_packet __P((const char *, u_char *, int));
-+				/* dump packet to debug log if interesting */
-+ssize_t complete_read __P((int, void *, size_t));
-+				/* read a complete buffer */
-+
-+/* Procedures exported from auth.c */
-+void link_required __P((int));	  /* we are starting to use the link */
-+void link_terminated __P((int));  /* we are finished with the link */
-+void link_down __P((int));	  /* the LCP layer has left the Opened state */
-+void upper_layers_down __P((int));/* take all NCPs down */
-+void link_established __P((int)); /* the link is up; authenticate now */
-+void start_networks __P((int));   /* start all the network control protos */
-+void continue_networks __P((int)); /* start network [ip, etc] control protos */
-+void np_up __P((int, int));	  /* a network protocol has come up */
-+void np_down __P((int, int));	  /* a network protocol has gone down */
-+void np_finished __P((int, int)); /* a network protocol no longer needs link */
-+void auth_peer_fail __P((int, int));
-+				/* peer failed to authenticate itself */
-+void auth_peer_success __P((int, int, int, char *, int));
-+				/* peer successfully authenticated itself */
-+void auth_withpeer_fail __P((int, int));
-+				/* we failed to authenticate ourselves */
-+void auth_withpeer_success __P((int, int, int));
-+				/* we successfully authenticated ourselves */
-+void auth_check_options __P((void));
-+				/* check authentication options supplied */
-+void auth_reset __P((int));	/* check what secrets we have */
-+int  check_passwd __P((int, char *, int, char *, int, char **));
-+				/* Check peer-supplied username/password */
-+int  get_secret __P((int, char *, char *, char *, int *, int));
-+				/* get "secret" for chap */
-+int  get_srp_secret __P((int unit, char *client, char *server, char *secret,
-+    int am_server));
-+int  auth_ip_addr __P((int, u_int32_t));
-+				/* check if IP address is authorized */
-+int  auth_number __P((void));	/* check if remote number is authorized */
-+int  bad_ip_adrs __P((u_int32_t));
-+				/* check if IP address is unreasonable */
-+
-+/* Procedures exported from demand.c */
-+void demand_conf __P((void));	/* config interface(s) for demand-dial */
-+void demand_block __P((void));	/* set all NPs to queue up packets */
-+void demand_unblock __P((void)); /* set all NPs to pass packets */
-+void demand_discard __P((void)); /* set all NPs to discard packets */
-+void demand_rexmit __P((int));	/* retransmit saved frames for an NP */
-+int  loop_chars __P((unsigned char *, int)); /* process chars from loopback */
-+int  loop_frame __P((unsigned char *, int)); /* should we bring link up? */
-+
-+/* Procedures exported from multilink.c */
-+#ifdef HAVE_MULTILINK
-+void mp_check_options __P((void)); /* Check multilink-related options */
-+int  mp_join_bundle __P((void));  /* join our link to an appropriate bundle */
-+void mp_exit_bundle __P((void));  /* have disconnected our link from bundle */
-+void mp_bundle_terminated __P((void));
-+char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */
-+int  str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */
-+#else
-+#define mp_bundle_terminated()	/* nothing */
-+#define mp_exit_bundle()	/* nothing */
-+#define doing_multilink		0
-+#define multilink_master	0
-+#endif
-+
-+/* Procedures exported from sys-*.c */
-+void sys_init __P((void));	/* Do system-dependent initialization */
-+void sys_cleanup __P((void));	/* Restore system state before exiting */
-+int  sys_check_options __P((void)); /* Check options specified */
-+void sys_close __P((void));	/* Clean up in a child before execing */
-+int  ppp_available __P((void));	/* Test whether ppp kernel support exists */
-+int  get_pty __P((int *, int *, char *, int));	/* Get pty master/slave */
-+int  open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
-+int  tty_establish_ppp __P((int));  /* Turn serial port into a ppp interface */
-+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
-+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
-+int  generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
-+void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
-+int  bundle_attach __P((int));	/* Attach link to existing bundle */
-+void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
-+void destroy_bundle __P((void)); /* Tell driver to destroy bundle */
-+void clean_check __P((void));	/* Check if line was 8-bit clean */
-+void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */
-+void restore_tty __P((int));	/* Restore port's original parameters */
-+void setdtr __P((int, int));	/* Raise or lower port's DTR line */
-+void output __P((int, u_char *, int)); /* Output a PPP packet */
-+void wait_input __P((struct timeval *));
-+				/* Wait for input, with timeout */
-+void add_fd __P((int));		/* Add fd to set to wait for */
-+void remove_fd __P((int));	/* Remove fd from set to wait for */
-+int  read_packet __P((u_char *)); /* Read PPP packet */
-+int  get_loop_output __P((void)); /* Read pkts from loopback */
-+void tty_send_config __P((int, u_int32_t, int, int));
-+				/* Configure i/f transmit parameters */
-+void tty_set_xaccm __P((ext_accm));
-+				/* Set extended transmit ACCM */
-+void tty_recv_config __P((int, u_int32_t, int, int));
-+				/* Configure i/f receive parameters */
-+int  ccp_test __P((int, u_char *, int, int));
-+				/* Test support for compression scheme */
-+void ccp_flags_set __P((int, int, int));
-+				/* Set kernel CCP state */
-+int  ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */
-+int  get_idle_time __P((int, struct ppp_idle *));
-+				/* Find out how long link has been idle */
-+int  get_ppp_stats __P((int, struct pppd_stats *));
-+				/* Return link statistics */
-+void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */
-+int  netif_get_mtu __P((int));      /* Get PPP interface MTU */
-+int  sifvjcomp __P((int, int, int, int));
-+				/* Configure VJ TCP header compression */
-+int  sifup __P((int));		/* Configure i/f up for one protocol */
-+int  sifnpmode __P((int u, int proto, enum NPmode mode));
-+				/* Set mode for handling packets for proto */
-+int  sifdown __P((int));	/* Configure i/f down for one protocol */
-+int  sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t));
-+				/* Configure IPv4 addresses for i/f */
-+int  cifaddr __P((int, u_int32_t, u_int32_t));
-+				/* Reset i/f IP addresses */
-+#ifdef INET6
-+int  sif6addr __P((int, eui64_t, eui64_t));
-+				/* Configure IPv6 addresses for i/f */
-+int  cif6addr __P((int, eui64_t, eui64_t));
-+				/* Remove an IPv6 address from i/f */
-+#endif
-+int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
-+				/* Create default route through i/f */
-+int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
-+				/* Delete default route through i/f */
-+int  sifproxyarp __P((int, u_int32_t));
-+				/* Add proxy ARP entry for peer */
-+int  cifproxyarp __P((int, u_int32_t));
-+				/* Delete proxy ARP entry for peer */
-+u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */
-+int  lock __P((char *));	/* Create lock file for device */
-+int  relock __P((int));		/* Rewrite lock file with new pid */
-+void unlock __P((void));	/* Delete previously-created lock file */
-+void logwtmp __P((const char *, const char *, const char *));
-+				/* Write entry to wtmp file */
-+int  get_host_seed __P((void));	/* Get host-dependent random number seed */
-+int  have_route_to __P((u_int32_t)); /* Check if route to addr exists */
-+#ifdef PPP_FILTER
-+int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
-+				/* Set filter programs in kernel */
-+#endif
-+#ifdef IPX_CHANGE
-+int  sipxfaddr __P((int, unsigned long, unsigned char *));
-+int  cipxfaddr __P((int));
-+#endif
-+int  get_if_hwaddr __P((u_char *addr, char *name));
-+char *get_first_ethernet __P((void));
-+
-+/* Procedures exported from options.c */
-+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
-+int  parse_args __P((int argc, char **argv));
-+				/* Parse options from arguments given */
-+int  options_from_file __P((char *filename, int must_exist, int check_prot,
-+			    int privileged));
-+				/* Parse options from an options file */
-+int  options_from_user __P((void)); /* Parse options from user's .ppprc */
-+int  options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */
-+int  options_from_list __P((struct wordlist *, int privileged));
-+				/* Parse options from a wordlist */
-+int  getword __P((FILE *f, char *word, int *newlinep, char *filename));
-+				/* Read a word from a file */
-+void option_error __P((char *fmt, ...));
-+				/* Print an error message about an option */
-+int int_option __P((char *, int *));
-+				/* Simplified number_option for decimal ints */
-+void add_options __P((option_t *)); /* Add extra options */
-+void check_options __P((void));	/* check values after all options parsed */
-+int  override_value __P((const char *, int, const char *));
-+				/* override value if permitted by priority */
-+void print_options __P((void (*) __P((void *, char *, ...)), void *));
-+				/* print out values of all options */
-+
-+int parse_dotted_ip __P((char *, u_int32_t *));
-+
-+/*
-+ * Hooks to enable plugins to change various things.
-+ */
-+extern int (*new_phase_hook) __P((int));
-+extern int (*idle_time_hook) __P((struct ppp_idle *));
-+extern int (*holdoff_hook) __P((void));
-+extern int (*pap_check_hook) __P((void));
-+extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
-+				 struct wordlist **paddrs,
-+				 struct wordlist **popts));
-+extern void (*pap_logout_hook) __P((void));
-+extern int (*pap_passwd_hook) __P((char *user, char *passwd));
-+extern int (*allowed_address_hook) __P((u_int32_t addr));
-+extern void (*ip_up_hook) __P((void));
-+extern void (*ip_down_hook) __P((void));
-+extern void (*ip_choose_hook) __P((u_int32_t *));
-+
-+extern int (*chap_check_hook) __P((void));
-+extern int (*chap_passwd_hook) __P((char *user, char *passwd));
-+
-+/* Let a plugin snoop sent and received packets.  Useful for L2TP */
-+extern void (*snoop_recv_hook) __P((unsigned char *p, int len));
-+extern void (*snoop_send_hook) __P((unsigned char *p, int len));
-+
-+/*
-+ * Inline versions of get/put char/short/long.
-+ * Pointer is advanced; we assume that both arguments
-+ * are lvalues and will already be in registers.
-+ * cp MUST be u_char *.
-+ */
-+#define GETCHAR(c, cp) { \
-+	(c) = *(cp)++; \
-+}
-+#define PUTCHAR(c, cp) { \
-+	*(cp)++ = (u_char) (c); \
-+}
-+
-+
-+#define GETSHORT(s, cp) { \
-+	(s) = *(cp)++ << 8; \
-+	(s) |= *(cp)++; \
-+}
-+#define PUTSHORT(s, cp) { \
-+	*(cp)++ = (u_char) ((s) >> 8); \
-+	*(cp)++ = (u_char) (s); \
-+}
-+
-+#define GETLONG(l, cp) { \
-+	(l) = *(cp)++ << 8; \
-+	(l) |= *(cp)++; (l) <<= 8; \
-+	(l) |= *(cp)++; (l) <<= 8; \
-+	(l) |= *(cp)++; \
-+}
-+#define PUTLONG(l, cp) { \
-+	*(cp)++ = (u_char) ((l) >> 24); \
-+	*(cp)++ = (u_char) ((l) >> 16); \
-+	*(cp)++ = (u_char) ((l) >> 8); \
-+	*(cp)++ = (u_char) (l); \
-+}
-+
-+#define INCPTR(n, cp)	((cp) += (n))
-+#define DECPTR(n, cp)	((cp) -= (n))
-+
-+/*
-+ * System dependent definitions for user-level 4.3BSD UNIX implementation.
-+ */
-+
-+#define TIMEOUT(r, f, t)	timeout((r), (f), (t), 0)
-+#define UNTIMEOUT(r, f)		untimeout((r), (f))
-+
-+#define BCOPY(s, d, l)		memcpy(d, s, l)
-+#define BZERO(s, n)		memset(s, 0, n)
-+#define	BCMP(s1, s2, l)		memcmp(s1, s2, l)
-+
-+#define PRINTMSG(m, l)		{ info("Remote message: %0.*v", l, m); }
-+
-+/*
-+ * MAKEHEADER - Add Header fields to a packet.
-+ */
-+#define MAKEHEADER(p, t) { \
-+    PUTCHAR(PPP_ALLSTATIONS, p); \
-+    PUTCHAR(PPP_UI, p); \
-+    PUTSHORT(t, p); }
-+
-+/*
-+ * Exit status values.
-+ */
-+#define EXIT_OK			0
-+#define EXIT_FATAL_ERROR	1
-+#define EXIT_OPTION_ERROR	2
-+#define EXIT_NOT_ROOT		3
-+#define EXIT_NO_KERNEL_SUPPORT	4
-+#define EXIT_USER_REQUEST	5
-+#define EXIT_LOCK_FAILED	6
-+#define EXIT_OPEN_FAILED	7
-+#define EXIT_CONNECT_FAILED	8
-+#define EXIT_PTYCMD_FAILED	9
-+#define EXIT_NEGOTIATION_FAILED	10
-+#define EXIT_PEER_AUTH_FAILED	11
-+#define EXIT_IDLE_TIMEOUT	12
-+#define EXIT_CONNECT_TIME	13
-+#define EXIT_CALLBACK		14
-+#define EXIT_PEER_DEAD		15
-+#define EXIT_HANGUP		16
-+#define EXIT_LOOPBACK		17
-+#define EXIT_INIT_FAILED	18
-+#define EXIT_AUTH_TOPEER_FAILED	19
-+#ifdef MAXOCTETS
-+#define EXIT_TRAFFIC_LIMIT	20
-+#endif
-+#define EXIT_CNID_AUTH_FAILED	21
-+
-+/*
-+ * Debug macros.  Slightly useful for finding bugs in pppd, not particularly
-+ * useful for finding out why your connection isn't being established.
-+ */
-+#ifdef DEBUGALL
-+#define DEBUGMAIN	1
-+#define DEBUGFSM	1
-+#define DEBUGLCP	1
-+#define DEBUGIPCP	1
-+#define DEBUGIPV6CP	1
-+#define DEBUGUPAP	1
-+#define DEBUGCHAP	1
-+#endif
-+
-+#ifndef LOG_PPP			/* we use LOG_LOCAL2 for syslog by default */
-+#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
-+  || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
-+  || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
-+#define LOG_PPP LOG_LOCAL2
-+#else
-+#define LOG_PPP LOG_DAEMON
-+#endif
-+#endif /* LOG_PPP */
-+
-+#ifdef DEBUGMAIN
-+#define MAINDEBUG(x)	if (debug) dbglog x
-+#else
-+#define MAINDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGSYS
-+#define SYSDEBUG(x)	if (debug) dbglog x
-+#else
-+#define SYSDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGFSM
-+#define FSMDEBUG(x)	if (debug) dbglog x
-+#else
-+#define FSMDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGLCP
-+#define LCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define LCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPCP
-+#define IPCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define IPCPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPV6CP
-+#define IPV6CPDEBUG(x)  if (debug) dbglog x
-+#else
-+#define IPV6CPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGUPAP
-+#define UPAPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define UPAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGCHAP
-+#define CHAPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define CHAPDEBUG(x)
-+#endif
-+
-+#ifdef DEBUGIPXCP
-+#define IPXCPDEBUG(x)	if (debug) dbglog x
-+#else
-+#define IPXCPDEBUG(x)
-+#endif
-+
-+#ifndef SIGTYPE
-+#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE)
-+#define SIGTYPE void
-+#else
-+#define SIGTYPE int
-+#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */
-+#endif /* SIGTYPE */
-+
-+#ifndef MIN
-+#define MIN(a, b)	((a) < (b)? (a): (b))
-+#endif
-+#ifndef MAX
-+#define MAX(a, b)	((a) > (b)? (a): (b))
-+#endif
-+
-+#ifndef offsetof
-+#define offsetof(type, member) ((size_t) &((type *)0)->member)
-+#endif
-+
-+#endif /* __PPP_H__ */
diff --git a/extra/dnsutils/PKGBUILD b/extra/dnsutils/PKGBUILD
deleted file mode 100644
index 9917297d0..000000000
--- a/extra/dnsutils/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 151740 2012-03-01 22:01:16Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: mario <mario_vazq@hotmail.com>
-
-pkgname=dnsutils
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.0
-_pkgver=9.9.0
-pkgrel=1
-
-pkgdesc='DNS utilities: dig host nslookup'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64')
-options=('!makeflags')
-depends=('openssl' 'krb5' 'idnkit')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'remove-bind.patch'
-        'trusted-key.key')
-sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094'
-          'b465ef6160b004838f04de9978fe1be8422af777'
-          'ca93da30c89de4365b846325d6ec4674a3e4fc02')
-
-replaces=('bind-tools' 'host')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-bind.patch
-	export STD_CDEFINES='-DDIG_SIGCHASE'
-
-	# hack to remove unused bloat from the binaries
-	CFLAGS+=' -fdata-sections -ffunction-sections'
-	LDFLAGS+=' -Wl,--gc-sections'
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-idn \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-	install -Dm644 ../trusted-key.key "${pkgdir}"/etc/trusted-key.key
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	cd bin; make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/dnsutils/remove-bind.patch b/extra/dnsutils/remove-bind.patch
deleted file mode 100644
index 19d650964..000000000
--- a/extra/dnsutils/remove-bind.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
-@@ -19,8 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
--		check confgen @PKCS11_TOOLS@
-+SUBDIRS =	dig
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff -aur old/lib/Makefile.in new/lib/Makefile.in
---- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
-+++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
-@@ -23,7 +23,7 @@
- # Attempt to disable parallel processing.
- .NOTPARALLEL:
- .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS =	isc dns isccfg bind9 lwres
- TARGETS =
- 
- @BIND9_MAKE_RULES@
diff --git a/extra/dnsutils/trusted-key.key b/extra/dnsutils/trusted-key.key
deleted file mode 100644
index 866cadda2..000000000
--- a/extra/dnsutils/trusted-key.key
+++ /dev/null
@@ -1,2 +0,0 @@
-.			172800	IN	DNSKEY	256 3 8 AwEAAZ/NErKzyMlImJ+2HTmK9qeH2sLUywlsF+mJbTP5GKoYFHoU2vn2 Zqr261Lk7a6jfBKYny5GX7BDRJcVvig36TgOinE9QP5KVS0RxdrOl98g KLwFMORfNf/wjCwjPdEl1GgaGYl0npJ4c+x+o6aa/xmDKJo9zUlpvb7B LxbJ7HwF
-.			172800	IN	DNSKEY	257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0=
diff --git a/extra/easytag/mp4v2-1.9.patch b/extra/easytag/mp4v2-1.9.patch
deleted file mode 100644
index 774bf7fb2..000000000
--- a/extra/easytag/mp4v2-1.9.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ur easytag-2.1.6.orig/configure easytag-2.1.6/configure
---- easytag-2.1.6.orig/configure	2008-07-12 17:57:44.000000000 +0300
-+++ easytag-2.1.6/configure	2009-07-10 16:44:39.000000000 +0300
-@@ -22418,12 +22418,12 @@
- /* end confdefs.h.  */
- 
-                 #include <stdio.h>
--                #include <mpeg4ip_config.h>
-+                #include <mp4v2/mp4v2.h>
-                 int main (void)
-                 {
-                     FILE *output;
-                     output=fopen("conftest.mp4v2","w");
--                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
-+                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
-                     fclose(output);
-                     exit(0);
-                 }
-@@ -22471,7 +22471,7 @@
- 
-                 cat >conftest.$ac_ext <<_ACEOF
- 
--           #include <mp4.h>
-+           #include <mp4v2/mp4v2.h>
-            main () {
-            MP4FileHandle hFile;
-            MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
-diff -ur easytag-2.1.6.orig/src/mp4_header.c easytag-2.1.6/src/mp4_header.c
---- easytag-2.1.6.orig/src/mp4_header.c	2007-11-28 10:54:35.000000000 +0200
-+++ easytag-2.1.6/src/mp4_header.c	2009-07-10 16:44:54.000000000 +0300
-@@ -44,7 +44,7 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- 
- /****************
-diff -ur easytag-2.1.6.orig/src/mp4_tag.c easytag-2.1.6/src/mp4_tag.c
---- easytag-2.1.6.orig/src/mp4_tag.c	2007-12-11 00:08:11.000000000 +0200
-+++ easytag-2.1.6/src/mp4_tag.c	2009-07-10 16:45:08.000000000 +0300
-@@ -50,7 +50,7 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
--#include <mp4.h>
-+#include <mp4v2/mp4v2.h>
- 
- 
- /****************
diff --git a/extra/eclipse/eclipse.ini.patch b/extra/eclipse/eclipse.ini.patch
deleted file mode 100644
index 0f2e3b226..000000000
--- a/extra/eclipse/eclipse.ini.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- eclipse/eclipse.ini	2010-06-24 09:22:59.474998451 +0200
-+++ eclipse/eclipse.ini~	2010-06-24 09:24:26.325011998 +0200
-@@ -5,9 +5,9 @@
- -showsplash
- org.eclipse.platform
- --launcher.XXMaxPermSize
--256m
-+512m
- --launcher.defaultAction
- openFile
- -vmargs
- -Xms40m
---Xmx384m
-+-Xmx768m
diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD
deleted file mode 100644
index 62458f595..000000000
--- a/extra/erlang/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 145333 2011-12-21 20:47:12Z andrea $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
-
-pkgname=erlang
-pkgver=R14B04
-pkgrel=2
-pkgdesc="A small concurrent functional programming language developed by Ericsson."
-arch=(i686 x86_64)
-url="http://www.erlang.org/index.html"
-license=('custom')
-depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
-optdepends=('wxgtk: for wx support' 'unixodbc: database')
-
-options=('!makeflags')
-source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
-	http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
-md5sums=('4b469729f103f52702bfb1fb24529dc0'
-         'f31e72518daae4007f595c0b224dd59f')
-
-# please check these deps reported by namcap when you do the next build:
-#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar)
-#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so'])
-
-
-build() {
-  cd "$srcdir/otp_src_${pkgver/./-}"
-  export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
-  export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
-
-  sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
-
-  CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
-  make
-}
-
-package() {
-  cd "$srcdir/otp_src_${pkgver/./-}"
-  make INSTALL_PREFIX="$pkgdir" install
-
-# fix prefix
-  cd "$pkgdir"
-  for i in usr/lib/erlang/bin/erl \
-      usr/lib/erlang/bin/start \
-      usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \
-      usr/lib/erlang/erts-${ERTSVERSION}/bin/start \
-      usr/lib/erlang/releases/RELEASES ;do
-    sed -i "s#$pkgdir##" $i
-  done
-
-# fix symlinks
-  cd "$pkgdir/usr/lib/erlang/bin"
-  ln -sf ../erts-${ERTSVERSION}/bin/epmd
-
-  cd "$pkgdir/usr/bin"
-  for file in *; do
-    ln -sfv ../lib/erlang/bin/$file
-  done
-
-  ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call"
-
-# install documentation
-  install -d "$pkgdir/usr/share/doc/erlang"
-  install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
-  cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
-
-  install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
-
-}
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
deleted file mode 100644
index 207d020ad..000000000
--- a/extra/ettercap/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 149946 2012-02-11 23:30:37Z allan $
-# Maintainer:
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=ettercap
-pkgname=('ettercap' 'ettercap-gtk')
-pkgver=NG_0.7.4.2
-_origver=${pkgver/_/-}
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://ettercap.sourceforge.net/"
-license=('GPL')
-makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz")
-md5sums=('ab2354bf9c91195f06ad0b5d058565a4')
-
-build() {
-  cd "${srcdir}"
-  sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${_origver}/desktop/ettercap.desktop
-
-  cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
-
-  cd ${pkgbase}-${_origver}
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --datarootdir=/usr/share \
-              --enable-plugins \
-              --enable-https \
-              --disable-gtk
-  make
-
-  cd ../${pkgbase}-${_origver}-gtk
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --datarootdir=/usr/share \
-              --enable-plugins \
-              --enable-https \
-              --enable-gtk
-  make
-}
-
-package_ettercap() {
-  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-  depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
-  backup=('etc/etter.conf')
-
-  cd "${srcdir}"/${pkgbase}-${_origver}
-  make DESTDIR="${pkgdir}" install
-}
-
-package_ettercap-gtk() {
-  pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
-  depends=('ettercap' 'gtk2' 'hicolor-icon-theme')
-  optdepends=('gksu: to run ettercap from the menu')
-  install=ettercap-gtk.install
-
-  cd "${srcdir}"/${pkgbase}-${_origver}-gtk
-  install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
-  install -Dm644 desktop/ettercap.desktop \
-    "${pkgdir}"/usr/share/applications/ettercap.desktop
-  install -Dm644 share/ettercap.png \
-    "${pkgdir}"/usr/share/ettercap/ettercap.png
-  install -Dm644 desktop/ettercap.xpm \
-    "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/ettercap.xpm
-  install -Dm644 desktop/ettercap.svg \
-    "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/ettercap.svg
-}
diff --git a/extra/ettercap/ettercap-gtk.install b/extra/ettercap/ettercap-gtk.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/extra/ettercap/ettercap-gtk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch
deleted file mode 100644
index c47248beb..000000000
--- a/extra/gcin/qt4-lib64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -aur old/configure new/configure
---- old/configure	2011-12-21 00:48:03.000000000 +1100
-+++ new/configure	2011-12-25 04:06:14.424317251 +1100
-@@ -188,7 +188,7 @@
- 
- 
- QT4_IM='N'
--QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
-+QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods
- echo "testing if you have qt4 support"
- pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
- if [ $? = 0 ]; then
-@@ -245,7 +245,7 @@
-   mv gcin.spec gcin.spec.tmp
-   grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec
- else
--  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
-+  for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc
-   do
- 	[ -x $i ] && QT4_MOC=$i
-   done
-diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
---- old/qt4-im/Makefile	2011-12-19 14:52:46.000000000 +1100
-+++ new/qt4-im/Makefile	2011-12-25 04:06:14.424317251 +1100
-@@ -1,5 +1,5 @@
- include ../config.mak
--QT=qt4
-+QT=qt
- QTIM=$(QT)/plugins/inputmethods
- IMMODULES=$(libdir)/$(QTIM)
- 
diff --git a/extra/gecko-sharp-2.0/PKGBUILD b/extra/gecko-sharp-2.0/PKGBUILD
deleted file mode 100644
index a6b0033a1..000000000
--- a/extra/gecko-sharp-2.0/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137770 2011-09-10 17:09:41Z pierre $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=gecko-sharp-2.0
-pkgver=0.13
-pkgrel=4
-pkgdesc="C# bindings for gtkmozembed"
-arch=('i686' 'x86_64')
-license=('LGPL' 'MPL')
-url="http://www.mono-project.com/"
-depends=('xulrunner' 'gtk-sharp-2')
-makedepends=('monodoc' 'pkgconfig')
-source=("http://go-mono.com/sources/gecko-sharp-2.0/gecko-sharp-2.0-${pkgver}.tar.bz2"
-        'gecko-sharp-2.0-0.12-xulrunner.patch')
-md5sums=('f88eaa06e71f8d8fa34cf59a3e034a6b'
-         '4f2c07c3fb0c1a94adaa4e4c8d57608b')
-
-build() {
-  # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd ${srcdir}/gecko-sharp-2.0-${pkgver}
-  patch -Np1 -i ${srcdir}/gecko-sharp-2.0-0.12-xulrunner.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/gecko-sharp-2.0-${pkgver}
-  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
-    DESTDIR=${pkgdir} install
-}
diff --git a/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch b/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch
deleted file mode 100644
index 5d19fea72..000000000
--- a/extra/gecko-sharp-2.0/gecko-sharp-2.0-0.12-xulrunner.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw.xl gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw
---- gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw.xl	2006-12-22 20:57:47.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.raw	2007-11-27 15:54:41.000000000 +0100
-@@ -349,6 +349,12 @@
-           <parameter type="const-char*" name="aPath" />
-         </parameters>
-       </method>
-+      <method name="SetPath" cname="gtk_moz_embed_set_path" shared="true">
-+        <return-type type="void" />
-+        <parameters>
-+          <parameter type="const-char*" name="aPath" />
-+        </parameters>
-+      </method>
-       <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
-         <return-type type="void" />
-         <parameters>
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml.xl gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml
---- gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml.xl	2006-12-22 20:57:54.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gtkgecko-api.xml	2007-11-27 15:54:41.000000000 +0100
-@@ -349,6 +349,12 @@
-           <parameter type="const-char*" name="aPath" />
-         </parameters>
-       </method>
-+      <method name="SetPath" cname="gtk_moz_embed_set_path" shared="true">
-+        <return-type type="void" />
-+        <parameters>
-+          <parameter type="const-char*" name="aPath" />
-+        </parameters>
-+      </method>
-       <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
-         <return-type type="void" />
-         <parameters>
-diff -up gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in.xl gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in
---- gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in.xl	2006-12-22 20:57:47.000000000 +0100
-+++ gecko-sharp-2.0-0.12/gtkmozembed/gecko-sharp.dll.config.in	2007-11-27 16:05:02.000000000 +0100
-@@ -3,5 +3,5 @@
-   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-   <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
--  <dllmap dll="gtkembedmoz.dll" target="libgtkembedmoz@LIB_PREFIX@@LIB_SUFFIX@"/>
-+  <dllmap dll="gtkembedmoz.dll" target="libxul@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/extra/gftp/PKGBUILD b/extra/gftp/PKGBUILD
deleted file mode 100644
index 01abbb7bf..000000000
--- a/extra/gftp/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 150475 2012-02-18 01:48:17Z allan $
-# Maintainer:
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-pkgname=gftp
-pkgver=2.0.19
-pkgrel=4
-pkgdesc="A multithreaded ftp client for X Windows"
-arch=('i686' 'x86_64')
-url="http://www.gftp.org/"
-license=('GPL2')
-depends=('gtk2' 'openssl' 'readline')
-source=(http://www.gftp.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('5183cb4955d94be0e03c892585547c64')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   ./configure --prefix=/usr --mandir=/usr/share/man
-   make
-}
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} install
-}
diff --git a/extra/gif2png/gif2png-2.5.5-libpng15.patch b/extra/gif2png/gif2png-2.5.5-libpng15.patch
deleted file mode 100644
index 58ca43186..000000000
--- a/extra/gif2png/gif2png-2.5.5-libpng15.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/gif2png.c	2012-01-29 00:02:06.000000000 +0100
-+++ b/gif2png.c	2012-02-06 00:49:14.000000000 +0100
-@@ -12,6 +12,7 @@
- #include <unistd.h>	/* for isatty() */
- #include <sys/stat.h>
- #include <utime.h>
-+#include <zlib.h>
- 
- #if !defined(TRUE)
- #define FALSE	0
-@@ -122,8 +123,8 @@
-     int colors_used = 0;
-     byte remap[MAXCMSIZE];
-     int low_prec;
--    png_struct *png_ptr = xalloc(sizeof (png_struct));
--    png_info *info_ptr = xalloc(sizeof (png_info));
-+    png_struct *png_ptr;
-+    png_info *info_ptr;
-     int p;
-     int gray_bitdepth;
-     png_color pal_rgb[MAXCMSIZE], *pltep;
-@@ -138,6 +139,19 @@
-     png_text software;
-     png_text comment;
- 
-+    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+    if (png_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+    info_ptr = png_create_info_struct(png_ptr);
-+    if (info_ptr == NULL) {
-+      fprintf(stderr, "gif2png: fatal error, out of memory\n");
-+      fprintf(stderr, "gif2png: exiting ungracefully\n");
-+      exit(1);
-+    }
-+
-     /* these volatile declarations prevent gcc warnings ("variable might be
-      *  clobbered by `longjmp' or `vfork'") */
-     volatile int gray = TRUE;
diff --git a/extra/gimp-refocus/PKGBUILD b/extra/gimp-refocus/PKGBUILD
deleted file mode 100644
index 5cc3b5703..000000000
--- a/extra/gimp-refocus/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 128457 2011-06-24 02:06:37Z eric $
-# Maintainer: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gimp-refocus
-pkgver=0.9.0
-pkgrel=3
-pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering"
-arch=('i686' 'x86_64')
-url="http://refocus.sourceforge.net/"
-license=('GPL2')
-depends=('gimp')
-source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \
-        refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch)
-md5sums=('8d4eac4ef45c904fb5e73021696bec94'
-         '8ef9dfe697cd20be2be14c1ee53a240a'
-         '532593cba030feab8ffa7800fc9cd782'
-         '6b55dbdc656646c765064cf21e1a3c57')
-
-build() {
-  cd "${srcdir}/refocus-${pkgver}"
-  patch -Np0 -i ../refocus-gimp-2.0.patch
-  patch -Np0 -i ../refocus-mirror-fix.patch
-  patch -Np0 -i ../refocus-gimp-preview.patch
-  aclocal
-  autoconf
-  automake --add-missing
-  ./configure --prefix=/usr --bindir=/usr/lib/gimp/2.0/plug-ins
-  make
-}
-
-package() {
-  cd "${srcdir}/refocus-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/gimp-refocus/refocus-gimp-2.0.patch b/extra/gimp-refocus/refocus-gimp-2.0.patch
deleted file mode 100644
index 259ee9f87..000000000
--- a/extra/gimp-refocus/refocus-gimp-2.0.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvsroot/refocus/refocus/configure.in,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 configure.in
---- configure.in	30 Jan 2003 21:29:29 -0000	1.1.1.1
-+++ configure.in	6 Apr 2004 20:26:54 -0000
-@@ -1,8 +1,8 @@
- dnl Process this file with autoconf to produce a configure script.
- 
--AC_INIT(README)
--
--AM_INIT_AUTOMAKE(refocus, 0.9.0)
-+AC_INIT([refocus],[0.9.0])
-+AC_CONFIG_SRCDIR(README)
-+AM_INIT_AUTOMAKE
- 
- AC_PROG_CC
- AC_CHECK_PROG(GCC3, gcc3, gcc3)
-@@ -12,7 +12,7 @@
-    AC_MSG_RESULT([using $CC as compiler])
- fi
- 
--AC_STDC_HEADERS
-+AC_HEADER_STDC([])
- AC_PROG_RANLIB
- 
- # Check if the user has ATLAS installed in ./lib-atlas
-@@ -36,7 +36,7 @@
- AC_SUBST(LAPACK_INCLUDE_DIR)
- AM_CONDITIONAL(HAVE_ATLAS, test x${have_atlas} = xyes)
- 
--AM_PATH_GIMP(1.2.0)
-+AM_PATH_GIMP_2_0(2.0.0)
- AM_PATH_GTK_2_0(2.0.0)
- AM_PATH_GLIB_2_0(2.0.0)
- 
-@@ -106,5 +106,6 @@
- #Check if erf is defined in the mathlibrary
- AC_CHECK_LIB(m, erf, AC_DEFINE(HAVE_ERF))
- 
--AC_OUTPUT([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ])
-+AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ])
-+AC_OUTPUT
- 
-Index: lib/Makefile.am
-===================================================================
-RCS file: /cvsroot/refocus/refocus/lib/Makefile.am,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 Makefile.am
---- lib/Makefile.am	30 Jan 2003 21:29:52 -0000	1.1.1.1
-+++ lib/Makefile.am	6 Apr 2004 20:26:55 -0000
-@@ -1,4 +1,4 @@
--CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops
-+AM_CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops
- 
- 
- noinst_LIBRARIES = liblapack.a libatlas.a libcblas.a
-Index: src/Makefile.am
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/Makefile.am,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 Makefile.am
---- src/Makefile.am	30 Jan 2003 21:30:18 -0000	1.1.1.1
-+++ src/Makefile.am	6 Apr 2004 20:26:55 -0000
-@@ -11,7 +11,7 @@
- EXTRA_DIST = dummy-plugin.c
- 
- refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c
--refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas}
-+refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas}
- refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a
- 
- test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c
-Index: src/gimppreview.c
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/gimppreview.c,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 gimppreview.c
---- src/gimppreview.c	30 Jan 2003 21:30:18 -0000	1.1.1.1
-+++ src/gimppreview.c	6 Apr 2004 20:26:55 -0000
-@@ -344,7 +344,7 @@
- 
-   /* Save the drawable info. */
-   preview->drawable = drawable;
--  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->id);
-+  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
- 
-   /* Calculate our preview size. */
-   if (preview_size == PREVIEW_FIXED_SIZE)
-Index: src/prevman.c
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/prevman.c,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 prevman.c
---- src/prevman.c	30 Jan 2003 21:30:18 -0000	1.1.1.1
-+++ src/prevman.c	6 Apr 2004 20:26:56 -0000
-@@ -52,7 +52,7 @@
-   tile_source->width = drawable->width;
-   tile_source->height = drawable->height;
-   tile_source->bpp = drawable->bpp;
--  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->id);
-+  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
-   tile_source->un.drw.drawable = drawable;
-   gimp_pixel_rgn_init (&tile_source->un.drw.pixel_rgn, drawable, x, y, width,
-                        height, FALSE, FALSE);
-@@ -144,7 +144,7 @@
-   tile_sink->width = drawable->width;
-   tile_sink->height = drawable->height;
-   tile_sink->bpp = drawable->bpp;
--  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
-+  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
-   gimp_pixel_rgn_init (&tile_sink->un.drw.pixel_rgn, drawable, x, y, width,
-                        height, TRUE, TRUE);
- }
-@@ -159,7 +159,7 @@
-   tile_sink->width = width;
-   tile_sink->height = height;
-   tile_sink->bpp = drawable->bpp;
--  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
-+  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
-   tile_sink->un.prv.data = g_new (guchar,
-                                   tile_sink->width * tile_sink->height *
-                                   tile_sink->bpp);
-Index: src/refocus.c
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/refocus.c,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 refocus.c
---- src/refocus.c	30 Jan 2003 21:30:19 -0000	1.1.1.1
-+++ src/refocus.c	6 Apr 2004 20:26:56 -0000
-@@ -45,9 +45,9 @@
- 
- /* Declare local functions. */
- static void query (void);
--static void run (char *name,
-+static void run (const gchar *name,
-                  gint nparams,
--                 GimpParam * param,
-+                 const GimpParam * param,
-                  gint * nreturn_vals, GimpParam ** return_vals);
- static gint dialog ();
- static void doit (void);
-@@ -111,7 +111,6 @@
-     {GIMP_PDB_FLOAT, "noise", "Noise to Signal ratio"},
-   };
-   static GimpParamDef *return_vals = NULL;
--  static gint nargs = (gint) (sizeof (args) / sizeof (args[0]));
-   static gint nreturn_vals = 0;
- 
-   gimp_install_procedure ("plug_in_refocus",
-@@ -123,15 +122,15 @@
-                           "<Image>/Filters/Enhance/Refocus ...",
-                           "RGB*, GRAY*",
-                           GIMP_PLUGIN,
--                          nargs, nreturn_vals, args, return_vals);
-+                          G_N_ELEMENTS(args), nreturn_vals, args, return_vals);
- }
- 
- static void
--run (char *name, gint n_params, GimpParam * param,
-+run (const gchar *name, gint n_params, const GimpParam * param,
-      gint * nreturn_vals, GimpParam ** return_vals)
- {
-   static GimpParam values[1];
--  GimpRunModeType run_mode;
-+  GimpRunMode run_mode;
-   GimpPDBStatusType status = GIMP_PDB_SUCCESS;
- 
-   (void) name;                  /* Shut up warnings about unused parameters. */
-@@ -186,8 +185,8 @@
-     {
- 
-       /*  Make sure that the drawable is gray or RGB color  */
--      if (gimp_drawable_is_rgb (drawable->id) ||
--          gimp_drawable_is_gray (drawable->id))
-+      if (gimp_drawable_is_rgb (drawable->drawable_id) ||
-+          gimp_drawable_is_gray (drawable->drawable_id))
-         {
-           doit ();
- 
-@@ -411,7 +410,7 @@
-           event_is_current =
-             gimp_preview_draw_unscaled_row (GIMP_PREVIEW (my_widgets.preview),
-                                             event->event_id,
--                                            gimp_drawable_type (drawable->id),
-+                                            gimp_drawable_type (drawable->drawable_id),
-                                             row, buf);
-         };
-       g_free (buf);
-@@ -608,7 +607,7 @@
-   gimp_progress_init ("Computing matrix");
-   update_matrix ();
-   gimp_progress_init ("Applying convolution");
--  gimp_drawable_mask_bounds (drawable->id, &sx1, &sy1, &sx2, &sy2);
-+  gimp_drawable_mask_bounds (drawable->drawable_id, &sx1, &sy1, &sx2, &sy2);
-   width = sx2 - sx1;
-   height = sy2 - sy1;
-   tile_source_init_from_drawable (&source, drawable, sx1, sy1, width, height);
-@@ -618,7 +617,7 @@
-                   matrix, 2 * my_config.mat_width + 1,
-                   &update_progress_closure);
-   gimp_drawable_flush (drawable);
--  gimp_drawable_merge_shadow (drawable->id, TRUE);
--  gimp_drawable_update (drawable->id, sx1, sy1, width, height);
-+  gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
-+  gimp_drawable_update (drawable->drawable_id, sx1, sy1, width, height);
-   g_free (matrix);
- }
diff --git a/extra/gimp-refocus/refocus-gimp-preview.patch b/extra/gimp-refocus/refocus-gimp-preview.patch
deleted file mode 100644
index 089365dcb..000000000
--- a/extra/gimp-refocus/refocus-gimp-preview.patch
+++ /dev/null
@@ -1,440 +0,0 @@
-diff -ur src/gimppreview.c src/gimppreview.c
---- src/gimppreview.c	2008-03-17 17:20:49.000000000 -0700
-+++ src/gimppreview.c	2008-03-17 17:15:51.000000000 -0700
-@@ -36,18 +36,18 @@
- #include "gimppreview.h"
- 
- 
--static void gimp_preview_init (GimpPreview * preview);
--static void gimp_preview_class_init (GimpPreviewClass * klass);
-+static void gimp_preview_init (RefocusPreview * preview);
-+static void gimp_preview_class_init (RefocusPreviewClass * klass);
- 
- static void gimp_preview_plus_callback (GtkWidget * widget, gpointer data);
- static void gimp_preview_minus_callback (GtkWidget * widget, gpointer data);
- static gint gimp_preview_event (GtkWidget * widget, GdkEvent * event,
-                                 gpointer data);
--static void gimp_preview_recompute_sizes (GimpPreview * preview,
-+static void gimp_preview_recompute_sizes (RefocusPreview * preview,
-                                           gdouble newscale);
--static void gimp_preview_update_preview (GimpPreview * preview);
-+static void gimp_preview_update_preview (RefocusPreview * preview);
- 
--static void gimp_preview_image_set_size (GimpPreview * preview, gint width,
-+static void gimp_preview_image_set_size (RefocusPreview * preview, gint width,
-                                          gint height);
- static void gimp_preview_size_request (GtkWidget * widget,
-                                        GtkRequisition * requisition);
-@@ -58,7 +58,7 @@
-                                  GtkCallback callback,
-                                  gpointer callback_data);
- gboolean gimp_preview_update_preview_idle_fun (gpointer data);
--void gimp_preview_schedule_update (GimpPreview * preview);
-+void gimp_preview_schedule_update (RefocusPreview * preview);
- 
- #define PROGRESS_BAR_HEIGHT (10)
- #define PREVIEW_SIZE (100)
-@@ -94,11 +94,11 @@
- 
- 
- /*
-- * Apps which use a GimpPreview widget should not be accessing the private
-+ * Apps which use a RefocusPreview widget should not be accessing the private
-  * data!
-  */
- #define PREVIEW_DATA(preview) \
--        ((GimpPreviewData*)(GIMP_PREVIEW (preview)->private_data))
-+        ((RefocusPreviewData*)(GIMP_PREVIEW (preview)->private_data))
- 
- typedef struct
- {
-@@ -126,7 +126,7 @@
-   GtkWidget *image;
-   GtkWidget *progress_bar;
- }
--GimpPreviewData;
-+RefocusPreviewData;
- 
- 
- /* Convert coordinate in preview space to image coordinates */
-@@ -155,20 +155,20 @@
-   if (!preview_type)
-     {
-       GTypeInfo preview_info = {
--        sizeof (GimpPreviewClass),
-+        sizeof (RefocusPreviewClass),
-         (GBaseInitFunc) NULL,
-         (GBaseFinalizeFunc) NULL,
-         (GClassInitFunc) gimp_preview_class_init,
-         (GClassFinalizeFunc) NULL,
-         (gconstpointer) NULL,   /* class_data */
--        sizeof (GimpPreview),
-+        sizeof (RefocusPreview),
-         0,                      /* n_preallocs */
-         (GInstanceInitFunc) gimp_preview_init,
-         (GTypeValueTable *) NULL /* value_table */
-       };
- 
-       preview_type =
--        g_type_register_static (GTK_TYPE_CONTAINER, "GimpPreview",
-+        g_type_register_static (GTK_TYPE_CONTAINER, "RefocusPreview",
-                                 &preview_info, 0);
-     }
- 
-@@ -181,7 +181,7 @@
-  * by GTK's internal mechanisms.
-  */
- static void
--gimp_preview_class_init (GimpPreviewClass * klass)
-+gimp_preview_class_init (RefocusPreviewClass * klass)
- {
-   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-   GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-@@ -190,7 +190,7 @@
-     g_signal_new ("update_preview",
-                   G_TYPE_FROM_CLASS (klass),
-                   G_SIGNAL_RUN_FIRST,
--                  G_STRUCT_OFFSET (GimpPreviewClass, update_preview),
-+                  G_STRUCT_OFFSET (RefocusPreviewClass, update_preview),
-                   NULL,
-                   NULL,
-                   g_cclosure_marshal_VOID__POINTER,
-@@ -200,7 +200,7 @@
-     g_signal_new ("preview_changed",
-                   G_TYPE_FROM_CLASS (klass),
-                   G_SIGNAL_RUN_FIRST,
--                  G_STRUCT_OFFSET (GimpPreviewClass, preview_changed),
-+                  G_STRUCT_OFFSET (RefocusPreviewClass, preview_changed),
-                   NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
- 
-   klass->update_preview = NULL;
-@@ -212,7 +212,7 @@
- 
- 
- void
--gimp_preview_set_scale_amount(GimpPreview *preview, gdouble scale_amount)
-+gimp_preview_set_scale_amount(RefocusPreview *preview, gdouble scale_amount)
- {
-   /*
-    * If the caller wants to set the scale amount, let them do so.
-@@ -269,7 +269,7 @@
-  * by GTK's internal mechanisms.
-  */
- static void
--gimp_preview_init (GimpPreview * preview)
-+gimp_preview_init (RefocusPreview * preview)
- {
-   gchar buffer[10];
- 
-@@ -277,7 +277,7 @@
-   GTK_WIDGET_SET_FLAGS (preview, GTK_NO_WINDOW);
-   GTK_CONTAINER (preview)->resize_mode = GTK_RESIZE_IMMEDIATE;
- 
--  preview->private_data = g_malloc0 (sizeof (GimpPreviewData));
-+  preview->private_data = g_malloc0 (sizeof (RefocusPreviewData));
- 
- 
-   PREVIEW_DATA (preview)->label = gtk_label_new ("");
-@@ -307,7 +307,7 @@
- gimp_preview_new_with_args (GimpDrawable * drawable, gint cb_preview_size,
-                             gdouble cb_scale_amount, gint cb_allow_scale)
- {
--  GimpPreview *preview;
-+  RefocusPreview *preview;
-   GtkWidget *frame;
-   GtkWidget *hbox;
-   GtkWidget *event_box;
-@@ -454,7 +454,7 @@
- static void
- gimp_preview_size_request (GtkWidget * widget, GtkRequisition * requisition)
- {
--  GimpPreview *preview = GIMP_PREVIEW (widget);
-+  RefocusPreview *preview = GIMP_PREVIEW (widget);
-   GtkRequisition resize_box_requisition;
- 
- #ifdef PREVIEW_DEBUG
-@@ -478,7 +478,7 @@
- static void
- gimp_preview_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
- {
--  GimpPreview *preview = GIMP_PREVIEW (widget);
-+  RefocusPreview *preview = GIMP_PREVIEW (widget);
-   GtkAllocation resize_box_allocation, progress_bar_allocation,
-     event_box_allocation;
-   GtkRequisition resize_box_requisition;
-@@ -543,7 +543,7 @@
-                      gboolean include_internals,
-                      GtkCallback callback, gpointer callback_data)
- {
--  GimpPreview *preview = GIMP_PREVIEW (container);
-+  RefocusPreview *preview = GIMP_PREVIEW (container);
- 
-   if (PREVIEW_DATA (preview)->resize_box)
-     {
-@@ -564,7 +564,7 @@
-  * Plug-ins call this to do an update of the preview area.
-  */
- void
--gimp_preview_update (GimpPreview * preview)
-+gimp_preview_update (RefocusPreview * preview)
- {
-   gimp_preview_recompute_sizes (preview, preview->scale);
-   gimp_preview_update_preview (preview);
-@@ -579,7 +579,7 @@
- static void
- gimp_preview_plus_callback (GtkWidget * widget, gpointer data)
- {
--  GimpPreview *preview;
-+  RefocusPreview *preview;
-   gchar buffer[10];
-   gdouble new_scale;
- 
-@@ -616,7 +616,7 @@
- static void
- gimp_preview_minus_callback (GtkWidget * widget, gpointer data)
- {
--  GimpPreview *preview;
-+  RefocusPreview *preview;
-   gchar buffer[10];
-   gdouble new_scale;
- 
-@@ -651,7 +651,7 @@
- static gint
- gimp_preview_event (GtkWidget * widget, GdkEvent * event, gpointer data)
- {
--  GimpPreview *preview;
-+  RefocusPreview *preview;
-   GdkEventButton *button_event;
-   gint x, y;
-   gint dx, dy;
-@@ -733,7 +733,7 @@
-  * This function is also used for initializing the preview.
-  */
- static void
--gimp_preview_recompute_sizes (GimpPreview * preview, gdouble new_scale)
-+gimp_preview_recompute_sizes (RefocusPreview * preview, gdouble new_scale)
- {
- 
-   /* The center of the preview in image coordinates.
-@@ -765,7 +765,7 @@
- }
- 
- void
--gimp_preview_generate_update_event (GimpPreview * preview)
-+gimp_preview_generate_update_event (RefocusPreview * preview)
-      /* Signal the user that the preview must be updated */
- {
-   const gdouble scale = preview->scale;
-@@ -783,7 +783,7 @@
-            0,
-            preview->drawable->height - image_y);
- 
--  GimpPreviewEvent preview_event;
-+  RefocusPreviewEvent preview_event;
- 
-   preview_event.event_id = PREVIEW_DATA (preview)->current_event_id;
-   preview_event.scale = preview->scale;
-@@ -814,7 +814,7 @@
-  * to step through source and destination!
-  */
- static void
--gimp_preview_update_preview (GimpPreview * preview)
-+gimp_preview_update_preview (RefocusPreview * preview)
- {
-   GimpPixelRgn region;
-   guchar *image_data = NULL;
-@@ -1012,7 +1012,7 @@
- 
- 
- void
--gimp_preview_force_redraw (GimpPreview * preview)
-+gimp_preview_force_redraw (RefocusPreview * preview)
- {
-   gtk_widget_queue_draw (GTK_WIDGET (PREVIEW_DATA (preview)->image));
- }
-@@ -1022,7 +1022,7 @@
- gboolean
- gimp_preview_update_preview_idle_fun (gpointer data)
- {
--  GimpPreview *preview = GIMP_PREVIEW (data);
-+  RefocusPreview *preview = GIMP_PREVIEW (data);
-   gint event_id = PREVIEW_DATA (preview)->current_event_id;
- 
- #ifdef PREVIEW_DEBUG
-@@ -1041,7 +1041,7 @@
- }
- 
- void
--gimp_preview_schedule_update (GimpPreview * preview)
-+gimp_preview_schedule_update (RefocusPreview * preview)
- {
-   PREVIEW_DATA (preview)->current_event_id++;
- 
-@@ -1082,7 +1082,7 @@
- }
- 
- void
--gimp_preview_image_set_size (GimpPreview * preview, gint width, gint height)
-+gimp_preview_image_set_size (RefocusPreview * preview, gint width, gint height)
- {
-   const gint real_width = MIN (preview->max_width, width);
-   const gint real_height = MIN (preview->max_height, height);
-@@ -1120,8 +1120,8 @@
- 
- /**
-  * gimp_preview_draw_row:
-- * @preview: the #GimpPreview
-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
-+ * @preview: the #RefocusPreview
-+ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
-  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
-  * @row:the relative number of the row within the preview.
-  * The top row of the preview is number 0.
-@@ -1137,7 +1137,7 @@
-  * with the same event-id will be ignored by the preview.
-  **/
- gboolean
--gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
-+gimp_preview_draw_row (RefocusPreview * preview, const gint event_id,
-                        GimpImageType type, gint row,
-                        const guchar * const data)
- {
-@@ -1247,8 +1247,8 @@
- 
- /**
-  * gimp_preview_draw_unscaled_row:
-- * @preview: the #GimpPreview
-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
-+ * @preview: the #RefocusPreview
-+ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
-  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
-  * @row:row is the relative position of the row w.r.t. preview_event->image_y.
-  * The top row has number 0.
-@@ -1267,7 +1267,7 @@
-  * with the same event-id will be ignored by the preview.
-  **/
- gboolean
--gimp_preview_draw_unscaled_row (GimpPreview * preview, const gint event_id,
-+gimp_preview_draw_unscaled_row (RefocusPreview * preview, const gint event_id,
-                                 GimpImageType type, const gint row,
-                                 const guchar * const data)
- {
-@@ -1445,8 +1445,8 @@
- 
- /**
-  * gimp_preview_progress_set_fraction:
-- * @preview: the #GimpPreview.
-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
-+ * @preview: the #RefocusPreview.
-+ * @event_id: event_id that was sent with the #RefocusPreviewEvent.
-  * @fraction: the fraction completed.
-  *
-  * Set the progress bar of the preview to @fraction completed.
-@@ -1456,7 +1456,7 @@
-  * with the same event-id will be ignored by the preview.
-  **/
- gboolean
--gimp_preview_progress_set_fraction (GimpPreview * preview,
-+gimp_preview_progress_set_fraction (RefocusPreview * preview,
-                                     const gint event_id, double fraction)
- {
-   const gboolean return_status =
-diff -ur src/gimppreview.h src/gimppreview.h
---- src/gimppreview.h	2003-01-30 13:30:18.000000000 -0800
-+++ src/gimppreview.h	2008-03-17 17:16:29.000000000 -0700
-@@ -33,24 +33,24 @@
- #define PREVIEW_FIXED_SIZE           0
- #define PREVIEW_DEFAULT_SIZE         -1
- #define GIMP_TYPE_PREVIEW            (gimp_preview_get_type ())
--#define GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview))
--#define GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, GimpPreviewClass))
-+#define GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, RefocusPreview))
-+#define GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, RefocusPreviewClass))
- #define GIMP_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PREVIEW))
- #define GIMP_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW))
--typedef struct _GimpPreview GimpPreview;
--typedef struct _GimpPreviewClass GimpPreviewClass;
--typedef struct _GimpPreviewEvent GimpPreviewEvent;
-+typedef struct _RefocusPreview RefocusPreview;
-+typedef struct _RefocusPreviewClass RefocusPreviewClass;
-+typedef struct _RefocusPreviewEvent RefocusPreviewEvent;
- 
--struct _GimpPreviewClass
-+struct _RefocusPreviewClass
- {
-   GtkContainerClass parent_class;
- 
--  void (*update_preview) (GimpPreview * preview, GimpPreviewEvent * event);
--  void (*preview_changed) (GimpPreview * preview);
-+  void (*update_preview) (RefocusPreview * preview, RefocusPreviewEvent * event);
-+  void (*preview_changed) (RefocusPreview * preview);
- };
- 
- 
--struct _GimpPreview
-+struct _RefocusPreview
- {
-   GtkContainer parent;
- 
-@@ -75,13 +75,13 @@
- };
- 
- /**
-- * GimpPreviewEvent:
-+ * RefocusPreviewEvent:
-  * @event_id: Id of this event. This is needed for gimp_preview_draw_row,
-  * gimp_preview_draw_unscaled_row and gimp_preview_progress_set_fraction.
-  * @scale: Current scale of the preview.
-  *
-  **/
--struct _GimpPreviewEvent
-+struct _RefocusPreviewEvent
- {
-   gint event_id;                /* Id of this event */
-   gdouble scale;                /* Scale of preview */
-@@ -113,20 +113,20 @@
-                                        gint preview_size,
-                                        gdouble scale_amount,
-                                        gint allow_scale);
--void gimp_preview_update (GimpPreview * preview);
-+void gimp_preview_update (RefocusPreview * preview);
- 
--gboolean gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
-+gboolean gimp_preview_draw_row (RefocusPreview * preview, const gint event_id,
-                                 GimpImageType type, const gint row,
-                                 const guchar * const data);
- 
--gboolean gimp_preview_draw_unscaled_row (GimpPreview * preview,
-+gboolean gimp_preview_draw_unscaled_row (RefocusPreview * preview,
-                                          const gint event_id,
-                                          GimpImageType type, const gint row,
-                                          const guchar * const data);
- 
--void gimp_preview_force_redraw (GimpPreview * preview);
-+void gimp_preview_force_redraw (RefocusPreview * preview);
- 
--gboolean gimp_preview_progress_set_fraction (GimpPreview * preview,
-+gboolean gimp_preview_progress_set_fraction (RefocusPreview * preview,
-                                              const gint event_id,
-                                              double fraction);
- 
-diff -ur src/refocus.c src/refocus.c
---- src/refocus.c	2008-03-17 17:20:49.000000000 -0700
-+++ src/refocus.c	2008-03-17 17:18:48.000000000 -0700
-@@ -25,6 +25,7 @@
- #include <time.h>
- #include <string.h>
- #include <libgimp/gimp.h>
-+#include <libgimp/gimpcompat.h>
- #include <gtk/gtk.h>
- #include <sys/types.h>
- #include <signal.h>
-@@ -372,7 +373,7 @@
- }
- 
- static void
--preview_callback (GtkWidget * widget, GimpPreviewEvent * event, gpointer data)
-+preview_callback (GtkWidget * widget, RefocusPreviewEvent * event, gpointer data)
- {
-   TileSource source;
-   TileSink sink;
diff --git a/extra/gimp-refocus/refocus-mirror-fix.patch b/extra/gimp-refocus/refocus-mirror-fix.patch
deleted file mode 100644
index af79dd893..000000000
--- a/extra/gimp-refocus/refocus-mirror-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: src/tilebuf.c
-===================================================================
-RCS file: /cvsroot/refocus/refocus/src/tilebuf.c,v
-retrieving revision 1.1.1.1
-diff -u -u -r1.1.1.1 tilebuf.c
---- src/tilebuf.c	30 Jan 2003 21:30:19 -0000	1.1.1.1
-+++ src/tilebuf.c	6 Apr 2004 20:26:56 -0000
-@@ -140,7 +140,10 @@
- 
-         for (x = x_lo - 1; x >= buf->real_x; x--)
-           {
--            copy_col (buf, 2 * x_lo - x, y_start, y_end - y_start, x);
-+            gint sx = 2 * x_lo - x;
-+            copy_col (buf,
-+                      sx<=buf->real_x+buf->real_width-1?sx:buf->real_x+buf->real_width-1,
-+                      y_start, y_end - y_start, x);
-           };
-       }
-       break;
-@@ -171,7 +174,9 @@
- 
-         for (x = x_hi; x < buf->real_x + buf->real_width; x++)
-           {
--            copy_col (buf, 2 * (x_hi - 1) - x, y_start, y_end - y_start, x);
-+            gint sx = 2 * (x_hi - 1) - x;
-+            copy_col (buf, sx>=buf->real_x?sx:buf->real_x,
-+                      y_start, y_end - y_start, x);
-           };
-       }
-       break;
-@@ -200,7 +205,10 @@
- 
-         for (y = y_lo - 1; y >= buf->real_y; y--)
-           {
--            copy_row (buf, buf->real_x, 2 * y_lo - y, buf->real_width, y);
-+            gint sy = 2 * y_lo - y;
-+            copy_row (buf, buf->real_x,
-+                      sy<=buf->real_y+buf->real_height-1?sy:buf->real_y+buf->real_height-1,
-+                      buf->real_width, y);
-           };
-       }
-       break;
-@@ -230,8 +238,9 @@
- 
-         for (y = y_hi; y < buf->real_y + buf->real_height; y++)
-           {
--            copy_row (buf, buf->real_x, 2 * (y_hi - 1) - y, buf->real_width,
--                      y);
-+            gint sy = 2 * (y_hi - 1) - y;
-+            copy_row (buf, buf->real_x, sy>=buf->real_y?sy:buf->real_y,
-+                      buf->real_width, y);
-           };
-       }
-       break;
diff --git a/extra/gnuplot/lua_tikz.patch b/extra/gnuplot/lua_tikz.patch
deleted file mode 100644
index f9a939d47..000000000
--- a/extra/gnuplot/lua_tikz.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- term/lua/gnuplot-tikz-444.lua	Sun Nov 13 00:57:15 2011
-+++ term/lua/gnuplot-tikz.lua	Fri Nov 25 01:11:38 2011
-@@ -251,6 +251,7 @@
-   gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))
-   gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",
-       term.gp_version, term.gp_patchlevel,
-+      _VERSION,
-       string.sub(term.lua_term_revision,7,-3),
-       pgf.REVISION,os.date()))
-   if font ~= "" then
-\ No newline at end of file
diff --git a/extra/gnutls/buildfix.diff b/extra/gnutls/buildfix.diff
deleted file mode 100644
index 23c749e9d..000000000
--- a/extra/gnutls/buildfix.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-index 17f6d3f..cc01dcd 100644 (file)
-
-
---- a/tests/mini-loss-time.c
-+++ b/tests/mini-loss-time.c
-@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
-     {
-       /* parent */
-       server (fd[0], server_packet);
-+      kill(child, SIGTERM);
-     }
-   else 
-     {
---- a/src/libopts/m4/libopts.m4
-+++ b/src/libopts/m4/libopts.m4
-@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
-     fi])
- 
-   AC_ARG_ENABLE([libopts-install],
--    AC_HELP_STRING([--disable-libopts-install],
--       [Do not install libopts with client installation]))
--  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
-+    AC_HELP_STRING([--enable-libopts-install],
-+       [Install libopts with client installation]))
-+  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
- 
-   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
-      AC_MSG_CHECKING([whether autoopts-config can be found])
diff --git a/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch b/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch
deleted file mode 100644
index 8ba4c8ed3..000000000
--- a/extra/gstreamer0.10-base/oggstream-fix-crashes-with-0-byte-vorbis-packets.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8bd3bdaf3768b3fb6adc85b3bc681fdce07b786e Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Wed, 03 Aug 2011 08:18:29 +0000
-Subject: oggstream: Fix crashes with 0-byte vorbis packets
-
-Fixes bug #655574.
----
-diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
-index e843f48..77f39d4 100644
---- a/ext/ogg/gstoggstream.c
-+++ b/ext/ogg/gstoggstream.c
-@@ -792,7 +792,7 @@ packet_duration_vorbis (GstOggStream * pad, ogg_packet * packet)
-   int size;
-   int duration;
- 
--  if (packet->packet[0] & 1)
-+  if (packet->bytes == 0 || packet->packet[0] & 1)
-     return 0;
- 
-   mode = (packet->packet[0] >> 1) & ((1 << pad->vorbis_log2_num_modes) - 1);
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch b/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch
deleted file mode 100644
index b9883d407..000000000
--- a/extra/gstreamer0.10-base/theoradec-segfault-on-0-byte-ogg_packet-in-_chain_reverse.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7d22d91fca6b9f24ca205eef98031f1ed6a44d33 Mon Sep 17 00:00:00 2001
-From: Philip Jägenstedt <philipj@opera.com>
-Date: Tue, 26 Jul 2011 14:10:17 +0000
-Subject: theoradec: segfault on 0-byte ogg_packet in _chain_reverse
-
----
-diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c
-index 96e12ee..25d68db 100644
---- a/ext/theora/gsttheoradec.c
-+++ b/ext/theora/gsttheoradec.c
-@@ -1440,7 +1440,7 @@ theora_dec_chain_reverse (GstTheoraDec * dec, gboolean discont, GstBuffer * buf)
- 
-       /* if we copied a keyframe, flush and decode the decode queue */
-       data = GST_BUFFER_DATA (gbuf);
--      if ((data[0] & 0x40) == 0) {
-+      if (data && (data[0] & 0x40) == 0) {
-         GST_DEBUG_OBJECT (dec, "copied keyframe");
-         res = theora_dec_flush_decode (dec);
-       }
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/gv/buildfix.diff b/extra/gv/buildfix.diff
deleted file mode 100644
index 76c88b158..000000000
--- a/extra/gv/buildfix.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644)
-
-http://bugs.gentoo.org/399753
-
---- src/Scrollbar.c
-+++ src/Scrollbar.c
-@@ -1006,7 +1006,7 @@
-    TOPLOC = newtop;
-    SHOWNLENGTH = newbot-newtop+1;
- 
--   (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
-+   (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
- 
-    ENDMESSAGE(Redisplay)
- }
diff --git a/extra/happy/PKGBUILD b/extra/happy/PKGBUILD
deleted file mode 100644
index 062f85e81..000000000
--- a/extra/happy/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 151874 2012-03-03 16:05:59Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
- 
-pkgname=happy
-pkgver=1.18.9
-pkgrel=4
-pkgdesc="The Parser Generator for Haskell"
-url="http://www.haskell.org/happy/"
-arch=('i686' 'x86_64')
-license=("custom:BSD3")
-depends=('gmp')
-makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('aeb565fe572f979f15a24db0df2de37d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  runhaskell Setup.lhs configure -O --prefix=/usr
-  runhaskell Setup.lhs build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  runhaskell Setup.lhs copy --destdir="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/haskell-cgi/PKGBUILD b/extra/haskell-cgi/PKGBUILD
deleted file mode 100644
index 4b64ba578..000000000
--- a/extra/haskell-cgi/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=cgi
-pkgname=haskell-cgi
-pkgver=3001.1.7.4
-pkgrel=3.1
-pkgdesc="A library for writing CGI programs"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-xhtml=3000.2.0.1-7.1')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('0e551afc8d6f39aaa70520e31de26506')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-cgi/haskell-cgi.install b/extra/haskell-cgi/haskell-cgi.install
deleted file mode 100644
index 533fe4dc5..000000000
--- a/extra/haskell-cgi/haskell-cgi.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-cgi
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-deepseq/PKGBUILD b/extra/haskell-deepseq/PKGBUILD
deleted file mode 100644
index 934303f2b..000000000
--- a/extra/haskell-deepseq/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=deepseq
-pkgname=haskell-deepseq
-pkgver=1.1.0.2
-pkgrel=2.1
-pkgdesc="Fully evaluate data structures"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('90b66480f0eb659c1db209ee703e0162')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-deepseq/haskell-deepseq.install b/extra/haskell-deepseq/haskell-deepseq.install
deleted file mode 100644
index 8ba51eac7..000000000
--- a/extra/haskell-deepseq/haskell-deepseq.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-deepseq
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-fgl/PKGBUILD b/extra/haskell-fgl/PKGBUILD
deleted file mode 100644
index 45f466e91..000000000
--- a/extra/haskell-fgl/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=fgl
-pkgname=haskell-fgl
-pkgver=5.4.2.3
-pkgrel=4.1
-pkgdesc="Martin Erwig's Functional Graph Library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c')
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c')
diff --git a/extra/haskell-fgl/haskell-fgl.install b/extra/haskell-fgl/haskell-fgl.install
deleted file mode 100644
index 0da0edb7b..000000000
--- a/extra/haskell-fgl/haskell-fgl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-fgl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-glut/PKGBUILD b/extra/haskell-glut/PKGBUILD
deleted file mode 100644
index 98a30495c..000000000
--- a/extra/haskell-glut/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=GLUT
-pkgname=haskell-glut
-pkgver=2.1.2.1
-pkgrel=7.1
-pkgdesc="A binding for the OpenGL Utility Toolkit"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc=7.0.3-2' 'haskell-opengl=2.2.3.0-7.1' 'freeglut')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('b97f476a04098701e330e86c1f89ed52')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-glut/haskell-glut.install b/extra/haskell-glut/haskell-glut.install
deleted file mode 100644
index 44c7cb3c1..000000000
--- a/extra/haskell-glut/haskell-glut.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-glut
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-haskell-src/PKGBUILD b/extra/haskell-haskell-src/PKGBUILD
deleted file mode 100644
index eeb4844a7..000000000
--- a/extra/haskell-haskell-src/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=haskell-src
-pkgname=haskell-haskell-src
-pkgver=1.0.1.4
-pkgrel=2.1
-pkgdesc="Facilities for manipulating Haskell source code: an abstract syntax, lexer, parser and pretty-printer."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'haskell-syb=0.3-2.1' sh)
-makedepends=(happy)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('32d181c082393ab859e72610803bac6e')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/extra/haskell-haskell-src/haskell-haskell-src.install b/extra/haskell-haskell-src/haskell-haskell-src.install
deleted file mode 100644
index 03ce601bc..000000000
--- a/extra/haskell-haskell-src/haskell-haskell-src.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskell-src
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-html/PKGBUILD b/extra/haskell-html/PKGBUILD
deleted file mode 100644
index 44a3ea50b..000000000
--- a/extra/haskell-html/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=html
-pkgname=haskell-html
-pkgver=1.0.1.2
-pkgrel=10
-pkgdesc="HTML combinator library"
-url="http://hackage.haskell.org/package/html"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-html/haskell-html.install b/extra/haskell-html/haskell-html.install
deleted file mode 100644
index 768297e0a..000000000
--- a/extra/haskell-html/haskell-html.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-html
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-hunit/PKGBUILD b/extra/haskell-hunit/PKGBUILD
deleted file mode 100644
index 401887e4e..000000000
--- a/extra/haskell-hunit/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=HUnit
-pkgname=haskell-hunit
-pkgver=1.2.2.3
-pkgrel=2.1
-pkgdesc="A unit testing framework for Haskell"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('f179add502f88153e5c9fdc69056b657')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-hunit/haskell-hunit.install b/extra/haskell-hunit/haskell-hunit.install
deleted file mode 100644
index ceb108b5b..000000000
--- a/extra/haskell-hunit/haskell-hunit.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hunit
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-opengl/PKGBUILD b/extra/haskell-opengl/PKGBUILD
deleted file mode 100644
index 8d70bbc91..000000000
--- a/extra/haskell-opengl/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=OpenGL
-pkgname=haskell-opengl
-pkgver=2.2.3.0
-pkgrel=7.1
-pkgdesc="A binding for the OpenGL graphics system"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 'mesa')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('f4e3ccb471034a6a74921d4dab9dd32d')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-       --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-opengl/haskell-opengl.install b/extra/haskell-opengl/haskell-opengl.install
deleted file mode 100644
index d0f3474b3..000000000
--- a/extra/haskell-opengl/haskell-opengl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-opengl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-parallel/PKGBUILD b/extra/haskell-parallel/PKGBUILD
deleted file mode 100644
index 0e46c2c93..000000000
--- a/extra/haskell-parallel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=parallel
-pkgname=haskell-parallel
-pkgver=3.1.0.1
-pkgrel=3.1
-pkgdesc="Parallel programming library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh 'haskell-deepseq=1.1.0.2-2.1')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('591979e7897dbc09157edf73a4614957')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-parallel/haskell-parallel.install b/extra/haskell-parallel/haskell-parallel.install
deleted file mode 100644
index e6ec0c449..000000000
--- a/extra/haskell-parallel/haskell-parallel.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-parallel
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-platform/PKGBUILD b/extra/haskell-platform/PKGBUILD
deleted file mode 100644
index 2534d95c2..000000000
--- a/extra/haskell-platform/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-pkgname=haskell-platform
-pkgver=2011.2.0.0
-pkgrel=4
-pkgdesc="The Haskell Platform"
-url="http://hackage.haskell.org/platform/"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' 
-         'haskell-glut=2.1.2.1-7.1' 
-         'haskell-http=4000.1.1-3.1'
-         'haskell-hunit=1.2.2.3-2.1'
-         'haskell-opengl=2.2.3.0-7.1'
-         'haskell-quickcheck=2.4.0.1-3.1'
-         'haskell-cgi=3001.1.7.4-3.1'
-         'haskell-deepseq=1.1.0.2-2.1'
-         'haskell-fgl=5.4.2.3-4.1'
-         'haskell-haskell-src=1.0.1.4-2.1'
-         'haskell-html=1.0.1.2-9.1'
-         'haskell-mtl=2.0.1.0-3.1'
-         'haskell-network=2.3.0.2-2.1'
-         'haskell-parallel=3.1.0.1-3.1'
-         'haskell-parsec=3.1.1-2.1'
-         'haskell-regex-base=0.93.2-4.1'
-         'haskell-regex-posix=0.94.4-2.1'
-         'haskell-regex-compat=0.93.1-4.1'	
-         'haskell-stm=2.2.0.1-2.1'
-         'haskell-syb=0.3-2.1'
-         'haskell-text=0.11.0.5-2.1'
-         'haskell-transformers=0.2.2.0-3.1'
-         'haskell-xhtml=3000.2.0.1-7.1'
-         'haskell-zlib=0.5.3.1-2.1'
-         'cabal-install=0.10.2'
-         'alex=2.3.5'
-         'happy=1.18.6' )
-
-build() {
-  return 0 
-}
diff --git a/extra/haskell-quickcheck/PKGBUILD b/extra/haskell-quickcheck/PKGBUILD
deleted file mode 100644
index 7b27cfb0c..000000000
--- a/extra/haskell-quickcheck/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=QuickCheck
-pkgname=haskell-quickcheck
-pkgver=2.4.2
-pkgrel=1
-pkgdesc="Automatic testing of Haskell programs"
-url="http://hackage.haskell.org/package/QuickCheck"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-quickcheck/haskell-quickcheck.install b/extra/haskell-quickcheck/haskell-quickcheck.install
deleted file mode 100644
index c9e12fadc..000000000
--- a/extra/haskell-quickcheck/haskell-quickcheck.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-quickcheck
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-regex-base/PKGBUILD b/extra/haskell-regex-base/PKGBUILD
deleted file mode 100644
index 3b8ecb4bb..000000000
--- a/extra/haskell-regex-base/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-base
-pkgname=haskell-regex-base
-pkgver=0.93.2
-pkgrel=5
-pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' sh 'haskell-mtl=2.0.1.0-4')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-regex-base/haskell-regex-base.install b/extra/haskell-regex-base/haskell-regex-base.install
deleted file mode 100644
index 3ad2fea28..000000000
--- a/extra/haskell-regex-base/haskell-regex-base.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-base
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-regex-compat/PKGBUILD b/extra/haskell-regex-compat/PKGBUILD
deleted file mode 100644
index c880ff4f2..000000000
--- a/extra/haskell-regex-compat/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-compat
-pkgname=haskell-regex-compat
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d0573ab4e2f3de5faa61380b67333320')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-regex-compat/haskell-regex-compat.install b/extra/haskell-regex-compat/haskell-regex-compat.install
deleted file mode 100644
index 898c0bba1..000000000
--- a/extra/haskell-regex-compat/haskell-regex-compat.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-compat
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-regex-posix/PKGBUILD b/extra/haskell-regex-posix/PKGBUILD
deleted file mode 100644
index 1bed15490..000000000
--- a/extra/haskell-regex-posix/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-posix
-pkgname=haskell-regex-posix
-pkgver=0.95.1
-pkgrel=1
-pkgdesc="The posix regex backend for regex-base"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('41cbc6d2b99837b64e0cc457c2737cc8')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-regex-posix/haskell-regex-posix.install b/extra/haskell-regex-posix/haskell-regex-posix.install
deleted file mode 100644
index 2b89fae7b..000000000
--- a/extra/haskell-regex-posix/haskell-regex-posix.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-posix
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-stm/PKGBUILD b/extra/haskell-stm/PKGBUILD
deleted file mode 100644
index 9a9c9a962..000000000
--- a/extra/haskell-stm/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=stm
-pkgname=haskell-stm
-pkgver=2.2.0.1
-pkgrel=2.1
-pkgdesc="A modular composable concurrency abstraction."
-url="http://hackage.haskell.org/package/stm"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('b1cf03ed315e00c33160746feeee8682')
-
-build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-stm/haskell-stm.install b/extra/haskell-stm/haskell-stm.install
deleted file mode 100644
index 0283c2fc5..000000000
--- a/extra/haskell-stm/haskell-stm.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-stm
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-syb/PKGBUILD b/extra/haskell-syb/PKGBUILD
deleted file mode 100644
index 64faf05ed..000000000
--- a/extra/haskell-syb/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=syb
-pkgname=haskell-syb
-pkgver=0.3
-pkgrel=2.1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.0.3-2' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('c4f6771fa32d467a029e6e813757a9fe')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/extra/haskell-syb/haskell-syb.install b/extra/haskell-syb/haskell-syb.install
deleted file mode 100644
index 080055165..000000000
--- a/extra/haskell-syb/haskell-syb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-syb
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/haskell-xhtml/PKGBUILD b/extra/haskell-xhtml/PKGBUILD
deleted file mode 100644
index 4a34206ad..000000000
--- a/extra/haskell-xhtml/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=xhtml
-pkgname=haskell-xhtml
-pkgver=3000.2.0.1
-pkgrel=7.1
-pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants."
-url="http://hackage.haskell.org/package/xhtml"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=(ghc=7.0.3-2 sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('9e3e7d9c66618c5e29716f90e54363c9')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/extra/haskell-xhtml/haskell-xhtml.install b/extra/haskell-xhtml/haskell-xhtml.install
deleted file mode 100644
index d03b8a053..000000000
--- a/extra/haskell-xhtml/haskell-xhtml.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-xhtml
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/extra/imake/xorg-cf-files-1.0.2-xprint.patch b/extra/imake/xorg-cf-files-1.0.2-xprint.patch
deleted file mode 100644
index 3926d724a..000000000
--- a/extra/imake/xorg-cf-files-1.0.2-xprint.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- xorg-cf-files-1.0.3/X11.tmpl.xprint	2005-10-01 12:45:48.000000000 -0400
-+++ xorg-cf-files-1.0.3/X11.tmpl	2006-04-25 20:24:02.000000000 -0400
-@@ -3920,21 +3920,13 @@
- #endif
- 
- #ifndef ExtraXawReqs
--# if BuildXaw
--#  define ExtraXawReqs $(XPLIB)
--# else
--#  define ExtraXawReqs /**/
--# endif
-+# define ExtraXawReqs /**/
- #endif
- 
- EXTRAXAWREQS = ExtraXawReqs
- 
- #ifndef ExtraXawClientDepLibs
--# if BuildXaw
--#  define ExtraXawClientDepLibs $(DEPXPLIB)
--# else
--#  define ExtraXawClientDepLibs /**/
--# endif
-+# define ExtraXawClientDepLibs /**/
- #endif
- 
- EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs
-@@ -3944,11 +3936,7 @@
- #endif
- 
- #ifndef ExtraXawClientLibs
--# if BuildXaw
--#  define ExtraXawClientLibs $(XPLIB)
--# else
--#  define ExtraXawClientLibs /**/
--# endif
-+# define ExtraXawClientLibs /**/
- #endif
- 
- EXTRAXAWCLIENTLIBS = ExtraXawClientLibs
diff --git a/extra/iperf/license b/extra/iperf/license
deleted file mode 100644
index e31f98080..000000000
--- a/extra/iperf/license
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 1999-2006, The Board of Trustees of the University of Illinois
-All Rights Reserved.
-
-Iperf performance test
-Mark Gates
-Ajay Tirumala
-Jim Ferguson
-Jon Dugan
-Feng Qin
-Kevin Gibbs
-John Estabrook
-National Laboratory for Applied Network Research
-National Center for Supercomputing Applications
-University of Illinois at Urbana-Champaign
-http://www.ncsa.uiuc.edu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software (Iperf) and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
-
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
-
-    * Neither the names of the University of Illinois, NCSA, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. 
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/extra/kdebase/fix-controlclick-selection.patch b/extra/kdebase/fix-controlclick-selection.patch
deleted file mode 100644
index a51161326..000000000
--- a/extra/kdebase/fix-controlclick-selection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
-+++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp
-@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven
-                                 (!shiftOrControlPressed && !pressedItemAlreadySelected);
-     if (clearSelection) {
-         m_selectionManager->clearSelection();
--    } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) {
-+    } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) {
-         // The user might want to start dragging multiple items, but if he clicks the item
-         // in order to trigger it instead, the other selected items must be deselected.
-         // However, we do not know yet what the user is going to do.
diff --git a/extra/kdeedu-marble/fix-with-qt48.patch b/extra/kdeedu-marble/fix-with-qt48.patch
deleted file mode 100644
index 3694a48fb..000000000
--- a/extra/kdeedu-marble/fix-with-qt48.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 79c39f45468bace95169d1ba959884ce27087d1e
-Author: Torsten Rahn <rahn@kde.org>
-Date:   Wed Feb 8 17:18:15 2012 +0100
-
-    Fixes for Marble with Qt 4.8:
-    
-    - Provide proper colors for Marble's Atlas, Temperature,
-      Precipitation and Venus/Mars Topography maps.
-      ( due to introduction of QImage::fill( QColor ) overload )
-    
-    - Show proper icons for MarbleLegendBrowser
-      ( due to new interpretation of the "current directory" in
-        QTextBrowser )
-
-diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
-index 4a25095..ffa0a23 100644
---- a/src/lib/MarbleLegendBrowser.cpp
-+++ b/src/lib/MarbleLegendBrowser.cpp
-@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend()
-     t.start();
- 
-     // Read the html string.
--    QString finalHtml;
-+    QString legendPath;
- 
-     // Check for a theme specific legend.html first
-     if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 )
-     {
-         GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme();
- 
--        QString customLegendPath = MarbleDirs::path( "maps/" + 
-+        legendPath = MarbleDirs::path( "maps/" + 
-         currentMapTheme->head()->target() + '/' + 
-         currentMapTheme->head()->theme() + "/legend.html" ); 
--        if ( !customLegendPath.isEmpty() )
--            finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath  ) );
--        else
--            finalHtml.clear();
-     }
--
--    if ( finalHtml.isEmpty() ) {
--        finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) );
-+    if ( legendPath.isEmpty() ) {
-+	legendPath = MarbleDirs::path( "legend.html" ); 
-     }
- 
-+    QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) );
-+    finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' );
-+
-     // Generate some parts of the html from the MapTheme <Legend> tag. 
-     const QString sectionsHtml = generateSectionsHtml();
- 
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index 4a4f8f3..d0deead 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
-         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
- 
-     // update coast image
--    m_coastImage.fill( Qt::transparent );
-+    m_coastImage.fill( QColor( 0, 0, 255, 0) );
- 
-     bool doClip = false; //assume false
-     switch( viewport->projection() ) {
-commit b89ff577fcbd085fbd180f59aa669dded1818082
-Author: Bernhard Beschow <bbeschow@cs.tu-berlin.de>
-Date:   Wed Feb 8 18:14:59 2012 +0100
-
-    compile with Qt < 4.8
-    
-    * take into account the comment in the API doc, which suggests to use QColor::rgb()
-    (cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9)
-
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index d0deead..9319a89 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
-         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
- 
-     // update coast image
--    m_coastImage.fill( QColor( 0, 0, 255, 0) );
-+    m_coastImage.fill( QColor( 0, 0, 255, 0).rgb() );
- 
-     bool doClip = false; //assume false
-     switch( viewport->projection() ) {
diff --git a/extra/kdeutils-printer-applet/PKGBUILD b/extra/kdeutils-printer-applet/PKGBUILD
deleted file mode 100644
index c80b49411..000000000
--- a/extra/kdeutils-printer-applet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 153227 2012-03-12 09:46:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-printer-applet
-pkgver=4.8.1
-pkgrel=1
-pkgdesc='System tray icon for managing print jobs'
-url='http://kde.org/applications/system/printerapplet/'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/stable/${pkgver}/src/printer-applet-${pkgver}.tar.xz")
-sha1sums=('c3002fea0382386256c3acaebd907a41db0ccc4e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../printer-applet-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-}
diff --git a/extra/kdevplatform/subversion17.patch b/extra/kdevplatform/subversion17.patch
deleted file mode 100644
index 782ac38ea..000000000
--- a/extra/kdevplatform/subversion17.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-commit 74dec52749e3c3af2ac6492f50e2676128f35b27
-Author: Milian Wolff <mail@milianw.de>
-Date:   Fri Nov 18 16:26:06 2011 +0100
-
-    fix svn api usage: use svn_dirent_canonicalize instead of svn_path_internal_style
-    
-    this was suggested by Stephan Sperling
-    
-    CCBUG: 284061
-
-diff --git a/plugins/subversion/kdevsvncpp/path.cpp b/plugins/subversion/kdevsvncpp/path.cpp
-index eaa84c1..4dced08 100644
---- a/plugins/subversion/kdevsvncpp/path.cpp
-+++ b/plugins/subversion/kdevsvncpp/path.cpp
-@@ -24,6 +24,7 @@
- 
- // subversion api
- #include "svn_path.h"
-+#include "svn_dirent_uri.h"
- 
- // apr api
- #include "apr_file_io.h"
-@@ -63,8 +64,7 @@ namespace svn
-       m_path = "";
-     else
-     {
--      const char * int_path =
--        svn_path_internal_style(path, pool.pool());
-+      const char * int_path = svn_dirent_canonicalize(path, pool);
- 
-       m_path = int_path;
- 
-commit cc7f0798d314cdac14b90e427abe22e99c6bd591
-Author: Milian Wolff <mail@milianw.de>
-Date:   Fri Nov 18 16:23:36 2011 +0100
-
-    properly initialize client context for compatibility with subversion API
-    
-    this should hopefully fix the crash with svn 1.7 in kdevelop, please test
-    
-    BUG: 284061
-
-diff --git a/plugins/subversion/kdevsvncpp/context.cpp b/plugins/subversion/kdevsvncpp/context.cpp
-index d277591..ddbb657 100644
---- a/plugins/subversion/kdevsvncpp/context.cpp
-+++ b/plugins/subversion/kdevsvncpp/context.cpp
-@@ -65,7 +65,7 @@ public:
-     bool logIsSet;
-     int promptCounter;
-     Pool pool;
--    svn_client_ctx_t ctx;
-+    svn_client_ctx_t * ctx;
-     std::string username;
-     std::string password;
-     std::string logMessage;
-@@ -205,26 +205,26 @@ public:
-       svn_auth_open(&ab, providers, pool);
- 
-       // initialize ctx structure
--      memset(&ctx, 0, sizeof(ctx));
-+      svn_client_create_context(&ctx, pool);
- 
-       // get the config based on the configDir passed in
--      svn_config_get_config(&ctx.config, c_configDir, pool);
-+      svn_config_get_config(&ctx->config, c_configDir, pool);
- 
-       // tell the auth functions where the config is
-       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR,
-                              c_configDir);
- 
--      ctx.auth_baton = ab;
--      ctx.log_msg_func = onLogMsg;
--      ctx.log_msg_baton = this;
--      ctx.notify_func = onNotify;
--      ctx.notify_baton = this;
--      ctx.cancel_func = onCancel;
--      ctx.cancel_baton = this;
-+      ctx->auth_baton = ab;
-+      ctx->log_msg_func = onLogMsg;
-+      ctx->log_msg_baton = this;
-+      ctx->notify_func = onNotify;
-+      ctx->notify_baton = this;
-+      ctx->cancel_func = onCancel;
-+      ctx->cancel_baton = this;
- 
- #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2)
--      ctx.notify_func2 = onNotify2;
--      ctx.notify_baton2 = this;
-+      ctx->notify_func2 = onNotify2;
-+      ctx->notify_baton2 = this;
- #endif
-     }
- 
-@@ -234,7 +234,7 @@ public:
-       if (!value)
-         param = (void *)"1";
- 
--      svn_auth_set_parameter(ctx.auth_baton,
-+      svn_auth_set_parameter(ctx->auth_baton,
-                              SVN_AUTH_PARAM_NO_AUTH_CACHE,
-                              param);
-     }
-@@ -245,7 +245,7 @@ public:
-       username = usr;
-       password = pwd;
- 
--      svn_auth_baton_t * ab = ctx.auth_baton;
-+      svn_auth_baton_t * ab = ctx->auth_baton;
-       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
-                              username.c_str());
-       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
-@@ -654,13 +654,13 @@ public:
- 
-   Context::operator svn_client_ctx_t * ()
-   {
--    return &(m->ctx);
-+    return m->ctx;
-   }
- 
-   svn_client_ctx_t *
-   Context::ctx()
-   {
--    return &(m->ctx);
-+    return m->ctx;
-   }
- 
-   void
diff --git a/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch b/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
deleted file mode 100644
index 4739e601d..000000000
--- a/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr kshutdown-3.0beta2.orig/src/kshutdown.cpp kshutdown-3.0beta2/src/kshutdown.cpp
---- kshutdown-3.0beta2.orig/src/kshutdown.cpp	2011-12-29 22:18:45.000000000 -0500
-+++ kshutdown-3.0beta2/src/kshutdown.cpp	2011-12-30 19:09:08.128451522 -0500
-@@ -886,13 +886,13 @@
- 	#ifdef KS_NATIVE_KDE
- 	if (
- // TODO: check if logout is available
--		(m_kdeShutDownAvailable || (m_type == U_SHUTDOWN_TYPE_LOGOUT)) &&
-+		(m_kdeShutDownAvailable || (m_type == U_SHUTDOWN_TYPE_LOGOUT))) 
- 		KWorkSpace::requestShutDown(
- 			KWorkSpace::ShutdownConfirmNo,
- 			m_type,
- 			KWorkSpace::ShutdownModeForceNow
--		)
--	)
-+		);
-+
- 		return true;
- 	#endif // KS_NATIVE_KDE
- 	
diff --git a/extra/libnet/PKGBUILD b/extra/libnet/PKGBUILD
deleted file mode 100644
index bc07a3d78..000000000
--- a/extra/libnet/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 150607 2012-02-18 22:50:44Z pierre $
-# Maintainer:
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=libnet
-pkgver=1.1.5
-pkgrel=2
-pkgdesc="A library which provides API for commonly used low-level net functions"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/libnet-dev/"
-license=('BSD')
-depends=('glibc' 'sh')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/libnet-dev/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a9bc1d75a610efcfee200d3e28d8eb8f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make CFLAGS="${CFLAGS} -fPIC"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 doc/COPYING \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/libpng/CVE-2011-3026.patch b/extra/libpng/CVE-2011-3026.patch
deleted file mode 100644
index 209b0691e..000000000
--- a/extra/libpng/CVE-2011-3026.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660026
-http://src.chromium.org/viewvc/chrome/branches/963/src/third_party/libpng/pngrutil.c?r1=121492&r2=121491&pathrev=121492
-
-Check for both truncation (64-bit platforms) and integer overflow.
-
---- a/pngrutil.c	2012-02-01 16:00:34.000000000 +1100
-+++ b/pngrutil.c	2012-02-16 09:05:45.000000000 +1100
-@@ -457,8 +457,16 @@ png_decompress_chunk(png_structp png_ptr
-       {
-          /* Success (maybe) - really uncompress the chunk. */
-          png_size_t new_size = 0;
--         png_charp text = (png_charp)png_malloc_warn(png_ptr,
--             prefix_size + expanded_size + 1);
-+         png_charp text = NULL;
-+         /* Need to check for both truncation (64-bit platforms) and integer
-+          * overflow.
-+          */
-+         if (prefix_size + expanded_size > prefix_size &&
-+             prefix_size + expanded_size < 0xffffffffU)
-+         {
-+            png_charp text = (png_charp)png_malloc_warn(png_ptr,
-+                prefix_size + expanded_size + 1);
-+         }
- 
-          if (text != NULL)
-          {
diff --git a/extra/libreoffice-i18n/PKGBUILD b/extra/libreoffice-i18n/PKGBUILD
deleted file mode 100644
index 5751c4ddb..000000000
--- a/extra/libreoffice-i18n/PKGBUILD
+++ /dev/null
@@ -1,1516 +0,0 @@
-# $Id: PKGBUILD 153705 2012-03-18 09:00:45Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="libreoffice-i18n"
-pkgname=('libreoffice-af'    'libreoffice-ar'    'libreoffice-as'    'libreoffice-ast'	 'libreoffice-be'    'libreoffice-bg'    'libreoffice-bn'
-	 'libreoffice-bo'    'libreoffice-br'    'libreoffice-brx'   'libreoffice-bs'    'libreoffice-ca'    'libreoffice-ca-XV' 'libreoffice-cs'
-	 'libreoffice-cy'    'libreoffice-da'    'libreoffice-de'    'libreoffice-dgo'	 'libreoffice-dz'    'libreoffice-el'
-	 'libreoffice-en-GB' 'libreoffice-en-ZA' 'libreoffice-eo'    'libreoffice-es'    'libreoffice-et'    'libreoffice-eu'
-	 'libreoffice-fa'    'libreoffice-fi'    'libreoffice-fr'    'libreoffice-ga'	 'libreoffice-gl' # 'libreoffice-gd'
-	 'libreoffice-gu'    'libreoffice-he'    'libreoffice-hi'    'libreoffice-hr'    'libreoffice-hu'    'libreoffice-id'    'libreoffice-is'
-	 'libreoffice-it'    'libreoffice-ja'    'libreoffice-ka'    'libreoffice-kk'    'libreoffice-km' #'libreoffice-kid'
-	 'libreoffice-kn'    'libreoffice-ko'    'libreoffice-kok'   'libreoffice-ks'    'libreoffice-ku' #   'libreoffice-ky'
-	 'libreoffice-lo'    'libreoffice-lt'    'libreoffice-lv'    'libreoffice-mai'   'libreoffice-mk'    'libreoffice-ml'
-	 'libreoffice-mn'    'libreoffice-mni'   'libreoffice-mr'    'libreoffice-my'    'libreoffice-nb' # 'libreoffice-ms'
-	 'libreoffice-ne'    'libreoffice-nl'    'libreoffice-nn'    'libreoffice-nr'    'libreoffice-nso'    'libreoffice-oc'
-	 'libreoffice-om'    'libreoffice-or'    'libreoffice-pa-IN' 'libreoffice-pl'  #  'libreoffice-ps' #'libreoffice-pap'
-	 'libreoffice-pt-BR' 'libreoffice-pt'    'libreoffice-ro'    'libreoffice-ru'    'libreoffice-rw'    'libreoffice-sa-IN'
-	 'libreoffice-sat'   'libreoffice-sd'    'libreoffice-sh'    'libreoffice-si'    'libreoffice-sk' #'libreoffice-sc'
-	 'libreoffice-sl'    'libreoffice-sq'    'libreoffice-sr'    'libreoffice-ss'    'libreoffice-st'    'libreoffice-sv'
-	 'libreoffice-sw-TZ' 'libreoffice-ta'    'libreoffice-te'    'libreoffice-tg'    'libreoffice-th' #    'libreoffice-ti'
-	 'libreoffice-tn'    'libreoffice-tr'    'libreoffice-ts'    'libreoffice-ug'    'libreoffice-uk' #   'libreoffice-ur'
-	 'libreoffice-uz'    'libreoffice-ve'    'libreoffice-vi'    'libreoffice-xh'    'libreoffice-zh-CN' 'libreoffice-zh-TW'
-	 'libreoffice-zu')
-pkgver=3.5.1
-pkgrel=1
-pkgdesc="LibreOffice language/localisation files"
-arch=('any')
-url="http://www.documentfoundation.org"
-license=('LGPL')
-#depends=('libreoffice-common') #>=${pkgver}")
-makedepends=('rpmextract')
-
-# http://wiki.documentfoundation.org/Language_Teams
-
-#http://download.documentfoundation.org/mirrors/all.html
-#_url="http://dev-builds.libreoffice.org/pre-releases"
-_url="http://download.documentfoundation.org/libreoffice/stable"
-#_url="http://download.documentfoundation.org/libreoffice/testing" 
-#_url="http://www.libreoffice.org/download/pre-releases"
-_oover="3.5.1"
-_oodlver="3.5.1rc2"
-_oomainver="3.5"
-_helpver=${_oodlver}
-_dirver="${_oodlver}"
-#_url+="/${pkgver}-rc2"
-_url+="/${pkgver}"
-
-source=(#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_af.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_af.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ar.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ar.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_as.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_as.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ast.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ast.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_be.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_be.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bg.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bo.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_br.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_br.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_brx.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_brx.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_bs.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ca.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ca-XV.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_cs.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_cy.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_cy.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_da.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_de.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_dgo.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_dgo.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_dz.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_el.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_en-GB.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_en-ZA.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_eo.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_es.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_et.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_eu.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fa.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_fa.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fi.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_fr.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ga.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ga.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gd.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gl.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_gu.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_he.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hi.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hr.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_hu.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_id.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_is.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_it.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ja.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ka.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kid.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kk.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kk.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_km.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ko.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_kok.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_kok.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ks.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ks.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ku.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ku.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ky.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lo.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lo.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lt.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lt.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_lv.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_lv.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mai.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mai.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mk.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ml.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ml.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mn.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mni.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mni.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_mr.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_mr.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ms.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_my.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_my.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nb.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ne.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nl.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nn.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nr.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_nr.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_nso.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_nso.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_oc.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_oc.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_om.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_or.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_or.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pa-IN.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_pa-IN.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pap.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pl.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ps.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pt-BR.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_pt.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ro.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ro.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ru.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_rw.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_rw.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sa-IN.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sa-IN.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sat.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sat.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sc.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sd.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sd.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sh.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sh.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_si.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sk.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sl.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sq.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sr.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sr.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ss.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ss.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_st.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_st.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sv.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_sw-TZ.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_sw-TZ.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ta.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ta.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_te.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_te.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tg.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_th.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_th.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ti.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_tn.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_tr.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ts.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ts.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ug.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_uk.tar.gz
-#	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ur.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_uz.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_uz.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_ve.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_ve.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_vi.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_xh.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_xh.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zh-CN.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zh-TW.tar.gz
-	#${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_{langpack,helppack}-rpm_zu.tar.gz
-	${_url}/rpm/x86/LibO_${_oodlver}_Linux_x86_langpack-rpm_zu.tar.gz)
-md5sums=('7f7c20098cef08074621ace2d094ea31'
-         'd9da365aba23e4ba9272af0f975aef6a'
-         '33700c2de7bf93a244d93156ee68415c'
-         'c91333e958e92228a7322d8efdc403a7'
-         '23cf166396efc097dc9bfc28e2efaeb7'
-         'cc38d36e2c209905b8796b6c65751902'
-         '98a3e7343bd41d76ea35ca175e1dc617'
-         '5444bc87475deeeb8469838f664c3c99'
-         'c3659fd23b371060a37931b084df34d3'
-         '35e9cdd5b3081a494e6370378eb17a6c'
-         '7971d82da443d123c3f3d58fa82fbee4'
-         'a4064fce8ec70c90ae7c36a10c18c8a7'
-         'f74a4e41946ca7170caaf8552b94d98e'
-         '8ce7ed1da720f57c5f36cad49a603988'
-         '227db2189ec19bec26d5d7f7d40d16a4'
-         '961c8f16db4e54ed7b693fa953ec339f'
-         '56f28eabed7a4410638d5bf1a184b977'
-         '967e424a97121cfa450c8065fed7a2f2'
-         '01f9c8c2857f930fa1c2e8ff7f243c46'
-         '8a30300b997c430102a4d3a626f2d828'
-         '1a4d977b3a19e15c4c06b701d377a7ee'
-         '7a0800f444f736e5453158a3628a2214'
-         '86e1738c96301b85d897fd8dbec8525d'
-         '51658722f9de1becc136fceb89f0c5b1'
-         '0da38c79cd0d04f9f3f274ff494f9149'
-         '92a3a63ba45c834a652afffb0b2cbce6'
-         'a927cc7d714c3bd19ee00c44d43820a8'
-         'ddaa9ef62aebe8f6da65348a00438e89'
-         '31ee5eb38aca769cb1a54fc0f12d3346'
-         'c4e4ce4753b2103a9a8cf89a2288a4ed'
-         'b55e670c058f6e487f94f4c11dbaf6c4'
-         '2d6d038897d5b00f32b8cb00c0b34e42'
-         'af73050370dfa0133ffddf9d80d36c1f'
-         'c4374695b2a4184b3df40de8bc5f3e54'
-         'f7271273e1368c2f6b7f64ec9188c1da'
-         '9b054c89b87ee961e9a70f1d215ee68d'
-         '73cb365f04b4e640fe1b195478f9129c'
-         '9b62dd5ee618d1b81df7bb388f310536'
-         '07a24c9517b9d0a6ba9265acc1612a3b'
-         'c46137f48ef7bd9f6f1b56dc6ddea6c5'
-         'b377795238f10ecf5c7c9956cf550b9d'
-         '578960152f6cccbfd9c301f5c53ca472'
-         'efe2ce1e0027ad4c334322bda6abb949'
-         'b92f61047259d942724784e4c8477b7c'
-         '94800c565aca2a1a84c27554a0581788'
-         '98dde6f6e9bc9d2f2bae0aca5577ffdd'
-         '448086486a50155e6a1da1ebe4872a48'
-         'b3354c8a56dce30ed351767c9b5fe172'
-         '820043d781de782d0aeedde465ff5ff0'
-         '68e3579dc96b65129286596258d84e82'
-         'd6dc451fcfe8de71124370e886c164d5'
-         '9b5e9ac9808b317b72bf306eb36800f6'
-         '4a2546a7b490f77a09ad64eecddbe840'
-         '59f8425aafa21dda7c526c42ac5243a6'
-         'f5e5ca3d3b695303df89d22d79f64417'
-         '4e1205f5d0e0ad38402651d73da0626a'
-         'ebbf87de2eb6cf622a3b7297eac2cb7a'
-         'ee94ced34e6032582537f1ac6447b939'
-         '129dabaf3d69558bd5ec065b863fbcfe'
-         '43166858ac3725741bb6244a7ec45dc7'
-         '0c0757b7d4beaa3958e153e7bb9e29c0'
-         'e42f16201626fc03ac1dda8295a3bfbe'
-         '5a30a5403265fed3ec470b13c2396225'
-         '52f56e4baf21b89bc2c87e46907d6ff5'
-         '099d7c871aef460ac5a9172108a2a65a'
-         'a4b57c6ea335b9ede0f3fc69de536cf5'
-         '13658761b955c9a1edc42b7c0df977c5'
-         '86bbe011b089542ea4fcc24c990048a2'
-         '923333dc1b26951ee0c3947000fe09ba'
-         '6d089390c2e6dd94b06f3534963636bc'
-         'c359828593c0a6965e280df42341e8c5'
-         'aaf21c9f0e7bdaeee355a78e0afa57f9'
-         '964cd91fbdfb322f3c9be5eb46831413'
-         'a21249b96179c806510f66114d0a7edd'
-         '6c1d4a8aec5ab047e0c25cc31733b219'
-         'a7563af3f895f45003cb46744405d54b'
-         'cb867c1a6a33439bb940cf2781112536'
-         '684b6b2de1e44d1becae7c59d77800bc'
-         '41faae601b5487af8829cf4cb1ccfce9'
-         '2541f33385bc4c2e12c3c4f84456b187'
-         '9e06900f3440a2cacb160a4b1b4b63dd'
-         '5c37081bbb6e1548a6b609b67b358bd1'
-         'a63d83bedf1e88ec3a9349ca91140b69'
-         'b6dedb96f9a67654984b748f881c226c'
-         '67b95ed19403cecfd172deee96f96cd8'
-         '826fcb7cffd08f72193d2a4631a44549'
-         'a30d83c886be7ad46929aca501dab464'
-         '6b98b000d0004655e417b16176d83590'
-         'a4dc7c4e3ce9788d2a03a767ec74ca09'
-         'fd6a75dfa5a6a33ee98c1dd33776904a'
-         '5303045a16e2a93f8afb1e6f2c737717'
-         'c4e586cbf1b4b05b4af2c01802ea12ff'
-         '3a9f96d299b5e39f41265b2f0655a3f4'
-         '367b44c7102bc525361b558b52afbcc6'
-         'fca64b9927eabd5a89b3469be153eb14'
-         '784875f950b29c37fa0befe3f6c17497'
-         '960bff67ccb3d60699db1da8844f55e4'
-         'd0a3de17dd475f2eee0e332af0733fc7'
-         '08746cdec9a71b4c2cd9d7299d984f73'
-         '1daafbf90a956f61af1e0ffe5fef9d75'
-         '455be925daf8f36c85bd78ac7e7a0754'
-         'e66ac970e40b4a21f28293370ac30f24'
-         'f8832de55a9b00dc3427f917f2d1094f'
-         'caabfedfdb225d034a2da72f08072b2f'
-         'ebd679024ccade59c98327d6994a1c5f'
-         '57fdfa1fb7839b58d98e87d11b94e904'
-         'bbeba1455907fda8e7fb2d4f8f173d15'
-         'af7f18dbefb5f241880a71f1e3ff3410'
-         '8e51ee0ad50bb3dc2ba4a29489929b2d'
-         '1348facb77bef09d7d29a3975aa24fbc'
-         '271d87462683d25ee7242c688fd648af'
-         '2e42b59f823fe1923c2d0c57062e2081'
-         '4c03c6902d802b68d819526e19606cca'
-         '773b423f96e60efdbfec62e66056d07f'
-         '414b2bdfbc4759f8c2633c221a2b12b5'
-         '9019dfbeacd30bd48875b6c5f64feca6'
-         '53a926b86484356f66c7cb1b0ab98304'
-         '1dc3df40820ff960c091b4f0477e60fe'
-         '7fbed4c3455165ac0cccbbdb84d613fb'
-         '4bf17b83bc24e92d99c4bbfb4d0e7362'
-         '7d24b9550b8ca3ebdae3fdee7ef2dd43'
-         '2151c78cabd670c668114af9d115e9b6'
-         '60155f678e2d9100297d64479847d462'
-         '5ea84e7b97f6b21cf704448c27cb5d77'
-         '705f9c41046ec499463270beff2ffbad'
-         '4b87b090d9939fb5b2ed6d0bf2beb88d'
-         '941700fd1b86846d64537e21ee39c461'
-         '52d96e5641485e65051d66234438eeea'
-         '4955f2da1c49f00f0f4a4a80a4d6d94d'
-         '05e37592d91e1ce9b1c076dfe65a8d24'
-         '061df11a24b6756a7c19aa39547602a3'
-         '2b5385ff57d479b511c5d67909d53141'
-         '20c1b9d81629f65c61e92a70a72de596'
-         '208056e90fd5e0120c32f685f8a1de3f'
-         '3afa7f135a042934d9ed05ca347640c3'
-         'd750c7533da6a62b4e4a76b29b4d9bfc'
-         '6c21140cd09ccc02df086b17f36a0ffa'
-         '836285a841b30e5549a08ea29c9c314e'
-         '68ee8a8f877244bb64d5af5507b7611e'
-         'f5774090a254277d4007a2dbfefcbb6a'
-         '89c840e327f846d3528f9ad76e7ce614'
-         '4db5ebfb5defa12ac0c119ea798429e1'
-         '05d9bbfe5e0d90e65ce546b0a9a473f2'
-         '8ad36add10ff1d90520370eeed7fba92'
-         '5fc1006dfed7f5105efa1187b45fb081'
-         'd2d939b9a08be8dfb63da6dd0c7367ff'
-         '7dacd033acaa438724cf2f32dae1f315'
-         'e4bcd4e489d4e272b5060429f14ba7e6'
-         '4a2d3bc92bed3db53843b16f5b5b0673'
-         'f9742f14279ed582378834c67656ef99'
-         '1929c4d496e39308506ac4ca89fd17ed'
-         '28d0f1bebad98d434debd47da63744ea'
-         '6f11112f5479cfddbb1f4da2d656382c'
-         'ecbccc62f2cc08fd429a73a9e0ff05cf'
-         '2d90fd6735c69db33f358de39a9cc76e'
-         '0879ebe63824414f08d04e2755ba0694'
-         '4a8f28bce3937d834098a300abb35506')
-
-build() {
-  for i in ${pkgname[@]}
-   do _pkglang=${i#*-}
-    echo ${_pkglang} " unpacking..."
-    #cd ${srcdir}/LibO_${_oover/-/}_Linux_x86_langpack-rpm_${_pkglang}/RPMS
-    cd ${srcdir}/LibO_${_helpver}_Linux_x86_langpack-rpm_${_pkglang}/RPMS
-    # remove dictionaries if shipped - we ship them now in separate packages
-    rm libreoffice3.5-dict-*.rpm || /bin/true
-	for j in *.rpm
-	 do rpmextract.sh $j
-	done
-    # the helppack rpm goes also into the langpack dir - so far we don't want to split the helppacks separate
-#     rpmextract.sh ${srcdir}/LibO_${_oover/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/libobasis3.3-${_pkglang}-help-${_helpver}.i586.rpm
-    #rpmextract.sh ${srcdir}/LibO_${_oover/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/*.rpm
-    rpmextract.sh ${srcdir}/LibO_${_helpver/-/}_Linux_x86_helppack-rpm_${_pkglang}/RPMS/*.rpm || /bin/true
-  done
-}
-
-package_libreoffice-af() {
-  pkgdesc="Afrikaans language pack for LibreOffice"
-  provides=('openoffice-af' 'libreoffice-langpack')
-  replaces=(openoffice-af)
-  conflicts=(openoffice-af)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_af/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ar() {
-  pkgdesc="Arabic language pack for LibreOffice"
-  provides=('openoffice-ar' 'libreoffice-langpack')
-  replaces=(openoffice-ar)
-  conflicts=(openoffice-ar)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ar/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-as() {
-  pkgdesc="Assamese (India) language pack for LibreOffice"
-  provides=('openoffice-as' 'libreoffice-langpack')
-  replaces=(openoffice-as)
-  conflicts=(openoffice-as)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_as/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ast() {
-  pkgdesc="Asturianu language pack for LibreOffice"
-  provides=('openoffice-ast' 'libreoffice-langpack')
-  replaces=(openoffice-ast)
-  conflicts=(openoffice-ast)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ast/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-be() {
-  pkgdesc="Belarusian language pack for LibreOffice"
-  provides=('openoffice-be-BY' 'libreoffice-langpack')
-  replaces=(openoffice-be-BY)
-  conflicts=(openoffice-be-BY)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_be/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-bg() {
-  pkgdesc="Bulgarian language pack for LibreOffice"
-  provides=('openoffice-bg' 'libreoffice-langpack')
-  replaces=(openoffice-bg)
-  conflicts=(openoffice-bg)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bg/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-bn() {
-  pkgdesc="Bengali language pack for LibreOffice"
-  provides=('openoffice-bn' 'libreoffice-langpack')
-  replaces=(openoffice-bn)
-  conflicts=(openoffice-bn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-bo() {
-  pkgdesc="Tibetan language pack for LibreOffice"
-  provides=('openoffice-bo' 'libreoffice-langpack')
-  replaces=(openoffice-bo)
-  conflicts=(openoffice-bo)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bo/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-br() {
-  pkgdesc="Breton language pack for LibreOffice"
-  provides=('openoffice-br' 'libreoffice-langpack')
-  replaces=(openoffice-br)
-  conflicts=(openoffice-br)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_br/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-brx() {
-  pkgdesc="Bodo language pack for LibreOffice"
-  provides=('openoffice-brx' 'libreoffice-langpack')
-  replaces=(openoffice-brx)
-  conflicts=(openoffice-brx)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_brx/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-bs() {
-  pkgdesc="Bosnian language pack for LibreOffice"
-  provides=('openoffice-bs' 'libreoffice-langpack')
-  replaces=(openoffice-bs)
-  conflicts=(openoffice-bs)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_bs/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ca() {
-  pkgdesc="Catalan language pack for LibreOffice"
-  provides=('openoffice-ca' 'libreoffice-langpack')
-  replaces=(openoffice-ca)
-  conflicts=(openoffice-ca)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ca/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ca-XV() {
-  pkgdesc="Catalan (Valencia) language pack for LibreOffice"
-  provides=('openoffice-ca-XV' 'libreoffice-langpack')
-  replaces=(openoffice-ca-XV)
-  conflicts=(openoffice-ca-XV)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ca-XV/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-cs() {
-  pkgdesc="Czech language pack for LibreOffice"
-  provides=('openoffice-cs' 'libreoffice-langpack')
-  replaces=(openoffice-cs)
-  conflicts=(openoffice-cs)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_cs/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-cy() {
-  pkgdesc="Welsh language pack for LibreOffice"
-  provides=('openoffice-cy' 'libreoffice-langpack')
-  replaces=(openoffice-cy)
-  conflicts=(openoffice-cy)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_cy/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-da() {
-  pkgdesc="Danish language pack for LibreOffice"
-  provides=('openoffice-da' 'libreoffice-langpack')
-  replaces=(openoffice-da)
-  conflicts=(openoffice-da)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_da/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-de() {
-  pkgdesc="German language pack for LibreOffice"
-  provides=('openoffice-de' 'libreoffice-langpack')
-  replaces=(openoffice-de)
-  conflicts=(openoffice-de)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_de/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-dgo() {
-  pkgdesc="Dogri language pack for LibreOffice"
-  provides=('openoffice-dgo' 'libreoffice-langpack')
-  replaces=(openoffice-dgo)
-  conflicts=(openoffice-dgo)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_dgo/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-dz() {
-  pkgdesc="Dzongkha language pack for LibreOffice"
-  provides=('openoffice-dz' 'libreoffice-langpack')
-  replaces=(openoffice-dz)
-  conflicts=(openoffice-dz)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_dz/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-el() {
-  pkgdesc="Greek language pack for LibreOffice"
-  provides=('openoffice-el' 'libreoffice-langpack')
-  replaces=(openoffice-el)
-  conflicts=(openoffice-el)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_el/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-en-GB() {
-  pkgdesc="English (GB) language pack for LibreOffice"
-  provides=('openoffice-en-GB' 'libreoffice-langpack')
-  replaces=(openoffice-en-GB)
-  conflicts=(openoffice-en-GB)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_en-GB/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-en-ZA() {
-  pkgdesc="English (ZA) language pack for LibreOffice"
-  provides=('openoffice-en-ZA' 'libreoffice-langpack')
-  replaces=(openoffice-en-ZA)
-  conflicts=(openoffice-en-ZA)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_en-ZA/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-eo() {
-  pkgdesc="Esperanto language pack for LibreOffice"
-  provides=('openoffice-eo' 'libreoffice-langpack')
-  replaces=(openoffice-eo)
-  conflicts=(openoffice-eo)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_eo/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-es() {
-  pkgdesc="Spanish language pack for LibreOffice"
-  provides=('openoffice-es' 'libreoffice-langpack')
-  replaces=(openoffice-es)
-  conflicts=(openoffice-es)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_es/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-et() {
-  pkgdesc="Estonian language pack for LibreOffice"
-  provides=('openoffice-et' 'libreoffice-langpack')
-  replaces=(openoffice-et)
-  conflicts=(openoffice-et)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_et/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-eu() {
-  pkgdesc="Basque language pack for LibreOffice"
-  provides=('openoffice-eu' 'libreoffice-langpack')
-  replaces=(openoffice-eu)
-  conflicts=(openoffice-eu)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_eu/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-fa() {
-  pkgdesc="Persian language pack for LibreOffice"
-  provides=('openoffice-fa' 'libreoffice-langpack')
-  replaces=(openoffice-fa)
-  conflicts=(openoffice-fa)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fa/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-fi() {
-  pkgdesc="Finnish language pack for LibreOffice"
-  provides=('openoffice-fi' 'libreoffice-langpack')
-  replaces=(openoffice-fi)
-  conflicts=(openoffice-fi)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fi/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-fr() {
-  pkgdesc="French language pack for LibreOffice"
-  provides=('openoffice-fr' 'libreoffice-langpack')
-  replaces=(openoffice-fr)
-  conflicts=(openoffice-fr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_fr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ga() {
-  pkgdesc="Irish language pack for LibreOffice"
-  provides=('openoffice-ga' 'libreoffice-langpack')
-  replaces=(openoffice-ga)
-  conflicts=(openoffice-ga)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ga/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-gl() {
-  pkgdesc="Galician language pack for LibreOffice"
-  provides=('openoffice-gl' 'libreoffice-langpack')
-  replaces=(openoffice-gl)
-  conflicts=(openoffice-gl)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_gl/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-gu() {
-  pkgdesc="Gujarati language pack for LibreOffice"
-  provides=('openoffice-gu' 'libreoffice-langpack')
-  replaces=(openoffice-gu)
-  conflicts=(openoffice-gu)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_gu/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-he() {
-  pkgdesc="Hebrew language pack for LibreOffice"
-  provides=('openoffice-he' 'libreoffice-langpack')
-  replaces=(openoffice-he)
-  conflicts=(openoffice-he)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_he/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-hi() {
-  pkgdesc="Hindi language pack for LibreOffice"
-  provides=('openoffice-hi' 'libreoffice-langpack')
-  replaces=(openoffice-hi)
-  conflicts=(openoffice-hi)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hi/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-hr() {
-  pkgdesc="Croatian language pack for LibreOffice"
-  provides=('openoffice-hr' 'libreoffice-langpack')
-  replaces=(openoffice-hr)
-  conflicts=(openoffice-hr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-hu() {
-  pkgdesc="Hungarian language pack for LibreOffice"
-  provides=('openoffice-hu' 'libreoffice-langpack')
-  replaces=(openoffice-hu)
-  conflicts=(openoffice-hu)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_hu/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-id() {
-  pkgdesc="Bahasa Indonesia language pack for LibreOffice"
-  provides=('openoffice-id' 'libreoffice-langpack')
-  replaces=(openoffice-id)
-  conflicts=(openoffice-id)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_id/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-is() {
-  pkgdesc="Icelandic language pack for LibreOffice"
-  provides=('openoffice-is' 'libreoffice-langpack')
-  replaces=(openoffice-is)
-  conflicts=(openoffice-is)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_is/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-it() {
-  pkgdesc="Italian language pack for LibreOffice"
-  provides=('openoffice-it' 'libreoffice-langpack')
-  replaces=(openoffice-it)
-  conflicts=(openoffice-it)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_it/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ja() {
-  pkgdesc="Japanese language pack for LibreOffice"
-  provides=('openoffice-ja' 'libreoffice-langpack')
-  replaces=(openoffice-ja)
-  conflicts=(openoffice-ja)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ja/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ka() {
-  pkgdesc="Georgian language pack for LibreOffice"
-  provides=('openoffice-ka' 'libreoffice-langpack')
-  replaces=(openoffice-ka)
-  conflicts=(openoffice-ka)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ka/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-kk() {
-  pkgdesc="Kazakh language pack for LibreOffice"
-  provides=('openoffice-kk' 'libreoffice-langpack')
-  replaces=(openoffice-kk)
-  conflicts=(openoffice-kk)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kk/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-km() {
-  pkgdesc="Khmer (Cambodia) language pack for LibreOffice"
-  provides=('openoffice-km' 'libreoffice-langpack')
-  replaces=(openoffice-km)
-  conflicts=(openoffice-km)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_km/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-kn() {
-  pkgdesc="Kannada language pack for LibreOffice"
-  provides=('openoffice-kn' 'libreoffice-langpack')
-  replaces=(openoffice-kn)
-  conflicts=(openoffice-kn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ko() {
-  pkgdesc="Korean language pack for LibreOffice"
-  provides=('openoffice-ko' 'libreoffice-langpack')
-  replaces=(openoffice-ko)
-  conflicts=(openoffice-ko)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ko/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-kok() {
-  pkgdesc="Konkani language pack for LibreOffice"
-  provides=('openoffice-kok' 'libreoffice-langpack')
-  replaces=(openoffice-kok)
-  conflicts=(openoffice-kok)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_kok/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ks() {
-  pkgdesc="Kashmiri language pack for LibreOffice"
-  provides=('openoffice-ks' 'libreoffice-langpack')
-  replaces=(openoffice-ks)
-  conflicts=(openoffice-ks)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ks/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ku() {
-  pkgdesc="Kurdish language pack for LibreOffice"
-  provides=('openoffice-ku' 'libreoffice-langpack')
-  replaces=(openoffice-ku)
-  conflicts=(openoffice-ku)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ku/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-lo() {
-  pkgdesc="Lao language pack for LibreOffice"
-  provides=('openoffice-lo' 'libreoffice-langpack')
-  replaces=(openoffice-lo)
-  conflicts=(openoffice-lo)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lo/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-lt() {
-  pkgdesc="Lithuanian language pack for LibreOffice"
-  provides=('openoffice-lt' 'libreoffice-langpack')
-  replaces=(openoffice-lt)
-  conflicts=(openoffice-lt)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lt/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-lv() {
-  pkgdesc="Latvian language pack for LibreOffice"
-  provides=('openoffice-lv' 'libreoffice-langpack')
-  replaces=(openoffice-lv)
-  conflicts=(openoffice-lv)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_lv/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mai() {
-  pkgdesc="Maithili language pack for LibreOffice"
-  provides=('openoffice-mai' 'libreoffice-langpack')
-  replaces=(openoffice-mai)
-  conflicts=(openoffice-mai)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mai/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mk() {
-  pkgdesc="Macedonian language pack for LibreOffice"
-  provides=('openoffice-mk' 'libreoffice-langpack')
-  replaces=(openoffice-mk)
-  conflicts=(openoffice-mk)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mk/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ml() {
-  pkgdesc="Malayalam language pack for LibreOffice"
-  provides=('openoffice-ml' 'libreoffice-langpack')
-  replaces=(openoffice-ml)
-  conflicts=(openoffice-ml)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ml/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mn() {
-  pkgdesc="Mongolian language pack for LibreOffice"
-  provides=('openoffice-mn' 'libreoffice-langpack')
-  replaces=(openoffice-mn)
-  conflicts=(openoffice-mn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mni() {
-  pkgdesc="Manipuri language pack for LibreOffice"
-  provides=('openoffice-mni' 'libreoffice-langpack')
-  replaces=(openoffice-mni)
-  conflicts=(openoffice-mni)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mni/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-mr() {
-  pkgdesc="Marathi language pack for LibreOffice"
-  provides=('openoffice-mr' 'libreoffice-langpack')
-  replaces=(openoffice-mr)
-  conflicts=(openoffice-mr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_mr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-my() {
-  pkgdesc="Burmese language pack for LibreOffice"
-  provides=('openoffice-my' 'libreoffice-langpack')
-  replaces=(openoffice-my)
-  conflicts=(openoffice-my)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_my/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nb() {
-  pkgdesc="Norwegian Bokmal language pack for LibreOffice"
-  provides=('openoffice-nb' 'libreoffice-langpack')
-  replaces=(openoffice-nb)
-  conflicts=(openoffice-nb)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nb/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ne() {
-  pkgdesc="Nepali language pack for LibreOffice"
-  provides=('openoffice-ne' 'libreoffice-langpack')
-  replaces=('openoffice-ne')
-  conflicts=(openoffice-ne)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ne/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nl() {
-  pkgdesc="Dutch language pack for LibreOffice"
-  provides=('openoffice-nl' 'libreoffice-langpack')
-  replaces=(openoffice-nl)
-  conflicts=(openoffice-nl)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nl/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nn() {
-  pkgdesc="Norwegian Nynorsk language pack for LibreOffice"
-  provides=('openoffice-nn' 'libreoffice-langpack')
-  replaces=(openoffice-nn)
-  conflicts=(openoffice-nn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nr() {
-  pkgdesc="Ndebele (South) language pack for LibreOffice"
-  provides=(openoffice-nr)
-  replaces=(openoffice-nr)
-  conflicts=(openoffice-nr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-nso() {
-  pkgdesc="Northern Sotho language pack for LibreOffice"
-  provides=('openoffice-ns' 'libreoffice-ns' 'libreoffice-langpack')
-  replaces=('openoffice-ns' 'libreoffice-ns')
-  conflicts=(openoffice-ns)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_nso/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-oc() {
-  pkgdesc="Occitan language pack for LibreOffice"
-  provides=('openoffice-oc' 'libreoffice-langpack')
-  replaces=(openoffice-oc)
-  conflicts=(openoffice-oc)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_oc/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-om() {
-  pkgdesc="Oromo language pack for LibreOffice"
-  provides=('openoffice-om' 'libreoffice-langpack')
-  replaces=(openoffice-om)
-  conflicts=(openoffice-om)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_om/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-or() {
-  pkgdesc="Oriya language pack for LibreOffice"
-  provides=('openoffice-or' 'libreoffice-langpack')
-  replaces=(openoffice-or)
-  conflicts=(openoffice-or)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_or/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-pa-IN() {
-  pkgdesc="Punjabi (India) language pack for LibreOffice"
-  provides=('openoffice-pa-IN' 'libreoffice-langpack')
-  replaces=(openoffice-pa-IN)
-  conflicts=(openoffice-pa-IN)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pa-IN/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-pl() {
-  pkgdesc="Polish language pack for LibreOffice"
-  provides=('openoffice-pl' 'libreoffice-langpack')
-  replaces=(openoffice-pl)
-  conflicts=(openoffice-pl)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pl/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-pt-BR() {
-  pkgdesc="Portuguese (Brasil) language pack for LibreOffice"
-  provides=('openoffice-pt-BR' 'libreoffice-langpack')
-  replaces=(openoffice-pt-BR)
-  conflicts=(openoffice-pt-BR)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pt-BR/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-pt() {
-  pkgdesc="Portuguese language pack for LibreOffice"
-  provides=('openoffice-pt' 'libreoffice-langpack')
-  replaces=(openoffice-pt)
-  conflicts=(openoffice-pt)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_pt/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ro() {
-  pkgdesc="Romanian language pack for LibreOffice"
-  provides=('openoffice-ro' 'libreoffice-langpack')
-  replaces=(openoffice-ro)
-  conflicts=(openoffice-ro)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ro/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ru() {
-  pkgdesc="Russian language pack for LibreOffice"
-  provides=('openoffice-ru' 'libreoffice-langpack')
-  replaces=(openoffice-ru)
-  conflicts=(openoffice-ru)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ru/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-rw() {
-  pkgdesc="Kinyarwanda language pack for LibreOffice"
-  provides=('openoffice-rw' 'libreoffice-langpack')
-  replaces=(openoffice-rw)
-  conflicts=(openoffice-rw)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_rw/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sa-IN() {
-  pkgdesc="Sanskrit (India) language pack for LibreOffice"
-  provides=('openoffice-sa-IN' 'libreoffice-langpack')
-  replaces=(openoffice-sa-IN)
-  conflicts=(openoffice-sa-IN)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sa-IN/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sat() {
-  pkgdesc="Santali language pack for LibreOffice"
-  provides=('openoffice-sat' 'libreoffice-langpack')
-  replaces=(openoffice-sat)
-  conflicts=(openoffice-sat)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sat/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sd() {
-  pkgdesc="Sindhi language pack for LibreOffice"
-  provides=('openoffice-sd' 'libreoffice-langpack')
-  replaces=(openoffice-sd)
-  conflicts=(openoffice-sd)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sd/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sh() {
-  pkgdesc="Serbo-Croatian language pack for LibreOffice"
-  provides=('openoffice-sh' 'libreoffice-langpack')
-  replaces=(openoffice-sh)
-  conflicts=(openoffice-sh)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sh/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-si() {
-  pkgdesc="Singhalese language pack for LibreOffice"
-  provides=('openoffice-si' 'libreoffice-langpack')
-  replaces=(openoffice-si)
-  conflicts=(openoffice-si)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_si/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sk() {
-  pkgdesc="Slovak language pack for LibreOffice"
-  provides=('openoffice-sk' 'libreoffice-langpack')
-  replaces=(openoffice-sk)
-  conflicts=(openoffice-sk)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sk/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sl() {
-  pkgdesc="Slovenian language pack for LibreOffice"
-  provides=('openoffice-sl' 'libreoffice-langpack')
-  replaces=(openoffice-sl)
-  conflicts=(openoffice-sl)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sl/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sq() {
-  pkgdesc="Albanien language pack for LibreOffice"
-  provides=('openoffice-sq' 'libreoffice-langpack')
-  replaces=(openoffice-sq)
-  conflicts=(openoffice-sq)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sq/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sr() {
-  pkgdesc="Serbian language pack for LibreOffice"
-  provides=('openoffice-sr' 'libreoffice-langpack')
-  replaces=(openoffice-sr)
-  conflicts=(openoffice-sr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ss() {
-  pkgdesc="Swati language pack for LibreOffice"
-  provides=('openoffice-ss' 'libreoffice-langpack')
-  replaces=(openoffice-ss)
-  conflicts=(openoffice-ss)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ss/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-st() {
-  pkgdesc="Southern Sotho language pack for LibreOffice"
-  provides=('openoffice-st' 'libreoffice-langpack')
-  replaces=(openoffice-st)
-  conflicts=(openoffice-st)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_st/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sv() {
-  pkgdesc="Swedish language pack for LibreOffice"
-  provides=('openoffice-sv' 'libreoffice-langpack')
-  replaces=(openoffice-sv)
-  conflicts=(openoffice-sv)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sv/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-sw-TZ() {
-  pkgdesc="Swahili (Tanzania) language pack for LibreOffice"
-  provides=('openoffice-sw-TZ' 'libreoffice-langpack')
-  replaces=(openoffice-sw-TZ)
-  conflicts=(openoffice-sw-TZ)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_sw-TZ/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ta() {
-  pkgdesc="Tamil language pack for LibreOffice"
-  provides=('openoffice-ta' 'libreoffice-langpack')
-  replaces=(openoffice-ta)
-  conflicts=(openoffice-ta)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ta/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-te() {
-  pkgdesc="Telugu language pack for LibreOffice"
-  provides=('openoffice-te' 'libreoffice-langpack')
-  replaces=(openoffice-te)
-  conflicts=(openoffice-te)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_te/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-tg() {
-  pkgdesc="Tajik language pack for LibreOffice"
-  provides=('openoffice-tg' 'libreoffice-langpack')
-  replaces=(openoffice-tg)
-  conflicts=(openoffice-tg)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tg/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-th() {
-  pkgdesc="Thai language pack for LibreOffice"
-  provides=('openoffice-th' 'libreoffice-langpack')
-  replaces=(openoffice-th)
-  conflicts=(openoffice-th)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_th/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-tn() {
-  pkgdesc="Tswana language pack for LibreOffice"
-  provides=('openoffice-tn' 'libreoffice-langpack')
-  replaces=(openoffice-tn)
-  conflicts=(openoffice-tn)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tn/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-tr() {
-  pkgdesc="Turkish language pack for LibreOffice"
-  provides=('openoffice-tr' 'libreoffice-langpack')
-  replaces=(openoffice-tr)
-  conflicts=(openoffice-tr)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_tr/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ts() {
-  pkgdesc="Tsonga language pack for LibreOffice"
-  provides=('openoffice-ts' 'libreoffice-langpack')
-  replaces=(openoffice-ts)
-  conflicts=(openoffice-ts)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ts/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ug() {
-  pkgdesc="Uighur language pack for LibreOffice"
-  provides=('openoffice-ug' 'libreoffice-langpack')
-  replaces=(openoffice-ug)
-  conflicts=(openoffice-ug)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ug/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-uk() {
-  pkgdesc="Ukrainian language pack for LibreOffice"
-  provides=('openoffice-uk' 'libreoffice-langpack')
-  replaces=(openoffice-uk)
-  conflicts=(openoffice-uk)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_uk/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-uz() {
-  pkgdesc="Uzbek language pack for LibreOffice"
-  provides=('openoffice-uz' 'libreoffice-langpack')
-  replaces=(openoffice-uz)
-  conflicts=(openoffice-uz)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_uz/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-ve() {
-  pkgdesc="Venda language pack for LibreOffice"
-  provides=('openoffice-ve' 'libreoffice-langpack')
-  replaces=(openoffice-ve)
-  conflicts=(openoffice-ve)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_ve/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-vi() {
-  pkgdesc="Vietnamese language pack for LibreOffice"
-  provides=('openoffice-vi' 'libreoffice-langpack')
-  replaces=(openoffice-vi)
-  conflicts=(openoffice-vi)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_vi/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-xh() {
-  pkgdesc="Xhosa language pack for LibreOffice"
-  provides=('openoffice-xh' 'libreoffice-langpack')
-  replaces=(openoffice-xh)
-  conflicts=(openoffice-xh)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_xh/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-zh-CN() {
-  pkgdesc="Chinese (simplified) language pack for LibreOffice"
-  provides=('openoffice-zh-CN' 'libreoffice-langpack')
-  replaces=(openoffice-zh-CN)
-  conflicts=(openoffice-zh-CN)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zh-CN/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-zh-TW() {
-  pkgdesc="Chinese (traditional) language pack for LibreOffice"
-  provides=('openoffice-zh-TW' 'libreoffice-langpack')
-  replaces=(openoffice-zh-TW)
-  conflicts=(openoffice-zh-TW)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zh-TW/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
-
-package_libreoffice-zu() {
-  pkgdesc="Zulu language pack for LibreOffice"
-  provides=('openoffice-zu' 'libreoffice-langpack')
-  replaces=(openoffice-zu)
-  conflicts=(openoffice-zu)
-  cd "${srcdir}"/LibO_${_dirver}_Linux_x86_langpack-rpm_zu/RPMS
-  mkdir -p "${pkgdir}"/usr/lib/libreoffice
-  cp -R opt/libreoffice3.5/* "${pkgdir}"/usr/lib/libreoffice
-  chown root:root -R "${pkgdir}"/usr/lib/libreoffice
-}
diff --git a/extra/libreoffice/PKGBUILD.next_stable b/extra/libreoffice/PKGBUILD.next_stable
deleted file mode 100644
index a8cb4c5ad..000000000
--- a/extra/libreoffice/PKGBUILD.next_stable
+++ /dev/null
@@ -1,631 +0,0 @@
-# $Id: PKGBUILD 142692 2011-11-12 20:22:14Z ibiru $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder')
-_LOver=3.4.99.3
-pkgver=3.5.0beta3
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment'
-              #'saxon' - currently broken 
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg'
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	     'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-	${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-	#${_additional_source_url}/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
-	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810)
-noextract=(053a35c244bf132f806e198ac4d960aa-libvisio-0.0.12.tar.bz2
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-	7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-#	cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
-)
-md5sums=('3f223ec797a100e557f7138c8ab4a91b'
-         'bb08c856e5c9a7a8bcf22fefdb7cf13f'
-         '83bd4be3370840de3e535b2c974e8af5'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '053a35c244bf132f806e198ac4d960aa'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         'e1c178b18f130b40494561f02bc1a948'
-         '7c2549f6b0a8bb604e6c4c729ffdcfe6'
-         '185d60944ea767075d27247c3162b3bc'
-         '60ce5dc9bd098f95c2e621a930c98dd9'
-         '661a52a02a31b3afbe4b3b3146061afd')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-        cd ${srcdir}/libreoffice-core-$_LOver
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-	
-	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
-	ln -s ../libreoffice-translations-$_LOver/translations .
-
-	# buildfixes & bugfixes
-	# one late fix to solve make distro-pack-install issue
-	patch -Np1 -i ${srcdir}/gmake_install.diff
-	patch -Np1 -i ${srcdir}/smp_buildfix.diff
-	
-	# unset C(XX)FLAGS
-	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
-#	unset CFLAGS
-#	unset CXXFLAGS
-
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-	
-	# python2 fix
-	export PYTHON=python2
-
-#	autoconf -f
-
-	# non-SMP test build
-#	export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-#	touch autogen.lastrun
-	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-lockdown\
-		--enable-mergelibs \
-		--enable-opengl \
-		--enable-odk\
-		--disable-ext-lightproof \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-sampleicc \
-		--without-system-libexttextcat \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--disable-mozilla \
-		--without-system-mozilla \
-		--without-system-mozilla-headers \
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--with-system-hsqldb \
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--with-install-dirname="${pkgbase}" 
-#		--enable-cairo\
-#		--with-system-libtextcat \
-#		--with-external-libtextcat-data \
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'hsqldb-java:      default database format for OpenOffice.org'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # fix ArchLinux LibreOffice installation paths	
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
-        -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \
-        -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \
-        -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
-        -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
-        -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
-        -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
-        -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
diff --git a/extra/libxcb/xcb_auth-fix-memory-leak.patch b/extra/libxcb/xcb_auth-fix-memory-leak.patch
deleted file mode 100644
index d1000913a..000000000
--- a/extra/libxcb/xcb_auth-fix-memory-leak.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5755582444ad0ba79e661ab3173cc38e9e588d83 Mon Sep 17 00:00:00 2001
-From: Nick Bowler <nbowler@draconx.ca>
-Date: Thu, 11 Nov 2010 01:49:41 +0000
-Subject: xcb_auth: Fix memory leak in _xcb_get_auth_info.
-
-If the initial get_peer_sock_name(getpeername ...) succeeds, the
-pointer to allocated memory is overwritten by the later call to
-get_peer_sock_name(getsockname ...).  Fix that up by freeing
-the allocated memory before overwriting the pointer.
-
-Signed-off-by: Nick Bowler <nbowler@draconx.ca>
-Signed-off-by: Julien Danjou <julien@danjou.info>
----
-diff --git a/src/xcb_auth.c b/src/xcb_auth.c
-index 1af27fc..4839b78 100644
---- a/src/xcb_auth.c
-+++ b/src/xcb_auth.c
-@@ -327,10 +327,15 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display)
-     if (!info->namelen)
-         goto no_auth;   /* out of memory */
- 
--    if (!gotsockname && (sockname = get_peer_sock_name(getsockname, fd)) == NULL)
-+    if (!gotsockname)
-     {
--        free(info->name);
--        goto no_auth;   /* can only authenticate sockets */
-+        free(sockname);
-+
-+        if ((sockname = get_peer_sock_name(getsockname, fd)) == NULL)
-+        {
-+            free(info->name);
-+            goto no_auth;   /* can only authenticate sockets */
-+        }
-     }
- 
-     ret = compute_auth(info, authptr, sockname);
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/libxt/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff b/extra/libxt/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
deleted file mode 100644
index b3f708292..000000000
--- a/extra/libxt/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From 70bb9e28d37fff4ead4d0a2c672af77059765fa4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed, 04 Jan 2012 18:33:29 +0000
-Subject: Treat unexpected returned events from poll as errors
-
-Inspired by libxcb's f0565e8f06aadf760a9065a97b8cf5ab9cbd18de
-
-Resolves https://bugs.freedesktop.org/show_bug.cgi?id=20048
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/NextEvent.c b/src/NextEvent.c
-index b1f7bc7..c8c9dd5 100644
---- a/src/NextEvent.c
-+++ b/src/NextEvent.c
-@@ -356,7 +356,21 @@ static int IoWait (
-     return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
- 		   wt->wait_time_ptr);
- #else
--    return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+    int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait);
-+    /* If poll() returns an event we didn't expect, such as POLLNVAL, treat
-+     * it as if it failed. */
-+    if(ret >= 0) {
-+        nfds_t i;
-+        for (i=0; i < wf->fdlistlen; i++) {
-+            struct pollfd *fd = &wf->fdlist[i];
-+            if (fd->revents & ~fd->events) {
-+                ret = -1;
-+                errno = EIO;
-+                break;
-+            }
-+        }
-+    }
-+    return ret;
- #endif
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/linux_logo/PKGBUILD b/extra/linux_logo/PKGBUILD
deleted file mode 100644
index 30fab1149..000000000
--- a/extra/linux_logo/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 140770 2011-10-19 00:51:32Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=linux_logo
-pkgver=5.11
-pkgrel=1
-pkgdesc="Text-based logo and system information program"
-arch=('i686' 'x86_64') 
-url="http://www.deater.net/weave/vmwprod/linux_logo"
-license=('GPL')
-depends=('glibc')
-source=(http://www.deater.net/weave/vmwprod/linux_logo/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('bd22808f165574cb3bc98c579aa48c0acab65f39')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX="${pkgdir}/usr" install
-}
diff --git a/extra/mailman/PKGBUILD b/extra/mailman/PKGBUILD
deleted file mode 100644
index 48dc1c20c..000000000
--- a/extra/mailman/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 151515 2012-02-27 10:52:55Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=mailman
-pkgver=2.1.14
-pkgrel=4
-pkgdesc="Mailing list manager with built in web access"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.list.org/"
-depends=('python2' 'smtp-server')
-# we need to have the mailman user to build mailman
-makedepends=('mailman')
-# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead.
-backup=('usr/lib/mailman/Mailman/mm_cfg.py')
-install=$pkgname.install
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
-        'mailman-2.1-build.patch'
-        'rc.mailman')
-md5sums=('9ea163871ceccbd33fee4c9e335fcf7b'
-         'ed04d062379eb21e39ce1e70e6b1ade2'
-         '3d83d06d0ec3319bf3c7d9df5d18e89f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # fix calls to /usr/bin/python
-  find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} +
-  # fix directory permissions to satisfy check_perms
-  patch -p1 -i ${srcdir}/mailman-2.1-build.patch
-  # set some sane defaults before the configure script has a chance to screw them up
-  sed -e 's/@MAILHOST@/localhost/g' \
-      -e 's/@URLHOST@/localhost/g' \
-      -i Mailman/Defaults.py.in
-
-  ./configure --without-permcheck \
-              --prefix=/usr/lib/mailman \
-              --with-var-prefix=/var/lib/mailman \
-              --with-mail-gid=mailman \
-              --with-username=mailman --with-groupname=mailman \
-              --with-cgi-gid=http --with-python=/usr/bin/python2
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # let's follow Fedora FHS way; Gentoo does it the other way round
-
-  # Create a link so that the config file mm_cfg.py appears in config
-  # directory /etc/mailman. We don't put mm_cfg.py in the config directory
-  # because its executable code (python file) and the security policy wants
-  # to keep executable code out of /etc and inside of a lib directory instead,
-  # and because traditionally mm_cfg.py was in the Mailman subdirectory and
-  # experienced mailman admins will expect to find it there. But having it
-  # "appear" in the config directory is good practice and heading in the
-  # right direction for FHS compliance.
-  install -d -m755 ${pkgdir}/etc/${pkgname}
-  ln -sv /usr/lib/mailman/Mailman/mm_cfg.py ${pkgdir}/etc/${pkgname}/mm_cfg.py
-
-  # fix some permissions to satisfy check_perms
-  chown -R mailman:mailman $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
-  chown http:mailman ${pkgdir}/var/lib/mailman/archives/private
-  chmod 2770 ${pkgdir}/var/lib/mailman/archives/private
-  chmod 2755 ${pkgdir}/usr/lib/mailman/cgi-bin/* 
-  chmod 2755 ${pkgdir}/usr/lib/mailman/mail/mailman
-
-  # install the launch script
-  install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman
-}
diff --git a/extra/mailman/mailman-2.1-build.patch b/extra/mailman/mailman-2.1-build.patch
deleted file mode 100644
index d00613ad7..000000000
--- a/extra/mailman/mailman-2.1-build.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
---- mailman-2.1.12-a/bin/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/bin/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -56,7 +55,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -72,8 +71,6 @@
- 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
---- mailman-2.1.12-a/cron/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/cron/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -68,8 +67,6 @@
- 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in
---- mailman-2.1.12-a/Mailman/Archiver/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -47,7 +46,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in
---- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in
---- mailman-2.1.12-a/Mailman/Cgi/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -47,7 +46,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
-         done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in
---- mailman-2.1.12-a/Mailman/Commands/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Commands/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in
---- mailman-2.1.12-a/Mailman/Gui/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Gui/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in
---- mailman-2.1.12-a/Mailman/Handlers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in
---- mailman-2.1.12-a/Mailman/Logging/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Logging/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in
---- mailman-2.1.12-a/Mailman/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -20,8 +20,6 @@
- 
- # Variables set by configure
- 
--VERSION=	@VERSION@
--
- VPATH=		@srcdir@
- srcdir= 	@srcdir@
- bindir= 	@bindir@
-@@ -30,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -48,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -79,12 +76,6 @@
- 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- 	done
- 
--finish:
--	@for d in $(SUBDIRS); \
--	do \
--	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \
--	done
--
- clean:
- 	for d in $(SUBDIRS); \
- 	do \
-diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in
---- mailman-2.1.12-a/Mailman/MTA/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/MTA/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in
---- mailman-2.1.12-a/Mailman/Queue/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Queue/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
---- mailman-2.1.12-a/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -61,11 +61,10 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID=	chmod g+s
- 
- DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
- LANGPACK = README-I18N.en templates messages
-@@ -85,14 +84,24 @@
- 
- doinstall: $(SUBDIRS)
- 	@echo "Creating architecture independent directories..."
-+	dir=$(DESTDIR)$(prefix); \
-+	if test ! -d $$dir; then \
-+		echo "Creating directory hierarchy $$dir"; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
-+	else true; \
-+	fi;
-+	dir=$(DESTDIR)$(var_prefix); \
-+	if test ! -d $$dir; then \
-+		echo "Creating directory hierarchy $$dir"; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
-+	else true; \
-+	fi;
- 	@for d in $(VAR_DIRS); \
- 	do \
- 	    dir=$(DESTDIR)$(var_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-@@ -102,9 +111,7 @@
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-@@ -114,9 +121,7 @@
- 	    dir=$(DESTDIR)$(exec_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in
---- mailman-2.1.12-a/messages/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/messages/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -32,7 +32,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -43,7 +42,6 @@
- CFLAGS=		$(OPT) $(DEFS)
- PACKAGEDIR= 	$(prefix)/messages
- SHELL=		/bin/sh
--DIRSETGID=	chmod g+s
- MSGFMT= 	@PYTHON@ ../build/bin/msgfmt.py
- MSGMERGE=	msgmerge
- 
-@@ -60,7 +58,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -90,9 +88,8 @@
- 	do \
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
- 	    echo "Creating language directory $$dir"; \
--	    $(srcdir)/../mkinstalldirs $$dir; \
--	    chmod $(DIRMODE) $$dir; \
--	    $(DIRSETGID) $$dir; \
-+	    $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \
-+	    $(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	done
- 	@for d in $(LANGUAGES); \
- 	do \
-@@ -113,8 +110,6 @@
- 
- mofiles: $(MOFILES)
- 
--finish:
--
- clean:
- 	-rm -f */LC_MESSAGES/mailman.mo
- 
-diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
---- mailman-2.1.12-a/misc/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/misc/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -30,7 +30,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- PYTHON=		@PYTHON@
- 
-@@ -62,7 +61,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- DATAMODE=	664
-@@ -101,8 +100,6 @@
- 	    (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in
---- mailman-2.1.12-a/scripts/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/scripts/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -49,7 +48,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -68,8 +67,6 @@
- 	$(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
- 	$(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
---- mailman-2.1.12-a/src/Makefile.in	2009-07-28 12:19:47.000000000 +0200
-+++ mailman-2.1.12-b/src/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- PYTHON=  	@PYTHON@
- 
-@@ -63,10 +62,9 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
--EXEMODE=	755
-+DIRMODE=	2775
-+EXEMODE=	2755
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID=	chmod g+s
- 
- # Fixed definitions
- 
-@@ -110,20 +108,10 @@
- 	do \
- 	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
- 	    $(INSTALL_PROGRAM) $$f $$exe; \
--	    $(DIRSETGID) $$exe; \
- 	done
- 	for f in $(MAIL_PROGS); \
- 	do \
- 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \
--	    $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \
--	done
--
--finish:
--	-for f in $(SUID_CGI_PROGS); \
--	do \
--	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
--	    chown $(MAILMAN_USER) $$exe; \
--	    chmod u+s $$exe; \
- 	done
- 
- clean:
-diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in
---- mailman-2.1.12-a/templates/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/templates/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- TRUE=		@TRUE@
- 
-@@ -48,7 +47,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,15 +60,13 @@
- install:
- 	for d in $(LANGUAGES); \
- 	do \
--	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
-+	    $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \
- 	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
- 	    do \
- 	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
- 	    done; \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in
---- mailman-2.1.12-a/tests/bounces/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/bounces/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
---- mailman-2.1.12-a/tests/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@
- 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in
---- mailman-2.1.12-a/tests/msgs/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/msgs/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
diff --git a/extra/mailman/mailman.install b/extra/mailman/mailman.install
deleted file mode 100644
index ec85260a5..000000000
--- a/extra/mailman/mailman.install
+++ /dev/null
@@ -1,31 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  # Make sure the group and user "mailman" exists on this system and has the correct values
-  if grep -q "^mailman:" /etc/group &> /dev/null ; then
-    groupmod -g 80 -n mailman mailman &> /dev/null
-  else
-    groupadd -g 80 mailman &> /dev/null
-  fi
-  
-  if grep -q "^mailman:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman mailman &> /dev/null
-  else
-    useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman -M -r mailman &> /dev/null
-  fi 
-
-  # check file permissions
-#  cd /usr/lib/mailman && bin/check_perms -f  > /dev/null 2>&1     # -f applies fixes we should solve in the PKGBUILD
-  cd /usr/lib/mailman && bin/check_perms > /dev/null
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-## arg 1:  the old package version
-pre_remove() {
-  userdel mailman &>/dev/null
-  groupdel mailman &>/dev/null || /bin/true
-}
diff --git a/extra/mailman/rc.mailman b/extra/mailman/rc.mailman
deleted file mode 100644
index 07660e530..000000000
--- a/extra/mailman/rc.mailman
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting mailman Daemon"
-      /usr/lib/mailman/bin/mailmanctl start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mailman
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mailman Daemon"
-    /usr/lib/mailman/bin/mailmanctl stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mailman
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/mercurial/mercurial-2.1-return-code.patch b/extra/mercurial/mercurial-2.1-return-code.patch
deleted file mode 100644
index 8139badfd..000000000
--- a/extra/mercurial/mercurial-2.1-return-code.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-
-# HG changeset patch
-# User Matt Mackall <mpm@selenic.com>
-# Date 1328911770 21600
-# Node ID a3dcc59054cac3a78d0d5e5402680b17a396d59e
-# Parent  d75aa756149bfd54b1f7f84b86072b3c1a50d683
-pull: backout change to return code
-
-This bit a number of people.
-
-diff --git a/mercurial/commands.py b/mercurial/commands.py
---- a/mercurial/commands.py
-+++ b/mercurial/commands.py
-@@ -4261,7 +4261,7 @@
- 
- def postincoming(ui, repo, modheads, optupdate, checkout):
-     if modheads == 0:
--        return 1
-+        return
-     if optupdate:
-         movemarkfrom = repo['.'].node()
-         try:
-@@ -4312,8 +4312,7 @@
-     If SOURCE is omitted, the 'default' path will be used.
-     See :hg:`help urls` for more information.
- 
--    Returns 0 on success, 1 if no changes found or an update had
--    unresolved files.
-+    Returns 0 on success, 1 if an update had unresolved files.
-     """
-     source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
-     other = hg.peer(repo, opts, source)
-diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
---- a/tests/test-bookmarks-pushpull.t
-+++ b/tests/test-bookmarks-pushpull.t
-@@ -44,7 +44,6 @@
-   pulling from ../a
-   no changes found
-   importing bookmark X
--  [1]
-   $ hg bookmark
-      X                         0:4e3505fd9583
-      Y                         0:4e3505fd9583
-@@ -185,7 +184,6 @@
-   no changes found
-   divergent bookmark X stored as X@1
-   importing bookmark Z
--  [1]
-   $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
-   requesting all changes
-   adding changesets
-diff --git a/tests/test-bundle.t b/tests/test-bundle.t
---- a/tests/test-bundle.t
-+++ b/tests/test-bundle.t
-@@ -85,7 +85,6 @@
-   pulling from ../full.hg
-   searching for changes
-   no changes found
--  [1]
- 
- Pull full.hg into empty (using --cwd)
- 
-@@ -120,7 +119,6 @@
-   pulling from full.hg
-   searching for changes
-   no changes found
--  [1]
- 
- Pull full.hg into empty (using -R)
- 
-@@ -128,7 +126,6 @@
-   pulling from full.hg
-   searching for changes
-   no changes found
--  [1]
- 
- Rollback empty
- 
-diff --git a/tests/test-convert.t b/tests/test-convert.t
---- a/tests/test-convert.t
-+++ b/tests/test-convert.t
-@@ -293,7 +293,6 @@
-   pulling from ../a
-   searching for changes
-   no changes found
--  [1]
-   $ touch bogusfile
- 
- should fail
-diff --git a/tests/test-hook.t b/tests/test-hook.t
---- a/tests/test-hook.t
-+++ b/tests/test-hook.t
-@@ -196,7 +196,6 @@
-   listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} 
-   listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} 
-   importing bookmark bar
--  [1]
-   $ cd ../a
- 
- test that prepushkey can prevent incoming keys
-diff --git a/tests/test-https.t b/tests/test-https.t
---- a/tests/test-https.t
-+++ b/tests/test-https.t
-@@ -160,7 +160,6 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ mv copy-pull/.hg/hgrc.bu copy-pull/.hg/hgrc
- 
- cacert configured globally, also testing expansion of environment
-@@ -172,13 +171,11 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ P=`pwd` hg -R copy-pull pull --insecure
-   warning: localhost certificate with fingerprint 91:4f:1a:ff:87:24:9c:09:b6:85:9b:88:b1:90:6d:30:75:64:91:ca not verified (check hostfingerprints or web.cacerts config setting)
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
- cacert mismatch
- 
-@@ -191,7 +188,6 @@
-   pulling from https://127.0.0.1:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg -R copy-pull pull --config web.cacerts=pub-other.pem
-   abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob)
-   [255]
-@@ -200,7 +196,6 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
- Test server cert which isn't valid yet
- 
-@@ -260,7 +255,6 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
- Test https with cacert and fingerprint through proxy
- 
-@@ -268,12 +262,10 @@
-   pulling from https://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull https://127.0.0.1:$HGPORT/
-   pulling from https://127.0.0.1:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
- Test https with cert problems through proxy
- 
-diff --git a/tests/test-mq-qimport-fail-cleanup.t b/tests/test-mq-qimport-fail-cleanup.t
---- a/tests/test-mq-qimport-fail-cleanup.t
-+++ b/tests/test-mq-qimport-fail-cleanup.t
-@@ -34,7 +34,6 @@
-   b.patch
- 
-   $ hg pull -q -r 0 . # update phase
--  [1]
-   $ hg qimport -r 0
-   abort: revision 0 is not mutable
-   (see "hg help phases" for details)
-diff --git a/tests/test-pending.t b/tests/test-pending.t
---- a/tests/test-pending.t
-+++ b/tests/test-pending.t
-@@ -102,7 +102,6 @@
-   rollback completed
-   abort: pretxnchangegroup hook failed
-   pull 0000000000000000000000000000000000000000
--  [1]
- 
- test external hook
- 
-@@ -118,4 +117,3 @@
-   rollback completed
-   abort: pretxnchangegroup hook exited with status 1
-   pull 0000000000000000000000000000000000000000
--  [1]
-diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
---- a/tests/test-phases-exchange.t
-+++ b/tests/test-phases-exchange.t
-@@ -136,7 +136,6 @@
-   pulling from ../alpha
-   searching for changes
-   no changes found
--  [1]
-   $ hgph
-   o  4 public a-D - b555f63b6063
-   |
-@@ -344,7 +343,6 @@
-   pulling from ../alpha
-   searching for changes
-   no changes found
--  [1]
-   $ hgph
-   @  6 public n-B - 145e75495359
-   |
-@@ -777,7 +775,6 @@
-   pulling from ../mu
-   searching for changes
-   no changes found
--  [1]
-   $ hgph
-   @  11 draft A-secret - 435b5d83910c
-   |
-@@ -930,7 +927,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg phase f54f1bb90ff3
-   2: draft
- 
-diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t
---- a/tests/test-pull-r.t
-+++ b/tests/test-pull-r.t
-@@ -100,5 +100,4 @@
- This used to abort: received changelog group is empty:
- 
-   $ hg pull -qr 1 ../repo
--  [1]
- 
-diff --git a/tests/test-pull.t b/tests/test-pull.t
---- a/tests/test-pull.t
-+++ b/tests/test-pull.t
-@@ -48,7 +48,6 @@
-   pulling from http://foo@localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
- 
-   $ hg rollback --dry-run --verbose
-   repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
-@@ -78,7 +77,6 @@
-   [255]
- 
-   $ hg pull -q file:../test
--  [1]
- 
- It's tricky to make file:// URLs working on every platform with
- regular shell commands.
-@@ -90,4 +88,3 @@
- 
-   $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
-   $ hg pull -q "$URL"
--  [1]
-diff --git a/tests/test-ssh.t b/tests/test-ssh.t
---- a/tests/test-ssh.t
-+++ b/tests/test-ssh.t
-@@ -80,7 +80,6 @@
-   pulling from ssh://user@dummy/remote
-   searching for changes
-   no changes found
--  [1]
- 
- local change
- 
-@@ -199,7 +198,6 @@
-   no changes found
-   updating bookmark foo
-   importing bookmark foo
--  [1]
-   $ hg book -d foo
-   $ hg push -B foo
-   pushing to ssh://user@dummy/remote
-diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
---- a/tests/test-subrepo.t
-+++ b/tests/test-subrepo.t
-@@ -580,7 +580,6 @@
-   cloning subrepo s from $TESTTMP/sub/repo/s (glob)
-   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-   $ hg -q -R repo2 pull -u
--  [1]
-   $ echo 1 > repo2/s/a
-   $ hg -R repo2/s ci -m2
-   $ hg -q -R repo2/s push
-@@ -639,7 +638,6 @@
-   pulling from issue1852a
-   searching for changes
-   no changes found
--  [1]
- 
- Try the same, but with pull -u
- 
-diff --git a/tests/test-treediscovery-legacy.t b/tests/test-treediscovery-legacy.t
---- a/tests/test-treediscovery-legacy.t
-+++ b/tests/test-treediscovery-legacy.t
-@@ -48,7 +48,6 @@
-   $ hg pull -R empty1 $remote
-   pulling from http://localhost:$HGPORT/
-   no changes found
--  [1]
-   $ hg push -R empty1 $remote
-   pushing to http://localhost:$HGPORT/
-   no changes found
-@@ -108,7 +107,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-@@ -233,7 +231,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-@@ -278,7 +275,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t
---- a/tests/test-treediscovery.t
-+++ b/tests/test-treediscovery.t
-@@ -42,7 +42,6 @@
-   $ hg pull -R empty1 $remote
-   pulling from http://localhost:$HGPORT/
-   no changes found
--  [1]
-   $ hg push -R empty1 $remote
-   pushing to http://localhost:$HGPORT/
-   no changes found
-@@ -102,7 +101,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-@@ -221,7 +219,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-@@ -266,7 +263,6 @@
-   pulling from http://localhost:$HGPORT/
-   searching for changes
-   no changes found
--  [1]
-   $ hg push $remote
-   pushing to http://localhost:$HGPORT/
-   searching for changes
-diff --git a/tests/test-url-rev.t b/tests/test-url-rev.t
---- a/tests/test-url-rev.t
-+++ b/tests/test-url-rev.t
-@@ -141,7 +141,6 @@
- No new revs, no update:
- 
-   $ hg pull -qu
--  [1]
- 
-   $ hg parents -q
-   0:1f0dee641bb7
-
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
deleted file mode 100644
index 432e226e2..000000000
--- a/extra/midori/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 145174 2011-12-19 00:22:14Z eric $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-
-pkgname=midori
-pkgver=0.4.3
-pkgrel=1
-pkgdesc="A lightweight web browser based on Gtk WebKit"
-arch=('i686' 'x86_64')
-url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-license=('LGPL2.1')
-install=midori.install
-depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
-optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('900037557b82818d79d2dd1c5a7d7fd2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  # python2 
-  export PYTHON=/usr/bin/python2
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
-  
-  ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
-	--enable-addons \
-	--disable-hildon \
-	--enable-unique \
-	--enable-nls \
-	--enable-docs \
-	--enable-apidocs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/midori/midori.install b/extra/midori/midori.install
deleted file mode 100644
index 4da5511fd..000000000
--- a/extra/midori/midori.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/midori/webkit_search.diff b/extra/midori/webkit_search.diff
deleted file mode 100644
index 620cdc96f..000000000
--- a/extra/midori/webkit_search.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@twotoasts.de>
-Date: Wed, 21 Sep 2011 21:50:51 +0000
-Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1
-
-Fixes: https://bugs.launchpad.net/midori/+bug/799603
----
-diff --git a/midori/midori-view.c b/midori/midori-view.c
-index 0d7a96e..e426e7f 100644
---- a/midori/midori-view.c
-+++ b/midori/midori-view.c
-@@ -39,9 +39,11 @@
-     #include <sys/utsname.h>
- #endif
- 
-+#if !WEBKIT_CHECK_VERSION (1, 5, 1)
- /* This is unstable API, so we need to declare it */
- gchar*
- webkit_web_view_get_selected_text (WebKitWebView* web_view);
-+#endif
- 
- static void
- midori_view_construct_web_view (MidoriView* view);
-@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view)
- gboolean
- midori_view_has_selection (MidoriView* view)
- {
-+#if WEBKIT_CHECK_VERSION (1, 5, 1)
-+    WebKitDOMDocument* doc;
-+    WebKitDOMDOMWindow* window;
-+    WebKitDOMDOMSelection* selection;
-+    WebKitDOMRange* range;
-+#endif
-+
-     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
- 
-+
-+#if WEBKIT_CHECK_VERSION (1, 5, 1)
-+    doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
-+    window = webkit_dom_document_get_default_view (doc);
-+    selection = webkit_dom_dom_window_get_selection (window);
-+    if (selection == NULL)
-+        return FALSE;
-+
-+    range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
-+    if (range == NULL)
-+        return FALSE;
-+
-+    katze_assign (view->selected_text, webkit_dom_range_get_text (range));
-+#else
-     katze_assign (view->selected_text, webkit_web_view_get_selected_text (
-         WEBKIT_WEB_VIEW (view->web_view)));
-+#endif
-+
-     if (view->selected_text && *view->selected_text)
-         return TRUE;
-     else
---
-cgit 
diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog
deleted file mode 100644
index 7e174cfb4..000000000
--- a/extra/mpd/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2012-02-11 Angel Velasquez <angvp@archlinux.org>
-    * Version bump to 0.16.7
-
-2011-12-05 Angel Velasquez <angvp@archlinux.org>
-    * Version bump to 0.16.6
-
-2011-09-03 Angel Velasquez <angvp@archlinux.org>
-    * Version bump to 0.16.4
-    * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream
-
-2011-06-25 Angel Velasquez <angvp@archlinux.org>
-    * Added a patch for bug with ffmpeg FS#24839 
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/extra/mpd/mpd b/extra/mpd/mpd
deleted file mode 100755
index 6134e2ed4..000000000
--- a/extra/mpd/mpd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Music Player Daemon"
-    [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
-    /usr/bin/mpd /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Music Player Daemon"
-    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/mpd/mpd.install b/extra/mpd/mpd.install
deleted file mode 100644
index 885505a07..000000000
--- a/extra/mpd/mpd.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade
-  echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
-}
-
-post_upgrade() {
-  getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
-  getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
-  for dir in /var/{lib,log}/mpd; do
-    chown -R mpd:mpd "$dir" 1>/dev/null
-  done
-}
-
-post_remove() {
-  getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
-  getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
-  [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
-}
diff --git a/extra/nss-mdns/mdns.allow b/extra/nss-mdns/mdns.allow
deleted file mode 100644
index ed64c974c..000000000
--- a/extra/nss-mdns/mdns.allow
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# /etc/mdns.allow
-#
-
-.local.
-.local
-
-# End of file
diff --git a/extra/nss/bug702090.patch b/extra/nss/bug702090.patch
deleted file mode 100644
index e25148554..000000000
--- a/extra/nss/bug702090.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./mozilla/security/nss/lib/util/pkcs11n.h.orig	2011-09-14 10:21:10.000000000 +0900
-+++ ./mozilla/security/nss/lib/util/pkcs11n.h	2011-11-19 00:45:01.131860104 +0900
-@@ -346,7 +346,7 @@
-  * labels have never been accurate to what was really implemented.
-  * The new labels correctly reflect what the values effectively mean.
-  */
--#if __GNUC__ > 3
-+#if defined(__GNUC__) && (__GNUC__ > 3)
- /* make GCC warn when we use these #defines */
- /*
-  *  This is really painful because GCC doesn't allow us to mark random
-@@ -362,7 +362,7 @@
-  *  cast the resulting value to the deprecated type in the #define, thus
-  *  producting the warning when the #define is used.
-  */
--#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
-+#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
- /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
-  * is a gcc version issue rather than mac or ppc specific */
- typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD
deleted file mode 100644
index 160ac938d..000000000
--- a/extra/ntrack/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 150906 2012-02-23 13:55:25Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=ntrack
-pkgver=16
-pkgrel=2
-epoch=1
-pkgdesc="A network connectivity tracking library"
-arch=('i686' 'x86_64')
-url="http://launchpad.net/ntrack/"
-license=('LGPL')
-depends=('qt' 'libnl')
-makedepends=('python2')
-options=('!libtool' '!emptydirs')
-source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz"
-        'libnl3.patch')
-md5sums=('21691dac43460a6791cba3decbc68242'
-         '0a1f6b7f9a01c323e81d6da95cad93cd')
-
-build() {
-  cd "${srcdir}/${pkgname}-0${pkgver}"
-  patch -p1 -i "${srcdir}"/libnl3.patch
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-0${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ntrack/libnl3.patch b/extra/ntrack/libnl3.patch
deleted file mode 100644
index 879b52c8c..000000000
--- a/extra/ntrack/libnl3.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
-Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 and glib.
-
-Index: ntrack/glib/Makefile.am
-===================================================================
---- ntrack.orig/glib/Makefile.am	2011-12-22 19:25:13.137470000 -0500
-+++ ntrack/glib/Makefile.am	2011-12-22 20:07:10.243344976 -0500
-@@ -26,7 +26,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/
- 
- AM_LDFLAGS =
-Index: ntrack/glib/Makefile.in
-===================================================================
---- ntrack.orig/glib/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/glib/Makefile.in	2011-12-22 20:07:14.871344769 -0500
-@@ -325,7 +325,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/
- 
- AM_LDFLAGS = 
-Index: ntrack/glib/test/Makefile.am
-===================================================================
---- ntrack.orig/glib/test/Makefile.am	2011-12-22 19:25:13.137470000 -0500
-+++ ntrack/glib/test/Makefile.am	2011-12-22 20:07:19.451344565 -0500
-@@ -27,7 +27,6 @@
- 	../../common/libntrack.la
- 
- AM_CFLAGS = \
--	-pedantic \
- 	-Wall \
- 	-Werror \
- 	-I$(srcdir)/.. \
-Index: ntrack/glib/test/Makefile.in
-===================================================================
---- ntrack.orig/glib/test/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/glib/test/Makefile.in	2011-12-22 20:07:23.903344367 -0500
-@@ -260,7 +260,6 @@
- 	../../common/libntrack.la
- 
- AM_CFLAGS = \
--	-pedantic \
- 	-Wall \
- 	-Werror \
- 	-I$(srcdir)/.. \
-Index: ntrack/gobject/Makefile.am
-===================================================================
---- ntrack.orig/gobject/Makefile.am	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/gobject/Makefile.am	2011-12-22 20:07:27.515344206 -0500
-@@ -26,7 +26,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/ \
- 	-I$(srcdir)/../glib/
- 
-Index: ntrack/gobject/Makefile.in
-===================================================================
---- ntrack.orig/gobject/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/gobject/Makefile.in	2011-12-22 20:07:31.519344028 -0500
-@@ -347,7 +347,6 @@
- AM_CFLAGS = \
- 	-Wall \
- 	-Werror \
--	-pedantic \
- 	-I$(srcdir)/../common/ \
- 	-I$(srcdir)/../glib/
- 
-Index: ntrack/modules/Makefile.am
-===================================================================
---- ntrack.orig/modules/Makefile.am	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/modules/Makefile.am	2011-12-22 20:07:35.519343851 -0500
-@@ -26,7 +26,6 @@
- 	-Wall \
- 	-Werror \
- 	-Wno-variadic-macros \
--	-pedantic \
- 	-I$(top_srcdir)/common/
- 
- AM_LDFLAGS =
-Index: ntrack/modules/Makefile.in
-===================================================================
---- ntrack.orig/modules/Makefile.in	2011-12-22 20:05:46.243208000 -0500
-+++ ntrack/modules/Makefile.in	2011-12-22 20:07:39.391343676 -0500
-@@ -352,7 +352,6 @@
- 	-Wall \
- 	-Werror \
- 	-Wno-variadic-macros \
--	-pedantic \
- 	-I$(top_srcdir)/common/
- 
- AM_LDFLAGS = 
diff --git a/extra/pekwm/libpng-1.4.patch b/extra/pekwm/libpng-1.4.patch
deleted file mode 100644
index bc4df2c4d..000000000
--- a/extra/pekwm/libpng-1.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur pekwm-0.1.11-orig/src/PImageLoaderPng.cc pekwm-0.1.11/src/PImageLoaderPng.cc
---- pekwm-0.1.11-orig/src/PImageLoaderPng.cc	2010-01-22 01:57:08.000000000 -0500
-+++ pekwm-0.1.11/src/PImageLoaderPng.cc	2010-01-22 02:00:02.000000000 -0500
-@@ -108,7 +108,7 @@
-     
-     // gray -> 8 bit gray
-     if (color_type == PNG_COLOR_TYPE_GRAY && (bpp < 8)) {
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-@@ -179,7 +179,7 @@
- 
-     status = fread(sig, 1, PImageLoaderPng::PNG_SIG_BYTES, fp);
-     if (status == PImageLoaderPng::PNG_SIG_BYTES) {
--        return (png_check_sig(sig, PImageLoaderPng::PNG_SIG_BYTES) != 0);
-+      return (png_sig_cmp(sig, 0, PImageLoaderPng::PNG_SIG_BYTES) == 0);
-     }
-     return false;
- }
diff --git a/extra/pidgin/nm09-more.patch b/extra/pidgin/nm09-more.patch
deleted file mode 100644
index 8c708df9a..000000000
--- a/extra/pidgin/nm09-more.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
---- pidgin-2.7.11/libpurple/network.c.nm09more	2011-04-26 12:01:27.700085246 -0500
-+++ pidgin-2.7.11/libpurple/network.c	2011-05-24 13:13:28.185165657 -0500
-@@ -833,8 +833,20 @@ purple_network_is_available(void)
- 			purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
- 	}
- 
--	if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
--		return TRUE;
-+	switch (nm_state)
-+	{
-+		case NM_STATE_UNKNOWN:
-+#if NM_CHECK_VERSION(0,8,992)
-+		case NM_STATE_CONNECTED_LOCAL:
-+		case NM_STATE_CONNECTED_SITE:
-+		case NM_STATE_CONNECTED_GLOBAL:
-+#else
-+		case NM_STATE_CONNECTED:
-+#endif
-+			return TRUE;
-+		default:
-+			break;
-+	}
- 
- 	return FALSE;
- 
-@@ -1170,9 +1182,14 @@ purple_network_init(void)
- 		                                     NM_DBUS_SERVICE,
- 		                                     NM_DBUS_PATH,
- 		                                     NM_DBUS_INTERFACE);
-+		/* NM 0.6 signal */
- 		dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
- 		dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
- 		                            G_CALLBACK(nm_state_change_cb), NULL, NULL);
-+		/* NM 0.7 and later signal */
-+		dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
-+		dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
-+		                            G_CALLBACK(nm_state_change_cb), NULL, NULL);
- 
- 		dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
- 		                                       DBUS_SERVICE_DBUS,
-@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
- #ifdef HAVE_NETWORKMANAGER
- 	if (nm_proxy) {
- 		dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
-+		dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
- 		g_object_unref(G_OBJECT(nm_proxy));
- 	}
- 	if (dbus_proxy) {
diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch
deleted file mode 100644
index 24a66b84f..000000000
--- a/extra/poppler/git-fixes.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 74f4299e8f9e2d204979479f6579dd784db678a4 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 04 Dec 2011 16:29:45 +0000
-Subject: Do not fail if we are trying to save a file with Encrypt but that we have not modified at all
-
-Fixes KDE bug #288045
-(cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa)
----
-diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
-index 01d2759..2758206 100644
---- a/poppler/PDFDoc.cc
-+++ b/poppler/PDFDoc.cc
-@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
- 
- int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
- 
--  // we don't support files with Encrypt at the moment
-+  // find if we have updated objects
-+  GBool updated = gFalse;
-+  for(int i=0; i<xref->getNumObjects(); i++) {
-+    if (xref->getEntry(i)->updated) {
-+      updated = gTrue;
-+      break;
-+    }
-+  }
-+
-+  // we don't support rewriting files with Encrypt at the moment
-   Object obj;
-   xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj);
-   if (!obj.isNull())
-   {
-     obj.free();
--    return errEncrypted;
-+    if (!updated && mode == writeStandard) {
-+      // simply copy the original file
-+      saveWithoutChangesAs (outStr);
-+    } else {
-+      return errEncrypted;
-+    }
-   }
--  obj.free();
-+  else
-+  {
-+    obj.free();
- 
--  if (mode == writeForceRewrite) {
--    saveCompleteRewrite(outStr);
--  } else if (mode == writeForceIncremental) {
--    saveIncrementalUpdate(outStr); 
--  } else { // let poppler decide
--    // find if we have updated objects
--    GBool updated = gFalse;
--    for(int i=0; i<xref->getNumObjects(); i++) {
--      if (xref->getEntry(i)->updated) {
--        updated = gTrue;
--        break;
-+    if (mode == writeForceRewrite) {
-+      saveCompleteRewrite(outStr);
-+    } else if (mode == writeForceIncremental) {
-+      saveIncrementalUpdate(outStr); 
-+    } else { // let poppler decide
-+      if(updated) { 
-+        saveIncrementalUpdate(outStr);
-+      } else {
-+        // simply copy the original file
-+        saveWithoutChangesAs (outStr);
-       }
-     }
--    if(updated) { 
--      saveIncrementalUpdate(outStr);
--    } else {
--      // simply copy the original file
--      saveWithoutChangesAs (outStr);
--    }
-   }
- 
-   return errNone;
---
-cgit v0.9.0.2-2-gbebe
-From 03544e2f602319f0b381f5f357e14cc2cc77d2c1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 06 Dec 2011 22:21:15 +0000
-Subject: include strings.h as we use memcpy
-
-Fixes bug 43558
-(cherry picked from commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b)
----
-diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc
-index f88c3a7..1fb8cab 100644
---- a/goo/PNGWriter.cc
-+++ b/goo/PNGWriter.cc
-@@ -6,7 +6,7 @@
- //
- // Copyright (C) 2009 Warren Toomey <wkt@tuhs.org>
- // Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
--// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
-+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
- // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
- // Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com>
- // Copyright (C) 2011 Thomas Klausner <wiz@danbala.tuwien.ac.at>
-@@ -19,6 +19,7 @@
- 
- #include <zlib.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "poppler/Error.h"
- #include "goo/gmem.h"
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/postgresql/postgresql b/extra/postgresql/postgresql
deleted file mode 100755
index 2ff845f73..000000000
--- a/extra/postgresql/postgresql
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-# Default PGROOT if it wasn't defined in the conf.d file
-PGROOT=${PGROOT:-/var/lib/postgres}
-PGLOG=${PGLOG:-/var/log/postgresql.log}
-PGCTL_BIN=/usr/bin/pg_ctl
-PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w)
-[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS")
-
-postgres_init() {
-    # initialization
-    if [[ ! -d "$PGROOT/data" ]]; then
-        mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT"
-        su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'"
-    fi
-    if [[ ! -e "$PGLOG" ]]; then
-        touch "$PGLOG"
-        chown postgres "$PGLOG"
-    fi
-}
-
-do_postgres() {
-  su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}") $@"
-}
-
-case $1 in
-  start)
-    postgres_init
-    stat_busy "Starting PostgreSQL"
-    if do_postgres start; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PostgreSQL"
-    if do_postgres stop -m fast; then
-      rm_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading PostgreSQL"
-    if do_postgres reload; then
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    postgres_init
-    stat_busy "Restarting PostgreSQL"
-    if do_postgres restart -m fast; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  status)
-    stat_busy "Checking PostgreSQL status";
-    ck_status postgresql
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-    exit 1
-esac
diff --git a/extra/pwgen/PKGBUILD b/extra/pwgen/PKGBUILD
deleted file mode 100644
index 7798a8370..000000000
--- a/extra/pwgen/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 149610 2012-02-08 20:11:44Z pierre $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor : Tobias Powalowski <t.powa@gmx.de>
-
-pkgname=pwgen
-pkgver=2.06
-pkgrel=3
-pkgdesc="Pwgen is a small password generator which creates passwords which can be easily memorized by a human"
-arch=("i686" "x86_64")
-url="http://sourceforge.net/projects/pwgen/"
-license=('GPL')
-depends=('glibc')
-source=("http://downloads.sourceforge.net/sourceforge/pwgen/${pkgname}-${pkgver}.tar.gz")
-md5sums=('935aebcbe610fbc9de8125e7b7d71297')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/python-pygame/ChangeLog b/extra/python-pygame/ChangeLog
deleted file mode 100644
index 566be3f65..000000000
--- a/extra/python-pygame/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-2012-01-24  Angel Velasquez <angvp@archlinux.org>
-
-	* Rebuilt against libpng 1.5
-
-2010-08-24  Eric Belanger  <eric@archlinux.org>
-
-	* Rebuilt for python2
-
-2009-08-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated to: 1.9.1
-
-2009-08-03  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Adding the examples folder
-
-2009-08-01  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for x86_64: 1.9.0
-
-2008-08-06  Eric Belanger  <eric@archlinux.org>
-
-	* python-pygame 1.8.1-2
-	* Fixed file permissions (close FS#11082)
-
-2008-07-31  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.8.1
-
-2008-03-31  Eric Belanger  <eric@archlinux.org>
-
-	* python-pygame 1.8.0-1
-	* Upstream update
-	* Added ChangeLog
diff --git a/extra/qt/fix-qgraphicsscene-regression.patch b/extra/qt/fix-qgraphicsscene-regression.patch
deleted file mode 100644
index 0c0a28a61..000000000
--- a/extra/qt/fix-qgraphicsscene-regression.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 15c14584199dc43e4a309fc331f3144009008128 Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Fri, 24 Feb 2012 00:42:34 +1100
-Subject: [PATCH] Revert "Don't rely on mapFromGlobal in
- QGraphicsScenePrivate::itemsAtPosition."
-
-This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e.
-The commit caused a regression whereby tooltips may be shown even if the
-mouse is not over the item if it has the Qt::ItemIgnoresTransformations
-flag and the QGraphicsView had been scaled.
-
-Task-number: QTBUG-17517
-Task-number: QTBUG-22663
-Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2
-Reviewed-by: Andy Shaw <andy.shaw@digia.com>
-Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
----
- src/gui/graphicsview/qgraphicsscene.cpp |   10 +++++++---
- 1 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
-index 14c0f3c..d1cdd4f 100644
---- a/src/gui/graphicsview/qgraphicsscene.cpp
-+++ b/src/gui/graphicsview/qgraphicsscene.cpp
-@@ -1084,7 +1084,7 @@ void QGraphicsScenePrivate::enableMouseTrackingOnViews()
- /*!
-     Returns all items for the screen position in \a event.
- */
--QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*screenPos*/,
-+QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &screenPos,
-                                                               const QPointF &scenePos,
-                                                               QWidget *widget) const
- {
-@@ -1093,12 +1093,16 @@ QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*sc
-     if (!view)
-         return q->items(scenePos, Qt::IntersectsItemShape, Qt::DescendingOrder, QTransform());
- 
--    const QRectF pointRect(scenePos, QSizeF(1, 1));
-+    const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)), QSizeF(1, 1));
-     if (!view->isTransformed())
-         return q->items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder);
- 
-     const QTransform viewTransform = view->viewportTransform();
--    return q->items(pointRect, Qt::IntersectsItemShape,
-+    if (viewTransform.type() <= QTransform::TxScale) {
-+        return q->items(viewTransform.inverted().mapRect(pointRect), Qt::IntersectsItemShape,
-+                        Qt::DescendingOrder, viewTransform);
-+    }
-+    return q->items(viewTransform.inverted().map(pointRect), Qt::IntersectsItemShape,
-                     Qt::DescendingOrder, viewTransform);
- }
- 
--- 
-1.7.6
-
diff --git a/extra/qt/fix-qurl.patch b/extra/qt/fix-qurl.patch
deleted file mode 100644
index 1c666dba4..000000000
--- a/extra/qt/fix-qurl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
---- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile	2011-10-03 22:44:32.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp	2011-10-27 12:58:35.706815049 -0500
-@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
- QString QUrl::toLocalFile() const
- {
-     // the call to isLocalFile() also ensures that we're parsed
--    if (!isLocalFile())
-+    // Treat URLs with no scheme as local for backward compatibility
-+    if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
-         return QString();
- 
-     QString tmp;
diff --git a/extra/qt/improve-cups-support.patch b/extra/qt/improve-cups-support.patch
deleted file mode 100644
index e0305e11b..000000000
--- a/extra/qt/improve-cups-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
-     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+    if (cups) {
-+        const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                options.duplexShort->setChecked(true);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                options.duplexLong->setChecked(true);
-+            else
-+                options.noDuplex->setChecked(true);
-+        }
-+
-+        if (cups->currentPPD()) {
-+            // set default color
-+            if (cups->currentPPD()->color_device)
-+                options.color->setChecked(true);
-+            else
-+                options.grayscale->setChecked(true);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups->ppdOption("Collate");
-+        if (collate)
-+            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+    }
- }
- #endif
- 
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
-                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
-         setOutputFormat(QPrinter::PdfFormat);
-     }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+    // fill in defaults from ppd file
-+    QCUPSSupport cups;
-+
-+    int printernum = -1;
-+    for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+            printernum = i;
-+    }
-+    if (printernum >= 0) {
-+        cups.setCurrentPrinter(printernum);
-+
-+        const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                setDuplex(DuplexShortSide);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                setDuplex(DuplexLongSide);
-+            else
-+                setDuplex(DuplexNone);
-+        }
-+
-+        if (cups.currentPPD()) {
-+            // set default color
-+            if (cups.currentPPD()->color_device)
-+                setColorMode(Color);
-+            else
-+                setColorMode(GrayScale);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups.ppdOption("Collate");
-+        if (collate)
-+            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+    }
-+#endif
- }
- 
- /*!
diff --git a/extra/qt/improved-filter-event.patch b/extra/qt/improved-filter-event.patch
deleted file mode 100644
index b03cdbe94..000000000
--- a/extra/qt/improved-filter-event.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- qt-opensource-4.8.0.old/src/gui/kernel/qapplication_x11.cpp	2011-12-16 03:22:33.918428374 -0500
-+++ qt-opensource-4.8.0.new/src/gui/kernel/qapplication_x11.cpp	2012-01-07 18:18:40.258246384 -0500
-@@ -4244,7 +4205,12 @@ bool QETWidget::translateMouseEvent(cons
-                     && (nextEvent.xclient.message_type == ATOM(_QT_SCROLL_DONE) ||
-                     (nextEvent.xclient.message_type == ATOM(WM_PROTOCOLS) &&
-                      (Atom)nextEvent.xclient.data.l[0] == ATOM(_NET_WM_SYNC_REQUEST))))) {
--                qApp->x11ProcessEvent(&nextEvent);
-+                // As we may run through a significant number of a large class of non-MotionNotify
-+                // events here, without returning to the event loop, first pass nextEvent to
-+                // QAbstractEventDispatcher::filterEvent() to allow applications which override
-+                // QAbstractEventDispatcher::filterEvent() to handle the event first.
-+                if (!QAbstractEventDispatcher::instance()->filterEvent(&nextEvent))
-+                    qApp->x11ProcessEvent(&nextEvent);
-                 continue;
-             } else if (nextEvent.type != MotionNotify ||
-                        nextEvent.xmotion.window != event->xmotion.window ||
---- qt-opensource-4.8.0.old/src/gui/kernel/qclipboard_x11.cpp	2011-12-08 00:06:02.000000000 -0500
-+++ qt-opensource-4.8.0.new/src/gui/kernel/qclipboard_x11.cpp	2012-01-07 18:30:35.298287639 -0500
-@@ -573,7 +573,11 @@ bool QX11Data::clipboardWaitForEvent(Win
- 
-             // process other clipboard events, since someone is probably requesting data from us
-             XEvent e;
--            if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0))
-+            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
-+            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
-+            // x11ProcessEvent().
-+            if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0) && 
-+                !QAbstractEventDispatcher::instance()->filterEvent(&e))
-                 qApp->x11ProcessEvent(&e);
- 
-             now.start();
---- qt-opensource-4.8.0.old/src/gui/kernel/qdnd_x11.cpp	2011-12-08 00:06:02.000000000 -0500
-+++ qt-opensource-4.8.0.new/src/gui/kernel/qdnd_x11.cpp	2012-01-07 18:28:13.841279478 -0500
-@@ -42,6 +42,7 @@
- #include "qplatformdefs.h"
- 
- #include "qapplication.h"
-+#include "qabstracteventdispatcher.h"
- 
- #ifndef QT_NO_DRAGANDDROP
- 
-@@ -1941,7 +1942,11 @@ Qt::DropAction QDragManager::drag(QDrag
-         timer.start();
-         do {
-             XEvent event;
--            if (XCheckTypedEvent(X11->display, ClientMessage, &event))
-+            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
-+            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
-+            // x11ProcessEvent().
-+            if (XCheckTypedEvent(X11->display, ClientMessage, &event) &&
-+                !QAbstractEventDispatcher::instance()->filterEvent(&event))
-                 qApp->x11ProcessEvent(&event);
- 
-             // sleep 50 ms, so we don't use up CPU cycles all the time.
---- qt-opensource-4.8.0.old/src/gui/kernel/qwidget_x11.cpp	2011-12-08 00:06:02.000000000 -0500
-+++ qt-opensource-4.8.0.new/src/gui/kernel/qwidget_x11.cpp	2012-01-07 18:29:26.286283657 -0500
-@@ -44,6 +44,7 @@
- #include "qdesktopwidget.h"
- #include "qapplication.h"
- #include "qapplication_p.h"
-+#include "qabstracteventdispatcher.h"
- #include "qnamespace.h"
- #include "qpainter.h"
- #include "qbitmap.h"
-@@ -376,17 +377,22 @@ void qt_x11_wait_for_window_manager(QWid
-     do {
-         if (XEventsQueued(X11->display, QueuedAlready)) {
-             XNextEvent(X11->display, &ev);
--            qApp->x11ProcessEvent(&ev);
--
--            switch (state) {
--            case Initial:
--                if (ev.type == MapNotify && ev.xany.window == winid)
--                    state = Mapped;
--                break;
--            case Mapped:
--                if (ev.type == Expose && ev.xany.window == winid)
--                    return;
--                break;
-+            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
-+            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
-+            // x11ProcessEvent().
-+            if (!QAbstractEventDispatcher::instance()->filterEvent(&ev)) {
-+                qApp->x11ProcessEvent(&ev);
-+
-+                switch (state) {
-+                case Initial:
-+                    if (ev.type == MapNotify && ev.xany.window == winid)
-+                        state = Mapped;
-+                    break;
-+                case Mapped:
-+                    if (ev.type == Expose && ev.xany.window == winid)
-+                        return;
-+                    break;
-+                }
-             }
-         } else {
-             if (!XEventsQueued(X11->display, QueuedAfterFlush))
diff --git a/extra/qt/qurl-backward-compatibility.patch b/extra/qt/qurl-backward-compatibility.patch
deleted file mode 100644
index 1c666dba4..000000000
--- a/extra/qt/qurl-backward-compatibility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
---- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile	2011-10-03 22:44:32.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp	2011-10-27 12:58:35.706815049 -0500
-@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
- QString QUrl::toLocalFile() const
- {
-     // the call to isLocalFile() also ensures that we're parsed
--    if (!isLocalFile())
-+    // Treat URLs with no scheme as local for backward compatibility
-+    if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
-         return QString();
- 
-     QString tmp;
diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD
deleted file mode 100644
index cd5e3cfce..000000000
--- a/extra/qtcurve-gtk2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 141029 2011-10-22 02:18:45Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-gtk2
-pkgver=1.8.12
-pkgrel=1
-pkgdesc="A configurable set of widget styles for KDE and Gtk"
-arch=('i686' 'x86_64')
-url="http://www.kde-look.org/content/show.php?content=40492"
-license=('GPL')
-depends=('gtk2')
-makedepends=('cmake')
-groups=('qtcurve')
-options=('!libtool')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2")
-sha1sums=('3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f')
-
-build() {
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../QtCurve-Gtk2-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/qtcurve-kde3/PKGBUILD b/extra/qtcurve-kde3/PKGBUILD
deleted file mode 100644
index 214bdb40d..000000000
--- a/extra/qtcurve-kde3/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 149631 2012-02-08 20:57:56Z pierre $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-kde3
-pkgver=1.8.5
-pkgrel=2
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('kdelibs3')
-makedepends=('cmake' 'kdelibs')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE3-${pkgver}.tar.bz2"
-	'kdeglobals'
-	'bypass-kde-config.patch')
-md5sums=('d9cca99526079782f9fc7bd7ba432582'
-         '05a6294c7f0e239e698e7e5224fc8e7f'
-         'e1ab2c0995e412b2cbfe804fba75517e')
-
-build() {
-  . /etc/profile.d/qt3.sh
-  . /etc/profile.d/kde3.sh
-
-  cd ${srcdir}/QtCurve-KDE3-${pkgver}
-  # Bypass KDE prefix detection by kde4-config, see:
-  # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-  patch -Np1 -i ${srcdir}/bypass-kde-config.patch
-
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../QtCurve-KDE3-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/opt/kde
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-
-  # remove kcontrol plugins
-  rm -f $pkgdir/opt/kde/lib/kde3/kstyle_qtcurve_config.*
-
-  # set default theme
-  install -D -m644 $srcdir/kdeglobals $pkgdir/opt/kde/share/config/kdeglobals
-}
diff --git a/extra/qtcurve-kde3/bypass-kde-config.patch b/extra/qtcurve-kde3/bypass-kde-config.patch
deleted file mode 100644
index 113fb93b8..000000000
--- a/extra/qtcurve-kde3/bypass-kde-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- QtCurve-KDE3-1.6.0/CMakeLists.txt~	2010-09-14 16:19:36.543333337 +0200
-+++ QtCurve-KDE3-1.6.0/CMakeLists.txt	2010-09-14 16:22:18.160000003 +0200
-@@ -44,6 +44,12 @@
-     endif (QT_PLUGINS_DIR MATCHES NOTFOUND)
- endif (NOT QTC_QT_ONLY)
- 
-+# Comment the kde3/kde4 prefix detection as a whole as it wants to run
-+# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
-+# This cannot work on read-only homes.
-+# So, the "fallback" prefixes ("/usr" for both) will be used.
-+if (BRAINDEAD_DETECTION)
-+
- if (NOT QTC_QT_ONLY)
- exec_program(kde-config
-              ARGS --prefix --expandvars
-@@ -71,6 +77,8 @@
-                  OUTPUT_VARIABLE KDE4PREFIX)
- endif(KDE4_KDECONFIG_EXECUTABLE)
- 
-+endif (BRAINDEAD_DETECTION)
-+
- if(NOT KDE4PREFIX)
-     set(KDE4PREFIX ${KDE3PREFIX})
- endif(NOT KDE4PREFIX)
diff --git a/extra/qtcurve-kde3/kdeglobals b/extra/qtcurve-kde3/kdeglobals
deleted file mode 100644
index ffbe26579..000000000
--- a/extra/qtcurve-kde3/kdeglobals
+++ /dev/null
@@ -1,2 +0,0 @@
-[General]
-widgetStyle=qtcurve
diff --git a/extra/qtcurve-kde4/PKGBUILD b/extra/qtcurve-kde4/PKGBUILD
deleted file mode 100644
index cf5716603..000000000
--- a/extra/qtcurve-kde4/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 140653 2011-10-17 18:59:52Z ronald $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-kde4
-pkgver=1.8.9
-pkgrel=1
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"
-        'bypass-kde-config.patch')
-sha1sums=('93bc8ce3e5bed506521a8839a254f7076b4bc988'
-          '8005c8bf0e9c5d75e80b417a01513bd45853274c')
-build() {
-	cd "${srcdir}"/QtCurve-KDE4-${pkgver}
-	# Bypass KDE prefix detection by kde4-config, see:
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-	patch -p1 -i "${srcdir}"/bypass-kde-config.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../QtCurve-KDE4-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/qtcurve-kde4/bypass-kde-config.patch b/extra/qtcurve-kde4/bypass-kde-config.patch
deleted file mode 100644
index d09e5ead5..000000000
--- a/extra/qtcurve-kde4/bypass-kde-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Pino Toscano <pino@kde.org>
-Description: Disable braindead KDE3/4 prefix detection
- The current detection of the KDE 3 and KDE 4 prefixes is done running
- kde-config and kde4-config, resp.
- This can be problematic, as these two could create files in ~/.kde,
- thus breaking when the home of the current user (eg in buildds) is read-only.
- Given the build system sets anyway "/usr" as prefix of KDE 3 and KDE 4
- if they were not detected, then just let it to.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,11 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CM
- set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
- include(CPack)
- 
-+# Comment the kde3/kde4 prefix detection as a whole as it wants to run
-+# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
-+# This cannot work on read-only homes.
-+# So, the "fallback" prefixes ("/usr" for both) will be used.
-+if (BRAINDEAD_DETECTION)
- set(OLD_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- 
- # Try to find kde4-config...
-@@ -48,6 +53,7 @@ if (KDE4_KDECONFIG_EXECUTABLE)
-                     ARGS --prefix
-                     OUTPUT_VARIABLE KDE4PREFIX)
- endif (KDE4_KDECONFIG_EXECUTABLE)
-+endif (BRAINDEAD_DETECTION)
- 
- if(NOT KDE3PREFIX)
-     if(KDE4PREFIX)
diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD
deleted file mode 100644
index 0b113c93a..000000000
--- a/extra/ristretto/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 148434 2012-01-31 20:33:48Z ronald $
-# Maintainer:
-# Contributor: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=ristretto
-pkgver=0.3.4
-pkgrel=1
-pkgdesc="A fast and lightweight picture-viewer for Xfce"
-arch=('i686' 'x86_64')
-url="http://goodies.xfce.org/projects/applications/ristretto"
-license=('GPL')
-depends=('libxfce4ui' 'libexif' 'exo' 'desktop-file-utils')
-makedepends=('intltool')
-groups=('xfce4-goodies')
-install=ristretto.install
-source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2")
-sha1sums=('7da6c287c45949193fd6046e82a099fd0469278c')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ristretto/ristretto.install b/extra/ristretto/ristretto.install
deleted file mode 100644
index 75e2b7b55..000000000
--- a/extra/ristretto/ristretto.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/extra/rubberband/gcc46.patch b/extra/rubberband/gcc46.patch
deleted file mode 100644
index 38ac76d42..000000000
--- a/extra/rubberband/gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h
-+++ rubberband-1.6.0/rubberband/RubberBandStretcher.h
-@@ -21,6 +21,7 @@
- 
- #include <vector>
- #include <map>
-+#include <cstddef>
- 
- /**
-  * @mainpage RubberBand
diff --git a/extra/rubberband/vectorops.patch b/extra/rubberband/vectorops.patch
deleted file mode 100644
index cae961591..000000000
--- a/extra/rubberband/vectorops.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/system/VectorOps.h    Mon Mar 21 21:51:33 2011 +0000
-+++ b/src/system/VectorOps.h    Sun Oct 02 21:12:42 2011 +0100
-@@ -84,8 +84,8 @@
- }
-
- template<typename T>
--inline void v_move(T *const R__ dst,
--                   const T *const R__ src,
-+inline void v_move(T *const dst,
-+                   const T *const src,
-                    const int count)
- {
-     memmove(dst, src, count * sizeof(T));
diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog
deleted file mode 100644
index ba267d49e..000000000
--- a/extra/rxvt-unicode/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-2012-01-22  Angel Velasquez <angvp@archlinux.org>
-	* Version bump to 9.15
-
-2011-12-02  Angel Velasquez <angvp@archlinux.org>
-	* Version bump to 9.14
-
-2011-12-02  Angel Velasquez <angvp@archlinux.org>
-	* Moved perl from optdepend to depend (closes FS#25782)
-
-2011-05-22  Angel Velasquez <angvp@archlinux.org>
-	* Rebuilt against perl 5.14.0
-
-2011-05-17  Angel Velasquez <angvp@archlinux.org>
-	* Removed not accepted upstream patch (closes FS#23324)
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
deleted file mode 100644
index 3d976c041..000000000
--- a/extra/rxvt-unicode/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 147102 2012-01-22 04:46:15Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-
-pkgname=rxvt-unicode
-pkgver=9.15
-pkgrel=1
-pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
-arch=('i686' 'x86_64')
-url="http://software.schmorp.de/pkg/rxvt-unicode.html"
-license=('GPL')
-depends=('gcc-libs' 'libxft' 'gdk-pixbuf2' 'perl')
-optdepends=('gtk2-perl: to use the urxvt-tabbed')
-changelog=ChangeLog
-source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
-        ${pkgname}.desktop)
-md5sums=('15595aa326167ac5eb68c28d95432faf'
-         '3de6c13126a45bc3bc9f6bba077a1311')
-sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7'
-          '962aebc88982dbeb62a7c4a051ff567e015f61a0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-terminfo=/usr/share/terminfo \
-    --enable-256-color \
-    --enable-font-styles \
-    --enable-xim \
-    --enable-keepscrolling \
-    --enable-selectionscrolling \
-    --enable-smart-resize \
-    --enable-pixbuf \
-    --enable-transparency \
-    --enable-utmp \
-    --enable-wtmp \
-    --enable-lastlog \
-    --disable-frills
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/share/terminfo"
-  export TERMINFO="${pkgdir}/usr/share/terminfo"
-  make DESTDIR="${pkgdir}" install
- # install the tabbing wrapper ( requires gtk2-perl! )
-  sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
-  install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed"
- # install freedesktop menu
-  install -Dm644 ../${pkgname}.desktop \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
diff --git a/extra/rxvt-unicode/rxvt-unicode.desktop b/extra/rxvt-unicode/rxvt-unicode.desktop
deleted file mode 100644
index 68d613dbd..000000000
--- a/extra/rxvt-unicode/rxvt-unicode.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=rxvt-unicode
-Comment=An Unicode capable rxvt clone
-Exec=urxvt
-Icon=terminal
-Terminal=false
-Type=Application
-Categories=Application;System;TerminalEmulator;
diff --git a/extra/samba/fix-ipv6-mount.patch b/extra/samba/fix-ipv6-mount.patch
deleted file mode 100644
index 89bef6533..000000000
--- a/extra/samba/fix-ipv6-mount.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/mount.cifs.c.orig	2010-03-03 13:42:02.143936727 +1000
-+++ client/mount.cifs.c	2010-03-04 01:53:22.752879004 +1000
-@@ -1563,7 +1563,7 @@
- 		}
- 	}
-
--	if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
-+	if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
- 		strlcat(options, "%", options_size);
- 		current_len = strnlen(options, options_size);
- 		optionstail = options + current_len; 
diff --git a/extra/telepathy-sofiasip/PKGBUILD b/extra/telepathy-sofiasip/PKGBUILD
deleted file mode 100644
index 7704eac95..000000000
--- a/extra/telepathy-sofiasip/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 120816 2011-04-26 16:16:06Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-pkgname=telepathy-sofiasip
-pkgver=0.7.1
-pkgrel=1
-pkgdesc="a SIP-protocol connection manager for the Telepathy framework based on SofiaSIP-stack."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('LGPL')
-depends=('telepathy-glib' 'sofia-sip')
-makedepends=('libxslt' 'python2')
-install=telepathy-sofiasip.install
-groups=('telepathy')
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4139027790aae97d8a18260e09a747c6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/telepathy-sofiasip/telepathy-sofiasip.install b/extra/telepathy-sofiasip/telepathy-sofiasip.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/extra/telepathy-sofiasip/telepathy-sofiasip.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/tightvnc/PKGBUILD b/extra/tightvnc/PKGBUILD
deleted file mode 100644
index 881aa1cfb..000000000
--- a/extra/tightvnc/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 150962 2012-02-24 10:13:24Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-pkgname=tightvnc
-pkgver=1.3.10
-pkgrel=6
-pkgdesc="VNC Unix server && viewer"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.tightvnc.com"
-depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth')
-makedepends=('imake')
-conflicts=('vnc')
-options=('!makeflags')
-source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2"
-        'tightvnc-fontpath-xcolors.patch')
-md5sums=('397b35faad32d5246b6d44b142f8304f'
-         '21aa7f3376ec3c608ff22d199a19c601')
-
-build() {
-  cd $srcdir/vnc_unixsrc
-  patch -Np1 -i ../tightvnc-fontpath-xcolors.patch
-  sed -i 's|/usr/local/|/usr/share/|' vncserver
-
-  xmkmf
-  make World
-  cd Xvnc
-  ./configure
-  sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \
-    -i programs/Xserver/os/Makefile lib/font/fc/Makefile
-  make
-}
-
-package() {
-  cd $srcdir/vnc_unixsrc
-  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
-  ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man
-
-  # install java classes
-  mkdir -p $pkgdir/usr/share/vnc/classes
-  install -Dm644 $srcdir/vnc_unixsrc/classes/* \
-    $pkgdir/usr/share/vnc/classes
-}
diff --git a/extra/tightvnc/tightvnc-fontpath-xcolors.patch b/extra/tightvnc/tightvnc-fontpath-xcolors.patch
deleted file mode 100644
index 10bc4b596..000000000
--- a/extra/tightvnc/tightvnc-fontpath-xcolors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver
---- vnc_unixsrc/vncserver	2009-02-11 23:27:18.000000000 -0500
-+++ vnc_unixsrc.fixed/vncserver	2009-04-23 21:46:46.000000000 -0400
-@@ -34,7 +34,8 @@
- $desktopName = "X";
- $vncClasses = "/usr/local/vnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/";
-+$colorPath = "/usr/share/X11/rgb";
- $authType = "-rfbauth $vncUserDir/passwd";
- 
- # Read configuration from the system-wide and user files if present.
diff --git a/extra/transmission/fix_minimize.patch b/extra/transmission/fix_minimize.patch
deleted file mode 100644
index fe0f42a03..000000000
--- a/extra/transmission/fix_minimize.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: /trunk/gtk/main.c
-===================================================================
---- /trunk/gtk/main.c	(revision 12968)
-+++ /trunk/gtk/main.c	(revision 13067)
-@@ -73,4 +73,5 @@
-     gboolean                    is_iconified;
- 
-+    guint                       activation_count;
-     guint                       timer;
-     guint                       update_model_soon_tag;
-@@ -533,6 +534,14 @@
- 
- static void
--on_activate( GApplication * app UNUSED, gpointer unused UNUSED )
--{
-+on_activate( GApplication * app UNUSED, struct cbdata * cbdata )
-+{
-+    cbdata->activation_count++;
-+
-+    /* GApplication emits an 'activate' signal when bootstrapping the primary.
-+     * Ordinarily we handle that by presenting the main window, but if the user
-+     * user started Transmission minimized, ignore that initial signal... */
-+    if( cbdata->is_iconified && ( cbdata->activation_count == 1 ) )
-+        return;
-+
-     gtr_action_activate( "present-main-window" );
- }
diff --git a/extra/umfpack/UFconfig.mk b/extra/umfpack/UFconfig.mk
deleted file mode 100644
index 209be5bd0..000000000
--- a/extra/umfpack/UFconfig.mk
+++ /dev/null
@@ -1,351 +0,0 @@
-#===============================================================================
-# UFconfig.mk:  common configuration file for the SuiteSparse
-#===============================================================================
-
-# This file contains all configuration settings for all packages authored or
-# co-authored by Tim Davis at the University of Florida:
-#
-# Package Version       Description
-# ------- -------       -----------
-# AMD	  1.2 or later  approximate minimum degree ordering
-# COLAMD  2.4 or later  column approximate minimum degree ordering
-# CCOLAMD 1.0 or later  constrained column approximate minimum degree ordering
-# CAMD    any		constrained approximate minimum degree ordering
-# UMFPACK 4.5 or later	sparse LU factorization, with the BLAS
-# CHOLMOD any		sparse Cholesky factorization, update/downdate
-# KLU	  0.8 or later  sparse LU factorization, BLAS-free
-# BTF	  0.8 or later  permutation to block triangular form
-# LDL	  1.2 or later	concise sparse LDL'
-# LPDASA  any		linear program solve (dual active set algorithm)
-# CXSparse any		extended version of CSparse (int/long, real/complex)
-# SuiteSparseQR	any	sparse QR factorization
-#
-# The UFconfig directory and the above packages should all appear in a single
-# directory, in order for the Makefile's within each package to find this file.
-#
-# To enable an option of the form "# OPTION = ...", edit this file and
-# delete the "#" in the first column of the option you wish to use.
-
-#------------------------------------------------------------------------------
-# Generic configuration
-#------------------------------------------------------------------------------
-
-# C compiler and compiler flags:  These will normally not give you optimal
-# performance.  You should select the optimization parameters that are best
-# for your system.  On Linux, use "CFLAGS = -O3 -fexceptions" for example.
-CC = cc
- CFLAGS = -O   (for example; see below for details)
-
-# C++ compiler (also uses CFLAGS)
-CPLUSPLUS = g++
-
-# ranlib, and ar, for generating libraries
-RANLIB = ranlib
-AR = ar cr
-
-# delete and rename a file
-RM = rm -f
-MV = mv -f
-
-# Fortran compiler (not normally required)
-F77 = gfortran
-F77FLAGS = -O3
-F77LIB =
-
-# C and Fortran libraries
-LIB = -lm
-
-# For compiling MATLAB mexFunctions (MATLAB 7.5 or later)
-MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
-
-# For compiling MATLAB mexFunctions (MATLAB 7.3 and 7.4)
-# MEX = mex -O -largeArrayDims -lmwlapack
-
-# For MATLAB 7.2 or earlier, you must use one of these options:
-# MEX = mex -O -lmwlapack
-# MEX = mex -O
-
-# Which version of MAKE you are using (default is "make")
-# MAKE = make
-# MAKE = gmake
-
-#------------------------------------------------------------------------------
-# BLAS and LAPACK configuration:
-#------------------------------------------------------------------------------
-
-# UMFPACK and CHOLMOD both require the BLAS.  CHOLMOD also requires LAPACK.
-# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
-# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
-# LAPACK is at http://www.netlib.org/lapack/ .  You can use the standard
-# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
-# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
-# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
-# on a 2.5Ghz dual-core AMD Opteron.
-
-# These settings will probably not work, since there is no fixed convention for
-# naming the BLAS and LAPACK library (*.a or *.so) files.
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lgfortran -lgfortranbegin -lg2c
-
-# This is probably slow ... it might connect to the Standard Reference BLAS:
-BLAS = -Lusr/lib -lblas -lgfortran -lgfortranbegin
-LAPACK = -llapack
-
-# Using non-optimized versions:
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin -lg2c
-# LAPACK = -llapack_plain
-
-# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
-# the BLAS.  Also, the standard xerbla requires the Fortran I/O library, and
-# stops the application program if an error occurs.  A C version of xerbla
-# distributed with this software (UFconfig/xerbla/libcerbla.a) includes a
-# Fortran-callable xerbla routine that prints nothing and does not stop the
-# application program.  This is optional.
-# XERBLA = ../../UFconfig/xerbla/libcerbla.a 
-
-# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
-# use this option:
-XERBLA = 
-
-# If you wish to use the Fortran UFconfig/xerbla/xerbla.f instead, use this:
-# XERBLA = ../../UFconfig/xerbla/libxerbla.a 
-
-#------------------------------------------------------------------------------
-# METIS, optionally used by CHOLMOD
-#------------------------------------------------------------------------------
-
-# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
-# compile CHOLMOD with the -DNPARTITION flag.  You must also use the
-# "METIS =" option, below.
-
-# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
-# You may wish to use an absolute path.  METIS is optional.  Compile
-# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-METIS_PATH = ../../metis-4.0
-METIS = ../../metis-4.0/libmetis.a
-
-# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
-# options:
-# METIS_PATH =
-# METIS =
-
-#------------------------------------------------------------------------------
-# UMFPACK configuration:
-#------------------------------------------------------------------------------
-
-# Configuration flags for UMFPACK.  See UMFPACK/Source/umf_config.h for details.
-#
-# -DNBLAS	do not use the BLAS.  UMFPACK will be very slow.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#  		LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF	do not use the Sun Perf. Library (default is use it on Solaris)
-# -DNPOSIX	do not use POSIX routines sysconf and times.
-# -DGETRUSAGE	use getrusage
-# -DNO_TIMER	do not use any timing routines
-# -DNRECIPROCAL	do not multiply by the reciprocal
-# -DNO_DIVIDE_BY_ZERO	do not divide by zero
-
-UMFPACK_CONFIG = 
-
-#------------------------------------------------------------------------------
-# CHOLMOD configuration
-#------------------------------------------------------------------------------
-
-# CHOLMOD Library Modules, which appear in libcholmod.a:
-# Core		requires: none
-# Check		requires: Core
-# Cholesky	requires: Core, AMD, COLAMD.  optional: Partition, Supernodal
-# MatrixOps	requires: Core
-# Modify	requires: Core
-# Partition	requires: Core, CCOLAMD, METIS.  optional: Cholesky
-# Supernodal	requires: Core, BLAS, LAPACK
-#
-# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
-# Tcov		requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
-#		optional: Partition
-# Valgrind	same as Tcov
-# Demo		requires: Core, Check, Cholesky, MatrixOps, Supernodal
-#		optional: Partition
-#
-# Configuration flags:
-# -DNCHECK	    do not include the Check module.	   License GNU LGPL
-# -DNCHOLESKY	    do not include the Cholesky module.	   License GNU LGPL
-# -DNPARTITION	    do not include the Partition module.   License GNU LGPL
-#		    also do not include METIS.
-# -DNGPL	    do not include any GNU GPL Modules in the CHOLMOD library:
-# -DNMATRIXOPS	    do not include the MatrixOps module.   License GNU GPL
-# -DNMODIFY	    do not include the Modify module.      License GNU GPL
-# -DNSUPERNODAL     do not include the Supernodal module.  License GNU GPL
-#
-# -DNPRINT	    do not print anything.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#  		    	LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF	    for Solaris only.  If defined, do not use the Sun
-#			Performance Library
-
-CHOLMOD_CONFIG =
-
-#------------------------------------------------------------------------------
-# SuiteSparseQR configuration:
-#------------------------------------------------------------------------------
-
-# The SuiteSparseQR library can be compiled with the following options:
-#
-# -DNPARTITION      do not include the CHOLMOD partition module
-# -DNEXPERT         do not include the functions in SuiteSparseQR_expert.cpp
-# -DTIMING          enable timing and flop counts
-# -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
-
-# default, without timing, without TBB:
-SPQR_CONFIG =
-# with timing and TBB:
-# SPQR_CONFIG = -DTIMING -DHAVE_TBB
-# with timing
-# SPQR_CONFIG = -DTIMING
-
-# with TBB, you must select this:
-# TBB = -ltbb
-# without TBB:
-TBB =
-
-# with timing, you must include the timing library:
-# RTLIB = -lrt
-# without timing
-RTLIB =
-
-#------------------------------------------------------------------------------
-# Linux
-#------------------------------------------------------------------------------
-
-# Using default compilers:
-# CC = gcc
-CFLAGS = -O3 -fexceptions -DNCHOLMOD
-
-# alternatives:
-# CFLAGS = -g -fexceptions \
-   	-Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-    	-Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CFLAGS = -O3 -fexceptions \
-   	-Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-    	-Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-# CFLAGS = -O3
-# CFLAGS = -O3 -g -fexceptions
-
-# consider:
-# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
-# -frename-registers -ffast-math -funroll-loops
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
-
-# Using Intel's icc and ifort compilers:
-#   (does not work for mexFunctions unless you add a mexopts.sh file)
-# F77 = ifort
-# CC = icc
-# CFLAGS = -O3 -xN -vec_report=0
-# CFLAGS = -g
-# old (broken): CFLAGS = -ansi -O3 -ip -tpp7 -xW -vec_report0
-
-# 64bit:
-# F77FLAGS = -O -m64
-# CFLAGS = -O3 -fexceptions -m64
-# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
-# LAPACK = -llapack64
-
-
-# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-
-# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto -lgfortran
-
-#------------------------------------------------------------------------------
-# Solaris
-#------------------------------------------------------------------------------
-
-# 32-bit
-# CFLAGS = -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
-
-# 64-bit
-# CFLAGS = -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
-
-# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
-
-# The Sun Performance Library includes both LAPACK and the BLAS:
-# BLAS = -xlic_lib=sunperf
-# LAPACK =
-
-
-#------------------------------------------------------------------------------
-# Compaq Alpha
-#------------------------------------------------------------------------------
-
-# 64-bit mode only
-# CFLAGS = -O2 -std1
-# BLAS = -ldxml
-# LAPACK =
-
-#------------------------------------------------------------------------------
-# Macintosh
-#------------------------------------------------------------------------------
-
-# CC = gcc
-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
-# LIB = -lstdc++
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
-
-#------------------------------------------------------------------------------
-# IBM RS 6000
-#------------------------------------------------------------------------------
-
-# BLAS = -lessl
-# LAPACK =
-
-# 32-bit mode:
-# CFLAGS   = -O4 -qipa -qmaxmem=16384 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384
-
-# 64-bit mode:
-# CFLAGS   = -O4 -qipa -qmaxmem=16384 -q64 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
-# AR = ar -X64
-
-#------------------------------------------------------------------------------
-# SGI IRIX
-#------------------------------------------------------------------------------
-
-# BLAS = -lscsl
-# LAPACK =
-
-# 32-bit mode
-# CFLAGS = -O
-
-# 64-bit mode (32 bit int's and 64-bit long's):
-# CFLAGS = -64
-# F77FLAGS = -64
-
-# SGI doesn't have ranlib
-# RANLIB = echo
-
-#------------------------------------------------------------------------------
-# AMD Opteron (64 bit)
-#------------------------------------------------------------------------------
-
-# BLAS = -lgoto_opteron64 -lg2c
-# LAPACK = -llapack_opteron64
-
-# SUSE Linux 10.1, AMD Opteron
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-# LAPACK = -llapack_opteron64
-
-#------------------------------------------------------------------------------
-# remove object files and profile output
-#------------------------------------------------------------------------------
-
-CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD
deleted file mode 100644
index 465974f25..000000000
--- a/extra/vsftpd/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 146202 2012-01-06 00:42:46Z eric $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=vsftpd
-pkgver=2.3.5
-pkgrel=1
-pkgdesc="Very Secure FTP daemon"
-arch=('i686' 'x86_64')
-url="https://security.appspot.com/vsftpd.html"
-license=('GPL2')
-depends=('openssl')
-backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
-install=vsftpd.install
-source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'vsftpd.xinetd' 'vsftpd.d')
-sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755'
-          '2ddf92782f19dafc72439a2917acb1d7e124d149'
-          'c87b4ce56dac15223694a6e86c01ea813b877596'
-          '24f268956c24e78be0c234c6d31f41487922eafe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # build-time config
-  sed \
-    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
-    -i builddefs.h
-  make CFLAGS="${CFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd"
-  install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf"
-  install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8"
-  install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5"
-  install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd"
-  install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd"
-
-  install -d -m755 "${pkgdir}/usr/share/empty"
-}
diff --git a/extra/vsftpd/vsftpd.d b/extra/vsftpd/vsftpd.d
deleted file mode 100644
index 27310855c..000000000
--- a/extra/vsftpd/vsftpd.d
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-daemon_name=vsftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name &
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/vsftpd/vsftpd.install b/extra/vsftpd/vsftpd.install
deleted file mode 100644
index 48f134e24..000000000
--- a/extra/vsftpd/vsftpd.install
+++ /dev/null
@@ -1,17 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
-    echo ">>> It appears that your current kernel has linux security"
-    echo ">>> capabilities built as a module.  vsftpd requires this"
-    echo ">>> functionality to operate."
-    echo ">>>"
-    echo ">>> To activate the module, please load it now (modprobe capability)."
-    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
-    echo ">>> it will be activated automatically at boot-up."
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
diff --git a/extra/vsftpd/vsftpd.xinetd b/extra/vsftpd/vsftpd.xinetd
deleted file mode 100644
index eff2eb3db..000000000
--- a/extra/vsftpd/vsftpd.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service ftp
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/vsftpd
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD
deleted file mode 100644
index 8cc7010f9..000000000
--- a/extra/windowmaker-crm-git/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 148962 2012-02-05 11:58:02Z ibiru $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=windowmaker-crm-git
-pkgver=20120109
-pkgrel=2
-pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra"
-arch=(i686 x86_64)
-url="http://www.windowmaker.org"
-license=('GPL' 'custom')
-depends=('libxinerama' 'libxrandr' 'libpng' 'libxpm' 'libxft' 'libtiff>=3.9.1' 'giflib' 'libxmu')
-options=('!libtool')
-provides=('windowmaker')
-conflicts=('windowmaker')
-source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)
-md5sums=('abe70f9cc7606c73a9bbe498cacf925a'
-         '2fba97bebfd691836b92b8f0db79ff13')
-
-build() {
-  cd $srcdir/windowmaker-$pkgver
-  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
-    --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
-    --enable-usermenu --enable-modelock --enable-xrandr
-  make
-}
-
-package() {
-  cd $srcdir/windowmaker-$pkgver
-  
-  make DESTDIR=$pkgdir install
-  install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
-  install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
-
-}
diff --git a/extra/windowmaker-crm-git/libpng-1.4.patch b/extra/windowmaker-crm-git/libpng-1.4.patch
deleted file mode 100644
index 5dbe5fd25..000000000
--- a/extra/windowmaker-crm-git/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur windowmaker-20091221-orig/wrlib/load.c windowmaker-20091221/wrlib/load.c
---- windowmaker-20091221-orig/wrlib/load.c	2010-01-21 17:01:10.000000000 -0500
-+++ windowmaker-20091221/wrlib/load.c	2010-01-21 17:02:38.000000000 -0500
-@@ -327,7 +327,7 @@
- 
- #ifdef USE_PNG
- 	/* check for PNG */
--	if (png_check_sig(buffer, 8))
-+	if (!png_sig_cmp(buffer, 0, 8))
- 		return IM_PNG;
- #endif
- 
diff --git a/extra/windowmaker-crm-git/wmaker.desktop b/extra/windowmaker-crm-git/wmaker.desktop
deleted file mode 100644
index f819c7577..000000000
--- a/extra/windowmaker-crm-git/wmaker.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=windowmaker
-Exec=/usr/bin/wmaker
-Type=Application
diff --git a/extra/xaw3d/xaw3d.patch b/extra/xaw3d/xaw3d.patch
deleted file mode 100644
index d126f7c5c..000000000
--- a/extra/xaw3d/xaw3d.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig	2003-02-10 18:22:26.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c	2008-10-06 10:07:46.000000000 +0200
-@@ -1087,7 +1087,11 @@ static void NotifyThumb (w, event, param
-     Cardinal *num_params;	/* unused */
- {
-     register ScrollbarWidget sbw = (ScrollbarWidget) w;
--    float top = sbw->scrollbar.top;
-+    union {
-+	XtPointer pt;
-+	float	  top;
-+    } foo;
-+    foo.top = sbw->scrollbar.top;
- 
- #ifndef XAW_ARROW_SCROLLBARS
-     if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */
-@@ -1116,10 +1120,10 @@ static void NotifyThumb (w, event, param
-     /* Removed the dependancy on scrollbar arrows. Xterm as distributed in
-        X11R6.6 by The XFree86 Project wants this correction, with or without
-        the arrows. */
--    top += 0.0001;
-+    foo.top += 0.0001;
- /* #endif */
--    XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top);
--    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top);
-+    XtCallCallbacks (w, XtNthumbProc, foo.pt);
-+    XtCallCallbacks (w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
- }
- 
- 
diff --git a/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch
deleted file mode 100644
index fee383855..000000000
--- a/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From patchwork Wed Mar 14 03:27:29 2012
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [synaptics] Fix inverted circular scrolling direction
-Date: Wed, 14 Mar 2012 03:27:29 -0000
-From: Peter Hutterer <peter.hutterer@who-t.net>
-X-Patchwork-Id: 9512
-Message-Id: <20120314032729.GA16614@yabbi.bne.redhat.com>
-To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org>
-Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas@archlinux.org>
-
-Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10.
-In said commit, the old-style button events were changed to delta
-accumulation. Alas, for circular scrolling, a positive delta is up whereas
-for everything else a positive delta is down.
-
-Reported-by: Thomas Bächler <thomas@archlinux.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
----
-src/synaptics.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/synaptics.c b/src/synaptics.c
-index fa46f0d..c9609cd 100644
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
- 	double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y));
- 	if (delta >= 0.005 && diff != 0.0) {
- 	    if (priv->circ_scroll_vert)
--		priv->scroll.delta_y += diff / delta * para->scroll_dist_vert;
-+		priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert;
- 	    else
--		priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;;
-+		priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;;
- 	    priv->scroll.last_a = angle(priv, hw->x, hw->y);
- 	    DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a);
-         }
diff --git a/extra/xf86-video-ast/ast-0.93.9-vga.patch b/extra/xf86-video-ast/ast-0.93.9-vga.patch
deleted file mode 100644
index e05a78f56..000000000
--- a/extra/xf86-video-ast/ast-0.93.9-vga.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4a7eda24050b42072c77d527257609e743e8dc78 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 16 Nov 2011 20:09:40 +0000
-Subject: Adapt to domain changes in videoabi 12
-
-This is a blind change, I don't have this hardware handy to test with.
-It probably wants the same new API that tdfx wants.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/ast_driver.c b/src/ast_driver.c
-index bd3d338..128538f 100644
---- a/src/ast_driver.c
-+++ b/src/ast_driver.c
-@@ -498,11 +498,20 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags)
- 	      (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast");
- 
-    /* Resource Allocation */
-+#if ABI_VIDEODRV_VERSION < 12
-     pAST->IODBase = pScrn->domainIOBase;  
-+#else
-+    pAST->IODBase = 0;
-+#endif
-     /* "Patch" the PIOOffset inside vgaHW in order to force
-      * the vgaHW module to use our relocated i/o ports.
-      */
--    VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
-+
-+#if ABI_VIDEODRV_VERSION < 12
-+    VGAHWPTR(pScrn)->PIOOffset = /* ... */
-+#endif
-+       	pAST->PIOOffset =
-+	pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
- 	
-     pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
- 	
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch b/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch
deleted file mode 100644
index b9c832238..000000000
--- a/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch
+++ /dev/null
@@ -1,580 +0,0 @@
-From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 29 Mar 2011 03:53:31 +0000
-Subject: chips: gut the overlay 8/16 support from driver.
-
-This driver is for chips that were bought by Intel in 1997,
-this feature means maintaining a lot of code in the X server
-for little gain.
-
-Drop it like its hot.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/man/chips.man b/man/chips.man
-index 740af38..0c022ee 100644
---- a/man/chips.man
-+++ b/man/chips.man
-@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
- Force driver to leave centering and stretching registers alone. This
- can fix some laptop suspend/resume problems. Default: off
- .TP
--.BI "Option \*qOverlay\*q"
--Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
--.TP
- .BI "Option \*qColorKey\*q \*q" integer \*q
- Set the colormap index used for the transparency key for the depth 8 plane
- when operating in 8+16 overlay mode.  The value must be in the range
-diff --git a/src/ct_accel.c b/src/ct_accel.c
-index 3920b0a..4b5776a 100644
---- a/src/ct_accel.c
-+++ b/src/ct_accel.c
-@@ -428,19 +428,7 @@ chips_imagewrite:
-         infoPtr->ImageWriteFlags |= NO_PLANEMASK;
- #endif
- 
--
--#ifdef CHIPS_HIQV
--    if (XAAInit(pScreen, infoPtr)) {
--	if (cPtr->Flags & ChipsOverlay8plus16)      
--	    return(XAAInitDualFramebufferOverlay(pScreen,
--						 CTNAME(DepthChange)));
--	else
--	    return TRUE;
--    } else
--	return FALSE;
--#else
-     return(XAAInit(pScreen, infoPtr));
--#endif
- }
- 
- #ifdef CHIPS_HIQV
-@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
- #endif
-     w *= cAcl->BytesPerPixel;
-     ctBLTWAIT;
--#ifdef CHIPS_HIQV
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
--	    (pScrn->depth == 8))
--	ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
--#endif
-     ctSETSRCADDR(srcaddr);
-     ctSETDSTADDR(destaddr);
- #ifdef CHIPS_HIQV
-@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
-     patternaddr = (paty * pScrn->displayWidth + 
- 		   (patx & ~0x3F)) * cAcl->BytesPerPixel;
-     cAcl->patternyrot = (patx & 0x3F) >> 3;
--#ifdef CHIPS_HIQV
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr += cPtr->FbOffset16;
--#endif
- 
-     ctBLTWAIT;
-     ctSETPATSRCADDR(patternaddr);
-@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
- 
- #ifdef CHIPS_HIQV
-     patternaddr = paty * pScrn->displayWidth + patx;
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr = patternaddr * 2 + cPtr->FbOffset16;
--    else
--	patternaddr *= cAcl->BytesPerPixel;
-+    patternaddr *= cAcl->BytesPerPixel;
- #else
-     patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
- #endif
-@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((skipleft  + bytesPerLine + 0x7) & ~0x7)) >> 2;
-     destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     destpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	destaddr += cPtr->FbOffset16;
--    else
--	destaddr += cAcl->FbOffset;
-+    destaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
- 
-@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	y++;
- 
- 	destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    destaddr += cPtr->FbOffset16;
--	else
--	    destaddr += cAcl->FbOffset;
-+	destaddr += cAcl->FbOffset;
- 
- 	ctBLTWAIT;
- 	ctSETDSTADDR(destaddr);
-@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
-     srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     srcpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	srcaddr += cPtr->FbOffset16;
--    else
--	srcaddr += cAcl->FbOffset;
-+    srcaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
-     ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | 
-@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	dst += dstwidth;
- 	y++;
- 	srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    srcaddr += cPtr->FbOffset16;
--	else
--	    srcaddr += cAcl->FbOffset;
-+	srcaddr += cAcl->FbOffset;
- 	ctBLTWAIT;
- 	ctSETSRCADDR(srcaddr);
- 	ctSETHEIGHTWIDTHGO(h, bytesPerLine);
-diff --git a/src/ct_driver.c b/src/ct_driver.c
-index 6624b79..08df050 100644
---- a/src/ct_driver.c
-+++ b/src/ct_driver.c
-@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
- 	}
-     }
-     
--    if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
--	if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
--	  if (pScrn->bitsPerPixel == 16) {
--	    if (cPtr->Flags & ChipsLinearSupport) {
--		cPtr->Flags |= ChipsOverlay8plus16;
--		if(!xf86GetOptValInteger(
--			cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
--		    pScrn->colorKey = TRANSPARENCY_KEY;
--		pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
--		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
--			   "PseudoColor overlay enabled.\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"Stretch\" \"ON\".\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"LcdCenter\" \"OFF\".\n");
--		if (cPtr->Flags & ChipsShadowFB) {
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
--		           "                             - Disabling \"Shadow Framebuffer\".\n");
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                               Not support with option \"8Plus16\".\n");
--		    cPtr->Flags &= ~ChipsShadowFB;
--		    cPtr->Rotate = 0;
--		}
--	    } else {
--		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
--	    }
--	  } else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"Option \"Overlay\" is not supported in this configuration\n");
--	  }
--	} else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"\"%s\" is not a valid value for Option \"Overlay\"\n", s); 
--	}
--    }
--
--    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
--	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
--		&(cPtr->videoKey))) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
-+    if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
-+	&(cPtr->videoKey))) {
-+         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
- 		cPtr->videoKey);
--	} else {
--	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
-+    } else {
-+       cPtr->videoKey =  (1 << pScrn->offset.red) | 
- 			(1 << pScrn->offset.green) |
- 			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
- 			<< pScrn->offset.blue); 
--	}
-     }
- 
-     if (cPtr->Flags & ChipsShadowFB) {
-@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
-     /* and 32bits on the others. Thus multiply by a suitable factor      */  
-     if (cPtr->Flags & Chips64BitMemory) {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 8 * 0.7 / bytesPerPixel);
-     } else {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 4 * 0.7 / bytesPerPixel);
-     }
-@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
-     /* Should we re-save the text mode on each VT enter? */
-     if(!chipsModeInit(pScrn, pScrn->currentMode))
-       return FALSE;
--    if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	&& (cPtr->Flags & ChipsVideoSupport)
-+    if ((cPtr->Flags & ChipsVideoSupport)
- 	&& (cPtr->Flags & ChipsLinearSupport)) 
-         CHIPSResetVideo(pScrn); 
- 
-@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-     int i, index, shift ;
-     CHIPSEntPtr cPtrEnt;    
- 
--    shift = ((pScrn->depth == 15) && 
--	     (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
-+    shift = (pScrn->depth == 15) ? 3 : 0;
- 
-     if (cPtr->UseDualChannel) {
-         cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
-@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
-     hwp->disablePalette(hwp);
- }
- 
--static Bool
--cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
--                  int xsize, int ysize, int dpix, int dpiy,
--                  int width16, int width8)
--{
--    return
--        (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
--                              dpix, dpiy, width16, width8, 16, 8) &&
--         fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
--                                   dpix, dpiy, width16, width8, 16, 8, 16, 8));
--}
--
- /* Mandatory */
- static Bool
- CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!chipsMapMem(pScrn))
- 	return FALSE;
- 
--    /* Setup a pointer to the overlay if needed */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
--	cPtr->FbSize16 =  (pScrn->displayWidth << 1) * pScrn->virtualY;
--	if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Too little memory for overlay. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--	if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Max overlay Width/Height 1024 pixels. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--    }
--
-     /* Setup the MMIO register access functions if need */
-     if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
- 	CHIPSSetMmioExtFuncs(cPtr);
-@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     miClearVisualTypes();
- 
-     /* Setup the visuals we support. */
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
--	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
--			      pScrn->rgbBits, PseudoColor))
--		return FALSE;
--	if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
--		return FALSE;
--    } else {
--      if (!miSetVisualTypes(pScrn->depth,
-+    if (!miSetVisualTypes(pScrn->depth,
- 			    miGetDefaultVisualMask(pScrn->depth),
- 			    pScrn->rgbBits, pScrn->defaultVisual))
--	return FALSE;
--    }
-+        return FALSE;
-     miSetPixmapDepths ();
- 
-     /*
-@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	break;
- #endif
-     case 16:
--      if (cPtr->Flags & ChipsOverlay8plus16) {
--	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
--				  cPtr->FbOffset16, FBStart, width, 
--				  height, pScrn->xDpi, pScrn->yDpi,
--				  displayWidth, displayWidth);
--	  break;
--      }
-     default:
- 	ret = fbScreenInit(pScreen, FBStart,
-  		        width,height,
-@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	if (pScrn->bitsPerPixel < 8)
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY / 2;
--	else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
--	    freespace = allocatebase - pScrn->displayWidth * 
--		    pScrn->virtualY - cPtr->FbSize16;
- 	else	
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
-@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	    AvailFBArea.y2 = cAcl->CacheEnd /
- 		(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
- 
--	    if (!(cPtr->Flags & ChipsOverlay8plus16)) {     
--		xf86InitFBManager(pScreen, &AvailFBArea); 
--	    }
-+	    xf86InitFBManager(pScreen, &AvailFBArea); 
- 	}
- 	if (cPtr->Flags & ChipsAccelSupport) {
- 	    if (IS_HiQV(cPtr)) {
-@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!miCreateDefColormap(pScreen))
- 	return FALSE;
-     
--    if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
--		NULL, CMAP_RELOAD_ON_MODE_SWITCH))
--	    return FALSE;
--    } else {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
-+    if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
- 		(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
- 		NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
--	    return FALSE;
--    }
-+	return FALSE;
-     
- #ifndef XSERVER_LIBPCIACCESS
-     racflag = RAC_COLORMAP;
-@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	xf86SetSilkenMouse(pScreen);
- #endif
- 
--	if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	    && (cPtr->Flags & ChipsVideoSupport)
-+	if ((cPtr->Flags & ChipsVideoSupport)
- 	    && (cPtr->Flags & ChipsLinearSupport)) {
- 	    CHIPSInitVideo(pScreen);
-     }
-@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	Base >>= 3;
- 	break;
-     case 16:
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	   Base >>= 1;
--	else
--	   Base >>= 2;
-+	Base >>= 1;
- 	break;
-     case 24:
- 	if (!IS_HiQV(cPtr))
-@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	cPtr->writeMSS(cPtr, hwp, MSS);
-     }
- 
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	Base = (Base << 3) & ~(unsigned long)0xF;
--
--	cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
--	cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
--	cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
--    }
--
- }
- 
- /* Mandatory */
-@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
- 
--    if (flags & MODECHECK_FINAL) {
--    /* Don't subtract FrambufferSize here as it should be subtracted already */
--    if ((cPtr->Flags & ChipsOverlay8plus16) 
--      && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY 
--	  < 0))
--	return MODE_MEM;
--    }
-     /* The tests here need to be expanded */
-     if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
- 	return MODE_NO_INTERLACE;
-@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     } else {
- 	ChipsStd->Attribute[0x10] = 0x01;   /* mode */
-     }
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
--	/* Make sure that the overlay isn't visible in the overscan region */
--	if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
--	    ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
--    } else
--	ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-+    ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-     ChipsStd->Attribute[0x12] = 0x0F;   /* enable all color planes */
-     ChipsStd->Attribute[0x13] = 0x00;   /* horiz pixel panning 0 */
- 
-@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* set virtual screen width */
-     tmp = pScrn->displayWidth >> 3;
-     if (pScrn->bitsPerPixel == 16) {
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	    tmp <<= 1;		       /* double the width of the buffer */
-+	tmp <<= 1;		       /* double the width of the buffer */
-     } else if (pScrn->bitsPerPixel == 24) {
- 	tmp += tmp << 1;
-     } else if (pScrn->bitsPerPixel == 32) {
-@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
-     /* centering/stretching */
-     if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
--	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
--	(cPtr->Flags & ChipsOverlay8plus16)) {
-+	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
- 	    ChipsNew->FR[0x40] &= 0xDF;    /* Disable Horizontal stretching */
- 	    ChipsNew->FR[0x48] &= 0xFB;    /* Disable vertical stretching */
- 	    ChipsNew->XR[0xA0] = 0x10;     /* Disable cursor stretching */
-@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	}
-     }
- 
--    if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
--		|| (cPtr->Flags & ChipsOverlay8plus16)) {
-+    if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
- 	ChipsNew->FR[0x40] |= 0x3;    /* Enable Horizontal centering */
- 	ChipsNew->FR[0x48] |= 0x3;    /* Enable Vertical centering */
-     } else {
-@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	ChipsNew->XR[0x82] |=0x02;
- 
-     /* software mode flag */
--    ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
--	8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
-+    ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
- 	min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
- 	mode->CrtcHDisplay, mode->CrtcVDisplay);
- #ifdef DEBUG
-@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     	}
-     }	    
-     /* bpp depend */
--    if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
-+    if (pScrn->bitsPerPixel == 16) {
- 	ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
- 	if (cPtr->Flags & ChipsGammaSupport)
- 	    ChipsNew->XR[0x82] |= 0x0C;
-@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* Turn off multimedia by default as it degrades performance */
-     ChipsNew->XR[0xD0] &= 0x0f;	 
-     
--    /* Setup the video/overlay */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
--#ifdef SAR04
--	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
--#endif
--	ChipsNew->MR[0x1E] &= 0xE0;	/* Set Zoom and Direction */
--	if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
--	    ChipsNew->MR[0x1E] |= 0x10;	/* Interlace */
--	ChipsNew->MR[0x1F] &= 0x14;	/* Mask reserved bits */
--	ChipsNew->MR[0x1F] |= 0x08;	/* RGB 16bpp */
--	if (pScrn->weight.green == 5)
--	    ChipsNew->MR[0x1F] |= 0x01;	/* RGB 15bpp */
--
--	ChipsNew->MR[0x20] &= 0x03;	/* Mask reserved bits */
--	ChipsNew->MR[0x20] |= 0x80;	/* Auto Centre, Use mem ptr1 */
--	ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 1 */
--	ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 2 */
--	ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
--	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
--
--	/* Left Edge of Overlay */
--	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
--	ChipsNew->MR[0x2B] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
--	/* Right Edge of Overlay */
--	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
--							1) & 0xFF;
--	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
--							1) >> 8) & 0x07;
--	/* Top Edge of Overlay */
--	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
--	ChipsNew->MR[0x2F] &= 0xF8;
--	ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
--	/* Bottom Edge of Overlay*/
--	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
--	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - 
--							1 ) >> 8) & 0x07;
--
--	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
--	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
--	ChipsNew->MR[0x3D] = 0x00;
--	ChipsNew->MR[0x3E] = 0x00;
--	ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
--	ChipsNew->MR[0x40] = 0xFF;
--	ChipsNew->MR[0x41] = 0xFF;
--	ChipsNew->MR[0x42] = 0x00;
--    } else if (cPtr->Flags & ChipsVideoSupport) {
-+    if (cPtr->Flags & ChipsVideoSupport) {
- #if 0   /* if we do this even though video isn't playing we kill performance */
- 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
- #endif
-@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
- 	}
- 
- 	/* Set SAR04 multimedia register correctly */
--	if ((cPtr->Flags & ChipsOverlay8plus16)
--	    || (cPtr->Flags & ChipsVideoSupport)) {
-+	if ((cPtr->Flags & ChipsVideoSupport)) {
- #ifdef SAR04
- 	    cPtr->writeXR(cPtr, 0x4E, 0x04);
- 	    if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
-diff --git a/src/ct_driver.h b/src/ct_driver.h
-index d8ce228..10a24d4 100644
---- a/src/ct_driver.h
-+++ b/src/ct_driver.h
-@@ -114,7 +114,6 @@ typedef struct {
- /* Options flags for the C&T chipsets */
- #define ChipsHWCursor		0x00001000
- #define ChipsShadowFB		0x00002000
--#define ChipsOverlay8plus16	0x00004000
- #define ChipsUseNewFB		0x00008000
- 
- /* Architecture type flags */
-diff --git a/src/ct_video.c b/src/ct_video.c
-index a68acb9..c9e5bb4 100644
---- a/src/ct_video.c
-+++ b/src/ct_video.c
-@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
-     int num_adaptors;
- 	
--    if (!(cPtr->Flags & ChipsOverlay8plus16) &&
--       (cPtr->Flags & ChipsVideoSupport)) {
-+    if ((cPtr->Flags & ChipsVideoSupport)) {
- 	newAdaptor = CHIPSSetupImageVideo(pScreen);
- 	CHIPSInitOffscreenImages(pScreen);
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-cirrus/cirrus-1.3.2-git.patch b/extra/xf86-video-cirrus/cirrus-1.3.2-git.patch
deleted file mode 100644
index 5701a8473..000000000
--- a/extra/xf86-video-cirrus/cirrus-1.3.2-git.patch
+++ /dev/null
@@ -1,846 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index aa89732..7bd8873 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,17 +18,18 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
--EXTRA_DIST = README.multihead ChangeLog
-+EXTRA_DIST = README.multihead
- 
--MAINTAINERCLEANFILES=ChangeLog
-+.PHONY: ChangeLog INSTALL
- 
--.PHONY: ChangeLog
-+INSTALL:
-+	$(INSTALL_CMD)
- 
- ChangeLog:
- 	$(CHANGELOG_CMD)
- 
--dist-hook: ChangeLog
-+dist-hook: ChangeLog INSTALL
- 
-diff --git a/configure.ac b/configure.ac
-index d205eb3..68c3eb3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,47 +20,47 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-cirrus],
--        1.3.2,
-+        [1.3.2],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-cirrus)
--
-+        [xf86-video-cirrus])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
--m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.2)
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
--XORG_CWARNFLAGS
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -78,21 +78,15 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--# Checks for header files.
--AC_HEADER_STDC
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=cirrus
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--XORG_CHANGELOG
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..1ea26b3 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,28 +1,25 @@
- #
--# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
--# 
-+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
-+#
- 
- drivermandir = $(DRIVER_MAN_DIR)
- 
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/cirrus.man b/man/cirrus.man
-index 009011e..af46248 100644
---- a/man/cirrus.man
-+++ b/man/cirrus.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH CIRRUS __drivermansuffix__ __vendorversion__
-diff --git a/src/CirrusClk.c b/src/CirrusClk.c
-index a3590c9..6fd6270 100644
---- a/src/CirrusClk.c
-+++ b/src/CirrusClk.c
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/CirrusClk.c,v 1.8 1998/12/06 06:08:28 dawes Exp $ */
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-diff --git a/src/alp.h b/src/alp.h
-index 01c5301..a182d0c 100644
---- a/src/alp.h
-+++ b/src/alp.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.8 2001/10/01 13:44:05 eich Exp $ */
--
- /* (c) Itai Nahshon */
- 
- #ifndef ALP_H
-diff --git a/src/alp_driver.c b/src/alp_driver.c
-index fe81757..d3d8e4f 100644
---- a/src/alp_driver.c
-+++ b/src/alp_driver.c
-@@ -15,8 +15,6 @@
- #include "config.h"
- #endif
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.35 2003/11/03 05:11:09 tsi Exp $ */
--
- /* All drivers should typically include these */
- #include "xf86.h"
- #include "xf86_OSproc.h"
-@@ -29,6 +27,10 @@
- /* Drivers for PCI hardware need this */
- #include "xf86PciInfo.h"
- 
-+#ifndef PCI_CHIP_GD7556  /*  for old xf86PciInfo.h  */
-+#define PCI_CHIP_GD7556            0x004C
-+#endif
-+
- /* Drivers that need to access the PCI config space directly need this */
- #include "xf86Pci.h"
- 
-@@ -119,6 +121,11 @@ static void AlpOffscreenAccelInit(ScrnInfoPtr pScrn);
- static void	AlpDisplayPowerManagementSet(ScrnInfoPtr pScrn,
- 											int PowerManagementMode, int flags);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+static void PC98CIRRUS755xEnable(ScrnInfoPtr pScrn);
-+static void PC98CIRRUS755xDisable(ScrnInfoPtr pScrn);
-+#endif
-+
- /*
-  * This is intentionally screen-independent.  It indicates the binding
-  * choice made in the first PreInit.
-@@ -153,6 +160,8 @@ static int gd5430_MaxClocks[] = {  85500,  85500,  50000,  28500,      0 };
- static int gd5446_MaxClocks[] = { 135100, 135100,  85500,  85500,      0 };
- static int gd5480_MaxClocks[] = { 135100, 200000, 200000, 135100, 135100 };
- static int gd7548_MaxClocks[] = {  80100,  80100,  80100,  80100,  80100 };
-+static int gd7555_MaxClocks[] = {  80100,  80100,  80100,  80100,  80100 };
-+static int gd7556_MaxClocks[] = {  80100,  80100,  80100,  80100,  80100 };
- 
- #ifdef XFree86LOADER
- 
-@@ -248,7 +257,7 @@ AlpFreeRec(ScrnInfoPtr pScrn)
- {
- 	if (pScrn->driverPrivate == NULL)
- 		return;
--	xfree(pScrn->driverPrivate);
-+	free(pScrn->driverPrivate);
- 	pScrn->driverPrivate = NULL;
- }
- 
-@@ -385,6 +394,11 @@ AlpCountRam(ScrnInfoPtr pScrn)
- 			break;
- 	}
- 	break;
-+
-+    case PCI_CHIP_GD7555:
-+    case PCI_CHIP_GD7556:
-+	videoram = 2048;   /*  for PC-9821 La13 etc.  */
-+	break;
-     }
- 
-     /* UNMap the Alp memory and MMIO areas */
-@@ -407,6 +421,8 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
- {
- 	int *linePitches = NULL;
- 	int i, n = 0;
-+	int max_pitch;
-+
- 	CirPtr pCir = CIRPTR(pScrn);
- 
- 	/* XXX ajv - 512, 576, and 1536 may not be supported
-@@ -423,8 +439,21 @@ GetAccelPitchValues(ScrnInfoPtr pScrn)
- 							1280, 1536, 1600, 1920, 2048, 0 };
- #endif
- 
-+	switch (pCir->Chipset) {
-+	case PCI_CHIP_GD5436:
-+	case PCI_CHIP_GD5446:
-+		max_pitch = 0x1ff << 3;
-+		break;
-+
-+	default:
-+		/* FIXME max_pitch for other chipsets? */
-+		max_pitch = (pScrn->bitsPerPixel / 8) * 2048;
-+		break;
-+	}
-+
- 	for (i = 0; accelWidths[i] != 0; i++) {
--		if (accelWidths[i] % pCir->Rounding == 0) {
-+		if ((accelWidths[i] % pCir->Rounding == 0)
-+		 && ((accelWidths[i] * pScrn->bitsPerPixel / 8) <= max_pitch)) {
- 			n++;
- 			linePitches = xnfrealloc(linePitches, n * sizeof(int));
- 			linePitches[n - 1] = accelWidths[i];
-@@ -482,12 +511,17 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	pCir = CIRPTR(pScrn);
- 	pCir->pScrn = pScrn;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	pCir->PIOReg = hwp->PIOOffset + 0x3CE;
-+#else
-+	pCir->PIOReg = 0x3CE;
-+#endif
- 
- 	/* Get the entity, and make sure it is PCI. */
- 	pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
- 	if (pCir->pEnt->location.type != BUS_PCI) {
--		xfree(pCir->pEnt);
-+		free(pCir->pEnt);
- 		return FALSE;
- 	}
- 
-@@ -498,7 +532,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 			      PCI_DEV_DEV(pCir->PciInfo),
- 			      PCI_DEV_FUNC(pCir->PciInfo));
- 
--    if (xf86LoadSubModule(pScrn, "int10")) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    if (!xf86IsPc98() && xf86LoadSubModule(pScrn, "int10")) {
- 	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
- 	pInt = xf86InitInt10(pCir->pEnt->index);
- 	xf86FreeInt10(pInt);
-@@ -509,8 +544,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM), 0x10);
- 	PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14);
--	
-     }
-+#endif
- 
-     /* Set pScrn->monitor */
- 	pScrn->monitor = pScrn->confScreen->monitor;
-@@ -574,7 +609,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 	xf86CollectOptions(pScrn, NULL);
- 
- 	/* Process the options */
--	if (!(pCir->Options = xalloc(sizeof(CirOptions))))
-+	if (!(pCir->Options = malloc(sizeof(CirOptions))))
- 		return FALSE;
- 	memcpy(pCir->Options, CirOptions, sizeof(CirOptions));
- 	xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCir->Options);
-@@ -589,6 +624,16 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	from = X_DEFAULT;
- 	pCir->HWCursor = FALSE;
-+
-+	switch (pCir->Chipset) {
-+	case PCI_CHIP_GD7555:
-+	case PCI_CHIP_GD7556:
-+	  pCir->HWCursor = TRUE;
-+	  break;
-+	default:
-+	  break;
-+	}
-+
- 	if (xf86GetOptValBool(pCir->Options, OPTION_HW_CURSOR, &pCir->HWCursor))
- 		from = X_CONFIG;
- 
-@@ -863,10 +908,10 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 		case PCI_CHIP_GD5430:
- 		case PCI_CHIP_GD5434_4:
- 		case PCI_CHIP_GD5434_8:
--		case PCI_CHIP_GD5436:
- 	/*	case PCI_CHIP_GD5440: */
- 			p = gd5430_MaxClocks;
- 			break;
-+		case PCI_CHIP_GD5436:
- 		case PCI_CHIP_GD5446:
- 			p = gd5446_MaxClocks;
- 			break;
-@@ -876,6 +921,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
- 		case PCI_CHIP_GD7548:
- 		        p = gd7548_MaxClocks;
-                         break;
-+		case PCI_CHIP_GD7555:
-+		        p = gd7555_MaxClocks;
-+                        break;
-+		case PCI_CHIP_GD7556:
-+		        p = gd7556_MaxClocks;
-+                        break;
- 		}
- 		if (!p)
- 			return FALSE;
-@@ -1360,6 +1411,11 @@ AlpModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
- 	vgaHWProtect(pScrn, FALSE);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	if (xf86IsPc98())
-+		PC98CIRRUS755xEnable(pScrn);
-+#endif
-+
- 	return TRUE;
- }
- 
-@@ -1489,7 +1545,7 @@ AlpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	
- 	if(pCir->shadowFB) {
- 	    pCir->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	    pCir->ShadowPtr = xalloc(pCir->ShadowPitch * height);
-+	    pCir->ShadowPtr = malloc(pCir->ShadowPitch * height);
- 	    displayWidth = pCir->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- 	    FbBase = pCir->ShadowPtr;
- 	} else {
-@@ -1782,6 +1838,11 @@ AlpLeaveVT(int scrnIndex, int flags)
- 
- 	AlpRestore(pScrn);
- 	vgaHWLock(hwp);
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	if (xf86IsPc98())
-+		PC98CIRRUS755xDisable(pScrn);
-+#endif
- }
- 
- 
-@@ -1813,12 +1874,17 @@ AlpCloseScreen(int scrnIndex, ScreenPtr pScreen)
- 		xf86DestroyCursorInfoRec(pCir->CursorInfoRec);
- 	pCir->CursorInfoRec = NULL;
- 	if (pCir->DGAModes)
--		xfree(pCir->DGAModes);
-+		free(pCir->DGAModes);
- 	pCir->DGAnumModes = 0;
- 	pCir->DGAModes = NULL;
- 
- 	pScrn->vtSema = FALSE;
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	if (xf86IsPc98())
-+		PC98CIRRUS755xDisable(pScrn);
-+#endif
-+
- 	pScreen->CloseScreen = pCir->CloseScreen;
- 	return (*pScreen->CloseScreen)(scrnIndex, pScreen);
- }
-@@ -2081,3 +2147,53 @@ AlpOffscreenAccelInit(ScrnInfoPtr pScrn)
- 		   box.y2 - pScrn->virtualY);
-     }
- }
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+static void
-+PC98CIRRUS755xEnable(ScrnInfoPtr pScrn)  /*  enter_aile()  */
-+{
-+   unsigned int  index,data;
-+   vgaHWPtr hwp = VGAHWPTR(pScrn);
-+
-+   outb(0xfac, 0x02);
-+
-+   outb(0x68, 0x0e);
-+   outb(0x6a, 0x07);
-+   outb(0x6a, 0x8f);
-+   outb(0x6a, 0x06);
-+
-+   outw(VGA_SEQ_INDEX, 0x1206);         /*  unlock cirrus special  */
-+
-+   index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET;
-+   data  = hwp->IOBase + VGA_CRTC_DATA_OFFSET;
-+   outb(index, 0x3c);
-+   outb(data,  inb(data) & 0xef);
-+   outb(index, 0x1a);
-+   outb(data,  inb(data) & 0xf3);
-+}
-+
-+static void
-+PC98CIRRUS755xDisable(ScrnInfoPtr pScrn)  /*  leave_aile()  */
-+{
-+   unsigned int  index,data;
-+   vgaHWPtr hwp = VGAHWPTR(pScrn);
-+
-+   outw(VGA_SEQ_INDEX, 0x1206);         /*  unlock cirrus special  */
-+
-+   index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET;
-+   data  = hwp->IOBase + VGA_CRTC_DATA_OFFSET;
-+   outb(index, 0x3c);
-+   outb(data,  0x71);
-+   outb(index, 0x1a);
-+   outb(data,  inb(data) | 0x0c);
-+
-+   outb(0xfac,0x00);
-+
-+   outb(0x68, 0x0f);
-+   outb(0x6a, 0x07);
-+   outb(0x6a, 0x8e);
-+   outb(0x6a, 0x21);
-+   outb(0x6a, 0x69);
-+   outb(0x6a, 0x06);
-+}
-+#endif
-diff --git a/src/alp_hwcurs.c b/src/alp_hwcurs.c
-index 79dfce7..9891eb4 100644
---- a/src/alp_hwcurs.c
-+++ b/src/alp_hwcurs.c
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_hwcurs.c,v 1.4 2000/12/06 15:35:15 eich Exp $ */
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-diff --git a/src/alp_i2c.c b/src/alp_i2c.c
-index 9e6ae67..7365215 100644
---- a/src/alp_i2c.c
-+++ b/src/alp_i2c.c
-@@ -4,8 +4,6 @@
- #include "config.h"
- #endif
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_i2c.c,v 1.6 1999/02/28 11:19:38 dawes Exp $ */
--
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "compiler.h"
-diff --git a/src/alp_xaa.c b/src/alp_xaa.c
-index 95741fc..7a96e1a 100644
---- a/src/alp_xaa.c
-+++ b/src/alp_xaa.c
-@@ -4,8 +4,6 @@
- #include "config.h"
- #endif
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
--
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "compiler.h"
-diff --git a/src/alp_xaam.c b/src/alp_xaam.c
-index 0193a43..3ecc7de 100644
---- a/src/alp_xaam.c
-+++ b/src/alp_xaam.c
-@@ -1,6 +1,5 @@
- /* (c) Itai Nahshon */
- /* #define DEBUG */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-diff --git a/src/cir.h b/src/cir.h
-index 904d9cc..861966d 100644
---- a/src/cir.h
-+++ b/src/cir.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.20 2002/01/04 21:26:54 tsi Exp $ */
--
- /* (c) Itai Nahshon */
- 
- #ifndef CIR_H
-@@ -23,7 +21,7 @@ typedef struct {
- 	CARD32			properties;
- 	pciVideoPtr		PciInfo;
- 	PCITAG			PciTag;
--	IOADDRESS		PIOReg;
-+	unsigned long		PIOReg;
-     union {
- 	struct lgRec		*lg;
- 	struct alpRec		*alp;
-diff --git a/src/cir_dga.c b/src/cir_dga.c
-index bc98df6..f930231 100644
---- a/src/cir_dga.c
-+++ b/src/cir_dga.c
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_dga.c,v 1.5 2001/02/15 17:39:27 eich Exp $ */
- /*
-  * Copyright 2000 by Egbert Eich
-  *
-@@ -83,9 +82,9 @@ CirDGAInit(ScreenPtr pScreen)
-   if (!pCir->DGAnumModes) {
-     pMode = firstMode = pScrn->modes;
-     while (pMode) {
--      newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec));
-+      newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec));
-       if (!newmodes) {
--	xfree(modes);
-+	free(modes);
- 	return FALSE;
-       }
-       modes = newmodes;
-diff --git a/src/cir_driver.c b/src/cir_driver.c
-index 5466c48..7e470bb 100644
---- a/src/cir_driver.c
-+++ b/src/cir_driver.c
-@@ -15,8 +15,6 @@
- #include "config.h"
- #endif
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.67 2001/05/15 10:19:37 eich Exp $ */
--
- /* All drivers should typically include these */
- #include "xf86.h"
- #include "xf86_OSproc.h"
-@@ -29,6 +27,10 @@
- /* Drivers for PCI hardware need this */
- #include "xf86PciInfo.h"
- 
-+#ifndef PCI_CHIP_GD7556  /*  for old xf86PciInfo.h  */
-+#define PCI_CHIP_GD7556            0x004C
-+#endif
-+
- /* Drivers that need to access the PCI config space directly need this */
- #include "xf86Pci.h"
- 
-@@ -90,6 +92,8 @@ SymTabRec CIRChipsets[] = {
- 	{ PCI_CHIP_GD5464BD,	"CL-GD5464BD" },
- 	{ PCI_CHIP_GD5465,		"CL-GD5465" },
- 	{ PCI_CHIP_GD7548,              "CL-GD7548" },
-+	{ PCI_CHIP_GD7555,              "CL-GD7555" },
-+	{ PCI_CHIP_GD7556,              "CL-GD7556" },
- 	{-1,					NULL }
- };
- 
-@@ -107,6 +111,8 @@ _X_EXPORT PciChipsets CIRPciChipsets[] = {
- 	{ PCI_CHIP_GD5464BD,PCI_CHIP_GD5464BD,	RES_SHARED_VGA },
- 	{ PCI_CHIP_GD5465,	PCI_CHIP_GD5465,	RES_SHARED_VGA },
- 	{ PCI_CHIP_GD7548,	PCI_CHIP_GD7548,	RES_SHARED_VGA },
-+	{ PCI_CHIP_GD7555,	PCI_CHIP_GD7555,	RES_SHARED_VGA },
-+	{ PCI_CHIP_GD7556,	PCI_CHIP_GD7556,	RES_SHARED_VGA },
- 	{ -1,				-1,					RES_UNDEFINED}
- };
- 
-@@ -238,7 +244,7 @@ CIRProbe(DriverPtr drv, int flags)
- 				    CIRChipsets, CIRPciChipsets, devSections,
-  				    numDevSections, drv, &usedChips);
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
-     if (numUsed <= 0)
-  	return FALSE;
-     if (flags & PROBE_DETECT)
-@@ -280,7 +286,7 @@ CIRProbe(DriverPtr drv, int flags)
-  	    pScrn->Probe	 = NULL;
-  	}
-     }
--    xfree(usedChips);
-+    free(usedChips);
-      
-     return foundScreen;
- }
-diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h
-index f0f5cf8..669b8fe 100644
---- a/src/cir_pcirename.h
-+++ b/src/cir_pcirename.h
-@@ -34,6 +34,33 @@ enum region_type {
-     REGION_IO 
- };
- 
-+#include "xf86Module.h"
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
-+
-+#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
-+#define PCI_DOM_MASK    0x01fful
-+#else
-+#define PCI_DOM_MASK 0x0ffu
-+#endif
-+
-+#ifndef PCI_DOM_MASK
-+# define PCI_DOM_MASK 0x0ffu
-+#endif
-+#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
-+
-+static inline uint32_t
-+pciTag(int busnum, int devnum, int funcnum)
-+{
-+	uint32_t tag;
-+	tag  = (busnum & (PCI_DOMBUS_MASK)) << 16;
-+	tag |= (devnum & 0x00001fu) << 11;
-+	tag |= (funcnum & 0x000007u) << 8;
-+
-+	return tag;
-+}
-+#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */
-+
- #ifndef XSERVER_LIBPCIACCESS
- 
- /* pciVideoPtr */
-diff --git a/src/cir_shadow.c b/src/cir_shadow.c
-index b89890a..0716a64 100644
---- a/src/cir_shadow.c
-+++ b/src/cir_shadow.c
-@@ -1,5 +1,3 @@
--/* $XFree86: Exp $ */
--
- /*
-    Copyright (c) 1999,2000  The XFree86 Project Inc. 
-    based on code written by Mark Vojkovich <markv@valinux.com>
-diff --git a/src/lg.h b/src/lg.h
-index 9d91053..985f634 100644
---- a/src/lg.h
-+++ b/src/lg.h
-@@ -10,8 +10,6 @@
-  *  Inspired by cir.h
-  */
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.12 2001/05/04 19:05:36 dawes Exp $ */
--
- #ifndef LG_H
- #define LG_H
- #define LG_DEBUG
-diff --git a/src/lg_driver.c b/src/lg_driver.c
-index cfc3e65..fc864f8 100644
---- a/src/lg_driver.c
-+++ b/src/lg_driver.c
-@@ -13,7 +13,6 @@
-  *	David Dawes, Andrew E. Mileski, Leonard N. Zubkoff,
-  *	Guy DESBIEF, Itai Nahshon.
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_driver.c,v 1.49 2003/11/03 05:11:09 tsi Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-@@ -259,7 +258,7 @@ LgFreeRec(ScrnInfoPtr pScrn)
- {
- 	if (pScrn->driverPrivate == NULL)
- 		return;
--	xfree(pScrn->driverPrivate);
-+	free(pScrn->driverPrivate);
- 	pScrn->driverPrivate = NULL;
- }
- 
-@@ -373,7 +372,12 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 	pCir = CIRPTR(pScrn);
- 	pCir->pScrn = pScrn;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	pCir->PIOReg = hwp->PIOOffset + 0x3CE;
-+#else
-+	pCir->PIOReg = 0x3CE;
-+#endif
- 
- 	/* Get the entity, and make sure it is PCI. */
- 	pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
-@@ -454,7 +458,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
- 	xf86CollectOptions(pScrn, NULL);
- 
- 	/* Process the options */
--	if (!(pCir->Options = xalloc(sizeof(LgOptions))))
-+	if (!(pCir->Options = malloc(sizeof(LgOptions))))
- 		return FALSE;
- 	memcpy(pCir->Options, LgOptions, sizeof(LgOptions));
- 	xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCir->Options);
-@@ -1314,7 +1318,7 @@ LgScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	
- 	if(pCir->shadowFB) {
- 	    pCir->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	    pCir->ShadowPtr = xalloc(pCir->ShadowPitch * height);
-+	    pCir->ShadowPtr = malloc(pCir->ShadowPitch * height);
- 	    displayWidth = pCir->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- 	    FbBase = pCir->ShadowPtr;
- 	} else {
-@@ -1617,7 +1621,7 @@ LgCloseScreen(int scrnIndex, ScreenPtr pScreen)
- 		xf86DestroyCursorInfoRec(pCir->CursorInfoRec);
- 	pCir->CursorInfoRec = NULL;
- 	if (pCir->DGAModes)
--		xfree(pCir->DGAModes);
-+		free(pCir->DGAModes);
- 	pCir->DGAnumModes = 0;
- 	pCir->DGAModes = NULL;
- 
-diff --git a/src/lg_hwcurs.c b/src/lg_hwcurs.c
-index b41b79a..381db1c 100644
---- a/src/lg_hwcurs.c
-+++ b/src/lg_hwcurs.c
-@@ -10,7 +10,6 @@
-  * Much of this code is inspired by the HW cursor code from XFree86
-  * 3.3.3.
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_hwcurs.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-diff --git a/src/lg_i2c.c b/src/lg_i2c.c
-index 05e083c..145cc2e 100644
---- a/src/lg_i2c.c
-+++ b/src/lg_i2c.c
-@@ -1,7 +1,5 @@
- /* (c) Itai Nahshon */
- 
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_i2c.c,v 1.1 1998/11/15 04:30:25 dawes Exp $ */
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-diff --git a/src/lg_xaa.c b/src/lg_xaa.c
-index fd8c70a..8bab365 100644
---- a/src/lg_xaa.c
-+++ b/src/lg_xaa.c
-@@ -10,7 +10,6 @@
-  * Much of this code is inspired by the XAA acceleration from XFree86
-  * 3.3.3, laguna_acl.c
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.c,v 1.4 2000/12/06 15:35:17 eich Exp $ */
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-diff --git a/src/lg_xaa.h b/src/lg_xaa.h
-index 7359a49..162aa5d 100644
---- a/src/lg_xaa.h
-+++ b/src/lg_xaa.h
-@@ -13,7 +13,6 @@
-  * This header file draws much from the file cir_blitLG.h in version 3.3.3
-  * of XFree86.
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.3 2000/02/08 13:13:15 eich Exp $ */
- 
- /* This header file defines the necessary structures, contstants, and
-    variables for using the bitBLT engine on a Laguna family graphics
diff --git a/extra/xf86-video-i128/i128-1.3.4-git.patch b/extra/xf86-video-i128/i128-1.3.4-git.patch
deleted file mode 100644
index 581ed7bb7..000000000
--- a/extra/xf86-video-i128/i128-1.3.4-git.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff --git a/man/i128.man b/man/i128.man
-index 920d2ab..a8e2e54 100644
---- a/man/i128.man
-+++ b/man/i128.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.man,v 1.2 2001/01/27 18:20:48 dawes Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH I128 __drivermansuffix__ __vendorversion__
-diff --git a/src/i128_driver.c b/src/i128_driver.c
-index 903a3a8..92f9d58 100644
---- a/src/i128_driver.c
-+++ b/src/i128_driver.c
-@@ -304,13 +304,13 @@ I128Probe(DriverPtr drv, int flags)
- 			numDevSections, drv, &usedChips);
- 
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
- 
-     if (numUsed <= 0)
- 	return FALSE;
- 
-     if (flags & PROBE_DETECT) {
--	xfree(usedChips);
-+	free(usedChips);
- 	return FALSE;
-     }
- 
-@@ -340,7 +340,7 @@ I128Probe(DriverPtr drv, int flags)
- 	foundScreen = TRUE;
-     }
- 
--    xfree(usedChips);
-+    free(usedChips);
- 
-     return foundScreen;
- }
-@@ -446,7 +446,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
-     int i;
-     ClockRangePtr clockRanges;
-     MessageType from;
--    IOADDRESS iobase;
-+    unsigned long iobase;
-     char *ramdac = NULL;
-     CARD32 tmpl, tmph, tmp;
-     unsigned char n, m, p, mdc, df;
-@@ -558,7 +558,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if (!(pI128->Options = xalloc(sizeof(I128Options))))
-+    if (!(pI128->Options = malloc(sizeof(I128Options))))
- 	return FALSE;
-     memcpy(pI128->Options, I128Options, sizeof(I128Options));
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI128->Options);
-@@ -650,7 +650,10 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
-         xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"%x\"\n",
-     	    PCI_SUB_VENDOR_ID(pI128->PciInfo));
- 
--    iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00) + hwp->PIOOffset;
-+    iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    iobase += hwp->PIOOffset;
-+#endif
-     pI128->RegRec.iobase = iobase;
- 
-     pI128->io.rbase_g = inl(iobase)        & 0xFFFFFF00;
-@@ -1157,7 +1160,7 @@ I128FreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -1704,12 +1707,12 @@ I128CloseScreen(int scrnIndex, ScreenPtr pScreen)
- 	XAADestroyInfoRec(pI128->XaaInfoRec);
-     if (pI128->ExaDriver) {
-         exaDriverFini(pScreen);
--        xfree(pI128->ExaDriver);
-+        free(pI128->ExaDriver);
-     }
-     if (pI128->CursorInfoRec)
-     	xf86DestroyCursorInfoRec(pI128->CursorInfoRec);
-     if (pI128->DGAModes)
--    	xfree(pI128->DGAModes);
-+    	free(pI128->DGAModes);
-     pScrn->vtSema = FALSE;
- 
-     pScreen->CloseScreen = pI128->CloseScreen;
-@@ -1804,7 +1807,7 @@ I128DDC1Read(ScrnInfoPtr pScrn)
-   I128Ptr pI128 = I128PTR(pScrn);
-   unsigned char val;
-   unsigned long tmp, ddc;
--  IOADDRESS iobase;
-+  unsigned long iobase;
- 
-   iobase = pI128->RegRec.iobase;
-   ddc = inl(iobase + 0x2C);
-@@ -1839,7 +1842,7 @@ I128I2CGetBits(I2CBusPtr b, int *clock, int *data)
- {
-   I128Ptr pI128 = I128PTR(xf86Screens[b->scrnIndex]);
-   unsigned long ddc;
--  IOADDRESS iobase;
-+  unsigned long iobase;
- #if 0
-   static int lastclock = -1, lastdata = -1;
- #endif
-@@ -1867,7 +1870,7 @@ I128I2CPutBits(I2CBusPtr b, int clock, int data)
-   unsigned char drv, val;
-   unsigned long ddc;
-   unsigned long tmp;
--  IOADDRESS iobase;
-+  unsigned long iobase;
- 
-   iobase = pI128->RegRec.iobase;
-   ddc = inl(iobase + 0x2C);
-@@ -1889,7 +1892,7 @@ I128I2CInit(ScrnInfoPtr pScrn)
- {       
-     I128Ptr pI128 = I128PTR(pScrn);
-     I2CBusPtr I2CPtr;
--    IOADDRESS iobase;
-+    unsigned long iobase;
-     unsigned long soft_sw, ddc;
-      
-     I2CPtr = xf86CreateI2CBusRec();
-@@ -2102,7 +2105,7 @@ void
- I128DumpActiveRegisters(ScrnInfoPtr pScrn)
- {
-     I128Ptr pI128 = I128PTR(pScrn);
--    IOADDRESS iobase;
-+    unsigned long iobase;
-     unsigned long rbase_g, rbase_w, rbase_a, rbase_b, rbase_i, rbase_e;
-     unsigned long id, config1, config2, sgram, soft_sw, ddc, vga_ctl;
-     volatile CARD32 *vrba, *vrbg, *vrbw;
-diff --git a/src/i128dga.c b/src/i128dga.c
-index 48823aa..8bc2fcb 100644
---- a/src/i128dga.c
-+++ b/src/i128dga.c
-@@ -59,15 +59,15 @@ I128DGAInit(ScreenPtr pScreen)
-    while(pMode) {
- 
- 	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
--	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
- 	    oneMore = TRUE;
- 	} else {
--	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- 	    oneMore = FALSE;
- 	}
- 
- 	if(!newmodes) {
--	   xfree(modes);
-+	   free(modes);
- 	   return FALSE;
- 	}
- 	modes = newmodes;
-diff --git a/src/i128reg.h b/src/i128reg.h
-index 56b9c33..a72b525 100644
---- a/src/i128reg.h
-+++ b/src/i128reg.h
-@@ -75,7 +75,7 @@ struct i128mem {
- 
- /* save the registers needed for restoration in this structure */
- typedef struct {
--	IOADDRESS iobase;		/* saved only for iobase indexing    */
-+	unsigned long iobase;		/* saved only for iobase indexing    */
- 	CARD32 config1;			/* iobase+0x1C register              */
- 	CARD32 config2;			/* iobase+0x20 register              */
- 	CARD32 sgram;			/* iobase+0x24 register              */
diff --git a/extra/xf86-video-mga/git-fixes.patch b/extra/xf86-video-mga/git-fixes.patch
deleted file mode 100644
index 70650b0d1..000000000
--- a/extra/xf86-video-mga/git-fixes.patch
+++ /dev/null
@@ -1,5192 +0,0 @@
-From 951474c7fcd1b28d3178a6644d58958cb3bdf5a8 Mon Sep 17 00:00:00 2001
-From: Yannick Heneault <yheneaul@matrox.com>
-Date: Wed, 25 Aug 2010 15:16:27 +0000
-Subject: modified G200SE conditionnal statement about revision register for products compatibility.
-
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 5a1e9b4..83649ee 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1081,7 +1081,7 @@ MGACountRam(ScrnInfoPtr pScrn)
- 
- 	if (pMga->is_G200SE)
- 	    pMga->reg_1e24 = INREG(0x1e24); /* stash the model for later */
--	if (pMga->reg_1e24 == 0x01) {
-+	if (pMga->reg_1e24 >= 0x01) {
- 	    MGAUnmapMem(pScrn);
- 	    ProbeSize = 16384;
- 	    ProbeSizeOffset = 0x10000;
-@@ -3253,7 +3253,7 @@ MGA_HAL(
-     MGA_NOT_HAL(
- 	if (pMga->is_G200SE) {
-             OUTREG8(0x1FDE, 0x06);
--	    if (pMga->reg_1e24 == 0x01)
-+	    if (pMga->reg_1e24 >= 0x01)
- 		OUTREG8(0x1FDF, 0x03);
- 	    else 
- 		OUTREG8(0x1FDF, 0x14);
-@@ -4326,7 +4326,7 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
- 	    return MODE_VIRTUAL_X;
- 	if (mode->VDisplay > 1200)
- 	    return MODE_VIRTUAL_Y;
--	if (pMga->reg_1e24 == 0x01 &&
-+	if (pMga->reg_1e24 >= 0x01 &&
- 	    xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244)
- 	    return MODE_BANDWIDTH;
-     } else if (pMga->is_G200WB){
---
-cgit v0.9.0.2-2-gbebe
-From 0bd44fad450843b7f1c35c70ab356a2b250d107d Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 20:29:51 +0000
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/mga.man b/man/mga.man
-index 3a7a9f8..e1e674f 100644
---- a/man/mga.man
-+++ b/man/mga.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.7 2003/04/03 07:11:03 herrb Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH mga __drivermansuffix__ __vendorversion__
-diff --git a/src/binding.h b/src/binding.h
-index 6dcd1e9..57e9b92 100644
---- a/src/binding.h
-+++ b/src/binding.h
-@@ -13,7 +13,6 @@
-  @end
- 
- ***************************************************************************************/
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v 1.3 2000/10/24 22:45:08 dawes Exp $ */
- 
- #ifndef _BINDING
- #define _BINDING
-diff --git a/src/mga.h b/src/mga.h
-index 2cb3d88..7725b56 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.87tsi Exp $ */
- /*
-  * MGA Millennium (MGA2064W) functions
-  *
-diff --git a/src/mga_common.h b/src/mga_common.h
-index 90f6b37..81be2bc 100644
---- a/src/mga_common.h
-+++ b/src/mga_common.h
-@@ -25,8 +25,6 @@
-  * Converted to common header format:
-  *   Jens Owen <jens@tungstengraphics.com>
-  *
-- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_common.h,v 1.2 2002/12/16 16:19:18 dawes Exp $
-- *
-  */
- 
- #ifndef _MGA_COMMON_H_
-diff --git a/src/mga_dri.h b/src/mga_dri.h
-index f1afb5d..1984b9c 100644
---- a/src/mga_dri.h
-+++ b/src/mga_dri.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h,v 1.6 2001/04/10 16:08:01 dawes Exp $ */
--
- /*
-  * Copyright 2000 VA Linux Systems Inc., Fremont, California.
-  * All Rights Reserved.
-diff --git a/src/mga_dripriv.h b/src/mga_dripriv.h
-index 3ddd133..feca134 100644
---- a/src/mga_dripriv.h
-+++ b/src/mga_dripriv.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dripriv.h,v 1.4 2001/04/10 16:08:01 dawes Exp $ */
--
- /*
-  * Copyright 2000 VA Linux Systems Inc., Fremont, California.
-  * All Rights Reserved.
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 83649ee..72e7acc 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1,4 +1,3 @@
--/* $XConsortium: mga_driver.c /main/12 1996/10/28 05:13:26 kaleb $ */
- /*
-  * MGA Millennium (MGA2064W) with Ti3026 RAMDAC driver v.1.1
-  *
-diff --git a/src/mga_macros.h b/src/mga_macros.h
-index 69dc8e3..bffd063 100644
---- a/src/mga_macros.h
-+++ b/src/mga_macros.h
-@@ -1,5 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_macros.h,v 1.21 2001/09/26 12:59:17 alanh Exp $ */
--
- #ifndef _MGA_MACROS_H_
- #define _MGA_MACROS_H_
- 
-diff --git a/src/mga_reg.h b/src/mga_reg.h
-index 6251976..ffe4723 100644
---- a/src/mga_reg.h
-+++ b/src/mga_reg.h
-@@ -1,11 +1,3 @@
--/* $XConsortium: mgareg.h /main/2 1996/10/25 10:33:21 kaleb $ */
--
--
--
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_reg.h,v 1.18 2001/09/26 12:59:18 alanh Exp $ */
--
--
--
- /*
-  * MGA Millennium (MGA2064W) functions
-  * MGA Mystique (MGA1064SG) functions
-diff --git a/src/mga_sarea.h b/src/mga_sarea.h
-index c5ffbbc..16fc9ce 100644
---- a/src/mga_sarea.h
-+++ b/src/mga_sarea.h
-@@ -1,5 +1,3 @@
--/* $XFree86$ */
--
- /*
-  * Copyright 2000 Gareth Hughes
-  * All Rights Reserved.
-diff --git a/src/mgareg_flags.h b/src/mgareg_flags.h
-index 69050fc..548af86 100644
---- a/src/mgareg_flags.h
-+++ b/src/mgareg_flags.h
-@@ -19,7 +19,6 @@
-  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
-  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  */
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mgareg_flags.h,v 1.2 2003/01/12 03:55:47 tsi Exp $ */
- 
- #ifndef _MGAREGS_H_
- #define _MGAREGS_H_
-diff --git a/util/stormdwg.c b/util/stormdwg.c
-index 99f76cc..b43cc32 100644
---- a/util/stormdwg.c
-+++ b/util/stormdwg.c
-@@ -1,8 +1,3 @@
--/* $XConsortium: dwg.c /main/2 1996/10/28 06:57:55 kaleb $ */
--
--
--
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/util/stormdwg.c,v 1.1 1997/04/12 14:11:29 hohndel Exp $ */
- 
- #include <stdio.h>
- #include <stdlib.h>
---
-cgit v0.9.0.2-2-gbebe
-From 636c3c88e7e9cb30010fe1731cd7356849f3f172 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 14 Oct 2010 18:36:06 +0000
-Subject: Don't allow the config file to override BIOS location
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 72e7acc..37bf847 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1779,23 +1779,16 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- #ifndef XSERVER_LIBPCIACCESS
-     /*
-      * Find the BIOS base.  Get it from the PCI config if possible.  Otherwise
--     * use the VGA default.  Allow the config file to override this.
-+     * use the VGA default.
-      */
- 
--    pMga->BiosFrom = X_NONE;
--    if (pMga->device->BiosBase != 0) {
--	/* XXX This isn't used */
--	pMga->BiosAddress = pMga->device->BiosBase;
--	pMga->BiosFrom = X_CONFIG;
--    } else {
--	/* details: rombase sdk pp 4-15 */
--	if (pMga->PciInfo->biosBase != 0) {
--	    pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
--	    pMga->BiosFrom = X_PROBED;
--	} else if (pMga->Primary) {
--	    pMga->BiosAddress = 0xc0000;
--	    pMga->BiosFrom = X_DEFAULT;
--	}
-+    /* details: rombase sdk pp 4-15 */
-+    if (pMga->PciInfo->biosBase != 0) {
-+	pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
-+	pMga->BiosFrom = X_PROBED;
-+    } else if (pMga->Primary) {
-+	pMga->BiosAddress = 0xc0000;
-+	pMga->BiosFrom = X_DEFAULT;
-     }
-     if (pMga->BiosAddress) {
- 	xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n",
---
-cgit v0.9.0.2-2-gbebe
-From f7a2ef60e18e2cc464f69c1cad4681096c645651 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 30 Oct 2010 16:38:31 +0000
-Subject: Sun's copyrights now belong to Oracle
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/Makefile.am b/man/Makefile.am
-index b3688ce..1ea26b3 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,5 +1,5 @@
- #
--# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- #
- # Permission is hereby granted, free of charge, to any person obtaining a
- # copy of this software and associated documentation files (the "Software"),
-@@ -19,7 +19,7 @@
- # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- # DEALINGS IN THE SOFTWARE.
--# 
-+#
- 
- drivermandir = $(DRIVER_MAN_DIR)
- 
---
-cgit v0.9.0.2-2-gbebe
-From 5f1b04e86e79938c8158055a777280a649f95510 Mon Sep 17 00:00:00 2001
-From: Yannick Heneault <yheneaul@matrox.com>
-Date: Fri, 17 Dec 2010 14:00:46 +0000
-Subject: added support for G200ER.
-
----
-diff --git a/src/mga.h b/src/mga.h
-index 7725b56..c520e86 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -136,6 +136,10 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
- #define PCI_CHIP_MGAG200_EH_PCI 0x0533
- #endif
- 
-+#ifndef PCI_CHIP_MGAG200_ER_PCI
-+#define PCI_CHIP_MGAG200_ER_PCI 0x0534
-+#endif
-+
- /*
-  * Read/write to the DAC via MMIO 
-  */
-@@ -199,7 +203,9 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
- typedef struct {
-     unsigned char	ExtVga[6];
-     unsigned char 	DacClk[6];
--    unsigned char *     DacRegs;
-+    unsigned char	ExtVga_Index24;
-+    unsigned char	Dac_Index90;
-+    unsigned char * DacRegs;
-     unsigned long	crtc2[0x58];
-     unsigned char	dac2[0x21];
-     CARD32		Option;
-@@ -478,6 +484,7 @@ typedef struct {
-     int is_G200WB:1;
-     int is_G200EV:1;
-     int is_G200EH:1;
-+    int is_G200ER:1;
- 
-     int KVM;
- 
-diff --git a/src/mga_dacG.c b/src/mga_dacG.c
-index df00765..fca1031 100644
---- a/src/mga_dacG.c
-+++ b/src/mga_dacG.c
-@@ -444,6 +444,116 @@ MGAG200WBPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
-     outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
- }
- 
-+#define G200ER_PLLREF 48000
-+#define G200ER_VCOMIN 1056000
-+#define G200ER_VCOMAX 1488000
-+
-+static void MGAG200ERComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *piM, int *piN, int *piP)
-+{
-+
-+    int  ulM;
-+    int  ulN;
-+    int  ulO;
-+    int  ulR;
-+
-+    CARD32 ulComputedFo;
-+    CARD32 ulVco;
-+    CARD32 ulFDelta;
-+    CARD32 ulFTmpDelta;
-+
-+    CARD32 aulMDivValue[] = {1, 2, 4, 8};
-+
-+    CARD32 ulFo   = lFo;
-+
-+    ulFDelta = 0xFFFFFFFF;
-+
-+    for (ulR = 0; ulR < 4;  ulR++)
-+    {
-+    	if(ulFDelta==0) break;
-+        for (ulN = 5; (ulN <= 128) ; ulN++)
-+        {
-+            if(ulFDelta==0) break;
-+            for (ulM = 3; ulM >= 0; ulM--)
-+            {
-+            	if(ulFDelta==0) break;
-+                for (ulO = 5; ulO <= 32; ulO++)
-+                {
-+                	ulVco = (G200ER_PLLREF * (ulN+1)) / (ulR+1);
-+                	// Validate vco
-+                    if (ulVco < G200ER_VCOMIN) continue;
-+					if (ulVco > G200ER_VCOMAX) continue;
-+                	ulComputedFo = ulVco / (aulMDivValue[ulM] * (ulO+1));
-+
-+                    if (ulComputedFo > ulFo)
-+                    {
-+                        ulFTmpDelta = ulComputedFo - ulFo;
-+                    }
-+                    else
-+                    {
-+                        ulFTmpDelta = ulFo - ulComputedFo;
-+                    }
-+
-+                    if (ulFTmpDelta < ulFDelta)
-+                    {
-+                        ulFDelta = ulFTmpDelta;
-+                        // XG200ERPIXPLLCM M<1:0> O<7:3>
-+                        *piM = (CARD8)ulM | (CARD8)(ulO<<3);
-+                        //
-+                        // XG200ERPIXPLLCN N<6:0>
-+                        *piN = (CARD8)ulN;
-+                        //
-+                        // XG200ERPIXPLLCP R<1:0> cg<7:4> (Use R value)
-+                        *piP = (CARD8)ulR | (CARD8)(ulR<<3);
-+
-+                        // Test
-+                        int ftest = (G200ER_PLLREF * (ulN+1)) / ((ulR+1) * aulMDivValue[ulM] * (ulO+1));
-+                        ftest=ftest;
-+                    }
-+                } // End O Loop
-+            } // End M Loop
-+        } // End N Loop
-+    } // End R Loop
-+}
-+
-+static void
-+MGAG200ERPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
-+{
-+    //TODO  G200ER Validate sequence 
-+    CARD8 ucPixCtrl, ucTempByte;
-+    MGAPtr pMga = MGAPTR(pScrn);
-+
-+
-+    // Set pixclkdis to 1
-+    ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
-+    ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS;
-+    outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
-+
-+    ucTempByte = inMGAdac(MGA1064_REMHEADCTL);
-+    ucTempByte |= MGA1064_REMHEADCTL_CLKDIS;
-+    outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
-+
-+    // Select PLL Set C
-+    ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
-+    ucTempByte |= (0x3<<2) | 0xc0; //select MGA pixel clock
-+    OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
-+
-+    ucPixCtrl &= ~MGA1064_PIX_CLK_CTL_CLK_DIS;
-+    ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
-+    outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
-+
-+    // Wait 500 us
-+    usleep(500);
-+
-+    // Program the Pixel PLL Register
-+    outMGAdac(MGA1064_ER_PIX_PLLC_N, mgaReg->PllN);
-+    outMGAdac(MGA1064_ER_PIX_PLLC_M, mgaReg->PllM);
-+    outMGAdac(MGA1064_ER_PIX_PLLC_P, mgaReg->PllP);
-+
-+        // Wait 50 us
-+    usleep(50);
-+
-+}
-+
- static void
- MGAG200WBPrepareForModeSwitch(ScrnInfoPtr pScrn)
- {
-@@ -768,8 +878,13 @@ MGAGSetPCLK( ScrnInfoPtr pScrn, long f_out )
- 
- 	    pReg->PllM = m;
- 	    pReg->PllN = n;
--	    pReg->PllP = p;
--        } else {
-+	    pReg->PllP = p;		
-+	} else if (pMga->is_G200ER) {
-+	    MGAG200ERComputePLLParam(pScrn, f_out, &m, &n, &p);
-+	    pReg->PllM = m;
-+	    pReg->PllN = n;
-+	    pReg->PllP = p;		
-+    } else {
- 	    /* Do the calculations for m, n, p and s */
- 	    MGAGCalcClock( pScrn, f_out, &m, &n, &p, &s );
- 
-@@ -966,6 +1081,10 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-                 pReg->Option2 = 0x0000b000;
-                 break;
- 
-+		case PCI_CHIP_MGAG200_ER_PCI:
-+			pReg->Dac_Index90 = 0;
-+			break;
-+
-         case PCI_CHIP_MGAG200_EH_PCI:
-                 pReg->DacRegs[MGA1064_MISC_CTL] =
-                     MGA1064_MISC_CTL_VGA8 |
-@@ -1088,6 +1207,7 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-         if (pMga->is_G200WB){
-             pReg->ExtVga[1] |= 0x88;
-         }
-+	pReg->ExtVga_Index24 = 0x05;
- 		
- 	pVga->CRTC[0]	= ht - 4;
- 	pVga->CRTC[1]	= hd;
-@@ -1327,10 +1447,15 @@ MGA_NOT_HAL(
- 	      if ( (pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) &&
- 		   (i >= 0x44) && (i <= 0x4E))
- 	         continue;
--
-+			 
- 	      outMGAdac(i, mgaReg->DacRegs[i]);
- 	   }
- 	   
-+		if (pMga->is_G200ER)
-+        {
-+			outMGAdac(0x90, mgaReg->Dac_Index90);
-+        }
-+   
- 	   if (!MGAISGx50(pMga)) {
- 	       /* restore pci_option register */
- #ifdef XSERVER_LIBPCIACCESS
-@@ -1361,7 +1486,9 @@ MGA_NOT_HAL(
- #endif
- 	   }
- 
--           if (pMga->is_G200EV) {
-+           if (pMga->is_G200ER) {
-+               MGAG200ERPIXPLLSET(pScrn, mgaReg);               
-+           } else  if (pMga->is_G200EV) {
-                MGAG200EVPIXPLLSET(pScrn, mgaReg);
-            } else if (pMga->is_G200WB) {
-                MGAG200WBPIXPLLSET(pScrn, mgaReg);
-@@ -1388,6 +1515,11 @@ MGA_NOT_HAL(
-            for (i = 0; i < 6; i++)
- 	      OUTREG16(MGAREG_CRTCEXT_INDEX, (mgaReg->ExtVga[i] << 8) | i);
- 
-+           if (pMga->is_G200ER) {
-+               OUTREG8(MGAREG_CRTCEXT_INDEX, 0x24);
-+               OUTREG8(MGAREG_CRTCEXT_DATA,  mgaReg->ExtVga_Index24);			   
-+           }
-+
- 	   /* This handles restoring the generic VGA registers. */
- 	   if (pMga->is_G200SE) {
-  	      MGAG200SERestoreMode(pScrn, vgaReg);
-@@ -1404,7 +1536,7 @@ MGA_NOT_HAL(
-                OUTREG16(MGAREG_CRTCEXT_INDEX, 6);
-                OUTREG16(MGAREG_CRTCEXT_DATA, 0);
-            }
--
-+		   
- 	   /*
- 	    * this is needed to properly restore start address
- 	    */
-@@ -1555,6 +1687,11 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg,
-             mgaReg->PllM = inMGAdac(MGA1064_EH_PIX_PLLC_M);
-             mgaReg->PllN = inMGAdac(MGA1064_EH_PIX_PLLC_N);
-             mgaReg->PllP = inMGAdac(MGA1064_EH_PIX_PLLC_P);
-+        } else if (pMga->is_G200ER) {
-+            mgaReg->PllM = inMGAdac(MGA1064_ER_PIX_PLLC_M);
-+            mgaReg->PllN = inMGAdac(MGA1064_ER_PIX_PLLC_N);
-+            mgaReg->PllP = inMGAdac(MGA1064_ER_PIX_PLLC_P);
-+            mgaReg->Dac_Index90 = inMGAdac(0x90);
-         }
- 
-         mgaReg->PIXPLLCSaved = TRUE;
-@@ -1583,6 +1720,11 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg,
- 		OUTREG8(MGAREG_CRTCEXT_INDEX, i);
- 		mgaReg->ExtVga[i] = INREG8(MGAREG_CRTCEXT_DATA);
- 	}
-+	if (pMga->is_G200ER)
-+	{
-+		OUTREG8(MGAREG_CRTCEXT_INDEX, 0x24);
-+		mgaReg->ExtVga_Index24 = INREG8(MGAREG_CRTCEXT_DATA);
-+	}
- 
- #ifdef DEBUG		
- 	ErrorF("Saved values:\nDAC:");
-@@ -1737,7 +1879,7 @@ static const struct mgag_i2c_private {
-     { (1 << 0), (1 << 2) },
-     { (1 << 4), (1 << 5) },
-     { (1 << 0), (1 << 1) },  /* G200SE, G200EV and G200WB I2C bits */
--    { (1 << 1), (1 << 0) },  /* G200EH I2C bits */
-+    { (1 << 1), (1 << 0) },  /* G200EH, G200ER I2C bits */
- };
- 
- 
-@@ -1750,7 +1892,7 @@ MGAG_ddc1Read(ScrnInfoPtr pScrn)
- 
-   if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
-     i2c_index = 3;
--  else if (pMga->is_G200EH)
-+  else if (pMga->is_G200EH || pMga->is_G200ER)
-     i2c_index = 4;
-   else
-     i2c_index = 0;
-@@ -1851,7 +1993,7 @@ MGAG_i2cInit(ScrnInfoPtr pScrn)
- 
-         if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
-             i2c_index = 3;
--        else if (pMga->is_G200EH)
-+        else if (pMga->is_G200EH || pMga->is_G200ER)
-             i2c_index = 4;
-         else
-             i2c_index = 0;
-@@ -1976,7 +2118,7 @@ void MGAGSetupFuncs(ScrnInfoPtr pScrn)
-     pMga->Save = MGAGSave;
-     pMga->Restore = MGAGRestore;
-     pMga->ModeInit = MGAGInit;
--    if (!pMga->is_G200WB){
-+    if ((!pMga->is_G200WB) && (!pMga->is_G200ER)) {
-         pMga->ddc1Read = MGAG_ddc1Read;
-         /* vgaHWddc1SetSpeed will only work if the card is in VGA mode */
-         pMga->DDC1SetSpeed = vgaHWddc1SetSpeedWeak();
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 37bf847..7232c73 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -403,6 +403,21 @@ static const struct mga_device_attributes attribs[] = {
- 	8192, 0x4000,          /* Memory probe size & offset values */
-     },
- 
-+    /* G200ER */
-+    [15] = { 0, 1, 0, 0, 1, 0, 0, 0, new_BARs,
-+            (TRANSC_SOLID_FILL | TWO_PASS_COLOR_EXPAND | USE_LINEAR_EXPANSION),
-+	{
-+	    { 50000, 230000 }, /* System VCO frequencies */
-+	    { 50000, 203400 }, /* Pixel VCO frequencies */
-+	    { 0, 0 },          /* Video VCO frequencies */
-+	    45000,            /* Memory clock */
-+	    27050,             /* PLL reference frequency */
-+	    0,                 /* Supports fast bitblt? */
-+	    MGA_HOST_PCI       /* Host interface */
-+	},
-+
-+	16384, 0x4000,          /* Memory probe size & offset values */
-+    }
- };
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -432,6 +447,8 @@ static const struct pci_id_match mga_device_match[] = {
- 
-     MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_EH_PCI, 14 ),
- 
-+	MGA_DEVICE_MATCH(PCI_CHIP_MGAG200_ER_PCI, 15 ),
-+
-     { 0, 0, 0 },
- };
- #endif
-@@ -449,6 +466,7 @@ static SymTabRec MGAChipsets[] = {
-     { PCI_CHIP_MGAG200_SE_A_PCI,	"mgag200 SE A PCI" },
-     { PCI_CHIP_MGAG200_SE_B_PCI,	"mgag200 SE B PCI" },
-     { PCI_CHIP_MGAG200_EV_PCI,	"mgag200 EV Maxim" },
-+    { PCI_CHIP_MGAG200_ER_PCI,	"mgag200 ER SH7757" },	
-     { PCI_CHIP_MGAG200_WINBOND_PCI,	"mgag200 eW Nuvoton" },
-     { PCI_CHIP_MGAG200_EH_PCI,	"mgag200eH" },
-     { PCI_CHIP_MGAG400,		"mgag400" },
-@@ -471,6 +489,8 @@ static PciChipsets MGAPciChipsets[] = {
- 	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG200_EV_PCI, PCI_CHIP_MGAG200_EV_PCI,
- 	RES_SHARED_VGA },
-+    { PCI_CHIP_MGAG200_ER_PCI, PCI_CHIP_MGAG200_ER_PCI,
-+	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI,
- 	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG200_EH_PCI, PCI_CHIP_MGAG200_EH_PCI,
-@@ -912,6 +932,11 @@ MGAProbe(DriverPtr drv, int flags)
-             case PCI_CHIP_MGAG200_EH_PCI:
-                 attrib_no = 14;
-                 break;
-+				
-+            case PCI_CHIP_MGAG200_ER_PCI:
-+                attrib_no = 15;
-+                break;
-+				
- 
- 	    default:
- 		return FALSE;
-@@ -1285,6 +1310,11 @@ MGAdoDDC(ScrnInfoPtr pScrn)
-     MGASave(pScrn);
- 
-     /* It is now safe to talk to the card */
-+    /* Allow access to DDC */
-+    if (pMga->is_G200ER) {
-+	 CARD8 ucData = inMGAdac(MGA1064_GEN_IO_CTL2);
-+     outMGAdac(MGA1064_GEN_IO_CTL2, ucData | 1);        
-+    }
- 
-     /* Initialize I2C buses - used by DDC if available */
-     if (pMga->i2cInit) {
-@@ -1326,6 +1356,12 @@ MGAdoDDC(ScrnInfoPtr pScrn)
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of monitor info\n");
-     }
- 
-+    /* Remove access to DDC */
-+    if (pMga->is_G200ER) {
-+	  CARD8 ucData = inMGAdac(MGA1064_GEN_IO_CTL2);
-+      outMGAdac(MGA1064_GEN_IO_CTL2, ucData & ~1);        
-+    }
-+
-     /* Restore previous state and unmap MGA memory and MMIO areas */
-     MGARestore(pScrn);
-     MGAUnmapMem(pScrn);
-@@ -1619,6 +1655,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     pMga->is_G200EV = (pMga->Chipset == PCI_CHIP_MGAG200_EV_PCI);
-     pMga->is_G200WB = (pMga->Chipset == PCI_CHIP_MGAG200_WINBOND_PCI);
-     pMga->is_G200EH = (pMga->Chipset == PCI_CHIP_MGAG200_EH_PCI);
-+    pMga->is_G200ER = (pMga->Chipset == PCI_CHIP_MGAG200_ER_PCI);
- 
- #ifdef USEMGAHAL
-     if (pMga->chip_attribs->HAL_chipset) {
-@@ -1782,14 +1819,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-      * use the VGA default.
-      */
- 
--    /* details: rombase sdk pp 4-15 */
--    if (pMga->PciInfo->biosBase != 0) {
--	pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
--	pMga->BiosFrom = X_PROBED;
--    } else if (pMga->Primary) {
--	pMga->BiosAddress = 0xc0000;
--	pMga->BiosFrom = X_DEFAULT;
--    }
-+	/* details: rombase sdk pp 4-15 */
-+	if (pMga->PciInfo->biosBase != 0) {
-+	    pMga->BiosAddress = pMga->PciInfo->biosBase & 0xffff0000;
-+	    pMga->BiosFrom = X_PROBED;
-+	} else if (pMga->Primary) {
-+	    pMga->BiosAddress = 0xc0000;
-+	    pMga->BiosFrom = X_DEFAULT;
-+	}
-     if (pMga->BiosAddress) {
- 	xf86DrvMsg(pScrn->scrnIndex, pMga->BiosFrom, "BIOS at 0x%lX\n",
- 		   (unsigned long)pMga->BiosAddress);
-@@ -2134,6 +2171,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-     case PCI_CHIP_MGAG200_EH_PCI:
-+    case PCI_CHIP_MGAG200_ER_PCI:	
-     case PCI_CHIP_MGAG400:
-     case PCI_CHIP_MGAG550:
- 	MGAGSetupFuncs(pScrn);
-@@ -2247,6 +2285,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-           case PCI_CHIP_MGAG200_WINBOND_PCI:
- 	  case PCI_CHIP_MGAG200_EV_PCI:
-       case PCI_CHIP_MGAG200_EH_PCI:
-+	  case PCI_CHIP_MGAG200_ER_PCI:	  
- 	    pMga->SrcOrg = 0;
- 	    pMga->DstOrg = 0;
- 	    break;
-@@ -2424,16 +2463,17 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	   maxPitch = 2048;
- 	   break;
- 	case PCI_CHIP_MGAG200_SE_A_PCI:
--	   if (pScrn->videoRam < 2048){
-+           if (pScrn->videoRam < 2048){
-                maxPitch = 1280;
--	   }
--	   break;
-+           }
-+           break;
- 	case PCI_CHIP_MGAG200:
- 	case PCI_CHIP_MGAG200_PCI:
- 	case PCI_CHIP_MGAG200_SE_B_PCI:
-         case PCI_CHIP_MGAG200_WINBOND_PCI:
- 	case PCI_CHIP_MGAG200_EV_PCI:
-     case PCI_CHIP_MGAG200_EH_PCI:
-+	case PCI_CHIP_MGAG200_ER_PCI:	
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
- 	   maxPitch = 4096;
-@@ -4332,10 +4372,13 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
- 	    return MODE_BANDWIDTH;
-     } else if (pMga->is_G200EV
- 	       && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 327)) {
--        return MODE_BANDWIDTH;
-+	return MODE_BANDWIDTH;
-     } else if (pMga->is_G200EH
-                && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 375)) {
-         return MODE_BANDWIDTH;
-+    } else if (pMga->is_G200ER
-+               && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 550)) {
-+        return MODE_BANDWIDTH;
-     }
- 
-     lace = 1 + ((mode->Flags & V_INTERLACE) != 0);
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index 753f752..1fd0572 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -363,6 +363,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-     case PCI_CHIP_MGAG200_EH_PCI:
-+	case PCI_CHIP_MGAG200_ER_PCI:
-     case PCI_CHIP_MGAG400:
-     case PCI_CHIP_MGAG550:
- 	MGAGSetupFuncs(pScrn);
-@@ -518,6 +519,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-         case PCI_CHIP_MGAG200_WINBOND_PCI:
-         case PCI_CHIP_MGAG200_EV_PCI:
-         case PCI_CHIP_MGAG200_EH_PCI:
-+	case PCI_CHIP_MGAG200_ER_PCI:		
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
- 	   maxPitch = 4096;
-diff --git a/src/mga_reg.h b/src/mga_reg.h
-index ffe4723..5a37db6 100644
---- a/src/mga_reg.h
-+++ b/src/mga_reg.h
-@@ -369,6 +369,7 @@
- #define MGA1064_MISC_CTL_VGA8   		( 0x01 << 3 )
- #define MGA1064_MISC_CTL_DAC_RAM_CS   		( 0x01 << 4 )
- 
-+#define MGA1064_GEN_IO_CTL2	0x29
- #define MGA1064_GEN_IO_CTL	0x2a
- #define MGA1064_GEN_IO_DATA	0x2b
- #define MGA1064_SYS_PLL_M	0x2c
-@@ -429,6 +430,10 @@
- #define MGA1064_EH_PIX_PLLC_N   0xb7
- #define MGA1064_EH_PIX_PLLC_P   0xb8
- 
-+/* Modified PLL for G200 Maxim (G200ER) */
-+#define MGA1064_ER_PIX_PLLC_M	0xb7
-+#define MGA1064_ER_PIX_PLLC_N	0xb6
-+#define MGA1064_ER_PIX_PLLC_P	0xb8
- 
- #define MGA1064_DISP_CTL        0x8a
- #define MGA1064_DISP_CTL_DAC1OUTSEL_MASK       0x01
-diff --git a/src/mga_storm.c b/src/mga_storm.c
-index 87473c8..db7fae7 100644
---- a/src/mga_storm.c
-+++ b/src/mga_storm.c
-@@ -1131,6 +1131,7 @@ void MGAStormEngineInit( ScrnInfoPtr pScrn )
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-     case PCI_CHIP_MGAG200_EH_PCI:
-+    case PCI_CHIP_MGAG200_ER_PCI:	
- 	pMga->SrcOrg = 0;
- 	OUTREG(MGAREG_SRCORG, pMga->realSrcOrg);
- 	OUTREG(MGAREG_DSTORG, pMga->DstOrg);
---
-cgit v0.9.0.2-2-gbebe
-From 43280e6521815582f219d42821d896093c9c0d5f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 22 Jun 2011 21:02:29 +0000
-Subject: Don't include xf86Priv.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/mga_dri.c b/src/mga_dri.c
-index 3fda623..14f342f 100644
---- a/src/mga_dri.c
-+++ b/src/mga_dri.c
-@@ -32,7 +32,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Priv.h"
- 
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
---
-cgit v0.9.0.2-2-gbebe
-From c083bf0a66bef9a4345847f39be5fb895c211f79 Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Wed, 03 Aug 2011 13:45:13 +0000
-Subject: Added support for G200SE Pilot3
-
-Optimize use of bandwidth and increase maximum resolution to 1920x1200
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 7232c73..b140013 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -3282,15 +3282,71 @@ MGA_HAL(
- 	    outb(0xfac, 0x02);
-     }
- 
--    MGA_NOT_HAL(
--	if (pMga->is_G200SE) {
-+    /* 
-+     This function optimize the Priority Request control
-+     Higher HiPriLvl will reduce drawing performance
-+     We need to give enough bandwith to crtc to avoid visual artifact
-+    */
-+	if (pMga->is_G200SE) 
-+    {
-+        if (pMga->reg_1e24 >= 0x02)
-+        {
-+            /* Calulate CRTC Priority value */
-+            CARD8  ucHiPriLvl;
-+            CARD32 ulBitsPerPixel;
-+            CARD32 ulMemoryBandwidth;
-+
-+            /* uiBitsPerPixel can only be 8,16 or32 */
-+            if (pScrn->bitsPerPixel > 16)
-+            {
-+                ulBitsPerPixel = 32;
-+            }
-+            else if (pScrn->bitsPerPixel >  8) 
-+            {
-+                ulBitsPerPixel = 16;
-+            }
-+            else 
-+            {
-+                ulBitsPerPixel = 8;
-+            }
-+
-+            
-+            ulMemoryBandwidth = (mode->Clock * ulBitsPerPixel) / 1000;
-+
-+            if      (ulMemoryBandwidth    > 3100)  ucHiPriLvl = 0;
-+            else if (ulMemoryBandwidth    > 2600)  ucHiPriLvl = 1;
-+            else if (ulMemoryBandwidth    > 1900)  ucHiPriLvl = 2;
-+            else if (ulMemoryBandwidth    > 1160)  ucHiPriLvl = 3;
-+            else if (ulMemoryBandwidth    > 440)   ucHiPriLvl = 4;
-+            else ucHiPriLvl = 5;
-+
-             OUTREG8(0x1FDE, 0x06);
--	    if (pMga->reg_1e24 >= 0x01)
--		OUTREG8(0x1FDF, 0x03);
--	    else 
--		OUTREG8(0x1FDF, 0x14);
-+		    OUTREG8(0x1FDF, ucHiPriLvl);
-+
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock           == %d\n",   mode->Clock);
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "BitsPerPixel    == %d\n",   pScrn->bitsPerPixel);
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MemoryBandwidth == %d\n",   ulMemoryBandwidth);
-+            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl        == %02X\n", ucHiPriLvl);
-         }
--    );
-+        else
-+        {
-+            MGA_NOT_HAL(
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock           == %d\n",   mode->Clock);
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO, "BitsPerPixel    == %d\n",   pScrn->bitsPerPixel);
-+                OUTREG8(0x1FDE, 0x06);
-+	            if (pMga->reg_1e24 >= 0x01)
-+                {
-+		            OUTREG8(0x1FDF, 0x03);
-+                    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl        == 03\n");
-+                }
-+	            else 
-+                {
-+		            OUTREG8(0x1FDF, 0x14);
-+                    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HiPriLvl        == 14h\n");
-+                }
-+            );
-+        }
-+    }
- 
-     pMga->CurrentLayout.mode = mode;
- 
-@@ -4354,13 +4410,23 @@ MGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-     MGAPtr pMga = MGAPTR(pScrn);
- 
-     if (pMga->Chipset == PCI_CHIP_MGAG200_SE_A_PCI) {
--	if (mode->HDisplay > 1600)
--	    return MODE_VIRTUAL_X;
--	if (mode->VDisplay > 1200)
--	    return MODE_VIRTUAL_Y;
--	if (pMga->reg_1e24 >= 0x01 &&
--	    xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244)
--	    return MODE_BANDWIDTH;
-+    	if (pMga->reg_1e24 == 0x01) {
-+	        if (mode->HDisplay > 1600)
-+	            return MODE_VIRTUAL_X;
-+	        if (mode->VDisplay > 1200)
-+	            return MODE_VIRTUAL_Y;
-+	        if (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 244)
-+	            return MODE_BANDWIDTH;
-+        } else {
-+            if (pMga->reg_1e24 >= 0x02) {
-+	            if (mode->HDisplay > 1920)
-+	                return MODE_VIRTUAL_X;
-+	            if (mode->VDisplay > 1200)
-+	                return MODE_VIRTUAL_Y;
-+	            if (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 301)
-+	                return MODE_BANDWIDTH;
-+            }
-+        }
-     } else if (pMga->is_G200WB){
-         if (mode->Flags & V_DBLSCAN)
-             return MODE_NO_DBLESCAN;
---
-cgit v0.9.0.2-2-gbebe
-From 01ca2186ea028b2549de509b51726aa08519fce0 Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Tue, 20 Sep 2011 17:07:16 +0000
-Subject: Reset tagfifo for renesas.
-
-For renesas, we need to reset tagfifo after a mode switch.
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index b140013..58a1390 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -3282,6 +3282,28 @@ MGA_HAL(
- 	    outb(0xfac, 0x02);
-     }
- 
-+    /* Reset tagfifo*/ 
-+	if (pMga->is_G200ER) 
-+    {
-+        CARD32 ulMemCtl = INREG(MGAREG_MEMCTL);
-+        CARD8  ucSeq1;
-+
-+        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Reset tagfifo\n");
-+        /* Screen off */
-+    	OUTREG8(MGAREG_SEQ_INDEX, 0x01);	/* Select SEQ1 */
-+	    ucSeq1 = INREG8(MGAREG_SEQ_DATA) | 0x20;
-+    	OUTREG8(MGAREG_SEQ_DATA, ucSeq1);
-+
-+        /* Reset tagfifo */
-+        OUTREG(MGAREG_MEMCTL, ulMemCtl | 0x002000000);
-+        usleep(1000); /* wait 1ms */
-+        OUTREG(MGAREG_MEMCTL, ulMemCtl & ~0x002000000);
-+
-+        /* Screen on */
-+    	OUTREG8(MGAREG_SEQ_DATA, ucSeq1 & ~0x20);
-+
-+    }
-+
-     /* 
-      This function optimize the Priority Request control
-      Higher HiPriLvl will reduce drawing performance
-diff --git a/src/mga_reg.h b/src/mga_reg.h
-index 5a37db6..ae0fe8c 100644
---- a/src/mga_reg.h
-+++ b/src/mga_reg.h
-@@ -119,6 +119,9 @@
- #define MGAREG_WACCEPTSEQ       0x1dd4
- #define MGAREG_WMISC            0x1e70
- 
-+
-+#define MGAREG_MEMCTL           0x2E08
-+
- /* OPMODE register additives */
- 
- #define MGAOPM_DMA_GENERAL	(0x00 << 2)
---
-cgit v0.9.0.2-2-gbebe
-From ae90c47503bc1015a50e7ea6d22ec10e5e0d4113 Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Tue, 13 Sep 2011 21:01:57 +0000
-Subject: Nothing uses clientlx.c, so delete it.
-
-Adam Jackson wrote:
-
-	Hey, so, remember back in the dark ages when dualhead was this
-	insanely wild differentiating feature?  Matrox thought it was so
-	special, in fact, that they hid most of the implementation of it
-	(and a bunch of other stuff) in a binary-only blob called the
-	HALlib.  As you'd expect it was pretty much a cut-and-paste of
-	the relevant Windows code, and then some open glue to keep it
-	working; clientlx.c is that glue.
-
-	I guess the theory was that if you don't tell people which
-	registers to duplicate to implement a second pipe in their own
-	hardware, they won't figure it out?  A pretty eyeroll-worthy
-	idea even at the time, and definitely not something we should be
-	condoning anymore.
-
-	Kill it with fire ...
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 17211bb..44417de 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -32,7 +32,6 @@ mga_drv_la_LIBADD = $(noinst_LTLIBRARIES)
- mga_drv_la_SOURCES = \
-          binding.h \
-          client.h \
--         clientlx.c \
-          mga_arc.c \
-          mga_bios.c \
-          mga_common.h \
-diff --git a/src/binding.h b/src/binding.h
-index 57e9b92..616aed7 100644
---- a/src/binding.h
-+++ b/src/binding.h
-@@ -37,37 +37,6 @@ typedef char            CHAR;
- typedef unsigned char   UCHAR;
- typedef unsigned char   FAR*LPUCHAR;
- 
--typedef struct TAGCLIENTTABLE{
--    ULONG (DECL *ClientReadConfigSpaceByte       )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadConfigSpaceDword      )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteConfigSpaceByte      )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteConfigSpaceDword     )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenRegisterBase          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseRegisterBase         )(LPVOID );                        
--    ULONG (DECL *ClientReadRegisterByte          )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadRegisterDword         )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteRegisterByte         )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteRegisterDword        )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenMemoryBase            )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseMemoryBase           )(LPVOID );                        
--    ULONG (DECL *ClientReadMemoryByte            )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadMemoryDword           )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteMemoryByte           )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteMemoryDword          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientOpenSystemDevice          )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientCloseSystemDevice         )(LPVOID );                        
--    ULONG (DECL *ClientReadSystemDeviceByte      )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientReadSystemDeviceDword     )(LPVOID , ULONG, LPVOID );        
--    ULONG (DECL *ClientWriteSystemDeviceByte     )(LPVOID , ULONG, UCHAR);          
--    ULONG (DECL *ClientWriteSystemDeviceDword    )(LPVOID , ULONG, ULONG);          
--    ULONG (DECL *ClientWait                      )(LPVOID , ULONG);                 
--    ULONG (DECL *ClientGetBiosInfo               ) (LPVOID, LPVOID, LPVOID);        
--    ULONG (DECL *ClientReadDDCEdid               ) (LPVOID, LPVOID, ULONG);         
--#ifdef DEBUG
--    ULONG (DECL *ClientDebug                     ) (LPVOID, ULONG, LPVOID, ULONG, LPVOID);
--#endif
--} CLIENTTABLE, FAR *LPCLIENTTABLE;
--
- #endif /* _INTERNALBINDING */
- 
- /***************************************************************************************************
-diff --git a/src/client.h b/src/client.h
-index 8348b64..59aca5d 100644
---- a/src/client.h
-+++ b/src/client.h
-@@ -17,46 +17,6 @@ typedef struct TAGCLIENTDATA
-     pointer        pMga;
- } CLIENTDATA, *LPCLIENTDATA;
- 
--extern ULONG DECL ClientReadConfigSpaceByte(LPBOARDHANDLE, ULONG, LPUCHAR);
--extern ULONG DECL ClientReadConfigSpaceDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteConfigSpaceByte (LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteConfigSpaceDword(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenRegisterBase(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseRegisterBase (LPBOARDHANDLE );
--extern ULONG DECL ClientReadRegisterByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadRegisterDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteRegisterByte (LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteRegisterDword(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenMemoryBase(LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseMemoryBase(LPBOARDHANDLE );
--extern ULONG DECL ClientReadMemoryByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadMemoryDword (LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteMemoryByte(LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteMemoryDword (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientOpenSystemDevice (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientCloseSystemDevice (LPBOARDHANDLE );
--extern ULONG DECL ClientReadSystemDeviceByte(LPBOARDHANDLE , ULONG, LPUCHAR );
--extern ULONG DECL ClientReadSystemDeviceDword(LPBOARDHANDLE , ULONG, LPULONG );
--extern ULONG DECL ClientWriteSystemDeviceByte(LPBOARDHANDLE , ULONG, UCHAR);
--extern ULONG DECL ClientWriteSystemDeviceDword (LPBOARDHANDLE , ULONG, ULONG);
--extern ULONG DECL ClientWait (LPBOARDHANDLE , ULONG);
--extern ULONG DECL ClientLocateFirstTwisterOfQuad(ULONG);
--extern ULONG DECL ClientSearchDevNode(ULONG, UCHAR, UCHAR);
--extern ULONG DECL ClientGetBiosInfo(LPBOARDHANDLE, LPUCHAR, LPULONG );
--extern ULONG DECL ClientDebug (LPBOARDHANDLE , ULONG, LPUCHAR, ULONG, LPVOID);
--extern ULONG DECL ClientCallBiosInt10(LPBOARDHANDLE, LPBIOSREGS);
--extern ULONG DECL ClientReadDDCEdid(LPBOARDHANDLE, LPUCHAR, ULONG);
--extern ULONG DECL ClientCustomCall(LPBOARDHANDLE, ULONG, LPVOID, LPVOID);
--extern ULONG DECL ClientApplyEpromPatch(LPBOARDHANDLE);
--extern ULONG DECL ClientDetectHostInterface(LPBOARDHANDLE, LPULONG);
--extern ULONG DECL ClientHSLPatchFunction(LPBOARDHANDLE, ULONG, ULONG, LPUCHAR);
--extern ULONG DECL InitClientFunctions(LPBOARDHANDLE, ULONG);
--extern ULONG DECL ClientInitTimeBase(LPBOARDHANDLE);
--extern ULONG DECL ClientOpenDMABase(LPBOARDHANDLE, ULONG, ULONG);
--extern ULONG DECL ClientReadDMAByte(LPBOARDHANDLE, ULONG, LPUCHAR);
--extern ULONG DECL ClientReadBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG, LPUCHAR);
--extern ULONG DECL ClientWriteBIOS(LPBOARDHANDLE, ULONG, ULONG, ULONG, ULONG);
--
- #if defined(__cplusplus)
-     }
- #endif
-diff --git a/src/clientlx.c b/src/clientlx.c
-deleted file mode 100644
-index 9c6ab50..0000000
---- a/src/clientlx.c
-+++ b/dev/null
-@@ -1,848 +0,0 @@
--/******************************************************************************\
--
--    clientlx.c
--
--    Copyright © 1997, Matrox Graphics Inc.
--
--    All Rights Reserved.
--
--\******************************************************************************/
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
--#include "xf86_OSproc.h"
--#include "xf86Pci.h"
--#include "client.h"
--#include "mga.h"
--
--CLIENTTABLE ClientFunctions = {
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadConfigSpaceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadConfigSpaceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteConfigSpaceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteConfigSpaceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenRegisterBase,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseRegisterBase,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadRegisterByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadRegisterDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteRegisterByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteRegisterDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenMemoryBase,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseMemoryBase,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadMemoryByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadMemoryDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteMemoryByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteMemoryDword,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientOpenSystemDevice,
--    (ULONG (DECL *)(LPVOID))                 ClientCloseSystemDevice,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadSystemDeviceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,LPVOID))    ClientReadSystemDeviceDword,
--    (ULONG (DECL *)(LPVOID,ULONG,UCHAR))     ClientWriteSystemDeviceByte,
--    (ULONG (DECL *)(LPVOID,ULONG,ULONG))     ClientWriteSystemDeviceDword,
--    (ULONG (DECL *)(LPVOID,ULONG))           ClientWait,
--    (ULONG (DECL *)(LPVOID,LPVOID,LPVOID))   ClientGetBiosInfo,
--    (ULONG (DECL *)(LPVOID,LPVOID,ULONG))    ClientReadDDCEdid
--};
--
--/******************************************************************************\
--
--    Function      : ClientReadConfigSpaceByte
--
--    Description   : Read a Byte from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specifib board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *pucByte | pointer to a byte that will receive
--                    the data
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientReadConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_read_u8(pMga->PciInfo, pucByte, ulOffset);
--#else
--    *pucByte = pciReadByte(pMga->PciTag,ulOffset);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadConfigSpaceDword
--
--    Description   : Read a Dword from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset  | Offset of the Byte to be read.
--                    ULONG *pulDword | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_read_u32(pMga->PciInfo, (uint32_t *) pulDword, ulOffset);
--#else
--    *pulDword = pciReadLong(pMga->PciTag,ulOffset);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteConfigSpaceByte
--
--    Description   : Write a Byte from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | Byte to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteConfigSpaceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_write_u8(pMga->PciInfo, ucByte, ulOffset);
--#else
--    pciWriteByte(pMga->PciTag,ulOffset, ucByte);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteConfigSpaceDword
--
--    Description   : Write a Dword from the configuration space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword containing the data to  be written
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteConfigSpaceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--#ifdef XSERVER_LIBPCIACCESS
--    pci_device_cfg_write_u32(pMga->PciInfo, (uint32_t) ulDword, ulOffset);
--#else
--    pciWriteLong(pMga->PciTag,ulOffset, ulDword);
--#endif
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenRegisterBase
--
--    Description   : Map the register base for future call to ClientReadRegisterX
--                    and ClientWriteRegisterX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenRegisterBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr)pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--    pClientStruct->ulRegisterBase = (ULONG) pMga->IOBase;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseRegisterBase
--
--    Description   : Unmap the register base address and free resources needed
--                    to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseRegisterBase(LPBOARDHANDLE pBoard)
--{
--    ASSERT_HANDLER(pBoard);
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadRegisterByte
--
--    Description   : Read a byte from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure.
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *pucByte | pointer to the byte that will receive
--                    the data.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                             UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pucByte = *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadRegisterDword
--
--    Description   : Read a Dword from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset  | Offset of the Byte to be read.
--                    ULONG *pulDword | pointer to the dword that will receive
--                    the data.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientReadRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                              ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pulDword = *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteRegisterByte
--
--    Description   : Write a Byte from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | CHAR to receive the data.
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteRegisterByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                              UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((UCHAR *)(pClientStruct->ulRegisterBase + ulOffset)) = ucByte;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteRegisterSpaceDword
--
--    Description   : Write a Dword from the Register space.
--
--    I/O Desc.     : LPBOARDHANDLE *| pBoard  | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to receive the data
--
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteRegisterDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                               ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((ULONG *)(pClientStruct->ulRegisterBase + ulOffset)) = ulDword;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenMemoryBase
--
--    Description   : Map the Memory base for future call to ClientReadMemoryX
--                    and ClientWriteMemoryX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenMemoryBase(LPBOARDHANDLE pBoard, ULONG ulAddress, ULONG ulSize)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--    MGAPtr pMga = (MGAPtr) pClientStruct->pMga;
--
--    ASSERT_HANDLER(pBoard);
--
--    pClientStruct->ulFrameBufferBase = (ULONG) pMga->FbBase;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseMemoryBase
--
--    Description   : Unmap the Frame Buffer aperture and free resources
--                    needed to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseMemoryBase(LPBOARDHANDLE pBoard)
--{
--    ASSERT_HANDLER(pBoard);
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadMemoryByte
--
--    Description   : Read a Byte from the Frame Buffer space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR *ucByte  | CHAR to receive the data
--
--    Return Val : ULONG
--\******************************************************************************/
--ULONG ClientReadMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR *pucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pucByte = *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadMemoryDword
--
--    Description   : Read a Dword from the Frame Buffer Space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG *uDword  | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                            ULONG *pulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *pulDword = *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset));
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--   Function      : ClientWriteMemoryByte
--
--   Description   : Write a Byte from the Frame Buffer space.
--
--   I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                   containing all the information about a specific board.
--                   ULONG ulOffset | Offset of the Byte to be read.
--                   UCHAR ucByte   | CHAR to receive the data
--
--   Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteMemoryByte(LPBOARDHANDLE pBoard, ULONG ulOffset, UCHAR ucByte)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((UCHAR *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ucByte;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteMemoryDword
--
--    Description   : Write a Dword from the Frame Buffer space.
--
--    I/O desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteMemoryDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                            ULONG ulDword)
--{
--    LPCLIENTDATA pClientStruct = MGAGetClientPointer(pBoard);
--
--    ASSERT_HANDLER(pBoard);
--
--    *((ULONG *)(pClientStruct->ulFrameBufferBase + ulOffset)) = ulDword;
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientOpenSystemDevice
--
--    Description   : Map a System device aperture for future call to
--                    ClientReadSystemDeviceX and ClientWriteSystemDeviceX.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulAddress | Physical address of the Register aperture
--                    ULONG ulSize    | Size in Byte of the Register Aperture
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientOpenSystemDevice(LPBOARDHANDLE pBoard, ULONG ulAddress,
--                                    ULONG ulSize)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCloseSystemDevice
--
--    Description   : Unmap the System Device aperture address and free
--                    resources needed to address it.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCloseSystemDevice (LPBOARDHANDLE pBoard)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadSystemDeviceByte
--
--    Description   : Read a Byte from the device Space.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG pucByte  | Byte to read the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                 UCHAR *pucByte)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadSystemDeviceDword
--
--    Description   : Read a Dword from the Frame Buffer Space
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG ulDword  | Dword to Read the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  ULONG *pulDword)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteSystemByte
--
--    Description   : Write a Byte from the System Device Aperture
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    UCHAR ucByte   | Byte to receive the data
--    Return Val : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteSystemDeviceByte(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                  UCHAR ucByte)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWriteSystemDword
--
--    Description   : Write a Dword from the System Device Aperture.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard     | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulOffset | Offset of the Byte to be read.
--                    ULONG uDword   | Dword to receive the data
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWriteSystemDeviceDword(LPBOARDHANDLE pBoard, ULONG ulOffset,
--                                   ULONG ulDword)
--{
--    return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientWait
--
--    Description   : Wait for ulDelayus micro-seconds.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    ULONG ulDelayus | Delay in uSec
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientWait (LPBOARDHANDLE pBoard, ULONG ulDelayus)
--{
--    int i;
--    ULONG ulTmp;
--
--    ASSERT_HANDLER(pBoard);
--
--    for(i = 0; i < ulDelayus * 3; i++)
--    {
--        ClientReadRegisterDword(pBoard,0x1e14,&ulTmp);
--    }
--
--    return 0;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientGetBiosInfo
--
--    Description   : This function will be call if no PINS can be found
--                    in physical EEPROM.
--
--    I/O Desc.     :  LPBOARDHANDLE pBoard | Handle to the board structure
--                     containing all the information about a specific board.
--                     LPUCHAR    | Buffer where we copy bios pins.
--                     ULONG      | Bios version
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientGetBiosInfo(LPBOARDHANDLE pBoard, LPUCHAR pucPins,LPULONG pulBIOSVersion)
--{
--    Bool bNotFound = TRUE;
--    UCHAR ucBIOS[32768];
--    UCHAR ucTmpByte;
--    UCHAR ucCheckSum;
--    UCHAR ucPinsIndex;
--    UCHAR ucPinsSize;
--    ULONG ulTmpDword;
--    ULONG ulPinsOffset = 0;
--    ULONG ulPCIINFOffset;
--
--    ASSERT_HANDLER(pBoard);
--
--    xf86ReadBIOS(0xc0000,0,ucBIOS,32768);
--
--    if(ucBIOS[0] == 0x55)
--    {
--        if(ucBIOS[1] == 0xaa)
--        {
--            while((ulPinsOffset < 0x10000) && bNotFound)
--            {
--                ulTmpDword = *(ULONG *)(ucBIOS + ulPinsOffset);
--                ucPinsSize = (UCHAR) (ulTmpDword >> 16);
--                if(((ulTmpDword & 0x0000ffff) == 0x0000412e)
--                    && ucPinsSize <= 128)
--                {
--                    ucCheckSum = 0;
--                    for(ucPinsIndex = 0;ucPinsIndex < ucPinsSize; ucPinsIndex++)
--                    {
--                        pucPins[ucPinsIndex] = ucBIOS[ulPinsOffset +
--                                               ucPinsIndex];
--                        ucCheckSum += pucPins[ucPinsIndex];
--                    }
--                    if(ucCheckSum == 0)
--                    {
--                        bNotFound = FALSE;
--                    }
--                }
--                ulPinsOffset++;
--            }
--
--            if(bNotFound)
--            {
--                return 1;
--            }
--
--            ulPCIINFOffset = *(ULONG *)(ucBIOS + 0x18);
--            ulPCIINFOffset &= 0x0000ffff;
--            ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset);
--
--            if(ulTmpDword == 0x52494350)  /* "PCIR" */
--            {
--                ulPCIINFOffset += 0x12;
--                ulTmpDword = *(ULONG *)(ucBIOS + ulPCIINFOffset);
--                *pulBIOSVersion = ((ULONG) ((ulTmpDword & 0xf0) >> 4) << 16) |
--                                  ((ulTmpDword &0xf) << 12) | ((ulTmpDword >> 8)
--                                  & 0xff);
--            }
--            else
--            {
--                return 1;
--            }
--        }
--        else
--        {
--           return 1;
--        }
--    }
--    else
--    {
--        return 1;
--    }
--
--    if(!*pulBIOSVersion)
--    {
--        ucTmpByte = ucBIOS[5];
--        *pulBIOSVersion = ((ULONG) (ucTmpByte >> 4) << 16) | ((ULONG)
--                          (ucTmpByte & 0x0f) << 12);
--    }
--
--    return 0;
--}
--
--/******************************************************************************\
--
--    Function      : ClientCallBiosInt10
--
--    Description   : Call the BIOS Int10h with specified parameters.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCallBiosInt10(LPBOARDHANDLE pBoard, LPBIOSREGS pBiosRegs)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientReadDDCEdid
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientReadDDCEdid(LPBOARDHANDLE pBoard, LPUCHAR pEdid,
--                               ULONG ulMonitorIndex)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientCustomCall
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientCustomCall(LPBOARDHANDLE pBoard, ULONG ulServiceNumber,
--                       LPVOID pInData, LPVOID pOutData)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientApplyEpromPatch
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientApplyEpromPatch(LPBOARDHANDLE pBoard)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
--
--/******************************************************************************\
--
--    Function      : ClientDetectHostInterface
--
--    Description   : Not implemented.
--
--    I/O Desc.     : LPBOARDHANDLE pBoard | Handle to the board structure
--                    containing all the information about a specific board.
--                    LPBIOSREGS pBiosRegs | Pointor to the Bios register
--                    structure.
--
--    Return Val    : ULONG
--
--\******************************************************************************/
--ULONG ClientDetectHostInterface(LPBOARDHANDLE pBoard, LPULONG pulData)
--{
--   ASSERT_HANDLER(pBoard);
--
--   return 1;
--}
--
---
-cgit v0.9.0.2-2-gbebe
-From 94bbeb132c7eda912d1b402a1a91ca7cbbf5e6a1 Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Thu, 15 Sep 2011 15:29:11 +0000
-Subject: Delete support for MGA's proprietary HAL: unifdef USEMGAHAL.
-
-This patch produced with:
-	for f in `git grep -Fwl USEMGAHAL`; do
-		unifdef -B -UUSEMGAHAL $f | sponge $f
-	done
-
-Adam Jackson wrote:
-
-	Hey, so, remember back in the dark ages when dualhead was this
-	insanely wild differentiating feature?  Matrox thought it was so
-	special, in fact, that they hid most of the implementation of it
-	(and a bunch of other stuff) in a binary-only blob called the
-	HALlib.  As you'd expect it was pretty much a cut-and-paste of
-	the relevant Windows code, and then some open glue to keep it
-	working; clientlx.c is that glue.
-
-	I guess the theory was that if you don't tell people which
-	registers to duplicate to implement a second pipe in their own
-	hardware, they won't figure it out?  A pretty eyeroll-worthy
-	idea even at the time, and definitely not something we should be
-	condoning anymore.
-
-	Kill it with fire, but while you're at it, untangle the hideous
-	mess of MGA_HAL() macros too.
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Cc: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/mga.h b/src/mga.h
-index c520e86..fced6aa 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -42,10 +42,6 @@
- #include "mga_dri.h"
- #endif
- 
--#ifdef USEMGAHAL
--#include "client.h"
--#endif
--
- typedef enum {
-     OPTION_SW_CURSOR,
-     OPTION_HW_CURSOR,
-@@ -329,11 +325,6 @@ typedef enum {
- 
- typedef struct {
-     int			lastInstance;
--#ifdef USEMGAHAL
--    LPCLIENTDATA	pClientStruct;
--    LPBOARDHANDLE	pBoard;
--    LPMGAHWINFO		pMgaHwInfo;
--#endif
-     int			refCount;
-     CARD32		masterFbAddress;
-     long		masterFbMapSize;
-@@ -459,12 +450,6 @@ struct mga_device_attributes {
- };
- 
- typedef struct {
--#ifdef USEMGAHAL
--    LPCLIENTDATA	pClientStruct;
--    LPBOARDHANDLE	pBoard;
--    LPMGAMODEINFO	pMgaModeInfo;
--    LPMGAHWINFO		pMgaHwInfo;
--#endif
-     EntityInfoPtr	pEnt;
-     struct mga_bios_values bios;
-     CARD8               BiosOutputMode;
-@@ -650,9 +635,6 @@ typedef struct {
-     MGAPaletteInfo	palinfo[256];  /* G400 hardware bug workaround */
-     FBLinearPtr		LinearScratch;
-     Bool                softbooted;
--#ifdef USEMGAHAL
--    Bool                HALLoaded;
--#endif
-     OptionInfoPtr	Options;
- 
-     /* Exa */
-@@ -810,26 +792,6 @@ void MGAG200SESaveMode(ScrnInfoPtr, vgaRegPtr);
- void MGAG200SERestoreMode(ScrnInfoPtr, vgaRegPtr);
- void MGAG200SEHWProtect(ScrnInfoPtr, Bool);
- 
--#ifdef USEMGAHAL
--/************ ESC Call Definition ***************/
--typedef struct {
--    char *function;
--    void (*funcptr)(ScrnInfoPtr pScrn, unsigned long *param, char *out, DisplayModePtr pMode);
--} MGAEscFuncRec, *MGAEscFuncPtr;
--
--typedef struct {
--    char function[32];
--    unsigned long parameters[32];
--} EscCmdStruct;
--
--extern LPMGAMODEINFO pMgaModeInfo[2];
--extern MGAMODEINFO   TmpMgaModeInfo[2];
--
--extern void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayModePtr pMode);
--void MGAFillDisplayModeStruct(DisplayModePtr pMode, LPMGAMODEINFO pModeInfo);
--/************************************************/
--#endif
--
- static __inline__ void
- MGA_MARK_SYNC(MGAPtr pMga, ScrnInfoPtr pScrn)
- {
-diff --git a/src/mga_dacG.c b/src/mga_dacG.c
-index fca1031..b489dea 100644
---- a/src/mga_dacG.c
-+++ b/src/mga_dacG.c
-@@ -1001,9 +1001,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 		break;
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
--#ifdef USEMGAHAL
--	       MGA_HAL(break;);
--#endif
- 	       if (MGAISGx50(pMga))
- 		       break;
- 
-@@ -1046,9 +1043,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 		break;
- 	case PCI_CHIP_MGAG200_SE_A_PCI:
- 	case PCI_CHIP_MGAG200_SE_B_PCI:
--#ifdef USEMGAHAL
--		MGA_HAL(break;);
--#endif
-         pReg->DacRegs[ MGA1064_VREF_CTL ] = 0x03;
-                 pReg->DacRegs[MGA1064_PIX_CLK_CTL] =
-                     MGA1064_PIX_CLK_CTL_SEL_PLL;
-@@ -1097,9 +1091,6 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	case PCI_CHIP_MGAG200:
- 	case PCI_CHIP_MGAG200_PCI:
- 	default:
--#ifdef USEMGAHAL
--		MGA_HAL(break;);
--#endif
- 		if(pMga->OverclockMem) {
-                      /* 143 Mhz */
- 		    pReg->DacRegs[ MGA1064_SYS_PLL_M ] = 0x06;
-@@ -1496,21 +1487,6 @@ MGA_NOT_HAL(
-                MGAG200EHPIXPLLSET(pScrn, mgaReg);
-            }
- );	/* MGA_NOT_HAL */
--#ifdef USEMGAHAL
--          /* 
--	   * Work around another bug in HALlib: it doesn't restore the
--	   * DAC width register correctly. MATROX: hint, hint.
--	   */
--           MGA_HAL(	 
--    	       outMGAdac(MGA1064_MUL_CTL,mgaReg->DacRegs[0]);
--  	       outMGAdac(MGA1064_MISC_CTL,mgaReg->DacRegs[1]); 
--	       if (!MGAISGx50(pMga)) {
--		   outMGAdac(MGA1064_PIX_PLLC_M,mgaReg->DacRegs[2]);
--		   outMGAdac(MGA1064_PIX_PLLC_N,mgaReg->DacRegs[3]);
--		   outMGAdac(MGA1064_PIX_PLLC_P,mgaReg->DacRegs[4]);
--	       } 
--	       ); 
--#endif
- 	   /* restore CRTCEXT regs */
-            for (i = 0; i < 6; i++)
- 	      OUTREG16(MGAREG_CRTCEXT_INDEX, (mgaReg->ExtVga[i] << 8) | i);
-@@ -1650,24 +1626,6 @@ MGAGSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, MGARegPtr mgaReg,
- 	 * DAC width register correctly.
- 	 */
- 
--#ifdef USEMGAHAL
--	/* 
--	 * Work around another bug in HALlib: it doesn't restore the
--	 * DAC width register correctly (s.o.). MATROX: hint, hint.
--	 */
--  	MGA_HAL(
--  	    if (mgaReg->DacRegs == NULL) {
--  		mgaReg->DacRegs = xnfcalloc(MGAISGx50(pMga) ? 2 : 5, 1);
--  	    }
--    	    mgaReg->DacRegs[0] = inMGAdac(MGA1064_MUL_CTL);
--  	    mgaReg->DacRegs[1] = inMGAdac(MGA1064_MISC_CTL);
--	    if (!MGAISGx50(pMga)) {
--		mgaReg->DacRegs[2] = inMGAdac(MGA1064_PIX_PLLC_M);
--		mgaReg->DacRegs[3] = inMGAdac(MGA1064_PIX_PLLC_N);
--		mgaReg->DacRegs[4] = inMGAdac(MGA1064_PIX_PLLC_P);
--	    } 
--  	);
--#endif
- 	MGA_NOT_HAL(
- 	/*
- 	 * The port I/O code necessary to read in the extended registers.
-@@ -1793,12 +1751,6 @@ MGAGSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
-     x += 64;
-     y += 64;
- 
--#ifdef USEMGAHAL
--    MGA_HAL(
--	    x += pMga->HALGranularityOffX;
--	    y += pMga->HALGranularityOffY;
--    );
--#endif
-     /* cursor update must never occurs during a retrace period (pp 4-160) */
-     while( INREG( MGAREG_Status ) & 0x08 );
-     
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 58a1390..d770031 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -1509,10 +1509,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     int flags24;
-     MGAEntPtr pMgaEnt = NULL;
-     Bool Default;
--#ifdef USEMGAHAL
--    ULONG status;
--    CARD8 MiscCtlReg;
--#endif
- 
-     /*
-      * Note: This function is only called once at server startup, and
-@@ -1657,37 +1653,9 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     pMga->is_G200EH = (pMga->Chipset == PCI_CHIP_MGAG200_EH_PCI);
-     pMga->is_G200ER = (pMga->Chipset == PCI_CHIP_MGAG200_ER_PCI);
- 
--#ifdef USEMGAHAL
--    if (pMga->chip_attribs->HAL_chipset) {
--	Bool loadHal = TRUE;
--	
--	from = X_DEFAULT;
--	if (xf86FindOption(pMga->device->options, "NoHal")) {
--	    loadHal = !xf86SetBoolOption(pMga->device->options,
--					 "NoHal", !loadHal);
--	    from = X_CONFIG;
--	} else if (xf86FindOption(pMga->device->options, "Hal")) {
--	    loadHal = xf86SetBoolOption(pMga->device->options,
--					"Hal", loadHal);
--	    from = X_CONFIG;
--	}
--        if (loadHal && xf86LoadSubModule(pScrn, "mga_hal")) {
--	  xf86DrvMsg(pScrn->scrnIndex, from,"Matrox HAL module used\n");
--	  pMga->HALLoaded = TRUE;
--	} else {
--	  xf86DrvMsg(pScrn->scrnIndex, from, "Matrox HAL module not loaded "
--		     "- using builtin mode setup instead\n");
--	  pMga->HALLoaded = FALSE;
--	}
--    }
--#endif
--
-     pMga->DualHeadEnabled = FALSE;
-     if (xf86IsEntityShared(pScrn->entityList[0])) {/* dual-head mode requested*/
- 	if (
--#ifdef USEMGAHAL
--	    pMga->HALLoaded ||
--#endif
- 	    !MGA_DH_NEEDS_HAL(pMga)) {
- 	    pMga->DualHeadEnabled = TRUE;
- 	} else if (xf86IsPrimInitDone(pScrn->entityList[0])) {
-@@ -2088,30 +2056,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-             xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                 "\"Merged Framebuffer\" mode only supported on G450 and G550 boards.\n");
-         } else { 
--#ifdef USEMGAHAL
--            if(pMga->HALLoaded)
--            { 
--                pMga->MergedFB = TRUE;
--                xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--                        "Using \"Merged Framebuffer\" mode.\n");
--                /*
--                * a few options that won't work well together
--                */
--                if(pMga->HWCursor) /*Should we give the choice? */
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Hardware Cursor disabled.\n");
--                pMga->HWCursor = FALSE; 
--                if(pMga->ShadowFB) 
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Shadow Framebuffer disabled.\n");
--                pMga->ShadowFB = FALSE;
--                if(pMga->FBDev) 
--                    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        " -- Framebuffer device disabled.\n");
--                pMga->FBDev = FALSE;
--            } /* MGA_HAL */
--            else
--#endif
-             { 
-                 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                     "HALLib not loaded! NOT using \"Merged Framebuffer\" mode.\n");
-@@ -2404,10 +2348,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     clockRanges->clockIndex = -1;		/* programmable */
-     clockRanges->interlaceAllowed = TRUE;
-     clockRanges->doubleScanAllowed = TRUE;
--#ifdef USEMGAHAL
--    MGA_HAL(clockRanges->interlaceAllowed = FALSE);
--    MGA_HAL(clockRanges->doubleScanAllowed = FALSE);
--#endif
-     if (pMga->SecondCrtc == TRUE) 
- 	clockRanges->interlaceAllowed = FALSE;
- 
-@@ -2513,80 +2453,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	MGAFreeRec(pScrn);
- 	return FALSE;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--
--    if(pMga->SecondCrtc == FALSE) {
--	
--        pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--        pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--        pMga->pClientStruct->pMga = (MGAPtr) pMga;
--
--        MGAMapMem(pScrn);
--	/* 
--	 * For some reason the MGAOPM_DMA_BLIT bit needs to be set
--	 * on G200 before opening the HALlib. I don't know why.
--	 * MATROX: hint, hint.
--	 */
--	/*if (pMga->Chipset == PCI_CHIP_MGAG200 ||
--	  pMga->Chipset == PCI_CHIP_MGAG200_PCI) */{
--	    CARD32 opmode;
--	    opmode = INREG(MGAREG_OPMODE);
--	    OUTREG(MGAREG_OPMODE,  MGAOPM_DMA_BLIT | opmode);
--	}
--	/* wrapping OpenLibrary to fix broken registers. MATROX: hint, hint. */
--	MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--        MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--        MGAUnmapMem(pScrn);
--        pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--        MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--
--        /* copy the board handles */
--        if (pMga->DualHeadEnabled) {
--            pMgaEnt->pClientStruct = pMga->pClientStruct;
--            pMgaEnt->pBoard = pMga->pBoard;
--            pMgaEnt->pMgaHwInfo = pMga->pMgaHwInfo;
--        }
--
--    } else { /* Second CRTC && entity is shared */ 
--        pMga->pBoard = pMgaEnt->pBoard;
--        pMga->pClientStruct = pMgaEnt->pClientStruct;
--        pMga->pMgaHwInfo = pMgaEnt->pMgaHwInfo;
--
--    }
--
--    MGAFillModeInfoStruct(pScrn,NULL);
--    /* Fields usually handled by MGAFillModeInfoStruct, but are unavailable
--     * because no mode is given
--     */
--    pMga->pMgaModeInfo->ulDispWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDispHeight = pScrn->virtualY;
--
--    
--    if (ISDIGITAL1(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "Digital screen detected on first head.\n");
--    if (ISTV1(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "TV detected on first head.\n");
--    if (ISDIGITAL2(pMga)) 
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "Digital screen detected on second head.\n");
--    if (ISTV2(pMga))
--        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--                    "TV detected on second head.\n");
--
--    
--    if((status = MGAValidateMode(pMga->pBoard,pMga->pMgaModeInfo)) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGAValidateMode from HALlib found the mode to be invalid.\n"
--		   "\tError: 0x%lx\n", status);
--        return FALSE;
--    }
--    pScrn->displayWidth = pMga->pMgaModeInfo->ulFBPitch;
--    );	/* MGA_HAL */
--#endif
- 
-     /* If the Device section explicitly set HasSDRAM, don't bother checking.
-      */
-@@ -2620,9 +2486,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-      * driver and if the driver doesn't provide code to set them.  They
-      * are not pre-initialised at all.
-      */
--#ifdef USEMGAHAL
--    MGA_HAL(xf86SetCrtcForModes(pScrn, 0));
--#endif
-     MGA_NOT_HAL(xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V));
- 
-     /* Set the current mode to the first in the list */
-@@ -2790,46 +2653,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     };
- 
-     
--#ifdef USEMGAHAL
--    MGA_HAL(
--    /* Close the library after preinit */
--    /* This needs to only happen after this board has completed preinit
--     * both times
--     */
--
--      if(pMga->DualHeadEnabled) {
--	  /* Entity is shared make sure refcount == 2 */
--	  /* If ref count is 2 then reset it to 0 */
--	  if(pMgaEnt->refCount == 2) {
--	      /* Both boards have done there initialization */
--	      MGACloseLibrary(pMga->pBoard);
--
--	      if (pMga->pBoard)
--	        xfree(pMga->pBoard);
--	      if (pMga->pClientStruct)
--	        xfree(pMga->pClientStruct);
--	      if (pMga->pMgaModeInfo)
--	        xfree(pMga->pMgaModeInfo);
--	      if (pMga->pMgaHwInfo)
--	        xfree(pMga->pMgaHwInfo);
--	      pMgaEnt->refCount = 0;
--	  }
--      } else {
--	  MGACloseLibrary(pMga->pBoard);
--
--	  if (pMga->pBoard)
--	    xfree(pMga->pBoard);
--	  if (pMga->pClientStruct)
--	    xfree(pMga->pClientStruct);
--	  if (pMga->pMgaModeInfo)
--	    xfree(pMga->pMgaModeInfo);
--	  if (pMga->pMgaHwInfo)
--	    xfree(pMga->pMgaHwInfo);
--      }
--
--    );	/* MGA_HAL */
--#endif
--
-     xf86SetPrimInitDone(pScrn->entityList[0]);
-     
-     return TRUE;
-@@ -2995,9 +2818,6 @@ MGASave(ScrnInfoPtr pScrn)
-     MGARegPtr mgaReg = &pMga->SavedReg;
- 
-     if(pMga->SecondCrtc == TRUE) return;
--#ifdef USEMGAHAL
--    MGA_HAL(if (pMga->pBoard != NULL) MGASaveVgaState(pMga->pBoard));
--#endif
- 
-     /* I need to save the registers for the second head also */
-     /* Save the register for 0x80 to 0xa0 */
-@@ -3007,135 +2827,6 @@ MGASave(ScrnInfoPtr pScrn)
-     (*pMga->Save)(pScrn, vgaReg, mgaReg, pMga->Primary);
- }
- 
--#ifdef USEMGAHAL
--/* Convert DisplayModeRec parameters in MGAMODEINFO parameters.
--*  mode parameter optionnal. */
--void
--MGAFillModeInfoStruct(ScrnInfoPtr pScrn, DisplayModePtr mode)
--{
--     const char *s;
--    MGAPtr pMga = MGAPTR(pScrn);
--
--    Bool digital1 = FALSE;
--    Bool digital2 = FALSE;
--    Bool tv1 = FALSE;
--    Bool tv2 = FALSE;
--    Bool swap_head
--      = xf86ReturnOptValBool(pMga->Options, OPTION_SWAPPED_HEAD, FALSE);
--        
--    if(pMga->MergedFB && mode && mode->Private && (mode->PrivSize == 0)) {
--        mode = pMga->SecondCrtc ? 
--             ((MergedDisplayModePtr)mode->Private)->Monitor2
--            : ((MergedDisplayModePtr)mode->Private)->Monitor1;
--    }
--    
--    
--    if (pMga->pMgaHwInfo)
--    {
--	digital1 = ISDIGITAL1(pMga);
--	digital2 = ISDIGITAL2(pMga);
--	tv1 = ISTV1(pMga);
--	tv2 = ISTV2(pMga);
--    }
--
--    /*FIXME: causes segfault elsewhere if not commented*/
--    /*if(!pMga->pMgaModeInfo)*/ pMga->pMgaModeInfo = xalloc(sizeof(MGAMODEINFO));
--    pMga->pMgaModeInfo->flOutput = 0;
--    pMga->pMgaModeInfo->ulDeskWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDeskHeight = pScrn->virtualY;
--    pMga->pMgaModeInfo->ulFBPitch = 0;
--    pMga->pMgaModeInfo->ulBpp = pScrn->bitsPerPixel;
--    pMga->pMgaModeInfo->ulZoom = 1;
--    pMga->pMgaModeInfo->flSignalMode = 0x10;
--
--    /* Set TV standard */
--    if ((s = xf86GetOptValString(pMga->Options, OPTION_TVSTANDARD))) {
--    	if (!xf86NameCmp(s, "PAL")) {
--    		pMga->pMgaModeInfo->flSignalMode = 0x00;
--    		pMga->pMgaModeInfo->ulRefreshRate = 50;
--    		pMga->pMgaModeInfo->ulTVStandard = TV_PAL;
--    	} else {
--    		pMga->pMgaModeInfo->ulRefreshRate = 60;
--    		pMga->pMgaModeInfo->ulTVStandard = TV_NTSC;
--    	}
--    } else {
--    	pMga->pMgaModeInfo->ulRefreshRate = 0;
--    	pMga->pMgaModeInfo->ulTVStandard = TV_NTSC;
--    }
--
--    /* Set Cable Type */
--    if ((s = xf86GetOptValString(pMga->Options, OPTION_CABLETYPE))) {
--    	if (!xf86NameCmp(s, "SCART_RGB")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_RGB;
--    	} else if (!xf86NameCmp(s, "SCART_COMPOSITE")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_COMPOSITE;
--    	} else if (!xf86NameCmp(s, "SCART_TYPE2")) {
--    		pMga->pMgaModeInfo->ulCableType = TV_SCART_TYPE2;
--    	} else {
--    		pMga->pMgaModeInfo->ulCableType = TV_YC_COMPOSITE;
--    	}
--    } else {
--    	pMga->pMgaModeInfo->ulCableType = TV_YC_COMPOSITE;
--    }
--
--    if(mode) {
--        pMga->pMgaModeInfo->ulHorizRate = 0;
--        pMga->pMgaModeInfo->ulDispWidth = mode->HDisplay;
--        pMga->pMgaModeInfo->ulDispHeight = mode->VDisplay;
--        pMga->pMgaModeInfo->ulPixClock = mode->Clock;
--        pMga->pMgaModeInfo->ulHFPorch = mode->HSyncStart - mode->HDisplay;
--        pMga->pMgaModeInfo->ulHSync = mode->HSyncEnd - mode->HSyncStart;
--        pMga->pMgaModeInfo->ulHBPorch = mode->HTotal - mode->HSyncEnd;
--        pMga->pMgaModeInfo->ulVFPorch = mode->VSyncStart - mode->VDisplay;
--        pMga->pMgaModeInfo->ulVSync = mode->VSyncEnd - mode->VSyncStart;
--        pMga->pMgaModeInfo->ulVBPorch = mode->VTotal - mode->VSyncEnd;
--    }
--    /* Use DstOrg directly */
--    /* This is an offset in pixels not memory */
--    pMga->pMgaModeInfo->ulDstOrg = pMga->DstOrg / (pScrn->bitsPerPixel / 8);
--    pMga->pMgaModeInfo->ulDisplayOrg = pMga->DstOrg / (pScrn->bitsPerPixel / 8);
--    pMga->pMgaModeInfo->ulPanXGran = 0;
--    pMga->pMgaModeInfo->ulPanYGran = 0;
--
--    if(pMga->SecondCrtc == TRUE) {
--	pMga->pMgaModeInfo->flOutput = MGAMODEINFO_SECOND_CRTC |
--				       MGAMODEINFO_FORCE_PITCH |
--				       MGAMODEINFO_FORCE_DISPLAYORG;
--	if (digital2) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL2;
--	} else if (tv2) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_TV;
--	} else {
--            if (!swap_head) {
--	      pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG2;
--            } else {
--              pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG1;
--            }
--	}
--    } else { 
--	pMga->pMgaModeInfo->flOutput = MGAMODEINFO_FORCE_PITCH;
--        if (digital1) {
--	    if ((pMga->Chipset == PCI_CHIP_MGAG200) ||
--		(pMga->Chipset == PCI_CHIP_MGAG200_PCI)) {
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_FLATPANEL1;
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL2;
--	    } else {
--		pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_DIGITAL1;
--	    }
--        } else if (tv1) {
--	    pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_TV;
--       	} else {
--            if (!swap_head) {
--	        pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG1;
--            } else {
--                pMga->pMgaModeInfo->flOutput |= MGAMODEINFO_ANALOG2;
--            }
--        }
--    }
--    pMga->pMgaModeInfo->ulFBPitch = pScrn->displayWidth;
--}
--#endif
--
- /*
-  * Initialise a new mode.  This is currently still using the old
-  * "initialise struct, restore/write struct to HW" model.  That could
-@@ -3150,9 +2841,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGARegPtr mgaReg;
- 
--#ifdef USEMGAHAL
--   ULONG status;
--#endif
-     vgaHWUnlock(hwp);
- 
- /*    if(pMga->MergedFB && mode && mode->Private && (mode->PrivSize == 0)) {
-@@ -3175,56 +2863,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     }
-     vgaReg = &hwp->ModeReg;
-     mgaReg = &pMga->ModeReg;
--#ifdef USEMGAHAL
--    MGA_HAL( 
--        MGAFillModeInfoStruct(pScrn,mode);
--                    
--        /* Validate the parameters */
--        if ((status = MGAValidateMode(pMga->pBoard, pMga->pMgaModeInfo)) != 0) {
--            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                    "MGAValidateMode from HALlib found the mode to be invalid.\n"
--                    "\tError: %lx\n", status);
--            return FALSE;
--        }
--
--        /*
--         * Find mode for second head. 
--         */
--        if(pMga->MergedFB) {
--    
--            MGAFillModeInfoStruct(pMga->pScrn2,mode);
--            /* Validates the Video parameters */
--            if ((status = MGAValidateVideoParameters(pMga->pBoard, MGAPTR(pMga->pScrn2)->pMgaModeInfo))
--                != 0) {
--                xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--                        "MGAValidateVideoParameters from HALlib found the mode to be invalid.\n\tError: %lx\n", status);
--                return FALSE;
--            }
--        }
--    );	 /*MGA_HAL */
--    
--#endif
--
--#ifdef USEMGAHAL
--MGA_HAL(
--
--    /*************************** ESC *****************************/
--    TmpMgaModeInfo[0] =  *pMga->pMgaModeInfo;
--	
--    if(pMga->SecondCrtc == TRUE)
--        pMgaModeInfo[1] = pMga->pMgaModeInfo;
--    else
--        pMgaModeInfo[0] = pMga->pMgaModeInfo;
--    
--	TmpMgaModeInfo[0].ulDispWidth = 0;
--    
--    if(!pMga->MergedFB) /* FIXME: Must deal with this once PowerDesk & MergedFB 
--                           compatibility will exist */
--        MGAFillDisplayModeStruct(mode, pMga->pMgaModeInfo);  
--    /*************************************************************/
--
--);	/* MGA_HAL */
--#endif
- 
- #ifdef XF86DRI
-    if (pMga->directRenderingEnabled) {
-@@ -3232,38 +2870,6 @@ MGA_HAL(
-    }
- #endif
- 
--#ifdef USEMGAHAL
--    MGA_HAL(
--    /* Initialize the board */
--    if(MGASetMode(pMga->pBoard,pMga->pMgaModeInfo) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		"MGASetMode returned an error."
--		"  Make sure to validate the mode before.\n");
--	return FALSE;
--    }
--    if(pMga->MergedFB
--       && MGASetMode(pMga->pBoard,MGAPTR(pMga->pScrn2)->pMgaModeInfo) != 0) {
--  	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGASetMode returned an error."
--		   "  Make sure to validate the mode before.\n");
--    }
--
--    );	/* MGA_HAL */
--
--    /* getting around bugs in the HAL lib. MATROX: hint, hint. */
--    MGA_HAL(
--	    if (pMga->chip_attribs->hwcursor_1064) {
--		if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
--		outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, 
--			  pMga->FbCursorOffset >> 10);
--		outMGAdac(MGA1064_CURSOR_BASE_ADR_HI, 
--			  pMga->FbCursorOffset >> 18);
--		outMGAdac(MGA1064_CURSOR_CTL, 0x00);
--	      }
--	    }
--    );	/* MGA_HAL */
--#endif
--
-     MGA_NOT_HAL((*pMga->Restore)(pScrn, vgaReg, mgaReg, FALSE));
- 
-     MGAStormSync(pScrn);
-@@ -3472,14 +3078,6 @@ MGARestore(ScrnInfoPtr pScrn)
- 	vgaHWProtect(pScrn, TRUE);
-     }
-     if (pMga->Primary) {
--#ifdef USEMGAHAL
--	MGA_HAL(
--	    if(pMga->pBoard != NULL) {
--		MGASetVgaMode(pMga->pBoard);
--		MGARestoreVgaState(pMga->pBoard);
--	    }
--	    );	/* MGA_HAL */
--#endif
-         (*pMga->Restore)(pScrn, vgaReg, mgaReg, TRUE);
-     } else {
-         vgaHWRestore(pScrn, vgaReg, VGA_SR_MODE);
-@@ -3588,81 +3186,12 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-        pPriv = xf86GetEntityPrivate(pScrn->entityList[0], MGAEntityIndex);
-        pMgaEnt = pPriv->ptr;
-        pMgaEnt->refCount++;
--#ifdef USEMGAHAL
--       MGA_HAL(
--       if(pMgaEnt->refCount == 1) {
--	   CARD8 MiscCtlReg;
--	  pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--	  pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--	  pMga->pClientStruct->pMga = (MGAPtr) pMga;
--	  
--	  /* wrapping OpenLibrary to fix broken registers. MATROX: hint,hint.*/
--          MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--	  MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	  outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--	  pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--	  MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--
--	  /* Detecting for type of display */
--	  if (pMga->pMgaHwInfo->ulCapsSecondOutput & MGAHWINFOCAPS_OUTPUT_TV) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "TV detected\n");
--	  }
--	  if (pMga->pMgaHwInfo->ulCapsFirstOutput &
--			MGAHWINFOCAPS_OUTPUT_DIGITAL) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
--				"Digital Screen detected\n");
--	  }
--	  if (pMga->pMgaHwInfo->ulCapsSecondOutput &
--			MGAHWINFOCAPS_OUTPUT_DIGITAL) {
--	  	xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
--				"Digital Screen detected\n");
--	  }
--
--	  /* Now copy these to the entitystructure */
--	  pMgaEnt->pClientStruct = pMga->pClientStruct;
--	  pMgaEnt->pBoard = pMga->pBoard;
--	  pMgaEnt->pMgaHwInfo = pMga->pMgaHwInfo;
--       } else { /* Ref count is 2 */
--	  pMga->pClientStruct = pMgaEnt->pClientStruct;
--	  pMga->pBoard = pMgaEnt->pBoard;
--	  pMga->pMgaHwInfo = pMgaEnt->pMgaHwInfo;
--       }
--       );	/* MGA_HAL */
--#endif
-     } else {
--#ifdef USEMGAHAL
--	CARD8 MiscCtlReg;
--
--	  MGA_HAL(
--	  pMga->pBoard = xalloc(sizeof(CLIENTDATA) + MGAGetBOARDHANDLESize());
--	  pMga->pClientStruct = xalloc(sizeof(CLIENTDATA));
--	  pMga->pClientStruct->pMga = (MGAPtr) pMga;
--
--	  MiscCtlReg = inMGAdac(MGA1064_MISC_CTL);
--	  /* wrapping OpenLibrary to fix broken registers. MATROX: hint,hint.*/
--	  MGAOpenLibrary(pMga->pBoard,pMga->pClientStruct,sizeof(CLIENTDATA));
--	  outMGAdac(MGA1064_MISC_CTL,MiscCtlReg);
--	  pMga->pMgaHwInfo = xalloc(sizeof(MGAHWINFO));
--	  MGAGetHardwareInfo(pMga->pBoard,pMga->pMgaHwInfo);
--	  );	/* MGA_HAL */
--#endif
-     }
-     if (pMga->is_G200SE) {
- 	pScrn->videoRam = VRTemp;
- 	pMga->FbMapSize = FBTemp;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--	/* There is a problem in the HALlib: set soft reset bit */
--	/* MATROX: hint, hint. */
--	if (!pMga->Primary && !pMga->FBDev &&
--	    (SUBSYS_ID(pMga->PciInfo) == PCI_CARD_MILL_G200_SG)) {
--	    OUTREG(MGAREG_Reset, 1);
--	    usleep(200);
--	    OUTREG(MGAREG_Reset, 0);
--	}
--    );	/* MGA_HAL */
--#endif
- 
-     /* Initialise the MMIO vgahw functions */
-     vgaHWSetMmioFuncs(hwp, pMga->IOBase, PORT_OFFSET);
-@@ -3969,66 +3498,8 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- Bool
- MGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- {
--#ifdef USEMGAHAL
--    char sCmdIn[256];
--    char sCmdOut[256];
--    FILE* fdIn;
--# ifdef MATROX_WRITEBACK
--    FILE* fdOut;
--# endif
--#endif
-  
-     if  (mode->Flags & 0x80000000) {
--#ifdef USEMGAHAL
--
--# ifdef MATROX_WRITEBACK
--#  define MWB(x) { x; }
--#  define MWB_COND(x) x
--# else
--#  define MWB(x)
--#  define MWB_COND(x) 1
--# endif
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
--
--	MGA_HAL(
--	fdIn = fopen("/tmp/mgaDriverIn", "rt");
--	MWB(fdOut = fopen("/tmp/mgaDriverOut", "wt"))
--
--	if(fdIn && MWB_COND(fdOut))
--	{
-- 
--	    fgets(sCmdIn, 255, fdIn);
-- 
--	    if(sCmdIn)
--	    {
-- 
--		MGAExecuteEscCmd(xf86Screens[scrnIndex], sCmdIn, sCmdOut, mode);
-- 
--		/* Remove file and close file descriptor */
--		remove("/tmp/mgaDriverIn");
--		fclose(fdIn);
--		MWB(
--		    /* Write output data to output file for
--		       calling application */
--		    fputs(sCmdOut, fdOut);
--		    fclose(fdOut);
--		    )
--		mode->Flags &= 0x7FFFFFFF;
--		return TRUE;
--	    }
--	    else
--	    {
--		mode->Flags &= 0x7FFFFFFF;
--		return FALSE;
--	    }
--	}
--	else
--	{
--	    mode->Flags &= 0x7FFFFFFF;
--	    return FALSE;
--	}
--   )
--#endif
-  	return FALSE; 
-     }   else
- 	return MGAModeInit(xf86Screens[scrnIndex], mode);
-@@ -4040,28 +3511,6 @@ MGASwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- void
- MGAAdjustGranularity(ScrnInfoPtr pScrn, int* x, int* y)
- {
--#ifdef USEMGAHAL
--    MGA_HAL(
--	MGAPtr pMga = MGAPTR(pScrn);
--	MGAPtr pMga2;
--	int xg = 1;
--	int yg = 1;
--	if(pMga->pMgaModeInfo && pMga->pMgaModeInfo->ulPanXGran && pMga->pMgaModeInfo->ulPanYGran) {
--	    xg = pMga->pMgaModeInfo->ulPanXGran;
--	    yg = pMga->pMgaModeInfo->ulPanYGran;
--	}
--	if(pMga->pScrn2 && (pMga2 = MGAPTR(pMga->pScrn2)) ) {
--
--	    if(pMga2->pMgaModeInfo && pMga2->pMgaModeInfo->ulPanXGran && pMga2->pMgaModeInfo->ulPanYGran) {
--		xg = max(xg,pMga2->pMgaModeInfo->ulPanXGran);
--		yg = max(yg,pMga2->pMgaModeInfo->ulPanYGran);
--	    }
--	}
--	xg=16; /*ncoder: temporary */ 
--	*x -= *x % xg;
--	*y -= *y % yg;
--	); 
--#endif
- }
- 
- 
-@@ -4087,16 +3536,6 @@ MGAAdjustFrame(int scrnIndex, int x, int y, int flags)
-         /* wanted to improve panning granularity problems without risking
-          * compatibility issues. Existing code looked hardware dependent.
-          */
--#ifdef USEMGAHAL
--    MGA_HAL(
--	    pMga->HALGranularityOffX = x;
--	    pMga->HALGranularityOffY = y;
--        MGAAdjustGranularity(pScrn,&x,&y);
--	    pMga->HALGranularityOffX = pMga->HALGranularityOffX - x;
--	    pMga->HALGranularityOffY = pMga->HALGranularityOffY - y;
--        HALSetDisplayStart(pMga->pBoard,x,y,0);
--    );
--#endif
-     MGA_NOT_HAL(
-         if(pMga->ShowCache && y && pScrn->vtSema)
-             y += pScrn->virtualY - 1;
-@@ -4139,12 +3578,6 @@ MGAAdjustFrameCrtc2(int scrnIndex, int x, int y, int flags)
-     pScrn = xf86Screens[scrnIndex];
-     pMga = MGAPTR(pScrn);
-     pLayout = &pMga->CurrentLayout;
--#ifdef USEMGAHAL
--    MGA_HAL(
--        MGAAdjustGranularity(pScrn,&x,&y);
--        HALSetDisplayStart(pMga->pBoard,x,y,1);
--    );
--#endif
-     MGA_NOT_HAL(
-         if(pMga->ShowCache && y && pScrn->vtSema)
-             y += pScrn->virtualY - 1;
-@@ -4258,9 +3691,6 @@ MGALeaveVT(int scrnIndex, int flags)
-         DRILock(pScreen, 0);
-     }
- #endif
--#ifdef USEMGAHAL
--    MGA_HAL( RESTORE_TEXTMODE_ON_DVI(pMga); );
--#endif
- }
- 
- 
-@@ -4280,9 +3710,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGAEntPtr pMgaEnt = NULL;
- 
--#ifdef USEMGAHAL    
--    MGA_HAL( RESTORE_TEXTMODE_ON_DVI(pMga); );
--#endif
-     if (pMga->MergedFB)
-          MGACloseScreenMerged(scrnIndex, pScreen);
- 
-@@ -4311,37 +3738,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-        pMgaEnt->refCount--;
-    }
- 
--#ifdef USEMGAHAL
--   MGA_HAL(
--   if(pMga->DualHeadEnabled) {
--      if(pMgaEnt->refCount == 0) {
--	 /* Both boards have closed there screen */
--	 MGACloseLibrary(pMga->pBoard);
--
--	 if (pMga->pBoard)
--	   xfree(pMga->pBoard);
--	 if (pMga->pClientStruct)
--	   xfree(pMga->pClientStruct);
--	 if (pMga->pMgaModeInfo)
--	   xfree(pMga->pMgaModeInfo);
--	 if (pMga->pMgaHwInfo)
--	   xfree(pMga->pMgaHwInfo);
--      }
--   } else {
--      MGACloseLibrary(pMga->pBoard);
--
--      if (pMga->pBoard)
--	xfree(pMga->pBoard);
--      if (pMga->pClientStruct)
--	xfree(pMga->pClientStruct);
--      if (pMga->pMgaModeInfo)
--	xfree(pMga->pMgaModeInfo);
--      if (pMga->pMgaHwInfo)
--	xfree(pMga->pMgaHwInfo);
--   }
--   );	/* MGA_HAL */
--#endif
--
- #ifdef USE_XAA
-     if (pMga->AccelInfoRec)
- 	XAADestroyInfoRec(pMga->AccelInfoRec);
-diff --git a/src/mga_esc.c b/src/mga_esc.c
-index e811712..41b734a 100644
---- a/src/mga_esc.c
-+++ b/src/mga_esc.c
-@@ -10,782 +10,4 @@
- #include "config.h"
- #endif
- 
--#ifdef USEMGAHAL
--
--/* All drivers should typically include these */
--#include "xf86.h"
--#include "xf86_OSproc.h"
--
--/* All drivers need this */
--
--#include "compiler.h"
--
--/* Drivers for PCI hardware need this */
--#include "xf86PciInfo.h"
--
--/* Drivers that need to access the PCI config space directly need this */
--#include "xf86Pci.h"
--
--/* All drivers initialising the SW cursor need this */
--#include "mipointer.h"
--
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
--#include "micmap.h"
--
--#include "xf86DDC.h"
--#include "vbe.h"
--
--#include "fb.h"
--#include "dixstruct.h"
--
--#include "mga_reg.h"
--#include "mga.h"
--#include "mga_macros.h"
--
--/* ESC */
--LPMGAMODEINFO pMgaModeInfo[2] = {NULL};
--MGAMODEINFO   TmpMgaModeInfo[2] = {{0}};
--
--/* ESC Implementation */
--static void EscHLeft(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHRight(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVUp(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVDown(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHLarger(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVTaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscVSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRefresh(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRestoreVidParm(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscHal(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscTest(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--static void EscMerged(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode);
--
--static LPMGAMODEINFO  GetModeInfoPtr(ULONG ulScreen);
--static void GetVideoParameterStr(LPMGAMODEINFO pModeInfo, char *sResult);
--static Bool convertNumber(unsigned long *pulNumber, char *sNumber);
--
--
--static MGAEscFuncRec FunctionTable[] = {
--    {"hal",  EscHal},
--    {"test",  EscTest},
--    {"read",  EscRead},
--	{"write", EscWrite},
--    {"left",  EscHLeft},
--    {"right", EscHRight},
--    {"down",  EscVDown},
--    {"up",    EscVUp},
--    {"h+",    EscHLarger},
--    {"h-",    EscHSmaller},
--    {"v+",    EscVTaller},
--    {"v-",    EscVSmaller},
--    {"refresh", EscRefresh},
--    {"undo",  EscRestoreVidParm},
--    {"merged", EscMerged},
--    {NULL,NULL}
--};
--
--
--void MGAFillDisplayModeStruct(DisplayModePtr pMode, LPMGAMODEINFO pModeInfo)
--{
--   pMode->Clock = pModeInfo->ulPixClock;
--
--   pMode->HDisplay = pModeInfo->ulDispWidth;
--   pMode->HSyncStart =  pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch;
--   pMode->HSyncEnd = pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch
--                        + pModeInfo->ulHSync;
--   pMode->HTotal = pModeInfo->ulDispWidth
--                       + pModeInfo->ulHFPorch
--                       + pModeInfo->ulHSync
--                       + pModeInfo->ulHBPorch;
--
--   pMode->VDisplay = pModeInfo->ulDispHeight;
--   pMode->VSyncStart =  pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch;
--   pMode->VSyncEnd = pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch
--                       + pModeInfo->ulVSync;
--   pMode->VTotal = pModeInfo->ulDispHeight
--                       + pModeInfo->ulVFPorch
--                       + pModeInfo->ulVSync
--                       + pModeInfo->ulVBPorch;
--
--   pMode->VRefresh = pModeInfo->ulRefreshRate;
--}
--
--static LPMGAMODEINFO  GetModeInfoPtr(ULONG ulScreen)
--{
--
--    if ( !TmpMgaModeInfo[ulScreen].ulDispWidth )
--    {
--        TmpMgaModeInfo[ulScreen] = *pMgaModeInfo[ulScreen];
--    }
--
--    return &TmpMgaModeInfo[ulScreen];
--}
--
--
--static void GetVideoParameterStr(LPMGAMODEINFO pModeInfo, char *sResult)
--{
--    sprintf(sResult, "%d %d %d %d %d %d %d %d %d %d %d",
--            pModeInfo->ulDispWidth,
--            pModeInfo->ulDispHeight,
--            pModeInfo->ulBpp,
--            pModeInfo->ulPixClock,
--            pModeInfo->ulHFPorch,
--            pModeInfo->ulHSync,
--            pModeInfo->ulHBPorch,
--            pModeInfo->ulVFPorch,
--            pModeInfo->ulVSync,
--            pModeInfo->ulVBPorch,
--            pModeInfo->flSignalMode);
--}
--
--
--static float  GetVRefresh(LPMGAMODEINFO pModeInfo)
--{
--    ULONG ulHTotal;
--    ULONG ulVTotal;
--
--    ulHTotal =
--        pModeInfo->ulDispWidth +
--        pModeInfo->ulHFPorch +
--        pModeInfo->ulHSync +
--        pModeInfo->ulHBPorch;
--
--    ulVTotal =
--        pModeInfo->ulDispHeight +
--        pModeInfo->ulVFPorch    +
--        pModeInfo->ulVSync      +
--        pModeInfo->ulVBPorch;
--
--    return ((float)pModeInfo->ulPixClock * 1000.0) / (ulHTotal * ulVTotal);
--}
--
--static void EscHal(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--	MGAPtr pMGA = MGAPTR(pScrn);
--
--	if(pMGA->HALLoaded)
--		strcpy(sResult, "YES");
--	else
--		strcpy(sResult, "NO");
--
--}
--
--static void EscTest(ScrnInfoPtr pScrn, unsigned long *param, char
--*sResult, DisplayModePtr pMode)
--{
--	strcpy(sResult, "YES");
--}
--
--static void EscMerged(ScrnInfoPtr pScrn, unsigned long *param, char
--*sResult, DisplayModePtr pMode)
--{
--	strcpy(sResult, "YES");
--}
--
--static void  EscRead(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    ULONG  ulSource, ulAddr, ulData;
--    UCHAR  ucIndex;
--
--    if ( (param[0] & 0xffff) < 2 )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--
--    ulSource = param[1] >> 16;
--    ulAddr = param[1] & 0xffff;
--
--
--    switch( ulSource )
--    {
--    case 0:
--        ulData = INREG(ulAddr);
--        sprintf(sResult, "MGA[%04X] = 0x%08X", ulAddr, ulData);
--        break;
--    case 1:
--        ucIndex = INREG8(0x3c00);
--        OUTREG8(0x3c00, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x3c0a);
--        OUTREG8(0x3c00, ucIndex);
--        sprintf(sResult, "DAC[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    case 2:
--        ucIndex = INREG8(0x1fd4);
--        OUTREG8(0x1fd4, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x1fd5);
--        OUTREG8(0x1fd4, ucIndex);
--        sprintf(sResult, "CRTC[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    case 3:
--        ucIndex = INREG8(0x1fde);
--        OUTREG8(0x1fde, (UCHAR)ulAddr);
--        ulData = (ULONG)INREG8(0x1fdf);
--        OUTREG8(0x1fde, ucIndex);
--        sprintf(sResult, "CRTCEXT[%02X] = 0x%02X", ulAddr, ulData);
--        break;
--    default:
--        strcpy(sResult, "ERROR# 2");
--        break;
--    }
--}
--
--static void  EscWrite(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    ULONG  ulSource, ulAddr, ulData;
--    UCHAR  ucIndex;
--
--    if ( (param[0] & 0xffff) < 3 )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    ulSource = param[1] >> 16;
--    ulAddr = param[1] & 0xffff;
--    ulData = param[2];
--
--
--    switch( ulSource )
--    {
--    case 0:
--        OUTREG(ulAddr, ulData);
--        strcpy(sResult, "OK");
--        break;
--    case 1:
--        ucIndex = INREG8(0x3c00);
--        OUTREG8(0x3c00, (UCHAR)ulAddr);
--        OUTREG8(0x3c0a, (UCHAR)ulData);
--        OUTREG8(0x3c00, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    case 2:
--        ucIndex = INREG8(0x1fd4);
--        OUTREG8(0x1fd4, (UCHAR)ulAddr);
--        OUTREG8(0x1fd5, (UCHAR)ulData);
--        OUTREG8(0x1fd4, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    case 3:
--        ucIndex = INREG8(0x1fde);
--        OUTREG8(0x1fde, (UCHAR)ulAddr);
--        OUTREG8(0x1fdf, (UCHAR)ulData);
--        OUTREG8(0x1fde, ucIndex);
--        strcpy(sResult, "OK");
--        break;
--    default:
--        strcpy(sResult, "ERROR# 2");
--        break;
--    }
--}
--
--static void  EscHLeft(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--
--    if (pModeInfo->ulHBPorch > (8 * param[1]) )
--    {
--        pModeInfo->ulHBPorch -=8 * param[1];
--        pModeInfo->ulHFPorch +=8 * param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void  EscHRight(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulHFPorch > (8 * param[1]) )
--    {
--        pModeInfo->ulHFPorch -=8 * param[1];
--        pModeInfo->ulHBPorch +=8 * param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--
--static void  EscVUp(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulVBPorch > (param[1]) )
--    {
--        pModeInfo->ulVBPorch -= param[1];
--        pModeInfo->ulVFPorch += param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void  EscVDown(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if (pModeInfo->ulVFPorch >= (param[1]) )
--    {
--        pModeInfo->ulVFPorch -= param[1];
--        pModeInfo->ulVBPorch += param[1];
--        MGASetMode(pMga->pBoard, pModeInfo);
--    }
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscHLarger(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1] * 8;
--    }
--    else
--    {
--
--        ulStep = 8;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    if (pModeInfo->ulHBPorch >= ulStep )
--    {
--        pModeInfo->ulHBPorch -= ulStep;
--    }
--    else
--    {
--        pModeInfo->ulHBPorch = 0;
--    }
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscHSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1] * 8;
--    }
--    else
--    {
--
--        ulStep = 8;
--    }
--
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulHBPorch += ulStep;
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscVTaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1];
--    }
--    else
--    {
--
--        ulStep = 1;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--
--    if (pModeInfo->ulVBPorch >= ulStep )
--    {
--        pModeInfo->ulVBPorch -= ulStep;
--    }
--    else
--    {
--        pModeInfo->ulVBPorch = 0;
--    }
--
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscVSmaller(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--    ULONG ulStep;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) > 1)
--    {
--
--        ulStep = param[1];
--    }
--    else
--    {
--
--        ulStep = 1;
--    }
--
--
--    fRefresh = GetVRefresh(pModeInfo);
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulVFPorch += ulStep;
--    pModeInfo->ulPixClock = (ULONG)( (fRefresh * fPixelClock) / GetVRefresh(pModeInfo));
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--
--static void EscRefresh(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--    LPMGAMODEINFO pModeInfo;
--    float fRefresh, fPixelClock;
--
--    pModeInfo = GetModeInfoPtr(param[0] >> 16);
--
--    if ( !pMgaModeInfo )
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    if ((param[0] & 0xffff) < 2)
--    {
--        strcpy(sResult, "#error 1");
--        return;
--    }
--
--    fRefresh = GetVRefresh(pModeInfo);
--
--    fPixelClock = (float)pModeInfo->ulPixClock;
--    pModeInfo->ulPixClock = (ULONG)( ((float)param[1] * fPixelClock) / fRefresh);
--
--    pModeInfo->ulRefreshRate = param[1];
--
--    MGASetMode(pMga->pBoard, pModeInfo);
--
--    MGAFillDisplayModeStruct(pMode, pModeInfo);
--
--    GetVideoParameterStr(pModeInfo, sResult);
--}
--
--static void EscRestoreVidParm(ScrnInfoPtr pScrn, unsigned long *param, char *sResult, DisplayModePtr pMode)
--{
--    MGAPtr pMga = MGAPTR(pScrn);
--
--    TmpMgaModeInfo[param[0] >> 16].ulDispWidth = 0;
--    MGASetMode(pMga->pBoard, pMgaModeInfo[param[0] >> 16]);
--
--    MGAFillDisplayModeStruct(pMode, pMgaModeInfo[param[0] >> 16]);
--
--    GetVideoParameterStr(pMgaModeInfo[param[0] >> 16], sResult);
--}
--
--static Bool convertNumber(unsigned long *pulNumber, char *sNumber)
--{
--    unsigned long i, ulDigit, shiftHex;
--    Bool bResult = TRUE;
--
--    if (sNumber == NULL)
--    {
--        return FALSE;
--    }
--
--
--    /* Convert number */
--    if ( (sNumber[0] == '0') && (sNumber[1] == 'x') )
--    {
--        shiftHex = 0;
--        *pulNumber = 0;
--
--        for (i = strlen(sNumber) - 1; i > 1; i--)
--        {
--            if (shiftHex > 28)
--            {
--                bResult = FALSE;
--                break;
--            }
--
--            if ( !isxdigit(sNumber[i]) )
--            {
--                bResult = FALSE;
--                break;
--            }
--
--            ulDigit = toupper(sNumber[i]) - '0';
--            if (ulDigit > 9)
--            {
--                ulDigit -= 7;
--            }
--            *pulNumber += ulDigit << shiftHex;
--            shiftHex += 4;
--        }
--    }
--    else
--    {
--        for (i = 0; i < strlen(sNumber); i++)
--        {
--            if ( !isdigit(sNumber[i]) )
--            {
--                bResult = FALSE;
--                break;
--            }
--        }
--        *pulNumber = atoi(sNumber);
--    }
--
--    return bResult;
--}
--
--static Bool GetEscCommand(char *cmdline, EscCmdStruct *escCmd)
--{
--    unsigned long i, paramIndex, ulHI;
--    Bool bResult;
--    char *pParameter, *function;
--
--    bResult = TRUE; /* success */
--
--    function = strtok(cmdline, " \t\n,");
--
--
--    escCmd->parameters[0] = 0;
--    if (function)
--    {
--        /* Find Screen */
--        if (function[1] == ':' )
--        {
--            escCmd->parameters[0] = (unsigned long)(function[0] - '0') << 16;
--            strncpy(escCmd->function, function+2, 32);
--        }
--        else
--        {
--            strncpy(escCmd->function, function, 32);
--        }
--
--    }
--    else
--    {
--        strcpy(escCmd->function, "#ERROR -1");
--        escCmd->parameters[0] = 0;
--        return FALSE;
--    }
--
--    paramIndex = 1;
--    while ( (pParameter = strtok(NULL, " \t\n,")) != NULL )
--    {
--        if (paramIndex > 31)
--        {
--            /* 32 parameters supported */
--            break;
--        }
--
--        i = 0;
--        while(pParameter[i] && pParameter[i] != ':')
--        {
--            i++;
--        }
--
--        if ( pParameter[i] )
--        {
--            pParameter[i] = '\0';
--            bResult  = convertNumber(&escCmd->parameters[paramIndex], &pParameter[i+1]);
--            bResult |= convertNumber(&ulHI, pParameter);
--            escCmd->parameters[paramIndex] &= 0xffff;
--            escCmd->parameters[paramIndex] += ulHI << 16;
--            pParameter[i] = ':';
--        }
--        else
--        {
--            bResult = convertNumber(&escCmd->parameters[paramIndex], pParameter);
--        }
--
--
--        if (!bResult)
--        {
--            break;
--        }
--        paramIndex++;
--    }
--
--    escCmd->parameters[0] += paramIndex;
--    return bResult;
--
--}
--
--void MGAExecuteEscCmd(ScrnInfoPtr pScrn, char *cmdline , char *sResult, DisplayModePtr pMode)
--{
--    int i = 0;
--    int ulScreen = 0;
--    MGAPtr pMga = MGAPTR(pScrn);
--    EscCmdStruct EscCmd;
--
--    if (pMga->SecondCrtc)
--    {
--	ulScreen = 1;
--    }
--    else
--    {
--	ulScreen = 0;
--    }
--
--
--    if (FunctionTable[0].function &&  GetEscCommand(cmdline,  &EscCmd) )
--    {
--        i = 0;
--
--        while ( FunctionTable[i].function && strcmp(FunctionTable[i].function, EscCmd.function) )
--        {
--            i++;
--        }
--
--        if (FunctionTable[i].function)
--        {
--	    EscCmd.parameters[0] &= 0xffff;
--	    EscCmd.parameters[0] |= ulScreen << 16;
--
--            FunctionTable[i].funcptr(pScrn, EscCmd.parameters, sResult, pMode);
--        }
--        else
--        {
--            strcpy(sResult, "error# -1");
--        }
--    }
--    else
--    {
--        strcpy(sResult, "error# -1");
--    }
--}
--#else
- int mga_foo;
--#endif
-diff --git a/src/mga_macros.h b/src/mga_macros.h
-index bffd063..130651d 100644
---- a/src/mga_macros.h
-+++ b/src/mga_macros.h
-@@ -74,18 +74,7 @@ while(INREG(MGAREG_DWGSYNC) != MGA_SYNC_XTAG) ; \
- #define CHECK_DMA_QUIESCENT(pMGA, pScrn)
- #endif
- 
--#ifdef USEMGAHAL
--#define MGA_HAL(x) { \
--	MGAPtr pMga = MGAPTR(pScrn); \
--	if (pMga->HALLoaded && pMga->chip_attribs->HAL_chipset) { x; } \
--}
--#define MGA_NOT_HAL(x) { \
--	MGAPtr pMga = MGAPTR(pScrn); \
--	if (!pMga->HALLoaded || !pMga->chip_attribs->HAL_chipset) { x; } \
--}
--#else
- #define MGA_NOT_HAL(x) { x; }
--#endif
- 
- #define MGAISGx50(x) ((x)->is_Gx50)
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index 1fd0572..2affe3b 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -236,9 +236,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     int i;
-     char* s;
-     ClockRangePtr clockRanges;
--#ifdef USEMGAHAL
--    ULONG status;
--#endif
-     MgaScrn2Rel Monitor2Pos;
- 
-     xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "==== Start of second screen initialization ====\n");
-@@ -252,9 +249,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     }
- 
-     pMga = MGAPTR(pScrn);
--#ifdef USEMGAHAL
--    pMga->pMgaModeInfo = NULL; /*will be allocated later if NULL*/ 
--#endif
-     pMga1 = MGAPTR(pScrn1);
-     pMga1->pScrn2 = pScrn;
-   
-@@ -456,10 +450,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     clockRanges->clockIndex = -1;		/* programmable */
-     clockRanges->interlaceAllowed = TRUE;
-     clockRanges->doubleScanAllowed = TRUE;
--#ifdef USEMGAHAL
--    MGA_HAL(clockRanges->interlaceAllowed = FALSE);
--    MGA_HAL(clockRanges->doubleScanAllowed = FALSE);
--#endif
-     clockRanges->interlaceAllowed = FALSE; /*no interlace on CRTC2 */
- 
-     clockRanges->ClockMulFactor = 1;
-@@ -562,30 +552,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 	MGAFreeRec(pScrn);
- 	return FALSE;
-     }
--#ifdef USEMGAHAL
--    MGA_HAL(
--
--    pMga->pBoard = pMga1->pBoard;
--    pMga->pClientStruct = pMga1->pClientStruct;
--    pMga->pMgaHwInfo = pMga1->pMgaHwInfo;
--
--
--    MGAFillModeInfoStruct(pScrn,NULL);
--    /* Fields usually handled by MGAFillModeInfoStruct, but are unavailable
--     * because no mode is given
--     */
--    pMga->pMgaModeInfo->ulDispWidth = pScrn->virtualX;
--    pMga->pMgaModeInfo->ulDispHeight = pScrn->virtualY;
--    
--    if((status = MGAValidateMode(pMga->pBoard,pMga->pMgaModeInfo)) != 0) {
--	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		   "MGAValidateMode from HALlib found the mode to be invalid.\n"
--		   "\tError: 0x%lx\n", status);
--        return FALSE;
--    }
--    pScrn->displayWidth = pMga->pMgaModeInfo->ulFBPitch;
--    );	/* MGA_HAL */
--#endif
- 
-     /*
-      * Set the CRTC parameters for all of the modes based on the type
-@@ -595,9 +561,6 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-      * driver and if the driver doesn't provide code to set them.  They
-      * are not pre-initialised at all.
-      */
--#ifdef USEMGAHAL
--    MGA_HAL(xf86SetCrtcForModes(pScrn, 0));
--#endif
-     MGA_NOT_HAL(xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V));
- 
-     /* Set the current mode to the first in the list */
---
-cgit v0.9.0.2-2-gbebe
-From ee09a9a340f8946f2d4a71a431b64189dbb5c256 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:22:09 +0000
-Subject: Remove xalloc/xcalloc/xrealloc/xfree
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_dga.c b/src/mga_dga.c
-index d43b96d..224e4ba 100644
---- a/src/mga_dga.c
-+++ b/src/mga_dga.c
-@@ -111,7 +111,7 @@ SECOND_PASS:
- 	    if(secondPitch)
- 		pitch = secondPitch; 
- 
--	    if(!(newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec))))
-+	    if(!(newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec))))
- 		break;
- 
- 	    modes = newmodes;
-diff --git a/src/mga_dri.c b/src/mga_dri.c
-index 14f342f..957c6df 100644
---- a/src/mga_dri.c
-+++ b/src/mga_dri.c
-@@ -91,24 +91,24 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen )
-    case 16:
-       numConfigs = 8;
- 
--      pConfigs = (__GLXvisualConfig*)xcalloc( sizeof(__GLXvisualConfig),
-+      pConfigs = (__GLXvisualConfig*)calloc( sizeof(__GLXvisualConfig),
- 						numConfigs );
-       if ( !pConfigs ) {
- 	 return FALSE;
-       }
- 
--      pMGAConfigs = (MGAConfigPrivPtr)xcalloc( sizeof(MGAConfigPrivRec),
-+      pMGAConfigs = (MGAConfigPrivPtr)calloc( sizeof(MGAConfigPrivRec),
- 						 numConfigs );
-       if ( !pMGAConfigs ) {
--	 xfree( pConfigs );
-+	 free(pConfigs);
- 	 return FALSE;
-       }
- 
--      pMGAConfigPtrs = (MGAConfigPrivPtr*)xcalloc( sizeof(MGAConfigPrivPtr),
-+      pMGAConfigPtrs = (MGAConfigPrivPtr*)calloc( sizeof(MGAConfigPrivPtr),
- 						     numConfigs );
-       if ( !pMGAConfigPtrs ) {
--	 xfree( pConfigs );
--	 xfree( pMGAConfigs );
-+	 free(pConfigs);
-+	 free(pMGAConfigs);
- 	 return FALSE;
-       }
- 
-@@ -182,24 +182,24 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen )
-    case 32:
-       numConfigs = 8;
- 
--      pConfigs = (__GLXvisualConfig*)xcalloc( sizeof(__GLXvisualConfig),
-+      pConfigs = (__GLXvisualConfig*)calloc( sizeof(__GLXvisualConfig),
- 						numConfigs );
-       if ( !pConfigs ) {
- 	 return FALSE;
-       }
- 
--      pMGAConfigs = (MGAConfigPrivPtr)xcalloc( sizeof(MGAConfigPrivRec),
-+      pMGAConfigs = (MGAConfigPrivPtr)calloc( sizeof(MGAConfigPrivRec),
- 						 numConfigs );
-       if ( !pMGAConfigs ) {
--	 xfree( pConfigs );
-+	 free(pConfigs);
- 	 return FALSE;
-       }
- 
--      pMGAConfigPtrs = (MGAConfigPrivPtr*)xcalloc( sizeof(MGAConfigPrivPtr),
-+      pMGAConfigPtrs = (MGAConfigPrivPtr*)calloc( sizeof(MGAConfigPrivPtr),
- 						     numConfigs );
-       if ( !pMGAConfigPtrs ) {
--	 xfree( pConfigs );
--	 xfree( pMGAConfigs );
-+	 free(pConfigs);
-+	 free(pMGAConfigs);
- 	 return FALSE;
-       }
- 
-@@ -973,11 +973,11 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 
-         if (nbox>1) {
- 	    /* Keep ordering in each band, reverse order of bands */
--	    pboxNew1 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
-+	    pboxNew1 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
- 	    if (!pboxNew1) return;
--	    pptNew1 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
-+	    pptNew1 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pptNew1) {
--	        xfree(pboxNew1);
-+	        free(pboxNew1);
- 	        return;
- 	    }
- 	    pboxBase = pboxNext = pbox+nbox-1;
-@@ -1008,14 +1008,14 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 
-         if (nbox > 1) {
- 	    /*reverse orderof rects in each band */
--	    pboxNew2 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox);
--	    pptNew2 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox);
-+	    pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
-+	    pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pboxNew2 || !pptNew2) {
--	        if (pptNew2) xfree(pptNew2);
--	        if (pboxNew2) xfree(pboxNew2);
-+	        if (pptNew2) free(pptNew2);
-+	        if (pboxNew2) free(pboxNew2);
- 	        if (pboxNew1) {
--		    xfree(pptNew1);
--		    xfree(pboxNew1);
-+		    free(pptNew1);
-+		    free(pboxNew1);
- 		}
- 	       return;
- 	    }
-@@ -1066,12 +1066,12 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
-     MGASelectBuffer(pScrn, MGA_FRONT);
- 
-     if (pboxNew2) {
--        xfree(pptNew2);
--        xfree(pboxNew2);
-+        free(pptNew2);
-+        free(pboxNew2);
-     }
-     if (pboxNew1) {
--        xfree(pptNew1);
--        xfree(pboxNew1);
-+        free(pptNew1);
-+        free(pboxNew1);
-     }
- 
-     pMga->AccelInfoRec->NeedToSync = TRUE;
-@@ -1150,7 +1150,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
-       pDRIInfo->busIdString = DRICreatePCIBusID(pMga->PciInfo);
-    } else {
--      pDRIInfo->busIdString = xalloc(64);
-+      pDRIInfo->busIdString = malloc(64);
-       sprintf( pDRIInfo->busIdString, "PCI:%d:%d:%d",
- #ifdef XSERVER_LIBPCIACCESS
- 	       ((pMga->PciInfo->domain << 8) | pMga->PciInfo->bus),
-@@ -1198,7 +1198,7 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
- 
-    pDRIInfo->SAREASize = SAREA_MAX;
- 
--   pMGADRI = (MGADRIPtr)xcalloc( sizeof(MGADRIRec), 1 );
-+   pMGADRI = (MGADRIPtr)calloc( sizeof(MGADRIRec), 1 );
-    if ( !pMGADRI ) {
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-@@ -1208,9 +1208,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    }
- 
-    pMGADRIServer = (MGADRIServerPrivatePtr)
--      xcalloc( sizeof(MGADRIServerPrivateRec), 1 );
-+      calloc( sizeof(MGADRIServerPrivateRec), 1 );
-    if ( !pMGADRIServer ) {
--      xfree( pMGADRI );
-+      free( pMGADRI );
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-       xf86DrvMsg( pScrn->scrnIndex, X_ERROR,
-@@ -1249,9 +1249,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
-    pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
- 
-    if ( !DRIScreenInit( pScreen, pDRIInfo, &pMga->drmFD ) ) {
--      xfree( pMGADRIServer );
-+      free( pMGADRIServer );
-       pMga->DRIServerInfo = 0;
--      xfree( pDRIInfo->devPrivate );
-+      free( pDRIInfo->devPrivate );
-       pDRIInfo->devPrivate = 0;
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-@@ -1495,20 +1495,20 @@ void MGADRICloseScreen( ScreenPtr pScreen )
- 
-    if ( pMga->pDRIInfo ) {
-       if ( pMga->pDRIInfo->devPrivate ) {
--	 xfree( pMga->pDRIInfo->devPrivate );
-+	 free( pMga->pDRIInfo->devPrivate );
- 	 pMga->pDRIInfo->devPrivate = 0;
-       }
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-    }
-    if ( pMga->DRIServerInfo ) {
--      xfree( pMga->DRIServerInfo );
-+      free(pMga->DRIServerInfo);
-       pMga->DRIServerInfo = 0;
-    }
-    if ( pMga->pVisualConfigs ) {
--      xfree( pMga->pVisualConfigs );
-+      free(pMga->pVisualConfigs);
-    }
-    if ( pMga->pVisualConfigsPriv ) {
--      xfree( pMga->pVisualConfigsPriv );
-+      free( pMga->pVisualConfigsPriv );
-    }
- }
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d770031..d4ae346 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -646,7 +646,7 @@ MGAFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -813,7 +813,7 @@ MGAProbe(DriverPtr drv, int flags)
- 			            MGAChipsets, MGAPciChipsets, devSections,
- 			            numDevSections, drv, &usedChips);
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
-     if (numUsed <= 0)
- 	return FALSE;
- 
-@@ -971,7 +971,7 @@ MGAProbe(DriverPtr drv, int flags)
- 	    }
-         }
-     }
--    xfree(usedChips);
-+    free(usedChips);
- 
-     return foundScreen;
- }
-@@ -1715,7 +1715,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
-     }
- 
--    if (!(pMga->Options = xalloc(sizeof(MGAOptions))))
-+    if (!(pMga->Options = malloc(sizeof(MGAOptions))))
- 	return FALSE;
-     memcpy(pMga->Options, MGAOptions, sizeof(MGAOptions));
- 
-@@ -2384,7 +2384,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-         switch(pMga->Chipset) {
- 	case PCI_CHIP_MGA2064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches1));
-+		linePitches = malloc(sizeof(Pitches1));
- 		memcpy(linePitches, Pitches1, sizeof(Pitches1));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -2393,7 +2393,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	case PCI_CHIP_MGA2164_AGP:
- 	case PCI_CHIP_MGA1064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches2));
-+		linePitches = malloc(sizeof(Pitches2));
- 		memcpy(linePitches, Pitches2, sizeof(Pitches2));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -2431,7 +2431,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 			      LOOKUP_BEST_REFRESH);
-       
- 	if (linePitches)
--	   xfree(linePitches);
-+	   free(linePitches);
-     }
- 
-     if (i < 1 && pMga->FBDev) {
-@@ -3294,7 +3294,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pMga->ShadowFB) {
-  	pMga->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	pMga->ShadowPtr = xalloc(pMga->ShadowPitch * height);
-+	pMga->ShadowPtr = malloc(pMga->ShadowPitch * height);
- 	displayWidth = pMga->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-         FBStart = pMga->ShadowPtr;
-     } else {
-@@ -3745,21 +3745,21 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- #ifdef USE_EXA
-     if (pMga->ExaDriver) {
- 	exaDriverFini(pScreen);
--	xfree(pMga->ExaDriver);
-+	free(pMga->ExaDriver);
-     }
- #endif
-     if (pMga->CursorInfoRec)
-     	xf86DestroyCursorInfoRec(pMga->CursorInfoRec);
-     if (pMga->ShadowPtr)
--	xfree(pMga->ShadowPtr);
-+	free(pMga->ShadowPtr);
-     if (pMga->DGAModes)
--	xfree(pMga->DGAModes);
-+	free(pMga->DGAModes);
-     if (pMga->adaptor)
--	xfree(pMga->adaptor);
-+	free(pMga->adaptor);
-     if (pMga->portPrivate)
--	xfree(pMga->portPrivate);
-+	free(pMga->portPrivate);
-     if (pMga->ScratchBuffer)
--	xfree(pMga->ScratchBuffer);
-+	free(pMga->ScratchBuffer);
- 
-     pScrn->vtSema = FALSE;
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index 2affe3b..e3216c9 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -70,9 +70,9 @@ CopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, DisplayModePtr i, DisplayM
-     DisplayModePtr mode;
-     int dx = 0,dy = 0;
-     /* start with first node */
--    mode = xalloc(sizeof(DisplayModeRec));
-+    mode = malloc(sizeof(DisplayModeRec));
-     memcpy(mode,i, sizeof(DisplayModeRec));
--    mode->Private = xalloc(sizeof(MergedDisplayModeRec));
-+    mode->Private = malloc(sizeof(MergedDisplayModeRec));
-     ((MergedDisplayModePtr)mode->Private)->Monitor1 = i;
-     ((MergedDisplayModePtr)mode->Private)->Monitor2 = j;
-     ((MergedDisplayModePtr)mode->Private)->Monitor2Pos = srel;
-@@ -239,7 +239,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     MgaScrn2Rel Monitor2Pos;
- 
-     xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "==== Start of second screen initialization ====\n");
--    pScrn = xalloc(sizeof(ScrnInfoRec));
-+    pScrn = malloc(sizeof(ScrnInfoRec));
-     memcpy(pScrn,pScrn1,sizeof(ScrnInfoRec));
-    
-     pScrn->driverPrivate = NULL; 
-@@ -270,7 +270,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 
-     /* Set pScrn->monitor */
-     {
--        pScrn->monitor = xalloc(sizeof(MonRec));
-+        pScrn->monitor = malloc(sizeof(MonRec));
-         /* copy everything we don't care about */
-         memcpy(pScrn->monitor,pScrn1->monitor,sizeof(MonRec));
-         pScrn->monitor->DDC = NULL;   /*FIXME:have to try this */ 
-@@ -484,7 +484,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-         switch(pMga->Chipset) {
- 	case PCI_CHIP_MGA2064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches1));
-+		linePitches = malloc(sizeof(Pitches1));
- 		memcpy(linePitches, Pitches1, sizeof(Pitches1));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -493,7 +493,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 	case PCI_CHIP_MGA2164_AGP:
- 	case PCI_CHIP_MGA1064:
- 	   if (!pMga->NoAccel) {
--		linePitches = xalloc(sizeof(Pitches2));
-+		linePitches = malloc(sizeof(Pitches2));
- 		memcpy(linePitches, Pitches2, sizeof(Pitches2));
- 		minPitch = maxPitch = 0;
- 	   }
-@@ -529,7 +529,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 			      LOOKUP_BEST_REFRESH);
-         
- 	if (linePitches)
--	   xfree(linePitches);
-+	   free(linePitches);
-     }
- 
- 
-@@ -881,10 +881,10 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-     ScrnInfoPtr pScrn2 = pMga->pScrn2;
- 
-     if(pScrn2) {
--        xfree(pScrn2->monitor);
-+        free(pScrn2->monitor);
-         pScrn2->monitor = NULL;
- 
--        xfree(pScrn2);
-+        free(pScrn2);
-         pMga->pScrn2 = NULL;
-     }
- 
-@@ -893,8 +893,8 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-         do {
-             DisplayModePtr p = pScrn1->currentMode->next; 
-             if(pScrn1->currentMode->Private) 
--                xfree(pScrn1->currentMode->Private);
--            xfree(pScrn1->currentMode);
-+                free(pScrn1->currentMode->Private);
-+            free(pScrn1->currentMode);
-             pScrn1->currentMode = p;
-         }while( pScrn1->currentMode != pScrn1->modes);
-     }
-diff --git a/src/mga_storm.c b/src/mga_storm.c
-index db7fae7..f0e6194 100644
---- a/src/mga_storm.c
-+++ b/src/mga_storm.c
-@@ -583,7 +583,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
-     BoxRec AvailFBArea;
-     int i;
- 
--    pMga->ScratchBuffer = xalloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3);
-+    pMga->ScratchBuffer = malloc(((pScrn->displayWidth * pMga->CurrentLayout.bitsPerPixel) + 127) >> 3);
-     if(!pMga->ScratchBuffer) return FALSE;
- 
-     pMga->AccelInfoRec = infoPtr = XAACreateInfoRec();
-diff --git a/src/mga_vga.c b/src/mga_vga.c
-index 9f00b3d..0ac8bf7 100644
---- a/src/mga_vga.c
-+++ b/src/mga_vga.c
-@@ -197,17 +197,17 @@ MGAG200SESaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save)
-     hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */
-     hwp->writeGr(hwp, 0x05, 0x00);  /* write mode 0, read mode 0 */
-     hwp->writeGr(hwp, 0x06, 0x05);  /* set graphics */
--    if (hwp->FontInfo1 || (hwp->FontInfo1 = xalloc(FONT_AMOUNT))) {
-+    if (hwp->FontInfo1 || (hwp->FontInfo1 = malloc(FONT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x04); /* write to plane 2 */
- 	hwp->writeGr(hwp, 0x04, 0x02);  /* read plane 2 */
- 	slowbcopy_frombus(hwp->Base, hwp->FontInfo1, FONT_AMOUNT);
-     }
--    if (hwp->FontInfo2 || (hwp->FontInfo2 = xalloc(FONT_AMOUNT))) {
-+    if (hwp->FontInfo2 || (hwp->FontInfo2 = malloc(FONT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x08); /* write to plane 3 */
- 	hwp->writeGr(hwp, 0x04, 0x03);  /* read plane 3 */
- 	slowbcopy_frombus(hwp->Base, hwp->FontInfo2, FONT_AMOUNT);
-     }
--    if (hwp->TextInfo || (hwp->TextInfo = xalloc(2 * TEXT_AMOUNT))) {
-+    if (hwp->TextInfo || (hwp->TextInfo = malloc(2 * TEXT_AMOUNT))) {
- 	hwp->writeSeq(hwp, 0x02, 0x01); /* write to plane 0 */
- 	hwp->writeGr(hwp, 0x04, 0x00);  /* read plane 0 */
- 	slowbcopy_frombus(hwp->Base, hwp->TextInfo, TEXT_AMOUNT);
-diff --git a/src/mga_video.c b/src/mga_video.c
-index a69c973..beb5a3c 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -131,8 +131,8 @@ void MGAInitVideo(ScreenPtr pScreen)
- 	    num_adaptors = 1;
- 	    adaptors = &newAdaptor;
- 	} else {
--	    newAdaptors =  /* need to free this someplace */
--		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+	    /* need to free this someplace */
-+	    newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
- 	    if(newAdaptors) {
- 		memcpy(newAdaptors, adaptors, num_adaptors * 
- 					sizeof(XF86VideoAdaptorPtr));
-@@ -147,7 +147,7 @@ void MGAInitVideo(ScreenPtr pScreen)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
-@@ -231,10 +231,10 @@ MGAAllocAdaptor(ScrnInfoPtr pScrn, Bool doublebuffer)
-     if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
- 	return NULL;
- 
--    if(!(pPriv = xcalloc(1, sizeof(MGAPortPrivRec) + 
-+    if(!(pPriv = calloc(1, sizeof(MGAPortPrivRec) +
- 			(sizeof(DevUnion) * MGA_MAX_PORTS)))) 
-     {
--	xfree(adapt);
-+	free(adapt);
- 	return NULL;
-     }
- 
-@@ -1082,18 +1082,18 @@ MGAAllocateSurface(
-     surface->width = w;
-     surface->height = h;
- 
--    if(!(surface->pitches = xalloc(sizeof(int)))) {
-+    if(!(surface->pitches = malloc(sizeof(int)))) {
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
--    if(!(surface->offsets = xalloc(sizeof(int)))) {
--	xfree(surface->pitches);
-+    if(!(surface->offsets = malloc(sizeof(int)))) {
-+	free(surface->pitches);
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
--    if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
-+	free(surface->pitches);
-+	free(surface->offsets);
-         MGAFreeMemory(pScrn, surface_memory);
- 	return BadAlloc;
-     }
-@@ -1137,9 +1137,9 @@ MGAFreeSurface(
-     if(pPriv->isOn)
- 	MGAStopSurface(surface);
-     MGAFreeMemory(pScrn, pPriv->surface_memory);
--    xfree(surface->pitches);
--    xfree(surface->offsets);
--    xfree(surface->devPrivate.ptr);
-+    free(surface->pitches);
-+    free(surface->offsets);
-+    free(surface->devPrivate.ptr);
- 
-     return Success;
- }
-@@ -1231,7 +1231,7 @@ MGAInitOffscreenImages(ScreenPtr pScreen)
-     XF86OffscreenImagePtr offscreenImages;
- 
-     /* need to free this someplace */
--    if(!(offscreenImages = xalloc(num * sizeof(XF86OffscreenImageRec))))
-+    if(!(offscreenImages = malloc(num * sizeof(XF86OffscreenImageRec))))
- 	return;
- 
-     offscreenImages[0].image = &Images[0];
---
-cgit v0.9.0.2-2-gbebe
-From 1036e32e006d496023553ea566cb13ae93933719 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:35:48 +0000
-Subject: Remove if(E != NULL) checks around free(E)
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_dri.c b/src/mga_dri.c
-index 957c6df..1454994 100644
---- a/src/mga_dri.c
-+++ b/src/mga_dri.c
-@@ -1011,8 +1011,8 @@ static void MGADRIMoveBuffersXAA(WindowPtr pParent, DDXPointRec ptOldOrg,
- 	    pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox);
- 	    pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox);
- 	    if (!pboxNew2 || !pptNew2) {
--	        if (pptNew2) free(pptNew2);
--	        if (pboxNew2) free(pboxNew2);
-+	        free(pptNew2);
-+	        free(pboxNew2);
- 	        if (pboxNew1) {
- 		    free(pptNew1);
- 		    free(pboxNew1);
-@@ -1494,21 +1494,13 @@ void MGADRICloseScreen( ScreenPtr pScreen )
-    DRICloseScreen( pScreen );
- 
-    if ( pMga->pDRIInfo ) {
--      if ( pMga->pDRIInfo->devPrivate ) {
--	 free( pMga->pDRIInfo->devPrivate );
--	 pMga->pDRIInfo->devPrivate = 0;
--      }
-+      free(pMga->pDRIInfo->devPrivate);
-+      pMga->pDRIInfo->devPrivate = 0;
-       DRIDestroyInfoRec( pMga->pDRIInfo );
-       pMga->pDRIInfo = 0;
-    }
--   if ( pMga->DRIServerInfo ) {
--      free(pMga->DRIServerInfo);
--      pMga->DRIServerInfo = 0;
--   }
--   if ( pMga->pVisualConfigs ) {
--      free(pMga->pVisualConfigs);
--   }
--   if ( pMga->pVisualConfigsPriv ) {
--      free( pMga->pVisualConfigsPriv );
--   }
-+   free(pMga->DRIServerInfo);
-+   pMga->DRIServerInfo = 0;
-+   free(pMga->pVisualConfigs);
-+   free(pMga->pVisualConfigsPriv);
- }
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d4ae346..dcbfabf 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -644,8 +644,6 @@ MGAGetRec(ScrnInfoPtr pScrn)
- void
- MGAFreeRec(ScrnInfoPtr pScrn)
- {
--    if (pScrn->driverPrivate == NULL)
--	return;
-     free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
-@@ -2430,8 +2428,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 			      pMga->FbMapSize,
- 			      LOOKUP_BEST_REFRESH);
-       
--	if (linePitches)
--	   free(linePitches);
-+	free(linePitches);
-     }
- 
-     if (i < 1 && pMga->FBDev) {
-@@ -3750,16 +3747,11 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- #endif
-     if (pMga->CursorInfoRec)
-     	xf86DestroyCursorInfoRec(pMga->CursorInfoRec);
--    if (pMga->ShadowPtr)
--	free(pMga->ShadowPtr);
--    if (pMga->DGAModes)
--	free(pMga->DGAModes);
--    if (pMga->adaptor)
--	free(pMga->adaptor);
--    if (pMga->portPrivate)
--	free(pMga->portPrivate);
--    if (pMga->ScratchBuffer)
--	free(pMga->ScratchBuffer);
-+    free(pMga->ShadowPtr);
-+    free(pMga->DGAModes);
-+    free(pMga->adaptor);
-+    free(pMga->portPrivate);
-+    free(pMga->ScratchBuffer);
- 
-     pScrn->vtSema = FALSE;
- 
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index e3216c9..c1cf2eb 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -528,8 +528,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
- 			      pMga->FbMapSize,
- 			      LOOKUP_BEST_REFRESH);
-         
--	if (linePitches)
--	   free(linePitches);
-+	free(linePitches);
-     }
- 
- 
-@@ -892,8 +891,7 @@ MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen) {
-         pScrn1->currentMode = pScrn1->modes;
-         do {
-             DisplayModePtr p = pScrn1->currentMode->next; 
--            if(pScrn1->currentMode->Private) 
--                free(pScrn1->currentMode->Private);
-+            free(pScrn1->currentMode->Private);
-             free(pScrn1->currentMode);
-             pScrn1->currentMode = p;
-         }while( pScrn1->currentMode != pScrn1->modes);
-diff --git a/src/mga_video.c b/src/mga_video.c
-index beb5a3c..784e7b1 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -146,8 +146,7 @@ void MGAInitVideo(ScreenPtr pScreen)
-     if(num_adaptors)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
--    if(newAdaptors)
--	free(newAdaptors);
-+    free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
---
-cgit v0.9.0.2-2-gbebe
-From 560967b4ffdb103f95121c43708dd5fc680a5045 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:37:04 +0000
-Subject: Fix printf format specifier warning
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_exa.c b/src/mga_exa.c
-index f292327..e5eaa92 100644
---- a/src/mga_exa.c
-+++ b/src/mga_exa.c
-@@ -865,7 +865,7 @@ mgaExaInit(ScreenPtr pScreen)
- 
-     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "X %d Y %d bpp %d\n",
-                pScrn->virtualX, pScrn->virtualY, pScrn->bitsPerPixel);
--    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Start at %p, size %x, osb %x\n",
-+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Start at %p, size %lx, osb %lx\n",
-                pExa->memoryBase, pExa->memorySize, pExa->offScreenBase);
- 
-     /* In PW24 mode, we need to align to "3 64-bytes" */
---
-cgit v0.9.0.2-2-gbebe
-From 07792ef41f33aa5419168263637e34ee614f26e2 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 27 Sep 2011 02:38:17 +0000
-Subject: Remove calls to xf86IsPc98()
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index dcbfabf..4af36ca 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2164,7 +2164,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     /*
-      * Reset card if it isn't primary one
-      */
--    if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() )
-+    if ( (!pMga->Primary && !pMga->FBDev) )
-         MGASoftReset(pScrn);
- 
-     if (pScrn->videoRam == 0) {
-@@ -2878,13 +2878,6 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	vgaHWProtect(pScrn, FALSE);
-     }
- 
--    if (xf86IsPc98()) {
--	if (pMga->Chipset == PCI_CHIP_MGA2064)
--	    outb(0xfac, 0x01);
--	else
--	    outb(0xfac, 0x02);
--    }
--
-     /* Reset tagfifo*/ 
- 	if (pMga->is_G200ER) 
-     {
-@@ -3680,8 +3673,6 @@ MGALeaveVT(int scrnIndex, int flags)
-     MGARestore(pScrn);
-     vgaHWLock(hwp);
- 
--    if (xf86IsPc98())
--	outb(0xfac, 0x00);
- #ifdef XF86DRI
-     if (pMga->directRenderingEnabled) {
-         pScreen = screenInfo.screens[scrnIndex];
-@@ -3755,9 +3746,6 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- 
-     pScrn->vtSema = FALSE;
- 
--    if (xf86IsPc98())
--	outb(0xfac, 0x00);
--
-     xf86ClearPrimInitDone(pScrn->entityList[0]);
- 
-     if(pMga->BlockHandler)
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index c1cf2eb..aec3443 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -385,7 +385,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     /*
-      * Reset card if it isn't primary one
-      */
--    if ( (!pMga->Primary && !pMga->FBDev) || xf86IsPc98() )
-+    if ( (!pMga->Primary && !pMga->FBDev) )
-         MGASoftReset(pScrn);
- 
-     
---
-cgit v0.9.0.2-2-gbebe
-From f9acf37be49844bea8165be9786afe37fd999229 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat, 29 Oct 2011 23:31:08 +0000
-Subject: Include <unistd.h> for usleep
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/mga_vga.c b/src/mga_vga.c
-index 0ac8bf7..8f52951 100644
---- a/src/mga_vga.c
-+++ b/src/mga_vga.c
-@@ -2,6 +2,8 @@
- #include "config.h"
- #endif
- 
-+#include <unistd.h>
-+
- #include "misc.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
---
-cgit v0.9.0.2-2-gbebe
-From d9cf07a4f424b2beb844ea1b3ec5d468e79a747c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat, 29 Oct 2011 23:34:41 +0000
-Subject: Include "xf86Modes.h" for xf86ModeBandwidth
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 4af36ca..d9f6ea4 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -52,6 +52,10 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
-+#ifdef HAVE_XF86MODEBANDWIDTH
-+#include "xf86Modes.h"
-+#endif
-+
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
- #include "xf86RAC.h"
---
-cgit v0.9.0.2-2-gbebe
-From 644ba5d11049e63ea61b5cc4fb889b0f840965ff Mon Sep 17 00:00:00 2001
-From: Christian Toutant <ctoutant@matrox.com>
-Date: Wed, 07 Dec 2011 20:42:39 +0000
-Subject: Add support for Video Memory greater then 8M
-
-Expand memory mapping of framebuffer from 8 to 16MB
-
-Fix segfault on redhat distibution
-
-Signed-off-by: Christian Toutant <ctoutant@matrox.com>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index d9f6ea4..ae36378 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2707,9 +2707,18 @@ MGAMapMem(ScrnInfoPtr pScrn)
- 	if (pMga->IOBase == NULL)
- 	    return FALSE;
- 
--	pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
--				     pMga->PciTag, pMga->FbAddress,
--				     pMga->FbMapSize);
-+    if (pMga->is_G200ER)
-+    {
-+        pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-+                         pMga->PciTag, pMga->FbAddress,
-+                         pMga->FbMapSize);
-+    }
-+    else
-+    {
-+        pMga->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
-+                         pMga->PciTag, pMga->FbAddress,
-+                         pMga->FbMapSize);
-+    }
- 	if (pMga->FbBase == NULL)
- 	    return FALSE;
- #endif
-@@ -3139,11 +3148,19 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     pMga = MGAPTR(pScrn);
-     MGAdac = &pMga->Dac;
- 
--    if (pMga->is_G200SE) {
--	VRTemp = pScrn->videoRam;
--	FBTemp = pMga->FbMapSize;
--	pScrn->videoRam = 8192;
--	pMga->FbMapSize = pScrn->videoRam * 1024;
-+    if (pMga->is_G200SE)
-+    {
-+        VRTemp = pScrn->videoRam;
-+        FBTemp = pMga->FbMapSize;
-+        if (pMga->reg_1e24 >= 0x01)
-+        {
-+            pScrn->videoRam = 16384;
-+        }
-+        else
-+        {
-+            pScrn->videoRam = 8192;
-+        }
-+        pMga->FbMapSize = pScrn->videoRam * 1024;
-     }
-     
- 
-@@ -3701,10 +3718,26 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-     vgaHWPtr hwp = VGAHWPTR(pScrn);
-     MGAPtr pMga = MGAPTR(pScrn);
-     MGAEntPtr pMgaEnt = NULL;
-+    CARD32 VRTemp, FBTemp;
- 
-     if (pMga->MergedFB)
-          MGACloseScreenMerged(scrnIndex, pScreen);
- 
-+    if (pMga->is_G200SE)
-+    {
-+        VRTemp = pScrn->videoRam;
-+        FBTemp = pMga->FbMapSize;
-+        if (pMga->reg_1e24 >= 0x01)
-+        {
-+            pScrn->videoRam = 16384;
-+        }
-+        else
-+        {
-+            pScrn->videoRam = 8192;
-+        }
-+        pMga->FbMapSize = pScrn->videoRam * 1024;
-+    }
-+
-     if (pScrn->vtSema) {
- 	if (pMga->FBDev) {
- 	    fbdevHWRestore(pScrn);
-@@ -3716,6 +3749,13 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
- 	    vgaHWUnmapMem(pScrn);
- 	}
-     }
-+
-+    if (pMga->is_G200SE)
-+    {
-+        pScrn->videoRam = VRTemp;
-+        pMga->FbMapSize = FBTemp;
-+    }
-+
- #ifdef XF86DRI
-    if (pMga->directRenderingEnabled) {
-        MGADRICloseScreen(pScreen);
---
-cgit v0.9.0.2-2-gbebe
-From cc9d2e808de20723c9035952242d966455d583b7 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Thu, 29 Dec 2011 03:44:40 +0000
-Subject: Check MGAAllocAdaptor() for memory allocation failure
-
-If it couldn't allocate memory, don't attempt to write a bunch of values
-to the NULL pointer before returning it, but just pass the NULL along
-right away.
-
-Resolves parfait warnings of the form:
-
-Error: Null pointer dereference (CWE 476)
-   Write to null pointer 'adapt'
-        at line 322 of src/mga_video.c in function 'MGASetupImageVideoTexture'.
-          Function 'MGAAllocAdaptor' may return constant 'NULL' at line 237, called at line 320.
-          Null pointer introduced at line 237 in function 'MGAAllocAdaptor'.
-
-repeated for every line writing to the adapt pointer in each function.
-
-[ This bug was found by the Parfait 0.4.2 bug checking tool.
-  For more information see http://labs.oracle.com/projects/parfait/ ]
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
----
-diff --git a/src/mga_video.c b/src/mga_video.c
-index 784e7b1..abce31f 100644
---- a/src/mga_video.c
-+++ b/src/mga_video.c
-@@ -269,6 +269,8 @@ MGASetupImageVideoOverlay(ScreenPtr pScreen)
-     XF86VideoAdaptorPtr adapt;
- 
-     adapt = MGAAllocAdaptor(pScrn, TRUE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
-@@ -316,6 +318,8 @@ MGASetupImageVideoTexture(ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
- 
-     adapt = MGAAllocAdaptor(pScrn, FALSE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = 0;
-@@ -1298,6 +1302,8 @@ MGASetupImageVideoILOAD(ScreenPtr pScreen)
-     MGAPtr pMga = MGAPTR(pScrn);
- 
-     adapt = MGAAllocAdaptor(pScrn, FALSE);
-+    if (adapt == NULL)
-+	return NULL;
- 
-     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     adapt->flags = 0;
---
-cgit v0.9.0.2-2-gbebe
-From 9223c44a731f48c66c226eb88dcb6f9d574cb599 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Tue, 03 Jan 2012 22:35:18 +0000
-Subject: When we can't load the xaa or exa modules, use shadowfb instead
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index ae36378..00469e7 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -2101,6 +2101,31 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-         }
-     }
- 
-+    /* Load XAA if needed */
-+    if (!pMga->NoAccel) {
-+#ifdef USE_EXA
-+	if (pMga->Exa) {
-+	    if (!xf86LoadSubModule(pScrn, "exa")) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+		           "Falling back to shadowfb\n");
-+		pMga->ShadowFB = TRUE;
-+		pMga->NoAccel = TRUE;
-+	    }
-+	} else {
-+#endif
-+#ifdef USE_XAA
-+	    if (!xf86LoadSubModule(pScrn, "xaa")) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+		           "Falling back to shadowfb\n");
-+		pMga->ShadowFB = TRUE;
-+		pMga->NoAccel = TRUE;
-+	    }
-+#endif
-+#ifdef USE_EXA
-+	}
-+#endif
-+    }
-+
-     switch (pMga->Chipset) {
-     case PCI_CHIP_MGA2064:
-     case PCI_CHIP_MGA2164:
-@@ -2596,27 +2621,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	return FALSE;
-     }
- 
--    /* Load XAA if needed */
--    if (!pMga->NoAccel) {
--#ifdef USE_EXA
--	if (pMga->Exa) {
--	    if (!xf86LoadSubModule(pScrn, "exa")) {
--		MGAFreeRec(pScrn);
--		return FALSE;
--	    }
--	} else {
--#endif
--#ifdef USE_XAA
--	    if (!xf86LoadSubModule(pScrn, "xaa")) {
--		MGAFreeRec(pScrn);
--		return FALSE;
--	    }
--#endif
--#ifdef USE_EXA
--	}
--#endif
--    }
--
-     /* Load ramdac if needed */
-     if (pMga->HWCursor) {
- 	if (!xf86LoadSubModule(pScrn, "ramdac")) {
---
-cgit v0.9.0.2-2-gbebe
-From 4c4beaf628c9c5dd531605e40696ed31db0e97b8 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 04 Jan 2012 05:15:07 +0000
-Subject: Untangle XF86DRI from the driver-specific DRI define
-
-XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
-itself does exactly nothing other than not fill in the CFLAGS
-and thus stop the driver from compiling.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/configure.ac b/configure.ac
-index 540c390..840ff3c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,8 +100,8 @@ AC_MSG_RESULT([$DRI])
- AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
- if test "x$DRI" = xyes; then
-         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
--        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-+        AC_DEFINE(MGADRI,1,[Enable DRI driver support])
-+        AC_DEFINE(MGADRI_DEVEL,1,[Enable developmental DRI driver support])
- fi
- 
- save_CFLAGS="$CFLAGS"
-diff --git a/src/mga.h b/src/mga.h
-index fced6aa..77406f1 100644
---- a/src/mga.h
-+++ b/src/mga.h
-@@ -28,7 +28,11 @@
- #include "xf86DDC.h"
- #include "xf86xv.h"
- 
--#ifdef XF86DRI
-+#ifndef XF86DRI
-+#undef MGADRI
-+#endif
-+
-+#ifdef MGADRI
- #include "xf86drm.h"
- 
- #define _XF86DRI_SERVER_
-@@ -589,7 +593,7 @@ typedef struct {
-     int			expandRemaining;
-     int			expandHeight;
-     int			expandY;
--#ifdef XF86DRI
-+#ifdef MGADRI
-     Bool 		directRenderingEnabled;
-     DRIInfoPtr 		pDRIInfo;
-     int 		drmFD;
-@@ -743,7 +747,7 @@ void MGAPointerMoved(int index, int x, int y);
- void MGAInitVideo(ScreenPtr pScreen);
- void MGAResetVideo(ScrnInfoPtr pScrn);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- 
- #define MGA_FRONT	0x1
- #define MGA_BACK	0x2
-diff --git a/src/mga_driver.c b/src/mga_driver.c
-index 00469e7..af005f1 100644
---- a/src/mga_driver.c
-+++ b/src/mga_driver.c
-@@ -101,7 +101,7 @@
- #include "shadowfb.h"
- #include "fbdevhw.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "dri.h"
- #endif
- 
-@@ -1532,7 +1532,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 
-     pMga = MGAPTR(pScrn);
-     /* Set here until dri is enabled */
--#ifdef XF86DRI
-+#ifdef MGADRI
-     pMga->haveQuiescense = 1;
- #endif
-     /* Get the entity, and make sure it is PCI. */
-@@ -1706,13 +1706,13 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     }
- 
-     if (pMga->DualHeadEnabled) {
--#ifdef XF86DRI
-+#ifdef MGADRI
-         pMga->GetQuiescence = MGAGetQuiescenceShared;
- #endif
-     } else {                                              /* single-head mode */
-         pMga->SecondCrtc = FALSE;
-         pMga->HWCursor = TRUE;
--#ifdef XF86DRI
-+#ifdef MGADRI
-         pMga->GetQuiescence = MGAGetQuiescence;
- #endif
-     }
-@@ -1942,7 +1942,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
-     if (pScrn->depth == 8)
- 	pScrn->rgbBits = 8;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     from = X_DEFAULT;
-     pMga->agpMode = MGA_DEFAULT_AGP_MODE;
- 
-@@ -2637,7 +2637,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
- 	}
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     /* Load the dri module if requested. */
-     if (xf86ReturnOptValBool(pMga->Options, OPTION_DRI, FALSE)) {
-        xf86LoadSubModule(pScrn, "dri");
-@@ -2878,7 +2878,7 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     vgaReg = &hwp->ModeReg;
-     mgaReg = &pMga->ModeReg;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled) {
-        DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
-    }
-@@ -2989,7 +2989,7 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	pMga->M1currentMode = (DisplayModePtr)mode->Private;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled)
-      DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
- #endif
-@@ -3138,7 +3138,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     MGAEntPtr pMgaEnt = NULL;
-     int f;
-     CARD32 VRTemp, FBTemp;
--#ifdef XF86DRI
-+#ifdef MGADRI
-     MessageType driFrom = X_DEFAULT;
- #endif
-     DPMSSetProcPtr mga_dpms_set_proc = NULL;
-@@ -3317,7 +3317,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	FBStart = pMga->FbStart;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-      /*
-       * Setup DRI after visuals have been established.
-       *
-@@ -3473,7 +3473,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     MGAInitVideo(pScreen);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
-        /* Now that mi, drm and others have done their thing,
- 	* complete the DRI setup.
-@@ -3625,7 +3625,7 @@ MGAEnterVT(int scrnIndex, int flags)
- 
-     pMga = MGAPTR(pScrn);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
- 	if (pMga->irq) {
- 	    /* Need to make sure interrupts are enabled */
-@@ -3651,7 +3651,7 @@ static Bool
- MGAEnterVTFBDev(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
--#ifdef XF86DRI
-+#ifdef MGADRI
-     ScreenPtr pScreen;
-     MGAPtr pMga;
- 
-@@ -3690,7 +3690,7 @@ MGALeaveVT(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     vgaHWPtr hwp = VGAHWPTR(pScrn);
--#ifdef XF86DRI
-+#ifdef MGADRI
-     MGAPtr pMga = MGAPTR(pScrn);
-     ScreenPtr pScreen;
- #endif
-@@ -3698,7 +3698,7 @@ MGALeaveVT(int scrnIndex, int flags)
-     MGARestore(pScrn);
-     vgaHWLock(hwp);
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled) {
-         pScreen = screenInfo.screens[scrnIndex];
-         DRILock(pScreen, 0);
-@@ -3760,7 +3760,7 @@ MGACloseScreen(int scrnIndex, ScreenPtr pScreen)
-         pMga->FbMapSize = FBTemp;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-    if (pMga->directRenderingEnabled) {
-        MGADRICloseScreen(pScreen);
-        pMga->directRenderingEnabled=FALSE;
-diff --git a/src/mga_exa.c b/src/mga_exa.c
-index e5eaa92..ced6452 100644
---- a/src/mga_exa.c
-+++ b/src/mga_exa.c
-@@ -41,7 +41,7 @@
- #include "mga_macros.h"
- 
- #include "exa.h"
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "mga_dri.h"
- #endif
- 
-@@ -763,7 +763,7 @@ mgaWaitMarker(ScreenPtr pScreen, int marker)
-     while (INREG (MGAREG_Status) & 0x10000);
- }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- static void
- init_dri(ScrnInfoPtr pScrn)
- {
-@@ -837,7 +837,7 @@ init_dri(ScrnInfoPtr pScrn)
-                        MGA_BUFFER_ALIGN) & ~MGA_BUFFER_ALIGN;
-     dri->backPitch = widthBytes;
- }
--#endif /* XF86DRI */
-+#endif /* MGADRI */
- 
- Bool
- mgaExaInit(ScreenPtr pScreen)
-@@ -898,7 +898,7 @@ mgaExaInit(ScreenPtr pScreen)
-     pExa->UploadToScreen = mgaUploadToScreen;
-     pExa->DownloadFromScreen = mgaDownloadFromScreen;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if (pMga->directRenderingEnabled)
-         init_dri(pScrn);
- #endif
-diff --git a/src/mga_macros.h b/src/mga_macros.h
-index 130651d..d3b0d0e 100644
---- a/src/mga_macros.h
-+++ b/src/mga_macros.h
-@@ -17,7 +17,7 @@
- 
- #define RGBEQUAL(c) (!((((c) >> 8) ^ (c)) & 0xffff))
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #define MGA_SYNC_XTAG                 0x275f4200
- 
- #define MGABUSYWAIT() do { \
-@@ -64,7 +64,7 @@ while(INREG(MGAREG_DWGSYNC) != MGA_SYNC_XTAG) ; \
- 	WAITFIFO(1); \
- 	OUTREG(MGAREG_CXBNDRY, 0xFFFF0000); }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #define CHECK_DMA_QUIESCENT(pMGA, pScrn) {	\
-    if (!pMGA->haveQuiescense) {			\
-       pMGA->GetQuiescence( pScrn );		\
-diff --git a/src/mga_merge.c b/src/mga_merge.c
-index aec3443..f355f76 100644
---- a/src/mga_merge.c
-+++ b/src/mga_merge.c
-@@ -316,7 +316,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
-     pMga->Chipset = pMga1->Chipset;
-     pMga->ChipRev = pMga1->ChipRev;
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     pMga->agpMode = pMga1->agpMode;
- #endif
- 
-diff --git a/src/mga_storm.c b/src/mga_storm.c
-index f0e6194..7ac3ae0 100644
---- a/src/mga_storm.c
-+++ b/src/mga_storm.c
-@@ -24,7 +24,7 @@
- #include "miline.h"
- #include "servermd.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "GL/glxtokens.h"
- #endif
- 
-@@ -32,7 +32,7 @@
- #include "mga_reg.h"
- #include "mga_macros.h"
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
- #include "mga_dri.h"
- #endif
- 
-@@ -797,7 +797,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
- 	break;
-     }
- 
--#ifdef XF86DRI
-+#ifdef MGADRI
-     if ( pMga->directRenderingEnabled ) {
-        MGADRIServerPrivatePtr pMGADRIServer = pMga->DRIServerInfo;
-        BoxRec MemBox;
-@@ -899,7 +899,7 @@ Bool mgaAccelInit( ScreenPtr pScreen )
- 		   pMGADRIServer->textureOffset );
-     }
-     else
--#endif /* defined(XF86DRI) */
-+#endif /* defined(MGADRI) */
-     {
-        AvailFBArea.x1 = 0;
-        AvailFBArea.x2 = pScrn->displayWidth;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-neomagic/git-fixes.diff b/extra/xf86-video-neomagic/git-fixes.diff
deleted file mode 100644
index dafba0b2f..000000000
--- a/extra/xf86-video-neomagic/git-fixes.diff
+++ /dev/null
@@ -1,616 +0,0 @@
-From eba90ed039416fa5db1800ce695d2a970f43b0e0 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 20:15:29 +0000
-Subject: config: upgrade to util-macros 1.8 for additional man page support
-
-Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
-The value of MAN_SUBST is the same for all X.Org packages.
----
-diff --git a/configure.ac b/configure.ac
-index 38cba3a..a80955b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
- # Checks for programs.
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
---
-cgit v0.9.0.2-2-gbebe
-From 9ad3e98825d45208ed2754f592527a05949f676d Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 22:45:19 +0000
-Subject: config: update AC_PREREQ statement to 2.60
-
-Unrelated to the previous patches, the new value simply reflects
-the reality that the minimum level for autoconf to configure
-all x.org modules is 2.60 dated June 2006.
-
-ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index a80955b..1c7ff1a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
-         1.2.5,
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
---
-cgit v0.9.0.2-2-gbebe
-From 788fa461f40c320c3b9a67ab9bc914e987eefd42 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue, 20 Jul 2010 23:41:31 +0000
-Subject: config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
-
-XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
-AC_PROG_C_C99. This sets gcc with -std=gnu99.
-If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 1c7ff1a..aa17100 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
- # Checks for programs.
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
---
-cgit v0.9.0.2-2-gbebe
-From adb592292e40a5e5f032ca95f3371c6b77227c40 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 00:24:42 +0000
-Subject: config: remove unrequired AC_HEADER_STDC
-
-Autoconf says:
-"This macro is obsolescent, as current systems have conforming
-header files. New programs need not use this macro".
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index aa17100..30c0e86 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,8 +79,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- 	      [#include "xorg-server.h"])
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
--# Checks for header files.
--AC_HEADER_STDC
- 
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
---
-cgit v0.9.0.2-2-gbebe
-From 5759eca769091518fd54e0d70193edc3c099e9bb Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 01:44:57 +0000
-Subject: config: remove unrequired AC_SUBST([XORG_CFLAGS])
-
-This macro is called by PKG_CHECK_MODULES
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 30c0e86..86f016f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,7 +86,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=neomagic
---
-cgit v0.9.0.2-2-gbebe
-From bcfba240265ecd633fcba051591b6c50b9373a53 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 13:27:42 +0000
-Subject: config: complete AC_INIT m4 quoting
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 86f016f..46cb0cc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,9 +22,9 @@
- 
- AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
--        1.2.5,
-+        [1.2.5],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-neomagic)
-+        [xf86-video-neomagic])
- 
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_CONFIG_HEADER([config.h])
---
-cgit v0.9.0.2-2-gbebe
-From 2f60a6e4c3be390d4cf0648bdffbdbff67def7ee Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 18:05:22 +0000
-Subject: config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 46cb0cc..7261ed5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_INIT([xf86-video-neomagic],
-         [xf86-video-neomagic])
- 
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
---
-cgit v0.9.0.2-2-gbebe
-From 8486ae164b462d50817b84340af13dccc26384ab Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 18:37:41 +0000
-Subject: config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 7261ed5..1d0a3d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
- AH_TOP([#include "xorg-server.h"])
- 
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
---
-cgit v0.9.0.2-2-gbebe
-From 5e0d301758b15fc1916dd0318f2a5549e3482ccf Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 20:07:00 +0000
-Subject: config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
-
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
----
-diff --git a/configure.ac b/configure.ac
-index 1d0a3d3..73dde93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,8 +91,9 @@ AC_SUBST([moduledir])
- DRIVER_NAME=neomagic
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
---
-cgit v0.9.0.2-2-gbebe
-From dd32df772bdf4462b816bfc2f98ccd18dbb4b930 Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed, 21 Jul 2010 20:49:04 +0000
-Subject: config: add comments for main statements
-
----
-diff --git a/configure.ac b/configure.ac
-index 73dde93..befac41 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,18 +20,18 @@
- #
- # Process this file with autoconf to produce a configure script
- 
-+# Initialize Autoconf
- AC_PREREQ([2.60])
- AC_INIT([xf86-video-neomagic],
-         [1.2.5],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
-         [xf86-video-neomagic])
--
- AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
- # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION],
- XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
-             AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-@@ -53,14 +54,14 @@ AC_ARG_WITH(xorg-module-dir,
-             [moduledir="$libdir/xorg/modules"])
- 
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- 
- save_CFLAGS="$CFLAGS"
---
-cgit v0.9.0.2-2-gbebe
-From a9d69f6d0ab4f66b954949cca016ee7b5b6f7adf Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 20:29:51 +0000
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/neomagic.man b/man/neomagic.man
-index 9daffe5..af8181c 100644
---- a/man/neomagic.man
-+++ b/man/neomagic.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH NEOMAGIC __drivermansuffix__ __vendorversion__
---
-cgit v0.9.0.2-2-gbebe
-From c3cf7e328d7e9c276a3e237dbf9d1772b57a370e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue, 11 Oct 2011 17:43:51 +0000
-Subject: Use malloc/calloc/realloc/free directly
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/neo_dga.c b/src/neo_dga.c
-index 4227da6..3e2a02e 100644
---- a/src/neo_dga.c
-+++ b/src/neo_dga.c
-@@ -86,10 +86,10 @@ NEODGAInit(ScreenPtr pScreen)
- 
-    while(pMode) {
- 
--	newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+	newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- 
- 	if(!newmodes) {
--	   xfree(modes);
-+	   free(modes);
- 	   return FALSE;
- 	}
- 	modes = newmodes;
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index b12c125..c51dad4 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -475,7 +475,7 @@ NEOFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -551,7 +551,7 @@ NEOProbe(DriverPtr drv, int flags)
- 		    foundScreen = TRUE;
- 		}
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- 
-@@ -584,11 +584,11 @@ NEOProbe(DriverPtr drv, int flags)
- 	    foundScreen = TRUE;
- 	}
-       }
--      xfree(usedChips);
-+      free(usedChips);
-     }
- #endif
- 
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- 
-@@ -940,11 +940,11 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     xf86CollectOptions(pScrn, NULL);
-     /* Process the options */
-     if (nPtr->NeoChipset == NM2070) {
--	if (!(nPtr->Options = xalloc(sizeof(NEO_2070_Options))))
-+	if (!(nPtr->Options = malloc(sizeof(NEO_2070_Options))))
- 	    return FALSE;
- 	memcpy(nPtr->Options, NEO_2070_Options, sizeof(NEO_2070_Options));
-     } else {
--	if (!(nPtr->Options = xalloc(sizeof(NEOOptions))))
-+	if (!(nPtr->Options = malloc(sizeof(NEOOptions))))
- 	    return FALSE;
- 	memcpy(nPtr->Options, NEOOptions, sizeof(NEOOptions));
-     }
-@@ -1476,7 +1476,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     
-     if(nPtr->shadowFB) {
- 	nPtr->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--	nPtr->ShadowPtr = xalloc(nPtr->ShadowPitch * height);
-+	nPtr->ShadowPtr = malloc(nPtr->ShadowPitch * height);
- 	displayWidth = nPtr->ShadowPitch / (pScrn->bitsPerPixel >> 3);
- 	FBStart = nPtr->ShadowPtr;
-     } else {
-@@ -1789,7 +1789,7 @@ NEOCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     if (nPtr->CursorInfo)
- 	xf86DestroyCursorInfoRec(nPtr->CursorInfo);
-     if (nPtr->ShadowPtr)
--	xfree(nPtr->ShadowPtr);
-+	free(nPtr->ShadowPtr);
- 
-     pScrn->vtSema = FALSE;
-     pScreen->CloseScreen = nPtr->CloseScreen;
-@@ -2860,7 +2860,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     if (NeoNew->reg) {
- 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		   "Non-NULL reg in NeoInit: reg=%p\n", (void *)NeoNew->reg);
--	xfree(NeoNew->reg);
-+	free(NeoNew->reg);
- 	NeoNew->reg = NULL;
-     }
- 
-diff --git a/src/neo_video.c b/src/neo_video.c
-index a9e1e25..0edae30 100644
---- a/src/neo_video.c
-+++ b/src/neo_video.c
-@@ -99,7 +99,7 @@ NEOInitVideo(ScreenPtr pScreen)
- 	    numAdaptors = 1;
- 	    overlayAdaptors = &newAdaptor;
- 	} else {
--	    newAdaptors = xalloc((numAdaptors + 1) 
-+	    newAdaptors = malloc((numAdaptors + 1) 
- 				 * sizeof(XF86VideoAdaptorPtr*));
- 	    if (newAdaptors){
- 		memcpy(newAdaptors, overlayAdaptors, 
-@@ -114,7 +114,7 @@ NEOInitVideo(ScreenPtr pScreen)
- 	xf86XVScreenInit(pScreen, overlayAdaptors, numAdaptors);
- 
-     if (newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- static XF86VideoEncodingRec NEOVideoEncodings[] =
-@@ -211,7 +211,7 @@ NEOSetupVideo(ScreenPtr pScreen)
- #ifdef DEBUG
-     xf86DrvMsg(pScrn->scrnIndex,X_INFO,"NEOSetupVideo\n");
- #endif
--    if ((overlayAdaptor = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if ((overlayAdaptor = calloc(1, sizeof(XF86VideoAdaptorRec) +
- 			      sizeof(DevUnion) + 
- 			      sizeof(NEOPortRec))) == NULL){
- 	return (NULL);
-@@ -918,7 +918,7 @@ NEOInitOffscreenImages(ScreenPtr pScreen)
- #ifdef DEBUG
-     xf86DrvMsg(xf86Screens[pScreen->myNum]->scrnIndex,X_INFO,"NEOInitOffscreenImages\n");
- #endif
--    if ((offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))) == NULL){
-+    if ((offscreenImages = malloc(sizeof(XF86OffscreenImageRec))) == NULL){
- 	return;
-     }
- 
-@@ -1017,19 +1017,19 @@ NEOAllocSurface(ScrnInfoPtr pScrn, int id,
- 
-     surface->width = width;
-     surface->height = height;
--    if ((surface->pitches = xalloc(sizeof(int))) == NULL){
-+    if ((surface->pitches = malloc(sizeof(int))) == NULL){
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
--    if ((surface->offsets = xalloc(sizeof(int))) == NULL){
--	xfree(surface->pitches);
-+    if ((surface->offsets = malloc(sizeof(int))) == NULL){
-+	free(surface->pitches);
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
- 
--    if ((pPriv = xalloc(sizeof(NEOOffscreenRec))) == NULL){
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if ((pPriv = malloc(sizeof(NEOOffscreenRec))) == NULL){
-+	free(surface->pitches);
-+	free(surface->offsets);
- 	xf86FreeOffscreenLinear(linear);
- 	return (BadAlloc);
-     }
-@@ -1057,9 +1057,9 @@ NEOFreeSurface(XF86SurfacePtr surface)
- 	NEOStopSurface(surface);
- 
-     xf86FreeOffscreenLinear(pPriv->linear);
--    xfree(surface->pitches);
--    xfree(surface->offsets);
--    xfree(surface->devPrivate.ptr);
-+    free(surface->pitches);
-+    free(surface->offsets);
-+    free(surface->devPrivate.ptr);
-     return (Success);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
-From f2a771c6d2a2308245a0d46301e579b50fb2b6bd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Tue, 11 Oct 2011 17:45:11 +0000
-Subject: Include <stdlib.h> for abs()
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index c51dad4..f8bca2c 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -107,6 +107,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include "scrnintstr.h"
- #include "servermd.h"
- 
-+#include <stdlib.h>
- #include <unistd.h>
- 
- /* Mandatory functions */
---
-cgit v0.9.0.2-2-gbebe
-From 07845a120a674380b6b499961e6c81accfdd6a2e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:50:28 +0000
-Subject: Fall back to shadowfb when XAA is unavailable
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index f8bca2c..a034f86 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -1089,6 +1089,18 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     if (nPtr->showcache)
- 	xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
- 		   "Show chache for debugging\n");
-+
-+    if (!xf86LoadSubModule(pScrn, "xaa")) {
-+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadow\n");
-+	nPtr->shadowFB = 1;
-+    }
-+
-+    if (nPtr->shadowFB) {
-+	if (!xf86LoadSubModule(pScrn, "shadow")) {
-+	    RETURN;
-+	}
-+    }
-+
-     if (nPtr->shadowFB) {
-         nPtr->noAccel = TRUE;
-         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
-@@ -1314,15 +1326,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
- 	RETURN;
-     }
- 
--    if (!xf86LoadSubModule(pScrn, "xaa")) 
--        RETURN;
--
--    if (nPtr->shadowFB) {
--	if (!xf86LoadSubModule(pScrn, "shadow")) {
--	    RETURN;
--	}
--    }
--    
-     if (!nPtr->swCursor) {
- 	if (!xf86LoadSubModule(pScrn, "ramdac"))
- 	    RETURN;
---
-cgit v0.9.0.2-2-gbebe
-From 819c8f2119b8db10a6a9e4553cf88d66cff6eb8e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:51:31 +0000
-Subject: Fix for new vgahw ABI
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index a034f86..509a77f 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -660,6 +660,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
-     if (!vgaHWGetHWRec(pScrn))
- 	return FALSE;
-     hwp = VGAHWPTR(pScrn);
-+    vgaHWSetStdFuncs(hwp);
- 
-     /* Allocate the NeoRec driverPrivate */
-     if (!NEOGetRec(pScrn)) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-r128/git-fixes.patch b/extra/xf86-video-r128/git-fixes.patch
deleted file mode 100644
index 933e8fb2a..000000000
--- a/extra/xf86-video-r128/git-fixes.patch
+++ /dev/null
@@ -1,842 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..05bcb74 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,91 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright 2007 George Sapountzis
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+
-+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
-+                     Precision Insight, Inc., Cedar Park, Texas, and
-+                     VA Linux Systems Inc., Fremont, California.
-+
-+All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation on the rights to use, copy, modify, merge,
-+publish, distribute, sublicense, and/or sell copies of the Software,
-+and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the
-+next paragraph) shall be included in all copies or substantial
-+portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
-+SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+OTHER DEALINGS IN THE SOFTWARE.
-+
-+Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
-+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
-+All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+DEALINGS IN THE SOFTWARE.
-+
-+Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-+
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting documentation, and
-+that the name of Marc Aurele La France not be used in advertising or
-+publicity pertaining to distribution of the software without specific,
-+written prior permission.  Marc Aurele La France makes no representations
-+about the suitability of this software for any purpose.  It is provided
-+"as-is" without express or implied warranty.
-+
-+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
-+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/Makefile.am b/Makefile.am
-index 1f4c3c4..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,21 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
--if BUILD_LINUXDOC
--README.r128: README.r128.sgml
--	$(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128
-+.PHONY: ChangeLog INSTALL
- 
--endif
--
--EXTRA_DIST = README.r128 README.r128.sgml ChangeLog
--CLEANFILES = ChangeLog
--
--.PHONY: ChangeLog
-+INSTALL:
-+	$(INSTALL_CMD)
- 
- ChangeLog:
- 	$(CHANGELOG_CMD)
- 
--dist-hook: ChangeLog
-+dist-hook: ChangeLog INSTALL
-diff --git a/README b/README
-index cb61870..5c6f59d 100644
---- a/README
-+++ b/README
-@@ -1,4 +1,161 @@
--xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server
-+  Information for ATI Rage 128 Users
-+  Precision Insight, Inc., SuSE GmbH
-+  13 June 2000
-+  ____________________________________________________________
-+
-+  Table of Contents
-+
-+
-+  1. Supported Hardware
-+  2. Features
-+  3. Technical Notes
-+  4. Reported Working Video Cards
-+  5. Configuration
-+  6. Driver Options
-+  7. Known Limitations
-+  8. Authors
-+
-+
-+  ______________________________________________________________________
-+
-+  1.  Supported Hardware
-+
-+
-+  o  ATI Rage 128 based cards
-+
-+
-+
-+  2.  Features
-+
-+
-+  o  Full support (including hardware accelerated 2D drawing) for 8, 15,
-+     16, 24 bit pixel depths.
-+
-+  o  Hardware cursor support to reduce sprite flicker.
-+
-+  o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
-+
-+  o  Support for doublescan video modes (e.g., 320x200 and 320x240).
-+
-+  o  Support for gamma correction at all pixel depths.
-+
-+  o  Fully programmable clock supported.
-+
-+  o  Robust text mode restore for VT switching.
-+
-+
-+
-+  3.  Technical Notes
-+
-+
-+  o  None
-+
-+
-+
-+  4.  Reported Working Video Cards
-+
-+
-+  o  Rage Fury AGP 32MB
-+
-+  o  XPERT 128 AGP 16MB
-+
-+  o  XPERT 99 AGP 8MB
-+
-+
-+
-+  5.  Configuration
-+
-+  The driver auto-detects all device information necessary to initialize
-+  the card. The only lines you need in the "Device" section of your
-+  xorg.conf file are:
-+
-+         Section "Device"
-+             Identifier "Rage 128"
-+             Driver     "r128"
-+         EndSection
-+
-+
-+  or let xorgconfig do this for you.
-+
-+  However, if you have problems with auto-detection, you can specify:
-+
-+  o  VideoRam - in kilobytes
-+
-+  o  MemBase - physical address of the linear framebuffer
-+
-+  o  IOBase - physical address of the memory mapped IO registers
-+
-+  o  ChipID - PCI DEVICE ID
-+
-+
-+
-+  6.  Driver Options
-+
-+
-+  o  "hw_cursor" - request hardware cursor (default)
-+
-+  o  "sw_cursor" - software cursor only
-+
-+  o  "no_accel" - software rendering only
-+
-+  o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
-+
-+  o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
-+
-+
-+
-+  7.  Known Limitations
-+
-+
-+  o  None
-+
-+
-+
-+  8.  Authors
-+
-+  The X11R7.5 driver was originally part of XFree86 4.4 rc2.
-+
-+  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
-+
-+  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
-+
-+  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
-+
-+  The XFree86 4 driver was funded by ATI and was donated to The XFree86
-+  Project by:
-+
-+      Precision Insight, Inc.
-+      Cedar Park, TX
-+      USA
-+
-+
-+  The XFree86 3.3.x driver used for the port was written by:
-+
-+  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
-+
-+  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
-+
-+     The XFree86 3.3.x driver was funded by ATI and was donated to The
-+     XFree86 Project by Precision Insight, Inc. It was based in part on
-+     an earlier driver that was written by:
-+
-+  o  Alan Hourihane  <mailto:alanh@fairlite.demon.co.uk>
-+
-+  o  Dirk Hohndel  <mailto:hohndel@suse.de>
-+
-+  This early driver was funded and donated to The XFree86 Project by:
-+
-+      SuSE GmbH
-+      Schanzaekerstr. 10
-+      90443 Nuernberg
-+      Germany
-+
-+
-+
-+  http://www.precisioninsight.com
-+
-+  http://www.suse.com
-+
- 
- Please submit bugs & patches to the Xorg bugzilla:
- 
-diff --git a/README.r128 b/README.r128
-deleted file mode 100644
-index dcc2715..0000000
---- a/README.r128
-+++ /dev/null
-@@ -1,160 +0,0 @@
--  Information for ATI Rage 128 Users
--  Precision Insight, Inc., SuSE GmbH
--  13 June 2000
--  ____________________________________________________________
--
--  Table of Contents
--
--
--  1. Supported Hardware
--  2. Features
--  3. Technical Notes
--  4. Reported Working Video Cards
--  5. Configuration
--  6. Driver Options
--  7. Known Limitations
--  8. Authors
--
--
--  ______________________________________________________________________
--
--  [1m1.  Supported Hardware[0m
--
--
--  +o  ATI Rage 128 based cards
--
--
--
--  [1m2.  Features[0m
--
--
--  +o  Full support (including hardware accelerated 2D drawing) for 8, 15,
--     16, 24 bit pixel depths.
--
--  +o  Hardware cursor support to reduce sprite flicker.
--
--  +o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
--
--  +o  Support for doublescan video modes (e.g., 320x200 and 320x240).
--
--  +o  Support for gamma correction at all pixel depths.
--
--  +o  Fully programmable clock supported.
--
--  +o  Robust text mode restore for VT switching.
--
--
--
--  [1m3.  Technical Notes[0m
--
--
--  +o  None
--
--
--
--  [1m4.  Reported Working Video Cards[0m
--
--
--  +o  Rage Fury AGP 32MB
--
--  +o  XPERT 128 AGP 16MB
--
--  +o  XPERT 99 AGP 8MB
--
--
--
--  [1m5.  Configuration[0m
--
--  The driver auto-detects all device information necessary to initialize
--  the card.  The only lines you need in the "Device" section of your
--  xorg.conf file are:
--
--         Section "Device"
--             Identifier "Rage 128"
--             Driver     "r128"
--         EndSection
--
--
--  or let xorgconfig do this for you.
--
--  However, if you have problems with auto-detection, you can specify:
--
--  +o  VideoRam - in kilobytes
--
--  +o  MemBase  - physical address of the linear framebuffer
--
--  +o  IOBase   - physical address of the memory mapped IO registers
--
--  +o  ChipID   - PCI DEVICE ID
--
--
--
--  [1m6.  Driver Options[0m
--
--
--  +o  "hw_cursor" - request hardware cursor (default)
--
--  +o  "sw_cursor" - software cursor only
--
--  +o  "no_accel"  - software rendering only
--
--  +o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
--
--  +o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
--
--
--
--  [1m7.  Known Limitations[0m
--
--
--  +o  None
--
--
--
--  [1m8.  Authors[0m
--
--  The X11R6.8 driver was originally part of XFree86 4.4 rc2.
--
--  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
--
--  +o  Rickard E. (Rik) Faith  <faith@precisioninsight.com>
--
--  +o  Kevin E. Martin  <kevin@precisioninsight.com>
--
--  The XFree86 4 driver was funded by ATI and was donated to The XFree86
--  Project by:
--
--      Precision Insight, Inc.
--      Cedar Park, TX
--      USA
--
--
--  The XFree86 3.3.x driver used for the port was written by:
--
--  +o  Rickard E. (Rik) Faith  <faith@precisioninsight.com>
--
--  +o  Kevin E. Martin  <kevin@precisioninsight.com>
--
--     The XFree86 3.3.x driver was funded by ATI and was donated to The
--     XFree86 Project by Precision Insight, Inc.  It was based in part on
--     an earlier driver that was written by:
--
--  +o  Alan Hourihane  <alanh@fairlite.demon.co.uk>
--
--  +o  Dirk Hohndel  <hohndel@suse.de>
--
--  This early driver was funded and donated to The XFree86 Project by:
--
--      SuSE GmbH
--      Schanzaekerstr. 10
--      90443 Nuernberg
--      Germany
--
--
--
--  http://www.precisioninsight.com
--
--  http://www.suse.com
--
--
--
-diff --git a/README.r128.sgml b/README.r128.sgml
-deleted file mode 100644
-index 8d7f448..0000000
---- a/README.r128.sgml
-+++ /dev/null
-@@ -1,138 +0,0 @@
--<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
--<!ENTITY % defs SYSTEM "defs.ent"> %defs;
--]>
--
--<article>
--<title>Information for ATI Rage 128 Users
--<author>Precision Insight, Inc., SuSE GmbH
--<date>13 June 2000
--
--<ident>
--</ident>
--
--<toc>
--
--<sect>Supported Hardware
--<p>
--<itemize>
--  <item>ATI Rage 128 based cards
--</itemize>
--
--
--<sect>Features
--<p>
--<itemize>
--  <item>Full support (including hardware accelerated 2D drawing) for 8, 15,
--        16, 24 bit pixel depths.
--  <item>Hardware cursor support to reduce sprite flicker.
--  <item>Support for high resolution video modes up to 1800x1440 @ 70Hz.
--  <item>Support for doublescan video modes (e.g., 320x200 and 320x240).
--  <item>Support for gamma correction at all pixel depths.
--  <item>Fully programmable clock supported.
--  <item>Robust text mode restore for VT switching.
--</itemize>
--
--
--<sect>Technical Notes
--<p>
--<itemize>
--  <item>None
--</itemize>
--
--
--<sect>Reported Working Video Cards
--<p>
--<itemize>
--  <item>Rage Fury AGP 32MB
--  <item>XPERT 128 AGP 16MB
--  <item>XPERT 99 AGP 8MB
--</itemize>
--
--
--<sect>Configuration
--<p>
--The driver auto-detects all device information necessary to
--initialize the card.  The only lines you need in the "Device"
--section of your xorg.conf file are:
--<verb>
--       Section "Device"
--           Identifier "Rage 128"
--           Driver     "r128"
--       EndSection
--</verb>
--or let <tt>xorgconfig</tt> do this for you.
--
--However, if you have problems with auto-detection, you can specify:
--<itemize>
--  <item>VideoRam - in kilobytes
--  <item>MemBase  - physical address of the linear framebuffer
--  <item>IOBase   - physical address of the memory mapped IO registers
--  <item>ChipID   - PCI DEVICE ID
--</itemize>
--
--
--<sect>Driver Options
--<p>
--<itemize>
--  <item>"hw_cursor" - request hardware cursor (default)
--  <item>"sw_cursor" - software cursor only
--  <item>"no_accel"  - software rendering only
--  <item>"dac_8_bit" - use color weight 888 in 8 bpp mode (default)
--  <item>"dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
--</itemize>
--
--
--<sect>Known Limitations
--<p>
--<itemize>
--  <item>None
--</itemize>
--
--
--<sect>Authors
--<p>
--The X11R&relvers; driver was originally part of XFree86 4.4 rc2.
--
--The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
--<itemize>
--   <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
--   <item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
--</itemize>
--<p>
--The XFree86 4 driver was funded by ATI and was donated to The XFree86
--Project by:
--<verb>
--    Precision Insight, Inc.
--    Cedar Park, TX
--    USA
--</verb>
--<p>
--The XFree86 3.3.x driver used for the port was written by:
--<itemize>
--   <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
--   <item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
--</itemize>
--The XFree86 3.3.x driver was funded by ATI and was donated to The XFree86
--Project by Precision Insight, Inc.  It was based in part on an earlier
--driver that was written by:
--<itemize>
--   <item>Alan Hourihane <email>alanh@fairlite.demon.co.uk</email>
--   <item>Dirk Hohndel <email>hohndel@suse.de</email>
--</itemize>
--<p>This early driver was funded and donated to The XFree86 Project by:
--<verb>
--    SuSE GmbH
--    Schanzaekerstr. 10
--    90443 Nuernberg
--    Germany
--</verb>
--
--<p>
--<htmlurl name="http://www.precisioninsight.com"
--          url="http://www.precisioninsight.com">
--<p>
--<htmlurl name="http://www.suse.com"
--          url="http://www.suse.com">
--
--
--</article>
-diff --git a/configure.ac b/configure.ac
-index 4e0f463..d5a0821 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,28 +20,30 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-r128],
--        6.8.1,
-+        [6.8.1],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-r128)
--
-+        [xf86-video-r128])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
--# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
--m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.2)
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
- 
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- if test "x$GCC" = "xyes"; then
- 	CPPFLAGS="$CPPFLAGS -Wall"
-@@ -49,38 +51,35 @@ fi
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
-                                   [Disable DRI support [[default=auto]]]),
-               [DRI="$enableval"],
-               [DRI=auto])
- 
--# Checks for extensions
--XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
- AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "$DRI" != no; then
- 	AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-@@ -126,26 +125,20 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
--AC_SUBST([DRI_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=r128
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--XORG_CHECK_LINUXDOC
--XORG_CHANGELOG
--
- AC_MSG_NOTICE(
- [Please change the Driver line in xorg.conf from "ati" to "r128" or install]
- [the ati wrapper as well:]
- [    git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati]
- )
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 858ba62..4e22d61 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = r128.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/r128.man b/man/r128.man
-index 5c7c4fe..4ba933d 100644
---- a/man/r128.man
-+++ b/man/r128.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man,v 1.3 2001/06/01 02:10:05 dawes Exp $
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH R128 __drivermansuffix__ __vendorversion__
-diff --git a/src/r128_driver.c b/src/r128_driver.c
-index d6448b6..9d08d77 100644
---- a/src/r128_driver.c
-+++ b/src/r128_driver.c
-@@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
- 				/* BIOS */
-     from              = X_PROBED;
-     info->BIOSAddr    = info->PciInfo->biosBase & 0xfffe0000;
--    if (dev->BiosBase) {
--	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--		   "BIOS address override, using 0x%08lx instead of 0x%08lx\n",
--		   dev->BiosBase,
--		   info->BIOSAddr);
--	info->BIOSAddr = dev->BiosBase;
--	from           = X_CONFIG;
--    }
-     if (info->BIOSAddr) {
- 	xf86DrvMsg(pScrn->scrnIndex, from,
- 		   "BIOS at 0x%08lx\n", info->BIOSAddr);
diff --git a/extra/xf86-video-siliconmotion/smi-1.7.5-vga.patch b/extra/xf86-video-siliconmotion/smi-1.7.5-vga.patch
deleted file mode 100644
index ef353f0df..000000000
--- a/extra/xf86-video-siliconmotion/smi-1.7.5-vga.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 16 Nov 2011 20:03:25 +0000
-Subject: Adapt to missing PIOOffset in videoabi 12
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/smi_driver.c b/src/smi_driver.c
-index 9c10e46..86644c7 100644
---- a/src/smi_driver.c
-+++ b/src/smi_driver.c
-@@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
- 	    LEAVE(FALSE);
- 
- 	hwp = VGAHWPTR(pScrn);
-+#if ABI_VIDEODRV_VERSION < 12
- 	pSmi->PIOBase = hwp->PIOOffset;
-+#else
-+	pSmi->PIOBase = 0;
-+#endif
- 
- 	xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, "
- 		       "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-sis/git-f5dafa24.patch b/extra/xf86-video-sis/git-f5dafa24.patch
deleted file mode 100644
index 8c15b974b..000000000
--- a/extra/xf86-video-sis/git-f5dafa24.patch
+++ /dev/null
@@ -1,1654 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 33c0d65..62ad933 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,54 +20,53 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-sis],
--        0.10.3,
-+        [0.10.3],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-sis)
--
-+        [xf86-video-sis])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
--XORG_PROG_RAWCPP
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
-                                   [Disable DRI support [[default=auto]]]),
-               [DRI="$enableval"],
-               [DRI=auto])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
-+# Obtain compiler/linker options for the driver dependencies
-+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto >= 2.1 $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
-@@ -76,9 +75,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "$DRI" != no; then
-         AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-@@ -103,8 +99,8 @@ AC_MSG_RESULT([$DRI])
- AM_CONDITIONAL(DRI, test x$DRI = xyes)
- if test "$DRI" = yes; then
-         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
--        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-+        AC_DEFINE(SISDRI,1,[Enable DRI driver support])
-+        AC_DEFINE(SISDRI_DEVEL,1,[Enable developmental DRI driver support])
- fi
- 
- # technically this should be a configure flag.  meh.
-@@ -118,20 +114,19 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
--    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
-+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
-     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([DRI_CFLAGS])
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=sis
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 1b26ac2..9ceb36f 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,39 +31,9 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MANDEFS =  \
--	-D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
--	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
--	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
--	-D__libmansuffix__=$(LIB_MAN_SUFFIX) \
--	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
--	-D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
--	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
--	-D__xconfigfile__=xorg.conf \
--	-D__xservername__=Xorg
--
--# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
--# to cpp, because that trick does not work on all ANSI C preprocessors.
--# Delete line numbers from the cpp output (-P is not portable, I guess).
--# Allow XCOMM to be preceded by whitespace and provide a means of generating
--# output lines with trailing backslashes.
--# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
--
--CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
--                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
--                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
--                       -e '/\@\@$$/s/\@\@$$/\\/'
--
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- .man.$(DRIVER_MAN_SUFFIX):
--	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
- 
-diff --git a/man/sis.man b/man/sis.man
-index 9ae4a1b..578bb68 100644
---- a/man/sis.man
-+++ b/man/sis.man
-@@ -1,17 +1,5 @@
--.\" $XFree86$
--.\" $XdotOrg$
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
--#ifdef __xservername__
--#define __myservername__ __xservername__
--#else
--#define __myservername__ XFree86
--#endif
--#ifdef __xconfigfile__
--#define __myxconfigfile__ __xconfigfile__
--#else
--#define __myxconfigfile__ XF86Config
--#endif
- .TH SIS __drivermansuffix__ __vendorversion__
- .SH NAME
- sis \- SiS and XGI video driver
-@@ -25,7 +13,7 @@ sis \- SiS and XGI video driver
- .fi
- .SH DESCRIPTION
- .B sis
--is an __myservername__ driver for SiS (Silicon Integrated Systems) and XGI video
-+is an __xservername__ driver for SiS (Silicon Integrated Systems) and XGI video
- chips. The driver is accelerated and provides support for colordepths of 8, 16
- and 24 bpp. XVideo, Render and other extensions are supported as well.
- .SH SUPPORTED HARDWARE
-@@ -60,7 +48,7 @@ for SiS315, 55x, 330, 661/741/76x (plus M, FX, MX, GX variants thereof), 340
- and all XGI chips.
- .PP
- .SH CONFIGURATION DETAILS
--Please refer to __myxconfigfile__(__filemansuffix__) for general configuration
-+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details.  This section only covers configuration details specific to this
- driver.
- .PP
-@@ -428,11 +416,7 @@ The amount is to be specified in megabyte, the default is 8.
- .SH "KNOWN BUGS"
- none.
- .SH "SEE ALSO"
--#ifdef __xservername__
- __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
--#else
--XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
--#endif
- .PP
- .B "http://www.winischhofer.eu/linuxsisvga.shtml"
- for more information and updates
-diff --git a/src/initextx.c b/src/initextx.c
-index 5c00398..1e84d0f 100644
---- a/src/initextx.c
-+++ b/src/initextx.c
-@@ -238,10 +238,10 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 	 continue;
-       }
- 
--      if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+      if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
-       memset(new, 0, sizeof(DisplayModeRec));
--      if(!(new->name = xalloc(10))) {
--	 xfree(new);
-+      if(!(new->name = malloc(10))) {
-+	 free(new);
- 	 return first;
-       }
-       if(!first) first = new;
-@@ -385,11 +385,11 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 		     }
- 		  }
- 
--		  if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+		  if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
- 
- 		  memset(new, 0, sizeof(DisplayModeRec));
--		  if(!(new->name = xalloc(12))) {
--		     xfree(new);
-+		  if(!(new->name = malloc(12))) {
-+		     free(new);
- 		     return first;
- 		  }
- 		  if(!first) first = new;
-@@ -470,11 +470,11 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfo
- 
- 	 if(pSiS->SiS_Pr->CP_DataValid[i]) {
- 
--	    if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+	    if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
- 
- 	    memset(new, 0, sizeof(DisplayModeRec));
--	    if(!(new->name = xalloc(10))) {
--	       xfree(new);
-+	    if(!(new->name = malloc(10))) {
-+	       free(new);
- 	       return first;
- 	    }
- 	    if(!first) first = new;
-diff --git a/src/osdef.h b/src/osdef.h
-index cd6b907..5776910 100644
---- a/src/osdef.h
-+++ b/src/osdef.h
-@@ -110,12 +110,12 @@
- #warning sisfb will not work!
- #endif
- 
--#define OutPortByte(p,v) outb((u8)(v),(IOADDRESS)(p))
--#define OutPortWord(p,v) outw((u16)(v),(IOADDRESS)(p))
--#define OutPortLong(p,v) outl((u32)(v),(IOADDRESS)(p))
--#define InPortByte(p)    inb((IOADDRESS)(p))
--#define InPortWord(p)    inw((IOADDRESS)(p))
--#define InPortLong(p)    inl((IOADDRESS)(p))
-+#define OutPortByte(p,v) outb((u8)(v),(unsigned long)(p))
-+#define OutPortWord(p,v) outw((u16)(v),(unsigned long)(p))
-+#define OutPortLong(p,v) outl((u32)(v),(unsigned long)(p))
-+#define InPortByte(p)    inb((unsigned long)(p))
-+#define InPortWord(p)    inw((unsigned long)(p))
-+#define InPortLong(p)    inl((unsigned long)(p))
- #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)
- 
- #endif /* LINUX_KERNEL */
-@@ -129,12 +129,12 @@
- #define SIS300
- #define SIS315H
- 
--#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v))
--#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v))
--#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v))
--#define InPortByte(p)    inSISREG((IOADDRESS)(p))
--#define InPortWord(p)    inSISREGW((IOADDRESS)(p))
--#define InPortLong(p)    inSISREGL((IOADDRESS)(p))
-+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v))
-+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v))
-+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v))
-+#define InPortByte(p)    inSISREG((unsigned long)(p))
-+#define InPortWord(p)    inSISREGW((unsigned long)(p))
-+#define InPortLong(p)    inSISREGL((unsigned long)(p))
- #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
- 
- #endif /* XF86 */
-diff --git a/src/sis.h b/src/sis.h
-index 400b83f..f2ca3a9 100644
---- a/src/sis.h
-+++ b/src/sis.h
-@@ -86,6 +86,14 @@
- #include "xf86cmap.h"
- #include "vbe.h"
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+#define _swapl(x, n) swapl(x,n)
-+#define _swaps(x, n) swaps(x,n)
-+#else
-+#define _swapl(x, n) swapl(x)
-+#define _swaps(x, n) swaps(x)
-+#endif
-+
- #define SIS_HaveDriverFuncs 0
- 
- #undef SISISXORG6899900
-@@ -173,7 +181,13 @@
- 
- #undef SISHAVEDRMWRITE
- #undef SISNEWDRI
--#ifdef XF86DRI
-+
-+/* if the server was built without DRI support, force-disable DRI */
-+#ifndef XF86DRI
-+#undef SISDRI
-+#endif
-+
-+#ifdef SISDRI
- #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,3,0)
- #define SISHAVEDRMWRITE
- #endif
-@@ -187,7 +201,7 @@
- #include "dri.h"
- #include "GL/glxint.h"
- #include "sis_dri.h"
--#endif /* XF86DRI */
-+#endif /* SISDRI */
- 
- /* Configurable stuff: ------------------------------------- */
- 
-@@ -251,7 +265,6 @@
- #endif
- 
- /* Need that for SiSCtrl and Pseudo-Xinerama */
--#define NEED_REPLIES				/* ? */
- #define EXTENSION_PROC_ARGS void *
- #include "extnsionst.h" 			/* required */
- #include <X11/extensions/panoramiXproto.h> 	/* required */
-@@ -805,7 +818,7 @@ typedef struct {
-     ScrnInfoPtr		pScrn_2;
-     UChar		*BIOS;
-     struct SiS_Private	*SiS_Pr;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     SISAGPHTYPE		agpHandle;
-     ULong		agpAddr;
-     UChar		*agpBase;
-@@ -971,7 +984,7 @@ typedef struct {
-     void 		*RealFbBase;	/* Real VRAM virtual linear address (for DHM and SiS76x UMA skipping) */
-     CARD32		IOAddress;	/* MMIO physical address */
-     void		*IOBase;	/* MMIO linear address */
--    IOADDRESS		IODBase;	/* Base of PIO memory area */
-+    unsigned long	IODBase;	/* Base of PIO memory area */
- #ifdef __alpha__
-     void		*IOBaseDense;	/* MMIO for Alpha platform */
- #endif
-@@ -1085,7 +1098,7 @@ typedef struct {
-     unsigned int	cmdQueueSize_div2;
-     unsigned int	cmdQueueSize_div4;
-     unsigned int	cmdQueueSize_4_3;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     SISAGPHTYPE		agpHandle;
-     ULong		agpAddr;
-     UChar 		*agpBase;
-@@ -1144,7 +1157,7 @@ typedef struct {
- 
-     /* DRI */
-     Bool		loadDRI;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     Bool		directRenderingEnabled;
-     DRIInfoPtr 		pDRIInfo;
-     int			drmSubFD;
-@@ -1348,7 +1361,7 @@ typedef struct {
-     Bool		skipswitchcheck;
-     unsigned int	VBFlagsInit;
-     DisplayModePtr	currentModeLast;
--    IOADDRESS		MyPIOOffset;
-+    unsigned long	MyPIOOffset;
-     Bool		OverruleRanges;
-     Bool		BenchMemCpy;
-     Bool		NeedCopyFastVidCpy;
-diff --git a/src/sis6326_video.c b/src/sis6326_video.c
-index c6b18e2..66352b7 100644
---- a/src/sis6326_video.c
-+++ b/src/sis6326_video.c
-@@ -170,7 +170,7 @@ void SIS6326InitVideo(ScreenPtr pScreen)
- 		adaptors = &newAdaptor;
- 	} else {
- 		/* need to free this someplace */
--		newAdaptors = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+		newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
- 		if(newAdaptors) {
- 			memcpy(newAdaptors, adaptors, num_adaptors *
- 				sizeof(XF86VideoAdaptorPtr));
-@@ -185,7 +185,7 @@ void SIS6326InitVideo(ScreenPtr pScreen)
- 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
-@@ -531,7 +531,7 @@ SIS6326SetupImageVideo(ScreenPtr pScreen)
-        return NULL;
- #endif
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(SISPortPrivRec) +
-                             sizeof(DevUnion))))
-        return NULL;
-diff --git a/src/sis_dga.c b/src/sis_dga.c
-index d358645..16b0ee4 100644
---- a/src/sis_dga.c
-+++ b/src/sis_dga.c
-@@ -150,18 +150,18 @@ SISSetupDGAMode(
- 
- 	if(pMode->HDisplay != otherPitch) {
- 
--	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
- 	    oneMore  = TRUE;
- 
- 	} else {
- 
--	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
- 	    oneMore  = FALSE;
- 
- 	}
- 
- 	if(!newmodes) {
--	    xfree(modes);
-+	    free(modes);
- 	    return NULL;
- 	}
- 	modes = newmodes;
-diff --git a/src/sis_dri.c b/src/sis_dri.c
-index 3a476a2..97ed951 100644
---- a/src/sis_dri.c
-+++ b/src/sis_dri.c
-@@ -149,19 +149,19 @@ SISInitVisualConfigs(ScreenPtr pScreen)
-   case 32:
-     numConfigs = (useZ16) ? 8 : 16;
- 
--    if(!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
-+    if(!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
- 						   numConfigs))) {
-        return FALSE;
-     }
--    if(!(pSISConfigs = (SISConfigPrivPtr)xcalloc(sizeof(SISConfigPrivRec),
-+    if(!(pSISConfigs = (SISConfigPrivPtr)calloc(sizeof(SISConfigPrivRec),
- 						    numConfigs))) {
--       xfree(pConfigs);
-+       free(pConfigs);
-        return FALSE;
-     }
--    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)xcalloc(sizeof(SISConfigPrivPtr),
-+    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)calloc(sizeof(SISConfigPrivPtr),
- 							  numConfigs))) {
--       xfree(pConfigs);
--       xfree(pSISConfigs);
-+       free(pConfigs);
-+       free(pSISConfigs);
-        return FALSE;
-     }
-     for(i=0; i<numConfigs; i++) pSISConfigPtrs[i] = &pSISConfigs[i];
-@@ -319,7 +319,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
-      pDRIInfo->busIdString = DRICreatePCIBusID(pSIS->PciInfo);
-   } else {
- #endif
--     pDRIInfo->busIdString = xalloc(64);
-+     pDRIInfo->busIdString = malloc(64);
-      sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
- 	     pSIS->PciBus, pSIS->PciDevice, pSIS->PciFunc);
- #ifdef SISHAVECREATEBUSID
-@@ -383,7 +383,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
-   pDRIInfo->SAREASize = SAREA_MAX;
- #endif
- 
--  if(!(pSISDRI = (SISDRIPtr)xcalloc(sizeof(SISDRIRec), 1))) {
-+  if(!(pSISDRI = (SISDRIPtr)calloc(sizeof(SISDRIRec), 1))) {
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-      pSIS->pDRIInfo = 0;
-      return FALSE;
-@@ -401,7 +401,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
- 
-   if(!DRIScreenInit(pScreen, pDRIInfo, &pSIS->drmSubFD)) {
-      xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] DRIScreenInit failed. Disabling the DRI.\n");
--     xfree(pDRIInfo->devPrivate);
-+     free(pDRIInfo->devPrivate);
-      pDRIInfo->devPrivate = 0;
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-      pSIS->pDRIInfo = 0;
-@@ -794,7 +794,7 @@ SISDRICloseScreen(ScreenPtr pScreen)
- 
-   if(pSIS->pDRIInfo) {
-      if(pSIS->pDRIInfo->devPrivate) {
--	xfree(pSIS->pDRIInfo->devPrivate);
-+	free(pSIS->pDRIInfo->devPrivate);
- 	pSIS->pDRIInfo->devPrivate = NULL;
-      }
-      DRIDestroyInfoRec(pSIS->pDRIInfo);
-@@ -802,12 +802,12 @@ SISDRICloseScreen(ScreenPtr pScreen)
-   }
- 
-   if(pSIS->pVisualConfigs) {
--     xfree(pSIS->pVisualConfigs);
-+     free(pSIS->pVisualConfigs);
-      pSIS->pVisualConfigs = NULL;
-   }
- 
-   if(pSIS->pVisualConfigsPriv) {
--     xfree(pSIS->pVisualConfigsPriv);
-+     free(pSIS->pVisualConfigsPriv);
-      pSIS->pVisualConfigsPriv = NULL;
-   }
- 
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index d95b5f1..7a5be4e 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -74,8 +74,7 @@
- 
- #include "sis_driver.h"
- 
--#define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- 
- #include "globals.h"
- 
-@@ -86,11 +85,35 @@
- #include <X11/extensions/dpms.h>
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
-+#include <inputstr.h> /* for inputInfo */
-+#endif
-+
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
- #include "dri.h"
- #endif
- 
-+/*
-+ * LookupWindow was removed with video abi 11.
-+ */
-+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
-+#ifndef DixGetAttrAccess
-+#define DixGetAttrAccess   (1<<4)
-+#endif
-+#endif
-+
-+#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 2)
-+static inline int
-+dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
-+{
-+    *pWin = LookupWindow(id, client);
-+    if (!*pWin)
-+	return BadWindow;
-+    return Success;
-+}
-+#endif
-+
- /* Globals (yes, these ARE really required to be global) */
- 
- #ifdef SISUSEDEVPORT
-@@ -299,9 +322,9 @@ SISFreeRec(ScrnInfoPtr pScrn)
-     pSiSEnt = pSiS->entityPrivate;
- #endif
- 
--    if(pSiS->pstate) xfree(pSiS->pstate);
-+    if(pSiS->pstate) free(pSiS->pstate);
-     pSiS->pstate = NULL;
--    if(pSiS->fonts) xfree(pSiS->fonts);
-+    if(pSiS->fonts) free(pSiS->fonts);
-     pSiS->fonts = NULL;
- 
- #ifdef SISDUALHEAD
-@@ -312,11 +335,11 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	   * and we need the BIOS image and SiS_Private for the first
- 	   * head.
- 	   */
--	  if(pSiSEnt->BIOS) xfree(pSiSEnt->BIOS);
-+	  if(pSiSEnt->BIOS) free(pSiSEnt->BIOS);
- 	  pSiSEnt->BIOS = pSiS->BIOS = NULL;
--	  if(pSiSEnt->SiS_Pr) xfree(pSiSEnt->SiS_Pr);
-+	  if(pSiSEnt->SiS_Pr) free(pSiSEnt->SiS_Pr);
- 	  pSiSEnt->SiS_Pr = pSiS->SiS_Pr = NULL;
--	  if(pSiSEnt->RenderAccelArray) xfree(pSiSEnt->RenderAccelArray);
-+	  if(pSiSEnt->RenderAccelArray) free(pSiSEnt->RenderAccelArray);
- 	  pSiSEnt->RenderAccelArray = pSiS->RenderAccelArray = NULL;
- 	  pSiSEnt->pScrn_1 = NULL;
-        } else {
-@@ -327,21 +350,21 @@ SISFreeRec(ScrnInfoPtr pScrn)
-        }
-     } else {
- #endif
--       if(pSiS->BIOS) xfree(pSiS->BIOS);
-+       if(pSiS->BIOS) free(pSiS->BIOS);
-        pSiS->BIOS = NULL;
--       if(pSiS->SiS_Pr) xfree(pSiS->SiS_Pr);
-+       if(pSiS->SiS_Pr) free(pSiS->SiS_Pr);
-        pSiS->SiS_Pr = NULL;
--       if(pSiS->RenderAccelArray) xfree(pSiS->RenderAccelArray);
-+       if(pSiS->RenderAccelArray) free(pSiS->RenderAccelArray);
-        pSiS->RenderAccelArray = NULL;
- #ifdef SISDUALHEAD
-     }
- #endif
- #ifdef SISMERGED
--    if(pSiS->CRT2HSync) xfree(pSiS->CRT2HSync);
-+    if(pSiS->CRT2HSync) free(pSiS->CRT2HSync);
-     pSiS->CRT2HSync = NULL;
--    if(pSiS->CRT2VRefresh) xfree(pSiS->CRT2VRefresh);
-+    if(pSiS->CRT2VRefresh) free(pSiS->CRT2VRefresh);
-     pSiS->CRT2VRefresh = NULL;
--    if(pSiS->MetaModes) xfree(pSiS->MetaModes);
-+    if(pSiS->MetaModes) free(pSiS->MetaModes);
-     pSiS->MetaModes = NULL;
-     if(pSiS->CRT2pScrn) {
-        if(pSiS->CRT2pScrn->modes) {
-@@ -353,10 +376,10 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	     while(pSiS->CRT2pScrn->monitor->Modes)
- 	        xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
- 	  }
--	  if(pSiS->CRT2pScrn->monitor->DDC) xfree(pSiS->CRT2pScrn->monitor->DDC);
--	  xfree(pSiS->CRT2pScrn->monitor);
-+	  if(pSiS->CRT2pScrn->monitor->DDC) free(pSiS->CRT2pScrn->monitor->DDC);
-+	  free(pSiS->CRT2pScrn->monitor);
-        }
--       xfree(pSiS->CRT2pScrn);
-+       free(pSiS->CRT2pScrn);
-        pSiS->CRT2pScrn = NULL;
-     }
-     if(pSiS->CRT1Modes) {
-@@ -366,8 +389,8 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 	     do {
- 	        DisplayModePtr p = pScrn->currentMode->next;
- 	        if(pScrn->currentMode->Private)
--	 	  xfree(pScrn->currentMode->Private);
--	        xfree(pScrn->currentMode);
-+	 	  free(pScrn->currentMode->Private);
-+	        free(pScrn->currentMode);
- 	        pScrn->currentMode = p;
- 	     } while(pScrn->currentMode != pScrn->modes);
- 	  }
-@@ -380,7 +403,7 @@ SISFreeRec(ScrnInfoPtr pScrn)
- #endif
-     while(pSiS->SISVESAModeList) {
-        sisModeInfoPtr mp = pSiS->SISVESAModeList->next;
--       xfree(pSiS->SISVESAModeList);
-+       free(pSiS->SISVESAModeList);
-        pSiS->SISVESAModeList = mp;
-     }
-     if(pSiS->pVbe) vbeFree(pSiS->pVbe);
-@@ -392,7 +415,7 @@ SISFreeRec(ScrnInfoPtr pScrn)
- 
-     if(pScrn->driverPrivate == NULL)
-         return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -501,7 +524,7 @@ SISProbe(DriverPtr drv, int flags)
- 			numDevSections, drv, &usedChipsXGI);
- 
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
- 
-     numUsed = numUsedSiS + numUsedXGI;
- 
-@@ -577,8 +600,8 @@ SISProbe(DriverPtr drv, int flags)
- 
-     }
- 
--    if(usedChipsSiS) xfree(usedChipsSiS);
--    if(usedChipsXGI) xfree(usedChipsXGI);
-+    if(usedChipsSiS) free(usedChipsSiS);
-+    if(usedChipsXGI) free(usedChipsXGI);
- 
-     return foundScreen;
- }
-@@ -642,10 +665,10 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
-    if(!(nramp = xf86GetGammaRampSize(pScreen))) return;
- 
-    for(i=0; i<3; i++) {
--      ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort));
-+      ramp[i] = (UShort *)malloc(nramp * sizeof(UShort));
-       if(!ramp[i]) {
--	 if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; }
--	 if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; }
-+	 if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; }
-+	 if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; }
- 	 return;
-       }
-    }
-@@ -705,9 +728,9 @@ SISCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
- 
-    xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]);
- 
--   xfree(ramp[0]);
--   xfree(ramp[1]);
--   xfree(ramp[2]);
-+   free(ramp[0]);
-+   free(ramp[1]);
-+   free(ramp[2]);
-    ramp[0] = ramp[1] = ramp[2] = NULL;
- }
- #endif
-@@ -1135,10 +1158,10 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
-     DisplayModePtr mode;
-     int dx = 0,dy = 0;
- 
--    if(!((mode = xalloc(sizeof(DisplayModeRec))))) return dest;
-+    if(!((mode = malloc(sizeof(DisplayModeRec))))) return dest;
-     memcpy(mode, i, sizeof(DisplayModeRec));
--    if(!((mode->Private = xalloc(sizeof(SiSMergedDisplayModeRec))))) {
--       xfree(mode);
-+    if(!((mode->Private = malloc(sizeof(SiSMergedDisplayModeRec))))) {
-+       free(mode);
-        return dest;
-     }
-     ((SiSMergedDisplayModePtr)mode->Private)->CRT1 = i;
-@@ -1223,8 +1246,8 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		"Skipped \"%s\" (%dx%d), not enough video RAM or beyond hardware specs\n",
- 		mode->name, mode->HDisplay, mode->VDisplay);
--       xfree(mode->Private);
--       xfree(mode);
-+       free(mode->Private);
-+       free(mode);
- 
-        return dest;
-     }
-@@ -2131,10 +2154,10 @@ SiSProcXineramaQueryVersion(ClientPtr client)
-     rep.majorVersion = SIS_XINERAMA_MAJOR_VERSION;
-     rep.minorVersion = SIS_XINERAMA_MINOR_VERSION;
-     if(client->swapped) {
--        swaps(&rep.sequenceNumber, n);
--        swapl(&rep.length, n);
--        swaps(&rep.majorVersion, n);
--        swaps(&rep.minorVersion, n);
-+        _swaps(&rep.sequenceNumber, n);
-+        _swapl(&rep.length, n);
-+        _swaps(&rep.majorVersion, n);
-+        _swaps(&rep.minorVersion, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep);
-     return (client->noClientException);
-@@ -2147,19 +2170,20 @@ SiSProcXineramaGetState(ClientPtr client)
-     WindowPtr			pWin;
-     xPanoramiXGetStateReply	rep;
-     register int		n;
-+    int				rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
--    pWin = LookupWindow(stuff->window, client);
--    if(!pWin) return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-     rep.sequenceNumber = client->sequence;
-     rep.state = !SiSnoPanoramiXExtension;
-     if(client->swapped) {
--       swaps (&rep.sequenceNumber, n);
--       swapl (&rep.length, n);
--       swaps (&rep.state, n);
-+       _swaps (&rep.sequenceNumber, n);
-+       _swapl (&rep.length, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
-     return client->noClientException;
-@@ -2172,19 +2196,20 @@ SiSProcXineramaGetScreenCount(ClientPtr client)
-     WindowPtr				pWin;
-     xPanoramiXGetScreenCountReply	rep;
-     register int			n;
-+    int					rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
--    pWin = LookupWindow(stuff->window, client);
--    if(!pWin) return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-     rep.sequenceNumber = client->sequence;
-     rep.ScreenCount = SiSXineramaNumScreens;
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swaps(&rep.ScreenCount, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
-     return client->noClientException;
-@@ -2197,10 +2222,12 @@ SiSProcXineramaGetScreenSize(ClientPtr client)
-     WindowPtr				pWin;
-     xPanoramiXGetScreenSizeReply	rep;
-     register int			n;
-+    int					rc;
- 
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
--    pWin = LookupWindow (stuff->window, client);
--    if(!pWin)  return BadWindow;
-+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-+    if (rc != Success)
-+        return rc;
- 
-     rep.type = X_Reply;
-     rep.length = 0;
-@@ -2208,10 +2235,10 @@ SiSProcXineramaGetScreenSize(ClientPtr client)
-     rep.width  = SiSXineramadataPtr[stuff->screen].width;
-     rep.height = SiSXineramadataPtr[stuff->screen].height;
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swaps(&rep.width, n);
--       swaps(&rep.height, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.width, n);
-+       _swapl(&rep.height, n);
-     }
-     WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
-     return client->noClientException;
-@@ -2230,9 +2257,9 @@ SiSProcXineramaIsActive(ClientPtr client)
-     rep.state = !SiSnoPanoramiXExtension;
-     if(client->swapped) {
- 	register int n;
--	swaps(&rep.sequenceNumber, n);
--	swapl(&rep.length, n);
--	swapl(&rep.state, n);
-+	_swaps(&rep.sequenceNumber, n);
-+	_swapl(&rep.length, n);
-+	_swapl(&rep.state, n);
-     }
-     WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep);
-     return client->noClientException;
-@@ -2251,9 +2278,9 @@ SiSProcXineramaQueryScreens(ClientPtr client)
-     rep.length = rep.number * sz_XineramaScreenInfo >> 2;
-     if(client->swapped) {
-        register int n;
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swapl(&rep.number, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.number, n);
-     }
-     WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
- 
-@@ -2268,10 +2295,10 @@ SiSProcXineramaQueryScreens(ClientPtr client)
- 	  scratch.height = SiSXineramadataPtr[i].height;
- 	  if(client->swapped) {
- 	     register int n;
--	     swaps(&scratch.x_org, n);
--	     swaps(&scratch.y_org, n);
--	     swaps(&scratch.width, n);
--	     swaps(&scratch.height, n);
-+	     _swaps(&scratch.x_org, n);
-+	     _swaps(&scratch.y_org, n);
-+	     _swaps(&scratch.width, n);
-+	     _swaps(&scratch.height, n);
- 	  }
- 	  WriteToClient(client, sz_XineramaScreenInfo, (char *)&scratch);
-        }
-@@ -2308,7 +2335,7 @@ SiSSProcXineramaQueryVersion (ClientPtr client)
- {
-     REQUEST(xPanoramiXQueryVersionReq);
-     register int n;
--    swaps(&stuff->length,n);
-+    _swaps(&stuff->length,n);
-     REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
-     return SiSProcXineramaQueryVersion(client);
- }
-@@ -2318,7 +2345,7 @@ SiSSProcXineramaGetState(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetStateReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-     return SiSProcXineramaGetState(client);
- }
-@@ -2328,7 +2355,7 @@ SiSSProcXineramaGetScreenCount(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetScreenCountReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-     return SiSProcXineramaGetScreenCount(client);
- }
-@@ -2338,7 +2365,7 @@ SiSSProcXineramaGetScreenSize(ClientPtr client)
- {
-     REQUEST(xPanoramiXGetScreenSizeReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-     return SiSProcXineramaGetScreenSize(client);
- }
-@@ -2348,7 +2375,7 @@ SiSSProcXineramaIsActive(ClientPtr client)
- {
-     REQUEST(xXineramaIsActiveReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
-     return SiSProcXineramaIsActive(client);
- }
-@@ -2358,7 +2385,7 @@ SiSSProcXineramaQueryScreens(ClientPtr client)
- {
-     REQUEST(xXineramaQueryScreensReq);
-     register int n;
--    swaps (&stuff->length, n);
-+    _swaps (&stuff->length, n);
-     REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
-     return SiSProcXineramaQueryScreens(client);
- }
-@@ -2389,7 +2416,7 @@ SiSXineramaResetProc(ExtensionEntry* extEntry)
- {
-     /* Called by CloseDownExtensions() */
-     if(SiSXineramadataPtr) {
--       Xfree(SiSXineramadataPtr);
-+       free(SiSXineramadataPtr);
-        SiSXineramadataPtr = NULL;
-     }
- }
-@@ -2454,7 +2481,7 @@ SiSXineramaExtensionInit(ScrnInfoPtr pScrn)
- 	  if(!pSiS->XineramaExtEntry) break;
- 
- 	  if(!(SiSXineramadataPtr = (SiSXineramaData *)
--	        xcalloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
-+	        calloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
- 
- 	  SiSXineramaGeneration = serverGeneration;
- 	  success = TRUE;
-@@ -2493,10 +2520,10 @@ SiSFreeCRT2Structs(SISPtr pSiS)
- 	     while(pSiS->CRT2pScrn->monitor->Modes)
- 		xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
- 	  }
--	  if(pSiS->CRT2pScrn->monitor->DDC) xfree(pSiS->CRT2pScrn->monitor->DDC);
--	  xfree(pSiS->CRT2pScrn->monitor);
-+	  if(pSiS->CRT2pScrn->monitor->DDC) free(pSiS->CRT2pScrn->monitor->DDC);
-+	  free(pSiS->CRT2pScrn->monitor);
-        }
--       xfree(pSiS->CRT2pScrn);
-+       free(pSiS->CRT2pScrn);
-        pSiS->CRT2pScrn = NULL;
-    }
- }
-@@ -2902,22 +2929,22 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn)
- 	     Bool gotit = FALSE;
- 
-  	     if(!ioctl(fd, SISFB_GET_INFO_SIZE, &sisfbinfosize)) {
-- 		if((mysisfbinfo = xalloc(sisfbinfosize))) {
-+ 		if((mysisfbinfo = malloc(sisfbinfosize))) {
-  		   if(!ioctl(fd, (SISFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) {
-  		      gotit = TRUE;
-  		   } else {
-- 		      xfree(mysisfbinfo);
-+ 		      free(mysisfbinfo);
-  		      mysisfbinfo = NULL;
-  		   }
-  		}
-  	     } else {
-- 		if((mysisfbinfo = xalloc(sizeof(*mysisfbinfo) + 16))) {
-+ 		if((mysisfbinfo = malloc(sizeof(*mysisfbinfo) + 16))) {
-  		   if(!ioctl(fd, SISFB_GET_INFO_OLD, mysisfbinfo)) {
-  		      gotit = TRUE;
- 		      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 				"Possibly old version of sisfb detected. Please update.\n");
- 		   } else {
--		      xfree(mysisfbinfo);
-+		      free(mysisfbinfo);
- 		      mysisfbinfo = NULL;
- 		   }
- 		}
-@@ -3056,7 +3083,7 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn)
- 		      }
- 		   }
- 	        }
--		xfree(mysisfbinfo);
-+		free(mysisfbinfo);
- 		mysisfbinfo = NULL;
- 	     }
- 	     close (fd);
-@@ -3216,7 +3243,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     pSiS->pInt = NULL;
- 
-     /* Save PCI Domain Base */
--#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
-+#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) || GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
-     pSiS->IODBase = 0;
- #else
-     pSiS->IODBase = pScrn->domainIOBase;
-@@ -4078,7 +4105,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        }
- #endif
-        if(!pSiS->BIOS) {
--	  if(!(pSiS->BIOS = xcalloc(1, BIOS_SIZE))) {
-+	  if(!(pSiS->BIOS = calloc(1, BIOS_SIZE))) {
- 	     xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 		"Could not allocate memory for video BIOS image\n");
- 	  } else {
-@@ -4173,7 +4200,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	     } else {
- 	        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- 			 "Could not find/read video BIOS\n");
--		xfree(pSiS->BIOS);
-+		free(pSiS->BIOS);
- 		pSiS->BIOS = NULL;
- 	     }
-           }
-@@ -5559,7 +5586,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     /* Do some MergedFB mode initialisation */
- #ifdef SISMERGED
-     if(pSiS->MergedFB) {
--       pSiS->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
-+       pSiS->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
-        if(!pSiS->CRT2pScrn) {
-           SISErrorLog(pScrn, "Failed to allocate memory for 2nd pScrn, %s\n", mergeddisstr);
- 	  pSiS->MergedFB = FALSE;
-@@ -5592,7 +5619,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 		} else {
- 		   SISErrorLog(pScrn, mergednocrt1, mergeddisstr);
- 		}
--		if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+		if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 		pSiS->CRT2pScrn = NULL;
- 		pSiS->MergedFB = FALSE;
- 	     }
-@@ -5639,7 +5666,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 		} else {
- 		   SISErrorLog(pScrn, mergednocrt2, mergeddisstr);
- 		}
--		if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+		if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 		pSiS->CRT2pScrn = NULL;
- 		pSiS->MergedFB = FALSE;
- 	     }
-@@ -6016,7 +6043,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 
- #ifdef SISMERGED
-     if(pSiS->MergedFB) {
--       pSiS->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
-+       pSiS->CRT2pScrn->monitor = malloc(sizeof(MonRec));
-        if(pSiS->CRT2pScrn->monitor) {
- 	  DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
- 	  memcpy(pSiS->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
-@@ -6025,10 +6052,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	  pSiS->CRT2pScrn->monitor->id = (char *)crt2monname;
- 	  tempm = pScrn->monitor->Modes;
- 	  while(tempm) {
--	     if(!(newm = xalloc(sizeof(DisplayModeRec)))) break;
-+	     if(!(newm = malloc(sizeof(DisplayModeRec)))) break;
- 	     memcpy(newm, tempm, sizeof(DisplayModeRec));
--	     if(!(newm->name = xalloc(strlen(tempm->name) + 1))) {
--	        xfree(newm);
-+	     if(!(newm->name = malloc(strlen(tempm->name) + 1))) {
-+	        free(newm);
- 		break;
- 	     }
- 	     strcpy(newm->name, tempm->name);
-@@ -6070,7 +6097,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        } else {
- 	  SISErrorLog(pScrn, "Failed to allocate memory for CRT2 monitor, %s.\n",
- 	  		mergeddisstr);
--	  if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
-+	  if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
- 	  pSiS->CRT2pScrn = NULL;
- 	  pSiS->MergedFB = FALSE;
-        }
-@@ -6835,8 +6862,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- #ifdef SIS_USE_XAA
-        if(!pSiS->useEXA) {
- 	  if (!xf86LoadSubModule(pScrn, "xaa")) {
--	    SISErrorLog(pScrn, "Could not load xaa module\n");
--	    goto my_error_1;
-+	      xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+			 "Falling back to shadowfb\n");
-+	      pSiS->NoAccel = 1;
-+	      pSiS->ShadowFB = 1;
- 	  }
-        }
- #endif
-@@ -6855,7 +6884,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	  }
-        }
- #endif
--       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
-     }
- 
-     /* Load shadowfb (if needed) */
-@@ -6867,7 +6895,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     }
- 
-     /* Load the dri and glx modules if requested. */
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
-        if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
- 	  if(xf86LoadSubModule(pScrn, "dri")) {
-@@ -7454,7 +7482,7 @@ SISVESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
- 	     (function == MODE_SAVE)) {
- 	     /* don't rely on the memory not being touched */
- 	     if(!pSiS->pstate) {
--		pSiS->pstate = xalloc(pSiS->stateSize);
-+		pSiS->pstate = malloc(pSiS->stateSize);
- 	     }
- 	     memcpy(pSiS->pstate, pSiS->state, pSiS->stateSize);
- 	  }
-@@ -8675,7 +8703,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pSiS->ShadowFB) {
-        pSiS->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--       pSiS->ShadowPtr = xalloc(pSiS->ShadowPitch * height);
-+       pSiS->ShadowPtr = malloc(pSiS->ShadowPitch * height);
-        displayWidth = pSiS->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-        FBStart = pSiS->ShadowPtr;
-     } else {
-@@ -8703,7 +8731,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     pSiS->cmdQueueLen = 0; /* Force an EngineIdle() at start */
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
- #ifdef SISDUALHEAD
-        /* No DRI in dual head mode */
-@@ -8849,14 +8877,14 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
- 	  pSiS->CRT2ColNum = 1 << pScrn->rgbBits;
- 
--	  if((pSiS->crt2gcolortable = xalloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
-+	  if((pSiS->crt2gcolortable = malloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
- 	     pSiS->crt2colors = &pSiS->crt2gcolortable[pSiS->CRT2ColNum];
--	     if((pSiS->crt2cindices = xalloc(256 * sizeof(int)))) {
-+	     if((pSiS->crt2cindices = malloc(256 * sizeof(int)))) {
- 		int i = pSiS->CRT2ColNum;
- 		SISCalculateGammaRampCRT2(pScrn);
- 		while(i--) pSiS->crt2cindices[i] = i;
- 	     } else {
--		xfree(pSiS->crt2gcolortable);
-+		free(pSiS->crt2gcolortable);
- 		pSiS->crt2gcolortable = NULL;
- 		pSiS->CRT2SepGamma = FALSE;
- 	     }
-@@ -9016,7 +9044,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     }
- #endif
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->loadDRI) {
-        if(pSiS->directRenderingEnabled) {
-           /* Now that mi, drm and others have done their thing,
-@@ -9322,9 +9350,22 @@ SISMergedPointerMoved(int scrnIndex, int x, int y)
- 	}
-      }
-      if(doit) {
--	UpdateCurrentTime();
- 	sigstate = xf86BlockSIGIO();
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
-+        {
-+            double dx = x, dy = y;
-+            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
-+            x = (int)dx;
-+            y = (int)dy;
-+        }
-+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
-+	miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
-+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
-+	miPointerSetPosition(inputInfo.pointer, x, y);
-+#else
-+	UpdateCurrentTime();
- 	miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
-+#endif
- 	xf86UnblockSIGIO(sigstate);
- 	return;
-      }
-@@ -9737,7 +9778,7 @@ SISEnterVT(int scrnIndex, int flags)
- 
-     SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->directRenderingEnabled) {
-        DRIUnlock(screenInfo.screens[scrnIndex]);
-     }
-@@ -9763,7 +9804,7 @@ SISLeaveVT(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     SISPtr pSiS = SISPTR(pScrn);
--#ifdef XF86DRI
-+#ifdef SISDRI
-     ScreenPtr pScreen;
- 
-     if(pSiS->directRenderingEnabled) {
-@@ -9847,7 +9888,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-        SiSCtrlExtUnregister(pSiS, pScrn->scrnIndex);
-     }
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     if(pSiS->directRenderingEnabled) {
-        SISDRICloseScreen(pScreen);
-        pSiS->directRenderingEnabled = FALSE;
-@@ -9941,7 +9982,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     if(pSiS->useEXA) {
-        if(pSiS->EXADriverPtr) {
-           exaDriverFini(pScreen);
--          xfree(pSiS->EXADriverPtr);
-+          free(pSiS->EXADriverPtr);
-           pSiS->EXADriverPtr = NULL;
-           pSiS->exa_scratch = NULL;
-        }
-@@ -9954,33 +9995,33 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
- 
-     if(pSiS->ShadowPtr) {
--       xfree(pSiS->ShadowPtr);
-+       free(pSiS->ShadowPtr);
-        pSiS->ShadowPtr = NULL;
-     }
- 
-     if(pSiS->DGAModes) {
--       xfree(pSiS->DGAModes);
-+       free(pSiS->DGAModes);
-        pSiS->DGAModes = NULL;
-     }
- 
-     if(pSiS->adaptor) {
--       xfree(pSiS->adaptor);
-+       free(pSiS->adaptor);
-        pSiS->adaptor = NULL;
-        pSiS->ResetXv = pSiS->ResetXvGamma = pSiS->ResetXvDisplay = NULL;
-     }
- 
-     if(pSiS->blitadaptor) {
--       xfree(pSiS->blitadaptor);
-+       free(pSiS->blitadaptor);
-        pSiS->blitadaptor = NULL;
-     }
- 
-     if(pSiS->crt2gcolortable) {
--       xfree(pSiS->crt2gcolortable);
-+       free(pSiS->crt2gcolortable);
-        pSiS->crt2gcolortable = NULL;
-     }
- 
-     if(pSiS->crt2cindices) {
--       xfree(pSiS->crt2cindices);
-+       free(pSiS->crt2cindices);
-        pSiS->crt2cindices = NULL;
-     }
- 
-diff --git a/src/sis_memcpy.c b/src/sis_memcpy.c
-index 6ad62e8..3634401 100644
---- a/src/sis_memcpy.c
-+++ b/src/sis_memcpy.c
-@@ -638,13 +638,13 @@ SiS_AllocBuffers(ScrnInfoPtr pScrn, UChar **buf1, UChar **buf2, UChar **buf3)
-     (*buf1) = (UChar *)pSiS->FbBase + offset;
-     (*buf1) = (UChar *)(((ULong)(*buf1) + 31) & ~31);
- 
--    if(!((*buf2) = (UChar *)xalloc(BUFFERSIZE + 15))) {
-+    if(!((*buf2) = (UChar *)malloc(BUFFERSIZE + 15))) {
-        SISFreeFBMemory(pScrn, &handle);
-        return NULL;
-     }
- 
--    if(!((*buf3) = (UChar *)xalloc(BUFFERSIZE + 15))) {
--       xfree((*buf2));
-+    if(!((*buf3) = (UChar *)malloc(BUFFERSIZE + 15))) {
-+       free((*buf2));
-        SISFreeFBMemory(pScrn, &handle);
-        return NULL;
-     }
-@@ -1098,8 +1098,8 @@ SiSVidCopyInitGen(ScreenPtr pScreen, SISMCFuncData *MCFunctions, vidCopyFunc *UM
- 
-     /* Free buffers */
-     SISFreeFBMemory(pScrn, &fbhandle);
--    xfree(buf2);
--    xfree(buf3);
-+    free(buf2);
-+    free(buf3);
- 
-     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- 	       "Using %s method for aligned data transfers %s video RAM\n",
-diff --git a/src/sis_opt.c b/src/sis_opt.c
-index 3517549..3fa12c9 100644
---- a/src/sis_opt.c
-+++ b/src/sis_opt.c
-@@ -448,7 +448,7 @@ SiSOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if(!(pSiS->Options = xalloc(sizeof(SISOptions)))) return;
-+    if(!(pSiS->Options = malloc(sizeof(SISOptions)))) return;
- 
-     memcpy(pSiS->Options, SISOptions, sizeof(SISOptions));
- 
-@@ -480,7 +480,7 @@ SiSOptions(ScrnInfoPtr pScrn)
- #endif
-     pSiS->ShadowFB = FALSE;
-     pSiS->loadDRI = FALSE;
--#ifdef XF86DRI
-+#ifdef SISDRI
-     pSiS->agpWantedPages = AGP_PAGES;
- #endif
-     pSiS->VESA = -1;
-@@ -888,7 +888,7 @@ SiSOptions(ScrnInfoPtr pScrn)
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2POS))) {
- 	     int result;
- 	     Bool valid = FALSE;
--	     char *tempstr = xalloc(strlen(strptr) + 1);
-+	     char *tempstr = malloc(strlen(strptr) + 1);
- 	     result = sscanf(strptr, "%s %d", tempstr, &ival);
- 	     if(result >= 1) {
- 		if(!xf86NameCmp(tempstr,"LeftOf")) {
-@@ -946,18 +946,18 @@ SiSOptions(ScrnInfoPtr pScrn)
- 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- 		    "Except for \"Clone\", the parameter may be followed by an integer.\n");
- 	     }
--	     xfree(tempstr);
-+	     free(tempstr);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_METAMODES))) {
--	     pSiS->MetaModes = xalloc(strlen(strptr) + 1);
-+	     pSiS->MetaModes = malloc(strlen(strptr) + 1);
- 	     if(pSiS->MetaModes) memcpy(pSiS->MetaModes, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2HSYNC))) {
--	     pSiS->CRT2HSync = xalloc(strlen(strptr) + 1);
-+	     pSiS->CRT2HSync = malloc(strlen(strptr) + 1);
- 	     if(pSiS->CRT2HSync) memcpy(pSiS->CRT2HSync, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2VREFRESH))) {
--	     pSiS->CRT2VRefresh = xalloc(strlen(strptr) + 1);
-+	     pSiS->CRT2VRefresh = malloc(strlen(strptr) + 1);
- 	     if(pSiS->CRT2VRefresh) memcpy(pSiS->CRT2VRefresh, strptr, strlen(strptr) + 1);
- 	  }
- 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_MERGEDDPI))) {
-@@ -2034,7 +2034,7 @@ SiSOptions(ScrnInfoPtr pScrn)
-        }
-     }
- 
--#ifdef XF86DRI
-+#ifdef SISDRI
-     /* DRI */
-     from = X_DEFAULT;
-     if(xf86GetOptValBool(pSiS->Options, OPTION_DRI, &pSiS->loadDRI)) {
-diff --git a/src/sis_utility.c b/src/sis_utility.c
-index a9bcd2b..eda194f 100644
---- a/src/sis_utility.c
-+++ b/src/sis_utility.c
-@@ -34,8 +34,6 @@
- #endif
- 
- #include "sis.h"
--#define NEED_REPLIES
--#define NEED_EVENTS
- #include <X11/X.h>
- #include "dixstruct.h"
- 
-@@ -1882,10 +1880,10 @@ SiSProcSiSCtrlQueryVersion(ClientPtr client)
-     rep.majorVersion = SISCTRL_MAJOR_VERSION;
-     rep.minorVersion = SISCTRL_MINOR_VERSION;
-     if(client->swapped) {
--        swaps(&rep.sequenceNumber, n);
--        swapl(&rep.length, n);
--        swaps(&rep.majorVersion, n);
--        swaps(&rep.minorVersion, n);
-+        _swaps(&rep.sequenceNumber, n);
-+        _swapl(&rep.length, n);
-+        _swaps(&rep.majorVersion, n);
-+        _swaps(&rep.minorVersion, n);
-     }
-     WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep);
-     return (client->noClientException);
-@@ -1926,15 +1924,15 @@ SiSProcSiSCtrlCommand(ClientPtr client)
-     rep.sequenceNumber = client->sequence;
- 
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swapl(&rep.screen, n);
--       swapl(&rep.sdc_id, n);
--       swapl(&rep.sdc_command, n);
--       swapl(&rep.sdc_result_header, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.screen, n);
-+       _swapl(&rep.sdc_id, n);
-+       _swapl(&rep.sdc_command, n);
-+       _swapl(&rep.sdc_result_header, n);
-        for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--	  swapl(&rep.sdc_parm[i], n);
--	  swapl(&rep.sdc_result[i], n);
-+	  _swapl(&rep.sdc_parm[i], n);
-+	  _swapl(&rep.sdc_result[i], n);
-        }
-     }
-     WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep);
-@@ -1961,7 +1959,7 @@ SiSSProcSiSCtrlQueryVersion(ClientPtr client)
- {
-     REQUEST(xSiSCtrlQueryVersionReq);
-     register int n;
--    swaps(&stuff->length, n);
-+    _swaps(&stuff->length, n);
-     REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq);
-     return SiSProcSiSCtrlQueryVersion(client);
- }
-@@ -1972,14 +1970,14 @@ SiSSProcSiSCtrlCommand(ClientPtr client)
-     REQUEST(xSiSCtrlCommandReq);
-     register int n;
-     int i;
--    swaps(&stuff->length, n);
--    swapl(&stuff->screen, n);
--    swapl(&stuff->sdc_id, n);
--    swapl(&stuff->sdc_command, n);
--    swapl(&stuff->sdc_result_header, n);
-+    _swaps(&stuff->length, n);
-+    _swapl(&stuff->screen, n);
-+    _swapl(&stuff->sdc_id, n);
-+    _swapl(&stuff->sdc_command, n);
-+    _swapl(&stuff->sdc_result_header, n);
-     for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--       swapl(&stuff->sdc_parm[i], n);
--       swapl(&stuff->sdc_result[i], n);
-+       _swapl(&stuff->sdc_parm[i], n);
-+       _swapl(&stuff->sdc_result[i], n);
-     }
-     REQUEST_SIZE_MATCH(xSiSCtrlCommandReq);
-     return SiSProcSiSCtrlCommand(client);
-@@ -2007,7 +2005,7 @@ SiSCtrlResetProc(ExtensionEntry* extEntry)
-      * in SiSCtrlExtUnregister())
-      */
-     if(extEntry->extPrivate) {
--       xfree(extEntry->extPrivate);
-+       free(extEntry->extPrivate);
-        extEntry->extPrivate = NULL;
-     }
- }
-@@ -2028,7 +2026,7 @@ SiSCtrlExtInit(ScrnInfoPtr pScrn)
- 
-    if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) {
- 
--      if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1)))
-+      if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1)))
-          return;
- 
-       if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0,
-@@ -2038,7 +2036,7 @@ SiSCtrlExtInit(ScrnInfoPtr pScrn)
- 				StandardMinorOpcode))) {
-          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 	 		"Failed to add SISCTRL extension\n");
--	 xfree(myctrl);
-+	 free(myctrl);
- 	 return;
-       }
- 
-diff --git a/src/sis_vga.c b/src/sis_vga.c
-index 3f6219b..4c887b8 100644
---- a/src/sis_vga.c
-+++ b/src/sis_vga.c
-@@ -1429,7 +1429,7 @@ SiSVGASaveFonts(ScrnInfoPtr pScrn)
-     attr10 = SiS_ReadAttr(pSiS, 0x10);
-     if(attr10 & 0x01) return;
- 
--    if(!(pSiS->fonts = xalloc(SIS_FONTS_SIZE * 2))) {
-+    if(!(pSiS->fonts = malloc(SIS_FONTS_SIZE * 2))) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		"Could not save console fonts, mem allocation failed\n");
-        return;
-@@ -1716,8 +1716,8 @@ SiSVGAMapMem(ScrnInfoPtr pScrn)
- 
- #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
- #if XSERVER_LIBPCIACCESS
--    pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
--			pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize);
-+    (void) pci_device_map_legacy(pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize,
-+                                 PCI_DEV_MAP_FLAG_WRITABLE, &pSiS->VGAMemBase);
- #else
-     pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
- 			pSiS->PciTag, pSiS->VGAMapPhys, pSiS->VGAMapSize);
-@@ -1737,7 +1737,12 @@ SiSVGAUnmapMem(ScrnInfoPtr pScrn)
- 
-     if(pSiS->VGAMemBase == NULL) return;
- 
-+#if XSERVER_LIBPCIACCESS
-+    (void) pci_device_unmap_legacy(pSiS->PciInfo, pSiS->VGAMemBase, pSiS->VGAMapSize);
-+#else
-     xf86UnMapVidMem(pScrn->scrnIndex, pSiS->VGAMemBase, pSiS->VGAMapSize);
-+#endif
-+
-     pSiS->VGAMemBase = NULL;
- }
- #endif
-diff --git a/src/sis_video.c b/src/sis_video.c
-index 7322efb..2006858 100644
---- a/src/sis_video.c
-+++ b/src/sis_video.c
-@@ -326,7 +326,7 @@ SISInitVideo(ScreenPtr pScreen)
-        if(newAdaptor)     size++;
-        if(newBlitAdaptor) size++;
- 
--       newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*));
-+       newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*));
-        if(newAdaptors) {
-           if(num_adaptors) {
-              memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
-@@ -356,7 +356,7 @@ SISInitVideo(ScreenPtr pScreen)
-     }
- 
-     if(newAdaptors) {
--       xfree(newAdaptors);
-+       free(newAdaptors);
-     }
- }
- 
-@@ -877,7 +877,7 @@ SISSetupImageVideo(ScreenPtr pScreen)
-     }
- #endif
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(SISPortPrivRec) +
-                             sizeof(DevUnion)))) {
-        return NULL;
-@@ -4067,7 +4067,7 @@ SISSetupBlitVideo(ScreenPtr pScreen)
-    }
- #endif
- 
--   if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+   if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-     			   (sizeof(DevUnion) * NUM_BLIT_PORTS) +
-                            sizeof(SISBPortPrivRec)))) {
-       return NULL;
-diff --git a/src/sispcirename.h b/src/sispcirename.h
-index c4beac6..a354ac4 100644
---- a/src/sispcirename.h
-+++ b/src/sispcirename.h
-@@ -29,11 +29,40 @@
- #ifndef SISPCIRENAME_H
- #define SISPCIRENAME_H
- 
-+#include <stdint.h>
-+
- enum region_type {
-     REGION_MEM,
-     REGION_IO 
- };
- 
-+#include "xf86Module.h"
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
-+
-+#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
-+#define PCI_DOM_MASK    0x01fful
-+#else
-+#define PCI_DOM_MASK 0x0ffu
-+#endif
-+
-+#ifndef PCI_DOM_MASK
-+# define PCI_DOM_MASK 0x0ffu
-+#endif
-+#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
-+
-+static inline uint32_t
-+pciTag(int busnum, int devnum, int funcnum)
-+{
-+	uint32_t tag;
-+	tag  = (busnum & (PCI_DOMBUS_MASK)) << 16;
-+	tag |= (devnum & 0x00001fu) << 11;
-+	tag |= (funcnum & 0x000007u) << 8;
-+
-+	return tag;
-+}
-+#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */
-+
- #ifndef XSERVER_LIBPCIACCESS
- 
- /* pciVideoPtr */
-diff --git a/src/vgatypes.h b/src/vgatypes.h
-index 4be31e4..d6e7b6e 100644
---- a/src/vgatypes.h
-+++ b/src/vgatypes.h
-@@ -69,8 +69,9 @@ typedef unsigned int BOOLEAN;
- 
- #define SISIOMEMTYPE
- 
--#ifdef SIS_LINUX_KERNEL
- typedef unsigned long SISIOADDRESS;
-+
-+#ifdef SIS_LINUX_KERNEL
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
- #include <linux/types.h>  /* Need __iomem */
- #undef SISIOMEMTYPE
-@@ -78,15 +79,6 @@ typedef unsigned long SISIOADDRESS;
- #endif
- #endif
- 
--#ifdef SIS_XORG_XF86
--#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
--typedef unsigned long IOADDRESS;
--typedef unsigned long SISIOADDRESS;
--#else
--typedef IOADDRESS SISIOADDRESS;
--#endif
--#endif
--
- typedef enum _SIS_CHIP_TYPE {
-     SIS_VGALegacy = 0,
-     SIS_530,
diff --git a/extra/xf86-video-trident/trident-1.3.4-git.patch b/extra/xf86-video-trident/trident-1.3.4-git.patch
deleted file mode 100644
index 4e0cc27b2..000000000
--- a/extra/xf86-video-trident/trident-1.3.4-git.patch
+++ /dev/null
@@ -1,523 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index be54427..0fc2066 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,47 +20,47 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-trident],
--        1.3.4,
-+        [1.3.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-trident)
--
-+        [xf86-video-trident])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-@@ -90,17 +90,14 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=trident
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/trident.man b/man/trident.man
-index 8d04ed0..f461e10 100644
---- a/man/trident.man
-+++ b/man/trident.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.man,v 1.14 2003/05/29 21:48:09 herrb Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH TRIDENT __drivermansuffix__ __vendorversion__
-diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c
-index 80e3f23..3129623 100644
---- a/src/blade_accel_exa.c
-+++ b/src/blade_accel_exa.c
-@@ -251,14 +251,6 @@ static void WaitMarker(ScreenPtr pScreen, int marker)
-     }
- }
- 
--static Bool PrepareAccess(PixmapPtr pPix, int index)
--{
--}
--
--static void FinishAccess(PixmapPtr pPix, int index)
--{
--}
--
- static void BladeInitializeAccelerator(ScrnInfoPtr pScrn)
- {
-     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-diff --git a/src/trident.h b/src/trident.h
-index c15d39c..a28c9fc 100644
---- a/src/trident.h
-+++ b/src/trident.h
-@@ -70,7 +70,7 @@ typedef struct {
- typedef struct {
-     ScrnInfoPtr		pScrn;
-     pciVideoPtr		PciInfo;
--    PCITAG		PciTag;
-+    uint32_t		PciTag;
-     EntityInfoPtr	pEnt;
-     ExaDriverPtr	EXADriverPtr;
-     int			useEXA;
-@@ -85,7 +85,7 @@ typedef struct {
-     unsigned char *     IOBase;
-     unsigned char *	FbBase;
-     long		FbMapSize;
--    IOADDRESS		PIOBase;
-+    unsigned long		PIOBase;
-     Bool		NoAccel;
-     Bool		HWCursor;
-     Bool		UsePCIRetry;
-diff --git a/src/trident_dga.c b/src/trident_dga.c
-index 78fa8f4..dd836a6 100644
---- a/src/trident_dga.c
-+++ b/src/trident_dga.c
-@@ -83,15 +83,15 @@ TRIDENTDGAInit(ScreenPtr pScreen)
-    while(pMode) {
- 
- 	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
--	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
- 	    oneMore = TRUE;
- 	} else {
--	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- 	    oneMore = FALSE;
- 	}
- 
- 	if(!newmodes) {
--	   xfree(modes);
-+	   free(modes);
- 	   return FALSE;
- 	}
- 	modes = newmodes;
-diff --git a/src/trident_driver.c b/src/trident_driver.c
-index 31cbb83..472c9b7 100644
---- a/src/trident_driver.c
-+++ b/src/trident_driver.c
-@@ -63,7 +63,7 @@
- 
- #ifdef XFreeXDGA
- #define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- #endif
- 
- #include "globals.h"
-@@ -560,7 +560,7 @@ TRIDENTFreeRec(ScrnInfoPtr pScrn)
- {
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -900,7 +900,7 @@ TRIDENTProbe(DriverPtr drv, int flags)
- 		    foundScreen = TRUE;
- 		}
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- 
-@@ -933,11 +933,11 @@ TRIDENTProbe(DriverPtr drv, int flags)
- 		foundScreen = TRUE;
- 	    }
- 	}
--	xfree(usedChips);
-+	free(usedChips);
-     }
- #endif    
- 
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- 	
-@@ -1109,7 +1109,12 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
-     hwp = VGAHWPTR(pScrn);
-     vgaHWGetIOBase(hwp);
-     vgaIOBase = hwp->IOBase;
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     pTrident->PIOBase = hwp->PIOOffset;
-+#else
-+    pTrident->PIOBase = 0;
-+#endif
- 
- #ifndef XSERVER_LIBPCIACCESS
-     xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr);
-@@ -1163,7 +1168,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if (!(pTrident->Options = xalloc(sizeof(TRIDENTOptions))))
-+    if (!(pTrident->Options = malloc(sizeof(TRIDENTOptions))))
- 	return FALSE;
-     memcpy(pTrident->Options, TRIDENTOptions, sizeof(TRIDENTOptions));
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTrident->Options);
-@@ -2617,7 +2622,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-     TRIDENTRegPtr tridentReg;
- 
--    if (!xf86IsPc98()) WAITFORVSYNC;
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    if (!xf86IsPc98())
-+#endif
-+        WAITFORVSYNC;
- 
-     TridentFindClock(pScrn,mode->Clock);
- 
-@@ -2709,8 +2717,10 @@ TRIDENTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
-     vgaHWProtect(pScrn, FALSE);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (xf86IsPc98())
- 	PC98TRIDENTEnable(pScrn);
-+#endif
- 
-     if (pTrident->TVChipset != 0)
-        VIA_TVInit(pScrn);
-@@ -2782,7 +2792,10 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!TRIDENTMapMem(pScrn))
- 	return FALSE;
- 
--    if (!xf86IsPc98()) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    if (!xf86IsPc98())
-+#endif
-+    {
- #ifdef VBE_INFO
- 	if (pTrident->vbeModes) {
- 	    pTrident->pVbe = VBEInit(NULL,pTrident->pEnt->index);
-@@ -2796,7 +2809,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	    }
- 	}
-     }
--    
-+
-     hwp = VGAHWPTR(pScrn);
- 
-     if (IsPciCard && UseMMIO) {
-@@ -2813,9 +2826,12 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-      * Some Trident chip on PC-9821 needs setup,
-      * because VGA chip is not initialized by VGA BIOS.
-      */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (IsPciCard && xf86IsPc98()) {
- 	 PC98TRIDENTInit(pScrn);
--    } else tridentSetModeBIOS(pScrn,pScrn->currentMode);
-+    } else
-+#endif
-+    tridentSetModeBIOS(pScrn,pScrn->currentMode);
- 
-     /* Initialise the first mode */
-     if (!TRIDENTModeInit(pScrn, pScrn->currentMode))
-@@ -2868,7 +2884,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pTrident->ShadowFB) {
-  	pTrident->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--        pTrident->ShadowPtr = xalloc(pTrident->ShadowPitch * height);
-+        pTrident->ShadowPtr = malloc(pTrident->ShadowPitch * height);
- 	displayWidth = pTrident->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-         FBStart = pTrident->ShadowPtr;
-     } else {
-@@ -2958,7 +2974,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 		(miBankProcPtr)TVGA8900SetReadWrite;
- 	if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
- 				 pScrn->displayWidth, pBankInfo)) {
--	    xfree(pBankInfo);
-+	    free(pBankInfo);
- 	    pBankInfo = NULL;
- 	    if (pTrident->pVbe)
- 	    	vbeFree(pTrident->pVbe);
-@@ -3200,8 +3216,10 @@ TRIDENTLeaveVT(int scrnIndex, int flags)
-     TRIDENTRestore(pScrn);
-     vgaHWLock(hwp);
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (xf86IsPc98())
- 	PC98TRIDENTDisable(pScrn);
-+#endif
- 
-     if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
- }
-@@ -3225,28 +3243,31 @@ TRIDENTCloseScreen(int scrnIndex, ScreenPtr pScreen)
- 	pTrident->AccelInfoRec->Sync(pScrn);
-     else if (!pTrident->NoAccel && pTrident->useEXA)
- 	pTrident->EXADriverPtr->WaitMarker(pScreen, 0);
--	
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (xf86IsPc98())
- 	PC98TRIDENTDisable(pScrn);
-+#endif
- 
-     	TRIDENTRestore(pScrn);
-     	vgaHWLock(hwp);
- 	if (IsPciCard && UseMMIO) TRIDENTDisableMMIO(pScrn);
-     	TRIDENTUnmapMem(pScrn);
-     }
-+
-     if (pTrident->AccelInfoRec)
- 	XAADestroyInfoRec(pTrident->AccelInfoRec);
-     if (pTrident->EXADriverPtr) {
- 	exaDriverFini(pScreen);
--	xfree(pTrident->EXADriverPtr);
-+	free(pTrident->EXADriverPtr);
- 	pTrident->EXADriverPtr = NULL;
-     }	
-     if (pTrident->CursorInfoRec)
- 	xf86DestroyCursorInfoRec(pTrident->CursorInfoRec);
-     if (pTrident->ShadowPtr)
--	xfree(pTrident->ShadowPtr);
-+	free(pTrident->ShadowPtr);
-     if (pTrident->DGAModes)
--	xfree(pTrident->DGAModes);
-+	free(pTrident->DGAModes);
-     pScrn->vtSema = FALSE;
- 
-     if(pTrident->BlockHandler)
-@@ -3317,15 +3338,17 @@ static void
- TRIDENTEnableMMIO(ScrnInfoPtr pScrn)
- {
-     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
--    IOADDRESS vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase;
-+    unsigned long vgaIOBase = pTrident->PIOBase + VGAHWPTR(pScrn)->IOBase;
-     CARD8 temp = 0, protect = 0;
- 
-     /*
-      * Skip MMIO Enable in PC-9821 PCI Trident Card!!
-      * Because of lack of non PCI VGA port
-      */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (IsPciCard && xf86IsPc98())
-       return;
-+#endif
- 
-     /* Goto New Mode */
-     outb(pTrident->PIOBase + 0x3C4, 0x0B);
-@@ -3366,8 +3389,10 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn)
-      * Skip MMIO Disable in PC-9821 PCI Trident Card!!
-      * Because of lack of non PCI VGA port
-      */
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     if (IsPciCard && xf86IsPc98())
-       return;
-+#endif
- 
-     /* Goto New Mode */
-     OUTB(0x3C4, 0x0B); temp = INB(0x3C5);
-@@ -3395,6 +3420,7 @@ TRIDENTDisableMMIO(ScrnInfoPtr pScrn)
-     outb(pTrident->PIOBase + 0x3C5, temp);
- }
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- /* Initialize VGA Block for Trident Chip on PC-98x1 */
- static void
- PC98TRIDENTInit(ScrnInfoPtr pScrn)
-@@ -3637,7 +3663,7 @@ PC98TRIDENT96xxDisable(ScrnInfoPtr pScrn)
-     outb(0x6A, 0x06);
-     outb(0x68, 0x0F);
- }
--
-+#endif
- 
- /* 
-  * This is a terrible hack! If we are on a notebook in a stretched
-diff --git a/src/trident_video.c b/src/trident_video.c
-index 0c5497b..0ae1d14 100644
---- a/src/trident_video.c
-+++ b/src/trident_video.c
-@@ -125,7 +125,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
- 	    adaptors = &newAdaptor;
- 	} else {
- 	    newAdaptors =  /* need to free this someplace */
--		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+		malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
- 	    if(newAdaptors) {
- 		memcpy(newAdaptors, adaptors, num_adaptors * 
- 					sizeof(XF86VideoAdaptorPtr));
-@@ -140,7 +140,7 @@ void TRIDENTInitVideo(ScreenPtr pScreen)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- 
-     if (pTrident->videoFlags)
- 	xf86DrvMsgVerb(pScrn->scrnIndex,X_INFO,3,
-@@ -321,7 +321,7 @@ TRIDENTSetupImageVideo(ScreenPtr pScreen)
-     XF86VideoAdaptorPtr adapt;
-     TRIDENTPortPrivPtr pPriv;
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
- 			    sizeof(TRIDENTPortPrivRec) +
- 			    sizeof(DevUnion))))
- 	return NULL;
-@@ -978,18 +978,18 @@ TRIDENTAllocateSurface(
-     surface->width = w;
-     surface->height = h;
- 
--    if(!(surface->pitches = xalloc(sizeof(int)))) {
-+    if(!(surface->pitches = malloc(sizeof(int)))) {
- 	xf86FreeOffscreenLinear(linear);
- 	return BadAlloc;
-     }
--    if(!(surface->offsets = xalloc(sizeof(int)))) {
--	xfree(surface->pitches);
-+    if(!(surface->offsets = malloc(sizeof(int)))) {
-+	free(surface->pitches);
- 	xf86FreeOffscreenLinear(linear);
- 	return BadAlloc;
-     }
--    if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
--	xfree(surface->pitches);
--	xfree(surface->offsets);
-+    if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
-+	free(surface->pitches);
-+	free(surface->offsets);
- 	xf86FreeOffscreenLinear(linear);
- 	return BadAlloc;
-     }
-@@ -1034,9 +1034,9 @@ TRIDENTFreeSurface(
-     if(pPriv->isOn)
- 	TRIDENTStopSurface(surface);
-     xf86FreeOffscreenLinear(pPriv->linear);
--    xfree(surface->pitches);
--    xfree(surface->offsets);
--    xfree(surface->devPrivate.ptr);
-+    free(surface->pitches);
-+    free(surface->offsets);
-+    free(surface->devPrivate.ptr);
- 
-     return Success;
- }
-@@ -1128,7 +1128,7 @@ TRIDENTInitOffscreenImages(ScreenPtr pScreen)
-     XF86OffscreenImagePtr offscreenImages;
- 
-     /* need to free this someplace */
--    if(!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec))))
-+    if(!(offscreenImages = malloc(sizeof(XF86OffscreenImageRec))))
- 	return;
- 
-     offscreenImages[0].image = &Images[0];
-@@ -1342,7 +1342,10 @@ WaitForVBlank(ScrnInfoPtr pScrn)
-      * full vblank has passed. 
-      * - Alan.
-      */
--    if (!xf86IsPc98()) {
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+    if (!xf86IsPc98())
-+#endif
-+    {
-        WAITFORVSYNC;
-        WAITFORVSYNC;
-     }
diff --git a/extra/xf86-video-vesa/git-fixes.patch b/extra/xf86-video-vesa/git-fixes.patch
deleted file mode 100644
index c4f442265..000000000
--- a/extra/xf86-video-vesa/git-fixes.patch
+++ /dev/null
@@ -1,444 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 22b4b13..f101fb8 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,4 +1,5 @@
- Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
-+Copyright 2008 Red Hat, Inc.
- 
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
-diff --git a/configure.ac b/configure.ac
-index ff4713d..2e4f542 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,45 +20,44 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-vesa],
--        2.3.0,
-+        [2.3.0],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-vesa)
--
-+        [xf86-video-vesa])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
-                              [ moduledir="$withval" ],
-                              [ moduledir="$libdir/xorg/modules" ])
- AC_SUBST(moduledir)
- 
--
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-@@ -93,21 +92,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
--AC_SUBST([CFLAGS])
--AC_SUBST([INCLUDES])
--
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- DRIVER_NAME=vesa
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/vesa.man b/man/vesa.man
-index 19cb766..ce4b369 100644
---- a/man/vesa.man
-+++ b/man/vesa.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH VESA __drivermansuffix__ __vendorversion__
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 88da8a2..dc702f0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -24,6 +24,9 @@
- # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
- # _ladir passes a dummy rpath to libtool so the thing will actually link
- # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-+
-+AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
-+
- vesa_drv_la_LTLIBRARIES = vesa_drv.la
- vesa_drv_la_LDFLAGS = -module -avoid-version
- vesa_drv_ladir = @moduledir@/drivers
-diff --git a/src/vesa.c b/src/vesa.c
-index 034a019..61d3550 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -281,7 +281,7 @@ static VESAPtr
- VESAGetRec(ScrnInfoPtr pScrn)
- {
-     if (!pScrn->driverPrivate)
--	pScrn->driverPrivate = xcalloc(sizeof(VESARec), 1);
-+	pScrn->driverPrivate = calloc(sizeof(VESARec), 1);
- 
-     return ((VESAPtr)pScrn->driverPrivate);
- }
-@@ -296,7 +296,7 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
- 
-     data = (VbeModeInfoData *)vbemode->Private;
- 
--    data->block = xcalloc(sizeof(VbeCRTCInfoBlock), 1);
-+    data->block = calloc(sizeof(VbeCRTCInfoBlock), 1);
-     data->block->HorizontalTotal = ddcmode->HTotal;
-     data->block->HorizontalSyncStart = ddcmode->HSyncStart;
-     data->block->HorizontalSyncEnd = ddcmode->HSyncEnd;
-@@ -317,6 +317,30 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode,
- 				(double)(ddcmode->HTotal * ddcmode->VTotal));
- }
- 
-+/*
-+ * Despite that VBE gives you pixel granularity for mode sizes, some BIOSes
-+ * think they can only give sizes in multiples of character cells; and
-+ * indeed, the reference CVT and GTF formulae only give results where
-+ * (h % 8) == 0.  Whatever, let's just try to cope.  What we're looking for
-+ * here is cases where the display says 1366x768 and the BIOS says 1360x768.
-+ */
-+static Bool
-+vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr vbe)
-+{
-+    if (!(edid->type & M_T_DRIVER))
-+	return FALSE;
-+
-+    /* never seen a height granularity... */
-+    if (edid->VDisplay != vbe->VDisplay)
-+	return FALSE;
-+
-+    if (edid->HDisplay >= vbe->HDisplay &&
-+	(edid->HDisplay & ~7) == (vbe->HDisplay & ~7))
-+	return TRUE;
-+
-+    return FALSE;
-+}
-+
- static ModeStatus
- VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
- {
-@@ -358,9 +382,7 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
- 	 */
- 	if (pScrn->monitor->DDC) {
- 	    for (mode = pScrn->monitor->Modes; mode; mode = mode->next) {
--		if (mode->type & M_T_DRIVER && 
--			mode->HDisplay == p->HDisplay &&
--			mode->VDisplay == p->VDisplay) {
-+		if (vesaModesCloseEnough(mode, p)) {
- 		    if (xf86CheckModeForMonitor(mode, mon) == MODE_OK) {
- 			found = 1;
- 			break;
-@@ -391,7 +413,8 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass)
-     for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) {
- 	mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0);
- 	ret = xf86CheckModeForMonitor(mode, mon);
--	xfree(mode);
-+	free(mode->name);
-+	free(mode);
- 	if (ret == MODE_OK)
- 	    break;
-     }
-@@ -431,8 +454,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
-     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
- 				NULL, NULL, NULL, NULL, NULL);
-     if (pScrn != NULL) {
--	VESAPtr pVesa = VESAGetRec(pScrn);
-+	VESAPtr pVesa;
-+
-+	if (pci_device_has_kernel_driver(dev)) {
-+	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
-+	    return FALSE;
-+	}
- 
-+	pVesa = VESAGetRec(pScrn);
- 	VESAInitScrn(pScrn);
- 	pVesa->pciInfo = dev;
-     }
-@@ -480,7 +509,7 @@ VESAProbe(DriverPtr drv, int flags)
- 		    }
- 		}
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- #endif
-@@ -503,11 +532,11 @@ VESAProbe(DriverPtr drv, int flags)
- 		foundScreen = TRUE;
- 	    }
- 	}
--	xfree(usedChips);
-+	free(usedChips);
-     }
- #endif
- 
--    xfree(devSections);
-+    free(devSections);
- 
-     return (foundScreen);
- }
-@@ -554,9 +583,9 @@ VESAFreeRec(ScrnInfoPtr pScrn)
- 		VbeModeInfoData *data = (VbeModeInfoData*)mode->Private;
- 
- 		if (data->block)
--		    xfree(data->block);
-+		    free(data->block);
- 
--		xfree(data);
-+		free(data);
- 
- 		mode->Private = NULL;
- 	    }
-@@ -564,12 +593,12 @@ VESAFreeRec(ScrnInfoPtr pScrn)
- 	} while (mode && mode != pScrn->modes);
-     }
- #endif
--    xfree(pVesa->monitor);
--    xfree(pVesa->vbeInfo);
--    xfree(pVesa->pal);
--    xfree(pVesa->savedPal);
--    xfree(pVesa->fonts);
--    xfree(pScrn->driverPrivate);
-+    free(pVesa->monitor);
-+    free(pVesa->vbeInfo);
-+    free(pVesa->pal);
-+    free(pVesa->savedPal);
-+    free(pVesa->fonts);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -712,7 +741,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
-     else {
- 	void *panelid = VBEReadPanelID(pVesa->pVbe);
- 	VBEInterpretPanelID(pScrn->scrnIndex, panelid);
--	xfree(panelid);
-+	free(panelid);
-     }
- #endif
- 
-@@ -805,7 +834,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
- 
-     /* options */
-     xf86CollectOptions(pScrn, NULL);
--    if (!(pVesa->Options = xalloc(sizeof(VESAOptions)))) {
-+    if (!(pVesa->Options = malloc(sizeof(VESAOptions)))) {
-         vbeFree(pVesa->pVbe);
- 	return FALSE;
-     }
-@@ -940,7 +969,7 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	pScrn->bitsPerPixel = 8;
- 
-     if (pVesa->shadowFB) {
--	pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY *
-+	pVesa->shadow = calloc(1, pScrn->displayWidth * pScrn->virtualY *
- 				   ((pScrn->bitsPerPixel + 7) / 8));
- 	if (!pVesa->shadow) {
- 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -1119,10 +1148,10 @@ VESACloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
-     if (pVesa->shadowFB && pVesa->shadow) {
- 	shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
--	xfree(pVesa->shadow);
-+	free(pVesa->shadow);
-     }
-     if (pVesa->pDGAMode) {
--	xfree(pVesa->pDGAMode);
-+	free(pVesa->pDGAMode);
- 	pVesa->pDGAMode = NULL;
- 	pVesa->nDGAMode = 0;
-     }
-@@ -1180,7 +1209,7 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
- 	     * Free it as it will not be any longer useful
- 	     */
- 	    xf86ErrorF(", mode set without customized refresh.\n");
--	    xfree(data->block);
-+	    free(data->block);
- 	    data->block = NULL;
- 	    data->mode &= ~(1 << 11);
- 	}
-@@ -1315,7 +1344,7 @@ VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
-     int base;
- 
-     if (pVesa->pal == NULL)
--	pVesa->pal = xcalloc(1, sizeof(CARD32) * 256);
-+	pVesa->pal = calloc(1, sizeof(CARD32) * 256);
- 
-     for (i = 0, base = idx = indices[i]; i < numColors; i++, idx++) {
- 	int j = indices[i];
-@@ -1414,7 +1443,7 @@ SaveFonts(ScrnInfoPtr pScrn)
-     if (attr10 & 0x01)
- 	return;
- 
--    pVesa->fonts = xalloc(16384);
-+    pVesa->fonts = malloc(16384);
- 
-     /* save the registers that are needed here */
-     miscOut = ReadMiscOut();
-@@ -1622,7 +1651,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
- 		&& function == MODE_SAVE) {
- 	        /* don't rely on the memory not being touched */
- 	        if (pVesa->pstate == NULL)
--		    pVesa->pstate = xalloc(pVesa->stateSize);
-+		    pVesa->pstate = malloc(pVesa->stateSize);
- 		memcpy(pVesa->pstate, pVesa->state, pVesa->stateSize);
- 	    }
- 	}
-@@ -1737,7 +1766,7 @@ VESADGAAddModes(ScrnInfoPtr pScrn)
-     DGAModePtr pDGAMode;
- 
-     do {
--	pDGAMode = xrealloc(pVesa->pDGAMode,
-+	pDGAMode = realloc(pVesa->pDGAMode,
- 			    (pVesa->nDGAMode + 1) * sizeof(DGAModeRec));
- 	if (!pDGAMode)
- 	    break;
-diff --git a/src/vesa.h b/src/vesa.h
-index 4656e4c..89245b9 100644
---- a/src/vesa.h
-+++ b/src/vesa.h
-@@ -25,8 +25,6 @@
-  * Conectiva Linux.
-  *
-  * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
-- *
-- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.12 2002/08/06 13:46:27 dawes Exp $
-  */
- 
- #ifndef _VESA_H_
diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.0.10-libnotify-0.7.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.0.10-libnotify-0.7.patch
deleted file mode 100644
index 60cdf27c5..000000000
--- a/extra/xfce4-power-manager/xfce4-power-manager-1.0.10-libnotify-0.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/xfpm-notify.c b/src/xfpm-notify.c
-index c93a843..311b0fd 100644
---- a/src/xfpm-notify.c
-+++ b/src/xfpm-notify.c
-@@ -233,9 +233,6 @@ xfpm_notify_new_notification_internal (const gchar *title, const gchar *message,
- #if !NOTIFY_CHECK_VERSION (0, 7, 0) 
-     if ( icon )
-     	notify_notification_attach_to_status_icon (n, icon);
--#else
--    if ( icon )
--    	notify_notification_attach_to_status_icon (n, icon);
- #endif
- #endif
- 	
diff --git a/extra/xfig/xfig-3.2.5-enable-Xaw3d.patch b/extra/xfig/xfig-3.2.5-enable-Xaw3d.patch
deleted file mode 100644
index f4d113808..000000000
--- a/extra/xfig/xfig-3.2.5-enable-Xaw3d.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up xfig.3.2.5/Imakefile.no-Xaw3d xfig.3.2.5/Imakefile
---- xfig.3.2.5/Imakefile.no-Xaw3d	2007-11-16 10:38:18.000000000 +0100
-+++ xfig.3.2.5/Imakefile	2007-11-16 10:38:49.000000000 +0100
-@@ -50,8 +50,8 @@ XAPPLOADDIR = /usr/share/X11/app-default
- XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
- XCOMM some new features, including "Tips", which replace xfig's "help balloons"
- XCOMM NOTE: This is the default for many X systems now.
-
--XCOMM #define XAW3D1_5E
-+#define XAW3D1_5E
- 
- #ifdef XAW3D1_5E
-     DUSEXAW3D = -DXAW3D -DXAW3D1_5E
--    XAWLIB = -lXaw3d15e
-+    XAWLIB = -lXaw3d
- #else
-     XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
-     XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
diff --git a/extra/xorg-server/revert-trapezoids.patch b/extra/xorg-server/revert-trapezoids.patch
deleted file mode 100644
index b9046c5cb..000000000
--- a/extra/xorg-server/revert-trapezoids.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ru a/fb/fbpict.c b/fb/fbpict.c
---- a/fb/fbpict.c	2011-08-01 01:44:24.000000000 +0200
-+++ b/fb/fbpict.c	2011-10-05 22:45:29.000000000 +0200
-@@ -364,7 +364,7 @@
-     ps->Glyphs = miGlyphs;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
--    ps->Trapezoids = fbTrapezoids;
-+    ps->Trapezoids = miTrapezoids;
-     ps->AddTraps = fbAddTraps;
-     ps->AddTriangles = fbAddTriangles;
-     ps->Triangles = fbTriangles;
-diff -ru a/render/mipict.c b/render/mipict.c
---- a/render/mipict.c	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mipict.c	2011-10-05 22:02:53.000000000 +0200
-@@ -573,6 +573,67 @@
-     }
- }
- 
-+void
-+miTrapezoids (CARD8	    op,
-+	      PicturePtr    pSrc,
-+	      PicturePtr    pDst,
-+	      PictFormatPtr maskFormat,
-+	      INT16	    xSrc,
-+	      INT16	    ySrc,
-+	      int	    ntrap,
-+	      xTrapezoid    *traps)
-+{
-+    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-+
-+    /*
-+     * Check for solid alpha add
-+     */
-+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-+    {
-+	for (; ntrap; ntrap--, traps++)
-+	    (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
-+    } 
-+    else if (maskFormat)
-+    {
-+	PicturePtr	pPicture;
-+	BoxRec		bounds;
-+	INT16		xDst, yDst;
-+	INT16		xRel, yRel;
-+	
-+	xDst = traps[0].left.p1.x >> 16;
-+	yDst = traps[0].left.p1.y >> 16;
-+
-+	miTrapezoidBounds (ntrap, traps, &bounds);
-+	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-+	    return;
-+	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-+					 bounds.x2 - bounds.x1,
-+					 bounds.y2 - bounds.y1);
-+	if (!pPicture)
-+	    return;
-+	for (; ntrap; ntrap--, traps++)
-+	    (*ps->RasterizeTrapezoid) (pPicture, traps, 
-+				       -bounds.x1, -bounds.y1);
-+	xRel = bounds.x1 + xSrc - xDst;
-+	yRel = bounds.y1 + ySrc - yDst;
-+	CompositePicture (op, pSrc, pPicture, pDst,
-+			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-+			  bounds.x2 - bounds.x1,
-+			  bounds.y2 - bounds.y1);
-+	FreePicture (pPicture, 0);
-+    }
-+    else
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	for (; ntrap; ntrap--, traps++)
-+	    miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
-+    }
-+}
-+
- Bool
- miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
- {
-@@ -599,7 +660,7 @@
-     ps->Composite	= 0;			/* requires DDX support */
-     ps->Glyphs		= miGlyphs;
-     ps->CompositeRects	= miCompositeRects;
--    ps->Trapezoids	= 0;
-+    ps->Trapezoids	= miTrapezoids;
-     ps->Triangles	= 0;
-     
-     ps->RasterizeTrapezoid = 0;			/* requires DDX support */
-diff -ru a/render/mipict.h b/render/mipict.h
---- a/render/mipict.h	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mipict.h	2011-10-05 22:06:19.000000000 +0200
-@@ -129,6 +129,23 @@
- 		      CARD32	    pixel,
- 		      xRenderColor  *color);
- 
-+extern _X_EXPORT PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height);
-+
-+extern _X_EXPORT void
-+miTrapezoids (CARD8	    op,
-+	      PicturePtr    pSrc,
-+	      PicturePtr    pDst,
-+	      PictFormatPtr maskFormat,
-+	      INT16	    xSrc,
-+	      INT16	    ySrc,
-+	      int	    ntrap,
-+	      xTrapezoid    *traps);
-+
- extern _X_EXPORT Bool
- miIsSolidAlpha (PicturePtr pSrc);
- 
-diff -ru a/render/mitrap.c b/render/mitrap.c
---- a/render/mitrap.c	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mitrap.c	2011-10-05 22:05:29.000000000 +0200
-@@ -34,6 +34,55 @@
- #include "picturestr.h"
- #include "mipict.h"
- 
-+PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height)
-+{
-+    PixmapPtr	    pPixmap;
-+    PicturePtr	    pPicture;
-+    GCPtr	    pGC;
-+    int		    error;
-+    xRectangle	    rect;
-+
-+    if (width > 32767 || height > 32767)
-+	return 0;
-+
-+    if (!pPictFormat)
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	if (!pPictFormat)
-+	    return 0;
-+    }
-+
-+    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
-+					pPictFormat->depth, 0);
-+    if (!pPixmap)
-+	return 0;
-+    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
-+    if (!pGC)
-+    {
-+	(*pScreen->DestroyPixmap) (pPixmap);
-+	return 0;
-+    }
-+    ValidateGC (&pPixmap->drawable, pGC);
-+    rect.x = 0;
-+    rect.y = 0;
-+    rect.width = width;
-+    rect.height = height;
-+    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
-+    FreeScratchGC (pGC);
-+    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
-+			      0, 0, serverClient, &error);
-+    (*pScreen->DestroyPixmap) (pPixmap);
-+    return pPicture;
-+}
-+
- static xFixed
- miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)
- {
-
diff --git a/extra/xorg-xpr/copyright.patch b/extra/xorg-xpr/copyright.patch
deleted file mode 100644
index 18e718246..000000000
--- a/extra/xorg-xpr/copyright.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 11569289123fb178e23fd1aa284e9fa10e6c1e8c Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 06 Aug 2010 22:09:48 +0000
-Subject: Fill in COPYING file with copyright notices from source code
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/COPYING b/COPYING
-index 7f33cbf..0f9d8e0 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,53 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Copyright (c) 1985, 1988  X Consortium
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+The above copyright notice and this permission notice shall be included
-+in all copies or substantial portions of the Software.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of the X Consortium shall
-+not be used in advertising or otherwise to promote the sale, use or
-+other dealings in this Software without prior written authorization
-+from the X Consortium.
-+
-+Copyright 1986 by Marvin Solomon and the University of Wisconsin
-+
-+Permission to use, copy, modify, and distribute this
-+software and its documentation for any purpose and without
-+fee is hereby granted, provided that the above copyright
-+notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting
-+documentation, and that the names of Marvin Solomon and
-+the University of Wisconsin not be used in
-+advertising or publicity pertaining to distribution of the
-+software without specific, written prior permission.
-+Neither Marvin Solomon nor the University of Wisconsin
-+makes any representations about the suitability of
-+this software for any purpose.  It is provided "as is"
-+without express or implied warranty.
-+
-+Copyright (c) 1988 by Hewlett-Packard Company
-+
-+Permission to use, copy, modify, and distribute this software
-+and its documentation for any purpose and without fee is hereby
-+granted, provided that the above copyright notice appear in all
-+copies and that both that copyright notice and this permission
-+notice appear in supporting documentation, and that
-+Hewlett-Packard not be used in advertising or publicity
-+pertaining to distribution of the software without specific, written
-+prior permission.
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/zsh/svn-1.7.patch b/extra/zsh/svn-1.7.patch
deleted file mode 100644
index 5ef314cc9..000000000
--- a/extra/zsh/svn-1.7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-index b1cb730..41cc3e7 100644
---- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
-@@ -6,12 +6,28 @@
- 
- setopt localoptions noksharrays extendedglob NO_shwordsplit
- local svnbase svnbranch a b rrn
-+local -i rc
- local -A svninfo parentinfo
- local -xA hook_com
- 
- svnbase=".";
- svninfo=()
--${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done
-+# Unfortunately, `$pipestatus' is broken currently. Until that problem is
-+# resolved, here is a workaround that will get things done, without using it.
-+# Clumsily, but that's life.
-+local -a dat
-+dat=( ${(f)"$(${vcs_comm[cmd]} info --non-interactive 2>&1)"} )
-+rc=$?
-+(( rc != 0 )) && return 1
-+# The following line is the real code, the following is the workaround.
-+#${vcs_comm[cmd]} info --non-interactive \
-+print -l "${dat[@]}" \
-+|& while IFS=: read a b; do
-+    svninfo[${a// /_}]="${b## #}"
-+done
-+#rc=${pipestatus[1]}
-+#(( rc != 0 )) && return 1
-+
- while [[ -d "${svnbase}/../.svn" ]]; do
-     parentinfo=()
-     ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done
diff --git a/extra/zziplib/zziplib-0.13.60-ldflags.patch b/extra/zziplib/zziplib-0.13.60-ldflags.patch
deleted file mode 100644
index 3c95ff465..000000000
--- a/extra/zziplib/zziplib-0.13.60-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3175466&group_id=6389&atid=306389
-https://bugs.gentoo.org/354051
-
---- a/configure
-+++ b/configure
-@@ -292,7 +292,7 @@
- # ---------------------------------------------------------------
- AC_MSG_CHECKING([link options])
- ZZIPLIB_LDFLAGS=""
--test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
-+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="-export-dynamic"
- RESOLVES=" # "
- case "$host_os" in mingw*)
-     ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
author	Parabola <dev@list.parabolagnulinux.org>	2012-04-03 14:54:55 +0000
committer	Parabola <dev@list.parabolagnulinux.org>	2012-04-03 14:54:55 +0000
commit	b618c3d0693aec564c6746238fd05d94e31d3b76 (patch)
tree	4a4834f3097bba25dba1adeba4324080c1b4bf7b /extra
parent	8cb5196780766f47b595410eed8ddbee2e8add08 (diff)