From b5b27b3216e088a4bea40718c8eea60ba1f3cbff Mon Sep 17 00:00:00 2001 From: couderc Date: Sun, 20 Jun 2004 17:54:58 +0000 Subject: [PATCH] update to 2.0.9 --- net/xchat2/Makefile | 8 +++- net/xchat2/distinfo | 6 +-- net/xchat2/patches/patch-Makefile_in | 38 +++++++------------ net/xchat2/patches/patch-configure | 10 ++--- net/xchat2/patches/patch-src_common_util_c | 13 +++++++ .../patches/patch-src_fe-gtk_Makefile_in | 35 +++++++---------- .../patches/patch-src_fe-text_Makefile_in | 35 +++++++---------- .../patches/patch-src_pixmaps_Makefile_in | 12 ++++++ net/xchat2/pkg/PLIST | 8 +++- 9 files changed, 88 insertions(+), 77 deletions(-) create mode 100644 net/xchat2/patches/patch-src_common_util_c create mode 100644 net/xchat2/patches/patch-src_pixmaps_Makefile_in diff --git a/net/xchat2/Makefile b/net/xchat2/Makefile index 397b412698c..1fc51a2c4ea 100644 --- a/net/xchat2/Makefile +++ b/net/xchat2/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 2004/04/10 18:48:30 couderc Exp $ +# $OpenBSD: Makefile,v 1.10 2004/06/20 17:54:58 couderc Exp $ COMMENT= "GTK+2 IRC client" MAJOR= 2.0 -VERSION= ${MAJOR}.8 +VERSION= ${MAJOR}.9 DISTNAME= xchat-${VERSION} PKGNAME= xchat2-${VERSION} CATEGORIES= net x11 @@ -35,4 +35,8 @@ CONFIGURE_ARGS+= --disable-python --enable-textfe \ CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +post-patch: + @mv ${WRKSRC}/xchat.png ${WRKSRC}/xchat2.png + @mv ${WRKSRC}/xchat.desktop ${WRKSRC}/xchat2.desktop + .include diff --git a/net/xchat2/distinfo b/net/xchat2/distinfo index 23013d57853..6c54f3c75f7 100644 --- a/net/xchat2/distinfo +++ b/net/xchat2/distinfo @@ -1,3 +1,3 @@ -MD5 (xchat-2.0.8.tar.bz2) = 64cd419e7bb14e36e658b09726d3411f -RMD160 (xchat-2.0.8.tar.bz2) = b0e47fa61d397de0082cd8a38259f49a8a52ede0 -SHA1 (xchat-2.0.8.tar.bz2) = 68177f242001a2632f4f474989ee9a8a41e725f9 +MD5 (xchat-2.0.9.tar.bz2) = 8a38f161176cc2c54b32bbe5e51e3fc7 +RMD160 (xchat-2.0.9.tar.bz2) = 9aa71a85f4eadce429b6ed3501692bfd8b2556df +SHA1 (xchat-2.0.9.tar.bz2) = b0b810b5123864a624988169f4acb08aef1739e6 diff --git a/net/xchat2/patches/patch-Makefile_in b/net/xchat2/patches/patch-Makefile_in index a2d2194da24..64f22a3a94e 100644 --- a/net/xchat2/patches/patch-Makefile_in +++ b/net/xchat2/patches/patch-Makefile_in @@ -1,25 +1,15 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2003/08/08 05:47:38 marcm Exp $ ---- Makefile.in.orig 2003-07-30 22:24:26.000000000 -0700 -+++ Makefile.in 2003-08-07 22:36:14.000000000 -0700 -@@ -287,8 +287,8 @@ install-iconDATA: $(icon_DATA) - @list='$(icon_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$$f"; \ -- $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$$f; \ -+ echo " $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$(PACKAGE).png"; \ -+ $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$(PACKAGE).png; \ - done +$OpenBSD: patch-Makefile_in,v 1.3 2004/06/20 17:54:58 couderc Exp $ +--- Makefile.in.orig 2004-06-20 17:35:22.000000000 +0200 ++++ Makefile.in 2004-06-20 17:32:11.000000000 +0200 +@@ -249,9 +249,9 @@ SUBDIRS = po intl src plugins + EXTRA_DIST = autogen.sh HACKING INSTALL.w32 faq.html xchat.png \ + xchat.desktop xchat.spec config.h.w32 xchat.ico - uninstall-iconDATA: -@@ -305,8 +305,8 @@ install-utilDATA: $(util_DATA) - @list='$(util_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(utilDATA_INSTALL) $$d$$p $(DESTDIR)$(utildir)/$$f"; \ -- $(utilDATA_INSTALL) $$d$$p $(DESTDIR)$(utildir)/$$f; \ -+ echo " $(utilDATA_INSTALL) $$d$$p $(DESTDIR)$(utildir)/$(PACKAGE).desktop"; \ -+ $(utilDATA_INSTALL) $$d$$p $(DESTDIR)$(utildir)/$(PACKAGE).desktop; \ - done - - uninstall-utilDATA: +-icon_DATA = xchat.png ++icon_DATA = xchat2.png + icondir = $(datadir)/pixmaps +-util_DATA = xchat.desktop ++util_DATA = xchat2.desktop + utildir = $(datadir)/applications + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/net/xchat2/patches/patch-configure b/net/xchat2/patches/patch-configure index a0e6cfb0846..23b22374173 100644 --- a/net/xchat2/patches/patch-configure +++ b/net/xchat2/patches/patch-configure @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.5 2004/04/10 18:48:30 couderc Exp $ ---- configure.orig 2004-03-20 09:35:51.000000000 +0100 -+++ configure 2004-04-09 18:18:47.000000000 +0200 -@@ -1762,7 +1762,7 @@ fi +$OpenBSD: patch-configure,v 1.6 2004/06/20 17:54:58 couderc Exp $ +--- configure.orig 2004-05-31 16:47:07.000000000 +0200 ++++ configure 2004-06-20 17:07:09.000000000 +0200 +@@ -1831,7 +1831,7 @@ fi # Define the identity of the package. - PACKAGE=xchat + PACKAGE=xchat2 - VERSION=2.0.8 + VERSION=2.0.9 diff --git a/net/xchat2/patches/patch-src_common_util_c b/net/xchat2/patches/patch-src_common_util_c new file mode 100644 index 00000000000..a2d8ccb7469 --- /dev/null +++ b/net/xchat2/patches/patch-src_common_util_c @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_common_util_c,v 1.1 2004/06/20 17:54:58 couderc Exp $ +--- src/common/util.c.orig 2004-06-20 17:22:00.000000000 +0200 ++++ src/common/util.c 2004-06-20 17:25:07.000000000 +0200 +@@ -580,8 +580,8 @@ get_cpu_str (void) + { + #if defined (USING_LINUX) || defined (USING_FREEBSD) + double mhz; +- int cpus = 1; + #endif ++ int cpus = 1; + struct utsname un; + static char *buf = NULL; + diff --git a/net/xchat2/patches/patch-src_fe-gtk_Makefile_in b/net/xchat2/patches/patch-src_fe-gtk_Makefile_in index 0293d63de52..d10b1b6b275 100644 --- a/net/xchat2/patches/patch-src_fe-gtk_Makefile_in +++ b/net/xchat2/patches/patch-src_fe-gtk_Makefile_in @@ -1,30 +1,23 @@ -$OpenBSD: patch-src_fe-gtk_Makefile_in,v 1.2 2003/08/08 05:47:38 marcm Exp $ ---- src/fe-gtk/Makefile.in.orig 2003-07-30 22:24:28.000000000 -0700 -+++ src/fe-gtk/Makefile.in 2003-08-07 22:36:14.000000000 -0700 -@@ -202,7 +202,7 @@ xchatlibdir = @xchatlibdir@ - xchatsharedir = @xchatsharedir@ - localedir = $(datadir)/locale - --bin_PROGRAMS = xchat -+bin_PROGRAMS = $(PACKAGE) - - INCLUDES = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\" - -@@ -230,7 +230,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = +$OpenBSD: patch-src_fe-gtk_Makefile_in,v 1.3 2004/06/20 17:54:58 couderc Exp $ +--- src/fe-gtk/Makefile.in.orig 2004-05-31 16:47:05.000000000 +0200 ++++ src/fe-gtk/Makefile.in 2004-06-20 17:13:46.000000000 +0200 +@@ -37,7 +37,7 @@ NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ -bin_PROGRAMS = xchat$(EXEEXT) +bin_PROGRAMS = $(PACKAGE)$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - am__xchat_SOURCES_DIST = about.c ascii.c banlist.c chanlist.c dccgui.c \ -@@ -321,7 +321,7 @@ clean-binPROGRAMS: + subdir = src/fe-gtk + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -348,8 +348,8 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -xchat$(EXEEXT): $(xchat_OBJECTS) $(xchat_DEPENDENCIES) +- @rm -f xchat$(EXEEXT) +$(PACKAGE)$(EXEEXT): $(xchat_OBJECTS) $(xchat_DEPENDENCIES) - @rm -f xchat$(EXEEXT) ++ @rm -f $(PACKAGE)$(EXEEXT) $(LINK) $(xchat_LDFLAGS) $(xchat_OBJECTS) $(xchat_LDADD) $(LIBS) + mostlyclean-compile: diff --git a/net/xchat2/patches/patch-src_fe-text_Makefile_in b/net/xchat2/patches/patch-src_fe-text_Makefile_in index 44c8726654b..e32bcdd4ae4 100644 --- a/net/xchat2/patches/patch-src_fe-text_Makefile_in +++ b/net/xchat2/patches/patch-src_fe-text_Makefile_in @@ -1,30 +1,23 @@ -$OpenBSD: patch-src_fe-text_Makefile_in,v 1.2 2003/08/08 05:47:38 marcm Exp $ ---- src/fe-text/Makefile.in.orig 2003-07-30 22:24:28.000000000 -0700 -+++ src/fe-text/Makefile.in 2003-08-07 22:36:14.000000000 -0700 -@@ -200,7 +200,7 @@ target_alias = @target_alias@ - unamepath = @unamepath@ - xchatlibdir = @xchatlibdir@ - xchatsharedir = @xchatsharedir@ --bin_PROGRAMS = xchat-text -+bin_PROGRAMS = $(PACKAGE)-text - - EXTRA_DIST = README - -@@ -213,7 +213,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = +$OpenBSD: patch-src_fe-text_Makefile_in,v 1.3 2004/06/20 17:54:58 couderc Exp $ +--- src/fe-text/Makefile.in.orig 2004-05-31 16:47:05.000000000 +0200 ++++ src/fe-text/Makefile.in 2004-06-20 17:11:59.000000000 +0200 +@@ -37,7 +37,7 @@ NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ -bin_PROGRAMS = xchat-text$(EXEEXT) +bin_PROGRAMS = $(PACKAGE)-text$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - am_xchat_text_OBJECTS = fe-text.$(OBJEXT) -@@ -274,7 +274,7 @@ clean-binPROGRAMS: + subdir = src/fe-text + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -306,8 +306,8 @@ clean-binPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -xchat-text$(EXEEXT): $(xchat_text_OBJECTS) $(xchat_text_DEPENDENCIES) +- @rm -f xchat-text$(EXEEXT) +$(PACKAGE)-text$(EXEEXT): $(xchat_text_OBJECTS) $(xchat_text_DEPENDENCIES) - @rm -f xchat-text$(EXEEXT) ++ @rm -f $(PACKAGE)-text$(EXEEXT) $(LINK) $(xchat_text_LDFLAGS) $(xchat_text_OBJECTS) $(xchat_text_LDADD) $(LIBS) + mostlyclean-compile: diff --git a/net/xchat2/patches/patch-src_pixmaps_Makefile_in b/net/xchat2/patches/patch-src_pixmaps_Makefile_in new file mode 100644 index 00000000000..4cc2f74ee38 --- /dev/null +++ b/net/xchat2/patches/patch-src_pixmaps_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_pixmaps_Makefile_in,v 1.1 2004/06/20 17:54:58 couderc Exp $ +--- src/pixmaps/Makefile.in.orig 2004-06-20 17:42:21.000000000 +0200 ++++ src/pixmaps/Makefile.in 2004-06-20 17:43:47.000000000 +0200 +@@ -227,7 +227,7 @@ LIST = aboutpng $(srcdir)/about.png \ + purplepng $(srcdir)/purple.png \ + redpng $(srcdir)/red.png \ + voicepng $(srcdir)/voice.png \ +- xchatpng $(srcdir)/../../xchat.png ++ xchatpng $(srcdir)/../../xchat2.png + + PNGS = about.png book.png hop.png op.png purple.png red.png voice.png + noinst_HEADERS = inline_pngs.h diff --git a/net/xchat2/pkg/PLIST b/net/xchat2/pkg/PLIST index 6431075a86c..73a276662a9 100644 --- a/net/xchat2/pkg/PLIST +++ b/net/xchat2/pkg/PLIST @@ -1,14 +1,18 @@ -@comment $OpenBSD: PLIST,v 1.7 2004/04/10 18:48:30 couderc Exp $ +@comment $OpenBSD: PLIST,v 1.8 2004/06/20 17:54:58 couderc Exp $ bin/xchat2 bin/xchat2-text share/applications/xchat2.desktop share/locale/am/LC_MESSAGES/xchat2.mo share/locale/az/LC_MESSAGES/xchat2.mo +share/locale/bg/LC_MESSAGES/xchat2.mo share/locale/ca/LC_MESSAGES/xchat2.mo +share/locale/cs/LC_MESSAGES/xchat2.mo share/locale/de/LC_MESSAGES/xchat2.mo share/locale/el/LC_MESSAGES/xchat2.mo +share/locale/en_GB/LC_MESSAGES/xchat2.mo share/locale/es/LC_MESSAGES/xchat2.mo share/locale/et/LC_MESSAGES/xchat2.mo +share/locale/eu/LC_MESSAGES/xchat2.mo share/locale/fi/LC_MESSAGES/xchat2.mo share/locale/fr/LC_MESSAGES/xchat2.mo share/locale/ja/LC_MESSAGES/xchat2.mo @@ -24,6 +28,8 @@ share/locale/sk/LC_MESSAGES/xchat2.mo share/locale/sl/LC_MESSAGES/xchat2.mo share/locale/sr/LC_MESSAGES/xchat2.mo share/locale/sv/LC_MESSAGES/xchat2.mo +share/locale/uk/LC_MESSAGES/xchat2.mo +share/locale/wa/LC_MESSAGES/xchat2.mo share/locale/zh_CN/LC_MESSAGES/xchat2.mo share/pixmaps/xchat2.png @dirrm share/pixmaps