Thu Aug 15 12:40:06 2013 UTC ()
misc fix including solaris support


(richard)
diff -r1.9 -r1.10 pkgsrc/sysutils/tree/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/tree/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/tree/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/sysutils/tree/patches/patch-tree.c
diff -r0 -r1.1 pkgsrc/sysutils/tree/patches/patch-tree.h
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/tree/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/tree/Makefile 2013/04/10 10:46:24 1.9
+++ pkgsrc/sysutils/tree/Makefile 2013/08/15 12:40:06 1.10
@@ -1,25 +1,30 @@ @@ -1,25 +1,30 @@
1# $NetBSD: Makefile,v 1.9 2013/04/10 10:46:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2013/08/15 12:40:06 richard Exp $
2# 2#
3 3
4DISTNAME= tree-1.6.0 4DISTNAME= tree-1.6.0
 5PKGREVISION= 1
5CATEGORIES= sysutils 6CATEGORIES= sysutils
6MASTER_SITES= ftp://mama.indstate.edu/linux/tree/ 7MASTER_SITES= ftp://mama.indstate.edu/linux/tree/
7EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://mama.indstate.edu/users/ice/tree/ 11HOMEPAGE= http://mama.indstate.edu/users/ice/tree/
11COMMENT= Print a text or HTML tree diagram of a directory structure 12COMMENT= Print a text or HTML tree diagram of a directory structure
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14USE_TOOLS+= gmake 15USE_TOOLS+= gmake
 16NO_CONFIGURE= yes
 17
 18CFLAGS+= -Wall -fomit-frame-pointer
 19CFLAGS.linux+= -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
