From 6140d3c6aada863a40f9075019eb0f48789cd48f Mon Sep 17 00:00:00 2001 From: Tijl Coosemans 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. --- devel/linux-c7-libsigc++20/Makefile | 6 ++---- devel/linux-c7-libsigc++20/distinfo | 7 +++++++ devel/linux-c7-libsigc++20/distinfo.x86_64 | 7 ------- devel/linux-c7-libsigc++20/pkg-plist.amd64 | 10 ++++++++++ devel/linux-c7-libsigc++20/pkg-plist.x86_64 | 4 ---- 5 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 devel/linux-c7-libsigc++20/distinfo delete mode 100644 devel/linux-c7-libsigc++20/distinfo.x86_64 create mode 100644 devel/linux-c7-libsigc++20/pkg-plist.amd64 delete mode 100644 devel/linux-c7-libsigc++20/pkg-plist.x86_64 (limited to 'devel/linux-c7-libsigc++20') diff --git a/devel/linux-c7-libsigc++20/Makefile b/devel/linux-c7-libsigc++20/Makefile index 4412bcc21cee..b287c927a1e0 100644 --- a/devel/linux-c7-libsigc++20/Makefile +++ b/devel/linux-c7-libsigc++20/Makefile @@ -7,16 +7,14 @@ PORTREVISION= 1 CATEGORIES= devel linux MAINTAINER= emulation@FreeBSD.org -COMMENT= Callback Framework for C++(Linux CentOS ${LINUX_DIST_VER}) +COMMENT= Callback Framework for C++ (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr RPMVERSION= 4.el7 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes -PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO -DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr - .include diff --git a/devel/linux-c7-libsigc++20/distinfo b/devel/linux-c7-libsigc++20/distinfo new file mode 100644 index 000000000000..31b0c139d211 --- /dev/null +++ b/devel/linux-c7-libsigc++20/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1482094165 +SHA256 (centos/libsigc++20-2.3.1-4.el7.i686.rpm) = 3136ed6109d2dfe5f2f3c10e83586f3f2999e7083546fefec800b5c8e667cdd8 +SIZE (centos/libsigc++20-2.3.1-4.el7.i686.rpm) = 61024 +SHA256 (centos/libsigc++20-2.3.1-4.el7.x86_64.rpm) = 14ca5f0a5a4bcefa87d4538c693fd79761da5d80b8c402800328b644cab5190d +SIZE (centos/libsigc++20-2.3.1-4.el7.x86_64.rpm) = 60644 +SHA256 (centos/libsigc++20-2.3.1-4.el7.src.rpm) = ca13e5a97d402ebf94522e39f87d878bf655aaa65dc744397988447eea055d14 +SIZE (centos/libsigc++20-2.3.1-4.el7.src.rpm) = 3471231 diff --git a/devel/linux-c7-libsigc++20/distinfo.x86_64 b/devel/linux-c7-libsigc++20/distinfo.x86_64 deleted file mode 100644 index 31b0c139d211..000000000000 --- a/devel/linux-c7-libsigc++20/distinfo.x86_64 +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1482094165 -SHA256 (centos/libsigc++20-2.3.1-4.el7.i686.rpm) = 3136ed6109d2dfe5f2f3c10e83586f3f2999e7083546fefec800b5c8e667cdd8 -SIZE (centos/libsigc++20-2.3.1-4.el7.i686.rpm) = 61024 -SHA256 (centos/libsigc++20-2.3.1-4.el7.x86_64.rpm) = 14ca5f0a5a4bcefa87d4538c693fd79761da5d80b8c402800328b644cab5190d -SIZE (centos/libsigc++20-2.3.1-4.el7.x86_64.rpm) = 60644 -SHA256 (centos/libsigc++20-2.3.1-4.el7.src.rpm) = ca13e5a97d402ebf94522e39f87d878bf655aaa65dc744397988447eea055d14 -SIZE (centos/libsigc++20-2.3.1-4.el7.src.rpm) = 3471231 diff --git a/devel/linux-c7-libsigc++20/pkg-plist.amd64 b/devel/linux-c7-libsigc++20/pkg-plist.amd64 new file mode 100644 index 000000000000..c1a44bdb4a1d --- /dev/null +++ b/devel/linux-c7-libsigc++20/pkg-plist.amd64 @@ -0,0 +1,10 @@ +usr/lib/libsigc-2.0.so.0 +usr/lib/libsigc-2.0.so.0.0.0 +usr/lib64/libsigc-2.0.so.0 +usr/lib64/libsigc-2.0.so.0.0.0 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO diff --git a/devel/linux-c7-libsigc++20/pkg-plist.x86_64 b/devel/linux-c7-libsigc++20/pkg-plist.x86_64 deleted file mode 100644 index 916de20fe64b..000000000000 --- a/devel/linux-c7-libsigc++20/pkg-plist.x86_64 +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/libsigc-2.0.so.0 -usr/lib/libsigc-2.0.so.0.0.0 -usr/lib64/libsigc-2.0.so.0 -usr/lib64/libsigc-2.0.so.0.0.0 -- cgit v1.2.3