Index: head/x11-toolkits/tk83/Makefile =================================================================== --- head/x11-toolkits/tk83/Makefile (revision 27977) +++ head/x11-toolkits/tk83/Makefile (revision 27978) @@ -1,310 +1,313 @@ # New ports collection makefile for: tk # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # PORTNAME= tk -PORTVERSION= 8.3.b1 -CATEGORIES= x11-toolkits #tk83 +PORTVERSION= 8.3.0 +CATEGORIES= x11-toolkits tk83 MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ -DISTNAME= ${PORTNAME}8.3b1 +DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= jseger@FreeBSD.org LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 USE_XLIB= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3 CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1 MAKE_ENV= SHORT_TK_VER=83 PKGINSTALL= ${PKGDIR}/INSTALL.wish PLIST_SUB= TK_VER=8.3 SHORT_TK_VER=83 MANCOMPRESSED= no MAN1= wish.1 MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \ CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3 \ CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 DrawFocHlt.3 EventHndlr.3 \ FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 GetAnchor.3 GetBitmap.3 \ - GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetFont.3 GetGC.3 \ - GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \ + GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetDash.3 GetFont.3 \ + GetGC.3 GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \ GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \ GetVRoot.3 GetVisual.3 HandleEvent.3 IdToWindow.3 ImgChanged.3 \ InternAtom.3 MainLoop.3 MainWin.3 MaintGeom.3 ManageGeom.3 \ MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \ ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \ SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \ TextLayout.3 Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3 MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \ - chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \ - focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \ + chooseColor.n chooseDirectory.n clipboard.n destroy.n dialog.n entry.n\ + event.n focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n\ image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \ menubutton.n message.n messageBox.n option.n optionMenu.n options.n \ pack-old.n pack.n palette.n photo.n place.n popup.n radiobutton.n \ raise.n scale.n scrollbar.n selection.n send.n text.n tk.n tkerror.n \ tkvars.n tkwait.n toplevel.n winfo.n wm.n # MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ 3DBorder.3 Tk_Get3DBorder.3 \ 3DBorder.3 Tk_Get3DBorderFromObj.3 \ 3DBorder.3 Tk_Draw3DRectangle.3 \ 3DBorder.3 Tk_Fill3DRectangle.3 \ 3DBorder.3 Tk_Draw3DPolygon.3 \ 3DBorder.3 Tk_Fill3DPolygon.3 \ 3DBorder.3 Tk_3DVerticalBevel.3 \ 3DBorder.3 Tk_3DHorizontalBevel.3 \ 3DBorder.3 Tk_SetBackgroundFromBorder.3 \ 3DBorder.3 Tk_NameOf3DBorder.3 \ 3DBorder.3 Tk_3DBorderColor.3 \ 3DBorder.3 Tk_3DBorderGC.3 \ 3DBorder.3 Tk_Free3DBorderFromObj.3 \ 3DBorder.3 Tk_Free3DBorder.3 \ BindTable.3 Tk_CreateBindingTable.3 \ BindTable.3 Tk_DeleteBindingTable.3 \ BindTable.3 Tk_CreateBinding.3 \ BindTable.3 Tk_DeleteBinding.3 \ BindTable.3 Tk_GetBinding.3 \ BindTable.3 Tk_GetAllBindings.3 \ BindTable.3 Tk_DeleteAllBindings.3 \ BindTable.3 Tk_BindEvent.3 \ CanvPsY.3 Tk_CanvasPsY.3 \ CanvPsY.3 Tk_CanvasPsBitmap.3 \ CanvPsY.3 Tk_CanvasPsColor.3 \ CanvPsY.3 Tk_CanvasPsFont.3 \ CanvPsY.3 Tk_CanvasPsPath.3 \ CanvPsY.3 Tk_CanvasPsStipple.3 \ CanvTkwin.3 Tk_CanvasTkwin.3 \ CanvTkwin.3 Tk_CanvasGetCoord.3 \ CanvTkwin.3 Tk_CanvasDrawableCoords.3 \ CanvTkwin.3 Tk_CanvasSetStippleOrigin.3 \ CanvTkwin.3 Tk_CanvasWindowCoords.3 \ CanvTkwin.3 Tk_CanvasEventuallyRedraw.3 \ CanvTkwin.3 Tk_CanvasTagsOption.3 \ CanvTxtInfo.3 Tk_CanvasTextInfo.3 \ Clipboard.3 Tk_ClipboardClear.3 \ Clipboard.3 Tk_ClipboardAppend.3 \ ClrSelect.3 Tk_ClearSelection.3 \ ConfigWidg.3 Tk_ConfigureWidget.3 \ ConfigWidg.3 Tk_Offset.3 \ ConfigWidg.3 Tk_ConfigureInfo.3 \ ConfigWidg.3 Tk_ConfigureValue.3 \ ConfigWidg.3 Tk_FreeOptions.3 \ ConfigWind.3 Tk_ConfigureWindow.3 \ ConfigWind.3 Tk_MoveWindow.3 \ ConfigWind.3 Tk_ResizeWindow.3 \ ConfigWind.3 Tk_MoveResizeWindow.3 \ ConfigWind.3 Tk_SetWindowBorderWidth.3 \ ConfigWind.3 Tk_ChangeWindowAttributes.3 \ ConfigWind.3 Tk_SetWindowBackground.3 \ ConfigWind.3 Tk_SetWindowBackgroundPixmap.3 \ ConfigWind.3 Tk_SetWindowBorder.3 \ ConfigWind.3 Tk_SetWindowBorderPixmap.3 \ ConfigWind.3 Tk_SetWindowColormap.3 \ ConfigWind.3 Tk_DefineCursor.3 \ ConfigWind.3 Tk_UndefineCursor.3 \ CoordToWin.3 Tk_CoordsToWindow.3 \ CrtErrHdlr.3 Tk_CreateErrorHandler.3 \ CrtErrHdlr.3 Tk_DeleteErrorHandler.3 \ CrtGenHdlr.3 Tk_CreateGenericHandler.3 \ CrtGenHdlr.3 Tk_DeleteGenericHandler.3 \ CrtImgType.3 Tk_CreateImageType.3 \ CrtImgType.3 Tk_GetImageMasterData.3 \ + CrtImgType.3 Tk_InitImageArgs.3 \ CrtItemType.3 Tk_CreateItemType.3 \ CrtItemType.3 Tk_GetItemTypes.3 \ CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3 \ CrtSelHdlr.3 Tk_CreateSelHandler.3 \ CrtSelHdlr.3 Tk_DeleteSelHandler.3 \ CrtWindow.3 Tk_CreateWindow.3 \ CrtWindow.3 Tk_CreateWindowFromPath.3 \ CrtWindow.3 Tk_DestroyWindow.3 \ CrtWindow.3 Tk_MakeWindowExist.3 \ DeleteImg.3 Tk_DeleteImage.3 \ DrawFocHlt.3 Tk_DrawFocusHighlight.3 \ EventHndlr.3 Tk_CreateEventHandler.3 \ EventHndlr.3 Tk_DeleteEventHandler.3 \ FindPhoto.3 Tk_FindPhoto.3 \ FindPhoto.3 Tk_PhotoPutBlock.3 \ FindPhoto.3 Tk_PhotoPutZoomedBlock.3 \ FindPhoto.3 Tk_PhotoGetImage.3 \ FindPhoto.3 Tk_PhotoBlank.3 \ FindPhoto.3 Tk_PhotoExpand.3 \ FindPhoto.3 Tk_PhotoGetSize.3 \ FindPhoto.3 Tk_PhotoSetSize.3 \ FontId.3 Tk_FontId.3 \ FontId.3 Tk_FontMetrics.3 \ FontId.3 Tk_PostscriptFontName.3 \ FreeXId.3 Tk_FreeXId.3 \ GeomReq.3 Tk_GeometryRequest.3 \ GeomReq.3 Tk_SetInternalBorder.3 \ GetAnchor.3 Tk_GetAnchorFromObj.3 \ GetAnchor.3 Tk_GetAnchor.3 \ GetAnchor.3 Tk_NameOfAnchor.3 \ GetBitmap.3 Tk_AllocBitmapFromObj.3 \ GetBitmap.3 Tk_GetBitmap.3 \ GetBitmap.3 Tk_GetBitmapFromObj.3 \ GetBitmap.3 Tk_DefineBitmap.3 \ GetBitmap.3 Tk_NameOfBitmap.3 \ GetBitmap.3 Tk_SizeOfBitmap.3 \ GetBitmap.3 Tk_FreeBitmapFromObj.3 \ GetBitmap.3 Tk_FreeBitmap.3 \ GetBitmap.3 Tk_GetBitmapFromData.3 \ GetCapStyl.3 Tk_GetCapStyle.3 \ GetCapStyl.3 Tk_NameOfCapStyle.3 \ GetClrmap.3 Tk_GetColormap.3 \ GetClrmap.3 Tk_FreeColormap.3 \ GetColor.3 Tk_AllocColorFromObj.3 \ GetColor.3 Tk_GetColor.3 \ GetColor.3 Tk_GetColorFromObj.3 \ GetColor.3 Tk_GetColorByValue.3 \ GetColor.3 Tk_NameOfColor.3 \ GetColor.3 Tk_FreeColorFromObj.3 \ GetColor.3 Tk_FreeColor.3 \ GetCursor.3 Tk_AllocCursorFromObj.3 \ GetCursor.3 Tk_GetCursor.3 \ GetCursor.3 Tk_GetCursorFromObj.3 \ GetCursor.3 Tk_GetCursorFromData.3 \ GetCursor.3 Tk_NameOfCursor.3 \ GetCursor.3 Tk_FreeCursorFromObj.3 \ GetCursor.3 Tk_FreeCursor.3 \ GetDash.3 Tk_GetDash.3 \ GetFont.3 Tk_AllocFontFromObj.3 \ GetFont.3 Tk_GetFont.3 \ GetFont.3 Tk_GetFontFromObj.3 \ GetFont.3 Tk_NameOfFont.3 \ GetFont.3 Tk_FreeFontFromObj.3 \ GetFont.3 Tk_FreeFont.3 \ GetGC.3 Tk_GetGC.3 \ GetGC.3 Tk_FreeGC.3 \ GetImage.3 Tk_GetImage.3 \ GetImage.3 Tk_RedrawImage.3 \ GetImage.3 Tk_SizeOfImage.3 \ GetImage.3 Tk_FreeImage.3 \ GetJoinStl.3 Tk_GetJoinStyle.3 \ GetJoinStl.3 Tk_NameOfJoinStyle.3 \ GetJustify.3 Tk_GetJustifyFromObj.3 \ GetJustify.3 Tk_GetJustify.3 \ GetJustify.3 Tk_NameOfJustify.3 \ GetOption.3 Tk_GetOption.3 \ GetPixels.3 Tk_GetPixelsFromObj.3 \ GetPixels.3 Tk_GetPixels.3 \ GetPixels.3 Tk_GetMMFromObj.3 \ GetPixels.3 Tk_GetScreenMM.3 \ GetPixmap.3 Tk_GetPixmap.3 \ GetPixmap.3 Tk_FreePixmap.3 \ GetRelief.3 Tk_GetReliefFromObj.3 \ GetRelief.3 Tk_GetRelief.3 \ GetRelief.3 Tk_NameOfRelief.3 \ GetRootCrd.3 Tk_GetRootCoords.3 \ GetScroll.3 Tk_GetScrollInfo.3 \ GetSelect.3 Tk_GetSelection.3 \ GetUid.3 Tk_GetUid.3 \ GetUid.3 Tk_Uid.3 \ GetVRoot.3 Tk_GetVRootGeometry.3 \ GetVisual.3 Tk_GetVisual.3 \ HandleEvent.3 Tk_HandleEvent.3 \ IdToWindow.3 Tk_IdToWindow.3 \ ImgChanged.3 Tk_ImageChanged.3 \ InternAtom.3 Tk_InternAtom.3 \ InternAtom.3 Tk_GetAtomName.3 \ MainLoop.3 Tk_MainLoop.3 \ MainWin.3 Tk_MainWindow.3 \ MaintGeom.3 Tk_MaintainGeometry.3 \ MaintGeom.3 Tk_UnmaintainGeometry.3 \ ManageGeom.3 Tk_ManageGeometry.3 \ MapWindow.3 Tk_MapWindow.3 \ MapWindow.3 Tk_UnmapWindow.3 \ MeasureChar.3 Tk_MeasureChars.3 \ MeasureChar.3 Tk_TextWidth.3 \ MeasureChar.3 Tk_DrawChars.3 \ MeasureChar.3 Tk_UnderlineChars.3 \ MoveToplev.3 Tk_MoveToplevelWindow.3 \ Name.3 Tk_Name.3 \ Name.3 Tk_PathName.3 \ Name.3 Tk_NameToWindow.3 \ NameOfImg.3 Tk_NameOfImage.3 \ OwnSelect.3 Tk_OwnSelection.3 \ ParseArgv.3 Tk_ParseArgv.3 \ QWinEvent.3 Tk_QueueWindowEvent.3 \ Restack.3 Tk_RestackWindow.3 \ RestrictEv.3 Tk_RestrictEvents.3 \ SetAppName.3 Tk_SetAppName.3 \ SetClass.3 Tk_SetClass.3 \ SetClass.3 Tk_Class.3 \ SetGrid.3 Tk_SetGrid.3 \ SetGrid.3 Tk_UnsetGrid.3 \ SetOptions.3 Tk_CreateOptionTable.3 \ SetOptions.3 Tk_DeleteOptionTable.3 \ SetOptions.3 Tk_InitOptions.3 \ SetOptions.3 Tk_SetOptions.3 \ SetOptions.3 Tk_FreeSavedOptions.3 \ SetOptions.3 Tk_RestoreSavedOptions.3 \ SetOptions.3 Tk_GetOptionValue.3 \ SetOptions.3 Tk_GetOptionInfo.3 \ SetOptions.3 Tk_FreeConfigOptions.3 \ SetVisual.3 Tk_SetWindowVisual.3 \ StrictMotif.3 Tk_StrictMotif.3 \ TextLayout.3 Tk_ComputeTextLayout.3 \ TextLayout.3 Tk_FreeTextLayout.3 \ TextLayout.3 Tk_DrawTextLayout.3 \ TextLayout.3 Tk_UnderlineTextLayout.3 \ TextLayout.3 Tk_PointToChar.3 \ TextLayout.3 Tk_CharBbox.3 \ TextLayout.3 Tk_DistanceToTextLayout.3 \ TextLayout.3 Tk_IntersectTextLayout.3 \ TextLayout.3 Tk_TextLayoutToPostscript.3 \ TkInitStubs.3 Tk_InitStubs.3 \ WindowId.3 Tk_WindowId.3 \ WindowId.3 Tk_Parent.3 \ WindowId.3 Tk_Display.3 \ WindowId.3 Tk_DisplayName.3 \ WindowId.3 Tk_ScreenNumber.3 \ WindowId.3 Tk_Screen.3 \ WindowId.3 Tk_X.3 \ WindowId.3 Tk_Y.3 \ WindowId.3 Tk_Width.3 \ WindowId.3 Tk_Height.3 \ WindowId.3 Tk_Changes.3 \ WindowId.3 Tk_Attributes.3 \ + WindowId.3 Tk_IsContainer.3 \ + WindowId.3 Tk_IsEmbedded.3 \ WindowId.3 Tk_IsMapped.3 \ WindowId.3 Tk_IsTopLevel.3 \ WindowId.3 Tk_ReqWidth.3 \ WindowId.3 Tk_ReqHeight.3 \ WindowId.3 Tk_InternalBorderWidth.3 \ WindowId.3 Tk_Visual.3 \ WindowId.3 Tk_Depth.3 \ WindowId.3 Tk_Colormap.3 \ chooseColor.n tk_chooseColor.n \ + chooseDirectory.n tk_chooseDirectory.n \ dialog.n tk_dialog.n \ focusNext.n tk_focusNext.n \ focusNext.n tk_focusPrev.n \ focusNext.n tk_focusFollowsMouse.n \ getOpenFile.n tk_getOpenFile.n \ getOpenFile.n tk_getSaveFile.n \ menubar.n tk_menuBar.n \ menubar.n tk_bindForTraversal.n \ messageBox.n tk_messageBox.n \ optionMenu.n tk_optionMenu.n \ palette.n tk_setPalette.n \ palette.n tk_bisque.n \ popup.n tk_popup.n .include post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if exists(${PKGINSTALL}) ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif test: cd ${WRKSRC}; make test .include Property changes on: head/x11-toolkits/tk83/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.34 \ No newline at end of property +1.35 \ No newline at end of property Index: head/x11-toolkits/tk83/distinfo =================================================================== --- head/x11-toolkits/tk83/distinfo (revision 27977) +++ head/x11-toolkits/tk83/distinfo (revision 27978) @@ -1 +1 @@ -MD5 (tk8.3b1.tar.gz) = 5c39764905e656836ca85af04c68cf23 +MD5 (tk8.3.0.tar.gz) = b98369476607536e8384940036890d5c Property changes on: head/x11-toolkits/tk83/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/x11-toolkits/tk83/files/patch-aa =================================================================== --- head/x11-toolkits/tk83/files/patch-aa (revision 27977) +++ head/x11-toolkits/tk83/files/patch-aa (revision 27978) @@ -1,41 +1,27 @@ ---- configure.orig Wed Nov 3 21:38:44 1999 -+++ configure Sun Nov 21 15:55:12 1999 -@@ -1756,7 +1756,7 @@ +--- configure.orig Thu Feb 10 06:11:02 2000 ++++ configure Mon Apr 24 15:59:27 2000 +@@ -1763,7 +1763,7 @@ LDFLAGS="-Wl,-Bexport" LD_SEARCH_FLAGS="" ;; - NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) + NetBSD-*|FreeBSD-*|OpenBSD-*) # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -1788,14 +1788,19 @@ - echo "$ac_t""yes" 1>&6 - - SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD_LIBS="" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - LDFLAGS="" - LD_SEARCH_FLAGS="" -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' -+ SHLIB_LD="ld -shared -x -soname \$@" -+ else -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHLIB_LD="ld -Bshareable -x" -+ fi - - else - echo "$ac_t""no" 1>&6 -@@ -2266,6 +2271,7 @@ +@@ -1847,6 +1847,7 @@ + # FreeBSD doesn't handle version numbers with dots. + + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' + TCL_LIB_VERSIONS_OK=nodots + ;; + FreeBSD-*) +@@ -2303,6 +2304,7 @@ echo "$ac_t""no" 1>&6 fi +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' Property changes on: head/x11-toolkits/tk83/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/x11-toolkits/tk83/files/patch-ab =================================================================== --- head/x11-toolkits/tk83/files/patch-ab (revision 27977) +++ head/x11-toolkits/tk83/files/patch-ab (revision 27978) @@ -1,131 +1,126 @@ ---- Makefile.in.orig Fri Aug 13 18:06:14 1999 -+++ Makefile.in Sat Sep 4 19:47:43 1999 +--- Makefile.in.orig Thu Feb 10 06:11:01 2000 ++++ Makefile.in Mon Apr 24 16:10:36 2000 @@ -56,7 +56,9 @@ BIN_DIR = $(exec_prefix)/bin # Directory in which to install the include file tk.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include +INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tk$(VERSION) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix # Top-level directory for manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man @@ -153,7 +155,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. -INSTALL = @srcdir@/install-sh -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 @@ -190,7 +192,7 @@ # Libraries to use when linking. This definition is determined by the # configure script. LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc +WISH_LIBS = -L${PREFIX}/lib -ltcl${SHORT_TK_VER} @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc # The symbol below provides support for dynamic loading and shared # libraries. See configure.in for a description of what it means. -@@ -356,8 +358,14 @@ +@@ -361,8 +363,14 @@ ${TK_LIB_FILE}: ${OBJS} rm -f ${TK_LIB_FILE} @MAKE_LIB@ + ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so $(RANLIB) ${TK_LIB_FILE} +libtk${SHORT_TK_VER}.a: ${OBJS} + rm -f libtk${SHORT_TK_VER}.a + ar cr libtk${SHORT_TK_VER}.a ${OBJS} + $(RANLIB) libtk${SHORT_TK_VER}.a + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -418,7 +426,7 @@ +@@ -424,7 +432,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). -install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish +install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -432,12 +440,18 @@ - chmod +x $(UNIX_DIR)/install-sh - chmod +x $(UNIX_DIR)/mkLinks +@@ -442,12 +450,18 @@ + fi + @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @echo "Installing libtk${SHORT_TK_VER}.a" + @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a + @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a) + @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a - @echo "Installing wish" + @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) - @echo "Installing tkConfig.sh" + @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh + @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION) + @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TK_EXP_FILE)"; \ + echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -451,6 +465,7 @@ +@@ -461,6 +475,7 @@ install-libraries: @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ + $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ do \ if [ ! -d $$i ] ; then \ -@@ -461,11 +476,19 @@ - fi; \ - done; - chmod +x $(UNIX_DIR)/install-sh +@@ -474,10 +489,16 @@ + chmod +x $(UNIX_DIR)/install-sh; \ + fi + @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ -+ @echo "Installing headers" + @for i in $(GENERIC_DIR)/*.h ; \ ++ do \ ++ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ ++ done; ++ @for i in $(UNIX_DIR)/*.h ; \ do \ - echo "Installing $$i"; \ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ done; -+ @for i in $(UNIX_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ -+ done ; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h - for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ + @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; + @for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ - do \ -@@ -530,16 +553,14 @@ - $$i > $(MAN1_INSTALL_DIR)/$$i; \ +@@ -543,7 +564,6 @@ chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; -- $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) + @echo "Cross-linking top-level (.1) docs"; +- @$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) + @echo "Installing C API (.3) docs"; @cd $(SRC_DIR)/doc; for i in *.3; \ do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MAN3_INSTALL_DIR)/$$i; \ +@@ -553,7 +573,6 @@ chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; -- $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) + @echo "Cross-linking top-level (.3) docs"; +- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) + @echo "Installing command (.n) docs"; @cd $(SRC_DIR)/doc; for i in *.n; \ do \ - echo "Installing doc/$$i"; \ -@@ -548,7 +569,6 @@ - $$i > $(MANN_INSTALL_DIR)/$$i; \ +@@ -563,7 +582,6 @@ chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; -- $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) + @echo "Cross-linking command (.n) docs"; +- @$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) Makefile: $(UNIX_DIR)/Makefile.in $(SHELL) config.status Property changes on: head/x11-toolkits/tk83/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/x11-toolkits/tk83/pkg-plist =================================================================== --- head/x11-toolkits/tk83/pkg-plist (revision 27977) +++ head/x11-toolkits/tk83/pkg-plist (revision 27978) @@ -1,140 +1,141 @@ bin/wish%%TK_VER%% include/tk%%TK_VER%%/generic/default.h include/tk%%TK_VER%%/generic/ks_names.h include/tk%%TK_VER%%/generic/tk.h include/tk%%TK_VER%%/generic/tk3d.h include/tk%%TK_VER%%/generic/tkButton.h include/tk%%TK_VER%%/generic/tkCanvas.h include/tk%%TK_VER%%/generic/tkColor.h include/tk%%TK_VER%%/generic/tkDecls.h include/tk%%TK_VER%%/generic/tkFileFilter.h include/tk%%TK_VER%%/generic/tkFont.h include/tk%%TK_VER%%/generic/tkInitScript.h include/tk%%TK_VER%%/generic/tkInt.h include/tk%%TK_VER%%/generic/tkIntDecls.h include/tk%%TK_VER%%/generic/tkIntPlatDecls.h include/tk%%TK_VER%%/generic/tkIntXlibDecls.h include/tk%%TK_VER%%/generic/tkMenu.h include/tk%%TK_VER%%/generic/tkMenubutton.h include/tk%%TK_VER%%/generic/tkPlatDecls.h include/tk%%TK_VER%%/generic/tkPort.h include/tk%%TK_VER%%/generic/tkScale.h include/tk%%TK_VER%%/generic/tkScrollbar.h include/tk%%TK_VER%%/generic/tkSelect.h include/tk%%TK_VER%%/generic/tkText.h include/tk%%TK_VER%%/tk.h include/tk%%TK_VER%%/tkDecls.h include/tk%%TK_VER%%/unix/tkUnixDefault.h include/tk%%TK_VER%%/unix/tkUnixInt.h include/tk%%TK_VER%%/unix/tkUnixPort.h lib/libtk%%SHORT_TK_VER%%.a lib/libtk%%SHORT_TK_VER%%.so lib/libtk%%SHORT_TK_VER%%.so.1 lib/libtkstub%%SHORT_TK_VER%%.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/tk%%TK_VER%%/bgerror.tcl lib/tk%%TK_VER%%/button.tcl +lib/tk%%TK_VER%%/choosedir.tcl lib/tk%%TK_VER%%/clrpick.tcl lib/tk%%TK_VER%%/comdlg.tcl lib/tk%%TK_VER%%/console.tcl lib/tk%%TK_VER%%/demos/README lib/tk%%TK_VER%%/demos/arrow.tcl lib/tk%%TK_VER%%/demos/bind.tcl lib/tk%%TK_VER%%/demos/bitmap.tcl lib/tk%%TK_VER%%/demos/browse lib/tk%%TK_VER%%/demos/button.tcl lib/tk%%TK_VER%%/demos/check.tcl lib/tk%%TK_VER%%/demos/clrpick.tcl lib/tk%%TK_VER%%/demos/colors.tcl lib/tk%%TK_VER%%/demos/cscroll.tcl lib/tk%%TK_VER%%/demos/ctext.tcl lib/tk%%TK_VER%%/demos/dialog1.tcl lib/tk%%TK_VER%%/demos/dialog2.tcl lib/tk%%TK_VER%%/demos/entry1.tcl lib/tk%%TK_VER%%/demos/entry2.tcl lib/tk%%TK_VER%%/demos/filebox.tcl lib/tk%%TK_VER%%/demos/floor.tcl lib/tk%%TK_VER%%/demos/form.tcl lib/tk%%TK_VER%%/demos/hello lib/tk%%TK_VER%%/demos/hscale.tcl lib/tk%%TK_VER%%/demos/icon.tcl lib/tk%%TK_VER%%/demos/image1.tcl lib/tk%%TK_VER%%/demos/image2.tcl lib/tk%%TK_VER%%/demos/images/earth.gif lib/tk%%TK_VER%%/demos/images/earthris.gif lib/tk%%TK_VER%%/demos/images/face.bmp lib/tk%%TK_VER%%/demos/images/flagdown.bmp lib/tk%%TK_VER%%/demos/images/flagup.bmp lib/tk%%TK_VER%%/demos/images/gray25.bmp lib/tk%%TK_VER%%/demos/images/letters.bmp lib/tk%%TK_VER%%/demos/images/noletter.bmp lib/tk%%TK_VER%%/demos/images/pattern.bmp lib/tk%%TK_VER%%/demos/images/tcllogo.gif lib/tk%%TK_VER%%/demos/images/teapot.ppm lib/tk%%TK_VER%%/demos/items.tcl lib/tk%%TK_VER%%/demos/ixset lib/tk%%TK_VER%%/demos/label.tcl lib/tk%%TK_VER%%/demos/license.terms lib/tk%%TK_VER%%/demos/menu.tcl lib/tk%%TK_VER%%/demos/menubu.tcl lib/tk%%TK_VER%%/demos/msgbox.tcl lib/tk%%TK_VER%%/demos/plot.tcl lib/tk%%TK_VER%%/demos/puzzle.tcl lib/tk%%TK_VER%%/demos/radio.tcl lib/tk%%TK_VER%%/demos/rmt lib/tk%%TK_VER%%/demos/rolodex lib/tk%%TK_VER%%/demos/ruler.tcl lib/tk%%TK_VER%%/demos/sayings.tcl lib/tk%%TK_VER%%/demos/search.tcl lib/tk%%TK_VER%%/demos/square lib/tk%%TK_VER%%/demos/states.tcl lib/tk%%TK_VER%%/demos/style.tcl lib/tk%%TK_VER%%/demos/tclIndex lib/tk%%TK_VER%%/demos/tcolor lib/tk%%TK_VER%%/demos/text.tcl lib/tk%%TK_VER%%/demos/timer lib/tk%%TK_VER%%/demos/twind.tcl lib/tk%%TK_VER%%/demos/vscale.tcl lib/tk%%TK_VER%%/demos/widget lib/tk%%TK_VER%%/dialog.tcl lib/tk%%TK_VER%%/entry.tcl lib/tk%%TK_VER%%/focus.tcl lib/tk%%TK_VER%%/images/README lib/tk%%TK_VER%%/images/logo.eps lib/tk%%TK_VER%%/images/logo100.gif lib/tk%%TK_VER%%/images/logo64.gif lib/tk%%TK_VER%%/images/logoLarge.gif lib/tk%%TK_VER%%/images/logoMed.gif lib/tk%%TK_VER%%/images/pwrdLogo.eps lib/tk%%TK_VER%%/images/pwrdLogo100.gif lib/tk%%TK_VER%%/images/pwrdLogo150.gif lib/tk%%TK_VER%%/images/pwrdLogo175.gif lib/tk%%TK_VER%%/images/pwrdLogo200.gif lib/tk%%TK_VER%%/images/pwrdLogo75.gif lib/tk%%TK_VER%%/images/tai-ku.gif lib/tk%%TK_VER%%/listbox.tcl lib/tk%%TK_VER%%/menu.tcl lib/tk%%TK_VER%%/msgbox.tcl lib/tk%%TK_VER%%/obsolete.tcl lib/tk%%TK_VER%%/optMenu.tcl lib/tk%%TK_VER%%/palette.tcl lib/tk%%TK_VER%%/prolog.ps lib/tk%%TK_VER%%/safetk.tcl lib/tk%%TK_VER%%/scale.tcl lib/tk%%TK_VER%%/scrlbar.tcl lib/tk%%TK_VER%%/tclIndex lib/tk%%TK_VER%%/tearoff.tcl lib/tk%%TK_VER%%/text.tcl lib/tk%%TK_VER%%/tk.tcl lib/tk%%TK_VER%%/tkAppInit.c lib/tk%%TK_VER%%/tkConfig.sh lib/tk%%TK_VER%%/tkfbox.tcl lib/tk%%TK_VER%%/xmfbox.tcl @dirrm lib/tk%%TK_VER%%/demos/images @dirrm lib/tk%%TK_VER%%/demos @dirrm lib/tk%%TK_VER%%/images @dirrm lib/tk%%TK_VER%% @dirrm include/tk%%TK_VER%%/unix @dirrm include/tk%%TK_VER%%/generic @dirrm include/tk%%TK_VER%% Property changes on: head/x11-toolkits/tk83/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/x11-toolkits/tk84/Makefile =================================================================== --- head/x11-toolkits/tk84/Makefile (revision 27977) +++ head/x11-toolkits/tk84/Makefile (revision 27978) @@ -1,310 +1,313 @@ # New ports collection makefile for: tk # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # PORTNAME= tk -PORTVERSION= 8.3.b1 -CATEGORIES= x11-toolkits #tk83 +PORTVERSION= 8.3.0 +CATEGORIES= x11-toolkits tk83 MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ -DISTNAME= ${PORTNAME}8.3b1 +DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= jseger@FreeBSD.org LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 USE_XLIB= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3 CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1 MAKE_ENV= SHORT_TK_VER=83 PKGINSTALL= ${PKGDIR}/INSTALL.wish PLIST_SUB= TK_VER=8.3 SHORT_TK_VER=83 MANCOMPRESSED= no MAN1= wish.1 MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \ CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3 \ CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 DrawFocHlt.3 EventHndlr.3 \ FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 GetAnchor.3 GetBitmap.3 \ - GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetFont.3 GetGC.3 \ - GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \ + GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetDash.3 GetFont.3 \ + GetGC.3 GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \ GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \ GetVRoot.3 GetVisual.3 HandleEvent.3 IdToWindow.3 ImgChanged.3 \ InternAtom.3 MainLoop.3 MainWin.3 MaintGeom.3 ManageGeom.3 \ MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \ ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \ SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \ TextLayout.3 Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3 MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \ - chooseColor.n clipboard.n destroy.n dialog.n entry.n event.n \ - focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \ + chooseColor.n chooseDirectory.n clipboard.n destroy.n dialog.n entry.n\ + event.n focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n\ image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \ menubutton.n message.n messageBox.n option.n optionMenu.n options.n \ pack-old.n pack.n palette.n photo.n place.n popup.n radiobutton.n \ raise.n scale.n scrollbar.n selection.n send.n text.n tk.n tkerror.n \ tkvars.n tkwait.n toplevel.n winfo.n wm.n # MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ 3DBorder.3 Tk_Get3DBorder.3 \ 3DBorder.3 Tk_Get3DBorderFromObj.3 \ 3DBorder.3 Tk_Draw3DRectangle.3 \ 3DBorder.3 Tk_Fill3DRectangle.3 \ 3DBorder.3 Tk_Draw3DPolygon.3 \ 3DBorder.3 Tk_Fill3DPolygon.3 \ 3DBorder.3 Tk_3DVerticalBevel.3 \ 3DBorder.3 Tk_3DHorizontalBevel.3 \ 3DBorder.3 Tk_SetBackgroundFromBorder.3 \ 3DBorder.3 Tk_NameOf3DBorder.3 \ 3DBorder.3 Tk_3DBorderColor.3 \ 3DBorder.3 Tk_3DBorderGC.3 \ 3DBorder.3 Tk_Free3DBorderFromObj.3 \ 3DBorder.3 Tk_Free3DBorder.3 \ BindTable.3 Tk_CreateBindingTable.3 \ BindTable.3 Tk_DeleteBindingTable.3 \ BindTable.3 Tk_CreateBinding.3 \ BindTable.3 Tk_DeleteBinding.3 \ BindTable.3 Tk_GetBinding.3 \ BindTable.3 Tk_GetAllBindings.3 \ BindTable.3 Tk_DeleteAllBindings.3 \ BindTable.3 Tk_BindEvent.3 \ CanvPsY.3 Tk_CanvasPsY.3 \ CanvPsY.3 Tk_CanvasPsBitmap.3 \ CanvPsY.3 Tk_CanvasPsColor.3 \ CanvPsY.3 Tk_CanvasPsFont.3 \ CanvPsY.3 Tk_CanvasPsPath.3 \ CanvPsY.3 Tk_CanvasPsStipple.3 \ CanvTkwin.3 Tk_CanvasTkwin.3 \ CanvTkwin.3 Tk_CanvasGetCoord.3 \ CanvTkwin.3 Tk_CanvasDrawableCoords.3 \ CanvTkwin.3 Tk_CanvasSetStippleOrigin.3 \ CanvTkwin.3 Tk_CanvasWindowCoords.3 \ CanvTkwin.3 Tk_CanvasEventuallyRedraw.3 \ CanvTkwin.3 Tk_CanvasTagsOption.3 \ CanvTxtInfo.3 Tk_CanvasTextInfo.3 \ Clipboard.3 Tk_ClipboardClear.3 \ Clipboard.3 Tk_ClipboardAppend.3 \ ClrSelect.3 Tk_ClearSelection.3 \ ConfigWidg.3 Tk_ConfigureWidget.3 \ ConfigWidg.3 Tk_Offset.3 \ ConfigWidg.3 Tk_ConfigureInfo.3 \ ConfigWidg.3 Tk_ConfigureValue.3 \ ConfigWidg.3 Tk_FreeOptions.3 \ ConfigWind.3 Tk_ConfigureWindow.3 \ ConfigWind.3 Tk_MoveWindow.3 \ ConfigWind.3 Tk_ResizeWindow.3 \ ConfigWind.3 Tk_MoveResizeWindow.3 \ ConfigWind.3 Tk_SetWindowBorderWidth.3 \ ConfigWind.3 Tk_ChangeWindowAttributes.3 \ ConfigWind.3 Tk_SetWindowBackground.3 \ ConfigWind.3 Tk_SetWindowBackgroundPixmap.3 \ ConfigWind.3 Tk_SetWindowBorder.3 \ ConfigWind.3 Tk_SetWindowBorderPixmap.3 \ ConfigWind.3 Tk_SetWindowColormap.3 \ ConfigWind.3 Tk_DefineCursor.3 \ ConfigWind.3 Tk_UndefineCursor.3 \ CoordToWin.3 Tk_CoordsToWindow.3 \ CrtErrHdlr.3 Tk_CreateErrorHandler.3 \ CrtErrHdlr.3 Tk_DeleteErrorHandler.3 \ CrtGenHdlr.3 Tk_CreateGenericHandler.3 \ CrtGenHdlr.3 Tk_DeleteGenericHandler.3 \ CrtImgType.3 Tk_CreateImageType.3 \ CrtImgType.3 Tk_GetImageMasterData.3 \ + CrtImgType.3 Tk_InitImageArgs.3 \ CrtItemType.3 Tk_CreateItemType.3 \ CrtItemType.3 Tk_GetItemTypes.3 \ CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3 \ CrtSelHdlr.3 Tk_CreateSelHandler.3 \ CrtSelHdlr.3 Tk_DeleteSelHandler.3 \ CrtWindow.3 Tk_CreateWindow.3 \ CrtWindow.3 Tk_CreateWindowFromPath.3 \ CrtWindow.3 Tk_DestroyWindow.3 \ CrtWindow.3 Tk_MakeWindowExist.3 \ DeleteImg.3 Tk_DeleteImage.3 \ DrawFocHlt.3 Tk_DrawFocusHighlight.3 \ EventHndlr.3 Tk_CreateEventHandler.3 \ EventHndlr.3 Tk_DeleteEventHandler.3 \ FindPhoto.3 Tk_FindPhoto.3 \ FindPhoto.3 Tk_PhotoPutBlock.3 \ FindPhoto.3 Tk_PhotoPutZoomedBlock.3 \ FindPhoto.3 Tk_PhotoGetImage.3 \ FindPhoto.3 Tk_PhotoBlank.3 \ FindPhoto.3 Tk_PhotoExpand.3 \ FindPhoto.3 Tk_PhotoGetSize.3 \ FindPhoto.3 Tk_PhotoSetSize.3 \ FontId.3 Tk_FontId.3 \ FontId.3 Tk_FontMetrics.3 \ FontId.3 Tk_PostscriptFontName.3 \ FreeXId.3 Tk_FreeXId.3 \ GeomReq.3 Tk_GeometryRequest.3 \ GeomReq.3 Tk_SetInternalBorder.3 \ GetAnchor.3 Tk_GetAnchorFromObj.3 \ GetAnchor.3 Tk_GetAnchor.3 \ GetAnchor.3 Tk_NameOfAnchor.3 \ GetBitmap.3 Tk_AllocBitmapFromObj.3 \ GetBitmap.3 Tk_GetBitmap.3 \ GetBitmap.3 Tk_GetBitmapFromObj.3 \ GetBitmap.3 Tk_DefineBitmap.3 \ GetBitmap.3 Tk_NameOfBitmap.3 \ GetBitmap.3 Tk_SizeOfBitmap.3 \ GetBitmap.3 Tk_FreeBitmapFromObj.3 \ GetBitmap.3 Tk_FreeBitmap.3 \ GetBitmap.3 Tk_GetBitmapFromData.3 \ GetCapStyl.3 Tk_GetCapStyle.3 \ GetCapStyl.3 Tk_NameOfCapStyle.3 \ GetClrmap.3 Tk_GetColormap.3 \ GetClrmap.3 Tk_FreeColormap.3 \ GetColor.3 Tk_AllocColorFromObj.3 \ GetColor.3 Tk_GetColor.3 \ GetColor.3 Tk_GetColorFromObj.3 \ GetColor.3 Tk_GetColorByValue.3 \ GetColor.3 Tk_NameOfColor.3 \ GetColor.3 Tk_FreeColorFromObj.3 \ GetColor.3 Tk_FreeColor.3 \ GetCursor.3 Tk_AllocCursorFromObj.3 \ GetCursor.3 Tk_GetCursor.3 \ GetCursor.3 Tk_GetCursorFromObj.3 \ GetCursor.3 Tk_GetCursorFromData.3 \ GetCursor.3 Tk_NameOfCursor.3 \ GetCursor.3 Tk_FreeCursorFromObj.3 \ GetCursor.3 Tk_FreeCursor.3 \ GetDash.3 Tk_GetDash.3 \ GetFont.3 Tk_AllocFontFromObj.3 \ GetFont.3 Tk_GetFont.3 \ GetFont.3 Tk_GetFontFromObj.3 \ GetFont.3 Tk_NameOfFont.3 \ GetFont.3 Tk_FreeFontFromObj.3 \ GetFont.3 Tk_FreeFont.3 \ GetGC.3 Tk_GetGC.3 \ GetGC.3 Tk_FreeGC.3 \ GetImage.3 Tk_GetImage.3 \ GetImage.3 Tk_RedrawImage.3 \ GetImage.3 Tk_SizeOfImage.3 \ GetImage.3 Tk_FreeImage.3 \ GetJoinStl.3 Tk_GetJoinStyle.3 \ GetJoinStl.3 Tk_NameOfJoinStyle.3 \ GetJustify.3 Tk_GetJustifyFromObj.3 \ GetJustify.3 Tk_GetJustify.3 \ GetJustify.3 Tk_NameOfJustify.3 \ GetOption.3 Tk_GetOption.3 \ GetPixels.3 Tk_GetPixelsFromObj.3 \ GetPixels.3 Tk_GetPixels.3 \ GetPixels.3 Tk_GetMMFromObj.3 \ GetPixels.3 Tk_GetScreenMM.3 \ GetPixmap.3 Tk_GetPixmap.3 \ GetPixmap.3 Tk_FreePixmap.3 \ GetRelief.3 Tk_GetReliefFromObj.3 \ GetRelief.3 Tk_GetRelief.3 \ GetRelief.3 Tk_NameOfRelief.3 \ GetRootCrd.3 Tk_GetRootCoords.3 \ GetScroll.3 Tk_GetScrollInfo.3 \ GetSelect.3 Tk_GetSelection.3 \ GetUid.3 Tk_GetUid.3 \ GetUid.3 Tk_Uid.3 \ GetVRoot.3 Tk_GetVRootGeometry.3 \ GetVisual.3 Tk_GetVisual.3 \ HandleEvent.3 Tk_HandleEvent.3 \ IdToWindow.3 Tk_IdToWindow.3 \ ImgChanged.3 Tk_ImageChanged.3 \ InternAtom.3 Tk_InternAtom.3 \ InternAtom.3 Tk_GetAtomName.3 \ MainLoop.3 Tk_MainLoop.3 \ MainWin.3 Tk_MainWindow.3 \ MaintGeom.3 Tk_MaintainGeometry.3 \ MaintGeom.3 Tk_UnmaintainGeometry.3 \ ManageGeom.3 Tk_ManageGeometry.3 \ MapWindow.3 Tk_MapWindow.3 \ MapWindow.3 Tk_UnmapWindow.3 \ MeasureChar.3 Tk_MeasureChars.3 \ MeasureChar.3 Tk_TextWidth.3 \ MeasureChar.3 Tk_DrawChars.3 \ MeasureChar.3 Tk_UnderlineChars.3 \ MoveToplev.3 Tk_MoveToplevelWindow.3 \ Name.3 Tk_Name.3 \ Name.3 Tk_PathName.3 \ Name.3 Tk_NameToWindow.3 \ NameOfImg.3 Tk_NameOfImage.3 \ OwnSelect.3 Tk_OwnSelection.3 \ ParseArgv.3 Tk_ParseArgv.3 \ QWinEvent.3 Tk_QueueWindowEvent.3 \ Restack.3 Tk_RestackWindow.3 \ RestrictEv.3 Tk_RestrictEvents.3 \ SetAppName.3 Tk_SetAppName.3 \ SetClass.3 Tk_SetClass.3 \ SetClass.3 Tk_Class.3 \ SetGrid.3 Tk_SetGrid.3 \ SetGrid.3 Tk_UnsetGrid.3 \ SetOptions.3 Tk_CreateOptionTable.3 \ SetOptions.3 Tk_DeleteOptionTable.3 \ SetOptions.3 Tk_InitOptions.3 \ SetOptions.3 Tk_SetOptions.3 \ SetOptions.3 Tk_FreeSavedOptions.3 \ SetOptions.3 Tk_RestoreSavedOptions.3 \ SetOptions.3 Tk_GetOptionValue.3 \ SetOptions.3 Tk_GetOptionInfo.3 \ SetOptions.3 Tk_FreeConfigOptions.3 \ SetVisual.3 Tk_SetWindowVisual.3 \ StrictMotif.3 Tk_StrictMotif.3 \ TextLayout.3 Tk_ComputeTextLayout.3 \ TextLayout.3 Tk_FreeTextLayout.3 \ TextLayout.3 Tk_DrawTextLayout.3 \ TextLayout.3 Tk_UnderlineTextLayout.3 \ TextLayout.3 Tk_PointToChar.3 \ TextLayout.3 Tk_CharBbox.3 \ TextLayout.3 Tk_DistanceToTextLayout.3 \ TextLayout.3 Tk_IntersectTextLayout.3 \ TextLayout.3 Tk_TextLayoutToPostscript.3 \ TkInitStubs.3 Tk_InitStubs.3 \ WindowId.3 Tk_WindowId.3 \ WindowId.3 Tk_Parent.3 \ WindowId.3 Tk_Display.3 \ WindowId.3 Tk_DisplayName.3 \ WindowId.3 Tk_ScreenNumber.3 \ WindowId.3 Tk_Screen.3 \ WindowId.3 Tk_X.3 \ WindowId.3 Tk_Y.3 \ WindowId.3 Tk_Width.3 \ WindowId.3 Tk_Height.3 \ WindowId.3 Tk_Changes.3 \ WindowId.3 Tk_Attributes.3 \ + WindowId.3 Tk_IsContainer.3 \ + WindowId.3 Tk_IsEmbedded.3 \ WindowId.3 Tk_IsMapped.3 \ WindowId.3 Tk_IsTopLevel.3 \ WindowId.3 Tk_ReqWidth.3 \ WindowId.3 Tk_ReqHeight.3 \ WindowId.3 Tk_InternalBorderWidth.3 \ WindowId.3 Tk_Visual.3 \ WindowId.3 Tk_Depth.3 \ WindowId.3 Tk_Colormap.3 \ chooseColor.n tk_chooseColor.n \ + chooseDirectory.n tk_chooseDirectory.n \ dialog.n tk_dialog.n \ focusNext.n tk_focusNext.n \ focusNext.n tk_focusPrev.n \ focusNext.n tk_focusFollowsMouse.n \ getOpenFile.n tk_getOpenFile.n \ getOpenFile.n tk_getSaveFile.n \ menubar.n tk_menuBar.n \ menubar.n tk_bindForTraversal.n \ messageBox.n tk_messageBox.n \ optionMenu.n tk_optionMenu.n \ palette.n tk_setPalette.n \ palette.n tk_bisque.n \ popup.n tk_popup.n .include post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if exists(${PKGINSTALL}) ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif test: cd ${WRKSRC}; make test .include Property changes on: head/x11-toolkits/tk84/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.34 \ No newline at end of property +1.35 \ No newline at end of property Index: head/x11-toolkits/tk84/distinfo =================================================================== --- head/x11-toolkits/tk84/distinfo (revision 27977) +++ head/x11-toolkits/tk84/distinfo (revision 27978) @@ -1 +1 @@ -MD5 (tk8.3b1.tar.gz) = 5c39764905e656836ca85af04c68cf23 +MD5 (tk8.3.0.tar.gz) = b98369476607536e8384940036890d5c Property changes on: head/x11-toolkits/tk84/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/x11-toolkits/tk84/files/patch-aa =================================================================== --- head/x11-toolkits/tk84/files/patch-aa (revision 27977) +++ head/x11-toolkits/tk84/files/patch-aa (revision 27978) @@ -1,41 +1,27 @@ ---- configure.orig Wed Nov 3 21:38:44 1999 -+++ configure Sun Nov 21 15:55:12 1999 -@@ -1756,7 +1756,7 @@ +--- configure.orig Thu Feb 10 06:11:02 2000 ++++ configure Mon Apr 24 15:59:27 2000 +@@ -1763,7 +1763,7 @@ LDFLAGS="-Wl,-Bexport" LD_SEARCH_FLAGS="" ;; - NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) + NetBSD-*|FreeBSD-*|OpenBSD-*) # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -1788,14 +1788,19 @@ - echo "$ac_t""yes" 1>&6 - - SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD_LIBS="" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - LDFLAGS="" - LD_SEARCH_FLAGS="" -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' -+ SHLIB_LD="ld -shared -x -soname \$@" -+ else -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHLIB_LD="ld -Bshareable -x" -+ fi - - else - echo "$ac_t""no" 1>&6 -@@ -2266,6 +2271,7 @@ +@@ -1847,6 +1847,7 @@ + # FreeBSD doesn't handle version numbers with dots. + + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' + TCL_LIB_VERSIONS_OK=nodots + ;; + FreeBSD-*) +@@ -2303,6 +2304,7 @@ echo "$ac_t""no" 1>&6 fi +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' Property changes on: head/x11-toolkits/tk84/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/x11-toolkits/tk84/files/patch-ab =================================================================== --- head/x11-toolkits/tk84/files/patch-ab (revision 27977) +++ head/x11-toolkits/tk84/files/patch-ab (revision 27978) @@ -1,131 +1,126 @@ ---- Makefile.in.orig Fri Aug 13 18:06:14 1999 -+++ Makefile.in Sat Sep 4 19:47:43 1999 +--- Makefile.in.orig Thu Feb 10 06:11:01 2000 ++++ Makefile.in Mon Apr 24 16:10:36 2000 @@ -56,7 +56,9 @@ BIN_DIR = $(exec_prefix)/bin # Directory in which to install the include file tk.h: -INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include +INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tk$(VERSION) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix # Top-level directory for manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man @@ -153,7 +155,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. -INSTALL = @srcdir@/install-sh -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 @@ -190,7 +192,7 @@ # Libraries to use when linking. This definition is determined by the # configure script. LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc +WISH_LIBS = -L${PREFIX}/lib -ltcl${SHORT_TK_VER} @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc # The symbol below provides support for dynamic loading and shared # libraries. See configure.in for a description of what it means. -@@ -356,8 +358,14 @@ +@@ -361,8 +363,14 @@ ${TK_LIB_FILE}: ${OBJS} rm -f ${TK_LIB_FILE} @MAKE_LIB@ + ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so $(RANLIB) ${TK_LIB_FILE} +libtk${SHORT_TK_VER}.a: ${OBJS} + rm -f libtk${SHORT_TK_VER}.a + ar cr libtk${SHORT_TK_VER}.a ${OBJS} + $(RANLIB) libtk${SHORT_TK_VER}.a + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -418,7 +426,7 @@ +@@ -424,7 +432,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). -install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish +install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk${SHORT_TK_VER}.a wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -432,12 +440,18 @@ - chmod +x $(UNIX_DIR)/install-sh - chmod +x $(UNIX_DIR)/mkLinks +@@ -442,12 +450,18 @@ + fi + @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/" @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @echo "Installing libtk${SHORT_TK_VER}.a" + @$(INSTALL_DATA) libtk${SHORT_TK_VER}.a $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a + @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk${SHORT_TK_VER}.a) + @chmod 555 $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.a - @echo "Installing wish" + @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)" @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) - @echo "Installing tkConfig.sh" + @echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh + @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION) + @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TK_EXP_FILE)"; \ + echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -451,6 +465,7 @@ +@@ -461,6 +475,7 @@ install-libraries: @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ + $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ do \ if [ ! -d $$i ] ; then \ -@@ -461,11 +476,19 @@ - fi; \ - done; - chmod +x $(UNIX_DIR)/install-sh +@@ -474,10 +489,16 @@ + chmod +x $(UNIX_DIR)/install-sh; \ + fi + @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ -+ @echo "Installing headers" + @for i in $(GENERIC_DIR)/*.h ; \ ++ do \ ++ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ ++ done; ++ @for i in $(UNIX_DIR)/*.h ; \ do \ - echo "Installing $$i"; \ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ done; -+ @for i in $(UNIX_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ -+ done ; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h - for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ + @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; + @for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ - do \ -@@ -530,16 +553,14 @@ - $$i > $(MAN1_INSTALL_DIR)/$$i; \ +@@ -543,7 +564,6 @@ chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; -- $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) + @echo "Cross-linking top-level (.1) docs"; +- @$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) + @echo "Installing C API (.3) docs"; @cd $(SRC_DIR)/doc; for i in *.3; \ do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MAN3_INSTALL_DIR)/$$i; \ +@@ -553,7 +573,6 @@ chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; -- $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) + @echo "Cross-linking top-level (.3) docs"; +- @$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) + @echo "Installing command (.n) docs"; @cd $(SRC_DIR)/doc; for i in *.n; \ do \ - echo "Installing doc/$$i"; \ -@@ -548,7 +569,6 @@ - $$i > $(MANN_INSTALL_DIR)/$$i; \ +@@ -563,7 +582,6 @@ chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; -- $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) + @echo "Cross-linking command (.n) docs"; +- @$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) Makefile: $(UNIX_DIR)/Makefile.in $(SHELL) config.status Property changes on: head/x11-toolkits/tk84/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/x11-toolkits/tk84/pkg-plist =================================================================== --- head/x11-toolkits/tk84/pkg-plist (revision 27977) +++ head/x11-toolkits/tk84/pkg-plist (revision 27978) @@ -1,140 +1,141 @@ bin/wish%%TK_VER%% include/tk%%TK_VER%%/generic/default.h include/tk%%TK_VER%%/generic/ks_names.h include/tk%%TK_VER%%/generic/tk.h include/tk%%TK_VER%%/generic/tk3d.h include/tk%%TK_VER%%/generic/tkButton.h include/tk%%TK_VER%%/generic/tkCanvas.h include/tk%%TK_VER%%/generic/tkColor.h include/tk%%TK_VER%%/generic/tkDecls.h include/tk%%TK_VER%%/generic/tkFileFilter.h include/tk%%TK_VER%%/generic/tkFont.h include/tk%%TK_VER%%/generic/tkInitScript.h include/tk%%TK_VER%%/generic/tkInt.h include/tk%%TK_VER%%/generic/tkIntDecls.h include/tk%%TK_VER%%/generic/tkIntPlatDecls.h include/tk%%TK_VER%%/generic/tkIntXlibDecls.h include/tk%%TK_VER%%/generic/tkMenu.h include/tk%%TK_VER%%/generic/tkMenubutton.h include/tk%%TK_VER%%/generic/tkPlatDecls.h include/tk%%TK_VER%%/generic/tkPort.h include/tk%%TK_VER%%/generic/tkScale.h include/tk%%TK_VER%%/generic/tkScrollbar.h include/tk%%TK_VER%%/generic/tkSelect.h include/tk%%TK_VER%%/generic/tkText.h include/tk%%TK_VER%%/tk.h include/tk%%TK_VER%%/tkDecls.h include/tk%%TK_VER%%/unix/tkUnixDefault.h include/tk%%TK_VER%%/unix/tkUnixInt.h include/tk%%TK_VER%%/unix/tkUnixPort.h lib/libtk%%SHORT_TK_VER%%.a lib/libtk%%SHORT_TK_VER%%.so lib/libtk%%SHORT_TK_VER%%.so.1 lib/libtkstub%%SHORT_TK_VER%%.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R lib/tk%%TK_VER%%/bgerror.tcl lib/tk%%TK_VER%%/button.tcl +lib/tk%%TK_VER%%/choosedir.tcl lib/tk%%TK_VER%%/clrpick.tcl lib/tk%%TK_VER%%/comdlg.tcl lib/tk%%TK_VER%%/console.tcl lib/tk%%TK_VER%%/demos/README lib/tk%%TK_VER%%/demos/arrow.tcl lib/tk%%TK_VER%%/demos/bind.tcl lib/tk%%TK_VER%%/demos/bitmap.tcl lib/tk%%TK_VER%%/demos/browse lib/tk%%TK_VER%%/demos/button.tcl lib/tk%%TK_VER%%/demos/check.tcl lib/tk%%TK_VER%%/demos/clrpick.tcl lib/tk%%TK_VER%%/demos/colors.tcl lib/tk%%TK_VER%%/demos/cscroll.tcl lib/tk%%TK_VER%%/demos/ctext.tcl lib/tk%%TK_VER%%/demos/dialog1.tcl lib/tk%%TK_VER%%/demos/dialog2.tcl lib/tk%%TK_VER%%/demos/entry1.tcl lib/tk%%TK_VER%%/demos/entry2.tcl lib/tk%%TK_VER%%/demos/filebox.tcl lib/tk%%TK_VER%%/demos/floor.tcl lib/tk%%TK_VER%%/demos/form.tcl lib/tk%%TK_VER%%/demos/hello lib/tk%%TK_VER%%/demos/hscale.tcl lib/tk%%TK_VER%%/demos/icon.tcl lib/tk%%TK_VER%%/demos/image1.tcl lib/tk%%TK_VER%%/demos/image2.tcl lib/tk%%TK_VER%%/demos/images/earth.gif lib/tk%%TK_VER%%/demos/images/earthris.gif lib/tk%%TK_VER%%/demos/images/face.bmp lib/tk%%TK_VER%%/demos/images/flagdown.bmp lib/tk%%TK_VER%%/demos/images/flagup.bmp lib/tk%%TK_VER%%/demos/images/gray25.bmp lib/tk%%TK_VER%%/demos/images/letters.bmp lib/tk%%TK_VER%%/demos/images/noletter.bmp lib/tk%%TK_VER%%/demos/images/pattern.bmp lib/tk%%TK_VER%%/demos/images/tcllogo.gif lib/tk%%TK_VER%%/demos/images/teapot.ppm lib/tk%%TK_VER%%/demos/items.tcl lib/tk%%TK_VER%%/demos/ixset lib/tk%%TK_VER%%/demos/label.tcl lib/tk%%TK_VER%%/demos/license.terms lib/tk%%TK_VER%%/demos/menu.tcl lib/tk%%TK_VER%%/demos/menubu.tcl lib/tk%%TK_VER%%/demos/msgbox.tcl lib/tk%%TK_VER%%/demos/plot.tcl lib/tk%%TK_VER%%/demos/puzzle.tcl lib/tk%%TK_VER%%/demos/radio.tcl lib/tk%%TK_VER%%/demos/rmt lib/tk%%TK_VER%%/demos/rolodex lib/tk%%TK_VER%%/demos/ruler.tcl lib/tk%%TK_VER%%/demos/sayings.tcl lib/tk%%TK_VER%%/demos/search.tcl lib/tk%%TK_VER%%/demos/square lib/tk%%TK_VER%%/demos/states.tcl lib/tk%%TK_VER%%/demos/style.tcl lib/tk%%TK_VER%%/demos/tclIndex lib/tk%%TK_VER%%/demos/tcolor lib/tk%%TK_VER%%/demos/text.tcl lib/tk%%TK_VER%%/demos/timer lib/tk%%TK_VER%%/demos/twind.tcl lib/tk%%TK_VER%%/demos/vscale.tcl lib/tk%%TK_VER%%/demos/widget lib/tk%%TK_VER%%/dialog.tcl lib/tk%%TK_VER%%/entry.tcl lib/tk%%TK_VER%%/focus.tcl lib/tk%%TK_VER%%/images/README lib/tk%%TK_VER%%/images/logo.eps lib/tk%%TK_VER%%/images/logo100.gif lib/tk%%TK_VER%%/images/logo64.gif lib/tk%%TK_VER%%/images/logoLarge.gif lib/tk%%TK_VER%%/images/logoMed.gif lib/tk%%TK_VER%%/images/pwrdLogo.eps lib/tk%%TK_VER%%/images/pwrdLogo100.gif lib/tk%%TK_VER%%/images/pwrdLogo150.gif lib/tk%%TK_VER%%/images/pwrdLogo175.gif lib/tk%%TK_VER%%/images/pwrdLogo200.gif lib/tk%%TK_VER%%/images/pwrdLogo75.gif lib/tk%%TK_VER%%/images/tai-ku.gif lib/tk%%TK_VER%%/listbox.tcl lib/tk%%TK_VER%%/menu.tcl lib/tk%%TK_VER%%/msgbox.tcl lib/tk%%TK_VER%%/obsolete.tcl lib/tk%%TK_VER%%/optMenu.tcl lib/tk%%TK_VER%%/palette.tcl lib/tk%%TK_VER%%/prolog.ps lib/tk%%TK_VER%%/safetk.tcl lib/tk%%TK_VER%%/scale.tcl lib/tk%%TK_VER%%/scrlbar.tcl lib/tk%%TK_VER%%/tclIndex lib/tk%%TK_VER%%/tearoff.tcl lib/tk%%TK_VER%%/text.tcl lib/tk%%TK_VER%%/tk.tcl lib/tk%%TK_VER%%/tkAppInit.c lib/tk%%TK_VER%%/tkConfig.sh lib/tk%%TK_VER%%/tkfbox.tcl lib/tk%%TK_VER%%/xmfbox.tcl @dirrm lib/tk%%TK_VER%%/demos/images @dirrm lib/tk%%TK_VER%%/demos @dirrm lib/tk%%TK_VER%%/images @dirrm lib/tk%%TK_VER%% @dirrm include/tk%%TK_VER%%/unix @dirrm include/tk%%TK_VER%%/generic @dirrm include/tk%%TK_VER%% Property changes on: head/x11-toolkits/tk84/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property