diff options
| author | kamil <kamil> | 2016-07-29 18:25:35 +0000 |
|---|---|---|
| committer | kamil <kamil> | 2016-07-29 18:25:35 +0000 |
| commit | 0c49033f8426d7a32ba9f1b871686ff983163a76 (patch) | |
| tree | 0cd6e311280b2a3e29e9b4acb0079a73030ee63c /multimedia | |
| parent | b63b34ae14eaa2190622d445c7d6270c764dc2cf (diff) | |
| download | pkgsrc-0c49033f8426d7a32ba9f1b871686ff983163a76.tar.gz | |
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 (limited to 'multimedia')
| -rw-r--r-- | multimedia/smpeg2/Makefile | 12 | ||||
| -rw-r--r-- | multimedia/smpeg2/PLIST | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/multimedia/smpeg2/Makefile b/multimedia/smpeg2/Makefile index be78a19636a..f087b438625 100644 --- a/multimedia/smpeg2/Makefile +++ b/multimedia/smpeg2/Makefile @@ -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 @@ HOMEPAGE= http://www.libsdl.org/projects/smpeg/ 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 --git a/multimedia/smpeg2/PLIST b/multimedia/smpeg2/PLIST index 22c97ca9477..760dce1c3bf 100644 --- a/multimedia/smpeg2/PLIST +++ b/multimedia/smpeg2/PLIST @@ -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/MPEGsystem.h include/smpeg2/MPEGvideo.h include/smpeg2/smpeg.h lib/libsmpeg2.la -man/man1/plaympeg.1 +man/man1/plaympeg2.1 share/aclocal/smpeg2.m4 |