summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-31 23:56:28 +0000
committerjlam <jlam@pkgsrc.org>2006-03-31 23:56:28 +0000
commit739ade02f5e5a61b32a7e44d8957b09888c72c6d (patch)
tree7b7b5579c729ee1cb9d4a3002eec00844f1ead5f /multimedia
parentc86ad2bc4b5f8212490ad688fee7ffee5bc1ee8f (diff)
downloadpkgsrc-739ade02f5e5a61b32a7e44d8957b09888c72c6d.tar.gz
List the info pages directly in the PLIST and ensure that we honor
PKGINFODIR.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libassetml/Makefile8
-rw-r--r--multimedia/libassetml/PLIST3
-rw-r--r--multimedia/mjpegtools/Makefile7
-rw-r--r--multimedia/mjpegtools/PLIST3
4 files changed, 11 insertions, 10 deletions
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
index bb72dc398a4..260a92c1f84 100644
--- a/multimedia/libassetml/Makefile
+++ b/multimedia/libassetml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/31 23:56:28 jlam Exp $
#
DISTNAME= libassetml-1.2.1
@@ -10,16 +10,14 @@ MAINTAINER= reed@reedmedia.net
HOMEPAGE= http://www.ofset.org/assetml/
COMMENT= Library for sharing image and audio files between projects
-BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
-
USE_DIRS+= gnome2-1.5 # share/gnome/help
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake pkg-config texi2html
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/src/libassetml.pc.in
GNU_CONFIGURE= yes
-INFO_FILES= libassetml.info
+INFO_FILES= # PLIST
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
diff --git a/multimedia/libassetml/PLIST b/multimedia/libassetml/PLIST
index d6de21f3a3f..f174ec93827 100644
--- a/multimedia/libassetml/PLIST
+++ b/multimedia/libassetml/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/16 18:38:41 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/31 23:56:28 jlam Exp $
bin/assetml-query
include/libassetml-1.0/libassetml/assetml.h
+info/libassetml.info
lib/libassetml.la
lib/pkgconfig/libassetml.pc
share/gnome/help/libassetml/C/libassetml.html
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index bd1ed9a78ba..df932fee047 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/09 21:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/03/31 23:56:28 jlam Exp $
DISTNAME= mjpegtools-1.8.0
PKGREVISION= 3
@@ -19,6 +19,7 @@ USE_TOOLS+= bash:run pkg-config
USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE+= libtool
PKGCONFIG_OVERRIDE= mjpegtools.pc.in
+INFO_FILES= # PLIST
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-libquicktime
@@ -27,15 +28,15 @@ CONFIGURE_ARGS+= --with-lame-includes=${BUILDLINK_PREFIX.lame}
.include "options.mk"
-INFO_FILES= mjpeg-howto.info
-
.include "../../audio/lame/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
+#
# GTK+ support is disabled to avoid a dependency on GTK+ when building GNOME2.
# This only disables the "glav" program. If you really need it, please add an
# external package for it.
+#
#.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST
index 8ca6558d57e..41434d6fc83 100644
--- a/multimedia/mjpegtools/PLIST
+++ b/multimedia/mjpegtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/01/30 08:44:25 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/31 23:56:28 jlam Exp $
bin/anytovcd.sh
bin/jpeg2yuv
bin/lav2avi.sh
@@ -96,6 +96,7 @@ include/mjpegtools/mplex/stream_params.hpp
include/mjpegtools/mplex/systems.hpp
include/mjpegtools/mplex/videostrm.hpp
include/mjpegtools/yuv4mpeg.h
+info/mjpeg-howto.info
lib/liblavfile.la
lib/liblavjpeg.la
lib/liblavplay.la