SF.net SVN: gar:[22174] csw/mgar/pkg/tk85/trunk

[lblume at users.sourceforge.net]

Revision: 22174
          http://gar.svn.sourceforge.net/gar/?rev=22174&view=rev
Author:   lblume
Date:     2013-10-08 19:22:36 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
tk85/trunk: Bump to 8.5.15; Re-enable for Solaris 9 to follow Tcl; Some clean up

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

Added Paths:
-----------
    csw/mgar/pkg/tk85/trunk/files/0001-disable-libsunmath.patch

Modified: csw/mgar/pkg/tk85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tk85/trunk/Makefile	2013-10-08 17:27:53 UTC (rev 22173)
+++ csw/mgar/pkg/tk85/trunk/Makefile	2013-10-08 19:22:36 UTC (rev 22174)
@@ -1,5 +1,5 @@
 NAME = tk
-VERSION = 8.5.12
+VERSION = 8.5.15
 GARTYPE = v2
 
 DESCRIPTION = GUI toolkit for tcl
@@ -12,20 +12,18 @@
 DISTNAME = $(NAME)$(VERSION)
 DISTFILES  = $(DISTNAME)-src.tar.gz
 
-PATCHFILES = Makefile.in.diff
-PATCHDIR = $(WORKDIR)/$(DISTNAME)
+#PATCHFILES = Makefile.in.diff
+#PATCHDIR = $(WORKDIR)/$(DISTNAME)
 
-#DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl
-#DEP_PKGS_CSWtk += CSWlibxext
-#DEP_PKGS_CSWtk += CSWlibxscrnsaver
-#DEP_PKGS_CSWtk += CSWsunmath
-
 # libsunmath support on Solaris 9 i386 is broken
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS  = solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 VENDOR_URL = http://www.tcl.tk/
 LICENSE = license.terms
 
+PATCHFILES += 0001-disable-libsunmath.patch
+
 PACKAGES += CSWtk
 SPKG_DESC_CSWtk = GUI toolkit for tcl
 # PKGFILES is catchall
@@ -35,17 +33,13 @@
 RUNTIME_DEP_PKGS_CSWtk-i386 += CSWsunmath
 RUNTIME_DEP_PKGS_CSWtk += $(RUNTIME_DEP_PKGS_CSWtk-$(GARCH))
 
-# Leave the manpage for now
-CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/wish.1
-
 PACKAGES += CSWlibtk8-5
 SPKG_DESC_CSWlibtk8-5 = GUI toolkit library for tcl, libtk8.5.so
 PKGFILES_CSWlibtk8-5 += $(call pkgfiles_lib,libtk8.5.so)
 PKGFILES_CSWlibtk8-5 += $(call baseisadirs,$(libdir),tk8.5/.*)
+RUNTIME_DEP_PKGS_CSWlibtk8-5 += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWlibtk8-5 += CSWlibfontconfig1
 
-RUNTIME_DEP_PKGS_CSWlibtk8-5-i386 += CSWsunmath
-RUNTIME_DEP_PKGS_CSWlibtk8-5 += $(RUNTIME_DEP_PKGS_CSWlibtk8-5-$(GARCH))
-
 # This is correct, the soname with *.so is really the one to use
 CHECKPKG_OVERRIDES_CSWlibtk8-5 += soname-equals-filename
 # This is just a demo
@@ -59,12 +53,12 @@
 PKGFILES_CSWtk-dev += $(call baseisadirs,$(libdir),tkConfig.sh)
 RUNTIME_DEP_PKGS_CSWtcl-dev += CSWlibtk8-5
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10894
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*)-src.tar.gz
-
-BUILD64 = 1
+# Enable 64 bits, but not for Solaris 9 x86
+BUILD64_5.9_sparc  = 1
+BUILD64_5.10_sparc = 1
+BUILD64_5.9_i386   =
+BUILD64_5.10_i386  = 1
+BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH))
 ISAEXEC = 1
 
 WORKSRC = $(WORKDIR)/$(DISTNAME)/unix

Modified: csw/mgar/pkg/tk85/trunk/checksums
===================================================================
--- csw/mgar/pkg/tk85/trunk/checksums	2013-10-08 17:27:53 UTC (rev 22173)
+++ csw/mgar/pkg/tk85/trunk/checksums	2013-10-08 19:22:36 UTC (rev 22174)
@@ -1 +1 @@
-a01640176845c1f654a412cfc9bab13b  tk8.5.12-src.tar.gz
+55b8e33f903210a4e1c8bce0f820657f  tk8.5.15-src.tar.gz

Added: csw/mgar/pkg/tk85/trunk/files/0001-disable-libsunmath.patch
===================================================================
--- csw/mgar/pkg/tk85/trunk/files/0001-disable-libsunmath.patch	                        (rev 0)
+++ csw/mgar/pkg/tk85/trunk/files/0001-disable-libsunmath.patch	2013-10-08 19:22:36 UTC (rev 22174)
@@ -0,0 +1,12 @@
+index 654b67d..b897519 100755
+--- a/unix/configure
++++ b/unix/configure
+@@ -6698,7 +6698,7 @@ else
+ 		arch=`isainfo`
+ 		echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5
+ echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6
+-		if test "$arch" = "amd64 i386"; then
++		if test "$arch" = "xxx"; then
+ 
+ 			echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6

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