15 20
16MAKE_FLAGS+= prefix=${PREFIX:Q} 21MAKE_FLAGS+= prefix=${PREFIX:Q}
17MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 22MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
18MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 23MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
19MAKE_FLAGS+= MANSUBDIR=${PKGMANDIR:Q} 24MAKE_FLAGS+= MANSUBDIR=${PKGMANDIR:Q}
20MAKE_FLAGS+= INSTALL_PROGRAM_DIR=${INSTALL_PROGRAM_DIR:Q} 25MAKE_FLAGS+= INSTALL_PROGRAM_DIR=${INSTALL_PROGRAM_DIR:Q}
21MAKE_FLAGS+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} 26MAKE_FLAGS+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
22MAKE_FLAGS+= INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q} 27MAKE_FLAGS+= INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q}
23MAKE_FLAGS+= INSTALL_MAN=${INSTALL_MAN:Q} 28MAKE_FLAGS+= INSTALL_MAN=${INSTALL_MAN:Q}
24 29
25.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/tree/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/tree/distinfo 2013/04/10 10:46:24 1.7
+++ pkgsrc/sysutils/tree/distinfo 2013/08/15 12:40:06 1.8
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.7 2013/04/10 10:46:24 wiz Exp $ 1$NetBSD: distinfo,v 1.8 2013/08/15 12:40:06 richard Exp $
2 2
3SHA1 (tree-1.6.0.tgz) = 350f851f68859a011668362dd0e7ee81fd1b713a 3SHA1 (tree-1.6.0.tgz) = 350f851f68859a011668362dd0e7ee81fd1b713a
4RMD160 (tree-1.6.0.tgz) = d0e89f49fa902c7a72056d1a4ef826ddfee6be15 4RMD160 (tree-1.6.0.tgz) = d0e89f49fa902c7a72056d1a4ef826ddfee6be15
5Size (tree-1.6.0.tgz) = 42706 bytes 5Size (tree-1.6.0.tgz) = 42706 bytes
6SHA1 (patch-Makefile) = b2b29766bfa46ff7e061bcd7bcd0fc88f954d236 6SHA1 (patch-Makefile) = 068bd63827393400262ac345f2ee43f5ad417670
 7SHA1 (patch-tree.c) = 0a110bc38fb1b0e498748d17c6327a0289321075
 8SHA1 (patch-tree.h) = fbcf8a76dadfd5ea2d102c4e4863d5ce464786bd
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/tree/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/tree/patches/patch-Makefile 2013/04/10 10:46:26 1.1
+++ pkgsrc/sysutils/tree/patches/patch-Makefile 2013/08/15 12:40:06 1.2
@@ -1,28 +1,25 @@ @@ -1,28 +1,25 @@
1$NetBSD: patch-Makefile,v 1.1 2013/04/10 10:46:26 wiz Exp $ 1$NetBSD: patch-Makefile,v 1.2 2013/08/15 12:40:06 richard Exp $
2 
3Fix build on systems lacking strverscmp. 
4Remove -O4 (doesn't exist in most compilers). 
5Fix DESTDIR. 
6 2
7--- Makefile.orig 2011-06-24 14:25:27.000000000 +0000 3--- Makefile.orig 2011-06-24 14:25:27.000000000 +0000
8+++ Makefile 4+++ Makefile
9@@ -31,13 +31,13 @@ OBJS=tree.o unix.o html.o xml.o hash.o c 5@@ -31,13 +31,13 @@ OBJS=tree.o unix.o html.o xml.o hash.o c
10  6
11 # Linux defaults: 7 # Linux defaults:
12 #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 8 #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
13-CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 9-CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
14+CFLAGS=-DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 10-LDFLAGS=-s
15 LDFLAGS=-s 11+#CFLAGS=-DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 12+#LDFLAGS=-s
16  13
17 # Uncomment for FreeBSD: 14 # Uncomment for FreeBSD:
18 #CFLAGS=-O2 -Wall -fomit-frame-pointer 15 #CFLAGS=-O2 -Wall -fomit-frame-pointer
19 #LDFLAGS=-s 16 #LDFLAGS=-s
20-#OBJS+=strverscmp.o 17-#OBJS+=strverscmp.o
21+OBJS+=strverscmp.o 18+OBJS+=strverscmp.o
22  19
23 # Uncomment for Solaris: 20 # Uncomment for Solaris:
24 #CC=cc 21 #CC=cc
25@@ -94,12 +94,12 @@ clean: 22@@ -94,12 +94,12 @@ clean:
26 rm -f *~ 23 rm -f *~
27  24
28 install: tree 25 install: tree
File Added: pkgsrc/sysutils/tree/patches/Attic/patch-tree.c
$NetBSD: patch-tree.c,v 1.1 2013/08/15 12:40:06 richard Exp $

--- tree.c.orig	2011-06-24 14:26:30.000000000 +0000
+++ tree.c
@@ -45,7 +45,7 @@ int mb_cur_max;
 #ifdef __EMX__
 const u_short ifmt[]={ FILE_ARCHIVED, FILE_DIRECTORY, FILE_SYSTEM, FILE_HIDDEN, FILE_READONLY, 0};
 #else
-  #ifdef S_ISPORT
+  #if defined(S_ISPORT) && defined(S_ISDOOR)
   const u_int ifmt[] = {S_IFREG, S_IFDIR, S_IFLNK, S_IFCHR, S_IFBLK, S_IFSOCK, S_IFIFO, S_ISDOOR, S_ISPORT, 0};
   const char fmt[] = "-dlcbspDP?";
   const char *ftype[] = {"file", "directory", "link", "char", "block", "socket", "fifo", "door", "port", "unknown", NULL};
File Added: pkgsrc/sysutils/tree/patches/Attic/patch-tree.h
$NetBSD: patch-tree.h,v 1.1 2013/08/15 12:40:06 richard Exp $

--- tree.h.orig	2011-06-24 12:55:58.000000000 +0000
+++ tree.h
@@ -59,6 +59,10 @@
 #define mbstowcs(w,m,x) mbsrtowcs(w,(const char**)(& #m),x,NULL)
 #endif
 
+#ifdef __sun
+# undef S_ISDOOR
+#endif
+
 /* Should probably use strdup(), but we like our xmalloc() */
 #define scopy(x)	strcpy(xmalloc(strlen(x)+1),(x))
 #define MINIT		30	/* number of dir entries to initially allocate */