Upgrade to samba-1.9.18p3 (old version no longer avail)

Install sample config file in /etc if no config file exists
Install doc in /usr/local/share/doc/samba
Install faq in /usr/local/share/doc/html/samba
Clean up packing list -- remove all but config files in /etc
Get rid of one instance of mktemp and some compile warnings

net/samba/Makefile

@@ -3,9 +3,9 @@
 # Date created:				16 Nov 1997
 # Whom:					ejovi
 #
-# $OpenBSD: Makefile,v 1.4 1998/01/29 15:10:01 niklas Exp $
+# $OpenBSD: Makefile,v 1.5 1998/03/14 22:05:22 marc Exp $
 
-DISTNAME=	samba-1.9.18p2
+DISTNAME=	samba-1.9.18p3
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/samba/
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
@@ -17,20 +17,57 @@ MAN5=		smb.conf.5
 MAN7=		samba.7
 MAN8=		smbd.8 nmbd.8 smbpasswd.8
 
-pre-install:
-	@${MKDIR} /usr/local/samba
-
 MAKE_FLAGS=	BASEDIR=$(PREFIX)
+MAKE_FLAGS+=	SBINDIR=$(PREFIX)/sbin
 MAKE_FLAGS+=	MANDIR=$(PREFIX)/man
-MAKE_FLAGS+=	SBINDIR=$(PREFIX)/sbin 
-MAKE_FLAGS+=	LIBDIR=$(PREFIX)/etc
+MAKE_FLAGS+=	CONFIGFILE=/etc/smb.conf 
+MAKE_FLAGS+=	LMHOSTSFILE=/etc/lmhosts
+MAKE_FLAGS+=	SMB_PASSWD_FILE=/etc/smbpasswd
 MAKE_FLAGS+=	VARDIR=/var/log
 MAKE_FLAGS+=	SMBLOGFILE=/var/log/smb
 MAKE_FLAGS+=	NMBLOGFILE=/var/log/nmb
-MAKE_FLAGS+=	CONFIGFILE=$(PREFIX)/etc/smb.conf 
-MAKE_FLAGS+=	LMHOSTSFILE=$(PREFIX)/etc/lmhosts
 MAKE_FLAGS+=	LOCKDIR=/var/spool/lock 
 
+DOC=		Application_Serving.txt BROWSING.txt BUGS.txt CVS_ACCESS.txt \
+		DIAGNOSIS.txt DNIX.txt DOMAIN.txt DOMAIN_CONTROL.txt \
+		ENCRYPTION.txt Faxing.txt GOTCHAS.txt HINTS.txt \
+		INSTALL.sambatar MIRRORS.txt NT4_PlainPassword.reg \
+		NTDOMAIN.txt NetBIOS.txt OS2-Client-HOWTO.txt \
+		PRINTER_DRIVER.txt PROJECTS Passwords.txt Printing.txt \
+		README.DCEDFS README.jis README.sambatar SCO.txt SMBTAR.notes \
+		Speed.txt Support.txt THANKS Tracing.txt UNIX-SMB.txt \
+		UNIX_INSTALL.txt Win95.txt Win95_PlainPassword.reg WinNT.txt \
+		announce cifsntdomain.txt history samba.lsm security_level.txt \
+		wfw_slip.htm faq/sambafaq.txt
+
+
+HTML=		Samba-Server-FAQ-1.html Samba-Server-FAQ-2.html \
+		Samba-Server-FAQ.html Samba-Server-FAQ.sgml \
+		Samba-meta-FAQ-1.html Samba-meta-FAQ-2.html \
+		Samba-meta-FAQ-3.html Samba-meta-FAQ-4.html \
+		Samba-meta-FAQ-5.html Samba-meta-FAQ-6.html \
+		Samba-meta-FAQ.html Samba-meta-FAQ.sgml Samba-meta-FAQ.txt \
+		sambafaq-1.html sambafaq-2.html sambafaq-3.html \
+		sambafaq-4.html sambafaq-5.html sambafaq.html sambafaq.sgml \
+
+post-install:
+	@if [ ! -e /etc/smb.conf ]; then \
+	    @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/smb.conf.default \
+		/etc/smb.conf; \
+	fi
+	@${MKDIR} ${PREFIX}/share/doc/samba
+	@echo "Installing samba docs in ${PREFIX}/share/doc/samba"
+.for doc in ${DOC}
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${doc} \
+		${PREFIX}/share/doc/samba
+.endfor
+	@${MKDIR} ${PREFIX}/share/doc/html/samba
+	@echo "Installing samba FAQ in ${PREFIX}/share/doc/html/samba"
+.for html in ${HTML}
+	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/faq/${html} \
+		${PREFIX}/share/doc/html/samba
+.endfor
+
 .include <bsd.port.mk>
 
 .if ${OPSYS} == "FreeBSD"

net/samba/files/md5

@@ -1 +1 @@
-MD5 (samba-1.9.18p2.tar.gz) = a6ab6ce3f246d05afa8c8118043d19d6
+MD5 (samba-1.9.18p3.tar.gz) = b7adc45f05547d0148cc0a722ca557a5

net/samba/patches/patch-aa

@@ -0,0 +1,10 @@
+--- includes.h.~1~	Thu Feb 12 17:44:28 1998
++++ includes.h	Fri Mar 13 21:07:30 1998
+@@ -530,6 +530,7 @@
+ #ifdef __OpenBSD__
+ #include <strings.h>
+ #include <netinet/tcp.h>
++#include <arpa/inet.h>
+ #define NO_GETSPNAM
+ #define SIGNAL_CAST (void (*)())
+ #define USE_DIRECT

net/samba/patches/patch-ab

