11 files changed, 22 insertions, 24 deletions

diff --git a/print/linux-c6-cups-libs/Makefile b/print/linux-c6-cups-libs/Makefile
index 4bfba6f3d491..b63d937439fe 100644
--- a/print/linux-c6-cups-libs/Makefile
+++ b/print/linux-c6-cups-libs/Makefile
@@ -1,21 +1,22 @@
 # Created by: Johannes Meixner <johannes@perceivon.net>
 # $FreeBSD$
 
-PORTNAME=	cups-libs
+PORTNAME=	cups
 PORTVERSION=	1.4.2
 PORTREVISION=	6
 CATEGORIES=	print linux
+PKGNAMESUFFIX=	-libs
+LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common UNIX Printing System libraries
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 RPMVERSION=	74.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	gnutls
 USE_LINUX_RPM=	yes
-SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
-DESCR=		${.CURDIR}/../cups/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/print/linux-c6-cups-libs/distinfo b/print/linux-c6-cups-libs/distinfo
new file mode 100644
index 000000000000..bb0b9efb7ba1
--- /dev/null
+++ b/print/linux-c6-cups-libs/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485616488
+SHA256 (centos/cups-libs-1.4.2-74.el6.i686.rpm) = 6906749fd25ea31056d7bbb4766dcef157037be453ee8956f52e49a33210b1ba
+SIZE (centos/cups-libs-1.4.2-74.el6.i686.rpm) = 339432
+SHA256 (centos/cups-libs-1.4.2-74.el6.x86_64.rpm) = 3d4973bcce244d127798ad20948479e8b8698efa11b2164c80be4ec50f60ebb5
+SIZE (centos/cups-libs-1.4.2-74.el6.x86_64.rpm) = 329344
+SHA256 (centos/cups-1.4.2-74.el6.src.rpm) = 00089025dd9d712ee03ec4934c221c5b5214af3c7771133337967c00620f0aaa
+SIZE (centos/cups-1.4.2-74.el6.src.rpm) = 4680232
diff --git a/print/linux-c6-cups-libs/distinfo.i386 b/print/linux-c6-cups-libs/distinfo.i386
deleted file mode 100644
index a0b05653ee8a..000000000000
--- a/print/linux-c6-cups-libs/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256747
-SHA256 (rpm/i686/centos/6.8/cups-libs-1.4.2-74.el6.i686.rpm) = 6906749fd25ea31056d7bbb4766dcef157037be453ee8956f52e49a33210b1ba
-SIZE (rpm/i686/centos/6.8/cups-libs-1.4.2-74.el6.i686.rpm) = 339432
-SHA256 (rpm/i686/centos/6.8/cups-1.4.2-74.el6.src.rpm) = 00089025dd9d712ee03ec4934c221c5b5214af3c7771133337967c00620f0aaa
-SIZE (rpm/i686/centos/6.8/cups-1.4.2-74.el6.src.rpm) = 4680232
diff --git a/print/linux-c6-cups-libs/distinfo.x86_64 b/print/linux-c6-cups-libs/distinfo.x86_64
deleted file mode 100644
index 80a7bc39af5b..000000000000
--- a/print/linux-c6-cups-libs/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257258
-SHA256 (rpm/x86_64/centos/6.8/cups-libs-1.4.2-74.el6.x86_64.rpm) = 3d4973bcce244d127798ad20948479e8b8698efa11b2164c80be4ec50f60ebb5
-SIZE (rpm/x86_64/centos/6.8/cups-libs-1.4.2-74.el6.x86_64.rpm) = 329344
-SHA256 (rpm/x86_64/centos/6.8/cups-libs-1.4.2-74.el6.i686.rpm) = 6906749fd25ea31056d7bbb4766dcef157037be453ee8956f52e49a33210b1ba
-SIZE (rpm/x86_64/centos/6.8/cups-libs-1.4.2-74.el6.i686.rpm) = 339432
-SHA256 (rpm/x86_64/centos/6.8/cups-1.4.2-74.el6.src.rpm) = 00089025dd9d712ee03ec4934c221c5b5214af3c7771133337967c00620f0aaa
-SIZE (rpm/x86_64/centos/6.8/cups-1.4.2-74.el6.src.rpm) = 4680232
diff --git a/print/linux-c6-cups-libs/pkg-plist.x86_64 b/print/linux-c6-cups-libs/pkg-plist.amd64
index 83998d7a3b3a..83998d7a3b3a 100644
--- a/print/linux-c6-cups-libs/pkg-plist.x86_64
+++ b/print/linux-c6-cups-libs/pkg-plist.amd64
diff --git a/print/linux-c7-cups-libs/Makefile b/print/linux-c7-cups-libs/Makefile
index 134fa20a9b00..1f06a0beb091 100644
--- a/print/linux-c7-cups-libs/Makefile
+++ b/print/linux-c7-cups-libs/Makefile
@@ -1,23 +1,25 @@
 # Created by: Piotr Kubaj <pkubaj@anongoth.pl>
 # $FreeBSD$
 
-PORTNAME=	cups-libs
+PORTNAME=	cups
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print linux
-SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+PKGNAMESUFFIX=	-libs
+LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common UNIX Printing System libraries
 
-CONFLICT=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICT=	linux-c6-${LINUXNAME}-[0-9]*
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 RPMVERSION=	26.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	gnutls
 USE_LINUX_RPM=	yes
 
-DESCR=		${.CURDIR}/../cups/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/print/linux-c7-cups-libs/distinfo.x86_64 b/print/linux-c7-cups-libs/distinfo
index f0d36ccdead3..f0d36ccdead3 100644
--- a/print/linux-c7-cups-libs/distinfo.x86_64
+++ b/print/linux-c7-cups-libs/distinfo
diff --git a/print/linux-c7-cups-libs/pkg-plist.x86_64 b/print/linux-c7-cups-libs/pkg-plist.amd64
index a59036feaf8c..6891d155a7a7 100644
--- a/print/linux-c7-cups-libs/pkg-plist.x86_64
+++ b/print/linux-c7-cups-libs/pkg-plist.amd64
@@ -8,3 +8,4 @@ usr/lib64/libcupscgi.so.1
 usr/lib64/libcupsimage.so.2
 usr/lib64/libcupsmime.so.1
 usr/lib64/libcupsppdc.so.1
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
diff --git a/print/linux-c7-harfbuzz/Makefile b/print/linux-c7-harfbuzz/Makefile
index 3b2064549a12..c010a4aae9f7 100644
--- a/print/linux-c7-harfbuzz/Makefile
+++ b/print/linux-c7-harfbuzz/Makefile
@@ -8,12 +8,11 @@ CATEGORIES=	print linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OpenType text shaping engine (Linux CentOS ${LINUX_DIST_VER})
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	graphite2
 USE_LINUX_RPM=	yes
 
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/print/linux-c7-harfbuzz/distinfo.x86_64 b/print/linux-c7-harfbuzz/distinfo
index 997a7f075086..997a7f075086 100644
--- a/print/linux-c7-harfbuzz/distinfo.x86_64
+++ b/print/linux-c7-harfbuzz/distinfo
diff --git a/print/linux-c7-harfbuzz/pkg-plist.x86_64 b/print/linux-c7-harfbuzz/pkg-plist.amd64
index b6a58e82f974..b6a58e82f974 100644
--- a/print/linux-c7-harfbuzz/pkg-plist.x86_64
+++ b/print/linux-c7-harfbuzz/pkg-plist.amd64