7 files changed, 13 insertions, 202 deletions

diff --git a/sysutils/du2ps/Makefile b/sysutils/du2ps/Makefile
index cedf143561c7..a4845c4d7c77 100644
--- a/sysutils/du2ps/Makefile
+++ b/sysutils/du2ps/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	du2ps
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	3.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.research.co.jp/software/du2ps/
+MASTER_SITES=	http://line.to/mac/soft/du2ps/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mistral@imasy.or.jp
@@ -18,17 +17,22 @@ COMMENT=	Filter for converting output of du to PostScript file
 # Nkf is required for just converting character code of japanese manual
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
-MAKEFILE=	makefile
 ALL_TARGET=
+MAKE_ARGS=	CFLAGS="${CFLAGS}"
 
 MAN1=		du2ps.1
 MANLANG=	"" ja
 PLIST_FILES=	bin/du2ps
+PORTDOCS=	README.ver1 README.ver2 README.xdu du2ps.pdf du2psj.pdf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/du2ps ${PREFIX}/bin/du2ps
-	${INSTALL_MAN} ${FILESDIR}/du2ps.1 ${PREFIX}/man/man1/du2ps.1
-	nkf -e ${WRKSRC}/du2ps.man > ${WRKDIR}/du2ps.1.ja
-	${INSTALL_MAN} ${WRKDIR}/du2ps.1.ja ${PREFIX}/man/ja/man1/du2ps.1
+	${INSTALL_MAN} ${WRKSRC}/du2ps.1 ${PREFIX}/man/man1/du2ps.1
+	nkf -e ${WRKSRC}/du2ps.1j > ${WRKSRC}/du2ps.1.ja
+	${INSTALL_MAN} ${WRKSRC}/du2ps.1.ja ${PREFIX}/man/ja/man1/du2ps.1
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/du2ps/distinfo b/sysutils/du2ps/distinfo
index a0ca9aac3c4a..ddffef01d4e3 100644
--- a/sysutils/du2ps/distinfo
+++ b/sysutils/du2ps/distinfo
@@ -1,2 +1,2 @@
-MD5 (du2ps-2.1.tgz) = e0f1366513b1a257cfdb4676bb8c4f9c
-SIZE (du2ps-2.1.tgz) = 9152
+MD5 (du2ps-3.1.tgz) = 520c4fabaf78cf8daa71d7475c75a28c
+SIZE (du2ps-3.1.tgz) = 18721
diff --git a/sysutils/du2ps/files/du2ps.1 b/sysutils/du2ps/files/du2ps.1
deleted file mode 100644
index 35832ac751e4..000000000000
--- a/sysutils/du2ps/files/du2ps.1
+++ /dev/null
@@ -1,108 +0,0 @@
-.\"
-.\" Copyleft by nagae@an.ip.titech.ac.jp and mac@research.co.jp
-.\" du2ps.man
-.TH du2ps 1 "Mar 2, 1994"
-.SH NAME
-du2ps \- filter for converting output of du to PostScript file
-.SH SYNOPSIS
-.B du2ps
-[
-.I options
-]
-<
-.I du_out_file
->
-.I ps_file
-.SH DESCRIPTION
-The
-.B du2ps
-reads output of
-.BR du (1),
-then generate a figure of hierarchical structure and utilization of
-directory as one page PostScript file.
-.PP
-Each directory is illustrated as rectangle in utilization order with
-height corresponding to its utilization, and sub directories are placed
-branched from left to right recursively. 
-.SH OPTIONS
-.TP
-.B \-land
-Layout in landscape.
-Default is in portrait.
-.TP
-.B \-sa
-Place directories in alphabetical order.
-Default is in utilization order.
-.TP
-.B \-b4
-.TP
-.B \-b5
-.TP
-.B \-us
-Switch page size to B4, B5, or US letter. Default is A4.
-.TP
-.BI \-ff " name"
-Specify font name for text. Default is Times-Roman.
-.TP
-.BI \-fs " size"
-Specify font size. Default is 8.0 [pt].
-.TP
-.BI \-ms " size"
-Specify margin around page. Default is 50.0 [pt].
-.TP
-.BI \-lw " size"
-Line width for drawing rectangle area. Default is 0.5 [pt].
-.TP
-.BI \-ncols " num"
-Specify number of rectangle columns (maximum directory depth).
-Default is 7 for portrait and 10 for landscape.
-.TP
-.BI \-eps " width height"
-Output in EPS format.
-.I Width
-and
-.I height
-are the width and height of BoundingBox.
-.SH EXAMPLES
-.B " du | du2ps | lpr
-.IP
-The most left directory name becomes ``.'', and ``The number of disk
-blocks used at .'' will be displayed at the upper left corner.
-.
-.B " du /home/taro/work | du2ps | lpr
-.PP
-.B " du ~taro/work | du2ps | lpr
-.IP
-The most left directory name becomes ``work'', and 
-``The number of disk blocks used at /home/taro/work'' 
-will be displayed at the upper left corner.
-.PP
-.B " du ../../ps | du2ps -us -fs 16 > tmp.ps; gs tmp.ps
-.IP
-The most left directory name becomes ``ps'', and
-``The number of disk blocks used at ../../ps''
-will be displayed at the upper left corner.
-The ``-us'' option makes entire page to fit paper, because default size of
-GhostScript is US letter.
-.PP
-.B " du ~taro/work ~taro/bin | du2ps -eps 200 300 > fig1.eps
-.IP
-The most left directory name becomes ``taro'', and
-``The number of disk blocks used at /home/taro''
-will be display at the upper left corner.
-Output will be commented with ``%%BoundingBox: 0 0 200 300''.
-.PP
-.B " du work bin | du2ps -eps 100 100 -fs 4 > fig2.eps
-.IP
-The most left directory name becomes ``..'', and
-``The number of disk blocks used at''
-will be display at the upper left corner.
-.SH SEE ALSO
-.BR du (1),
-.BR xdu (1)
-.SH AUTHORS
-Takanori Nagae <nagae@an.ip.titech.ac.jp> and
-Shigeru Makino <mac@research.co.jp>
-.PP
-The du2ps is based on xdu.
-The author of xdu is Phillip C. Dykstra <phil@BRL.MIL>.
diff --git a/sysutils/du2ps/files/patch-aa b/sysutils/du2ps/files/patch-aa
deleted file mode 100644
index d74af3d7e2e4..000000000000
--- a/sysutils/du2ps/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- du2ps.h.orig	Tue Mar 15 18:17:00 1994
-+++ du2ps.h	Fri Jun  1 15:39:04 2001
-@@ -51,6 +51,8 @@
- #define FONT_FAMILY "Times-Roman"
- #define LINE_WIDTH 0.5
- #define HEAD_SEP 5.0
-+#define A3_WIDTH 841.889764
-+#define A3_HEIGHT 1190.55118
- #define A4_WIDTH 595.275591
- #define A4_HEIGHT 841.889764
- #define B4_WIDTH 728.503937
diff --git a/sysutils/du2ps/files/patch-ab b/sysutils/du2ps/files/patch-ab
deleted file mode 100644
index 7e8944605476..000000000000
--- a/sysutils/du2ps/files/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
---- getopt.c.orig	Wed Mar 16 11:41:27 1994
-+++ getopt.c	Fri Jun  1 15:40:02 2001
-@@ -22,6 +22,7 @@
- 	"du2ps [options] < infile > outfile",
- 	"OPTIONS:",
- 	"  -land       ... landscape",
-+	"  -a3         ... A3",
- 	"  -b4         ... B4",
- 	"  -b5         ... B5",
- 	"  -us         ... US letter",
-@@ -62,6 +63,10 @@
- 			i++;
- 		} else if(!strcmp("-sa", argv[i])){
- 			cmp = cmp_alph;
-+			i++;
-+		} else if(!strcmp("-a3", argv[i])){
-+			paper_width = A3_WIDTH;
-+			paper_height = A3_HEIGHT;
- 			i++;
- 		} else if(!strcmp("-b4", argv[i])){
- 			paper_width = B4_WIDTH;
diff --git a/sysutils/du2ps/files/patch-ac b/sysutils/du2ps/files/patch-ac
deleted file mode 100644
index a979c3fc7f77..000000000000
--- a/sysutils/du2ps/files/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
---- nodeop.c.orig	Wed Mar 16 13:10:45 1994
-+++ nodeop.c	Sun Mar 21 17:44:55 2004
-@@ -142,7 +142,8 @@ int depth;
- 
-     /* for each child */
- 	for(np = nodep->child; NODE_NULL != np; np = np->peer){
--		double height = h * np->size / nodep->size;
-+		/* When nodep->size is 0, 'divided by zero' will be raised */
-+		double height = (nodep->size != 0 ? h * np->size / nodep->size : 0);
- 
- 		drawrect(np, y, height, depth);
- 
-@@ -172,9 +173,9 @@ parse()
- 		if('/' == *n) n++;     /* skip leading / */
- 		path[depth = 0] = n;
- 			
--		for(; NULL != *n; n++){
-+		for(; '\0' != *n; n++){
- 			if('/' == *n){
--				*n = NULL;
-+				*n = '\0';
- 				path[++depth] = n + 1;
- 				if(depth > MAXDEPTH) break;
- 			}
-@@ -193,7 +194,7 @@ parse()
- 
- 		if (1 == top->nchild) {
- 			top = top->child;
--			while (NULL != *n) n++;
-+			while ('\0' != *n) n++;
- 			*n = '/';
- 		}
- 		else if(1 < top->nchild){
-@@ -204,7 +205,7 @@ parse()
- 		}
- 		else break;
- 	}
--	*n = NULL;
-+	*n = '\0';
- 	return strdup(name);
- }
- 
diff --git a/sysutils/du2ps/files/patch-du2ps.c b/sysutils/du2ps/files/patch-du2ps.c
deleted file mode 100644
index 17e0fdc93dc6..000000000000
--- a/sysutils/du2ps/files/patch-du2ps.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- du2ps.c.orig	Wed Mar 16 11:41:16 1994
-+++ du2ps.c	Sun Mar 21 17:36:26 2004
-@@ -57,7 +57,7 @@
- 	for(; NULL != *mes; mes++) puts(*mes);
- }
- 
--void
-+int
- main(argc,argv)
- int argc;
- char **argv;