5 files changed, 118 insertions, 131 deletions

diff --git a/deskutils/kmymoney2/Makefile b/deskutils/kmymoney2/Makefile
index 07134428fbeb..da9b4a40047a 100644
--- a/deskutils/kmymoney2/Makefile
+++ b/deskutils/kmymoney2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kmymoney2
-PORTVERSION=	0.3.6
+PORTVERSION=	0.4
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kmymoney2
@@ -16,6 +16,34 @@ MAINTAINER=	dmitry_makovey@mail.com
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
+
+# After path
+
+USE_AUTOCONF_VER=213
+USE_AUTOMAKE_VER=14
+
+CONFIGURE_ARGS+=	--with-qt-dir=${X11BASE} --with-qt-moc=${X11BASE}/bin \
+			--prefix=${PREFIX}
+MAKE_ENV+=		MOC=${X11BASE}/bin/moc2
+MAKE_ENV+=		LIBQT="-lqt2"
+
+MAKE_ENV+=		PATH=${WRKDIR}/bin:${PATH}
+CONFIGURE_ENV+=		PATH=${WRKDIR}/bin:${PATH}
+
+pre-configure:
+	${MKDIR} ${WRKDIR}/bin
+	-${LN} -sf ${PREFIX}/bin/aclocal14 ${WRKDIR}/bin/aclocal
+	-${LN} -sf ${PREFIX}/bin/autoconf213  ${WRKDIR}/bin/autoconf
+	-${LN} -sf ${PREFIX}/bin/autoheader213  ${WRKDIR}/bin/autoheader
+	-${LN} -sf ${PREFIX}/bin/automake14  ${WRKDIR}/bin/automake
+
+post-configure:
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION} && ${GMAKE} -f Makefile.dist ${CONFIGURE_ENV}
+
+post-install:
+	cd ${PREFIX}/bin && ${LN} -fs i386-portbld-freebsd4.5-kmymoney2 kmymoney2
+
+#USE_AUTOCONF=	yes
+#MAKE_ENV= AUTOMAKE=automake14 ACLOCAL=aclocal14 AUTOCONF=autoconf213
 
 .include <bsd.port.mk>
