7 files changed, 56 insertions, 66 deletions

diff --git a/audio/linux-c6-libaudiofile/Makefile b/audio/linux-c6-libaudiofile/Makefile
index 70501d52bcd0..3a9389d9e68a 100644
--- a/audio/linux-c6-libaudiofile/Makefile
+++ b/audio/linux-c6-libaudiofile/Makefile
@@ -1,23 +1,18 @@
 # Created by: Johannes Meixner <johannes@perceivon.net>
 # $FreeBSD$
 
-PORTNAME=	libaudiofile
+PORTNAME=	audiofile
 PORTVERSION=	0.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio linux
-DISTNAME=	audiofile-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Implementation of the Audio File Library from SGI (Linux CentOS ${LINUX_DIST_VER})
 
-CONTFLICTS=	linux-libaudiofile-[0-9]* linux-f10-libaudiofile-[0-9]*
-
-USES=		linux:c6
-USE_LINUX_RPM=	yes
-
+DESCR=		${.CURDIR}/../lib${PORTNAME}/pkg-descr
 RPMVERSION=	11.1.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/linux-c6-libaudiofile/distinfo b/audio/linux-c6-libaudiofile/distinfo
new file mode 100644
index 000000000000..1b859a1ef4a9
--- /dev/null
+++ b/audio/linux-c6-libaudiofile/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485446288
+SHA256 (centos/audiofile-0.2.6-11.1.el6.i686.rpm) = 0c69612801fba085f31d4efb86516249349ef468629af48497de3480ed02394c
+SIZE (centos/audiofile-0.2.6-11.1.el6.i686.rpm) = 98100
+SHA256 (centos/audiofile-0.2.6-11.1.el6.x86_64.rpm) = 528b304107d7004939cbb7060151091b81eb4696111f0510418e8444a707d89d
+SIZE (centos/audiofile-0.2.6-11.1.el6.x86_64.rpm) = 97244
+SHA256 (centos/audiofile-0.2.6-11.1.el6.src.rpm) = fc01779d488a6430cfe2c437d996cfd42025a1864f2b15bd241325ecafc05f5b
+SIZE (centos/audiofile-0.2.6-11.1.el6.src.rpm) = 291993
diff --git a/audio/linux-c6-libaudiofile/distinfo.i386 b/audio/linux-c6-libaudiofile/distinfo.i386
deleted file mode 100644
index df1c1ec12ebd..000000000000
--- a/audio/linux-c6-libaudiofile/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466263057
-SHA256 (rpm/i686/centos/6.8/audiofile-0.2.6-11.1.el6.i686.rpm) = 0c69612801fba085f31d4efb86516249349ef468629af48497de3480ed02394c
-SIZE (rpm/i686/centos/6.8/audiofile-0.2.6-11.1.el6.i686.rpm) = 98100
-SHA256 (rpm/i686/centos/6.8/audiofile-0.2.6-11.1.el6.src.rpm) = fc01779d488a6430cfe2c437d996cfd42025a1864f2b15bd241325ecafc05f5b
-SIZE (rpm/i686/centos/6.8/audiofile-0.2.6-11.1.el6.src.rpm) = 291993
diff --git a/audio/linux-c6-libaudiofile/distinfo.x86_64 b/audio/linux-c6-libaudiofile/distinfo.x86_64
deleted file mode 100644
index 9e34ec73a88c..000000000000
--- a/audio/linux-c6-libaudiofile/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257278
-SHA256 (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.x86_64.rpm) = 528b304107d7004939cbb7060151091b81eb4696111f0510418e8444a707d89d
-SIZE (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.x86_64.rpm) = 97244
-SHA256 (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.i686.rpm) = 0c69612801fba085f31d4efb86516249349ef468629af48497de3480ed02394c
-SIZE (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.i686.rpm) = 98100
-SHA256 (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.src.rpm) = fc01779d488a6430cfe2c437d996cfd42025a1864f2b15bd241325ecafc05f5b
-SIZE (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.src.rpm) = 291993
diff --git a/audio/linux-c6-libaudiofile/pkg-plist.amd64 b/audio/linux-c6-libaudiofile/pkg-plist.amd64
new file mode 100644
index 000000000000..b601b7547a5e
--- /dev/null
+++ b/audio/linux-c6-libaudiofile/pkg-plist.amd64
@@ -0,0 +1,25 @@
+usr/bin/sfconvert
+usr/bin/sfinfo
+usr/lib/libaudiofile.so.0
+usr/lib/libaudiofile.so.0.0.2
+usr/lib64/libaudiofile.so.0
+usr/lib64/libaudiofile.so.0.0.2
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/docs/afCloseFile
+%%PORTDOCS%%%%DOCSDIR%%/docs/afGetFrameSize
+%%PORTDOCS%%%%DOCSDIR%%/docs/afGetTrackBytes
+%%PORTDOCS%%%%DOCSDIR%%/docs/afIntro
+%%PORTDOCS%%%%DOCSDIR%%/docs/afNewFileSetup
+%%PORTDOCS%%%%DOCSDIR%%/docs/afOpenFile
+%%PORTDOCS%%%%DOCSDIR%%/docs/afQuery
+%%PORTDOCS%%%%DOCSDIR%%/docs/afReadFrames
+%%PORTDOCS%%%%DOCSDIR%%/docs/afReadMisc
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSeekFrame
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSetErrorHandler
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSetVirtualByteOrder
+%%PORTDOCS%%%%DOCSDIR%%/docs/afWriteFrames
+%%PORTDOCS%%%%DOCSDIR%%/docs/sfconvert
+%%PORTDOCS%%%%DOCSDIR%%/docs/sfinfo
diff --git a/audio/linux-c6-libaudiofile/pkg-plist.i386 b/audio/linux-c6-libaudiofile/pkg-plist.i386
index 4df95fb4a8c9..859b83afe577 100644
--- a/audio/linux-c6-libaudiofile/pkg-plist.i386
+++ b/audio/linux-c6-libaudiofile/pkg-plist.i386
@@ -2,22 +2,22 @@ usr/bin/sfconvert
 usr/bin/sfinfo
 usr/lib/libaudiofile.so.0
 usr/lib/libaudiofile.so.0.0.2
