Import of pkgsrc-2016Q3

databases/pgadmin3/Makefile

@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.49 2015/08/05 15:29:00 richard Exp $
+# $NetBSD: Makefile,v 1.54 2016/08/03 10:22:36 adam Exp $
 
-DISTNAME=	pgadmin3-1.20.0
+DISTNAME=	pgadmin3-1.22.0
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/}
 
-MAINTAINER=	joerg@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pgadmin.org/
 COMMENT=	Graphical PostgreSQL client and administration tool
 LICENSE=	postgresql-license
@@ -17,11 +18,15 @@ 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}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=	--with-arch-${MACHINE_ARCH}
+.endif
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"

databases/pgadmin3/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/10/13 12:06:30 richard Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/03/16 04:46:24 richard Exp $
 bin/pgadmin3
 share/pgadmin3/branding/branding.ini
 share/pgadmin3/docs/cs_CZ/hints/autovacuum.html
@@ -108,6 +108,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-3.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-4.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/basic.css
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/classic.css
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-bright.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-close.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment.png
@@ -126,6 +127,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-filter.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-sort.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/guru-connect.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery-1.11.1.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/locks.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/logfile.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/main.png
@@ -191,6 +193,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-upgrade.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/status.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/transaction.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore.js
+${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore-1.3.1.js
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/up-pressed.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/up.png
 ${PLIST.doc}share/pgadmin3/docs/en_US/_static/websupport.js

databases/pgadmin3/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2015/08/05 15:29:00 richard Exp $
+$NetBSD: distinfo,v 1.15 2016/03/16 04:46:24 richard Exp $
 
-SHA1 (pgadmin3-1.20.0.tar.gz) = 70ade343c286ef4413961317d41477b47aac675a
-RMD160 (pgadmin3-1.20.0.tar.gz) = 3f2902b68a915d88bc93c10b897f4c163459b03e
-Size (pgadmin3-1.20.0.tar.gz) = 14394997 bytes
-SHA1 (patch-pgadmin_ctl_ctlMenuToolbar.cpp) = c3c2ed84d9cd2d06bb1f63af86008c24b2c39d3f
+SHA1 (pgadmin3-1.22.0.tar.gz) = 3091b0bdc5156e54197f157a86240e47af9becc2
+RMD160 (pgadmin3-1.22.0.tar.gz) = 6c5c8c28c0aaa7cd9720a6089fafe770210f002c
+SHA512 (pgadmin3-1.22.0.tar.gz) = db16ac1b92e95a6da51be973b6833e53aed4c1d8740c8bccbfd778b0c3d3a4158fb13107761e0a39227aea87360be3b297ebc8809ac8ca5102d673935a33727c
+Size (pgadmin3-1.22.0.tar.gz) = 14668096 bytes
+SHA1 (patch-configure) = 52be492c191e3a249bcbf88075f0f2a2f1a0f76a

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);
- }
- 
-