diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
| commit | e2afa97f51a1f72e6618533019aaaae07b7d3cf2 (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /audio/libogg | |
| parent | e97ad43756dc8382d2c6cb8a7ae09be0eb540f67 (diff) | |
| download | pkgsrc-e2afa97f51a1f72e6618533019aaaae07b7d3cf2.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'audio/libogg')
| -rw-r--r-- | audio/libogg/Makefile | 4 | ||||
| -rw-r--r-- | audio/libogg/PLIST | 2 | ||||
| -rw-r--r-- | audio/libogg/buildlink.mk | 2 | ||||
| -rw-r--r-- | audio/libogg/buildlink2.mk | 21 | ||||
| -rw-r--r-- | audio/libogg/distinfo | 2 | ||||
| -rw-r--r-- | audio/libogg/patches/patch-ab | 2 |
6 files changed, 27 insertions, 6 deletions
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index b200956f25a..b772feefe6c 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/08/05 13:10:14 lukem Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 18:38:13 jlam Exp $ DISTNAME= libogg-1.0 PKGNAME= libogg-1.0.0.8 @@ -9,7 +9,7 @@ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.xiph.org/ogg/ COMMENT= Ogg project codecs library -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/audio/libogg/PLIST b/audio/libogg/PLIST index a9a625efcbe..72948a44997 100644 --- a/audio/libogg/PLIST +++ b/audio/libogg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:10:14 lukem Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:14 jlam Exp $ include/ogg/config_types.h include/ogg/ogg.h include/ogg/os_types.h diff --git a/audio/libogg/buildlink.mk b/audio/libogg/buildlink.mk index 9745b92c56c..af2e1b48c5f 100644 --- a/audio/libogg/buildlink.mk +++ b/audio/libogg/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2002/08/05 13:10:14 lukem Exp $ +# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:14 jlam Exp $ # # This Makefile fragment is included by packages that use libogg. # diff --git a/audio/libogg/buildlink2.mk b/audio/libogg/buildlink2.mk new file mode 100644 index 00000000000..1fcecd4af72 --- /dev/null +++ b/audio/libogg/buildlink2.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:14 jlam Exp $ + +.if !defined(LIBOGG_BUILDLINK2_MK) +LIBOGG_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= libogg +BUILDLINK_DEPENDS.libogg?= libogg>=1.0.0.8 +BUILDLINK_PKGSRCDIR.libogg?= ../../audio/libogg + +EVAL_PREFIX+= BUILDLINK_PREFIX.libogg=libogg +BUILDLINK_PREFIX.libogg_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libogg= include/ogg/config_types.h +BUILDLINK_FILES.libogg+= include/ogg/ogg.h +BUILDLINK_FILES.libogg+= include/ogg/os_types.h +BUILDLINK_FILES.libogg+= lib/libogg.* + +BUILDLINK_TARGETS+= libogg-buildlink + +libogg-buildlink: _BUILDLINK_USE + +.endif # LIBOGG_BUILDLINK2_MK diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo index 897a76970c7..8c8b9f12a0c 100644 --- a/audio/libogg/distinfo +++ b/audio/libogg/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/08/05 13:10:14 lukem Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 18:38:15 jlam Exp $ SHA1 (libogg-1.0.tar.gz) = 2929e8867e566e9f7029cfacf0b4ccbe2f1f6cec Size (libogg-1.0.tar.gz) = 222625 bytes diff --git a/audio/libogg/patches/patch-ab b/audio/libogg/patches/patch-ab index c24db1dff14..89482e71c96 100644 --- a/audio/libogg/patches/patch-ab +++ b/audio/libogg/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/05 13:10:14 lukem Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 18:38:15 jlam Exp $ --- doc/ogg/Makefile.in.orig Sat Jul 20 00:13:22 2002 +++ doc/ogg/Makefile.in |