diff options
| author | mezz <mezz@FreeBSD.org> | 2006-06-06 12:25:18 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2006-06-06 12:25:18 +0800 |
| commit | 36af2f921aeafeed9ab8add5de816a990b3e49b5 (patch) | |
| tree | 2fc6de8ae56c6048296412e0ab87a3b554b5e94c /multimedia | |
| parent | fbc2fda60f3a5867777cf9099c8dc03ed5debf57 (diff) | |
| download | freebsd-ports-gnome-36af2f921aeafeed9ab8add5de816a990b3e49b5.tar.gz freebsd-ports-gnome-36af2f921aeafeed9ab8add5de816a990b3e49b5.tar.zst freebsd-ports-gnome-36af2f921aeafeed9ab8add5de816a990b3e49b5.zip | |
Fix the CONFLICTS in gstreamer-plugins-jpeg-mmx80 and gstreamer-plugins-jpeg80
to not get in conflict by themselves. Also, use -[0-9]*. Found by portlint.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gstreamer-plugins80/Makefile.common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common index e065f231c12b..f95a185e2718 100644 --- a/multimedia/gstreamer-plugins80/Makefile.common +++ b/multimedia/gstreamer-plugins80/Makefile.common @@ -275,13 +275,13 @@ PLIST_FILES= ${GST_LIB_DIR}/libgsthermescolorspace.so \ # jpeg .if ${GST_PLUGIN}=="jpeg" LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg -CONFLICTS+= gstreamer-plugins-jpeg-mmx-* +CONFLICTS+= gstreamer-plugins-jpeg-mmx-[0-9]* .endif # jpeg-mmx .if ${GST_PLUGIN}=="jpeg-mmx" LIB_DEPENDS+= jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx -CONFLICTS+= gstreamer-plugins-jpeg-*.* +CONFLICTS+= gstreamer-plugins-jpeg-[0-9]* GST_PLUGIN_DIR= ext/jpeg PLIST_FILES= ${GST_LIB_DIR}/libgstjpeg.so \ |