diff --git a/Makefile b/Makefile index 188b3b9..7998231 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pgadmin3 -PORTVERSION= 1.12.0 +PORTVERSION= 1.14.0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src @@ -14,14 +14,12 @@ MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src MAINTAINER= fjoe@FreeBSD.org COMMENT= PostgreSQL database design and management system -CONFLICTS= pgadmin3-1.[12]* - MAKE_JOBS_SAFE= yes USE_GETTEXT= yes USE_PGSQL= yes USE_GMAKE= yes -IGNORE_WITH_PGSQL= 73 74 80 81 82 -DEFAULT_PGSQL_VER?= 83 +IGNORE_WITH_PGSQL= 82 83 +DIST_SUBDIR= postgresql GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" CPPFLAGS+= ${PTHREAD_CFLAGS} @@ -29,11 +27,19 @@ CONFIGURE_ARGS= --with-wx-version=${USE_WX} USE_GNOME= libxml2 libxslt USE_WX= 2.8 WX_COMPS= wx contrib -WX_CONF_ARGS= relative WX_UNICODE= yes +OPTIONS= POSTGIS "Add PostGIS plugin menu item" off + post-patch: @${REINPLACE_CMD} -e 's,/wx-config,/${WX_CONFIG:T},' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,/usr/bin/xterm,${LOCALBASE}/bin/xterm,' ${WRKSRC}/pgadmin/plugins.ini + @${REINPLACE_CMD} -e 's,/usr/bin/xterm,${LOCALBASE}/bin/xterm,' ${WRKSRC}/plugins.d/plugins.ini + @${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' ${WRKSRC}/pgadmin/ver_svn.sh + +.include + +.if defined(WITH_POSTGIS) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-plugins.d-plugins.ini +.endif .include diff --git a/distinfo b/distinfo index 61fe984..b32fb1d 100644 --- a/distinfo +++ b/distinfo @@ -1,2 +1,2 @@ -SHA256 (pgadmin3-1.12.0.tar.gz) = 59824bcb4bae5311b69e932dc46e6f831c228951fbd5ddcb2adb92330b95a85e -SIZE (pgadmin3-1.12.0.tar.gz) = 13258032 +SHA256 (postgresql/pgadmin3-1.14.0.tar.gz) = 396c2b0394496f23ea51c095b619eecc8c33473f0f483b795bfeb391e56cafd2 +SIZE (postgresql/pgadmin3-1.14.0.tar.gz) = 15041312 diff --git a/files/extra-patch-plugins.d-plugins.ini b/files/extra-patch-plugins.d-plugins.ini new file mode 100644 index 0000000..15f9524 --- /dev/null +++ b/files/extra-patch-plugins.d-plugins.ini @@ -0,0 +1,20 @@ +--- plugins.d/plugins.ini.orig 2011-10-23 22:55:30.000000000 +0400 ++++ plugins.d/plugins.ini 2011-10-23 22:57:56.000000000 +0400 +@@ -152,6 +152,17 @@ + Database=Yes + SetPassword=Yes + ++; ++; PostGIS shp2pgsql-gui (Unix): ++; ++Title=PostGIS Shapefile and DBF loader ++Command="$$PGBINDIR/shp2pgsql-gui" -h $$HOSTNAME -p $$PORT -U $$USERNAME -d $$DATABASE ++Description=Open a PostGIS ESRI Shapefile or Plain dbf loader to the current database. ++KeyFile=$$PGBINDIR/shp2pgsql-gui ++Platform=unix ++ServerType=postgresql ++Database=Yes ++SetPassword=Yes + ; + ; The following example shows how we might add a separator and additional plugin + ; diff --git a/pkg-plist b/pkg-plist index 16fd321..c8c904c 100644 --- a/pkg-plist +++ b/pkg-plist @@ -1,4 +1,5 @@ bin/pgadmin3 +bin/png2c %%DATADIR%%/branding/branding.ini %%DATADIR%%/docs/cs_CZ/appendices.html %%DATADIR%%/docs/cs_CZ/backup.html @@ -155,12 +156,18 @@ bin/pgadmin3 %%DATADIR%%/docs/en_US/hints/encoding-unicode.html %%DATADIR%%/docs/en_US/hints/fki.html %%DATADIR%%/docs/en_US/hints/instrumentation.html +%%DATADIR%%/docs/en_US/hints/instrumentation91_with.html +%%DATADIR%%/docs/en_US/hints/instrumentation91_without.html %%DATADIR%%/docs/en_US/hints/multiple.html %%DATADIR%%/docs/en_US/hints/object-editing.html %%DATADIR%%/docs/en_US/hints/pk.html %%DATADIR%%/docs/en_US/hints/saving-passwords.html +%%DATADIR%%/docs/en_US/hints/vacuum-full.html %%DATADIR%%/docs/en_US/hints/vacuum.html %%DATADIR%%/docs/en_US/hints/view-without-pk.html +%%DATADIR%%/docs/en_US/images/backup-2.png +%%DATADIR%%/docs/en_US/images/backup-3.png +%%DATADIR%%/docs/en_US/images/backup-4.png %%DATADIR%%/docs/en_US/images/backup.png %%DATADIR%%/docs/en_US/images/connect.png %%DATADIR%%/docs/en_US/images/debugger.png @@ -178,11 +185,13 @@ bin/pgadmin3 %%DATADIR%%/docs/en_US/images/manage-macros.png %%DATADIR%%/docs/en_US/images/no-hba.png %%DATADIR%%/docs/en_US/images/not-running.png -%%DATADIR%%/docs/en_US/images/options-display.png +%%DATADIR%%/docs/en_US/images/options-browser.png +%%DATADIR%%/docs/en_US/images/options-colours.png %%DATADIR%%/docs/en_US/images/options-general.png %%DATADIR%%/docs/en_US/images/options-logging.png -%%DATADIR%%/docs/en_US/images/options-pref.png -%%DATADIR%%/docs/en_US/images/options-query.png +%%DATADIR%%/docs/en_US/images/options-preferences.png +%%DATADIR%%/docs/en_US/images/options-querytool.png +%%DATADIR%%/docs/en_US/images/options-querytoolfiles.png %%DATADIR%%/docs/en_US/images/password.png %%DATADIR%%/docs/en_US/images/pgagent-jobdetails.png %%DATADIR%%/docs/en_US/images/pgagent-jobproperties.png @@ -198,7 +207,9 @@ bin/pgadmin3 %%DATADIR%%/docs/en_US/images/query.png %%DATADIR%%/docs/en_US/images/reporttool-html.png %%DATADIR%%/docs/en_US/images/reporttool-xml.png -%%DATADIR%%/docs/en_US/images/restore-content.png +%%DATADIR%%/docs/en_US/images/restore-2.png +%%DATADIR%%/docs/en_US/images/restore-3.png +%%DATADIR%%/docs/en_US/images/restore-4.png %%DATADIR%%/docs/en_US/images/restore.png %%DATADIR%%/docs/en_US/images/server.png %%DATADIR%%/docs/en_US/images/slony-create.png @@ -226,6 +237,8 @@ bin/pgadmin3 %%DATADIR%%/docs/en_US/options-tab3.html %%DATADIR%%/docs/en_US/options-tab4.html %%DATADIR%%/docs/en_US/options-tab5.html +%%DATADIR%%/docs/en_US/options-tab6.html +%%DATADIR%%/docs/en_US/options-tab7.html %%DATADIR%%/docs/en_US/options.html %%DATADIR%%/docs/en_US/password.html %%DATADIR%%/docs/en_US/pgadmin3.css @@ -305,10 +318,16 @@ bin/pgadmin3 %%DATADIR%%/docs/fr_FR/hints/encoding-unicode.html %%DATADIR%%/docs/fr_FR/hints/fki.html %%DATADIR%%/docs/fr_FR/hints/instrumentation.html +%%DATADIR%%/docs/fr_FR/hints/instrumentation91_with.html +%%DATADIR%%/docs/fr_FR/hints/instrumentation91_without.html %%DATADIR%%/docs/fr_FR/hints/multiple.html %%DATADIR%%/docs/fr_FR/hints/pk.html +%%DATADIR%%/docs/fr_FR/hints/vacuum-full.html %%DATADIR%%/docs/fr_FR/hints/vacuum.html %%DATADIR%%/docs/fr_FR/hints/view-without-pk.html +%%DATADIR%%/docs/fr_FR/images/backup-2.png +%%DATADIR%%/docs/fr_FR/images/backup-3.png +%%DATADIR%%/docs/fr_FR/images/backup-4.png %%DATADIR%%/docs/fr_FR/images/backup.png %%DATADIR%%/docs/fr_FR/images/connect.png %%DATADIR%%/docs/fr_FR/images/debugger.png @@ -326,11 +345,16 @@ bin/pgadmin3 %%DATADIR%%/docs/fr_FR/images/manage-macros.png %%DATADIR%%/docs/fr_FR/images/no-hba.png %%DATADIR%%/docs/fr_FR/images/not-running.png +%%DATADIR%%/docs/fr_FR/images/options-browser.png +%%DATADIR%%/docs/fr_FR/images/options-colours.png %%DATADIR%%/docs/fr_FR/images/options-display.png %%DATADIR%%/docs/fr_FR/images/options-general.png %%DATADIR%%/docs/fr_FR/images/options-logging.png %%DATADIR%%/docs/fr_FR/images/options-pref.png +%%DATADIR%%/docs/fr_FR/images/options-preferences.png %%DATADIR%%/docs/fr_FR/images/options-query.png +%%DATADIR%%/docs/fr_FR/images/options-querytool.png +%%DATADIR%%/docs/fr_FR/images/options-querytoolfiles.png %%DATADIR%%/docs/fr_FR/images/password.png %%DATADIR%%/docs/fr_FR/images/pgagent-jobdetails.png %%DATADIR%%/docs/fr_FR/images/pgagent-jobproperties.png @@ -346,6 +370,9 @@ bin/pgadmin3 %%DATADIR%%/docs/fr_FR/images/query.png %%DATADIR%%/docs/fr_FR/images/reporttool-html.png %%DATADIR%%/docs/fr_FR/images/reporttool-xml.png +%%DATADIR%%/docs/fr_FR/images/restore-2.png +%%DATADIR%%/docs/fr_FR/images/restore-3.png +%%DATADIR%%/docs/fr_FR/images/restore-4.png %%DATADIR%%/docs/fr_FR/images/restore-content.png %%DATADIR%%/docs/fr_FR/images/restore.png %%DATADIR%%/docs/fr_FR/images/server.png @@ -374,6 +401,8 @@ bin/pgadmin3 %%DATADIR%%/docs/fr_FR/options-tab3.html %%DATADIR%%/docs/fr_FR/options-tab4.html %%DATADIR%%/docs/fr_FR/options-tab5.html +%%DATADIR%%/docs/fr_FR/options-tab6.html +%%DATADIR%%/docs/fr_FR/options-tab7.html %%DATADIR%%/docs/fr_FR/options.html %%DATADIR%%/docs/fr_FR/password.html %%DATADIR%%/docs/fr_FR/pgadmin3.css @@ -441,28 +470,22 @@ bin/pgadmin3 %%DATADIR%%/docs/zh_TW/hints/saving-passwords.html %%DATADIR%%/docs/zh_TW/hints/vacuum.html %%DATADIR%%/docs/zh_TW/hints/view-without-pk.html -%%DATADIR%%/i18n/af_ZA/pgadmin3.mo -%%DATADIR%%/i18n/af_ZA/wxstd.mo -%%DATADIR%%/i18n/ca_ES/pgadmin3.mo -%%DATADIR%%/i18n/ca_ES/wxstd.mo %%DATADIR%%/i18n/cs_CZ/pgadmin3.mo %%DATADIR%%/i18n/cs_CZ/wxstd.mo %%DATADIR%%/i18n/de_DE/pgadmin3.mo %%DATADIR%%/i18n/de_DE/wxstd.mo -%%DATADIR%%/i18n/es_ES/pgadmin3.mo -%%DATADIR%%/i18n/es_ES/wxstd.mo +%%DATADIR%%/i18n/fa_IR/pgadmin3.mo +%%DATADIR%%/i18n/fa_IR/wxstd.mo %%DATADIR%%/i18n/fr_FR/pgadmin3.mo %%DATADIR%%/i18n/fr_FR/wxstd.mo -%%DATADIR%%/i18n/it_IT/pgadmin3.mo -%%DATADIR%%/i18n/it_IT/wxstd.mo %%DATADIR%%/i18n/ja_JP/pgadmin3.mo %%DATADIR%%/i18n/ja_JP/wxstd.mo +%%DATADIR%%/i18n/lv_LV/pgadmin3.mo +%%DATADIR%%/i18n/lv_LV/wxstd.mo %%DATADIR%%/i18n/pg_settings.csv %%DATADIR%%/i18n/pgadmin3.lng %%DATADIR%%/i18n/pl_PL/pgadmin3.mo %%DATADIR%%/i18n/pl_PL/wxstd.mo -%%DATADIR%%/i18n/pt_PT/pgadmin3.mo -%%DATADIR%%/i18n/pt_PT/wxstd.mo %%DATADIR%%/i18n/ru_RU/pgadmin3.mo %%DATADIR%%/i18n/ru_RU/wxstd.mo %%DATADIR%%/i18n/sr_RS/pgadmin3.mo @@ -470,24 +493,19 @@ bin/pgadmin3 %%DATADIR%%/i18n/wxstd.mo %%DATADIR%%/i18n/zh_CN/pgadmin3.mo %%DATADIR%%/i18n/zh_CN/wxstd.mo -%%DATADIR%%/i18n/zh_TW/pgadmin3.mo -%%DATADIR%%/i18n/zh_TW/wxstd.mo -%%DATADIR%%/plugins.ini +%%DATADIR%%/plugins.d/plugins.ini %%DATADIR%%/settings.ini -@dirrm %%DATADIR%%/i18n/zh_TW +@dirrm %%DATADIR%%/plugins.d @dirrm %%DATADIR%%/i18n/zh_CN @dirrm %%DATADIR%%/i18n/sr_RS @dirrm %%DATADIR%%/i18n/ru_RU -@dirrm %%DATADIR%%/i18n/pt_PT @dirrm %%DATADIR%%/i18n/pl_PL +@dirrm %%DATADIR%%/i18n/lv_LV @dirrm %%DATADIR%%/i18n/ja_JP -@dirrm %%DATADIR%%/i18n/it_IT @dirrm %%DATADIR%%/i18n/fr_FR -@dirrm %%DATADIR%%/i18n/es_ES +@dirrm %%DATADIR%%/i18n/fa_IR @dirrm %%DATADIR%%/i18n/de_DE @dirrm %%DATADIR%%/i18n/cs_CZ -@dirrm %%DATADIR%%/i18n/ca_ES -@dirrm %%DATADIR%%/i18n/af_ZA @dirrm %%DATADIR%%/i18n @dirrm %%DATADIR%%/docs/zh_TW/hints @dirrm %%DATADIR%%/docs/zh_TW