9 files changed, 46 insertions, 37 deletions

diff --git a/net/samba4wins/Makefile b/net/samba4wins/Makefile
index e9bb9ecb36e1..7e9464bd43d6 100644
--- a/net/samba4wins/Makefile
+++ b/net/samba4wins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		samba4wins
-PORTVERSION=		1.0.6
-PORTREVISION=		1
+PORTVERSION=		1.0.7
 CATEGORIES=		net
 MASTER_SITES=		http://ftp.sernet.de/pub/samba4WINS/debian/pool/
 DISTNAME=		${PORTNAME}_${PORTVERSION}-1
@@ -55,6 +54,8 @@ SUB_LIST+=		S4W_RUNDIR=${S4W_RUNDIR}
 PLIST_SUB+=		S4W_LOGDIR=${S4W_LOGDIR} \
 			S4W_LOCKDIR=${S4W_LOCKDIR}
 
+INSTALL_TARGET=		showlayout installbin installdat installmisc installlib installpc
+
 post-build:
 			@for f in ${WRKSRC}/scripting/bin/*; do \
 			    ${REINPLACE_CMD} -i '' -e 's|smbscript|${PREFIX}/bin/smbscript4|' \
@@ -67,18 +68,8 @@ post-install:
 .if !defined(NOPORTDOCS)
 			@${MKDIR} ${DOCSDIR}
 .	for d in HOWTO.txt NEWS.txt README.txt TODO.txt
-			${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/debian/${PORTNAME}-${PORTVERSION}-${d} ${DOCSDIR}/${d}
+			${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/${PORTNAME}-${d} ${DOCSDIR}/${d}
 .	endfor
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on FreeBSD 6.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/samba4wins/distinfo b/net/samba4wins/distinfo
index 0f744d66367e..4af2d63e8ba0 100644
--- a/net/samba4wins/distinfo
+++ b/net/samba4wins/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba4wins_1.0.6-1.tar.gz) = bd5893446dd99ec0ce025e989b726ee7
-SHA256 (samba4wins_1.0.6-1.tar.gz) = 996d96a8d6862d60034f8fe527fa757ca0194ae5231b8eb214a89eaf07cea8d8
-SIZE (samba4wins_1.0.6-1.tar.gz) = 7231680
+MD5 (samba4wins_1.0.7-1.tar.gz) = d1ec72bb75ff510634a10cdb6c780d88
+SHA256 (samba4wins_1.0.7-1.tar.gz) = 17c074a7c1f2db53beb4fd0dd71606da8af18ee7bff5efc33e318bf568f60467
+SIZE (samba4wins_1.0.7-1.tar.gz) = 7398515
diff --git a/net/samba4wins/files/patch-build__m4__check_types.m4 b/net/samba4wins/files/patch-build__m4__check_types.m4
new file mode 100644
index 000000000000..45dd1bf8ab86
--- /dev/null
+++ b/net/samba4wins/files/patch-build__m4__check_types.m4
@@ -0,0 +1,11 @@
+--- ./build/m4/check_types.m4.orig	2009-01-19 04:57:18.000000000 +0000
++++ ./build/m4/check_types.m4	2009-01-19 04:57:30.000000000 +0000
+@@ -21,7 +21,7 @@
+ AC_CHECK_SIZEOF(int,cross)
+ AC_CHECK_SIZEOF(long,cross)
+ AC_CHECK_SIZEOF(long long,cross)
+-if test x"$ac_cv_type_long_long" != x"yes";then
++if test x"$ac_cv_type_long_long" = x"yes";then
+ 	AC_MSG_ERROR([Sorry we need type 'long long'])
+ fi
+ if test $ac_cv_sizeof_long_long -lt 8;then
diff --git a/net/samba4wins/files/patch-heimdal_build__config.h b/net/samba4wins/files/patch-heimdal_build__config.h
new file mode 100644
index 000000000000..2014841fb9df
--- /dev/null
+++ b/net/samba4wins/files/patch-heimdal_build__config.h
@@ -0,0 +1,19 @@
+--- ./heimdal_build/config.h.orig	2009-01-19 03:15:19.000000000 +0000
++++ ./heimdal_build/config.h	2009-01-19 04:55:23.000000000 +0000
+@@ -58,6 +58,16 @@
+ #define OPENLOG_PROTO_COMPATIBLE
+ #define GETSOCKNAME_PROTO_COMPATIBLE
+ 
++#ifndef HAVE_GETPROGNAME
++#define HAVE_GETPROGNAME
++#endif
++#ifndef HAVE_SETPROGNAME
++#define HAVE_SETPROGNAME
++#endif
++#ifndef HAVE___PROGNAME
++#define HAVE___PROGNAME
++#endif
++
+ #ifndef HAVE_SOCKLEN_T
+ #define HAVE_SOCKLEN_T
+ #endif
diff --git a/net/samba4wins/files/patch-lib_ldb_config.mk b/net/samba4wins/files/patch-lib__ldb__config.mk
index 3da37cf4981d..ebe5b5721692 100644
--- a/net/samba4wins/files/patch-lib_ldb_config.mk
+++ b/net/samba4wins/files/patch-lib__ldb__config.mk
@@ -1,5 +1,5 @@
---- lib/ldb/config.mk.orig	Mon Aug 28 04:22:54 2006
-+++ lib/ldb/config.mk	Mon Aug 28 04:23:33 2006
+--- ./lib/ldb/config.mk.orig	2009-01-14 08:31:07.000000000 +0000
++++ ./lib/ldb/config.mk	2009-01-19 02:13:34.000000000 +0000
 @@ -179,7 +179,7 @@
  
  ################################################
diff --git a/net/samba4wins/files/patch-main.mk b/net/samba4wins/files/patch-main.mk
deleted file mode 100644
index af8793ebeb3a..000000000000
--- a/net/samba4wins/files/patch-main.mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- main.mk.orig	Sun Apr  9 04:52:10 2006
-+++ main.mk	Sun Apr  9 04:52:33 2006
-@@ -86,8 +86,7 @@
- 	 -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
- 	 -DSETUPDIR=\"$(SETUPDIR)\"
- 
--install: showlayout installbin installdat installswat installmisc installlib \
--	installheader installpc
-+install: showlayout installbin installdat installmisc installlib installpc
- 
- # DESTDIR is used here to prevent packagers wasting their time
- # duplicating the Makefile. Remove it and you will have the privilege
diff --git a/net/samba4wins/files/patch-scripting_ejs_config.mk b/net/samba4wins/files/patch-scripting__ejs__config.mk
index 2d86a5e3083f..afdb5867e1e2 100644
--- a/net/samba4wins/files/patch-scripting_ejs_config.mk
+++ b/net/samba4wins/files/patch-scripting__ejs__config.mk
@@ -1,5 +1,5 @@
---- scripting/ejs/config.mk.orig	Tue Aug 29 01:37:15 2006
-+++ scripting/ejs/config.mk	Tue Aug 29 01:37:25 2006
+--- ./scripting/ejs/config.mk.orig	2005-12-31 12:13:44.000000000 +0000
++++ ./scripting/ejs/config.mk	2009-01-19 02:13:34.000000000 +0000
 @@ -37,7 +37,7 @@
  
  #######################
diff --git a/net/samba4wins/files/patch-torture_config.mk b/net/samba4wins/files/patch-torture__config.mk
index 57bd7f5cd16e..03c35e1170f8 100644
--- a/net/samba4wins/files/patch-torture_config.mk
+++ b/net/samba4wins/files/patch-torture__config.mk
@@ -1,5 +1,5 @@
---- torture/config.mk.orig	Mon Aug 28 23:34:14 2006
-+++ torture/config.mk	Mon Aug 28 23:34:27 2006
+--- ./torture/config.mk.orig	2009-01-14 08:31:07.000000000 +0000
++++ ./torture/config.mk	2009-01-19 02:13:34.000000000 +0000
 @@ -198,7 +198,7 @@
  
  #################################
diff --git a/net/samba4wins/files/patch-utils_config.mk b/net/samba4wins/files/patch-utils__config.mk
index b23040b8151e..3c3019fd73df 100644
--- a/net/samba4wins/files/patch-utils_config.mk
+++ b/net/samba4wins/files/patch-utils__config.mk
@@ -1,5 +1,5 @@
---- utils/config.mk.orig	Mon Jul  3 09:48:15 2006
-+++ utils/config.mk	Mon Aug 28 02:13:42 2006
+--- ./utils/config.mk.orig	2009-01-14 08:31:07.000000000 +0000
++++ ./utils/config.mk	2009-01-19 02:13:34.000000000 +0000
 @@ -77,7 +77,7 @@
  
  #################################