diff options
Diffstat (limited to 'databases/pgadmin3-12')
| -rw-r--r-- | databases/pgadmin3-12/Makefile | 8 | ||||
| -rw-r--r-- | databases/pgadmin3-12/files/patch-configure | 26 |
2 files changed, 22 insertions, 12 deletions
diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile index b686a27ac685..5c28ed60ae70 100644 --- a/databases/pgadmin3-12/Makefile +++ b/databases/pgadmin3-12/Makefile @@ -34,16 +34,16 @@ pre-everything:: .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 +LIB_DEPENDS+= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib +CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.6-config PKGNAMESUFFIX= -unicode PKGMESSAGE= ${PKGDIR}/pkg-message-unicode post-install: @${CAT} ${PKGMESSAGE} .else -LIB_DEPENDS+= wx_gtk2_stc-2.5.3:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel -CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.5-config +LIB_DEPENDS+= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib +CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.6-config .endif # WITHOUT_UNICODE .include <bsd.port.post.mk> diff --git a/databases/pgadmin3-12/files/patch-configure b/databases/pgadmin3-12/files/patch-configure index ecf91d0e2b9d..18af8abfe59d 100644 --- a/databases/pgadmin3-12/files/patch-configure +++ b/databases/pgadmin3-12/files/patch-configure @@ -1,13 +1,23 @@ --- configure.orig Tue Nov 30 02:09:55 2004 -+++ configure Wed Jan 5 19:00:36 2005 -@@ -5175,6 +5175,10 @@ - LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}" - LIBS="$LIBS $WX_NEW_LDFLAGS" ++++ configure Fri May 6 00:59:54 2005 +@@ -4996,6 +4996,9 @@ + # Which version of wxWindows is this? + WX_VERSION=`${WX_CONFIG} --version` + case "${WX_VERSION}" in ++ 2.6*) ++ WX_VERSION="2.6" ++ ;; + 2.5*) + WX_VERSION="2.5" + ;; +@@ -5173,6 +5176,10 @@ ;; -+ *wx_gtk2_core*) -+ LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION}" + *wx_gtk2u_core*) + LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}" + LIBS="$LIBS $WX_NEW_LDFLAGS" + ;; - *wx_gtkud-*) - LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION}" ++ *wx_gtk2_core*) ++ LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION}" LIBS="$LIBS $WX_NEW_LDFLAGS" + ;; + *wx_gtkud-*) |