From owner-svn-ports-all@FreeBSD.ORG Tue May 6 09:55:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32500C38; Tue, 6 May 2014 09:55:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1FADDCB1; Tue, 6 May 2014 09:55:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s469tZPV016132; Tue, 6 May 2014 09:55:35 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s469tZdT016129; Tue, 6 May 2014 09:55:35 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201405060955.s469tZdT016129@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 6 May 2014 09:55:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353081 - in head: Mk databases/vsqlite X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 09:55:36 -0000 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 [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@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 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