diff --git a/deskutils/kmymoney2/distinfo b/deskutils/kmymoney2/distinfo
index cdd44ac838b6..4af1b3a6e149 100644
--- a/deskutils/kmymoney2/distinfo
+++ b/deskutils/kmymoney2/distinfo
@@ -1 +1 @@
-MD5 (kmymoney2-0.3.6.tar.bz2) = 9cc43770c3c1ae2851fbb844386f1d14
+MD5 (kmymoney2-0.4.tar.bz2) = bdffbd80bdc0085497edd4533f0e1f51
diff --git a/deskutils/kmymoney2/files/patch-aa b/deskutils/kmymoney2/files/patch-aa
deleted file mode 100644
index b0807fe599ee..000000000000
--- a/deskutils/kmymoney2/files/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
-*** acinclude.m4.orig	Fri Jul 27 21:38:25 2001
---- acinclude.m4	Thu Aug  2 16:22:56 2001
-***************
-*** 143,149 ****
-        qt_bindirs="$ac_qt_bindir $qt_bindirs"
-     fi
-  
-!    KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
-     KDE_FIND_PATH(uic, UIC, [$qt_bindirs], [UIC="" ; KDE_UIC_ERROR_MESSAGE])
-     if test -z "$UIC" ; then
-       if test -z "$UIC_NOT_NEEDED" ; then
---- 143,149 ----
-        qt_bindirs="$ac_qt_bindir $qt_bindirs"
-     fi
-  
-!    KDE_FIND_PATH(moc2, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
-     KDE_FIND_PATH(uic, UIC, [$qt_bindirs], [UIC="" ; KDE_UIC_ERROR_MESSAGE])
-     if test -z "$UIC" ; then
-       if test -z "$UIC_NOT_NEEDED" ; then
-***************
-*** 878,891 ****
-  
-  if test -z "$LIBQT_GLOB"; then
-  
-!   LIBQT_GLOB="libqt.*"
-  
-  fi
-  
-  if test -z "$LIBQT"; then
-  
-!   LIBQT="-lqt"
-!   kde_int_qt="-lqt"
-  
-  dnl ------------------------------------------------------------------------
-  dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
---- 878,891 ----
-  
-  if test -z "$LIBQT_GLOB"; then
-  
-!   LIBQT_GLOB="libqt2.*"
-  
-  fi
-  
-  if test -z "$LIBQT"; then
-  
-!   LIBQT="-lqt2"
-!   kde_int_qt="-lqt2"
-  
-  dnl ------------------------------------------------------------------------
-  dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-***************
-*** 896,904 ****
-        case $host in
-        *-*-linux-*)
-          if test "x$GCC" = "xyes"; then
-!           LIBQT="-lqt-mt"
-!           kde_int_qt="-lqt-mt"
-!           LIBQT_GLOB="libqt-mt.*"
-            USING_QT_MT="using -mt"
-          fi
-        ;;
---- 896,904 ----
-        case $host in
-        *-*-linux-*)
-          if test "x$GCC" = "xyes"; then
-!           LIBQT="-lqt2-mt"
-!           kde_int_qt="-lqt2-mt"
-!           LIBQT_GLOB="libqt2-mt.*"
-            USING_QT_MT="using -mt"
-          fi
-        ;;
diff --git a/deskutils/kmymoney2/files/patch-ab b/deskutils/kmymoney2/files/patch-ab
deleted file mode 100644
index c6980a17b23a..000000000000
--- a/deskutils/kmymoney2/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-*** kmymoney2/kmymoneyview.orig	Fri Jul 27 20:51:32 2001
---- kmymoney2/kmymoneyview.cpp	Wed Aug  1 18:14:47 2001
-***************
-*** 1639,1648 ****
-            + ","
-            + ((transaction->type()==MyMoneyTransaction::Credit) ?
-              QString::number(transaction->amount().amount()) :
-!             "")
-            + ","
-            + ((transaction->type()==MyMoneyTransaction::Credit) ?
-!             "" :
-              QString::number(transaction->amount().amount()))
-            + ","
-            + "\n"
---- 1639,1648 ----
-            + ","
-            + ((transaction->type()==MyMoneyTransaction::Credit) ?
-              QString::number(transaction->amount().amount()) :
-!             (QString)"")
-            + ","
-            + ((transaction->type()==MyMoneyTransaction::Credit) ?
-!             (QString)"" :
-              QString::number(transaction->amount().amount()))
-            + ","
-            + "\n"
diff --git a/deskutils/kmymoney2/pkg-plist b/deskutils/kmymoney2/pkg-plist
index 0047210a272b..a2f0d73ba10f 100644
--- a/deskutils/kmymoney2/pkg-plist
+++ b/deskutils/kmymoney2/pkg-plist
@@ -1,48 +1,103 @@
-@cwd /usr/local
-bin/kmymoney2
-share/doc/HTML/en/kmymoney2/common
+share/icons/locolor/32x32/apps/kmymoney2.png
+share/icons/locolor/16x16/apps/kmymoney2.png
+share/icons/hicolor/48x48/mimetypes/kmy.png
+share/icons/hicolor/32x32/mimetypes/kmy.png
+share/icons/hicolor/32x32/apps/kmymoney2.png
+share/icons/hicolor/16x16/mimetypes/kmy.png
+share/icons/hicolor/16x16/apps/kmymoney2.png
+share/doc/HTML/en/kmymoney2/transwindow.png
+share/doc/HTML/en/kmymoney2/startdialog.png
+share/doc/HTML/en/kmymoney2/newbank_icon.png
+share/doc/HTML/en/kmymoney2/newbank.png
+share/doc/HTML/en/kmymoney2/newaccount_icon.png
+share/doc/HTML/en/kmymoney2/newaccount.png
+share/doc/HTML/en/kmymoney2/mainwindow.png
 share/doc/HTML/en/kmymoney2/index.docbook
+share/doc/HTML/en/kmymoney2/index.cache.bz2
 share/doc/HTML/en/kmymoney2/blank_icon.png
-share/doc/HTML/en/kmymoney2/mainwindow.png
-share/doc/HTML/en/kmymoney2/newaccount.png
-share/doc/HTML/en/kmymoney2/newaccount_icon.png
-share/doc/HTML/en/kmymoney2/newbank.png
-share/doc/HTML/en/kmymoney2/newbank_icon.png
-share/doc/HTML/en/kmymoney2/startdialog.png
-share/doc/HTML/en/kmymoney2/transwindow.png
-share/applnk/Applications/kmymoney2.desktop
-share/apps/kmymoney2/toolbar/kmymoney_newacc.xpm
-share/apps/kmymoney2/toolbar/kmymoney_up.xpm
-share/apps/kmymoney2/pics/account-folder.xpm
-share/apps/kmymoney2/pics/bank-folder.xpm
+share/doc/HTML/en/kmymoney2/common
+share/apps/kmymoney2/pics/view_info.png
 share/apps/kmymoney2/pics/startlogo.png
 share/apps/kmymoney2/pics/setting_list.png
-share/apps/kmymoney2/icons/hicolor/22x22/actions/pay_edit.png
-share/apps/kmymoney2/icons/hicolor/22x22/actions/bank.png
-share/apps/kmymoney2/icons/hicolor/22x22/actions/categories.png
+share/apps/kmymoney2/pics/dlg_reconcile.png
+share/apps/kmymoney2/pics/dlg_qif_import.png
+share/apps/kmymoney2/pics/dlg_qif_export.png
+share/apps/kmymoney2/pics/dlg_payees.png
+share/apps/kmymoney2/pics/dlg_new_institution.png
+share/apps/kmymoney2/pics/dlg_new_account.png
+share/apps/kmymoney2/pics/dlg_import.png
+share/apps/kmymoney2/pics/dlg_find_transaction.png
+share/apps/kmymoney2/pics/dlg_export.png
+share/apps/kmymoney2/pics/dlg_ending_balance.png
+share/apps/kmymoney2/pics/dlg_edit_file.png
+share/apps/kmymoney2/pics/dlg_edit_category.png
+share/apps/kmymoney2/pics/dlg_edit_categories.png
+share/apps/kmymoney2/pics/dlg_csv_import.png
+share/apps/kmymoney2/pics/dlg_backup.png
+share/apps/kmymoney2/pics/bank-folder.xpm
+share/apps/kmymoney2/pics/account-folder.xpm
+share/apps/kmymoney2/kmymoney2ui.rc
+share/apps/kmymoney2/icons/hicolor/22x22/actions/view_info.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/unreconciled.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/transaction_import.png
 share/apps/kmymoney2/icons/hicolor/22x22/actions/transaction_find.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/transaction_export.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/transaction.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/set_as.png
 share/apps/kmymoney2/icons/hicolor/22x22/actions/reconcile.png
-share/apps/kmymoney2/icons/hicolor/16x16/actions/bank.png
-share/apps/kmymoney2/icons/hicolor/16x16/actions/categories.png
-share/apps/kmymoney2/icons/hicolor/16x16/actions/pay_edit.png
-share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction_export.png
-share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction_find.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/personal_data.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/pay_edit.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/delete.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/close_window.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/cleared.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/categories.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/bank.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/backup.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account_open.png
+share/apps/kmymoney2/icons/hicolor/22x22/actions/account.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/view_info.png
 share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction_import.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction_find.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction_export.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/transaction.png
 share/apps/kmymoney2/icons/hicolor/16x16/actions/reconcile.png
-share/apps/kmymoney2/kmymoney2ui.rc
+share/apps/kmymoney2/icons/hicolor/16x16/actions/personal_data.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/pay_edit.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/delete.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/close_window.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/categories.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/bank.png
+share/apps/kmymoney2/icons/hicolor/16x16/actions/backup.png
 share/apps/kmymoney2/default_categories.dat
-share/icons/locolor/16x16/apps/kmymoney2.png
-share/icons/locolor/32x32/apps/kmymoney2.png
-share/icons/hicolor/16x16/mimetypes/kmy.png
-share/icons/hicolor/32x32/mimetypes/kmy.png
-share/icons/hicolor/48x48/mimetypes/kmy.png
+share/applnk/Applications/kmymoney2.desktop
+bin/kmymoney2
+bin/i386-portbld-freebsd4.5-kmymoney2
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/hicolor/48x48/mimetypes
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/mimetypes
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16/mimetypes
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/kmymoney2
-@dirrm share/apps/kmymoney2/toolbar
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
 @dirrm share/apps/kmymoney2/pics
-@dirrm share/apps/kmymoney2/icons/hicolor/16x16/actions
-@dirrm share/apps/kmymoney2/icons/hicolor/16x16
 @dirrm share/apps/kmymoney2/icons/hicolor/22x22/actions
 @dirrm share/apps/kmymoney2/icons/hicolor/22x22
+@dirrm share/apps/kmymoney2/icons/hicolor/16x16/actions
+@dirrm share/apps/kmymoney2/icons/hicolor/16x16
 @dirrm share/apps/kmymoney2/icons/hicolor
 @dirrm share/apps/kmymoney2/icons
 @dirrm share/apps/kmymoney2
+@dirrm share/apps
+@dirrm share/applnk/Applications
+@dirrm share/applnk