Date: Sun, 7 Sep 2014 20:02:17 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367600 - head/deskutils/gnotime Message-ID: <201409072002.s87K2HVu078177@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Sep 7 20:02:17 2014 New Revision: 367600 URL: http://svnweb.freebsd.org/changeset/ports/367600 QAT: https://qat.redports.org/buildarchive/r367600/ Log: Use the new databases/qof Modified: head/deskutils/gnotime/Makefile head/deskutils/gnotime/distinfo head/deskutils/gnotime/pkg-plist Modified: head/deskutils/gnotime/Makefile ============================================================================== --- head/deskutils/gnotime/Makefile Sun Sep 7 19:57:15 2014 (r367599) +++ head/deskutils/gnotime/Makefile Sun Sep 7 20:02:17 2014 (r367600) @@ -3,79 +3,40 @@ PORTNAME= gnotime PORTVERSION= 2.4.1 -PORTREVISION= 3 +PORTREVISION= 4 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 +MASTER_SITES= SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Time tracker for gnome2 LICENSE= GPLv2 # (or later) +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile +LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile \ + libqof.so:${PORTSDIR}/databases/qof 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}" + GUILE_LIBS="$$(guile-config link)" CONFIGURE_ARGS= --disable-silent-rules INSTALL_TARGET= install-strip USE_LDCONFIG= yes INSTALLS_OMF= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gnotime.schemas -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 - 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}) .include <bsd.port.mk> Modified: head/deskutils/gnotime/distinfo ============================================================================== --- head/deskutils/gnotime/distinfo Sun Sep 7 19:57:15 2014 (r367599) +++ head/deskutils/gnotime/distinfo Sun Sep 7 20:02:17 2014 (r367600) @@ -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 Modified: head/deskutils/gnotime/pkg-plist ============================================================================== --- head/deskutils/gnotime/pkg-plist Sun Sep 7 19:57:15 2014 (r367599) +++ head/deskutils/gnotime/pkg-plist Sun Sep 7 20:02:17 2014 (r367600) @@ -1,52 +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 -include/qof/qofbackend-p.h -include/qof/qofbackend.h -include/qof/qofbook.h -include/qof/qofbookmerge.h -include/qof/qofchoice.h -include/qof/qofclass.h -include/qof/qofdate.h -include/qof/qoferror.h -include/qof/qofevent.h -include/qof/qofgobj.h -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 -include/qof/qofquery-p.h -include/qof/qofquery.h -include/qof/qofquerycore-p.h -include/qof/qofquerycore.h -include/qof/qofreference.h -include/qof/qofsession.h -include/qof/qofsql.h -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.a -lib/libqof.so -lib/libqof.so.1 -lib/libqofsql.a -lib/libqofsql.so -lib/libqofsql.so.1 -libdata/pkgconfig/qof-1.pc -libdata/pkgconfig/qof.pc man/man1/gnotime-remote.1.gz man/man1/gnotime.1.gz share/applications/gnotime.desktop @@ -124,7 +77,6 @@ share/locale/fr/LC_MESSAGES/gnotime-2.0. 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 @@ -137,29 +89,19 @@ share/locale/nn/LC_MESSAGES/gnotime-2.0. 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 -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 @@ -168,4 +110,3 @@ share/xml/qof/qsf/qsf-object.xsd.xml @dirrm share/gnome/help/gnotime/C/figures @dirrm share/gnome/help/gnotime/C @dirrm share/gnome/help/gnotime -@dirrm include/qof
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409072002.s87K2HVu078177>