1 |
vostorga 09/08/25 18:40:36 |
2 |
|
3 |
Modified: biew-570-makefile.patch |
4 |
Added: biew-570-configure.patch |
5 |
Removed: biew-570-configure-gpm.patch |
6 |
Log: |
7 |
Respecting CC, LD, AR, RANLIB variables, bug #243972, Fixing pre-stripped files, bug #255833 , Fixing man page location bug #255835 , Respecting CFLAGS and LDFLAGS , Now builds in ~amd64 , thanks to Diego E. |
8 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 dev-util/biew/files/biew-570-makefile.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/biew/files/biew-570-makefile.patch?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/biew/files/biew-570-makefile.patch?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/biew/files/biew-570-makefile.patch?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: biew-570-makefile.patch |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/biew/files/biew-570-makefile.patch,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- biew-570-makefile.patch 26 Dec 2008 08:07:25 -0000 1.1 |
24 |
+++ biew-570-makefile.patch 25 Aug 2009 18:40:36 -0000 1.2 |
25 |
@@ -1,6 +1,9 @@ |
26 |
---- makefile.orig 2008-12-21 12:33:37.001959467 +0100 |
27 |
-+++ makefile 2008-12-21 12:38:56.925669582 +0100 |
28 |
-@@ -271,16 +271,16 @@ |
29 |
+diff -NrU5 biew-570.original/makefile biew-570/makefile |
30 |
+--- biew-570.original/makefile 2009-08-25 18:45:37.000000000 -0600 |
31 |
++++ biew-570/makefile 2009-08-25 18:47:01.000000000 -0600 |
32 |
+@@ -269,20 +269,20 @@ |
33 |
+ @echo "*** installation. Please download 'fileutils' from ftp://ftp.gnu.org and" |
34 |
+ @echo "*** install them to have possibility perform autiomatic installation" |
35 |
@echo "*** of this project" |
36 |
@exit 1 |
37 |
endif |
38 |
@@ -15,7 +18,7 @@ |
39 |
- $(INSTALL) -D -c -m 644 bin_rc/xlt/russian/*.xlt $(DATADIR)/xlt/russian |
40 |
- $(INSTALL) -D -c -m 644 bin_rc/xlt/*.xlt bin_rc/xlt/readme $(DATADIR)/xlt |
41 |
+ $(INSTALL) -D -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET) |
42 |
-+ $(INSTALL) -D -c -m 644 doc/biew.1 $(DESTDIR)$(PREFIX)/man/man1/biew.1 |
43 |
++ $(INSTALL) -D -c -m 644 doc/biew.1 $(DESTDIR)$(DATADIR)/man/man1/biew.1 |
44 |
+ $(INSTALL) -D -c -m 644 bin_rc/biew.hlp $(DESTDIR)$(DATADIR)/biew.hlp |
45 |
+ mkdir --parents $(DESTDIR)$(DATADIR)/skn |
46 |
+ $(INSTALL) -D -c -m 644 bin_rc/skn/*.skn $(DESTDIR)$(DATADIR)/skn |
47 |
@@ -27,3 +30,5 @@ |
48 |
uninstall: |
49 |
$(RM) $(PREFIX)/bin/$(TARGET) |
50 |
$(RM) $(DATADIR)/skn/* |
51 |
+ rmdir -p --ignore-fail-on-non-empty $(DATADIR)/skn |
52 |
+ $(RM) $(DATADIR)/syntax/* |
53 |
|
54 |
|
55 |
|
56 |
1.1 dev-util/biew/files/biew-570-configure.patch |
57 |
|
58 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/biew/files/biew-570-configure.patch?rev=1.1&view=markup |
59 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/biew/files/biew-570-configure.patch?rev=1.1&content-type=text/plain |
60 |
|
61 |
Index: biew-570-configure.patch |
62 |
=================================================================== |
63 |
diff -NrU5 biew-570.original/configure biew-570/configure |
64 |
--- biew-570.original/configure 2009-08-25 16:18:03.000000000 -0600 |
65 |
+++ biew-570/configure 2009-08-25 16:54:17.000000000 -0600 |
66 |
@@ -467,21 +467,24 @@ |
67 |
qnxnto) |
68 |
_cdefos="-D__QNX6__ -D__UNIX__ -D__OS_NAME__='\"QNX6\"' -D__OS__=\"qnxnto\" -U__QNX__ -U__NTO__ -D_VT100_ -DHAVE_TERMINAL_OUT=1 -D__DISABLE_MMF -DPREFIX=\"$_prefix\" $_cdefos" |
69 |
_oslibs="-lncurses $_oslibs" |
70 |
;; |
71 |
linux) |
72 |
- if test $_ld=gcc ; then |
73 |
+ if test $_ld = gcc -o $_ld = x86_64-pc-linux-gnu-gcc -o $_ld = i686-pc-linux-gnu-gcc; then |
74 |
_osldef="-m32 $_osldef" |
75 |
fi |
76 |
_cdefos="-D__LINUX__ -D__UNIX__ -D__OS_NAME__='\"Linux\"' -D__OS__=\"linux\" -Ulinux -D_VT100_ -DHAVE_TERMINAL_OUT=1 -DPREFIX=\"$_prefix\" $_cdefos" |
77 |
echocheck "gpm.h" |
78 |
cat > $TMPC << EOF |
79 |
#include <gpm.h> |
80 |
int main(void) {return 0;} |
81 |
EOF |
82 |
- _gpm=no |
83 |
- cc_check -lgpm && _gpm=yes |
84 |
+ # _gpm may be forced from command line |
85 |
+ if test -z "$_gpm" ; then |
86 |
+ _gpm=no |
87 |
+ cc_check -lgpm && _gpm=yes |
88 |
+ fi |
89 |
if test "$_gpm" = yes ; then |
90 |
_cdefos="-DHAVE_MOUSE $_cdefos" |
91 |
_oslibs="-lgpm $_oslibs" |
92 |
fi |
93 |
echores "$_gpm" |