[csw-devel] SF.net SVN: gar:[9811] csw/mgar/pkg/xterm/trunk

[skayser at users.sourceforge.net]

Revision: 9811
          http://gar.svn.sourceforge.net/gar/?rev=9811&view=rev
Author:   skayser
Date:     2010-05-04 21:37:51 +0000 (Tue, 04 May 2010)

Log Message:
-----------
xterm: adjust path for app-defaults

Modified Paths:
--------------
    csw/mgar/pkg/xterm/trunk/Makefile
    csw/mgar/pkg/xterm/trunk/files/README.CSW

Modified: csw/mgar/pkg/xterm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xterm/trunk/Makefile	2010-05-04 20:28:19 UTC (rev 9810)
+++ csw/mgar/pkg/xterm/trunk/Makefile	2010-05-04 21:37:51 UTC (rev 9811)
@@ -1,5 +1,7 @@
-# TODO
-# ! Test app-defaults loading (cf. files/README.CSW)
+# TODO (release-critical prefixed with !, non release-critical with *)
+# * app-defaults are currently in $(prefix)/X11/etc/X11/app-defaults
+#   because of our libXt. Once the whole X11 mess is sorted, they
+#   might go to $(prefix)/etc/X11/app-defaults instead.
 GARNAME = xterm
 GARVERSION = 258
 CATEGORIES = apps
@@ -63,6 +65,10 @@
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
+# Xt app-default files need to go where Xt looks for them (one of
+# $(prefix)/X11/{etc,share,lib}/X11/app-defaults)
+CONFIGURE_ARGS += --with-app-defaults=$(prefix)/X11/etc/X11/app-defaults
+
 # Make sure to runtime link the same way that we link edited
 # * xterm link edit order is (-L/-R):  X11/lib/, lib/
 # * LD_OPTIONS would prepend (-R):  lib/

Modified: csw/mgar/pkg/xterm/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/xterm/trunk/files/README.CSW	2010-05-04 20:28:19 UTC (rev 9810)
+++ csw/mgar/pkg/xterm/trunk/files/README.CSW	2010-05-04 21:37:51 UTC (rev 9811)
@@ -12,18 +12,3 @@
 SSH'ing to machines where xterm-new isn't known to terminfo ("terminal not
 fully functional" messages). That's the main reason TERM=xterm-new hasn't
 been compiled in as a default by the way.
-
-
-Note: X resource files in /opt/csw/lib/X11/app-defaults
--------------------------------------------------------
-
-Although this package delivers some X resource files in
-/opt/csw/lib/X11/app-defaults/ this folder is not evaluated by the
-Solaris libXt per default. 
-
-Either treat them as example files and copy and paste what you need into
-your system / personal X resource files or set XFILESEARCHPATH /
-XUSERFILESEARCHPATH to honor this directory.
-
-  http://www.faqs.org/faqs/x-faq/part2/section-22.html
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.