From owner-svn-ports-all@FreeBSD.ORG  Wed Feb  6 09:36:01 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BADACAC6;
 Wed,  6 Feb 2013 09:36:01 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 97580CCF;
 Wed,  6 Feb 2013 09:36:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r169a1fj063022;
 Wed, 6 Feb 2013 09:36:01 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r169a1iB063018;
 Wed, 6 Feb 2013 09:36:01 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201302060936.r169a1iB063018@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 6 Feb 2013 09:36:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311751 - in head/x11-toolkits/gnocl: . 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Feb 2013 09:36:01 -0000

Author: gahr
Date: Wed Feb  6 09:36:00 2013
New Revision: 311751
URL: http://svnweb.freebsd.org/changeset/ports/311751

Log:
  - Fix build with Tcl != 8.6
  
  Reported by:	bapt

Modified:
  head/x11-toolkits/gnocl/Makefile
  head/x11-toolkits/gnocl/files/patch-src_Makefile

Modified: head/x11-toolkits/gnocl/Makefile
==============================================================================
--- head/x11-toolkits/gnocl/Makefile	Wed Feb  6 09:28:22 2013	(r311750)
+++ head/x11-toolkits/gnocl/Makefile	Wed Feb  6 09:36:00 2013	(r311751)
@@ -37,7 +37,8 @@ PLIST_DIRS=	${BASEDIR}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|; \
-	    s|%%LOCALBASE%%|${LOCALBASE}|' \
+	    s|%%LOCALBASE%%|${LOCALBASE}|; \
+	    s|%%SHORT_TCL_VER%%|${TCL_VER:S/.//}|' \
 	    ${BUILD_WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|\[info library\]|${PREFIX}/lib|; s|tclsh|${TCLSH}|g;' ${BUILD_WRKSRC}/install.tcl
 

Modified: head/x11-toolkits/gnocl/files/patch-src_Makefile
==============================================================================
--- head/x11-toolkits/gnocl/files/patch-src_Makefile	Wed Feb  6 09:28:22 2013	(r311750)
+++ head/x11-toolkits/gnocl/files/patch-src_Makefile	Wed Feb  6 09:36:00 2013	(r311751)
@@ -14,7 +14,7 @@
 -	--libs gtk+-2.0 libglade-2.0 libnotify) \
 -	-ltclstub$(TCL_VERSION)
 +	--libs gtk+-2.0 gtk+-unix-print-2.0 libglade-2.0 libnotify) \
-+	%%LOCALBASE%%/lib/libtclstub86.a
++	%%LOCALBASE%%/lib/libtclstub%%SHORT_TCL_VER%%.a
  
  GTK_OBJ := \
  	aboutDialog.o \