Index: print/freetype2/Makefile
===================================================================
--- print/freetype2/Makefile	(revision 347977)
+++ print/freetype2/Makefile	(working copy)
@@ -4,6 +4,7 @@
 
 PORTNAME=	freetype2
 PORTVERSION=	2.5.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
 		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
@@ -18,12 +19,10 @@
 COMMENT=	Free and portable TrueType font rendering engine
 
 USE_BZIP2=	yes
-USES=		gmake
+USES=		gmake libtool
 MAKE_ENV=	TOP=""
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	ltverhack:9
-ltverhack_PATCH_FILES=	builds/unix/ltmain.sh
 CONFIGURE_ARGS=	--without-harfbuzz
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 
Index: print/freetype2/pkg-plist
===================================================================
--- print/freetype2/pkg-plist	(revision 347977)
+++ print/freetype2/pkg-plist	(working copy)
@@ -53,7 +53,8 @@
 lib/libfreetype.a
 lib/libfreetype.la
 lib/libfreetype.so
-lib/libfreetype.so.9
+lib/libfreetype.so.6
+lib/libfreetype.so.6.11.2
 libdata/pkgconfig/freetype2.pc
 man/man1/freetype-config.1.gz
 share/aclocal/freetype2.m4
Index: textproc/libxml2/Makefile
===================================================================
--- textproc/libxml2/Makefile	(revision 347977)
+++ textproc/libxml2/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.8.0
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
 		http://xmlsoft.org/sources/ \
@@ -17,7 +17,7 @@
 .if !defined(REFERENCE_PORT)
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
-USES=		pathfix gmake iconv pkgconfig
+USES=		gmake iconv libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
 		--with-html-dir=${PREFIX}/share/doc \
@@ -25,6 +25,9 @@
 		--with-lzma=/usr \
 		--without-python
 
+LIBVERSION=	${PORTVERSION}
+PLIST_SUB+=	LIBVERSION=${LIBVERSION}
+
 .if !defined(MASTERDIR)
 OPTIONS_DEFINE= SCHEMA THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
 OPTIONS_DEFAULT=SCHEMA THREADS
@@ -60,6 +63,9 @@
 		-e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \$$0; \
 		touch -mt \$$mtime \$$0" {} \; || /usr/bin/true
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxml2.so.${LIBVERSION}
+
 .include <bsd.port.mk>
 
 .endif
Index: textproc/libxml2/files/patch-Makefile.in
===================================================================
--- textproc/libxml2/files/patch-Makefile.in	(revision 347977)
+++ textproc/libxml2/files/patch-Makefile.in	(working copy)
@@ -11,15 +11,6 @@
  DIST_SUBDIRS = include . doc example python xstc
  INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ @LZMA_CFLAGS@
  bin_SCRIPTS = xml2-config
-@@ -596,7 +596,7 @@
- @USE_VERSION_SCRIPT_TRUE@LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
- libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \
-                      $(LIBXML2_VERSION_SCRIPT) \
--		     -version-info @LIBXML_VERSION_INFO@ \
-+		     -version-info 5:0:0 \
- 		     @MODULE_PLATFORM_LIBS@
- 
- @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
 @@ -712,7 +712,7 @@
  runxmlconf_DEPENDENCIES = $(DEPS)
  runxmlconf_LDADD = $(LDADDS)
Index: textproc/libxml2/pkg-plist
===================================================================
--- textproc/libxml2/pkg-plist	(revision 347977)
+++ textproc/libxml2/pkg-plist	(working copy)
@@ -52,7 +52,8 @@
 lib/libxml2.a
 lib/libxml2.la
 lib/libxml2.so
-lib/libxml2.so.5
+lib/libxml2.so.2
+lib/libxml2.so.%%LIBVERSION%%
 libdata/pkgconfig/libxml-2.0.pc
 share/aclocal/libxml.m4
 man/man1/xml2-config.1.gz
Index: textproc/py-libxml2/Makefile
===================================================================
--- textproc/py-libxml2/Makefile	(revision 347977)
+++ textproc/py-libxml2/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -28,7 +28,8 @@
 EXAMPLESDIR=	${PREFIX}/share/examples/py-libxml2
 
 post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${STAGEDIR}${PYTHON_SITELIBDIR}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${STAGEDIR}${PYTHON_SITELIBDIR}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so
 
 .include "${MASTERDIR}/Makefile"