Bug 189687 - [MAINTAINER] www/lynx -> 2.8.8.1
Summary: [MAINTAINER] www/lynx -> 2.8.8.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Frederic Culot
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-11 21:50 UTC by jharris
Modified: 2014-07-04 14:15 UTC (History)
1 user (show)

See Also:


Attachments
pkg-plist - proposed changes (1.87 KB, patch)
2014-06-15 15:50 UTC, jharris
jharris: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jharris 2014-05-11 21:50:02 UTC
	Update www/lynx to 2.8.8.1

Fix: -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
NotDashEscaped: You need GnuPG to verify this message



iJ0EARECAF0FAlNv4hBWGGh0dHA6Ly9rZXlzZXJ2ZXIua2pzbC5jb206MTEzNzEv
cGtzL2xvb2t1cD9vcD1nZXQmc2VhcmNoPTB4RDM5REEwRTMmd2VoYXZleW91bm93
PXRydWUACgkQSypIl9OdoOPT0gCdF0V9ilSG8mn50i3vkkpIydw7p1IAoNlqYumy
zur3vVNvbNewtSxv/FuE
=FGLx
-----END PGP SIGNATURE-------sTuFvLwmJ66z1L8eaV1i40xuv49U3qCq2mwdsIaOwc2ldypq
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: Makefile
===================================================================
--- Makefile	(revision 353729)
+++ Makefile	(working copy)
@@ -2,20 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	lynx
-PORTVERSION=	2.8.7.2
+PORTVERSION=	2.8.8.1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://lynx.isc.org/current/
+MASTER_SITES=	http://lynx.isc.org/current/ \
+		http://bitrote.org/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}rel.${PORTVERSION:E}
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Non-graphical, text-based World-Wide Web client
 
-CONFLICTS=	lynx-2.8.[8-9]*
+LICENSE=	GPLv2
 
+CONFLICTS=	lynx-2.8.[8-9]d*
+
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}2-8-7
+WRKSRC=		${WRKDIR}/${PORTNAME}2-8-8
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-persistent-cookies \
Index: distinfo
===================================================================
--- distinfo	(revision 353729)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (lynx2.8.7rel.2.tar.bz2) = 301bda96ad3cd5032805e8d5315a42061a11e472e3d3a7baee3a2879517ef627
-SIZE (lynx2.8.7rel.2.tar.bz2) = 2436801
+SHA256 (lynx2.8.8rel.1.tar.bz2) = a25a1c74c8fe86ff332d8a85441d6155a842fef894d2ffb9ffd9f6457a754c02
+SIZE (lynx2.8.8rel.1.tar.bz2) = 2583698
Index: files/patch-makefile.in
===================================================================
--- files/patch-makefile.in	(revision 353729)
+++ files/patch-makefile.in	(working copy)
@@ -1,5 +1,5 @@
 Index: makefile.in
-@@ -388,7 +388,9 @@
+@@ -433,7 +433,9 @@
  	else \
  		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
  	fi'
@@ -10,7 +10,7 @@
  	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
  		-e '/^#HELPFILE:file/s!#!!' \
  		$(SYSCONFDIR)/lynx.tmp | \
-@@ -396,9 +398,11 @@
+@@ -441,9 +443,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)!' \
@@ -24,7 +24,7 @@
  
  LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
  	@echo Creating $@
-@@ -420,17 +424,17 @@
+@@ -465,17 +469,17 @@
  	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
  
  install-cfg : $(SYSCONFDIR)
@@ -37,8 +37,8 @@
  
  uninstall ::
  @MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) uninstall
- 	-rm -f $(BINDIR)/lynx$x
- 	-rm -f $(MANDIR)/lynx.1
+ 	-rm -f $(BINDIR)/$(binary_PROG)
+ 	-rm -f $(MANDIR)/$(actual_PROG).1
 -	-rm -f $(SYSCONFDIR)/lynx.cfg
 -	-rm -f $(SYSCONFDIR)/lynx.lss
 +	-rm -f $(SYSCONFDIR)/lynx.cfg.sample
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
How-To-Repeat: 	Apply patch below.
Comment 1 Frederic Culot freebsd_committer 2014-05-12 06:21:27 UTC
Responsible Changed
From-To: freebsd-ports-bugs->culot

I'll take it.
Comment 2 Frederic Culot freebsd_committer 2014-05-12 17:55:54 UTC
Hi Jason,

thanks for submitting this update but unfortunately I found some issues
during staging and a "make check-orphans" reports the following:

Error: Orphaned: %%ETCDIR%%.cfg
Error: Orphaned: %%ETCDIR%%.lss
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/docs/README.release
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx.bat
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/test/circle.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/test/square.html
Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%/test/triangle.html
Error: Orphaned: share/locale/eo/LC_MESSAGES/lynx.mo

Could you please check the port's plist?

Thanks,
Frederic
Comment 3 Frederic Culot freebsd_committer 2014-05-19 07:39:47 UTC
State Changed
From-To: open->feedback
Comment 4 jharris 2014-06-15 15:50:32 UTC
Created attachment 143808 [details]
pkg-plist - proposed changes

"make check-orphans" is now happy, but is it OK to have all three of these lines for lynx.cfg?

@unexec if cmp -s %D/etc/lynx.cfg %D/etc/lynx.cfg.sample; then rm -f %D/etc/lynx.cfg; fi
etc/lynx.cfg
@exec if [ ! -f %B/lynx.cfg ]; then cp -p %D/%F %B/lynx.cfg; fi

If not, please choose the preferred line(s) for lynx.lss as well:

@unexec if cmp -s %D/etc/lynx.lss %D/etc/lynx.lss.sample; then rm -f %D/etc/lynx.lss; fi
etc/lynx.lss
@exec if [ ! -f %B/lynx.lss ]; then cp -p %D/%F %B/lynx.lss; fi

Thanks!

BTW, I didn't get the "make check-orphans" followup via (GNATS) email, hence the late (Bugzilla) reply.
Comment 5 commit-hook freebsd_committer 2014-07-04 14:15:02 UTC
A commit references this bug:

Author: culot
Date: Fri Jul  4 14:14:03 UTC 2014
New revision: 360620
URL: http://svnweb.freebsd.org/changeset/ports/360620

Log:
  - Update to 2.8.8.1

  PR:		ports/189687
  Submitted by:	Jason Harris <jharris@widomaker.com> (maintainer)

Changes:
  head/www/lynx/Makefile
  head/www/lynx/distinfo
  head/www/lynx/files/patch-makefile.in
  head/www/lynx/pkg-plist
Comment 6 Frederic Culot freebsd_committer 2014-07-04 14:15:22 UTC
And I did not get the follow-up on your answer neither, hence the long time before commit :'(