Date: Thu, 16 Feb 2012 10:54:56 +0800 From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: "Lev A. Serebryakov" <lev@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/devel/subversion Makefile Makefile.common distinfo pkg-plist ports/devel/subversion/files pkg-deinstall.in pkg-install.in Message-ID: <20120216025456.GA69160@bonjour.sunpoet.net> In-Reply-To: <201202141606.q1EG6LiA001829@repoman.freebsd.org> References: <201202141606.q1EG6LiA001829@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Feb 14, 2012 at 04:06:21PM +0000, Lev A. Serebryakov wrote:
> lev 2012-02-14 16:06:21 UTC
>=20
> FreeBSD ports repository
>=20
> Modified files:
> devel/subversion Makefile Makefile.common distinfo=20
> pkg-plist=20
> devel/subversion/files pkg-deinstall.in pkg-install.in=20
> Log:
> (1) Upgrade to 1.7.3
> (2) Return building od mod_dontdothat
> (3) Fix pkg-plist and remove strange binary files from installation
> (4) Make better install/deinstall scripts
> (5) Fix installation with SVNSERVE_WRAPPER, MOD_DAV_SVN and WITH_REPO=
_CREATION
> =20
> PR: [3, 4] ports/164033, [5] ports/164583
> =20
> Revision Changes Path
> 1.140 +31 -24 ports/devel/subversion/Makefile
> 1.59 +2 -2 ports/devel/subversion/Makefile.common
> 1.84 +5 -5 ports/devel/subversion/distinfo
> 1.2 +5 -8 ports/devel/subversion/files/pkg-deinstall.in
> 1.2 +2 -2 ports/devel/subversion/files/pkg-install.in
> 1.45 +7 -39 ports/devel/subversion/pkg-plist
Hi,
The path for mod_dontdothat is wrong, the patch is attached.
Thanks.
Regars,
sunpoet
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/pcvs/ports/devel/subversion/Makefile,v
retrieving revision 1.140
diff -u -r1.140 Makefile
--- Makefile 14 Feb 2012 16:06:21 -0000 1.140
+++ Makefile 16 Feb 2012 01:45:00 -0000
@@ -190,7 +190,7 @@
=20
post-build:
.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT)
- cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
+ cd ${WRKSRC}/tools/server-side/mod_dontdothat && \
${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_=
subr/.libs -lsvn_subr-1 mod_dontdothat.c
.endif
# subversion 1.7+ -- it is not optional
@@ -213,7 +213,7 @@
${APXS} -e -S LIBEXECDIR=3D${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREF=
IX}/${APACHEMODDIR}/mod_dav_svn.so
${APXS} -e -S LIBEXECDIR=3D${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PR=
EFIX}/${APACHEMODDIR}/mod_authz_svn.so
.if defined(WITH_MOD_DONTDOTHAT)
- cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
+ cd ${WRKSRC}/tools/server-side/mod_dontdothat && \
${APXS} -i -n dontdothat mod_dontdothat.la
${APXS} -e -S LIBEXECDIR=3D${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${P=
REFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
@@ -236,7 +236,7 @@
.endif
.endif
.if defined(WITH_ASVN)
- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/client-side/asvn ${PREFIX}/bin
.endif
.if defined(WITH_SVNSERVE_WRAPPER)
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
--=20
Sunpoet Po-Chuan Hsieh <sunpoet at sunpoet.net> <sunpoet at FreeBSD.org>
4096R/CC57E36B 8AD8 68F2 7D2B 0A10 7E9B 8CC0 DC44 247E CC57 E36B
http://people.FreeBSD.org/~sunpoet/pgpkeys.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120216025456.GA69160>