diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-06 09:36:00 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-06 09:36:00 +0000 |
| commit | 648d1cac5c0e55fa04e8d7158163efa1bea319ad (patch) | |
| tree | e4e41538e60bdd9dce68c05fe3ac1cfa85ba26c0 /x11-toolkits | |
| parent | Fix build on FreeBSD 9+ (diff) | |
- Fix build with Tcl != 8.6
Reported by: bapt
Notes
Notes:
svn path=/head/; revision=311751
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gnocl/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/gnocl/files/patch-src_Makefile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile index 0232843aa679..a6822085b6b7 100644 --- a/x11-toolkits/gnocl/Makefile +++ b/x11-toolkits/gnocl/Makefile @@ -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 diff --git a/x11-toolkits/gnocl/files/patch-src_Makefile b/x11-toolkits/gnocl/files/patch-src_Makefile index 33f49f574ae7..c6c92964f387 100644 --- a/x11-toolkits/gnocl/files/patch-src_Makefile +++ b/x11-toolkits/gnocl/files/patch-src_Makefile @@ -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 \ |