Sat Sep 29 14:37:30 2018 UTC ()
samba4: mention correct SMF instances


(wiedi)
diff -r1.46 -r1.47 pkgsrc/net/samba4/Makefile
cvs diff -r1.46 -r1.47 pkgsrc/net/samba4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba4/Makefile 2018/08/22 09:46:07 1.46
+++ pkgsrc/net/samba4/Makefile 2018/09/29 14:37:30 1.47
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.46 2018/08/22 09:46:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.47 2018/09/29 14:37:30 wiedi Exp $
2 2
3DISTNAME= samba-${VERSION} 3DISTNAME= samba-${VERSION}
4PKGREVISION= 8 4PKGREVISION= 9
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://download.samba.org/pub/samba/stable/ 6MASTER_SITES= http://download.samba.org/pub/samba/stable/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.samba.org/ 9HOMEPAGE= http://www.samba.org/
10COMMENT= SMB/CIFS protocol server suite 10COMMENT= SMB/CIFS protocol server suite
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 13DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
14 14
15VERSION= 4.6.8 15VERSION= 4.6.8
16CONFLICTS+= ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]* 16CONFLICTS+= ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]*
17 17
@@ -153,26 +153,28 @@ SUBST_STAGE.paths= pre-configure @@ -153,26 +153,28 @@ SUBST_STAGE.paths= pre-configure
153SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g' 153SUBST_SED.paths+= -e 's,@PERL@,${PERL5},g'
154SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE 154SUBST_VARS.paths= AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE
155 155
156SUBST_CLASSES+= logpath 156SUBST_CLASSES+= logpath
157SUBST_MESSAGE.logpath= Fixing log path. 157SUBST_MESSAGE.logpath= Fixing log path.
158SUBST_FILES.logpath= examples/smb.conf.default 158SUBST_FILES.logpath= examples/smb.conf.default
159SUBST_STAGE.logpath= pre-configure 159SUBST_STAGE.logpath= pre-configure
160SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g' 160SUBST_SED.logpath+= -e 's,/usr/local/samba/var/log.%m,${SMB_LOGFILEBASE}/log.%m,g'
161 161
162.if ${INIT_SYSTEM} == "rc.d" 162.if ${INIT_SYSTEM} == "rc.d"
163MESSAGE_SRC= ${PKGDIR}/MESSAGE.rcd 163MESSAGE_SRC= ${PKGDIR}/MESSAGE.rcd
164.endif 164.endif
165 165
 166SMF_INSTANCES= smbd nmbd
 167
166post-extract: 168post-extract:
167 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} 169 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
168 170
169post-install: 171post-install:
170 set -e ; cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \ 172 set -e ; cd ${WRKSRC}/docs-xml/registry; for f in *.reg; do \
171 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \ 173 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
172 done 174 done
173 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \ 175 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \
174 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh 176 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh
175 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \ 177 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \
176 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh 178 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh
177 ${INSTALL_DATA} ${WRKSRC}/examples/LDAP/samba.schema \ 179 ${INSTALL_DATA} ${WRKSRC}/examples/LDAP/samba.schema \
178 ${DESTDIR}${PREFIX}/${EGDIR} 180 ${DESTDIR}${PREFIX}/${EGDIR}