aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorobraun <obraun@FreeBSD.org>2003-03-25 03:02:35 +0800
committerobraun <obraun@FreeBSD.org>2003-03-25 03:02:35 +0800
commitd4cde5d8f7f355c7ee049b41885d623814763fe1 (patch)
tree194b70a7d183385c1ac90eb22596bd272bdb342b /net
parent9c22afc8e0aefe123ba817f1b0a9fc95fb7d4043 (diff)
downloadfreebsd-ports-gnome-d4cde5d8f7f355c7ee049b41885d623814763fe1.tar.gz
freebsd-ports-gnome-d4cde5d8f7f355c7ee049b41885d623814763fe1.tar.zst
freebsd-ports-gnome-d4cde5d8f7f355c7ee049b41885d623814763fe1.zip
Add dependency on converters/libiconv.
Submitted by: maintainer
Diffstat (limited to 'net')
-rw-r--r--net/samba-devel/Makefile5
-rw-r--r--net/samba-devel/files/smb.conf.default37
-rw-r--r--net/samba3/Makefile5
-rw-r--r--net/samba3/files/smb.conf.default37
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