* packages.mak: Updated the download server of libopendaap and the used version....

* Makefile:
    - Our patch was applied upstream, so we don't need it anymore.
    - Fixed a copy&paste typo, which prevented the dist-clean of 9 libraries

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 781dfb8463b5261f659667f834729031bbf6ec06..e0e4dd8a250f0977c6c9f18a4ed308f88c4718d2 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1072,7 +1072,7 @@ libpng: libpng-$(PNG_VERSION).tar.bz2
 
 CLEAN_FILE += .png
 CLEAN_PKG += libpng
-DISCLEAN_PKG += libpng-$(PNG_VERSION).tar.bz2
+DISTCLEAN_PKG += libpng-$(PNG_VERSION).tar.bz2
 
 # ***************************************************************************
 # libzvbi
@@ -1090,7 +1090,7 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
 
 CLEAN_FILE += .zvbi
 CLEAN_PKG += zvbi
-DISCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
+DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 
 # ***************************************************************************
 # gpg-error 
@@ -1109,7 +1109,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
 
 CLEAN_FILE += .gpg-error
 CLEAN_PKG += libgpg-error
-DISCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz
+DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz
 
 # ***************************************************************************
 # libgcrypt
@@ -1129,7 +1129,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.gz
 
 CLEAN_FILE += .gcrypt
 CLEAN_PKG += libgcrypt
-DISCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.gz
+DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.gz
 
 # ***************************************************************************
 # gnutls
@@ -1148,7 +1148,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
 
 CLEAN_FILE += .gnutls
 CLEAN_PKG += gnutls
-DISCLEAN_PKG += gnutls-$(GNUTLS_VERSION).tar.bz2
+DISTCLEAN_PKG += gnutls-$(GNUTLS_VERSION).tar.bz2
 
 # ***************************************************************************
 # libopendaap
@@ -1159,7 +1159,6 @@ libopendaap-$(DAAP_VERSION).tar.bz2:
 
 libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p 0 < Patches/daap.patch
 
 .daap: libopendaap
        (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make install )
@@ -1167,7 +1166,7 @@ libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2
 
 CLEAN_FILE += .daap
 CLEAN_PKG += libopendaap
-DISCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
+DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
 
 # ***************************************************************************
 # glib
@@ -1185,7 +1184,7 @@ glib: glib-$(GLIB_VERSION).tar.gz
 
 CLEAN_FILE += .glibl
 CLEAN_PKG += glib
-DISCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz
+DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz
 
 # ***************************************************************************
 # libIDL
@@ -1203,7 +1202,7 @@ libIDL: libIDL-$(LIBIDL_VERSION).tar.gz
 
 CLEAN_FILE += .libidl
 CLEAN_PKG += libIDL
-DISCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
+DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
 
 # ***************************************************************************
 # mozilla
@@ -1221,7 +1220,7 @@ mozilla: mozilla-source-$(MOZILLA_VERSION).tar.bz2
 
 CLEAN_FILE += .mozilla
 CLEAN_PKG += mozilla
-DISCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2
+DISTCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2
 
 # ***************************************************************************
 # Copy aclocal files

diff --git a/extras/contrib/src/Patches/daap.patch b/extras/contrib/src/Patches/daap.patch
deleted file mode 100644 (file)
index cca2526..0000000
--- a/extras/contrib/src/Patches/daap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN libopendaap.orig/http_client.c libopendaap/http_client.c
---- libopendaap.orig/http_client.c     Mon Jan 17 15:36:28 2005
-+++ libopendaap/http_client.c  Mon Jan 17 15:37:01 2005
-@@ -36,6 +36,7 @@
- # include <sys/types.h>
- # include <sys/socket.h>
- # include <sys/select.h>
-+# include <netinet/in.h>
- # include <netdb.h>
- # include <fcntl.h>
- #elif defined(SYSTEM_WIN32)

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 509cb461b24a6988c11341ced092ddf3b68799e8..e663257e902fc525e78e20ab5952ed4e36d10550 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -117,8 +117,8 @@ GCRYPT_VERSION=1.2.0
 GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.gz
 GNUTLS_VERSION=1.2.6
 GNUTLS_URL=ftp://ftp.gnutls.org/pub/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
-DAAP_VERSION=0.3.0
-DAAP_URL=http://crazney.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
+DAAP_VERSION=0.4.0
+DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
 GLIB_VERSION=1.2.8
 GLIB_URL=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.8.tar.gz
 LIBIDL_VERSION=0.6.8