diff options
| author | jmmv <jmmv> | 2004-11-06 11:07:17 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-11-06 11:07:17 +0000 |
| commit | a90a88648a1e635c7028a28519c3466c7c5be33f (patch) | |
| tree | d63b4b5d4e0325d6088520b2fbda83c44943ee0f /net/samba | |
| parent | 2f79d7ff685c081f8d58d1d87102e4ef88d57583 (diff) | |
| download | pkgsrc-a90a88648a1e635c7028a28519c3466c7c5be33f.tar.gz | |
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 (limited to 'net/samba')
| -rw-r--r-- | net/samba/Makefile | 7 | ||||
| -rw-r--r-- | net/samba/PLIST | 3 | ||||
| -rw-r--r-- | net/samba/options.mk | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 2d6713349f5..ec0969ffd7f 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -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 @@ post-install: ${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 --git a/net/samba/PLIST b/net/samba/PLIST index b34cd4402a1..75b0a16a254 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -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/recycle.so 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 --git a/net/samba/options.mk b/net/samba/options.mk index 146f78a45b1..d816a69234e 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -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 @@ CONFIGURE_ARGS+= --without-krb5 .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 ### |