6 files changed, 19 insertions, 20 deletions

diff --git a/audio/linux-c6-sdl_mixer/Makefile b/audio/linux-c6-sdl_mixer/Makefile
index ca49c6917f3e..4cf989aac359 100644
--- a/audio/linux-c6-sdl_mixer/Makefile
+++ b/audio/linux-c6-sdl_mixer/Makefile
@@ -3,25 +3,23 @@
 
 PORTNAME=	sdl_mixer
 PORTVERSION=	1.2.12
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio linux
 MASTER_SITES=	EPEL
-DISTNAME=	${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[0-9]*
 
-LINUX_NAME=	SDL_mixer
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME=	SDL_mixer
 RPMVERSION=	1.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
-USE_LINUX=	sdl12 mikmod
+USE_LINUX=	sdl12
 USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-PORTDOCS=	CHANGES COPYING README
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/audio/linux-c6-sdl_mixer/distinfo b/audio/linux-c6-sdl_mixer/distinfo
new file mode 100644
index 000000000000..001c196072ca
--- /dev/null
+++ b/audio/linux-c6-sdl_mixer/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485451905
+SHA256 (centos/SDL_mixer-1.2.12-1.el6.i686.rpm) = fe55d342e9a75f481dbf13e441f6090e078c6022f3493186ee06084672ea3a7c
+SIZE (centos/SDL_mixer-1.2.12-1.el6.i686.rpm) = 85304
+SHA256 (centos/SDL_mixer-1.2.12-1.el6.x86_64.rpm) = 83c6869de31f9da391e41b57f91f6f1ed81ed38b3fbd6db819b90a91e2c5bbdb
+SIZE (centos/SDL_mixer-1.2.12-1.el6.x86_64.rpm) = 85388
+SHA256 (centos/SDL_mixer-1.2.12-1.el6.src.rpm) = 935b0d8e096dd8f9ec746be2a841531161d247da6de7400fa4072ac61d39a140
+SIZE (centos/SDL_mixer-1.2.12-1.el6.src.rpm) = 3700092
diff --git a/audio/linux-c6-sdl_mixer/distinfo.i386 b/audio/linux-c6-sdl_mixer/distinfo.i386
deleted file mode 100644
index d09c7d1cdaa8..000000000000
--- a/audio/linux-c6-sdl_mixer/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256763
-SHA256 (rpm/i686/centos/6.8/SDL_mixer-1.2.12-1.el6.i686.rpm) = fe55d342e9a75f481dbf13e441f6090e078c6022f3493186ee06084672ea3a7c
-SIZE (rpm/i686/centos/6.8/SDL_mixer-1.2.12-1.el6.i686.rpm) = 85304
-SHA256 (rpm/i686/centos/6.8/SDL_mixer-1.2.12-1.el6.src.rpm) = 935b0d8e096dd8f9ec746be2a841531161d247da6de7400fa4072ac61d39a140
-SIZE (rpm/i686/centos/6.8/SDL_mixer-1.2.12-1.el6.src.rpm) = 3700092
diff --git a/audio/linux-c6-sdl_mixer/distinfo.x86_64 b/audio/linux-c6-sdl_mixer/distinfo.x86_64
deleted file mode 100644
index 916c00a5ba9c..000000000000
--- a/audio/linux-c6-sdl_mixer/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257291
-SHA256 (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.x86_64.rpm) = 83c6869de31f9da391e41b57f91f6f1ed81ed38b3fbd6db819b90a91e2c5bbdb
-SIZE (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.x86_64.rpm) = 85388
-SHA256 (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.i686.rpm) = fe55d342e9a75f481dbf13e441f6090e078c6022f3493186ee06084672ea3a7c
-SIZE (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.i686.rpm) = 85304
-SHA256 (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.src.rpm) = 935b0d8e096dd8f9ec746be2a841531161d247da6de7400fa4072ac61d39a140
-SIZE (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.src.rpm) = 3700092
diff --git a/audio/linux-c6-sdl_mixer/pkg-plist.x86_64 b/audio/linux-c6-sdl_mixer/pkg-plist.amd64
index 543a2d1f78b9..13b4c72e4c80 100644
--- a/audio/linux-c6-sdl_mixer/pkg-plist.x86_64
+++ b/audio/linux-c6-sdl_mixer/pkg-plist.amd64
@@ -4,3 +4,6 @@ usr/lib/libSDL_mixer-1.2.so.0
 usr/lib/libSDL_mixer-1.2.so.0.12.0
 usr/lib64/libSDL_mixer-1.2.so.0
 usr/lib64/libSDL_mixer-1.2.so.0.12.0
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c6-sdl_mixer/pkg-plist.i386 b/audio/linux-c6-sdl_mixer/pkg-plist.i386
index 6af8f411248f..2a75a1212d6f 100644
--- a/audio/linux-c6-sdl_mixer/pkg-plist.i386
+++ b/audio/linux-c6-sdl_mixer/pkg-plist.i386
@@ -2,3 +2,6 @@ usr/bin/playmus
 usr/bin/playwave
 usr/lib/libSDL_mixer-1.2.so.0
 usr/lib/libSDL_mixer-1.2.so.0.12.0
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README