cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

byebye xchat 1.8.X and hello 2.4.x

Browse Source
This commit is contained in:
couderc 2004-11-28 19:50:20 +00:00
parent b068d3d2f4
commit b38893e4e6
9 changed files with 99 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
net/xchat/Makefile
View File

@ -1,19 +1,12 @@
# $OpenBSD: Makefile,v 1.46 2004/08/10 09:38:34 xsa Exp $
# $FreeBSD: Makefile,v 1.12 1999/06/08 23:41:54 steve Exp $
# $OpenBSD: Makefile,v 1.47 2004/11/28 19:50:20 couderc Exp $
COMMENT= "X-Chat is an X11 IRC client"
COMMENT= "GTK+2 IRC client"
MAJOR= 1.8
VERSION= ${MAJOR}.11
MAJOR= 2.4
VERSION= ${MAJOR}.1
DISTNAME= xchat-${VERSION}
PKGNAME= ${DISTNAME}p1
CATEGORIES= net x11
MASTER_SITES= http://xchat.org/files/source/${MAJOR}/ \
http://xchat.linuxpower.org/files/source/${MAJOR}/
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.xchat.org/
MAINTAINER= Damien Couderc <couderc@openbsd.org>
@ -23,26 +16,22 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= gdk_pixbuf::graphics/gdk-pixbuf
MASTER_SITES= ${HOMEPAGE}files/source/2.4/
MASTER_SITES0= ${MASTER_SITE_SOURCEFORGE:=xchat/}
MODULES= converters/libiconv devel/gettext
EXTRACT_SUFX= .tar.bz2
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= gtk-x11-2.0.0.0,gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0::x11/gtk+2
MODULES= devel/gettext
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-python --disable-gnome \
--disable-zvt --disable-mmx \
--enable-ipv6 --enable-openssl="/usr" \
--enable-japanese-conv
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
DOCDIR= ${PREFIX}/share/doc/xchat
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
@rm -rf ${WRKSRC}/doc/CVS
${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCDIR}
CONFIGURE_ARGS+= --disable-python --disable-textfe \
--disable-perl --disable-mmx \
--enable-ipv6 --enable-openssl="/usr"
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

6
net/xchat/distinfo
View File

@ -1,3 +1,3 @@
MD5 (xchat-1.8.11.tar.bz2) = 951f5b2fe2d5deef08f7f519414072a1
RMD160 (xchat-1.8.11.tar.bz2) = 5055190942e28933e33b9f520a6811b86241daae
SHA1 (xchat-1.8.11.tar.bz2) = 331afd74bc20797c0dec1a7e32fe014efe6cdc0a
MD5 (xchat-2.4.1.tar.bz2) = aeb2337cc36dd4a9ac0cd6e909f67227
RMD160 (xchat-2.4.1.tar.bz2) = a6659817a744fce486146e9a770bb42b390b7121
SHA1 (xchat-2.4.1.tar.bz2) = 6e096fc536367470f213832f313312560d4920e1

