diff options
| -rw-r--r-- | databases/glom/Makefile | 17 | ||||
| -rw-r--r-- | databases/glom/distinfo | 6 | ||||
| -rw-r--r-- | databases/glom/files/patch-glom_main.cc | 29 | ||||
| -rw-r--r-- | databases/glom/pkg-plist | 15 |
4 files changed, 48 insertions, 19 deletions
diff --git a/databases/glom/Makefile b/databases/glom/Makefile index 7b699fd12..b0dd51f8c 100644 --- a/databases/glom/Makefile +++ b/databases/glom/Makefile @@ -3,13 +3,14 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/databases/glom/Makefile,v 1.20 2008/08/10 18:51:33 kwm Exp $ # PORTNAME= glom -PORTVERSION= 1.7.1 +PORTVERSION= 1.8.5 CATEGORIES= databases gnome MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 MAINTAINER= kwm@FreeBSD.org COMMENT= GNOME database designer and user interface @@ -17,7 +18,7 @@ COMMENT= GNOME database designer and user interface LIB_DEPENDS= bakery-2.6:${PORTSDIR}/x11-toolkits/bakery \ gdamm-3.0.10:${PORTSDIR}/databases/libgdamm \ gtksourceviewmm-2.0.2:${PORTSDIR}/x11-toolkits/libgtksourceviewmm \ - goocanvasmm-0.1.2:${PORTSDIR}/graphics/goocanvasmm + goocanvasmm-0.1.4:${PORTSDIR}/graphics/goocanvasmm BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/libgda-postgres-3.0.pc:${PORTSDIR}/databases/libgda3-postgresql RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ @@ -37,17 +38,17 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-postgres-utils=${LOCALBASE}/bin INSTALLS_ICONS= yes -OPTIONS= SELF_HOSTING "Host the database locally" off +#OPTIONS= SELF_HOSTING "Host the database locally" on .include <bsd.port.pre.mk> -.if defined(WITH_SELF_HOSTING) +#.if defined(WITH_SELF_HOSTING) # Note: USE_PGSQL has already been set above. BUILD_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server RUN_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server -.else -CONFIGURE_ARGS+=--enable-client-only -.endif +#.else +#CONFIGURE_ARGS+=--enable-client-only +#.endif post-patch: @${REINPLACE_CMD} -e 's|-update-mime-database|true|g' \ diff --git a/databases/glom/distinfo b/databases/glom/distinfo index 4d0e1430f..55b3b7efc 100644 --- a/databases/glom/distinfo +++ b/databases/glom/distinfo @@ -1,3 +1,3 @@ -MD5 (glom-1.7.1.tar.bz2) = 7da4e51b4616b85267a51762ca85609a -SHA256 (glom-1.7.1.tar.bz2) = 84b608660fcd66accb42dcf790111ec6cfd421701c8648f5a2b2e4d0a6a896af -SIZE (glom-1.7.1.tar.bz2) = 3175629 +MD5 (gnome2/glom-1.8.5.tar.bz2) = d161b394c6a89b936f8853a8015ed27b +SHA256 (gnome2/glom-1.8.5.tar.bz2) = 8597749371063260ae494ac5a779db06f4d80d2d5341864fb8a52241058dcc37 +SIZE (gnome2/glom-1.8.5.tar.bz2) = 3266015 diff --git a/databases/glom/files/patch-glom_main.cc b/databases/glom/files/patch-glom_main.cc index 6d40eb0ef..69a77fb59 100644 --- a/databases/glom/files/patch-glom_main.cc +++ b/databases/glom/files/patch-glom_main.cc @@ -1,19 +1,32 @@ ---- glom/main.cc.orig 2008-08-08 02:55:08.000000000 +0200 -+++ glom/main.cc 2008-08-08 02:55:59.000000000 +0200 -@@ -84,14 +84,14 @@ OptionGroup::OptionGroup() +--- glom/main.cc.orig 2008-08-22 16:36:46.000000000 +0200 ++++ glom/main.cc 2008-09-13 21:23:46.000000000 +0200 +@@ -89,18 +89,19 @@ } //namespace Glom --extern "C" void __libc_freeres(void); -+//extern "C" void __libc_freeres(void); +-#ifndef G_OS_WIN32 ++#ifdef __linux + extern "C" void __libc_freeres(void); + #endif int main(int argc, char* argv[]) { +-#ifndef G_OS_WIN32 ++#ifdef __linux //Force some cleanup at exit, //to help valgrind to detect memory leaks: -- atexit(__libc_freeres); -+ //atexit(__libc_freeres); + atexit(__libc_freeres); + #else ++# ifdef G_OS_WIN32 + WSADATA data; + int errcode = WSAStartup(MAKEWORD(2, 0), &data); + if(errcode != 0) +@@ -108,6 +109,7 @@ + std::cerr << "Failed to initialize WinSock: " << errcode << std::endl; + return -1; + } ++# endif + #endif // TODO: I am not sure why, but this does not work. PYTHONPATH is set - // correctly according to getenv(), but python still does not look in it. diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist index beb6ff88a..a9db6f4b6 100644 --- a/databases/glom/pkg-plist +++ b/databases/glom/pkg-plist @@ -18,8 +18,11 @@ share/applications/glom.desktop %%DATADIR%%/pixmaps/glom-button.png %%DATADIR%%/pixmaps/glom-field.png %%DATADIR%%/pixmaps/glom-group.png +%%DATADIR%%/pixmaps/glom-line-horizontal.png +%%DATADIR%%/pixmaps/glom-line-vertical.png %%DATADIR%%/pixmaps/glom-image.png %%DATADIR%%/pixmaps/glom-notebook.png +%%DATADIR%%/pixmaps/glom-related-records.png %%DATADIR%%/pixmaps/glom-text.png %%DATADIR%%/xslt/print_details_to_html.xsl %%DATADIR%%/xslt/print_report_to_html.xsl @@ -34,6 +37,8 @@ share/gnome/help/glom/C/figures/glom_design_reports_details.png share/gnome/help/glom/C/figures/glom_design_reports_group_by.png share/gnome/help/glom/C/figures/glom_design_reports_vertical_group.png share/gnome/help/glom/C/figures/glom_design_translations.png +share/gnome/help/glom/C/figures/glom_import.png +share/gnome/help/glom/C/figures/glom_initial_dialog_local_network.png share/gnome/help/glom/C/figures/glom_report_result.png share/gnome/help/glom/C/figures/glom_tables.png share/gnome/help/glom/C/figures/start.png @@ -50,6 +55,8 @@ share/gnome/help/glom/de/figures/glom_design_reports_details.png share/gnome/help/glom/de/figures/glom_design_reports_group_by.png share/gnome/help/glom/de/figures/glom_design_reports_vertical_group.png share/gnome/help/glom/de/figures/glom_design_translations.png +share/gnome/help/glom/de/figures/glom_import.png +share/gnome/help/glom/de/figures/glom_initial_dialog_local_network.png share/gnome/help/glom/de/figures/glom_report_result.png share/gnome/help/glom/de/figures/glom_tables.png share/gnome/help/glom/de/figures/start.png @@ -66,6 +73,8 @@ share/gnome/help/glom/en_GB/figures/glom_design_reports_details.png share/gnome/help/glom/en_GB/figures/glom_design_reports_group_by.png share/gnome/help/glom/en_GB/figures/glom_design_reports_vertical_group.png share/gnome/help/glom/en_GB/figures/glom_design_translations.png +share/gnome/help/glom/en_GB/figures/glom_import.png +share/gnome/help/glom/en_GB/figures/glom_initial_dialog_local_network.png share/gnome/help/glom/en_GB/figures/glom_report_result.png share/gnome/help/glom/en_GB/figures/glom_tables.png share/gnome/help/glom/en_GB/figures/start.png @@ -82,6 +91,8 @@ share/gnome/help/glom/es/figures/glom_design_reports_details.png share/gnome/help/glom/es/figures/glom_design_reports_group_by.png share/gnome/help/glom/es/figures/glom_design_reports_vertical_group.png share/gnome/help/glom/es/figures/glom_design_translations.png +share/gnome/help/glom/es/figures/glom_import.png +share/gnome/help/glom/es/figures/glom_initial_dialog_local_network.png share/gnome/help/glom/es/figures/glom_report_result.png share/gnome/help/glom/es/figures/glom_tables.png share/gnome/help/glom/es/figures/start.png @@ -98,6 +109,8 @@ share/gnome/help/glom/fr/figures/glom_design_reports_details.png share/gnome/help/glom/fr/figures/glom_design_reports_group_by.png share/gnome/help/glom/fr/figures/glom_design_reports_vertical_group.png share/gnome/help/glom/fr/figures/glom_design_translations.png +share/gnome/help/glom/fr/figures/glom_import.png +share/gnome/help/glom/fr/figures/glom_initial_dialog_local_network.png share/gnome/help/glom/fr/figures/glom_report_result.png share/gnome/help/glom/fr/figures/glom_tables.png share/gnome/help/glom/fr/figures/start.png @@ -114,6 +127,8 @@ share/gnome/help/glom/sv/figures/glom_design_reports_details.png share/gnome/help/glom/sv/figures/glom_design_reports_group_by.png share/gnome/help/glom/sv/figures/glom_design_reports_vertical_group.png share/gnome/help/glom/sv/figures/glom_design_translations.png +share/gnome/help/glom/sv/figures/glom_import.png +share/gnome/help/glom/sv/figures/glom_initial_dialog_local_network.png share/gnome/help/glom/sv/figures/glom_report_result.png share/gnome/help/glom/sv/figures/glom_tables.png share/gnome/help/glom/sv/figures/start.png |