[csw-devel] SF.net SVN: gar:[9290] csw/mgar/pkg/xterm/trunk
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Sun Mar 21 00:34:56 CET 2010
Revision: 9290
http://gar.svn.sourceforge.net/gar/?rev=9290&view=rev
Author: skayser
Date: 2010-03-20 23:34:56 +0000 (Sat, 20 Mar 2010)
Log Message:
-----------
xterm: bump to 256, add license, added X11/bin to PATH for xft-config, re-ordered RPATH
Modified Paths:
--------------
csw/mgar/pkg/xterm/trunk/Makefile
csw/mgar/pkg/xterm/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/xterm/trunk/files/COPYING
Modified: csw/mgar/pkg/xterm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xterm/trunk/Makefile 2010-03-20 19:10:07 UTC (rev 9289)
+++ csw/mgar/pkg/xterm/trunk/Makefile 2010-03-20 23:34:56 UTC (rev 9290)
@@ -1,8 +1,5 @@
-# TODO
-# - Now that we mostly have our own CSW X11 libs, can we place the app-default
-# files in a location where they are actually read by default?
GARNAME = xterm
-GARVERSION = 251
+GARVERSION = 256
CATEGORIES = apps
DESCRIPTION = Terminal emulator for the X Window System
@@ -14,12 +11,19 @@
the control sequences for VT220.
endef
-SPKG_SOURCEURL = http://invisible-island.net/xterm/
-MASTER_SITES = ftp://invisible-island.net/xterm/
-DISTFILES = $(GARNAME)-$(GARVERSION).tgz
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
+VENDOR_URL = http://invisible-island.net/xterm/
+MASTER_SITES = ftp://invisible-island.net/xterm/
+DISTFILES = $(GARNAME)-$(GARVERSION).tgz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
+DISTFILES += COPYING
-RUNTIME_DEP_PKGS = CSWfconfig CSWlibxft2
+RUNTIME_DEP_PKGS = CSWfconfig
+RUNTIME_DEP_PKGS += CSWlibxft2
+RUNTIME_DEP_PKGS += CSWlibice
+RUNTIME_DEP_PKGS += CSWlibx11
+RUNTIME_DEP_PKGS += CSWlibxaw
+RUNTIME_DEP_PKGS += CSWlibxmu
+RUNTIME_DEP_PKGS += CSWlibxt
# xterm Makefile doesn't have a test target
TEST_TARGET =
@@ -45,7 +49,7 @@
CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings
# Notes on CSW X11 libs:
-# xterm depends on Xrender and Xft for freetype font support. Starting with
+# Through CSW freetype, xterm depends on Xrender and Xft. Starting with
#
# libxrender-0.9.4,REV=2009.06.11
# libxft2-2.1.13,REV=2009.06.15
@@ -53,20 +57,17 @@
# these libs moved to the CSW X11 libs prefix (/opt/csw/X11). Accordingly,
# we need to build against these X11 libs, otherwise ./configure bails out
# when verifying the linkage to freetype. This unfortunatel drags a pile
-# of other CSW X11 libs with it ... o_O ... Any caveats? libX11 for
-# instance will be run-time linked twice (see ldd output on xterm).
-# One from Solaris, another one from us. Time will show how this works out.
+# of other CSW X11 libs with it ... o_O ...
CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib
+CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-RUNTIME_DEP_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt
+# 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/
+# -> libs like libXft might be runtime linked from lib/ instead of X11/lib/
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(filter-out %ISALIST, $(RUNPATH_LINKER_FLAGS))
-# The need for the explicit -lfontconfig linkage also came along when
-# we upgraded from xterm-243 (CSW X11 libs had been introduced in the
-# meantime, related? pkgconfig woes?). Without the explicit linkage
-# there are implicit symbol dependencies on the final xterm linking run.
-EXTRA_LDFLAGS = -L$(libdir) -lfontconfig
-
# luit comes with snv_85
# http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431
#CONFIGURE_ARGS += --enable-luit
@@ -74,6 +75,9 @@
include gar/category.mk
+# ./configure needs to find xft-config
+PATH := /opt/csw/X11/bin:$(PATH)
+
post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
post-install-modulated: CSWDOCS=README.CSW changelog.CSW
post-install-modulated: DOCS=xterm.log.html ctlseqs.txt
Modified: csw/mgar/pkg/xterm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xterm/trunk/checksums 2010-03-20 19:10:07 UTC (rev 9289)
+++ csw/mgar/pkg/xterm/trunk/checksums 2010-03-20 23:34:56 UTC (rev 9290)
@@ -1 +1,2 @@
-343a4ce213f70c53cf65979f163bebc3 xterm-251.tgz
+d028c88c07ae91b8367ee76cdcb16cc8 COPYING
+6da5c166e1c633fc26917b66d6433f1f xterm-256.tgz
Added: csw/mgar/pkg/xterm/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/xterm/trunk/files/COPYING (rev 0)
+++ csw/mgar/pkg/xterm/trunk/files/COPYING 2010-03-20 23:34:56 UTC (rev 9290)
@@ -0,0 +1,27 @@
+Copyright 1999-2009,2010 by Thomas E. Dickey
+
+ All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list