summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo>2005-06-02 09:48:43 +0000
committersalo <salo>2005-06-02 09:48:43 +0000
commit4af1ed71550271da07cf443b42b596d931f1c3ed (patch)
tree1b70eb42d310cec9891790e64edc0ac1a8e325f0
parent85b5ea11f440631cd01ffd6a5baf9e022dc4292e (diff)
downloadpkgsrc-4af1ed71550271da07cf443b42b596d931f1c3ed.tar.gz
delint.
-rw-r--r--net/samba2/Makefile8
-rw-r--r--net/samba2/Makefile.common6
-rw-r--r--net/samba2/PLIST4
-rw-r--r--net/samba2/options.mk4
4 files changed, 11 insertions, 11 deletions
diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index 9f0cf254dc7..14deeba278b 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/02 09:48:43 salo Exp $
.include "Makefile.common"
PKGREVISION= # empty1
@@ -77,9 +77,9 @@ post-build:
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}; \
+ cd ${WRKDIR}/${DISTNAME}/docs; \
+ for f in announce textdocs/* Registry/*.reg; do \
+ ${INSTALL_DATA} $$f ${DOCDIR}; \
done
# Install Samba examples.
diff --git a/net/samba2/Makefile.common b/net/samba2/Makefile.common
index 81f34ab36bb..5a2a10adbef 100644
--- a/net/samba2/Makefile.common
+++ b/net/samba2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/10/25 17:05:41 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/06/02 09:48:43 salo Exp $
#
# NOTE: This file is included by:
#
@@ -21,8 +21,8 @@ EXTRACT_SUFX= .tar.gz
DISTINFO_FILE?= ${.CURDIR}/../../net/samba2/distinfo
PATCHDIR?= ${.CURDIR}/../../net/samba2/patches
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../mk/bsd.prefs.mk"
diff --git a/net/samba2/PLIST b/net/samba2/PLIST
index cc257f2837d..d6318fbd366 100644
--- a/net/samba2/PLIST
+++ b/net/samba2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:03 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/06/02 09:48:43 salo Exp $
bin/findsmb
bin/make_printerdef
bin/make_smbcodepage
@@ -94,9 +94,9 @@ share/doc/samba/WindowsTerminalServer.reg
share/doc/samba/announce
share/doc/samba/cifsntdomain.txt
share/doc/samba/security_level.txt
-share/examples/rc.d/smbd
share/examples/rc.d/nmbd
share/examples/rc.d/samba
+share/examples/rc.d/smbd
share/examples/samba/LDAP/README
share/examples/samba/LDAP/export_smbpasswd.pl
share/examples/samba/LDAP/import_smbpasswd.pl
diff --git a/net/samba2/options.mk b/net/samba2/options.mk
index 0697c907db3..a7fa3e28ffe 100644
--- a/net/samba2/options.mk
+++ b/net/samba2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/05/31 11:24:32 dillo Exp $
+# $NetBSD: options.mk,v 1.4 2005/06/02 09:48:43 salo Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.samba2
PKG_SUPPORTED_OPTIONS= pam cups ldap-compat
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --enable-cups
. include "../../databases/openldap/buildlink3.mk"
CONFIGURE_ARGS+= --with-ldapsam
PLIST_SUBST+= SAMBA_LDAP=""
-.else
+.else
PLIST_SUBST+= SAMBA_LDAP="@comment "
MESSAGE_SRC= ${.CURDIR}/MESSAGE.smbpasswd
SMBPASSWD_FILE= /dev/null ${SAMBA_PRIVATE}/smbpasswd \