ports/133166: www/wml port fix
Rodrigo OSORIO (ros)
rodrigo at bebik.net
Sat Mar 28 21:20:02 UTC 2009
>Number: 133166
>Category: ports
>Synopsis: www/wml port fix
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 28 21:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Rodrigo OSORIO (ros)
>Release: FreeBSD 7.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD kurz 7.1-RELEASE FreeBSD 7.1-RELEASE #0: Thu Jan 1 14:37:25 UTC 2009 root at logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This patch fix the problems found after the
the last perl update.
>How-To-Repeat:
>Fix:
--- wml-patch-280309.diff begins here ---
diff -Naur wml/Makefile wml-new/Makefile
--- wml/Makefile 2009-01-22 15:31:28.000000000 +0100
+++ wml-new/Makefile 2009-03-28 16:45:23.000000000 +0100
@@ -2,12 +2,12 @@
# Date created: 09-Sep-1997
# Whom: Ralf S. Engelschall <rse at engelschall.com>
#
-# $FreeBSD: ports/www/wml/Makefile,v 1.68 2009/01/22 14:31:28 wxs Exp $
+# $FreeBSD: ports/www/wml/Makefile,v 1.67 2009/01/10 22:58:13 wxs Exp $
#
PORTNAME= wml
PORTVERSION= 2.0.12
-PORTEPOCH= 1
+PORTEPOCH= 2
CATEGORIES= www lang
MASTER_SITES= ${MASTER_SITE_BERLIOS}
MASTER_SITE_SUBDIR=thewml
@@ -19,14 +19,17 @@
BUILD_DEPENDS= lynx:${PORTSDIR}/www/lynx \
${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-PLIST_SUB= WML_ARCH=${ARCH}-freebsd
+PLIST_SUB= LOCAL_PERL_ARCH=$(${PERL5} -MConfig -e 'print $Config{archname})
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --with-perl=${PERL5} --with-catdir=man \
--prefix=${PREFIX}
-BROKEN= does not build with perl 5.8.9
+LOCAL_PERL_ARCH= ${LOCAL_PERL_ARCH}
+PLIST_SUB= LOCAL_PERL_ARCH=${PERL_ARCH}
+PLIST_IN= ${PKGDIR}/pkg-plist.in
+PLIST= ${WRKDIR}/pkg-plist
MAN1= wmd.1 wmd_missing.1 wmk.1 wml.1 wmb.1 wmu.1 \
wml_aux_freetable.1 wml_aux_htmlclean.1 wml_aux_htmlinfo.1 wml_aux_iselect.1 \
diff -Naur wml/files/.#patch-11-wmk.t.1.1 wml-new/files/.#patch-11-wmk.t.1.1
--- wml/files/.#patch-11-wmk.t.1.1 1970-01-01 01:00:00.000000000 +0100
+++ wml-new/files/.#patch-11-wmk.t.1.1 2009-03-19 23:28:11.000000000 +0100
@@ -0,0 +1,11 @@
+--- wml_test/t/11-wmk.t Thu Dec 1 19:22:04 2005
++++ wml_test/t/11-wmk.t Tue Dec 16 22:13:48 2008
+@@ -37,6 +37,8 @@
+ bar
+ EOT_IN
+
++sleep 1;
++
+ $rc = `$wmk a.wml 2>&1`;
+ print ($rc eq "$ENV{WML} -n -q -W \"1,-N\" -o a.html a.wml\n" ? "ok\n" : "not ok\n");
+ $rc = &TEST::system("cmp $tmpfile1 a.html");
diff -Naur wml/files/.#patch-wml_backend-p3_eperl-configure.1.1 wml-new/files/.#patch-wml_backend-p3_eperl-configure.1.1
--- wml/files/.#patch-wml_backend-p3_eperl-configure.1.1 1970-01-01 01:00:00.000000000 +0100
+++ wml-new/files/.#patch-wml_backend-p3_eperl-configure.1.1 2009-03-19 23:28:11.000000000 +0100
@@ -0,0 +1,11 @@
+--- wml_backend/p3_eperl/configure 2008-04-16 20:36:43.000000000 +0200
++++ wml_backend/p3_eperl/configure 2009-03-15 17:40:27.000000000 +0100
+@@ -1876,7 +1876,7 @@
+ #define HAVE_PERL_DYNALOADER 1
+ _ACEOF
+
+- if $perlprog -e 'exit(! ($] > 5.009))' ; then
++ if $perlprog -e 'exit(! ($] >= 5.008009))' ; then
+ perl_dla=
+ else
+ perl_dla="$perl_archlib/auto/DynaLoader/DynaLoader.a"
diff -Naur wml/files/.#patch-wml_common-gd-Makefile.PL.in.1.1 wml-new/files/.#patch-wml_common-gd-Makefile.PL.in.1.1
--- wml/files/.#patch-wml_common-gd-Makefile.PL.in.1.1 1970-01-01 01:00:00.000000000 +0100
+++ wml-new/files/.#patch-wml_common-gd-Makefile.PL.in.1.1 2009-03-19 23:28:12.000000000 +0100
@@ -0,0 +1,10 @@
+--- wml_common/gd/Makefile.PL.in 2009-03-15 17:17:56.000000000 +0100
++++ wml_common/gd/Makefile.PL.in 2009-03-15 17:18:29.000000000 +0100
+@@ -3,6 +3,7 @@
+ # the contents of the Makefile that is written.
+ WriteMakefile(
+ 'NAME' => 'WML::GD',
++ 'MAKE' => 'gmake',
+ 'VERSION_FROM' => 'GD.pm',
+ 'PM' => {'GD.pm' => '$(INST_LIBDIR)/GD.pm'},
+ 'MYEXTLIB' => 'libgd/libgd$(LIB_EXT)',
diff -Naur wml/files/patch-wml_backend-p3_eperl-configure wml-new/files/patch-wml_backend-p3_eperl-configure
--- wml/files/patch-wml_backend-p3_eperl-configure 1970-01-01 01:00:00.000000000 +0100
+++ wml-new/files/patch-wml_backend-p3_eperl-configure 2009-03-19 23:32:39.000000000 +0100
@@ -0,0 +1,11 @@
+--- wml_backend/p3_eperl/configure 2008-04-16 20:36:43.000000000 +0200
++++ wml_backend/p3_eperl/configure 2009-03-15 17:40:27.000000000 +0100
+@@ -1876,7 +1876,7 @@
+ #define HAVE_PERL_DYNALOADER 1
+ _ACEOF
+
+- if $perlprog -e 'exit(! ($] > 5.009))' ; then
++ if $perlprog -e 'exit(! ($] >= 5.008009))' ; then
+ perl_dla=
+ else
+ perl_dla="$perl_archlib/auto/DynaLoader/DynaLoader.a"
diff -Naur wml/files/patch-wml_common-gd-Makefile.PL.in wml-new/files/patch-wml_common-gd-Makefile.PL.in
--- wml/files/patch-wml_common-gd-Makefile.PL.in 1970-01-01 01:00:00.000000000 +0100
+++ wml-new/files/patch-wml_common-gd-Makefile.PL.in 2009-03-19 23:32:52.000000000 +0100
@@ -0,0 +1,10 @@
+--- wml_common/gd/Makefile.PL.in 2009-03-15 17:17:56.000000000 +0100
++++ wml_common/gd/Makefile.PL.in 2009-03-15 17:18:29.000000000 +0100
+@@ -3,6 +3,7 @@
+ # the contents of the Makefile that is written.
+ WriteMakefile(
+ 'NAME' => 'WML::GD',
++ 'MAKE' => 'gmake',
+ 'VERSION_FROM' => 'GD.pm',
+ 'PM' => {'GD.pm' => '$(INST_LIBDIR)/GD.pm'},
+ 'MYEXTLIB' => 'libgd/libgd$(LIB_EXT)',
diff -Naur wml/pkg-plist wml-new/pkg-plist
--- wml/pkg-plist 2009-01-10 23:58:13.000000000 +0100
+++ wml-new/pkg-plist 2009-03-19 23:27:58.000000000 +0100
@@ -105,52 +105,52 @@
lib/wml/include/sys/bootp3.wml
lib/wml/include/sys/bootp4.wml
lib/wml/include/sys/compat1.wml
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit/Vector/Vector.so
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit/Vector/Vector.bs
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit/Vector/.packlist
-lib/wml/perl/lib/%%WML_ARCH%%/auto/File/PathConvert/.packlist
-lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD/GD.so
-lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD/GD.bs
-lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD/autosplit.ix
-lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD/.packlist
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Getopt/Long/.packlist
-lib/wml/perl/lib/%%WML_ARCH%%/auto/HTML/Clean/.packlist
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Image/Size/.packlist
-lib/wml/perl/lib/%%WML_ARCH%%/auto/IO/IO.so
-lib/wml/perl/lib/%%WML_ARCH%%/auto/IO/IO.bs
-lib/wml/perl/lib/%%WML_ARCH%%/auto/IO/.packlist
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey/ReadKey.so
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey/ReadKey.bs
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey/autosplit.ix
-lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey/.packlist
-lib/wml/perl/lib/%%WML_ARCH%%/Bit/Vector.pm
-lib/wml/perl/lib/%%WML_ARCH%%/WML/GD.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Handle.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Poll.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Seekable.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Dir.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Pipe.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Select.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/File.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/UNIX.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/INET.pm
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/entries
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/format
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/text-base/INET.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/text-base/UNIX.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/format
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/entries
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Pipe.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Socket.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Seekable.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/File.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Poll.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Dir.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Handle.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base/Select.pm.svn-base
-lib/wml/perl/lib/%%WML_ARCH%%/Term/ReadKey.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector/Vector.so
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector/Vector.bs
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector/.packlist
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/File/PathConvert/.packlist
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD/GD.so
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD/GD.bs
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD/autosplit.ix
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD/.packlist
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Getopt/Long/.packlist
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/HTML/Clean/.packlist
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Image/Size/.packlist
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO/IO.so
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO/IO.bs
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO/.packlist
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey/autosplit.ix
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey/.packlist
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Bit/Vector.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/WML/GD.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Handle.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Poll.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Seekable.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Dir.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Pipe.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Select.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/File.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/UNIX.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/INET.pm
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/entries
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/format
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/text-base/INET.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/text-base/UNIX.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/format
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/entries
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Pipe.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Socket.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Seekable.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/File.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Poll.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Dir.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Handle.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base/Select.pm.svn-base
+lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Term/ReadKey.pm
lib/wml/perl/lib/File/PathConvert.pm
lib/wml/perl/lib/Getopt/Long.pm
lib/wml/perl/lib/auto/Getopt/Long/GetOptions.al
@@ -173,32 +173,32 @@
lib/wml/perl/lib/auto/Image/Size/autosplit.ix
lib/wml/perl/lib/HTML/Clean.pm
lib/wml/perl/lib/Image/Size.pm
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/WML
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Term
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Image/Size
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Image
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/IO
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/HTML/Clean
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/HTML
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Getopt/Long
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Getopt
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/File/PathConvert
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/File
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit/Vector
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/WML
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/Term
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/text-base
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%/Bit
- at dirrm lib/wml/perl/lib/%%WML_ARCH%%
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Image/Size
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Image
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/HTML/Clean
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/HTML
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Getopt/Long
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Getopt
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/File/PathConvert
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/File
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/WML
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Term
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/text-base
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Bit
+ at dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%
@dirrm lib/wml/perl/lib/auto/Image/Size
@dirrm lib/wml/perl/lib/auto/Image
@dirrm lib/wml/perl/lib/auto/HTML/Clean
--- wml-patch-280309.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list