sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Provide a patch that allows to build working non-Unicode version.

Browse source 
- Add back 4.x support (non-Unicode version only).
- Bump PORTREVISION.
This commit is contained in:
Max Khon 2005-02-23 19:28:13 +00:00
parent 571a685031
commit dc0eeebdd1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=129620
6 changed files with 68 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
databases/pgadmin3-12/Makefile
View file

@ -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>

16
databases/pgadmin3-12/files/patch-src-utils-utffile.cpp Normal file
View file

@ -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;

0
databases/pgadmin3-12/pkg-message → databases/pgadmin3-12/pkg-message-unicode
View file

24
databases/pgadmin3/Makefile
View file

@ -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>

16
databases/pgadmin3/files/patch-src-utils-utffile.cpp Normal file
View file

@ -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;

0
databases/pgadmin3/pkg-message → databases/pgadmin3/pkg-message-unicode
View file