Import of pkgsrc-2016Q3

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"
+ 	

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"
+ 

databases/pgadmin3/patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp

@@ -1,14 +0,0 @@
-$NetBSD: patch-pgadmin_ctl_ctlMenuToolbar.cpp,v 1.1 2015/08/05 15:29:00 richard Exp $
-Resolved an assertion error opening the plugin popup menu
-for wxWidgets 3.0 (upstream commit b75c57f69e4799507622b8d2f9820cda2bf154a3)
---- pgadmin/ctl/ctlMenuToolbar.cpp.orig	2014-01-27 12:11:43.000000000 +0000
-+++ pgadmin/ctl/ctlMenuToolbar.cpp
-@@ -109,7 +109,7 @@ void ctlMenuButton::DoProcessLeftClick(w
- 		menu_pos.y = button_size.GetHeight();
- 	}
- 
--	PopupMenu(m_menu, menu_pos);
-+	DoPopupMenu(m_menu, menu_pos.x, menu_pos.y);
- }
- 
-