7 files changed, 39 insertions, 69 deletions

diff --git a/devel/cutils/Makefile b/devel/cutils/Makefile
index 96b67249ec52..9b9f6a7eb54f 100644
--- a/devel/cutils/Makefile
+++ b/devel/cutils/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	cutils
-PORTVERSION=	1.4
+PORTVERSION=	1.6
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS
+MASTER_SITES=	http://www.sigala.it/sandro/files/
 
-MAINTAINER=	ssigala@globalnet.it
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
-MAN1=		cdecl.1 cundecl.1 chilight.1 cinfo.1 cinfoc.1 cinfodc.1 \
-		cobfusc.1 cunloop.1 yyextract.1 yyref.1
-MAN5=		cinfodb.5
+MAKE_ENV=	MAKEINFO=/usr/bin/makeinfo
+MAN1=		cdecl.1 chilight.1 cobfusc.1 cundecl.1 cunloop.1 yyextract.1 \
+		yyref.1
+
+post-install:
+	install-info ${PREFIX}/info/${PORTNAME}.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/cutils/distinfo b/devel/cutils/distinfo
index 314995b6af38..400b12339b9e 100644
--- a/devel/cutils/distinfo
+++ b/devel/cutils/distinfo
@@ -1 +1 @@
-MD5 (cutils-1.4.tar.gz) = d024951fc4cc2ab5d83de6d2b580c116
+MD5 (cutils-1.6.tar.gz) = 8b9ec6fa72e209694f4412a092164b67
diff --git a/devel/cutils/files/patch-aa b/devel/cutils/files/patch-aa
deleted file mode 100644
index f5cec2b3e625..000000000000
--- a/devel/cutils/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/cinfo/cinfo/cinfo.c.org	Wed Mar 26 05:58:10 1997
-+++ ./src/cinfo/cinfo/cinfo.c	Sun Jun 15 01:46:08 1997
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <dirent.h>
- #include <unistd.h>
- #include <err.h>
diff --git a/devel/cutils/files/patch-ab b/devel/cutils/files/patch-ab
deleted file mode 100644
index 1b47162e5c62..000000000000
--- a/devel/cutils/files/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/cobfusc/cobfusc.c.orig	Wed Mar 26 07:58:16 1997
-+++ src/cobfusc/cobfusc.c	Fri Aug 11 15:36:09 2000
-@@ -342,25 +342,31 @@
- 		/*
- 		 * Convert the string to uppercase.
- 		 */
--		while (*p)
--			*p = toupper(*p++);
-+		while (*p) {
-+			*p = toupper(*p);
-+			p++;
-+		}
- 		break;
- 	case 2:
- 		/*
- 		 * Convert the string to lowercase.
- 		 */
--		while (*p)
--			*p = tolower(*p++);
-+		while (*p) {
-+			*p = tolower(*p);
-+			p++;
-+		}
- 		break;
- 	default:
- 		/*
- 		 * Convert the string to random case.
- 		 */
--		while (*p)
-+		while (*p) {
- 			if (RANDOM(2) == 1)
--				*p = toupper(*p++);
-+				*p = toupper(*p);
- 			else
--				*p = tolower(*p++);
-+				*p = tolower(*p);
-+			p++;
-+		}
- 	}
- 
- 	return buf;
-
diff --git a/devel/cutils/files/patch-doc::Makefile.in b/devel/cutils/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..579450879394
--- /dev/null
+++ b/devel/cutils/files/patch-doc::Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Fri Jul 13 21:09:55 2001
++++ doc/Makefile.in	Fri Nov  2 17:31:48 2001
+@@ -16,7 +16,7 @@
+ 
+ all: $(FILES)
+ 
+-cutils.info: cutils.texi
++$(srcdir)/cutils.info: cutils.texi
+ 	cd $(srcdir) && $(MAKEINFO) cutils.texi
+ 
+ dvi: cutils.dvi
diff --git a/devel/cutils/files/patch-doc::cutils.texi b/devel/cutils/files/patch-doc::cutils.texi
new file mode 100644
index 000000000000..42642a4d3e8c
--- /dev/null
+++ b/devel/cutils/files/patch-doc::cutils.texi
@@ -0,0 +1,14 @@
+--- doc/cutils.texi.orig	Sun Jul 15 17:13:26 2001
++++ doc/cutils.texi	Fri Nov  2 17:38:59 2001
+@@ -2,6 +2,11 @@
+ @setfilename cutils.info
+ @settitle The cutils Manual
+ 
++@dircategory Programming & development tools
++@direntry
++* Cutils: (cutils).             A collection of utilities for "C" programmers.
++@end direntry
++
+ @c If "finalout" is commented out, the printed output will show
+ @c black boxes that mark lines that are too long.  Thus, it is
+ @c unwise to comment it out when running a master in case there are
diff --git a/devel/cutils/pkg-plist b/devel/cutils/pkg-plist
index 2679b6867da3..e0d244b3dc75 100644
--- a/devel/cutils/pkg-plist
+++ b/devel/cutils/pkg-plist
@@ -1,15 +1,10 @@
 bin/cdecl
-bin/cundecl
 bin/chilight
-bin/cinfo
-bin/cinfoc
-bin/cinfodc
 bin/cobfusc
+bin/cundecl
 bin/cunloop
 bin/yyextract
 bin/yyref
-share/cutils/cinfo/stdc.cinfo.db
-share/cutils/cinfo/stdclib.cinfo.db
-share/cutils/cinfo/unix.cinfo.db
-@dirrm share/cutils/cinfo
-@dirrm share/cutils
+@unexec install-info --delete %D/info/cutils.info %D/info/dir
+info/cutils.info
+@exec install-info %B/%f %D/info/dir