[csw-devel] SF.net SVN: gar:[19175] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sun Sep 9 00:09:05 CEST 2012
Revision: 19175
http://gar.svn.sourceforge.net/gar/?rev=19175&view=rev
Author: dmichelsen
Date: 2012-09-08 22:09:05 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
tk85: Rename from tk, rework
Added Paths:
-----------
csw/mgar/pkg/tk85/
csw/mgar/pkg/tk85/trunk/Makefile
csw/mgar/pkg/tk85/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/tk/
csw/mgar/pkg/tk85/trunk/Makefile
csw/mgar/pkg/tk85/trunk/checksums
csw/mgar/pkg/tk85/trunk/files/8.4.i386.tar.xz
csw/mgar/pkg/tk85/trunk/files/8.4.sparc.tar.xz
Deleted: csw/mgar/pkg/tk85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tk/trunk/Makefile 2012-08-16 19:31:59 UTC (rev 18981)
+++ csw/mgar/pkg/tk85/trunk/Makefile 2012-09-08 22:09:05 UTC (rev 19175)
@@ -1,99 +0,0 @@
-NAME = tk
-VERSION = 8.5.8
-CATEGORIES = lang
-GARTYPE = v2
-
-DESCRIPTION = GUI toolkit for tcl
-define BLURB
-endef
-
-SF_PROJ = tcl
-MASTER_SITES = $(SF_MIRRORS)
-
-DISTNAME = $(NAME)$(VERSION)
-DISTFILES = $(DISTNAME)-src.tar.gz
-
-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
-
-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
-
-# 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
-
-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 =
-
-TEST_TARGET =
-
-include gar/category.mk
-
-#CFLAGS := $(filter-out -I%,$(CFLAGS))
-#DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
-
-
-pre-configure-modulated:
- @(cd $(WORKSRC) ; cp -p ../license.terms .)
- @$(MAKECOOKIE)
-
-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 -)
- @# Need to manually create symlink to latest version
- @echo Creating link to wish8.5
- @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
- @$(MAKECOOKIE)
-
-post-install-isa-amd64:
- @# Need to manually create symlink to latest version
- @echo Creating link to wish8.5
- @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
- @$(MAKECOOKIE)
-
-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 -)
- @# Need to manually create symlink to latest version
- @echo Creating link to wish8.5
- @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
- @$(MAKECOOKIE)
-
-post-install-isa-sparcv9:
- @# Need to manually create symlink to latest version
- @echo Creating link to wish8.5
- @ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
- @$(MAKECOOKIE)
Copied: csw/mgar/pkg/tk85/trunk/Makefile (from rev 19171, csw/mgar/pkg/tk/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/tk85/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/tk85/trunk/Makefile 2012-09-08 22:09:05 UTC (rev 19175)
@@ -0,0 +1,109 @@
+NAME = tk
+VERSION = 8.5.12
+CATEGORIES = lang
+GARTYPE = v2
+
+DESCRIPTION = GUI toolkit for tcl
+define BLURB
+endef
+
+SF_PROJ = tcl
+MASTER_SITES = $(SF_MIRRORS)
+
+DISTNAME = $(NAME)$(VERSION)
+DISTFILES = $(DISTNAME)-src.tar.gz
+
+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
+
+VENDOR_URL = http://www.tcl.tk/
+LICENSE = license.terms
+
+PACKAGES += CSWtk
+SPKG_DESC_CSWtk = GUI toolkit for tcl
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWtk += CSWlibtcl8-5
+RUNTIME_DEP_PKGS_CSWtk += CSWlibtk8-5
+
+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-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
+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
+UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*)-src.tar.gz
+
+BUILD64 = 1
+
+WORKSRC = $(WORKDIR)/$(DISTNAME)/unix
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# tk need the static tclstub library for some reason
+MERGE_EXCLUDE_STATICLIBS =
+
+TEST_TARGET =
+
+include gar/category.mk
+
+#CFLAGS := $(filter-out -I%,$(CFLAGS))
+#DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
+
+
+pre-configure-modulated:
+ @(cd $(WORKSRC) ; cp -p ../license.terms .)
+ @$(MAKECOOKIE)
+
+post-install-isa-i386:
+ @echo Creating link to wish8.5
+ ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
+ @$(MAKECOOKIE)
+
+post-install-isa-amd64:
+ @# Need to manually create symlink to latest version
+ @echo Creating link to wish8.5
+ ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
+ @$(MAKECOOKIE)
+
+post-install-isa-sparcv8:
+ @echo Creating link to wish8.5
+ ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
+ @$(MAKECOOKIE)
+
+post-install-isa-sparcv9:
+ @# Need to manually create symlink to latest version
+ @echo Creating link to wish8.5
+ ln -s wish8.5 $(INSTALLISADIR)/$(bindir)/wish
+ @$(MAKECOOKIE)
Deleted: csw/mgar/pkg/tk85/trunk/checksums
===================================================================
--- csw/mgar/pkg/tk/trunk/checksums 2012-08-16 19:31:59 UTC (rev 18981)
+++ csw/mgar/pkg/tk85/trunk/checksums 2012-09-08 22:09:05 UTC (rev 19175)
@@ -1,2 +0,0 @@
-5db325a0c9285adb2f2d8a7157dc132a Makefile.in.diff
-13bf90602e16fc530e05196431021dc6 tk8.5.8-src.tar.gz
Copied: csw/mgar/pkg/tk85/trunk/checksums (from rev 19171, csw/mgar/pkg/tk/trunk/checksums)
===================================================================
--- csw/mgar/pkg/tk85/trunk/checksums (rev 0)
+++ csw/mgar/pkg/tk85/trunk/checksums 2012-09-08 22:09:05 UTC (rev 19175)
@@ -0,0 +1 @@
+a01640176845c1f654a412cfc9bab13b tk8.5.12-src.tar.gz
Deleted: csw/mgar/pkg/tk85/trunk/files/8.4.i386.tar.xz
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/tk85/trunk/files/8.4.sparc.tar.xz
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list