[112213] trunk/dports/aqua/pgAdmin3

[mojca at macports.org]

Revision: 112213
          https://trac.macports.org/changeset/112213
Author:   mojca at macports.org
Date:     2013-10-15 02:42:53 -0700 (Tue, 15 Oct 2013)
Log Message:
-----------
pgAdmin3: upgrade to 1.18.0, declare Permissive licence (#40608, #40694, #40743)

Modified Paths:
--------------
    trunk/dports/aqua/pgAdmin3/Portfile

Removed Paths:
-------------
    trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff

Modified: trunk/dports/aqua/pgAdmin3/Portfile
===================================================================
--- trunk/dports/aqua/pgAdmin3/Portfile	2013-10-15 09:34:15 UTC (rev 112212)
+++ trunk/dports/aqua/pgAdmin3/Portfile	2013-10-15 09:42:53 UTC (rev 112213)
@@ -5,8 +5,7 @@
 PortGroup           wxWidgets 1.0
 
 name                pgAdmin3
-version             1.16.1
-revision            1
+version             1.18.0
 
 categories          aqua
 maintainers         jwa
@@ -18,6 +17,7 @@
                     OS X and Windows 2000/XP. This port is for OS X.
 
 platforms           macosx
+license             Permissive
 homepage            http://www.pgadmin.org/
 
 master_sites        http://developer.pgadmin.org/ftp/release/v${version}/src/ \
@@ -26,15 +26,11 @@
 
 distname            pgadmin3-${version}
 
-checksums           rmd160  b2830f6dcc9b22592cc196e27b2e844a3717e1a9 \
-                    sha256  d4ba243dc24dc28e6d0db4104baec373ab3bec11c6dc0e6cfa4bd665a5b7c28e
+checksums           rmd160  0f3a117c4f48abc8a61f2e652bdff4ebe4eb5a59 \
+                    sha256  58f29f5a380a49065e4b97bd9c8effd12ae99f464fa8834ba403baa2a658278d
 
 wxWidgets.use       wxWidgets-3.0
 
-# the wxStandardPaths patch can be removed with the next version of pgAdmin3
-# because the issue has been fixed in that already
-patchfiles          patch-wxStandardPaths.diff
-
 depends_lib         port:openssl \
                     port:libxml2 \
                     port:libxslt \

Deleted: trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff
===================================================================
--- trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff	2013-10-15 09:34:15 UTC (rev 112212)
+++ trunk/dports/aqua/pgAdmin3/files/patch-wxStandardPaths.diff	2013-10-15 09:42:53 UTC (rev 112213)
@@ -1,49 +0,0 @@
---- pgadmin/pgAdmin3.cpp.orig
-+++ pgadmin/pgAdmin3.cpp
-@@ -1304,7 +1304,7 @@ wxString pgAdmin3::LocatePath(const wxString &pathToFind, const bool isFile)
- 	// When using wxStandardPaths on OSX, wx default to the unix,
- 	// not to the mac variants. Therefore, we request wxStandardPathsCF
- 	// directly.
--	wxStandardPathsCF stdPaths ;
-+	wxStandardPaths stdPaths = wxStandardPaths::Get();
- 	dataDir = stdPaths.GetDataDir() ;
- 
- #else // other *ixes
---- pgadmin/utils/sysSettings.cpp.orig
-+++ pgadmin/utils/sysSettings.cpp
-@@ -740,7 +740,7 @@ wxString sysSettings::GetConfigFile(configFileName cfgname)
- {
- 	if (cfgname == PGPASS)
- 	{
--		wxStandardPaths stdp;
-+		wxStandardPaths stdp = wxStandardPaths::Get();
- 		wxString fname = stdp.GetUserConfigDir();
- #ifdef WIN32
- 		fname += wxT("\\postgresql");
-@@ -770,7 +770,7 @@ wxString sysSettings::GetFavouritesFile()
- {
- 	wxString s, tmp;
- 
--	wxStandardPaths stdp;
-+	wxStandardPaths stdp = wxStandardPaths::Get();
- 	tmp = stdp.GetUserConfigDir();
- #ifdef WIN32
- 	tmp += wxT("\\postgresql");
-@@ -791,7 +791,7 @@ wxString sysSettings::GetMacrosFile()
- {
- 	wxString s, tmp;
- 
--	wxStandardPaths stdp;
-+	wxStandardPaths stdp = wxStandardPaths::Get();
- 	tmp = stdp.GetUserConfigDir();
- #ifdef WIN32
- 	tmp += wxT("\\postgresql");
-@@ -812,7 +812,7 @@ wxString sysSettings::GetHistoryFile()
- {
- 	wxString s, tmp;
- 
--	wxStandardPaths stdp;
-+	wxStandardPaths stdp = wxStandardPaths::Get();
- 	tmp = stdp.GetUserConfigDir();
- #ifdef WIN32
- 	tmp += wxT("\\postgresql");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131015/f25062b5/attachment.html>