From 67b19ee14b1ccdae3b8838f6b42e56c6d6a994f0 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 25 Jun 2002 23:22:13 +0000 Subject: Make this package look more like net/samba, and do some minor tweaks to the wording in comments and the description. --- net/ja-samba/DESCR | 5 +++-- net/ja-samba/Makefile | 17 ++++++++++------- net/ja-samba/PLIST | 4 ++-- net/ja-samba/distinfo | 3 +-- net/ja-samba/patches/patch-aj | 13 ------------- 5 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 net/ja-samba/patches/patch-aj (limited to 'net/ja-samba') diff --git a/net/ja-samba/DESCR b/net/ja-samba/DESCR index 6f50c4a7d56..8bc26c678ee 100644 --- a/net/ja-samba/DESCR +++ b/net/ja-samba/DESCR @@ -12,5 +12,6 @@ capability for these operating systems to behave much like a LAN Server or Windows NT Server machine, only with added functionality and flexibility designed to make life easier for administrators. -And this is modified version deveopled by Samba Users Group Japan, and -support I18N for SWAT and use of localized charcter encoding (Japanese). +This package contains a modified version of Samba developed by the Samba +Users Group Japan and supports I18N for SWAT and the use of localized +(Japanese) character encoding. diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index d02bad9132c..f8c0011ae04 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $ +# $NetBSD: Makefile,v 1.2 2002/06/25 23:22:13 jlam Exp $ DISTNAME= samba-2.2.2-ja-1.1 PKGNAME= ja-samba-2.2.2.1.1 @@ -36,9 +36,6 @@ SAMBA_LOGDIR?= ${VARDIR}/log SAMBA_PIDDIR?= ${VARDIR}/run SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private -MAKE_ENV+= ETCDIR=${SAMBA_ETCDIR} -MAKE_ENV+= LOGDIR=${SAMBA_LOGDIR} - CONFIGURE_ARGS+= --localstatedir=${VARDIR} CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} @@ -57,6 +54,11 @@ CFLAGS+= -I${BUILDLINK_DIR}/include/openssl # ssl.h, err.h CONFIGURE_ARGS+= --with-i18n-swat +# Force the use of the included gettext library this doesn't seem to link +# with the gettext-lib package. +# +CONFIGURE_ARGS+= --with-included-gettext + CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no .if defined(USE_CUPS) && (${USE_CUPS} == "YES") @@ -104,7 +106,7 @@ MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP} MESSAGE_SUBST+= ROOT_USER=${ROOT_USER} -CONF_FILES= ${EXAMPLESDIR}/smb.conf.sample ${SAMBA_ETCDIR}/smb.conf +CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE} RCD_SCRIPTS= samba nmbd smbd OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} @@ -112,6 +114,7 @@ OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500 INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL +# Remove irrelevant files for this package. post-extract: ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \ ${XARGS} ${RM} -f @@ -121,8 +124,8 @@ post-extract: ${RM} -r ${WRKDIR}/${DISTNAME}/examples/autofs ${RM} -r ${WRKDIR}/${DISTNAME}/examples/dce-dfs ${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient - ${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup ${RM} -r ${WRKDIR}/${DISTNAME}/examples/smbchartool + ${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup pre-install: @for script in ${RCD_SCRIPTS}; do \ @@ -149,7 +152,7 @@ post-install: ${PREFIX}/etc/rc.d/$${script}; \ done ${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd \ - ${PREFIX}/sbin + ${EXAMPLESDIR}/misc ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ ${PREFIX}/sbin/mksmbpasswd diff --git a/net/ja-samba/PLIST b/net/ja-samba/PLIST index 6d3952c0b3d..4d6acd94991 100644 --- a/net/ja-samba/PLIST +++ b/net/ja-samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/06/25 23:22:13 jlam Exp $ bin/make_nftable bin/make_printerdef bin/make_smbcodepage @@ -73,7 +73,6 @@ man/man8/smbspool.8 man/man8/smbumount.8 man/man8/swat.8 man/man8/winbindd.8 -sbin/convert_smbpasswd sbin/mksmbpasswd sbin/nmbd sbin/smbd @@ -150,6 +149,7 @@ share/examples/samba/LDAP/ldapchpasswd share/examples/samba/LDAP/ldapsync.pl share/examples/samba/LDAP/samba.schema share/examples/samba/README +share/examples/samba/misc/convert_smbpasswd share/examples/samba/misc/extra_smbstatus share/examples/samba/misc/modify_samba_config.pl share/examples/samba/misc/swat.pl diff --git a/net/ja-samba/distinfo b/net/ja-samba/distinfo index bd15bb147f6..11542c561c4 100644 --- a/net/ja-samba/distinfo +++ b/net/ja-samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/06/25 15:31:32 taca Exp $ +$NetBSD: distinfo,v 1.2 2002/06/25 23:22:13 jlam Exp $ SHA1 (samba-2.2.2-ja-1.1.tar.bz2) = e443b3b99db850f4b2f0ca6a829752711cabb87b Size (samba-2.2.2-ja-1.1.tar.bz2) = 7154111 bytes @@ -12,7 +12,6 @@ SHA1 (patch-ae) = 6e2bea197fe641ab03f14c98a5250bb8cee938c2 SHA1 (patch-af) = f1d8d10b4fa9aec77a6dd878d984e71a61312442 SHA1 (patch-ah) = 73cbcbee5a4611b1677fe9f0ba1d2686a6384a98 SHA1 (patch-ai) = 69c4a234da9dd072e38fcac0be80c5ad5d3b5752 -SHA1 (patch-aj) = ea0531b80866a648fe9d30b614f2f83895db83bf SHA1 (patch-ak) = 24046b0ce52854f676015a5e25c9ffd23424efe4 SHA1 (patch-al) = e7caad8f6743537469866f9b47b0044ec95852ad SHA1 (patch-am) = 92aa5e122529a30e05199cbe26620b3ac01adbc5 diff --git a/net/ja-samba/patches/patch-aj b/net/ja-samba/patches/patch-aj deleted file mode 100644 index bb311526522..00000000000 --- a/net/ja-samba/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $ - ---- script/convert_smbpasswd.orig Sun Sep 24 20:02:55 2000 -+++ script/convert_smbpasswd -@@ -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 -- cgit v1.2.3