ports/112094: www/lynx: plist missing configuration file

[Eric P. Scott]

>Number:         112094
>Category:       ports
>Synopsis:       www/lynx: plist missing configuration file
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 24 21:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Eric P. Scott
>Release:        FreeBSD 6.2-RELEASE-p2 i386
>Organization:
ana-systems, Inc.
>Environment:
System: FreeBSD sixofone 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Tue Feb 27 22:41:06 UTC 2007 root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
www/lynx (and www/lynx-ssl) packages are broken because the lynx
executable can't find lynx.lss.  This file was not required by
previous (2.8.5 and earlier) releases.

1. Add etc/lynx.lss to pkg-plist
2. Decouple PORTREVISION from current lynx patchlevel
3. Derive WRKSRC from PORTVERSION
4. Remove extraneous post-patch action

Although it is not part of the patch below, I encourage the port
maintainer to consider adding  --without-lss-file  to
CONFIGURE_ARGS; this would make 2.8.6 behave more like its
predecessor.  See the source's INSTALLATION file for a full
explanation.
>How-To-Repeat:
% pkg_add lynx-ssl-2.8.6_4.tbz
% lynx

Lynx file "/usr/local/etc/lynx.lss" is not available.

>Fix:
diff -ruN /usr/ports/www/lynx/Makefile www/lynx/Makefile
--- /usr/ports/www/lynx/Makefile	Sun Apr 15 06:38:41 2007
+++ www/lynx/Makefile
@@ -7,11 +7,12 @@
 
 PORTNAME=	lynx
 PORTVERSION=	2.8.6
-PORTREVISION=	4
+PORTREVISION=	5
+DISTVERSION=	${PORTVERSION}rel.4
+DISTNAME=	${PORTNAME}${DISTVERSION}
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://lynx.isc.org/current/ \
 		ftp://lynx.isc.org/lynx${PORTVERSION}/patches/:patches
-DISTNAME=	${PORTNAME}${PORTVERSION}rel.${PORTREVISION}
 
 MAINTAINER?=	jharris at widomaker.com
 COMMENT?=	A non-graphical, text-based World-Wide Web client
@@ -19,7 +20,7 @@
 CONFLICTS?=	lynx-ssl* lynx-current*
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}2-8-6
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/./-/g}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-persistent-cookies \
@@ -38,7 +39,6 @@
 L_HELP=		${PREFIX}/share/lynx_help
 
 post-patch:
-	@${RM} -f ${WRKSRC}/CHANGES.orig
 	@${REINPLACE_CMD} -e 's|-lssl -lcrypto|-L${OPENSSLLIB} &|g' \
 		${WRKSRC}/configure
 
diff -ruN /usr/ports/www/lynx/pkg-plist www/lynx/pkg-plist
--- /usr/ports/www/lynx/pkg-plist	Sun Apr 15 06:38:42 2007
+++ www/lynx/pkg-plist
@@ -2,6 +2,7 @@
 @unexec if [ -f %D/etc/lynx.cfg ] && cmp -s %D/etc/lynx.cfg %D/etc/lynx.cfg.default; then rm -f %D/etc/lynx.cfg; fi
 etc/lynx.cfg.default
 @exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi
+etc/lynx.lss
 @exec mkdir -p %D/share/lynx_help
 %%DOCSDIR%%/CHANGES
 %%DOCSDIR%%/COPYHEADER
>Release-Note:
>Audit-Trail:
>Unformatted: