Convert to USES=libtool

svn path=/head/; revision=366401

devel/subversion16/Makefile.common

@@ -3,7 +3,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	#please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync.
-PORTREVISION?=	7
+PORTREVISION?=	8
 CATEGORIES+=	devel
 PKGNAMESUFFIX=	16
 MASTER_SITES=	http://subversion.tigris.org/downloads/
@@ -11,9 +11,9 @@ DIST_SUBDIR=	subversion
 
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_KDE4=	# Used below if KWallet support is enabled
-USES+=		pkgconfig tar:bzip2 cpe
+USES+=		cpe libtool pkgconfig tar:bzip2
 
 LICENSE=	APACHE20
 
@@ -106,7 +106,6 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in
 .if defined(SVN_BUILD_BINDINGS)
 	@${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}
 .endif

devel/subversion16/files/patch-Makefile.in

@@ -20,12 +20,3 @@
             @SVN_NEON_INCLUDES@ @SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ \
             @SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@
  
-@@ -188,7 +189,7 @@
- LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
- 
- # special link rule for mod_dav_svn
--LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
-+LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -inst-prefix-dir ${DESTDIR}
- 
- # Compilation of SWIG-generated C source code
- COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@

devel/subversion16/files/patch-build--ltmain.sh

@@ -1,11 +0,0 @@
---- build/ltmain.sh.orig	Fri May 20 21:41:54 2005
-+++ build/ltmain.sh	Wed May 25 14:38:21 2005
-@@ -1492,7 +1492,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+	  *-*-openbsd* | *-*-freebsd4* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;

devel/subversion16/pkg-plist

@@ -54,73 +54,73 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a
-%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la
 %%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
 %%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
+%%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0.0.0
 %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a
-%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la
 %%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
 %%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
+%%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0.0.0
 lib/libsvn_client-1.a
-lib/libsvn_client-1.la
 %%NO_STATIC%%lib/libsvn_client-1.so
 %%NO_STATIC%%lib/libsvn_client-1.so.0
+%%NO_STATIC%%lib/libsvn_client-1.so.0.0.0
 lib/libsvn_delta-1.a
-lib/libsvn_delta-1.la
 %%NO_STATIC%%lib/libsvn_delta-1.so
 %%NO_STATIC%%lib/libsvn_delta-1.so.0
+%%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0
 lib/libsvn_diff-1.a
-lib/libsvn_diff-1.la
 %%NO_STATIC%%lib/libsvn_diff-1.so
 %%NO_STATIC%%lib/libsvn_diff-1.so.0
+%%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0
 lib/libsvn_fs-1.a
-lib/libsvn_fs-1.la
 %%NO_STATIC%%lib/libsvn_fs-1.so
 %%NO_STATIC%%lib/libsvn_fs-1.so.0
+%%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0
 %%BDB%%lib/libsvn_fs_base-1.a
-%%BDB%%lib/libsvn_fs_base-1.la
 %%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so
 %%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0
+%%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0
 lib/libsvn_fs_fs-1.a
-lib/libsvn_fs_fs-1.la
 %%NO_STATIC%%lib/libsvn_fs_fs-1.so
 %%NO_STATIC%%lib/libsvn_fs_fs-1.so.0
+%%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0
 lib/libsvn_fs_util-1.a
-lib/libsvn_fs_util-1.la
 %%NO_STATIC%%lib/libsvn_fs_util-1.so
 %%NO_STATIC%%lib/libsvn_fs_util-1.so.0
+%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0
 lib/libsvn_ra-1.a
-lib/libsvn_ra-1.la
 %%NO_STATIC%%lib/libsvn_ra-1.so
 %%NO_STATIC%%lib/libsvn_ra-1.so.0
+%%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0
 lib/libsvn_ra_local-1.a
-lib/libsvn_ra_local-1.la
 %%NO_STATIC%%lib/libsvn_ra_local-1.so
 %%NO_STATIC%%lib/libsvn_ra_local-1.so.0
+%%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0
 %%NEON%%lib/libsvn_ra_neon-1.a
-%%NEON%%lib/libsvn_ra_neon-1.la
 %%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so
 %%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0
+%%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0.0.0
 lib/libsvn_ra_svn-1.a
-lib/libsvn_ra_svn-1.la
 %%NO_STATIC%%lib/libsvn_ra_svn-1.so
 %%NO_STATIC%%lib/libsvn_ra_svn-1.so.0
+%%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0
 lib/libsvn_repos-1.a
-lib/libsvn_repos-1.la
 %%NO_STATIC%%lib/libsvn_repos-1.so
 %%NO_STATIC%%lib/libsvn_repos-1.so.0
+%%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0
 %%SERF%%lib/libsvn_ra_serf-1.a
-%%SERF%%lib/libsvn_ra_serf-1.la
 %%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so
 %%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0
 lib/libsvn_subr-1.a
-lib/libsvn_subr-1.la
 %%NO_STATIC%%lib/libsvn_subr-1.so
 %%NO_STATIC%%lib/libsvn_subr-1.so.0
+%%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0
 lib/libsvn_wc-1.a
-lib/libsvn_wc-1.la
 %%NO_STATIC%%lib/libsvn_wc-1.so
 %%NO_STATIC%%lib/libsvn_wc-1.so.0
+%%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0
 @comment enable modules in this order: dav_svn, authz_svn, dontdothat
 %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
 %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so