From 844eb16a686a8eaf36b88417fa047f2a37149374 Mon Sep 17 00:00:00 2001 From: tijl Date: Tue, 31 Jan 2017 16:54:21 +0000 Subject: - Autodetect the installed linux_base port and use LINUX_DEFAULT only as a last resort. - Construct a list of DISTFILES for every architecture (amd64, i386). Select one list for regular make and all lists for make makesum so linux ports can have one combined distinfo file. - Set DIST_SUBDIR?=centos so there's only one copy of common distfiles. - Use MASTER_SITES and DISTFILES groups so make fetch is a bit smarter. - Regenerate all distinfo files. - For linux_base-c6 (just like linux_base-c7 already does) turn bin, lib, lib64 and sbin into symbolic links to the same directory under usr. This fixes the problem where some programs/libraries exist under / on FreeBSD and /usr on Linux or vice versa and then depending on the order of search paths Linux programs may run/load FreeBSD programs/libraries and fail. - Turn usr/share/icons into a symbolic link to LOCALBASE/share/icons so Linux programs can find desktop theme icons. This eliminates the need for x11-themes/linux*-hicolor-icon-theme. - Rename pkg-plist.x86_64 to pkg-plist.amd64. - Regenerate all pkg-plist files. - Add @preexec to linux_base pkg-plist that moves existing files in bin, lib, lib64, sbin and icons to the new destination before the directories are turned into symbolic links. - Remove several empty directories from linux_base ports. - Sweep over all linux ports: use consistent style, remove old CONFLICTS, remove unused pkg-descr files, add NLS option,... - Remove old linux arts, esound and openssl-compat ports. --- print/linux-c6-cups-libs/Makefile | 9 +++++---- print/linux-c6-cups-libs/distinfo | 7 +++++++ print/linux-c6-cups-libs/distinfo.i386 | 5 ----- print/linux-c6-cups-libs/distinfo.x86_64 | 7 ------- print/linux-c6-cups-libs/pkg-plist.amd64 | 12 ++++++++++++ print/linux-c6-cups-libs/pkg-plist.x86_64 | 12 ------------ print/linux-c7-cups-libs/Makefile | 14 ++++++++------ print/linux-c7-cups-libs/distinfo | 7 +++++++ print/linux-c7-cups-libs/distinfo.x86_64 | 7 ------- print/linux-c7-cups-libs/pkg-plist.amd64 | 11 +++++++++++ print/linux-c7-cups-libs/pkg-plist.x86_64 | 10 ---------- print/linux-c7-harfbuzz/Makefile | 3 +-- print/linux-c7-harfbuzz/distinfo | 7 +++++++ print/linux-c7-harfbuzz/distinfo.x86_64 | 7 ------- print/linux-c7-harfbuzz/pkg-plist.amd64 | 8 ++++++++ print/linux-c7-harfbuzz/pkg-plist.x86_64 | 8 -------- 16 files changed, 66 insertions(+), 68 deletions(-) create mode 100644 print/linux-c6-cups-libs/distinfo delete mode 100644 print/linux-c6-cups-libs/distinfo.i386 delete mode 100644 print/linux-c6-cups-libs/distinfo.x86_64 create mode 100644 print/linux-c6-cups-libs/pkg-plist.amd64 delete mode 100644 print/linux-c6-cups-libs/pkg-plist.x86_64 create mode 100644 print/linux-c7-cups-libs/distinfo delete mode 100644 print/linux-c7-cups-libs/distinfo.x86_64 create mode 100644 print/linux-c7-cups-libs/pkg-plist.amd64 delete mode 100644 print/linux-c7-cups-libs/pkg-plist.x86_64 create mode 100644 print/linux-c7-harfbuzz/distinfo delete mode 100644 print/linux-c7-harfbuzz/distinfo.x86_64 create mode 100644 print/linux-c7-harfbuzz/pkg-plist.amd64 delete mode 100644 print/linux-c7-harfbuzz/pkg-plist.x86_64 (limited to 'print') 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 # $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 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.amd64 b/print/linux-c6-cups-libs/pkg-plist.amd64 new file mode 100644 index 000000000000..83998d7a3b3a --- /dev/null +++ b/print/linux-c6-cups-libs/pkg-plist.amd64 @@ -0,0 +1,12 @@ +usr/lib/libcups.so.2 +usr/lib/libcupscgi.so.1 +usr/lib/libcupsdriver.so.1 +usr/lib/libcupsimage.so.2 +usr/lib/libcupsmime.so.1 +usr/lib/libcupsppdc.so.1 +usr/lib64/libcups.so.2 +usr/lib64/libcupscgi.so.1 +usr/lib64/libcupsdriver.so.1 +usr/lib64/libcupsimage.so.2 +usr/lib64/libcupsmime.so.1 +usr/lib64/libcupsppdc.so.1 diff --git a/print/linux-c6-cups-libs/pkg-plist.x86_64 b/print/linux-c6-cups-libs/pkg-plist.x86_64 deleted file mode 100644 index 83998d7a3b3a..000000000000 --- a/print/linux-c6-cups-libs/pkg-plist.x86_64 +++ /dev/null @@ -1,12 +0,0 @@ -usr/lib/libcups.so.2 -usr/lib/libcupscgi.so.1 -usr/lib/libcupsdriver.so.1 -usr/lib/libcupsimage.so.2 -usr/lib/libcupsmime.so.1 -usr/lib/libcupsppdc.so.1 -usr/lib64/libcups.so.2 -usr/lib64/libcupscgi.so.1 -usr/lib64/libcupsdriver.so.1 -usr/lib64/libcupsimage.so.2 -usr/lib64/libcupsmime.so.1 -usr/lib64/libcupsppdc.so.1 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 # $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 diff --git a/print/linux-c7-cups-libs/distinfo b/print/linux-c7-cups-libs/distinfo new file mode 100644 index 000000000000..f0d36ccdead3 --- /dev/null +++ b/print/linux-c7-cups-libs/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1482093358 +SHA256 (centos/cups-libs-1.6.3-26.el7.i686.rpm) = dea3266d201310ac8e96714e0e214f898fda28675eea3993bd86c99c133d1364 +SIZE (centos/cups-libs-1.6.3-26.el7.i686.rpm) = 365244 +SHA256 (centos/cups-libs-1.6.3-26.el7.x86_64.rpm) = 7913b38d24eaa95d281cab56a128e409141980d0aad64b4bcb6ba6d5e673b672 +SIZE (centos/cups-libs-1.6.3-26.el7.x86_64.rpm) = 364052 +SHA256 (centos/cups-1.6.3-26.el7.src.rpm) = fdc70cc54ddde088779c4f5fb22eff7a535ddcbad9ae10775588ea36731efd22 +SIZE (centos/cups-1.6.3-26.el7.src.rpm) = 8475367 diff --git a/print/linux-c7-cups-libs/distinfo.x86_64 b/print/linux-c7-cups-libs/distinfo.x86_64 deleted file mode 100644 index f0d36ccdead3..000000000000 --- a/print/linux-c7-cups-libs/distinfo.x86_64 +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1482093358 -SHA256 (centos/cups-libs-1.6.3-26.el7.i686.rpm) = dea3266d201310ac8e96714e0e214f898fda28675eea3993bd86c99c133d1364 -SIZE (centos/cups-libs-1.6.3-26.el7.i686.rpm) = 365244 -SHA256 (centos/cups-libs-1.6.3-26.el7.x86_64.rpm) = 7913b38d24eaa95d281cab56a128e409141980d0aad64b4bcb6ba6d5e673b672 -SIZE (centos/cups-libs-1.6.3-26.el7.x86_64.rpm) = 364052 -SHA256 (centos/cups-1.6.3-26.el7.src.rpm) = fdc70cc54ddde088779c4f5fb22eff7a535ddcbad9ae10775588ea36731efd22 -SIZE (centos/cups-1.6.3-26.el7.src.rpm) = 8475367 diff --git a/print/linux-c7-cups-libs/pkg-plist.amd64 b/print/linux-c7-cups-libs/pkg-plist.amd64 new file mode 100644 index 000000000000..6891d155a7a7 --- /dev/null +++ b/print/linux-c7-cups-libs/pkg-plist.amd64 @@ -0,0 +1,11 @@ +usr/lib/libcups.so.2 +usr/lib/libcupscgi.so.1 +usr/lib/libcupsimage.so.2 +usr/lib/libcupsmime.so.1 +usr/lib/libcupsppdc.so.1 +usr/lib64/libcups.so.2 +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-cups-libs/pkg-plist.x86_64 b/print/linux-c7-cups-libs/pkg-plist.x86_64 deleted file mode 100644 index a59036feaf8c..000000000000 --- a/print/linux-c7-cups-libs/pkg-plist.x86_64 +++ /dev/null @@ -1,10 +0,0 @@ -usr/lib/libcups.so.2 -usr/lib/libcupscgi.so.1 -usr/lib/libcupsimage.so.2 -usr/lib/libcupsmime.so.1 -usr/lib/libcupsppdc.so.1 -usr/lib64/libcups.so.2 -usr/lib64/libcupscgi.so.1 -usr/lib64/libcupsimage.so.2 -usr/lib64/libcupsmime.so.1 -usr/lib64/libcupsppdc.so.1 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 diff --git a/print/linux-c7-harfbuzz/distinfo b/print/linux-c7-harfbuzz/distinfo new file mode 100644 index 000000000000..997a7f075086 --- /dev/null +++ b/print/linux-c7-harfbuzz/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1482091524 +SHA256 (centos/harfbuzz-0.9.36-1.el7.i686.rpm) = 2bb37a0c0b8b0156c5074b7c3e96e93c645b0203e4a5d030931ac331faf121f9 +SIZE (centos/harfbuzz-0.9.36-1.el7.i686.rpm) = 159380 +SHA256 (centos/harfbuzz-0.9.36-1.el7.x86_64.rpm) = 8e44b44215df3ca01b66295249d068a1722460764c24456ef97340e2539e9a67 +SIZE (centos/harfbuzz-0.9.36-1.el7.x86_64.rpm) = 160036 +SHA256 (centos/harfbuzz-0.9.36-1.el7.src.rpm) = e2f9caad7fed5451c19271b904cf597b210676120a63246b1094060ca9aa6873 +SIZE (centos/harfbuzz-0.9.36-1.el7.src.rpm) = 1168365 diff --git a/print/linux-c7-harfbuzz/distinfo.x86_64 b/print/linux-c7-harfbuzz/distinfo.x86_64 deleted file mode 100644 index 997a7f075086..000000000000 --- a/print/linux-c7-harfbuzz/distinfo.x86_64 +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1482091524 -SHA256 (centos/harfbuzz-0.9.36-1.el7.i686.rpm) = 2bb37a0c0b8b0156c5074b7c3e96e93c645b0203e4a5d030931ac331faf121f9 -SIZE (centos/harfbuzz-0.9.36-1.el7.i686.rpm) = 159380 -SHA256 (centos/harfbuzz-0.9.36-1.el7.x86_64.rpm) = 8e44b44215df3ca01b66295249d068a1722460764c24456ef97340e2539e9a67 -SIZE (centos/harfbuzz-0.9.36-1.el7.x86_64.rpm) = 160036 -SHA256 (centos/harfbuzz-0.9.36-1.el7.src.rpm) = e2f9caad7fed5451c19271b904cf597b210676120a63246b1094060ca9aa6873 -SIZE (centos/harfbuzz-0.9.36-1.el7.src.rpm) = 1168365 diff --git a/print/linux-c7-harfbuzz/pkg-plist.amd64 b/print/linux-c7-harfbuzz/pkg-plist.amd64 new file mode 100644 index 000000000000..b6a58e82f974 --- /dev/null +++ b/print/linux-c7-harfbuzz/pkg-plist.amd64 @@ -0,0 +1,8 @@ +usr/lib/libharfbuzz.so.0 +usr/lib/libharfbuzz.so.0.936.0 +usr/lib64/libharfbuzz.so.0 +usr/lib64/libharfbuzz.so.0.936.0 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README diff --git a/print/linux-c7-harfbuzz/pkg-plist.x86_64 b/print/linux-c7-harfbuzz/pkg-plist.x86_64 deleted file mode 100644 index b6a58e82f974..000000000000 --- a/print/linux-c7-harfbuzz/pkg-plist.x86_64 +++ /dev/null @@ -1,8 +0,0 @@ -usr/lib/libharfbuzz.so.0 -usr/lib/libharfbuzz.so.0.936.0 -usr/lib64/libharfbuzz.so.0 -usr/lib64/libharfbuzz.so.0.936.0 -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -- cgit