diff options
-rw-r--r-- | chat/xchat/Makefile | 11 | ||||
-rw-r--r-- | chat/xchat/Makefile.common | 8 | ||||
-rw-r--r-- | chat/xchat/PLIST | 9 | ||||
-rw-r--r-- | chat/xchat/distinfo | 10 | ||||
-rw-r--r-- | chat/xchat/patches/patch-ab | 18 | ||||
-rw-r--r-- | chat/xchat/patches/patch-ac | 18 |
6 files changed, 62 insertions, 12 deletions
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile index 4516f4a19c3..8fa0af642ba 100644 --- a/chat/xchat/Makefile +++ b/chat/xchat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2007/01/16 11:07:59 tron Exp $ +# $NetBSD: Makefile,v 1.46 2007/01/25 21:27:48 reed Exp $ .include "Makefile.common" @@ -15,6 +15,7 @@ USE_PKGLOCALEDIR= YES CONFIGURE_ARGS+= --enable-tcl=no CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-python +CONFIGURE_ARGS+= --enable-xft LDFLAGS.IRIX+= -lX11 @@ -22,6 +23,7 @@ LDFLAGS.IRIX+= -lX11 .include "options.mk" .include "../../devel/gettext-lib/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 .include "../../x11/gtk2/buildlink3.mk" .if ${OPSYS} == "Darwin" @@ -34,7 +36,12 @@ CONFIGURE_ARGS+= --disable-xlib .endif .endif +INSTALLATION_DIRS+= share/doc/xchat lib/xchat/plugins + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/xchat/plugins + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat/ + ${INSTALL_DATA} ${WRKSRC}/faq.html ${PREFIX}/share/doc/xchat/ + ${INSTALL_DATA} ${WRKSRC}/plugins/plugin20.html \ + ${PREFIX}/share/doc/xchat/ .include "../../mk/bsd.pkg.mk" diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index a93b33a8f9d..e6aca0371ed 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.52 2006/11/14 10:38:36 tron Exp $ +# $NetBSD: Makefile.common,v 1.53 2007/01/25 21:27:49 reed Exp $ -DISTNAME= xchat-2.6.8 -CATEGORIES= chat gnome -MASTER_SITES= http://xchat.org/files/source/2.6/ +DISTNAME= xchat-2.8.0 +CATEGORIES= chat +MASTER_SITES= http://xchat.org/files/source/2.8/ EXTRACT_SUFX= .tar.bz2 HOMEPAGE= http://xchat.org/ diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST index 0013ed6ece5..29987123377 100644 --- a/chat/xchat/PLIST +++ b/chat/xchat/PLIST @@ -1,16 +1,20 @@ -@comment $NetBSD: PLIST,v 1.12 2006/11/14 10:38:36 tron Exp $ +@comment $NetBSD: PLIST,v 1.13 2007/01/25 21:27:49 reed Exp $ bin/xchat share/applications/xchat.desktop +share/doc/xchat/README +share/doc/xchat/faq.html +share/doc/xchat/plugin20.html share/locale/be/LC_MESSAGES/xchat.mo +share/locale/cs/LC_MESSAGES/xchat.mo share/locale/de/LC_MESSAGES/xchat.mo share/locale/el/LC_MESSAGES/xchat.mo share/locale/es/LC_MESSAGES/xchat.mo share/locale/fi/LC_MESSAGES/xchat.mo share/locale/fr/LC_MESSAGES/xchat.mo share/locale/gl/LC_MESSAGES/xchat.mo +share/locale/hu/LC_MESSAGES/xchat.mo share/locale/it/LC_MESSAGES/xchat.mo share/locale/ja/LC_MESSAGES/xchat.mo -share/locale/hu/LC_MESSAGES/xchat.mo share/locale/ko/LC_MESSAGES/xchat.mo share/locale/lt/LC_MESSAGES/xchat.mo share/locale/nl/LC_MESSAGES/xchat.mo @@ -26,5 +30,6 @@ share/pixmaps/xchat.png @comment in xdg-dirs: @dirrm share/pixmaps @comment in xdg-dirs: @dirrm share/applications @exec ${MKDIR} %D/lib/xchat/plugins +@dirrm share/doc/xchat @dirrm lib/xchat/plugins @dirrm lib/xchat diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo index 00a3665b28a..f4a5eb9e090 100644 --- a/chat/xchat/distinfo +++ b/chat/xchat/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.31 2006/11/14 10:38:36 tron Exp $ +$NetBSD: distinfo,v 1.32 2007/01/25 21:27:49 reed Exp $ -SHA1 (xchat-2.6.8.tar.bz2) = 7be12710c7461c8108524b763af83de89ae900f4 -RMD160 (xchat-2.6.8.tar.bz2) = add965c1092c11f565110f127f402c900bedcec0 -Size (xchat-2.6.8.tar.bz2) = 1184287 bytes +SHA1 (xchat-2.8.0.tar.bz2) = 80248b4fcd45261c686557eb243fec6ce459bd60 +RMD160 (xchat-2.8.0.tar.bz2) = a65329728c050c5448b2cbab2ea6c68ba72a0c95 +Size (xchat-2.8.0.tar.bz2) = 1257232 bytes SHA1 (patch-aa) = 90af71915ac6373ebc623790f9a90642376fb1f4 +SHA1 (patch-ab) = 99eb42cbe3e6b15fd0930245df2ecd2b00394ab3 +SHA1 (patch-ac) = a523f43c2d70fcf93638204fa22808530801847b diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-ab new file mode 100644 index 00000000000..5e89a18b215 --- /dev/null +++ b/chat/xchat/patches/patch-ab @@ -0,0 +1,18 @@ +$NetBSD: patch-ab,v 1.8 2007/01/25 21:27:48 reed Exp $ + +http://xchat.org/files/source/2.8/patches/xc280-fix-back.diff + +# +# Fix: /BACK command not working after upgrading from xchat < 2.8.0 +# +--- src/common/cfgfiles.c 2 Jan 2007 00:26:40 -0000 1.102 ++++ src/common/cfgfiles.c 3 Jan 2007 14:01:00 -0000 +@@ -45,7 +45,7 @@ + int cmd_len = 1, name_len; + + /* remove <2.8.0 stuff */ +- if (!strcmp (cmd, "AWAY") & !strcmp (name, "BACK")) ++ if (!strcmp (cmd, "away") && !strcmp (name, "BACK")) + return; + + if (cmd) diff --git a/chat/xchat/patches/patch-ac b/chat/xchat/patches/patch-ac new file mode 100644 index 00000000000..1c58871541d --- /dev/null +++ b/chat/xchat/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.4 2007/01/25 21:27:48 reed Exp $ + +http://xchat.org/files/source/2.8/patches/xc280-fix-ja.diff + +# +# Japanese translation error in 2.6.8 and 2.8.0 causes xchat NOT to run! +# +--- po/ja.po 8 Aug 2006 14:39:41 -0000 1.16 ++++ po/ja.po 15 Nov 2006 00:59:59 -0000 +@@ -1082,7 +1176,7 @@ + + #: src/common/textevents.h:318 + msgid "%C28-%C29$1/Wallops%C28-%O$t$2" +-msgstr "%C28-%C29$1/Wallops%C28-%O$t$" ++msgstr "%C28-%C29$1/Wallops%C28-%O$t$2" + + #: src/common/textevents.h:321 + #, fuzzy |