Thu Jan 22 20:18:30 2009 UTC ()
Pullup ticket #2651 - requested by is
libtheora: build fix

Revisions pulled up:
- multimedia/libtheora/Makefile			1.23
---
Module Name:	pkgsrc
Committed By:	is
Date:		Thu Jan 22 15:14:23 UTC 2009

Modified Files:
	pkgsrc/multimedia/libtheora: Makefile

Log Message:
If transfig is installed during the build, but gs is not, building
fails. As we don't want to install the docs but from a seperate package,
just disable all doc-building tools to be on the safe side. PR 40452


(tron)
diff -r1.22 -r1.22.2.1 pkgsrc/multimedia/libtheora/Makefile
cvs diff -r1.22 -r1.22.2.1 pkgsrc/multimedia/libtheora/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libtheora/Makefile 2008/11/05 14:55:23 1.22
+++ pkgsrc/multimedia/libtheora/Makefile 2009/01/22 20:18:30 1.22.2.1
@@ -1,23 +1,28 @@ @@ -1,23 +1,28 @@
1# $NetBSD: Makefile,v 1.22 2008/11/05 14:55:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.22.2.1 2009/01/22 20:18:30 tron Exp $
2# 2#
3 3
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGREVISION= 1 6PKGREVISION= 1
7 7
8PKGCONFIG_OVERRIDE= theora.pc.in theoradec.pc.in theoraenc.pc.in 8PKGCONFIG_OVERRIDE= theora.pc.in theoradec.pc.in theoraenc.pc.in
9USE_LIBTOOL= YES 9USE_LIBTOOL= YES
10TEST_TARGET= check 10TEST_TARGET= check
11 11
12# disable doxygen, see libtheora-docs package 12# disable doxygen, see libtheora-docs package
 13# also, disable transfig, and *tex.
 14
13CONFIGURE_ENV+= HAVE_DOXYGEN=no 15CONFIGURE_ENV+= HAVE_DOXYGEN=no
 16CONFIGURE_ENV+= HAVE_TRANSFIG=no
 17CONFIGURE_ENV+= HAVE_BIBTEX=no
 18CONFIGURE_ENV+= HAVE_PDFLATEX=no
14 19
15# avoid installing docs 20# avoid installing docs
16do-install: 21do-install:
17 cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} install-pkgconfigDATA 22 cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} install-pkgconfigDATA
18 cd ${WRKSRC}/include && ${MAKE_ENV} ${MAKE} install 23 cd ${WRKSRC}/include && ${MAKE_ENV} ${MAKE} install
19 cd ${WRKSRC}/lib && ${MAKE_ENV} ${MAKE} install 24 cd ${WRKSRC}/lib && ${MAKE_ENV} ${MAKE} install
20 25
21.include "../../audio/libvorbis/buildlink3.mk" 26.include "../../audio/libvorbis/buildlink3.mk"
22.include "../../multimedia/libogg/buildlink3.mk" 27.include "../../multimedia/libogg/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"