diff options
author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-10-11 14:27:00 +0000 |
---|---|---|
committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-10-11 14:27:00 +0000 |
commit | b1c4f7eeed91b2b5500d512ebbb5f929448c6e89 (patch) | |
tree | e52fc5bbd52c0d70d4f48cf7863f9720f9fe3c02 /net/samba3 | |
parent | Update to 2.2.6 RC2 (diff) |
Update to alpha20
Notes
Notes:
svn path=/head/; revision=67814
Diffstat (limited to 'net/samba3')
-rw-r--r-- | net/samba3/Makefile | 6 | ||||
-rw-r--r-- | net/samba3/distinfo | 2 | ||||
-rw-r--r-- | net/samba3/files/patch-ae | 11 | ||||
-rw-r--r-- | net/samba3/files/patch-configure.in | 28 | ||||
-rw-r--r-- | net/samba3/files/patch-includes.h | 14 | ||||
-rw-r--r-- | net/samba3/pkg-plist | 64 |
6 files changed, 41 insertions, 84 deletions
diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 07d2bc50a555..b0b042a69f14 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -6,14 +6,16 @@ # PORTNAME= samba -PORTVERSION= 3.0a19 +PORTVERSION= 3.0a20 CATEGORIES= net MASTER_SITES= http://us4.samba.org/samba/ftp/%SUBDIR%/ MASTER_SITE_SUBDIR= alpha old -DISTNAME= ${PORTNAME}-${PORTVERSION:S/a/-alpha/} +DISTNAME= ${PORTNAME}-${PORTVERSION:S/a/alpha/} MAINTAINER= dwcjr@FreeBSD.org +USE_BZIP2="YES" + .if !defined(WITHOUT_CUPS) WITH_CUPS= yes .endif diff --git a/net/samba3/distinfo b/net/samba3/distinfo index b69a4fd5ffe5..a081eab1d7a7 100644 --- a/net/samba3/distinfo +++ b/net/samba3/distinfo @@ -1 +1 @@ -MD5 (samba-3.0-alpha19.tar.gz) = 497ff8a99f8afe7528ced8dd5f29f46c +MD5 (samba-3.0alpha20.tar.bz2) = 2fe6a786d717998871889ba8d72ec521 diff --git a/net/samba3/files/patch-ae b/net/samba3/files/patch-ae deleted file mode 100644 index e735b5794be1..000000000000 --- a/net/samba3/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- script/convert_smbpasswd.orig Thu Nov 5 02:50:17 1998 -+++ script/convert_smbpasswd Tue Oct 16 17:19:10 2001 -@@ -7,7 +7,7 @@ - # with trying to work out how to get the seconds since 1970 - # in awk or the shell. JRA. - # --nawk 'BEGIN {FS=":"} -+awk 'BEGIN {FS=":"} - { - if( $0 ~ "^#" ) { - print $0 diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in deleted file mode 100644 index da1f47cff770..000000000000 --- a/net/samba3/files/patch-configure.in +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.in.orig Thu Dec 13 08:19:58 2001 -+++ configure.in Sun Dec 23 23:39:48 2001 -@@ -1642,10 +1642,9 @@ - CFLAGS="$CFLAGS -I$withval/include" - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" -- ;; -- esac ], -- AC_MSG_RESULT(no) --) -+ -+ # don't automatically detect krb5 stuff, only do it if --with-krb5=foo -+ # is given (and isn't 'no'). - - # now check for krb5.h. Some systems have the libraries without the headers! - # note that this check is done here to allow for different kerberos -@@ -1669,6 +1668,11 @@ - AC_CHECK_LIB(krb5, krb5_mk_req_extended, [LIBS="$LIBS -lkrb5"; - AC_DEFINE(HAVE_KRB5)]) - -+ ;; -+ esac ], -+ AC_MSG_RESULT(no) -+) -+# end of --with-krb5 check - - ################################################################## - # we might need the lber lib on some systems. To avoid link errors diff --git a/net/samba3/files/patch-includes.h b/net/samba3/files/patch-includes.h deleted file mode 100644 index d041b5d22e49..000000000000 --- a/net/samba3/files/patch-includes.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/includes.h.orig Tue Apr 2 17:23:04 2002 -+++ include/includes.h Tue Apr 2 17:23:08 2002 -@@ -27,6 +27,11 @@ - - #include "local.h" - -+#ifdef __FreeBSD__ -+#define DEFAULT_PRINTING PRINT_BSD -+#define PRINTCAP_NAME "/etc/printcap" -+#endif /* __FreeBSD__ */ -+ - #ifdef AIX - #define DEFAULT_PRINTING PRINT_AIX - #define PRINTCAP_NAME "/etc/qconfig" diff --git a/net/samba3/pkg-plist b/net/samba3/pkg-plist index ac51d10edf35..9f0d17b143b9 100644 --- a/net/samba3/pkg-plist +++ b/net/samba3/pkg-plist @@ -62,17 +62,23 @@ sbin/swat %%PORTDOCS%%share/doc/samba/faq/sambafaq.sgml %%PORTDOCS%%share/doc/samba/faq/sambafaq.txt %%PORTDOCS%%share/doc/samba/history +%%PORTDOCS%%share/doc/samba/htmldocs/Browsing.html +%%PORTDOCS%%share/doc/samba/htmldocs/Bugs.html %%PORTDOCS%%share/doc/samba/htmldocs/CVS-Access.html %%PORTDOCS%%share/doc/samba/htmldocs/DOMAIN_MEMBER.html +%%PORTDOCS%%share/doc/samba/htmldocs/Diagnosis.html %%PORTDOCS%%share/doc/samba/htmldocs/ENCRYPTION.html %%PORTDOCS%%share/doc/samba/htmldocs/Integrating-with-Windows.html %%PORTDOCS%%share/doc/samba/htmldocs/NT_Security.html %%PORTDOCS%%share/doc/samba/htmldocs/OS2-Client-HOWTO.html %%PORTDOCS%%share/doc/samba/htmldocs/PAM-Authentication-And-Samba.html +%%PORTDOCS%%share/doc/samba/htmldocs/Printing.html %%PORTDOCS%%share/doc/samba/htmldocs/Samba-HOWTO-Collection.html %%PORTDOCS%%share/doc/samba/htmldocs/Samba-BDC-HOWTO.html %%PORTDOCS%%share/doc/samba/htmldocs/Samba-PDC-HOWTO.html %%PORTDOCS%%share/doc/samba/htmldocs/Samba-LDAP-HOWTO.html +%%PORTDOCS%%share/doc/samba/htmldocs/Speed.html +%%PORTDOCS%%share/doc/samba/htmldocs/security_level.html %%PORTDOCS%%share/doc/samba/htmldocs/UNIX_INSTALL.html %%PORTDOCS%%share/doc/samba/htmldocs/findsmb.1.html %%PORTDOCS%%share/doc/samba/htmldocs/lmhosts.5.html @@ -111,49 +117,25 @@ sbin/swat %%PORTDOCS%%share/doc/samba/textdocs/ADS-HOWTO.txt %%PORTDOCS%%share/doc/samba/textdocs/Application_Serving.txt %%PORTDOCS%%share/doc/samba/textdocs/BROWSING-Config.txt -%%PORTDOCS%%share/doc/samba/textdocs/BROWSING.txt -%%PORTDOCS%%share/doc/samba/textdocs/BUGS.txt %%PORTDOCS%%share/doc/samba/textdocs/DHCP-Server-Configuration.txt -%%PORTDOCS%%share/doc/samba/textdocs/DIAGNOSIS.txt -%%PORTDOCS%%share/doc/samba/textdocs/DNIX.txt %%PORTDOCS%%share/doc/samba/textdocs/Faxing.txt %%PORTDOCS%%share/doc/samba/textdocs/GOTCHAS.txt -%%PORTDOCS%%share/doc/samba/textdocs/GROUP-MAPPING-HOWTO.txt %%PORTDOCS%%share/doc/samba/textdocs/HINTS.txt -%%PORTDOCS%%share/doc/samba/textdocs/INSTALL.sambatar -%%PORTDOCS%%share/doc/samba/textdocs/Imprints.txt -%%PORTDOCS%%share/doc/samba/textdocs/Macintosh_Clients.txt -%%PORTDOCS%%share/doc/samba/textdocs/NetBIOS.txt %%PORTDOCS%%share/doc/samba/textdocs/PROFILES.txt -%%PORTDOCS%%share/doc/samba/textdocs/Passwords.txt -%%PORTDOCS%%share/doc/samba/textdocs/Printing.txt %%PORTDOCS%%share/doc/samba/textdocs/README.DCEDFS %%PORTDOCS%%share/doc/samba/textdocs/README.NOW %%PORTDOCS%%share/doc/samba/textdocs/README.jis -%%PORTDOCS%%share/doc/samba/textdocs/README.sambatar %%PORTDOCS%%share/doc/samba/textdocs/Recent-FAQs.txt %%PORTDOCS%%share/doc/samba/textdocs/RoutedNetworks.txt -%%PORTDOCS%%share/doc/samba/textdocs/SCO.txt -%%PORTDOCS%%share/doc/samba/textdocs/SMBTAR.notes -%%PORTDOCS%%share/doc/samba/textdocs/Solaris-Winbind-HOWTO.txt -%%PORTDOCS%%share/doc/samba/textdocs/Speed.txt -%%PORTDOCS%%share/doc/samba/textdocs/Speed2.txt -%%PORTDOCS%%share/doc/samba/textdocs/Tracing.txt -%%PORTDOCS%%share/doc/samba/textdocs/UNIX-SMB.txt %%PORTDOCS%%share/doc/samba/textdocs/UNIX_SECURITY.txt -%%PORTDOCS%%share/doc/samba/textdocs/Win95.txt -%%PORTDOCS%%share/doc/samba/textdocs/WinNT.txt -%%PORTDOCS%%share/doc/samba/textdocs/cifsntdomain.txt -%%PORTDOCS%%share/doc/samba/textdocs/security_level.txt share/examples/samba/README share/examples/samba/VFS/.cvsignore share/examples/samba/VFS/Makefile +share/examples/samba/VFS/Makefile.in share/examples/samba/VFS/README -share/examples/samba/VFS/block/Makefile -share/examples/samba/VFS/block/block.c -share/examples/samba/VFS/block/samba-block.conf -share/examples/samba/VFS/block/smb.conf +share/examples/samba/VFS/README.netatalk share/examples/samba/VFS/audit.c +share/examples/samba/VFS/netatalk.c share/examples/samba/VFS/skel.c share/examples/samba/VFS/recycle.c share/examples/samba/LDAP/README @@ -180,8 +162,20 @@ share/examples/samba/libsmbclient/README share/examples/samba/libsmbclient/testsmbc.c share/examples/samba/libsmbclient/tree.c share/examples/samba/misc/extra_smbstatus +share/examples/samba/misc/modify_samba_config.pl share/examples/samba/misc/swat.pl share/examples/samba/misc/wall.perl +share/examples/samba/pdb/mysql/ChangeLog +share/examples/samba/pdb/mysql/Makefile +share/examples/samba/pdb/mysql/Makefile.in +share/examples/samba/pdb/mysql/README +share/examples/samba/pdb/mysql/pdb_mysql.c +share/examples/samba/pdb/xml/ChangeLog +share/examples/samba/pdb/xml/Makefile +share/examples/samba/pdb/xml/Makefile.in +share/examples/samba/pdb/xml/README +share/examples/samba/pdb/xml/TODO +share/examples/samba/pdb/xml/pdb_xml.c share/examples/samba/pdb/Makefile share/examples/samba/pdb/README share/examples/samba/pdb/pdb_test.c @@ -192,10 +186,15 @@ share/examples/samba/printer-accounting/hp5-redir share/examples/samba/printer-accounting/lp-acct share/examples/samba/printer-accounting/printcap share/examples/samba/printing/smbprint +share/examples/samba/printing/smbprint.old share/examples/samba/printing/smbprint-new.sh share/examples/samba/printing/smbprint.sysv share/examples/samba/simple/README share/examples/samba/simple/smb.conf +share/examples/samba/sam/Makefile +share/examples/samba/sam/Makefile.in +share/examples/samba/sam/README +share/examples/samba/sam/sam_skel.c share/examples/samba/smb.conf.default share/examples/samba/svr4-startup/README share/examples/samba/svr4-startup/samba.server @@ -211,16 +210,22 @@ share/examples/samba/validchars/nwdos70.out share/examples/samba/validchars/readme share/examples/samba/validchars/validchr.c share/examples/samba/validchars/validchr.com +share/swat/help/Browsing.html +share/swat/help/Bugs.html share/swat/help/CVS-Access.html share/swat/help/DOMAIN_MEMBER.html +share/swat/help/Diagnosis.html share/swat/help/ENCRYPTION.html share/swat/help/Integrating-with-Windows.html share/swat/help/NT_Security.html share/swat/help/OS2-Client-HOWTO.html share/swat/help/PAM-Authentication-And-Samba.html +share/swat/help/Printing.html share/swat/help/Samba-HOWTO-Collection.html share/swat/help/Samba-BDC-HOWTO.html share/swat/help/Samba-PDC-HOWTO.html +share/swat/help/Speed.html +share/swat/help/security_level.html share/swat/help/UNIX_INSTALL.html share/swat/help/findsmb.1.html share/swat/help/lmhosts.5.html @@ -265,6 +270,7 @@ share/swat/images/samba.gif share/swat/images/shares.gif share/swat/images/status.gif share/swat/images/viewconfig.gif +share/swat/images/wizard.gif share/swat/include/footer.html share/swat/include/header.html share/swat/lang/ja/help/welcome.html @@ -472,14 +478,16 @@ share/swat/using_samba/this_edition.html @dirrm share/examples/samba/svr4-startup @dirrm share/examples/samba/simple @dirrm share/examples/samba/printing +@dirrm share/examples/samba/pdb/mysql +@dirrm share/examples/samba/pdb/xml @dirrm share/examples/samba/pdb @dirrm share/examples/samba/printer-accounting +@dirrm share/examples/samba/sam @dirrm share/examples/samba/misc @dirrm share/examples/samba/libsmbclient @dirrm share/examples/samba/dce-dfs @dirrm share/examples/samba/autofs @dirrm share/examples/samba/appliance -@dirrm share/examples/samba/VFS/block @dirrm share/examples/samba/VFS @dirrm share/examples/samba %%PORTDOCS%%@dirrm share/doc/samba/Registry |