From 9b0a15ebb12d7377e96955c8a92dad398a9f9a14 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 16 Mar 2001 16:30:01 +0000
Subject: [PATCH] Simplify.

A few tweaks.
---
 misc/fileutils/Makefile         | 18 ++++++++++--------
 misc/fileutils/pkg/COMMENT      |  1 -
 misc/fileutils/pkg/COMMENT-info |  1 -
 misc/fileutils/pkg/COMMENT-ls   |  1 -
 misc/fileutils/pkg/DESCR-info   |  3 ---
 misc/fileutils/pkg/PLIST-info   |  5 -----
 misc/fileutils/pkg/PLIST-ls     |  4 ++--
 7 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 misc/fileutils/pkg/COMMENT
 delete mode 100644 misc/fileutils/pkg/COMMENT-info
 delete mode 100644 misc/fileutils/pkg/COMMENT-ls
 delete mode 100644 misc/fileutils/pkg/DESCR-info
 delete mode 100644 misc/fileutils/pkg/PLIST-info

diff --git a/misc/fileutils/Makefile b/misc/fileutils/Makefile
index b101bf4dcac..cf0cec02f85 100644
--- a/misc/fileutils/Makefile
+++ b/misc/fileutils/Makefile
@@ -1,8 +1,14 @@
-# $OpenBSD: Makefile,v 1.2 2001/03/15 18:32:58 wilfried Exp $
+# $OpenBSD: Makefile,v 1.3 2001/03/16 16:30:01 espie Exp $
 
-DISTNAME=		fileutils-4.0
+COMMENT= 		"GNU versions of common file management utilities"
+COMMENT-ls=		"colorized GNU `ls'"
+
+V=			4.0
+DISTNAME=		fileutils-$V
 CATEGORIES=		misc
-NEED_VERSION=		1.340
+NEED_VERSION=		1.361
+
+PKGNAME-ls=		fileutils-ls-$V
 
 MAINTAINER=		David Lebel <lebel@lebel.org>
 
@@ -24,10 +30,6 @@ CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=		--program-prefix=g
 
-MULTI_PACKAGES=		-ls -info
-
-.if defined(SUBPACKAGE)
-PKGNAME=                ${DISTNAME:C/-[^-]*$//}${SUBPACKAGE}${DISTNAME:C/^[^-]*//}
-.endif
+MULTI_PACKAGES=		-ls
 
 .include <bsd.port.mk>
diff --git a/misc/fileutils/pkg/COMMENT b/misc/fileutils/pkg/COMMENT
deleted file mode 100644
index 08b0c8accc2..00000000000
--- a/misc/fileutils/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNU versions of common file management utilities
diff --git a/misc/fileutils/pkg/COMMENT-info b/misc/fileutils/pkg/COMMENT-info
deleted file mode 100644
index 458db863b0e..00000000000
--- a/misc/fileutils/pkg/COMMENT-info
+++ /dev/null
@@ -1 +0,0 @@
-.info file for the fileutils package
diff --git a/misc/fileutils/pkg/COMMENT-ls b/misc/fileutils/pkg/COMMENT-ls
deleted file mode 100644
index 1f2013a2079..00000000000
--- a/misc/fileutils/pkg/COMMENT-ls
+++ /dev/null
@@ -1 +0,0 @@
-colorized GNU `ls'
diff --git a/misc/fileutils/pkg/DESCR-info b/misc/fileutils/pkg/DESCR-info
deleted file mode 100644
index 557894261b1..00000000000
--- a/misc/fileutils/pkg/DESCR-info
+++ /dev/null
@@ -1,3 +0,0 @@
-The fileutils package includes a number of GNU versions of common and
-popular file management utilities.  This subpackage includes only the info
-document.
diff --git a/misc/fileutils/pkg/PLIST-info b/misc/fileutils/pkg/PLIST-info
deleted file mode 100644
index c52c49ea273..00000000000
--- a/misc/fileutils/pkg/PLIST-info
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-info,v 1.1 2001/03/15 18:32:59 wilfried Exp $
-@pkgcfl fileutils-[0-9].[0-9]
-@unexec install-info --delete --info-dir=%D/info %D/info/fileutils.info
-info/fileutils.info
-@exec install-info --info-dir=%D/info %D/info/fileutils.info
diff --git a/misc/fileutils/pkg/PLIST-ls b/misc/fileutils/pkg/PLIST-ls
index 72fb3d25aca..2457f63ddc6 100644
--- a/misc/fileutils/pkg/PLIST-ls
+++ b/misc/fileutils/pkg/PLIST-ls
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST-ls,v 1.1 2001/03/15 18:32:59 wilfried Exp $
-@pkgcfl fileutils-[0-9].[0-9]
+@comment $OpenBSD: PLIST-ls,v 1.2 2001/03/16 16:30:01 espie Exp $
+@pkgcfl fileutils-[0-9]*
 bin/gdir
 bin/gdircolors
 bin/gls