@@ -0,0 +1,20 @@
+--- message.c.~1~	Mon Jan 26 12:05:40 1998
++++ message.c	Fri Mar 13 20:56:23 1998
+@@ -53,14 +53,13 @@
+     }
+ 
+   /* put it in a temporary file */
+-  sprintf(s,"%s/msg.XXXXXX",tmpdir());
+-  fstrcpy(name,(char *)mktemp(s));
+-
+-  fd = open(name,O_WRONLY|O_CREAT|O_TRUNC|O_EXCL,0600);
++  snprintf(s, sizeof(s),"%s/msg.XXXXXX",tmpdir());
++  fd = mkstemp( s );
+   if (fd == -1) {
+     DEBUG(1,("can't open message file %s\n",name));
+     return;
+   }
++  fstrcpy(name,s);
+ 
+   for (i=0;i<msgpos;) {
+     if (msgbuf[i]=='\r' && i<(msgpos-1) && msgbuf[i+1]=='\n') {

net/samba/pkg/PLIST

@@ -1,4 +1,6 @@
 bin/addtosmbpass
+bin/make_printerdef
+bin/make_smbcodepage
 bin/nmblookup
 bin/smbclient
 bin/smbpasswd
@@ -7,8 +9,14 @@ bin/smbstatus
 bin/smbtar
 bin/testparm
 bin/testprns
-sbin/smbd
 sbin/nmbd
+sbin/smbd
+lib/codepages/codepage.437
+lib/codepages/codepage.850
+lib/codepages/codepage.852
+lib/codepages/codepage.866
+lib/codepages/codepage.932
+man/man1/make_smbcodepage.1
 man/man1/smbclient.1
 man/man1/smbrun.1
 man/man1/smbstatus.1
@@ -17,6 +25,82 @@ man/man1/testparm.1
 man/man1/testprns.1
 man/man5/smb.conf.5
 man/man7/samba.7
-man/man8/smbd.8
 man/man8/nmbd.8
+man/man8/smbd.8
+man/man8/smbmnt.8
+man/man8/smbmount.8
 man/man8/smbpasswd.8
+man/man8/smbumount.8
+share/doc/html/samba/Samba-Server-FAQ-1.html
+share/doc/html/samba/Samba-Server-FAQ-2.html
+share/doc/html/samba/Samba-Server-FAQ.html
+share/doc/html/samba/Samba-Server-FAQ.sgml
+share/doc/html/samba/Samba-meta-FAQ-1.html
+share/doc/html/samba/Samba-meta-FAQ-2.html
+share/doc/html/samba/Samba-meta-FAQ-3.html
+share/doc/html/samba/Samba-meta-FAQ-4.html
+share/doc/html/samba/Samba-meta-FAQ-5.html
+share/doc/html/samba/Samba-meta-FAQ-6.html
+share/doc/html/samba/Samba-meta-FAQ.html
+share/doc/html/samba/Samba-meta-FAQ.sgml
+share/doc/html/samba/Samba-meta-FAQ.txt
+share/doc/html/samba/sambafaq-1.html
+share/doc/html/samba/sambafaq-2.html
+share/doc/html/samba/sambafaq-3.html
+share/doc/html/samba/sambafaq-4.html
+share/doc/html/samba/sambafaq-5.html
+share/doc/html/samba/sambafaq.html
+share/doc/html/samba/sambafaq.sgml
+share/doc/samba/Application_Serving.txt
+share/doc/samba/BROWSING.txt
+share/doc/samba/BUGS.txt
+share/doc/samba/CVS_ACCESS.txt
+share/doc/samba/DIAGNOSIS.txt
+share/doc/samba/DNIX.txt
+share/doc/samba/DOMAIN.txt
+share/doc/samba/DOMAIN_CONTROL.txt
+share/doc/samba/ENCRYPTION.txt
+share/doc/samba/Faxing.txt
+share/doc/samba/GOTCHAS.txt
+share/doc/samba/HINTS.txt
+share/doc/samba/INSTALL.sambatar
+share/doc/samba/MIRRORS.txt
+share/doc/samba/NT4_PlainPassword.reg
+share/doc/samba/NTDOMAIN.txt
+share/doc/samba/NetBIOS.txt
+share/doc/samba/OS2-Client-HOWTO.txt
+share/doc/samba/PRINTER_DRIVER.txt
+share/doc/samba/PROJECTS
+share/doc/samba/Passwords.txt
+share/doc/samba/Printing.txt
+share/doc/samba/README.DCEDFS
+share/doc/samba/README.jis
+share/doc/samba/README.sambatar
+share/doc/samba/SCO.txt
+share/doc/samba/SMBTAR.notes
+share/doc/samba/Speed.txt
+share/doc/samba/Support.txt
+share/doc/samba/THANKS
+share/doc/samba/Tracing.txt
+share/doc/samba/UNIX-SMB.txt
+share/doc/samba/UNIX_INSTALL.txt
+share/doc/samba/Win95.txt
+share/doc/samba/Win95_PlainPassword.reg
+share/doc/samba/WinNT.txt
+share/doc/samba/announce
+share/doc/samba/cifsntdomain.txt
+share/doc/samba/history
+share/doc/samba/samba.lsm
+share/doc/samba/security_level.txt
+share/doc/samba/wfw_slip.htm
+share/doc/samba/sambafaq.txt
+@dirrm lib/codepages
+@dirrm share/doc/html/samba
+@dirrm share/doc/samba
+@unexec echo ""
+@unexec echo "*** Remove these files (if they exist)"
+@unexec echo "***	/etc/smb.conf"
+@unexec echo "***	/etc/lmhosts"
+@unexec echo "***	/etc/smbpasswd"
+@unexec echo "*** if you wish to completely delete samba from your system."
+@unexec echo ""