[csw-devel] SF.net SVN: gar:[3818] csw/mgar/pkg/mcabber/trunk

[skayser at users.sourceforge.net]

Revision: 3818
          http://gar.svn.sourceforge.net/gar/?rev=3818&view=rev
Author:   skayser
Date:     2009-03-19 14:29:42 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
mcabber: fixed typos, added samplerc

Modified Paths:
--------------
    csw/mgar/pkg/mcabber/trunk/Makefile
    csw/mgar/pkg/mcabber/trunk/checksums
    csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff
    csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff

Modified: csw/mgar/pkg/mcabber/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mcabber/trunk/Makefile	2009-03-19 14:23:19 UTC (rev 3817)
+++ csw/mgar/pkg/mcabber/trunk/Makefile	2009-03-19 14:29:42 UTC (rev 3818)
@@ -17,8 +17,8 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 REQUIRED_PKGS = CSWncurses CSWosslrt CSWotr
-REQUIRED_PKGS = CSWaspell CSWggettextrt CSWglib2 
-REQUIRED_PKGS = CSWgpgerr CSWgpgme CSWiconv
+REQUIRED_PKGS += CSWaspell CSWggettextrt CSWglib2 
+REQUIRED_PKGS += CSWgpgerr CSWgpgme CSWiconv
 
 TEST_SCRIPTS = 
 
@@ -43,7 +43,7 @@
 PATCHFILES = patch-inline.diff
 
 # Solaris 8 doesn't have iswlbank(), provide replacement macro
-PATCHFILES = patch-iswblank.diff
+PATCHFILES += patch-iswblank.diff
 
 include gar/category.mk
 
@@ -53,3 +53,10 @@
 		$(WORKSRC)/Makefile \
 		$(WORKSRC)/src/Makefile \
 		$(WORKSRC)/libjabber/Makefile
+
+post-install-modulated:
+	@perl -pi -e '\
+		s|/usr/share/ssl/certs/ca-bundle.crt|/opt/csw/ssl/certs/ca-certificates.crt|;' \
+		$(WORKSRC)/mcabberrc.example
+	@ginstall -d $(DESTDIR)$(docdir)$(GARNAME)
+	@cp $(WORKSRC)/mcabberrc.example $(DESTDIR)$(docdir)$(GARNAME)

Modified: csw/mgar/pkg/mcabber/trunk/checksums
===================================================================
--- csw/mgar/pkg/mcabber/trunk/checksums	2009-03-19 14:23:19 UTC (rev 3817)
+++ csw/mgar/pkg/mcabber/trunk/checksums	2009-03-19 14:29:42 UTC (rev 3818)
@@ -1,2 +1,3 @@
 189fb9d23f5a8412bc660884528475ea  download/mcabber-0.9.9.tar.bz2
-756f80c0584594d5e66d3bdeadc5ca56  download/patch-iswblank.diff
+a7ceb9f017c2c9267e2264aa626b7a4e  download/patch-inline.diff
+cff6d32fef59fc10806534025dc53f7e  download/patch-iswblank.diff

Modified: csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff
===================================================================
--- csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff	2009-03-19 14:23:19 UTC (rev 3817)
+++ csw/mgar/pkg/mcabber/trunk/files/patch-inline.diff	2009-03-19 14:29:42 UTC (rev 3818)
@@ -1,5 +1,5 @@
---- mcabber-0.9.9/src/histolog.c	2008-10-09 22:17:52.000000000 +0200
-+++ work/build-isa-sparcv8/mcabber-0.9.9/src/histolog.c	2009-03-08 16:35:25.758629698 +0100
+--- mcabber-0.9.9.orig/src/histolog.c	2008-10-09 22:17:52.000000000 +0200
++++ mcabber-0.9.9/src/histolog.c	2009-03-08 16:35:25.758629698 +0100
 @@ -398,7 +398,7 @@
    return UseFileLogging;
  }
@@ -18,9 +18,8 @@
          enum imstatus status, const char *status_msg)
  {
    // XXX Check status value?
-diff -ur mcabber-0.9.9/src/jabglue.c work/build-isa-sparcv8/mcabber-0.9.9/src/jabglue.c
---- mcabber-0.9.9/src/jabglue.c	2008-10-09 22:17:52.000000000 +0200
-+++ work/build-isa-sparcv8/mcabber-0.9.9/src/jabglue.c	2009-03-08 15:49:11.552806445 +0100
+--- mcabber-0.9.9.orig/src/jabglue.c	2008-10-09 22:17:52.000000000 +0200
++++ mcabber-0.9.9/src/jabglue.c	2009-03-08 15:49:11.552806445 +0100
 @@ -171,7 +171,7 @@
    jc = NULL;
  }
@@ -54,9 +53,8 @@
  {
    jb_setstatus(mywantedstatus, NULL, mystatusmsg, FALSE);
  }
-diff -ur mcabber-0.9.9/src/screen.c work/build-isa-sparcv8/mcabber-0.9.9/src/screen.c
---- mcabber-0.9.9/src/screen.c	2008-10-09 22:17:52.000000000 +0200
-+++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.c	2009-03-08 16:45:11.929482636 +0100
+--- mcabber-0.9.9.orig/src/screen.c	2008-10-09 22:17:52.000000000 +0200
++++ mcabber-0.9.9/src/screen.c	2009-03-08 16:45:11.929482636 +0100
 @@ -155,8 +156,8 @@
                         unsigned int prefix_flags, int force_show,
                         unsigned mucnicklen);
@@ -112,17 +110,3 @@
  {
    return multimode;
  }
-diff -ur mcabber-0.9.9/src/screen.h work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h
---- mcabber-0.9.9/src/screen.h	2008-10-09 22:17:52.000000000 +0200
-+++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h	2009-03-08 16:31:44.043214331 +0100
-@@ -20,6 +20,10 @@
- //static void spellcheck(char*, char*);
- #endif
- 
-+#ifndef HAVE_ISWBLANK
-+#define iswblank(wc) iswctype(wc, wctype("blank"))
-+#endif
-+
- #include "hbuf.h"
- #include "logprint.h"
- 

Modified: csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff
===================================================================
--- csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff	2009-03-19 14:23:19 UTC (rev 3817)
+++ csw/mgar/pkg/mcabber/trunk/files/patch-iswblank.diff	2009-03-19 14:29:42 UTC (rev 3818)
@@ -1,6 +1,5 @@
-diff -ur mcabber-0.9.9/src/screen.h work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h
---- mcabber-0.9.9/src/screen.h	2008-10-09 22:17:52.000000000 +0200
-+++ work/build-isa-sparcv8/mcabber-0.9.9/src/screen.h	2009-03-08 16:31:44.043214331 +0100
+--- mcabber-0.9.9.orig/src/screen.h	2008-10-09 22:17:52.000000000 +0200
++++ mcabber-0.9.9/src/screen.h	2009-03-08 16:31:44.043214331 +0100
 @@ -20,6 +20,10 @@
  //static void spellcheck(char*, char*);
  #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.