Wed Mar 2 16:01:10 2011 UTC ()
Pullup ticket 3372 - requested by sbd
build fix for Linux

Revisions pulled up:
- pkgsrc/net/samba35/Makefile	1.3

-----------------------------------------------------------------------------
   Module Name:  pkgsrc
   Committed By: sbd
   Date:         Tue Mar  1 11:28:59 UTC 2011

   Modified Files:
         pkgsrc/net/samba35: Makefile

   Log Message:
   Add --with-cifsumount to CONFIGURE_ARGS on Linux systems in order to build
   umount.cifs

   To generate a diff of this commit:
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/samba35/Makefile


(spz)
diff -r1.1.1.1 -r1.1.1.1.2.1 pkgsrc/net/samba35/Makefile
cvs diff -r1.1.1.1 -r1.1.1.1.2.1 pkgsrc/net/samba35/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba35/Attic/Makefile 2010/12/06 17:01:22 1.1.1.1
+++ pkgsrc/net/samba35/Attic/Makefile 2011/03/02 16:01:09 1.1.1.1.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1.1.1 2010/12/06 17:01:22 adam Exp $ 1# $NetBSD: Makefile,v 1.1.1.1.2.1 2011/03/02 16:01:09 spz Exp $
2 2
3.include "../../net/samba/Makefile.mirrors" 3.include "../../net/samba/Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${SAMBA_MIRRORS:=stable/} 7MASTER_SITES= ${SAMBA_MIRRORS:=stable/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.samba.org/ 10HOMEPAGE= http://www.samba.org/
11COMMENT= SMB/CIFS protocol server suite 11COMMENT= SMB/CIFS protocol server suite
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14VERSION= 3.5.6 14VERSION= 3.5.6
@@ -62,27 +62,27 @@ CONFIGURE_ARGS+= --with-modulesdir=${SAM @@ -62,27 +62,27 @@ CONFIGURE_ARGS+= --with-modulesdir=${SAM
62CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} 62CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
63CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} 63CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q}
64CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} 64CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR}
65CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} 65CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR}
66CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} 66CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR}
67CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat 67CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat
68 68
69.include "../../net/samba/options.mk" 69.include "../../net/samba/options.mk"
70 70
71PLIST_VARS+= cifsmount macosx 71PLIST_VARS+= cifsmount macosx
72 72
73# Only Linux supports mount.cifs for mounting a CIFS share into the filesystem. 73# Only Linux supports mount.cifs for mounting a CIFS share into the filesystem.
74.if ${OPSYS} == "Linux" 74.if ${OPSYS} == "Linux"
75CONFIGURE_ARGS+= --with-cifsmount 75CONFIGURE_ARGS+= --with-cifsmount --with-cifsumount
76PLIST.cifsmount= yes 76PLIST.cifsmount= yes
77.endif 77.endif
78 78
79.if ${OPSYS} == "Darwin" 79.if ${OPSYS} == "Darwin"
80PLIST.macosx= yes 80PLIST.macosx= yes
81.endif 81.endif
82 82
83.if ${_OPSYS_SHLIB_TYPE} == "dylib" 83.if ${_OPSYS_SHLIB_TYPE} == "dylib"
84PLIST_SUBST+= LIBEXT=dylib 84PLIST_SUBST+= LIBEXT=dylib
85.else 85.else
86PLIST_SUBST+= LIBEXT=so 86PLIST_SUBST+= LIBEXT=so
87.endif 87.endif
88 88