[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

UPDATE: www/elinks



Scratch the 0.10.6 update I sent earlier.  They just released 0.11.0 on
the first of the year.  Here is the update for that.

Summary of changes to the port:
* removed -gopher flavor and incorporated into base build as it does
  not depend on any outside package(s)
* added bzlib support because bzip2 was already required to extract
  distfile, so why not incorporate into base build 
* modified to use our libiconv (still uses their own gettext, however)

The CONFIGURE_ENV additions may look strange; but, configure would not
see bzlib.h or iconv.h without it.

Also, two of the new patches have to do with the use of "PRId64".  For
now, I have patched out the places where this was used.  Is there
possibly a better way to deal with this is this the only (best) way
currently?

Test and comment please.  Thanks!

-- 
James Prevatt <jprevatt+bsd_(_at_)_paunix_(_dot_)_org>
Website: http://jprevatt.beevomit.org
Gopher: gopher://sdf.lonestar.org/users/jprevatt
SDF Public Access UNIX System - http://sdf.lonestar.org
v2sw5Yhw6ln3pr4Ock2ma9u7Ow2m5l6i2e4t6MAb8Hen5g5Ta28s5Mr5 hackerkey.com
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/elinks/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	22 Oct 2005 23:55:20 -0000	1.3
+++ Makefile	4 Jan 2006 20:17:48 -0000
@@ -1,13 +1,12 @@
 # $OpenBSD: Makefile,v 1.3 2005/10/22 23:55:20 espie Exp $
 
 COMMENT=		"full-featured text WWW browser"
-DISTNAME=		elinks-0.10.5
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		elinks-0.11.0
 EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		www
-MASTER_SITES=		http://elinks.or.cz/download/
+MASTER_SITES=		http://elinks.cz/download/
 
-HOMEPAGE=		http://elinks.or.cz/
+HOMEPAGE=		http://elinks.cz/
 
 MAINTAINER=		James Prevatt <jprevatt+bsd_(_at_)_paunix_(_dot_)_org>
 
@@ -18,20 +17,24 @@
 PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE=	gnu
-BUILD_DEPENDS=		:automake-1.4.*:devel/automake/1.4
+CONFIGURE_ENV+=		CFLAGS=-I${LOCALBASE}/include \
+			LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-bzlib \
+			--disable-xbel \
+			--enable-gopher \
+			--with-libiconv=${LOCALBASE}
+LIB_DEPENDS+=		bz2::archivers/bzip2
 USE_GMAKE=		Yes
 
 RUN_DEPENDS=		::devel/gettext
 WANTLIB=		crypto c z ssl
+MODULES=		converters/libiconv
 
-FLAVORS=		gopher lua no_x11
+FLAVORS=		lua no_x11
 FLAVOR?=		
 
-.if ${FLAVOR:L:Mgopher}
-CONFIGURE_ARGS+=	--enable-gopher
-.endif
-
 .if ${FLAVOR:L:Mlua}
+CONFIGURE_ARGS+=	--with-lua
 LIB_DEPENDS+=		lua.5,lualib.5::lang/lua
 WANTLIB+=		m
 .else
@@ -41,13 +44,9 @@
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+=	--without-x
 .else
+CONFIGURE_ARGS+=	--with-x
 USE_X11=		Yes
 WANTLIB+=		X11
 .endif
-
-post-patch:
-	@cd ${WRKSRC} && automake-1.4 -a -c
-
-REGRESS_IS_INTERACTIVE=	Yes
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/elinks/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	22 Jul 2005 04:21:30 -0000	1.1
+++ distinfo	4 Jan 2006 20:17:48 -0000
@@ -1,4 +1,4 @@
-MD5 (elinks-0.10.5.tar.bz2) = d19fea8cddd1c64ae890319650dce1ff
-RMD160 (elinks-0.10.5.tar.bz2) = f1b54cfa1eb4375a20b4b4e1a6edcc589739c3a2
-SHA1 (elinks-0.10.5.tar.bz2) = f05fcb5194bd5a6b43ed4bc09880de7577cbcce0
-SIZE (elinks-0.10.5.tar.bz2) = 2357709
+MD5 (elinks-0.11.0.tar.bz2) = 9154f493f544af31ae31ec1dd203d315
+RMD160 (elinks-0.11.0.tar.bz2) = ff95458cab4890ab724d823dc78e6d3d7b871b3d
+SHA1 (elinks-0.11.0.tar.bz2) = 8d6c0aac00c8e79dd654e13807be7e1a50a8dec1
+SIZE (elinks-0.11.0.tar.bz2) = 2575870
Index: patches/patch-Makefile_base
===================================================================
RCS file: patches/patch-Makefile_base
diff -N patches/patch-Makefile_base
--- patches/patch-Makefile_base	22 Jul 2005 04:21:30 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-Makefile_base,v 1.1 2005/07/22 04:21:30 marco Exp $
---- Makefile.base.orig	Thu Apr 29 10:17:12 2004
-+++ Makefile.base	Wed May 25 11:29:47 2005
-@@ -13,4 +13,4 @@ COMPILE = $(CC) @DEFS@ $(INCLUDES) $(AM_
- # Rule for getting test dependencies right. This is a workaround since
- # automake doesn't support defining subdirs sources.
- testutils:
--	make -C $(top_builddir)/src/util CPPFLAGS="-DDEBUG"
-+	$(MAKE) -C $(top_builddir)/src/util CPPFLAGS="-DDEBUG"
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure	4 Jan 2006 20:17:48 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- configure.orig	Sun Jan  1 11:39:43 2006
++++ configure	Wed Jan  4 14:18:10 2006
+@@ -22496,10 +22496,6 @@ ALL_CFLAGS="$CFLAGS $CPPFLAGS"
+ 
+ 
+ 
+-if test $(`which tput` colors) -ge 4; then
+-	MAKE_COLOR=1
+-
+-fi
+ 
+ 
+                                                                       ac_config_files="$ac_config_files Makefile.config contrib/elinks.spec contrib/lua/hooks.lua contrib/conv/w3m2links.awk doc/man/man1/elinks.1 src/intl/gettext/ref-add.sed src/intl/gettext/ref-del.sed"
Index: patches/patch-src_cache_dialogs_c
===================================================================
RCS file: patches/patch-src_cache_dialogs_c
diff -N patches/patch-src_cache_dialogs_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_cache_dialogs_c	4 Jan 2006 20:17:48 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- src/cache/dialogs.c.orig	Sun Jan  1 11:39:36 2006
++++ src/cache/dialogs.c	Wed Jan  4 13:28:54 2006
+@@ -82,9 +82,9 @@ get_cache_entry_info(struct listbox_item
+ 		}
+ 	}
+ 
+-	add_format_to_string(&msg, "\n%s: %" PRId64, _("Size", term),
++	add_format_to_string(&msg, "\n%s: %lld", _("Size", term),
+ 	                     cached->length);
+-	add_format_to_string(&msg, "\n%s: %" PRId64, _("Loaded size", term),
++	add_format_to_string(&msg, "\n%s: %lld", _("Loaded size", term),
+ 						cached->data_size);
+ 	if (cached->content_type) {
+ 		add_format_to_string(&msg, "\n%s: %s", _("Content type", term),
Index: patches/patch-src_dialogs_document_c
===================================================================
RCS file: patches/patch-src_dialogs_document_c
diff -N patches/patch-src_dialogs_document_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_dialogs_document_c	4 Jan 2006 20:17:48 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/dialogs/document.c.orig	Wed Jan  4 13:29:51 2006
++++ src/dialogs/document.c	Wed Jan  4 13:30:05 2006
+@@ -152,7 +152,7 @@ document_info_dialog(struct session *ses
+ 	if (cached) {
+ 		unsigned char *a;
+ 
+-		add_format_to_string(&msg, "\n%s: %" PRId64,
++		add_format_to_string(&msg, "\n%s: %lld",
+ 				     _("Size", term), cached->length);
+ 
+ 		if (cached->incomplete) {
Index: patches/patch-src_intl_gettext_Makefile
===================================================================
RCS file: patches/patch-src_intl_gettext_Makefile
diff -N patches/patch-src_intl_gettext_Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_intl_gettext_Makefile	4 Jan 2006 20:17:48 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/intl/gettext/Makefile.orig	Sun Jan  1 11:39:36 2006
++++ src/intl/gettext/Makefile	Wed Jan  4 14:17:41 2006
+@@ -26,8 +26,8 @@ OBJS = \
+ 
+ 
+ # $(builddir)/charset.alias: $(srcdir)/config.charset
+-$(builddir)/charset.alias: $(srcdir)config.charset
+-	$(SHELL) $(srcdir)/config.charset '$(host)' > $_(_at_)__(_dot_)_new
++$(builddir)/charset.alias: config.charset
++	$(SHELL) config.charset '$(host)' > $_(_at_)__(_dot_)_new
+ 	mv $_(_at_)__(_dot_)_new $@
+ 
+ # FIXME: Building plural.c from plural.y on the fly doesn't work
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/elinks/pkg/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- pkg/DESCR	4 Sep 2005 19:02:32 -0000	1.2
+++ pkg/DESCR	4 Jan 2006 20:17:48 -0000
@@ -4,6 +4,5 @@
 portable and runs on a variety of platforms.
 
 Flavors:
-        gopher     - build with gopher support
         lua        - build with Lua support
         no_x11     - build without X11 support
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/elinks/pkg/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- pkg/PLIST	22 Jul 2005 04:21:30 -0000	1.1
+++ pkg/PLIST	4 Jan 2006 20:17:48 -0000
@@ -4,12 +4,8 @@
 @man man/man1/elinks.1
 @man man/man5/elinks.conf.5
 @man man/man5/elinkskeys.5
-_(_at_)_comment share/locale/be/
-_(_at_)_comment share/locale/be/LC_MESSAGES/
 share/locale/be/LC_MESSAGES/elinks.mo
 share/locale/bg/LC_MESSAGES/elinks.mo
-_(_at_)_comment share/locale/ca/
-_(_at_)_comment share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/elinks.mo
 share/locale/cs/LC_MESSAGES/elinks.mo
 share/locale/da/LC_MESSAGES/elinks.mo
@@ -31,14 +27,15 @@
 @comment share/locale/lt/
 @comment share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/elinks.mo
+share/locale/nb/LC_MESSAGES/elinks.mo
 share/locale/nl/LC_MESSAGES/elinks.mo
-share/locale/no/LC_MESSAGES/elinks.mo
 share/locale/pl/LC_MESSAGES/elinks.mo
 share/locale/pt/LC_MESSAGES/elinks.mo
 share/locale/pt_BR/LC_MESSAGES/elinks.mo
 share/locale/ro/LC_MESSAGES/elinks.mo
 share/locale/ru/LC_MESSAGES/elinks.mo
 share/locale/sk/LC_MESSAGES/elinks.mo
+share/locale/sr/LC_MESSAGES/elinks.mo
 share/locale/sv/LC_MESSAGES/elinks.mo
 share/locale/tr/LC_MESSAGES/elinks.mo
 share/locale/uk/LC_MESSAGES/elinks.mo