ports/109974: some kdelibs depend sholud be optional

[Rashid N. Achilov]

>Number:         109974
>Category:       ports
>Synopsis:       some kdelibs depend sholud be optional
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 06 10:00:10 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Rashid N. Achilov
>Release:        6.2-RELEASE
>Organization:
LLC "AS-System Complex"
>Environment:
FreeBSD to-495.askd.ru 6.2-RELEASE FreeBSD 6.2-RELEASE #3: Fri Feb 16 18:47:32 NOVT 2007     root at to-495.askd.ru:/usr/obj/usr/src/sys/Sentry  i386

>Description:
kdelibs take unconditional depends from DNSSD and libthai packages. Why? I do not use DNS-SD and do not have any other boxes with DNS-SD. I do not know thai language and at nearest 500m around hasn't any who knows it. Why I sholud download, install and update these unnecessary packages? kdelibs IMHO sholud has an OPTIONS to switch off these depends and I have generated patch to include it
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN kdelibs3.old/Makefile kdelibs3/Makefile
--- kdelibs3.old/Makefile	Thu Feb  8 04:09:19 2007
+++ kdelibs3/Makefile	Tue Mar  6 15:55:13 2007
@@ -23,11 +23,9 @@
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
 		artsc.0:${PORTSDIR}/audio/arts \
 		aspell:${PORTSDIR}/textproc/aspell \
-		dns_sd:${PORTSDIR}/net/mDNSResponder \
 		idn:${PORTSDIR}/dns/libidn \
 		jasper:${PORTSDIR}/graphics/jasper \
 		pcre:${PORTSDIR}/devel/pcre \
-		thai:${PORTSDIR}/devel/libthai \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.2:${PORTSDIR}/textproc/libxslt
@@ -38,15 +36,6 @@
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 CONFLICTS+=	kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2*
-.if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
-CONFLICTS+=	kdelibs-[0-9]*
-PKGNAMESUFFIX=	-nocups
-CONFIGURE_ARGS+=--disable-cups
-PLIST=		${.CURDIR}/../kdelibs3-nocups/pkg-plist
-.else
-CONFLICTS+=	kdelibs-nocups-[0-9]*
-LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-base
-.endif
 
 USE_BZIP2=	yes
 USE_FAM=	yes
@@ -66,7 +55,6 @@
 		--enable-mt \
 		--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
-		--with-libthai=yes \
 		--with-lua=no \
 		--with-ssl-dir=${OPENSSLBASE}
 CONFIGURE_ENV+=	libltdl_cv_shlibext=".so"
@@ -74,6 +62,10 @@
 FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
 FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir
 
+OPTIONS=	CUPS	"With CUPS support" on \
+		DNSSD	"With DNS-SD support" on \
+		THAI	"With Thai language support" off
+
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
@@ -81,6 +73,27 @@
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif # !exists(/usr/bin/bzip2)
+
+.if !defined(WITH_CUPS) || defined(KDE_WITHOUT_CUPS)
+CONFLICTS+=	kdelibs-[0-9]*
+PKGNAMESUFFIX=	-nocups
+CONFIGURE_ARGS+=--disable-cups
+PLIST=		${.CURDIR}/../kdelibs3-nocups/pkg-plist
+.else
+CONFLICTS+=	kdelibs-nocups-[0-9]*
+LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-base
+.endif
+
+.if defined(WITH_DNSSD)
+LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
+.else
+CONFIGURE_ARGS+=--without-dnssd
+.endif
+
+.if defined(WITH_THAI)
+LIB_DEPENDS+=	thai:${PORTSDIR}/devel/libthai
+CONFIGURE_ARGS+=--with-libthai=yes
+.endif
 
 pre-configure:
 	${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp

>Release-Note:
>Audit-Trail:
>Unformatted: