1 files changed, 51 insertions, 42 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index dbe2e71fd4b6..979fd72839a6 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,59 +1,45 @@
 # New ports collection makefile for:	samba
-# Version required:			1.9.18
+# Version required:			2.0.0
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.27 1998/08/28 02:07:45 hosokawa Exp $
+# $Id: Makefile,v 1.28 1999/01/12 18:25:32 scrappy Exp $
 #
 
-DISTNAME=	samba-1.9.18p10
-PKGNAME=	samba-1.9.18.10
+DISTNAME=	samba-2.0.0
+#PKGNAME=	samba-2.0.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 
-MAINTAINER=	hosokawa@jp.FreeBSD.ORG
+MAINTAINER=	hosokawa@jp.FreeBSD.org
 
 Y2K=		http://us1.samba.org/samba/docs/sambay2k.html
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/source
-MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1 make_smbcodepage.1
-MAN5=		smb.conf.5
-MAN7=		samba.7
-MAN8=		smbd.8 nmbd.8 smbpasswd.8
-
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
-SAMPLE_CONFIG=	${PREFIX}/etc/smb.conf.default
-SAMBA_SPOOL=	/var/spool/samba
-XSAMBA_SPOOL=	\/var\/spool\/samba
-SAMBA_LOGDIR=	/var/log
-XSAMBA_LOGDIR=	\/var\/log
+# directories
+VARDIR=		/var
+SAMBA_SPOOL=	${VARDIR}/spool/samba
+SAMBA_LOGDIR=	${VARDIR}/log
 SAMBA_PRIVATE=	${PREFIX}/private
+SAMBA_CONFDIR=	${PREFIX}/etc
+# sample files
+STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/samba.sh.sample
+SAMPLE_CONFIG=	${SAMBA_CONFDIR}/smb.conf.default
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --libdir=${SAMBA_CONFDIR} \
+		--localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-SAMBA_DOCS=${WRKDIR}/${DISTNAME}/docs/INSTALL.sambatar \
-	${WRKDIR}/${DISTNAME}/docs/THANKS \
-	${WRKDIR}/${DISTNAME}/docs/history \
-	${WRKDIR}/${DISTNAME}/docs/announce \
-	${WRKDIR}/${DISTNAME}/docs/PROJECTS \
-	${WRKDIR}/${DISTNAME}/docs/SMBTAR.notes
+MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
+		testparm.1 testprns.1 make_smbcodepage.1
+MAN5=		smb.conf.5 smbpasswd.5 lmhosts.5
+MAN7=		samba.7
+MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 \
+		smbmount.8 smbumount.8 smbmnt.8
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
 	${CP} -rp ${WRKDIR}/${DISTNAME}/examples/* ${PREFIX}/share/examples/samba
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/samba/faq
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/samba
-	for i in ${SAMBA_DOCS} ${WRKDIR}/${DISTNAME}/docs/*.txt		\
-			${WRKDIR}/${DISTNAME}/docs/*.reg		\
-			${WRKDIR}/${DISTNAME}/docs/*.htm		\
-			${WRKDIR}/${DISTNAME}/*.txt			\
-			${WRKDIR}/${DISTNAME}/README			\
-			${WRKDIR}/${DISTNAME}/docs/README.* ; do	\
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
-	done
-	for i in ${WRKDIR}/${DISTNAME}/docs/faq/* ; do			\
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/faq ;	\
-	done
-.endif
 	@if [ ! -f ${STARTUP_SCRIPT} ]; then				\
 		${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ;	\
 		${INSTALL_SCRIPT} ${FILESDIR}/samba.sh.sample 		\
@@ -61,23 +47,46 @@ post-install:
 	fi
 	@test -d ${SAMBA_SPOOL} || ${MKDIR} ${SAMBA_SPOOL} && chmod 1777 ${SAMBA_SPOOL}
 	@if [ ! -f ${SAMPLE_CONFIG} ]; then				\
-		${SED} -e 's/__SAMBA_SPOOL__/${XSAMBA_SPOOL}/'		\
-		    -e 's/__LOGDIR__/${XSAMBA_LOGDIR}/' 		\
+		${SED} -e 's!%%SAMBA_SPOOL%%!${SAMBA_SPOOL}!'		\
+			-e 's!%%SAMBA_LOGDIR%%!${SAMBA_LOGDIR}!'	\
+			-e 's!%%SAMBA_CONFDIR%%!${SAMBA_CONFDIR}!'	\
 			${FILESDIR}/smb.conf.default			\
 			> ${SAMPLE_CONFIG} ;				\
 	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/mksmbpasswd.sh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/source/script/mksmbpasswd.sh ${PREFIX}/bin/make_smbpasswd
 	if [ ! -d ${SAMBA_PRIVATE} ] ; then				\
 		${MKDIR} ${SAMBA_PRIVATE} ;				\
 		chown root.wheel ${SAMBA_PRIVATE} ;			\
 	fi
 	chmod 700 ${SAMBA_PRIVATE}
 	if [ ! -f ${SAMBA_PRIVATE}/smbpasswd ] ; then			\
-		${CAT} /etc/passwd | ${PREFIX}/bin/mksmbpasswd.sh > ${SAMBA_PRIVATE}/smbpasswd ; \
+		${CAT} /etc/passwd | ${PREFIX}/bin/make_smbpasswd > ${SAMBA_PRIVATE}/smbpasswd ; \
 		chmod 600 ${SAMBA_PRIVATE}/smbpasswd ;			\
 	fi
 	chmod 500 ${SAMBA_PRIVATE}
 	chown root.wheel ${PREFIX}/bin/smbpasswd
 	chmod 111 ${PREFIX}/bin/smbpasswd
 
+.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}/WHATSNEW.txt		\
+			${WRKDIR}/${DISTNAME}/Roadmap			\
+			${WRKDIR}/${DISTNAME}/Manifest			\
+			${WRKDIR}/${DISTNAME}/docs/*.reg		\
+			${WRKDIR}/${DISTNAME}/docs/THANKS		\
+			${WRKDIR}/${DISTNAME}/docs/announce		\
+			${WRKDIR}/${DISTNAME}/docs/history		\
+			${WRKDIR}/${DISTNAME}/docs/textdocs/* ; do	\
+		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba ;		\
+	done
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/swat/README ${PREFIX}/share/doc/samba/README.swat
+	${MKDIR} ${PREFIX}/share/doc/samba/faq
+	for i in ${WRKDIR}/${DISTNAME}/docs/faq/* ; do			\
+		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/faq ;	\
+	done
+.endif
+
 .include <bsd.port.mk>