7 files changed, 22 insertions, 24 deletions

diff --git a/audio/linux-c6-libogg/Makefile b/audio/linux-c6-libogg/Makefile
index 7756b48d7ffc..ebe83d753a4f 100644
--- a/audio/linux-c6-libogg/Makefile
+++ b/audio/linux-c6-libogg/Makefile
@@ -9,15 +9,10 @@ CATEGORIES=	audio linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Ogg bitstream library (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-libogg-[0-9]* linux-f10-libogg-[0-9]*
-
-USES=		linux:c6
-USE_LINUX_RPM=	yes
-
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	2.1.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-
-PORTDOCS=	AUTHORS CHANGES COPYING README
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/linux-c6-libogg/distinfo b/audio/linux-c6-libogg/distinfo
new file mode 100644
index 000000000000..03d3208d2e39
--- /dev/null
+++ b/audio/linux-c6-libogg/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485448641
+SHA256 (centos/libogg-1.1.4-2.1.el6.i686.rpm) = cb9c44995ebd89d5063bb9c91cf64fdae911e1350c412c99019d76ca7e9f70ab
+SIZE (centos/libogg-1.1.4-2.1.el6.i686.rpm) = 22172
+SHA256 (centos/libogg-1.1.4-2.1.el6.x86_64.rpm) = 065a86824f6d88d6f2fbba456cdbaebd458869232a8d6f4c1249a7da81a58a82
+SIZE (centos/libogg-1.1.4-2.1.el6.x86_64.rpm) = 21392
+SHA256 (centos/libogg-1.1.4-2.1.el6.src.rpm) = e3052e1e020779e92aa5a37d453de207071100bde1e50cac046ee1dc9fd535a2
+SIZE (centos/libogg-1.1.4-2.1.el6.src.rpm) = 447558
diff --git a/audio/linux-c6-libogg/distinfo.i386 b/audio/linux-c6-libogg/distinfo.i386
deleted file mode 100644
index 71084c138b45..000000000000
--- a/audio/linux-c6-libogg/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256765
-SHA256 (rpm/i686/centos/6.8/libogg-1.1.4-2.1.el6.i686.rpm) = cb9c44995ebd89d5063bb9c91cf64fdae911e1350c412c99019d76ca7e9f70ab
-SIZE (rpm/i686/centos/6.8/libogg-1.1.4-2.1.el6.i686.rpm) = 22172
-SHA256 (rpm/i686/centos/6.8/libogg-1.1.4-2.1.el6.src.rpm) = e3052e1e020779e92aa5a37d453de207071100bde1e50cac046ee1dc9fd535a2
-SIZE (rpm/i686/centos/6.8/libogg-1.1.4-2.1.el6.src.rpm) = 447558
diff --git a/audio/linux-c6-libogg/distinfo.x86_64 b/audio/linux-c6-libogg/distinfo.x86_64
deleted file mode 100644
index 312af5db9738..000000000000
--- a/audio/linux-c6-libogg/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257299
-SHA256 (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.x86_64.rpm) = 065a86824f6d88d6f2fbba456cdbaebd458869232a8d6f4c1249a7da81a58a82
-SIZE (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.x86_64.rpm) = 21392
-SHA256 (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.i686.rpm) = cb9c44995ebd89d5063bb9c91cf64fdae911e1350c412c99019d76ca7e9f70ab
-SIZE (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.i686.rpm) = 22172
-SHA256 (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.src.rpm) = e3052e1e020779e92aa5a37d453de207071100bde1e50cac046ee1dc9fd535a2
-SIZE (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.src.rpm) = 447558
diff --git a/audio/linux-c6-libogg/pkg-plist.amd64 b/audio/linux-c6-libogg/pkg-plist.amd64
new file mode 100644
index 000000000000..077512f3b35d
--- /dev/null
+++ b/audio/linux-c6-libogg/pkg-plist.amd64
@@ -0,0 +1,8 @@
+usr/lib/libogg.so.0
+usr/lib/libogg.so.0.6.0
+usr/lib64/libogg.so.0
+usr/lib64/libogg.so.0.6.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c6-libogg/pkg-plist.i386 b/audio/linux-c6-libogg/pkg-plist.i386
index 471dc04490a4..2de650ed6c1e 100644
--- a/audio/linux-c6-libogg/pkg-plist.i386
+++ b/audio/linux-c6-libogg/pkg-plist.i386
@@ -1,2 +1,6 @@
 usr/lib/libogg.so.0
 usr/lib/libogg.so.0.6.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c6-libogg/pkg-plist.x86_64 b/audio/linux-c6-libogg/pkg-plist.x86_64
deleted file mode 100644
index e021dff729f9..000000000000
--- a/audio/linux-c6-libogg/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libogg.so.0
-usr/lib/libogg.so.0.6.0
-usr/lib64/libogg.so.0
-usr/lib64/libogg.so.0.6.0