8 files changed, 268 insertions, 23 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index c13cebe24098..e23183e1b0f5 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -6,34 +6,191 @@
 #
 
 PORTNAME=	elinks
-PORTVERSION=	0.10.5
+PORTVERSION=	0.11.1
 CATEGORIES=	www
-MASTER_SITES=	http://keyserver.kjsl.com/~jharris/distfiles/ \
-		http://elinks.or.cz/download/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://elinks.or.cz/download/ \
+		http://keyserver.kjsl.com/~jharris/distfiles/
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Elinks - links text WWW browser with enhancements
 
-USE_GPG?=	yes
-SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.asc
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_OPENSSL=	yes
-#USE_ICONV=	yes
-#CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+
+MAN1=		elinks.1
+MAN5=		elinkskeys.5 elinks.conf.5
+
+OPTIONS=	88COLORS	"Enable 88 color support"	on \
+		256COLORS	"Enable 256 color support"	on \
+		SPIDERMONKEY	"Enable ECMAScript support (via SpiderMonkey)" off \
+		XBELMARKS	"Enable XBEL bookmarks (via expat)" off \
+		LOCAL_CGI	"Enable local CGI support" off \
+		FINGER		"Enable finger protocol support" off \
+		GOPHER		"Enable gopher protocol support" off \
+		BITTORRENT	"Enable BitTorrent protocol support" off \
+		NNTP		"Enable NNTP (News) protocol support" off \
+		FTP		"Enable FTP protocol support" on \
+		FSP		"Enable FSP protocol support (via fsplib)" off \
+		SMB		"Enable SMP protocol support (via smbclient)" off \
+		EXMODE		"Enable exmode (CLI) support" on \
+		HIGHLIGHT	"Enable HTML highlighting using DOM engine" on \
+		IDN		"Enable international domain name support" off \
+		NOROOT		"Enable prevention of usage by root" off \
+		FASTMEM		"Enable fast memory allocation functions" on \
+		PERLSCRIPT	"Enable Perl scripting support" off \
+		RUBYSCRIPT	"Enable Ruby scripting support" off \
+		LUASCRIPT	"Enable Lua scripting support" off \
+		GUILESCRIPT	"Enable Guile scripting support" off \
+		ICONV		"Enable iconv support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=	--disable-nls
+.else
+PLIST_SUB+=	NLS=""
+USE_GETTEXT=	yes
+.endif
+
+.if defined(WITH_RUBYSCRIPT)
+LIB_DEPENDS+=	ruby18:${PORTSDIR}/lang/ruby18
+CONFIGURE_ARGS+=	--with-ruby
+.else
+CONFIGURE_ARGS+=	--without-ruby
+.endif
+
+.if defined(WITH_GUILESCRIPT)
+LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
+CONFIGURE_ARGS+=	--with-guile
+.else
+CONFIGURE_ARGS+=	--without-guile
+.endif
+
+.if defined(WITH_LUASCRIPT)
+LIB_DEPENDS+=	lua:${PORTSDIR}/lang/lua
+CONFIGURE_ARGS+=	--with-lua
+.else
+CONFIGURE_ARGS+=	--without-lua
+.endif
+
+.if defined(WITH_PERLSCRIPT)
+USE_PERL5=	yes
+CONFIGURE_ARGS+=	--with-perl
+.else
+CONFIGURE_ARGS+=	--without-perl
+.endif
+
+.if defined(WITH_FASTMEM)
+CONFIGURE_ARGS+=	--enable-fastmem
+.endif
+
+.if defined(WITH_IDN)
+LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
+CONFIGURE_ARGS+=	--with-idn
+.else
+CONFIGURE_ARGS+=	--without-idn
+.endif
+
+.if defined(WITH_NOROOT)
+CONFIGURE_ARGS+=	--enable-no-root
+.endif
+
+.if defined(WITH_HIGHLIGHT)
+CONFIGURE_ARGS+=	--enable-html-highlight
+.endif
+
+.if defined(WITH_EXMODE)
+CONFIGURE_ARGS+=	--enable-exmode
+.endif
+
+.if defined(WITH_SMB)
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
+BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
+CONFIGURE_ARGS+=	--enable-smb
+.else
+CONFIGURE_ARGS+=	--disable-smb
+.endif
+
+.if defined(WITH_FSP)
+RUN_DEPENDS+=	${LOCALBASE}/lib/libfsp.a:${PORTSDIR}/net/fsplib
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libfsp.a:${PORTSDIR}/net/fsplib
+CONFIGURE_ARGS+=	--enable-fsp
+.else
+CONFIGURE_ARGS+=	--disable-fsp
+.endif
+
+.if defined(WITH_FTP)
+CONFIGURE_ARGS+=	--enable-ftp
+.else
+CONFIGURE_ARGS+=	--disable-ftp
+.endif
+
+.if defined(WITH_NNTP)
+CONFIGURE_ARGS+=	--enable-nntp
+.else
+CONFIGURE_ARGS+=	--disable-nntp
+.endif
+
+.if defined(WITH_BITTORRENT)
+CONFIGURE_ARGS+=	--enable-bittorrent
+.else
+CONFIGURE_ARGS+=	--disable-bittorrent
+.endif
+
+.if defined(WITH_GOPHER)
+CONFIGURE_ARGS+=	--enable-gopher
+.else
+CONFIGURE_ARGS+=	--disable-gopher
+.endif
+
+.if defined(WITH_FINGER)
+CONFIGURE_ARGS+=	--enable-finger
+.else
+CONFIGURE_ARGS+=	--disable-finger
+.endif
+
+.if defined(WITH_LOCAL_CGI)
+CONFIGURE_ARGS+=	--enable-cgi
+.else
+CONFIGURE_ARGS+=	--disable-cgi
+.endif
+
+.if defined(WITH_XBELMARKS)
+LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2
+CONFIGURE_ARGS+=	--enable-xbel --with-expat
+.else
+CONFIGURE_ARGS+=	--disable-xbel
+.endif
 
 .if defined(WITH_256COLORS)
 CONFIGURE_ARGS+=	--enable-256-colors
 .endif
 
