diff options
| author | fjoe <fjoe@FreeBSD.org> | 2005-02-24 03:28:13 +0800 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2005-02-24 03:28:13 +0800 |
| commit | 8ec059e08ad840953a063bb04221f97fc7a7ae1a (patch) | |
| tree | fc88f0e9ab8e4879990c0d26da5eba3aa31843d3 /databases/pgadmin3-12 | |
| parent | bb03208a147da735650f35444547ace1fa281f9e (diff) | |
| download | freebsd-ports-gnome-8ec059e08ad840953a063bb04221f97fc7a7ae1a.tar.gz freebsd-ports-gnome-8ec059e08ad840953a063bb04221f97fc7a7ae1a.tar.zst freebsd-ports-gnome-8ec059e08ad840953a063bb04221f97fc7a7ae1a.zip | |
- Provide a patch that allows to build working non-Unicode version.
- Add back 4.x support (non-Unicode version only).
- Bump PORTREVISION.
Diffstat (limited to 'databases/pgadmin3-12')
| -rw-r--r-- | databases/pgadmin3-12/Makefile | 24 | ||||
| -rw-r--r-- | databases/pgadmin3-12/files/patch-src-utils-utffile.cpp | 16 | ||||
| -rw-r--r-- | databases/pgadmin3-12/pkg-message-unicode (renamed from databases/pgadmin3-12/pkg-message) | 0 |
3 files changed, 34 insertions, 6 deletions
diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile index 2dd649ad03fc..2b8e404b505e 100644 --- a/databases/pgadmin3-12/Makefile +++ b/databases/pgadmin3-12/Makefile @@ -7,7 +7,7 @@ PORTNAME= pgadmin3 PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src @@ -15,13 +15,10 @@ 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}\ - --with-wx-config=wxgtk2u-2.5-config +CONFIGURE_ARGS= --with-wx=${X11BASE} CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}" @@ -31,7 +28,22 @@ post-install: .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 -IGNORE= Systems prior to FreeBSD 5.0 currently out of support +WITHOUT_UNICODE= yes +.endif + +pre-everything:: +.if !defined(WITHOUT_UNICODE) + @${ECHO_MSG} "You can build non-Unicode version by defining WITHOUT_UNICODE." .endif +.if !defined(WITHOUT_UNICODE) +LIB_DEPENDS+= wx_gtk2u_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel +CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.5-config +PKGNAMESUFFIX= -unicode +PKGMESSAGE= ${PKGDIR}/pkg-message-unicode +.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 # WITHOUT_UNICODE + .include <bsd.port.post.mk> diff --git a/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp b/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp new file mode 100644 index 000000000000..ca3579afcf78 --- /dev/null +++ b/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp @@ -0,0 +1,16 @@ +--- src/utils/utffile.cpp.orig Thu Feb 24 00:41:36 2005 ++++ src/utils/utffile.cpp Thu Feb 24 00:41:18 2005 +@@ -83,7 +83,12 @@ + if (decr) + Seek(-decr, wxFromCurrent); + +- m_conversion->MB2WC((wchar_t*)(wxChar*)wxStringBuffer(str, nLen), (const char*)buffer, (size_t)(nLen+1)); ++#if wxUSE_UNICODE ++ size_t buf_len = nLen; ++#else ++ size_t buf_len = nLen * sizeof(wchar_t); ++#endif ++ m_conversion->MB2WC((wchar_t*)(wxChar*)wxStringBuffer(str, buf_len), (const char*)buffer, (size_t)(nLen+1)); + } + else + str = (wxChar*)buffer; diff --git a/databases/pgadmin3-12/pkg-message b/databases/pgadmin3-12/pkg-message-unicode index b0d67fc88e44..b0d67fc88e44 100644 --- a/databases/pgadmin3-12/pkg-message +++ b/databases/pgadmin3-12/pkg-message-unicode |