summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleot <leot@pkgsrc.org>2017-09-02 22:45:04 +0000
committerleot <leot@pkgsrc.org>2017-09-02 22:45:04 +0000
commit02d2298a4b0c1936f2eacafd23929257e28c8da6 (patch)
tree0abcbf739ad61b16062b93aad56af1157a839f1f
parentde1e291f156d73785e063357198f0cf083021eb3 (diff)
downloadpkgsrc-02d2298a4b0c1936f2eacafd23929257e28c8da6.tar.gz
Update x11/xdg-user-dirs to 0.16
Changes: 0.16 ---- * Added autostart file
-rw-r--r--x11/xdg-user-dirs/Makefile10
-rw-r--r--x11/xdg-user-dirs/PLIST4
-rw-r--r--x11/xdg-user-dirs/distinfo14
-rw-r--r--x11/xdg-user-dirs/patches/patch-ab20
-rw-r--r--x11/xdg-user-dirs/patches/patch-ac10
5 files changed, 30 insertions, 28 deletions
diff --git a/x11/xdg-user-dirs/Makefile b/x11/xdg-user-dirs/Makefile
index 7228c3500c8..333dee76892 100644
--- a/x11/xdg-user-dirs/Makefile
+++ b/x11/xdg-user-dirs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2017/02/03 08:42:32 leot Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/02 22:45:04 leot Exp $
-DISTNAME= xdg-user-dirs-0.15
-PKGREVISION= 2
+DISTNAME= xdg-user-dirs-0.16
CATEGORIES= x11
MASTER_SITES= http://user-dirs.freedesktop.org/releases/
@@ -18,13 +17,16 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt
EGDIR= ${PREFIX}/share/examples/xdg
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart
CONF_FILES+= ${EGDIR}/user-dirs.conf \
${PKG_SYSCONFDIR}/xdg/user-dirs.conf
CONF_FILES+= ${EGDIR}/user-dirs.defaults \
${PKG_SYSCONFDIR}/xdg/user-dirs.defaults
+CONF_FILES+= ${EGDIR}/autostart/xdg-user-dirs.desktop \
+ ${PKG_SYSCONFDIR}/xdg/autostart/xdg-user-dirs.desktop
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdg-user-dirs/PLIST b/x11/xdg-user-dirs/PLIST
index 84a73b0c081..3af4a5181aa 100644
--- a/x11/xdg-user-dirs/PLIST
+++ b/x11/xdg-user-dirs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/08/26 11:54:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/09/02 22:45:04 leot Exp $
bin/xdg-user-dir
bin/xdg-user-dirs-update
man/man1/xdg-user-dir.1
@@ -6,6 +6,7 @@ man/man1/xdg-user-dirs-update.1
man/man5/user-dirs.conf.5
man/man5/user-dirs.defaults.5
man/man5/user-dirs.dirs.5
+share/examples/xdg/autostart/xdg-user-dirs.desktop
share/examples/xdg/user-dirs.conf
share/examples/xdg/user-dirs.defaults
share/locale/af/LC_MESSAGES/xdg-user-dirs.mo
@@ -32,6 +33,7 @@ share/locale/fa/LC_MESSAGES/xdg-user-dirs.mo
share/locale/fi/LC_MESSAGES/xdg-user-dirs.mo
share/locale/fr/LC_MESSAGES/xdg-user-dirs.mo
share/locale/ga/LC_MESSAGES/xdg-user-dirs.mo
+share/locale/gd/LC_MESSAGES/xdg-user-dirs.mo
share/locale/gl/LC_MESSAGES/xdg-user-dirs.mo
share/locale/gu/LC_MESSAGES/xdg-user-dirs.mo
share/locale/he/LC_MESSAGES/xdg-user-dirs.mo
diff --git a/x11/xdg-user-dirs/distinfo b/x11/xdg-user-dirs/distinfo
index a609d77b609..c5e5fe922e4 100644
--- a/x11/xdg-user-dirs/distinfo
+++ b/x11/xdg-user-dirs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2016/02/23 11:31:54 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2017/09/02 22:45:04 leot Exp $
-SHA1 (xdg-user-dirs-0.15.tar.gz) = 4e722682adcce33b4b9130b148bfbd9d49737814
-RMD160 (xdg-user-dirs-0.15.tar.gz) = 16a15a2283643139891570466dd3521542cbd2da
-SHA512 (xdg-user-dirs-0.15.tar.gz) = 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9
-Size (xdg-user-dirs-0.15.tar.gz) = 243747 bytes
-SHA1 (patch-ab) = 2a699ce58d526684c53c0e989b95de588908e324
-SHA1 (patch-ac) = 9a765ae9a9ee8065bed91f47a528a592c626daf7
+SHA1 (xdg-user-dirs-0.16.tar.gz) = 4a30055f4570c11b8473db76b3cb4586a67afc53
+RMD160 (xdg-user-dirs-0.16.tar.gz) = e84d99d0a9bda3eff5e4eaae5f52a5fa7d956169
+SHA512 (xdg-user-dirs-0.16.tar.gz) = 245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae
+Size (xdg-user-dirs-0.16.tar.gz) = 255933 bytes
+SHA1 (patch-ab) = a68f8557afcedc2bbf947834eeef067ac78d21a7
+SHA1 (patch-ac) = 1bb7ee838a2e8c016f1b5988d51de153e61e9a04
SHA1 (patch-xdg-user-dirs-update.c) = 303cd15575e34942ede3b5bc23cf76575e833ff9
diff --git a/x11/xdg-user-dirs/patches/patch-ab b/x11/xdg-user-dirs/patches/patch-ab
index 3f3465cd611..07b051200cb 100644
--- a/x11/xdg-user-dirs/patches/patch-ab
+++ b/x11/xdg-user-dirs/patches/patch-ab
@@ -1,18 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/04/16 19:06:56 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2017/09/02 22:45:04 leot Exp $
---- configure.orig 2009-04-16 16:43:21.000000000 +0200
+--- configure.orig 2017-08-21 07:00:51.000000000 +0000
+++ configure
-@@ -6744,12 +6744,11 @@ extern
+@@ -7270,8 +7270,7 @@ extern
#ifdef __cplusplus
"C"
#endif
-const char *_nl_expand_alias (const char *);
- int
- main ()
- {
- bindtextdomain ("", "");
--return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr
- ;
- return 0;
- }
+-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr)
+ #else
+ #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+ #endif
diff --git a/x11/xdg-user-dirs/patches/patch-ac b/x11/xdg-user-dirs/patches/patch-ac
index fb1fc0ef311..aa985344ba6 100644
--- a/x11/xdg-user-dirs/patches/patch-ac
+++ b/x11/xdg-user-dirs/patches/patch-ac
@@ -1,14 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2015/08/27 21:44:59 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2017/09/02 22:45:04 leot Exp $
---- Makefile.in.orig 2013-06-27 08:22:14.000000000 +0000
+--- Makefile.in.orig 2017-08-21 07:02:40.000000000 +0000
+++ Makefile.in
-@@ -314,9 +314,9 @@ INCLUDES = \
+@@ -398,11 +398,11 @@ INCLUDES = \
EXTRA_DIST = config.rpath translate.c autogen.sh \
- user-dirs.conf user-dirs.defaults xdg-user-dir
+ user-dirs.conf user-dirs.defaults xdg-user-dir xdg-user-dirs.desktop
-xdgdir = $(sysconfdir)/xdg
+xdgdir = $(prefix)/share/examples/xdg
xdg_DATA = user-dirs.conf user-dirs.defaults
+ xdgautostartdir = $(xdgdir)/autostart
+ xdgautostart_DATA = xdg-user-dirs.desktop
-libraries = $(LIBINTL)
+libraries = $(LIBINTL) $(LIBICONV)
bin_SCRIPTS = \