--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Greg Troxel --> tech-pkg (2006-04-12 08:05:27 -0400):
> I run cups w/o SLP.  Since the cups people seem to think slp is the
> right way to find cups servers, I'd say optionize it, and default to
> on.

Done (see attached patch). Anybody willing to commit or should I send
a PR?


Cheers, Jukka

-- 
bashian roulette:
$ ((RANDOM%6)) || rm -rf ~

--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: print/cups/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/Makefile,v
retrieving revision 1.108
diff -u -p -r1.108 Makefile
--- print/cups/Makefile	29 Mar 2006 17:22:46 -0000	1.108
+++ print/cups/Makefile	12 Apr 2006 12:22:14 -0000
@@ -46,14 +46,14 @@ CONFIGURE_ARGS+=	--with-cups-user=${CUPS
 CONFIGURE_ARGS+=	--with-cups-group=${CUPS_GROUP:Q}
 CONFIGURE_ARGS+=	--with-manext=bsd
 CONFIGURE_ARGS+=	--enable-libtool
-CONFIGURE_ARGS+=	--enable-slp
 CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		DSOFLAGS=${LDFLAGS:M*:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
-PKG_SUPPORTED_OPTIONS=	pam
+PKG_SUPPORTED_OPTIONS=	pam slp
+PKG_SUGGESTED_OPTIONS=	slp
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpam)
@@ -68,6 +68,13 @@ MESSAGE_SRC=		${.CURDIR}/MESSAGE
 PLIST_SUBST+=		PAM="@comment "
 .endif
 
+.if !empty(PKG_OPTIONS:Mslp)
+.include "../../net/openslp/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-slp
+.else
+CONFIGURE_ARGS+=	--disable-slp
+.endif
+
 # CUPS_USER	username of the CUPS administrator
 # CUPS_GROUP	group of the CUPS administrator
 #
@@ -109,7 +116,6 @@ OWN_DIRS_PERMS+=	${CUPS_REQUESTS}/tmp ${
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../net/openslp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 SUBST_CLASSES+=		paths

--pf9I7BMVVzbSWLtt--