svn commit: r357445 - head/devel/apr1

[Bryan Drewery]

I'm not sure, I think this may have made www/tomcat-native have its 
shlib go backwards:

A few days ago it was fine:

http://beefy2.isc.freebsd.org/bulk/head-amd64-default/latest-per-pkg/tomcat-native-1.1.30.log

It was generating libtcnative-1.so.1

Now it is generating libtcnative-1.so.0[.30]

Any ideas?

Bryan

On 2014-06-11 04:31, Olli Hauer wrote:
> 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
> + at dirrm include/apr-1
> +%%APU_EXTRAS%%@dirrm lib/apr-util-1
>  @dirrm %%DATADIR%%/build-1
>  @dirrm %%DATADIR%%
> -%%APU_EXTRAS%%@dirrm lib/apr-util-1
> - at dirrm include/apr-1

-- 
Regards,
Bryan Drewery