Date: Wed, 1 Dec 2004 00:08:08 +0100 (CET) From: Michael Lestinsky <michael@mobi.lestinsky.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74569: kdelibs3: disable cups with WITHOUT_CUPS option Message-ID: <200411302308.iAUN888j014357@mobi.lestinsky.de> Resent-Message-ID: <200411302330.iAUNUTEJ030447@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74569
>Category: ports
>Synopsis: kdelibs3: disable cups with WITHOUT_CUPS option
>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: Tue Nov 30 23:30:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Michael Lestinsky
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mobi 5.3-STABLE FreeBSD 5.3-STABLE #19: Sat Nov 13 15:54:54 CET 2004 michael@mobi:/usr/obj/usr/src/sys/mobi i386
>Description:
Disable the dependency of this port from cups.
>How-To-Repeat:
>Fix:
Apply these patches:
michael@mobi:/usr/ports/x11/kdelibs3> cvs diff
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/kdelibs3/Makefile,v
retrieving revision 1.159
diff -u -r1.159 Makefile
--- Makefile 8 Nov 2004 00:34:11 -0000 1.159
+++ Makefile 30 Nov 2004 23:01:13 -0000
@@ -23,7 +23,6 @@
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
artsc.0:${PORTSDIR}/audio/arts \
aspell:${PORTSDIR}/textproc/aspell \
- cups.2:${PORTSDIR}/print/cups-base \
fam.0:${PORTSDIR}/devel/fam \
idn:${PORTSDIR}/devel/libidn \
jasper:${PORTSDIR}/graphics/jasper \
@@ -57,9 +56,18 @@
FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
+OPTIONS= CUPS "Disable Cups support" on
+
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=--disable-cups
+PLIST_SUB+= CUPS="@comment "
+.else
+LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
+.endif # defined($WITHOUT_CUPS)
+
# bzip2 is required as a libdepend for the help: kioslave
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
Index: pkg-plist
===================================================================
RCS file: /home/cvs/ports/x11/kdelibs3/pkg-plist,v
retrieving revision 1.56
diff -u -r1.56 pkg-plist
--- pkg-plist 8 Nov 2004 00:34:11 -0000 1.56
+++ pkg-plist 30 Nov 2004 21:36:52 -0000
@@ -1,7 +1,7 @@
bin/artsmessage
bin/checkXML
-bin/cupsdconf
-bin/cupsdoprint
+%%CUPS%%bin/cupsdconf
+%%CUPS%%bin/cupsdoprint
bin/dcop
bin/dcopclient
bin/dcopfind
@@ -52,7 +52,7 @@
bin/ktradertest
bin/kwrapper
bin/lnusertemp
-bin/make_driver_db_cups
+%%CUPS%%bin/make_driver_db_cups
bin/make_driver_db_lpr
bin/makekdewidgets
bin/meinproc
@@ -718,8 +718,8 @@
include/scriptclientinterface.h
include/scriptinterface.h
include/scriptmanager.h
-lib/kde3/cupsdconf.la
-lib/kde3/cupsdconf.so
+%%CUPS%%lib/kde3/cupsdconf.la
+%%CUPS%%lib/kde3/cupsdconf.so
lib/kde3/dcopserver.la
lib/kde3/dcopserver.so
lib/kde3/kabc_dir.la
@@ -760,8 +760,8 @@
lib/kde3/kded_kwalletd.so
lib/kde3/kded_proxyscout.la
lib/kde3/kded_proxyscout.so
-lib/kde3/kdeprint_cups.la
-lib/kde3/kdeprint_cups.so
+%%CUPS%%lib/kde3/kdeprint_cups.la
+%%CUPS%%lib/kde3/kdeprint_cups.so
lib/kde3/kdeprint_ext.la
lib/kde3/kdeprint_ext.so
lib/kde3/kdeprint_lpdunix.la
@@ -890,8 +890,8 @@
lib/libkdefx.la
lib/libkdefx.so
lib/libkdefx.so.6
-lib/libkdeinit_cupsdconf.la
-lib/libkdeinit_cupsdconf.so
+%%CUPS%%lib/libkdeinit_cupsdconf.la
+%%CUPS%%lib/libkdeinit_cupsdconf.so
lib/libkdeinit_dcopserver.la
lib/libkdeinit_dcopserver.so
lib/libkdeinit_kaddprinterwizard.la
@@ -1123,8 +1123,8 @@
share/apps/kconf_update/useragent.pl
share/apps/kdeprint/apsdriver1
share/apps/kdeprint/apsdriver2
-share/apps/kdeprint/cups_logo.png
-share/apps/kdeprint/cupsd.conf.template
+%%CUPS%%share/apps/kdeprint/cups_logo.png
+%%CUPS%%share/apps/kdeprint/cupsd.conf.template
share/apps/kdeprint/filters/enscript.desktop
share/apps/kdeprint/filters/enscript.xml
share/apps/kdeprint/filters/imagetops.desktop
@@ -1220,7 +1220,7 @@
share/apps/kdeprint/pics/kdeprint_revportrait.png
share/apps/kdeprint/pics/kdeprint_uncollate.png
share/apps/kdeprint/pics/kdeprint_uncollate_reverse.png
-share/apps/kdeprint/plugins/cups.print
+%%CUPS%%share/apps/kdeprint/plugins/cups.print
share/apps/kdeprint/plugins/ext.print
share/apps/kdeprint/plugins/lpdunix.print
share/apps/kdeprint/plugins/lpr.print
@@ -2563,7 +2563,7 @@
share/config/language.codes
share/config/ui/kprintpreviewui.rc
share/config/ui/ui_standards.rc
-share/cups/model/postscript.ppd.gz
+%%CUPS%%share/cups/model/postscript.ppd.gz
share/doc/HTML/en/common/1.png
share/doc/HTML/en/common/10.png
share/doc/HTML/en/common/2.png
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411302308.iAUN888j014357>