From a68aa8e12f130cf045177cf4ffbf78a061fab370 Mon Sep 17 00:00:00 2001 From: shell Date: Wed, 25 Jul 2001 11:19:38 +0000 Subject: [PATCH] Upgrade to 1.8.1 - Bump VERSION - Fixes MASTER_SITES - New ssl flavor - New Maintainer - Remove po patches - Add patch for text-based xchat Permission granted by original maintainer : Couderc Damien --- net/xchat/Makefile | 48 ++++++++++++------- net/xchat/files/md5 | 6 +-- net/xchat/patches/patch-po_Makefile_in_in | 12 ++--- net/xchat/patches/patch-po_hu_po | 12 ----- net/xchat/patches/patch-po_ja_po | 12 ----- net/xchat/patches/patch-po_sk_po | 12 ----- net/xchat/patches/patch-po_zh_TW_Big5_po | 21 -------- .../patches/patch-src_fe-text_Makefile_in | 12 +++++ net/xchat/pkg/PLIST | 6 ++- 9 files changed, 55 insertions(+), 86 deletions(-) delete mode 100644 net/xchat/patches/patch-po_hu_po delete mode 100644 net/xchat/patches/patch-po_ja_po delete mode 100644 net/xchat/patches/patch-po_sk_po delete mode 100644 net/xchat/patches/patch-po_zh_TW_Big5_po create mode 100644 net/xchat/patches/patch-src_fe-text_Makefile_in diff --git a/net/xchat/Makefile b/net/xchat/Makefile index bd13564a089..49d96d2c75b 100644 --- a/net/xchat/Makefile +++ b/net/xchat/Makefile @@ -1,40 +1,52 @@ -# $OpenBSD: Makefile,v 1.28 2001/06/26 21:03:29 naddy Exp $ +# $OpenBSD: Makefile,v 1.29 2001/07/25 11:19:38 shell Exp $ # $FreeBSD: Makefile,v 1.12 1999/06/08 23:41:54 steve Exp $ COMMENT= "X-Chat is an X11 IRC client" -DISTNAME= xchat-1.6.4 +MAJOR= 1.8 +VERSION= ${MAJOR}.1 +DISTNAME= xchat-${VERSION} CATEGORIES= net x11 -NEED_VERSION= 1.402 -MASTER_SITES= http://xchat.org/files/source/1.6/ \ - http://xchat.linuxpower.org/files/source/1.6/ +NEED_VERSION= 1.427 + +MASTER_SITES= http://xchat.org/files/source/${MAJOR}/ \ + http://xchat.linuxpower.org/files/source/${MAJOR}/ + EXTRACT_SUFX= .tar.bz2 HOMEPAGE= http://www.xchat.org/ -LIB_DEPENDS= gtk.1.2::x11/gtk+ \ - gdk_pixbuf::graphics/gdk-pixbuf - -MAINTAINER= Couderc Damien +MAINTAINER= Shell Hung PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -USE_GMAKE= Yes -USE_X11= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --disable-gnome --disable-imlib --disable-python -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + +FLAVORS= ssl +FLAVOR?= + +CONFIGURE_ARGS+= --disable-imlib --disable-python --disable-gnome +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @touch ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure +USE_GMAKE= Yes +USE_X11= Yes + +LIB_DEPENDS= gtk.1.2::x11/gtk+ \ + gdk_pixbuf::graphics/gdk-pixbuf + +.if ${FLAVOR:L:Mssl} +CONFIGURE_ARGS+= --enable-openssl="/usr" +.endif + +DOCDIR= ${PREFIX}/share/doc/xchat post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat - ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/xchat + ${INSTALL_DATA_DIR} ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCDIR} .include diff --git a/net/xchat/files/md5 b/net/xchat/files/md5 index 3bc836231e6..04be203cb63 100644 --- a/net/xchat/files/md5 +++ b/net/xchat/files/md5 @@ -1,3 +1,3 @@ -MD5 (xchat-1.6.4.tar.bz2) = 995c02b43454ba76bb641792503c669a -RMD160 (xchat-1.6.4.tar.bz2) = 374b0bdfe32cea95fc850472d1bc713fa51191f3 -SHA1 (xchat-1.6.4.tar.bz2) = 6b8bd496fddc4b6ee75f78137b5d92b0c0b11506 +MD5 (xchat-1.8.1.tar.bz2) = ea1dc6c61f76adad6f72eab94ee83d64 +RMD160 (xchat-1.8.1.tar.bz2) = c42f70d73ed3ef1803919c433453de88a7374de3 +SHA1 (xchat-1.8.1.tar.bz2) = 0f02d796e251cabd850cdf77f8a11bf4038c7c85 diff --git a/net/xchat/patches/patch-po_Makefile_in_in b/net/xchat/patches/patch-po_Makefile_in_in index 5712b15c263..55bf778e65c 100644 --- a/net/xchat/patches/patch-po_Makefile_in_in +++ b/net/xchat/patches/patch-po_Makefile_in_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/01/22 00:26:49 naddy Exp $ ---- po/Makefile.in.in.orig Sun Oct 31 12:17:50 1999 -+++ po/Makefile.in.in Mon Jan 15 18:49:55 2001 -@@ -18,7 +18,7 @@ VPATH = @srcdir@ +$OpenBSD: patch-po_Makefile_in_in,v 1.2 2001/07/25 11:19:38 shell Exp $ +--- po/Makefile.in.in.orig Sun Oct 31 19:17:50 1999 ++++ po/Makefile.in.in Fri Jul 20 05:58:39 2001 +@@ -18,7 +18,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -10,7 +10,7 @@ $OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/01/22 00:26:49 naddy Exp $ localedir = $(datadir)/locale gnulocaledir = $(prefix)/share/locale gettextsrcdir = $(prefix)/share/gettext/po -@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@ +@@ -111,9 +111,9 @@ install-data-no: all install-data-yes: all if test -r "$(MKINSTALLDIRS)"; then \ @@ -22,7 +22,7 @@ $OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/01/22 00:26:49 naddy Exp $ fi @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ -@@ -123,7 +123,7 @@ install-data-yes: all +@@ -123,7 +123,7 @@ *) destdir=$(localedir);; \ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ diff --git a/net/xchat/patches/patch-po_hu_po b/net/xchat/patches/patch-po_hu_po deleted file mode 100644 index 46088a22078..00000000000 --- a/net/xchat/patches/patch-po_hu_po +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_hu_po,v 1.1 2001/05/14 20:17:27 naddy Exp $ ---- po/hu.po.orig Mon May 14 22:07:03 2001 -+++ po/hu.po Mon May 14 22:11:16 2001 -@@ -10,7 +10,7 @@ msgstr "" - "Last-Translator: Horvath Szabolcs \n" - "Language-Team: Hungarian \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Type: text/plain; charset=ISO-8859-2\n" - "Content-Transfer-Encoding: 8-bit\n" - - #: src/fe-gtk/gtkutil.c:194 src/fe-gtk/settings.c:1645 diff --git a/net/xchat/patches/patch-po_ja_po b/net/xchat/patches/patch-po_ja_po deleted file mode 100644 index 4d8fea8bfad..00000000000 --- a/net/xchat/patches/patch-po_ja_po +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_ja_po,v 1.1 2001/05/14 20:17:27 naddy Exp $ ---- po/ja.po.orig Mon May 14 22:11:25 2001 -+++ po/ja.po Mon May 14 22:12:17 2001 -@@ -9,7 +9,7 @@ msgstr "" - "Last-Translator: Yuusuke Tahara \n" - "Language-Team: JAPANESE\n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=x-euc-jp\n" -+"Content-Type: text/plain; charset=EUC-JP\n" - "Content-Transfer-Encoding: 8bit\n" - - #: src/fe-gtk/gtkutil.c:194 src/fe-gtk/settings.c:1645 diff --git a/net/xchat/patches/patch-po_sk_po b/net/xchat/patches/patch-po_sk_po deleted file mode 100644 index 036ab352258..00000000000 --- a/net/xchat/patches/patch-po_sk_po +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_sk_po,v 1.1 2001/05/14 20:17:27 naddy Exp $ ---- po/sk.po.orig Mon May 14 22:05:05 2001 -+++ po/sk.po Mon May 14 22:05:12 2001 -@@ -10,7 +10,7 @@ msgstr "" - "Last-Translator: Stanislav Visnovsky \n" - "Language-Team: Slovak \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=ISO 8859-2\n" -+"Content-Type: text/plain; charset=ISO-8859-2\n" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: KBabel 0.6\n" - diff --git a/net/xchat/patches/patch-po_zh_TW_Big5_po b/net/xchat/patches/patch-po_zh_TW_Big5_po deleted file mode 100644 index d0ad95fd1a2..00000000000 --- a/net/xchat/patches/patch-po_zh_TW_Big5_po +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-po_zh_TW_Big5_po,v 1.1 2001/05/14 20:17:27 naddy Exp $ ---- po/zh_TW.Big5.po.orig Mon May 14 22:05:20 2001 -+++ po/zh_TW.Big5.po Mon May 14 22:05:56 2001 -@@ -274,7 +274,7 @@ msgstr "設定(_S)" - - #: src/fe-gtk/menu.c:1640 - msgid "S_cripts & Plugins" --msgstr "擴充功\能(_C)" -+msgstr "擴充功能(_C)" - - #: src/fe-gtk/menu.c:1641 - msgid "Use_r Menu" -@@ -1025,7 +1025,7 @@ msgstr "自動開啟對話視窗" - - #: src/fe-gtk/settings.c:1505 - msgid "Resume on Auto Accept" --msgstr "自動接收檔案時使用續傳功\能" -+msgstr "自動接收檔案時使用續傳功能" - - #: src/fe-gtk/settings.c:1509 - msgid "When Auto-Accepting DCC, try to resume." diff --git a/net/xchat/patches/patch-src_fe-text_Makefile_in b/net/xchat/patches/patch-src_fe-text_Makefile_in new file mode 100644 index 00000000000..e43ccddc87d --- /dev/null +++ b/net/xchat/patches/patch-src_fe-text_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_fe-text_Makefile_in,v 1.1 2001/07/25 11:19:38 shell Exp $ +--- src/fe-text/Makefile.in.orig Wed Jul 25 05:58:47 2001 ++++ src/fe-text/Makefile.in Wed Jul 11 13:14:41 2001 +@@ -124,7 +124,7 @@ + @USE_MYGLIB_TRUE@xchat_text_OBJECTS = fe-text.o glib.o + xchat_text_DEPENDENCIES = ../common/libxchatmain.a + xchat_text_LDFLAGS = +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ -lintl + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ diff --git a/net/xchat/pkg/PLIST b/net/xchat/pkg/PLIST index 670daf924a2..8778359ba54 100644 --- a/net/xchat/pkg/PLIST +++ b/net/xchat/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2001/02/19 00:11:44 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.8 2001/07/25 11:19:38 shell Exp $ bin/xchat bin/xchat-text share/doc/xchat/README @@ -29,14 +29,16 @@ share/locale/ja/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 +share/locale/no/LC_MESSAGES/xchat.mo 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/LC_MESSAGES/xchat.mo share/locale/sk/LC_MESSAGES/xchat.mo share/locale/sl/LC_MESSAGES/xchat.mo -share/locale/sr_YU/LC_MESSAGES/xchat.mo +share/locale/sr/LC_MESSAGES/xchat.mo share/locale/sv/LC_MESSAGES/xchat.mo +share/locale/tr/LC_MESSAGES/xchat.mo share/locale/uk/LC_MESSAGES/xchat.mo share/locale/zh_CN/LC_MESSAGES/xchat.mo share/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo