Index: head/databases/pgadmin3/pkg-message =================================================================== --- head/databases/pgadmin3/pkg-message (revision 129619) +++ head/databases/pgadmin3/pkg-message (nonexistent) @@ -1,18 +0,0 @@ -=========================================================================== -== 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. - -== == -=========================================================================== Property changes on: head/databases/pgadmin3/pkg-message ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/pgadmin3/Makefile =================================================================== --- head/databases/pgadmin3/Makefile (revision 129619) +++ head/databases/pgadmin3/Makefile (revision 129620) @@ -1,37 +1,49 @@ # New ports collection makefile for: pgadmin3 # Date created: November 4, 2003 # Whom: Max Khon # # $FreeBSD$ # 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 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}" post-install: @${CAT} ${PKGMESSAGE} .include .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 Property changes on: head/databases/pgadmin3/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/databases/pgadmin3/files/patch-src-utils-utffile.cpp =================================================================== --- head/databases/pgadmin3/files/patch-src-utils-utffile.cpp (nonexistent) +++ head/databases/pgadmin3/files/patch-src-utils-utffile.cpp (revision 129620) @@ -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; Property changes on: head/databases/pgadmin3/files/patch-src-utils-utffile.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/databases/pgadmin3/pkg-message-unicode =================================================================== --- head/databases/pgadmin3/pkg-message-unicode (nonexistent) +++ head/databases/pgadmin3/pkg-message-unicode (revision 129620) @@ -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. + +== == +=========================================================================== Property changes on: head/databases/pgadmin3/pkg-message-unicode ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/databases/pgadmin3-12/pkg-message =================================================================== --- head/databases/pgadmin3-12/pkg-message (revision 129619) +++ head/databases/pgadmin3-12/pkg-message (nonexistent) @@ -1,18 +0,0 @@ -=========================================================================== -== 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. - -== == -=========================================================================== Property changes on: head/databases/pgadmin3-12/pkg-message ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/pgadmin3-12/Makefile =================================================================== --- head/databases/pgadmin3-12/Makefile (revision 129619) +++ head/databases/pgadmin3-12/Makefile (revision 129620) @@ -1,37 +1,49 @@ # New ports collection makefile for: pgadmin3 # Date created: November 4, 2003 # Whom: Max Khon # # $FreeBSD$ # 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 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}" post-install: @${CAT} ${PKGMESSAGE} .include .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 Property changes on: head/databases/pgadmin3-12/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp =================================================================== --- head/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp (nonexistent) +++ head/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp (revision 129620) @@ -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; Property changes on: head/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/databases/pgadmin3-12/pkg-message-unicode =================================================================== --- head/databases/pgadmin3-12/pkg-message-unicode (nonexistent) +++ head/databases/pgadmin3-12/pkg-message-unicode (revision 129620) @@ -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. + +== == +=========================================================================== Property changes on: head/databases/pgadmin3-12/pkg-message-unicode ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property