svn commit: r311751 - in head/x11-toolkits/gnocl: . files

[Pietro Cerutti]

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 \