Tue Feb 4 14:33:54 2014 UTC ()
Update to get misc/gnuls package to work with latest sysutils/coreutils-8.22.


(richard)
diff -r1.25 -r1.26 pkgsrc/misc/gnuls/Makefile
diff -r1.24 -r1.25 pkgsrc/sysutils/coreutils/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/coreutils/patches/patch-Makefile.in
cvs diff -r1.25 -r1.26 pkgsrc/misc/gnuls/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/gnuls/Makefile 2012/06/02 08:51:37 1.25
+++ pkgsrc/misc/gnuls/Makefile 2014/02/04 14:33:54 1.26
@@ -1,30 +1,26 @@ @@ -1,30 +1,26 @@
1# $NetBSD: Makefile,v 1.25 2012/06/02 08:51:37 cheusov Exp $ 1# $NetBSD: Makefile,v 1.26 2014/02/04 14:33:54 richard Exp $
2# 2#
3 3
4.include "../../sysutils/coreutils/Makefile.common" 4.include "../../sysutils/coreutils/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:S/coreutils/gnuls/} 6PKGNAME= ${DISTNAME:S/coreutils/gnuls/}
7PKGREVISION= 2 
8CATEGORIES= misc 7CATEGORIES= misc
9 8
10COMMENT= GNU ls utility with color support 9COMMENT= GNU ls utility with color support
11 10
12CONFLICTS= coreutils-[0-9]* linuxls-[0-9]* 11CONFLICTS= coreutils-[0-9]* linuxls-[0-9]*
13 12
14do-build: 13BUILD_TARGET= gnuls
15 ${RUN} cd ${WRKSRC}/lib && ${BUILD_MAKE_CMD} all 
16 ${RUN} cd ${WRKSRC}/src && ${BUILD_MAKE_CMD} version.h 
17 ${RUN} cd ${WRKSRC}/src && ${BUILD_MAKE_CMD} dircolors ls 
18 14
19AUTO_MKDIRS= yes 15AUTO_MKDIRS= yes
20 16
21do-install: 17do-install:
22.for f in ls dircolors 18.for f in ls dircolors
23 ${INSTALL_PROGRAM} ${WRKSRC}/src/${f} \ 19 ${INSTALL_PROGRAM} ${WRKSRC}/src/${f} \
24 ${DESTDIR}${PREFIX}/bin/g${f} 20 ${DESTDIR}${PREFIX}/bin/g${f}
25 ${INSTALL_DATA} ${WRKSRC}/man/${f}.1 \ 21 ${INSTALL_DATA} ${WRKSRC}/man/${f}.1 \
26 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f}.1 22 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f}.1
27 ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f} 23 ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}
28 ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1 24 ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1
29.endfor 25.endfor
30 26
cvs diff -r1.24 -r1.25 pkgsrc/sysutils/coreutils/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/coreutils/distinfo 2014/02/02 07:08:24 1.24
+++ pkgsrc/sysutils/coreutils/distinfo 2014/02/04 14:33:54 1.25
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.24 2014/02/02 07:08:24 richard Exp $ 1$NetBSD: distinfo,v 1.25 2014/02/04 14:33:54 richard Exp $
2 2
3SHA1 (coreutils-8.22.tar.xz) = cc7fe47b21eb49dd2ee4cdb707570f42fb2c8cc6 3SHA1 (coreutils-8.22.tar.xz) = cc7fe47b21eb49dd2ee4cdb707570f42fb2c8cc6
4RMD160 (coreutils-8.22.tar.xz) = c3da7ade1d3ac82e97ac4a24c70376af8b9b503b 4RMD160 (coreutils-8.22.tar.xz) = c3da7ade1d3ac82e97ac4a24c70376af8b9b503b
5Size (coreutils-8.22.tar.xz) = 5335124 bytes 5Size (coreutils-8.22.tar.xz) = 5335124 bytes
 6SHA1 (patch-Makefile.in) = 2dfeef19557a569bb7a60947dd3389656cb5024b
6SHA1 (patch-lib-fflush.c) = 106e9c7d05fff290f24cb69e1b2c80d0077c62bd 7SHA1 (patch-lib-fflush.c) = 106e9c7d05fff290f24cb69e1b2c80d0077c62bd
7SHA1 (patch-lib-fseeko.c) = 9f4b0294698648011c64869fc0e642f910e9d47f 8SHA1 (patch-lib-fseeko.c) = 9f4b0294698648011c64869fc0e642f910e9d47f
File Added: pkgsrc/sysutils/coreutils/patches/patch-Makefile.in
$NetBSD: patch-Makefile.in,v 1.1 2014/02/04 14:33:54 richard Exp $

--- Makefile.in.orig	2013-12-13 15:20:00.000000000 +0000
+++ Makefile.in
@@ -4395,6 +4395,9 @@ pr_data = \
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
+gnuls: $(BUILT_SOURCES) $(mandeps)
+	$(MAKE) $(AM_MAKEFLAGS) src/dircolors src/ls man/dircolors.1 man/ls.1
+
 .SUFFIXES:
 .SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sed .sh .sh$(EXEEXT) .sin .trs .x .xpl .xpl$(EXEEXT) .y
 am--refresh: Makefile