aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/lynx-current/Makefile21
-rw-r--r--www/lynx-current/distinfo6
-rw-r--r--www/lynx-current/files/patch-aa19
-rw-r--r--www/lynx-current/pkg-plist5
4 files changed, 31 insertions, 20 deletions
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 06e8b6b6d905..ce159dd0e6ed 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -6,28 +6,31 @@
#
PORTNAME= lynx
-PORTVERSION= 2.8.7r1
+PORTVERSION= 2.8.8d2
CATEGORIES= www ipv6
MASTER_SITES= http://lynx.isc.org/current/
-DISTNAME= ${PORTNAME}2.8.7rel.1
+DISTNAME= ${PORTNAME}2.8.8dev.2
MAINTAINER= ache@FreeBSD.org
COMMENT= A non-graphical, text-based World-Wide Web client
+LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
-CONFLICTS= lynx-2.8.[0-6].*
+CONFLICTS= lynx-2.8.[0-7].*
-WRKSRC= ${WRKDIR}/${PORTNAME}2-8-7
+WRKSRC= ${WRKDIR}/${PORTNAME}2-8-8
USE_BZIP2= yes
USE_ICONV= yes
NO_LATEST_LINK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-zlib --libdir="${L_LIB}" \
- --enable-nsl-fork --enable-nls --with-bzlib \
+ --enable-nsl-fork --with-bzlib \
--enable-nested-tables --enable-default-colors \
- --enable-scrollbar --enable-addrlist-page \
+ --enable-addrlist-page \
--enable-gzip-help \
+ --enable-idna \
+ --enable-ipv6 \
--with-mime-libdir=${PREFIX}/etc \
--with-libiconv-prefix=${LOCALBASE}
MAKE_JOBS_UNSAFE= yes
@@ -48,7 +51,6 @@ CONFIGURE_ARGS+= --with-screen=ncursesw
CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
.endif
-CONFIGURE_ARGS+=--enable-ipv6
MAKE_FLAGS= helpdir=${L_HELP} docdir=${L_DOC} -f
MAKEFILE= makefile
INSTALL_TARGET= install-full
@@ -61,14 +63,15 @@ L_HELP= ${PREFIX}/share/lynx_help
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
+CONFIGURE_ARGS+= --enable-nls
.else
-CONFIGURE_ARGS+=--disable-nls
+CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
post-install:
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_DOC}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_HELP}
- ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg
+ ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg* ${L_LIB}/lynx.lss*
.include <bsd.port.post.mk>
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index 080448bc9947..aa803c9f22e6 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1,3 +1,3 @@
-MD5 (lynx2.8.7rel.1.tar.bz2) = 493af4c77ef6761e3f0157cd1be033a0
-SHA256 (lynx2.8.7rel.1.tar.bz2) = 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
-SIZE (lynx2.8.7rel.1.tar.bz2) = 2432045
+MD5 (lynx2.8.8dev.2.tar.bz2) = 80180423a8e961664df8603e633dca1a
+SHA256 (lynx2.8.8dev.2.tar.bz2) = 7a1c2ce33870fde4645105e72399f4058e3d8221274d41e8024b8e0f7b2056a2
+SIZE (lynx2.8.8dev.2.tar.bz2) = 2437222
diff --git a/www/lynx-current/files/patch-aa b/www/lynx-current/files/patch-aa
index 8e88ed2357ae..de8c5ac586ce 100644
--- a/www/lynx-current/files/patch-aa
+++ b/www/lynx-current/files/patch-aa
@@ -1,6 +1,6 @@
---- makefile.in.orig Fri May 18 02:53:22 2007
-+++ makefile.in Fri May 25 05:06:51 2007
-@@ -365,14 +365,9 @@
+--- makefile.in.orig 2009-11-25 13:56:48.000000000 +0300
++++ makefile.in 2010-03-26 11:13:46.000000000 +0300
+@@ -384,14 +384,9 @@
if test "$(COMPRESS_PROG)" != "" ; then \
(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
fi'
@@ -18,7 +18,7 @@
@ECHO_CC@sed -e '/^HELPFILE:http/s!^!#!' \
-e '/^#HELPFILE:file/s!#!!' \
$(SYSCONFDIR)/lynx.tmp | \
-@@ -380,9 +375,10 @@
+@@ -399,9 +394,10 @@
$(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)!' \
@@ -29,9 +29,9 @@
-rm -f $(SYSCONFDIR)/lynx.tmp
+ -[ ! -f $(SYSCONFDIR)/lynx.cfg ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.cfg.default $(SYSCONFDIR)/lynx.cfg
- LYHelp.h : help_files.sed LYHelp.hin
+ LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
@echo Creating $@
-@@ -404,7 +400,7 @@
+@@ -423,10 +419,11 @@
$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
install-cfg : $(SYSCONFDIR)
@@ -39,4 +39,9 @@
+ @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.default
install-lss : $(SYSCONFDIR)
- @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
+- @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
++ @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.default
++ -[ ! -f $(SYSCONFDIR)/lynx.lss ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.lss.default $(SYSCONFDIR)/lynx.lss
+
+ uninstall ::
+ @MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index 2d2856354418..3fd31a4e526e 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -2,7 +2,9 @@ bin/lynx
@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
+@unexec if [ -f %D/etc/lynx.lss ] && cmp -s %D/etc/lynx.lss %D/etc/lynx.lss.default; then rm -f %D/etc/lynx.lss; fi
+etc/lynx.lss.default
+@exec if [ ! -f %D/etc/lynx.lss ] ; then cp -p %D/%F %B/lynx.lss; fi
@exec mkdir -p %D/share/lynx_help
%%DOCSDIR%%/CHANGES
%%DOCSDIR%%/COPYHEADER
@@ -32,6 +34,7 @@ etc/lynx.lss
%%DOCSDIR%%/docs/README.jp
%%DOCSDIR%%/docs/README.metrics
%%DOCSDIR%%/docs/README.options
+%%DOCSDIR%%/docs/README.release
%%DOCSDIR%%/docs/README.rootcerts
%%DOCSDIR%%/docs/README.ssl
%%DOCSDIR%%/docs/README.sslcerts