- Unbreak.

- Remove ability to build non-unicode version which is not supported by pgadmin3
developers.
- Bump PORTREVISION.

2 files changed, 25 insertions, 17 deletions

diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile
index 78aea7cd9909..2dd649ad03fc 100644
--- a/databases/pgadmin3-12/Makefile
+++ b/databases/pgadmin3-12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pgadmin3
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src
@@ -15,33 +15,23 @@ MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	PostgreSQL database design and management system
 
+LIB_DEPENDS+=	wx_gtk2u_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
+
 USE_PGSQL=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-wx=${X11BASE}
+CONFIGURE_ARGS=	--with-wx=${X11BASE}\
+		--with-wx-config=wxgtk2u-2.5-config
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
 
-post-patch:
-	@${FIND} ${WRKSRC}/src \( -name '*.cpp' -or -name '*.h' \) -print0 | \
-		${XARGS} -0 ${REINPLACE_CMD} -e 's,wxNotifyEvent,wxCommandEvent,g'
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_UNICODE)
 .if ${OSVERSION} < 500000
 IGNORE=		Systems prior to FreeBSD 5.0 currently out of support
-.else
-LIB_DEPENDS+=	wx_gtk2u_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
-CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.5-config
-.endif
-.else
-LIB_DEPENDS+=	wx_gtk2_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
-CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.5-config
-.endif # WITH_UNICODE
-
-.if ${OSVERSION} >= 502000
-BROKEN=		"Please use binary version distributed by http://pgadmin.org/"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/pgadmin3-12/pkg-message b/databases/pgadmin3-12/pkg-message
new file mode 100644
index 000000000000..b0d67fc88e44
--- /dev/null
+++ b/databases/pgadmin3-12/pkg-message
@@ -0,0 +1,18 @@
+===========================================================================
+== NOTICE                                                                ==
+==                                                                       ==
+
+Make sure that your system is older than
+
+- 600014 for 6.0-CURRENT
+
+or please apply this patch: http://people.freebsd.org/~fjoe/vswprintf.c.diff
+and rebuild libc.
+
+You need to use either C or Latin-1 locale OR use locale with multibyte
+encoding (any UTF-8 locale, Big5 or EUC locales). pgadmin3 will not work
+in single-byte non-Latin-1 locales, for example ru_RU.KOI8-R.
+Use ru_RU.UTF-8 in the example above instead.
+
+==                                                                       ==
+===========================================================================