Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 19 insertions, 11 deletions

diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 0ad0fd9e9183..e9097ed6cd3e 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	hk_classes
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hk-classes
@@ -21,12 +22,11 @@ USE_PYTHON=	yes
 USE_GNOME=	pkgconfig
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--with-pythondir=${PYTHONBASE}
-GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
 LDCONFIG_DIRS+=	${PREFIX}/lib/hk_classes/
 
 OPTIONS=	MYSQL		"Build MySQL driver"		on  \
diff --git a/databases/hk_classes/pkg-plist b/databases/hk_classes/pkg-plist
index e4835bc4d913..c79c85db4c06 100644
--- a/databases/hk_classes/pkg-plist
+++ b/databases/hk_classes/pkg-plist
@@ -55,33 +55,41 @@ include/hk_classes/hk_subform.h
 include/hk_classes/hk_tabvisible.h
 include/hk_classes/hk_url.h
 include/hk_classes/hk_visible.h
-%%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.so.0
-%%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.so
 %%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.a
+%%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.la
+%%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.so
+%%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.so.0
+%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.a
+%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.la
 %%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so
 %%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so.3
-%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.a
+%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.a
+%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.la
 %%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so
 %%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so.0
-%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.a
+%%PARADOX%%lib/hk_classes/drivers/libhk_paradoxdriver.a
+%%PARADOX%%lib/hk_classes/drivers/libhk_paradoxdriver.la
 %%PARADOX%%lib/hk_classes/drivers/libhk_paradoxdriver.so.0
 %%PARADOX%%lib/hk_classes/drivers/libhk_paradoxdriver.so
-%%PARADOX%%lib/hk_classes/drivers/libhk_paradoxdriver.a
+%%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.a
+%%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.la
 %%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.so
 %%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.so.0
-%%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.a
+%%SQLITE2%%lib/hk_classes/drivers/libhk_sqlite2driver.a
+%%SQLITE2%%lib/hk_classes/drivers/libhk_sqlite2driver.la
 %%SQLITE2%%lib/hk_classes/drivers/libhk_sqlite2driver.so
 %%SQLITE2%%lib/hk_classes/drivers/libhk_sqlite2driver.so.0
-%%SQLITE2%%lib/hk_classes/drivers/libhk_sqlite2driver.a
+%%SQLITE3%%lib/hk_classes/drivers/libhk_sqlite3driver.a
+%%SQLITE3%%lib/hk_classes/drivers/libhk_sqlite3driver.la
 %%SQLITE3%%lib/hk_classes/drivers/libhk_sqlite3driver.so
 %%SQLITE3%%lib/hk_classes/drivers/libhk_sqlite3driver.so.0
-%%SQLITE3%%lib/hk_classes/drivers/libhk_sqlite3driver.a
 %%PYTHON_SITELIBDIR%%/_hk_classes.so
 %%PYTHON_SITELIBDIR%%/hk_classes.py
 %%PYTHON_SITELIBDIR%%/hk_classes.pyc
+lib/hk_classes/libhk_classes.a
+lib/hk_classes/libhk_classes.la
 lib/hk_classes/libhk_classes.so
 lib/hk_classes/libhk_classes.so.9
-lib/hk_classes/libhk_classes.a
 @dirrm lib/hk_classes/drivers
 @dirrm lib/hk_classes
 @dirrm include/hk_classes