From e2161c1c0849ff9d1c53f7baa5afb8580c8eb5c3 Mon Sep 17 00:00:00 2001 From: Paul Traina Date: Fri, 14 Nov 1997 17:51:08 +0000 Subject: Upgrade tkgoodstuff port to 8.0-final --- x11/tkgoodstuff/Makefile | 13 ++--- x11/tkgoodstuff/distinfo | 2 +- x11/tkgoodstuff/files/patch-aa | 128 ++++++++++++++++++++--------------------- x11/tkgoodstuff/pkg-descr | 52 ++++------------- x11/tkgoodstuff/pkg-plist | 75 +++++++++++++++--------- 5 files changed, 129 insertions(+), 141 deletions(-) (limited to 'x11/tkgoodstuff') diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile index f3c568bc38cd..dcc91dfb5bf2 100644 --- a/x11/tkgoodstuff/Makefile +++ b/x11/tkgoodstuff/Makefile @@ -1,25 +1,24 @@ # New ports collection makefile for: tkgoodstuff -# Version required: 4.2b1-8 +# Version required: 8.0-final # Date created: 7 Oct 1996 # Whom: pst # # $Id: Makefile,v 1.7 1997/07/07 06:30:30 pst Exp $ # -DISTNAME= tkgoodstuff4.2 -PKGNAME= tkgoodstuff-4.2b1.8 +DISTNAME= tkgoodstuff8.0-final +PKGNAME= tkgoodstuff-8.0 CATEGORIES= x11 MASTER_SITES= http://www-personal.umich.edu/~markcrim/tkgoodstuff/dists/ MAINTAINER= pst@FreeBSD.org RUN_DEPENDS= fvwm2:${PORTSDIR}/x11/fvwm2 -LIB_DEPENDS= tk42\\.1:${PORTSDIR}/x11/tk42 +LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 -WRKSRC= ${WRKDIR}/tkgoodstuff4.2b1-8 GNU_CONFIGURE= yes -CONFIGURE_ENV= TCLCONFIGSH=${PREFIX}/lib/tcl7.6/tclConfig.sh \ - TKCONFIGSH=${PREFIX}/lib/tk4.2/tkConfig.sh +CONFIGURE_ENV= TCLCONFIGSH=${PREFIX}/lib/tcl8.0/tclConfig.sh \ + TKCONFIGSH=${PREFIX}/lib/tk8.0/tkConfig.sh CONFIGURE_ARGS= --enable-libs STRIP= diff --git a/x11/tkgoodstuff/distinfo b/x11/tkgoodstuff/distinfo index 01d819351b92..6b5b1965c2b7 100644 --- a/x11/tkgoodstuff/distinfo +++ b/x11/tkgoodstuff/distinfo @@ -1 +1 @@ -MD5 (tkgoodstuff4.2.tar.gz) = 3c505f1d8ac566b233f7d27b6eef9692 +MD5 (tkgoodstuff8.0-final.tar.gz) = 1ccbe2c99026be8d66a9436e2ea72fcd diff --git a/x11/tkgoodstuff/files/patch-aa b/x11/tkgoodstuff/files/patch-aa index 051d6fd36471..490013e97064 100644 --- a/x11/tkgoodstuff/files/patch-aa +++ b/x11/tkgoodstuff/files/patch-aa @@ -1,66 +1,62 @@ -*** libs/Makefile.in.orig Sat Nov 23 12:09:43 1996 ---- libs/Makefile.in Sat Jun 21 13:43:32 1997 -*************** -*** 44,50 **** - INSTALL_DATA = @INSTALL_DATA@ - - CC_SWITCHES = ${CFLAGS} -I$(SRCDIR) \ -! -I$(TK_PREFIX)/include -I$(TK_PREFIX)/include/tcl \ - $(XINCLUDES) $(SHLIB_CFLAGS) - - OBJS = tkFvwm.o tixImgXpm.o tkXAccess.o tkNetscape.o clientWin.o \ ---- 44,50 ---- - INSTALL_DATA = @INSTALL_DATA@ - - CC_SWITCHES = ${CFLAGS} -I$(SRCDIR) \ -! -I$(TK_PREFIX)/include/tk4.2 -I$(TK_PREFIX)/include/tcl7.6 \ - $(XINCLUDES) $(SHLIB_CFLAGS) - - OBJS = tkFvwm.o tixImgXpm.o tkXAccess.o tkNetscape.o clientWin.o \ -*************** -*** 58,79 **** - libs: $(SHLIBS) pkgIndex.tcl - - $(TKG_SHLIB): tkg.o tkgButton.o -! ${SHLIB_LD} -o $@ $(LIBS) $(SHLIB_LD_LIBS) tkg.o tkgButton.o - @chmod 0755 $@ - - $(XPM_SHLIB): tixImgXpm.o -! ${SHLIB_LD} -o $@ $(LIBS) $(SHLIB_LD_LIBS) tixImgXpm.o - @chmod 0755 $@ - - $(NETSCAPE_SHLIB): tkNetscape.o clientWin.o -! ${SHLIB_LD} -o $@ $(LIBS) $(SHLIB_LD_LIBS) tkNetscape.o clientWin.o - - $(FVWM_SHLIB): tkFvwm.o -! ${SHLIB_LD} -o $@ $(LIBS) $(SHLIB_LD_LIBS) tkFvwm.o - @chmod 0755 $@ - - $(STEAL_SHLIB): tkXAccess.o -! ${SHLIB_LD} -o $@ $(LIBS) $(SHLIB_LD_LIBS) tkXAccess.o - @chmod 0755 $@ - - tkgwish: $(TKGWISH_NAME) ---- 58,79 ---- - libs: $(SHLIBS) pkgIndex.tcl - - $(TKG_SHLIB): tkg.o tkgButton.o -! ${SHLIB_LD} -o $@ $(SHLIB_LD_LIBS) tkg.o tkgButton.o - @chmod 0755 $@ - - $(XPM_SHLIB): tixImgXpm.o -! ${SHLIB_LD} -o $@ $(SHLIB_LD_LIBS) tixImgXpm.o - @chmod 0755 $@ - - $(NETSCAPE_SHLIB): tkNetscape.o clientWin.o -! ${SHLIB_LD} -o $@ $(SHLIB_LD_LIBS) tkNetscape.o clientWin.o - - $(FVWM_SHLIB): tkFvwm.o -! ${SHLIB_LD} -o $@ $(SHLIB_LD_LIBS) tkFvwm.o - @chmod 0755 $@ - - $(STEAL_SHLIB): tkXAccess.o -! ${SHLIB_LD} -o $@ $(SHLIB_LD_LIBS) tkXAccess.o - @chmod 0755 $@ - - tkgwish: $(TKGWISH_NAME) +--- configure Thu Aug 7 12:49:27 1997 ++++ configure Wed Aug 27 01:18:17 1997 +@@ -540,29 +540,34 @@ + # Find appropriate tclConfig.sh and + # recover information that Tcl computed with its configure script. + +-TCLCONFIGSH="" +-for prefix in $dirlist; do +- if test -f $prefix/lib/tclConfig.sh; then +- TCLCONFIGSH=$prefix/lib/tclConfig.sh +- . $TCLCONFIGSH +- if test `expr \( $TCL_MAJOR_VERSION \< $TCLTK_MAJORNEEDED \) \| \( $TCL_MINOR_VERSION \< $TCLTK_MINORNEEDED \)` = 0 +- then +- break ++if [ -z "$TCLCONFIGSH" ] ; then ++ TCLCONFIGSH="" ++ for prefix in $dirlist; do ++ if test -f $prefix/lib/tclConfig.sh; then ++ TCLCONFIGSH=$prefix/lib/tclConfig.sh ++ . $TCLCONFIGSH ++ if test `expr \( $TCL_MAJOR_VERSION \< $TCLTK_MAJORNEEDED \) \| \( $TCL_MINOR_VERSION \< $TCLTK_MINORNEEDED \)` = 0 ++ then ++ break ++ fi + fi +- fi +-done ++ done ++fi + test -f "$TCLCONFIGSH" || abort "Can't find any tclConfig.sh" ++. $TCLCONFIGSH + if test `expr \( $TCL_MAJOR_VERSION \< $TCLTK_MAJORNEEDED \) \| \( $TCL_MINOR_VERSION \< $TCLTK_MINORNEEDED \)` = 1 + then + abort "Need but can't find tclConfig.sh for Tcl ${TCLTK_MAJORNEEDED}.${TCLTK_MINORNEEDED} or later." + fi + echo "using $TCLCONFIGSH" + +-TKCONFIGSH=${prefix}/lib/tkConfig.sh +-test -f "$TKCONFIGSH" || abort "Can't find any tkConfig.sh" ++if [ -z "$TKCONFIGSH" ] ; then ++ TKCONFIGSH=${prefix}/lib/tkConfig.sh ++ test -f "$TKCONFIGSH" || abort "Can't find any tkConfig.sh" ++fi + . $TKCONFIGSH + if test `expr \( $TK_MAJOR_VERSION \< $TCLTK_MAJORNEEDED \) \| \( $TK_MINOR_VERSION \< $TCLTK_MINORNEEDED \)` = 1 +- then abort "Need but can't find tkConfig.sh for Tk ${TCLTK_MAJORNEEDED}.${TCLTK_MINORNEEDED} or later." ++ then abort "Need but can't find tkConfig.sh for Tk ${TCLTK_MAJORNEEDED}.${TCLTK_MINORNEEDED} or later." + fi + echo "using $TKCONFIGSH" + +--- libs/Makefile.in Wed Aug 6 08:10:43 1997 ++++ libs/Makefile.in Wed Aug 27 01:22:36 1997 +@@ -28,7 +28,8 @@ + SRCDIR = @srcdir@ + + CFLAGS = -O @TCL_DEFS@ @TK_DEFS@ -I$(SRCDIR) \ +- -I$(TK_PREFIX)/include -I$(TK_PREFIX)/include/tcl \ ++ -I$(TCL_PREFIX)/include/tcl8.0 \ ++ -I$(TK_PREFIX)/include/tk8.0 \ + $(XINCLUDES) + + INSTALL = @INSTALL@ diff --git a/x11/tkgoodstuff/pkg-descr b/x11/tkgoodstuff/pkg-descr index 86d82b44a898..55c0d5cefe9a 100644 --- a/x11/tkgoodstuff/pkg-descr +++ b/x11/tkgoodstuff/pkg-descr @@ -1,45 +1,15 @@ -README for TkGoodStuff version 4.1, 2 Oct, 1996 +README for TkGoodStuff version 8.0-final, 1 Oct, 1997 -TkGoodStuff for the X Window System is an alarm clock, biff, modem -dialer/network status indicator, note-taker, web-browser launch tool, -system load monitor, application/utility menu, Win95-like task bar, -and whatever else you want. +TkGoodStuff for the X Window System is an alarm clock, biff, file +watcher, modem dialer/network status indicator, note-taker, +web-browser launch tool, system load monitor, application/utility +menu, Win95-like task bar, and whatever else you want. TkGoodStuff produces a button bar. It is easily configured and modified with the on-line GUI preferences manager (*no* rc-file -hacking). The main envisioned use is as an always-on-top destop -utility to serve the user's common needs for indicators and buttons. -There is a "screen-edge" mode, in which the bar occupies an edge of -the screen, can be dragged to other edges, and can auto-minimize -(shrink to a line at the screen-edge). For users of the fvwm window -manager (though tkgoodstuff works without fvwm), tkgoodstuff serves -all the functions of the Windows95 taskbar, and then some. - -You can configure buttons to launch applications (with lots of -configurable options), you can "swallow" any application's window into -your tkgoodstuff panel, and several "clients" are included (you can -also write your own with a tcl/tk script---an example is provided): - - -- analog/digital alarm clock - -- biff (check/scan/read new mail; handles multiple folders - and alert levels, MH folders, IMAP mailboxes) - -- PPP (or SLIP or TERM) net link GUI dialer and status - indicator (with sophisticated redialing and login - scripting). - -- FVWM support, including Win95-like bar of buttons for open - and iconified windows, as well as a pager. - -- launcher for WWW browsers (lets you visit the URL in the - current X selection with one click) - -- note-taker (tool for quickly jotting down and organizing - scraps of information) - -- calendar/alarm support (for Ical-generated calendar files) - -- system load monitor (graphical and/or digital display) - -- Menu button, for launching applications and running - utilities (the menu is GUI-configured). - -- "webster" net dictionary client - -- calculator with scrollable history and hex/dec/oct modes - (perpetually alpha, until someone adopts it as a project!) - -- POP/IMAP mail fetch scheduler. - -- file watcher: look for changes in log files - -- launcher for tkman (operates with X selection like WWW - client) +hacking). There is a "screen-edge" mode, in which the bar occupies an +edge of the screen, can be dragged to other edges, and can +auto-minimize (shrink to a line at the screen-edge). For users of the +fvwm window manager (though tkgoodstuff works without fvwm), +tkgoodstuff serves all the functions of the Windows95 taskbar, and +then some. diff --git a/x11/tkgoodstuff/pkg-plist b/x11/tkgoodstuff/pkg-plist index 3a2b9c18b1e4..380493536abf 100644 --- a/x11/tkgoodstuff/pkg-plist +++ b/x11/tkgoodstuff/pkg-plist @@ -1,8 +1,11 @@ bin/Dialer bin/tkgoodstuff +bin/tkgwish8.0 +lib/tkgoodstuff/Dialer lib/tkgoodstuff/tcl/Alarm.tcl lib/tkgoodstuff/tcl/Analog.tcl lib/tkgoodstuff/tcl/Biff.tcl +lib/tkgoodstuff/tcl/BiffIMAP.tcl lib/tkgoodstuff/tcl/BiffMH.tcl lib/tkgoodstuff/tcl/Biffatime.tcl lib/tkgoodstuff/tcl/Bifffilesize.tcl @@ -20,15 +23,19 @@ lib/tkgoodstuff/tcl/Ical-fetch.tcl lib/tkgoodstuff/tcl/Ical.tcl lib/tkgoodstuff/tcl/Jots.tcl lib/tkgoodstuff/tcl/Load.tcl +lib/tkgoodstuff/tcl/Markets.tcl lib/tkgoodstuff/tcl/Menu.tcl lib/tkgoodstuff/tcl/Net.tcl +lib/tkgoodstuff/tcl/Outside.tcl lib/tkgoodstuff/tcl/Pager.tcl lib/tkgoodstuff/tcl/PopImap.tcl lib/tkgoodstuff/tcl/TkMan.tcl lib/tkgoodstuff/tcl/WWW.tcl +lib/tkgoodstuff/tcl/Watch.tcl lib/tkgoodstuff/tcl/WatchDog.tcl lib/tkgoodstuff/tcl/Webster.tcl lib/tkgoodstuff/tcl/WindowList.tcl +lib/tkgoodstuff/tcl/args.tcl lib/tkgoodstuff/tcl/async.tcl lib/tkgoodstuff/tcl/balloon.tcl lib/tkgoodstuff/tcl/configcommands.tcl @@ -36,6 +43,7 @@ lib/tkgoodstuff/tcl/defaults.tcl lib/tkgoodstuff/tcl/dialogs.tcl lib/tkgoodstuff/tcl/elements.tcl lib/tkgoodstuff/tcl/english.tcl +lib/tkgoodstuff/tcl/expect.tcl lib/tkgoodstuff/tcl/francais.tcl lib/tkgoodstuff/tcl/hlist.tcl lib/tkgoodstuff/tcl/inits.tcl @@ -45,26 +53,27 @@ lib/tkgoodstuff/tcl/mainwin.tcl lib/tkgoodstuff/tcl/misc.tcl lib/tkgoodstuff/tcl/panelgeo.tcl lib/tkgoodstuff/tcl/popup.tcl +lib/tkgoodstuff/tcl/prefs-biff.tcl +lib/tkgoodstuff/tcl/prefs-browsers.tcl lib/tkgoodstuff/tcl/prefs-config.tcl lib/tkgoodstuff/tcl/prefs-menu.tcl +lib/tkgoodstuff/tcl/prefs-watch.tcl +lib/tkgoodstuff/tcl/prefs-windowlist.tcl lib/tkgoodstuff/tcl/prefs.tcl lib/tkgoodstuff/tcl/screenedge.tcl +lib/tkgoodstuff/tcl/sexpr.tcl lib/tkgoodstuff/tcl/startup.tcl lib/tkgoodstuff/tcl/swallow.tcl +lib/tkgoodstuff/tcl/tabnotebook.tcl lib/tkgoodstuff/tcl/tclIndex lib/tkgoodstuff/tcl/tkSteal.tcl lib/tkgoodstuff/tcl/tkgbutton.tcl lib/tkgoodstuff/tcl/tkgoodstuff.tcl lib/tkgoodstuff/tcl/utils.tcl -lib/tkgoodstuff/tcl/BiffIMAP.tcl -lib/tkgoodstuff/tcl/args.tcl -lib/tkgoodstuff/tcl/expect.tcl -lib/tkgoodstuff/tcl/prefs-biff.tcl -lib/tkgoodstuff/tcl/prefs-windowlist.tcl -lib/tkgoodstuff/tcl/sexpr.tcl -lib/tkgoodstuff/tcl/tabnotebook.tcl +lib/tkgoodstuff/tcl/wlpatch lib/tkgoodstuff/doc/CHANGES lib/tkgoodstuff/doc/Example +lib/tkgoodstuff/doc/FAQ lib/tkgoodstuff/doc/NOTICE lib/tkgoodstuff/doc/biff.html lib/tkgoodstuff/doc/chooser.html @@ -73,28 +82,41 @@ lib/tkgoodstuff/doc/dialer.html lib/tkgoodstuff/doc/fvwm.html lib/tkgoodstuff/doc/ical.html lib/tkgoodstuff/doc/icons.html +lib/tkgoodstuff/doc/index-orig.html lib/tkgoodstuff/doc/index.html lib/tkgoodstuff/doc/install.html lib/tkgoodstuff/doc/jots.html lib/tkgoodstuff/doc/load.html +lib/tkgoodstuff/doc/mailinglists.html lib/tkgoodstuff/doc/menu.html lib/tkgoodstuff/doc/net.html lib/tkgoodstuff/doc/pager.html lib/tkgoodstuff/doc/popimap.html lib/tkgoodstuff/doc/preferences.html lib/tkgoodstuff/doc/running.html +lib/tkgoodstuff/doc/screenshots.html +lib/tkgoodstuff/doc/shots.html lib/tkgoodstuff/doc/tkgoodstuff.html lib/tkgoodstuff/doc/tkman.html -lib/tkgoodstuff/doc/watchdog.html +lib/tkgoodstuff/doc/toc.html +lib/tkgoodstuff/doc/watch.html lib/tkgoodstuff/doc/webster.html lib/tkgoodstuff/doc/windowlist.html lib/tkgoodstuff/doc/writingclients.html lib/tkgoodstuff/doc/www.html -lib/tkgoodstuff/doc/FAQ +lib/tkgoodstuff/icons/biffgreen-sm.xpm +lib/tkgoodstuff/icons/biffgreen.xpm lib/tkgoodstuff/icons/biffnew-sm.xpm lib/tkgoodstuff/icons/biffnew.xpm lib/tkgoodstuff/icons/biffno-sm.xpm lib/tkgoodstuff/icons/biffno.xpm +lib/tkgoodstuff/icons/biffred-sm.xpm +lib/tkgoodstuff/icons/biffred.xpm +lib/tkgoodstuff/icons/biffwhite-sm.xpm +lib/tkgoodstuff/icons/biffwhite.xpm +lib/tkgoodstuff/icons/biffyellow-sm.xpm +lib/tkgoodstuff/icons/biffyellow.xpm +lib/tkgoodstuff/icons/blue_marble.xpm lib/tkgoodstuff/icons/browser.xpm lib/tkgoodstuff/icons/bullet.xpm lib/tkgoodstuff/icons/button.xpm @@ -102,9 +124,11 @@ lib/tkgoodstuff/icons/calc-sm.xpm lib/tkgoodstuff/icons/calc.xpm lib/tkgoodstuff/icons/client.xpm lib/tkgoodstuff/icons/copyright.info +lib/tkgoodstuff/icons/dimple.xpm lib/tkgoodstuff/icons/editor.xpm lib/tkgoodstuff/icons/error lib/tkgoodstuff/icons/exec.xpm +lib/tkgoodstuff/icons/file lib/tkgoodstuff/icons/fileempty.xpm lib/tkgoodstuff/icons/filefull.xpm lib/tkgoodstuff/icons/filegone.xpm @@ -117,6 +141,7 @@ lib/tkgoodstuff/icons/jots-sm.xpm lib/tkgoodstuff/icons/jots.xpm lib/tkgoodstuff/icons/labelbox.xpm lib/tkgoodstuff/icons/letters +lib/tkgoodstuff/icons/lightblue_marble.xpm lib/tkgoodstuff/icons/mailer.xpm lib/tkgoodstuff/icons/manreader.xpm lib/tkgoodstuff/icons/menu.xpm @@ -137,12 +162,26 @@ lib/tkgoodstuff/icons/run.xpm lib/tkgoodstuff/icons/separator.xpm lib/tkgoodstuff/icons/shell.xpm lib/tkgoodstuff/icons/stack.xpm +lib/tkgoodstuff/icons/swallow.xpm lib/tkgoodstuff/icons/tcl.xpm lib/tkgoodstuff/icons/telnet-sm.xpm lib/tkgoodstuff/icons/telnet.xpm +lib/tkgoodstuff/icons/tk.xpm +lib/tkgoodstuff/icons/tkgmenu-sm.xpm +lib/tkgoodstuff/icons/tkgmenu.xpm lib/tkgoodstuff/icons/tkman-sm.xpm lib/tkgoodstuff/icons/tkman.xpm lib/tkgoodstuff/icons/warning +lib/tkgoodstuff/icons/watchgreen-sm.xpm +lib/tkgoodstuff/icons/watchgreen.xpm +lib/tkgoodstuff/icons/watchred-sm.xpm +lib/tkgoodstuff/icons/watchred.xpm +lib/tkgoodstuff/icons/watchunchanged-sm.xpm +lib/tkgoodstuff/icons/watchunchanged.xpm +lib/tkgoodstuff/icons/watchwhite-sm.xpm +lib/tkgoodstuff/icons/watchwhite.xpm +lib/tkgoodstuff/icons/watchyellow-sm.xpm +lib/tkgoodstuff/icons/watchyellow.xpm lib/tkgoodstuff/icons/weather-sm.xpm lib/tkgoodstuff/icons/weather.xpm lib/tkgoodstuff/icons/webster-sm.xpm @@ -152,29 +191,13 @@ lib/tkgoodstuff/icons/www-sm.xpm lib/tkgoodstuff/icons/www.xpm lib/tkgoodstuff/icons/xlogo-sm.xpm lib/tkgoodstuff/icons/xlogo.xpm -lib/tkgoodstuff/icons/biffgreen-sm.xpm -lib/tkgoodstuff/icons/biffgreen.xpm -lib/tkgoodstuff/icons/biffred-sm.xpm -lib/tkgoodstuff/icons/biffred.xpm -lib/tkgoodstuff/icons/biffwhite-sm.xpm -lib/tkgoodstuff/icons/biffwhite.xpm -lib/tkgoodstuff/icons/biffyellow-sm.xpm -lib/tkgoodstuff/icons/biffyellow.xpm -lib/tkgoodstuff/icons/swallow.xpm -lib/tkgoodstuff/icons/tk.xpm lib/tkgoodstuff/sample-rc/.tkgoodstuffrc lib/tkgoodstuff/sample-rc/home lib/tkgoodstuff/sample-rc/minimal lib/tkgoodstuff/sample-rc/stacks lib/tkgoodstuff/sample-rc/win95 +lib/tkgoodstuff/tcl/tclIndex lib/tkgoodstuff/tkgoodstuff -lib/tkgoodstuff/Dialer -lib/tkgoodstuff/libtkg42.so -lib/tkgoodstuff/libpixmap42.so -lib/tkgoodstuff/libtkNetscape42.so -lib/tkgoodstuff/libtkfvwm42.so -lib/tkgoodstuff/libtkSteal42.so -lib/tkgoodstuff/pkgIndex.tcl @dirrm lib/tkgoodstuff/tcl @dirrm lib/tkgoodstuff/sample-rc @dirrm lib/tkgoodstuff/icons -- cgit v1.2.3