aboutsummaryrefslogtreecommitdiffstats
path: root/databases/pgadmin3
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2005-05-13 01:45:30 +0800
committerfjoe <fjoe@FreeBSD.org>2005-05-13 01:45:30 +0800
commit8042e6ea5d97f9fb6a5181a58a8a0e758af39392 (patch)
tree4facc960aaefa092a5f31ef5eb5e8c88e2b6523d /databases/pgadmin3
parentedacad0e4e492a9d385c5db52a3b68d88868e5d6 (diff)
downloadfreebsd-ports-graphics-8042e6ea5d97f9fb6a5181a58a8a0e758af39392.tar.gz
freebsd-ports-graphics-8042e6ea5d97f9fb6a5181a58a8a0e758af39392.tar.zst
freebsd-ports-graphics-8042e6ea5d97f9fb6a5181a58a8a0e758af39392.zip
Finish repo-move of wxgtk2*-devel ports to wxgtk26* and update to the
latest stable release wxWidgets 2.6.0.
Diffstat (limited to 'databases/pgadmin3')
-rw-r--r--databases/pgadmin3/Makefile8
-rw-r--r--databases/pgadmin3/files/patch-configure26
2 files changed, 22 insertions, 12 deletions
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index b686a27ac68..5c28ed60ae7 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/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/files/patch-configure b/databases/pgadmin3/files/patch-configure
index ecf91d0e2b9..18af8abfe59 100644
--- a/databases/pgadmin3/files/patch-configure
+++ b/databases/pgadmin3/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-*)