8 files changed, 71 insertions, 152 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index e4e1d96c915b..ce6900c02fe0 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	samba
 PORTVERSION=	${SAMBA_VERSION}.j${SAMBA_JA_VERSION}
-PORTREVISION=	1
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
 		ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \
@@ -21,15 +20,12 @@ MAINTAINER=	nakaji@jp.FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
 
 SAMBA_VERSION=		2.2.8a
-SAMBA_JA_VERSION=	1.0
+SAMBA_JA_VERSION=	1.1
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 USE_SUBMAKE=	yes
 
@@ -42,17 +38,23 @@ IS_INTERACTIVE=	yes
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
+.if defined(WITH_GNU_GETTEXT)
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
+.endif
+
 AUDIT?=		"@comment "
 RECYCLE?=	"@comment "
 LIBSAMBA?=	"@comment "
 BUILD_VFS?=	"@comment "
 LDAPSAM?=	"@comment "
 WINBIND?=	"@comment "
+SMBSH?=		"@comment "
 
 .if defined(WITH_AUDIT)
 AUDIT=		""
 LIBSAMBA=	""
 BUILD_VFS=	""
+USE_LIBTOOL=	yes
 .endif
 
 .if defined(WITH_RECYCLE)
@@ -84,9 +86,15 @@ CONFIGURE_ARGS=	--with-i18n-swat \
 		--with-logfilebase=${SAMBA_LOGDIR} \
 		--with-privatedir=${SAMBA_PRIVATE} \
 		--with-piddir=${VARDIR}/run \
-		--with-pam \
+		--with-pam --with-pam_smbpass \
 		--prefix=${PREFIX}
 
+.if defined(WITH_GNU_GETTEXT)
+CONFIGURE_ARGS+=	--with-included-gettext=no
+.else
+CONFIGURE_ARGS+=	--with-included-gettext
+.endif
+
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ENV+=	TESTDIR=/tmp \
@@ -121,7 +129,7 @@ CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 LDAPSAM=	""
 .endif
 
-.if !defined(WITHOUT_CUPS)
+.if defined(WITH_CUPS)
 WITH_CUPS=	yes
 .endif
 
@@ -134,6 +142,11 @@ WINBIND=	""
 CONFIGURE_ARGS+=	--with-winbind-auth-challenge
 .endif
 
+.if defined(WITH_SMBSH)
+CONFIGURE_ARGS+=	--with-smbwrapper --with-libsmbclient
+SMBSH=		""
+.endif
+
 # malloc.h check is not needed.
 CONFIGURE_ENV+=	ac_cv_header_malloc_h=no
 
@@ -183,17 +196,21 @@ PLIST_SUB=      AUDIT=${AUDIT} \
 		LIBSAMBA=${LIBSAMBA} \
 		BUILD_VFS=${BUILD_VFS} \
 		LDAPSAM=${LDAPSAM} \
-		WINBIND=${WINBIND}
+		WINBIND=${WINBIND} \
+		SMBSH=${SMBSH}
 
-pre-build:
-	${RM} -fr ${WRKSRC}/include/proto.h
-	(cd ${WRKSRC} && make proto)
+post-patch:
+	${FIND} ${WRKSRC}/.. -name '*.orig' -delete
+
+#pre-build:
+#	${RM} -fr ${WRKSRC}/include/proto.h
+#	(cd ${WRKSRC} && make proto)
 
 post-build:
 	${SED} 's:/usr/local:${PREFIX}:g' ${FILESDIR}/samba.sh.sample \
 		> ${WRKDIR}/samba.sh.sample
 .if defined(WITH_RECYCLE) || defined(WITH_AUDIT)
-	cd ${WRKDIR}/${DISTNAME}/examples/VFS; \
+	cd ${WRKSRC}/../examples/VFS; \
 		${SETENV} LIBTOOL=${LIBTOOL} ./configure;${GMAKE}; \
 		${RM} -f config.cache config.log config.status
 .endif
@@ -202,29 +219,20 @@ post-install:
 .if defined(WITH_AUDIT) || defined(WITH_RECYCLE)
 	@test -d ${SAMBA_VFSDIR} || ${MKDIR} ${SAMBA_VFSDIR}
 .if defined(WITH_AUDIT)