-MAN1=		elinks.1
-MAN5=		elinkskeys.5 elinks.conf.5
+.if defined(WITH_88COLORS)
+CONFIGURE_ARGS+=	--enable-88-colors
+.endif
 
-PLIST_FILES=	bin/elinks
+.if defined(WITH_SPIDERMONKEY)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libjs.so:${PORTSDIR}/lang/spidermonkey
+RUN_DEPENDS+=	js:${PORTSDIR}/lang/spidermonkey
+LIB_DEPENDS+=	nspr4:${PORTSDIR}/devel/nspr
+CFLAGS+=	-I${LOCALBASE}/include/nspr
+LDFLAGS+=	-lnspr4 -pthread -lpthread -lm
+CONFIGURE_ARGS+=	--enable-sm-scripting --with-spidermonkey
+.else
+CONFIGURE_ARGS+=	--disable-sm-scripting --without-spidermonkey
+.endif
+
+.if defined(WITH_ICONV)
+USE_ICONV=	yes
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
index 2fea0230c45c..74bdb3601730 100644
--- a/www/elinks/distinfo
+++ b/www/elinks/distinfo
@@ -1,10 +1,3 @@
-MD5 (elinks-0.10.5.tar.bz2) = d19fea8cddd1c64ae890319650dce1ff
-SHA1 (elinks-0.10.5.tar.bz2) = f05fcb5194bd5a6b43ed4bc09880de7577cbcce0
-RMD160 (elinks-0.10.5.tar.bz2) = f1b54cfa1eb4375a20b4b4e1a6edcc589739c3a2
-SHA256 (elinks-0.10.5.tar.bz2) = 4366f63ecf9c0fe84beb1757cef4481066943230172b708489c0d7e7baf25b19
-SIZE (elinks-0.10.5.tar.bz2) = 2357709
-MD5 (elinks-0.10.5.tar.bz2.asc) = 7a5c30bf678ef05be74bbb2e13056982
-SHA1 (elinks-0.10.5.tar.bz2.asc) = 2514a3d94bd7a032252f5050cdf16130f72cfca2
-RMD160 (elinks-0.10.5.tar.bz2.asc) = a524e7ebbec2e156e0d3647e5c349f9400969e3e
-SHA256 (elinks-0.10.5.tar.bz2.asc) = 1e5d8d2096f6e60d5351c0d60d4d02c56eddeeef1d26d0b3305cf04cb0abaf36
-SIZE (elinks-0.10.5.tar.bz2.asc) = 305
+MD5 (elinks-0.11.1.tar.bz2) = db0d62394b03938eec81b749e49dfbbc
+SHA256 (elinks-0.11.1.tar.bz2) = d18c723840a91989e79273215363391567b9a48b901efa458fb3974e8487327d
+SIZE (elinks-0.11.1.tar.bz2) = 2612791
diff --git a/www/elinks/files/patch-src_cache_cache.c b/www/elinks/files/patch-src_cache_cache.c
new file mode 100644
index 000000000000..9904b37f87d6
--- /dev/null
+++ b/www/elinks/files/patch-src_cache_cache.c
@@ -0,0 +1,12 @@
+--- src/cache/cache.c.orig	Tue Feb 14 13:41:35 2006
++++ src/cache/cache.c	Tue Feb 14 13:41:49 2006
+@@ -1,5 +1,9 @@
+ /* Cache subsystem */
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version < 500000
++#define	PRId64		"lld"
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
diff --git a/www/elinks/files/patch-src_cache_dialogs.c b/www/elinks/files/patch-src_cache_dialogs.c
new file mode 100644
index 000000000000..42f0a4f5680e
--- /dev/null
+++ b/www/elinks/files/patch-src_cache_dialogs.c
@@ -0,0 +1,13 @@
+--- src/cache/dialogs.c.orig	Tue Feb 14 13:38:58 2006
++++ src/cache/dialogs.c	Tue Feb 14 13:39:53 2006
+@@ -4,6 +4,10 @@
+ #define _GNU_SOURCE /* XXX: we _WANT_ strcasestr() ! */
+ #endif
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version < 500000
++#define	PRId64		"lld"
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
diff --git a/www/elinks/files/patch-src_dialogs_document.c b/www/elinks/files/patch-src_dialogs_document.c
new file mode 100644
index 000000000000..62cb76c714a3
--- /dev/null
+++ b/www/elinks/files/patch-src_dialogs_document.c
@@ -0,0 +1,12 @@
+--- src/dialogs/document.c.orig	Tue Feb 14 13:42:17 2006
++++ src/dialogs/document.c	Tue Feb 14 13:43:00 2006
+@@ -1,5 +1,9 @@
+ /* Information about current document and current link */
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version < 500000
++#define	PRId64		"lld"
++#endif
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
diff --git a/www/elinks/files/patch-src_intl_gettext_Makefile b/www/elinks/files/patch-src_intl_gettext_Makefile
new file mode 100644
index 000000000000..b046fff67e69
--- /dev/null
+++ b/www/elinks/files/patch-src_intl_gettext_Makefile
@@ -0,0 +1,25 @@
+--- src/intl/gettext/Makefile.orig	Thu Feb 16 07:41:10 2006
++++ src/intl/gettext/Makefile	Thu Feb 16 07:48:45 2006
+@@ -47,14 +47,12 @@
+ 	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+ 	    orig=$(DESTDIR)$(libdir)/charset.alias; \
+ 	    sed -f ref-add.sed $$orig > $$temp; \
+-	    $(INSTALL_DATA) $$temp $$dest; \
+ 	    rm -f $$temp; \
+ 	  else \
+ 	    if test $(GLIBC21) = no; then \
+ 	      $(MKINSTALLDIRS) $(DESTDIR)$(libdir); \
+ 	      orig=charset.alias; \
+ 	      sed -f ref-add.sed $$orig > $$temp; \
+-	      $(INSTALL_DATA) $$temp $$dest; \
+ 	      rm -f $$temp; \
+ 	    fi; \
+ 	  fi; \
+@@ -65,7 +63,6 @@
+ 	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+ 	  dest=$(DESTDIR)$(localedir)/locale.alias; \
+ 	  sed -f ref-add.sed $$orig > $$temp; \
+-	  $(INSTALL_DATA) $$temp $$dest; \
+ 	  rm -f $$temp; \
+ 	else \
+ 	  : ; \
diff --git a/www/elinks/pkg-descr b/www/elinks/pkg-descr
index 2fa1ba857035..25829084f5b2 100644
--- a/www/elinks/pkg-descr
+++ b/www/elinks/pkg-descr
@@ -15,5 +15,7 @@ So far elinks adds the following to links:
      unhistory 
      support for editing textareas in external editor 
      ability to switch off document-specific colors 
+     Spidermonkey-based ECMAScript support
+     Syntax highlighting for HTML, RSS, and XBEL
 
 WWW: http://elinks.or.cz/
diff --git a/www/elinks/pkg-plist b/www/elinks/pkg-plist
new file mode 100644
index 000000000000..c3a0e92a2ace
--- /dev/null
+++ b/www/elinks/pkg-plist
@@ -0,0 +1,31 @@
+bin/elinks
+%%NLS%%share/locale/be/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/da/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/de/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/el/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/es/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/et/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/id/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/is/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/it/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/elinks.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/elinks.mo