cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to SHARED_ONLY; it's unused nowadays.

Browse Source 
Not touching make-plist too much because espie@ already has local changes in that file.

ok espie@
This commit is contained in:
ajacoutot 2016-06-22 10:13:17 +00:00
parent aa07160cdb
commit 19618db5d9
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infrastructure/bin/make-plist
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: make-plist,v 1.9 2015/07/19 17:31:44 naddy Exp $
# $OpenBSD: make-plist,v 1.10 2016/06/22 10:13:17 ajacoutot Exp $
# Copyright (c) 2004-2008 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -128,7 +128,7 @@ my %plistname;
my %mtree;
my @subs;
my $baseprefix=$ENV{PREFIX};
my $shared_only;
my $shared_only = 1;
my $make = $ENV{MAKE};
my $portsdir = $ENV{PORTSDIR};
my $portsdir_path = $ENV{PORTSDIR_PATH};

9
infrastructure/man/man1/make-plist.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: make-plist.1,v 1.5 2015/09/10 20:11:27 schwarze Exp $
.\" $OpenBSD: make-plist.1,v 1.6 2016/06/22 10:13:17 ajacoutot Exp $
.\"
.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
.\"
@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: September 10 2015 $
.Dd $Mdocdate: June 22 2016 $
.Dt MAKE-PLIST 1
.Os
.Sh NAME
@ -98,11 +98,6 @@ will complain if it doesn't find the corresponding
assignment.
.Pp
.Nm
will separate shared files fragments unless
.Ev SHARED_ONLY
is set.
.Pp
.Nm
also has limited understanding of existing fragments, and will try to
dispatch entries to the most likely fragment.
.Pp

3
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1317 2016/05/17 13:38:25 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1318 2016/06/22 10:13:17 ajacoutot Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -2364,7 +2364,6 @@ _internal-plist _internal-update-plist: _internal-fake ${_FAKESUDO_CHECK_COOKIE}
PORTSDIR_PATH=${PORTSDIR_PATH} \
FLAVORS='${FLAVORS}' MULTI_PACKAGES='${MULTI_PACKAGES}' \
OKAY_FILES='${_FAKE_COOKIE} ${_INSTALL_PRE_COOKIE} ${WRKINST}/.saved_libs' \
SHARED_ONLY=Yes \
OWNER=$$(id -u) \
GROUP=$$(id -g) \
${_FAKESUDO} ${_PERLSCRIPT}/make-plist \