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

Wed Nov 18 04:12:37 CET 2009

Revision: 7336
          http://gar.svn.sourceforge.net/gar/?rev=7336&view=rev
Author:   skayser
Date:     2009-11-18 03:12:37 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
xterm: version bump to 251, documented CSW X11 related build changes since 243

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

Modified: csw/mgar/pkg/xterm/trunk/Makefile
===================================================================

--- csw/mgar/pkg/xterm/trunk/Makefile	2009-11-18 02:51:57 UTC (rev 7335)
+++ csw/mgar/pkg/xterm/trunk/Makefile	2009-11-18 03:12:37 UTC (rev 7336)
@@ -1,5 +1,8 @@
+# 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 = 250
+GARVERSION = 251
 CATEGORIES = apps
 
 DESCRIPTION = Terminal emulator for the X Window System
@@ -11,26 +14,16 @@
   the control sequences for VT220.
 endef
 
-MASTER_SITES = ftp://invisible-island.net/xterm/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
+SPKG_SOURCEURL = http://invisible-island.net/xterm/
+MASTER_SITES   = ftp://invisible-island.net/xterm/
+DISTFILES      = $(GARNAME)-$(GARVERSION).tgz
+UFILES_REGEX   = $(GARNAME)-(\d+(?:\.\d+)*).tgz
 
 REQUIRED_PKGS = CSWfconfig CSWlibxft2
-# We needed to switch to CSW-built X11 (build against Solaris X11 was broken
-# on the build boxes, ) and these came along as dependencies.
-REQUIRED_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt
 
-# enable -mk_width per default to address unicode form character width woes, 
-# can be taken out once upstream enhances wcwidth() sanity checking 
-#   http://article.gmane.org/gmane.comp.lib.ncurses.bugs/3795
-#
-# fixed in #244, let's see whether it works
-#PATCHFILES = patch-mkwidth.diff
+# xterm Makefile doesn't have a test target
+TEST_TARGET =
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
-
-TEST_SCRIPTS =
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-setuid
 CONFIGURE_ARGS += --disable-setgid
@@ -46,26 +39,46 @@
 CONFIGURE_ARGS += --enable-wide-chars
 CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink
 CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2"
+
+#GARFLAVOR = DBG
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings
+
+# Notes on CSW X11 libs:
+# xterm depends on Xrender and Xft for freetype font support. Starting with 
+#
+# 	libxrender-0.9.4,REV=2009.06.11
+#	libxft2-2.1.13,REV=2009.06.15
+#
+# 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.
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib
 
+REQUIRED_PKGS += CSWlibice CSWlibx11 CSWlibxaw CSWlibxmu CSWlibxt
+
+# 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
 
-#GARFLAVOR = DBG
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
-CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings
 
-# The need for the following extra flags also came along with the switch 
-# to CSW X11, didn't yet investigate what exactly broke ./configure
-EXTRA_LDFLAGS = -L$(libdir) -lfontconfig
-
 include gar/category.mk
 
-post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME)
+post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
+post-install-modulated: CSWDOCS=README.CSW changelog.CSW
+post-install-modulated: DOCS=xterm.log.html ctlseqs.txt
 post-install-modulated:
 	ginstall -d $(DOCDEST)
-	cp $(FILEDIR)/README.CSW $(DOCDEST)
-	cp $(FILEDIR)/changelog.CSW $(DOCDEST)
+	cp $(addprefix $(FILEDIR)/,$(CSWDOCS)) $(DOCDEST)
+	cp $(addprefix $(WORKSRC)/,$(DOCS))    $(DOCDEST)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/xterm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xterm/trunk/checksums	2009-11-18 02:51:57 UTC (rev 7335)
+++ csw/mgar/pkg/xterm/trunk/checksums	2009-11-18 03:12:37 UTC (rev 7336)
@@ -1 +1 @@
-962ce117f65daf6bf376b6697b2cd02d  download/xterm-250.tgz
+343a4ce213f70c53cf65979f163bebc3  xterm-251.tgz

Modified: csw/mgar/pkg/xterm/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/xterm/trunk/files/changelog.CSW	2009-11-18 02:51:57 UTC (rev 7335)
+++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW	2009-11-18 03:12:37 UTC (rev 7336)
@@ -1,5 +1,5 @@
-xterm (250,REV=2009.11.02)
+xterm (251,REV=2009.11.18)
 
   * Updated to 250. (Fixes #3937, #3856)
 
- -- Sebastian Kayser <skayser at opencsw.org>  Mon,  2 Nov 2009 16:11:49 +0100
+ -- Sebastian Kayser <skayser at opencsw.org>  Wed, 18 Nov 2009 03:23:47 +0100


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

