[pkgsrc/trunk]: pkgsrc/devel/libebml Resolve conflicts, switch to bl3. (sorry...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/01d11650c4d8
branches:  trunk
changeset: 472252:01d11650c4d8
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Apr 07 11:47:46 2004 +0000

description:
Resolve conflicts, switch to bl3. (sorry for the mess..)

diffstat:

 devel/libebml/Makefile         |  19 +++++++++++--------
 devel/libebml/PLIST            |   6 +++---
 devel/libebml/buildlink2.mk    |  20 --------------------
 devel/libebml/patches/patch-aa |  13 -------------
 4 files changed, 14 insertions(+), 44 deletions(-)

diffs (95 lines):

diff -r abd5f9fd5953 -r 01d11650c4d8 devel/libebml/Makefile
--- a/devel/libebml/Makefile    Wed Apr 07 11:40:21 2004 +0000
+++ b/devel/libebml/Makefile    Wed Apr 07 11:47:46 2004 +0000
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2004/02/04 03:02:51 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/07 11:47:46 salo Exp $
 #
 
-DISTNAME=      libebml-0.6.3
+DISTNAME=      libebml-0.6.5
 CATEGORIES=    devel
-MASTER_SITES=  http://matroska.free.fr/downloads/libebml/
+MASTER_SITES=  http://dl.matroska.org/downloads/libebml/
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
-HOMEPAGE=      http://matroska.sourceforge.net/
-COMMENT=       Libraries for the EBML (Extensible Binary Meta Language) format
+HOMEPAGE=      http://www.sourceforge.net/projects/ebml/
+COMMENT=       Extensible Binary Meta Language support library
 
-BUILD_DIRS=            ${WRKSRC}/make/linux
-USE_BUILDLINK2=                YES
-USE_GNU_TOOLS+=                make
+USE_BUILDLINK3=        yes
+USE_GNU_TOOLS+=        make
+
+NO_CONFIGURE=  yes
+MAKEFLAGS+=    prefix="${PREFIX}"
+BUILD_DIRS=    ${WRKDIR}/${DISTNAME}/make/linux
 
 .include "../../mk/bsd.pkg.mk"
diff -r abd5f9fd5953 -r 01d11650c4d8 devel/libebml/PLIST
--- a/devel/libebml/PLIST       Wed Apr 07 11:40:21 2004 +0000
+++ b/devel/libebml/PLIST       Wed Apr 07 11:47:46 2004 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.2 2004/04/07 10:40:01 salo Exp $
-lib/libebml.a
+@comment $NetBSD: PLIST,v 1.2 2004/04/07 11:47:46 salo Exp $
 include/ebml/Debug.h
 include/ebml/EbmlBinary.h
 include/ebml/EbmlConfig.h
@@ -21,10 +20,11 @@
 include/ebml/EbmlUInteger.h
 include/ebml/EbmlUnicodeString.h
 include/ebml/EbmlVersion.h
-include/ebml/c/libebml_t.h
 include/ebml/EbmlVoid.h
 include/ebml/IOCallback.h
 include/ebml/MemIOCallback.h
 include/ebml/StdIOCallback.h
+include/ebml/c/libebml_t.h
+lib/libebml.a
 @dirrm include/ebml/c
 @dirrm include/ebml
diff -r abd5f9fd5953 -r 01d11650c4d8 devel/libebml/buildlink2.mk
--- a/devel/libebml/buildlink2.mk       Wed Apr 07 11:40:21 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/18 20:14:59 kristerw Exp $
-
-.if !defined(LIBEBML_BUILDLINK2_MK)
-LIBEBML_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+=           libebml
-BUILDLINK_DEPENDS.libebml?=    libebml>=0.6.3
-BUILDLINK_PKGSRCDIR.libebml?=  ../../devel/libebml
-
-EVAL_PREFIX+=  BUILDLINK_PREFIX.libebml=libebml
-BUILDLINK_PREFIX.libebml_DEFAULT=      ${LOCALBASE}
-BUILDLINK_FILES.libebml +=     include/ebml/*
-BUILDLINK_FILES.libebml +=     include/ebml/c/*
-BUILDLINK_FILES.libebml +=     lib/libebml.*
-
-BUILDLINK_TARGETS+=    libebml-buildlink
-
-libebml-buildlink: _BUILDLINK_USE
-
-.endif # LIBEBML_BUILDLINK2_MK
diff -r abd5f9fd5953 -r 01d11650c4d8 devel/libebml/patches/patch-aa
--- a/devel/libebml/patches/patch-aa    Wed Apr 07 11:40:21 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/18 20:14:59 kristerw Exp $
-
---- make/linux/Makefile.orig   Sun Jan 18 20:26:55 2004
-+++ make/linux/Makefile        Sun Jan 18 20:27:21 2004
-@@ -10,7 +10,7 @@
- #
- 
- # Paths
--prefix=/usr/local
-+prefix=${PREFIX}
- libdir=$(prefix)/lib
- includedir=$(prefix)/include/ebml
-