diff options
| author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-04-02 23:42:32 +0000 |
|---|---|---|
| committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-04-02 23:42:32 +0000 |
| commit | f8be38195750ffe46dda155fe133ef6ffd52744e (patch) | |
| tree | d74720746c08a3f94e54b6abb35160569270558e | |
| parent | I thought our Red Hat Linux emulation was at 6.2, not 6.1. (diff) | |
Fix cups support.
PR: 36666
Submitted by: alane@geeksrus.net
Notes
Notes:
svn path=/head/; revision=57247
| -rw-r--r-- | net/samba-devel/Makefile | 11 | ||||
| -rw-r--r-- | net/samba-devel/files/patch-includes.h | 23 | ||||
| -rw-r--r-- | net/samba3/Makefile | 11 | ||||
| -rw-r--r-- | net/samba3/files/patch-includes.h | 23 |
4 files changed, 48 insertions, 20 deletions
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile index fe8d7e0c43c5..4e224afc9c7d 100644 --- a/net/samba-devel/Makefile +++ b/net/samba-devel/Makefile @@ -18,8 +18,14 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/a/-alpha/} MAINTAINER= dwcjr@FreeBSD.org +.if !defined(WITHOUT_CUPS) +WITH_CUPS= yes +.endif + .if defined(WITH_CUPS) LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base +CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib .endif # directories @@ -49,11 +55,6 @@ CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME} CONFIGURE_ARGS+= --with-krb5=no .endif -.if defined(WITH_CUPS) -# This enables CUPS printing support in Samba. -CONFIGURE_ARGS+= --with-cups=${LOCALBASE} -.endif - .if defined(WITH_ACL_SUPPORT) .if ${OSVERSION} < 500018 BROKEN= "Requires a recent FreeBSD 5.0-CURRENT" diff --git a/net/samba-devel/files/patch-includes.h b/net/samba-devel/files/patch-includes.h index 3a087eb7e363..25653af85e5b 100644 --- a/net/samba-devel/files/patch-includes.h +++ b/net/samba-devel/files/patch-includes.h @@ -1,12 +1,25 @@ ---- include/includes.h.orig Sat Mar 30 23:30:18 2002 -+++ include/includes.h Sat Mar 30 23:31:07 2002 -@@ -1117,5 +1117,9 @@ +--- include/includes.h.orig Tue Apr 2 17:23:04 2002 ++++ include/includes.h Tue Apr 2 17:23:08 2002 +@@ -27,6 +27,11 @@ + + #include "local.h" + ++#ifdef __FreeBSD__ ++#define DEFAULT_PRINTING PRINT_BSD ++#define PRINTCAP_NAME "/etc/printcap" ++#endif /* __FreeBSD__ */ ++ + #ifdef AIX + #define DEFAULT_PRINTING PRINT_AIX + #define PRINTCAP_NAME "/etc/qconfig" +@@ -1119,6 +1124,10 @@ + for snprintf and vsnprintf */ #define slprintf snprintf #define vslprintf vsnprintf - ++ +#ifndef PAM_AUTHTOK_RECOVER_ERR +#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR +#endif -+ + #endif /* _INCLUDES_H */ diff --git a/net/samba3/Makefile b/net/samba3/Makefile index fe8d7e0c43c5..4e224afc9c7d 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -18,8 +18,14 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/a/-alpha/} MAINTAINER= dwcjr@FreeBSD.org +.if !defined(WITHOUT_CUPS) +WITH_CUPS= yes +.endif + .if defined(WITH_CUPS) LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base +CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib .endif # directories @@ -49,11 +55,6 @@ CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME} CONFIGURE_ARGS+= --with-krb5=no .endif -.if defined(WITH_CUPS) -# This enables CUPS printing support in Samba. -CONFIGURE_ARGS+= --with-cups=${LOCALBASE} -.endif - .if defined(WITH_ACL_SUPPORT) .if ${OSVERSION} < 500018 BROKEN= "Requires a recent FreeBSD 5.0-CURRENT" diff --git a/net/samba3/files/patch-includes.h b/net/samba3/files/patch-includes.h index 3a087eb7e363..25653af85e5b 100644 --- a/net/samba3/files/patch-includes.h +++ b/net/samba3/files/patch-includes.h @@ -1,12 +1,25 @@ ---- include/includes.h.orig Sat Mar 30 23:30:18 2002 -+++ include/includes.h Sat Mar 30 23:31:07 2002 -@@ -1117,5 +1117,9 @@ +--- include/includes.h.orig Tue Apr 2 17:23:04 2002 ++++ include/includes.h Tue Apr 2 17:23:08 2002 +@@ -27,6 +27,11 @@ + + #include "local.h" + ++#ifdef __FreeBSD__ ++#define DEFAULT_PRINTING PRINT_BSD ++#define PRINTCAP_NAME "/etc/printcap" ++#endif /* __FreeBSD__ */ ++ + #ifdef AIX + #define DEFAULT_PRINTING PRINT_AIX + #define PRINTCAP_NAME "/etc/qconfig" +@@ -1119,6 +1124,10 @@ + for snprintf and vsnprintf */ #define slprintf snprintf #define vslprintf vsnprintf - ++ +#ifndef PAM_AUTHTOK_RECOVER_ERR +#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR +#endif -+ + #endif /* _INCLUDES_H */ |