svn commit: r352663 - in head/graphics/gdtclft: . files

[Mikhail Teterin]

Author: mi
Date: Tue Apr 29 23:45:55 2014
New Revision: 352663
URL: http://svnweb.freebsd.org/changeset/ports/352663
QAT: https://qat.redports.org/buildarchive/r352663/

Log:
  Because we are installing into a directory specific to TCL against which
  we built anyway, we don't need to use TCL_STUBS.

Modified:
  head/graphics/gdtclft/Makefile
  head/graphics/gdtclft/files/Makefile.bsd
  head/graphics/gdtclft/files/patch-improve

Modified: head/graphics/gdtclft/Makefile
==============================================================================
--- head/graphics/gdtclft/Makefile	Tue Apr 29 23:38:30 2014	(r352662)
+++ head/graphics/gdtclft/Makefile	Tue Apr 29 23:45:55 2014	(r352663)
@@ -17,6 +17,7 @@ USES=		tcl:84+ uidfix
 
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
+			TCL_SHLIB_VER=${TCL_SHLIB_VER} \
 			INSTALL_DATA="${INSTALL_DATA}" STAGEDIR="${STAGEDIR}"
 ALL_TARGET=	all
 

Modified: head/graphics/gdtclft/files/Makefile.bsd
==============================================================================
--- head/graphics/gdtclft/files/Makefile.bsd	Tue Apr 29 23:38:30 2014	(r352662)
+++ head/graphics/gdtclft/files/Makefile.bsd	Tue Apr 29 23:45:55 2014	(r352663)
@@ -9,20 +9,10 @@ PREFIX		?=/usr/local
 TCL_VER		?=8.4
 WARNS		= 3
 
-.if exists(${LOCALBASE}/lib/tcl${TCL_VER}/tclConfig.sh)
-# If for some reason  the file does not exist -- make the best guess. In
-# reality, it will exist by the time we are actually doing the build, so
-# the quality of the guess does not matter. But we still try well. -mi
-TCL_STUB_LIB_SPEC!=	. ${LOCALBASE}/lib/tcl${TCL_VER}/tclConfig.sh; \
-		echo $$TCL_STUB_LIB_SPEC
-.else
-TCL_STUB_LIB_SPEC=	-L${LOCALBASE}/lib -ltclstub${TCL_VER:S/.//}
-.endif
-
-LDADD		= -L${LOCALBASE}/lib -lgd -lpng -lz -lm ${TCL_STUB_LIB_SPEC}
+LDADD		= -L${LOCALBASE}/lib -lgd -lpng -lz -lm -ltcl${TCL_SHLIB_VER}
 
 CFLAGS		+=-I${LOCALBASE}/include/tcl${TCL_VER} -I${LOCALBASE}/include/gd
-CFLAGS		+=-DNDEBUG -Wall -I. -DUSE_TCL_STUBS -I${LOCALBASE}/include
+CFLAGS		+=-DNDEBUG -Wall -I. -I${LOCALBASE}/include
 CFLAGS		+=-DVERSION=\"${VERSION}\"
 
 all: pkgIndex.tcl

Modified: head/graphics/gdtclft/files/patch-improve
==============================================================================
--- head/graphics/gdtclft/files/patch-improve	Tue Apr 29 23:38:30 2014	(r352662)
+++ head/graphics/gdtclft/files/patch-improve	Tue Apr 29 23:45:55 2014	(r352663)
@@ -19,7 +19,7 @@ Use freely and get yourself a pademelon.
 	-mi (http://cafepress.com/buy/pademelon?pid=5934485)
 
 --- gdCmd.c	Fri Aug  4 17:11:05 2000
-+++ gdCmd.c	2014-04-29 18:27:30.000000000 -0400
++++ gdCmd.c	2014-04-29 19:42:13.000000000 -0400
 @@ -19,4 +19,5 @@
   */
  
@@ -970,6 +970,13 @@ Use freely and get yourself a pademelon.
 -
  #ifdef USE_TCL_STUBS
  	if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
+@@ -1183,5 +1296,5 @@
+ 	}
+ #else
+-	if (Tcl_PkgRequired(interp, "Tcl", TCL_VERSION, 0) == NULL) {
++	if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
+ 		return TCL_ERROR;
+ 	}
 @@ -1191,11 +1304,5 @@
  	}