[pkgsrc/trunk]: pkgsrc/multimedia/smpeg2 Remove conflict between multimedia/s...

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/21d87949b785
branches:  trunk
changeset: 350560:21d87949b785
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Fri Jul 29 18:25:35 2016 +0000

description:
Remove conflict between multimedia/smpeg and multimedia/smpeg2

Install plaympeg of smpeg2 and the corresponding man-page as versioned.

Bump PKGREVISION.

Accepted by <wiz>

diffstat:

 multimedia/smpeg2/Makefile |  12 ++++++++----
 multimedia/smpeg2/PLIST    |   6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (53 lines):

diff -r 24a9e50abafa -r 21d87949b785 multimedia/smpeg2/Makefile
--- a/multimedia/smpeg2/Makefile        Fri Jul 29 12:11:19 2016 +0000
+++ b/multimedia/smpeg2/Makefile        Fri Jul 29 18:25:35 2016 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:41 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2016/07/29 18:25:35 kamil Exp $
 
 DISTNAME=      smpeg2-2.0.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.libsdl.org/projects/smpeg/release/
 
@@ -10,15 +10,19 @@
 COMMENT=       Free MPEG1 video player library with sound support
 LICENSE=       gnu-lgpl-v2.1
 
-CONFLICTS+=    smpeg-[0-9]*
-
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 
+CONFIGURE_ARGS+=       --program-suffix=2
+
 .include "../../mk/bsd.fast.prefs.mk"
 
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
+post-install:
+       ${MV} ${DESTDIR}${PREFIX}/bin/smpeg2-config2 \
+               ${DESTDIR}${PREFIX}/bin/smpeg2-config
+
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 24a9e50abafa -r 21d87949b785 multimedia/smpeg2/PLIST
--- a/multimedia/smpeg2/PLIST   Fri Jul 29 12:11:19 2016 +0000
+++ b/multimedia/smpeg2/PLIST   Fri Jul 29 18:25:35 2016 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2014/02/02 15:24:13 rodent Exp $
-bin/plaympeg
+@comment $NetBSD: PLIST,v 1.2 2016/07/29 18:25:35 kamil Exp $
+bin/plaympeg2
 bin/smpeg2-config
 include/smpeg2/MPEG.h
 include/smpeg2/MPEGaction.h
@@ -13,5 +13,5 @@
 include/smpeg2/MPEGvideo.h
 include/smpeg2/smpeg.h
 lib/libsmpeg2.la
-man/man1/plaympeg.1
+man/man1/plaympeg2.1
 share/aclocal/smpeg2.m4