5 files changed, 8 insertions, 27 deletions

diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index 10a7f6f85088..7e9d6d8c1610 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	madedit
-PORTVERSION=	0.2.8
-PORTREVISION=	2
+PORTVERSION=	0.2.9
 CATEGORIES=	editors
 MASTER_SITES=	SF
 
@@ -23,6 +22,7 @@ LIB_DEPENDS+=	boost_regex:${PORTSDIR}/devel/boost
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 CONFIGURE_ENV+=	PKG_CONFIG="${PKG_CONFIG}" glib_gtk2_CFLAGS="${glib_gtk2_CFLAGS}" glib_gtk2_LIBS="${glib_gtk2_LIBS}"
+CXXFLAGS+=	${glib_gtk2_CFLAGS}
 
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 glib_gtk2_CFLAGS=`${PKG_CONFIG} --cflags gtk+-2.0`
diff --git a/editors/madedit/distinfo b/editors/madedit/distinfo
index b79420c12533..c60b08645808 100644
--- a/editors/madedit/distinfo
+++ b/editors/madedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (madedit-0.2.8.tar.gz) = 5ff9c404b3249fd5b79dae444eb8a515
-SHA256 (madedit-0.2.8.tar.gz) = a4e19765d2248cf06337c47d0ac961b948d9b57ad4adf99d22ed3ff41bec3a46
-SIZE (madedit-0.2.8.tar.gz) = 1343878
+MD5 (madedit-0.2.9.tar.gz) = d5530767a363ca7e9135bd046a227f91
+SHA256 (madedit-0.2.9.tar.gz) = db97d926b11fa339995434098044d85866151c123742c4de74f5ab5dc391955b
+SIZE (madedit-0.2.9.tar.gz) = 1703993
diff --git a/editors/madedit/files/patch-Makefile.in b/editors/madedit/files/patch-Makefile.in
deleted file mode 100644
index 266567787f08..000000000000
--- a/editors/madedit/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.in.orig	2007-10-07 09:14:29.000000000 -0700
-+++ ./Makefile.in	2007-11-12 11:24:00.142449950 -0800
-@@ -297,7 +297,7 @@
- target_alias = @target_alias@
- SUBDIRS = syntax po
- INCLUDES = -I$(top_srcdir)/wxAUI/include -I$(top_srcdir)/charset-detector/include -I$(top_srcdir)/charset-detector/src -I$(top_srcdir)/charset-detector/src/tables
--madedit_CXXFLAGS = -DwxUSE_AUI=1 -DWXDLLIMPEXP_AUI= -DWXDLLIMPEXP_FWD_AUI= -DDATA_DIR=\"${datadir}\"
-+madedit_CXXFLAGS = -DwxUSE_AUI=1 -DWXDLLIMPEXP_AUI= -DWXDLLIMPEXP_FWD_AUI= -DDATA_DIR=\"${datadir}\" $(glib_gtk2_CFLAGS)
- madedit_SOURCES = src/MadAboutDialog.cpp \
- 	src/MadAboutDialog.h \
- 	src/MadCommand.h \
diff --git a/editors/madedit/files/patch-src__MadEditFrame.cpp b/editors/madedit/files/patch-src__MadEditFrame.cpp
deleted file mode 100644
index 93948d87f5aa..000000000000
--- a/editors/madedit/files/patch-src__MadEditFrame.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/MadEditFrame.cpp.orig	2007-10-08 02:37:26.000000000 -0700
-+++ ./src/MadEditFrame.cpp	2009-02-12 17:39:21.810385103 -0800
-@@ -2158,7 +2158,7 @@
- #ifndef __WXMSW__

-     // it will crash randomly under linux.

-     // so we must call exit() to quit the app.

--    exit(0);

-+    _Exit(0);

- #else

-     extern HANDLE g_Mutex;

-     if(g_Mutex)

diff --git a/editors/madedit/pkg-plist b/editors/madedit/pkg-plist
index 9ae24c976e5e..9bfc504a53dd 100644
--- a/editors/madedit/pkg-plist
+++ b/editors/madedit/pkg-plist
@@ -1,6 +1,7 @@
 bin/madedit
 share/locale/zh_CN/LC_MESSAGES/madedit.mo
 share/locale/zh_TW/LC_MESSAGES/madedit.mo
+share/locale/ja_JP/LC_MESSAGES/madedit.mo
 share/locale/it_IT/LC_MESSAGES/madedit.mo
 share/pixmaps/madedit.xpm
 %%DATADIR%%/syntax/extension.list
@@ -49,5 +50,7 @@ share/applications/madedit.desktop
 @dirrmtry share/applications
 @dirrmtry %%DATADIR%%/syntax
 @dirrmtry %%DATADIR%%
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
 @dirrmtry share/locale/it_IT/LC_MESSAGES
 @dirrmtry share/locale/it_IT