Remove all mi-induced bogons:

- Don't honour bogus MAKE_JOBS;
- sort pkg-plist and remove bogus `@dirrm share/doc/ja/' from it;
- remove useless USE_LIBTOOL.

3 files changed, 24 insertions, 17 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 0e8a98ed8b98..8bd74ec91bd8 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
@@ -17,12 +18,8 @@ BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-MAKE_FLAGS+=	LIBTOOL="${LIBTOOL}" -ELIBTOOL
-.if defined(MAKE_JOBS)
-MAKE_FLAGS+=	AM_MAKEFLAGS=-j${MAKE_JOBS}
-.endif
 
 CONFIGURE_ARGS=	--with-iconv \
 		--with-html-dir=${PREFIX}/share/doc
@@ -35,15 +32,8 @@ MAN4=		libxml.4
 pre-patch:
 	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
-
-post-patch:
-	@${PERL} -pi -e 's/([^g])iconv.h/\1giconv.h/g;' \
-		-e 's/-liconv/-lgiconv/g' ${WRKSRC}/${CONFIGURE_SCRIPT} \
-		${WRKSRC}/include/libxml/encoding.h
-
-# If someone knows a better way to avoid this from even creeping into
-# lib/ -- please, tell me...	$Author$
-post-install:
-	${RM} ${PREFIX}/lib/libxml2.la
+	@cd ${WRKSRC} && ${PERL} -pi -e \
+		's|([^g])iconv.h|\1giconv.h|g ; s|-liconv|-lgiconv|g' \
+			configure include/libxml/encoding.h
 
 .include <bsd.port.mk>
diff --git a/textproc/libxml2/files/patch-ltmain.sh b/textproc/libxml2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/textproc/libxml2/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 5dc565dc30dc..51972800311e 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -1,6 +1,6 @@
 bin/xml2-config
-bin/xmllint
 bin/xmlcatalog
+bin/xmllint
 etc/xml2Conf.sh
 include/libxml2/libxml/DOCBparser.h
 include/libxml2/libxml/HTMLparser.h
@@ -65,7 +65,6 @@ share/doc/libxml2/html/libxml-xpathinternals.html
 share/doc/libxml2/html/libxml-xpointer.html
 share/doc/libxml2/html/structure.gif
 share/doc/libxml2/html/xml.html
-@dirrm share/doc/ja/
 @dirrm share/doc/libxml2/html
 @dirrm share/doc/libxml2
 @dirrm include/libxml2/libxml