- Fix pkg-plist and unbreak;

- use libtool;

- add PNG support.

Note: this port is still marked broken on amd64.

PR:		ports/69857
Submitted by:	myself
Approved by:	maintainer.

2 files changed, 46 insertions, 41 deletions

diff --git a/www/wml/Makefile b/www/wml/Makefile
index 6931f5950f17..f117333bb8fe 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -14,13 +14,16 @@ MASTER_SITES=	http://thewml.org/distrib/ \
 MAINTAINER=	delta@lackas.net
 COMMENT=	Website META Language, webdesign toolkit for HTML generation
 
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
 USE_PERL5=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl=${PERL5}
-PLIST_SUB+=	ARCH=${ARCH}-freebsd
-
-BROKEN=		"Broken pkg-plist"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_LIBTOOL_VER=	15
+LIBTOOLFILES=	wml_backend/p2_mp4h/configure
+PLIST_SUB+=	ARCH=${LOCAL_PERL_ARCH}
 
 CAT1=	wml_aux_txt2html.1 wml_aux_tidy.1 wml_p4_gm4.1
 
@@ -55,6 +58,8 @@ MAN7=	wml_intro.7 wml_macros.7 wml_tutorial.7 wml_faq.7 wml_tags.7
 
 .include <bsd.port.pre.mk>
 
+LOCAL_PERL_ARCH!=	${PERL5} -MConfig -e 'print "$$Config{archname}"'
+
 .if ${ARCH} == "amd64"
 BROKEN=		"Build fails on amd64 (needs to build shared libraries with -fPIC)"
 .endif
diff --git a/www/wml/pkg-plist b/www/wml/pkg-plist
index 59ec01483e0f..cb85dbe09562 100644
--- a/www/wml/pkg-plist
+++ b/www/wml/pkg-plist
@@ -18,15 +18,6 @@ lib/wml/data/logos/logo-htdig.png
 lib/wml/data/logos/logo-linux.gif
 lib/wml/data/logos/logo-linux.info
 lib/wml/data/logos/logo-linux.png
-lib/wml/data/logos/logo-php3.gif
-lib/wml/data/logos/logo-php3.info
-lib/wml/data/logos/logo-php3.png
-lib/wml/data/logos/logo-vim.gif
-lib/wml/data/logos/logo-vim.info
-lib/wml/data/logos/logo-vim.png
-lib/wml/data/logos/logo-wml.gif
-lib/wml/data/logos/logo-wml.info
-lib/wml/data/logos/logo-wml.png
 lib/wml/data/logos/logo-netbsd.gif
 lib/wml/data/logos/logo-netbsd.info
 lib/wml/data/logos/logo-netbsd.png
@@ -36,6 +27,15 @@ lib/wml/data/logos/logo-openbsd.png
 lib/wml/data/logos/logo-php.gif
 lib/wml/data/logos/logo-php.info
 lib/wml/data/logos/logo-php.png
+lib/wml/data/logos/logo-php3.gif
+lib/wml/data/logos/logo-php3.info
+lib/wml/data/logos/logo-php3.png
+lib/wml/data/logos/logo-vim.gif
+lib/wml/data/logos/logo-vim.info
+lib/wml/data/logos/logo-vim.png
+lib/wml/data/logos/logo-wml.gif
+lib/wml/data/logos/logo-wml.info
+lib/wml/data/logos/logo-wml.png
 lib/wml/data/logos/logo-xemacs.gif
 lib/wml/data/logos/logo-xemacs.info
 lib/wml/data/logos/logo-xemacs.png
@@ -122,11 +122,11 @@ lib/wml/perl/lib/auto/Image/Size/gifsize.al
 lib/wml/perl/lib/auto/Image/Size/jpegsize.al
 lib/wml/perl/lib/auto/Image/Size/pngsize.al
 lib/wml/perl/lib/auto/Image/Size/ppmsize.al
+lib/wml/perl/lib/auto/Image/Size/psdsize.al
+lib/wml/perl/lib/auto/Image/Size/swfsize.al
 lib/wml/perl/lib/auto/Image/Size/tiffsize.al
 lib/wml/perl/lib/auto/Image/Size/xbmsize.al
 lib/wml/perl/lib/auto/Image/Size/xpmsize.al
