diff options
| author | mezz <mezz@FreeBSD.org> | 2004-11-25 12:54:14 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2004-11-25 12:54:14 +0800 |
| commit | f070ed77301979e056dc42876a20eaa1ad059359 (patch) | |
| tree | c0090c0b35d4ee42c2fa116b04ac2f8b70df46c8 /devel/apr | |
| parent | e74993e009d3dc587f0658add28adebd7418e72a (diff) | |
| download | freebsd-ports-gnome-f070ed77301979e056dc42876a20eaa1ad059359.tar.gz freebsd-ports-gnome-f070ed77301979e056dc42876a20eaa1ad059359.tar.zst freebsd-ports-gnome-f070ed77301979e056dc42876a20eaa1ad059359.zip | |
Make the portlint a bit happier.
Approved by: dolt_ (IRC handle, the maintainer)
Diffstat (limited to 'devel/apr')
| -rw-r--r-- | devel/apr/Makefile | 20 | ||||
| -rw-r--r-- | devel/apr/pkg-plist | 6 |
2 files changed, 15 insertions, 11 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 8f9710b5aea2..d533bfcd1f81 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -17,7 +17,8 @@ PORTNAME= apr PORTVERSION= 1.0.1 CATEGORIES= devel -MASTER_SITES= http://www.apache.org/dist/apr/ +MASTER_SITES= ${MASTER_SITE_APACHE} +MASTER_SITE_SUBDIR= apr DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz MAINTAINER= rodrigc@crodrigues.org @@ -30,6 +31,7 @@ USE_ICONV= yes USE_AUTOMAKE_VER= 19 USE_AUTOCONF_VER= 259 WANT_LIBTOOL_VER= 15 +USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes USE_PYTHON= yes @@ -124,8 +126,10 @@ pre-extract: @${ECHO_MSG} "" post-patch: - sed -i .orig1 's/OSVERSION/'${OSVERSION}'/g' \ + ${SED} -i .orig1 's/OSVERSION/'${OSVERSION}'/g' \ ${WRKDIR}/apr-${PORTVERSION}/build/apr_hints.m4 + ${FIND} ${WRKDIR} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' pre-configure: .for d in apr apr-util @@ -160,15 +164,15 @@ do-install: cd ${WRKDIR}/apr-util-${PORTVERSION}; ${SETENV} ${MAKE_ENV} ${GMAKE} install debug_autoconf: - @echo "LIBTOOL: ${LIBTOOL_VERSION}" - @echo "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}" - @echo "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}" + @echo "LIBTOOL: ${LIBTOOL_VERSION}" + @echo "AUTOCONF: dev ${dev_acver} cur ${cur_acver} use ${use_acver}" + @echo "AUTOMAKE: dev ${dev_amver} cur ${cur_amver} use ${use_amver}" @echo "AUTOCONF_DIR: ${AUTOCONF_DIR}" @echo "BUILD_DEPENDS: ${BUILD_DEPENDS}" @echo "ACLOCAL_DIR: ${ACLOCAL_DIR}" @echo "LIBTOOLFILES: ${LIBTOOLFILES}" - @echo "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}" - @echo "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}" - @echo "LIBTOOL_M4: ${LIBTOOL_M4}" + @echo "LIBTOOL_SHAREDIR: ${LIBTOOL_SHAREDIR}" + @echo "LIBTOOL_LIBEXECDIR: ${LIBTOOL_LIBEXECDIR}" + @echo "LIBTOOL_M4: ${LIBTOOL_M4}" .include <bsd.port.post.mk> diff --git a/devel/apr/pkg-plist b/devel/apr/pkg-plist index 2a4cd14e90ec..2fbe619d868b 100644 --- a/devel/apr/pkg-plist +++ b/devel/apr/pkg-plist @@ -67,8 +67,8 @@ include/apr-1/apr_xml.h include/apr-1/apu.h include/apr-1/apu_version.h include/apr-1/apu_want.h -lib/pkgconfig/apr-1.pc -lib/pkgconfig/apr-util-1.pc +libdata/pkgconfig/apr-1.pc +libdata/pkgconfig/apr-util-1.pc lib/apr.exp lib/aprutil.exp lib/libapr-1.a @@ -77,6 +77,6 @@ lib/libapr-1.so.0 lib/libaprutil-1.a lib/libaprutil-1.so lib/libaprutil-1.so.0 -@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true +@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true @dirrm build-1 @dirrm include/apr-1 |