diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba/Makefile | 34 | ||||
| -rw-r--r-- | net/samba/distinfo | 2 | ||||
| -rw-r--r-- | net/samba/files/patch-ba | 18 | ||||
| -rw-r--r-- | net/samba/files/patch-libsmb | 11 | ||||
| -rw-r--r-- | net/samba/files/patch-source-include-includes.h | 14 | ||||
| -rw-r--r-- | net/samba/pkg-plist | 3 |
6 files changed, 19 insertions, 63 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 02b6edfc630e..f41dd6b282a1 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -6,26 +6,33 @@ # PORTNAME= samba -PORTVERSION= 2.2.6.p2 -PORTREVISION= 1 +PORTVERSION= 2.2.6.r2 CATEGORIES= net MASTER_SITES= http://us4.samba.org/samba/ftp/%SUBDIR%/ MASTER_SITE_SUBDIR= pre old-versions . -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/} +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= dwcjr@FreeBSD.org USE_BZIP2= YES -USE_REINPLACE= YES USE_SUBMAKE= YES USE_GMAKE= YES USE_LIBTOOL= YES USE_AUTOCONF= YES -AUDIT= "@comment " -RECYCLE= "@comment " -LIBSAMBA= "@comment " -BUILD_VFS= "@comment " +# directories +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) +IS_INTERACTIVE= yes +.endif + +.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) +.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" +.endif + +AUDIT?= "@comment " +RECYCLE?= "@comment " +LIBSAMBA?= "@comment " +BUILD_VFS?= "@comment " .if defined(WITH_AUDIT) AUDIT= "" @@ -39,14 +46,6 @@ LIBSAMBA= "" BUILD_VFS= "" .endif -# directories -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -IS_INTERACTIVE= yes -.endif - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif VARDIR= /var SAMBA_SPOOL= ${VARDIR}/spool/samba @@ -166,9 +165,6 @@ post-build: ${RM} -f config.cache config.log config.status .endif -pre-configure: - ${REINPLACE_CMD} -e 's/DYNEXP="-Wl,-Bdynamic"/DYNEXP="-Wl,--export-dynamic"/' ${WRKSRC}/configure.in - pre-build: ${RM} -fr ${WRKSRC}/include/proto.h (cd ${WRKSRC} && make proto) diff --git a/net/samba/distinfo b/net/samba/distinfo index 4aaef51ab25d..f5777ac4f237 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1 +1 @@ -MD5 (samba-2.2.6pre2.tar.bz2) = d48b02481dcb0335829cffe5d11fd6ad +MD5 (samba-2.2.6rc2.tar.bz2) = f8bb543946ab5016d6c685f2e0f67157 diff --git a/net/samba/files/patch-ba b/net/samba/files/patch-ba index 4d22339926f5..e9824c885c59 100644 --- a/net/samba/files/patch-ba +++ b/net/samba/files/patch-ba @@ -1,14 +1,5 @@ --- source/configure.in.orig Thu Aug 29 07:05:30 2002 +++ source/configure.in Sat Sep 7 20:54:21 2002 -@@ -884,7 +884,7 @@ - LDSHFLAGS="-shared" - DYNEXP="-Wl,--export-dynamic" - SONAMEFLAG="-Wl,-soname," -- PICFLAG="-fPIC" -+ PICFLAG="-fPIC -DPIC" - AC_DEFINE(STAT_ST_BLOCKSIZE,512) - ;; - *openbsd*) BLDSHARED="true" @@ -1914,7 +1914,7 @@ yes) AC_MSG_RESULT(yes) @@ -18,12 +9,3 @@ CFLAGS="$CFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib" ;; -@@ -2090,7 +2090,7 @@ - AC_DEFINE(WITH_LDAP_SAM) - LDAPLIBS="-lldap" - AC_CHECK_LIB(lber, ber_bvfree, [LDAPLIBS="$LDAPLIBS -llber"]) -- LDAPLIBS="-lresolv $LDAPLIBS" -+ LDAPLIBS="$LDAPLIBS" - old_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $LDAPLIBS" - AC_CHECK_FUNCS(ldap_start_tls_s) diff --git a/net/samba/files/patch-libsmb b/net/samba/files/patch-libsmb deleted file mode 100644 index f922c5be6eb8..000000000000 --- a/net/samba/files/patch-libsmb +++ /dev/null @@ -1,11 +0,0 @@ ---- source/libsmb/clilist.c Fri Jul 26 23:56:45 2002 -+++ source/libsmb/clilist.c Mon -Sep 16 07:18:16 2002 -@@ -59,7 +59,6 @@ - sizeof(finfo->name), - len, - STR_TERMINATE); -- p += 1; /* Skip the trailing \0 too */ - return PTR_DIFF(p, base); - - case 2: /* this is what OS/2 uses mostly */ diff --git a/net/samba/files/patch-source-include-includes.h b/net/samba/files/patch-source-include-includes.h deleted file mode 100644 index 9596eee19536..000000000000 --- a/net/samba/files/patch-source-include-includes.h +++ /dev/null @@ -1,14 +0,0 @@ ---- source/include/includes.h.orig Sat Oct 13 17:09:21 2001 -+++ source/include/includes.h Fri Jan 11 22:12:06 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/samba/pkg-plist b/net/samba/pkg-plist index 2039ce774a53..317ea8cdeaba 100644 --- a/net/samba/pkg-plist +++ b/net/samba/pkg-plist @@ -150,6 +150,7 @@ sbin/swat %%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/CUPS-PrintingInfo.txt %%PORTDOCS%%share/doc/samba/textdocs/DHCP-Server-Configuration.txt %%PORTDOCS%%share/doc/samba/textdocs/DIAGNOSIS.txt %%PORTDOCS%%share/doc/samba/textdocs/DNIX.txt @@ -186,6 +187,7 @@ share/examples/samba/LDAP/export_smbpasswd.pl share/examples/samba/LDAP/import_smbpasswd.pl share/examples/samba/LDAP/ldapchpasswd share/examples/samba/LDAP/ldapsync.pl +share/examples/samba/LDAP/samba-nds.schema share/examples/samba/LDAP/samba.schema share/examples/samba/LDAP/samba-schema-netscapeds4.x share/examples/samba/LDAP/samba-schema-netscapeds5.x @@ -227,6 +229,7 @@ share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm share/examples/samba/README share/examples/samba/VFS/.cvsignore +share/examples/samba/VFS/Makefile share/examples/samba/VFS/README share/examples/samba/VFS/block/block.c %%BUILD_VFS%%share/examples/samba/VFS/block/block.o |