Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13684
Modified Files:
lynx.info lynx.patch
Log Message:
Update from tracker #1406790
Index: lynx.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/lynx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lynx.patch 20 Jan 2006 20:32:32 -0000 1.1
+++ lynx.patch 27 Jul 2006 23:00:14 -0000 1.2
@@ -1,12 +1,39 @@
-diff -Nurd -x'*~' lynx2-8-4.orig/makefile.in lynx2-8-4/makefile.in
---- lynx2-8-4.orig/makefile.in 2005-01-09 15:24:28.000000000 -0500
-+++ lynx2-8-4/makefile.in 2005-01-09 15:25:06.000000000 -0500
-@@ -327,7 +327,7 @@
- ( cd $(DOCDIR) && chmod -R u+w . && tar xf - )
+diff -urN lynx2-8-5/WWW/Library/Implementation/HTTCP.c
lynx2-8-5.patched/WWW/Library/Implementation/HTTCP.c
+--- lynx2-8-5/WWW/Library/Implementation/HTTCP.c 2004-01-24
17:51:04.000000000 -0800
++++ lynx2-8-5.patched/WWW/Library/Implementation/HTTCP.c 2006-06-07
22:30:28.000000000 -0700
+@@ -1326,7 +1326,11 @@
+ if (phost->h_length != sizeof soc_in->sin_addr) {
+ HTAlwaysAlert(host, gettext("Address length looks invalid"));
+ }
++#ifdef _POSIX_C_SOURCE
++ memcpy((void *)&soc_in->sin_addr, phost->h_addr_list[0],
phost->h_length);
++#else
+ memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length);
++#endif /* _POSIX_C_SOURCE */
+ #endif /* VMS && CMU_TCP */
+ }
+ #endif /* _WINDOWS_NSL */
+diff -urN lynx2-8-5/configure lynx2-8-5.patched/configure
+--- lynx2-8-5/configure 2004-02-04 04:07:09.000000000 -0800
++++ lynx2-8-5.patched/configure 2006-06-07 22:36:48.000000000 -0700
+@@ -9595,7 +9595,7 @@
+ ;;
+ esac
+
+-eval cf_libdir=$libdir
++eval cf_libdir=$sysconfdir
+ cf_libdir=`echo $cf_libdir | sed -e s%'^NONE/'%$prefix/% -e
s%'^NONE/'%$ac_default_prefix/%`
+
+ echo $ac_n "checking for location of config-file""... $ac_c" 1>&6
+diff -urN lynx2-8-5/makefile.in lynx2-8-5.patched/makefile.in
+--- lynx2-8-5/makefile.in 2004-02-04 04:07:09.000000000 -0800
++++ lynx2-8-5.patched/makefile.in 2006-06-07 22:30:28.000000000 -0700
+@@ -305,7 +305,7 @@
+ fi'
$(SHELL) -c 'for name in COPYING COPYHEADER; do \
cd $(HELPDIR) && rm -f $$name ;\
- cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp
$(DOCDIR)/$$name . );\
+ cd $(HELPDIR) && cp $(DOCDIR)/$$name . ;\
done'
+ -$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root
$(DOCDIR);; esac'
- # HPUX 'sed' does not seem to like '=' as pattern delimiter.
Index: lynx.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/lynx.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lynx.info 21 Jan 2006 17:50:31 -0000 1.2
+++ lynx.info 27 Jul 2006 23:00:14 -0000 1.3
@@ -1,46 +1,69 @@
Package: lynx
-Version: 2.8.4
-Revision: 1025
-Conflicts: lynx-ssl
-Replaces: lynx-ssl
-BuildDepends: gettext-dev, gettext-bin, gettext-tools, libncurses5 (>=
5.4-20041023-1006)
-Depends: ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>=
5.4-20041023-1006)
+Version: 2.8.5
+Revision: 1
+Replaces: lynx-ssl (<< %v-%r)
+SplitOff: <<
+ Package: lynx-ssl
+ Depends: %N (= %v-%r)
+ Description: Dummy upgrade package for lynx with system-openssl
+ DocFiles: CHANGES COPYHEADER COPYING README
+ DescDetail: <<
+ This package only exists to migrate users to the new unified mutt package.
+ You can safely remove it.
+ <<
+<<
+
+BuildDepends: libncurses5, libgettext3-dev, gettext-bin, libiconv-dev,
system-openssl-dev
+Depends: ncurses, libncurses5-shlibs, libgettext3-shlibs, libiconv
+
CustomMirror: <<
- Primary: http://ftp.at.gnucash.org/infosys/browsers/lynx/lynx2.8.4/
- Primary: http://gd.tuwien.ac.at/infosys/browsers/lynx/lynx2.8.4/
- Primary: http://ftp6.us.freebsd.org/pub/lynx/lynx2.8.4/
- Primary: ftp://ftp.netbuddy.org/linux/
- Primary: http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/uos/mirror/
+ Primary: http://lynx.isc.org/lynx2.8.5/
+ Primary: http://ftp.at.gnucash.org/infosys/browsers/lynx/lynx2.8.5/
+ Primary: http://gd.tuwien.ac.at/infosys/browsers/lynx/lynx2.8.5/
<<
Source: mirror:custom:lynx%v.tar.bz2
-Source-MD5: 6916c0127839f1e454052b683e4691c4
-SourceDirectory: lynx2-8-4
+Source-MD5: d1e5134e5d175f913c16cb6768bc30eb
+SourceDirectory: lynx2-8-5
+Description: Console based web browser
+
+DescDetail: <<
+ Lynx is a web browser that runs inside a terminal emulator,
+ e.g. Terminal.app or an xterm. It can't display graphics and also has
+ trouble with tables, but it can come in handy in some situations.
+
+ This package builds Lynx with SSL/https support using Apple's
+ openssl implementation.
+ <<
+
+##Patch phase
Patch: %n.patch
-ConfigureParams: --enable-nls --with-screen=ncurses --disable-full-paths
--enable-file-upload --enable-internal-links --libdir=%p/etc
--mandir=%p/share/man --enable-persistent-cookies
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
+
+##Compile phase
+ConfigureParams: --enable-nls --with-screen=ncurses --disable-full-paths
--enable-file-upload --enable-internal-links --libdir=%p/lib
--mandir=%p/share/man --sysconfdir=%p/etc --enable-persistent-cookies
--with-ssl=%p/lib/system-openssl
SetLIBS: -lncurses
NoSetCPPFLAGS: true
-CompileScript: export CPATH=%p/include ; ./configure %c ; make
+CompileScript: <<
+ #!/bin/sh -ex
+ export CPATH=%p/include
+ export PATH=/usr/bin/:$PATH
+ ./configure %c
+ make
+<<
+
+#Install Phase
InstallScript: <<
mkdir -p %i/etc
make install-full DESTDIR=%d docdir=%p/share/doc/%n
helpdir=%p/share/lynx_help localedir=%i/share/locale
gnulocaledir=%i/share/locale
- (cd %i/share/lynx_help && rm -f COPYHEADER COPYING && cp ../doc/%n/COPYHEADER
../doc/%n/COPYING .)
+ (cd %i/share/lynx_help && rm -f COPYHEADER COPYING)
+ mv %i/lib/lynx.cfg %i/etc/lynx.cfg
<<
+DocFiles: CHANGES COPYHEADER COPYING README
ConfFiles: %p/etc/lynx.cfg
#
-Description: Console based web browser
-DescDetail: <<
-Lynx is a web browser that runs inside a terminal emulator,
-e.g. Terminal.app or an xterm. It can't display graphics and also has
-trouble with tables, but it can come in handy in some situations.
-This package builds Lynx without SSL/https support. Install the
-lynx-ssl package instead if you need it.
-<<
DescPort: <<
-Doesn't do color in Terminal.app and xterms; this can probably be
-cured by adjusting the terminfo data.
+Unicode characters do not work correctly with Terminal.app but they
+display OK in xterm
<<
DescPackaging: <<
The Makefile for the message catalogs doesn't respect DESTDIR, we work
@@ -57,7 +80,10 @@
dmacks--Patch makefile.in to install actual COPYING and COPYHEADER files
in lynx_help instead of symlinks to build dir files.
+Patch WWW/Library/Implementation/HTTCP.c to fix a POXIS problem.
<<
+
License: GPL
Homepage: http://lynx.browser.org/
-Maintainer: None <fink-devel@lists.sourceforge.net>
+Maintainer: elcepi <[EMAIL PROTECTED]>
+
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
