diff options
| -rw-r--r-- | databases/pgadmin3/Makefile | 34 | ||||
| -rw-r--r-- | databases/pgadmin3/PLIST | 7 | ||||
| -rw-r--r-- | databases/pgadmin3/distinfo | 13 | ||||
| -rw-r--r-- | databases/pgadmin3/options.mk | 49 | ||||
| -rw-r--r-- | databases/pgadmin3/patches/patch-Makefile.am | 27 | ||||
| -rw-r--r-- | databases/pgadmin3/patches/patch-acinclude.m4 | 17 | ||||
| -rw-r--r-- | databases/pgadmin3/patches/patch-configure | 18 | ||||
| -rw-r--r-- | databases/pgadmin3/patches/patch-pgadmin_gqb_gqbView.cpp | 15 | ||||
| -rw-r--r-- | databases/pgadmin3/patches/patch-xtra_pgscript_file_test_execute.sh | 15 |
9 files changed, 62 insertions, 133 deletions
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 7f57d9b1732..2bd0eb29be3 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2013/09/02 19:50:58 adam Exp $ +# $NetBSD: Makefile,v 1.42 2013/09/11 13:39:35 richard Exp $ -DISTNAME= pgadmin3-1.16.1 -PKGREVISION= 1 +DISTNAME= pgadmin3-1.18.0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/} @@ -11,42 +10,17 @@ COMMENT= Graphical PostgreSQL client and administration tool LICENSE= postgresql-license USE_LANGUAGES= c99 c++ -USE_TOOLS+= automake autoreconf gmake msgfmt +USE_TOOLS+= echo gmake sed GNU_CONFIGURE= yes -PKG_OPTIONS_VAR= PKG_OPTIONS.pgadmin3 -PKG_SUPPORTED_OPTIONS= pgadmin-db-designer doc -PKG_SUGGESTED_OPTIONS= pgadmin-db-designer - REPLACE_SH= pgadmin/ver_svn.sh -.include "../../mk/bsd.options.mk" - -PLIST_VARS= doc - -### -### Database Designer support -### -.if !empty(PKG_OPTIONS:Mpgadmin-db-designer) -CONFIGURE_ARGS+= --enable-databasedesigner -.endif - -.if !empty(PKG_OPTIONS:Mdoc) -PLIST.doc= yes -PYTHON_FOR_BUILD_ONLY=yes -.include "../../lang/python/pyversion.mk" -BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.0:../../textproc/py-sphinx -.else -CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD= -.endif +.include "options.mk" CONFIGURE_ARGS+= --with-wx=${BUILDLINK_PREFIX.wxGTK28} CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-libxslt=${BUILDLINK_PREFIX.libxslt} -pre-configure: - cd ${WRKSRC} && autoreconf -vfi - .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" diff --git a/databases/pgadmin3/PLIST b/databases/pgadmin3/PLIST index acee94901d5..042e8f262e6 100644 --- a/databases/pgadmin3/PLIST +++ b/databases/pgadmin3/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.9 2013/07/20 05:10:42 richard Exp $ +@comment $NetBSD: PLIST,v 1.10 2013/09/11 13:39:35 richard Exp $ bin/pgadmin3 -bin/png2c share/pgadmin3/branding/branding.ini share/pgadmin3/docs/cs_CZ/hints/autovacuum.html share/pgadmin3/docs/cs_CZ/hints/conn-hba.html @@ -10,10 +9,13 @@ share/pgadmin3/docs/cs_CZ/hints/encoding-ascii.html share/pgadmin3/docs/cs_CZ/hints/encoding-unicode.html share/pgadmin3/docs/cs_CZ/hints/fki.html share/pgadmin3/docs/cs_CZ/hints/instrumentation.html +share/pgadmin3/docs/cs_CZ/hints/instrumentation91_with.html +share/pgadmin3/docs/cs_CZ/hints/instrumentation91_without.html share/pgadmin3/docs/cs_CZ/hints/multiple.html share/pgadmin3/docs/cs_CZ/hints/object-editing.html share/pgadmin3/docs/cs_CZ/hints/pk.html share/pgadmin3/docs/cs_CZ/hints/saving-passwords.html +share/pgadmin3/docs/cs_CZ/hints/vacuum-full.html share/pgadmin3/docs/cs_CZ/hints/vacuum.html share/pgadmin3/docs/cs_CZ/hints/view-without-pk.html share/pgadmin3/docs/cs_CZ/pgadmin3.css @@ -226,6 +228,7 @@ share/pgadmin3/docs/en_US/hints/saving-passwords.html share/pgadmin3/docs/en_US/hints/vacuum-full.html share/pgadmin3/docs/en_US/hints/vacuum.html share/pgadmin3/docs/en_US/hints/view-without-pk.html +share/pgadmin3/docs/en_US/pgadmin3.css ${PLIST.doc}share/pgadmin3/docs/en_US/index.html ${PLIST.doc}share/pgadmin3/docs/en_US/introduction.html ${PLIST.doc}share/pgadmin3/docs/en_US/kerberos.html diff --git a/databases/pgadmin3/distinfo b/databases/pgadmin3/distinfo index b34acb12e99..32c60556e93 100644 --- a/databases/pgadmin3/distinfo +++ b/databases/pgadmin3/distinfo @@ -1,10 +1,5 @@ -$NetBSD: distinfo,v 1.9 2013/07/20 05:10:42 richard Exp $ +$NetBSD: distinfo,v 1.10 2013/09/11 13:39:35 richard Exp $ -SHA1 (pgadmin3-1.16.1.tar.gz) = f5eaa8184d9e30662eec3a7bf639258eb8a658a3 -RMD160 (pgadmin3-1.16.1.tar.gz) = b2830f6dcc9b22592cc196e27b2e844a3717e1a9 -Size (pgadmin3-1.16.1.tar.gz) = 13783723 bytes -SHA1 (patch-Makefile.am) = a3a9b705eb74d66fda228c2ce13c61c50d88a84a -SHA1 (patch-acinclude.m4) = 3402690e3446ed068bceb9ea4711171e851d58df -SHA1 (patch-configure) = 0803a3d1ef954bedbbb181858b135e622bc1642e -SHA1 (patch-pgadmin_gqb_gqbView.cpp) = 1a0248ba837f068c7304c97f5f022ae566b6dab9 -SHA1 (patch-xtra_pgscript_file_test_execute.sh) = e0af8b239c9bd1d2b62053224f225acb7fcee17b +SHA1 (pgadmin3-1.18.0.tar.gz) = f0b40d38cb1504054f9350b755e0398b89ce5ef5 +RMD160 (pgadmin3-1.18.0.tar.gz) = 0f3a117c4f48abc8a61f2e652bdff4ebe4eb5a59 +Size (pgadmin3-1.18.0.tar.gz) = 14257838 bytes diff --git a/databases/pgadmin3/options.mk b/databases/pgadmin3/options.mk new file mode 100644 index 00000000000..848e0e78d1e --- /dev/null +++ b/databases/pgadmin3/options.mk @@ -0,0 +1,49 @@ +# $NetBSD: options.mk,v 1.1 2013/09/11 13:39:35 richard Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.pgadmin3 +PKG_SUPPORTED_OPTIONS= pgadmin-db-designer doc zlib +PKG_OPTIONS_OPTIONAL_GROUPS= crypto +PKG_SUGGESTED_OPTIONS= pgadmin-db-designer openssl +PKG_OPTIONS_GROUP.crypto= openssl libgcrypt + +.include "../../mk/bsd.options.mk" + +PLIST_VARS= doc + +### Database Designer support +.if !empty(PKG_OPTIONS:Mpgadmin-db-designer) +CONFIGURE_ARGS+= --enable-databasedesigner +.endif + +.if !empty(PKG_OPTIONS:Mdoc) +PLIST.doc= yes +PYTHON_FOR_BUILD_ONLY=yes +.include "../../lang/python/pyversion.mk" +BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.0:../../textproc/py-sphinx +.else +CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD= +.endif + +.if !empty(PKG_OPTIONS:Mlibgcrypt) +CONFIGURE_ARGS+= --with-libgcrypt +CONFIGURE_ARGS+= --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt} +.include "../../security/libgcrypt/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-libgcrypt +.endif + +.if !empty(PKG_OPTIONS:Mopenssl) +CONFIGURE_ARGS+= --with-openssl +CONFIGURE_ARGS+= --with-libssl-prefix=${BUILDLINK_PREFIX.openssl} +.include "../../security/openssl/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-openssl +.endif + +.if !empty(PKG_OPTIONS:Mzlib) +CONFIGURE_ARGS+= --with-libz +CONFIGURE_ARGS+= --with-libz-prefix=${BUILDLINK_PREFIX.zlib} +.include "../../devel/zlib/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-libz +.endif diff --git a/databases/pgadmin3/patches/patch-Makefile.am b/databases/pgadmin3/patches/patch-Makefile.am deleted file mode 100644 index 69952c35598..00000000000 --- a/databases/pgadmin3/patches/patch-Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-Makefile.am,v 1.1 2013/07/20 05:10:42 richard Exp $ - -Suppress hack for creating hhp.cached file in help_dir -and use pkgsrc supplied $(MAKE) for building sphinx - ---- Makefile.am.orig 2012-08-02 14:28:59.000000000 +0000 -+++ Makefile.am -@@ -71,8 +71,8 @@ endif - - # We need to ensure the help cache is world writeable - install-data-hook: -- touch $(help_dir)/docs/en_US/pgadmin3.hhp.cached -- chmod 0666 $(help_dir)/docs/en_US/pgadmin3.hhp.cached -+# touch $(help_dir)/docs/en_US/pgadmin3.hhp.cached -+# chmod 0666 $(help_dir)/docs/en_US/pgadmin3.hhp.cached - if SPHINX_BUILD - if [ -d $(top_srcdir)/docs/en_US/_build/htmlhelp ]; then cp -R $(top_srcdir)/docs/en_US/_build/htmlhelp/* $(help_dir)/docs/en_US/; fi - -@@ -94,7 +94,7 @@ style: - # Create HTML docs - doc: - if SPHINX_BUILD -- cd $(top_srcdir)/docs/en_US && make -f Makefile.sphinx SPHINXBUILD=${SPHINX_BUILD} htmlhelp -+ cd $(top_srcdir)/docs/en_US && $(MAKE) -f Makefile.sphinx SPHINXBUILD=${SPHINX_BUILD} htmlhelp - endif - - all: doc diff --git a/databases/pgadmin3/patches/patch-acinclude.m4 b/databases/pgadmin3/patches/patch-acinclude.m4 deleted file mode 100644 index a41d3e48b4e..00000000000 --- a/databases/pgadmin3/patches/patch-acinclude.m4 +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-acinclude.m4,v 1.1 2013/07/20 05:10:42 richard Exp $ - -Fix LDFLAGS problem for sun ld not supporting -as-needed - ---- acinclude.m4.orig 2012-08-02 14:28:51.000000000 +0000 -+++ acinclude.m4 -@@ -684,7 +684,9 @@ AC_DEFUN([SETUP_POSTGRESQL], - case "${host}" in - *-apple-darwin*) - ;; -- -+ *solaris*) -+ LDFLAGS="$LDFLAGS" -+ ;; - *) - LDFLAGS="$LDFLAGS -Wl,-as-needed" - ;; diff --git a/databases/pgadmin3/patches/patch-configure b/databases/pgadmin3/patches/patch-configure deleted file mode 100644 index d0b65aecf38..00000000000 --- a/databases/pgadmin3/patches/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2013/07/20 05:10:42 richard Exp $ - -copy patch details from patch-acinclude.m4 to suppress ld -option -as-needed which is not supported on solaris. - ---- configure.orig 2012-12-03 16:02:14.000000000 +0000 -+++ configure -@@ -6011,6 +6011,10 @@ $as_echo "failed" >&6; } - *-apple-darwin*) - ;; - -+ *solaris*) -+ LDFLAGS="$LDFLAGS" -+ ;; -+ - *) - LDFLAGS="$LDFLAGS -Wl,-as-needed" - ;; diff --git a/databases/pgadmin3/patches/patch-pgadmin_gqb_gqbView.cpp b/databases/pgadmin3/patches/patch-pgadmin_gqb_gqbView.cpp deleted file mode 100644 index 974d6aa9cfd..00000000000 --- a/databases/pgadmin3/patches/patch-pgadmin_gqb_gqbView.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-pgadmin_gqb_gqbView.cpp,v 1.1 2013/07/20 05:10:42 richard Exp $ - -patch to quelch g++ warning - ---- pgadmin/gqb/gqbView.cpp.orig 2012-08-02 14:29:01.000000000 +0000 -+++ pgadmin/gqb/gqbView.cpp -@@ -341,7 +341,7 @@ void gqbView::onMotion(wxMouseEvent &eve - } - else - { -- anySelected = false; -+ anySelected = NULL; - mode = pt_normal; - } - diff --git a/databases/pgadmin3/patches/patch-xtra_pgscript_file_test_execute.sh b/databases/pgadmin3/patches/patch-xtra_pgscript_file_test_execute.sh deleted file mode 100644 index 273ab301971..00000000000 --- a/databases/pgadmin3/patches/patch-xtra_pgscript_file_test_execute.sh +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-xtra_pgscript_file_test_execute.sh,v 1.1 2013/07/20 05:10:42 richard Exp $ - -Patch non-portable test for null string - ---- xtra/pgscript/file/test/execute.sh.orig 2012-08-02 14:29:10.000000000 +0000 -+++ xtra/pgscript/file/test/execute.sh -@@ -24,7 +24,7 @@ echo "done" - echo "" - - # Get parameters for database connections --if test "$*" == "" -+if test -z "$*" - then - PARAMETERS="$DEFAULTPARAM" # Default if nothing is provided - else |