diff options
| author | Anders Nordby <anders@FreeBSD.org> | 2011-08-31 13:44:56 +0000 |
|---|---|---|
| committer | Anders Nordby <anders@FreeBSD.org> | 2011-08-31 13:44:56 +0000 |
| commit | 77fad6e6ca61a59ad80082b66f6169d439a7cb13 (patch) | |
| tree | ad6480d3093bb64c880f5fe549bd84691423fc0a /www/varnish | |
| parent | 24e277e48b2f347758d2a5533eea889028c8d3b5 (diff) | |
| download | ports-77fad6e6ca61a59ad80082b66f6169d439a7cb13.tar.gz ports-77fad6e6ca61a59ad80082b66f6169d439a7cb13.zip | |
Fix libedit support: use libreadline.
Drop varnishncsa -b patch, no need for it + does not work anymore.
Notes
Notes:
svn path=/head/; revision=280855
Diffstat (limited to 'www/varnish')
| -rw-r--r-- | www/varnish/Makefile | 7 | ||||
| -rw-r--r-- | www/varnish/files/patch-configure.ac | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/www/varnish/Makefile b/www/varnish/Makefile index 2eebcede4225..e2ae60ddd284 100644 --- a/www/varnish/Makefile +++ b/www/varnish/Makefile @@ -39,13 +39,6 @@ MAN7= vcl.7 varnish-cli.7 USE_RC_SUBR= varnishd varnishlog varnishncsa SUB_FILES= pkg-message -.if defined(WITH_VARNISHNCSA_B) -# I still find a use for varnishncsa -b, even though Varnish developers does -# not seem to want to keep this option. - anders@FreeBSD.org 2011-08-31 -PATCH_SITES+= http://anders.fupp.net/distfiles/:ncsab -PATCHFILES+= patch-varnishncsa-3.0.0.diff:ncsab -.endif - .include <bsd.port.pre.mk> .if ${OSVERSION} < 601000 diff --git a/www/varnish/files/patch-configure.ac b/www/varnish/files/patch-configure.ac index 1a82d3e9aa06..63b59223d650 100644 --- a/www/varnish/files/patch-configure.ac +++ b/www/varnish/files/patch-configure.ac @@ -1,5 +1,5 @@ --- configure.ac.orig 2011-08-30 11:15:59.000000000 +0200 -+++ configure.ac 2011-08-31 01:36:16.000000000 +0200 ++++ configure.ac 2011-08-31 13:43:24.000000000 +0200 @@ -138,9 +138,22 @@ AC_SUBST(PCRE_CFLAGS) AC_SUBST(PCRE_LIBS) @@ -12,7 +12,7 @@ + AC_CHECK_LIB(edit, el_init, + [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit]) + LIBEDIT_CFLAGS="" -+ LIBEDIT_LIBS="-ledit" ++ LIBEDIT_LIBS="-lreadline" + ], + [AC_MSG_WARN([libedit not found, disabling libedit support])]) + ;; |