3 files changed, 7 insertions, 53 deletions
diff --git a/package/expat/Makefile b/package/expat/Makefile
index fbc04413c..c74b8a3c4 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -6,15 +6,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		expat
-PKG_VERSION:=		1.95.8
+PKG_VERSION:=		2.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		aff487543845a82fe262e6e2922b4c8e
-
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=expat/}
+PKG_MD5SUM:=		ee8b492592568805593f81f8cdf2a04c
+PKG_DESCR:=		a fast, non-validating, stream-oriented XML parsing library
+PKG_SECTION:=		libs
+PKG_URL:=		http://expat.sourceforge.net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=expat/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
diff --git a/package/expat/ipkg/libexpat.control b/package/expat/ipkg/libexpat.control
deleted file mode 100644
index 9fe78fa63..000000000
--- a/package/expat/ipkg/libexpat.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libexpat
-Priority: optional
-Section: net
-Description: a fast, non-validating, stream-oriented XML parsing library
diff --git a/package/expat/patches/001-destdir.patch b/package/expat/patches/001-destdir.patch
deleted file mode 100644
index 0116f97f2..000000000
--- a/package/expat/patches/001-destdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ruN expat-1.95.8-orig/Makefile.in expat-1.95.8-1/Makefile.in
---- expat-1.95.8.orig/Makefile.in	2004-05-07 22:00:48.000000000 +0200
-+++ expat-1.95.8/Makefile.in	2009-05-09 13:40:57.000000000 +0200
-@@ -34,6 +34,8 @@ man1dir = @mandir@/man1
- 
- top_builddir = .
- 
-+DESTDIR =
-+
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -73,22 +75,22 @@ check: tests/runtests
- 	tests/runtests
- 
- install: xmlwf/xmlwf installlib
--	$(mkinstalldirs) $(bindir) $(man1dir)
--	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
--	$(INSTALL_DATA) $(MANFILE) $(man1dir)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
-+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf
-+	$(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir)
- 
- installlib: $(LIBRARY) $(APIHEADER)
--	$(mkinstalldirs) $(libdir) $(includedir)
--	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
--	$(INSTALL_DATA) $(APIHEADER) $(includedir)
-+	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
-+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
-+	$(INSTALL_DATA) $(APIHEADER) $(DESTDIR)$(includedir)
- 
- uninstall: uninstalllib
--	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
-+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf
- 	rm -f $(man1dir)/xmlwf.1
- 
- uninstalllib:
--	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
--	rm -f $(includedir)/$(APIHEADER)
-+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)
-+	rm -f $(DESTDIR)$(includedir)/$(APIHEADER)
- 
- # for VPATH builds (invoked by configure)
- mkdir-init: