about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD/VS6/clean.bat27
-rw-r--r--BUILD/VS6/develop.bat7
-rw-r--r--CHANGES9
-rw-r--r--PACKAGE/lynx-default.iss11
-rw-r--r--PACKAGE/lynx.iss6
-rw-r--r--PACKAGE/lynx.spec35
-rw-r--r--makefile.in11
-rw-r--r--samples/lynx.bat16
-rw-r--r--samples/oldlynx.bat10
9 files changed, 65 insertions, 67 deletions
diff --git a/BUILD/VS6/clean.bat b/BUILD/VS6/clean.bat
deleted file mode 100644
index a4b12477..00000000
--- a/BUILD/VS6/clean.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-@echo off

-@rem $LynxId: clean.bat,v 1.2 2007/07/01 21:52:45 tom Exp $

-@rem Remove all build-products in subdirectories, leaving only sources (and unrecognized types)

-

-del/f/s/q *.aps

-del/f/s/q *.bsc

-del/f/s/q *.exe

-del/f/s/q *.exp

-del/f/s/q *.idb

-del/f/s/q *.ilk

-del/f/s/q *.lib

-del/f/s/q *.ncb

-del/f/s/q *.obj

-del/f/s/q *.opt

-del/f/s/q *.pch

-del/f/s/q *.pdb

-del/f/s/q *.plg

-del/f/s/q *.res

-del/f/s/q *.sbr

-del/f/s/q *.suo

-

-del/f/s/q ne*.h

-del/f/s/q BuildLog.htm

-

-attrib +r *.bat /s

-attrib +r *.dsp /s

-attrib +r *.dsw /s

diff --git a/BUILD/VS6/develop.bat b/BUILD/VS6/develop.bat
deleted file mode 100644
index 8fdf38c2..00000000
--- a/BUILD/VS6/develop.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off

-@rem $LynxId: develop.bat,v 1.2 2007/07/01 21:52:50 tom Exp $

-@rem ensure that all IDE files are writable

-

-attrib -r *.bat /s

-attrib -r *.dsp /s

-attrib -r *.dsw /s
\ No newline at end of file
diff --git a/CHANGES b/CHANGES
index ed975bdb..c5af9922 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,14 @@
--- $LynxId: CHANGES,v 1.945 2018/03/11 22:47:43 tom Exp $
+-- $LynxId: CHANGES,v 1.948 2018/03/13 09:14:59 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2018-03-11 (2.8.9dev.17)
+2018-03-13 (2.8.9dev.17)
+* modify windows installers to use static libraries for pdcurses and slang,
+  because the dll for the latter is much larger than the rest of lynx -TD
+* rename test-package for ".rpm" to "lynx-dev" for consistency with ".deb" -TD
+* improve samples/lynx.bat by using location of script rather than current
+  directory ("Smuggler" loto1992@inbox.ru).
 * permanently enable MISC_EXP feature -TD
 * remove several obsolete ifdefs: DGUX, DGUX_OLD, HP_TERMINAL,
   REVERSE_CLEAR_SCREEN_PROBLEM, SHORTENED_RBIND, SLANG_MBCS_HACK, SNAKE -TD
diff --git a/PACKAGE/lynx-default.iss b/PACKAGE/lynx-default.iss
new file mode 100644
index 00000000..f39b9b5c
--- /dev/null
+++ b/PACKAGE/lynx-default.iss
@@ -0,0 +1,11 @@
+; $LynxId: lynx-default.iss,v 1.1 2018/03/13 09:10:08 tom Exp $

+;

+; This is an installer for the "default" flavor of Lynx.

+;

+; The script assumes environment variables have been set, e.g., to point to

+; data which is used by the installer (see "lynx.lss" for details).

+

+#define NoScreenDll

+#define SourceExeName "lynx-default.exe"

+

+#include "lynx.iss"

diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index 9f8c3e93..3120000f 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.18 2018/02/05 09:42:33 tom Exp $

+; $LynxId: lynx.iss,v 1.19 2018/03/13 09:11:29 tom Exp $

 ; vile:ts=2 sw=2 notabinsert

 ;

 ; This is the BASE script for different flavors of the installer for Lynx.

@@ -37,7 +37,7 @@
 #endif

 

 #ifndef ZlibDllName

-#define ZlibDllName "zlib.dll"

+#define ZlibDllName "zlib1.dll"

 #endif

 

 #ifndef BzipExeName

@@ -62,7 +62,7 @@
 #ifndef DllsSrcDir

 #define DllsSrcDir GetEnv("LYNX_DLLSDIR")

 #if DllsSrcDir == ""

-#define DllsSrcDir "..\dlls"

+#define DllsSrcDir "..\bin"

 #endif

 #endif

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 6308d3bd..08976491 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,17 +1,25 @@
-# $LynxId: lynx.spec,v 1.46 2018/03/11 22:48:05 tom Exp $
+# $LynxId: lynx.spec,v 1.47 2018/03/13 00:21:12 tom Exp $
 Summary: A text-based Web browser
-Name: lynx
+Name: lynx-dev
 Version: 2.8.9
 Release: dev.17
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
-# URL: http://invisible-island.net/lynx/
+URL: http://lynx.invisible-island.net
 Provides: webclient
 Provides: text-www-browser
-# BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5,
-# BuildRequires: zlib-devel, gettext, rsh, telnet, zip, unzip
-# Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Fedora:
+BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5,
+BuildRequires: zlib-devel, gettext
+BuildRequires: libidn-devel
+# BuildRequires: bzip2-devel
+
+# SuSE:
+# BuildRequires: libbz2-devel       
+
+Requires: gzip, bzip2, tar, zip, unzip
 
 %description
 Lynx is a fully-featured World Wide Web (WWW) client for users running
