diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2006-06-06 04:25:18 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2006-06-06 04:25:18 +0000 |
| commit | a16dbad07a510dfbddbc659b6607b027b024c443 (patch) | |
| tree | 2aa0b460afa8e332a3f1ac8f744f676f07978444 /multimedia | |
| parent | - Updated from v0.09 to v1.01 (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=164562
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 \ |