-usr/share/doc/audiofile-0.2.6/COPYING
-usr/share/doc/audiofile-0.2.6/ChangeLog
-usr/share/doc/audiofile-0.2.6/README
-usr/share/doc/audiofile-0.2.6/TODO
-usr/share/doc/audiofile-0.2.6/docs/afCloseFile
-usr/share/doc/audiofile-0.2.6/docs/afGetFrameSize
-usr/share/doc/audiofile-0.2.6/docs/afGetTrackBytes
-usr/share/doc/audiofile-0.2.6/docs/afIntro
-usr/share/doc/audiofile-0.2.6/docs/afNewFileSetup
-usr/share/doc/audiofile-0.2.6/docs/afOpenFile
-usr/share/doc/audiofile-0.2.6/docs/afQuery
-usr/share/doc/audiofile-0.2.6/docs/afReadFrames
-usr/share/doc/audiofile-0.2.6/docs/afReadMisc
-usr/share/doc/audiofile-0.2.6/docs/afSeekFrame
-usr/share/doc/audiofile-0.2.6/docs/afSetErrorHandler
-usr/share/doc/audiofile-0.2.6/docs/afSetVirtualByteOrder
-usr/share/doc/audiofile-0.2.6/docs/afWriteFrames
-usr/share/doc/audiofile-0.2.6/docs/sfconvert
-usr/share/doc/audiofile-0.2.6/docs/sfinfo
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/docs/afCloseFile
+%%PORTDOCS%%%%DOCSDIR%%/docs/afGetFrameSize
+%%PORTDOCS%%%%DOCSDIR%%/docs/afGetTrackBytes
+%%PORTDOCS%%%%DOCSDIR%%/docs/afIntro
+%%PORTDOCS%%%%DOCSDIR%%/docs/afNewFileSetup
+%%PORTDOCS%%%%DOCSDIR%%/docs/afOpenFile
+%%PORTDOCS%%%%DOCSDIR%%/docs/afQuery
+%%PORTDOCS%%%%DOCSDIR%%/docs/afReadFrames
+%%PORTDOCS%%%%DOCSDIR%%/docs/afReadMisc
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSeekFrame
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSetErrorHandler
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSetVirtualByteOrder
+%%PORTDOCS%%%%DOCSDIR%%/docs/afWriteFrames
+%%PORTDOCS%%%%DOCSDIR%%/docs/sfconvert
+%%PORTDOCS%%%%DOCSDIR%%/docs/sfinfo
diff --git a/audio/linux-c6-libaudiofile/pkg-plist.x86_64 b/audio/linux-c6-libaudiofile/pkg-plist.x86_64
deleted file mode 100644
index 20b35f382ef9..000000000000
--- a/audio/linux-c6-libaudiofile/pkg-plist.x86_64
+++ /dev/null
@@ -1,25 +0,0 @@
-usr/bin/sfconvert
-usr/bin/sfinfo
-usr/lib/libaudiofile.so.0
-usr/lib/libaudiofile.so.0.0.2
-usr/lib64/libaudiofile.so.0
-usr/lib64/libaudiofile.so.0.0.2
-usr/share/doc/audiofile-0.2.6/COPYING
-usr/share/doc/audiofile-0.2.6/ChangeLog
-usr/share/doc/audiofile-0.2.6/README
-usr/share/doc/audiofile-0.2.6/TODO
-usr/share/doc/audiofile-0.2.6/docs/afCloseFile
-usr/share/doc/audiofile-0.2.6/docs/afGetFrameSize
-usr/share/doc/audiofile-0.2.6/docs/afGetTrackBytes
-usr/share/doc/audiofile-0.2.6/docs/afIntro
-usr/share/doc/audiofile-0.2.6/docs/afNewFileSetup
-usr/share/doc/audiofile-0.2.6/docs/afOpenFile
-usr/share/doc/audiofile-0.2.6/docs/afQuery
-usr/share/doc/audiofile-0.2.6/docs/afReadFrames
-usr/share/doc/audiofile-0.2.6/docs/afReadMisc
-usr/share/doc/audiofile-0.2.6/docs/afSeekFrame
-usr/share/doc/audiofile-0.2.6/docs/afSetErrorHandler
-usr/share/doc/audiofile-0.2.6/docs/afSetVirtualByteOrder
-usr/share/doc/audiofile-0.2.6/docs/afWriteFrames
-usr/share/doc/audiofile-0.2.6/docs/sfconvert
-usr/share/doc/audiofile-0.2.6/docs/sfinfo