diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-10-17 14:07:27 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-10-17 14:07:27 +0000 |
| commit | f7593780b292872badd7cf05d2b6a6429e256ed9 (patch) | |
| tree | 66fbb288defe58f2cb1c3f86b3b69d8dbf0f61a1 /x11/tkXwin | |
| parent | - Rest Maintainer (diff) | |
- Fix build after tk/tcl update
PR: 117187
Submitted by: Denis Shaposhnikov <dsh@vlink.ru> (maintainer)
Notes
Notes:
svn path=/head/; revision=201625
Diffstat (limited to 'x11/tkXwin')
| -rw-r--r-- | x11/tkXwin/Makefile | 15 | ||||
| -rw-r--r-- | x11/tkXwin/files/patch-configure | 13 | ||||
| -rw-r--r-- | x11/tkXwin/pkg-plist | 1 |
3 files changed, 16 insertions, 13 deletions
diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile index d4284ca1fe3c..30ddc776b16c 100644 --- a/x11/tkXwin/Makefile +++ b/x11/tkXwin/Makefile @@ -16,20 +16,15 @@ EXTRACT_SUFX= .tgz MAINTAINER= dsh@vlink.ru COMMENT= Tcl/Tk library to detect idle periods of an X session -LIB_DEPENDS= tcl${SHORT_TK_VER}:${PORTSDIR}/lang/tcl${SHORT_TK_VER} \ - tk${SHORT_TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER} - GNU_CONFIGURE= yes USE_X_PREFIX= yes USE_LDCONFIG= yes +USE_TK= 84+ -CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \ - --with-tclinclude=${LOCALBASE}/include/tcl${TK_VER} \ - --with-tk=${LOCALBASE}/lib/tk${TK_VER} \ - --with-tkinclude=${LOCALBASE}/include/tk${TK_VER} +CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ + --with-tclinclude=${TCL_INCLUDEDIR} \ + --with-tk=${TK_LIBDIR} \ + --with-tkinclude=${TK_INCLUDEDIR} CONFIGURE_ENV= INSTALL="${INSTALL_DATA}" -TK_VER= 8.4 -SHORT_TK_VER= ${TK_VER:S/.//} - .include <bsd.port.mk> diff --git a/x11/tkXwin/files/patch-configure b/x11/tkXwin/files/patch-configure index fef7f501d812..824fd4a21489 100644 --- a/x11/tkXwin/files/patch-configure +++ b/x11/tkXwin/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Tue Aug 30 14:52:03 2005 -+++ configure Tue Aug 30 14:52:18 2005 +--- configure.orig 2002-08-25 10:29:53.000000000 +0400 ++++ configure 2007-10-14 20:44:46.000000000 +0400 @@ -1798,7 +1798,7 @@ AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ @@ -9,3 +9,12 @@ $libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +@@ -3534,7 +3534,7 @@ + + + +-PKG_TCL=${TCL_PACKAGE_PATH}/tkXwin ++PKG_TCL=${TCL_PREFIX}/lib/tkXwin + + + diff --git a/x11/tkXwin/pkg-plist b/x11/tkXwin/pkg-plist index 37c9c5ec86dc..2aca4c00833a 100644 --- a/x11/tkXwin/pkg-plist +++ b/x11/tkXwin/pkg-plist @@ -1,7 +1,6 @@ lib/libtkXwin.la lib/libtkXwin.so lib/libtkXwin.so.1 -@cd %%LOCALBASE%% lib/tkXwin/pkgIndex.tcl lib/tkXwin/test.tcl @dirrm lib/tkXwin |