7 files changed, 23 insertions, 23 deletions

diff --git a/x11-toolkits/linux-c6-openmotif/Makefile b/x11-toolkits/linux-c6-openmotif/Makefile
index d07df747148d..1e2fe37a67f2 100644
--- a/x11-toolkits/linux-c6-openmotif/Makefile
+++ b/x11-toolkits/linux-c6-openmotif/Makefile
@@ -3,23 +3,21 @@
 
 PORTNAME=	openmotif
 PORTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-openmotif-[0-9]* linux-f8-openmotif-[0-9]*
-
-USES=		linux:c6
+DESCR=		${.CURDIR}/../open-motif/pkg-descr
 RPMVERSION=	8.el6
-USE_LINUX_RPM=	yes
-USE_LINUX=	xorglibs
+USES=		linux:c6
 USE_LDCONFIG=	yes
-DESCR=	${.CURDIR}/../open-motif/pkg-descr
+USE_LINUX=	xorglibs
+USE_LINUX_RPM=	yes
 
-post-extract:
-		@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/bin ${WRKSRC}/usr/include \
-			${WRKSRC}/usr/share
+post-patch:
+	@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/bin ${WRKSRC}/usr/include \
+		${WRKSRC}/usr/share/X11 ${WRKSRC}/usr/share/man
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-openmotif/distinfo b/x11-toolkits/linux-c6-openmotif/distinfo
new file mode 100644
index 000000000000..313eb2782c7a
--- /dev/null
+++ b/x11-toolkits/linux-c6-openmotif/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485685659
+SHA256 (centos/openmotif-2.3.3-8.el6.i686.rpm) = a3110d8051e806bb87da96f65da5c1f912f530ceeb78d12cf3f372e1ceacf42d
+SIZE (centos/openmotif-2.3.3-8.el6.i686.rpm) = 1417316
+SHA256 (centos/openmotif-2.3.3-8.el6.x86_64.rpm) = fd5d2d0cb2aad05cee5da8f6e971923c0883a7334e1d12a9b28d5fb3956959c0
+SIZE (centos/openmotif-2.3.3-8.el6.x86_64.rpm) = 1417252
+SHA256 (centos/openmotif-2.3.3-8.el6.src.rpm) = 3225eb7285d58c40b08e765d866bffe85f8fb96f19b769ed8899253c568a1eea
+SIZE (centos/openmotif-2.3.3-8.el6.src.rpm) = 6059385
diff --git a/x11-toolkits/linux-c6-openmotif/distinfo.i386 b/x11-toolkits/linux-c6-openmotif/distinfo.i386
deleted file mode 100644
index 091a0971c071..000000000000
--- a/x11-toolkits/linux-c6-openmotif/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256703
-SHA256 (rpm/i686/centos/6.8/openmotif-2.3.3-8.el6.i686.rpm) = a3110d8051e806bb87da96f65da5c1f912f530ceeb78d12cf3f372e1ceacf42d
-SIZE (rpm/i686/centos/6.8/openmotif-2.3.3-8.el6.i686.rpm) = 1417316
-SHA256 (rpm/i686/centos/6.8/openmotif-2.3.3-8.el6.src.rpm) = 3225eb7285d58c40b08e765d866bffe85f8fb96f19b769ed8899253c568a1eea
-SIZE (rpm/i686/centos/6.8/openmotif-2.3.3-8.el6.src.rpm) = 6059385
diff --git a/x11-toolkits/linux-c6-openmotif/distinfo.x86_64 b/x11-toolkits/linux-c6-openmotif/distinfo.x86_64
deleted file mode 100644
index 2e53aa421962..000000000000
--- a/x11-toolkits/linux-c6-openmotif/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257000
-SHA256 (rpm/x86_64/centos/6.8/openmotif-2.3.3-8.el6.x86_64.rpm) = fd5d2d0cb2aad05cee5da8f6e971923c0883a7334e1d12a9b28d5fb3956959c0
-SIZE (rpm/x86_64/centos/6.8/openmotif-2.3.3-8.el6.x86_64.rpm) = 1417252
-SHA256 (rpm/x86_64/centos/6.8/openmotif-2.3.3-8.el6.i686.rpm) = a3110d8051e806bb87da96f65da5c1f912f530ceeb78d12cf3f372e1ceacf42d
-SIZE (rpm/x86_64/centos/6.8/openmotif-2.3.3-8.el6.i686.rpm) = 1417316
-SHA256 (rpm/x86_64/centos/6.8/openmotif-2.3.3-8.el6.src.rpm) = 3225eb7285d58c40b08e765d866bffe85f8fb96f19b769ed8899253c568a1eea
-SIZE (rpm/x86_64/centos/6.8/openmotif-2.3.3-8.el6.src.rpm) = 6059385
diff --git a/x11-toolkits/linux-c6-openmotif/pkg-descr b/x11-toolkits/linux-c6-openmotif/pkg-descr
deleted file mode 100644
index e669752e68f9..000000000000
--- a/x11-toolkits/linux-c6-openmotif/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Open Motif runtime libraries for the Linux emulation environment.
diff --git a/x11-toolkits/linux-c6-openmotif/pkg-plist.x86_64 b/x11-toolkits/linux-c6-openmotif/pkg-plist.amd64
index a1ebd586713c..0ad4221641ea 100644
--- a/x11-toolkits/linux-c6-openmotif/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-openmotif/pkg-plist.amd64
@@ -10,3 +10,7 @@ usr/lib64/libUil.so.4
 usr/lib64/libUil.so.4.0.3
 usr/lib64/libXm.so.4
 usr/lib64/libXm.so.4.0.3
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.MOTIF
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
diff --git a/x11-toolkits/linux-c6-openmotif/pkg-plist.i386 b/x11-toolkits/linux-c6-openmotif/pkg-plist.i386
index a52643cacb02..cc2a0b2fea3a 100644
--- a/x11-toolkits/linux-c6-openmotif/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-openmotif/pkg-plist.i386
@@ -4,3 +4,7 @@ usr/lib/libUil.so.4
 usr/lib/libUil.so.4.0.3
 usr/lib/libXm.so.4
 usr/lib/libXm.so.4.0.3
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.MOTIF
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES