bl3ify and clean up DESCR.

3 files changed, 34 insertions, 15 deletions

diff --git a/multimedia/ogle/DESCR b/multimedia/ogle/DESCR
index 523eb585f50..456137b1f26 100644
--- a/multimedia/ogle/DESCR
+++ b/multimedia/ogle/DESCR
@@ -1,5 +1,4 @@
-Ogle is a open source DVD player that supports DVD menus and
-navigation. You should be able to play DVDs directly from the
-device, a mounted fs, an image file or as copy on you harddrive.
-Keyboard commands for navigation in both player modes, if you
-have input foucus in the video window.
+Ogle is a open source DVD player that supports DVD menus and navigation.
+You should be able to play DVDs directly from the device, a mounted fs, an
+image file or a copy on your harddrive.  There are keyboard commands for
+navigation in both player modes.
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 2004e40c49d..56ead475036 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/15 13:43:57 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/29 02:49:46 snj Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	1
@@ -17,10 +17,10 @@ ONLY_FOR_PLATFORM+=	NetBSD-1.6Z*-alpha NetBSD-[2-9]*-alpha
 ONLY_FOR_PLATFORM+=	Linux-*-*
 ONLY_FOR_PLATFORM+=	SunOS-*-*
 
-USE_BUILDLINK2=		yes
-USE_X11=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
+USE_X11=		yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
@@ -31,11 +31,11 @@ GCC_REQD+=		2.95.3
 
 MESSAGE_SUBST+=		PKGBASE=${PKGBASE}
 
-.include "../../audio/liba52/buildlink2.mk"
-.include "../../audio/libmad/buildlink2.mk"
-.include "../../devel/binutils/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../multimedia/libdvdread/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../audio/liba52/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../devel/binutils/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ogle/buildlink3.mk b/multimedia/ogle/buildlink3.mk
new file mode 100644
index 00000000000..04049a51410
--- /dev/null
+++ b/multimedia/ogle/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/29 02:49:46 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+OGLE_BUILDLINK3_MK:=	${OGLE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ogle
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nogle}
+BUILDLINK_PACKAGES+=	ogle
+
+.if !empty(OGLE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ogle+=	ogle>=0.9.2
+BUILDLINK_PKGSRCDIR.ogle?=	../../multimedia/ogle
+.endif	# OGLE_BUILDLINK3_MK
+
+.include "../../textproc/libxml2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}