From f0a1c5bc72a19366e4ee77eb8ec344083d02a721 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 29 Jul 2014 23:40:17 +0000
Subject: [PATCH] - Switch devel/cppunit to USES=libtool, drop .la files

Approved by:	portmgr blanket
---
 devel/cppunit/Makefile         | 4 ++--
 devel/cppunit/pkg-plist        | 3 +--
 math/tvmet/Makefile            | 2 +-
 ports-mgmt/packagekit/Makefile | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index a57482e22665..881d7046a020 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cppunit
 PORTVERSION=	1.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -12,7 +12,7 @@ COMMENT=	C++ port of the JUnit framework for unit testing
 
 OPTIONS_DEFINE=	DOXYGEN DOCS
 
-USE_AUTOTOOLS=	libtool
+USES=		libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/devel/cppunit/pkg-plist b/devel/cppunit/pkg-plist
index ef0567e7daae..ab6884aeace1 100644
--- a/devel/cppunit/pkg-plist
+++ b/devel/cppunit/pkg-plist
@@ -1,9 +1,8 @@
 bin/DllPlugInTester
 bin/cppunit-config
-lib/libcppunit-1.12.so
 lib/libcppunit-1.12.so.1
+lib/libcppunit-1.12.so.1.0.0
 lib/libcppunit.a
-lib/libcppunit.la
 lib/libcppunit.so
 libdata/pkgconfig/cppunit.pc
 man/man1/cppunit-config.1.gz
diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile
index e33e3dc6e42e..5b1830c396fa 100644
--- a/math/tvmet/Makefile
+++ b/math/tvmet/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--with-cxx=${CXX}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCPPUNIT}
-LIB_DEPENDS+=	libcppunit-1.12.so:${PORTSDIR}/devel/cppunit
+LIB_DEPENDS+=	libcppunit.so:${PORTSDIR}/devel/cppunit
 CONFIGURE_ARGS+=	--with-cppunit-prefix=${LOCALBASE}
 .else
 CONFIGURE_ENV+=	ac_cv_path_CPPUNIT_CONFIG=no
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 45ed5d0f7b89..f8b3f279f28f 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=--disable-qt
 LIB_DEPENDS+=	libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit
 
 CONFIGURE_ARGS+=--enable-qt
-LIB_DEPENDS+=	libcppunit-1.12.so:${PORTSDIR}/devel/cppunit
+LIB_DEPENDS+=	libcppunit.so:${PORTSDIR}/devel/cppunit
 USE_QT4+=	dbus gui xml sql moc_build
 #.include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif