Replace USES=libtool:oldver with USES=libtool or USES=libtool:keepla in

the 32 ports that still use it.  Bump PORTREVISION on their dependent
ports except the ones that depend on these:

audio/libogg
audio/libvorbis
devel/pcre
ftp/curl
graphics/jpeg
graphics/libart_lgpl
graphics/tiff
textproc/expat2
textproc/libxslt

In these cases the same trick as in the recent gettext update is used.
The ports install a symlink with the old library version.  When enough
of their dependent ports have had regular updates the remaining ones can
get a PORTREVISION bump and the links can be removed.

Also remove the devel/pcre dependency from USE_GNOME=glib20.  It causes
over 2200 packages to depend on devel/pcre while less than 200 actually
link with it.  The glib20 package still depends on devel/pcre so this
should not make a difference for ports with USE_GNOME=glib20.  Also,
libdata/pkgconfig/glib-2.0.pc lists pcre as a private library so
USE_GNOME=glib20 should not propagate it.

PR:		195724
Exp-run by:	antoine
Approved by:	portmgr (antoine)

13 files changed, 28 insertions, 28 deletions

diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 70432612cb20..7d6aa1d8676b 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	expat
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
@@ -12,23 +12,13 @@ COMMENT=	XML 1.0 parser written in C
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	default
-USES=		pathfix libtool:keepla
+USES=		libtool pathfix
 USE_LDCONFIG=	yes
 
-# Increment only when there are incompatible API changes.
-SHLIB_MAJOR=	6
-
-PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
-
 post-patch:
-	@${REINPLACE_CMD} \
-		-e 's/@LIBCURRENT.*@/${SHLIB_MAJOR}/' \
-		-e '/^DESTDIR =/d' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^DESTDIR =/d' ${WRKSRC}/Makefile.in
 
-list-depend-ports:
-	cd ${PORTSDIR}; \
-	${FIND} . -mindepth 3 -maxdepth 3 -name Makefile -execdir ${SH} -c \
-		'${FIND} . -type f | ${GREP} -v CVS | ${XARGS} ${GREP} -q expat.5' \; \
-		-print
+post-stage:
+	${LN} -s libexpat.so.1 ${STAGEDIR}${PREFIX}/lib/libexpat.so.6
 
 .include <bsd.port.mk>
diff --git a/textproc/expat2/pkg-plist b/textproc/expat2/pkg-plist
index cc3f187c4cb0..a0601dacb2d9 100644
--- a/textproc/expat2/pkg-plist
+++ b/textproc/expat2/pkg-plist
@@ -2,9 +2,9 @@ bin/xmlwf
 include/expat.h
 include/expat_external.h
 lib/libexpat.a
-lib/libexpat.la
 lib/libexpat.so
-lib/libexpat.so.%%SHLIB_MAJOR%%
-lib/libexpat.so.%%SHLIB_MAJOR%%.0.0
+lib/libexpat.so.1
+lib/libexpat.so.1.6.0
+lib/libexpat.so.6
 libdata/pkgconfig/expat.pc
 man/man1/xmlwf.1.gz
diff --git a/textproc/fcitx-m17n/Makefile b/textproc/fcitx-m17n/Makefile
index 44b48bb115ee..5a5ff9544377 100644
--- a/textproc/fcitx-m17n/Makefile
+++ b/textproc/fcitx-m17n/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fcitx-m17n
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	fcitx
diff --git a/textproc/gladtex/Makefile b/textproc/gladtex/Makefile
index 606445788bc8..03bee7cb6211 100644
--- a/textproc/gladtex/Makefile
+++ b/textproc/gladtex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gladtex
 PORTVERSION=	1.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc math www
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/textproc/ibus-m17n/Makefile b/textproc/ibus-m17n/Makefile
index 51fa94c87880..cea471314abc 100644
--- a/textproc/ibus-m17n/Makefile
+++ b/textproc/ibus-m17n/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ibus-m17n
 PORTVERSION=	1.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 71db8f6f7584..e2359671420a 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 3a9a1c3089ff..6445f6393063 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxslt
 PORTVERSION=	1.1.28
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
 		http://xmlsoft.org/sources/ \
@@ -15,7 +15,7 @@ COMMENT?=	The XSLT C library for GNOME
 
 .if !defined(REFERENCE_PORT)
 
-USES+=		gmake libtool:oldver pathfix
+USES+=		gmake libtool pathfix
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
@@ -48,6 +48,12 @@ post-patch:
 		s|[$$](bindir)/xmllint|../xmllint/xmllint|g' \
 		${WRKSRC}/doc/Makefile.in
 
+.if !defined(MASTERDIR)
+post-stage:
+	${LN} -s libxslt.so.1 ${STAGEDIR}${PREFIX}/lib/libxslt.so.2
+	${LN} -s libexslt.so.0 ${STAGEDIR}${PREFIX}/lib/libexslt.so.8
+.endif
+
 .include <bsd.port.mk>
 
 .endif
diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist
index ee1e00c5c3d9..9910d7c3d590 100644
--- a/textproc/libxslt/pkg-plist
+++ b/textproc/libxslt/pkg-plist
@@ -25,12 +25,14 @@ include/libxslt/xsltexports.h
 include/libxslt/xsltlocale.h
 include/libxslt/xsltutils.h
 lib/libexslt.a
-lib/libexslt.la
 lib/libexslt.so
+lib/libexslt.so.0
+lib/libexslt.so.0.8.17
 lib/libexslt.so.8
 lib/libxslt.a
-lib/libxslt.la
 lib/libxslt.so
+lib/libxslt.so.1
+lib/libxslt.so.1.1.28
 lib/libxslt.so.2
 lib/xsltConf.sh
 libdata/pkgconfig/libexslt.pc
diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
index 54c4f59c48fd..bf7fd524c1f9 100644
--- a/textproc/m17n-im-config/Makefile
+++ b/textproc/m17n-im-config/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	m17n-im-config
 PORTVERSION=	0.9.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.m17n.org/common/im-config/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/py-libxslt/pkg-plist b/textproc/py-libxslt/pkg-plist
index 097dd632450e..fbc8c6b53177 100644
--- a/textproc/py-libxslt/pkg-plist
+++ b/textproc/py-libxslt/pkg-plist
@@ -2,7 +2,6 @@
 %%PYTHON_SITELIBDIR%%/libxslt.pyc
 %%PYTHON_SITELIBDIR%%/libxslt.pyo
 %%PYTHON_SITELIBDIR%%/libxsltmod.a
-%%PYTHON_SITELIBDIR%%/libxsltmod.la
 %%PYTHON_SITELIBDIR%%/libxsltmod.so
 %%DOCSDIR%%/TODO
 %%EXAMPLESDIR%%/basic.py
diff --git a/textproc/scim-m17n/Makefile b/textproc/scim-m17n/Makefile
index 136b70a5b214..ec405b60ded0 100644
--- a/textproc/scim-m17n/Makefile
+++ b/textproc/scim-m17n/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim-m17n
 PORTVERSION=	0.2.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 592b2c159dce..e23d7d15a310 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sigil
 PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	Sigil-${PORTVERSION}-Code
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index ae3344d18734..0df0541486ec 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -1,6 +1,7 @@
 # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	2
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-m17nlib-nox11
 .else