[Midnightbsd-cvs] mports [16114] U trunk/net/samba36: cleanup
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Mar 24 09:48:56 EDT 2014
Revision: 16114
http://svnweb.midnightbsd.org/mports/?rev=16114
Author: laffer1
Date: 2014-03-24 09:48:55 -0400 (Mon, 24 Mar 2014)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/net/samba36/Makefile
trunk/net/samba36/distinfo
trunk/net/samba36/files/samba.in
Removed Paths:
-------------
trunk/net/samba36/files/patch-lib__replace__libreplace_macros.m4
Property Changed:
----------------
trunk/net/samba36/files/README.FreeBSD
trunk/net/samba36/files/patch-lib__replace__system__wait.h
trunk/net/samba36/files/patch-lib__tevent__tevent_signal.c
trunk/net/samba36/files/patch-nsswitch__pam_winbind.c
trunk/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c
trunk/net/samba36/files/patch-nsswitch__wins_freebsd.c
trunk/net/samba36/files/patch-source3__Makefile.in
trunk/net/samba36/files/patch-source3__configure.in
trunk/net/samba36/files/patch-source3__include__includes.h
trunk/net/samba36/files/patch-source3__lib__fault.c
trunk/net/samba36/files/patch-source3__lib__system.c
trunk/net/samba36/files/patch-source3__m4__aclocal.m4
trunk/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c
trunk/net/samba36/files/patch-source3__smbd__quotas.c
trunk/net/samba36/files/patch-source3__smbd__statvfs.c
trunk/net/samba36/files/patch-source3__utils__net.c
trunk/net/samba36/files/patch-source3__utils__net_time.c
trunk/net/samba36/files/pkg-deinstall.in
trunk/net/samba36/files/pkg-install.in
trunk/net/samba36/files/pkg-message.in
trunk/net/samba36/files/samba.in
trunk/net/samba36/files/sernet.patch
trunk/net/samba36/files/smb.conf.sample.in
trunk/net/samba36/pkg-descr
trunk/net/samba36/pkg-plist.swat
Modified: trunk/net/samba36/Makefile
===================================================================
--- trunk/net/samba36/Makefile 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/Makefile 2014-03-24 13:48:55 UTC (rev 16114)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= ${SAMBA_BASENAME}36
-PORTVERSION= 3.6.16
+PORTVERSION= 3.6.22
PORTREVISION?= 0
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
@@ -28,9 +28,8 @@
AUTOHEADER_ARGS= ${IPATHS}
AUTOCONF_ARGS= ${IPATHS}
-USE_GMAKE= yes
GNU_CONFIGURE= yes
-USES= pkgconfig iconv
+USES= gmake pkgconfig iconv
USE_AUTOTOOLS= autoconf autoheader
USE_LDCONFIG= ${SAMBA_LIBDIR}
# pkg-config is used to find talloc
@@ -459,13 +458,6 @@
INSTALL_TARGET+=installswat
.endif
-.if defined(OPTIONS)
-pre-fetch:
- @${ECHO_MSG} "===> -------------------------------------------"
- @${ECHO_MSG} "===> Run 'make config' to (re)configure the port"
- @${ECHO_MSG} "===> -------------------------------------------"
-.endif
-
pre-configure:
@${FIND} ${WRKDIR}/${DISTNAME} -type d | ${XARGS} ${CHMOD} u+w,a+rx
@${FIND} ${WRKDIR}/${DISTNAME} -type f | ${XARGS} ${CHMOD} u+w,a+r
Modified: trunk/net/samba36/distinfo
===================================================================
--- trunk/net/samba36/distinfo 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/distinfo 2014-03-24 13:48:55 UTC (rev 16114)
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.16.tar.gz) = 347c0abe608ad907d04e37948d0f82a2d9dd8daeba13b0b78d7463b8d7b3fef4
-SIZE (samba-3.6.16.tar.gz) = 34108738
+SHA256 (samba-3.6.22.tar.gz) = 30bdf20e7788785573196a33905e7e27083a32d749285c22958edce0721cdeea
+SIZE (samba-3.6.22.tar.gz) = 34122131
Index: trunk/net/samba36/files/README.FreeBSD
===================================================================
--- trunk/net/samba36/files/README.FreeBSD 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/README.FreeBSD 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/README.FreeBSD
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/net/samba36/files/patch-lib__replace__libreplace_macros.m4
===================================================================
--- trunk/net/samba36/files/patch-lib__replace__libreplace_macros.m4 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-lib__replace__libreplace_macros.m4 2014-03-24 13:48:55 UTC (rev 16114)
@@ -1,11 +0,0 @@
---- ./lib/replace/libreplace_macros.m4.orig 2011-10-12 01:38:14.000000000 +0200
-+++ ./lib/replace/libreplace_macros.m4 2011-10-12 01:39:36.000000000 +0200
-@@ -298,7 +298,7 @@
- eval AS_TR_SH([ac_cv_c_prototype_$1])=no
- ])
- )
--AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
-+AS_IF([eval test \$AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
- ])
-
- AC_DEFUN(LIBREPLACE_PROVIDE_HEADER,
Index: trunk/net/samba36/files/patch-lib__replace__system__wait.h
===================================================================
--- trunk/net/samba36/files/patch-lib__replace__system__wait.h 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-lib__replace__system__wait.h 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-lib__replace__system__wait.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-lib__tevent__tevent_signal.c
===================================================================
--- trunk/net/samba36/files/patch-lib__tevent__tevent_signal.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-lib__tevent__tevent_signal.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-lib__tevent__tevent_signal.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-nsswitch__pam_winbind.c
===================================================================
--- trunk/net/samba36/files/patch-nsswitch__pam_winbind.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-nsswitch__pam_winbind.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-nsswitch__pam_winbind.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c
===================================================================
--- trunk/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-nsswitch__winbind_nss_freebsd.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-nsswitch__wins_freebsd.c
===================================================================
--- trunk/net/samba36/files/patch-nsswitch__wins_freebsd.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-nsswitch__wins_freebsd.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-nsswitch__wins_freebsd.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__Makefile.in
===================================================================
--- trunk/net/samba36/files/patch-source3__Makefile.in 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__Makefile.in 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__configure.in
===================================================================
--- trunk/net/samba36/files/patch-source3__configure.in 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__configure.in 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__configure.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__include__includes.h
===================================================================
--- trunk/net/samba36/files/patch-source3__include__includes.h 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__include__includes.h 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__include__includes.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__lib__fault.c
===================================================================
--- trunk/net/samba36/files/patch-source3__lib__fault.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__lib__fault.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__lib__fault.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__lib__system.c
===================================================================
--- trunk/net/samba36/files/patch-source3__lib__system.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__lib__system.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__lib__system.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__m4__aclocal.m4
===================================================================
--- trunk/net/samba36/files/patch-source3__m4__aclocal.m4 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__m4__aclocal.m4 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__m4__aclocal.m4
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c
===================================================================
--- trunk/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__modules__vfs_shadow_copy2.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__smbd__quotas.c
===================================================================
--- trunk/net/samba36/files/patch-source3__smbd__quotas.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__smbd__quotas.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__smbd__quotas.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__smbd__statvfs.c
===================================================================
--- trunk/net/samba36/files/patch-source3__smbd__statvfs.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__smbd__statvfs.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__smbd__statvfs.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__utils__net.c
===================================================================
--- trunk/net/samba36/files/patch-source3__utils__net.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__utils__net.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__utils__net.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/patch-source3__utils__net_time.c
===================================================================
--- trunk/net/samba36/files/patch-source3__utils__net_time.c 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/patch-source3__utils__net_time.c 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/patch-source3__utils__net_time.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/pkg-deinstall.in
===================================================================
--- trunk/net/samba36/files/pkg-deinstall.in 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/pkg-deinstall.in 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/pkg-deinstall.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/pkg-install.in
===================================================================
--- trunk/net/samba36/files/pkg-install.in 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/pkg-install.in 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/pkg-install.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/pkg-message.in
===================================================================
--- trunk/net/samba36/files/pkg-message.in 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/pkg-message.in 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/samba36/files/samba.in
===================================================================
--- trunk/net/samba36/files/samba.in 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/samba.in 2014-03-24 13:48:55 UTC (rev 16114)
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# $FreeBSD$
-#
+# $MidnightBSD$
# PROVIDE: nmbd smbd
%%WINBIND%%# PROVIDE: winbindd
@@ -162,13 +161,13 @@
if [ -n "${samba_config}" -a "${samba_config}" != "${samba_config_default}" ]; then
pid_extra="-$(basename "${samba_config}")"
fi
+ # Defaults
+ samba_enable=${samba_enable:=NO}
# Setup dependent variables
if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
nmbd_enable=${nmbd_enable=YES}
smbd_enable=${smbd_enable=YES}
fi
- # Defaults
- samba_enable=${samba_enable:=NO}
nmbd_enable=${nmbd_enable:=NO}
smbd_enable=${smbd_enable:=NO}
%%WINBIND%% # Winbindd
Property changes on: trunk/net/samba36/files/samba.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/files/sernet.patch
===================================================================
--- trunk/net/samba36/files/sernet.patch 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/sernet.patch 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/sernet.patch
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/net/samba36/files/smb.conf.sample.in
===================================================================
--- trunk/net/samba36/files/smb.conf.sample.in 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/files/smb.conf.sample.in 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/files/smb.conf.sample.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/pkg-descr
===================================================================
--- trunk/net/samba36/pkg-descr 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/pkg-descr 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/samba36/pkg-plist.swat
===================================================================
--- trunk/net/samba36/pkg-plist.swat 2014-03-24 12:38:41 UTC (rev 16113)
+++ trunk/net/samba36/pkg-plist.swat 2014-03-24 13:48:55 UTC (rev 16114)
Property changes on: trunk/net/samba36/pkg-plist.swat
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list