diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2000-02-15 07:25:53 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2000-02-15 07:25:53 +0000 |
commit | 7f4d9a06caa0b8a221c2a61670909c09f7424d8f (patch) | |
tree | 0e8397dd4da8b7eb39a9df785b9f5f8f91514c65 /ftp/pavuk | |
parent | Upgrade to stunnel 3.7 (diff) |
USE_OPENSSL
Submitted by: Jim Bloom <bloom@acm.org>
Approved by: Maintainer
Notes
Notes:
svn path=/head/; revision=25848
Diffstat (limited to 'ftp/pavuk')
-rw-r--r-- | ftp/pavuk/Makefile | 17 | ||||
-rw-r--r-- | ftp/pavuk/files/patch-ad | 11 | ||||
-rw-r--r-- | ftp/pavuk/files/patch-ae | 18 |
3 files changed, 44 insertions, 2 deletions
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile index bb535da0957b..94c6c2d5fb7f 100644 --- a/ftp/pavuk/Makefile +++ b/ftp/pavuk/Makefile @@ -18,7 +18,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= andy@icc.surw.chel.su -GNU_CONFIGURE= yes +USE_AUTOCONF= yes .if defined(NO_X11) CONFIGURE_ARGS= --disable-gtk @@ -29,6 +29,19 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm USE_GMAKE= yes +.if defined(USE_SSL) +USE_OPENSSL= RSA +.else +CONFIGURE_ARGS+= --disable-ssl +.endif + +.include <bsd.port.pre.mk> + +.if defined(OPENSSL_RSAREF) +CONFIGURE_ENV+= EXTRA_SSL_LIBS="-L${OPENSSLLIB} -lRSAglue -L${LOCALBASE}/lib -lrsaref" \ + OPENSSLLIB=${OPENSSLLIB} +.endif + MAN1= pavuk.1 do-install: @@ -51,4 +64,4 @@ do-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/ftp/pavuk/files/patch-ad b/ftp/pavuk/files/patch-ad new file mode 100644 index 000000000000..d425e9cc9b19 --- /dev/null +++ b/ftp/pavuk/files/patch-ad @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Feb 13 23:12:20 2000 ++++ Makefile.in Sun Feb 13 23:13:13 2000 +@@ -109,7 +109,7 @@ + config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +- cd $(srcdir) && $(AUTOCONF) ++ cd $(srcdir) && $(CONFIGURE_ENV) $(AUTOCONF) + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. diff --git a/ftp/pavuk/files/patch-ae b/ftp/pavuk/files/patch-ae new file mode 100644 index 000000000000..f1f89a6c4c59 --- /dev/null +++ b/ftp/pavuk/files/patch-ae @@ -0,0 +1,18 @@ +--- configure.in.orig Sun Jul 25 15:18:07 1999 ++++ configure.in Thu Feb 10 16:30:46 2000 +@@ -197,14 +197,14 @@ + fi + + if eval "test x$WITH_SSL = xyes"; then +- AC_CHECK_LIB(ssl, SSLv23_client_method, SSL_LIBS="-lssl", ,"-lcrypto") ++ AC_CHECK_LIB(ssl, SSLv23_client_method, SSL_LIBS="-lssl", ,-lcrypto $EXTRA_SSL_LIBS) + if test -n "$SSL_LIBS"; then + AC_CHECK_HEADER(ssl.h, SSLEAY=yes, SSLEAY=no) + AC_CHECK_HEADER(openssl/ssl.h, OPENSSL=yes, OPENSSL=no) + if eval "test x$SSLEAY = xno -a x$OPENSSL = xno"; then + AC_WARN("SSLeay headers not found --\> use --disable-ssl option or set --with-ssl-includes to apropriate location") + fi +- AC_CHECK_LIB(crypto, SSLeay, SSL_LIBS="$SSL_LIBS -lcrypto", SSL_LIBS='') ++ AC_CHECK_LIB(crypto, SSLeay, SSL_LIBS="$SSL_LIBS -lcrypto $EXTRA_SSL_LIBS", SSL_LIBS='', $EXTRA_SSL_LIBS) + fi + fi |