[pkgsrc/trunk]: pkgsrc/net/netatalk Make cups and kerberos optional. Bump PK...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4283dfd377d5
branches:  trunk
changeset: 488425:4283dfd377d5
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Jan 31 09:53:11 2005 +0000

description:
Make cups and kerberos optional.  Bump PKGREVISION.

diffstat:

 net/netatalk/Makefile |  31 +++++++++++++++++++++++++------
 net/netatalk/PLIST    |   4 ++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diffs (77 lines):

diff -r 1d572acc3368 -r 4283dfd377d5 net/netatalk/Makefile
--- a/net/netatalk/Makefile     Mon Jan 31 09:25:04 2005 +0000
+++ b/net/netatalk/Makefile     Mon Jan 31 09:53:11 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2005/01/16 20:00:05 markd Exp $
+# $NetBSD: Makefile,v 1.38 2005/01/31 09:53:11 markd Exp $
 
 DISTNAME=      netatalk-2.0.2
+PKGREVISION=   1
 CATEGORIES=    net print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=  .tar.bz2
@@ -45,9 +46,7 @@
                        --with-pkgconfdir=${PKG_SYSCONFDIR} \
                        --localstatedir=${VARBASE}/netatalk \
                        --with-uams-path=${PREFIX}/libexec/netatalk/uams \
-                       --with-bdb=${BUILDLINK_PREFIX.db4} \
-                       --with-gssapi --enable-krbV-uam
-CONFIGURE_ENV+=        GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
+                       --with-bdb=${BUILDLINK_PREFIX.db4}
 
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   "Fixing hardcoded paths."
@@ -56,13 +55,33 @@
 SUBST_SED.paths=       -e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3,"
 SUBST_SED.paths+=      -e "s,\(NETBSD.*\)/etc/rc.d,\1${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR},"
 
+PKG_OPTIONS_VAR=        PKG_OPTIONS.netatalk
+PKG_SUPPORTED_OPTIONS=  cups kerberos
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcups)
+.include "../../print/cups/buildlink3.mk"
+CONFIGURE_ARGS+=        --enable-cups
+.else
+CONFIGURE_ARGS+=        --disable-cups
+.endif
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+.include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-gssapi --enable-krbV-uam
+CONFIGURE_ENV+=        GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
+PLIST_SUBST+=          GSSAPI=""
+.else
+CONFIGURE_ARGS+=       --without-gssapi
+PLIST_SUBST+=          GSSAPI="@comment "
+.endif
+
 pre-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../net/openslp/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/krb5.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1d572acc3368 -r 4283dfd377d5 net/netatalk/PLIST
--- a/net/netatalk/PLIST        Mon Jan 31 09:25:04 2005 +0000
+++ b/net/netatalk/PLIST        Mon Jan 31 09:53:11 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/04 12:57:03 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/01/31 09:53:11 markd Exp $
 bin/achfile
 bin/acleandir.rc
 bin/adv1tov2
@@ -106,7 +106,7 @@
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
 libexec/netatalk/uams/uams_dhx_passwd.la
-libexec/netatalk/uams/uams_gss.la
+${GSSAPI}libexec/netatalk/uams/uams_gss.la
 libexec/netatalk/uams/uams_guest.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la