diff options
author | dinoex <dinoex@FreeBSD.org> | 2002-03-07 15:52:39 +0800 |
---|---|---|
committer | dinoex <dinoex@FreeBSD.org> | 2002-03-07 15:52:39 +0800 |
commit | 2ed2739b3d9549a71a497322b9ac128c5539e895 (patch) | |
tree | de9c561ec2e3baa1a33813a66f588c38e0a94e48 /x11-toolkits | |
parent | 00e784616216447f9b871dfa3ae515b8e56ca762 (diff) | |
download | freebsd-ports-gnome-2ed2739b3d9549a71a497322b9ac128c5539e895.tar.gz freebsd-ports-gnome-2ed2739b3d9549a71a497322b9ac128c5539e895.tar.zst freebsd-ports-gnome-2ed2739b3d9549a71a497322b9ac128c5539e895.zip |
Update to 8.4a4
- DINSTANME changed
- more manpages
- new demos
- lib/tk%%TK_VER%%/msgs/
- new modules
- fix FreeBSD build
- reduce Makefile patch
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/tk84/Makefile | 25 | ||||
-rw-r--r-- | x11-toolkits/tk84/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 73 | ||||
-rw-r--r-- | x11-toolkits/tk84/files/patch-ab | 9 | ||||
-rw-r--r-- | x11-toolkits/tk84/pkg-plist | 15 |
5 files changed, 51 insertions, 73 deletions
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 654fed703655..e35efd9ead18 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -6,11 +6,11 @@ # PORTNAME= tk -PORTVERSION= 8.4a3 +PORTVERSION= 8.4a4 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl -DISTNAME= ${PORTNAME}${PORTVERSION} +DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= dinoex@FreeBSD.org @@ -54,11 +54,11 @@ MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \ chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \ cursors.n destroy.n dialog.n entry.n event.n focus.n focusNext.n \ font.n frame.n getOpenFile.n grab.n grid.n keysyms.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 spinbox.n text.n tk.n tkerror.n \ - tkvars.n tkwait.n toplevel.n winfo.n wm.n + labelframe.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 panedwindow.n palette.n photo.n place.n popup.n radiobutton.n \ + raise.n scale.n scrollbar.n selection.n send.n spinbox.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 \ @@ -156,7 +156,9 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ FontId.3 Tk_PostscriptFontName.3 \ FreeXId.3 Tk_FreeXId.3 \ GeomReq.3 Tk_GeometryRequest.3 \ + GeomReq.3 Tk_SetMinimumRequestSize.3 \ GeomReq.3 Tk_SetInternalBorder.3 \ + GeomReq.3 Tk_SetInternalBorderEx.3 \ GetAnchor.3 Tk_GetAnchorFromObj.3 \ GetAnchor.3 Tk_GetAnchor.3 \ GetAnchor.3 Tk_NameOfAnchor.3 \ @@ -270,7 +272,6 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ SetOptions.3 Tk_GetOptionValue.3 \ SetOptions.3 Tk_GetOptionInfo.3 \ SetOptions.3 Tk_FreeConfigOptions.3 \ - SetOptions.3 Tk_Offset.3 \ SetVisual.3 Tk_SetWindowVisual.3 \ StrictMotif.3 Tk_StrictMotif.3 \ TextLayout.3 Tk_ComputeTextLayout.3 \ @@ -302,7 +303,12 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ WindowId.3 Tk_IsTopLevel.3 \ WindowId.3 Tk_ReqWidth.3 \ WindowId.3 Tk_ReqHeight.3 \ - WindowId.3 Tk_InternalBorderWidth.3 \ + WindowId.3 Tk_MinReqWidth.3 \ + WindowId.3 Tk_MinReqHeight.3 \ + WindowId.3 Tk_InternalBorderLeft.3 \ + WindowId.3 Tk_InternalBorderRight.3 \ + WindowId.3 Tk_InternalBorderTop.3 \ + WindowId.3 Tk_InternalBorderBottom.3 \ WindowId.3 Tk_Visual.3 \ WindowId.3 Tk_Depth.3 \ WindowId.3 Tk_Colormap.3 \ @@ -329,7 +335,6 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ .include <bsd.port.pre.mk> post-install: - @${RMDIR} ${PREFIX}/lib/tk${TK_VER}/msgs .if exists(${PKGINSTALL}) ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo index a9ca3eb6d84b..5e69b56ba186 100644 --- a/x11-toolkits/tk84/distinfo +++ b/x11-toolkits/tk84/distinfo @@ -1 +1 @@ -MD5 (tk8.4a3.tar.gz) = 6a87be59ec339619b037225f9371acbe +MD5 (tk8.4a4-src.tar.gz) = de6be9be4a6c169d526ca8f8632b44de diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa index eae1bd508dae..691d92b0a599 100644 --- a/x11-toolkits/tk84/files/patch-aa +++ b/x11-toolkits/tk84/files/patch-aa @@ -1,63 +1,30 @@ ---- configure.orig Tue Aug 7 05:12:23 2001 -+++ configure Tue Nov 13 08:20:01 2001 -@@ -1513,7 +1513,7 @@ - EXTRA_CFLAGS="" - TCL_EXPORT_FILE_SUFFIX="" - UNSHARED_LIB_SUFFIX="" -- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' -+ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` - ECHO_VERSION='`echo ${VERSION}`' - TCL_LIB_VERSIONS_OK=ok - CFLAGS_DEBUG=-g -@@ -2039,18 +2039,23 @@ - # 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.0' - TCL_LIB_VERSIONS_OK=nodots - ;; +--- configure.orig Thu Mar 7 07:34:52 2002 ++++ configure Thu Mar 7 07:35:03 2002 +@@ -2482,22 +2482,23 @@ FreeBSD-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -+ SHLIB_LD="ld -shared -x -soname \$@" -+ SHLIB_LD_LIBS='${LIBS}' ++ TCL_SHLIB_LD_EXTRAS="-soname \$@" ++ SHLIB_LD="ld -shared -x" + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="-export-dynamic" + LDFLAGS="" LD_SEARCH_FLAGS="" -+ # 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 - ;; - NEXTSTEP-*) - SHLIB_CFLAGS="" -@@ -2538,6 +2543,7 @@ - echo "$ac_t""no" 1>&6 - fi - -+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} - - LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - -@@ -4270,6 +4276,7 @@ - else - eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" - fi -+ TK_LIB_FLAG="-ltk${TCL_TRIM_DOTS}\${TK_DBGX}" - TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" - TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" - TK_BUILD_EXP_FILE="" -@@ -4301,7 +4308,7 @@ - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}" - else -- eval TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}" -+ eval TK_STUB_LIB_FLAG="-ltkstub${TCL_TRIM_DOTS}\${TK_DBGX}" - fi - - TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}" + if test "${TCL_THREADS}" = "1" ; then + EXTRA_CFLAGS="-pthread" + LDFLAGS="$LDFLAGS -pthread" + fi + case $system in +- FreeBSD-3.*) ++ FreeBSD-*) + # FreeBSD-3 doesn't handle version numbers with dots. + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1' + TCL_LIB_VERSIONS_OK=nodots + ;; + esac diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab index a17f49ae71a6..9c04ebf4a133 100644 --- a/x11-toolkits/tk84/files/patch-ab +++ b/x11-toolkits/tk84/files/patch-ab @@ -20,15 +20,6 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -203,7 +205,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. @@ -354,6 +356,8 @@ default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \ tkPort.h tkScrollbar.h tkText.h diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist index 15dce59e771b..e224d9626237 100644 --- a/x11-toolkits/tk84/pkg-plist +++ b/x11-toolkits/tk84/pkg-plist @@ -54,6 +54,7 @@ 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/entry3.tcl lib/tk%%TK_VER%%/demos/filebox.tcl lib/tk%%TK_VER%%/demos/floor.tcl lib/tk%%TK_VER%%/demos/form.tcl @@ -76,10 +77,13 @@ 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/labelframe.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/paned1.tcl +lib/tk%%TK_VER%%/demos/paned2.tcl lib/tk%%TK_VER%%/demos/plot.tcl lib/tk%%TK_VER%%/demos/puzzle.tcl lib/tk%%TK_VER%%/demos/radio.tcl @@ -88,6 +92,7 @@ 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/spin.tcl lib/tk%%TK_VER%%/demos/square lib/tk%%TK_VER%%/demos/states.tcl lib/tk%%TK_VER%%/demos/style.tcl @@ -114,12 +119,21 @@ 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%%/msgs/cs.msg +lib/tk%%TK_VER%%/msgs/de.msg +lib/tk%%TK_VER%%/msgs/el.msg +lib/tk%%TK_VER%%/msgs/en.msg +lib/tk%%TK_VER%%/msgs/es.msg +lib/tk%%TK_VER%%/msgs/fr.msg +lib/tk%%TK_VER%%/msgs/it.msg +lib/tk%%TK_VER%%/msgs/nl.msg 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%%/panedwindow.tcl lib/tk%%TK_VER%%/prolog.ps lib/tk%%TK_VER%%/safetk.tcl lib/tk%%TK_VER%%/scale.tcl @@ -137,6 +151,7 @@ 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%%/msgs @dirrm lib/tk%%TK_VER%% @dirrm include/tk%%TK_VER%%/unix @dirrm include/tk%%TK_VER%%/generic |