aboutsummaryrefslogtreecommitdiffstats
path: root/databases/pgadmin3-12
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2003-11-05 06:05:54 +0800
committerfjoe <fjoe@FreeBSD.org>2003-11-05 06:05:54 +0800
commitfb8a89004b445ca0e9d4e995a2e8c9c121add4e8 (patch)
tree150babaf8b020065bc98085211b8ea0e1ea7e830 /databases/pgadmin3-12
parent120cee2b41029759f9917a69703f6a1af28f8bac (diff)
downloadfreebsd-ports-gnome-fb8a89004b445ca0e9d4e995a2e8c9c121add4e8.tar.gz
freebsd-ports-gnome-fb8a89004b445ca0e9d4e995a2e8c9c121add4e8.tar.zst
freebsd-ports-gnome-fb8a89004b445ca0e9d4e995a2e8c9c121add4e8.zip
Chase wxgtk library name change.
Use wxgtk2. Bump PORTREVISION.
Diffstat (limited to 'databases/pgadmin3-12')
-rw-r--r--databases/pgadmin3-12/Makefile17
-rw-r--r--databases/pgadmin3-12/files/patch-configure15
2 files changed, 21 insertions, 11 deletions
diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile
index 6356c7e6c0aa..48749d730d5d 100644
--- a/databases/pgadmin3-12/Makefile
+++ b/databases/pgadmin3-12/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pgadmin3
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= pgadmin3/release/src
@@ -14,9 +15,7 @@ MASTER_SITE_SUBDIR= pgadmin3/release/src
MAINTAINER= fjoe@FreeBSD.org
COMMENT= PostgreSQL database design and management system
-LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} \
- wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel \
- wx_gtk_stc.0:${PORTSDIR}/x11-toolkits/wxgtk-contrib
+LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-wx=${X11BASE}
@@ -25,4 +24,14 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
POSTGRESQL_PORT?= databases/postgresql-client
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+#.if ${OSVERSION} < 500000
+LIB_DEPENDS+= wx_gtk2_stc-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-contrib
+CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.4-config
+#.else
+#LIB_DEPENDS+= wx_gtk2u_stc-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib
+#CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.4-config
+#.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/pgadmin3-12/files/patch-configure b/databases/pgadmin3-12/files/patch-configure
index 06a1ba6c7894..15f3ec322d35 100644
--- a/databases/pgadmin3-12/files/patch-configure
+++ b/databases/pgadmin3-12/files/patch-configure
@@ -1,17 +1,18 @@
---- configure.orig Fri Sep 26 16:14:11 2003
-+++ configure Tue Nov 4 03:24:50 2003
-@@ -5033,13 +5033,17 @@
+--- configure.orig Tue Oct 14 20:10:14 2003
++++ configure Wed Nov 5 03:55:28 2003
+@@ -5033,13 +5033,18 @@
LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION} -lwx_gtk_xrc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
-+ *wx_gtk*)
-+ LIBS="$LIBS -lwx_gtk_stc -lwx_gtk_xrc"
-+ LIBS="$LIBS $WX_NEW_LDFLAGS $PTHREAD_LIBS"
-+ ;;
++ *wx_gtk2-*)
++ LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION} -lwx_gtk2_xrc-${WX_VERSION}"
++ LIBS="$LIBS $WX_NEW_LDFLAGS"
++ ;;
*)
;;
esac
fi
++ LIBS="$LIBS $PTHREAD_LIBS"
WX_NEW_CPPFLAGS=`${WX_CONFIG} --cxxflags`
- CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include"