[csw-devel] SF.net SVN: gar:[19173] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Sat Sep 8 22:34:29 CEST 2012
Revision: 19173
http://gar.svn.sourceforge.net/gar/?rev=19173&view=rev
Author: dmichelsen
Date: 2012-09-08 20:34:29 +0000 (Sat, 08 Sep 2012)
Log Message:
-----------
tk84: Rework Tk 8.4 from legacy contents
Modified Paths:
--------------
csw/mgar/pkg/tk84/trunk/files/8.4.i386.tar.xz
csw/mgar/pkg/tk84/trunk/files/8.4.sparc.tar.xz
Added Paths:
-----------
csw/mgar/pkg/tk84/
csw/mgar/pkg/tk84/trunk/Makefile
csw/mgar/pkg/tk84/trunk/checksums
csw/mgar/pkg/tk84/trunk/files/license.terms
Removed Paths:
-------------
csw/mgar/pkg/tk84/trunk/Makefile
csw/mgar/pkg/tk84/trunk/checksums
csw/mgar/pkg/tk84/trunk/files/Makefile.in.diff
Deleted: csw/mgar/pkg/tk84/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tk/trunk/Makefile 2012-08-16 19:31:59 UTC (rev 18981)
+++ csw/mgar/pkg/tk84/trunk/Makefile 2012-09-08 20:34:29 UTC (rev 19173)
@@ -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/tk84/trunk/Makefile (from rev 19171, csw/mgar/pkg/tk/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/tk84/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/tk84/trunk/Makefile 2012-09-08 20:34:29 UTC (rev 19173)
@@ -0,0 +1,45 @@
+NAME = tk
+VERSION = 8.4.15
+CATEGORIES = lang
+GARTYPE = v2
+
+DESCRIPTION = GUI toolkit for tcl
+define BLURB
+endef
+
+SF_PROJ = tcl
+MASTER_SITES = $(SF_MIRRORS)
+
+DISTFILES += 8.4.i386.tar.xz
+DISTFILES += 8.4.sparc.tar.xz
+DISTFILES += license.terms
+
+NOEXTRACT += 8.4.i386.tar.xz
+NOEXTRACT += 8.4.sparc.tar.xz
+
+VENDOR_URL = http://www.tcl.tk/
+LICENSE = license.terms
+
+PACKAGES += CSWlibtk8-4
+SPKG_DESC_CSWlibtk8-4 = GUI toolkit library for tcl, libtk8.4.so
+# PKGFILES is catchall
+
+# This is correct, the soname with *.so is really the one to use
+CHECKPKG_OVERRIDES_CSWlibtk8-4 += soname-equals-filename
+
+# These are legacy files, just leave them for now
+CHECKPKG_OVERRIDES_CSWlibtk8-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/tk8.4/demos/tcolor
+CHECKPKG_OVERRIDES_CSWlibtk8-4 += file-with-bad-content|/usr/local|root/opt/csw/lib/tk8.4/demos/README
+CHECKPKG_OVERRIDES_CSWlibtk8-4 += file-with-bad-content|/export/medusa|root/opt/csw/lib/libtk8.4.so
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+ ginstall -d $(DESTDIR)
+ xz -c -d $(FILEDIR)/8.4.$(GARCH).tar.xz | (cd $(DESTDIR) && tar xf -)
+
Deleted: csw/mgar/pkg/tk84/trunk/checksums
===================================================================
--- csw/mgar/pkg/tk/trunk/checksums 2012-08-16 19:31:59 UTC (rev 18981)
+++ csw/mgar/pkg/tk84/trunk/checksums 2012-09-08 20:34:29 UTC (rev 19173)
@@ -1,2 +0,0 @@
-5db325a0c9285adb2f2d8a7157dc132a Makefile.in.diff
-13bf90602e16fc530e05196431021dc6 tk8.5.8-src.tar.gz
Copied: csw/mgar/pkg/tk84/trunk/checksums (from rev 19171, csw/mgar/pkg/tk/trunk/checksums)
===================================================================
Modified: csw/mgar/pkg/tk84/trunk/files/8.4.i386.tar.xz
===================================================================
(Binary files differ)
Modified: csw/mgar/pkg/tk84/trunk/files/8.4.sparc.tar.xz
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/tk84/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/tk/trunk/files/Makefile.in.diff 2012-08-16 19:31:59 UTC (rev 18981)
+++ csw/mgar/pkg/tk84/trunk/files/Makefile.in.diff 2012-09-08 20:34:29 UTC (rev 19173)
@@ -1,27 +0,0 @@
---- tk8.5.8/unix/Makefile.in.orig 2009-11-13 19:38:48.000000000 +0100
-+++ tk8.5.8/unix/Makefile.in 2010-03-28 15:44:27.880721334 +0200
-@@ -326,20 +326,20 @@
-
- CC = @CC@
-
--CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-+CC_SWITCHES_NO_STUBS = ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
- -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} -I${TCL_GENERIC_DIR} \
- -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} ${AC_FLAGS} \
- ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
--${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@
-+${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS}
-
- CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS}
-
- APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@
-
--DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
-+DEPEND_SWITCHES = -I${UNIX_DIR} -I${GENERIC_DIR} -I${BMAP_DIR} \
- -I${TCL_GENERIC_DIR} -I${TCL_PLATFORM_DIR} ${@TK_WINDOWINGSYSTEM at _INCLUDES} \
- ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} \
--${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@
-+${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ ${CFLAGS}
-
- WISH_OBJS = tkAppInit.o
-
Added: csw/mgar/pkg/tk84/trunk/files/license.terms
===================================================================
--- csw/mgar/pkg/tk84/trunk/files/license.terms (rev 0)
+++ csw/mgar/pkg/tk84/trunk/files/license.terms 2012-09-08 20:34:29 UTC (rev 19173)
@@ -0,0 +1,39 @@
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., and other parties. The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license.
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