diff options
| author | salo <salo@pkgsrc.org> | 2004-04-07 11:47:46 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2004-04-07 11:47:46 +0000 |
| commit | 76792a419a5efa50603f95f74c3075e07cb28b5c (patch) | |
| tree | 18d0c0d66f030e4abe1be197d4c3e576e83f373a | |
| parent | 9db7ce8ce16b0d52ba1bd2ef3a707942a2d189db (diff) | |
| download | pkgsrc-76792a419a5efa50603f95f74c3075e07cb28b5c.tar.gz | |
Resolve conflicts, switch to bl3. (sorry for the mess..)
| -rw-r--r-- | devel/libebml/Makefile | 19 | ||||
| -rw-r--r-- | devel/libebml/PLIST | 6 | ||||
| -rw-r--r-- | devel/libebml/buildlink2.mk | 20 | ||||
| -rw-r--r-- | devel/libebml/patches/patch-aa | 13 |
4 files changed, 14 insertions, 44 deletions
diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile index ceec028c123..d0f65b24812 100644 --- a/devel/libebml/Makefile +++ b/devel/libebml/Makefile @@ -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 -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 --git a/devel/libebml/PLIST b/devel/libebml/PLIST index c657762eb78..cd87eebf692 100644 --- a/devel/libebml/PLIST +++ b/devel/libebml/PLIST @@ -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/EbmlTypes.h 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 --git a/devel/libebml/buildlink2.mk b/devel/libebml/buildlink2.mk deleted file mode 100644 index a0b1296be0e..00000000000 --- a/devel/libebml/buildlink2.mk +++ /dev/null @@ -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 --git a/devel/libebml/patches/patch-aa b/devel/libebml/patches/patch-aa deleted file mode 100644 index 23eb49e945a..00000000000 --- a/devel/libebml/patches/patch-aa +++ /dev/null @@ -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 - |