9 files changed, 170 insertions, 0 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 2926fb623146..5a5597bd1deb 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -248,6 +248,7 @@
     SUBDIR += nvi-euc-jp
     SUBDIR += nvi-iso-2022-jp
     SUBDIR += nvi-sjis
+    SUBDIR += ochusha
     SUBDIR += okphone
     SUBDIR += oleo
     SUBDIR += onew-canna
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
new file mode 100644
index 000000000000..27ca4a918e21
--- /dev/null
+++ b/japanese/ochusha/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for:   ochusha
+# Date created:     15 April 2006
+# Whom:             sgr
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ochusha
+PORTVERSION=	0.5.8.2
+PORTREVISION=	4
+CATEGORIES=	japanese
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=		ochusha/16560
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A GUI BBS browser for 2ch.net
+
+MAN1=		ochusha.1
+MANCOMPRESSED=	no
+
+USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_GNOME=	pkgconfig glib20 gtk20 libxml2
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	automake:110 autoconf:261 aclocal:110 libtool:15
+
+DESKTOP_ENTRIES="ochusha" "A GUI BBS browser for 2ch.net" \
+		"${X11BASE}/share/ochusha/ochusha32.xpm" \
+		"Ochusha" "Application;Network;" \
+		false
+
+ACLOCAL_ARGS=	-I "${ACLOCAL_DIR}" -I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	-c -a
+
+pre-configure:
+	@echo "===>  Regenerating ${WRKSRC}/libmodifiedgtk2/Makefile.in"
+	@${RM} ${WRKSRC}/libmodifiedgtk2/aclocal.m4
+	@${RM} ${WRKSRC}/libmodifiedgtk2/Makefile.in
+	@(cd ${WRKSRC}/libmodifiedgtk2/ && \
+	${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} && \
+	${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} && \
+	${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF})
+
+.include <bsd.port.mk>
diff --git a/japanese/ochusha/Makefile.bak b/japanese/ochusha/Makefile.bak
new file mode 100644
index 000000000000..95dbbdda2eb6
--- /dev/null
+++ b/japanese/ochusha/Makefile.bak
@@ -0,0 +1,46 @@
+# New ports collection makefile for:   ochusha
+# Date created:     15 April 2006
+# Whom:             sgr
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ochusha
+PORTVERSION=	0.5.8.2
+PORTREVISION=	4
+CATEGORIES=	japanese
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=		ochusha/16560
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A GUI BBS browser for 2ch.net
+
+MAN1=		ochusha.1
+MANCOMPRESSED=	no
+
+USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_GNOME=	pkgconfig glib20 gtk20 libxml2
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	automake:110 autoconf:261 aclocal:110 libtool:15
+
+DESKTOP_ENTRIES="ochusha" "A GUI BBS browser for 2ch.net" \
+		"${X11BASE}/share/ochusha/ochusha32.xpm" \
+		"Ochusha" "Application;Network;" \
+		false
+
+ACLOCAL_ARGS=	-I "${ACLOCAL_DIR}" -I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	-c -a
+#CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
+
+pre-configure:
+	@echo "===>  Regenerating ${WRKSRC}/libmodifiedgtk2/Makefile.in"
+	@${RM} ${WRKSRC}/libmodifiedgtk2/aclocal.m4
+	@${RM} ${WRKSRC}/libmodifiedgtk2/Makefile.in
+	@(cd ${WRKSRC}/libmodifiedgtk2/ && \
+	${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} && \
+	${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} && \
+	${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF})
+
+.include <bsd.port.mk>
diff --git a/japanese/ochusha/distinfo b/japanese/ochusha/distinfo
new file mode 100644
index 000000000000..d25a01dcb1d6
--- /dev/null
+++ b/japanese/ochusha/distinfo
@@ -0,0 +1,3 @@
+MD5 (ochusha-0.5.8.2.tar.bz2) = 167edce1d41f766d18018175458373c7
+SHA256 (ochusha-0.5.8.2.tar.bz2) = 91a4429b085be335ad34c9af3ed2ab8871b6245839348abe21073a48789dbe7c
+SIZE (ochusha-0.5.8.2.tar.bz2) = 1794268
diff --git a/japanese/ochusha/files/patch-for-glib b/japanese/ochusha/files/patch-for-glib
new file mode 100644
index 000000000000..b428f66b78ac
--- /dev/null
+++ b/japanese/ochusha/files/patch-for-glib
@@ -0,0 +1,11 @@
+--- libmodifiedgtk2/Makefile.am.orig	Sun Jul 16 23:43:53 2006
++++ libmodifiedgtk2/Makefile.am	Sun Jul 16 23:44:27 2006
+@@ -21,7 +21,7 @@
+ 
+ localedir		= $(datadir)/locale
+ 
+-AM_CPPFLAGS		= -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
++AM_CPPFLAGS		= -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DGTK_COMPILATION
+ #AM_CPPFLAGS		= -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -Wall $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -pg
+ 
+ marshal.h:	marshal.list
diff --git a/japanese/ochusha/files/patch-hanamogera-11 b/japanese/ochusha/files/patch-hanamogera-11
new file mode 100644
index 000000000000..8ac7a68fa51c
--- /dev/null
+++ b/japanese/ochusha/files/patch-hanamogera-11
@@ -0,0 +1,20 @@
+--- lib/ochusha_thread_2ch.c.orig	Fri Jul 28 17:26:31 2006
++++ lib/ochusha_thread_2ch.c	Fri Jul 28 17:30:59 2006
+@@ -1883,7 +1883,7 @@
+ 	  && broker->config->login_2ch)
+ 	query = g_strdup_printf("submit=%%8F%%91%%82%%AB%%8D%%9E%%82%%DE&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s&sid=%s&time=%ld", from, mail, message, bbs, key, broker->config->session_id_2ch, time);
+       else
+-	query = g_strdup_printf("submit=%%8F%%91%%82%%AB%%8D%%9E%%82%%DE&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s&time=%ld", from, mail, message, bbs, key, time);
++	query = g_strdup_printf("hana=mogera&submit=%%8F%%91%%82%%AB%%8D%%9E%%82%%DE&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s&time=%ld", from, mail, message, bbs, key, time);
+     }
+ 
+   if (query == NULL)
+@@ -1903,7 +1903,7 @@
+ 		  && broker->config->login_2ch)
+ 		query = g_strdup_printf("submit=%%91%%53%%90%%D3%%94%%43%%82%%F0%%95%%89%%82%%A4%%82%%B1%%82%%C6%%82%%F0%%8F%%B3%%91%%F8%%82%%B5%%82%%C4%%8F%%91%%82%%AB%%8D%%9E%%82%%DE&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s&sid=%s&time=%ld", from, mail, message, bbs, key, broker->config->session_id_2ch, time);
+ 	      else
+-		query = g_strdup_printf("submit=%%91%%53%%90%%D3%%94%%43%%82%%F0%%95%%89%%82%%A4%%82%%B1%%82%%C6%%82%%F0%%8F%%B3%%91%%F8%%82%%B5%%82%%C4%%8F%%91%%82%%AB%%8D%%9E%%82%%DE&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s&time=%ld", from, mail, message, bbs, key, time);
++		query = g_strdup_printf("hana=mogera&submit=%%91%%53%%90%%D3%%94%%43%%82%%F0%%95%%89%%82%%A4%%82%%B1%%82%%C6%%82%%F0%%8F%%B3%%91%%F8%%82%%B5%%82%%C4%%8F%%91%%82%%AB%%8D%%9E%%82%%DE&FROM=%s&mail=%s&MESSAGE=%s&bbs=%s&key=%s&time=%ld", from, mail, message, bbs, key, time);
+ 	    }
+ 	  sleep(30);
+ 	  post_result = ochusha_utils_2ch_try_post(broker, thread->board,
diff --git a/japanese/ochusha/files/patch-hanamogera-15 b/japanese/ochusha/files/patch-hanamogera-15
new file mode 100644
index 000000000000..014829e9dfc0
--- /dev/null
+++ b/japanese/ochusha/files/patch-hanamogera-15
@@ -0,0 +1,12 @@
+--- lib/ochusha_board_2ch.c.orig	Fri Jul 28 17:31:21 2006
++++ lib/ochusha_board_2ch.c	Fri Jul 28 17:33:59 2006
+@@ -981,7 +981,8 @@
+   if (board->cookie != NULL)
+     G_FREE(board->cookie);
+   if (cookie != NULL)
+-    board->cookie = G_STRDUP(cookie);
++/*    board->cookie = G_STRDUP(cookie); */
++    board->cookie = g_strconcat(cookie, "; hana=mogera", NULL);
+   else
+     board->cookie = NULL;
+ }
diff --git a/japanese/ochusha/pkg-descr b/japanese/ochusha/pkg-descr
new file mode 100644
index 000000000000..1324934513d8
--- /dev/null
+++ b/japanese/ochusha/pkg-descr
@@ -0,0 +1,4 @@
+ochusha is a program that gives a GUI based on GTK+ for accessing
+BBS like 2ch.net.
+
+WWW: http://ochusha.sourceforge.jp/
diff --git a/japanese/ochusha/pkg-plist b/japanese/ochusha/pkg-plist
new file mode 100644
index 000000000000..b51d43fee1f4
--- /dev/null
+++ b/japanese/ochusha/pkg-plist
@@ -0,0 +1,28 @@
+bin/ochusha
+lib/libmodifiedghttp.a
+lib/libmodifiedghttp.la
+lib/libmodifiedghttp.so.1
+lib/libmodifiedghttp.so
+lib/libmodifiedgtk2.a
+lib/libmodifiedgtk2.la
+lib/libmodifiedgtk2.so.0
+lib/libmodifiedgtk2.so
+lib/libochusha.a
+lib/libochusha.la
+lib/libochusha.so.5
+lib/libochusha.so
+lib/libtsengine.a
+lib/libtsengine.la
+lib/libtsengine.so.0
+lib/libtsengine.so
+share/locale/ja/LC_MESSAGES/ochusha.mo
+share/ochusha/aalist.txt
+share/ochusha/ca-bundle.crt
+share/ochusha/ochusha-gtkrc
+share/ochusha/ochusha-gtkrc.gray
+share/ochusha/ochusha-init.scm
+share/ochusha/ochusha.desktop
+share/ochusha/ochusha32.xpm
+share/ochusha/ochusha48.png
+share/ochusha/ochusha48.xpm
+@dirrm share/ochusha