X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fneon%2FMakefile;h=50e4a4958f613dba9b12898d30af38dc76c839ea;hb=883cc2b2229af850895efc5f2b3d243eeb8c1d80;hp=ed452c271218e7ee8a5c2e82c19b5ad06a11d21d;hpb=7ac56ada95f6da0e5426c5b70949b92e6de916a9;p=packages.git

diff --git a/libs/neon/Makefile b/libs/neon/Makefile
index ed452c271..50e4a4958 100644
--- a/libs/neon/Makefile
+++ b/libs/neon/Makefile
@@ -1,85 +1,62 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=neon
-PKG_VERSION:=0.26.3
+PKG_VERSION:=0.29.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.webdav.org/neon/
-PKG_MD5SUM:=6e52cd9c03e372026d6eccbfb80f09ef
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://www.webdav.org/neon
+PKG_MD5SUM:=591e0c82e6979e7e615211b386b8f6bc
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/neon
+define Package/libneon
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libopenssl +libxml2 +libintl
-  TITLE:=neon - HTTP and WebDAV client library
+  TITLE:=HTTP and WebDAV client library
   URL:=http://www.webdav.org/neon/
+  DEPENDS:=+libopenssl +libexpat
 endef
 
-define Build/Configure	
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--with-libxml2 \
-		--with-ssl=openssl \
-		--without-egd \
-		--without-socks \
-		, \
-		LDFLAGS="-lcrypto -lssl -L$(STAGING_DIR)/usr/lib" \
-		CFLAGS="-I$(STAGING_DIR)/include \
-		       	-I$(STAGING_DIR)/usr/include/libxml2 \
-			-I$(STAGING_DIR)/usr/lib/libintl/include" \
-	)
-endef
-
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+TARGET_CFLAGS += $(FPIC)
 
-define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(STAGING_DIR)/usr/bin/
-	mkdir -p $(STAGING_DIR)/usr/include/neon
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/neon/* $(STAGING_DIR)/usr/include/neon/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/{libneon.a,libneon.la,libneon.so,libneon.so.26,libneon.so.26.0.3} $(STAGING_DIR)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/neon.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-	$(SED)  "s,\=\/usr,\=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/neon-config
-	$(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libneon.la
-	$(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libneon.lav
-	$(SED)  "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/neon.pc
-	$(SED)  "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/neon.pc
-endef
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--with-expat \
+	--with-ssl="openssl" \
+	--without-egd \
+	--without-libproxy \
 
-define Build/UninstallDev
-	rm	$(STAGING_DIR)/usr/bin/neon-config \
-		$(STAGING_DIR)/usr/lib/{libneon.a,libneon.la,libneon.so,libneon.so.26,libneon.so.26.0.3} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/neon.pc
-	rm -rf	$(STAGING_DIR)/usr/include/neon
-endef
+CONFIGURE_VARS += \
+	LDFLAGS="$$$$LDFLAGS -lcrypto -lssl"
 
-define Package/neon/install	
+define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/neon $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libneon.{a,so*} $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/neon.pc $(1)/usr/lib/pkgconfig/
+	$(SED) 's,-I$$$${includedir}/,-I$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/neon-config
+	$(SED) 's,-L$$$${libdir},,g' $(1)/usr/bin/neon-config
+endef
+
+define Package/libneon/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libneon.so.* $(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,neon))
+$(eval $(call BuildPackage,libneon))