Date: Wed, 17 Nov 2004 06:24:53 +0100 From: dirk.meyer@dinoex.sub.org (Dirk Meyer) To: x11@FreeBSD.org Subject: [PATCH]: x11/XFree86 to build without tcl/tk Message-ID: <G0Vv6Atm5F@dmeyer.dinoex.sub.org>
next in thread | raw e-mail | index | archive | help
Hello,
When building XFree86-3.x its autdetects tcl/tk
and skip build for some components.
To support this for a package too,
this patch can be applied.
I am subscribed to x11@FreeBSD.org.
Plese feel free to comment on this.
Or is this ready to commite?
kind regards Dirk
- Dirk Meyer, Im Grund 4, 34317 Habichtswald, Germany
- [dirk.meyer@dinoex.sub.org],[dirk.meyer@guug.de],[dinoex@FreeBSD.org]
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/XFree86/Makefile,v
retrieving revision 1.104
diff -u -r1.104 Makefile
--- Makefile 23 Jul 2004 19:10:17 -0000 1.104
+++ Makefile 17 Nov 2004 05:06:15 -0000
@@ -94,6 +94,12 @@
IS_INTERACTIVE= yes # configure script asks questions
.endif
+.if !defined(WITHOUT_TCL)
+PLIST_SUB+= WITH_TCL="@comment "
+.else
+PLIST_SUB+= WITH_TCL=""
+.endif
+
pre-configure:
@${MKDIR} ${SCRIPTDIR}
.if defined(BUILD_XDIST)
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11/XFree86/pkg-plist,v
retrieving revision 1.28
diff -u -r1.28 pkg-plist
--- pkg-plist 5 Apr 2001 16:21:30 -0000 1.28
+++ pkg-plist 17 Nov 2004 05:06:20 -0000
@@ -1,6 +1,6 @@
bin/SuperProbe
bin/X
-bin/XF86Setup
+%%WITH_TCL%%bin/XF86Setup
bin/XF86_3DLabs
bin/XF86_8514
bin/XF86_AGX
@@ -89,7 +89,7 @@
bin/xmh
bin/xmkmf
bin/xmodmap
-bin/xmseconfig
+%%WITH_TCL%%bin/xmseconfig
bin/xon
bin/xprop
bin/xrdb
@@ -407,71 +407,71 @@
lib/X11/Cards
lib/X11/XErrorDB
lib/X11/XF86Config.eg
-lib/X11/XF86Setup/LICENSE
-lib/X11/XF86Setup/card.tcl
-lib/X11/XF86Setup/carddata.tcl
-lib/X11/XF86Setup/done.tcl
-lib/X11/XF86Setup/filelist.tcl
-lib/X11/XF86Setup/keyboard.tcl
-lib/X11/XF86Setup/modeselect.tcl
-lib/X11/XF86Setup/mondata.tcl
-lib/X11/XF86Setup/monitor.tcl
-lib/X11/XF86Setup/mouse.tcl
-lib/X11/XF86Setup/mseproto.tcl
-lib/X11/XF86Setup/phase1.tcl
-lib/X11/XF86Setup/phase2.tcl
-lib/X11/XF86Setup/phase3.tcl
-lib/X11/XF86Setup/phase4.tcl
-lib/X11/XF86Setup/phase5.tcl
-lib/X11/XF86Setup/pics/XFree86.msk
-lib/X11/XF86Setup/pics/XFree86.xbm
-lib/X11/XF86Setup/pics/vidcard.msk
-lib/X11/XF86Setup/pics/vidcard.xbm
-lib/X11/XF86Setup/scripts/mseconfig.tcl
-lib/X11/XF86Setup/setuplib.tcl
-lib/X11/XF86Setup/srvflags.tcl
-lib/X11/XF86Setup/tcllib/button.tcl
-lib/X11/XF86Setup/tcllib/combobox.tcl
-lib/X11/XF86Setup/tcllib/dialog.tcl
-lib/X11/XF86Setup/tcllib/downarrow.xbm
-lib/X11/XF86Setup/tcllib/entry.tcl
-lib/X11/XF86Setup/tcllib/focus.tcl
-lib/X11/XF86Setup/tcllib/init.tcl
-lib/X11/XF86Setup/tcllib/license.terms
-lib/X11/XF86Setup/tcllib/listbox.tcl
-lib/X11/XF86Setup/tcllib/menu.tcl
-lib/X11/XF86Setup/tcllib/misc.tcl
-lib/X11/XF86Setup/tcllib/optionMenu.tcl
-lib/X11/XF86Setup/tcllib/palette.tcl
-lib/X11/XF86Setup/tcllib/scale.tcl
-lib/X11/XF86Setup/tcllib/scrollbar.tcl
-lib/X11/XF86Setup/tcllib/tclIndex
-lib/X11/XF86Setup/tcllib/tearoff.tcl
-lib/X11/XF86Setup/tcllib/text.tcl
-lib/X11/XF86Setup/tcllib/tk.tcl
-lib/X11/XF86Setup/tcllib/tkerror.tcl
-lib/X11/XF86Setup/tcllib/uparrow.xbm
-lib/X11/XF86Setup/texts/generic/help_card.tcl
-lib/X11/XF86Setup/texts/generic/help_done.tcl
-lib/X11/XF86Setup/texts/generic/help_intro.tcl
-lib/X11/XF86Setup/texts/generic/help_keyboard.tcl
-lib/X11/XF86Setup/texts/generic/help_modeselect.tcl
-lib/X11/XF86Setup/texts/generic/help_monitor.tcl
-lib/X11/XF86Setup/texts/generic/help_mouse.tcl
-lib/X11/XF86Setup/texts/generic/help_other.tcl
-lib/X11/XF86Setup/texts/generic/message_proc.tcl
-lib/X11/XF86Setup/texts/generic/messages.tcl
-lib/X11/XF86Setup/texts/ja/help_card.tcl
-lib/X11/XF86Setup/texts/ja/help_done.tcl
-lib/X11/XF86Setup/texts/ja/help_intro.tcl
-lib/X11/XF86Setup/texts/ja/help_keyboard.tcl
-lib/X11/XF86Setup/texts/ja/help_modeselect.tcl
-lib/X11/XF86Setup/texts/ja/help_monitor.tcl
-lib/X11/XF86Setup/texts/ja/help_mouse.tcl
-lib/X11/XF86Setup/texts/ja/help_other.tcl
-lib/X11/XF86Setup/texts/ja/message_proc.tcl
-lib/X11/XF86Setup/texts/ja/messages.tcl
-lib/X11/XF86Setup/texts/local_text.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/LICENSE
+%%WITH_TCL%%lib/X11/XF86Setup/card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/carddata.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/filelist.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mondata.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mseproto.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase1.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase2.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase3.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase4.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase5.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/pics/XFree86.msk
+%%WITH_TCL%%lib/X11/XF86Setup/pics/XFree86.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/pics/vidcard.msk
+%%WITH_TCL%%lib/X11/XF86Setup/pics/vidcard.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/scripts/mseconfig.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/setuplib.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/srvflags.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/button.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/combobox.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/dialog.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/downarrow.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/entry.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/focus.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/init.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/license.terms
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/listbox.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/menu.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/misc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/optionMenu.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/palette.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/scale.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/scrollbar.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tclIndex
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tearoff.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/text.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tk.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tkerror.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/uparrow.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_intro.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_other.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/message_proc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/messages.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_intro.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_other.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/message_proc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/messages.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/local_text.tcl
lib/X11/XKeysymDB
lib/X11/app-defaults/Beforelight
lib/X11/app-defaults/Bitmap
@@ -1528,7 +1528,7 @@
lib/modules/xf86Wacom.so
lib/modules/xie.so
man/man1/SuperProbe.1.gz
-man/man1/XF86Setup.1.gz
+%%WITH_TCL%%man/man1/XF86Setup.1.gz
man/man1/XF86_8514.1.gz
man/man1/XF86_AGX.1.gz
man/man1/XF86_Accel.1.gz
@@ -1609,7 +1609,7 @@
man/man1/xmh.1.gz
man/man1/xmkmf.1.gz
man/man1/xmodmap.1.gz
-man/man1/xmseconfig.1.gz
+%%WITH_TCL%%man/man1/xmseconfig.1.gz
man/man1/xon.1.gz
man/man1/xprop.1.gz
man/man1/xrdb.1.gz
@@ -2675,13 +2675,13 @@
@dirrm lib/X11/doc
@dirrm lib/X11/config
@dirrm lib/X11/app-defaults
-@dirrm lib/X11/XF86Setup/texts/ja
-@dirrm lib/X11/XF86Setup/texts/generic
-@dirrm lib/X11/XF86Setup/texts
-@dirrm lib/X11/XF86Setup/tcllib
-@dirrm lib/X11/XF86Setup/scripts
-@dirrm lib/X11/XF86Setup/pics
-@dirrm lib/X11/XF86Setup
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts/ja
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts/generic
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/tcllib
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/scripts
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/pics
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup
@dirrm include/X11/fonts
@dirrm include/X11/extensions
@dirrm include/X11/bitmaps
Index: pkg-plist.alpha
===================================================================
RCS file: /home/pcvs/ports/x11/XFree86/pkg-plist.alpha,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist.alpha
--- pkg-plist.alpha 5 Apr 2001 16:21:30 -0000 1.8
+++ pkg-plist.alpha 17 Nov 2004 05:06:24 -0000
@@ -1,6 +1,6 @@
bin/SuperProbe
bin/X
-bin/XF86Setup
+%%WITH_TCL%%bin/XF86Setup
bin/XF86_3DLabs
bin/XF86_I128
bin/XF86_Mach64
@@ -82,7 +82,7 @@
bin/xmh
bin/xmkmf
bin/xmodmap
-bin/xmseconfig
+%%WITH_TCL%%bin/xmseconfig
bin/xon
bin/xprop
bin/xrdb
@@ -400,71 +400,71 @@
lib/X11/Cards
lib/X11/XErrorDB
lib/X11/XF86Config.eg
-lib/X11/XF86Setup/LICENSE
-lib/X11/XF86Setup/card.tcl
-lib/X11/XF86Setup/carddata.tcl
-lib/X11/XF86Setup/done.tcl
-lib/X11/XF86Setup/filelist.tcl
-lib/X11/XF86Setup/keyboard.tcl
-lib/X11/XF86Setup/modeselect.tcl
-lib/X11/XF86Setup/mondata.tcl
-lib/X11/XF86Setup/monitor.tcl
-lib/X11/XF86Setup/mouse.tcl
-lib/X11/XF86Setup/mseproto.tcl
-lib/X11/XF86Setup/phase1.tcl
-lib/X11/XF86Setup/phase2.tcl
-lib/X11/XF86Setup/phase3.tcl
-lib/X11/XF86Setup/phase4.tcl
-lib/X11/XF86Setup/phase5.tcl
-lib/X11/XF86Setup/pics/XFree86.msk
-lib/X11/XF86Setup/pics/XFree86.xbm
-lib/X11/XF86Setup/pics/vidcard.msk
-lib/X11/XF86Setup/pics/vidcard.xbm
-lib/X11/XF86Setup/scripts/mseconfig.tcl
-lib/X11/XF86Setup/setuplib.tcl
-lib/X11/XF86Setup/srvflags.tcl
-lib/X11/XF86Setup/tcllib/button.tcl
-lib/X11/XF86Setup/tcllib/combobox.tcl
-lib/X11/XF86Setup/tcllib/dialog.tcl
-lib/X11/XF86Setup/tcllib/downarrow.xbm
-lib/X11/XF86Setup/tcllib/entry.tcl
-lib/X11/XF86Setup/tcllib/focus.tcl
-lib/X11/XF86Setup/tcllib/init.tcl
-lib/X11/XF86Setup/tcllib/license.terms
-lib/X11/XF86Setup/tcllib/listbox.tcl
-lib/X11/XF86Setup/tcllib/menu.tcl
-lib/X11/XF86Setup/tcllib/misc.tcl
-lib/X11/XF86Setup/tcllib/optionMenu.tcl
-lib/X11/XF86Setup/tcllib/palette.tcl
-lib/X11/XF86Setup/tcllib/scale.tcl
-lib/X11/XF86Setup/tcllib/scrollbar.tcl
-lib/X11/XF86Setup/tcllib/tclIndex
-lib/X11/XF86Setup/tcllib/tearoff.tcl
-lib/X11/XF86Setup/tcllib/text.tcl
-lib/X11/XF86Setup/tcllib/tk.tcl
-lib/X11/XF86Setup/tcllib/tkerror.tcl
-lib/X11/XF86Setup/tcllib/uparrow.xbm
-lib/X11/XF86Setup/texts/generic/help_card.tcl
-lib/X11/XF86Setup/texts/generic/help_done.tcl
-lib/X11/XF86Setup/texts/generic/help_intro.tcl
-lib/X11/XF86Setup/texts/generic/help_keyboard.tcl
-lib/X11/XF86Setup/texts/generic/help_modeselect.tcl
-lib/X11/XF86Setup/texts/generic/help_monitor.tcl
-lib/X11/XF86Setup/texts/generic/help_mouse.tcl
-lib/X11/XF86Setup/texts/generic/help_other.tcl
-lib/X11/XF86Setup/texts/generic/message_proc.tcl
-lib/X11/XF86Setup/texts/generic/messages.tcl
-lib/X11/XF86Setup/texts/ja/help_card.tcl
-lib/X11/XF86Setup/texts/ja/help_done.tcl
-lib/X11/XF86Setup/texts/ja/help_intro.tcl
-lib/X11/XF86Setup/texts/ja/help_keyboard.tcl
-lib/X11/XF86Setup/texts/ja/help_modeselect.tcl
-lib/X11/XF86Setup/texts/ja/help_monitor.tcl
-lib/X11/XF86Setup/texts/ja/help_mouse.tcl
-lib/X11/XF86Setup/texts/ja/help_other.tcl
-lib/X11/XF86Setup/texts/ja/message_proc.tcl
-lib/X11/XF86Setup/texts/ja/messages.tcl
-lib/X11/XF86Setup/texts/local_text.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/LICENSE
+%%WITH_TCL%%lib/X11/XF86Setup/card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/carddata.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/filelist.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mondata.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mseproto.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase1.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase2.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase3.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase4.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase5.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/pics/XFree86.msk
+%%WITH_TCL%%lib/X11/XF86Setup/pics/XFree86.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/pics/vidcard.msk
+%%WITH_TCL%%lib/X11/XF86Setup/pics/vidcard.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/scripts/mseconfig.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/setuplib.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/srvflags.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/button.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/combobox.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/dialog.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/downarrow.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/entry.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/focus.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/init.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/license.terms
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/listbox.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/menu.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/misc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/optionMenu.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/palette.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/scale.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/scrollbar.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tclIndex
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tearoff.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/text.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tk.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tkerror.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/uparrow.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_intro.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_other.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/message_proc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/messages.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_intro.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_other.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/message_proc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/messages.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/local_text.tcl
lib/X11/XKeysymDB
lib/X11/app-defaults/Beforelight
lib/X11/app-defaults/Bitmap
@@ -1264,8 +1264,8 @@
lib/X11/rstart/commands/@List
lib/X11/rstart/commands/ListContexts
lib/X11/rstart/commands/ListGenericCommands
-@exec ln -sf x11r6 %D/lib/X11/rstart/commands/x
-@exec ln -sf x11r6 %D/lib/X11/rstart/commands/x11
+@exec ln -fs %D/lib/X11/rstart/commands/x11r6 %D/lib/X11/rstart/commands/x
+@exec ln -fs %D/lib/X11/rstart/commands/x11r6 %D/lib/X11/rstart/commands/x11
@unexec rm -f %D/lib/X11/rstart/commands/x
@unexec rm -f %D/lib/X11/rstart/commands/x11
lib/X11/rstart/commands/x11r6/@List
@@ -1471,6 +1471,8 @@
lib/libXIE.a
lib/libXIE.so
lib/libXIE.so.6
+lib/libXThrStub.so
+lib/libXThrStub.so.6
lib/libXau.a
lib/libXaw.a
lib/libXaw.so
@@ -1490,8 +1492,6 @@
lib/libXp.so
lib/libXp.so.6
lib/libXss.a
-lib/libXThrStub.so
-lib/libXThrStub.so.6
lib/libXt.a
lib/libXt.so
lib/libXt.so.6
@@ -1516,7 +1516,7 @@
lib/modules/xf86Wacom.so
lib/modules/xie.so
man/man1/SuperProbe.1.gz
-man/man1/XF86Setup.1.gz
+%%WITH_TCL%%man/man1/XF86Setup.1.gz
man/man1/XF86_8514.1.gz
man/man1/XF86_AGX.1.gz
man/man1/XF86_Accel.1.gz
@@ -1597,7 +1597,7 @@
man/man1/xmh.1.gz
man/man1/xmkmf.1.gz
man/man1/xmodmap.1.gz
-man/man1/xmseconfig.1.gz
+%%WITH_TCL%%man/man1/xmseconfig.1.gz
man/man1/xon.1.gz
man/man1/xprop.1.gz
man/man1/xrdb.1.gz
@@ -2663,13 +2663,13 @@
@dirrm lib/X11/doc
@dirrm lib/X11/config
@dirrm lib/X11/app-defaults
-@dirrm lib/X11/XF86Setup/texts/ja
-@dirrm lib/X11/XF86Setup/texts/generic
-@dirrm lib/X11/XF86Setup/texts
-@dirrm lib/X11/XF86Setup/tcllib
-@dirrm lib/X11/XF86Setup/scripts
-@dirrm lib/X11/XF86Setup/pics
-@dirrm lib/X11/XF86Setup
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts/ja
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts/generic
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/tcllib
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/scripts
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/pics
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup
@dirrm include/X11/fonts
@dirrm include/X11/extensions
@dirrm include/X11/bitmaps
Index: pkg-plist.pc98
===================================================================
RCS file: /home/pcvs/ports/x11/XFree86/pkg-plist.pc98,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist.pc98
--- pkg-plist.pc98 5 Apr 2001 16:21:30 -0000 1.11
+++ pkg-plist.pc98 17 Nov 2004 05:06:30 -0000
@@ -1,6 +1,6 @@
bin/SuperProbe
bin/X
-bin/XF98Setup
+%%WITH_TCL%%bin/XF98Setup
bin/XF98_EGC
bin/XF98_GA968
bin/XF98_GANBWAP
@@ -89,7 +89,7 @@
bin/xmh
bin/xmkmf
bin/xmodmap
-bin/xmseconfig
+%%WITH_TCL%%bin/xmseconfig
bin/xon
bin/xprop
bin/xrdb
@@ -409,71 +409,71 @@
lib/X11/XErrorDB
lib/X11/XF86Config.eg
lib/X11/XF86Config.98
-lib/X11/XF86Setup/LICENSE
-lib/X11/XF86Setup/card.tcl
-lib/X11/XF86Setup/carddata.tcl
-lib/X11/XF86Setup/done.tcl
-lib/X11/XF86Setup/filelist98.tcl
-lib/X11/XF86Setup/keyboard.tcl
-lib/X11/XF86Setup/modeselect.tcl
-lib/X11/XF86Setup/mondata.tcl
-lib/X11/XF86Setup/monitor.tcl
-lib/X11/XF86Setup/mouse.tcl
-lib/X11/XF86Setup/mseproto98.tcl
-lib/X11/XF86Setup/phase1.tcl
-lib/X11/XF86Setup/phase2.tcl
-lib/X11/XF86Setup/phase3.tcl
-lib/X11/XF86Setup/phase4.tcl
-lib/X11/XF86Setup/phase5.tcl
-lib/X11/XF86Setup/pics/XFree86.msk
-lib/X11/XF86Setup/pics/XFree86.xbm
-lib/X11/XF86Setup/pics/vidcard.msk
-lib/X11/XF86Setup/pics/vidcard.xbm
-lib/X11/XF86Setup/scripts/mseconfig.tcl
-lib/X11/XF86Setup/setuplib.tcl
-lib/X11/XF86Setup/srvflags.tcl
-lib/X11/XF86Setup/tcllib/button.tcl
-lib/X11/XF86Setup/tcllib/combobox.tcl
-lib/X11/XF86Setup/tcllib/dialog.tcl
-lib/X11/XF86Setup/tcllib/downarrow.xbm
-lib/X11/XF86Setup/tcllib/entry.tcl
-lib/X11/XF86Setup/tcllib/focus.tcl
-lib/X11/XF86Setup/tcllib/init.tcl
-lib/X11/XF86Setup/tcllib/license.terms
-lib/X11/XF86Setup/tcllib/listbox.tcl
-lib/X11/XF86Setup/tcllib/menu.tcl
-lib/X11/XF86Setup/tcllib/misc.tcl
-lib/X11/XF86Setup/tcllib/optionMenu.tcl
-lib/X11/XF86Setup/tcllib/palette.tcl
-lib/X11/XF86Setup/tcllib/scale.tcl
-lib/X11/XF86Setup/tcllib/scrollbar.tcl
-lib/X11/XF86Setup/tcllib/tclIndex
-lib/X11/XF86Setup/tcllib/tearoff.tcl
-lib/X11/XF86Setup/tcllib/text.tcl
-lib/X11/XF86Setup/tcllib/tk.tcl
-lib/X11/XF86Setup/tcllib/tkerror.tcl
-lib/X11/XF86Setup/tcllib/uparrow.xbm
-lib/X11/XF86Setup/texts/generic/help_card.tcl
-lib/X11/XF86Setup/texts/generic/help_done.tcl
-lib/X11/XF86Setup/texts/generic/help_intro.tcl
-lib/X11/XF86Setup/texts/generic/help_keyboard.tcl
-lib/X11/XF86Setup/texts/generic/help_modeselect.tcl
-lib/X11/XF86Setup/texts/generic/help_monitor.tcl
-lib/X11/XF86Setup/texts/generic/help_mouse.tcl
-lib/X11/XF86Setup/texts/generic/help_other.tcl
-lib/X11/XF86Setup/texts/generic/message_proc.tcl
-lib/X11/XF86Setup/texts/generic/messages.tcl
-lib/X11/XF86Setup/texts/ja/help_card.tcl
-lib/X11/XF86Setup/texts/ja/help_done.tcl
-lib/X11/XF86Setup/texts/ja/help_intro.tcl
-lib/X11/XF86Setup/texts/ja/help_keyboard.tcl
-lib/X11/XF86Setup/texts/ja/help_modeselect.tcl
-lib/X11/XF86Setup/texts/ja/help_monitor.tcl
-lib/X11/XF86Setup/texts/ja/help_mouse.tcl
-lib/X11/XF86Setup/texts/ja/help_other.tcl
-lib/X11/XF86Setup/texts/ja/message_proc.tcl
-lib/X11/XF86Setup/texts/ja/messages.tcl
-lib/X11/XF86Setup/texts/local_text.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/LICENSE
+%%WITH_TCL%%lib/X11/XF86Setup/card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/carddata.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/filelist98.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mondata.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/mseproto98.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase1.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase2.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase3.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase4.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/phase5.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/pics/XFree86.msk
+%%WITH_TCL%%lib/X11/XF86Setup/pics/XFree86.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/pics/vidcard.msk
+%%WITH_TCL%%lib/X11/XF86Setup/pics/vidcard.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/scripts/mseconfig.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/setuplib.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/srvflags.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/button.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/combobox.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/dialog.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/downarrow.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/entry.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/focus.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/init.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/license.terms
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/listbox.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/menu.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/misc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/optionMenu.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/palette.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/scale.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/scrollbar.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tclIndex
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tearoff.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/text.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tk.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/tkerror.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/tcllib/uparrow.xbm
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_intro.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/help_other.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/message_proc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/generic/messages.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_card.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_done.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_intro.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_keyboard.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_modeselect.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_monitor.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_mouse.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/help_other.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/message_proc.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/ja/messages.tcl
+%%WITH_TCL%%lib/X11/XF86Setup/texts/local_text.tcl
lib/X11/XKeysymDB
lib/X11/app-defaults/Beforelight
lib/X11/app-defaults/Bitmap
@@ -1535,7 +1535,7 @@
lib/modules/xf86Wacom.so
lib/modules/xie.so
man/man1/SuperProbe.1.gz
-man/man1/XF86Setup.1.gz
+%%WITH_TCL%%man/man1/XF86Setup.1.gz
man/man1/XF86_8514.1.gz
man/man1/XF86_AGX.1.gz
man/man1/XF86_Accel.1.gz
@@ -1616,7 +1616,7 @@
man/man1/xmh.1.gz
man/man1/xmkmf.1.gz
man/man1/xmodmap.1.gz
-man/man1/xmseconfig.1.gz
+%%WITH_TCL%%man/man1/xmseconfig.1.gz
man/man1/xon.1.gz
man/man1/xprop.1.gz
man/man1/xrdb.1.gz
@@ -2680,13 +2680,13 @@
@dirrm lib/X11/doc
@dirrm lib/X11/config
@dirrm lib/X11/app-defaults
-@dirrm lib/X11/XF86Setup/texts/ja
-@dirrm lib/X11/XF86Setup/texts/generic
-@dirrm lib/X11/XF86Setup/texts
-@dirrm lib/X11/XF86Setup/tcllib
-@dirrm lib/X11/XF86Setup/scripts
-@dirrm lib/X11/XF86Setup/pics
-@dirrm lib/X11/XF86Setup
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts/ja
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts/generic
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/texts
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/tcllib
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/scripts
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup/pics
+%%WITH_TCL%%@dirrm lib/X11/XF86Setup
@dirrm include/X11/fonts
@dirrm include/X11/extensions
@dirrm include/X11/bitmaps
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?G0Vv6Atm5F>