6 files changed, 29 insertions, 38 deletions

diff --git a/x11-toolkits/linux-c6-pango/Makefile b/x11-toolkits/linux-c6-pango/Makefile
index 5e7729891f1e..342b9357df4a 100644
--- a/x11-toolkits/linux-c6-pango/Makefile
+++ b/x11-toolkits/linux-c6-pango/Makefile
@@ -7,17 +7,13 @@ PORTREVISION=	7
 CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	emulation@FreeBSD.org
-
 COMMENT=	Pango library (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-pango-[0-9]* linux-f10-pango-[0-9]*
-
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	11.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	cairo fontconfig libthai xorglibs
 USE_LINUX_RPM=	yes
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-pango/distinfo b/x11-toolkits/linux-c6-pango/distinfo
new file mode 100644
index 000000000000..71264c1d1193
--- /dev/null
+++ b/x11-toolkits/linux-c6-pango/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485686999
+SHA256 (centos/pango-1.28.1-11.el6.i686.rpm) = 1ae8ed9e7dfc0a5d162f1fb129bfdd2c7fb7d849ca0595da225a73796e770cb6
+SIZE (centos/pango-1.28.1-11.el6.i686.rpm) = 359152
+SHA256 (centos/pango-1.28.1-11.el6.x86_64.rpm) = 0663a5ce99cebf5285d96c4d92fc83155e859976bfd72980bf8691c3e89f92ad
+SIZE (centos/pango-1.28.1-11.el6.x86_64.rpm) = 359752
+SHA256 (centos/pango-1.28.1-11.el6.src.rpm) = b7769f4cfbec69171ef48b8e2bb686555a578515eec225ebebfae286a343e384
+SIZE (centos/pango-1.28.1-11.el6.src.rpm) = 1441312
diff --git a/x11-toolkits/linux-c6-pango/distinfo.i386 b/x11-toolkits/linux-c6-pango/distinfo.i386
deleted file mode 100644
index 7e7a41c7e569..000000000000
--- a/x11-toolkits/linux-c6-pango/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256700
-SHA256 (rpm/i686/centos/6.8/pango-1.28.1-11.el6.i686.rpm) = 1ae8ed9e7dfc0a5d162f1fb129bfdd2c7fb7d849ca0595da225a73796e770cb6
-SIZE (rpm/i686/centos/6.8/pango-1.28.1-11.el6.i686.rpm) = 359152
-SHA256 (rpm/i686/centos/6.8/pango-1.28.1-11.el6.src.rpm) = b7769f4cfbec69171ef48b8e2bb686555a578515eec225ebebfae286a343e384
-SIZE (rpm/i686/centos/6.8/pango-1.28.1-11.el6.src.rpm) = 1441312
diff --git a/x11-toolkits/linux-c6-pango/distinfo.x86_64 b/x11-toolkits/linux-c6-pango/distinfo.x86_64
deleted file mode 100644
index 1a7cc5c52ce4..000000000000
--- a/x11-toolkits/linux-c6-pango/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466256989
-SHA256 (rpm/x86_64/centos/6.8/pango-1.28.1-11.el6.x86_64.rpm) = 0663a5ce99cebf5285d96c4d92fc83155e859976bfd72980bf8691c3e89f92ad
-SIZE (rpm/x86_64/centos/6.8/pango-1.28.1-11.el6.x86_64.rpm) = 359752
-SHA256 (rpm/x86_64/centos/6.8/pango-1.28.1-11.el6.i686.rpm) = 1ae8ed9e7dfc0a5d162f1fb129bfdd2c7fb7d849ca0595da225a73796e770cb6
-SIZE (rpm/x86_64/centos/6.8/pango-1.28.1-11.el6.i686.rpm) = 359152
-SHA256 (rpm/x86_64/centos/6.8/pango-1.28.1-11.el6.src.rpm) = b7769f4cfbec69171ef48b8e2bb686555a578515eec225ebebfae286a343e384
-SIZE (rpm/x86_64/centos/6.8/pango-1.28.1-11.el6.src.rpm) = 1441312
diff --git a/x11-toolkits/linux-c6-pango/pkg-plist.x86_64 b/x11-toolkits/linux-c6-pango/pkg-plist.amd64
index 72e5ad2b6ad5..22c5b6bb4dbc 100644
--- a/x11-toolkits/linux-c6-pango/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-pango/pkg-plist.amd64
@@ -1,8 +1,8 @@
-@postexec %D/usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules
-@rmtry etc/pango/i386-redhat-linux-gnu/pango.modules
-etc/pango/pangox.aliases
-@postexec %D/usr/bin/pango-querymodules-64 > %D/etc/pango/x86_64-redhat-linux-gnu/pango.modules
-@rmtry etc/pango/x86_64-redhat-linux-gnu/pango.modules
+@postexec %D/usr/bin/pango-querymodules-32 > %D/%%ETCDIR%%/i386-redhat-linux-gnu/pango.modules
+@rmtry %%ETCDIR%%/i386-redhat-linux-gnu/pango.modules
+%%ETCDIR%%/pangox.aliases
+@postexec %D/usr/bin/pango-querymodules-64 > %D/%%ETCDIR%%/x86_64-redhat-linux-gnu/pango.modules
+@rmtry %%ETCDIR%%/x86_64-redhat-linux-gnu/pango.modules
 usr/bin/pango-querymodules-32
 usr/bin/pango-querymodules-64
 usr/bin/pango-view
@@ -50,12 +50,12 @@ usr/lib64/pango/1.6.0/modules/pango-syriac-fc.so
 usr/lib64/pango/1.6.0/modules/pango-thai-fc.so
 usr/lib64/pango/1.6.0/modules/pango-thai-lang.so
 usr/lib64/pango/1.6.0/modules/pango-tibetan-fc.so
-usr/share/doc/pango-1.28.1/AUTHORS
-usr/share/doc/pango-1.28.1/COPYING
-usr/share/doc/pango-1.28.1/HELLO.txt
-usr/share/doc/pango-1.28.1/NEWS
-usr/share/doc/pango-1.28.1/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/HELLO.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/pango-querymodules.1.gz
 usr/share/man/man1/pango-view.1.gz
-@dir etc/pango/i386-redhat-linux-gnu
-@dir etc/pango/x86_64-redhat-linux-gnu
+@dir %%ETCDIR%%/i386-redhat-linux-gnu
+@dir %%ETCDIR%%/x86_64-redhat-linux-gnu
diff --git a/x11-toolkits/linux-c6-pango/pkg-plist.i386 b/x11-toolkits/linux-c6-pango/pkg-plist.i386
index 2ddca1b5d89d..ce22a9d83bb1 100644
--- a/x11-toolkits/linux-c6-pango/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-pango/pkg-plist.i386
@@ -1,6 +1,6 @@
-@postexec %D/usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules
-@rmtry etc/pango/i386-redhat-linux-gnu/pango.modules
-etc/pango/pangox.aliases
+@postexec %D/usr/bin/pango-querymodules-32 > %D/%%ETCDIR%%/i386-redhat-linux-gnu/pango.modules
+@rmtry %%ETCDIR%%/i386-redhat-linux-gnu/pango.modules
+%%ETCDIR%%/pangox.aliases
 usr/bin/pango-querymodules-32
 usr/bin/pango-view
 usr/lib/libpango-1.0.so.0
@@ -25,11 +25,11 @@ usr/lib/pango/1.6.0/modules/pango-syriac-fc.so
 usr/lib/pango/1.6.0/modules/pango-thai-fc.so
 usr/lib/pango/1.6.0/modules/pango-thai-lang.so
 usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so
-usr/share/doc/pango-1.28.1/AUTHORS
-usr/share/doc/pango-1.28.1/COPYING
-usr/share/doc/pango-1.28.1/HELLO.txt
-usr/share/doc/pango-1.28.1/NEWS
-usr/share/doc/pango-1.28.1/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/HELLO.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/pango-querymodules.1.gz
 usr/share/man/man1/pango-view.1.gz
-@dir etc/pango/i386-redhat-linux-gnu
+@dir %%ETCDIR%%/i386-redhat-linux-gnu