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

[lblume at users.sourceforge.net]

Revision: 22176
          http://gar.svn.sourceforge.net/gar/?rev=22176&view=rev
Author:   lblume
Date:     2013-10-08 20:26:21 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
tk85/trunk: Reintroduce patch for Makefile now that it's clear what it does

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

Added Paths:
-----------
    csw/mgar/pkg/tk85/trunk/files/0002-CFLAGS-should-be-at-the-end.patch

Removed Paths:
-------------
    csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff

Modified: csw/mgar/pkg/tk85/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tk85/trunk/Makefile	2013-10-08 19:36:49 UTC (rev 22175)
+++ csw/mgar/pkg/tk85/trunk/Makefile	2013-10-08 20:26:21 UTC (rev 22176)
@@ -12,9 +12,6 @@
 DISTNAME = $(NAME)$(VERSION)
 DISTFILES  = $(DISTNAME)-src.tar.gz
 
-#PATCHFILES = Makefile.in.diff
-#PATCHDIR = $(WORKDIR)/$(DISTNAME)
-
 # libsunmath support on Solaris 9 i386 is broken
 PACKAGING_PLATFORMS  = solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
@@ -23,6 +20,7 @@
 LICENSE = license.terms
 
 PATCHFILES += 0001-disable-libsunmath.patch
+PATCHFILES += 0002-CFLAGS-should-be-at-the-end.patch
 
 PACKAGES += CSWtk
 SPKG_DESC_CSWtk = GUI toolkit for tcl

Copied: csw/mgar/pkg/tk85/trunk/files/0002-CFLAGS-should-be-at-the-end.patch (from rev 22151, csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff)
===================================================================
--- csw/mgar/pkg/tk85/trunk/files/0002-CFLAGS-should-be-at-the-end.patch	                        (rev 0)
+++ csw/mgar/pkg/tk85/trunk/files/0002-CFLAGS-should-be-at-the-end.patch	2013-10-08 20:26:21 UTC (rev 22176)
@@ -0,0 +1,28 @@
+index 3fb3d29..11401ce 100644
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -320,20 +320,20 @@ MAN_FLAGS               = @MAN_FLAGS@
+ 
+ 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/tk85/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff	2013-10-08 19:36:49 UTC (rev 22175)
+++ csw/mgar/pkg/tk85/trunk/files/Makefile.in.diff	2013-10-08 20:26:21 UTC (rev 22176)
@@ -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
- 

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