diff options
| author | Oliver Braun <obraun@FreeBSD.org> | 2003-03-24 19:02:35 +0000 |
|---|---|---|
| committer | Oliver Braun <obraun@FreeBSD.org> | 2003-03-24 19:02:35 +0000 |
| commit | 8af6edf436ccf10e772854c58dde31f5752c9b23 (patch) | |
| tree | d6cb40b0a781bff9816a633adce2beda56b80d82 /net | |
| parent | Support /dev/(tcp|udp)/host/port redirection. (diff) | |
Add dependency on converters/libiconv.
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=77413
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba-devel/Makefile | 5 | ||||
| -rw-r--r-- | net/samba-devel/files/smb.conf.default | 37 | ||||
| -rw-r--r-- | net/samba3/Makefile | 5 | ||||
| -rw-r--r-- | net/samba3/files/smb.conf.default | 37 |
4 files changed, 20 insertions, 64 deletions
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile index 6b3c8bc686bc..46a2e26e2b5c 100644 --- a/net/samba-devel/Makefile +++ b/net/samba-devel/Makefile @@ -84,6 +84,11 @@ CONFIGURE_ARGS+= --with-acl-support .endif .endif +.if defined(WITH_LIBICONV) +LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv +CONFIGURE_ARGS+= --with-libiconv +.endif + WRKSRC= ${WRKDIR}/${DISTNAME}/source MAN1= findsmb.1 make_smbcodepage.1 make_unicodemap.1 nmblookup.1 \ diff --git a/net/samba-devel/files/smb.conf.default b/net/samba-devel/files/smb.conf.default index ef0d65a03705..8046bf75398a 100644 --- a/net/samba-devel/files/smb.conf.default +++ b/net/samba-devel/files/smb.conf.default @@ -136,39 +136,12 @@ # this has been changed in version 1.9.18 to no. dns proxy = no -# Client codepage settings - -# for Greek users -; client code page=737 - -# for European users (Latin 1) -; client code page=850 - -# for European users (Latin 2) -; client code page=852 - -# for Icelandic users -; client code page=861 - -# for Cyrillic users -; client code page=866 - -# for Japanese Users -; client code page=932 -; coding system=cap - -# for Simplified Chinese Users -; client code page=936 -; coding system=cap - -# for Korean Users -; client code page=949 -; coding system=cap - -# for Traditional Chinese Users -; client code page=950 -; coding system=cap +# charset settings +; display charset = ASCII +; unix charset = ASCII +; dos charset = ASCII +# #============================ Share Definitions ============================== [homes] comment = Home Directories diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 6b3c8bc686bc..46a2e26e2b5c 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -84,6 +84,11 @@ CONFIGURE_ARGS+= --with-acl-support .endif .endif +.if defined(WITH_LIBICONV) +LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv +CONFIGURE_ARGS+= --with-libiconv +.endif + WRKSRC= ${WRKDIR}/${DISTNAME}/source MAN1= findsmb.1 make_smbcodepage.1 make_unicodemap.1 nmblookup.1 \ diff --git a/net/samba3/files/smb.conf.default b/net/samba3/files/smb.conf.default index ef0d65a03705..8046bf75398a 100644 --- a/net/samba3/files/smb.conf.default +++ b/net/samba3/files/smb.conf.default @@ -136,39 +136,12 @@ # this has been changed in version 1.9.18 to no. dns proxy = no -# Client codepage settings - -# for Greek users -; client code page=737 - -# for European users (Latin 1) -; client code page=850 - -# for European users (Latin 2) -; client code page=852 - -# for Icelandic users -; client code page=861 - -# for Cyrillic users -; client code page=866 - -# for Japanese Users -; client code page=932 -; coding system=cap - -# for Simplified Chinese Users -; client code page=936 -; coding system=cap - -# for Korean Users -; client code page=949 -; coding system=cap - -# for Traditional Chinese Users -; client code page=950 -; coding system=cap +# charset settings +; display charset = ASCII +; unix charset = ASCII +; dos charset = ASCII +# #============================ Share Definitions ============================== [homes] comment = Home Directories |