change the libtool version to use from 1.3 to 1.5

13 files changed, 19 insertions, 16 deletions

diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index fc239bb3ae11..3afb8a01e261 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	Coin:${PORTSDIR}/graphics/Coin
 
 USE_MESA=	yes
 USE_MOTIF=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--with-pthread=yes --with-coin=${X11BASE}
 # avoid renaming of soxt-config and soxt-config.1
diff --git a/x11-toolkits/SoXt/pkg-plist b/x11-toolkits/SoXt/pkg-plist
index 407fefa871ac..2550f7a8da51 100644
--- a/x11-toolkits/SoXt/pkg-plist
+++ b/x11-toolkits/SoXt/pkg-plist
@@ -36,7 +36,6 @@ include/Inventor/Xt/SoXtRenderArea.h
 lib/libSoXt.a
 lib/libSoXt.so.0
 lib/libSoXt.so
-lib/libSoXt.la
 share/aclocal/soxt.m4
 share/Coin/conf/soxt-default.cfg
 @dirrm share/Coin/conf
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index a1876a631338..9ff656d2cf3a 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -21,7 +21,8 @@ LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
 
 USE_GL=		yes
 USE_GNOME=	gtk12
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-lib-GL
 INSTALLS_SHLIB=	yes
@@ -30,4 +31,8 @@ CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU \
 		${PTHREAD_LIBS}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkglarea--/pkg-plist b/x11-toolkits/gtkglarea--/pkg-plist
index a37abc493f22..eeda5778019b 100644
--- a/x11-toolkits/gtkglarea--/pkg-plist
+++ b/x11-toolkits/gtkglarea--/pkg-plist
@@ -2,7 +2,6 @@ include/gtkgl--/private/glarea_p.h
 include/gtkgl--/gdkgl.h
 include/gtkgl--/glarea.h
 lib/libgtkglmm.a
-lib/libgtkglmm.la
 lib/libgtkglmm.so
 lib/libgtkglmm.so.1
 @dirrm include/gtkgl--/private
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 62d4dba08723..98bc6dac6b11 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 lthack
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++ ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-lib-GL
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index e10d6d58e2d0..a4d2bce3d1c1 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_GL=		yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 1095df26ef96..dedb0855f0dc 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext \
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/gtkglextmm/pkg-plist b/x11-toolkits/gtkglextmm/pkg-plist
index 633483591220..311374f3e00e 100644
--- a/x11-toolkits/gtkglextmm/pkg-plist
+++ b/x11-toolkits/gtkglextmm/pkg-plist
@@ -34,11 +34,9 @@ lib/gtkglextmm-1.0/proc/m4/convert.m4
 lib/gtkglextmm-1.0/proc/m4/convert_gdkglext.m4
 lib/gtkglextmm-1.0/proc/m4/convert_gtkglext.m4
 lib/libgdkglextmm-x11-1.0.a
-lib/libgdkglextmm-x11-1.0.la
 lib/libgdkglextmm-x11-1.0.so
 lib/libgdkglextmm-x11-1.0.so.0
 lib/libgtkglextmm-x11-1.0.a
-lib/libgtkglextmm-x11-1.0.la
 lib/libgtkglextmm-x11-1.0.so
 lib/libgtkglextmm-x11-1.0.so.0
 @dirrm lib/gtkglextmm-1.0/proc/m4
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index fe410ddd177e..25d43f84613c 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display scientific data as dynamic plot
 
 USE_MOTIF=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 08c077c41bde..ce050968c175 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Athena Widgets with N*XTSTEP appearance
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index be8caf3e868c..3888ef39f72d 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	physfs-1.0.0:${PORTSDIR}/devel/physfs \
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -47,6 +47,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[$][(]SDL_CFLAGS[)]|\$\(PARAGUI_CFLAGS\)|g ; \
 		 s|lib/pkgconfig|libdata/pkgconfig|g ; \
-		 s|-L[./]*../src|&/.libs |g'
+		 s|-L[./]*../src|&/.libs |g ; \
+		 s|-release $$(LT_RELEASE)||g'
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index be8caf3e868c..3888ef39f72d 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	physfs-1.0.0:${PORTSDIR}/devel/physfs \
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_SDL=	sdl image ttf
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -47,6 +47,7 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[$][(]SDL_CFLAGS[)]|\$\(PARAGUI_CFLAGS\)|g ; \
 		 s|lib/pkgconfig|libdata/pkgconfig|g ; \
-		 s|-L[./]*../src|&/.libs |g'
+		 s|-L[./]*../src|&/.libs |g ; \
+		 s|-release $$(LT_RELEASE)||g'
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index d0eb11ed19dc..59b2b91acbf3 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -18,7 +18,7 @@ COMMENT=	C++ wrapper for GTK+ toolkit
 USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk20 lthack
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no --enable-testvdk=no