diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2004-11-25 20:07:36 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2004-11-25 20:07:36 +0000 |
| commit | 8c524bb5e80f1a04c1cd1f271387423e05f8ef2c (patch) | |
| tree | d9f07eeac885fff891d32d38b6bbddbfa8d86ecb /databases/pgadmin3-12 | |
| parent | Update wxgtk2*-devel to 2.5.3 (diff) | |
Chase wxgtk2*-devel libraries version bump.
Notes
Notes:
svn path=/head/; revision=122429
Diffstat (limited to 'databases/pgadmin3-12')
| -rw-r--r-- | databases/pgadmin3-12/Makefile | 4 | ||||
| -rw-r--r-- | databases/pgadmin3-12/files/patch-configure | 37 |
2 files changed, 38 insertions, 3 deletions
diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile index ee56caba78c8..b196e09154ef 100644 --- a/databases/pgadmin3-12/Makefile +++ b/databases/pgadmin3-12/Makefile @@ -36,11 +36,11 @@ post-patch: .if ${OSVERSION} < 500000 IGNORE= Systems prior to FreeBSD 5.0 currently out of support .else -LIB_DEPENDS+= wx_gtk2u_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel +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.2:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel +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 diff --git a/databases/pgadmin3-12/files/patch-configure b/databases/pgadmin3-12/files/patch-configure index 45fe8d0cd755..b7e190df8f3c 100644 --- a/databases/pgadmin3-12/files/patch-configure +++ b/databases/pgadmin3-12/files/patch-configure @@ -1,5 +1,18 @@ --- configure.orig Fri Nov 28 17:36:36 2003 -+++ configure Mon Jun 28 01:33:07 2004 ++++ configure Fri Nov 26 00:24:05 2004 +@@ -4844,10 +4844,10 @@ + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + WX_HOME=/usr/local/wx2 +- if test ! -f "${WX_HOME}/include/wx/wx.h" ++ if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h" + then + WX_HOME=/usr/local +- if test ! -f "${WX_HOME}/include/wx/wx.h" ++ if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h" + then + WX_HOME=/usr + fi @@ -5017,7 +5017,7 @@ LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION} -lwx_gtk2d_xrc-${WX_VERSION}" LIBS="$LIBS $WX_NEW_LDFLAGS" @@ -29,3 +42,25 @@ case "${host}" in *-apple-darwin*) CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti" +@@ -5048,18 +5053,18 @@ + ;; + esac + wx_wx_h="yes" +- if test ! -f "${WX_HOME}/include/wx/version.h" ++ if test ! -f "${WX_HOME}/include/wx-2.5/wx/version.h" + then + wx_wx_h="no" + fi +- if test ! -f "${WX_HOME}/include/wx/stc/stc.h" ++ if test ! -f "${WX_HOME}/include/wx-2.5/wx/stc/stc.h" + then + { { echo "$as_me:$LINENO: error: you need to install the stc package from wxWindows/contrib/src/stc" >&5 + echo "$as_me: error: you need to install the stc package from wxWindows/contrib/src/stc" >&2;} + { (exit 1); exit 1; }; } + wx_wx_h="no" + fi +- if test ! -f "${WX_HOME}/include/wx/xrc/xmlres.h" ++ if test ! -f "${WX_HOME}/include/wx-2.5/wx/xrc/xmlres.h" + then + { { echo "$as_me:$LINENO: error: you need to install the xrc package from wxWindows/contrib/src/xrc" >&5 + echo "$as_me: error: you need to install the xrc package from wxWindows/contrib/src/xrc" >&2;} |