[BACK]Return to patch-ah CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / finance / kmymoney2 / patches

File: [cvs.NetBSD.org] / pkgsrc / finance / kmymoney2 / patches / Attic / patch-ah (download)

Revision 1.5, Mon Dec 12 05:03:42 2011 UTC (12 years, 3 months ago) by dholland
Branch: MAIN
CVS Tags: pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4
Changes since 1.4: +4 -3 lines

sed -i is a gnuism, so make a temporary output file instead.
(Still doesn't build on NetBSD due to C++ issues, though.)

$NetBSD: patch-ah,v 1.5 2011/12/12 05:03:42 dholland Exp $

--- acinclude.m4.orig	2010-05-10 19:24:51.000000000 +0000
+++ acinclude.m4
@@ -612,7 +612,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share `kde-config --prefix`/share"
+ 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share `kde-config --prefix`/share/kde"
             test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -12173,6 +12173,8 @@ AC_DEFUN([AC_SQLITE3], [
     rm -rf qt-sqlite3-0.2
     gunzip -c `dirname -- ${0}`/23011-qt-sqlite3-0.2.tar.gz | tar -xf -
     cd qt-sqlite3-0.2
+    sed s/QTDIR/\(QTDIR\)/ < sqlite3/sqlite3.pro > sqlite3/sqlite3.pro.new
+    mv -f sqlite3/sqlite3.pro.new sqlite3/sqlite3.pro
     ${ac_qmake} QMAKE=${ac_qmake}
     SQLITE3=qt-sqlite3-0.2
     sed -i s/^install:.*$// Makefile
@@ -12197,11 +12198,11 @@ install:
 	if test ! x$SQLITE3 = x; then \
 	  if test "x\$(DESTDIR)" = "x" -a "${prefix:0-5}" = "_inst"; then \
 	    /bin/sh ../$ac_aux_dir/mkinstalldirs \`dirname ${prefix}${LIBSQLITE3}\`; \
-	    ${INSTALL} sqldrivers/libqsqlite3.so ${prefix}${LIBSQLITE3}; \
+	    ${INSTALL} sqldrivers/.libs/libqsqlite3.so ${prefix}${LIBSQLITE3}; \
 	    chmod 755 ${prefix}${LIBSQLITE3}; \
 	  else \
 	    /bin/sh ../$ac_aux_dir/mkinstalldirs \`dirname \$(DESTDIR)${LIBSQLITE3}\`; \
-	    ${INSTALL} sqldrivers/libqsqlite3.so \$(DESTDIR)${LIBSQLITE3}; \
+	    ${INSTALL} sqldrivers/.libs/libqsqlite3.so \$(DESTDIR)${LIBSQLITE3}; \
 	    chmod 755 \$(DESTDIR)${LIBSQLITE3}; \
 	  fi \
 	fi