Modify for non-lib32 package

2 files changed, 16 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a57213ea3e33..989a0da6722c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
-pkgbase = lib32-libxml
-	pkgdesc = The XML C parser and toolkit of Gnome. Older version (32-bit)
+pkgbase = libxml
+	pkgdesc = The XML C parser and toolkit of Gnome. Older version.
 	pkgver = 1.8.17
 	pkgrel = 1
 	url = http://xmlsoft.org/
+	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = lib32-zlib
+	depends = zlib
 	options = !libtool
 	source = ftp://xmlsoft.org/libxml2/old/libxml-1.8.17.tar.gz
 	md5sums = 53846294aa850a7d042948176d1d19dc
 
-pkgname = lib32-libxml
+pkgname = libxml
 
diff --git a/PKGBUILD b/PKGBUILD
index 07d4fd68d384..02e0d54985ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,20 @@
-# Maintainer: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Jonathon Fernyhough <jonathon_at manjaro dot_org>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
 
-_pkgbasename=libxml
-pkgname=lib32-$_pkgbasename
+pkgname=libxml
 pkgver=1.8.17
 pkgrel=1
-pkgdesc="The XML C parser and toolkit of Gnome. Older version (32-bit)"
-arch=(x86_64)
+pkgdesc="The XML C parser and toolkit of Gnome. Older version."
+arch=(i686 x86_64)
 url="http://xmlsoft.org/"
 license=('GPL')
-depends=('lib32-zlib')
+depends=('zlib')
 options=('!libtool')
-source=("ftp://xmlsoft.org/libxml2/old/${_pkgbasename}-${pkgver}.tar.gz")
+source=("ftp://xmlsoft.org/libxml2/old/${pkgname}-${pkgver}.tar.gz")
 md5sums=('53846294aa850a7d042948176d1d19dc')
 
 build() {
-  
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   
   # build with -D_FORTIFY_SOURCE=2
   sed -i "s|\(O_WRONLY\))|\1, 0666)|" nanohttp.c
@@ -27,14 +22,14 @@ build() {
   sed -i -e "32c LT_INIT" -e "20c AM_INIT_AUTOMAKE([1.13 no-define foreign])" -e "3,4c AC_INIT(libxml, 1.8.17) \nAC_CONFIG_HEADERS([config.h])" configure.in
   autoreconf -fi
 
-  ./configure --prefix=/usr --enable-static=no --libdir=/usr/lib32
+  ./configure --prefix=/usr --enable-static=no
   make
 }
 
 package() {
-  cd "$srcdir/${_pkgbasename}-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="${pkgdir}/" install
 }
 
 # vim:set ts=2 sw=2 et: