svn commit: r353081 - in head: Mk databases/vsqlite

[Tijl Coosemans]

Author: tijl
Date: Tue May  6 09:55:35 2014
New Revision: 353081
URL: http://svnweb.freebsd.org/changeset/ports/353081
QAT: https://qat.redports.org/buildarchive/r353081/

Log:
  - Run autotools in the same order as autoreconf, i.e. libtoolize, aclocal,
    autoconf, autoheader, automake. [1]
    This should allow replacing custom pre-configure and run-autotools
    targets that some ports have with USE_AUTOTOOLS.
  - Set default LIBTOOLIZE_ARGS:
    -i: install missing build scripts.
    -c: copy files instead of linking them.  This is needed for USES=libtool
        to be able to patch them.
    -f: force replacement of existing files.  This ensures all files belong
        to the same version.
  
  database/vsqlite:
  - Fix with new LIBTOOLIZE_ARGS.
  - INSTALL_TARGET=install-strip.
  - Drop :keepla.
  
  Reported by:	Nikola Kolev <koue at chaosophia.net> [1]
  Exp-run:	antoine
  Approved by:	portmgr (antoine)

Modified:
  head/Mk/bsd.autotools.mk
  head/databases/vsqlite/Makefile
  head/databases/vsqlite/pkg-plist

Modified: head/Mk/bsd.autotools.mk
==============================================================================
--- head/Mk/bsd.autotools.mk	Tue May  6 09:27:10 2014	(r353080)
+++ head/Mk/bsd.autotools.mk	Tue May  6 09:55:35 2014	(r353081)
@@ -308,6 +308,8 @@ LIBTOOLFILES?=		aclocal.m4
 LIBTOOLFILES?=		${CONFIGURE_SCRIPT}
 . endif
 
+LIBTOOLIZE_ARGS?=	-i -c -f
+
 LIBTOOL_DEPENDS=	libtool>=2.4:${PORTSDIR}/${LIBTOOL_PORT}
 BUILD_DEPENDS+=		${LIBTOOL_DEPENDS}
 .endif
@@ -329,15 +331,13 @@ ${var:tu}_ENV+=		${AUTOTOOLS_VARS}
 #---------------------------------------------------------------------------
 
 .if !target(run-autotools)
-.ORDER:			run-autotools run-autotools-aclocal \
-				patch-autotools-libtool run-autotools-autoheader \
-				run-autotools-libtoolize run-autotools-autoconf \
-				run-autotools-automake
-
-run-autotools:: run-autotools-aclocal \
-				patch-autotools-libtool run-autotools-autoheader \
-				run-autotools-libtoolize run-autotools-autoconf \
-				run-autotools-automake
+.ORDER:			run-autotools run-autotools-libtoolize run-autotools-aclocal \
+				patch-autotools-libtool run-autotools-autoconf \
+				run-autotools-autoheader run-autotools-automake
+
+run-autotools::	run-autotools-libtoolize run-autotools-aclocal \
+				patch-autotools-libtool run-autotools-autoconf \
+				run-autotools-autoheader run-autotools-automake
 .endif
 
 .if !target(run-autotools-aclocal)

Modified: head/databases/vsqlite/Makefile
==============================================================================
--- head/databases/vsqlite/Makefile	Tue May  6 09:27:10 2014	(r353080)
+++ head/databases/vsqlite/Makefile	Tue May  6 09:55:35 2014	(r353081)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vsqlite
 PORTVERSION=	0.3.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	kwm at FreeBSD.org
@@ -19,17 +19,13 @@ GH_PROJECT=	vsqlite--
 GH_TAGNAME=	3fa8d32
 GH_COMMIT=	3fa8d32
 
-USE_AUTOTOOLS=	libtoolize autoconf automake
-USES=		compiler:c++0x libtool:keepla
+USES=		compiler:c++0x libtool
+USE_AUTOTOOLS=	libtoolize aclocal autoconf automake
+AUTOMAKE_ARGS=	-a -c -f
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-pre-configure:
-	@cd ${WRKSRC} && ${SH} autogen.sh
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvsqlitepp.so.3
-
 .include <bsd.port.mk>

Modified: head/databases/vsqlite/pkg-plist
==============================================================================
--- head/databases/vsqlite/pkg-plist	Tue May  6 09:27:10 2014	(r353080)
+++ head/databases/vsqlite/pkg-plist	Tue May  6 09:55:35 2014	(r353081)
@@ -8,7 +8,6 @@ include/sqlite/result.hpp
 include/sqlite/transaction.hpp
 include/sqlite/view.hpp
 lib/libvsqlitepp.a
-lib/libvsqlitepp.la
 lib/libvsqlitepp.so
 lib/libvsqlitepp.so.3
 lib/libvsqlitepp.so.3.0.0