Fix conflicts.

2 files changed, 135 insertions, 0 deletions

diff --git a/net/samba2/Makefile b/net/samba2/Makefile
new file mode 100644
index 00000000000..e15603821e2
--- /dev/null
+++ b/net/samba2/Makefile
@@ -0,0 +1,120 @@
+# $NetBSD: Makefile,v 1.9 2004/01/11 00:44:35 jlam Exp $
+
+.include "Makefile.common"
+PKGREVISION=		6
+
+MAINTAINER=		kim@tac.nyc.ny.us
+HOMEPAGE=		http://www.samba.org/
+COMMENT=		SMB/CIFS protocol server suite for UNIX
+
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
+USE_GNU_READLINE=	# uses rl_event_hook interface to GNU readline
+CONFIGURE_ARGS+=	--with-readline
+
+CONFIGURE_ARGS+=	--with-ssl
+CONFIGURE_ARGS+=	--with-sslinc=${SSLBASE}
+CFLAGS+=		-I${SSLBASE}/include/openssl	# ssl.h, err.h
+
+REPLACE_PERL+=		script/findsmb.in
+
+.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
+.include "../../print/cups/buildlink3.mk"
+BUILD_DEFS+=		USE_CUPS
+CONFIGURE_ARGS+=	--enable-cups
+.endif
+
+.if defined(USE_PAM)
+.include "../../security/PAM/buildlink3.mk"
+BUILD_DEFS+=		USE_PAM
+CONFIGURE_ARGS+=	--with-pam
+.endif
+
+.if defined(SAMBA_USE_LDAP) && ${SAMBA_USE_LDAP} == "YES"
+.include "../../databases/openldap/buildlink3.mk"
+BUILD_DEFS+=		SAMBA_USE_LDAP
+CONFIGURE_ARGS+=	--with-ldapsam
+PLIST_SUBST+=		SAMBA_LDAP=""
+.else
+PLIST_SUBST+=		SAMBA_LDAP="@comment "
+MESSAGE_SRC=		${.CURDIR}/MESSAGE.smbpasswd
+SMBPASSWD_FILE=		/dev/null ${SAMBA_PRIVATE}/smbpasswd		\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+.endif
+
+# Microsoft DFS support
+CONFIGURE_ARGS+=	--with-msdfs
+
+MESSAGE_SUBST+=		SAMBA_PRIVATE=${SAMBA_PRIVATE}
+MESSAGE_SUBST+=		ROOT_GROUP=${ROOT_GROUP}
+MESSAGE_SUBST+=		ROOT_USER=${ROOT_USER}
+
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
+EXAMPLESDIR=		${PREFIX}/share/examples/${PKGBASE}
+
+CONF_FILES=		${EXAMPLESDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
+SUPPORT_FILES_PERMS=	${SMBPASSWD_FILE}
+SUPPORT_FILES_PERMS+=	${EXAMPLESDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
+			${ROOT_USER} ${ROOT_GROUP} 0555
+SUPPORT_FILES_PERMS+=	${EXAMPLESDIR}/deluser.sh ${SAMBA_ETCDIR}/deluser \
+			${ROOT_USER} ${ROOT_GROUP} 0555
+RCD_SCRIPTS=		samba nmbd smbd
+OWN_DIRS=		${SAMBA_ETCDIR} ${SAMBA_LOCKDIR}
+OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
+
+.if !defined(MKTEMP)
+MKTEMP!=	${TYPE} mktemp 2>&1 | \
+		${AWK} '/not found/ { print "mktemp"; exit } { print $$3 }'
+MAKEFLAGS+=	MKTEMP="${MKTEMP}"
+.endif
+.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}"
+.endif
+FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
+FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
+
+# Remove irrelevant files for this package.
+post-extract:
+	${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print |	\
+		${XARGS} ${RM} -f
+	${RM} -r ${WRKDIR}/${DISTNAME}/docs/textdocs/outdated
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/VFS
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/appliance
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/autofs
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/dce-dfs
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient
+	${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup
+
+post-build:
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/adduser.sh > ${WRKDIR}/adduser.sh
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/deluser.sh > ${WRKDIR}/deluser.sh
+
+post-install:
+	# Install Samba documentation.
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cd ${WRKDIR}/${DISTNAME}/docs;					\
+	for file in announce textdocs/* Registry/*.reg; do		\
+		${INSTALL_DATA} $$file ${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_SCRIPT} ${WRKSRC}/script/convert_smbpasswd		\
+		${EXAMPLESDIR}/misc
+	${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh		\
+		${PREFIX}/sbin/mksmbpasswd
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba2/patches/patch-aa b/net/samba2/patches/patch-aa
new file mode 100644
index 00000000000..7263872679a
--- /dev/null
+++ b/net/samba2/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.6 2004/01/11 00:44:35 jlam Exp $
+
+--- configure.in.orig	Fri Feb 28 15:56:18 2003
++++ configure.in	Sun Mar 16 09:01:24 2003
+@@ -2033,6 +2033,10 @@
+ # we can't build a pam module if we don't have pam.
+ AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)])
+ 
++dnl Checks for libraries.
++AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc)
++AC_SUBST(PAM_NEEDS_LIBC)
++
+ #################################################
+ # check for pam_smbpass support
+ AC_MSG_CHECKING(whether to use pam_smbpass)