Add missing libconv dependency and fix linker line.

From Jörn Clausen in PR 50180.

Bump PKGREVISION to be on the safe side.
This commit is contained in:
wiz 2015-08-27 21:44:59 +00:00
parent 7a22cc975b
commit 415dd2eb5d
3 changed files with 12 additions and 7 deletions

View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.7 2015/08/26 11:54:10 wiz Exp $
# $NetBSD: Makefile,v 1.8 2015/08/27 21:44:59 wiz Exp $
DISTNAME= xdg-user-dirs-0.15
PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://user-dirs.freedesktop.org/releases/
@ -23,5 +24,6 @@ CONF_FILES+= ${EGDIR}/user-dirs.conf \
CONF_FILES+= ${EGDIR}/user-dirs.defaults \
${PKG_SYSCONFDIR}/xdg/user-dirs.defaults
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.3 2015/08/26 11:54:10 wiz Exp $
$NetBSD: distinfo,v 1.4 2015/08/27 21:44:59 wiz Exp $
SHA1 (xdg-user-dirs-0.15.tar.gz) = 4e722682adcce33b4b9130b148bfbd9d49737814
RMD160 (xdg-user-dirs-0.15.tar.gz) = 16a15a2283643139891570466dd3521542cbd2da
Size (xdg-user-dirs-0.15.tar.gz) = 243747 bytes
SHA1 (patch-ab) = 2a699ce58d526684c53c0e989b95de588908e324
SHA1 (patch-ac) = da06f94f98f6d9ad8fb219c0d6708868b9975821
SHA1 (patch-ac) = 9a765ae9a9ee8065bed91f47a528a592c626daf7
SHA1 (patch-xdg-user-dirs-update.c) = c08fe39ab65ba7704aefc9c1530ccebf11e06ad7

View file

@ -1,13 +1,16 @@
$NetBSD: patch-ac,v 1.1.1.1 2009/04/16 19:06:56 drochner Exp $
$NetBSD: patch-ac,v 1.2 2015/08/27 21:44:59 wiz Exp $
--- Makefile.in.orig 2009-04-16 17:04:57.000000000 +0200
--- Makefile.in.orig 2013-06-27 08:22:14.000000000 +0000
+++ Makefile.in
@@ -229,7 +229,7 @@ INCLUDES = \
@@ -314,9 +314,9 @@ INCLUDES = \
EXTRA_DIST = config.rpath translate.c autogen.sh \
user-dirs.conf user-dirs.defaults xdg-user-dir
-xdgdir = $(sysconfdir)/xdg
+xdgdir = $(prefix)/share/examples/xdg
xdg_DATA = user-dirs.conf user-dirs.defaults
libraries = $(LIBINTL)
-libraries = $(LIBINTL)
+libraries = $(LIBINTL) $(LIBICONV)
bin_SCRIPTS = \
xdg-user-dir \
$(NULL)