SF.net SVN: gar:[22801] csw/mgar/pkg/xterm/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22801
          http://sourceforge.net/p/gar/code/22801
Author:   dmichelsen
Date:     2014-01-07 10:30:15 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
xterm/trunk: Update to 300

Modified Paths:
--------------
    csw/mgar/pkg/xterm/trunk/Makefile
    csw/mgar/pkg/xterm/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/xterm/trunk/files/COPYING

Modified: csw/mgar/pkg/xterm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xterm/trunk/Makefile	2014-01-07 10:10:19 UTC (rev 22800)
+++ csw/mgar/pkg/xterm/trunk/Makefile	2014-01-07 10:30:15 UTC (rev 22801)
@@ -1,6 +1,6 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 NAME = xterm
-VERSION = 267
+VERSION = 300
 GARTYPE = v2
 
 DESCRIPTION = Terminal emulator for the X Window System
@@ -12,18 +12,22 @@
   the control sequences for VT220.
 endef
 
-VENDOR_URL    = http://invisible-island.net/xterm/
-MASTER_SITES  = ftp://invisible-island.net/xterm/
-DISTFILES     = $(NAME)-$(VERSION).tgz
-UFILES_REGEX  = $(NAME)-(\d+(?:\.\d+)*).tgz
-DISTFILES    += COPYING
+MASTER_SITES += ftp://invisible-island.net/xterm/
+DISTFILES += $(NAME)-$(VERSION).tgz
 
-RUNTIME_DEP_PKGS  = CSWfconfig
-RUNTIME_DEP_PKGS += CSWlibxft2
+VENDOR_URL = http://invisible-island.net/xterm/
+LICENSE = INSTALL
 
-# xterm Makefile doesn't have a test target
-TEST_TARGET =
+PACKAGES += CSWxterm
+SPKG_DESC_CSWxterm = Terminal emulator for the X Window System
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWxterm += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWxterm += CSWlibxpm4
+RUNTIME_DEP_PKGS_CSWxterm += CSWlibfontconfig1
 
+PIXMAPDIR = $(sharedstatedir)/pixmaps/xterm
+EXTRA_CPPFLAGS += -DPIXMAP_ROOTDIR=\\\"$(PIXMAPDIR)\\\"
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-setuid
 CONFIGURE_ARGS += --disable-setgid
@@ -38,22 +42,24 @@
 CONFIGURE_ARGS += --enable-warnings
 CONFIGURE_ARGS += --enable-wide-chars
 CONFIGURE_ARGS += --program-suffix=86 --with-xterm-symlink
+CONFIGURE_ARGS += --with-pixmapdir=$(PIXMAPDIR)
 
 # Specify freetype linker flags, otherwise /opt/csw/X11/bin/xft-config is used
 CONFIGURE_ARGS += --with-freetype-cflags="-I$(includedir)/freetype2"
 CONFIGURE_ARGS += --with-freetype-libs="-lXft -lfontconfig -lfreetype"
 
-#GARFLAVOR = DBG
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 CONFIGURE_ARGS_DBG = --enable-trace --enable-warnings
 
 # luit comes with snv_85 
 #   http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6662431
-#CONFIGURE_ARGS += --enable-luit
+CONFIGURE_ARGS += --enable-luit
 
 # xterm doesn't rely on optimized libs, fasten startup
 NOISALIST = 1
 
+# xterm Makefile doesn't have a test target
+TEST_TARGET =
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/xterm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xterm/trunk/checksums	2014-01-07 10:10:19 UTC (rev 22800)
+++ csw/mgar/pkg/xterm/trunk/checksums	2014-01-07 10:30:15 UTC (rev 22801)
@@ -1 +1 @@
-3945ab70cfa2a9e95804157ee1b0f8e8  xterm-267.tgz
+6adc7c7f39ab2a71fd83747049d60358  xterm-300.tgz

Deleted: csw/mgar/pkg/xterm/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/xterm/trunk/files/COPYING	2014-01-07 10:10:19 UTC (rev 22800)
+++ csw/mgar/pkg/xterm/trunk/files/COPYING	2014-01-07 10:30:15 UTC (rev 22801)
@@ -1,27 +0,0 @@
-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.