summaryrefslogtreecommitdiff
path: root/net/samba
diff options
context:
space:
mode:
Diffstat (limited to 'net/samba')
-rw-r--r--net/samba/Makefile25
-rw-r--r--net/samba/distinfo6
-rw-r--r--net/samba/patches/patch-aa34
-rw-r--r--net/samba/patches/patch-ab26
4 files changed, 68 insertions, 23 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 776e4b85d77..3f21cbc52b3 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2001/05/14 18:56:15 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2001/05/22 21:49:28 jlam Exp $
DISTNAME= samba-2.2.0
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -14,9 +14,6 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite for UNIX
-# Samba uses some GNU readline features (rl_event_hook).
-DEPENDS+= readline>=2.2:../../devel/readline
-
USE_LIBINTL= # defined
USE_SSL= # defined
@@ -24,7 +21,13 @@ GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
+
.include "../../mk/bsd.prefs.mk"
+.include "../../devel/readline/Makefile.readline"
+
+CFLAGS+= -I${WRKINCDIR}
+LDFLAGS+= -L${WRKLIBDIR}
SAMBA_LOGDIR= /var/log
SAMBA_LOCKDIR= /var/run/samba
@@ -41,26 +44,24 @@ CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE}
CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/swat
-CONFIGURE_ARGS+= --with-readline=${LOCALBASE}
+CONFIGURE_ARGS+= --with-readline
CONFIGURE_ARGS+= --with-ssl
-
-# The following should be ${SSLBASE}, but we don't want the configure script
-# to add -I/usr/include at the front of the compiler options, so force it to
-# be ${LOCALBASE} instead. This is needed anyway for many of the
-# dependencies.
-#
-CONFIGURE_ARGS+= --with-sslinc=${LOCALBASE}
+CONFIGURE_ARGS+= --with-sslinc=${SSLBASE}
+CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
+CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
CPPFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h
.if defined(SAMBA_WITH_CUPS)
CONFIGURE_ARGS+= --with-cups
DEPENDS+= cups>=1.1.1:../../print/cups
+CPPFLAGS+= -I${LOCALBASE}/include
.endif
.if defined(USE_PAM)
CONFIGURE_ARGS+= --with-pam
DEPENDS+= PAM-*:../../security/PAM
+CPPFLAGS+= -I${LOCALBASE}/include
.endif
# The following are Linux-only options.
diff --git a/net/samba/distinfo b/net/samba/distinfo
index ec8fdfa5d22..b603c51610f 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/05/14 18:56:16 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/05/22 21:49:28 jlam Exp $
SHA1 (samba-2.2.0.tar.gz) = a7010ff4b3e99a94e8a618184e551e3e61909859
Size (samba-2.2.0.tar.gz) = 5835104 bytes
-SHA1 (patch-aa) = 2e9a5ee07f77d643f8a89314a36b905777b3fb19
-SHA1 (patch-ab) = 72c04568af9b986a2e8dd6513b9be57bb28f44c3
+SHA1 (patch-aa) = 191875ae477167a1937a011c5b2f9baf033e41d8
+SHA1 (patch-ab) = 28cfc5703a2c04b48a3e52047453c27d30aab160
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 8db84cc61f4..f7174da3455 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.14 2001/05/14 18:56:16 jlam Exp $
+$NetBSD: patch-aa,v 1.15 2001/05/22 21:49:29 jlam Exp $
--- configure.in.orig Tue Apr 17 01:44:30 2001
-+++ configure.in
++++ configure.in Tue May 22 15:58:59 2001
@@ -392,9 +392,6 @@
AC_CHECK_TYPE(ssize_t, int)
AC_CHECK_TYPE(wchar_t, unsigned short)
@@ -12,11 +12,10 @@ $NetBSD: patch-aa,v 1.14 2001/05/14 18:56:16 jlam Exp $
# we need libdl for PAM and the new VFS code
AC_CHECK_LIB(dl, dlopen, [LIBS="$LIBS -ldl";
AC_DEFINE(HAVE_LIBDL)])
-@@ -1459,6 +1456,24 @@
- AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES)
+@@ -1460,6 +1457,24 @@
fi
-+
+
+################################################
+# check for CUPS support
+AC_MSG_CHECKING(whether to use CUPS)
@@ -34,6 +33,29 @@ $NetBSD: patch-aa,v 1.14 2001/05/14 18:56:16 jlam Exp $
+ esac ],
+ AC_MSG_RESULT(no)
+)
-
++
#################################################
# check for smbwrapper support
+ AC_MSG_CHECKING(whether to use smbwrapper)
+@@ -1724,6 +1739,9 @@
+ LIBS="-lssl -lcrypto $LIBS"
+ LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS"
+ ;;
++ /usr)
++ LIBS="-lssl -lcrypto $LIBS"
++ ;;
+ * )
+ CFLAGS="-I${withval}/include $CFLAGS"
+ LIBS="-lssl -lcrypto $LIBS"
+@@ -1738,11 +1756,6 @@
+ LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
+
+ fi
+-
+- if test ! -d ${withval}; then
+- echo "configure: error: called with --with-ssl, but ssl base directory ${withval} does not exist or is not a directory. Aborting config" 1>&2
+- exit 1
+- fi
+
+ CFLAGS="-DHAVE_CRYPT_DECL $CFLAGS" # Damn, SSLeay defines its own
+
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index ae64e98a3e8..51c4d36e593 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 2001/05/14 18:56:17 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2001/05/22 21:49:29 jlam Exp $
--- configure.orig Tue Apr 17 01:44:24 2001
-+++ configure
++++ configure Tue May 22 16:07:36 2001
@@ -40,6 +40,9 @@
--with-readline[=DIR] Look for readline include/libs in DIR
--without-readline Don't include readline support"
@@ -152,3 +152,25 @@ $NetBSD: patch-ab,v 1.10 2001/05/14 18:56:17 jlam Exp $
# Check whether --with-smbwrapper or --without-smbwrapper was given.
if test "${with_smbwrapper+set}" = set; then
withval="$with_smbwrapper"
+@@ -11427,6 +11449,9 @@
+ LIBS="-lssl -lcrypto $LIBS"
+ LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS"
+ ;;
++ /usr)
++ LIBS="-lssl -lcrypto $LIBS"
++ ;;
+ * )
+ CFLAGS="-I${withval}/include $CFLAGS"
+ LIBS="-lssl -lcrypto $LIBS"
+@@ -11441,11 +11466,6 @@
+ LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS"
+
+ fi
+-
+- if test ! -d ${withval}; then
+- echo "configure: error: called with --with-ssl, but ssl base directory ${withval} does not exist or is not a directory. Aborting config" 1>&2
+- exit 1
+- fi
+
+ CFLAGS="-DHAVE_CRYPT_DECL $CFLAGS" # Damn, SSLeay defines its own
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 16:37:13 +0000