diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2009-12-12 11:08:52 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2009-12-12 11:08:52 +0800 |
| commit | 515b2fb21572c293aa4e0bd329cd022807a5f912 (patch) | |
| tree | 0624c325ee71daca4b2091f9bb8a1e5be6d4cc38 /www/lynx | |
| parent | 98ea5653b9efd707da01603c368ced7acdd674e7 (diff) | |
| download | freebsd-ports-graphics-515b2fb21572c293aa4e0bd329cd022807a5f912.tar.gz freebsd-ports-graphics-515b2fb21572c293aa4e0bd329cd022807a5f912.tar.zst freebsd-ports-graphics-515b2fb21572c293aa4e0bd329cd022807a5f912.zip | |
- Fix installation to not copy .cfg files to .cfg.sample and to not tamper with .cfg when it's not needed
- Simplify config-related @exec/@unexec's in the pkg-plist
PR: 137565
Submitted by: bf <bf1783@gmail.com>
Approved by: maintainer timeout
Diffstat (limited to 'www/lynx')
| -rw-r--r-- | www/lynx/files/patch-aa | 21 | ||||
| -rw-r--r-- | www/lynx/pkg-plist | 8 |
2 files changed, 17 insertions, 12 deletions
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa index 5e713ecc7a6..f0c4bf9f1c7 100644 --- a/www/lynx/files/patch-aa +++ b/www/lynx/files/patch-aa @@ -1,17 +1,22 @@ ---- makefile.in.orig Mon Sep 4 01:25:39 2006 -+++ makefile.in Tue Jul 31 10:37:26 2007 -@@ -366,7 +366,9 @@ +--- makefile.in.orig 2006-09-03 19:25:39.000000000 -0400 ++++ makefile.in 2009-08-08 04:44:18.000000000 -0400 +@@ -361,12 +361,12 @@ + (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 ; \ ++ @ECHO_CC@$(SHELL) -c 'if test -f $(SYSCONFDIR)/lynx.cfg.sample ; then \ ++ mv $(SYSCONFDIR)/lynx.cfg.sample $(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 $(srcdir)/lynx.cfg.sample -+ @cp $(srcdir)/lynx.cfg $(srcdir)/lynx.tmp -+ @echo Updating $(srcdir)/lynx.cfg.sample to point to installed help-files ++ @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 | \ -@@ -374,9 +376,11 @@ +@@ -374,9 +374,11 @@ $(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)!' \ @@ -25,7 +30,7 @@ LYHelp.h : help_files.sed LYHelp.hin @echo Creating $@ -@@ -398,18 +402,17 @@ +@@ -398,18 +400,17 @@ $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)' install-cfg : $(SYSCONFDIR) diff --git a/www/lynx/pkg-plist b/www/lynx/pkg-plist index 53d64ba5dff..c3d7454ebeb 100644 --- a/www/lynx/pkg-plist +++ b/www/lynx/pkg-plist @@ -1,10 +1,10 @@ bin/lynx -@unexec if [ -f %D/etc/lynx.cfg ] && cmp -s %D/etc/lynx.cfg %D/etc/lynx.cfg.sample; then rm -f %D/etc/lynx.cfg; fi +@unexec if cmp -s %D/etc/lynx.cfg %D/etc/lynx.cfg.sample; then rm -f %D/etc/lynx.cfg; fi etc/lynx.cfg.sample -@exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi -@unexec if [ -f %D/etc/lynx.lss ] && cmp -s %D/etc/lynx.lss %D/etc/lynx.lss.sample; then rm -f %D/etc/lynx.lss; fi +@exec if [ ! -f %B/lynx.cfg ]; then cp -p %D/%F %B/lynx.cfg; fi +@unexec if cmp -s %D/etc/lynx.lss %D/etc/lynx.lss.sample; then rm -f %D/etc/lynx.lss; fi etc/lynx.lss.sample -@exec if [ ! -f %D/etc/lynx.lss ] ; then cp -p %D/%F %B/lynx.lss; fi +@exec if [ ! -f %B/lynx.lss ]; then cp -p %D/%F %B/lynx.lss; fi @exec mkdir -p %D/share/lynx_help %%DOCSDIR%%/CHANGES %%DOCSDIR%%/COPYHEADER |