Skip site navigation (1)Skip section navigation (2)
Date:      Thu,  2 Feb 2006 01:33:10 -0500 (EST)
From:      "Jeffrey H. Johnson" <CPE1704TKS@bellsouth.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jharris@widomaker.com, CPE1704TKS@bellsouth.net
Subject:   ports/92718: [PATCH] www/elinks: update to 0.11.1
Message-ID:  <20060202063310.88F1E3981C@offworld.cqasys.com>
Resent-Message-ID: <200602020640.k126e3kP055325@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         92718
>Category:       ports
>Synopsis:       [PATCH] www/elinks: update to 0.11.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 02 06:40:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jeffrey H. Johnson
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD offworld.cqasys.com 6.0-STABLE FreeBSD 6.0-STABLE #21: Wed Jan 18 22:35:45 EST 2006
>Description:
- Update to 0.11.1
- No longer automatically link with libraries to ensure proper packages, thus:
-  OPTIONS for protocols: Finger, Gopher, BitTorrent, FTP, FSP, NNTP, SMB.
-  OPTIONS for scripting: SpiderMonkey, Ruby, Perl, Guile, Lua.
-  OPTIONS for extras: colors, XBEL, DOM, IDN, exmode, CGI, and other options.

-x-

This includes tested working support for all OPTIONS supplied.  This also
has been tested to build proper packages for all configurations available.

This patch supercedes the previous patch that I posted, which is currently
open at PR #92117.  That patch was for 0.11.0 and shared the problems of
the version currently in the tree.  This version is fully tested and working.

This patch is against the 0.10.5 version currently in the ports tree, as 
the port maintainer did not respond to the last patch request yet.

-x-

Port maintainer (jharris@widomaker.com) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- elinks-0.11.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/elinks/Makefile /usr/home/trn/port-work/elinks-0.11/Makefile
--- /usr/ports/www/elinks/Makefile	Sun Jul 31 09:32:49 2005
+++ /usr/home/trn/port-work/elinks-0.11/Makefile	Thu Feb  2 01:11:55 2006
@@ -6,18 +6,16 @@
 #
 
 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
+MASTER_SITES=	http://elinks.or.cz/download/ \
+		http://keyserver.kjsl.com/~jharris/distfiles/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 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
@@ -26,14 +24,165 @@
 #USE_ICONV=	yes
 #CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
 CONFIGURE_ARGS+=	--disable-nls
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+
+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
+
+.include <bsd.port.pre.mk>
+
+.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+=	${RUN_DEPENDS}
+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+=	${RUN_DEPENDS}
+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
 
+.if defined(WITH_88COLORS)
+CONFIGURE_ARGS+=	--enable-88-colors
+.endif
+
+.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
+
 MAN1=		elinks.1
 MAN5=		elinkskeys.5 elinks.conf.5
 
 PLIST_FILES=	bin/elinks
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/www/elinks/distinfo /usr/home/trn/port-work/elinks-0.11/distinfo
--- /usr/ports/www/elinks/distinfo	Sun Jul 31 09:32:49 2005
+++ /usr/home/trn/port-work/elinks-0.11/distinfo	Wed Feb  1 21:47:43 2006
@@ -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 -ruN --exclude=CVS /usr/ports/www/elinks/pkg-descr /usr/home/trn/port-work/elinks-0.11/pkg-descr
--- /usr/ports/www/elinks/pkg-descr	Sun Sep  1 11:10:09 2002
+++ /usr/home/trn/port-work/elinks-0.11/pkg-descr	Sat Jan 21 17:51:30 2006
@@ -15,5 +15,7 @@
      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/
--- elinks-0.11.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060202063310.88F1E3981C>