- Update to version 1.7

PR:		55496
Submitted by:	Ports Fury

finance/khacc/Makefile

@@ -4,20 +4,35 @@
 #
 # $FreeBSD$
 
-PORTNAME=		khacc
-PORTVERSION=		1.4.1
-CATEGORIES=		finance
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+PORTNAME=	khacc
+PORTVERSION=	1.7
+CATEGORIES=	finance
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qhacc
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple KDE-base financial manager
 
+LIB_DEPENDS=	qhacc.2:${PORTSDIR}/finance/qhacc
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
+
 USE_KDELIBS_VER=	3
-GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=		--with-qt-moc=${QT_PREFIX}/bin \
-			--with-qt-libs=${QT_PREFIX}/lib
+CONFIGURE_ARGS=	--with-qhacc-includes=${X11BASE}/include \
+		--with-qhacc-libs=${X11BASE}/lib \
+		--with-qt-moc=${QT_PREFIX}/bin \
+		--with-qt-libs=${QT_PREFIX}/lib
+
+STRIP=		# none
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|#! /bin/sh|#!${LOCALBASE}/bin/bash|g ; \
+		 s|/usr/local/|${X11BASE}/lib/|g' ${WRKSRC}/src/khacc.orig
+
+post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/khacc-*
 
 .include <bsd.port.mk>

finance/khacc/distinfo

@@ -1 +1 @@
-MD5 (khacc-1.4.1.tar.gz) = 4973a4671ba69da39c0a24c9c54daab3
+MD5 (khacc-1.7.tar.gz) = e75ea55266c040895b23d062c01dccee

finance/khacc/files/patch-khacc::Makefile.in

@@ -0,0 +1,11 @@
+--- khacc/Makefile.in.orig	Sun Aug  3 04:49:06 2003
++++ khacc/Makefile.in	Tue Aug 12 03:01:54 2003
+@@ -828,8 +828,6 @@
+ 	fi
+ 
+ install-data-local:
+-		mkdir -p $(QHACCLIBDIR)/../bin
+-		mv $(kde_bindir)/$(bin_PROGRAMS) $(QHACCLIBDIR)/../bin
+ 		$(INSTALL_PROGRAM) khacc.orig $(kde_bindir)/khacc
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

finance/khacc/pkg-plist

@@ -1,11 +1,8 @@
 bin/khacc
-share/applnk/Applications/khacc.desktop
-share/icons/locolor/32x32/apps/khacc.png
-share/icons/locolor/16x16/apps/khacc.png
+bin/khacc-gui
 share/apps/khacc/khaccui.rc
 share/doc/HTML/en/khacc/common
-share/doc/HTML/en/khacc/index.docbook
 share/doc/HTML/en/khacc/index.cache.bz2
-@dirrm share/applnk/Applications
+share/doc/HTML/en/khacc/index.docbook
 @dirrm share/doc/HTML/en/khacc
 @dirrm share/apps/khacc