Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/net/ja-samba/Attic/Makefile,v retrieving revision 1.35 retrieving revision 1.36 diff -u -p -r1.35 -r1.36 --- pkgsrc/net/ja-samba/Attic/Makefile 2005/06/03 22:54:44 1.35 +++ pkgsrc/net/ja-samba/Attic/Makefile 2005/06/19 18:38:40 1.36 @@ -1,56 +1,140 @@ -# $NetBSD: Makefile,v 1.35 2005/06/03 22:54:44 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/19 18:38:40 taca Exp $ -.include "Makefile.common" - -PKGNAME= ja-samba-${SAMBA_BASE_VERS}.${SAMBA_JA_VERS} -PKGREVISION= 1 +DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION} +PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION} CATEGORIES= net +MASTER_SITES= ${JA_SAMBA_MASTER_SITES:S/$/beta\//} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://www.jp.samba.org/project/samba-ja/index.html.en COMMENT= Samba supporting I18N swat and L10N for Japanese -CONFLICTS+= samba-[0-9]* +CONFLICTS+= samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* +WRKSRC?= ${WRKDIR}/${DISTNAME}/source +GNU_CONFIGURE= yes + +SAMBA_VERSION= 2.2.12 +JA_VERSION= 1.0beta1 +JA_PKG_VERSION= 0.9.1 -USE_PKGINSTALL= YES -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +.include "../../mk/bsd.prefs.mk" -USE_PKGLOCALEDIR= YES +PKG_SYSCONFSUBDIR?= samba +PKG_SYSCONFVAR= samba -USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline -CONFIGURE_ARGS+= --with-readline +SAMBA_USER?= samba +SAMBA_GROUP?= samba -CONFIGURE_ARGS+= --with-ssl -CONFIGURE_ARGS+= --with-sslinc=${SSLBASE} -CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h +SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} +SAMBA_LIBDIR?= ${PREFIX}/lib/samba +SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/db/samba +SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log +SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run +SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private +SAMBA_VARDIR?= ${VARBASE} + +FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR} +FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} +FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} +FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR} +FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} +FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} + +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} +CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} + +CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_LIBDIR}/codepages +CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat +CONFIGURE_ARGS+= --with-libsmbclient +CONFIGURE_ARGS+= --with-msdfs +CONFIGURE_ARGS+= --with-winbind -# Force the use of the included gettext library this doesn't seem to link -# with the gettext-lib package. -# +CONFIGURE_ARGS+= --with-i18n-swat + +.include "../../converters/libiconv/buildlink3.mk" +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} + +## Force the use of the included gettext library this doesn't seem to link +## with the gettext-lib package. +## CONFIGURE_ARGS+= --with-included-gettext -.include "../../mk/bsd.prefs.mk" +USE_GNU_READLINE= yes # uses rl_event_hook interface to GNU readline +.include "../../devel/readline/buildlink3.mk" +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} + +CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no + .include "options.mk" -# Microsoft DFS support -CONFIGURE_ARGS+= --with-msdfs +# mktemp is useful for the replacement adduser script, but don't require +# a full dependency since it's not actually needed by samba. +# +USE_TOOLS+= mktemp -MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} -MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP} -MESSAGE_SUBST+= ROOT_USER=${ROOT_USER} +# +# findsmb script use perl +# +USE_TOOLS+= perl -DOCDIR= ${PREFIX}/share/doc/samba -EXAMPLESDIR= ${PREFIX}/share/examples/samba +.if !defined(PWD_MKDB) +PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \ + ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }' +MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} +.endif +FILES_SUBST+= MKTEMP=${MKTEMP:Q} +FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} + +.if !empty(NSS_WINBIND) +PLIST_SUBST+= NSS_WINBIND=lib/${NSS_WINBIND} +.else +PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module" +.endif +.if !empty(NSS_WINS) +PLIST_SUBST+= NSS_WINS=lib/${NSS_WINS} +.else +PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module" +.endif + +DOCDIR= ${PREFIX}/share/doc/samba +EGDIR= ${PREFIX}/share/examples/samba + +USE_PKGLOCALEDIR= YES +USE_LANGUAGE= c +USE_LIBTOOL= yes +SHLIBTOOL_OVERRIDE= libtool +INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -CONF_FILES= ${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf -SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE} -SUPPORT_FILES_PERMS+= ${EXAMPLESDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \ +USE_PKGINSTALL= YES +CONF_FILES= ${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf +SUPPORT_FILES_PERMS+= ${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \ ${ROOT_USER} ${ROOT_GROUP} 0555 -SUPPORT_FILES_PERMS+= ${EXAMPLESDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \ +SUPPORT_FILES_PERMS+= ${EGDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \ ${ROOT_USER} ${ROOT_GROUP} 0555 -RCD_SCRIPTS= samba nmbd smbd +#SUPPORT_FILES_PERMS= ${SMBPASSWD_FILE} +MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR} OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500 +RCD_SCRIPTS= samba nmbd smbd winbindd + +PKG_GROUPS= ${SAMBA_GROUP} +PKG_USERS= ${SAMBA_USER}:${SAMBA_GROUP}::Samba\\ pseudo-user + +BUILD_DEFS+= SAMBA_USER SAMBA_GROUP +MAKE_FLAGS= CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"' + +INSTALL_LIBRARY= \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} + +MESSAGE_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} +MESSAGE_SUBST+= ROOT_GROUP=${ROOT_GROUP} +MESSAGE_SUBST+= ROOT_USER=${ROOT_USER} # mktemp is useful for the replacement adduser script, but don't require # a full dependency since it's not actually needed by samba. @@ -67,9 +151,6 @@ FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} REPLACE_PERL= script/findsmb.in -.include "../../devel/readline/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" - # Remove irrelevant files for this package. post-extract: ${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print | \ @@ -88,23 +169,31 @@ post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh post-install: - # Install Samba documentation. + -cd ${PREFIX}/lib && ${LN} -s libsmbclient.so libsmbclient.so.0 +.if !empty(NSS_WINBIND) + ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/${NSS_WINBIND} ${PREFIX}/lib +.endif +.if !empty(PKG_OPTIONS:Mpam) + ${INSTALL_LIBRARY} ${WRKSRC}/bin/pam_smbpass.so ${PREFIX}/lib/security + ${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so \ + ${PREFIX}/lib/security +.endif ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKDIR}/${DISTNAME}/docs; \ - for file in announce textdocs/* Registry/*.reg; do \ - ${INSTALL_DATA} $$file ${DOCDIR}; \ + for f in announce textdocs/* Registry/*.reg; do \ + ${INSTALL_DATA} $${f} ${DOCDIR}; \ done # Install Samba examples. - ${INSTALL_DATA_DIR} ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EXAMPLESDIR}/adduser.sh - ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EXAMPLESDIR}/deluser.sh - ${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${EXAMPLESDIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} - ${CHMOD} -R ugo-w ${EXAMPLESDIR} + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh ${EGDIR}/adduser.sh + ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh ${EGDIR}/deluser.sh + ${CP} -R ${WRKDIR}/${DISTNAME}/examples/* ${EGDIR} + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EGDIR} + ${CHMOD} -R ugo-w ${EGDIR} ${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd \ - ${EXAMPLESDIR}/misc + ${EGDIR}/misc ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ ${PREFIX}/sbin/mksmbpasswd