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

[hson at users.sourceforge.net]

Revision: 9414
          http://gar.svn.sourceforge.net/gar/?rev=9414&view=rev
Author:   hson
Date:     2010-03-28 16:22:20 +0000 (Sun, 28 Mar 2010)

Log Message:
-----------
tk: Need to patch Makefile.in so tk.h from build dir gets picked up instead of /opt/csw/include. Add legacy stuff to package

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

Added Paths:
-----------
    csw/mgar/pkg/tk/trunk/files/8.4.i386.tar.xz
    csw/mgar/pkg/tk/trunk/files/8.4.sparc.tar.xz
    csw/mgar/pkg/tk/trunk/files/Makefile.in.diff

Removed Paths:
-------------
    csw/mgar/pkg/tk/trunk/files/CSWtk.gspec
    csw/mgar/pkg/tk/trunk/files/libtk8.4.so.i
    csw/mgar/pkg/tk/trunk/files/libtk8.4.so.s

Modified: csw/mgar/pkg/tk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tk/trunk/Makefile	2010-03-28 16:16:49 UTC (rev 9413)
+++ csw/mgar/pkg/tk/trunk/Makefile	2010-03-28 16:22:20 UTC (rev 9414)
@@ -11,12 +11,16 @@
 
 DISTNAME = $(GARNAME)$(GARVERSION)
 DISTFILES  = $(DISTNAME)-src.tar.gz
-DISTFILES += libtk8.4.so.i
-DISTFILES += libtk8.4.so.s
 
+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
 
-SPKG_SOURCEURL = http://www.tcl.tk/
+VENDOR_URL = http://www.tcl.tk/
 LICENSE = license.terms
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -58,11 +62,11 @@
 post-install-i386:
 	@# Install legacy libs
 	@# Building them with version modulations would be hard as that would require a full legacy tcl also
-	ginstall $(WORKDIR)/libtk8.4.so.i $(DESTDIR)$(libdir)/libtk8.4.so
+	@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.i386.tar.xz | tar xf -)
 	@$(MAKECOOKIE)
 
 post-install-sparc:
 	@# Install legacy libs
 	@# Building them with version modulations would be hard as that would require a full legacy tcl also
-	ginstall $(WORKDIR)/libtk8.4.so.s $(DESTDIR)$(libdir)/libtk8.4.so
+	@( cd $(INSTALLISADIR); xz -dc $(CURDIR)/$(FILEDIR)/8.4.sparc.tar.xz | tar xf -)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/tk/trunk/checksums
===================================================================
--- csw/mgar/pkg/tk/trunk/checksums	2010-03-28 16:16:49 UTC (rev 9413)
+++ csw/mgar/pkg/tk/trunk/checksums	2010-03-28 16:22:20 UTC (rev 9414)
@@ -1,3 +1,2 @@
-8295c274c17ffa975bcf623763c77bc6  libtk8.4.so.i
-340e9cec53ced4cae6099fdda2cdb0d3  libtk8.4.so.s
+5db325a0c9285adb2f2d8a7157dc132a  Makefile.in.diff
 13bf90602e16fc530e05196431021dc6  tk8.5.8-src.tar.gz

Added: csw/mgar/pkg/tk/trunk/files/8.4.i386.tar.xz
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/tk/trunk/files/8.4.i386.tar.xz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/tk/trunk/files/8.4.sparc.tar.xz
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/tk/trunk/files/8.4.sparc.tar.xz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: csw/mgar/pkg/tk/trunk/files/CSWtk.gspec
===================================================================
--- csw/mgar/pkg/tk/trunk/files/CSWtk.gspec	2010-03-28 16:16:49 UTC (rev 9413)
+++ csw/mgar/pkg/tk/trunk/files/CSWtk.gspec	2010-03-28 16:22:20 UTC (rev 9414)
@@ -1,4 +0,0 @@
-%var            bitname tk
-%var            pkgname CSWtk
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/license.terms

Added: csw/mgar/pkg/tk/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/tk/trunk/files/Makefile.in.diff	                        (rev 0)
+++ csw/mgar/pkg/tk/trunk/files/Makefile.in.diff	2010-03-28 16:22:20 UTC (rev 9414)
@@ -0,0 +1,27 @@
+--- 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
+ 

Deleted: csw/mgar/pkg/tk/trunk/files/libtk8.4.so.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/tk/trunk/files/libtk8.4.so.s
===================================================================
(Binary files differ)


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