Index: subversion/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile,v retrieving revision 1.144 diff -u -r1.144 Makefile --- subversion/Makefile 2 Apr 2012 15:16:52 -0000 1.144 +++ subversion/Makefile 2 Apr 2012 19:21:43 -0000 @@ -210,19 +210,6 @@ fi .endif -post-build: -.if defined(WITH_MOD_DAV_SVN) && defined(WITH_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 -#.if defined(WITH_SVNAUTHZ_VALIDATE) -# # place binary in ${WRKDIR}, else we install it twice -# cd ${WRKSRC}/tools/server-side && \ -# ${CC} svnauthz-validate.c -o ../../svnauthz-validate -I${WRKSRC}/subversion/include -I${APR_INCLUDE_DIR} \ -# -L${WRKSRC}/subversion/libsvn_repos/.libs -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_repos-1 -lsvn_subr-1 -#.endif - pre-install: .if defined(WITH_MOD_DAV_SVN) # activate dav_module now in pkg-install to prevent double activation. @@ -235,17 +222,17 @@ ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so .if defined(WITH_MOD_DONTDOTHAT) - cd ${WRKSRC}/tools/server-side/mod_dontdothat && \ - ${APXS} -i -n dontdothat mod_dontdothat.la ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so .endif .endif .if defined(WITH_SVNAUTHZ_VALIDATE) - ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/tools/server-side/svnauthz-validate ${PREFIX}/bin + ${LIBTOOL} --mode=install ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/tools/server-side/svnauthz-validate ${PREFIX}/bin .endif @${MKDIR} ${DATADIR} cd ${WRKSRC}/tools ; \ - ${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' -cf - * | ${TAR} -C ${DATADIR} -xf - + ${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' --exclude='*.slo' -cf - * | ${TAR} -C ${DATADIR} -xf - +# ugly hack to remove libtool scripts ... + @${GREP} -R ${WRKSRC} ${DATADIR} | ${CUT} -d\: -f 1 | ${XARGS} ${RM} -f @${CHMOD} -R a-st,o+rX ${DATADIR} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} Index: subversion/Makefile.common =================================================================== RCS file: /home/pcvs/ports/devel/subversion/Makefile.common,v retrieving revision 1.61 diff -u -r1.61 Makefile.common --- subversion/Makefile.common 2 Apr 2012 15:16:52 -0000 1.61 +++ subversion/Makefile.common 2 Apr 2012 19:21:43 -0000 @@ -6,7 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.7.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \ ${MASTER_SITE_LOCAL:S/$/:book/} @@ -68,6 +68,10 @@ PLIST_SUB+= BDB="@comment " .endif +.if defined(WITH_MOD_DONTDOTHAT) && defined(WITHOUT_MOD_DAV_SVN) +IGNORE= to build mod_dontdothat option mod_dav_svn is required +.endif + .if defined(WITH_MOD_DAV_SVN) WITH_APACHE= yes CONFIGURE_ARGS+=--with-apxs=${APXS} Index: subversion/pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/subversion/pkg-plist,v retrieving revision 1.46 diff -u -r1.46 pkg-plist --- subversion/pkg-plist 1 Apr 2012 18:45:05 -0000 1.46 +++ subversion/pkg-plist 2 Apr 2012 19:21:43 -0000 @@ -229,7 +229,6 @@ %%DATADIR%%/client-side/svn-graph.pl %%DATADIR%%/client-side/svn-ssl-fingerprints.sh %%DATADIR%%/client-side/svn-viewspec.py -%%DATADIR%%/client-side/svnmucc/svnmucc %%DATADIR%%/client-side/svnmucc/svnmucc.c %%DATADIR%%/client-side/svnmucc/svnmucc-test.py %%DATADIR%%/client-side/wcfind @@ -272,7 +271,6 @@ %%DATADIR%%/dev/svn-entries.el %%DATADIR%%/dev/svn-merge-revs.py %%DATADIR%%/dev/svnqlite3-dump -%%DATADIR%%/dev/svnraisetreeconflict/svnraisetreeconflict %%DATADIR%%/dev/svnraisetreeconflict/main.c %%DATADIR%%/dev/trails.py %%DATADIR%%/dev/unix-build/Makefile.svn @@ -289,11 +287,8 @@ %%DATADIR%%/dev/windows-build/document-version.pl %%DATADIR%%/dev/windows-build/Makefile %%DATADIR%%/dev/windows-build/README -%%DATADIR%%/diff/diff %%DATADIR%%/diff/diff.c -%%DATADIR%%/diff/diff3 %%DATADIR%%/diff/diff3.c -%%DATADIR%%/diff/diff4 %%DATADIR%%/diff/diff4.c %%DATADIR%%/dist/backport.pl %%DATADIR%%/dist/checksums.py @@ -353,16 +348,11 @@ %%DATADIR%%/po/po-update.sh %%DATADIR%%/server-side/mod_dontdothat/README %%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c -%%MOD_DONTDOTHAT%%%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.la -%%MOD_DONTDOTHAT%%%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.slo %%DATADIR%%/server-side/fsfs-reshard.py %%DATADIR%%/server-side/svn-backup-dumps.py -%%DATADIR%%/server-side/svn-populate-node-origins-index %%DATADIR%%/server-side/svn-populate-node-origins-index.c -%%DATADIR%%/server-side/svn-rep-sharing-stats %%DATADIR%%/server-side/svn-rep-sharing-stats.c %%DATADIR%%/server-side/svn_server_log_parse.py -%%DATADIR%%/server-side/svnauthz-validate %%DATADIR%%/server-side/svnauthz-validate.c %%DATADIR%%/server-side/test_svn_server_log_parse.py %%DATADIR%%/xslt/svnindex.css @@ -371,7 +361,7 @@ %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n authz_svn libexec/%%APACHEDIR%%/mod_authz_svn.so -%%MOD_DONTDOTHAT%%%%APACHEMODDIR%%/mod_dontdothat.so +%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so %%MOD_DONTDOTHAT%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dontdothat libexec/%%APACHEDIR%%/mod_dontdothat.so %%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images %%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html