From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 20 06:30:01 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B111916A41A for ; Thu, 20 Sep 2007 06:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7C61213C465 for ; Thu, 20 Sep 2007 06:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l8K6U1aj096978 for ; Thu, 20 Sep 2007 06:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l8K6U1Zr096977; Thu, 20 Sep 2007 06:30:01 GMT (envelope-from gnats) Resent-Date: Thu, 20 Sep 2007 06:30:01 GMT Resent-Message-Id: <200709200630.l8K6U1Zr096977@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Doug Barton Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41FF116A417; Thu, 20 Sep 2007 06:22:23 +0000 (UTC) (envelope-from dougb@lap.dougb.net) Received: from lap.dougb.net (unknown [IPv6:2001:4840:ffff:c048:215:c5ff:fe55:f05b]) by mx1.freebsd.org (Postfix) with ESMTP id EC10713C48E; Thu, 20 Sep 2007 06:22:22 +0000 (UTC) (envelope-from dougb@lap.dougb.net) Received: from lap.dougb.net (z64nav1x9lfhybm7@localhost [127.0.0.1]) by lap.dougb.net (8.14.1/8.14.1) with ESMTP id l8K6MMhE088390; Wed, 19 Sep 2007 23:22:22 -0700 (PDT) (envelope-from dougb@lap.dougb.net) Received: (from dougb@localhost) by lap.dougb.net (8.14.1/8.14.1/Submit) id l8K6MMu8088389; Wed, 19 Sep 2007 23:22:22 -0700 (PDT) (envelope-from dougb) Message-Id: <200709200622.l8K6MMu8088389@lap.dougb.net> Date: Wed, 19 Sep 2007 23:22:22 -0700 (PDT) From: Doug Barton To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kde@FreeBSD.org Subject: ports/116484: [PATCH] OPTIONS'ify kdelibs3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Doug Barton List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Sep 2007 06:30:01 -0000 >Number: 116484 >Category: ports >Synopsis: [PATCH] OPTIONS'ify kdelibs3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 20 06:30:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Doug Barton >Release: FreeBSD 7.0-CURRENT-0918 i386 >Organization: AAAG >Environment: DNA >Description: Currently kdelibs3 depends unconditionally on kerberos, which is a problem since don't have that installed. The patch below adds OPTIONS to the Makefile for kdelibs3 for kerberos, libthai, and CUPS. I used to patch the Makefile by hand so I know that KDE runs fine without kerberos. I am running the new build without libthai right now, so far so good. The CUPS stuff I just relocated, so I imagine that should be fine. I tried to preserve the status quo with the defaults, but I think it would probably make more sense if libthai defaulted to off. I also have no objections to changing the specifics of any of the rest of the patch either, it's the idea that I think is valuable. >How-To-Repeat: DNA >Fix: Apply the following patch: Index: Makefile =================================================================== RCS file: /usr/local/ncvs/ports/x11/kdelibs3/Makefile,v retrieving revision 1.219 diff -u -r1.219 Makefile --- Makefile 19 Sep 2007 16:44:36 -0000 1.219 +++ Makefile 20 Sep 2007 01:59:50 -0000 @@ -8,7 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -26,7 +26,6 @@ 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 @@ -36,15 +35,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 @@ -63,7 +53,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" @@ -71,9 +60,37 @@ FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir +OPTIONS= KDELIBS_KERBEROS "Include kerberos support" on \ + CUPS "Support for the Common Unix Print Server" on \ + LIBTHAI "Thai-language support from libthai" off + .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include +# Handle OPTIONS +.if !defined(WITHOUT_KDELIBS_KERBEROS) +CONFIGURE_ARGS+= --with-gssapi +.else +CONFIGURE_ARGS+= --without-gssapi +.endif + +.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 + +.if !defined(WITHOUT_LIBTHAI) +CONFIGURE_ARGS+= --with-libthai=yes +LIB_DEPENDS+= thai:${PORTSDIR}/devel/libthai +.else +CONFIGURE_ARGS+= --without-libthai +.endif + # bzip2 is required as a libdepend for the help: kioslave .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 >Release-Note: >Audit-Trail: >Unformatted: