1 |
commit: b833f1a0939de985479d6548b9133403b35f4ac2 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 23 20:53:29 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 23 20:53:29 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b833f1a0 |
7 |
|
8 |
app-text/psutils: fix perl shebangs |
9 |
|
10 |
Closes: https://bugs.gentoo.org/853922 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
app-text/psutils/files/psutils-1.17-makefile.patch | 152 ++++++++++++++++++++- |
14 |
...utils-1.17-r4.ebuild => psutils-1.17-r5.ebuild} | 0 |
15 |
2 files changed, 151 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/app-text/psutils/files/psutils-1.17-makefile.patch b/app-text/psutils/files/psutils-1.17-makefile.patch |
18 |
index 241ea284c66e..8e8f03208f78 100644 |
19 |
--- a/app-text/psutils/files/psutils-1.17-makefile.patch |
20 |
+++ b/app-text/psutils/files/psutils-1.17-makefile.patch |
21 |
@@ -10,7 +10,7 @@ |
22 |
-INCLUDEDIR = /usr/local/share/psutils |
23 |
-PERL = /usr/local/bin/perl |
24 |
+INCLUDEDIR = $(DESTDIR)$(EPREFIX)/usr/share/psutils |
25 |
-+PERL = perl |
26 |
++PERL = "/usr/bin/env perl" |
27 |
|
28 |
BINMODE = 0755 |
29 |
MANMODE = 0644 |
30 |
@@ -58,3 +58,153 @@ |
31 |
|
32 |
pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c |
33 |
|
34 |
+@@ -99,116 +92,116 @@ |
35 |
+ cp $? $@ |
36 |
+ |
37 |
+ psmerge: psmerge.pl |
38 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
39 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
40 |
+ $(CHMOD) $(BINMODE) $@ |
41 |
+ |
42 |
+ fixfmps: fixfmps.pl |
43 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
44 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
45 |
+ $(CHMOD) $(BINMODE) $@ |
46 |
+ |
47 |
+ fixmacps: fixmacps.pl |
48 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ |
49 |
++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ |
50 |
+ $(CHMOD) $(BINMODE) $@ |
51 |
+ |
52 |
+ fixpsditps: fixpsditps.pl |
53 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
54 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
55 |
+ $(CHMOD) $(BINMODE) $@ |
56 |
+ |
57 |
+ fixpspps: fixpspps.pl |
58 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
59 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
60 |
+ $(CHMOD) $(BINMODE) $@ |
61 |
+ |
62 |
+ fixscribeps: fixscribeps.pl |
63 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
64 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
65 |
+ $(CHMOD) $(BINMODE) $@ |
66 |
+ |
67 |
+ fixtpps: fixtpps.pl |
68 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
69 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
70 |
+ $(CHMOD) $(BINMODE) $@ |
71 |
+ |
72 |
+ fixwfwps: fixwfwps.pl |
73 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
74 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
75 |
+ $(CHMOD) $(BINMODE) $@ |
76 |
+ |
77 |
+ fixwpps: fixwpps.pl |
78 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
79 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
80 |
+ $(CHMOD) $(BINMODE) $@ |
81 |
+ |
82 |
+ fixwwps: fixwwps.pl |
83 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
84 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
85 |
+ $(CHMOD) $(BINMODE) $@ |
86 |
+ |
87 |
+ fixdlsrps: fixdlsrps.pl |
88 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
89 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
90 |
+ $(CHMOD) $(BINMODE) $@ |
91 |
+ |
92 |
+ extractres: extractres.pl |
93 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ |
94 |
++ perl maketext OS=$(OS) PERL=$(PERL) $? > $@ |
95 |
+ $(CHMOD) $(BINMODE) $@ |
96 |
+ |
97 |
+ includeres: includeres.pl |
98 |
+- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ |
99 |
++ perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ |
100 |
+ $(CHMOD) $(BINMODE) $@ |
101 |
+ |
102 |
+ epsffit.$(MANEXT): epsffit.man |
103 |
+- $(PERL) maketext MAN="$(MANPAGES)" $? > $@ |
104 |
++ perl maketext MAN="$(MANPAGES)" $? > $@ |
105 |
+ |
106 |
+ psnup.$(MANEXT): psnup.man |
107 |
+- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ |
108 |
++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ |
109 |
+ |
110 |
+ psresize.$(MANEXT): psresize.man |
111 |
+- $(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ |
112 |
++ perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@ |
113 |
+ |
114 |
+ psbook.$(MANEXT): psbook.man |
115 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
116 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
117 |
+ |
118 |
+ psselect.$(MANEXT): psselect.man |
119 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
120 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
121 |
+ |
122 |
+ pstops.$(MANEXT): pstops.man |
123 |
+- $(PERL) maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@ |
124 |
++ perl maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@ |
125 |
+ |
126 |
+ psmerge.$(MANEXT): psmerge.man |
127 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
128 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
129 |
+ |
130 |
+ fixfmps.$(MANEXT): fixfmps.man |
131 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
132 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
133 |
+ |
134 |
+ fixmacps.$(MANEXT): fixmacps.man |
135 |
+- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ |
136 |
++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ |
137 |
+ |
138 |
+ fixpsditps.$(MANEXT): fixpsditps.man |
139 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
140 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
141 |
+ |
142 |
+ fixpspps.$(MANEXT): fixpspps.man |
143 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
144 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
145 |
+ |
146 |
+ fixscribeps.$(MANEXT): fixscribeps.man |
147 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
148 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
149 |
+ |
150 |
+ fixtpps.$(MANEXT): fixtpps.man |
151 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
152 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
153 |
+ |
154 |
+ fixwfwps.$(MANEXT): fixwfwps.man |
155 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
156 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
157 |
+ |
158 |
+ fixwpps.$(MANEXT): fixwpps.man |
159 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
160 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
161 |
+ |
162 |
+ fixwwps.$(MANEXT): fixwwps.man |
163 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
164 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
165 |
+ |
166 |
+ fixdlsrps.$(MANEXT): fixdlsrps.man |
167 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
168 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
169 |
+ |
170 |
+ extractres.$(MANEXT): extractres.man |
171 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
172 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
173 |
+ |
174 |
+ includeres.$(MANEXT): includeres.man |
175 |
+- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ |
176 |
++ perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ |
177 |
+ |
178 |
+ getafm.$(MANEXT): getafm.man |
179 |
+- $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ |
180 |
++ perl maketext "MAN=$(MANPAGES)" $? > $@ |
181 |
+ |
182 |
+ clean: |
183 |
+ rm -f *.o |
184 |
|
185 |
diff --git a/app-text/psutils/psutils-1.17-r4.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild |
186 |
similarity index 100% |
187 |
rename from app-text/psutils/psutils-1.17-r4.ebuild |
188 |
rename to app-text/psutils/psutils-1.17-r5.ebuild |