@@ -20,8 +28,8 @@ to use.  It will display HTML documents containing links to files residing on
 the local system, as well as files residing on remote systems running Gopher,
 HTTP, FTP, WAIS, and NNTP servers.
 
-%define lynx_doc %{_defaultdocdir}/lynx
-%define lynx_etc %{_sysconfdir}/lynx
+%define lynx_doc %{_defaultdocdir}/%{name}
+%define lynx_etc %{_sysconfdir}/%{name}
 
 %prep
 
@@ -33,11 +41,13 @@ HTTP, FTP, WAIS, and NNTP servers.
 	--target %{_target_platform} \
 	--prefix=%{_prefix} \
 	--bindir=%{_bindir} \
+	--program-suffix=-dev \
 	--datadir=%{lynx_doc} \
 	--libdir=%{lynx_etc} \
 	--mandir=%{_mandir} \
 	--sysconfdir=%{lynx_etc} \
 	--with-cfg-path=%{lynx_etc}:%{lynx_doc}/samples \
+	--with-textdomain=%{name} \
 	--disable-font-switch \
 	--disable-internal-links \
 	--enable-8bit-toupper \
@@ -103,14 +113,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/lynx
+%{_bindir}/%{name}
 %{_mandir}/*/*
 %{_datadir}/locale/*
 %{lynx_doc}/*
-%config %{lynx_etc}/lynx.cfg
-%config %{lynx_etc}/lynx.lss
+%config %{lynx_etc}/*.cfg
+%config %{lynx_etc}/*.lss
 
 %changelog
 
+* Mon Mar 12 2018 Thomas E. Dickey
+- rename to "lynx-dev", add a few dependencies where package names are same.
+
 * Fri Sep 17 2010 Thomas E. Dickey
 - initial version.
diff --git a/makefile.in b/makefile.in
index 7f5c65d6..785a5572 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.167 2018/03/11 22:48:48 tom Exp $
+# $LynxId: makefile.in,v 1.168 2018/03/12 23:25:57 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -37,7 +37,6 @@ LIBS		= @LIBS@
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 INSTALL_DATA	= @INSTALL_DATA@
-transform	= @program_transform_name@
 
 LN_S		= @LN_S@
 
@@ -196,7 +195,7 @@ SRC_CFLAGS = \
 	WWWINC=$(WWW_DIR) \
 	WWWLIB="../$(WWW_DIR)/libwww.a"
 
-actual_PROG  = `echo lynx|    sed '$(transform)'`
+actual_PROG  = `echo lynx|sed '@program_transform_name@'`
 binary_PROG  = $(actual_PROG)$x
 
 all lynx$x: cfg_defs.h LYHelp.h
@@ -299,9 +298,9 @@ install-full: install install-help install-doc
 
 install-bin: $(BINDIR) lynx$x
 @MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) install
-	@ECHO_CC@$(SHELL) -c \
-	'if test -f $(BINDIR)/$(binary_PROG) ; then \
-	      mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi'
+	@ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \
+	if test -f $(BINDIR)/$$P ; then \
+	      mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"
 	$(INSTALL_PROGRAM) lynx$x $(BINDIR)/$(binary_PROG)
 
 install-man : $(MANDIR)
diff --git a/samples/lynx.bat b/samples/lynx.bat
index 6076cf8d..eaa484ab 100644
--- a/samples/lynx.bat
+++ b/samples/lynx.bat
@@ -1,11 +1,15 @@
 @echo off

-@rem $LynxId: lynx.bat,v 1.3 2013/10/17 09:02:20 tom Exp $

+@rem $LynxId: lynx.bat,v 1.4 2018/03/12 09:08:19 tom Exp $

 @rem Claudio Santambrogio

+@rem improved by loto1992@inbox.ru

 setlocal

+

 set TERM=vt100

-set HOME=%CD%

-set TEMP=%HOME%\tmp

-set LYNX_CFG=%HOME%\lynx-demo.cfg

-set LYNX_LSS=%HOME%\opaque.lss

-"%HOME%\lynx.exe" %1 %2 %3 %4 %5

+set HOME=%~dp0

+set TEMP=%HOME%tmp

+

+set LYNX_CFG=%HOME%lynx-demo.cfg

+set LYNX_LSS=%HOME%opaque.lss

+

+"%HOME%lynx.exe" %1 %2 %3 %4 %5

 endlocal

diff --git a/samples/oldlynx.bat b/samples/oldlynx.bat
index 955ae992..c45a8216 100644
--- a/samples/oldlynx.bat
+++ b/samples/oldlynx.bat
@@ -1,13 +1,13 @@
 @ECHO OFF

-@rem $LynxId: oldlynx.bat,v 1.3 2013/10/17 09:38:40 tom Exp $

+@rem $LynxId: oldlynx.bat,v 1.4 2018/03/12 09:07:29 tom Exp $

 @rem demonstrate lynx without color-style -TD

 setlocal

 

 set TERM=vt100

-set HOME=%CD%

-set TEMP=%HOME%\tmp

+set HOME=%~dp0

+set TEMP=%HOME%tmp

 

-set LYNX_CFG=%HOME%\oldlynx.cfg

+set LYNX_CFG=%HOME%oldlynx.cfg

 set LYNX_LSS=

 

 if exist "%LYNX_CFG%" goto done

@@ -18,5 +18,5 @@ echo "COLOR_STYLE:"          >>"%LYNX_CFG%"
 echo "NESTED_TABLES:off"     >>"%LYNX_CFG%"

 

 :done

-"%HOME%\lynx.exe" -lss="" %1 %2 %3 %4 %5 %6 %7 %8 %9

+"%HOME%lynx.exe" -lss="" %1 %2 %3 %4 %5 %6 %7 %8 %9

 endlocal
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-04 19:26:33 +0000