Update to 1.8.3.

Merge everything into irc/xchat and make japanese/chat a slave port of
irc/xchat again.

4 files changed, 3 insertions, 132 deletions

diff --git a/japanese/xchat/Makefile b/japanese/xchat/Makefile
index 1f2a20c598ff..7432e138f69f 100644
--- a/japanese/xchat/Makefile
+++ b/japanese/xchat/Makefile
@@ -5,83 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xchat
-PORTVERSION=	1.8.2
-CATEGORIES+=	irc gnome ipv6
-MASTER_SITES=	http://xchat.org/files/source/1.8/ \
-		http://xchat.linuxpower.org/files/source/1.8/
+CATEGORIES=	japanese
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	msgfmt-new:${PORTSDIR}/devel/gettext-devel
-LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
-
-# <ja-specific>
-CATEGORIES:=	japanese ${CATEGORIES}
-
-#EXTRA_PATCHES=	${.CURDIR}/files/patch-aa
-
 CONFIGURE_ARGS=	--enable-japanese-conv
 
-COMMENT=	${.CURDIR}/../../irc/xchat/pkg-comment
-DESCR=		${.CURDIR}/../../irc/xchat/pkg-descr
-# </ja-specific>
-
-USE_X_PREFIX=		yes
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-USE_PERL5=		yes
-USE_IMLIB=		yes
-WANT_GNOME=		yes
-GNU_CONFIGURE=		yes
-# Assign with `+=' for slave ports
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib -lintl -lgiconv" \
-			MSGFMT=${LOCALBASE}/bin/msgfmt-new
-CONFIGURE_ARGS+=	--disable-python \
-			--without-included-gettext \
-			--enable-nls \
-			--enable-ipv6
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SOCKS)
-# Assign with `+=' for slave ports
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-CONFIGURE_ARGS+=	--enable-socks
-.endif
-
-.if defined(WITH_SSL)
-USE_OPENSSL=		YES
-CONFIGURE_ARGS+=	--enable-openssl
-.endif
-
-.if defined(HAVE_GNOME)
-USE_GNOME=		yes
-CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf
-.else
-CONFIGURE_ARGS+=	--disable-gnome --disable-gdk-pixbuf
-.endif
-
-post-patch:
-	@${PERL} -pi \
-		-e 's|-lpthread|${PTHREAD_LIBS}|g;' \
-		-e 's|DATADIRNAME=lib|DATADIRNAME=share|g;' \
-		-e 's|iconv|giconv|;' \
-		${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi \
-		-e 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g;' \
-		-e 's|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g;'
-	@${PERL} -pi -e 's|iconv\.h|giconv.h|;' \
-		${WRKSRC}/src/common/jcode.c
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
-	@${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat
-	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat
-.endif
+MASTERDIR=	${.CURDIR}/../../x11/gnomecore
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/xchat/distinfo b/japanese/xchat/distinfo
deleted file mode 100644
index 576149e162a7..000000000000
--- a/japanese/xchat/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (xchat-1.8.2.tar.bz2) = 51987e6e79d0e902e1928918fdd7b353
diff --git a/japanese/xchat/files/patch-aa b/japanese/xchat/files/patch-aa
deleted file mode 100644
index 9fa5c4d95530..000000000000
--- a/japanese/xchat/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/common/cfgfiles.c.orig	Mon Jun 25 18:23:57 2001
-+++ src/common/cfgfiles.c	Mon Jul  2 20:25:35 2001
-@@ -17,6 +17,7 @@
-  */
- 
- #include <fcntl.h>
-+#include <locale.h>
- #include <unistd.h>
- #include <stdlib.h>
- #ifdef HAVE_STRINGS_H
diff --git a/japanese/xchat/pkg-plist b/japanese/xchat/pkg-plist
deleted file mode 100644
index 0629a4594d85..000000000000
--- a/japanese/xchat/pkg-plist
+++ /dev/null
@@ -1,47 +0,0 @@
-bin/xchat
-bin/xchat-text
-%%PORTDOCS%%share/doc/xchat/ChangeLog
-%%PORTDOCS%%share/doc/xchat/README
-%%PORTDOCS%%share/doc/xchat/xchat-1.html
-%%PORTDOCS%%share/doc/xchat/xchat-10.html
-%%PORTDOCS%%share/doc/xchat/xchat-2.html
-%%PORTDOCS%%share/doc/xchat/xchat-3.html
-%%PORTDOCS%%share/doc/xchat/xchat-4.html
-%%PORTDOCS%%share/doc/xchat/xchat-5.html
-%%PORTDOCS%%share/doc/xchat/xchat-6.html
-%%PORTDOCS%%share/doc/xchat/xchat-7.html
-%%PORTDOCS%%share/doc/xchat/xchat-8.html
-%%PORTDOCS%%share/doc/xchat/xchat-9.html
-%%PORTDOCS%%share/doc/xchat/xchat.html
-%%PORTDOCS%%share/doc/xchat/xchat.sgml
-%%GNOME:%%share/gnome/apps/Internet/xchat.desktop
-%%GNOME:%%share/gnome/pixmaps/xchat.png
-%%PORTDOCS%%@dirrm share/doc/xchat
-share/locale/ca/LC_MESSAGES/xchat.mo
-share/locale/cs/LC_MESSAGES/xchat.mo
-share/locale/da/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/he/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/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/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