- Fix build.

- Use $Config{archname} from perl for PLIST_SUB.

PR:		ports/133166
Submitted by:	Rodrigo OSORIO (ros) <rodrigo@bebik.net> (maintainer)

4 files changed, 99 insertions, 76 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 2f093a3b74da..3f249ba3c60b 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -19,15 +19,12 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 BUILD_DEPENDS=	lynx:${PORTSDIR}/www/lynx \
 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
-PLIST_SUB=	WML_ARCH=${ARCH}-freebsd
 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
-
 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 \
 	wml_aux_map2html.1 wml_aux_weblint.1 wml_p1_ipp.1 \
@@ -58,6 +55,11 @@ MAN7=	wml_barebone.7 \
 	wml_std_html401.7 wml_std_wai10.7 wml_std_xhtml10.7 \
 	wml_intro.7 wml_macros.7 wml_tutorial.7 wml_faq.7 wml_tags.7
 
+.include <bsd.port.pre.mk>
+
+PERL_ARCHNAME!=	${PERL} -V:archname 2>/dev/null || true
+PLIST_SUB=	LOCAL_PERL_ARCH=${PERL_ARCHNAME:S/archname='//:S/';//}
+
 do-configure:
 	@[ -f ${CONFIGURE_COOKIE}] || (cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS})
 
@@ -67,4 +69,4 @@ post-build:
 test:
 	@cd ${WRKSRC} && ${GMAKE} test
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/wml/files/patch-wml_backend-p3_eperl-configure b/www/wml/files/patch-wml_backend-p3_eperl-configure
new file mode 100644
index 000000000000..40b26aee6148
--- /dev/null
+++ b/www/wml/files/patch-wml_backend-p3_eperl-configure
@@ -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 --git a/www/wml/files/patch-wml_common-gd-Makefile.PL.in b/www/wml/files/patch-wml_common-gd-Makefile.PL.in
new file mode 100644
index 000000000000..d3ce59c549e4
--- /dev/null
+++ b/www/wml/files/patch-wml_common-gd-Makefile.PL.in
@@ -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 --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index b1bb63913db2..b44bea5054e2 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -105,52 +105,52 @@ lib/wml/include/sys/all.wml
 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/swfsize.al
 lib/wml/perl/lib/auto/Image/Size/autosplit.ix
 lib/wml/perl/lib/HTML/Clean.pm
 lib/wml/perl/lib/Image/Size.pm
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/WML/GD
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/WML
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Term/ReadKey
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Term
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Image/Size
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Image
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/IO
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/HTML/Clean
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/HTML
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Getopt
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/File/PathConvert
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/File
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit/Vector
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto/Bit
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/auto
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/WML
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/Term
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn/text-base
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket/.svn
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/Socket
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn/text-base
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO/.svn
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/IO
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%/Bit
-@dirrm lib/wml/perl/lib/%%WML_ARCH%%
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML/GD
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/WML
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term/ReadKey
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Term
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Image/Size
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Image
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/IO
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/HTML/Clean
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/HTML
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Getopt/Long
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Getopt
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/File/PathConvert
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/File
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit/Vector
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto/Bit
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/auto
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/WML
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Term
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn/text-base
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket/.svn
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/Socket
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn/text-base
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO/.svn
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/IO
+@dirrm lib/wml/perl/lib/%%LOCAL_PERL_ARCH%%/Bit
+@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