From owner-svn-ports-all@FreeBSD.ORG Tue Apr 29 23:45:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C589713; Tue, 29 Apr 2014 23:45:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2BFA22; Tue, 29 Apr 2014 23:45:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3TNjuNi006360; Tue, 29 Apr 2014 23:45:56 GMT (envelope-from mi@svn.freebsd.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3TNjtUo006357; Tue, 29 Apr 2014 23:45:55 GMT (envelope-from mi@svn.freebsd.org) Message-Id: <201404292345.s3TNjtUo006357@svn.freebsd.org> From: Mikhail Teterin Date: Tue, 29 Apr 2014 23:45:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352663 - in head/graphics/gdtclft: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 23:45:56 -0000 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 @@ }