From 470be3178bc24052308770465fd09d3efb2750ec Mon Sep 17 00:00:00 2001 From: alek Date: Mon, 18 Apr 2005 21:59:51 +0000 Subject: [PATCH] - Update to 0.95.4 - Patch sources so @(un)exec is no longer needed Mostly from Marc Bruenink (MAINTAINER) --- net/coccinella/Makefile | 18 ++-- net/coccinella/distinfo | 8 +- net/coccinella/patches/patch-Coccinella_tcl | 29 +++++++ net/coccinella/patches/patch-lib_Init_tcl | 12 +++ net/coccinella/pkg/PLIST | 94 ++++++++++++++------- 5 files changed, 117 insertions(+), 44 deletions(-) create mode 100644 net/coccinella/patches/patch-Coccinella_tcl create mode 100644 net/coccinella/patches/patch-lib_Init_tcl diff --git a/net/coccinella/Makefile b/net/coccinella/Makefile index 3d50956ae25..59f82b88c17 100644 --- a/net/coccinella/Makefile +++ b/net/coccinella/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2004/12/07 13:21:43 alek Exp $ +# $OpenBSD: Makefile,v 1.2 2005/04/18 21:59:51 alek Exp $ COMMENT= "Jabber client with whiteboard communication" -DISTNAME= Coccinella-0.95.1Src +DISTNAME= Coccinella-0.95.4Src PKGNAME= ${DISTNAME:S/Src$//:L} CATEGORIES= net @@ -26,10 +26,8 @@ NO_REGRESS= Yes PKG_ARCH= * post-patch: - @perl -pi -e 's|exec wish|exec wish8.4|g'\ - ${WRKSRC}/Coccinella.tcl - @perl -pi -e 's|parray chatstate xevent,\*||' \ - ${WRKSRC}/jabber/Chat.tcl + @perl -pi -e 's,!!COCCINELLALIB!!,${LOCALBASE}/lib/coccinella,'\ + ${WRKSRC}/Coccinella.tcl ${WRKSRC}/lib/Init.tcl do-install: ${INSTALL_SCRIPT_DIR} ${PREFIX}/lib/coccinella @@ -37,7 +35,9 @@ do-install: tar xf - -C ${PREFIX}/lib/coccinella/ ${INSTALL_SCRIPT} ${WRKSRC}/Coccinella.tcl ${PREFIX}/lib/coccinella/ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/coccinella - @cd ${WRKSRC} && ${INSTALL_DATA} README README-jabber README-smileys \ - ${PREFIX}/share/doc/coccinella/ - + @cd ${WRKSRC} && ${INSTALL_DATA} README.txt READMEs/README-jabber \ + READMEs/README-smileys msgs/README_encodings \ + sounds/README-sounds \ + ${PREFIX}/share/doc/coccinella/ + .include diff --git a/net/coccinella/distinfo b/net/coccinella/distinfo index 43211a01a90..cc7d9f31b3d 100644 --- a/net/coccinella/distinfo +++ b/net/coccinella/distinfo @@ -1,4 +1,4 @@ -MD5 (Coccinella-0.95.1Src.tar.gz) = ce09253332f64851b377be8f75c53b44 -RMD160 (Coccinella-0.95.1Src.tar.gz) = f9b1ac5d331f267bae14b82fb0f6b4bd2106dc54 -SHA1 (Coccinella-0.95.1Src.tar.gz) = 23951f66b6d3d6bea5e6e53c9e8081771fcbecd0 -SIZE (Coccinella-0.95.1Src.tar.gz) = 3967322 +MD5 (Coccinella-0.95.4Src.tar.gz) = 3c202c59f7eec82cc11beafcc57efa28 +RMD160 (Coccinella-0.95.4Src.tar.gz) = 1a8f50fff825d844236087026eece5bdaba1eb60 +SHA1 (Coccinella-0.95.4Src.tar.gz) = 8b5387d24798e924417a3430f892fde04a80d17d +SIZE (Coccinella-0.95.4Src.tar.gz) = 4006282 diff --git a/net/coccinella/patches/patch-Coccinella_tcl b/net/coccinella/patches/patch-Coccinella_tcl new file mode 100644 index 00000000000..d7acc661f03 --- /dev/null +++ b/net/coccinella/patches/patch-Coccinella_tcl @@ -0,0 +1,29 @@ +$OpenBSD: patch-Coccinella_tcl,v 1.1 2005/04/18 21:59:51 alek Exp $ +--- Coccinella.tcl.orig Wed Jan 26 08:58:29 2005 ++++ Coccinella.tcl Thu Apr 7 22:47:56 2005 +@@ -1,6 +1,6 @@ + #!/bin/sh + # the next line restarts using wish \ +- exec wish "$0" -visual best "$@" ++ exec wish8.4 "$0" -visual best "$@" + + # Coccinella.tcl --- + # +@@ -131,7 +131,7 @@ if {[string equal $this(platform) "unix" + } else { + set thisScript [file normalize [info script]] + } +-set thisPath [file normalize [file dirname $thisScript]] ++set thisPath "!!COCCINELLALIB!!" + if {[info exists ::env(HOME)]} { + cd $::env(HOME) + } else { +@@ -159,6 +159,8 @@ if {![catch {package require Itcl 3.2}]} + } + set prefs(appName) "Coccinella" + set prefs(theAppName) "The Coccinella" ++ ++lappend auto_path !!COCCINELLALIB!! + + # Read our theme prefs file, if any, containing the theme name and locale. + package require Theme diff --git a/net/coccinella/patches/patch-lib_Init_tcl b/net/coccinella/patches/patch-lib_Init_tcl new file mode 100644 index 00000000000..e733d03a99b --- /dev/null +++ b/net/coccinella/patches/patch-lib_Init_tcl @@ -0,0 +1,12 @@ +$OpenBSD: patch-lib_Init_tcl,v 1.1 2005/04/18 21:59:51 alek Exp $ +--- lib/Init.tcl.orig Wed Jan 26 09:00:26 2005 ++++ lib/Init.tcl Thu Apr 7 22:47:26 2005 +@@ -49,7 +49,7 @@ proc ::Init::SetThis {thisScript} { + + # Collect paths in 'this' array. + set this(script) $thisScript +- set this(path) [file dirname $thisScript] ++ set this(path) "!!COCCINELLALIB!!" + set this(appPath) $this(path) + if {[info exists starkit::topdir]} { + set this(appPath) [file dirname [info nameofexecutable]] diff --git a/net/coccinella/pkg/PLIST b/net/coccinella/pkg/PLIST index 5d0e5d5a843..db81884c8ec 100644 --- a/net/coccinella/pkg/PLIST +++ b/net/coccinella/pkg/PLIST @@ -1,6 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2004/12/07 13:21:44 alek Exp $ +@comment $OpenBSD: PLIST,v 1.2 2005/04/18 21:59:51 alek Exp $ lib/coccinella/ lib/coccinella/Coccinella.tcl +@mode 755 +@sample bin/coccinella +@mode lib/coccinella/TclXML/ @comment lib/coccinella/TclXML/CHANGES lib/coccinella/TclXML/pkgIndex.tcl @@ -18,13 +21,17 @@ lib/coccinella/components/AutoUpdate.tcl lib/coccinella/components/BuddyPounce.tcl lib/coccinella/components/CarbonNotification.tcl lib/coccinella/components/ComponentExample.tcl +lib/coccinella/components/GMeeting.tcl lib/coccinella/components/ICQ.tcl lib/coccinella/components/ImageMagic.tcl +lib/coccinella/components/Notifier.tcl lib/coccinella/components/ParseURI.tcl lib/coccinella/components/SlideShow.tcl lib/coccinella/components/Sounds.tcl lib/coccinella/components/Speech.tcl +lib/coccinella/components/Tile.tcl lib/coccinella/components/URIRegistry.tcl +lib/coccinella/components/VoIP.tcl lib/coccinella/components/cmpntIndex.tcl lib/coccinella/components/taskbar/ lib/coccinella/components/taskbar/Taskbar.tcl @@ -35,6 +42,7 @@ lib/coccinella/contrib/ lib/coccinella/contrib/MSSpeech.tcl lib/coccinella/contrib/ProgressWindow.tcl @comment lib/coccinella/contrib/README +lib/coccinella/contrib/Test2Tree.tcl lib/coccinella/contrib/TestTree.tcl lib/coccinella/contrib/TkInteractorPackage.tcl lib/coccinella/contrib/alertbox.tcl @@ -57,8 +65,9 @@ lib/coccinella/contrib/hooks.tcl lib/coccinella/contrib/httpex.tcl lib/coccinella/contrib/mactabnotebook.tcl lib/coccinella/contrib/md5x.tcl +lib/coccinella/contrib/mnotebook.tcl lib/coccinella/contrib/moviecontroller.tcl -lib/coccinella/contrib/notebook.tcl +lib/coccinella/contrib/notebox.tcl lib/coccinella/contrib/pane.tcl lib/coccinella/contrib/pipes.tcl lib/coccinella/contrib/pkgIndex.tcl @@ -68,19 +77,24 @@ lib/coccinella/contrib/sha1pure.tcl lib/coccinella/contrib/socks5.tcl lib/coccinella/contrib/svg2can.tcl lib/coccinella/contrib/svgwb2can.tcl -lib/coccinella/contrib/tablelist3.0/ -lib/coccinella/contrib/tablelist3.0/CHANGES.txt -lib/coccinella/contrib/tablelist3.0/COPYRIGHT.txt -lib/coccinella/contrib/tablelist3.0/README.txt -lib/coccinella/contrib/tablelist3.0/pkgIndex.tcl -lib/coccinella/contrib/tablelist3.0/scripts/ -lib/coccinella/contrib/tablelist3.0/scripts/mwutil.tcl -lib/coccinella/contrib/tablelist3.0/scripts/repair.tcl -lib/coccinella/contrib/tablelist3.0/scripts/tablelistEditcell.tcl -lib/coccinella/contrib/tablelist3.0/scripts/tablelistSortByColumn.tcl -lib/coccinella/contrib/tablelist3.0/scripts/tablelistWidget.tcl -lib/coccinella/contrib/tablelist3.0/scripts/tclIndex -lib/coccinella/contrib/tablelist3.0/tablelist.tcl +lib/coccinella/contrib/tablelist3.5/ +@comment lib/coccinella/contrib/tablelist3.5/CHANGES.txt +@comment lib/coccinella/contrib/tablelist3.5/COPYRIGHT.txt +@comment lib/coccinella/contrib/tablelist3.5/README.txt +lib/coccinella/contrib/tablelist3.5/pkgIndex.tcl +lib/coccinella/contrib/tablelist3.5/scripts/ +lib/coccinella/contrib/tablelist3.5/scripts/mwutil.tcl +lib/coccinella/contrib/tablelist3.5/scripts/repair.tcl +lib/coccinella/contrib/tablelist3.5/scripts/tablelistBind.tcl +lib/coccinella/contrib/tablelist3.5/scripts/tablelistConfig.tcl +lib/coccinella/contrib/tablelist3.5/scripts/tablelistEdit.tcl +lib/coccinella/contrib/tablelist3.5/scripts/tablelistMove.tcl +lib/coccinella/contrib/tablelist3.5/scripts/tablelistSort.tcl +lib/coccinella/contrib/tablelist3.5/scripts/tablelistUtil.tcl +lib/coccinella/contrib/tablelist3.5/scripts/tablelistWidget.tcl +lib/coccinella/contrib/tablelist3.5/scripts/tclIndex +lib/coccinella/contrib/tablelist3.5/tablelist.tcl +lib/coccinella/contrib/timing.tcl lib/coccinella/contrib/tinyfileutils.tcl lib/coccinella/contrib/tinyhttpd.tcl lib/coccinella/contrib/tree.tcl @@ -99,8 +113,13 @@ lib/coccinella/docs/Welcome_en.can lib/coccinella/docs/Welcome_nl.can lib/coccinella/docs/Welcome_sv.can lib/coccinella/httpd/ -lib/coccinella/httpd/macfoldericon.gif -lib/coccinella/httpd/textfileicon.gif +lib/coccinella/httpd/404.html +lib/coccinella/httpd/images/ +lib/coccinella/httpd/images/download.gif +lib/coccinella/httpd/images/file.gif +lib/coccinella/httpd/images/folder.gif +lib/coccinella/httpd/images/up.gif +lib/coccinella/httpd/std.css lib/coccinella/iconsets/ lib/coccinella/iconsets/emoticons/ lib/coccinella/iconsets/emoticons/AIM.jisp @@ -108,7 +127,7 @@ lib/coccinella/iconsets/emoticons/Chibi.jisp lib/coccinella/iconsets/emoticons/KMess-Cartoon-1.0.jisp lib/coccinella/iconsets/emoticons/apple_ichat.jisp lib/coccinella/iconsets/emoticons/default/ -lib/coccinella/iconsets/emoticons/default/SmileysReadme.txt +@comment lib/coccinella/iconsets/emoticons/default/SmileysReadme.txt lib/coccinella/iconsets/emoticons/default/icondef.xml lib/coccinella/iconsets/emoticons/default/smiley-alien.gif lib/coccinella/iconsets/emoticons/default/smiley-angry.gif @@ -176,6 +195,9 @@ lib/coccinella/iconsets/emoticons/patricks_faces-1.0.jisp lib/coccinella/iconsets/emoticons/trill-basic-smileys.jisp lib/coccinella/iconsets/emoticons/webmessenger.jisp lib/coccinella/iconsets/emoticons/yahoo_messenger.jisp +lib/coccinella/iconsets/roster/ +lib/coccinella/iconsets/roster/default/ +lib/coccinella/iconsets/roster/default/icondef.xml lib/coccinella/images/ lib/coccinella/images/Coccinella.icns lib/coccinella/images/Coccinella.psd @@ -227,6 +249,8 @@ lib/coccinella/images/qtlogo12.gif lib/coccinella/images/qtlogo16.gif lib/coccinella/images/quote.gif lib/coccinella/images/quoteDis.gif +lib/coccinella/images/reliefpopupbt.gif +lib/coccinella/images/reliefpopupbtpush.gif lib/coccinella/images/reply.gif lib/coccinella/images/replyDis.gif lib/coccinella/images/resizehandle.gif @@ -237,6 +261,7 @@ lib/coccinella/images/send.gif lib/coccinella/images/sendDis.gif lib/coccinella/images/sendfile.gif lib/coccinella/images/sendfileDis.gif +lib/coccinella/images/settings.gif lib/coccinella/images/sky.gif lib/coccinella/images/sky2.gif lib/coccinella/images/splash.gif @@ -247,6 +272,7 @@ lib/coccinella/images/trash.gif lib/coccinella/images/trashDis.gif lib/coccinella/images/unreadmessage.gif lib/coccinella/images/wave.gif +lib/coccinella/images/xppopupbt.gif lib/coccinella/items/ lib/coccinella/items/Games/ lib/coccinella/items/Games/Chess.can @@ -269,6 +295,7 @@ lib/coccinella/items/Games/chessimages/wqueen.gif lib/coccinella/items/Games/chessimages/wrunner.gif lib/coccinella/items/Games/chessimages/wtower.gif lib/coccinella/items/Games/chineschecker.gif +lib/coccinella/items/Mathematica.can lib/coccinella/items/Smileys/ lib/coccinella/items/Smileys/Classic.can lib/coccinella/items/Smileys/Cry.can @@ -309,30 +336,27 @@ lib/coccinella/jabber/Privacy.tcl lib/coccinella/jabber/Profiles.tcl lib/coccinella/jabber/Register.tcl lib/coccinella/jabber/Roster.tcl +lib/coccinella/jabber/Rosticons.tcl lib/coccinella/jabber/Search.tcl lib/coccinella/jabber/SetupAss.tcl +lib/coccinella/jabber/Status.tcl lib/coccinella/jabber/Subscribe.tcl lib/coccinella/jabber/VCard.tcl lib/coccinella/jabber/pkgIndex.tcl lib/coccinella/jabberlib/ -lib/coccinella/jabberlib/MiniJlibDemo.tcl -lib/coccinella/jabberlib/README -lib/coccinella/jabberlib/TestJlib.tcl -lib/coccinella/jabberlib/TestRoster.tcl -lib/coccinella/jabberlib/TestWrapper.tcl +@comment lib/coccinella/jabberlib/README lib/coccinella/jabberlib/XMLFormat.tcl lib/coccinella/jabberlib/browse.tcl lib/coccinella/jabberlib/disco.tcl lib/coccinella/jabberlib/ibb.tcl -lib/coccinella/jabberlib/jabberhttptransport.tcl lib/coccinella/jabberlib/jabberlib.tcl +lib/coccinella/jabberlib/jlibhttp.tcl lib/coccinella/jabberlib/jlibsasl.tcl lib/coccinella/jabberlib/jlibtls.tcl lib/coccinella/jabberlib/muc.tcl lib/coccinella/jabberlib/pkgIndex.tcl lib/coccinella/jabberlib/roster.tcl lib/coccinella/jabberlib/saslmd5.tcl -@comment lib/coccinella/jabberlib/saslmd5.tcl~ lib/coccinella/jabberlib/service.tcl lib/coccinella/jabberlib/stanzaerror.tcl lib/coccinella/jabberlib/streamerror.tcl @@ -340,10 +364,14 @@ lib/coccinella/jabberlib/tinydom.tcl lib/coccinella/jabberlib/wrapper.tcl lib/coccinella/lib/ lib/coccinella/lib/Base64Icons.tcl +lib/coccinella/lib/Debug.tcl lib/coccinella/lib/Dialogs.tcl lib/coccinella/lib/EditDialogs.tcl lib/coccinella/lib/FileCache.tcl lib/coccinella/lib/FileUtils.tcl +lib/coccinella/lib/HttpTrpt.tcl +lib/coccinella/lib/Httpd.tcl +lib/coccinella/lib/Init.tcl lib/coccinella/lib/MacintoshUtils.tcl lib/coccinella/lib/Network.tcl lib/coccinella/lib/P2P.tcl @@ -362,11 +390,13 @@ lib/coccinella/lib/Utils.tcl lib/coccinella/lib/WindowsUtils.tcl lib/coccinella/lib/pkgIndex.tcl lib/coccinella/msgs/ -lib/coccinella/msgs/README_encodings lib/coccinella/msgs/de.msg lib/coccinella/msgs/en.msg +lib/coccinella/msgs/es.msg lib/coccinella/msgs/fr.msg lib/coccinella/msgs/nl.msg +lib/coccinella/msgs/post/ +@comment lib/coccinella/msgs/post/README-post lib/coccinella/msgs/sv.mac lib/coccinella/msgs/sv.msg lib/coccinella/pkgIndex.tcl @@ -375,7 +405,7 @@ lib/coccinella/plugins/Example.tcl lib/coccinella/plugins/HtmlImport.tcl lib/coccinella/plugins/ItclApplets.tcl lib/coccinella/plugins/PluginTextPlain.tcl -lib/coccinella/plugins/README-plugins +@comment lib/coccinella/plugins/README-plugins lib/coccinella/plugins/WinImport.tcl lib/coccinella/plugins/applets/ lib/coccinella/plugins/applets/CardGame/ @@ -393,13 +423,15 @@ lib/coccinella/resources/ lib/coccinella/resources/README-resources lib/coccinella/resources/blueberry.rdb lib/coccinella/resources/bluetabs.rdb +lib/coccinella/resources/crystal.rdb lib/coccinella/resources/default.rdb lib/coccinella/resources/macintosh.rdb lib/coccinella/resources/macosx.rdb +lib/coccinella/resources/post/ +lib/coccinella/resources/post/README-post lib/coccinella/resources/unix.rdb lib/coccinella/resources/windows.rdb lib/coccinella/sounds/ -lib/coccinella/sounds/README-sounds lib/coccinella/sounds/alarm.wav lib/coccinella/sounds/autoanswered.wav lib/coccinella/sounds/clicked.wav @@ -435,8 +467,8 @@ lib/coccinella/whiteboard/Whiteboard.tcl lib/coccinella/whiteboard/pkgIndex.tcl lib/coccinella/whiteboard/tclIndex share/doc/coccinella/ -share/doc/coccinella/README share/doc/coccinella/README-jabber share/doc/coccinella/README-smileys -@exec ln -s ${PREFIX}/lib/coccinella/Coccinella.tcl ${PREFIX}/bin/coccinella -@unexec rm -f ${PREFIX}/bin/coccinella +share/doc/coccinella/README-sounds +share/doc/coccinella/README.txt +share/doc/coccinella/README_encodings