From owner-cvs-all  Mon Aug 20 13:57:28 2001
Delivered-To: cvs-all@freebsd.org
Received: from mail.ctonet.it (mail.ctonet.it [212.110.160.100])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9ED5B37B401; Mon, 20 Aug 2001 13:57:17 -0700 (PDT)
	(envelope-from olgeni@uli.it)
Received: from olgeni.olgeni (ppp-75.dial3.ctonet.it [212.110.178.75])
	by mail.ctonet.it (Postfix) with ESMTP
	id 9D8FB1237D; Mon, 20 Aug 2001 22:57:14 +0200 (CEST)
Received: from localhost (localhost [127.0.0.1])
	by olgeni.olgeni (8.11.5/8.11.5) with ESMTP id f7KKvYF11594;
	Mon, 20 Aug 2001 22:57:35 +0200 (CEST)
	(envelope-from olgeni@uli.it)
Date: Mon, 20 Aug 2001 22:57:34 +0200 (CEST)
From: Jimmy Olgeni <olgeni@uli.it>
X-X-Sender:  <olgeni@olgeni.olgeni>
To: Will Andrews <will@FreeBSD.org>
Cc: <cvs-committers@FreeBSD.org>, <cvs-all@FreeBSD.org>
Subject: Re: cvs commit: ports/audio/kdemultimedia2 pkg-plist
In-Reply-To: <200108201951.f7KJpgB42601@freefall.freebsd.org>
Message-ID: <20010820225641.F5123-100000@olgeni.olgeni>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG


On Mon, 20 Aug 2001, Will Andrews wrote:

> will        2001/08/20 12:51:42 PDT
>
>   Modified files:
>     audio/kdemultimedia2 pkg-plist
>   Log:
>   Remove files not built/installed by default.

What about this? It should autodetect ogg/vorbis. If you like it, I
have more :)

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/kdemultimedia2/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- Makefile	2001/08/15 16:25:09	1.55
+++ Makefile	2001/08/20 20:56:00
@@ -24,6 +24,26 @@
 USE_GMAKE=	yes
 MAKE_ENV=	${CONFIGURE_ENV}

+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/include/ogg/ogg.h) \
+    && exists(${LOCALBASE}/include/vorbis/vorbisfile.h)
+WITH_OGGVORBIS=	yes
+.endif
+
+.if defined(WITH_OGGVORBIS) && ${WITH_OGGVORBIS} == yes
+LIB_DEPENDS+=	ogg.2:${PORTSDIR}/audio/libogg \
+		vorbis.0:${PORTSDIR}/audio/libvorbis
+PLIST_SUB+=	OGGVORBIS:=""
+.else
+PLIST_SUB+=	OGGVORBIS:="@comment "
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want to compile with ogg/vorbis support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_OGGVORBIS=yes\""
+	@${ECHO_MSG}
+.endif
+
 pre-configure:
 	${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
 	${PERL} -pi -e 's,kscd_compile=no,kscd_compile=yes,g; \
@@ -43,4 +63,4 @@
 	@${ECHO_MSG} " # ${CHMOD} 666 /dev/racd0c"
 	@${ECHO_MSG}

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/kdemultimedia2/pkg-plist,v
retrieving revision 1.17
diff -u -r1.17 pkg-plist
--- pkg-plist	2001/08/20 19:51:42	1.17
+++ pkg-plist	2001/08/20 20:56:00
@@ -125,6 +125,8 @@
 lib/libnoatunui.so
 lib/libnoatunvoiceprint.la
 lib/libnoatunvoiceprint.so
+%%OGGVORBIS:%%lib/liboggarts.la
+%%OGGVORBIS:%%lib/liboggarts.so
 lib/libsplitplaylist.la
 lib/libsplitplaylist.so
 lib/libworkman.la
@@ -174,6 +176,7 @@
 lib/mcop/Arts/VBox.mcopclass
 lib/mcop/Arts/Widget.mcopclass
 lib/mcop/Arts/mpg123PlayObject.mcopclass
+%%OGGVORBIS:%%lib/mcop/Arts/oggPlayObject.mcopclass
 lib/mcop/ExtraStereo.mcopclass
 lib/mcop/ExtraStereoGuiFactory.mcopclass
 lib/mcop/Noatun/Equalizer.mcopclass
@@ -203,6 +206,8 @@
 lib/mcop/mpg123arts.mcoptype
 lib/mcop/noatunarts.mcopclass
 lib/mcop/noatunarts.mcoptype
+%%OGGVORBIS:%%lib/mcop/oggarts.mcopclass
+%%OGGVORBIS:%%lib/mcop/oggarts.mcoptype
 lib/noatun.la
 lib/noatun.so
 share/applnk/Multimedia/aktion.desktop


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message