diff options
Diffstat (limited to 'time')
-rw-r--r-- | time/gnotime/Makefile | 18 | ||||
-rw-r--r-- | time/gnotime/PLIST | 3 | ||||
-rw-r--r-- | time/gnotime/distinfo | 12 | ||||
-rw-r--r-- | time/gnotime/patches/patch-aa | 58 | ||||
-rw-r--r-- | time/gnotime/patches/patch-ab | 13 |
5 files changed, 21 insertions, 83 deletions
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile index d5989475414..627b9c15cd1 100644 --- a/time/gnotime/Makefile +++ b/time/gnotime/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.71 2016/03/05 11:29:33 jperkin Exp $ +# $NetBSD: Makefile,v 1.72 2016/07/30 02:56:34 mef Exp $ -DISTNAME= gnotime-2.3.0 -PKGREVISION= 37 +DISTNAME= gnotime-2.4.0 CATEGORIES= time gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gttr/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://gttr.sourceforge.net/ COMMENT= Time tracker for GNOME2 +LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes USE_TOOLS+= gmake intltool msgfmt pkg-config @@ -17,6 +17,15 @@ USE_PKGLOCALEDIR= yes GCONF_SCHEMAS= gnotime.schemas MAKE_ENV+= GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q} +EGDIR= share/gconf +CONF_FILES+= ${EGDIR}/schemas/${GCONF_SCHEMAS} etc/gconf/schemas/${GCONF_SCHEMAS} + +post-install: + cd ${DESTDIR}${PREFIX}; \ + ${MKDIR} etc/gconf/schemas ;\ + ${MKDIR} ${EGDIR}/schemas ;\ + ${MV} etc/gconf/schemas/${GCONF_SCHEMAS} ${EGDIR}/schemas + .include "../../devel/GConf/schemas.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -25,7 +34,7 @@ MAKE_ENV+= GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q} .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/qof/buildlink3.mk" -.include "../../lang/guile/buildlink3.mk" +.include "../../lang/guile20/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" @@ -34,4 +43,5 @@ MAKE_ENV+= GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q} .include "../../x11/libXScrnSaver/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/time/gnotime/PLIST b/time/gnotime/PLIST index e9f13a4d036..5f602f7998e 100644 --- a/time/gnotime/PLIST +++ b/time/gnotime/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:17:58 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/07/30 02:56:34 mef Exp $ bin/gnotime bin/gnotime-remote man/man1/gnotime-remote.1 @@ -104,3 +104,4 @@ 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 +@pkgdir etc/gconf/schemas diff --git a/time/gnotime/distinfo b/time/gnotime/distinfo index 78e6cec6534..c04b626a296 100644 --- a/time/gnotime/distinfo +++ b/time/gnotime/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.11 2015/11/02 23:31:36 agc Exp $ +$NetBSD: distinfo,v 1.12 2016/07/30 02:56:34 mef Exp $ -SHA1 (gnotime-2.3.0.tar.gz) = 1cd38b5a3d3548d19543f0aea421152367523a90 -RMD160 (gnotime-2.3.0.tar.gz) = 361e45d82997cbac691751b830a2279e6ed74134 -SHA512 (gnotime-2.3.0.tar.gz) = 650442494c4c32b934c5f46d368b67f0a65592f4c0f3a953fb1925f3289dec4a692eb3eadc13d7b0e08fcb76247af759b24a822fb02b09c8e61cf83e3641fbda -Size (gnotime-2.3.0.tar.gz) = 1987788 bytes -SHA1 (patch-aa) = 48add73db83f4bee002c12833fd756b0eaef7eec -SHA1 (patch-ab) = c78194b5eb8caef9d118246c0da1c923a32a2e8c +SHA1 (gnotime-2.4.0.tar.gz) = 2f7bd2ec0287bc0631f5d6e9aabf0a4e2279277a +RMD160 (gnotime-2.4.0.tar.gz) = a0963cad9547c9b25f2ee6280c211a7fcb87e4d2 +SHA512 (gnotime-2.4.0.tar.gz) = d2b6e7e401dfaa7331e11074d09af7f21ac66d759050d780f5ea3165664a9a9a8e9c6181e4f5e54e9dc6789d947d730f6113a1b32c5aca776eeada454040c3f9 +Size (gnotime-2.4.0.tar.gz) = 1767510 bytes diff --git a/time/gnotime/patches/patch-aa b/time/gnotime/patches/patch-aa deleted file mode 100644 index e48bb256457..00000000000 --- a/time/gnotime/patches/patch-aa +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2009/12/21 19:55:01 joerg Exp $ - -Makefiles use LIBGNOMEUI_CFLAGS etc, so make sure that the values are -added to the right variable. - ---- configure.orig 2009-12-21 19:47:53.000000000 +0000 -+++ configure -@@ -24931,8 +24931,8 @@ pkg_failed=no - echo $ECHO_N "checking for GNOMEUI... $ECHO_C" >&6; } - - if test -n "$PKG_CONFIG"; then -- if test -n "$GNOMEUI_CFLAGS"; then -- pkg_cv_GNOMEUI_CFLAGS="$GNOMEUI_CFLAGS" -+ if test -n "$LIBGNOMEUI_CFLAGS"; then -+ pkg_cv_LIBGNOMEUI_CFLAGS="$LIBGNOMEUI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5 -@@ -24940,7 +24940,7 @@ if test -n "$PKG_CONFIG"; then - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null` -+ pkg_cv_LIBGNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -24949,8 +24949,8 @@ else - pkg_failed=untried - fi - if test -n "$PKG_CONFIG"; then -- if test -n "$GNOMEUI_LIBS"; then -- pkg_cv_GNOMEUI_LIBS="$GNOMEUI_LIBS" -+ if test -n "$LIBGNOMEUI_LIBS"; then -+ pkg_cv_LIBGNOMEUI_LIBS="$LIBGNOMEUI_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED\"") >&5 -@@ -24958,7 +24958,7 @@ if test -n "$PKG_CONFIG"; then - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GNOMEUI_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null` -+ pkg_cv_LIBGNOMEUI_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -25030,8 +25030,8 @@ To get pkg-config, see <http://pkg-confi - See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else -- GNOMEUI_CFLAGS=$pkg_cv_GNOMEUI_CFLAGS -- GNOMEUI_LIBS=$pkg_cv_GNOMEUI_LIBS -+ LIBGNOMEUI_CFLAGS=$pkg_cv_LIBGNOMEUI_CFLAGS -+ LIBGNOMEUI_LIBS=$pkg_cv_LIBGNOMEUI_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - : diff --git a/time/gnotime/patches/patch-ab b/time/gnotime/patches/patch-ab deleted file mode 100644 index 5d57146eec7..00000000000 --- a/time/gnotime/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2008/10/28 23:38:33 wiz Exp $ - ---- gconf/Makefile.in.orig 2008-02-15 20:11:59.000000000 +0000 -+++ gconf/Makefile.in -@@ -259,7 +259,7 @@ top_srcdir = @top_srcdir@ - EXTRA_DIST = \ - gnotime.schemas.in - --schemasdir = $(sysconfdir)/gconf/schemas -+schemasdir = $(GCONF_SCHEMAS_DIR) - schemas_in_files = gnotime.schemas.in - schemas_DATA = gnotime.schemas - all: all-am |