Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5119
Modified Files:
elinks.info elinks.patch
Log Message:
new version
Index: elinks.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/elinks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- elinks.patch 22 Nov 2006 09:05:31 -0000 1.2
+++ elinks.patch 22 Mar 2009 21:11:34 -0000 1.3
@@ -1,72 +1,31 @@
-diff -Nurd -x'*~' elinks-0.11.2.orig/Makefile.config.in
elinks-0.11.2/Makefile.config.in
---- elinks-0.11.2.orig/Makefile.config.in 2006-11-19 08:46:35.000000000
-0500
-+++ elinks-0.11.2/Makefile.config.in 2006-11-22 02:53:53.000000000 -0500
-@@ -157,8 +157,9 @@
-
+diff -Nurd -x'*~' elinks-0.11.6.orig/Makefile.config.in
elinks-0.11.6/Makefile.config.in
+--- elinks-0.11.6.orig/Makefile.config.in 2009-03-21 08:31:54.000000000
-0400
++++ elinks-0.11.6/Makefile.config.in 2009-03-22 16:32:18.000000000 -0400
+@@ -160,7 +160,7 @@
+ LIBS = @LIBS@
- INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
-+AM_CPPFLAGS = -I$(top_srcdir)/src/intl/gettext
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
+-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
-I$(top_srcdir)/src/intl/gettext
- MAKE_COLOR = @MAKE_COLOR@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-diff -Nurd -x'*~' elinks-0.11.2.orig/configure elinks-0.11.2/configure
---- elinks-0.11.2.orig/configure 2006-11-19 08:46:47.000000000 -0500
-+++ elinks-0.11.2/configure 2006-11-22 03:08:23.000000000 -0500
-@@ -11212,6 +11212,7 @@
- echo "${ECHO_T}$HAVE_VARIADIC_MACROS" >&6
+diff -Nurd -x'*~' elinks-0.11.6.orig/configure elinks-0.11.6/configure
+--- elinks-0.11.6.orig/configure 2009-03-21 08:50:25.000000000 -0400
++++ elinks-0.11.6/configure 2009-03-22 16:30:21.000000000 -0400
+@@ -11479,6 +11479,7 @@
+ echo "${ECHO_T}$HAVE_VARIADIC_MACROS" >&6; }
+if false; then
- echo "$as_me:$LINENO: checking for -rdynamic" >&5
- echo $ECHO_N "checking for -rdynamic... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for -rdynamic" >&5
+ echo $ECHO_N "checking for -rdynamic... $ECHO_C" >&6; }
LDFLAGS_X="$LDFLAGS"
-@@ -11265,6 +11266,7 @@
+@@ -11529,6 +11530,7 @@
test "$have_rdynamic" = no && LDFLAGS="$LDFLAGS_X"
- echo "$as_me:$LINENO: result: $have_rdynamic" >&5
- echo "${ECHO_T}$have_rdynamic" >&6
+ { echo "$as_me:$LINENO: result: $have_rdynamic" >&5
+ echo "${ECHO_T}$have_rdynamic" >&6; }
+fi
-@@ -23327,7 +23329,28 @@
- # CFLAGS doesn't contain all compile flags. Some will be added only when
- # needed in the respective source directory. To get all compile flags
- # easily just add CPPFLAGS.
--ALL_CFLAGS="$CFLAGS $CPPFLAGS"
-+
-+
-+ about="Compiler options (CPPFLAGS)"
-+ value=""
-+ msgdots2="`echo $about | sed 's/[0-9]/./g'`"
-+ msgdots1="`echo $msgdots2 | sed 's/[a-z]/./g'`"
-+ msgdots0="`echo $msgdots1 | sed 's/[A-Z]/./g'`"
-+ msgdots="`echo $msgdots0 | sed 's/[_ ()]/./g'`"
-+ DOTS="................................"
-+ dots=`echo $DOTS | sed "s/$msgdots//"`
-+
-+ # $msgdots too big?
-+ if test "$dots" = "$DOTS"; then
-+ dots=""
-+ fi
-+
-+ if test -z "$value"; then
-+ value="$CPPFLAGS"
-+ fi
-+
-+ echo "$about $dots $value" >> features.log
-+
-
-
- about="Compiler options (CFLAGS)"
-@@ -23345,7 +23368,7 @@
- fi
-
- if test -z "$value"; then
-- value="$ALL_CFLAGS"
-+ value="$CFLAGS"
- fi
-
- echo "$about $dots $value" >> features.log
Index: elinks.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/elinks.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- elinks.info 20 Apr 2008 19:47:17 -0000 1.7
+++ elinks.info 22 Mar 2009 21:11:33 -0000 1.8
@@ -1,24 +1,40 @@
Package: elinks
-Version: 0.11.2
-Revision: 2
+Version: 0.11.6
+Revision: 1
Description: Development version of Links text WWW browser
License: GPL
Maintainer: Daniel Macks <dma...@netspace.org>
Conflicts: elinks-ssl (<< 0.11.2-2)
Replaces: elinks-ssl (<< 0.11.2-2)
-Depends: expat1-shlibs, libidn-shlibs, bzip2-shlibs, libiconv
-BuildDepends: expat1, libidn, bzip2-dev, gettext-tools, libiconv-dev, bison
(>= 2.0), system-openssl-dev, fink (>= 0.24.12-1)
+Depends: <<
+ bzip2-shlibs,
+ expat1-shlibs,
+ libiconv,
+ libidn-shlibs,
+ x11
+<<
+BuildDepends: <<
+ bison (>= 2.0),
+ bzip2-dev,
+ expat1,
+ fink (>= 0.24.12-1),
+ gettext-tools,
+ libiconv-dev,
+ libidn,
+ system-openssl-dev,
+ x11-dev
+<<
Source: http://elinks.or.cz/download/elinks-%v.tar.bz2
-Source-MD5: 5a8f83afb527cf443f58b372136a81fc
+Source-MD5: 463ec007b013822a82d197580117ea16
PatchFile: %n.patch
-PatchFile-MD5: 5d8877f3492290429637b9ad2103dd6c
+PatchFile-MD5: f4dc2db3cf61dbfd9f9faa3a8710ebb5
PatchScript: <<
%{default_script}
- perl -pi -e 's/INCLUDES( \+= .*CFLAGS)/CPPFLAGS\1/' `find . -name
Makefile`
+# perl -pi -e 's/INCLUDES( \+= .*CFLAGS)/CPPFLAGS\1/' `find . -name
Makefile`
<<
SetCPPFLAGS: -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
-ConfigureParams: --mandir=%p/share/man --without-gpm --without-lua --without-x
--without-spidermonkey --disable-fsp --with-openssl=%p/lib/system-openssl
+ConfigureParams: --mandir=%p/share/man --without-gpm --without-lua
--without-spidermonkey --disable-fsp --with-openssl=%p/lib/system-openssl
CompileScript: <<
ac_cv_path_ASCIIDOC= ac_cv_path_XMLTO= ac_cv_path_JW= ./configure %c
make V=1
@@ -58,15 +74,10 @@
Fix general CPPFLAGS handling. See:
http://linuxfromscratch.org/pipermail/elinks-users/2006-November/001354.html
-Fix configure *_CFLAGS propagation. See:
-
-rdynamic test is documented to be fragile. It incorrectly passes for
us, so just skip it.
<<
DescPackaging: <<
-Not going to require X11. For info about why it is needed at all, see
-http://linuxfromscratch.org/pipermail/elinks-dev/2004-January/000754.html
-
Define V Makefile variable to display actual compiler commands instead
of high-level summary.
@@ -79,5 +90,7 @@
potential dependency. Circularity! We already have docs in the
tarball, so force configure to avoid looking for those utility
packages.
+
+spidermonkey is disabled due to inertia.
<<
Homepage: http://elinks.or.cz
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
