From owner-svn-ports-head@FreeBSD.ORG Sat Sep 6 21:52:00 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBDC0971; Sat, 6 Sep 2014 21:52:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B76D1AC8; Sat, 6 Sep 2014 21:52:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s86Lq0tY048325; Sat, 6 Sep 2014 21:52:00 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s86LpxUg048311; Sat, 6 Sep 2014 21:51:59 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409062151.s86LpxUg048311@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sat, 6 Sep 2014 21:51:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367477 - in head/databases: . qof X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Sep 2014 21:52:00 -0000 Author: tijl Date: Sat Sep 6 21:51:59 2014 New Revision: 367477 URL: http://svnweb.freebsd.org/changeset/ports/367477 QAT: https://qat.redports.org/buildarchive/r367477/ Log: deskutils/gnotime basically contains two ports. Split off one part into a new port databases/qof: QOF - Query Object Framework - library to add a query engine to C applications with generic XML backend. A SQL database is not needed; any collection of C/C++ objects can act as tables. WWW: https://alioth.debian.org/projects/qof/ Added: head/databases/qof/ - copied from r367409, head/deskutils/gnotime/ Modified: head/databases/Makefile head/databases/qof/Makefile head/databases/qof/distinfo head/databases/qof/pkg-descr head/databases/qof/pkg-plist Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sat Sep 6 21:49:56 2014 (r367476) +++ head/databases/Makefile Sat Sep 6 21:51:59 2014 (r367477) @@ -784,6 +784,7 @@ SUBDIR += pyspatialite SUBDIR += qdbm SUBDIR += qdbm-plus + SUBDIR += qof SUBDIR += qt4-ibase-plugin SUBDIR += qt4-mysql-plugin SUBDIR += qt4-odbc-plugin Modified: head/databases/qof/Makefile ============================================================================== --- head/deskutils/gnotime/Makefile Sat Sep 6 09:27:24 2014 (r367409) +++ head/databases/qof/Makefile Sat Sep 6 21:51:59 2014 (r367477) @@ -1,81 +1,43 @@ -# Created by: Martin Klaffenboeck # $FreeBSD$ -PORTNAME= gnotime -PORTVERSION= 2.4.1 -PORTREVISION= 2 -CATEGORIES= deskutils gnome -MASTER_SITES= SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ - SF/qof/qof/${QOF_VERSION}:qof -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT \ - ${QOF_DISTNAME}${EXTRACT_SUFX}:qof +PORTNAME= qof +PORTVERSION= 0.8.7 +CATEGORIES= databases +MASTER_SITES= DEBIAN_POOL +DISTNAME= qof_${PORTVERSION}.orig MAINTAINER= ports@FreeBSD.org -COMMENT= Time tracker for gnome2 +COMMENT= Query Object Framework LICENSE= GPLv2 # (or later) +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile +CONFLICTS_INSTALL= gnotime-2.[0-3]* gnotime-2.4.0* gnotime-2.4.1 gnotime-2.4.1_[12]* -USES= gettext gmake libtool pathfix pkgconfig -USE_XORG= xscrnsaver -USE_GNOME= gnomeprefix gtkhtml3 intlhack libgnomeui -USE_AUTOTOOLS= libtoolize libltdl GNU_CONFIGURE= yes -LIBTOOLFILES= configure ../${QOF_DISTNAME}/configure -CONFIGURE_ENV= GUILE_CFLAGS="$$(guile-config compile)" \ - GUILE_LIBS="$$(guile-config link)" \ - LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" \ - LIBQOF_LIBS="${LIBQOF_LIBS}" -CONFIGURE_ARGS= --disable-silent-rules +CONFIGURE_ARGS= --disable-doxygen --disable-gdasql --disable-sqlite +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip +USES= gmake libtool pathfix pkgconfig +USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes -INSTALLS_OMF= yes - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -GCONF_SCHEMAS= gnotime.schemas +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes -QOF_VERSION= 0.7.5 -QOF_DISTNAME= qof-${QOF_VERSION} -QOF_WRKSRC= ${WRKDIR}/${QOF_DISTNAME} -LIBQOF_CFLAGS= -I${QOF_WRKSRC}/qof -LIBQOF_LIBS= -L${QOF_WRKSRC}/qof/.libs -lqof +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls post-patch: - @${REINPLACE_CMD} -e \ - '/^install-data-am/s|install-data-local||' \ - ${WRKSRC}/gconf/Makefile.in - @${REINPLACE_CMD} -e \ - '/^AM_CFLAGS =/s|-g||' ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} -e \ - '/CFLAGS=/s|-g2||' ${QOF_WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|__isleap|qof_date_isleap|' ${QOF_WRKSRC}/qof/qofdate.c - @${REINPLACE_CMD} -e \ - 's|^inline|static inline|' ${QOF_WRKSRC}/qof/qofmath128.h - @${FIND} ${QOF_WRKSRC} -name "Makefile.in" -print0 | \ - ${XARGS} -0 ${REINPLACE_CMD} -e \ - '/^AM_CFLAGS =/s|-g|| ; \ - s|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' - -pre-configure: - @(cd ${QOF_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - CC="${CC}" CFLAGS="${CFLAGS}" \ - CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ - ./configure --prefix=${PREFIX} --disable-error-on-warning \ - --disable-sqlite --disable-gdasql) - -pre-build: - (cd ${QOF_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) - ${FIND} ${QOF_WRKSRC} -type f -name '*.la' | \ - ${XARGS} ${GREP} -l 'libtool library' | ${XARGS} ${RM} - -pre-install: - (cd ${QOF_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) + @${REINPLACE_CMD} -e '/CFLAGS=/s|-g2||' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|__isleap|qof_date_isleap|' \ + ${WRKSRC}/qof/qofdate.c + @${REINPLACE_CMD} -e '/^AM_CFLAGS =/s|-g||' \ + ${WRKSRC}/lib/libsql/Makefile.in \ + ${WRKSRC}/qof/Makefile.in + @${REINPLACE_CMD} -e '/^sql_parse_test_DEPENDENCIES =/s/$$/ libqofsql.la/' \ + ${WRKSRC}/lib/libsql/Makefile.in .include Modified: head/databases/qof/distinfo ============================================================================== --- head/deskutils/gnotime/distinfo Sat Sep 6 09:27:24 2014 (r367409) +++ head/databases/qof/distinfo Sat Sep 6 21:51:59 2014 (r367477) @@ -1,4 +1,2 @@ -SHA256 (gnotime-2.4.1.tar.gz) = b25a9d94cdb7e08c18f115eddddd32a6e23834416355fcaed852260b6b2f6410 -SIZE (gnotime-2.4.1.tar.gz) = 1767643 -SHA256 (qof-0.7.5.tar.gz) = 39dbb47f59ef33d4754f622c4afcc201862743dbd974172f19be0c19cb53428c -SIZE (qof-0.7.5.tar.gz) = 906010 +SHA256 (qof_0.8.7.orig.tar.gz) = 86fd671390dc13ee6fd2e1e13775786c518b0ebff5e886f27bbd394de1e73094 +SIZE (qof_0.8.7.orig.tar.gz) = 932957 Modified: head/databases/qof/pkg-descr ============================================================================== --- head/deskutils/gnotime/pkg-descr Sat Sep 6 09:27:24 2014 (r367409) +++ head/databases/qof/pkg-descr Sat Sep 6 21:51:59 2014 (r367477) @@ -1,5 +1,5 @@ -Time (formerly GTT, the Gnome Time Tracker) is a desktop utility for -tracking the amount of time spent on projects, and generating -configurable invoices based on that time. +QOF - Query Object Framework - library to add a query engine to C +applications with generic XML backend. A SQL database is not needed; any +collection of C/C++ objects can act as tables. -WWW: http://gttr.sourceforge.net/ +WWW: https://alioth.debian.org/projects/qof/ Modified: head/databases/qof/pkg-plist ============================================================================== --- head/deskutils/gnotime/pkg-plist Sat Sep 6 09:27:24 2014 (r367409) +++ head/databases/qof/pkg-plist Sat Sep 6 21:51:59 2014 (r367477) @@ -1,9 +1,5 @@ -bin/gnotime -bin/gnotime-remote -include/qof/deprecated.h include/qof/guid.h include/qof/kvpframe.h -include/qof/kvputil-p.h include/qof/kvputil.h include/qof/qof-backend-qsf.h include/qof/qof.h @@ -21,7 +17,6 @@ include/qof/qofid-p.h include/qof/qofid.h include/qof/qofinstance-p.h include/qof/qofinstance.h -include/qof/qofla-dir.h include/qof/qoflog.h include/qof/qofnumeric.h include/qof/qofobject.h @@ -36,139 +31,34 @@ include/qof/qoftime.h include/qof/qofundo.h include/qof/qofutil.h include/qof/sql_parser.h -lib/libqof-backend-qsf.a -lib/libqof-backend-qsf.so -lib/libqof-backend-qsf.so.0 -lib/libqof-backend-qsf.so.0.0.7 lib/libqof.a lib/libqof.so -lib/libqof.so.1 -lib/libqof.so.1.0.10 +lib/libqof.so.2 +lib/libqof.so.2.0.4 lib/libqofsql.a lib/libqofsql.so lib/libqofsql.so.1 lib/libqofsql.so.1.0.1 -libdata/pkgconfig/qof-1.pc +lib/qof2/libqof-backend-qsf.a +lib/qof2/libqof-backend-qsf.so libdata/pkgconfig/qof.pc -man/man1/gnotime-remote.1.gz -man/man1/gnotime.1.gz -share/applications/gnotime.desktop -share/gnome/help/gnotime/C/figures/gtt_edit_reports_dialog.png -share/gnome/help/gnotime/C/figures/gtt_mainwin.png -share/gnome/help/gnotime/C/figures/gtt_new_project.png -share/gnome/help/gnotime/C/figures/gtt_new_report_dialog.png -share/gnome/help/gnotime/C/figures/gtt_prefs_display.png -share/gnome/help/gnotime/C/figures/gtt_prefs_fields.png -share/gnome/help/gnotime/C/figures/gtt_prefs_logfile.png -share/gnome/help/gnotime/C/figures/gtt_prefs_misc.png -share/gnome/help/gnotime/C/figures/gtt_prefs_reports.png -share/gnome/help/gnotime/C/figures/gtt_prefs_shell.png -share/gnome/help/gnotime/C/figures/gtt_prefs_toolbar.png -share/gnome/help/gnotime/C/figures/gtt_prefswin.png -share/gnome/help/gnotime/C/figures/gtt_props_intervals.png -share/gnome/help/gnotime/C/figures/gtt_props_planning.png -share/gnome/help/gnotime/C/figures/gtt_props_project.png -share/gnome/help/gnotime/C/figures/gtt_props_rates.png -share/gnome/help/gnotime/C/figures/gtt_report_activity.png -share/gnome/help/gnotime/C/figures/gtt_report_daily.png -share/gnome/help/gnotime/C/figures/gtt_report_invoice.png -share/gnome/help/gnotime/C/figures/gtt_report_journal.png -share/gnome/help/gnotime/C/figures/gtt_report_todo.png -share/gnome/help/gnotime/C/figures/gtt_restartwin.png -share/gnome/help/gnotime/C/figures/gtt_startprojwin.png -share/gnome/help/gnotime/C/gnotime.xml -%%DATADIR%%/ghtml/C/activity.ghtml -%%DATADIR%%/ghtml/C/basic-daily.ghtml -%%DATADIR%%/ghtml/C/basic-invoice.ghtml -%%DATADIR%%/ghtml/C/basic-journal.ghtml -%%DATADIR%%/ghtml/C/basic-todo.ghtml -%%DATADIR%%/ghtml/C/daily.ghtml -%%DATADIR%%/ghtml/C/gnotime-logo.png -%%DATADIR%%/ghtml/C/gtt-style.css -%%DATADIR%%/ghtml/C/gtt.scm -%%DATADIR%%/ghtml/C/invoice.ghtml -%%DATADIR%%/ghtml/C/journal-rss.ghtml -%%DATADIR%%/ghtml/C/journal.ghtml -%%DATADIR%%/ghtml/C/monthly-daily.ghtml -%%DATADIR%%/ghtml/C/noproject.ghtml -%%DATADIR%%/ghtml/C/primer.ghtml -%%DATADIR%%/ghtml/C/query.ghtml -%%DATADIR%%/ghtml/C/status.ghtml -%%DATADIR%%/ghtml/C/tab-delim.ghtml -%%DATADIR%%/ghtml/C/todo-export.ghtml -%%DATADIR%%/ghtml/C/todo.ghtml -%%DATADIR%%/glade/active.glade -%%DATADIR%%/glade/column_menu.glade -%%DATADIR%%/glade/idle.glade -%%DATADIR%%/glade/interval_edit.glade -%%DATADIR%%/glade/interval_popup.glade -%%DATADIR%%/glade/journal.glade -%%DATADIR%%/glade/not-implemented.glade -%%DATADIR%%/glade/notes.glade -%%DATADIR%%/glade/plugin.glade -%%DATADIR%%/glade/plugin_editor.glade -%%DATADIR%%/glade/prefs.glade -%%DATADIR%%/glade/project_properties.glade -%%DATADIR%%/glade/task_popup.glade -%%DATADIR%%/glade/task_properties.glade -share/locale/az/LC_MESSAGES/gnotime-2.0.mo -share/locale/bg/LC_MESSAGES/gnotime-2.0.mo -share/locale/ca/LC_MESSAGES/gnotime-2.0.mo -share/locale/cs/LC_MESSAGES/gnotime-2.0.mo -share/locale/da/LC_MESSAGES/gnotime-2.0.mo -share/locale/de/LC_MESSAGES/gnotime-2.0.mo -share/locale/el/LC_MESSAGES/gnotime-2.0.mo -share/locale/en_GB/LC_MESSAGES/gnotime-2.0.mo -share/locale/es/LC_MESSAGES/gnotime-2.0.mo -share/locale/et/LC_MESSAGES/gnotime-2.0.mo -share/locale/eu/LC_MESSAGES/gnotime-2.0.mo -share/locale/fi/LC_MESSAGES/gnotime-2.0.mo -share/locale/fr/LC_MESSAGES/gnotime-2.0.mo -share/locale/ga/LC_MESSAGES/gnotime-2.0.mo -share/locale/gl/LC_MESSAGES/gnotime-2.0.mo -share/locale/hu/LC_MESSAGES/gnotime-2.0.mo -share/locale/id/LC_MESSAGES/qof.mo -share/locale/it/LC_MESSAGES/gnotime-2.0.mo -share/locale/ja/LC_MESSAGES/gnotime-2.0.mo -share/locale/ko/LC_MESSAGES/gnotime-2.0.mo -share/locale/lt/LC_MESSAGES/gnotime-2.0.mo -share/locale/lv/LC_MESSAGES/gnotime-2.0.mo -share/locale/ms/LC_MESSAGES/gnotime-2.0.mo -share/locale/nb/LC_MESSAGES/gnotime-2.0.mo -share/locale/nl/LC_MESSAGES/gnotime-2.0.mo -share/locale/nn/LC_MESSAGES/gnotime-2.0.mo -share/locale/pl/LC_MESSAGES/gnotime-2.0.mo -share/locale/pt/LC_MESSAGES/gnotime-2.0.mo -share/locale/pt_BR/LC_MESSAGES/gnotime-2.0.mo -share/locale/pt_BR/LC_MESSAGES/qof.mo -share/locale/ro/LC_MESSAGES/gnotime-2.0.mo -share/locale/ro/LC_MESSAGES/qof.mo -share/locale/ru/LC_MESSAGES/gnotime-2.0.mo -share/locale/sk/LC_MESSAGES/gnotime-2.0.mo -share/locale/sl/LC_MESSAGES/gnotime-2.0.mo -share/locale/sv/LC_MESSAGES/gnotime-2.0.mo -share/locale/sv/LC_MESSAGES/qof.mo -share/locale/ta/LC_MESSAGES/gnotime-2.0.mo -share/locale/tr/LC_MESSAGES/gnotime-2.0.mo -share/locale/uk/LC_MESSAGES/gnotime-2.0.mo -share/locale/vi/LC_MESSAGES/gnotime-2.0.mo -share/locale/vi/LC_MESSAGES/qof.mo -share/locale/wa/LC_MESSAGES/gnotime-2.0.mo -share/locale/zh_CN/LC_MESSAGES/gnotime-2.0.mo -share/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo -share/omf/gnotime/gnotime-C.omf +%%NLS%%share/locale/cs/LC_MESSAGES/qof.mo +%%NLS%%share/locale/de/LC_MESSAGES/qof.mo +%%NLS%%share/locale/fr/LC_MESSAGES/qof.mo +%%NLS%%share/locale/id/LC_MESSAGES/qof.mo +%%NLS%%share/locale/it/LC_MESSAGES/qof.mo +%%NLS%%share/locale/pt/LC_MESSAGES/qof.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/qof.mo +%%NLS%%share/locale/ro/LC_MESSAGES/qof.mo +%%NLS%%share/locale/ru/LC_MESSAGES/qof.mo +%%NLS%%share/locale/sv/LC_MESSAGES/qof.mo +%%NLS%%share/locale/vi/LC_MESSAGES/qof.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/qof.mo share/xml/qof/qsf/pilot-qsf-GnuCashInvoice.xml share/xml/qof/qsf/pilot-qsf-gncCustomer.xml share/xml/qof/qsf/qsf-map.xsd.xml share/xml/qof/qsf/qsf-object.xsd.xml @dirrm share/xml/qof/qsf @dirrm share/xml/qof -@dirrm share/omf/gnotime -@dirrm %%DATADIR%%/glade -@dirrm %%DATADIR%%/ghtml/C -@dirrm %%DATADIR%%/ghtml -@dirrm %%DATADIR%% -@dirrm share/gnome/help/gnotime/C/figures -@dirrm share/gnome/help/gnotime/C -@dirrm share/gnome/help/gnotime +@dirrm lib/qof2 @dirrm include/qof