12
net/xchat/patches/patch-src_common_outbound_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_common_outbound_c,v 1.1 2002/12/30 09:15:26 pvalchev Exp $
--- src/common/outbound.c.orig Mon Dec 30 00:53:29 2002
+++ src/common/outbound.c Mon Dec 30 00:53:37 2002
@@ -1879,7 +1879,7 @@ cmd_exec (struct session *sess, char *tb
/* Now we call /bin/sh to run our cmd ; made it more friendly -DC1 */
if (shell)
{
- execl ("/bin/sh", "sh", "-c", cmd, 0);
+ execl ("/bin/sh", "sh", "-c", cmd, (void *)NULL);
} else
{
char **argv;

21
net/xchat/patches/patch-src_common_server_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_common_server_c,v 1.1 2004/08/14 19:16:44 brad Exp $
--- src/common/server.c.orig Sat Aug 14 14:50:33 2004
+++ src/common/server.c Sat Aug 14 14:51:24 2004
@@ -837,7 +837,7 @@ traverse_socks5 (int sok, char *serverAd
struct sock5_connect1 sc1;
unsigned char *sc2;
unsigned int packetlen, addrlen;
- unsigned char buf[10];
+ unsigned char buf[260];
sc1.version = 5;
sc1.nmethods = 1;
@@ -878,7 +878,7 @@ traverse_socks5 (int sok, char *serverAd
{
if (recv (sok, buf, 1, 0) != 1)
return 1;
- packetlen = buf[0] + 2;
+ packetlen = buf[0] + 2; /* can't exceed 260 */
if (recv (sok, buf, packetlen, 0) != packetlen)
return 1;
}

12
net/xchat/patches/patch-src_fe-gtk_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_fe-gtk_Makefile_in,v 1.1 2003/05/30 15:34:45 brad Exp $
--- src/fe-gtk/Makefile.in.orig Wed Dec 11 04:42:59 2002
+++ src/fe-gtk/Makefile.in Fri May 30 11:24:11 2003
@@ -125,7 +125,7 @@ localedir = $(datadir)/locale
bin_PROGRAMS = xchat
CFLAGS = $(GUI_CFLAGS)
-LIBS = $(GUI_LIBS)
+LIBS = $(GUI_LIBS) $(LIBICONV)
INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\"

15
net/xchat/patches/patch-src_fe-gtk_xtext_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_fe-gtk_xtext_c,v 1.1 2003/08/02 14:36:50 couderc Exp $
--- src/fe-gtk/xtext.c.orig 2003-08-02 16:06:15.000000000 +0200
+++ src/fe-gtk/xtext.c 2003-08-02 16:07:47.000000000 +0200
@@ -505,7 +505,11 @@ gtk_xtext_size_allocate (GtkWidget * wid
int height_only = FALSE;
if (allocation->width == widget->allocation.width)
+ {
+ if (allocation->height == widget->allocation.height)
+ return;
height_only = TRUE;
+ }
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))

12
net/xchat/patches/patch-src_fe-text_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_fe-text_Makefile_in,v 1.6 2003/05/30 15:34:45 brad Exp $
--- src/fe-text/Makefile.in.orig Fri May 30 11:24:22 2003
+++ src/fe-text/Makefile.in Fri May 30 11:24:36 2003
@@ -146,7 +146,7 @@ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LIBS = @LIBS@ $(LIBICONV)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fe-text.Po ./$(DEPDIR)/glib.Po

4
net/xchat/pkg/DESCR
View File

@ -1,3 +1 @@
X-Chat is a small yet very forceful X11 IRC client. It runs nicely,
has a nice good looking interface, and best of all, is easy to use
all around.
Xchat is a Gtk+2 IRC client for UNIX operating systems.

107
net/xchat/pkg/PLIST
View File

@ -1,60 +1,109 @@
@comment $OpenBSD: PLIST,v 1.14 2004/09/15 18:17:47 espie Exp $
@comment $OpenBSD: PLIST,v 1.15 2004/11/28 19:50:20 couderc Exp $
bin/xchat
bin/xchat-text
share/doc/xchat/
share/doc/xchat/README
share/doc/xchat/xchat-1.html
share/doc/xchat/xchat-10.html
share/doc/xchat/xchat-2.html
share/doc/xchat/xchat-3.html
share/doc/xchat/xchat-4.html
share/doc/xchat/xchat-5.html
share/doc/xchat/xchat-6.html
share/doc/xchat/xchat-7.html
share/doc/xchat/xchat-8.html
share/doc/xchat/xchat-9.html
share/doc/xchat/xchat.html
share/doc/xchat/xchat.sgml
share/applications/
share/applications/xchat.desktop
share/locale/
share/locale/am/
share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/xchat.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/xchat.mo
share/locale/bg/
share/locale/bg/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/xchat.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/xchat.mo
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/xchat.mo
share/locale/da/LC_MESSAGES/xchat.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/xchat.mo
share/locale/el/
share/locale/el/LC_MESSAGES/
share/locale/el/LC_MESSAGES/xchat.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/xchat.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/xchat.mo
share/locale/et/
share/locale/et/LC_MESSAGES/
share/locale/et/LC_MESSAGES/xchat.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/xchat.mo
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/xchat.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/xchat.mo
share/locale/he/LC_MESSAGES/xchat.mo
share/locale/hu/LC_MESSAGES/xchat.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/xchat.mo
share/locale/ja/
share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/xchat.mo
share/locale/ko/
share/locale/ko/LC_MESSAGES/
share/locale/ko/LC_MESSAGES/xchat.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/xchat.mo
share/locale/lv/
share/locale/lv/LC_MESSAGES/
share/locale/lv/LC_MESSAGES/xchat.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/xchat.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/xchat.mo
share/locale/nb/
share/locale/nb/LC_MESSAGES/
share/locale/nb/LC_MESSAGES/xchat.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/xchat.mo
share/locale/no/
share/locale/no/LC_MESSAGES/
share/locale/no/LC_MESSAGES/xchat.mo
share/locale/pl/LC_MESSAGES/xchat.mo
share/locale/pt/
share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/xchat.mo
share/locale/pt_BR/LC_MESSAGES/xchat.mo
share/locale/ro/LC_MESSAGES/xchat.mo
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/xchat.mo
share/locale/sk/
share/locale/sk/LC_MESSAGES/
share/locale/sk/LC_MESSAGES/xchat.mo
share/locale/sl/
share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/xchat.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/xchat.mo
share/locale/sr/
share/locale/sr/LC_MESSAGES/
share/locale/sr/LC_MESSAGES/xchat.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/xchat.mo
share/locale/tr/LC_MESSAGES/xchat.mo
share/locale/uk/
share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/xchat.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/xchat.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/xchat.mo
share/locale/zh_CN/
share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/xchat.mo
share/locale/zh_TW.Big5/
share/locale/zh_TW.Big5/LC_MESSAGES/
share/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo
share/locale/zh_TW/
share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/xchat.mo
share/pixmaps/
share/pixmaps/xchat.png