Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dialup/lrzsz/files: lrzsz-autotools.patch
Date: Thu, 09 Jul 2009 23:46:23
Message-Id: E1MP3Jl-00008r-Kg@stork.gentoo.org
1 mrness 09/07/09 23:46:21
2
3 Added: lrzsz-autotools.patch
4 Log:
5 Use eautoreconf (#226789).
6 (Portage version: 2.1.6.13/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 net-dialup/lrzsz/files/lrzsz-autotools.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/lrzsz/files/lrzsz-autotools.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/lrzsz/files/lrzsz-autotools.patch?rev=1.1&content-type=text/plain
13
14 Index: lrzsz-autotools.patch
15 ===================================================================
16 diff -Nru lrzsz-0.12.20.orig/acinclude.m4 lrzsz-0.12.20/acinclude.m4
17 --- lrzsz-0.12.20.orig/acinclude.m4 1998-12-27 23:08:59.000000000 +0100
18 +++ lrzsz-0.12.20/acinclude.m4 2009-07-10 01:18:40.000000000 +0200
19 @@ -13,7 +13,7 @@
20 lrzsz_cv_decl_errno=yes, lrzsz_cv_decl_errno=no)])
21 AC_MSG_RESULT($lrzsz_cv_decl_errno)
22 if test $lrzsz_cv_decl_errno = yes; then
23 - AC_DEFINE([HAVE_ERRNO_DECLARATION])
24 + AC_DEFINE([HAVE_ERRNO_DECLARATION], 1, [[HAVE_ERRNO_DECLARATION]])
25 fi
26 ])
27
28 @@ -57,7 +57,7 @@
29 ], ac_cv_type_speed_t=yes, ac_cv_type_speed_t=no)])dnl
30 AC_MSG_RESULT($ac_cv_type_speed_t)
31 if test $ac_cv_type_speed_t = no; then
32 - AC_DEFINE([speed_t],long)
33 + AC_DEFINE([speed_t],long, [speed_t])
34 fi
35 ])
36
37 @@ -69,7 +69,7 @@
38 #include <sys/select.h>],
39 [struct tm *tp;], lrzsz_cv_header_sys_select=yes, lrzsz_cv_header_sys_select=no)])
40 if test $lrzsz_cv_header_sys_select = no; then
41 - AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT)
42 + AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT, 1, [SYS_TIME_WITHOUT_SYS_SELECT])
43 fi
44 ])
45
46 diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
47 --- lrzsz-0.12.20.orig/configure.in 1998-12-30 08:50:07.000000000 +0100
48 +++ lrzsz-0.12.20/configure.in 2009-07-10 01:18:40.000000000 +0200
49 @@ -33,25 +33,25 @@
50 [if test "$enableval" = "no" ; then
51 :
52 else
53 - AC_DEFINE(ENABLE_TIMESYNC)
54 + AC_DEFINE(ENABLE_TIMESYNC, 1, [ENABLE_TIMESYNC])
55 fi],
56 - [AC_DEFINE(ENABLE_TIMESYNC)])
57 + [AC_DEFINE(ENABLE_TIMESYNC, 1, [ENABLE_TIMESYNC])])
58 AC_SUBST(ENABLE_TIMESYNC)
59 AC_ARG_ENABLE(pubdir,
60 [--enable-pubdir=/path include support for a public writeable directory],
61 [if test "$enableval" = "no" ; then
62 :
63 else
64 - AC_DEFINE_UNQUOTED(PUBDIR,"$enableval")
65 + AC_DEFINE_UNQUOTED(PUBDIR,"$enableval", [PUBDIR])
66 fi])
67 AC_ARG_ENABLE(mkdir,
68 [--disable-mkdir disable support for creating directories (lrz)],
69 [if test "$enableval" = "no" ; then
70 :
71 else
72 - AC_DEFINE(ENABLE_MKDIR)
73 + AC_DEFINE(ENABLE_MKDIR, 1, [ENABLE_MKDIR])
74 fi],
75 - [AC_DEFINE(ENABLE_MKDIR)])
76 + [AC_DEFINE(ENABLE_MKDIR, 1, [ENABLE_MKDIR])])
77 AC_ARG_ENABLE(syslog,
78 [--enable-syslog=FACILITY,{force,default,optional} include syslogsupport],
79 [
80 @@ -62,7 +62,7 @@
81 *,*)
82 level=`echo $enableval|sed -e 's/^.*,//'`
83 fac=`echo $enableval|sed -e 's/,.*$//'`
84 - AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$fac)
85 + AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$fac, [ENABLE_SYSLOG])
86 ;;
87 *)
88 lookup_facility=LOG_UUCP
89 @@ -70,16 +70,16 @@
90 ;;
91 esac
92 if test "$level" = "force" ; then
93 - AC_DEFINE(ENABLE_SYSLOG_FORCE)
94 + AC_DEFINE(ENABLE_SYSLOG_FORCE, 1, [ENABLE_SYSLOG_FORCE])
95 else
96 if test "$level" = "optional" ; then
97 :
98 else
99 - AC_DEFINE(ENABLE_SYSLOG_DEFAULT)
100 + AC_DEFINE(ENABLE_SYSLOG_DEFAULT, 1, [ENABLE_SYSLOG_DEFAULT])
101 fi
102 fi
103 fi],[
104 - AC_DEFINE(ENABLE_SYSLOG_DEFAULT)
105 + AC_DEFINE(ENABLE_SYSLOG_DEFAULT, 1, [ENABLE_SYSLOG_DEFAULT])
106 lookup_facility=LOG_UUCP
107 ])
108
109 @@ -90,8 +90,8 @@
110 dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE
111 AC_PROG_RANLIB
112 AC_ISC_POSIX
113 -AC_AIX
114 -AC_MINIX
115 +AC_USE_SYSTEM_EXTENSIONS
116 +AM_GNU_GETTEXT
117 AM_C_PROTOTYPES
118 AC_C_CONST
119 AC_C_INLINE
120 @@ -113,7 +113,7 @@
121 fi
122 case "$CFLAGS" in
123 *-Wstrict-prototypes*)
124 - AC_DEFINE(STRICT_PROTOTYPES)
125 + AC_DEFINE(STRICT_PROTOTYPES, 1, [STRICT_PROTOTYPES])
126 ;;
127 esac
128
129 @@ -131,7 +131,7 @@
130 LRZSZ_HEADERS_TERM_IO
131 AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h)
132 AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h)
133 -AC_CHECK_HEADERS(sys/select.h strings.h arpa/inet.h)
134 +AC_CHECK_HEADERS(sys/select.h strings.h locale.h arpa/inet.h)
135
136 dnl Checks for typedefs, structures, and compiler characteristics.
137 AC_TYPE_SIZE_T
138 @@ -153,7 +153,7 @@
139 dnl AC_FUNC_UTIME_NULL
140 AC_FUNC_MMAP
141 AC_FUNC_ALLOCA
142 -AC_EGREP_HEADER([struct.*utimbuf], utime.h, AC_DEFINE(HAVE_STRUCT_UTIMBUF))
143 +AC_EGREP_HEADER([struct.*utimbuf], utime.h, AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [HAVE_STRUCT_UTIMBUF]))
144
145 AC_CHECK_FUNCS(gettimeofday settimeofday)
146 AC_CHECK_FUNCS(strchr memcpy select vprintf)
147 @@ -206,10 +206,10 @@
148 lrzsz_cv_sys_ftime_ok=no,
149 lrzsz_cv_sys_ftime_ok=runtime)])
150 case $lrzsz_cv_sys_ftime_ok in
151 -yes) AC_DEFINE(HAVE_FTIME) AC_MSG_RESULT(yes) ;;
152 +yes) AC_DEFINE(HAVE_FTIME, 1, [HAVE_FTIME]) AC_MSG_RESULT(yes) ;;
153 no) AC_MSG_RESULT(no)
154 AC_MSG_WARN(ftime seems to be buggy) ;;
155 -runtime) AC_DEFINE(HAVE_FTIME)
156 +runtime) AC_DEFINE(HAVE_FTIME, 1, [HAVE_FTIME])
157 AC_MSG_RESULT(will check at run time) ;;
158 esac
159 ])
160 @@ -223,7 +223,7 @@
161 ])
162 if test $libquark_cv_var_timezone = yes ; then
163 AC_MSG_RESULT(yes)
164 - AC_DEFINE(HAVE_TIMEZONE_VAR)
165 + AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [HAVE_TIMEZONE_VAR])
166 else
167 AC_MSG_RESULT(no)
168 fi
169 @@ -245,9 +245,9 @@
170 ])
171 if test $lrzsz_cv_lookup_facility = yes ; then
172 AC_MSG_RESULT(yes)
173 - AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$lookup_facility)
174 + AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$lookup_facility, [ENABLE_SYSLOG])
175 else
176 - AC_DEFINE(ENABLE_SYSLOG,LOG_USER)
177 + AC_DEFINE(ENABLE_SYSLOG,LOG_USER, [ENABLE_SYSLOG])
178 AC_MSG_RESULT(no)
179 fi
180 fi
181 @@ -257,9 +257,8 @@
182 AC_SUBST(LDFLAGS)
183 AC_SUBST(LIBS)
184
185 -AM_GNU_GETTEXT
186
187 -AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
188 +AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR])
189 AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
190
191 AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile \
192 diff -Nru lrzsz-0.12.20.orig/lib/Makefile.am lrzsz-0.12.20/lib/Makefile.am
193 --- lrzsz-0.12.20.orig/lib/Makefile.am 1998-12-27 17:25:26.000000000 +0100
194 +++ lrzsz-0.12.20/lib/Makefile.am 2009-07-10 01:18:40.000000000 +0200
195 @@ -1,5 +1,4 @@
196 noinst_LIBRARIES=libzmodem.a
197 -CFLAGS=@CFLAGS@
198 AUTOMAKE_OPTIONS=ansi2knr
199
200 EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
201 diff -Nru lrzsz-0.12.20.orig/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in
202 --- lrzsz-0.12.20.orig/po/Makefile.in.in 1998-04-26 15:22:40.000000000 +0200
203 +++ lrzsz-0.12.20/po/Makefile.in.in 2009-07-10 01:19:23.000000000 +0200
204 @@ -51,7 +51,7 @@
205
206 POTFILES = \
207
208 -CATALOGS = @CATALOGS@
209 +CATALOGS = de.gmo
210 CATOBJEXT = @CATOBJEXT@
211 INSTOBJEXT = @INSTOBJEXT@
212
213 @@ -118,8 +118,8 @@
214 for cat in $$catalogs; do \
215 cat=`basename $$cat`; \
216 case "$$cat" in \
217 - *.gmo) destdir=$(gnulocaledir);; \
218 - *) destdir=$(localedir);; \
219 + *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
220 + *) destdir=$(DESTDIR)$(localedir);; \
221 esac; \
222 lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
223 dir=$$destdir/$$lang/LC_MESSAGES; \
224 diff -Nru lrzsz-0.12.20.orig/src/Makefile.am lrzsz-0.12.20/src/Makefile.am
225 --- lrzsz-0.12.20.orig/src/Makefile.am 1998-12-28 09:38:47.000000000 +0100
226 +++ lrzsz-0.12.20/src/Makefile.am 2009-07-10 01:18:40.000000000 +0200
227 @@ -4,7 +4,6 @@
228 noinst_HEADERS = timing.h zglobal.h zmodem.h
229 datadir = $(prefix)/@DATADIRNAME@
230 localedir = $(datadir)/locale
231 -CFLAGS=@CFLAGS@
232 DISTCLEAN_FILES=lrzszbug
233
234 LDADD = ../lib/libzmodem.a @INTLLIBS@
235 @@ -14,22 +13,16 @@
236 #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
237 DEFS = -DNFGVMIN @DEFS@ -DLOCALEDIR=\"$(localedir)\"
238
239 -install-exec-local:
240 - rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`
241 - ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
242 - $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'`
243 - rm -f $(bindir)/`echo lsx | sed -e '$(transform)'`
244 - ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
245 - $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'`
246 - rm -f $(bindir)/`echo lrb | sed -e '$(transform)'`
247 - ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
248 - $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'`
249 - rm -f $(bindir)/`echo lrx | sed -e '$(transform)'`
250 - ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
251 - $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'`
252 -# rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`
253 -# ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
254 -# $(bindir)/`echo lrzszbug |sed -e '$(transform)'`
255 +# Caveat: program name transformation is ignored here.
256 +$(DESTDIR)$(bindir)/lsz $(DESTDIR)$(bindir)/lrz: install-binPROGRAMS
257 +
258 +$(DESTDIR)$(bindir)/lsb $(DESTDIR)$(bindir)/lsx: $(DESTDIR)$(bindir)/lsz
259 + rm -f $@ ; ln -s `basename $<` $@
260 +
261 +$(DESTDIR)$(bindir)/lrb $(DESTDIR)$(bindir)/lrx: $(DESTDIR)$(bindir)/lrz
262 + rm -f $@ ; ln -s `basename $<` $@
263 +
264 +install-exec-local: $(DESTDIR)$(bindir)/lsb $(DESTDIR)$(bindir)/lsx $(DESTDIR)$(bindir)/lrb $(DESTDIR)$(bindir)/lrx
265
266 uninstall-local:
267 rm -f $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'`
Report Message
Find on MARC Find on Google Groups