diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2017-01-31 16:54:21 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2017-01-31 16:54:21 +0000 |
commit | 6140d3c6aada863a40f9075019eb0f48789cd48f (patch) | |
tree | 31bde26cde7c64937193d64587b12c96997aad8c /security/linux-c7-libssh2 | |
parent | 0177884e904ff5abe1705efd562133d568e572c4 (diff) | |
download | ports-6140d3c6aada863a40f9075019eb0f48789cd48f.tar.gz ports-6140d3c6aada863a40f9075019eb0f48789cd48f.zip |
- 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.
Notes
Notes:
svn path=/head/; revision=432937
Diffstat (limited to 'security/linux-c7-libssh2')
-rw-r--r-- | security/linux-c7-libssh2/Makefile | 8 | ||||
-rw-r--r-- | security/linux-c7-libssh2/distinfo (renamed from security/linux-c7-libssh2/distinfo.x86_64) | 0 | ||||
-rw-r--r-- | security/linux-c7-libssh2/pkg-plist.amd64 | 9 | ||||
-rw-r--r-- | security/linux-c7-libssh2/pkg-plist.x86_64 | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/security/linux-c7-libssh2/Makefile b/security/linux-c7-libssh2/Makefile index d17c8c571b6b..d838dc2a0f5d 100644 --- a/security/linux-c7-libssh2/Makefile +++ b/security/linux-c7-libssh2/Makefile @@ -3,21 +3,19 @@ PORTNAME= libssh2 PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security linux MAINTAINER= emulation@FreeBSD.org COMMENT= Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER}) -CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr RPMVERSION= 10.el7_2.1 USES= linux:c7 USE_LDCONFIG= yes USE_LINUX= openssl USE_LINUX_RPM= yes -PORTDOCS= AUTHORS COPYING ChangeLog NEWS README -DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr - .include <bsd.port.mk> diff --git a/security/linux-c7-libssh2/distinfo.x86_64 b/security/linux-c7-libssh2/distinfo index 0ba22e2d0edd..0ba22e2d0edd 100644 --- a/security/linux-c7-libssh2/distinfo.x86_64 +++ b/security/linux-c7-libssh2/distinfo diff --git a/security/linux-c7-libssh2/pkg-plist.amd64 b/security/linux-c7-libssh2/pkg-plist.amd64 new file mode 100644 index 000000000000..64a98107e465 --- /dev/null +++ b/security/linux-c7-libssh2/pkg-plist.amd64 @@ -0,0 +1,9 @@ +usr/lib/libssh2.so.1 +usr/lib/libssh2.so.1.0.1 +usr/lib64/libssh2.so.1 +usr/lib64/libssh2.so.1.0.1 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README diff --git a/security/linux-c7-libssh2/pkg-plist.x86_64 b/security/linux-c7-libssh2/pkg-plist.x86_64 deleted file mode 100644 index 15c8cac04181..000000000000 --- a/security/linux-c7-libssh2/pkg-plist.x86_64 +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/libssh2.so.1 -usr/lib/libssh2.so.1.0.1 -usr/lib64/libssh2.so.1 -usr/lib64/libssh2.so.1.0.1 |