diff options
author | dbj <dbj@pkgsrc.org> | 2016-02-16 03:45:18 +0000 |
---|---|---|
committer | dbj <dbj@pkgsrc.org> | 2016-02-16 03:45:18 +0000 |
commit | da1b54916d7d7d326a7eb1b5c5b7a8086a6ce15f (patch) | |
tree | c62e15adeced6449def3f684ef8aa242dc04efde /databases/pgadmin3 | |
parent | 86507f1d7f07ace227fd60e64a89900e73e4c513 (diff) | |
download | pkgsrc-da1b54916d7d7d326a7eb1b5c5b7a8086a6ce15f.tar.gz |
fixes to build with wxGTK30 when wx-config is not in ${PREFIX}/bin
Diffstat (limited to 'databases/pgadmin3')
-rw-r--r-- | databases/pgadmin3/Makefile | 4 | ||||
-rw-r--r-- | databases/pgadmin3/distinfo | 3 | ||||
-rw-r--r-- | databases/pgadmin3/patches/manual-acinclude.m4 | 44 | ||||
-rw-r--r-- | databases/pgadmin3/patches/patch-configure | 44 |
4 files changed, 91 insertions, 4 deletions
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 4d750e5813d..b8050f18b09 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2016/02/16 01:07:22 dbj Exp $ +# $NetBSD: Makefile,v 1.51 2016/02/16 03:45:18 dbj Exp $ DISTNAME= pgadmin3-1.20.0 CATEGORIES= databases @@ -17,8 +17,6 @@ REPLACE_SH= pgadmin/ver_svn.sh .include "options.mk" -CONFIGURE_ARGS+= --with-wx=${BUILDLINK_PREFIX.wxGTK30} -CONFIGURE_ARGS+= --with-wx-version=3.0 CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-libxslt=${BUILDLINK_PREFIX.libxslt} diff --git a/databases/pgadmin3/distinfo b/databases/pgadmin3/distinfo index 372899f0e33..0f26eda8b39 100644 --- a/databases/pgadmin3/distinfo +++ b/databases/pgadmin3/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 01:56:24 agc Exp $ +$NetBSD: distinfo,v 1.14 2016/02/16 03:45:18 dbj Exp $ SHA1 (pgadmin3-1.20.0.tar.gz) = 70ade343c286ef4413961317d41477b47aac675a RMD160 (pgadmin3-1.20.0.tar.gz) = 3f2902b68a915d88bc93c10b897f4c163459b03e SHA512 (pgadmin3-1.20.0.tar.gz) = 83521a16d60bf8c9cffb03e4fb401a31e28f764c31608c0b223f7c88a14a09f665c976f3472debd4ad8b6cd54f0fbd2b8de352c296180e6ea6f8088cb45447bc Size (pgadmin3-1.20.0.tar.gz) = 14394997 bytes +SHA1 (patch-configure) = 52be492c191e3a249bcbf88075f0f2a2f1a0f76a SHA1 (patch-pgadmin_ctl_ctlMenuToolbar.cpp) = c3c2ed84d9cd2d06bb1f63af86008c24b2c39d3f diff --git a/databases/pgadmin3/patches/manual-acinclude.m4 b/databases/pgadmin3/patches/manual-acinclude.m4 new file mode 100644 index 00000000000..71e4a812c5f --- /dev/null +++ b/databases/pgadmin3/patches/manual-acinclude.m4 @@ -0,0 +1,44 @@ +$NetBSD: manual-acinclude.m4,v 1.1 2016/02/16 03:45:19 dbj Exp $ + +Remove code that insists wx-config is in a directory named bin + +--- acinclude.m4.orig 2013-07-19 08:53:33.000000000 +0000 ++++ acinclude.m4 +@@ -87,15 +87,6 @@ AC_DEFUN([LOCATE_WXWIDGETS], + WX_CONFIG=${WX_HOME}/bin/wx-config + ], + [ +- WX_HOME=/usr/local/wx2 +- if test ! -f "${WX_HOME}/bin/wx-config" +- then +- WX_HOME=/usr/local +- if test ! -f "${WX_HOME}/bin/wx-config" +- then +- WX_HOME=/usr +- if test ! -f "${WX_HOME}/bin/wx-config" +- then + # Search the path + AC_PATH_PROGS(WX_CONFIG, wx-config) + if test ! -f "${WX_CONFIG}" +@@ -104,10 +95,6 @@ AC_DEFUN([LOCATE_WXWIDGETS], + else + WX_HOME=`${WX_CONFIG} --prefix` + fi +- fi +- fi +- fi +- WX_CONFIG=${WX_HOME}/bin/wx-config + ]) + ]) + +@@ -730,9 +717,8 @@ AC_SUBST(EDB_LIBPQ) + ################################################ + AC_DEFUN([SETUP_WXWIDGETS], + [ +- if test -n "${WX_HOME}" ++ if test -n "${WX_CONFIG}" + then +- LDFLAGS="$LDFLAGS -L${WX_HOME}/lib" + WX_OLD_LDFLAGS="$LDFLAGS" + WX_OLD_CPPFLAGS="$CPPFLAGS" + diff --git a/databases/pgadmin3/patches/patch-configure b/databases/pgadmin3/patches/patch-configure new file mode 100644 index 00000000000..6caeb3aa808 --- /dev/null +++ b/databases/pgadmin3/patches/patch-configure @@ -0,0 +1,44 @@ +$NetBSD: patch-configure,v 1.3 2016/02/16 03:45:19 dbj Exp $ + +Remove code that insists wx-config is in a directory named bin + +--- configure.orig 2014-12-15 15:10:17.000000000 +0000 ++++ configure +@@ -6466,15 +6466,6 @@ if test "${with_wx+set}" = set; then : + + else + +- WX_HOME=/usr/local/wx2 +- if test ! -f "${WX_HOME}/bin/wx-config" +- then +- WX_HOME=/usr/local +- if test ! -f "${WX_HOME}/bin/wx-config" +- then +- WX_HOME=/usr +- if test ! -f "${WX_HOME}/bin/wx-config" +- then + # Search the path + for ac_prog in wx-config + do +@@ -6527,10 +6518,6 @@ done + else + WX_HOME=`${WX_CONFIG} --prefix` + fi +- fi +- fi +- fi +- WX_CONFIG=${WX_HOME}/bin/wx-config + + fi + +@@ -6557,9 +6544,8 @@ $as_echo "failed" >&6; } + $as_echo "ok" >&6; } + + +- if test -n "${WX_HOME}" ++ if test -n "${WX_CONFIG}" + then +- LDFLAGS="$LDFLAGS -L${WX_HOME}/lib" + WX_OLD_LDFLAGS="$LDFLAGS" + WX_OLD_CPPFLAGS="$CPPFLAGS" + |