Attachment #227163 for bug #257812

View | Details | Raw Unified | Return to bug 257812
Collapse All | Expand All

Lines 1-10 Link Here

(-)w/www/lynx-current/Makefile (-2 / +3 lines)
1	# Created by: ache	1	# Created by: ache
2		2
3	PORTNAME= lynx	3	PORTNAME= lynx
4	PORTVERSION= 2.9.0d6	4	PORTVERSION= 2.9.0d9
5	CATEGORIES= www	5	CATEGORIES= www
6	MASTER_SITES= http://invisible-mirror.net/archives/lynx/tarballs/ \	6	MASTER_SITES= http://invisible-mirror.net/archives/lynx/tarballs/ \
7	ftp://invisible-island.net/lynx/tarballs/	7	ftp://ftp.invisible-island.net/lynx/tarballs/
		8
8	PKGNAMESUFFIX= -current	9	PKGNAMESUFFIX= -current
9	DISTNAME= ${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./}	10	DISTNAME= ${PORTNAME}${PORTVERSION:S/p/pre./:S/d/dev./}
10		11

Lines 1-3 Link Here

(-)w/www/lynx-current/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1605020628	1	TIMESTAMP = 1605020628
2	SHA256 (lynx2.9.0dev.6.tar.bz2) = 78f0be7f81f4b84d8d33b45a05145f015e35355109be350e461de5c03abf53b2	2	SHA256 (lynx2.9.0dev.9.tar.bz2) = 6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
3	SIZE (lynx2.9.0dev.6.tar.bz2) = 2730690	3	SIZE (lynx2.9.0dev.9.tar.bz2) = 2746988




--- makefile.in.orig	2021-08-01 20:50:51.000000000 +0200
+++ makefile.in	2021-08-13 17:31:19.742347000 +0200
@@ -325,7 +325,7 @@
 		cd $(HELPDIR) && rm -f $$name ;\
 		r= ;\
 		test "$(LN_S)" = "ln -s" || r=`echo $(helpdir)|sed -e "s%[^/]\+%..%g" -e "s%^.%%"`; \
-		cd $(HELPDIR) && ( $(LN_S) $$r$(docdir)/$$name . || cp $(DOCDIR)/$$name . );\
+		cd $(HELPDIR) && ( $(LN_S) ../doc/lynx/$$name . || cp $(DOCDIR)/$$name . );\
 		done';\
 	$(SHELL) -c 'set -x; \
 		case `id|sed -e "s/(.*//"` in \
