[83533] trunk/dports/www/wml
cal at macports.org
cal at macports.org
Sun Sep 4 16:31:21 PDT 2011
Revision: 83533
http://trac.macports.org/changeset/83533
Author: cal at macports.org
Date: 2011-09-04 16:31:17 -0700 (Sun, 04 Sep 2011)
Log Message:
-----------
www/wml: Build fixes, closes #26539
Modified Paths:
--------------
trunk/dports/www/wml/Portfile
Added Paths:
-----------
trunk/dports/www/wml/files/
trunk/dports/www/wml/files/patch-Makefile.in.diff
trunk/dports/www/wml/files/patch-configure.diff
trunk/dports/www/wml/files/patch-no_eperl.diff
trunk/dports/www/wml/files/patch-no_gm4.diff
trunk/dports/www/wml/files/patch-no_tidy.diff
trunk/dports/www/wml/files/patch-no_txt2html.diff
trunk/dports/www/wml/files/patch-wml_frontend-wml.src.diff
Removed Paths:
-------------
trunk/dports/www/wml/files/
Modified: trunk/dports/www/wml/Portfile
===================================================================
--- trunk/dports/www/wml/Portfile 2011-09-04 23:04:42 UTC (rev 83532)
+++ trunk/dports/www/wml/Portfile 2011-09-04 23:31:17 UTC (rev 83533)
@@ -5,7 +5,7 @@
name wml
version 2.0.11
-revision 1
+revision 2
platforms darwin
categories www lang
maintainers nomaintainer
@@ -21,13 +21,34 @@
checksums rmd160 fead82a35d116447b860d7b1c506c6de187355e8 \
sha256 8e11ef19ea67ff9c4b28ff0fcacf5098881ac0c5f09ddfe3abc29f1e12be5d4a
-patchfiles patch-configure \
- patch-wml_backend-p3_eperl-configure
+patch.args -p1
-depends_lib port:gdbm port:gettext port:libiconv
+patchfiles patch-configure.diff \
+ patch-Makefile.in.diff \
+ patch-wml_frontend-wml.src.diff \
+ patch-no_eperl.diff \
+ patch-no_gm4.diff \
+ patch-no_tidy.diff \
+ patch-no_txt2html.diff
+
+depends_run port:p5.12-eperl \
+ port:m4 \
+ port:tidy
+
+depends_lib port:gdbm \
+ port:gettext \
+ port:libiconv \
+ port:p5.12-getopt-long \
+ port:p5.12-bit-vector \
+ port:p5.12-image-size \
+ port:p5.12-io \
+ port:p5.12-term-readkey
+
depends_build port:lynx
-configure.args --with-perl=${prefix}/bin/perl --without-modules \
+configure.args --with-perl=${prefix}/bin/perl \
+ --without-modules \
+ --with-openworld \
--with-cc=${configure.cc}
configure.env CPATH=${prefix}/include
@@ -36,3 +57,6 @@
destroot.destdir prefix=${destroot}${prefix} \
mandir=${destroot}${prefix}/share/man
+
+test.run yes
+
Added: trunk/dports/www/wml/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/www/wml/files/patch-Makefile.in.diff (rev 0)
+++ trunk/dports/www/wml/files/patch-Makefile.in.diff 2011-09-04 23:31:17 UTC (rev 83533)
@@ -0,0 +1,19 @@
+diff -Nur wml-2.0.11.orig/Makefile.in wml-2.0.11/Makefile.in
+--- wml-2.0.11.orig/wml_common/Makefile.in 2011-07-27 17:30:03.000000000 +0200
++++ wml-2.0.11/wml_common/Makefile.in 2011-07-27 17:31:34.000000000 +0200
+@@ -45,14 +45,9 @@
+ have_gd=0
+
+ SUBDIRS = \
+- bitvector \
+ filepathconvert \
+ gd \
+- getoptlong \
+- htmlclean \
+- imagesize \
+- io \
+- termreadkey
++ htmlclean
+
+ # ------------------------------------------------
+ # TARGETS
Added: trunk/dports/www/wml/files/patch-configure.diff
===================================================================
--- trunk/dports/www/wml/files/patch-configure.diff (rev 0)
+++ trunk/dports/www/wml/files/patch-configure.diff 2011-09-04 23:31:17 UTC (rev 83533)
@@ -0,0 +1,30 @@
+--- a/configure.orig 2009-10-03 18:53:20.000000000 -0500
++++ b/configure 2009-10-03 18:58:01.000000000 -0500
+@@ -1199,6 +1199,7 @@
+
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
++ac_precious_variables=
+ ac_cache_corrupted=false
+ for ac_var in `(set) 2>&1 |
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+@@ -1236,7 +1237,7 @@
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++ *) ac_precious_variables="$ac_precious_variables '$ac_arg'" ;;
+ esac
+ fi
+ done
+@@ -3536,8 +3537,8 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++ echo "running $SHELL " $ac_precious_variables " $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++ exec $SHELL $ac_precious_variables $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+
+ _ACEOF
Added: trunk/dports/www/wml/files/patch-no_eperl.diff
===================================================================
--- trunk/dports/www/wml/files/patch-no_eperl.diff (rev 0)
+++ trunk/dports/www/wml/files/patch-no_eperl.diff 2011-09-04 23:31:17 UTC (rev 83533)
@@ -0,0 +1,75 @@
+diff -Nur wml-2.0.11.orig/Makefile.in wml-2.0.11/Makefile.in
+--- wml-2.0.11.orig/Makefile.in 2005-12-01 18:50:13.000000000 +0100
++++ wml-2.0.11/Makefile.in 2010-09-19 22:25:00.000000000 +0200
+@@ -45,10 +45,6 @@
+ wml_test
+
+ PROBLEMATIC_FILES = \
+- wml_backend/p3_eperl/eperl_readme.c \
+- wml_backend/p3_eperl/eperl_license.c \
+- wml_backend/p3_eperl/eperl_logo.c \
+- wml_backend/p3_eperl/eperl_powered.c \
+ wml_backend/p9_slice/slice_term.pl
+
+ # ------------------------------------------------
+@@ -135,8 +131,6 @@
+ $(INSTALL_DATA) wml_backend/p1_ipp/ipp.1 $(mandir)/man1/wml_p1_ipp.1
+ $(INSTALL_PROGRAM) wml_backend/p2_mp4h/src/mp4h at EXEEXT@ $(libdir)/exec/wml_p2_mp4h at EXEEXT@
+ $(INSTALL_DATA) wml_backend/p2_mp4h/doc/mp4h.1 $(mandir)/man1/wml_p2_mp4h.1
+- $(INSTALL_PROGRAM) wml_backend/p3_eperl/eperl at EXEEXT@ $(libdir)/exec/wml_p3_eperl at EXEEXT@
+- $(INSTALL_DATA) wml_backend/p3_eperl/eperl.1 $(mandir)/man1/wml_p3_eperl.1
+ $(INSTALL_PROGRAM) wml_backend/p4_gm4/src/m4 at EXEEXT@ $(libdir)/exec/wml_p4_gm4 at EXEEXT@
+ $(INSTALL_DATA) wml_backend/p4_gm4/doc/m4.txt $(mandir)/$(catdir)1/wml_p4_gm4.1
+ $(INSTALL_SCRIPT) wml_backend/p5_divert/divert.pl $(libdir)/exec/wml_p5_divert
+@@ -242,7 +236,6 @@
+ .:etc/shtool \
+ wml_aux/iselect:etc/shtool \
+ wml_backend/p2_mp4h:shtool \
+- wml_backend/p3_eperl:etc/shtool \
+ wml_backend/p9_slice:etc/shtool
+
+ update-shtool:
+diff -Nur wml-2.0.11.orig/configure wml-2.0.11/configure
+--- wml-2.0.11.orig/configure 2010-09-19 22:21:20.000000000 +0200
++++ wml-2.0.11/configure 2010-09-19 22:22:24.000000000 +0200
+@@ -274,7 +274,7 @@
+
+ ac_unique_file="INSTALL"
+ ac_default_prefix=/usr/local
+-ac_subdirs_all="$ac_subdirs_all wml_backend/p2_mp4h wml_backend/p3_eperl wml_backend/p4_gm4 wml_aux/iselect wml_common/gd"
++ac_subdirs_all="$ac_subdirs_all wml_backend/p2_mp4h wml_backend/p4_gm4 wml_aux/iselect wml_common/gd"
+ 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=''
+
+@@ -2993,7 +2993,7 @@
+
+
+
+-subdirs="$subdirs wml_backend/p2_mp4h wml_backend/p3_eperl wml_backend/p4_gm4 wml_aux/iselect wml_common/gd "
++subdirs="$subdirs wml_backend/p2_mp4h wml_backend/p4_gm4 wml_aux/iselect wml_common/gd "
+
+
+ echo "$as_me:$LINENO: result: " >&5
+diff -Nur wml-2.0.11.orig/wml_frontend/wml.src wml-2.0.11/wml_frontend/wml.src
+--- wml-2.0.11.orig/wml_frontend/wml.src 2005-12-01 18:50:13.000000000 +0100
++++ wml-2.0.11/wml_frontend/wml.src 2010-09-19 22:24:20.000000000 +0200
+@@ -800,7 +800,7 @@
+ my ($opt, $from, $to, $tmp) = @_;
+ my ($rc);
+
+- $rc = &dosystem("@libdir@/exec/wml_p3_eperl $opt -P -k -B '<:' -E ':>' $from >$to");
++ $rc = &dosystem("@bindir@/eperl $opt -P -k -B '<:' -E ':>' $from >$to");
+
+ return $rc;
+ }
+diff -Nur wml-2.0.11.orig/wml_backend/Makefile.in wml-2.0.11/wml_backend/Makefile.in
+--- wml-2.0.11.orig/wml_backend/Makefile.in 2005-12-01 18:50:13.000000000 +0100
++++ wml-2.0.11/wml_backend/Makefile.in 2010-09-19 23:00:22.000000000 +0200
+@@ -17,7 +17,6 @@
+ SUBDIRS = \
+ p1_ipp \
+ p2_mp4h \
+- p3_eperl \
+ p4_gm4 \
+ p5_divert \
+ p6_asubst \
Added: trunk/dports/www/wml/files/patch-no_gm4.diff
===================================================================
--- trunk/dports/www/wml/files/patch-no_gm4.diff (rev 0)
+++ trunk/dports/www/wml/files/patch-no_gm4.diff 2011-09-04 23:31:17 UTC (rev 83533)
@@ -0,0 +1,56 @@
+diff -Nur wml-2.0.11.orig/Makefile.in wml-2.0.11/Makefile.in
+--- wml-2.0.11.orig/Makefile.in 2010-09-19 22:29:41.000000000 +0200
++++ wml-2.0.11/Makefile.in 2010-09-19 22:30:45.000000000 +0200
+@@ -131,8 +131,6 @@
+ $(INSTALL_DATA) wml_backend/p1_ipp/ipp.1 $(mandir)/man1/wml_p1_ipp.1
+ $(INSTALL_PROGRAM) wml_backend/p2_mp4h/src/mp4h at EXEEXT@ $(libdir)/exec/wml_p2_mp4h at EXEEXT@
+ $(INSTALL_DATA) wml_backend/p2_mp4h/doc/mp4h.1 $(mandir)/man1/wml_p2_mp4h.1
+- $(INSTALL_PROGRAM) wml_backend/p4_gm4/src/m4 at EXEEXT@ $(libdir)/exec/wml_p4_gm4 at EXEEXT@
+- $(INSTALL_DATA) wml_backend/p4_gm4/doc/m4.txt $(mandir)/$(catdir)1/wml_p4_gm4.1
+ $(INSTALL_SCRIPT) wml_backend/p5_divert/divert.pl $(libdir)/exec/wml_p5_divert
+ $(INSTALL_DATA) wml_backend/p5_divert/divert.1 $(mandir)/man1/wml_p5_divert.1
+ $(INSTALL_SCRIPT) wml_backend/p6_asubst/asubst.pl $(libdir)/exec/wml_p6_asubst
+diff -Nur wml-2.0.11.orig/configure wml-2.0.11/configure
+--- wml-2.0.11.orig/configure 2010-09-19 22:29:41.000000000 +0200
++++ wml-2.0.11/configure 2010-09-19 22:30:29.000000000 +0200
+@@ -274,7 +274,7 @@
+
+ ac_unique_file="INSTALL"
+ ac_default_prefix=/usr/local
+-ac_subdirs_all="$ac_subdirs_all wml_backend/p2_mp4h wml_backend/p4_gm4 wml_aux/iselect wml_common/gd"
++ac_subdirs_all="$ac_subdirs_all wml_backend/p2_mp4h wml_aux/iselect wml_common/gd"
+ 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=''
+
+@@ -2993,7 +2993,7 @@
+
+
+
+-subdirs="$subdirs wml_backend/p2_mp4h wml_backend/p4_gm4 wml_aux/iselect wml_common/gd "
++subdirs="$subdirs wml_backend/p2_mp4h wml_aux/iselect wml_common/gd "
+
+
+ echo "$as_me:$LINENO: result: " >&5
+diff -Nur wml-2.0.11.orig/wml_frontend/wml.src wml-2.0.11/wml_frontend/wml.src
+--- wml-2.0.11.orig/wml_frontend/wml.src 2010-09-19 22:29:41.000000000 +0200
++++ wml-2.0.11/wml_frontend/wml.src 2010-09-19 22:32:37.000000000 +0200
+@@ -809,7 +809,7 @@
+ my ($opt, $from, $to, $tmp) = @_;
+ my ($rc);
+
+- $rc = &dosystem("@libdir@/exec/wml_p4_gm4 $opt --prefix-builtins <$from >$to");
++ $rc = &dosystem("@bindir@/gm4 $opt --prefix-builtins <$from >$to");
+
+ return $rc;
+ }
+diff -Nur wml-2.0.11.orig/wml_backend/Makefile.in wml-2.0.11/wml_backend/Makefile.in
+--- wml-2.0.11.orig/wml_backend/Makefile.in 2010-09-19 23:01:27.000000000 +0200
++++ wml-2.0.11/wml_backend/Makefile.in 2010-09-19 23:02:00.000000000 +0200
+@@ -17,7 +17,6 @@
+ SUBDIRS = \
+ p1_ipp \
+ p2_mp4h \
+- p4_gm4 \
+ p5_divert \
+ p6_asubst \
+ p7_htmlfix \
Added: trunk/dports/www/wml/files/patch-no_tidy.diff
===================================================================
--- trunk/dports/www/wml/files/patch-no_tidy.diff (rev 0)
+++ trunk/dports/www/wml/files/patch-no_tidy.diff 2011-09-04 23:31:17 UTC (rev 83533)
@@ -0,0 +1,64 @@
+diff -Nur wml-2.0.11.orig/configure wml-2.0.11/configure
+--- wml-2.0.11.orig/configure 2010-09-19 22:33:41.000000000 +0200
++++ wml-2.0.11/configure 2010-09-19 22:35:37.000000000 +0200
+@@ -2989,7 +2989,7 @@
+ fi;
+
+
+-ac_configure_args="$ac_configure_args --with-tidy=`pwd`/wml_aux/tidy/tidy"
++# ac_configure_args="$ac_configure_args --with-tidy=`pwd`/wml_aux/tidy/tidy"
+
+
+
+@@ -3001,7 +3001,7 @@
+ echo "$as_me:$LINENO: result: ${TERM_BOLD}RESULT: Substituting Files${TERM_NORM}" >&5
+ echo "${ECHO_T}${TERM_BOLD}RESULT: Substituting Files${TERM_NORM}" >&6
+
+- ac_config_files="$ac_config_files Makefile wml_frontend/Makefile wml_backend/Makefile wml_backend/p1_ipp/Makefile wml_backend/p5_divert/Makefile wml_backend/p6_asubst/Makefile wml_backend/p7_htmlfix/Makefile wml_backend/p8_htmlstrip/Makefile wml_backend/p9_slice/Makefile wml_common/Makefile wml_docs/Makefile wml_aux/Makefile wml_aux/htmlinfo/Makefile wml_aux/htmlclean/Makefile wml_aux/linklint/Makefile wml_aux/map2html/Makefile wml_aux/txt2html/Makefile wml_aux/tidy/Makefile wml_aux/weblint/Makefile wml_aux/freetable/Makefile wml_misc/Makefile wml_include/Makefile wml_test/Makefile"
++ ac_config_files="$ac_config_files Makefile wml_frontend/Makefile wml_backend/Makefile wml_backend/p1_ipp/Makefile wml_backend/p5_divert/Makefile wml_backend/p6_asubst/Makefile wml_backend/p7_htmlfix/Makefile wml_backend/p8_htmlstrip/Makefile wml_backend/p9_slice/Makefile wml_common/Makefile wml_docs/Makefile wml_aux/Makefile wml_aux/htmlinfo/Makefile wml_aux/htmlclean/Makefile wml_aux/linklint/Makefile wml_aux/map2html/Makefile wml_aux/txt2html/Makefile wml_aux/weblint/Makefile wml_aux/freetable/Makefile wml_misc/Makefile wml_include/Makefile wml_test/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -3569,7 +3569,6 @@
+ "wml_aux/linklint/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/linklint/Makefile" ;;
+ "wml_aux/map2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/map2html/Makefile" ;;
+ "wml_aux/txt2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/txt2html/Makefile" ;;
+- "wml_aux/tidy/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/tidy/Makefile" ;;
+ "wml_aux/weblint/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/weblint/Makefile" ;;
+ "wml_aux/freetable/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/freetable/Makefile" ;;
+ "wml_misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_misc/Makefile" ;;
+diff -Nur wml-2.0.11.orig/wml_frontend/wml.src wml-2.0.11/wml_frontend/wml.src
+--- wml-2.0.11.orig/wml_frontend/wml.src 2010-09-19 22:33:41.000000000 +0200
++++ wml-2.0.11/wml_frontend/wml.src 2010-09-19 22:36:12.000000000 +0200
+@@ -1374,7 +1374,7 @@
+ $e = "@libdir@/exec/wml_aux_weblint$1";
+ }
+ elsif ($e =~ m|^tidy(.*)|) {
+- $e = "@libdir@/exec/wml_aux_tidy$1";
++ $e = "@bindir@/tidy$1";
+ $e .= " -m" if ($1 eq '');
+ }
+ &verbose(2, "EPILOG: $e $o\n");
+diff -Nur wml-2.0.11.orig/Makefile.in wml-2.0.11/Makefile.in
+--- wml-2.0.11.orig/Makefile.in 2010-09-19 22:41:24.000000000 +0200
++++ wml-2.0.11/Makefile.in 2010-09-19 22:42:03.000000000 +0200
+@@ -178,8 +178,6 @@
+ $(INSTALL_SCRIPT) wml_aux/txt2html/txt2html.pl $(libdir)/exec/wml_aux_txt2html
+ $(INSTALL_DATA) wml_aux/txt2html/txt2html.txt $(mandir)/$(catdir)1/wml_aux_txt2html.1
+ $(INSTALL_DATA) wml_aux/txt2html/txt2html.dict $(libdir)/data/txt2html.dict
+- $(INSTALL_PROGRAM) wml_aux/tidy/tidy at EXEEXT@ $(libdir)/exec/wml_aux_tidy at EXEEXT@
+- $(INSTALL_DATA) wml_aux/tidy/tidy.txt $(mandir)/$(catdir)1/wml_aux_tidy.1
+ $(INSTALL_SCRIPT) wml_aux/htmlinfo/htmlinfo.pl $(libdir)/exec/wml_aux_htmlinfo
+ $(INSTALL_DATA) wml_aux/htmlinfo/htmlinfo.1 $(mandir)/man1/wml_aux_htmlinfo.1
+ $(INSTALL_SCRIPT) wml_aux/linklint/linklint.pl $(libdir)/exec/wml_aux_linklint
+diff -Nur wml-2.0.11.orig/wml_aux/Makefile.in wml-2.0.11/wml_aux/Makefile.in
+--- wml-2.0.11.orig/wml_aux/Makefile.in 2005-12-01 18:50:13.000000000 +0100
++++ wml-2.0.11/wml_aux/Makefile.in 2010-09-19 22:57:18.000000000 +0200
+@@ -20,7 +20,6 @@
+ htmlinfo \
+ linklint \
+ map2html \
+- tidy \
+ txt2html \
+ weblint \
+ freetable
Added: trunk/dports/www/wml/files/patch-no_txt2html.diff
===================================================================
--- trunk/dports/www/wml/files/patch-no_txt2html.diff (rev 0)
+++ trunk/dports/www/wml/files/patch-no_txt2html.diff 2011-09-04 23:31:17 UTC (rev 83533)
@@ -0,0 +1,44 @@
+diff -Nur wml-2.0.11.orig/Makefile.in wml-2.0.11/Makefile.in
+--- wml-2.0.11.orig/Makefile.in 2010-09-19 23:15:53.000000000 +0200
++++ wml-2.0.11/Makefile.in 2010-09-19 23:17:51.000000000 +0200
+@@ -177,9 +177,6 @@
+ $(INSTALL_DATA) wml_aux/iselect/iselect.1 $(mandir)/man1/wml_aux_iselect.1
+ $(INSTALL_SCRIPT) wml_aux/map2html/map2html.pl $(libdir)/exec/wml_aux_map2html
+ $(INSTALL_DATA) wml_aux/map2html/map2html.1 $(mandir)/man1/wml_aux_map2html.1
+- $(INSTALL_SCRIPT) wml_aux/txt2html/txt2html.pl $(libdir)/exec/wml_aux_txt2html
+- $(INSTALL_DATA) wml_aux/txt2html/txt2html.txt $(mandir)/$(catdir)1/wml_aux_txt2html.1
+- $(INSTALL_DATA) wml_aux/txt2html/txt2html.dict $(libdir)/data/txt2html.dict
+ $(INSTALL_SCRIPT) wml_aux/htmlinfo/htmlinfo.pl $(libdir)/exec/wml_aux_htmlinfo
+ $(INSTALL_DATA) wml_aux/htmlinfo/htmlinfo.1 $(mandir)/man1/wml_aux_htmlinfo.1
+ $(INSTALL_SCRIPT) wml_aux/linklint/linklint.pl $(libdir)/exec/wml_aux_linklint
+diff -Nur wml-2.0.11.orig/configure wml-2.0.11/configure
+--- wml-2.0.11.orig/configure 2010-09-19 23:15:53.000000000 +0200
++++ wml-2.0.11/configure 2010-09-19 23:17:43.000000000 +0200
+@@ -3001,7 +3001,7 @@
+ echo "$as_me:$LINENO: result: ${TERM_BOLD}RESULT: Substituting Files${TERM_NORM}" >&5
+ echo "${ECHO_T}${TERM_BOLD}RESULT: Substituting Files${TERM_NORM}" >&6
+
+- ac_config_files="$ac_config_files Makefile wml_frontend/Makefile wml_backend/Makefile wml_backend/p1_ipp/Makefile wml_backend/p5_divert/Makefile wml_backend/p6_asubst/Makefile wml_backend/p7_htmlfix/Makefile wml_backend/p8_htmlstrip/Makefile wml_backend/p9_slice/Makefile wml_common/Makefile wml_docs/Makefile wml_aux/Makefile wml_aux/htmlinfo/Makefile wml_aux/htmlclean/Makefile wml_aux/linklint/Makefile wml_aux/map2html/Makefile wml_aux/txt2html/Makefile wml_aux/weblint/Makefile wml_aux/freetable/Makefile wml_misc/Makefile wml_include/Makefile wml_test/Makefile"
++ ac_config_files="$ac_config_files Makefile wml_frontend/Makefile wml_backend/Makefile wml_backend/p1_ipp/Makefile wml_backend/p5_divert/Makefile wml_backend/p6_asubst/Makefile wml_backend/p7_htmlfix/Makefile wml_backend/p8_htmlstrip/Makefile wml_backend/p9_slice/Makefile wml_common/Makefile wml_docs/Makefile wml_aux/Makefile wml_aux/htmlinfo/Makefile wml_aux/htmlclean/Makefile wml_aux/linklint/Makefile wml_aux/map2html/Makefile wml_aux/weblint/Makefile wml_aux/freetable/Makefile wml_misc/Makefile wml_include/Makefile wml_test/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -3568,7 +3568,6 @@
+ "wml_aux/htmlclean/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/htmlclean/Makefile" ;;
+ "wml_aux/linklint/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/linklint/Makefile" ;;
+ "wml_aux/map2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/map2html/Makefile" ;;
+- "wml_aux/txt2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/txt2html/Makefile" ;;
+ "wml_aux/weblint/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/weblint/Makefile" ;;
+ "wml_aux/freetable/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/freetable/Makefile" ;;
+ "wml_misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_misc/Makefile" ;;
+diff -Nur wml-2.0.11.orig/wml_aux/Makefile.in wml-2.0.11/wml_aux/Makefile.in
+--- wml-2.0.11.orig/wml_aux/Makefile.in 2010-09-19 23:15:53.000000000 +0200
++++ wml-2.0.11/wml_aux/Makefile.in 2010-09-19 23:17:16.000000000 +0200
+@@ -20,7 +20,6 @@
+ htmlinfo \
+ linklint \
+ map2html \
+- txt2html \
+ weblint \
+ freetable
+
Added: trunk/dports/www/wml/files/patch-wml_frontend-wml.src.diff
===================================================================
--- trunk/dports/www/wml/files/patch-wml_frontend-wml.src.diff (rev 0)
+++ trunk/dports/www/wml/files/patch-wml_frontend-wml.src.diff 2011-09-04 23:31:17 UTC (rev 83533)
@@ -0,0 +1,47 @@
+--- wml-2.0.11.orig/wml_frontend/wml.src 2011-07-28 15:54:09.000000000 +0200
++++ wml-2.0.11/wml_frontend/wml.src 2011-07-28 15:57:42.000000000 +0200
+@@ -49,7 +49,7 @@
+ }
+
+ use Getopt::Long 2.13;
+-use File::PathConvert;
++use File::Spec();
+ use IO::File 1.06;
+ use Term::ReadKey;
+ use Cwd;
+@@ -338,7 +338,7 @@
+ @opt_I_NEW = @opt_I_OLD;
+
+ # adjust -D options
+- $reldir = File::PathConvert::abs2rel("$dir", "$src");
++ $reldir = File::Spec->abs2rel("$dir", "$src");
+ $reldir = "." if $reldir eq '';
+ foreach $d (@opt_D) {
+ if ($d =~ m|^([A-Za-z0-9_]+)~(.+)$|) {
+@@ -363,7 +363,7 @@
+ }
+
+ # adjust -I options
+- $reldir = File::PathConvert::abs2rel("$dir");
++ $reldir = File::Spec->abs2rel("$dir");
+ $reldir = "." if $reldir eq '';
+ foreach $path (@opt_I) {
+ if ($path !~ m|^/|) {
+@@ -477,7 +477,7 @@
+ $reldir = $src;
+ $reldir =~ s,(:?/|^)[^/]+$,,;
+ ($cwd = Cwd::cwd) =~ s|/$||;
+- $reldir = File::PathConvert::abs2rel($cwd, "$cwd/$reldir");
++ $reldir = File::Spec->abs2rel($cwd, "$cwd/$reldir");
+ $reldir = "." if $reldir eq '';
+ }
+ else {
+@@ -958,7 +958,7 @@
+ if ($src =~ m|/|) {
+ $src_dirname = $src;
+ $src_dirname =~ s|/+[^/]*$||;
+- $src_dirname = File::PathConvert::realpath("$src_dirname");
++ $src_dirname = Cwd::realpath("$src_dirname");
+ }
+ else {
+ $src_dirname = $cwd;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110904/bea1e24c/attachment-0001.html>
More information about the macports-changes
mailing list