[csw-devel] SF.net SVN: gar:[8276] csw/mgar/pkg/tk/trunk

[hson at users.sourceforge.net]

Revision: 8276
          http://gar.svn.sourceforge.net/gar/?rev=8276&view=rev
Author:   hson
Date:     2010-01-31 20:20:43 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
tk: Update to 8.5.7

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

Modified: csw/mgar/pkg/tk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tk/trunk/Makefile	2010-01-31 20:03:45 UTC (rev 8275)
+++ csw/mgar/pkg/tk/trunk/Makefile	2010-01-31 20:20:43 UTC (rev 8276)
@@ -1,8 +1,8 @@
 GARNAME = tk
-GARVERSION = 8.4.19
+GARVERSION = 8.5.7
 CATEGORIES = lang
 
-DESCRIPTION = Tcl programming language
+DESCRIPTION = GUI toolkit for tcl
 define BLURB
 endef
 
@@ -11,8 +11,14 @@
 
 DISTNAME = $(GARNAME)$(GARVERSION)
 DISTFILES  = $(DISTNAME)-src.tar.gz
-DISTFILES += $(call admfiles,CSWtk,)
 
+REQUIRED_PKGS_CSWtk += CSWfconfig
+REQUIRED_PKGS_CSWtk += CSWftype2
+REQUIRED_PKGS_CSWtk += CSWlibx11
+REQUIRED_PKGS_CSWtk += CSWlibxft2
+REQUIRED_PKGS_CSWtk += CSWlibxrender
+REQUIRED_PKGS_CSWtk += CSWtcl
+
 SPKG_SOURCEURL = http://www.tcl.tk/
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -23,12 +29,23 @@
 BUILD64 = 1
 NO_ISAEXEC = 1
 
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+
 WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
 
 # INCLUDE_FLAGS =
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
+CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
+EXTRA_MERGE_INCLUDE_FILES  = $(libdir)/libtkstub.*\.a
+
+TEST_TARGET =
+
 include gar/category.mk
 
 #CFLAGS := $(filter-out -I%,$(CFLAGS))

Modified: csw/mgar/pkg/tk/trunk/checksums
===================================================================
--- csw/mgar/pkg/tk/trunk/checksums	2010-01-31 20:03:45 UTC (rev 8275)
+++ csw/mgar/pkg/tk/trunk/checksums	2010-01-31 20:20:43 UTC (rev 8276)
@@ -1,2 +1 @@
-9b998d0456d1b956eb9da610837a9c47  download/tk8.4.19-src.tar.gz
-12a36182202248eb293d4391d8390781  download/CSWtk.gspec
+0764f63ae2106b4774c4ecb0ef391610  tk8.5.7-src.tar.gz


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