update to 0.99.

from Robert Nagy
This commit is contained in:
espie 2004-02-23 15:44:43 +00:00
parent 8d1eb61885
commit 0ce05cf334
4 changed files with 101 additions and 6 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2002/12/03 00:01:19 margarida Exp $
# $OpenBSD: Makefile,v 1.9 2004/02/23 15:44:43 espie Exp $
COMMENT= "text browser, displays while downloading"
VERSION= 0.98
VERSION= 0.99
DISTNAME= links-${VERSION}
CATEGORIES= www
@ -18,6 +18,6 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://artax.karlin.mff.cuni.cz/%7Emikulas/links/download/ \
http://links.sourceforge.net/download/
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (links-0.98.tar.gz) = c411e8f85e959408d6c0182045bd7b62
RMD160 (links-0.98.tar.gz) = db9a18803145e6f997041fcedb9fe48977e9c57c
SHA1 (links-0.98.tar.gz) = c50fcc75c797e0a9a643944c6b5cb9fb8d41dcb6
MD5 (links-0.99.tar.gz) = c487673abcd6ffe568ab04e6003abdc8
RMD160 (links-0.99.tar.gz) = fafa5e7a58cb28fa89c0f87d92d7fa77027df1ef
SHA1 (links-0.99.tar.gz) = bccdb4f0359d27233218dc288e0465a931508e59

View File

@ -0,0 +1,66 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2004/02/23 15:44:43 espie Exp $
--- aclocal.m4.orig Thu Feb 12 23:04:12 2004
+++ aclocal.m4 Thu Feb 12 23:04:23 2004
@@ -124,62 +124,3 @@
am_indx=`expr "<<$>>am_indx" + 1`
done<<>>dnl>>)
changequote([,]))])
-
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN(PKG_CHECK_MODULES, [
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- AC_MSG_CHECKING(for $2)
-
- if $PKG_CONFIG --exists "$2" ; then
- AC_MSG_RESULT(yes)
- succeeded=yes
-
- AC_MSG_CHECKING($1_CFLAGS)
- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
- AC_MSG_RESULT($$1_CFLAGS)
-
- AC_MSG_CHECKING($1_LIBS)
- $1_LIBS=`$PKG_CONFIG --libs "$2"`
- AC_MSG_RESULT($$1_LIBS)
- else
- $1_CFLAGS=""
- $1_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- ifelse([$4], ,echo $$1_PKG_ERRORS,)
- fi
-
- AC_SUBST($1_CFLAGS)
- AC_SUBST($1_LIBS)
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- ifelse([$3], , :, [$3])
- else
- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
- fi
-])
-
-
-

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-configure_in,v 1.1 2004/02/23 15:44:43 espie Exp $
--- configure.in.orig Thu Feb 12 23:04:49 2004
+++ configure.in Thu Feb 12 23:05:41 2004
@@ -147,17 +147,7 @@
LIBS_X="$LIBS"
cf_result=no
if test -z "$disable_ssl"; then
- PKG_CHECK_MODULES(OPENSSL,openssl,pkgconfig_openssl=yes,pkgconfig_openssl=no)
- if test "$pkgconfig_openssl" = "yes"; then
AC_MSG_CHECKING([for OpenSSL])
- CPPFLAGS="$CPPFLAGS `pkg-config openssl --cflags-only-I`"
- LIBS="$LIBS `pkg-config openssl --libs`"
- AC_TRY_LINK([#include <openssl/ssl.h>], [OpenSSL_add_all_algorithms()], cf_result=yes, cf_result=no)
- if test "$cf_result" != yes; then
- AC_TRY_LINK([#include <openssl/ssl.h>], [SSLeay_add_ssl_algorithms()], cf_result=yes, cf_result=no)
- fi
- else
- AC_MSG_CHECKING([for OpenSSL])
for ssldir in "" /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/local/www /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl; do
if test "$cf_result" = no; then
if test ! -z "$ssldir" && test "$ssldir" != /usr; then
@@ -172,7 +162,6 @@
fi
fi
done
- fi
AC_MSG_RESULT($cf_result)