OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jul-2004 13:53:31
Branch: HEAD Handle: 2004070612533000
Modified files:
openpkg-src/elm elm.spec
Log:
run correct shell; deactivate misleading ksh(1) check; elm requires
curses which is omitted from latest Linux (fixes SuSE 9.1); batch mode
configuration reads defaults from file not env; tweak Configure to
find ncurses and pass ldflags; handle OS specific expr(1) behavior
when first arg starts with a dash (fixes FreeBSD 5.2)
Summary:
Revision Changes Path
1.18 +11 -5 openpkg-src/elm/elm.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/elm/elm.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 elm.spec
--- openpkg-src/elm/elm.spec 5 Jul 2004 11:37:50 -0000 1.17
+++ openpkg-src/elm/elm.spec 6 Jul 2004 11:53:30 -0000 1.18
@@ -38,7 +38,7 @@
Group: Mail
License: ELM License
Version: %{V_base}.%{V_me}
-Release: 20040705
+Release: 20040706
# list of sources
Source0: http://www.ozone.fmi.fi/KEH/elm-%{V_base}ME+%{V_me}.tar.gz
@@ -46,7 +46,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make
+BuildPreReq: OpenPKG, openpkg >= 20040130, ncurses, gcc, make
PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
@@ -75,10 +75,16 @@
-e 's;install_prefix/var/stage-$package;install_prefix/var/elm;g' \
-e 's;install_prefix/lib;install_prefix/lib/elm;g' \
-e
's;shlib="$install_prefix/$libdirname";shlib="$install_prefix/lib/elm";g' \
+ -e 's;#! */bin/sh;#!%{l_bash} --noprofile;' \
+ -e 's;^(alias);(false);' \
+ -e 's;^\(cc=.\)\(.\)$;\1%{l_cc}\2;' \
+ -e 's;^\(optimize=.\)\(.\)$;\1%{l_cflags -O}\2;' \
+ -e 's;^\(ldflags=.\)\(.\)$;\1%{l_ldflags}\2;' \
+ -e 's;\(for A in ..\) \(.-ltermlib.\);\1 -lncurses \2;' \
+ -e 's;\(if $cc $ccflags\) \(-o try_term\);\1 $ldflags \2;' \
Configure
- export cc="%{l_cc}"
- export optimize="%{l_cflags -O}"
- ./Configure -d -b -P%{l_prefix}
+ expr -P >/dev/null 2>&1 || %{l_shtool} subst -e 's;expr ;expr -- ;g' Configure
+ ./Configure -b -P%{l_prefix}
# build program
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
