Fix the build with new gtk20.

Reported by:	pointyhat-exp


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9747 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 186 insertions, 0 deletions

diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
new file mode 100644
index 000000000..c4c20eac3
--- /dev/null
+++ b/japanese/ochusha/Makefile
@@ -0,0 +1,49 @@
+# 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
+
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
+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 000000000..d25a01dcb
--- /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 000000000..b428f66b7
--- /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 000000000..8ac7a68fa
--- /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 000000000..014829e9d
--- /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 000000000..132493451
--- /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 000000000..b51d43fee
--- /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
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index 72569d36a..6a979c052 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -28,5 +28,7 @@ MAN1=	gdmap.1
 post-patch:
 	@${REINPLACE_CMD} -e 's,<sys/vfs.h>,<sys/statvfs.h>,' \
 		${WRKSRC}/src/gui_main.c
+	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
new file mode 100644
index 000000000..c510461a7
--- /dev/null
+++ b/x11/trayer/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for:   trayer
+# Date created: Aug 21, 2006
+# Whom:         Alexey Mikhailov <karma@ez.pereslavl.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	trayer
+PORTVERSION=	1.0
+PORTREVISION=	1
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_DEBIAN}
+MASTER_SITE_SUBDIR=	pool/main/t/trayer
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Lightweight GTK2-based systray for UNIX desktop
+
+USE_GNOME=	gtk20 glib20 pango atk
+USE_ICONV=	yes
+USE_X_PREFIX=	yes
+
+USE_GMAKE=	yes
+MAKE_ARGS=	"PREFIX=${X11BASE}"
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README CREDITS CHANGELOG
+.endif
+
+PLIST_FILES=	bin/trayer
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/Makefile.common
+
+post-install:
+	${MKDIR} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11/trayer/distinfo b/x11/trayer/distinfo
new file mode 100644
index 000000000..d910badd2
--- /dev/null
+++ b/x11/trayer/distinfo
@@ -0,0 +1,3 @@
+SIZE (trayer_1.0.orig.tar.gz) = 29713
+MD5 (trayer_1.0.orig.tar.gz) = e1b0b6464f991f2c296561e377585867
+SHA256 (trayer_1.0.orig.tar.gz) = 64f3b7040a7a563ca4b6924efd950f10c928af7f3535b6f4a00f8bbe0b19484d
diff --git a/x11/trayer/pkg-descr b/x11/trayer/pkg-descr
new file mode 100644
index 000000000..efcaa7660
--- /dev/null
+++ b/x11/trayer/pkg-descr
@@ -0,0 +1,9 @@
+trayer is small program designed to provide systray functionality
+present in GNOME/KDE desktop enviroments for window managers 
+which doesn't support that function. It's similar to other 
+applications such as 'peksystray' and 'docker'.
+
+trayer code was extracted from fbpanel application, you can find more
+about it on it's homepage
+
+WWW: http://fbpanel.sourceforge.net/