4 files changed, 7 insertions, 53 deletions

diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
index 94db6c055cc3..78fc9784ffb1 100644
--- a/net/samba-libsmbclient/Makefile
+++ b/net/samba-libsmbclient/Makefile
@@ -6,21 +6,19 @@
 #
 
 PORTNAME=	samba
-PORTVERSION=	3.0.0
+PORTVERSION=	3.0.1
 CATEGORIES=	net
 MASTER_SITES=   http://us3.samba.org/samba/ftp/%SUBDIR%/ \
                 http://us4.samba.org/samba/ftp/%SUBDIR%/ \
                 http://us5.samba.org/samba/ftp/%SUBDIR%/
 MASTER_SITE_SUBDIR=     . old-versions
 PKGNAMESUFFIX=  -libsmbclient
-DISTNAME=	${PORTNAME}-3.0.0
 
 MAINTAINER=	kwm@rainbow-runner.nl
-COMMENT=	The shared lib from the samba packges
-
-CONFLICTS=	samba-3.*
+COMMENT=	The shared lib from the samba packages
 
 USE_BZIP2=		yes
+USE_SIZE=		yes
 USE_AUTOCONF=		yes
 WANT_AUTOCONF_VER=	253
 INSTALLS_SHLIB=		yes
@@ -36,7 +34,7 @@ do-build:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so ${PREFIX}/lib
-	${LN} -s ${PREFIX}/lib/libsmbclient.so ${PREFIX}/lib/libsmbclient.so.0
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so ${PREFIX}/lib/libsmbclient.so.0
+	${LN} -s ${PREFIX}/lib/libsmbclient.so.0 ${PREFIX}/lib/libsmbclient.so
 
 .include <bsd.port.mk>
diff --git a/net/samba-libsmbclient/distinfo b/net/samba-libsmbclient/distinfo
index 525e7a4cd22d..c10b7f6e4cd6 100644
--- a/net/samba-libsmbclient/distinfo
+++ b/net/samba-libsmbclient/distinfo
@@ -1 +1,2 @@
-MD5 (samba-3.0.0.tar.bz2) = f54ba49f9a5ef6090272acf8db2e066d
+MD5 (samba-3.0.1.tar.bz2) = 2a3d494f139ab7402d8902b0e68c463f
+SIZE (samba-3.0.1.tar.bz2) = 8303432
diff --git a/net/samba-libsmbclient/files/patch-configure b/net/samba-libsmbclient/files/patch-configure
deleted file mode 100644
index cd8f4afb43fe..000000000000
--- a/net/samba-libsmbclient/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.in.orig	Wed Jul 16 22:45:47 2003
-+++ configure.in	Sun Aug  3 12:49:35 2003
-@@ -1310,12 +1310,20 @@
-     AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
- fi
- 
--AC_CACHE_CHECK([for __va_copy],samba_cv_HAVE_VA_COPY,[
-+AC_CACHE_CHECK([for va_copy],samba_cv_HAVE_VA_COPY,[
- AC_TRY_LINK([#include <stdarg.h>
--va_list ap1,ap2;], [__va_copy(ap1,ap2);],
-+va_list ap1,ap2;], [va_copy(ap1,ap2);],
- samba_cv_HAVE_VA_COPY=yes,samba_cv_HAVE_VA_COPY=no)])
- if test x"$samba_cv_HAVE_VA_COPY" = x"yes"; then
--    AC_DEFINE(HAVE_VA_COPY,1,[Whether __va_copy() is available])
-+    AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
-+fi
-+
-+AC_CACHE_CHECK([for __va_copy],samba_cv_HAVE__VA_COPY,[
-+AC_TRY_LINK([#include <stdarg.h>
-+va_list ap1,ap2;], [__va_copy(ap1,ap2);],
-+samba_cv_HAVE__VA_COPY=yes,samba_cv_HAVE__VA_COPY=no)])
-+if test x"$samba_cv_HAVE__VA_COPY" = x"yes"; then
-+    AC_DEFINE(HAVE__VA_COPY,1,[Whether __va_copy() is available])
- fi
- 
- AC_CACHE_CHECK([for C99 vsnprintf],samba_cv_HAVE_C99_VSNPRINTF,[
diff --git a/net/samba-libsmbclient/files/patch-include_includes.h b/net/samba-libsmbclient/files/patch-include_includes.h
deleted file mode 100644
index c50317978d45..000000000000
--- a/net/samba-libsmbclient/files/patch-include_includes.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/includes.h.orig	Tue Jul  1 22:44:25 2003
-+++ include/includes.h	Sun Aug  3 12:05:23 2003
-@@ -1248,10 +1248,14 @@
- 
- 
- /* we need to use __va_copy() on some platforms */
--#ifdef HAVE_VA_COPY
-+#ifdef HAVE__VA_COPY
- #define VA_COPY(dest, src) __va_copy(dest, src)
- #else
-+#ifdef HAVE_VA_COPY
-+#define VA_COPY(dest, src) va_copy(dest, src)
-+#else
- #define VA_COPY(dest, src) (dest) = (src)
-+#endif
- #endif
- 
- #ifndef HAVE_TIMEGM
-