Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Sep 2001 02:31:49 -0700 (PDT)
From:      TOGAWA Satoshi <toga@puyo.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/30282: Update port: ja-xchat 1.8.2
Message-ID:  <200109030931.f839Vnh50030@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         30282
>Category:       ports
>Synopsis:       Update port: ja-xchat 1.8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 03 02:40:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     TOGAWA Satoshi
>Release:        4.3-RELEASE
>Organization:
>Environment:
FreeBSD puyo.statp.is.tohoku.ac.jp 4.3-RELEASE FreeBSD 4.3-RELEASE #2: Wed Jun 27 21:05:28 JST 2001     togawa@puyo.statp.is.tohoku.ac.jp:/usr/src/sys/compile/PUYO  i386

>Description:
Now xchat contain Japanese translation in its original code.
So we can use original xchat instead of Japanese patch version.

Note: It don't support IPv6 because irc/xchat don't support it.


>How-To-Repeat:

>Fix:

diff -urN xchat/Makefile xchat.new/Makefile
--- xchat/Makefile	Fri Mar 30 03:02:39 2001
+++ xchat.new/Makefile	Mon Sep  3 17:47:00 2001
@@ -5,91 +5,32 @@
 # $FreeBSD: ports/japanese/xchat/Makefile,v 1.8 2001/03/29 16:34:08 sobomax Exp $
 #
 
-PORTNAME=	xchat
-PORTVERSION=	1.4.3
-PORTREVISION=	2
-CATEGORIES=	japanese irc gnome
-MASTER_SITES=	http://xchat.org/files/source/1.4/ \
-		http://xchat.linuxpower.org/files/source/1.4/
-
-PATCH_SITES=	http://northeye.org/~takuo/xchat-ja/
-PATCHFILES=	${PORTNAME}-${PORTVERSION}.ja.3.diff.gz
-PATCH_DIST_STRIP=	-p1
+CATEGORIES=	japanese
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
-RUN_DEPENDS=	${LOCALBASE}/libexec/iconv/iso-2022-jp.so:${PORTSDIR}/converters/iconv-extra
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 
 MASTERDIR=	${.CURDIR}/../../irc/xchat
-MD5_FILE=	${.CURDIR}/distinfo
-PLIST=		${.CURDIR}/pkg-plist
+PKGDIR=		${.CURDIR}
+PLIST=		${MASTERDIR}/pkg-plist
+DESCR=		${MASTERDIR}/pkg-descr
+COMMENT=	${MASTERDIR}/pkg-comment
+
+EXTRA_PATCHES=	${.CURDIR}/files/patch-aa
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-japanese-conv
-MAKE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+	LIBS="-L${LOCALBASE}/lib -lgiconv"
+
+JCODE_C=	${WRKSRC}/src/common/jcode.c
+CONFIGURE=	${WRKSRC}/configure
 
-# begin master part
-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_ARGS+=--disable-python
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 400014
-CATEGORIES+=	ipv6
-CONFIGURE_ARGS+=--enable-ipv6
-.endif
-
-.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(HAVE_GNOME)
-USE_GNOME=	yes
-CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf
-.else
-CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf
-.endif
-# end master part
-
-pre-patch:
-	${PERL} -i -pe 's/-b&h-lucidatypewriter-medium-r-normal-\*-\*-120-\*-\*-m-\*-\*-\*/$$&,-default-*ng-medium-r-normal--14-*,*/' ${WRKSRC}/src/common/cfgfiles.c
-
-# begin master part
-post-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
-		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
-# end master part
-
-pre-build:
-	${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in ${WRKSRC}/configure ${WRKSRC}/config.status
-
-# begin master part
-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
-# end master part
+post-extract:
+	${MV} ${JCODE_C} ${JCODE_C}.orig
+	${MV} ${CONFIGURE} ${CONFIGURE}.orig
+	${SED} "s/iconv\.h/giconv.h/" < ${JCODE_C}.orig > ${JCODE_C}
+	${SED} "s/iconv/giconv/" < ${CONFIGURE}.orig > ${CONFIGURE}
+	${CHMOD} +x ${CONFIGURE}
 
-.include <bsd.port.post.mk>
-#.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile"
diff -urN xchat/distinfo xchat.new/distinfo
--- xchat/distinfo	Sun Oct  1 23:57:28 2000
+++ xchat.new/distinfo	Thu Jan  1 09:00:00 1970
@@ -1,2 +0,0 @@
-MD5 (xchat-1.4.3.tar.bz2) = 268ee72a8a58c323e838f72ebfc58cd6
-MD5 (xchat-1.4.3.ja.3.diff.gz) = 06c66673eb980eb6a85e73679333f014
diff -urN xchat/files/patch-aa xchat.new/files/patch-aa
--- xchat/files/patch-aa	Thu Jan  1 09:00:00 1970
+++ xchat.new/files/patch-aa	Mon Sep  3 17:33:25 2001
@@ -0,0 +1,10 @@
+--- 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 -urN xchat/pkg-plist xchat.new/pkg-plist
--- xchat/pkg-plist	Wed Feb 21 10:03:38 2001
+++ xchat.new/pkg-plist	Thu Jan  1 09:00:00 1970
@@ -1,33 +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
-%%PORTDOCS%%@dirrm share/doc/xchat
-%%GNOME:%%share/gnome/apps/Internet/xchat.desktop
-%%GNOME:%%share/gnome/pixmaps/xchat.png
-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/fr/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/nl/LC_MESSAGES/xchat.mo
-share/locale/pt_BR/LC_MESSAGES/xchat.mo
-share/locale/sl/LC_MESSAGES/xchat.mo
-share/locale/sr_YU/LC_MESSAGES/xchat.mo

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200109030931.f839Vnh50030>