-	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/examples/VFS/audit.so ${SAMBA_VFSDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/../examples/VFS/audit.so ${SAMBA_VFSDIR}
 .endif
 .if defined(WITH_RECYCLE)
-	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/examples/VFS/recycle/recycle.so ${SAMBA_VFSDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/../examples/VFS/recycle/recycle.so ${SAMBA_VFSDIR}
 .endif
 .endif
-	${MKDIR} ${PREFIX}/share/examples/samba
-	-${RM} -f ${WRKDIR}/${DISTNAME}/examples/libsmbclient/*.o
-	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
-.if defined(WITH_AUDIT) || defined(WITH_RECYCLE)
-#	@${RM} -rf ${PREFIX}/share/examples/samba/VFS/.libs
-	${FIND} ${PREFIX}/share/examples/samba/VFS -type d -name ".libs" | ${XARGS} ${RM} -r
-	@for file in audit.o audit.so recycle/recycle.o recycle/recycle.so skel.o skel.so ; do \
-		${RM} ${PREFIX}/share/examples/samba/VFS/$${file} ; \
-	done
-.endif
+	@${MKDIR} ${PREFIX}/share/examples/samba
+	@-${RM} -f ${WRKSRC}/../examples/libsmbclient/*.o
+	@cd ${WRKSRC}/../examples; \
+		${TAR}  --exclude .cvsignore --exclude .libs --exclude '*.o' --exclude '*.lo' -cf - . | ${TAR} -xf - -C ${PREFIX}/share/examples/samba
 	@${STRIP_CMD} ${PREFIX}/sbin/smbd ${PREFIX}/sbin/nmbd ${PREFIX}/sbin/swat
 	@${STRIP_CMD} ${PREFIX}/bin/smbclient ${PREFIX}/bin/smbspool
 	@${STRIP_CMD} ${PREFIX}/bin/testparm ${PREFIX}/bin/testprns ${PREFIX}/bin/testprns ${PREFIX}/bin/smbstatus ${PREFIX}/bin/smbcontrol ${PREFIX}/bin/make_printerdef
-	@${STRIP_CMD} ${PREFIX}/bin/smbpasswd ${PREFIX}/bin/make_smbcodepage ${PREFIX}/bin/rpcclient ${PREFIX}/bin/make_unicodemap ${PREFIX}/bin/make_nftable ${PREFIX}/bin/smbcacls ${PREFIX}/bin/nmblookup
-	@${MKDIR} ${PREFIX}/share/examples/samba
-	@cd ${WRKDIR}/${DISTNAME}/examples; \
-		${TAR}  --exclude .cvsignore --exclude .libs -cf - . | ${TAR} -xf - -C ${PREFIX}/share/examples/samba
+	@${STRIP_CMD} ${PREFIX}/bin/smbpasswd ${PREFIX}/bin/make_smbcodepage ${PREFIX}/bin/rpcclient ${PREFIX}/bin/make_unicodemap ${PREFIX}/bin/smbcacls ${PREFIX}/bin/nmblookup
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
 		${INSTALL_SCRIPT} ${WRKDIR}/samba.sh.sample 		\
@@ -239,7 +247,7 @@ post-install:
 			${FILESDIR}/smb.conf.default			\
 			> ${SAMPLE_CONFIG} ;				\
 	fi
-	@${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
+	@${INSTALL_SCRIPT} ${WRKSRC}/../source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 
 	@${MKDIR} -m 500 ${SAMBA_PRIVATE}
 	@${CHOWN} root:wheel ${SAMBA_PRIVATE}
@@ -249,31 +257,31 @@ post-install:
 
 	@${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd
 	@${CHMOD} 111 ${PREFIX}/bin/smbpasswd
-	${ECHO_CMD} "@exec ${TEST} -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL}" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_SPOOL}" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@exec ${MKDIR} -m 500 ${SAMBA_PRIVATE}" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@exec ${CAT} /etc/passwd | ${GREP} -v "^#" | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.default" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@exec ${TEST} -e ${SAMBA_PRIVATE}/smbpasswd || ${CP} -p ${SAMBA_PRIVATE}/smbpasswd.default ${SAMBA_PRIVATE}/smbpasswd" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@exec ${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@unexec /usr/bin/cmp -s ${SAMBA_PRIVATE}/smbpasswd ${SAMBA_PRIVATE}/smbpasswd.default && ${RM} -f ${SAMBA_PRIVATE}/smbpasswd ${SAMBA_PRIVATE}/secrets.tdb || ${TRUE}" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@unexec ${RM} -f ${SAMBA_PRIVATE}/smbpasswd.default" | ${SED_PLIST} >> ${TMPPLIST}
-	${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} || (${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore,\" && ${ECHO_CMD} \"         please remove ${SAMBA_PRIVATE} and its contents manually.\")" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${TEST} -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && ${CHMOD} 1777 ${SAMBA_SPOOL}" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${RM} -rf ${SAMBA_SPOOL}" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${MKDIR} -m 500 ${SAMBA_PRIVATE}" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHOWN} root:wheel ${SAMBA_PRIVATE}" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CAT} /etc/passwd | ${GREP} -v "^#" | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd.default" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${TEST} -e ${SAMBA_PRIVATE}/smbpasswd || ${CP} -p ${SAMBA_PRIVATE}/smbpasswd.default ${SAMBA_PRIVATE}/smbpasswd" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${CHMOD} 600 ${SAMBA_PRIVATE}/smbpasswd*" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec /usr/bin/cmp -s ${SAMBA_PRIVATE}/smbpasswd ${SAMBA_PRIVATE}/smbpasswd.default && ${RM} -f ${SAMBA_PRIVATE}/smbpasswd ${SAMBA_PRIVATE}/secrets.tdb || ${TRUE}" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${RM} -f ${SAMBA_PRIVATE}/smbpasswd.default" | ${SED_PLIST} >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${RMDIR} ${SAMBA_PRIVATE} || (${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore,\" && ${ECHO_CMD} \"         please remove ${SAMBA_PRIVATE} and its contents manually.\")" | ${SED_PLIST} >> ${TMPPLIST}
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/samba
 	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
-	@for i in ${WRKDIR}/${DISTNAME}/README				\
-			${WRKDIR}/${DISTNAME}/COPYING			\
-			${WRKDIR}/${DISTNAME}/Manifest			\
-			${WRKDIR}/${DISTNAME}/Read-Manifest-Now		\
-			${WRKDIR}/${DISTNAME}/Roadmap			\
-			${WRKDIR}/${DISTNAME}/WHATSNEW.txt; do		\
+	@for i in ${WRKSRC}/../README				\
+			${WRKSRC}/../COPYING			\
+			${WRKSRC}/../Manifest			\
+			${WRKSRC}/../Read-Manifest-Now		\
+			${WRKSRC}/../Roadmap			\
+			${WRKSRC}/../WHATSNEW.txt; do		\
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
 	done
-	@cd ${WRKDIR}/${DISTNAME}/docs; \
+	@cd ${WRKSRC}/../docs; \
 		${TAR}  --exclude .cvsignore -cf - . | ${TAR} -xf - -C ${PREFIX}/share/doc/samba
-	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
+	@${INSTALL_DATA} ${WRKSRC}/../swat/README ${PREFIX}/share/doc/samba/README.swat
 .endif
 
 	@if [ -f ${VARDIR}/spool/lock/browse.dat ]; then \
diff --git a/japanese/samba/distinfo b/japanese/samba/distinfo
index 6ebb1c6dd59c..8d0b4e99337c 100644
--- a/japanese/samba/distinfo
+++ b/japanese/samba/distinfo
@@ -1 +1 @@
-MD5 (samba-2.2.8a-ja-1.0.tar.bz2) = 4c1af06f1570449584c92033c4901e0b
+MD5 (samba-2.2.8a-ja-1.1.tar.bz2) = 5fd05df0691fa40352f696a1a61976e6
diff --git a/japanese/samba/files/patch-ba b/japanese/samba/files/patch-ba
deleted file mode 100644
index b19b60f10b31..000000000000
--- a/japanese/samba/files/patch-ba
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.orig	Wed Feb 26 17:32:32 2003
-+++ configure.in	Wed Feb 26 17:33:13 2003
-@@ -170,7 +170,7 @@
- AC_SUBST(INSTALLCLIENTLIB)
- 
- # compile with optimization and without debugging by default
--CFLAGS="-O ${CFLAGS}"
-+CFLAGS="${CFLAGS}"
- 
- AC_ARG_ENABLE(debug, 
- [  --enable-debug          Turn on compiler debugging information (default=no)],
-@@ -1981,7 +1981,7 @@
-   yes)
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(KRB5_AUTH)
--    LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err"
-+    LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err"
-     CFLAGS="$CFLAGS -I$withval/include"
-     LDFLAGS="$LDFLAGS -L$withval/lib"
-     ;;
diff --git a/japanese/samba/files/patch-forXP b/japanese/samba/files/patch-forXP
deleted file mode 100644
index 6850e1323b25..000000000000
--- a/japanese/samba/files/patch-forXP
+++ /dev/null
@@ -1,62 +0,0 @@
---- param/loadparm.c.orig	Tue May 20 11:28:38 2003
-+++ param/loadparm.c	Wed Jun  4 23:31:55 2003
-@@ -3857,8 +3857,10 @@
- 	int iService;
- 	fstring serviceName;
- 	int len;
-+	enum remote_arch_types ra_type = get_remote_arch();
- 	
--	len = (get_remote_arch() == RA_WIN2K) ? 127 : 12;
-+	len = ( (ra_type == RA_WIN2K) || (ra_type == RA_WINXP) ||
-+	        (ra_type == RA_WIN2K3) ) ? 127 : 12;
- 
- 	for (iService = iNumServices - 1; iService >= 0; iService--)
- 	{
---- rpc_server/srv_srvsvc_nt.c.orig	Tue May 20 11:22:11 2003
-+++ rpc_server/srv_srvsvc_nt.c	Wed Jun  4 23:31:55 2003
-@@ -38,9 +38,11 @@
- 	pstring net_name;
- 	pstring remark;
- 	uint32 type;
-+	enum remote_arch_types ra_type = get_remote_arch();
- 
- 	StrnCpy(net_name, lp_servicename(snum),
--		(get_remote_arch() == RA_WIN2K) ? 127 : 12);
-+		(((ra_type == RA_WIN2K) || (ra_type == RA_WINXP) ||
-+		  (ra_type == RA_WIN2K3) ) ? 127 : 12 ) );
- 	pstrcpy(remark, lp_comment(snum));
- 	standard_sub_conn(p->conn, remark, sizeof(remark));
- 	len_net_name = strlen(net_name);
---- smbd/trans2.c.orig	Tue May 20 11:17:19 2003
-+++ smbd/trans2.c	Wed Jun  4 23:34:21 2003
-@@ -921,7 +921,8 @@
- 	SMB_STRUCT_STAT sbuf;
- 
- 	ra_type = get_remote_arch();
--	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K));
-+	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) ||
-+	           (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3) );
- 
- 	if (total_params < 12)
- 		return(ERROR_DOS(ERRDOS,ERRinvalidparam));
-@@ -1488,7 +1489,9 @@
- 			/* NT4 always serves this up as unicode but expects it to be
- 			 * delivered as ascii! (tridge && JRA)
- 			 */
--			if ((get_remote_arch() != RA_WIN2K) && (global_client_caps & CAP_NT_SMBS)) {
-+			if (((get_remote_arch() != RA_WIN2K) ||
-+			     (get_remote_arch() != RA_WINXP) ||
-+			     (get_remote_arch() != RA_WIN2K3)) && (global_client_caps & CAP_NT_SMBS)) {
- 				data_len = 18 + strlen(vname);
- 				SIVAL(pdata,12,strlen(vname));
- 				pstrcpy(pdata+18,vname);      
-@@ -3100,7 +3103,8 @@
- 	int max_referral_level;
- 
- 	ra_type = get_remote_arch();
--	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K));
-+	NT_arch = ((ra_type == RA_WINNT) || (ra_type == RA_WIN2K) ||
-+	           (ra_type == RA_WINXP) || (ra_type == RA_WIN2K3) );
- 
- 	DEBUG(10,("call_trans2getdfsreferral\n"));
- 
diff --git a/japanese/samba/files/patch-nsswitch:pam_winbind.h b/japanese/samba/files/patch-nsswitch:pam_winbind.h
deleted file mode 100644
index 3eadd1921de3..000000000000
--- a/japanese/samba/files/patch-nsswitch:pam_winbind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- nsswitch/pam_winbind.h.orig	Mon Feb 10 17:21:48 2003
-+++ nsswitch/pam_winbind.h	Wed Feb 26 14:28:24 2003
-@@ -31,7 +31,9 @@
- #define PAM_EXTERN extern
- #include <security/pam_appl.h> 
- 
-+#ifndef PAM_AUTHTOK_RECOVER_ERR
- #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR
-+#endif
- #endif
- 
- #ifdef HAVE_SECURITY_PAM_MODULES_H
diff --git a/japanese/samba/pkg-message b/japanese/samba/pkg-message
index a01cb5ca53ff..61b5ee6b71f0 100644
--- a/japanese/samba/pkg-message
+++ b/japanese/samba/pkg-message
@@ -4,5 +4,5 @@ The lock directory where browse.dat, wins.dat and other *.tdb files
 are created by smbd and nmbd is changed from /var/spool/lock to
 /var/db/samba.
 
-If you are about to update your japanese/samba from 2.0.10j1.2 to 2.2.7bj1.0,
+If you are about to update your japanese/samba from 2.0.10j1.2 to 2.2.8aj1.1,
 you need to remove old these files in /var/spool/lock.
diff --git a/japanese/samba/pkg-plist b/japanese/samba/pkg-plist
index 589e57e5509b..a0943686caa6 100644
--- a/japanese/samba/pkg-plist
+++ b/japanese/samba/pkg-plist
@@ -1,5 +1,4 @@
 bin/findsmb
-bin/make_nftable
 bin/make_printerdef
 bin/make_smbcodepage
 bin/make_smbpasswd
@@ -19,6 +18,9 @@ bin/tdbbackup
 %%LDAPSAM%%bin/pdbedit
 %%WINBIND%%bin/wbinfo
 %%WINBIND%%sbin/winbindd
+%%SMBSH%%bin/smbsh
+%%SMBSH%%bin/smbwrapper.so
+bin/pam_smbpass.so
 etc/codepages/codepage.1125
 etc/codepages/codepage.1251
 etc/codepages/codepage.437
@@ -823,17 +825,12 @@ share/examples/samba/LDAP/smbldap-tools/smbldap_conf.pm
 share/examples/samba/LDAP/smbldap-tools/smbldap_tools.pm
 share/examples/samba/README
 %%BUILD_VFS%%share/examples/samba/VFS/Makefile
-share/examples/samba/VFS/.cvsignore
 share/examples/samba/VFS/README
 share/examples/samba/VFS/audit.c
-%%BUILD_VFS%%share/examples/samba/VFS/audit.o
 %%BUILD_VFS%%share/examples/samba/VFS/audit.so
 share/examples/samba/VFS/block/block.c
-%%BUILD_VFS%%share/examples/samba/VFS/block/block.o
 %%BUILD_VFS%%share/examples/samba/VFS/block/block.so
-%%BUILD_VFS%%share/examples/samba/VFS/recycle/recycle.o
 %%BUILD_VFS%%share/examples/samba/VFS/recycle/recycle.so
-%%BUILD_VFS%%share/examples/samba/VFS/skel.o
 %%BUILD_VFS%%share/examples/samba/VFS/skel.so
 share/examples/samba/VFS/block/samba-block.conf
 share/examples/samba/VFS/block/smb.conf
diff --git a/japanese/samba/scripts/configure.samba b/japanese/samba/scripts/configure.samba
index 80af4c823d43..2058a5b470a3 100644
--- a/japanese/samba/scripts/configure.samba
+++ b/japanese/samba/scripts/configure.samba
@@ -17,7 +17,8 @@ Please select desired options:" -1 -1 12 \
 syslog		"With syslog support" OFF \
 ssl		"With ssl support" OFF \
 ldap		"With LDAP2 support" OFF \
-nocups		"Without CUPS" OFF \
+cups		"With CUPS" OFF \
+gettext		"With GNU gettext" OFF \
 acl		"With ACL support" OFF \
 utmp		"With UTMP support" OFF \
 msdfs		"With MSDFS support" OFF \
@@ -26,6 +27,7 @@ recycle		"With Recycle Bin" OFF \
 audit		"With Audit" OFF \
 winbind		"With Winbind" OFF \
 wbauth		"With Winbind Auth Challenge" OFF \
+smbsh		"With Smbsh and smbwrapper" OFF \
 2> $tempfile
 
 	retval=$?
@@ -60,8 +62,11 @@ while [ "$1" ]; do
 		\"ldap\")
 			echo "WITH_LDAP=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 			;;
-		\"nocups\")
-			echo "WITHOUT_CUPS=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+		\"cups\")
+			echo "WITH_CUPS=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+			;;
+		\"gettext\")
+			echo "WITH_GNU_GETTEXT=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 			;;
 		\"acl\")
 			echo "WITH_ACL_SUPPORT=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
@@ -87,6 +92,9 @@ while [ "$1" ]; do
 		\"wbauth\")
 			echo "WITH_WINBIND_AUTH_CHALLENGE=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 			;;
+		\"smbsh\")
+			echo "WITH_SMBSH=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+			;;
 		*)
 			echo "Invalid option: $1"
 			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc