From 65fa982a3b547b05c14c853b0c54c7e3aa4f4f9e Mon Sep 17 00:00:00 2001
From: dhartmei <dhartmei@openbsd.org>
Date: Sat, 9 Feb 2002 14:15:08 +0000
Subject: [PATCH] Update to 2.2.3a, from brad@

---
 net/samba/stable/Makefile                   | 21 ++++++------
 net/samba/stable/distinfo                   |  6 ++--
 net/samba/stable/patches/patch-configure_in | 36 ++++++++++++++-------
 net/samba/stable/pkg/DEINSTALL              |  6 ++--
 net/samba/stable/pkg/INSTALL                |  6 ++--
 5 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/net/samba/stable/Makefile b/net/samba/stable/Makefile
index ab663e0a390..532ac2cb993 100644
--- a/net/samba/stable/Makefile
+++ b/net/samba/stable/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2002/02/05 09:07:13 dhartmei Exp $
+# $OpenBSD: Makefile,v 1.3 2002/02/09 14:15:08 dhartmei Exp $
 
 COMMENT=	"SMB and CIFS client and server for UNIX"
 
-DISTNAME=	samba-2.2.3
+DISTNAME=	samba-2.2.3a
 CATEGORIES=	net
 NEED_VERSION=	1.500
 MASTER_SITES=	ftp://ftp.samba.org/pub/samba/ \
@@ -28,14 +28,20 @@ FAKE_FLAGS=	prefix="${WRKINST}${PREFIX}" \
 		SWATDIR="${WRKINST}${PREFIX}/share/swat" \
 		SBINDIR="${WRKINST}${PREFIX}/libexec"
 
+SYSCONFDIR=	/etc/samba
+SAMBA_SPOOL=	/var/spool/samba
+SAMBA_LOGDIR=	/var/log
+SUBST_VARS=	SAMBA_SPOOL
+
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= autoconf
 CONFIGURE_ARGS=	--libdir="${PREFIX}/lib/samba" \
 		--localstatedir="/var" \
 		--sbindir="${PREFIX}/libexec" \
-		--with-configdir="${SYSCONFDIR}/samba" \
-		--with-lockdir="/var/spool/samba" \
-		--with-privatedir="${SYSCONFDIR}/samba" \
+		--with-configdir="${SYSCONFDIR}" \
+		--with-lockdir="${SAMBA_SPOOL}" \
+		--with-logfilebase="${SAMBA_LOGDIR}" \
+		--with-privatedir="${SYSCONFDIR}" \
 		--with-swatdir="${PREFIX}/share/swat" \
 		--with-ssl \
 		--with-sslinc="/usr/include/ssl" \
@@ -51,9 +57,6 @@ NO_REGRESS=	Yes
 
 WRKDIST=	${WRKDIR}/${DISTNAME}/source
 
-SAMBA_SPOOL=	/var/spool/samba
-SAMBA_LOGDIR=	/var/log
-
 SAMBA_DOCS=${WRKSRC}/../README \
 	${WRKSRC}/../docs/THANKS \
 	${WRKSRC}/../docs/history \
@@ -65,7 +68,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/faq
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/samba/textdocs
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/samba
-	@cp -r ${WRKSRC}/../examples/* ${PREFIX}/share/examples/samba
+	@cp -R ${WRKSRC}/../examples/* ${PREFIX}/share/examples/samba
 	@chown -R root.bin ${PREFIX}/share/examples/samba
 	${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/samba
 	@for i in ${SAMBA_DOCS}; do \
diff --git a/net/samba/stable/distinfo b/net/samba/stable/distinfo
index 1e49b3c9635..e6dd63a0683 100644
--- a/net/samba/stable/distinfo
+++ b/net/samba/stable/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-2.2.3.tar.gz) = 618e679e84923b958f18e7d50c09bc1a
-RMD160 (samba-2.2.3.tar.gz) = a81f50e170ccd2106b46ddb5f3ad7904c3f00325
-SHA1 (samba-2.2.3.tar.gz) = df469c3cbe15cd8379d47487ad749ef4407aa405
+MD5 (samba-2.2.3a.tar.gz) = b6ec2f076af69331535a82b586f55254
+RMD160 (samba-2.2.3a.tar.gz) = bb7af5e6e7e5283c7b77392df29888c8621ad428
+SHA1 (samba-2.2.3a.tar.gz) = cbcb16419fc83e1b17f97c971d8f41962ff49d5b
diff --git a/net/samba/stable/patches/patch-configure_in b/net/samba/stable/patches/patch-configure_in
index 68fbb19d9d9..6a8ac586145 100644
--- a/net/samba/stable/patches/patch-configure_in
+++ b/net/samba/stable/patches/patch-configure_in
@@ -1,11 +1,25 @@
---- configure.in.orig	Fri Nov  2 22:56:11 2001
-+++ configure.in	Fri Nov  2 22:56:36 2001
-@@ -19,7 +19,7 @@
-     codepagedir="\$(LIBDIR)/codepages"
-     configdir="\$(LIBDIR)"
-     lockdir="\$(VARDIR)/locks"
--    logfilebase="\$(VARDIR)"
-+    logfilebase="\$(VARDIR)/log"
-     privatedir="\${prefix}/private"
-     swatdir="\${prefix}/swat")
- 
+--- configure.in.orig	Wed Feb  6 21:56:47 2002
++++ configure.in	Fri Feb  8 11:44:50 2002
+@@ -810,7 +810,21 @@ case "$host_os" in
+ 			LDSHFLAGS="-Wl,-h,\$@ -G"
+ 			PICFLAG="-KPIC"   # Is this correct for SunOS
+ 		;;
+-		*bsd*)  BLDSHARED="true"
++		*openbsd*)
++			BLDSHARED="true"
++			case "$host_os" in
++			*openbsd[[01]].* | *openbsd2.[[0-7]] | *openbsd2.[[0-7]].*)
++			  SHLD="ld"
++			  LDSHFLAGS="-Bshareable"
++			  ;;
++			*)
++			  LDSHFLAGS="-shared -fPIC"
++			  ;;
++			esac
++			PICFLAG="-fPIC"
++			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
++		;;
++		*freebsd* | *netbsd*)  BLDSHARED="true"
+ 			LDSHFLAGS="-Wl,-soname,\$@ -shared"
+ 			PICFLAG="-fPIC"
+ 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
diff --git a/net/samba/stable/pkg/DEINSTALL b/net/samba/stable/pkg/DEINSTALL
index 003ded12896..8e65e7e7cf2 100644
--- a/net/samba/stable/pkg/DEINSTALL
+++ b/net/samba/stable/pkg/DEINSTALL
@@ -1,13 +1,13 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2001/12/26 19:15:09 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2002/02/09 14:15:09 dhartmei Exp $
 #
 # samba de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}/samba
-SAMBA_SPOOL=/var/spool/samba
+CONFIG_DIR=${SYSCONFDIR}
+SAMBA_SPOOL=${SAMBA_SPOOL}
 
 if [ -d ${CONFIG_DIR} ]; then
     echo
diff --git a/net/samba/stable/pkg/INSTALL b/net/samba/stable/pkg/INSTALL
index eae957d3407..05e4c5e9f9a 100644
--- a/net/samba/stable/pkg/INSTALL
+++ b/net/samba/stable/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2001/12/26 19:15:09 brad Exp $
+# $OpenBSD: INSTALL,v 1.2 2002/02/09 14:15:09 dhartmei Exp $
 #
 # Pre/post-installation setup of samba
 
@@ -8,10 +8,10 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}/samba
+CONFIG_DIR=${SYSCONFDIR}
 CONFIG_FILE=$CONFIG_DIR/smb.conf
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/samba
-SAMBA_SPOOL=/var/spool/samba
+SAMBA_SPOOL=${SAMBA_SPOOL}
 
 install -d -o root -g wheel -m 1755 $SAMBA_SPOOL