Date: Wed, 24 Sep 2003 23:43:30 +0900 (JST) From: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/57170: japanese/samba: reduce dependencies Message-ID: <200309241443.h8OEhUPC047965@xa12.heimat.gr.jp> Resent-Message-ID: <200309241450.h8OEoJOx098916@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57170 >Category: ports >Synopsis: japanese/samba: reduce dependencies >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Sep 24 07:50:19 PDT 2003 >Closed-Date: >Last-Modified: >Originator: NAKAJI Hiroyuki >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD xa12.heimat.gr.jp 5.1-CURRENT FreeBSD 5.1-CURRENT #2: Thu Aug 7 09:50:06 JST 2003 root@xa12.heimat.gr.jp:/usr/obj/usr/src/sys/NAKAJI i386 >Description: The latest samba-ja do not need GNU make, libtool and gettext. Samba-ja has its own (old) libintl library in it and some versions of GNU gettext have bad influences on samba-ja as reported in [samba-jp:15265], which is not available in the ML archive on http://www.samba.gr.jp/ >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /net/pcat/home/ncvs/ports/japanese/samba/Makefile,v retrieving revision 1.35 diff -u -r1.35 Makefile --- Makefile 29 Aug 2003 09:11:17 -0000 1.35 +++ Makefile 24 Sep 2003 14:32:49 -0000 @@ -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 @@ 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 @@ .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 @@ AUDIT= "" LIBSAMBA= "" BUILD_VFS= "" -USE_LIBTOOL= yes .endif .if defined(WITH_RECYCLE) @@ -86,14 +78,7 @@ --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 @@ LDAPSAM= "" .endif -.if defined(WITH_CUPS) -WITH_CUPS= yes -.endif - .if defined(WITH_WINBIND) CONFIGURE_ARGS+= --with-winbind WINBIND= "" @@ -211,7 +192,7 @@ > ${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 Index: scripts/configure.samba =================================================================== RCS file: /net/pcat/home/ncvs/ports/japanese/samba/scripts/configure.samba,v retrieving revision 1.2 diff -u -r1.2 configure.samba --- scripts/configure.samba 29 Aug 2003 09:11:18 -0000 1.2 +++ scripts/configure.samba 23 Sep 2003 02:06:32 -0000 @@ -18,7 +18,6 @@ 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 \ @@ -64,9 +63,6 @@ ;; \"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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309241443.h8OEhUPC047965>