Ian Darwin <i...@darwinsys.com> wrote:

> > > Port tarball at http://darwinsys.com/tmp/audio_xmms-mp4-port.tgz
> > 
> > How does this compare with faad-xmms? ;-)
> 
> Meh
> (does an rm -r and crawls back under rock)

To be fair, I didn't remember that we had faad-xmms right away
either.

Ian has suggested to me that we tweak the COMMENT and I'm inclined
to also rename faad-xmms to xmms-faad, in line with other XMMS
plugin packages.

Unfortunately the diff below still seems to be missing something,
because pkg_add -u fails to pick up the change.  Any ideas?

Index: audio/faad/Makefile
===================================================================
RCS file: /cvs/ports/audio/faad/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- audio/faad/Makefile 21 Mar 2013 08:45:12 -0000      1.53
+++ audio/faad/Makefile 15 Dec 2013 15:22:50 -0000
@@ -1,13 +1,12 @@
 # $OpenBSD: Makefile,v 1.53 2013/03/21 08:45:12 ajacoutot Exp $
 
 COMMENT-main=  MPEG-2 and MPEG-4 AAC decoder
-COMMENT-xmms=  XMMS input plugin for AAC files
+COMMENT-xmms=  XMMS input plugin for MP4/M4A/AAC files
 
 V=             2.7
 DISTNAME=      faad2-${V}
 PKGNAME-main=  faad-${V}
-PKGNAME-xmms=  faad-xmms-${V}
-REVISION-xmms= 0
+PKGNAME-xmms=  xmms-faad-${V}
 CATEGORIES=            audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=faac/}
 EXTRACT_SUFX=  .tar.bz2
Index: audio/faad/pkg/PFRAG.shared-xmms
===================================================================
RCS file: audio/faad/pkg/PFRAG.shared-xmms
diff -N audio/faad/pkg/PFRAG.shared-xmms
--- audio/faad/pkg/PFRAG.shared-xmms    9 Dec 2004 04:57:56 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-xmms,v 1.1 2004/12/09 04:57:56 jcs Exp $
-lib/xmms/Input/libmp4.so
Index: audio/faad/pkg/PLIST-xmms
===================================================================
RCS file: /cvs/ports/audio/faad/pkg/PLIST-xmms,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-xmms
--- audio/faad/pkg/PLIST-xmms   30 Dec 2005 16:41:06 -0000      1.3
+++ audio/faad/pkg/PLIST-xmms   15 Dec 2013 15:22:50 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST-xmms,v 1.3 2005/12/30 16:41:06 naddy Exp $
-%%SHARED%%
+@conflict faad-xmms-*
 @comment lib/xmms/
 @comment lib/xmms/Input/
 @comment lib/xmms/Input/libmp4.a
 @comment lib/xmms/Input/libmp4.la
+lib/xmms/Input/libmp4.so
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- devel/quirks/Makefile       15 Dec 2013 10:43:29 -0000      1.106
+++ devel/quirks/Makefile       15 Dec 2013 15:22:50 -0000
@@ -5,7 +5,7 @@ CATEGORIES =    devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =      quirks-1.103
+PKGNAME =      quirks-1.104
 PKG_ARCH =     *
 MAINTAINER =   Marc Espie <es...@openbsd.org>
 
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.113
diff -u -p -r1.113 Quirks.pm
--- devel/quirks/files/Quirks.pm        15 Dec 2013 10:43:29 -0000      1.113
+++ devel/quirks/files/Quirks.pm        15 Dec 2013 15:22:52 -0000
@@ -329,6 +329,7 @@ my $stem_extensions = {
        'mentry' =>'tklib',
        'wcb' =>'tklib',
        'foomatic-filters' =>'cups-filters',
+       'faad-xmms' => 'xmms-faad',
 };
 
 # reasons for obsolete packages
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to