Hello!
The attached patch rearranges the two kdelibs3* ports to move all
nocups-handling intelligence into the master port kdelibs3, with
kdelibs3-nocups doing only one things -- setting WITHOUT_CUPS.
The reason for this change is that it now allows one to just set
WITHOUT_CUPS in /etc/make.conf and build kde from the beginning --
rather then in two steps as is required currently (kdelibs-nocups
first, then the rest).
It also eliminates having to maintain two (almost identical) pkg-plists --
after applying the patch, kdelib3-nocups/pkg-plist can go away.
Please, take a look. Thanks!
-mi
Index: kdelibs3/Makefile
===================================================================
RCS file: /meow/ncvs/ports/x11/kdelibs3/Makefile,v
retrieving revision 1.179
diff -U2 -r1.179 Makefile
--- kdelibs3/Makefile 4 Aug 2005 19:58:57 -0000 1.179
+++ kdelibs3/Makefile 12 Aug 2005 18:34:27 -0000
@@ -36,9 +36,14 @@
${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
-.if ${PKGNAMESUFFIX} == -nocups
CONFLICTS+= kdeadmin-3.* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]*
kdebase-3.[0-3]* kdepim-3.2*
+.if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
+CONFLICTS+= kdelibs-[0-9]*
+PKGNAMESUFFIX= -nocups
+CONFIGURE_ARGS+=--disable-cups
+PLIST_SUB+= CUPS='@comment '
.else
-CONFLICTS+= kdeadmin-3.* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]*
kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2*
-LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
+CONFLICTS+= kdelibs-nocups-[0-9]*
+LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-base
+PLIST_SUB+= CUPS=''
.endif
Index: kdelibs3/pkg-plist
===================================================================
RCS file: /meow/ncvs/ports/x11/kdelibs3/pkg-plist,v
retrieving revision 1.62
diff -U2 -r1.62 pkg-plist
--- kdelibs3/pkg-plist 31 Jul 2005 22:46:34 -0000 1.62
+++ kdelibs3/pkg-plist 12 Aug 2005 18:32:21 -0000
@@ -1,6 +1,6 @@
bin/artsmessage
bin/checkXML
-bin/cupsdconf
-bin/cupsdoprint
+%%CUPS%%bin/cupsdconf
+%%CUPS%%bin/cupsdoprint
bin/dcop
bin/dcopclient
@@ -53,5 +53,5 @@
bin/kwrapper
bin/lnusertemp
-bin/make_driver_db_cups
+%%CUPS%%bin/make_driver_db_cups
bin/make_driver_db_lpr
bin/makekdewidgets
@@ -748,6 +748,6 @@
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
@@ -792,6 +792,6 @@
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
@@ -930,6 +930,6 @@
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
@@ -1186,6 +1186,6 @@
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
@@ -1263,5 +1263,5 @@
share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png
share/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png
-share/apps/kdeprint/kde_logo.png
+%%CUPS%%share/apps/kdeprint/kde_logo.png
share/apps/kdeprint/lprngtooldriver1
share/apps/kdeprint/pics/kdeprint_collate.png
@@ -1283,11 +1283,11 @@
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
share/apps/kdeprint/plugins/rlpr.print
-share/apps/kdeprint/preview-mini.png
-share/apps/kdeprint/preview.png
+%%CUPS%%share/apps/kdeprint/preview-mini.png
+%%CUPS%%share/apps/kdeprint/preview.png
share/apps/kdeprint/side.png
share/apps/kdeprint/specials.desktop
@@ -2866,5 +2866,5 @@
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
Index: kdelibs3-nocups/Makefile
===================================================================
RCS file: /meow/ncvs/ports/x11/kdelibs3-nocups/Makefile,v
retrieving revision 1.4
diff -U2 -r1.4 Makefile
--- kdelibs3-nocups/Makefile 31 Jul 2005 22:46:34 -0000 1.4
+++ kdelibs3-nocups/Makefile 12 Aug 2005 19:07:24 -0000
@@ -5,14 +5,8 @@
# $FreeBSD: ports/x11/kdelibs3-nocups/Makefile,v 1.4 2005/07/31 22:46:34 lofi
Exp $
-PORTNAME= kdelibs3
-PKGNAMESUFFIX= -nocups
-
MAINTAINER= [EMAIL PROTECTED]
-MASTERDIR= ${.CURDIR}/../kdelibs3
-CONFLICTS+= kdelibs-[0-9]*
-
-CONFIGURE_ARGS+= --disable-cups
-PLIST= ${.CURDIR}/pkg-plist
+MASTERDIR= ${.CURDIR:H}/kdelibs3
+WITHOUT_CUPS= yes
.include "${MASTERDIR}/Makefile"
_______________________________________________
kde-freebsd mailing list
[email protected]
http://freebsd.kde.org/mailman/listinfo/kde-freebsd
