diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-util/makepp/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-util/makepp/files')
-rw-r--r-- | dev-util/makepp/files/makepp-1.18-install.patch | 69 | ||||
-rw-r--r-- | dev-util/makepp/files/makepp-1.40.1a-install.patch | 12 | ||||
-rw-r--r-- | dev-util/makepp/files/makepp-2.0-destdir.patch | 13 | ||||
-rw-r--r-- | dev-util/makepp/files/makepp-2.0.98.5-perl526.patch | 24 |
4 files changed, 0 insertions, 118 deletions
diff --git a/dev-util/makepp/files/makepp-1.18-install.patch b/dev-util/makepp/files/makepp-1.18-install.patch deleted file mode 100644 index 7d90e2166223..000000000000 --- a/dev-util/makepp/files/makepp-1.18-install.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- install.pl.orig 2003-02-18 13:15:15.000000000 -0800 -+++ install.pl 2003-02-18 13:49:10.000000000 -0800 -@@ -31,9 +31,24 @@ - # - # Now figure out where everything goes: - # --$prefix = "/usr/local"; -+$prefix = shift(@ARGV) || -+ read_with_prompt( " -+You can specify a prefix directory that will simplify defaults for -+further questions. -+ -+What should be the prefix directory [$prefix]? ") || -+ "/usr/local"; -+ -+$inst_prefix = shift(@ARGV) || -+ read_with_prompt( " -+You can specify an install prefix that is prefixed to the runtime -+prefix for the install phase only. This is useful when installing -+into staging directories for packaging systems. - --$bindir = shift(@_) || -+What should the install prefix be []? ") || -+ ""; -+ -+$bindir = shift(@ARGV) || - read_with_prompt(" - Makepp needs to know where you want to install it and its data files. - makepp is written in perl, but there is no particular reason to install -@@ -43,10 +58,7 @@ - Where should the makepp executable be installed [$prefix/bin]? ") || - "$prefix/bin"; - --$bindir =~ m@(.*)/bin@ and $prefix = $1; -- # See if a prefix was specified. -- --$datadir = shift @_ || read_with_prompt(" -+$datadir = shift @ARGV || read_with_prompt(" - Makepp has a number of library files that it needs to install somewhere. Some - of these are perl modules, but they can't be used by other perl programs, so - there's no point in installing them in the perl modules hierarchy; they are -@@ -55,14 +67,24 @@ - Where should the library files be installed [$prefix/share/makepp]? ") || - "$prefix/share/makepp"; - --$htmldir = shift @_ || read_with_prompt(" -+$htmldir = shift @ARGV || read_with_prompt(" - Where should the HTML documentation be installed? - Enter \"none\" if you do not want any documentation installed. - HTML documentation directory [$prefix/share/makepp/html]: ") || - "$prefix/share/makepp/html"; - --substitute_file("makepp", $bindir, 0755); --substitute_file("recursive_makepp", $datadir, 0644); -+substitute_file("makepp", "$inst_prefix/$bindir", 0755); -+substitute_file("recursive_makepp", "$inst_prefix/$datadir", 0644); -+ -+if( $inst_prefix ) { -+ $bindir = join( '/', $inst_prefix, $bindir ); -+ $datadir = join( '/', $inst_prefix, $datadir ); -+ $htmldir = join( '/', $inst_prefix, $htmldir ); -+} -+ -+print STDERR "bindir now $bindir\n"; -+print STDERR "datadir now $datadir\n"; -+print STDERR "htmldir now $htmldir\n"; - - make_dir("$datadir/Signature"); - foreach $module (qw(FileInfo FileInfo_makepp MakeEvent Glob Makefile Makesubs Rule diff --git a/dev-util/makepp/files/makepp-1.40.1a-install.patch b/dev-util/makepp/files/makepp-1.40.1a-install.patch deleted file mode 100644 index b1ee013add3e..000000000000 --- a/dev-util/makepp/files/makepp-1.40.1a-install.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- makepp-1.40/config.pl -+++ makepp-1.40/config.pl -@@ -34,7 +34,7 @@ - cd makepp-$(VERSION) && make test # Make sure it all runs. - rm -rf makepp-$(VERSION) - --install: all -- $(PERL) install.pl $(BINDIR) $(DATADIR) $(MANDIR) $(HTMLDIR) $(FINDBIN) -+install: -+ $(PERL) install.pl $(DESTDIR)$(BINDIR) $(DESTDIR)$(DATADIR) $(DESTDIR)$(MANDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(FINDBIN) - - .PHONY: all distribution install test diff --git a/dev-util/makepp/files/makepp-2.0-destdir.patch b/dev-util/makepp/files/makepp-2.0-destdir.patch deleted file mode 100644 index 7d7950b2dff4..000000000000 --- a/dev-util/makepp/files/makepp-2.0-destdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -don't break install paths when DESTDIR is set - ---- a/install.pl -+++ b/install.pl -@@ -131,7 +131,7 @@ - - if( $destdir ) { - for( $bindir, $datadir, $mandir, $htmldir_val ) { -- s/$prefix/$destdir/o if defined; -+ s/^/$destdir/o if defined; - } - } - diff --git a/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch b/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch deleted file mode 100644 index b5ed875b4dcf..000000000000 --- a/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN makepp-2.0.98.5.orig/config.pl makepp-2.0.98.5/config.pl ---- makepp-2.0.98.5.orig/config.pl 2017-07-08 21:35:18.257017457 +0200 -+++ makepp-2.0.98.5/config.pl 2017-07-08 21:39:06.087026936 +0200 -@@ -19,6 +19,8 @@ - you on?), get the latest from www.perl.org and install it. - EOS - -+use lib q[.]; -+ - BEGIN { eval { require Mpp::Utils } or warn <<EOS and exit 1 } # avoid BEGIN/die diagnostic - Please call this script in the directory where you unpacked it! - EOS -diff -ruN makepp-2.0.98.5.orig/install.pl makepp-2.0.98.5/install.pl ---- makepp-2.0.98.5.orig/install.pl 2013-07-05 23:02:38.000000000 +0200 -+++ makepp-2.0.98.5/install.pl 2017-07-08 21:38:48.441026202 +0200 -@@ -13,6 +13,8 @@ - # - BEGIN { eval { require 5.008 } or exec $^X, 'config.pl' } # Dies with nice message. - -+use lib q[.]; -+ - BEGIN { eval { require Mpp::Text } or warn <<EOS and exit 1 } # avoid BEGIN/die diagnostic - Please call this script in the directory where you unpacked it! - EOS |