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

[dmichelsen at users.sourceforge.net]

Revision: 19171
          http://gar.svn.sourceforge.net/gar/?rev=19171&view=rev
Author:   dmichelsen
Date:     2012-09-07 19:39:32 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
tk/trunk: General rework of recipe matching tcl 8.5 build

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	2012-09-07 19:23:45 UTC (rev 19170)
+++ csw/mgar/pkg/tk/trunk/Makefile	2012-09-07 19:39:32 UTC (rev 19171)
@@ -1,5 +1,5 @@
 NAME = tk
-VERSION = 8.5.8
+VERSION = 8.5.12
 CATEGORIES = lang
 GARTYPE = v2
 
@@ -16,21 +16,41 @@
 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
+#DEP_PKGS_CSWtk = CSWfconfig CSWftype2 CSWlibx11 CSWlibxft2 CSWlibxrender CSWtcl
+#DEP_PKGS_CSWtk += CSWlibxext
+#DEP_PKGS_CSWtk += CSWlibxscrnsaver
+#DEP_PKGS_CSWtk += CSWsunmath
 
 VENDOR_URL = http://www.tcl.tk/
 LICENSE = license.terms
 
-CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtk8.4.so
-CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtkstub8.4.a
-CHECKPKG_OVERRIDES_CSWtk += file-with-bad-content|/export/medusa|root/opt/csw/share/checkpkg/overrides/tk
-CHECKPKG_OVERRIDES_CSWtk += linked-against-discouraged-library|libtk8.4.so|libX11.so.4
-CHECKPKG_OVERRIDES_CSWtk += surplus-dependency|CSWsunmath
-CHECKPKG_OVERRIDES_CSWtk += soname-not-found|libm.so.2
+PACKAGES += CSWtk
+SPKG_DESC_CSWtk = GUI toolkit for tcl
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWtk += CSWlibtcl8-5
+RUNTIME_DEP_PKGS_CSWtk += CSWlibtk8-5
 
+# 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/.*)
+
+# 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
+CHECKPKG_OVERRIDES_CSWlibtk8-5 += file-with-bad-content|/usr/local|root/opt/csw/lib/tk8.5/demos/tcolor
+
+PACKAGES += CSWtk-dev
+SPKG_DESC_CSWtk-dev = Development files for libtk8.5.so
+# Indeed, the *.so is the real library and belongs to CSWlibtcl8-5
+PKGFILES_DEVEL_SHAREDLIBLINK =
+PKGFILES_CSWtk-dev += $(PKGFILES_DEVEL)
+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
@@ -38,18 +58,9 @@
 
 BUILD64 = 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))
 
 # tk need the static tclstub library for some reason
 MERGE_EXCLUDE_STATICLIBS =
@@ -69,8 +80,8 @@
 post-install-isa-i386:
 	@# Install legacy libs
 	@# Building them with version modulations would be hard as that would require a full legacy tcl also
-	@echo Installing legacy files
-	@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -)
+	#@echo Installing legacy files
+	#@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -)
 	@# Need to manually create symlink to latest version
 	@echo Creating link to wish8.5
 	@ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
@@ -85,8 +96,8 @@
 post-install-isa-sparcv8:
 	@# Install legacy libs
 	@# Building them with version modulations would be hard as that would require a full legacy tcl also
-	@echo Installing legacy files
-	@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -)
+	#@echo Installing legacy files
+	#@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -)
 	@# Need to manually create symlink to latest version
 	@echo Creating link to wish8.5
 	@ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish

Modified: csw/mgar/pkg/tk/trunk/checksums
===================================================================
--- csw/mgar/pkg/tk/trunk/checksums	2012-09-07 19:23:45 UTC (rev 19170)
+++ csw/mgar/pkg/tk/trunk/checksums	2012-09-07 19:39:32 UTC (rev 19171)
@@ -1,2 +1 @@
-5db325a0c9285adb2f2d8a7157dc132a  Makefile.in.diff
-13bf90602e16fc530e05196431021dc6  tk8.5.8-src.tar.gz
+a01640176845c1f654a412cfc9bab13b  tk8.5.12-src.tar.gz

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