diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-04-11 00:04:08 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-04-11 00:04:08 +0000 |
| commit | c51343153df06b28d26a2523916b83cbe7d99c10 (patch) | |
| tree | e079be1d53820ce0d5615f59200b085f5dac2d62 /devel/subversion16 | |
| parent | 257de46ff2ddf01d06ce48b12f8ef0447ef64427 (diff) | |
| download | ports-c51343153df06b28d26a2523916b83cbe7d99c10.tar.gz ports-c51343153df06b28d26a2523916b83cbe7d99c10.zip | |
Notes
Diffstat (limited to 'devel/subversion16')
| -rw-r--r-- | devel/subversion16/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/subversion16/files/patch-Makefile.in | 13 | ||||
| -rw-r--r-- | devel/subversion16/files/patch-configure | 17 |
3 files changed, 30 insertions, 4 deletions
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common index eccc9ed7e8fd..e07d95056a16 100644 --- a/devel/subversion16/Makefile.common +++ b/devel/subversion16/Makefile.common @@ -6,7 +6,7 @@ PORTNAME= subversion PORTVERSION= 1.6.16 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= devel MASTER_SITES= http://subversion.tigris.org/downloads/:main \ http://svnbook.red-bean.com/en/1.5/:book @@ -169,7 +169,7 @@ PLIST_SUB+= GNOME_KEYRING="@comment " .endif .if defined(WITH_KDE_KWALLET) -USE_KDE4= kdelibs +USE_KDE4= kdelibs runtime CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX} PLIST_SUB+= KDE_KWALLET="" .else diff --git a/devel/subversion16/files/patch-Makefile.in b/devel/subversion16/files/patch-Makefile.in new file mode 100644 index 000000000000..81849c005a3a --- /dev/null +++ b/devel/subversion16/files/patch-Makefile.in @@ -0,0 +1,13 @@ +--- Makefile.in.orig 2011-04-11 01:50:03.390898319 +0200 ++++ Makefile.in 2011-04-11 01:51:34.081021527 +0200 +@@ -110,8 +110,9 @@ + LT_CXX_LIBADD = @LT_CXX_LIBADD@ + + INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \ ++ @SVN_KWALLET_INCLUDES@ \ + @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_APR_MEMCACHE_INCLUDES@ \ +- @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ @SVN_KWALLET_INCLUDES@ \ ++ @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ \ + @SVN_NEON_INCLUDES@ @SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ \ + @SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@ + diff --git a/devel/subversion16/files/patch-configure b/devel/subversion16/files/patch-configure index 28d6e19ffcf8..a6615fd633e9 100644 --- a/devel/subversion16/files/patch-configure +++ b/devel/subversion16/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2010-11-23 17:33:28.000000000 +0300 -+++ configure 2010-11-25 01:47:25.000000000 +0300 +--- configure.orig 2011-02-22 23:46:15.000000000 +0100 ++++ configure 2011-04-11 01:48:37.781008487 +0200 @@ -21458,8 +21458,8 @@ fi @@ -29,6 +29,19 @@ status=skip else status=try-link +@@ -22490,10 +22490,10 @@ + SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include" + qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" + SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" +- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" ++ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS" + LIBS="$LIBS $SVN_KWALLET_LIBS" + qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" +- LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`" ++ LDFLAGS="$qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix` $old_LDFLAGS" + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -23801,7 +23801,10 @@ |