pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/samba When cups support is enabled, link smbspool ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc12cf74c36d
branches:  trunk
changeset: 483025:dc12cf74c36d
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Nov 06 11:07:17 2004 +0000

description:
When cups support is enabled, link smbspool into cups' backend directory
as smb (as the manual says).  This enables samba printing through cups
(at least, the option appears in the web configuration form).
Bump PKGREVISION to 2.

diffstat:

 net/samba/Makefile   |  7 +++++--
 net/samba/PLIST      |  3 ++-
 net/samba/options.mk |  4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diffs (59 lines):

diff -r 07b528111976 -r dc12cf74c36d net/samba/Makefile
--- a/net/samba/Makefile        Sat Nov 06 10:42:54 2004 +0000
+++ b/net/samba/Makefile        Sat Nov 06 11:07:17 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.130 2004/10/03 00:17:58 tv Exp $
+# $NetBSD: Makefile,v 1.131 2004/11/06 11:07:17 jmmv Exp $
 
 DISTNAME=              samba-3.0.7
-PKGREVISION=   1
+PKGREVISION=           2
 CATEGORIES=            net
 MASTER_SITES=          ftp://ftp.samba.org/pub/samba/old-versions/ \
                        ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \
@@ -146,5 +146,8 @@
                ${INSTALL_DATA} $${file} ${EGDIR}/pam_smbpass/$${file}; \
        done
 .endif
+.if !empty(PKG_OPTIONS:Mcups)
+       cd ${PREFIX}/libexec/cups/backend && ${LN} -s ../../../bin/smbspool smb
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r 07b528111976 -r dc12cf74c36d net/samba/PLIST
--- a/net/samba/PLIST   Sat Nov 06 10:42:54 2004 +0000
+++ b/net/samba/PLIST   Sat Nov 06 11:07:17 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2004/09/14 17:18:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.25 2004/11/06 11:07:17 jmmv Exp $
 bin/findsmb
 bin/net
 bin/nmblookup
@@ -55,6 +55,7 @@
 lib/samba/vfs/shadow_copy.so
 ${PAM}lib/security/pam_smbpass.so
 ${PAM}lib/security/pam_winbind.so
+${CUPS}libexec/cups/backend/smb
 man/man1/editreg.1
 man/man1/findsmb.1
 man/man1/log2pcap.1
diff -r 07b528111976 -r dc12cf74c36d net/samba/options.mk
--- a/net/samba/options.mk      Sat Nov 06 10:42:54 2004 +0000
+++ b/net/samba/options.mk      Sat Nov 06 11:07:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/09/12 05:00:53 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2004/11/06 11:07:17 jmmv Exp $
 
 # Global and legacy options
 .if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])
@@ -53,8 +53,10 @@
 .if !empty(PKG_OPTIONS:Mcups)
 .  include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-cups
+PLIST_SUBST+=          CUPS=
 .else
 CONFIGURE_ARGS+=       --disable-cups
+PLIST_SUBST+=          CUPS="@comment "
 .endif
 
 ###



Home | Main Index | Thread Index | Old Index