diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2014-02-02 16:40:08 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2014-02-02 16:40:08 +0000 |
| commit | 3f79abcacb6dc3d5f86bfa4b563bd073f1405bca (patch) | |
| tree | edd76019d0f44972d6f49286f8413bd20dca2bdf /devel/subversion | |
| parent | Stage support (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=342334
Diffstat (limited to 'devel/subversion')
| -rw-r--r-- | devel/subversion/Makefile.common | 10 | ||||
| -rw-r--r-- | devel/subversion/files/patch-Makefile.in | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index ae392249a3ca..2a573e1f0b51 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -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:${PORTSDIR}/security/gnome-keyring 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|' + diff --git a/devel/subversion/files/patch-Makefile.in b/devel/subversion/files/patch-Makefile.in index 16c7ba88b208..ac484ac2d08e 100644 --- a/devel/subversion/files/patch-Makefile.in +++ b/devel/subversion/files/patch-Makefile.in @@ -12,12 +12,3 @@ This patch is required to build SVN Apache modules with staging support 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@ |