Update coccinella from the very old version to latest release. Many new

features to list them here, and especially a much nicer looking interface.
No sound or VoIP yet, since those dependencies needs to be ported to sndio first.
Take maintainership, since I'm part of upstream, old maintainer agreed
long time ago.

OK landry@
This commit is contained in:
sebastia 2010-07-28 18:03:00 +00:00
parent 819a4cdb13
commit d63f2b43fe
6 changed files with 747 additions and 312 deletions

View File

@ -1,43 +1,59 @@
# $OpenBSD: Makefile,v 1.5 2007/09/15 22:36:52 merdely Exp $
# $OpenBSD: Makefile,v 1.6 2010/07/28 18:03:00 sebastia Exp $
COMMENT= Jabber client with whiteboard communication
SHARED_ONLY = Yes
DISTNAME= Coccinella-0.95.4Src
PKGNAME= ${DISTNAME:S/Src$//:L}
CATEGORIES= net
COMMENT = XMPP client with whiteboard
HOMEPAGE= http://hem.fyristorg.com/matben/
DISTNAME = Coccinella-0.96.18Src
PKGNAME = ${DISTNAME:S/Src$//:L}
CATEGORIES = net
MAINTAINER= Marc Bruenink <marc@bruenink.de>
HOMEPAGE = http://www.coccinella.im
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=coccinella/}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=coccinella/}
RUN_DEPENDS= ::x11/tk/8.4
MODULES = x11/tk
USE_X11= Yes
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
# No dependencies to sound and telephony yet, due to the reason those
# need to be ported to sndio first
RUN_DEPENDS = ::devel/itcl \
::graphics/tkpng \
::graphics/tkimg \
::misc/memchan \
::net/tcludp \
::security/tcltls \
::x11/tkdnd \
::x11/tkhtml \
::x11/tktray \
::x11/tktreectrl
NO_BUILD = Yes
NO_REGRESS = Yes
SEPARATE_BUILD = simple
COCCINELLALIB = ${LOCALBASE}/lib/coccinella
SUBST_VARS = COCCINELLALIB
pre-configure:
@perl -pi -e 's,!!COCCINELLALIB!!,${LOCALBASE}/lib/coccinella,'\
${WRKSRC}/Coccinella.tcl ${WRKSRC}/lib/Init.tcl
${MODTCL_WISH_ADJ} ${WRKSRC}/Coccinella.tcl
${SUBST_CMD} ${WRKSRC}/Coccinella.tcl \
${WRKSRC}/lib/Init.tcl
do-install:
${INSTALL_SCRIPT_DIR} ${PREFIX}/lib/coccinella
@cd ${WRKSRC} ; tar cf - TclXML [c-z]* | \
cd ${WRKSRC} ; tar cf - TclXML [c-z]* | \
tar xf - -C ${PREFIX}/lib/coccinella/
${INSTALL_SCRIPT} ${WRKSRC}/Coccinella.tcl ${PREFIX}/lib/coccinella/
rm ${PREFIX}/lib/coccinella/lib/Init.tcl.*
${INSTALL_SCRIPT} ${WRKSRC}/Coccinella.tcl ${PREFIX}/bin/coccinella
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/coccinella
@cd ${WRKSRC} && ${INSTALL_DATA} README.txt READMEs/README-jabber \
READMEs/README-smileys msgs/README_encodings \
sounds/README-sounds \
cd ${WRKSRC} && ${INSTALL_DATA} README.txt READMEs/README-xmpp \
READMEs/README-sounds \
${PREFIX}/share/doc/coccinella/
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (Coccinella-0.95.4Src.tar.gz) = PCAsWffuyCzBG+r8xX76KA==
RMD160 (Coccinella-0.95.4Src.tar.gz) = Go9Q//gl2EQjYIcCbuzlvauh62A=
SHA1 (Coccinella-0.95.4Src.tar.gz) = i1OH0keY6SRBejQw+JL94EqA0X0=
SHA256 (Coccinella-0.95.4Src.tar.gz) = 4QcajPQs5XHnVQ4fFbmfXutZMi16P1UoEOHpZXs7hxY=
SIZE (Coccinella-0.95.4Src.tar.gz) = 4006282
MD5 (Coccinella-0.96.18Src.tar.gz) = kN80t0I9AJyNHvlyf6KEBA==
RMD160 (Coccinella-0.96.18Src.tar.gz) = fA/0JQPgDAKHt2krQt7n38Q35yQ=
SHA1 (Coccinella-0.96.18Src.tar.gz) = lNYHRElWd4eC2u8pIcAqWbsPz14=
SHA256 (Coccinella-0.96.18Src.tar.gz) = Wd4Nd7czh5T5O+BJ50j/1eLEw/3FXEo1oUuBv4o/y3E=
SIZE (Coccinella-0.96.18Src.tar.gz) = 9493927

View File

@ -1,29 +1,21 @@
$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"
$OpenBSD: patch-Coccinella_tcl,v 1.2 2010/07/28 18:03:00 sebastia Exp $
--- Coccinella.tcl.orig Mon Feb 23 05:47:12 2009
+++ Coccinella.tcl Sat Aug 29 13:13:35 2009
@@ -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!!
+set thisPath ${COCCINELLALIB}
# Read our theme prefs file, if any, containing the theme name and locale.
package require Theme
# Debug support.
source [file join $thisPath lib Debug.tcl]
@@ -148,6 +148,8 @@ source [file join $thisPath lib Init.tcl]
set prefs(appName) "Coccinella"
set prefs(theAppName) "Coccinella"
+
+lappend auto_path ${COCCINELLALIB}
# Read our prefs file containing the theme name and locale needed before splash.
package require PrefUtils

View File

@ -1,12 +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} {
$OpenBSD: patch-lib_Init_tcl,v 1.2 2010/07/28 18:03:00 sebastia Exp $
--- lib/Init.tcl.orig Thu Mar 12 20:59:00 2009
+++ lib/Init.tcl Sat Aug 29 13:15:51 2009
@@ -35,7 +35,7 @@ proc ::Init::SetThis {mainScript} {
set this(prefsDriverDir) "CoccinellaPrefs"
# 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]]
- set path [file dirname $mainScript]
+ set path ${COCCINELLALIB}
set this(path) $path
set this(script) $mainScript

View File

@ -1,4 +1,4 @@
Coccinella is a Jabber chat client with whiteboard communication. The
whiteboard let you share your mp3s, photos, and lots of other stuff.
Further it accepts any fonts. So you will also be able to share
mathematical formulas with your contacts.
Coccinella is a XMPP chat client with whiteboard. The whiteboard
let you share your mp3s, photos, and lots of other stuff. Further
it accepts any fonts. So you will also be able to share mathematical
formulas with your contacts.

File diff suppressed because it is too large Load Diff