@@ -403,14 +403,10 @@
 		if test "$(COMPRESS_PROG)" != "" ; then \
 			(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
 		fi'
-	@echo "Updating $(sysconfdir)/lynx.cfg"
-	@ECHO_CC@$(SHELL) -c \
-	'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
-		mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
-	else \
-		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
-	fi'
-	@echo "Updating $(sysconfdir)/lynx.cfg to point to installed help-files"
+	@echo "Updating $(sysconfdir)/lynx.cfg.sample"
+	cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp
+	rm -f $(SYSCONFDIR)/lynx.cfg.sample
+	@echo "Updating $(sysconfdir)/lynx.cfg.sample to point to installed help-files"
 	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
 		-e '/^#HELPFILE:file/s!#!!' \
 		$(SYSCONFDIR)/lynx.tmp | \
@@ -418,8 +414,8 @@
 	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
 	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
 		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
-		>$(SYSCONFDIR)/lynx.cfg ;\
-	chmod 644 $(SYSCONFDIR)/lynx.cfg ;\
+		>$(SYSCONFDIR)/lynx.cfg.sample; \
+	chmod 644 $(SYSCONFDIR)/lynx.cfg.sample; \
 	rm -f $(SYSCONFDIR)/lynx.tmp
 
 LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
@@ -442,17 +438,15 @@
 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
 
 install-cfg : $(SYSCONFDIR)

+	@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.sample
 
 uninstall ::
 @MSG_DIR_MAKE@	( cd $(PO_DIR) && $(MAKE_RECUR) uninstall )
 	-rm -f $(BINDIR)/$(binary_PROG) ;\
-	rm -f $(MANDIR)/$(actual_PROG).1 ;\
-	rm -f $(SYSCONFDIR)/lynx.cfg ;\
-	rm -f $(SYSCONFDIR)/lynx.lss
+	rm -f $(MANDIR)/$(actual_PROG).1
 
 uninstall \
 uninstall-help ::

Return to bug 257812

Lines 1-45 Link Here

(-)w/www/lynx-current/files/patch-makefile.in (-23 / +24 lines)
1	--- makefile.in.orig 2019-08-26 20:21:48 UTC	1	--- makefile.in.orig 2021-08-01 20:50:51.000000000 +0200
2	+++ makefile.in	2	+++ makefile.in 2021-08-13 17:31:19.742347000 +0200
3	@@ -324,7 +324,7 @@ install-doc : $(DOCDIR) $(HELPDIR)	3	@@ -325,7 +325,7 @@
4	cd $(HELPDIR) && rm -f $$name ;\	4	cd $(HELPDIR) && rm -f $$name ;\
5	r= ;\	5	r= ;\
6	test "$(LN_S)" = "ln -s" \|\| r=`echo $(helpdir)\|sed -e "s%[^/]\+%..%g" -e "s%^.%%"`; \	6	test "$(LN_S)" = "ln -s" \|\| r=`echo $(helpdir)\|sed -e "s%[^/]\+%..%g" -e "s%^.%%"`; \
7	- cd $(HELPDIR) && ( $(LN_S) $$r$(docdir)/$$name . \|\| cp $(DOCDIR)/$$name . );\	7	- cd $(HELPDIR) && ( $(LN_S) $$r$(docdir)/$$name . \|\| cp $(DOCDIR)/$$name . );\
8	+ cd $(HELPDIR) && ( $(LN_S) ../doc/lynx/$$name . \|\| cp $(DOCDIR)/$$name . );\	8	+ cd $(HELPDIR) && ( $(LN_S) ../doc/lynx/$$name . \|\| cp $(DOCDIR)/$$name . );\
9	done'	9	done';\
10	-$(SHELL) -c 'case `id\|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac'	10	$(SHELL) -c 'set -x; \
11		11	case `id\|sed -e "s/(.*//"` in \
12	@@ -393,14 +393,10 @@ install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $	12	@@ -403,14 +403,10 @@
13	if test "$(COMPRESS_PROG)" != "" ; then \	13	if test "$(COMPRESS_PROG)" != "" ; then \
14	(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \	14	(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
15	fi'	15	fi'
16	- @echo Updating $(sysconfdir)/lynx.cfg	16	- @echo "Updating $(sysconfdir)/lynx.cfg"
17	- @ECHO_CC@$(SHELL) -c \	17	- @ECHO_CC@$(SHELL) -c \
18	- 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \	18	- 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
19	- mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \	19	- mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
20	- else \	20	- else \
21	- cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \	21	- cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
22	- fi'	22	- fi'
23	- @echo Updating $(sysconfdir)/lynx.cfg to point to installed help-files	23	- @echo "Updating $(sysconfdir)/lynx.cfg to point to installed help-files"
24	+ @echo Updating $(sysconfdir)/lynx.cfg.sample	24	+ @echo "Updating $(sysconfdir)/lynx.cfg.sample"
25	+ cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp	25	+ cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp
26	+ rm -f $(SYSCONFDIR)/lynx.cfg.sample	26	+ rm -f $(SYSCONFDIR)/lynx.cfg.sample
27	+ @echo Updating $(sysconfdir)/lynx.cfg.sample to point to installed help-files	27	+ @echo "Updating $(sysconfdir)/lynx.cfg.sample to point to installed help-files"
28	@ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \	28	@ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \
29	-e '/^#HELPFILE:file/s!#!!' \	29	-e '/^#HELPFILE:file/s!#!!' \
30	$(SYSCONFDIR)/lynx.tmp \| \	30	$(SYSCONFDIR)/lynx.tmp \| \
31	@@ -408,8 +404,8 @@ install-help : $(CFG2HTML) help_files.sed $(HELPDIR) $	31	@@ -418,8 +414,8 @@
32	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) \| \	32	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) \| \
33	sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \	33	sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
34	-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \	34	-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
35	- >$(SYSCONFDIR)/lynx.cfg	35	- >$(SYSCONFDIR)/lynx.cfg ;\
36	- chmod 644 $(SYSCONFDIR)/lynx.cfg	36	- chmod 644 $(SYSCONFDIR)/lynx.cfg ;\
37	+ >$(SYSCONFDIR)/lynx.cfg.sample	37	+ >$(SYSCONFDIR)/lynx.cfg.sample; \
38	+ chmod 644 $(SYSCONFDIR)/lynx.cfg.sample	38	+ chmod 644 $(SYSCONFDIR)/lynx.cfg.sample; \
39	-rm -f $(SYSCONFDIR)/lynx.tmp	39	rm -f $(SYSCONFDIR)/lynx.tmp
40		40
41	LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin	41	LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
42	@@ -432,17 +428,15 @@ cfg_defs.h : $(scripts_dir)/cfg_defs.sh $(scripts_dir)	42	@@ -442,17 +438,15 @@
43	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'	43	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
44		44
45	install-cfg : $(SYSCONFDIR)	45	install-cfg : $(SYSCONFDIR)
Lines 51-61 Link Here
51	+ @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.sample	51	+ @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.sample
52		52
53	uninstall ::	53	uninstall ::
54	@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall	54	@MSG_DIR_MAKE@ ( cd $(PO_DIR) && $(MAKE_RECUR) uninstall )
55	-rm -f $(BINDIR)/$(binary_PROG)	55	-rm -f $(BINDIR)/$(binary_PROG) ;\
56	-rm -f $(MANDIR)/$(actual_PROG).1	56	- rm -f $(MANDIR)/$(actual_PROG).1 ;\
57	- -rm -f $(SYSCONFDIR)/lynx.cfg	57	- rm -f $(SYSCONFDIR)/lynx.cfg ;\
58	- -rm -f $(SYSCONFDIR)/lynx.lss	58	- rm -f $(SYSCONFDIR)/lynx.lss
		59	+ rm -f $(MANDIR)/$(actual_PROG).1
59		60
60	uninstall \	61	uninstall \
61	uninstall-help ::	62	uninstall-help ::