cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to wml 2.0.11 and fix an assumption in configure that is

Browse Source 
not valid for perl-5.10.0.  OK bernd@
This commit is contained in:
millert 2008-10-01 20:15:04 +00:00
parent a62e640727
commit bdab44c159
9 changed files with 142 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/wml/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2007/09/15 20:38:26 merdely Exp $
# $OpenBSD: Makefile,v 1.3 2008/10/01 20:15:04 millert Exp $
COMMENT= Website META Language
DISTNAME= wml-2.0.9
DISTNAME= wml-2.0.11
CATEGORIES= www
HOMEPAGE= http://www.thewml.org/

10
www/wml/distinfo
View File

@ -1,5 +1,5 @@
MD5 (wml-2.0.9.tar.gz) = p8naO1j35AcG48KcN7SCKw==
RMD160 (wml-2.0.9.tar.gz) = vxSkwJvdhQxbrV9I9xJxehOxNBI=
SHA1 (wml-2.0.9.tar.gz) = zpWtnFX9UuICgJnTkYWNiM/9XZ8=
SHA256 (wml-2.0.9.tar.gz) = DUsv3wXIqVl7z73PNCaNR/nFhGxiVQtl6156v+ieqok=
SIZE (wml-2.0.9.tar.gz) = 2570742
MD5 (wml-2.0.11.tar.gz) = om/uv05Z6aaUD1TGnd4FtQ==
RMD160 (wml-2.0.11.tar.gz) = /q2Co10RZEe4YNexxQbG3hhzVeg=
SHA1 (wml-2.0.11.tar.gz) = FN18I0YXFhcaZrZWdrym4ZpZMAc=
SHA256 (wml-2.0.11.tar.gz) = jhHvGepn/5xLKP8Pys9QmIgawMXwnd/jq8KfHhK+XUo=
SIZE (wml-2.0.11.tar.gz) = 3115230

28
www/wml/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
--- configure.orig Fri Oct 18 23:44:21 2002
+++ configure Fri Jun 16 03:13:47 2006
@@ -270,7 +270,7 @@ PACKAGE_BUGREPORT=
$OpenBSD: patch-configure,v 1.2 2008/10/01 20:15:04 millert Exp $
--- configure.orig Sat Aug 19 02:09:50 2006
+++ configure Mon Sep 29 11:20:55 2008
@@ -274,7 +274,7 @@ PACKAGE_BUGREPORT=
ac_unique_file="INSTALL"
ac_default_prefix=/usr/local
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WML_VERSION VERSION WML_CONFIG_ARGS MAINT built_system built_user built_date libsubdir tmpdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os DCOLON CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB SET_MAKE PATH_PERL perlprog perlvers PERL_OPTS have_getoptlong have_bitvector have_filepathconvert have_imagesize have_io have_termreadkey INSTALLPRIVLIB INSTALLARCHLIB catdir subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=''
@@ -1170,7 +1170,6 @@ echo "$as_me: current value: $ac_new_v
@@ -1236,7 +1236,6 @@ echo "$as_me: current value: $ac_new_val" >&2;}
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
esac
fi
done
@@ -2568,7 +2567,7 @@ for dir in `echo $PATH | sed -e 's/:/ /g
@@ -2785,7 +2784,7 @@ for dir in `echo $PATH | sed -e 's/:/ /g'` $tmpdir; do
if test -f "$dir/$perl"; then
if test -x "$dir/$perl"; then
perlprog="$dir/$perl"
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
perlvers=`$perlprog -e 'printf "%.3f",$]'`
break 2
fi
@@ -2580,7 +2579,7 @@ done
@@ -2797,7 +2796,7 @@ done
fi; PATH_PERL=$perlprog
echo "$as_me:$LINENO: result: $perlprog v$perlvers" >&5
echo "${ECHO_T}$perlprog v$perlvers" >&6
@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
:
else
echo ""
@@ -2639,7 +2638,7 @@ if test ".$with_openworld" = .no; then
@@ -2856,7 +2855,7 @@ if test ".$with_openworld" = .no; then
else
echo "$as_me:$LINENO: checking for Perl module Getopt::Long (2.16)" >&5
echo $ECHO_N "checking for Perl module Getopt::Long (2.16)... $ECHO_C" >&6
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
if test ".$rc" = .ok; then
have_getoptlong=1
echo "$as_me:$LINENO: result: found" >&5
@@ -2653,7 +2652,7 @@ fi
@@ -2870,7 +2869,7 @@ fi
echo "$as_me:$LINENO: checking for Perl module Bit::Vector (5.2)" >&5
echo $ECHO_N "checking for Perl module Bit::Vector (5.2)... $ECHO_C" >&6
@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
if test ".$rc" = .ok; then
have_bitvector=1
echo "$as_me:$LINENO: result: found" >&5
@@ -2665,9 +2664,9 @@ echo "${ECHO_T}not found" >&6
@@ -2882,9 +2881,9 @@ echo "${ECHO_T}not found" >&6
fi
@ -67,7 +67,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
if test ".$rc" = .ok; then
have_filepathconvert=1
echo "$as_me:$LINENO: result: found" >&5
@@ -2681,7 +2680,7 @@ fi
@@ -2898,7 +2897,7 @@ fi
echo "$as_me:$LINENO: checking for Perl module Image::Size (2.6)" >&5
echo $ECHO_N "checking for Perl module Image::Size (2.6)... $ECHO_C" >&6
@ -76,7 +76,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
if test ".$rc" = .ok; then
have_imagesize=1
echo "$as_me:$LINENO: result: found" >&5
@@ -2695,7 +2694,7 @@ fi
@@ -2912,7 +2911,7 @@ fi
echo "$as_me:$LINENO: checking for Perl module IO::File (1.07)" >&5
echo $ECHO_N "checking for Perl module IO::File (1.07)... $ECHO_C" >&6
@ -85,7 +85,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
if test ".$rc" = .ok; then
have_io=1
echo "$as_me:$LINENO: result: found" >&5
@@ -2709,7 +2708,7 @@ fi
@@ -2926,7 +2925,7 @@ fi
echo "$as_me:$LINENO: checking for Perl module Term::ReadKey (2.11)" >&5
echo $ECHO_N "checking for Perl module Term::ReadKey (2.11)... $ECHO_C" >&6
@ -94,7 +94,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/07/14 16:12:12 bernd Exp $
if test ".$rc" = .ok; then
have_termreadkey=1
echo "$as_me:$LINENO: result: found" >&5
@@ -2771,11 +2770,10 @@ catdir=cat
@@ -2988,11 +2987,10 @@ catdir=cat
fi;

8
www/wml/patches/patch-wml_aux_txt2html_txt2html_src
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-wml_aux_txt2html_txt2html_src,v 1.1.1.1 2006/07/14 16:12:14 bernd Exp $
--- wml_aux/txt2html/txt2html.src.orig Thu Jun 15 14:42:42 2006
+++ wml_aux/txt2html/txt2html.src Thu Jun 15 14:42:42 2006
@@ -230,7 +230,7 @@ $dict_debug = 0; # Debug
$OpenBSD: patch-wml_aux_txt2html_txt2html_src,v 1.2 2008/10/01 20:15:04 millert Exp $
--- wml_aux/txt2html/txt2html.src.orig Thu Dec 1 12:50:13 2005
+++ wml_aux/txt2html/txt2html.src Mon Sep 29 11:20:55 2008
@@ -230,7 +230,7 @@ $dict_debug = 0; # Debug mode for link
# 2: The code that will make the links
# 4: When each rule matches something

70
www/wml/patches/patch-wml_aux_weblint_weblint_src Normal file
View File

@ -0,0 +1,70 @@
$OpenBSD: patch-wml_aux_weblint_weblint_src,v 1.1 2008/10/01 20:15:04 millert Exp $
--- wml_aux/weblint/weblint.src.orig Thu Dec 1 12:50:13 2005
+++ wml_aux/weblint/weblint.src Mon Sep 29 11:20:55 2008
@@ -179,7 +179,7 @@ $nonNest = 'A|FORM';
'HR', 'ALIGN|NOSHADE|SIZE|WIDTH',
'HTML', 'VERSION',
'IMG', 'SRC|ALT|ALIGN|HEIGHT|WIDTH|BORDER|HSPACE|VSPACE|USEMAP|ISMAP',
- 'INPUT', 'TYPE|NAME|VALUE|CHECKED|SIZE|MAXLENGTH|SRC|ALIGN',
+ 'INPUT', 'TYPE|NAME|VALUE|CHECKED|SIZE|MAXLENGTH|SRC|ALIGN|BORDER|ALT',
'ISINDEX', 'PROMPT',
'LI', 'TYPE|VALUE',
'LINK', 'HREF|REL|REV|TITLE',
@@ -193,10 +193,10 @@ $nonNest = 'A|FORM';
'PARAM', 'NAME|VALUE',
'PLAINTEXT', 0,
'PRE', 'WIDTH',
- 'SCRIPT', 'LANGUAGE|SRC',
+ 'SCRIPT', 'LANGUAGE|SRC|TYPE',
'SELECT', 'NAME|SIZE|MULTIPLE',
'STYLE', 0,
- 'TABLE', 'ALIGN|WIDTH|BORDER|CELLSPACING|CELLPADDING',
+ 'TABLE', 'ALIGN|WIDTH|BORDER|CELLSPACING|CELLPADDING|SUMMARY',
'TD', 'NOWRAP|ROWSPAN|COLSPAN|ALIGN|VALIGN|WIDTH|HEIGHT',
'TEXTAREA', 'NAME|ROWS|COLS',
'TH', 'NOWRAP|ROWSPAN|COLSPAN|ALIGN|VALIGN|WIDTH|HEIGHT',
@@ -283,7 +283,7 @@ $attributeFormat{'ALINK'} = $attributeFormat{'VLINK'}
'IMG', 'ALIGN|ALT|BORDER|HEIGHT|HSPACE|ISMAP|LOWSRC|NAME|ONABORT|'.
'ONERROR|ONLOAD|SRC|USEMAP|VSPACE|WIDTH',
'INPUT', 'ALIGN|CHECKED|MAXLENGTH|NAME|ONBLUR|ONCHANGE|ONCLICK|ONFOCUS|'.
- 'ONSELECT|SIZE|SRC|TYPE|VALUE',
+ 'ONSELECT|SIZE|SRC|TYPE|VALUE|BORDER|ALT',
'KEYGEN', 'NAME|CHALLENGE',
'LAYER', 'ID|LEFT|TOP|PAGEX|PAGEY|SRC|Z-INDEX|ABOVE|BELOW|WIDTH|HEIGHT|'.
'CLIP|VISIBILITY|BGCOLOR|BACKGROUND|ONMOUSEOVER|ONFOCUS|ONLOAD',
@@ -302,7 +302,7 @@ $attributeFormat{'ALINK'} = $attributeFormat{'VLINK'}
'SPAN', 'STYLE|CLASS',
'STYLE', 'TYPE',
'TABLE', 'ALIGN|BGCOLOR|BORDER|CELLPADDING|CELLSPACING|COLS|HEIGHT|'.
- 'HSPACE|WIDTH|VSPACE',
+ 'HSPACE|SUMMARY|WIDTH|VSPACE',
'TD', 'ALIGN|BGCOLOR|COLSPAN|NOWRAP|ROWSPAN|VALIGN|WIDTH|HEIGHT',
'TEXTAREA', 'COLS|NAME|ONBLUR|ONCHANGE|ONFOCUS|ONSELECT|ROWS|WRAP',
'TH', 'ALIGN|BGCOLOR|COLSPAN|NOWRAP|ROWSPAN|VALIGN|WIDTH|HEIGHT',
@@ -395,7 +395,7 @@ $msTextAttrs = $msStdAttrs.'|'.$msEvents;
'ID|ISMAP|LANG|LANGUAGE|LOOP|LOWSRC|NAME|SRC|STYLE|TITLE|'.
'USEMAP|VSPACE|WIDTH|ONABORT|'.$msFullEvents,
'INPUT', 'ACCESSKEY|CHECKED|CLASS|DISABLED|ID|LANG|LANGUAGE|MAXLENGTH|'.
- 'NAME|READONLY|SIZE|SRC|STYLE|TABINDEX|TITLE|TYPE|VALUE|'.
+ 'NAME|READONLY|SIZE|SRC|STYLE|TABINDEX|TITLE|TYPE|VALUE|BORDER|ALT|'.
$msFullEvents,
'ISINDEX', 'ACTION|PROMPT|HREF',
'KBD', $msTextAttrs,
@@ -426,7 +426,7 @@ $msTextAttrs = $msStdAttrs.'|'.$msEvents;
'PRE', $msTextAttrs,
'S', $msTextAttrs,
'SAMP', $msTextAttrs,
- 'SCRIPT', 'CLASS|EVENT|FOR|ID|LANGUAGE|SRC|TITLE',
+ 'SCRIPT', 'CLASS|EVENT|FOR|ID|LANGUAGE|SRC|TITLE|TYPE',
'SELECT', 'ACCESSKEY|ALIGN|CLASS|DATAFLD|DATASRC|DISABLED|ID|LANG|'.
'LANGUAGE|MULTIPLE|NAME|SIZE|STYLE|TABINDEX|TITLE|'.
$msFullEvents,
@@ -441,7 +441,7 @@ $msTextAttrs = $msStdAttrs.'|'.$msEvents;
'TABLE', 'ALIGN|BACKGROUND|BGCOLOR|BORDER|BORDERCOLOR|BORDERCOLORDARK|'.
'BORDERCOLORLIGHT|CELLPADDING|CELLSPACING|CLASS|COLS|'.
'DATAPAGESIZE|DATASRC|FRAME|HEIGHT|ID|LANG|LANGUAGE|RULES|'.
- 'STYLE|TITLE|WIDTH|'.$msFullEvents,
+ 'STYLE|SUMMARY|TITLE|WIDTH|'.$msFullEvents,
'TBODY', 'ALIGN|BGCOLOR|CLASS|ID|LANG|LANGUAGE|STYLE|TITLE|VALIGN'.
$msEvents,
'TD', 'ALIGN|BACKGROUND|BGCOLOR|BORDERCOLOR|BORDERCOLORDARK|'.

22
www/wml/patches/patch-wml_backend_p2_mp4h_configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-wml_backend_p2_mp4h_configure,v 1.1.1.1 2006/07/14 16:12:14 bernd Exp $
--- wml_backend/p2_mp4h/configure.orig Fri Oct 18 01:33:13 2002
+++ wml_backend/p2_mp4h/configure Mon Feb 13 14:48:15 2006
@@ -8123,7 +8123,7 @@ _ACEOF
$OpenBSD: patch-wml_backend_p2_mp4h_configure,v 1.2 2008/10/01 20:15:04 millert Exp $
--- wml_backend/p2_mp4h/configure.orig Sat Aug 19 02:09:49 2006
+++ wml_backend/p2_mp4h/configure Mon Sep 29 11:23:21 2008
@@ -27049,7 +27049,7 @@ _ACEOF
@ -10,17 +10,17 @@ $OpenBSD: patch-wml_backend_p2_mp4h_configure,v 1.1.1.1 2006/07/14 16:12:14 bern
@@ -16070,7 +16070,7 @@ s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
s,@GLIBC21@,$GLIBC21,;t t
@@ -44810,7 +44810,7 @@ s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t
s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@INTLBISON@,$INTLBISON,;t t
s,@USE_NLS@,$USE_NLS,;t t
@@ -16083,7 +16083,7 @@ s,@INSTOBJEXT@,$INSTOBJEXT,;t t
s,@GENCAT@,$GENCAT,;t t
s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
@@ -44822,7 +44822,7 @@ s,@GENCAT@,$GENCAT,;t t
s,@INTLOBJS@,$INTLOBJS,;t t
s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t

16
www/wml/patches/patch-wml_backend_p3_eperl_configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-wml_backend_p3_eperl_configure,v 1.1 2008/10/01 20:15:04 millert Exp $
--- wml_backend/p3_eperl/configure.orig Thu Dec 1 12:50:13 2005
+++ wml_backend/p3_eperl/configure Mon Sep 29 12:17:50 2008
@@ -678,7 +678,11 @@ case $usedl in
#define HAVE_PERL_DYNALOADER 1
EOF
- perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
+ if test -f $perl_archlib/auto/DynaLoader/DynaLoader.a; then
+ perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
+ else
+ perl_dla=
+ fi
;;
* )
rc=no

16
www/wml/patches/patch-wml_backend_p3_eperl_configure_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-wml_backend_p3_eperl_configure_in,v 1.1 2008/10/01 20:15:04 millert Exp $
--- wml_backend/p3_eperl/configure.in.orig Thu Dec 1 12:50:13 2005
+++ wml_backend/p3_eperl/configure.in Mon Sep 29 12:18:19 2008
@@ -159,7 +159,11 @@ case $usedl in
define )
rc=yes
AC_DEFINE(HAVE_PERL_DYNALOADER)
- perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
+ if test -f $perl_archlib/auto/DynaLoader/DynaLoader.a; then
+ perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a
+ else
+ perl_dla=
+ fi
;;
* )
rc=no

8
www/wml/patches/patch-wml_frontend_wml_src
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-wml_frontend_wml_src,v 1.1.1.1 2006/07/14 16:12:14 bernd Exp $
--- wml_frontend/wml.src.orig Sun Apr 21 01:04:28 2002
+++ wml_frontend/wml.src Sun Jun 25 12:01:07 2006
$OpenBSD: patch-wml_frontend_wml_src,v 1.2 2008/10/01 20:15:04 millert Exp $
--- wml_frontend/wml.src.orig Thu Dec 1 12:50:13 2005
+++ wml_frontend/wml.src Mon Sep 29 11:20:55 2008
@@ -49,7 +49,7 @@ if ($ENV{'PATH'} !~ m|@bindir@|) {
}
@ -60,7 +60,7 @@ $OpenBSD: patch-wml_frontend_wml_src,v 1.1.1.1 2006/07/14 16:12:14 bernd Exp $
}
else {
$src_dirname = $cwd;
@@ -1004,6 +1003,7 @@ unshift(@opt_D, "WML_GEN_HOSTNAME=$gen_h
@@ -1004,6 +1003,7 @@ unshift(@opt_D, "WML_GEN_HOSTNAME=$gen_hostname");
unshift(@opt_D, "WML_LOC_PREFIX=@prefix@");
unshift(@opt_D, "WML_LOC_BINDIR=@bindir@");
unshift(@opt_D, "WML_LOC_LIBDIR=@libdir@");