diff options
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/tk84/Makefile | 6 | ||||
-rw-r--r-- | x11-toolkits/tk84/files/pkgIndex.tcl.in | 2 | ||||
-rw-r--r-- | x11-toolkits/tk85/Makefile | 6 | ||||
-rw-r--r-- | x11-toolkits/tk85/files/pkgIndex.tcl.in | 2 | ||||
-rw-r--r-- | x11-toolkits/tk86/Makefile | 6 | ||||
-rw-r--r-- | x11-toolkits/tk86/files/pkgIndex.tcl.in | 2 |
6 files changed, 15 insertions, 9 deletions
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index b8255bd04b09..84772a68eb81 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.4.14 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -37,7 +37,6 @@ SUB_FILES= pkgIndex.tcl .if !defined(BUILDING_TK_THREADS) USE_TCL= 84 -USE_TCL_BUILD= 84 OPTIONS= TK84_MAN "Install tk 8.4 manpages" on .else @@ -56,10 +55,13 @@ CONFIGURE_ARGS+= --enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THRE CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}" LATEST_LINK= tk85${THREADS_SUFFIX} +SUB_LIST+= TK_PROVIDE="; package provide Tk-threads ${TK_VER}" .else CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} CONFIGURE_ENV+= ac_cv_path_tclsh="${TCLSH}" +SUB_LIST+= TK_PROVIDE="" + .if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN) PLIST_SUB+= INSTMAN='@comment ' diff --git a/x11-toolkits/tk84/files/pkgIndex.tcl.in b/x11-toolkits/tk84/files/pkgIndex.tcl.in index 349c03a786f6..903d6a2f0e68 100644 --- a/x11-toolkits/tk84/files/pkgIndex.tcl.in +++ b/x11-toolkits/tk84/files/pkgIndex.tcl.in @@ -1,3 +1,3 @@ # Tcl package index file, version 1.0 -package ifneeded Tk%%THREADS_SUFFIX%% 8.4 [list load "[file join [file dirname $dir] libtk84%%THREADS_SUFFIX%%.so.1]" Tk] +package ifneeded Tk%%THREADS_SUFFIX%% 8.4 "[list load "[file join [file dirname $dir] libtk84%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%" diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile index d24a618580ff..09262b3474d4 100644 --- a/x11-toolkits/tk85/Makefile +++ b/x11-toolkits/tk85/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.5.a.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -35,7 +35,6 @@ SUB_FILES= pkgIndex.tcl .if !defined(BUILDING_TK_THREADS) USE_TCL= ${SHORT_TK_VER} -USE_TCL_BUILD= ${SHORT_TK_VER} OPTIONS= TK85_MAN "Install tk 8.5 manpages" off .else @@ -54,10 +53,13 @@ CONFIGURE_ARGS+= --enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THRE CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}" LATEST_LINK= tk85${THREADS_SUFFIX} +SUB_LIST+= TK_PROVIDE="; package provide Tk-threads ${TK_VER}" .else CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \ ac_cv_path_tclsh="${TCLSH}" +SUB_LIST+= TK_PROVIDE="" + .if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN) PLIST_SUB+= INSTMAN='@comment ' diff --git a/x11-toolkits/tk85/files/pkgIndex.tcl.in b/x11-toolkits/tk85/files/pkgIndex.tcl.in index 2be3641e0273..954c05521c10 100644 --- a/x11-toolkits/tk85/files/pkgIndex.tcl.in +++ b/x11-toolkits/tk85/files/pkgIndex.tcl.in @@ -1,3 +1,3 @@ # Tcl package index file, version 1.0 -package ifneeded Tk%%THREADS_SUFFIX%% 8.5 [list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk] +package ifneeded Tk%%THREADS_SUFFIX%% 8.5 "[list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%" diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile index d24a618580ff..09262b3474d4 100644 --- a/x11-toolkits/tk86/Makefile +++ b/x11-toolkits/tk86/Makefile @@ -7,7 +7,7 @@ PORTNAME= tk PORTVERSION= 8.5.a.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl @@ -35,7 +35,6 @@ SUB_FILES= pkgIndex.tcl .if !defined(BUILDING_TK_THREADS) USE_TCL= ${SHORT_TK_VER} -USE_TCL_BUILD= ${SHORT_TK_VER} OPTIONS= TK85_MAN "Install tk 8.5 manpages" off .else @@ -54,10 +53,13 @@ CONFIGURE_ARGS+= --enable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}${THRE CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}${THREADS_SUFFIX}" LATEST_LINK= tk85${THREADS_SUFFIX} +SUB_LIST+= TK_PROVIDE="; package provide Tk-threads ${TK_VER}" .else CONFIGURE_ARGS+= --disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \ ac_cv_path_tclsh="${TCLSH}" +SUB_LIST+= TK_PROVIDE="" + .if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN) PLIST_SUB+= INSTMAN='@comment ' diff --git a/x11-toolkits/tk86/files/pkgIndex.tcl.in b/x11-toolkits/tk86/files/pkgIndex.tcl.in index 2be3641e0273..954c05521c10 100644 --- a/x11-toolkits/tk86/files/pkgIndex.tcl.in +++ b/x11-toolkits/tk86/files/pkgIndex.tcl.in @@ -1,3 +1,3 @@ # Tcl package index file, version 1.0 -package ifneeded Tk%%THREADS_SUFFIX%% 8.5 [list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk] +package ifneeded Tk%%THREADS_SUFFIX%% 8.5 "[list load "[file join [file dirname $dir] libtk85%%THREADS_SUFFIX%%.so.1]" Tk]%%TK_PROVIDE%%" |