Revision: 3507
http://gar.svn.sourceforge.net/gar/?rev=3507&view=rev
Author: valholla
Date: 2009-02-27 02:58:23 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
working copy
Modified Paths:
--------------
csw/mgar/pkg/xchat/trunk/Makefile
csw/mgar/pkg/xchat/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/xchat/trunk/files/fixme.sh
csw/mgar/pkg/xchat/trunk/files/xc286-smallfixes.diff
csw/mgar/pkg/xchat/trunk/files/xchat26-compiletime.diff
Removed Paths:
-------------
csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.depend
csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.gspec
csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.prototype
csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.depend
csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.gspec
csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.prototype
csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.depend
csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.gspec
csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.prototype
csw/mgar/pkg/xchat/trunk/files/CSWxchat.depend
csw/mgar/pkg/xchat/trunk/files/CSWxchat.gspec
csw/mgar/pkg/xchat/trunk/files/CSWxchat.prototype
csw/mgar/pkg/xchat/trunk/files/fixes.diff
csw/mgar/pkg/xchat/trunk/files/pylibs.diff
csw/mgar/pkg/xchat/trunk/files/textfe.diff
Modified: csw/mgar/pkg/xchat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xchat/trunk/Makefile 2009-02-26 23:17:11 UTC (rev 3506)
+++ csw/mgar/pkg/xchat/trunk/Makefile 2009-02-27 02:58:23 UTC (rev 3507)
@@ -1,5 +1,5 @@
GARNAME = xchat
-GARVERSION = 2.8.4
+GARVERSION = 2.8.6
CATEGORIES = gnome
DESCRIPTION = GTK+ based IRC client, similar to AmIRC (Amiga).
@@ -11,35 +11,53 @@
MASTER_SITES = http://xchat.org/files/source/2.8/
MASTER_SITES += http://xchat.org/files/source/2.8/patches/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += CSWxchat.gspec CSWxchat.depend CSWxchat.prototype
-DISTFILES += CSWxchat-pl.gspec CSWxchat-pl.depend CSWxchat-pl.prototype
-DISTFILES += CSWxchat-py.gspec CSWxchat-py.depend CSWxchat-py.prototype
-DISTFILES += CSWxchat-tcl.gspec CSWxchat-tcl.depend CSWxchat-tcl.prototype
-# We define upstream file regex so we can be notifed of new upstream software
release
+PACKAGES = CSWxchat CSWxchat-pl CSWxchat-py CSWxchat-tcl
+CATALOGNAME_CSWxchat = xchat
+CATALOGNAME_CSWxchat-pl = xchat_pl
+CATALOGNAME_CSWxchat-py = xchat_py
+CATALOGNAME_CSWxchat-tcl = xchat_tcl
+SPKG_DESC_CSWxchat = GTK+ based IRC client, similar to AmIRC (Amiga).
+SPKG_DESC_CSWxchat-pl = xChat Perl Plugin
+SPKG_DESC_CSWxchat-py = xChat Python Plugin
+SPKG_DESC_CSWxchat-tcl = xChat TCL Plugin
+REQUIRED_PKGS_CSWxchat = CSWdbusglib CSWexpat CSWfconfig CSWftype2 CSWlibntlm
+REQUIRED_PKGS_CSWxchat += CSWggettextrt CSWglib2 CSWgtk2 CSWiconv CSWlibatk
+REQUIRED_PKGS_CSWxchat += CSWlibcairo CSWlibdbus CSWlibxft2 CSWlibxrender
+REQUIRED_PKGS_CSWxchat += CSWosslrt CSWpango CSWpng CSWsunmath CSWzlib
+REQUIRED_PKGS_CSWxchat-pl = CSWxchat CSWperl
+REQUIRED_PKGS_CSWxchat-py = CSWxchat CSWpython
+REQUIRED_PKGS_CSWxchat-tcl = CSWxchat CSWtcl
+PKGFILES_CSWxchat-pl = $(libdir)/.*/perl.so
+PKGFILES_CSWxchat-py = $(libdir)/.*/python.so
+PKGFILES_CSWxchat-tcl = $(libdir)/.*/tcl.so
+
+# We define upstream file regex so we can be notifed of new
+# upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
-# Remove hardcoded use of -lutil for the python plugin
-PATCHFILES += pylibs.diff
-
-# Fix compile-time errors
-PATCHFILES += fixes.diff
-PATCHFILES += textfe.diff
-
# Official XChat patches
-PATCHFILES += xc284-improvescrollback.diff
-PATCHFILES += xc284-scrollbmkdir.diff
+PATCHFILES = xc286-smallfixes.diff
+PATCHFILES += xchat26-compiletime.diff
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-openssl=$(prefix)
-CONFIGURE_ARGS += --enable-textfe
+CONFIGURE_ARGS += --enable-threads=solaris
CONFIGURE_ARGS += --enable-tcl=$(libdir)
CONFIGURE_ARGS += --enable-shm
CONFIGURE_ARGS += --enable-ipv6
+## run checkpkg manually
+ENABLE_CHECK = 0
TEST_TARGET = check
EXTRA_INC = $(prefix)/bdb44/include
EXTRA_LIB = $(prefix)/bdb44/lib
+DISTFILES += fixme.sh
+post-configure-modulated:
+ @(echo "~~~ Fixing Libtool ~~~")
+ @$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
+ $(DONADA)
+
include gar/category.mk
Modified: csw/mgar/pkg/xchat/trunk/checksums
===================================================================
--- csw/mgar/pkg/xchat/trunk/checksums 2009-02-26 23:17:11 UTC (rev 3506)
+++ csw/mgar/pkg/xchat/trunk/checksums 2009-02-27 02:58:23 UTC (rev 3507)
@@ -1,18 +1,4 @@
-66d60febc62a01bafac9bb3a35fb37ae download/xchat-2.8.4.tar.bz2
-6d8f0db81e3d0f0d1b61752dc99d3ece download/CSWxchat.gspec
-00b2e2e2959a25c75b499c4a78b8efc2 download/CSWxchat.depend
-f0631e064d004e12bdbd3a5c9f467b72 download/CSWxchat.prototype
-854707eedb0cbbc0dec9789c3040a574 download/CSWxchat-pl.gspec
-46818629a874638d20360aef81fb7805 download/CSWxchat-pl.depend
-26bb618ddbb8e255d6a3cd2925e96359 download/CSWxchat-pl.prototype
-0739b670b59b9586b0a1d12092d5511c download/CSWxchat-py.gspec
-b6bb9d5c30b9087c2024e1facd57fe67 download/CSWxchat-py.depend
-59f8e886eeccaa15adc0ead28ea63cf8 download/CSWxchat-py.prototype
-c82a9961c1dc59e0df7f310300153fce download/CSWxchat-tcl.gspec
-a3a3879d1c328fc737fc44af533c8cd7 download/CSWxchat-tcl.depend
-1f5dcd86dea352323bbd0816ce0de68b download/CSWxchat-tcl.prototype
-f5c28b6f2b6209d9555e48643c95bc60 download/pylibs.diff
-15c71c3745ecb54f7d78a4509d14d45d download/fixes.diff
-9e6053aa7981923da413ac3b6f699e50 download/textfe.diff
-a202ee20d7f04f0a515f32190acb65d8 download/xc284-improvescrollback.diff
-e6f0279d8c01cbe6a6bf698add6113fa download/xc284-scrollbmkdir.diff
+1f2670865d43a23a9abc596dde999aca download/xchat-2.8.6.tar.bz2
+41ec540885de7c34625768aa1fb9682b download/fixme.sh
+eb68b6261bf6740cb5f223627eb8f384 download/xc286-smallfixes.diff
+02f27ba7bcf10d36523618fb201d9634 download/xchat26-compiletime.diff
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.depend
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.depend 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.depend 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,6 +0,0 @@
-P CSWggettext ggettext - GNU gettext
-P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+
-P CSWiconv libiconv - GNU iconv library
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWperl perl - A high-level, general-purpose programming language
-P CSWxchat xchat - GTK+ based IRC client, similar to AmIRC (Amiga).
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.gspec
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.gspec 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.gspec 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,5 +0,0 @@
-%var bitname xchat_pl
-%var pkgname CSWxchat-pl
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%var desc xchat perl plugin
-%copyright url file://%{WORKSRC}/COPYING
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.prototype
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.prototype 2009-02-26
23:17:11 UTC (rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-pl.prototype 2009-02-27
02:58:23 UTC (rev 3507)
@@ -1,4 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/xchat 0755 root bin
-d none /opt/csw/lib/xchat/plugins 0755 root bin
-f none /opt/csw/lib/xchat/plugins/perl.so 0755 root bin
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.depend
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.depend 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.depend 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,6 +0,0 @@
-P CSWggettext ggettext - GNU gettext
-P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+
-P CSWiconv libiconv - GNU iconv library
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWpython python - The Python language interpreter
-P CSWxchat xchat - GTK+ based IRC client, similar to AmIRC (Amiga).
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.gspec
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.gspec 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.gspec 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,5 +0,0 @@
-%var bitname xchat_py
-%var pkgname CSWxchat-py
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%var desc xchat python plugin
-%copyright url file://%{WORKSRC}/COPYING
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.prototype
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.prototype 2009-02-26
23:17:11 UTC (rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-py.prototype 2009-02-27
02:58:23 UTC (rev 3507)
@@ -1,4 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/xchat 0755 root bin
-d none /opt/csw/lib/xchat/plugins 0755 root bin
-f none /opt/csw/lib/xchat/plugins/python.so 0755 root bin
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.depend
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.depend 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.depend 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,6 +0,0 @@
-P CSWggettext ggettext - GNU gettext
-P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+
-P CSWiconv libiconv - GNU iconv library
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWtcl tcl - Tool Command Language
-P CSWxchat xchat - GTK+ based IRC client, similar to AmIRC (Amiga).
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.gspec
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.gspec 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.gspec 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,5 +0,0 @@
-%var bitname xchat_tcl
-%var pkgname CSWxchat-tcl
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%var desc xchat tcl plugin
-%copyright url file://%{WORKSRC}/COPYING
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.prototype
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.prototype 2009-02-26
23:17:11 UTC (rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat-tcl.prototype 2009-02-27
02:58:23 UTC (rev 3507)
@@ -1,4 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/xchat 0755 root bin
-d none /opt/csw/lib/xchat/plugins 0755 root bin
-f none /opt/csw/lib/xchat/plugins/tcl.so 0755 root bin
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat.depend
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat.depend 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat.depend 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,18 +0,0 @@
-P CSWdbusglib dbus_glib - DBus GLib Bindings
-P CSWexpat expat - XML Parser Toolkit
-P CSWfconfig fontconfig - Font configuration and customization library
-P CSWftype2 freetype2 - The free and portable high-quality Font Engine
-P CSWggettext ggettext - GNU gettext
-P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+
-P CSWgtk2 gtk2 - GTK+, The GIMP Toolkit
-P CSWiconv libiconv - GNU iconv library
-P CSWlibatk libatk - Accessibility toolkit
-P CSWlibcairo libcairo - The Cairo 2D Graphics Library
-P CSWlibdbus libdbus - DBus Message Bus System - dynamic libraries
-P CSWlibxft2 libxft2 - FreeType-based font drawing library for X
-P CSWlibxrender libxrender - fontconfig.org Xrender library
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWpango libpango - Library for laying out and rendering text
-P CSWpng png - library for Portable Network Graphics format (PNG)
-P CSWsunmath libsunmath - Sun maths library
-P CSWzlib zlib - Zlib Data Compression Library
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat.gspec
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat.gspec 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat.gspec 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,4 +0,0 @@
-%var bitname xchat
-%var pkgname CSWxchat
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYING
Deleted: csw/mgar/pkg/xchat/trunk/files/CSWxchat.prototype
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/CSWxchat.prototype 2009-02-26 23:17:11 UTC
(rev 3506)
+++ csw/mgar/pkg/xchat/trunk/files/CSWxchat.prototype 2009-02-27 02:58:23 UTC
(rev 3507)
@@ -1,84 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/xchat 0755 root bin
-f none /opt/csw/bin/xchat-text 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/applications 0755 root bin
-f none /opt/csw/share/applications/xchat.desktop 0644 root bin
-d none /opt/csw/share/locale 0755 root bin
-d none /opt/csw/share/locale/be 0755 root bin
-d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/be/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/ca 0755 root bin
-d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ca/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/cs 0755 root bin
-d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/cs/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/de 0755 root bin
-d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/de/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/el 0755 root bin
-d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/el/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/es 0755 root bin
-d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/es/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/fi 0755 root bin
-d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/fi/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/fr 0755 root bin
-d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/fr/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/gl 0755 root bin
-d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/gl/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/hu 0755 root bin
-d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/hu/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/it 0755 root bin
-d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/it/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/ja 0755 root bin
-d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ja/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/ko 0755 root bin
-d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ko/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/lt 0755 root bin
-d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/lt/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/nl 0755 root bin
-d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/nl/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/pa 0755 root bin
-d none /opt/csw/share/locale/pa/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pa/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/pt 0755 root bin
-d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pt/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/ru 0755 root bin
-d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ru/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/sq 0755 root bin
-d none /opt/csw/share/locale/sq/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/sq/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/sr 0755 root bin
-d none /opt/csw/share/locale/sr/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/sr/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/sv 0755 root bin
-d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/sv/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/uk 0755 root bin
-d none /opt/csw/share/locale/uk/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/uk/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/vi 0755 root bin
-d none /opt/csw/share/locale/vi/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/vi/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/zh_CN 0755 root bin
-d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/locale/zh_TW 0755 root bin
-d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/xchat.mo 0644 root bin
-d none /opt/csw/share/pixmaps 0755 root bin
-f none /opt/csw/share/pixmaps/xchat.png 0644 root bin
Deleted: csw/mgar/pkg/xchat/trunk/files/fixes.diff
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/fixes.diff 2009-02-26 23:17:11 UTC (rev
3506)
+++ csw/mgar/pkg/xchat/trunk/files/fixes.diff 2009-02-27 02:58:23 UTC (rev
3507)
@@ -1,32 +0,0 @@
-diff --speed-large-files --minimal -Nru xchat-2.8.2.orig/src/common/modes.c
xchat-2.8.2/src/common/modes.c
---- xchat-2.8.2.orig/src/common/modes.c 2006-10-25 00:18:07.000000000
-0400
-+++ xchat-2.8.2/src/common/modes.c 2007-04-29 14:12:41.862417000 -0400
-@@ -26,6 +26,7 @@
- #include "server.h"
- #include "text.h"
- #include "fe.h"
-+#include "inbound.h"
- #include "util.h"
- #ifdef HAVE_STRINGS_H
- #include <strings.h>
-diff --speed-large-files --minimal -Nru xchat-2.8.2.orig/src/common/msproxy.h
xchat-2.8.2/src/common/msproxy.h
---- xchat-2.8.2.orig/src/common/msproxy.h 2006-04-16 11:32:17.000000000
-0400
-+++ xchat-2.8.2/src/common/msproxy.h 2007-04-29 14:13:11.837042000 -0400
-@@ -120,7 +120,7 @@
- char pad50[6];
/* 211-216 */
- guint16 magic55;
/* 217-218: 0x30, 0x00 */
- char pad55[2];
/* 219-220 */
-- char data[0];
/* Dummy end marker, no real data required */
-+ char *data; /*
Dummy end marker, no real data required */
- } auth;
-
- struct {
-@@ -180,7 +180,7 @@
- guint16 boundport;
/* 77-78: bind request; port used on client behalf. */
- guint32 boundaddr;
/* 79-82: addr used on client behalf */
- char pad30[90];
/* 83-172 */
-- char data[0];
/* End marker */
-+ char *data; /* End
marker */
- } connack;
-
- } packet;
Added: csw/mgar/pkg/xchat/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/fixme.sh (rev 0)
+++ csw/mgar/pkg/xchat/trunk/files/fixme.sh 2009-02-27 02:58:23 UTC (rev
3507)
@@ -0,0 +1,49 @@
+#!/bin/bash
+####################################################
+#
+# fixme.sh
+# Intended to remove the use of libtool's
+# pseudo-libraries for opencsw builds.
+#
+# Author: Mike Watters mwatters_at_opencsw.org
+# Initial Version: 0.1
+#
+####################################################
+
+umask 0022
+PATH=/opt/csw/bin
+
+if [ $# -ne 1 ]; then
+ gecho "USAGE: $(basename $0) WORKSRC"
+ exit 1
+fi
+BASEPATH=$1
+
+## Fix Makefiles
+for mk in $(gfind ${BASEPATH} -name Makefile -print); do
+ LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
+ gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
+
+ for file in ${LT_FILES}; do
+ LIB_NAME=$(ggrep 'dlname=' ${file} | \
+ gsed -e "s/.*'\(.*\)'/\1/" \
+ -e "s/^lib//" \
+ -e "s/\.so.*$//")
+ fixpath=$(gecho $file |gsed 's/\//\\\//g')
+ gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
+ gmv Makefile.new ${mk}
+ done
+done
+
+## Fix libtool Script
+for lt in $(gfind ${BASEPATH} -name libtool -print); do
+ gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
+ gmv ${lt}.new ${lt}
+done
+
+LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
+if [ -f ${LTMAIN} ]; then
+ gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
+ gmv ${LTMAIN}.new ${LTMAIN}
+fi
+
Property changes on: csw/mgar/pkg/xchat/trunk/files/fixme.sh
___________________________________________________________________
Added: svn:executable
+ *
Deleted: csw/mgar/pkg/xchat/trunk/files/pylibs.diff
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/pylibs.diff 2009-02-26 23:17:11 UTC (rev
3506)
+++ csw/mgar/pkg/xchat/trunk/files/pylibs.diff 2009-02-27 02:58:23 UTC (rev
3507)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru xchat-2.8.2.orig/configure
xchat-2.8.2/configure
---- xchat-2.8.2.orig/configure 2007-04-02 07:14:01.000000000 -0400
-+++ xchat-2.8.2/configure 2007-04-29 13:48:24.474716000 -0400
-@@ -27028,7 +27028,7 @@
- PY_PREFIX=`$pythonpath -c 'import sys; print
sys.prefix'`
- PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print
sys.exec_prefix'`
- if test -f $PY_INC/Python.h; then
-- PY_LIBS="-L$PY_LIB/config -lpython$PY_VER
-lpthread -lutil"
-+ PY_LIBS="-L$PY_LIB/config -lpython$PY_VER
-lpthread -lrt -lm"
- PY_CFLAGS="-I$PY_INC"
- echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6
Deleted: csw/mgar/pkg/xchat/trunk/files/textfe.diff
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/textfe.diff 2009-02-26 23:17:11 UTC (rev
3506)
+++ csw/mgar/pkg/xchat/trunk/files/textfe.diff 2009-02-27 02:58:23 UTC (rev
3507)
@@ -1,31 +0,0 @@
-Binary files xchat-2.8.4.orig/src/common/.text.c.swp and
xchat-2.8.4/src/common/.text.c.swp differ
-diff --speed-large-files --minimal -Nru xchat-2.8.4.orig/src/fe-text/fe-text.c
xchat-2.8.4/src/fe-text/fe-text.c
---- xchat-2.8.4.orig/src/fe-text/fe-text.c 2007-04-29 02:07:09.000000000
-0400
-+++ xchat-2.8.4/src/fe-text/fe-text.c 2007-10-04 01:55:56.719012000 -0400
-@@ -106,7 +106,7 @@
- " \017This binary compiled
\00310"__DATE__"\017\n",
- get_cpu_str(),
- glib_major_version, glib_minor_version,
glib_micro_version);
-- fe_print_text (sess, buf);
-+ fe_print_text (sess, buf, 0);
-
- fe_print_text (sess, "\n\nCompiled in Features\0032:\017 "
- #ifdef USE_PLUGIN
-@@ -121,7 +121,7 @@
- #ifdef USE_IPV6
- "IPv6"
- #endif
-- "\n\n");
-+ "\n\n", 0);
- fflush (stdout);
- fflush (stdin);
- }
-@@ -146,7 +146,7 @@
- static const short colconv[] = { 0, 7, 4, 2, 1, 3, 5, 11, 13, 12, 6, 16, 14,
15, 10, 7 };
-
- void
--fe_print_text (struct session *sess, char *text)
-+fe_print_text (struct session *sess, char *text, time_t stamp)
- {
- int dotime = FALSE;
- char num[8];
Added: csw/mgar/pkg/xchat/trunk/files/xc286-smallfixes.diff
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/xc286-smallfixes.diff
(rev 0)
+++ csw/mgar/pkg/xchat/trunk/files/xc286-smallfixes.diff 2009-02-27
02:58:23 UTC (rev 3507)
@@ -0,0 +1,68 @@
+#
+# Various small fixes from CVS that are considered safe to apply to 2.8.6.
+#
+--- xchat-2.8.6/src/common/cfgfiles.c 2008-02-05 21:02:47.000000000 +1100
++++ xchat-2.8.6p1/src/common/cfgfiles.c 2008-06-15 13:45:43.000000000
+1000
+@@ -886,7 +886,6 @@
+ set_showval (session *sess, const struct prefs *var, char *tbuf)
+ {
+ int len, dots, j;
+- static const char *offon[] = { "OFF", "ON" };
+
+ len = strlen (var->name);
+ memcpy (tbuf, var->name, len);
+@@ -909,8 +908,10 @@
+ *((int *) &prefs + var->offset));
+ break;
+ case TYPE_BOOL:
+- sprintf (tbuf + len, "\0033:\017 %s\n", offon[
+- *((int *) &prefs + var->offset)]);
++ if (*((int *) &prefs + var->offset))
++ sprintf (tbuf + len, "\0033:\017 %s\n", "ON");
++ else
++ sprintf (tbuf + len, "\0033:\017 %s\n", "OFF");
+ break;
+ }
+ PrintText (sess, tbuf);
+--- xchat-2.8.6/src/common/chanopt.c 2008-06-10 22:00:55.000000000 +1000
++++ xchat-2.8.6p1/src/common/chanopt.c 2008-06-15 13:48:04.000000000 +1000
+@@ -32,7 +32,7 @@
+
+ #define S_F(xx) STRUCT_OFFSET_STR(struct session,xx)
+
+-channel_options chanopt[] =
++static const channel_options chanopt[] =
+ {
+ {"alert_beep", "BEEP", S_F(alert_beep)},
+ {"alert_taskbar", NULL, S_F(alert_taskbar)},
+--- xchat-2.8.6/src/common/servlist.c 2008-04-01 19:22:34.000000000 +1100
++++ xchat-2.8.6p1/src/common/servlist.c 2008-06-15 13:57:41.000000000
+1000
+@@ -509,6 +509,8 @@
+ list = g_slist_nth (net->servlist, net->selected);
+ if (!list)
+ list = net->servlist;
++ if (!list)
++ return;
+ ircserv = list->data;
+
+ /* incase a protocol switch is added to the servlist gui */
+--- xchat-2.8.6/src/common/text.c 2008-03-28 13:20:04.000000000 +1100
++++ xchat-2.8.6p1/src/common/text.c 2008-06-15 13:59:59.000000000 +1000
+@@ -216,7 +216,7 @@
+ static void
+ scrollback_save (session *sess, char *text)
+ {
+- char buf[1024];
++ char buf[512 * 4];
+ time_t stamp;
+ int len;
+
+@@ -266,7 +266,7 @@
+ scrollback_load (session *sess)
+ {
+ int fh;
+- char buf[1024];
++ char buf[512 * 4];
+ char *text;
+ time_t stamp;
+ int lines;
Added: csw/mgar/pkg/xchat/trunk/files/xchat26-compiletime.diff
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/xchat26-compiletime.diff
(rev 0)
+++ csw/mgar/pkg/xchat/trunk/files/xchat26-compiletime.diff 2009-02-27
02:58:23 UTC (rev 3507)
@@ -0,0 +1,41 @@
+--- xchat-2.8.6/configure.orig 2009-02-26 19:59:34.698949415 -0600
++++ xchat-2.8.6/configure 2009-02-26 20:01:00.058872631 -0600
+@@ -29106,7 +29106,7 @@
+ PY_PREFIX=`$pythonpath -c 'import sys; print
sys.prefix'`
+ PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print
sys.exec_prefix'`
+ if test -f $PY_INC/Python.h; then
+- PY_LIBS="-L$PY_LIB/config -lpython$PY_VER
-lpthread -lutil"
++ PY_LIBS="-L$PY_LIB/config -lpython$PY_VER
-lpthread -lrt -lm"
+ PY_CFLAGS="-I$PY_INC"
+ { echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6; }
+--- xchat-2.8.6/src/common/msproxy.h.orig 2009-02-26 19:57:16.256414289
-0600
++++ xchat-2.8.6/src/common/msproxy.h 2009-02-26 19:57:44.323002461 -0600
+@@ -120,7 +120,7 @@
+ char pad50[6];
/* 211-216 */
+ guint16 magic55;
/* 217-218: 0x30, 0x00 */
+ char pad55[2];
/* 219-220 */
+- char data[0];
/* Dummy end marker, no real data required */
++ char *data; /*
Dummy end marker, no real data required */
+ } auth;
+
+ struct {
+@@ -180,7 +180,7 @@
+ guint16 boundport;
/* 77-78: bind request; port used on client behalf. */
+ guint32 boundaddr;
/* 79-82: addr used on client behalf */
+ char pad30[90];
/* 83-172 */
+- char data[0];
/* End marker */
++ char *data; /* End
marker */
+ } connack;
+
+ } packet;
+--- xchat-2.8.6/src/common/modes.c.orig 2009-02-26 19:57:58.675799251
-0600
++++ xchat-2.8.6/src/common/modes.c 2009-02-26 19:58:35.063129852 -0600
+@@ -26,6 +26,7 @@
+ #include "server.h"
+ #include "text.h"
+ #include "fe.h"
++#include "inbound.h"
+ #include "util.h"
+ #ifdef HAVE_STRINGS_H
+ #include <strings.h>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
