From 403db7837b6a3300a2d7f5c89a2e6e18c4c382f4 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 21 Oct 2002 13:27:24 +0000 Subject: Convert to buildlink2. Get rid of autoconf dependency by adding a patch. --- www/arena/Makefile | 22 +++--- www/arena/distinfo | 3 +- www/arena/patches/patch-ak | 190 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 14 deletions(-) create mode 100644 www/arena/patches/patch-ak (limited to 'www/arena') diff --git a/www/arena/Makefile b/www/arena/Makefile index ad2bd59e16c..080081e81a9 100644 --- a/www/arena/Makefile +++ b/www/arena/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2002/10/02 18:52:38 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2002/10/21 13:27:24 wiz Exp $ DISTNAME= arena-0.3.62 PKGREVISION= 2 @@ -10,27 +10,20 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.yggdrasil.com/Products/Arena/ COMMENT= Experimental HTML 3 browser, supports math and style sheets -DEPENDS+= jpeg-6b:../../graphics/jpeg -DEPENDS+= libwww>=5.3.2nb1:../../www/libwww -DEPENDS+= png>=1.2.1:../../graphics/png - -AUTOCONF_REQD?= 2.13 BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES +USE_BUILDLINK2= YES USE_GMAKE= YES -USE_LIBINTL= YES USE_X11= YES -USE_XPM= YES # Comment out the following to build in the debugging symbols. CONFIGURE_ARGS+= --without-debug CONFIGURE_ARGS+= --with-arenarc-dir=${LOCALBASE}/etc CONFIGURE_ARGS+= --with-libwww-config-h-dir=${WRKDIR} -CONFIGURE_ARGS+= --with-libwww-include=${LOCALBASE}/include/w3c-libwww -CONFIGURE_ARGS+= --with-libwww-libdir=${LOCALBASE}/lib +CONFIGURE_ARGS+= --with-libwww-include=${BUILDLINK_PREFIX.libwww}/include/w3c-libwww +CONFIGURE_ARGS+= --with-libwww-libdir=${BUILDLINK_PREFIX.libwww}/lib -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include MAKEFILE= makefile # Arena requires libwww's "config.h" header - it is installed as "wwwconf.h", @@ -42,7 +35,6 @@ pre-configure: ${LN} -sf $$c ${WRKSRC}/config.h; \ fi; \ done - cd ${WRKSRC} && ${AUTOCONF} do-install: ${INSTALL_PROGRAM} \ @@ -71,5 +63,9 @@ EXTRACT_ELEMENTS= ${GLOBAL_EXCLUDE_ARG} EXTRACT_ELEMENTS+= ${EXCLUDE_ARG} Arena-*/Auxiliary/${DONT_EXTRACT_SUBDIR} .endfor -.include "../../mk/autoconf.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../www/libwww/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/arena/distinfo b/www/arena/distinfo index eaed12c03a0..9575f683d1c 100644 --- a/www/arena/distinfo +++ b/www/arena/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:02:33 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/10/21 13:27:24 wiz Exp $ SHA1 (arena-0.3.62.tar.gz) = 21a28049c519630f7a2c0a759568316102f07410 Size (arena-0.3.62.tar.gz) = 1277043 bytes @@ -12,3 +12,4 @@ SHA1 (patch-ag) = 8d9b6181ca38c37c60124ddece89c26a64fe1737 SHA1 (patch-ah) = 1e7907dc79a394f3f3adf138d0721a8fb67c8d66 SHA1 (patch-ai) = 8e943f47afd8dbd268e34e52e854f8028ec028c5 SHA1 (patch-aj) = 6c4f011abfb08d5e0b84aa8dbc3d4d3941eb81c1 +SHA1 (patch-ak) = eac8655c6e5e594c869f0d18e2bcb2f30ea19a45 diff --git a/www/arena/patches/patch-ak b/www/arena/patches/patch-ak new file mode 100644 index 00000000000..6eb98cb9473 --- /dev/null +++ b/www/arena/patches/patch-ak @@ -0,0 +1,190 @@ +$NetBSD: patch-ak,v 1.1 2002/10/21 13:27:25 wiz Exp $ + +--- configure.orig Wed Nov 25 12:21:07 1998 ++++ configure +@@ -19,7 +19,7 @@ ac_help="$ac_help + --with-libwww=DIR Specify path to W3C Reference Library distribution." + ac_help="$ac_help + --with-libwww-libdir=DIR +- Specify directory where the libwww.a resides." ++ Specify directory where the libwww modules reside." + ac_help="$ac_help + --with-libwww-include=DIR + Specify the libwww header files location." +@@ -740,6 +745,40 @@ else + echo "$ac_t""no" 1>&6 + fi + ++ if test -z "$CC"; then ++ case "`uname -s`" in ++ *win32* | *WIN32*) ++ # Extract the first word of "cl", so it can be a program name with args. ++set dummy cl; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:755: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_prog_CC="cl" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++fi ++fi ++CC="$ac_cv_prog_CC" ++if test -n "$CC"; then ++ echo "$ac_t""$CC" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ;; ++ esac ++ fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + +@@ -2560,7 +2654,7 @@ if test "${with_libwww_libdir+set}" = se + then + if test "${with_libwww_libdir}" = "no" ; + then +- echo "configure: warning: Without libwww.a library? =O" 1>&2 ++ echo "configure: warning: Without libwww modules? =O" 1>&2 + else + libwww_library_dir="${with_libwww_libdir}" + if test -d ${libwww_library_dir} ; +@@ -2622,7 +2716,7 @@ if test "${with_libwww_config_h_dir+set} + fi + + +-libwww="libwww" ++libwww="libwwwinit" + + # + if test "${libwww_include+set}" = "set" && \ +@@ -2742,7 +2836,7 @@ if test "${libwww_standard}" = "no" ; + fi + fi + # +- libwww_dep="$libwww" ++ libwww_dep="$libwwwinit" + # + # Aren't all the necessary symbols already defined? + # +@@ -2800,7 +2894,7 @@ echo "configure:2766: checking for W3C R + # + for ac_dir in $LibWWWPATH ; + do +- if test -f ${ac_dir}/libwww.a && \ ++ if test -f ${ac_dir}/libwwwinit.a && \ + test -f ${ac_dir}/include/WWWLib.h && \ + test -f ${ac_dir}/config.h ; + then +@@ -2835,7 +2929,7 @@ echo "configure:2766: checking for W3C R + test -f ${ac_dir}/config.h.in ; + then + ac_dir_f="`cd $ac_dir ; $BINPWD`" +- libwww_dep="libwww" ++ libwww_dep="libwwwinit" + : ${libwww_dir:="$ac_dir_f"} + libwww_version="5" + libwww_distribution="source" +@@ -2994,7 +3088,7 @@ else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- ARENA_cv_VERSION_LibWWW_version_is_501=yes ++ ARENA_cv_VERSION_LibWWW_version_is_501=no + fi + rm -f conftest* + echo "$ac_t""$ARENA_cv_VERSION_LibWWW_version_is_501" 1>&6 +@@ -4736,7 +4830,65 @@ fi + for ac_func in snprintf vsnprintf strerror strncpy strndup strdup strstr + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:4740: checking for $ac_func" >&5 ++echo "configure:4834: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func(); ++ ++int main() { ++ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++$ac_func(); ++#endif ++ ++; return 0; } ++EOF ++if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=no" ++fi ++rm -f conftest* ++fi ++ ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <&6 ++fi ++done ++ ++ ++if test "${ac_cv_header_sys_time_h}" = "yes" ; ++ then ++ for ac_func in setitimer ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:4892: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4788,7 +4940,14 @@ else + fi + done + ++ if test "${ac_cv_func_setitimer}" = "yes" ; ++ then ++ cat >> confdefs.h <<\EOF ++#define SETITIMER_USES_TIMEVAL 1 ++EOF + ++ fi ++fi + + # + # Check if we want to use index or strchr -- cgit v1.2.3