diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2014-06-11 09:31:13 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2014-06-11 09:31:13 +0000 |
| commit | 013764a32f77fe38e9bc31f97350c6f04e9de737 (patch) | |
| tree | 9d4b3eb3c6d254d1b93fcb6376039a8b9bc72850 /devel/apr1 | |
| parent | 37a83b3bcc87f32b1626d10902ce58b26ccd7310 (diff) | |
| download | ports-013764a32f77fe38e9bc31f97350c6f04e9de737.tar.gz ports-013764a32f77fe38e9bc31f97350c6f04e9de737.zip | |
- 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.
Notes
Notes:
svn path=/head/; revision=357445
Diffstat (limited to 'devel/apr1')
| -rw-r--r-- | devel/apr1/Makefile | 10 | ||||
| -rw-r--r-- | devel/apr1/pkg-plist | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 5f0b59a3c2d5..17f6b0f55cb0 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -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) diff --git a/devel/apr1/pkg-plist b/devel/apr1/pkg-plist index e6e0158a6c5a..7ddf2e65bb1b 100644 --- a/devel/apr1/pkg-plist +++ b/devel/apr1/pkg-plist @@ -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 |