2 files changed, 3 insertions, 26 deletions

diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index ce6900c02fe0..da5325e5f6b1 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -7,6 +7,7 @@
 
 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%/ \
@@ -19,15 +20,11 @@ DISTNAME=	${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION}
 MAINTAINER=	nakaji@jp.FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-
 SAMBA_VERSION=		2.2.8a
 SAMBA_JA_VERSION=	1.1
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_SUBMAKE=	yes
 
 # directories
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
@@ -38,10 +35,6 @@ 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 "
@@ -54,7 +47,6 @@ SMBSH?=		"@comment "
 AUDIT=		""
 LIBSAMBA=	""
 BUILD_VFS=	""
-USE_LIBTOOL=	yes
 .endif
 
 .if defined(WITH_RECYCLE)
@@ -86,14 +78,7 @@ CONFIGURE_ARGS=	--with-i18n-swat \
 		--with-logfilebase=${SAMBA_LOGDIR} \
 		--with-privatedir=${SAMBA_PRIVATE} \
 		--with-piddir=${VARDIR}/run \
-		--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
+		--with-pam --with-pam_smbpass
 
 .include <bsd.port.pre.mk>
 
@@ -129,10 +114,6 @@ CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 LDAPSAM=	""
 .endif
 
-.if defined(WITH_CUPS)
-WITH_CUPS=	yes
-.endif
-
 .if defined(WITH_WINBIND)
 CONFIGURE_ARGS+=	--with-winbind
 WINBIND=	""
@@ -211,7 +192,7 @@ post-build:
 		> ${WRKDIR}/samba.sh.sample
 .if defined(WITH_RECYCLE) || defined(WITH_AUDIT)
 	cd ${WRKSRC}/../examples/VFS; \
-		${SETENV} LIBTOOL=${LIBTOOL} ./configure;${GMAKE}; \
+		./configure;${MAKE}; \
 		${RM} -f config.cache config.log config.status
 .endif
 
diff --git a/japanese/samba/scripts/configure.samba b/japanese/samba/scripts/configure.samba
index 2058a5b470a3..19ae74c39605 100644
--- a/japanese/samba/scripts/configure.samba
+++ b/japanese/samba/scripts/configure.samba
@@ -18,7 +18,6 @@ syslog		"With syslog support" OFF \
 ssl		"With ssl support" OFF \
 ldap		"With LDAP2 support" 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 \
@@ -65,9 +64,6 @@ while [ "$1" ]; do
 		\"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
 			;;