Newly imported misc/p5-Scalar-List-Utils is just an update of

devel/p5-Scalar-List-Utils.  Merge them.  p5-Scalar-List-Utils
shouldn't have been imported into pkgsrc-wip in the first place.
Pointed out by Adrian Portelli.

8 files changed, 21 insertions, 64 deletions

diff --git a/devel/p5-Scalar-List-Utils/DESCR b/devel/p5-Scalar-List-Utils/DESCR
index 2e648100b57..d5b76c8e241 100644
--- a/devel/p5-Scalar-List-Utils/DESCR
+++ b/devel/p5-Scalar-List-Utils/DESCR
@@ -1,9 +1,7 @@
-This distribution is a replacement for the builtin distribution.
-
 This package contains a selection of subroutines that people have
-expressed would be nice to have in the perl core, but the usage would not
-really be high enough to warrant the use of a keyword, and the size so
-small such that being individual extensions would be wasteful.
+expressed would be nice to have in the perl core, but the usage would
+not really be high enough to warrant the use of a keyword, and the size
+so small such that being individual extensions would be wasteful.
 
 This distribution provides
 
diff --git a/devel/p5-Scalar-List-Utils/Makefile b/devel/p5-Scalar-List-Utils/Makefile
index aa4edbfbdff..8ae8e0b90a4 100644
--- a/devel/p5-Scalar-List-Utils/Makefile
+++ b/devel/p5-Scalar-List-Utils/Makefile
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/30 19:01:32 he Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/16 21:33:03 minskim Exp $
+#
 
-DISTNAME=	Scalar-List-Utils-1.12
-PKGNAME=	p5-${DISTNAME}
-SVR4_PKGNAME=	p5slu
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Scalar/}
+DISTNAME=		Scalar-List-Utils-1.13
+PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5slu
+CATEGORIES=		misc perl5
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Scalar/}
 
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://search.cpan.org/author/GBARR/Scalar-List-Utils-1.12/
-COMMENT=	Selection of general-utility scalar subroutines
+MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://search.cpan.org/search?dist=Scalar-List-Utils
+COMMENT=		Perl subroutines that would be nice to have in the perl core
 
-USE_BUILDLINK2=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/List/Util/.packlist
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/List/Util/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Scalar-List-Utils/PLIST b/devel/p5-Scalar-List-Utils/PLIST
index 879d2f9f813..a22325948b8 100644
--- a/devel/p5-Scalar-List-Utils/PLIST
+++ b/devel/p5-Scalar-List-Utils/PLIST
@@ -1 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/30 19:01:32 he Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/16 21:33:03 minskim Exp $
diff --git a/devel/p5-Scalar-List-Utils/distinfo b/devel/p5-Scalar-List-Utils/distinfo
index 1b573c2869b..d44ede02268 100644
--- a/devel/p5-Scalar-List-Utils/distinfo
+++ b/devel/p5-Scalar-List-Utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/08/30 19:01:32 he Exp $
+$NetBSD: distinfo,v 1.2 2004/02/16 21:33:03 minskim Exp $
 
-SHA1 (Scalar-List-Utils-1.12.tar.gz) = 496bfccc766d2896246a7d1c1882d17fc01850d9
-Size (Scalar-List-Utils-1.12.tar.gz) = 15622 bytes
+SHA1 (Scalar-List-Utils-1.13.tar.gz) = a5e039e44aaa18b98524246c75b43b927d995116
+Size (Scalar-List-Utils-1.13.tar.gz) = 15703 bytes
diff --git a/misc/p5-Scalar-List-Utils/DESCR b/misc/p5-Scalar-List-Utils/DESCR
deleted file mode 100644
index d5b76c8e241..00000000000
--- a/misc/p5-Scalar-List-Utils/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-This package contains a selection of subroutines that people have
-expressed would be nice to have in the perl core, but the usage would
-not really be high enough to warrant the use of a keyword, and the size
-so small such that being individual extensions would be wasteful.
-
-This distribution provides
-
-  min
-  max
-  minstr
-  maxstr
-  sum
-  reduce
-  reftype
-  blessed
-  weaken   (5.005_57 and later only)
-  isweak   (5.005_57 and later only)
-  dualvar
-  shuffle
diff --git a/misc/p5-Scalar-List-Utils/Makefile b/misc/p5-Scalar-List-Utils/Makefile
deleted file mode 100644
index e8bc2fb2869..00000000000
--- a/misc/p5-Scalar-List-Utils/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/16 17:51:58 minskim Exp $
-#
-
-DISTNAME=		Scalar-List-Utils-1.13
-PKGNAME=		p5-${DISTNAME}
-SVR4_PKGNAME=		p5slu
-CATEGORIES=		misc perl5
-MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Scalar/}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://search.cpan.org/search?dist=Scalar-List-Utils
-COMMENT=		Perl subroutines that would be nice to have in the perl core
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_BUILDLINK3=		YES
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/List/Util/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Scalar-List-Utils/PLIST b/misc/p5-Scalar-List-Utils/PLIST
deleted file mode 100644
index ebe645c0add..00000000000
--- a/misc/p5-Scalar-List-Utils/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/16 17:51:58 minskim Exp $
diff --git a/misc/p5-Scalar-List-Utils/distinfo b/misc/p5-Scalar-List-Utils/distinfo
deleted file mode 100644
index 6e07e299398..00000000000
--- a/misc/p5-Scalar-List-Utils/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/16 17:51:58 minskim Exp $
-
-SHA1 (Scalar-List-Utils-1.13.tar.gz) = a5e039e44aaa18b98524246c75b43b927d995116
-Size (Scalar-List-Utils-1.13.tar.gz) = 15703 bytes