-lib/wml/perl/lib/auto/Image/Size/psdsize.al
-lib/wml/perl/lib/auto/Image/Size/swfsize.al
 lib/wml/perl/lib/%%ARCH%%/Bit/Vector.pm
 lib/wml/perl/lib/%%ARCH%%/IO.pm
 lib/wml/perl/lib/%%ARCH%%/IO/Dir.pm
@@ -172,50 +172,50 @@ man/cat7/wml_std_html40.7.gz
 man/cat7/wml_std_html401.7.gz
 man/cat7/wml_std_wai10.7.gz
 man/cat7/wml_std_xhtml10.7.gz
-@dirrm lib/wml/exec
-@dirrm lib/wml/data/logos
-@dirrm lib/wml/data
-@dirrm lib/wml/include/des
-@dirrm lib/wml/include/fmt
-@dirrm lib/wml/include/imp
-@dirrm lib/wml/include/mod
-@dirrm lib/wml/include/std
-@dirrm lib/wml/include/sup
-@dirrm lib/wml/include/sys
-@dirrm lib/wml/include
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Getopt
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Bit/Vector
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Bit
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/File/PathConvert
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/File
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Image/Size
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Image
 @dirrm lib/wml/perl/lib/%%ARCH%%/auto/WML/GD
 @dirrm lib/wml/perl/lib/%%ARCH%%/auto/WML
-@dirrm lib/wml/perl/lib/%%ARCH%%/auto/IO
 @dirrm lib/wml/perl/lib/%%ARCH%%/auto/Term/ReadKey
 @dirrm lib/wml/perl/lib/%%ARCH%%/auto/Term
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Image/Size
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Image
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/IO
 @dirrm lib/wml/perl/lib/%%ARCH%%/auto/HTML/Clean
 @dirrm lib/wml/perl/lib/%%ARCH%%/auto/HTML
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Getopt/Long
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Getopt
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/File/PathConvert
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/File
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Bit/Vector
+@dirrm lib/wml/perl/lib/%%ARCH%%/auto/Bit
 @dirrm lib/wml/perl/lib/%%ARCH%%/auto
-@dirrm lib/wml/perl/lib/%%ARCH%%/Bit
 @dirrm lib/wml/perl/lib/%%ARCH%%/WML
+@dirrm lib/wml/perl/lib/%%ARCH%%/Term
 @dirrm lib/wml/perl/lib/%%ARCH%%/IO/Socket
 @dirrm lib/wml/perl/lib/%%ARCH%%/IO
-@dirrm lib/wml/perl/lib/%%ARCH%%/Term
+@dirrm lib/wml/perl/lib/%%ARCH%%/Bit
 @dirrm lib/wml/perl/lib/%%ARCH%%
-@dirrm lib/wml/perl/lib/Getopt
-@dirrm lib/wml/perl/lib/auto/Getopt/Long
-@dirrm lib/wml/perl/lib/auto/Getopt
 @dirrm lib/wml/perl/lib/auto/Image/Size
 @dirrm lib/wml/perl/lib/auto/Image
 @dirrm lib/wml/perl/lib/auto/HTML/Clean
 @dirrm lib/wml/perl/lib/auto/HTML
+@dirrm lib/wml/perl/lib/auto/Getopt/Long
+@dirrm lib/wml/perl/lib/auto/Getopt
 @dirrm lib/wml/perl/lib/auto
-@dirrm lib/wml/perl/lib/File
 @dirrm lib/wml/perl/lib/Image
 @dirrm lib/wml/perl/lib/HTML
+@dirrm lib/wml/perl/lib/Getopt
+@dirrm lib/wml/perl/lib/File
 @dirrm lib/wml/perl/lib
 @dirrm lib/wml/perl
+@dirrm lib/wml/include/sys
+@dirrm lib/wml/include/sup
+@dirrm lib/wml/include/std
+@dirrm lib/wml/include/mod
+@dirrm lib/wml/include/imp
+@dirrm lib/wml/include/fmt
+@dirrm lib/wml/include/des
+@dirrm lib/wml/include
+@dirrm lib/wml/exec
+@dirrm lib/wml/data/logos
+@dirrm lib/wml/data
 @dirrm lib/wml