[65861] trunk/dports/www/elinks-devel
perry at macports.org
perry at macports.org
Fri Apr 2 00:37:30 PDT 2010
Revision: 65861
http://trac.macports.org/changeset/65861
Author: perry at macports.org
Date: 2010-04-02 00:37:26 -0700 (Fri, 02 Apr 2010)
Log Message:
-----------
Updated www/elinks-devel to 0.12pre5.
Modified Paths:
--------------
trunk/dports/www/elinks-devel/Portfile
Added Paths:
-----------
trunk/dports/www/elinks-devel/files/patch-Makefile.lib.diff
trunk/dports/www/elinks-devel/files/patch-configure.diff
trunk/dports/www/elinks-devel/files/patch-src-scripting-perl-hooks.h.diff
Removed Paths:
-------------
trunk/dports/www/elinks-devel/files/patch-hooks.h.diff
Modified: trunk/dports/www/elinks-devel/Portfile
===================================================================
--- trunk/dports/www/elinks-devel/Portfile 2010-04-02 07:32:44 UTC (rev 65860)
+++ trunk/dports/www/elinks-devel/Portfile 2010-04-02 07:37:26 UTC (rev 65861)
@@ -3,53 +3,93 @@
PortSystem 1.0
name elinks-devel
-version 0.12pre3
-revision 0
+version 0.12pre5
categories www
-maintainers perry
+maintainers perry openmaintainer
platforms darwin
description Full-Featured Text WWW Browser
-long_description ELinks is an advanced and well established feature rich \
+long_description ELinks is an advanced and well-established feature-rich \
text mode web (HTTP/FTP/..) browser.
+license GPLv2
homepage http://elinks.or.cz/
+livecheck.regex {unstable version is (.*),}
livecheck.type regex
-livecheck.regex {unstable version is (.*),}
livecheck.url ${homepage}
+depends_build port:pkgconfig
depends_lib \
- port:boehmgc port:bzip2 port:expat port:libiconv port:openssl port:see \
+ port:boehmgc \
+ port:bzip2 \
+ port:expat \
+ port:gettext \
+ port:libiconv \
+ port:libidn \
+ port:openssl \
+ port:spidermonkey \
+ port:tre \
port:zlib
distname elinks-${version}
master_sites ${homepage}download/
-checksums rmd160 5bcf4fb7d339d185466cc91f88a8b58816d35fa7
+checksums rmd160 517f8ef0e1978a204496631a63495656fbf51f19
+patchfiles patch-Makefile.lib.diff patch-configure.diff
+
+post-patch {
+ if {[variant_isset universal]} {
+ reinplace "s|@ARCHS@|${configure.universal_ldflags}|" ${worksrcpath}/Makefile.lib
+ } else {
+ reinplace "s|@ARCHS@|-arch ${build_arch}|" ${worksrcpath}/Makefile.lib
+ }
+}
+
configure.args \
- --disable-256-colors --disable-88-colors --disable-debug \
- --disable-fastmem --disable-fsp --disable-no-root --disable-own-libc \
- --disable-sm-scripting --disable-small --disable-smb --disable-sysmouse \
- --disable-true-color --enable-backtrace --enable-bittorrent \
- --enable-bookmarks --enable-cgi --enable-cookies --enable-css \
- --enable-data --enable-exmode --enable-finger --enable-formhist \
- --enable-ftp --enable-globhist --enable-gopher --enable-html-highlight \
- --enable-ipv6 --enable-largefile --enable-leds --enable-mailcap \
- --enable-marks --enable-mimetypes --enable-mouse --enable-nls \
- --enable-nntp --enable-uri-rewrite --enable-utf-8 --enable-xbel \
- --with-bzlib --with-gc --with-libiconv --with-openssl --with-see \
- --with-zlib --without-gnutls --without-gpm --without-gssapi \
- --without-guile --without-idn --without-lua --without-lzma \
- --without-perl --without-python --without-ruby --without-spidermonkey \
- --without-x --without-xterm
+ --disable-256-colors \
+ --disable-88-colors \
+ --disable-debug \
+ --disable-fsp \
+ --disable-smb \
+ --disable-true-color \
+ --enable-bittorrent \
+ --enable-cgi \
+ --enable-exmode \
+ --enable-finger \
+ --enable-gopher \
+ --enable-html-highlight \
+ --enable-nntp \
+ --with-gc \
+ --with-idn \
+ --with-libiconv \
+ --with-openssl \
+ --with-spidermonkey=${prefix} \
+ --with-tre \
+ --without-gnutls \
+ --without-gpm \
+ --without-gssapi \
+ --without-guile \
+ --without-lua \
+ --without-lzma \
+ --without-perl \
+ --without-python \
+ --without-ruby \
+ --without-see \
+ --without-x \
+ --without-xterm
-# Note: This variant increases memory usage regardless of color mode.
+use_parallel_build no
+
variant colors description {Enable support for 88/256 colors and True color} {
configure.args-append \
- --enable-256-colors --enable-88-colors --enable-true-color
+ --enable-256-colors \
+ --enable-88-colors \
+ --enable-true-color
configure.args-delete \
- --disable-256-colors --disable-88-colors --disable-true-color
+ --disable-256-colors \
+ --disable-88-colors \
+ --disable-true-color
}
variant debug description {Enable debug mode} {
@@ -57,60 +97,53 @@
configure.args-delete --disable-debug
}
-variant fsp description {Enable support for FSP} {
- depends_lib-append port:fsplib
+variant fsp description {Enable support for FSP (File Service Protocol)} {
+ depends_build-append port:fsplib
configure.args-append --enable-fsp
configure.args-delete --disable-fsp
}
variant gnutls description {Use GnuTLS in lieu of OpenSSL} {
- depends_lib-append port:gnutls
+ depends_lib-append port:gnutls port:libtasn1
depends_lib-delete port:openssl
configure.args-append --with-gnutls --without-openssl
- configure.args-delete --with-openssl --without-gnutls
+ configure.args-delete --without-gnutls --with-openssl
}
-variant guile description {Enable support for Guile} {
+variant guile description {Enable support for Guile scripting} {
depends_lib-append port:guile
configure.args-append --with-guile
configure.args-delete --without-guile
}
-variant idn description {Enable support for internationalized domain names} {
- depends_lib-append port:libidn
-
- configure.args-append --with-idn
- configure.args-delete --without-idn
-}
-
-variant lua description {Enable support for Lua} {
+variant lua description {Enable support for Lua scripting} {
depends_lib-append port:lua50
configure.args-append --with-lua=${prefix}
configure.args-delete --without-lua
}
-variant perl description {Enable support for Perl} {
+variant perl description {Enable support for Perl scripting} {
depends_lib-append path:bin/perl:perl5
- patchfiles patch-hooks.h.diff
+ patchfiles-append patch-src-scripting-perl-hooks.h.diff
configure.args-append --with-perl
configure.args-delete --without-perl
}
-variant python description {Enable support for Python} {
+variant python description {Enable support for Python scripting} {
depends_lib-append port:python26
configure.args-append --with-python
configure.args-delete --without-python
- configure.python ${prefix}/bin/python2.6
+ configure.python ${prefix}/bin/python2.6
}
-variant ruby description {Enable support for Ruby} {
+variant ruby description {Enable support for Ruby scripting} {
depends_lib-append port:ruby
configure.args-append --with-ruby
@@ -120,21 +153,15 @@
variant samba description {Enable support for Samba} {
depends_lib-append port:samba3
- configure.args-append --enable-smb
- configure.args-delete --disable-smb
+ configure.args-append --enable-smb
+ configure.args-delete --disable-smb
configure.ldflags-append "-L${prefix}/lib/samba3"
}
-variant x11 description {Enable support for X11} {
- depends_lib-append port:xorg-libX11
+variant see description {Use SEE in lieu of SpiderMonkey} {
+ depends_lib-append port:see
+ depends_lib-delete port:spidermonkey
- pre-configure {
- reinplace "s|x_includes=NONE|x_includes=${prefix}/include/X11|g" \
- ${worksrcpath}/configure
- reinplace "s|x_libraries=NONE|x_libraries=${prefix}/lib|g" \
- ${worksrcpath}/configure
- }
-
- configure.args-append --with-x
- configure.args-delete --without-x
+ configure.args-append --enable-see
+ configure.args-delete --with-spidermonkey=${prefix}
}
Added: trunk/dports/www/elinks-devel/files/patch-Makefile.lib.diff
===================================================================
--- trunk/dports/www/elinks-devel/files/patch-Makefile.lib.diff (rev 0)
+++ trunk/dports/www/elinks-devel/files/patch-Makefile.lib.diff 2010-04-02 07:37:26 UTC (rev 65861)
@@ -0,0 +1,11 @@
+--- Makefile.lib.orig 2010-03-29 21:13:12.000000000 -0700
++++ Makefile.lib 2010-03-29 21:16:02.000000000 -0700
+@@ -57,7 +57,7 @@
+
+ # Rule to compile a set of .o files into one .o file
+ quiet_cmd_ld_objs = " [$(LD_COLOR)LD$(END_COLOR)] $(RELPATH)$@"
+- cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \
++ cmd_ld_objs = $(CC) @ARCHS@ -nostdlib -r -o $@ $(filter $(OBJS), $^) \
+ $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
+ `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
+
Added: trunk/dports/www/elinks-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/www/elinks-devel/files/patch-configure.diff (rev 0)
+++ trunk/dports/www/elinks-devel/files/patch-configure.diff 2010-04-02 07:37:26 UTC (rev 65861)
@@ -0,0 +1,22 @@
+--- configure.orig 2010-04-01 22:38:13.000000000 -0700
++++ configure 2010-04-01 23:19:47.000000000 -0700
+@@ -18656,8 +18656,8 @@
+
+
+ if test "$enable_perl" = "yes"; then
+- PERL_LIBS="`perl -MExtUtils::Embed -e ldopts`"
+- PERL_CFLAGS="`perl -MExtUtils::Embed -e ccopts`"
++ PERL_LIBS="`perl -MExtUtils::Embed -e ldopts | perl -ne 's/(-arch|i386|ppc(64)?|x86_64)//g; print $_'`"
++ PERL_CFLAGS="`perl -MExtUtils::Embed -e ccopts | perl -ne 's/(-arch|i386|ppc(64)?|x86_64)//g; print $_'`"
+ LIBS="$PERL_LIBS $LIBS"
+ CFLAGS="$PERL_CFLAGS $CFLAGS"
+ CPPFLAGS="$CPPFLAGS $PERL_CFLAGS"
+@@ -19252,7 +19252,7 @@
+ echo $ECHO_N "checking for TRE in pkg-config... $ECHO_C" >&6; }
+ if pkg-config tre; then
+ TRE_CFLAGS=`pkg-config --cflags tre`
+- TRE_LIBS=`pkg-config --libs tre`
++ TRE_LIBS="`pkg-config --libs-only-L tre` `pkg-config --libs-only-l tre`"
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ else
Deleted: trunk/dports/www/elinks-devel/files/patch-hooks.h.diff
===================================================================
--- trunk/dports/www/elinks-devel/files/patch-hooks.h.diff 2010-04-02 07:32:44 UTC (rev 65860)
+++ trunk/dports/www/elinks-devel/files/patch-hooks.h.diff 2010-04-02 07:37:26 UTC (rev 65861)
@@ -1,13 +0,0 @@
---- src/scripting/perl/hooks.h.orig 2009-02-09 23:20:48.000000000 -0800
-+++ src/scripting/perl/hooks.h 2009-02-09 23:21:03.000000000 -0800
-@@ -2,6 +2,10 @@
- #ifndef EL__SCRIPTING_PERL_HOOKS_H
- #define EL__SCRIPTING_PERL_HOOKS_H
-
-+/* src/util/lists.h */
-+#undef LIST_HEAD
-+#define LIST_HEAD(x) x *next; x *prev
-+
- struct event_hook_info;
-
- extern struct event_hook_info perl_scripting_hooks[];
Copied: trunk/dports/www/elinks-devel/files/patch-src-scripting-perl-hooks.h.diff (from rev 65831, trunk/dports/www/elinks-devel/files/patch-hooks.h.diff)
===================================================================
--- trunk/dports/www/elinks-devel/files/patch-src-scripting-perl-hooks.h.diff (rev 0)
+++ trunk/dports/www/elinks-devel/files/patch-src-scripting-perl-hooks.h.diff 2010-04-02 07:37:26 UTC (rev 65861)
@@ -0,0 +1,13 @@
+--- src/scripting/perl/hooks.h.orig 2009-02-09 23:20:48.000000000 -0800
++++ src/scripting/perl/hooks.h 2009-02-09 23:21:03.000000000 -0800
+@@ -2,6 +2,10 @@
+ #ifndef EL__SCRIPTING_PERL_HOOKS_H
+ #define EL__SCRIPTING_PERL_HOOKS_H
+
++/* src/util/lists.h */
++#undef LIST_HEAD
++#define LIST_HEAD(x) x *next; x *prev
++
+ struct event_hook_info;
+
+ extern struct event_hook_info perl_scripting_hooks[];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100402/e44a96da/attachment.html>
More information about the macports-changes
mailing list