Date: Sun, 2 Feb 2014 16:40:09 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342334 - in head/devel: subversion subversion/files subversion17 subversion17/files Message-ID: <201402021640.s12Ge9w2031657@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Feb 2 16:40:08 2014 New Revision: 342334 URL: http://svnweb.freebsd.org/changeset/ports/342334 QAT: https://qat.redports.org/buildarchive/r342334/ Log: - fix apache module building (r341335 regression) [1] - add all necessary KDE dependencies to KDE_KWALLET (r331808 regression) [2] - fix shebank (the old way!) [3] PR: ports/186167 , Tang Jianfeng <tangjfn@gmail.com> [1] PR: ports/186361 , PeterK <fbsdq@peterk.org> [1] PR: ports/185494 , Raphael Kubo da Costa <rakuco@FreeBSD.org> [2] PR: ports/184295 , Matthias Andree <mandree@FreeBSD.org> [3] Approved by: lev (implicit) Deleted: head/devel/subversion17/files/patch-Makefile.in Modified: head/devel/subversion/Makefile.common head/devel/subversion/files/patch-Makefile.in head/devel/subversion17/Makefile head/devel/subversion17/Makefile.common Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Sun Feb 2 16:38:22 2014 (r342333) +++ head/devel/subversion/Makefile.common Sun Feb 2 16:40:08 2014 (r342334) @@ -3,7 +3,7 @@ PORTNAME= subversion PORTVERSION= 1.8.5 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 @@ -45,7 +45,7 @@ GNOME_KEYRING_LIB_DEPENDS= libgcr.so:${P KDE_KWALLET_CONFIGURE_OFF= --without-kwallet KDE_KWALLET_CONFIGURE_ON= --with-kwallet=${KDE4_PREFIX} -KDE_KWALLET_USE= KDE4=kdelibs runtime +KDE_KWALLET_USE= KDE4=kdelibs,runtime MAINTAINER_DEBUG_CFLAGS= -g MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug @@ -113,3 +113,9 @@ post-patch: .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif +# shebangfix + ${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \ + | ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ + -e '1s|#\!/bin/env|#\!/usr/bin/env|' \ + -e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|' + Modified: head/devel/subversion/files/patch-Makefile.in ============================================================================== --- head/devel/subversion/files/patch-Makefile.in Sun Feb 2 16:38:22 2014 (r342333) +++ head/devel/subversion/files/patch-Makefile.in Sun Feb 2 16:40:08 2014 (r342334) @@ -12,12 +12,3 @@ This patch is required to build SVN Apac javahl_javadir = @libdir@/svn-javahl javahl_javahdir = @libdir@/svn-javahl/include -@@ -207,7 +207,7 @@ - LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) - - # special link rule for mod_dav_svn --LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -+LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -inst-prefix-dir ${DESTDIR} - - # Special LDFLAGS for some libraries - libsvn_auth_gnome_keyring_LDFLAGS = @libsvn_auth_gnome_keyring_LDFLAGS@ Modified: head/devel/subversion17/Makefile ============================================================================== --- head/devel/subversion17/Makefile Sun Feb 2 16:38:22 2014 (r342333) +++ head/devel/subversion17/Makefile Sun Feb 2 16:40:08 2014 (r342334) @@ -199,7 +199,7 @@ post-install: ${MKREPOS_TARGET} @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} .endif @${MKDIR} ${STAGEDIR}${DATADIR} - @(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) + @(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' --exclude '*.bak' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/devel/subversion17/Makefile.common ============================================================================== --- head/devel/subversion17/Makefile.common Sun Feb 2 16:38:22 2014 (r342333) +++ head/devel/subversion17/Makefile.common Sun Feb 2 16:40:08 2014 (r342334) @@ -3,7 +3,7 @@ PORTNAME= subversion PORTVERSION= 1.7.14 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion17 @@ -47,7 +47,7 @@ GNOME_KEYRING_LIB_DEPENDS= libgcr.so:${P KDE_KWALLET_CONFIGURE_OFF= --without-kwallet KDE_KWALLET_CONFIGURE_ON= --with-kwallet=${KDE4_PREFIX} -KDE_KWALLET_USE= KDE4=kdelibs runtime +KDE_KWALLET_USE= KDE4=kdelibs,runtime MAINTAINER_DEBUG_CFLAGS= -g MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug @@ -123,3 +123,9 @@ post-patch: .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif +# shebangfix + ${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \ + | ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ + -e '1s|#\!/bin/env|#\!/usr/bin/env|' \ + -e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|' +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402021640.s12Ge9w2031657>