Merge archivers/ucl and devel/ucl into one. This was an accident.

Pointed out by wiz.

9 files changed, 9 insertions, 61 deletions

diff --git a/archivers/ucl/DESCR b/archivers/ucl/DESCR
deleted file mode 100644
index 6b4046a191f..00000000000
--- a/archivers/ucl/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-UCL is a portable lossless data compression library written in ANSI C.
-UCL implements a number of compression algorithms that achieve an
-excellent compression ratio while allowing *very* fast decompression.
-Decompression requires no additional memory.
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
deleted file mode 100644
index a651d97a89e..00000000000
--- a/archivers/ucl/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:28:53 jlam Exp $
-#
-
-DISTNAME=		ucl-1.03
-CATEGORIES=		archivers
-MASTER_SITES=		http://www.oberhumer.com/opensource/ucl/download/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.oberhumer.com/opensource/ucl/
-COMMENT=		Lossless data compression library
-
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ucl/PLIST b/archivers/ucl/PLIST
deleted file mode 100644
index a3ae8752b88..00000000000
--- a/archivers/ucl/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/15 16:58:21 drochner Exp $
-include/ucl/ucl.h
-include/ucl/ucl_asm.h
-include/ucl/uclconf.h
-lib/libucl.la
-@dirrm include/ucl
diff --git a/archivers/ucl/buildlink3.mk b/archivers/ucl/buildlink3.mk
deleted file mode 100644
index a912195abaa..00000000000
--- a/archivers/ucl/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:35 jlam Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-UCL_BUILDLINK3_MK:=	${UCL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ucl
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nucl}
-BUILDLINK_PACKAGES+=	ucl
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ucl
-
-.if !empty(UCL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ucl+=	ucl>=1.03
-BUILDLINK_PKGSRCDIR.ucl?=	../../archivers/ucl
-.endif	# UCL_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/archivers/ucl/distinfo b/archivers/ucl/distinfo
deleted file mode 100644
index 66dd4f8232d..00000000000
--- a/archivers/ucl/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/02/15 16:58:21 drochner Exp $
-
-SHA1 (ucl-1.03.tar.gz) = 5847003d136fbbca1334dd5de10554c76c755f7c
-RMD160 (ucl-1.03.tar.gz) = d1b50127d482481c125eabff9a9c157d491c4a6a
-Size (ucl-1.03.tar.gz) = 534881 bytes
diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile
index b3e19e5dfa3..e24ce665ba9 100644
--- a/devel/ucl/Makefile
+++ b/devel/ucl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:08 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/04/10 15:58:34 drochner Exp $
 #
 
-DISTNAME=	ucl-1.02
-PKGREVISION=	3
+DISTNAME=	ucl-1.03
 CATEGORIES=	devel archivers
 MASTER_SITES=	http://www.oberhumer.com/opensource/ucl/download/
 
diff --git a/devel/ucl/PLIST b/devel/ucl/PLIST
index 56f984fc5a5..a87abad6db3 100644
--- a/devel/ucl/PLIST
+++ b/devel/ucl/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/04/10 15:58:34 drochner Exp $
 bin/uclpack
 include/ucl/ucl.h
 include/ucl/ucl_asm.h
 include/ucl/uclconf.h
 lib/libucl.la
 share/examples/ucl/Makefile
-share/examples/ucl/lutil.h
 share/examples/ucl/simple.c
 share/examples/ucl/uclpack.c
 @dirrm share/examples/ucl
diff --git a/devel/ucl/distinfo b/devel/ucl/distinfo
index 76a4da684ba..028a17d159b 100644
--- a/devel/ucl/distinfo
+++ b/devel/ucl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:35 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/04/10 15:58:34 drochner Exp $
 
-SHA1 (ucl-1.02.tar.gz) = d9abe2ab87bd7186cf052c4a1160e1dbeadab54f
-RMD160 (ucl-1.02.tar.gz) = 65cd002de65201c15c9a9f2c183989fb6a41912d
-Size (ucl-1.02.tar.gz) = 513433 bytes
+SHA1 (ucl-1.03.tar.gz) = 5847003d136fbbca1334dd5de10554c76c755f7c
+RMD160 (ucl-1.03.tar.gz) = d1b50127d482481c125eabff9a9c157d491c4a6a
+Size (ucl-1.03.tar.gz) = 534881 bytes
diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile
index 1c290477164..d0e8b735f7c 100644
--- a/math/py-pytables/Makefile
+++ b/math/py-pytables/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/17 14:32:32 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2007/04/10 15:59:10 drochner Exp $
 #
 
 DISTNAME=		pytables-1.3.3
@@ -23,7 +23,7 @@ PYSETUPBUILDARGS+=	--lzo=${BUILDLINK_PREFIX.lzo}
 .endif
 .if !empty(PKG_OPTIONS:Mucl)
 PYSETUPBUILDARGS+=	--ucl=${BUILDLINK_PREFIX.ucl}
-.include "../../archivers/ucl/buildlink3.mk"
+.include "../../devel/ucl/buildlink3.mk"
 .endif
 PYSETUPINSTALLARGS=	${PYSETUPBUILDARGS}
 PYTHON_VERSIONS_ACCEPTED=	24 23