From owner-svn-ports-all@FreeBSD.ORG Wed Jun 11 09:31:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 02966F75; Wed, 11 Jun 2014 09:31:14 +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 CC07D209A; Wed, 11 Jun 2014 09:31:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5B9VDuB062996; Wed, 11 Jun 2014 09:31:13 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5B9VDCC062994; Wed, 11 Jun 2014 09:31:13 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201406110931.s5B9VDCC062994@svn.freebsd.org> From: Olli Hauer Date: Wed, 11 Jun 2014 09:31:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357445 - head/devel/apr1 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: Wed, 11 Jun 2014 09:31:14 -0000 Author: ohauer Date: Wed Jun 11 09:31:13 2014 New Revision: 357445 URL: http://svnweb.freebsd.org/changeset/ports/357445 QAT: https://qat.redports.org/buildarchive/r357445/ Log: - USES libtool:keepla - bump PORTREVISION Originally I planned to keep this change on hold, but a couple of minutes before gdbm was changed so this is a good time to annoy users only once. Modified: head/devel/apr1/Makefile head/devel/apr1/pkg-plist Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Wed Jun 11 09:19:08 2014 (r357444) +++ head/devel/apr1/Makefile Wed Jun 11 09:31:13 2014 (r357445) @@ -3,6 +3,7 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -29,7 +30,7 @@ NSS_DESC= NSS crypto driver APR_VERSION= 1.5.1 APU_VERSION= 1.5.3 -USES= iconv pathfix +USES= iconv pathfix libtool:keepla USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -38,8 +39,8 @@ APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION} PLIST_SUB+= SHLIB_APR_MAJOR="${SHLIB_APR_MAJOR}" SHLIB_APU_MAJOR="${SHLIB_APU_MAJOR}" -SHLIB_APR_MAJOR= 5 -SHLIB_APU_MAJOR= 5 +SHLIB_APR_MAJOR= ${APR_VERSION:C/^1/0/} +SHLIB_APU_MAJOR= ${APU_VERSION:C/^1/0/} APR_CONF_ARGS= --with-installbuilddir=${DATADIR}/build-1 \ --enable-posix-shm @@ -191,6 +192,9 @@ do-install: @(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} ${MAKE_ARGS}) @(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET} ${MAKE_ARGS}) +post-install: + @${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD} + test: build -@(cd ${APR_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test) -@(cd ${APU_WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} test) Modified: head/devel/apr1/pkg-plist ============================================================================== --- head/devel/apr1/pkg-plist Wed Jun 11 09:19:08 2014 (r357444) +++ head/devel/apr1/pkg-plist Wed Jun 11 09:31:13 2014 (r357445) @@ -116,10 +116,12 @@ lib/aprutil.exp lib/libapr-1.a lib/libapr-1.la lib/libapr-1.so +lib/libapr-1.so.0 lib/libapr-1.so.%%SHLIB_APR_MAJOR%% lib/libaprutil-1.a lib/libaprutil-1.la lib/libaprutil-1.so +lib/libaprutil-1.so.0 lib/libaprutil-1.so.%%SHLIB_APU_MAJOR%% libdata/pkgconfig/apr-1.pc libdata/pkgconfig/apr-util-1.pc @@ -128,7 +130,7 @@ libdata/pkgconfig/apr-util-1.pc %%DATADIR%%/build-1/make_exports.awk %%DATADIR%%/build-1/make_var_export.awk %%DATADIR%%/build-1/mkdir.sh +@dirrm include/apr-1 +%%APU_EXTRAS%%@dirrm lib/apr-util-1 @dirrm %%DATADIR%%/build-1 @dirrm %%DATADIR%% -%%APU_EXTRAS%%@dirrm lib/apr-util-1 -@dirrm include/apr-1