- Fix pkg-plist

- Chase location of libxml2 headers

PR:		38229
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 33 insertions, 26 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 25fa5c960492..870c0d4da6fe 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libwmf
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	wvware
@@ -14,27 +15,27 @@ MASTER_SITE_SUBDIR=	wvware
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2     # XXX
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-.ifndef (WITHOUT_X11)
-USE_XLIB=	yes
-PLIST_SUB+=	X11=''
-.else
-PKGNAMESUFFIX=	-nox11
-PLIST_SUB+=	X11='@comment '
-.endif
-
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	# none
-CONFIGURE_ARGS=	--build=${ARCH}-portbld-freebsd${OSREL} \
-		--enable-magick --with-sys-gd=no \
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--enable-magick --with-sys-gd=no \
 		--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \
 		--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
 INSTALLS_SHLIB=	yes
 
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-nox11
+CONFIGURE_ARGS+=	--with-x=no
+PLIST_SUB+=	X11='@comment '
+.else
+USE_XLIB=	yes
+PLIST_SUB+=	X11=''
+.endif
+
 pre-patch:
 	@${PERL} -pi -e 's|src include fonts doc|src include fonts|g' \
 		${WRKSRC}/Makefile.in
diff --git a/graphics/libwmf/files/patch-ltmain.sh b/graphics/libwmf/files/patch-ltmain.sh
index 6f0d975557a7..f83fdb86dd19 100644
--- a/graphics/libwmf/files/patch-ltmain.sh
+++ b/graphics/libwmf/files/patch-ltmain.sh
@@ -1,16 +1,6 @@
---- ltmain.sh.orig	Sun Oct 28 22:08:24 2001
-+++ ltmain.sh	Sat Nov 17 05:11:40 2001
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4175,10 +4178,12 @@
+--- ltmain.sh.orig	Wed May 15 18:57:35 2002
++++ ltmain.sh	Fri May 17 21:18:44 2002
+@@ -4731,10 +4731,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/graphics/libwmf/files/patch-src::font.c b/graphics/libwmf/files/patch-src::font.c
new file mode 100644
index 000000000000..2900d47cdd7b
--- /dev/null
+++ b/graphics/libwmf/files/patch-src::font.c
@@ -0,0 +1,13 @@
+--- src/font.c.orig	Wed May 15 18:34:08 2002
++++ src/font.c	Fri May 17 23:56:23 2002
+@@ -833,8 +833,8 @@
+ 
+ #ifdef HAVE_XML2
+ 
+-#include <libxml/parser.h>
+-#include <libxml/parserInternals.h>
++#include <libxml2/libxml/parser.h>
++#include <libxml2/libxml/parserInternals.h>
+ 
+ static void xml2_start (void* user_data,const char* tag,const char** attributes)
+ {	const char** attr;
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index 7a444a6ec212..a3a3eb340e7a 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -34,6 +34,9 @@ include/libwmf/x.h
 lib/libwmf.a
 lib/libwmf.so
 lib/libwmf.so.2
+lib/libwmflite.a
+lib/libwmflite.so
+lib/libwmflite.so.2
 %%PORTDOCS%%share/doc/libwmf/caolan/2.html
 %%PORTDOCS%%share/doc/libwmf/caolan/Arc.html
 %%PORTDOCS%%share/doc/libwmf/caolan/BitBlt.html