6 files changed, 44 insertions, 14 deletions

diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index cf84a1f3ab5b..db6a9d084136 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ostrich-emulators.cx/qhacc/
 
@@ -15,18 +15,19 @@ MAINTAINER=	ports@FreeBSD.org
 USE_QT2=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-qt="${X11BASE}"
-MAKE_ENV+=	QTDIR=${PREFIX} CXX="${CXX}" CC="${CC}"
+CONFIGURE_ARGS=	--with-qt="${X11BASE}"
 
 pre-build:
 	@${RM} -f ${WRKSRC}/src/moc_*.cpp
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin/qhacc.exec
-	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/qhacc.sh \
-		> ${PREFIX}/bin/qhacc
-	@${CHMOD} 755 ${PREFIX}/bin/qhacc
+	${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/qhacc
-	@${INSTALL_DATA} ${FILESDIR}/config ${PREFIX}/share/qhacc/config.sample
+	${INSTALL_DATA} ${FILESDIR}/config ${PREFIX}/share/qhacc/config.sample
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/qhacc
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/qhacc
+.endif
+	@${SED} -e "s:/usr/X11R6:${PREFIX}:g" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/finance/qhacc/distinfo b/finance/qhacc/distinfo
index 00d2c13d525c..775acb37b407 100644
--- a/finance/qhacc/distinfo
+++ b/finance/qhacc/distinfo
@@ -1 +1 @@
-MD5 (qhacc-0.5.tar.gz) = d8ece4da9d86a6cdd8444aaeed8987f4
+MD5 (qhacc-0.6.tar.gz) = 60596f6b31629b3be802cecd044393ac
diff --git a/finance/qhacc/files/patch-aa b/finance/qhacc/files/patch-aa
index bb6f62b9719e..6003ae37fcf8 100644
--- a/finance/qhacc/files/patch-aa
+++ b/finance/qhacc/files/patch-aa
@@ -1,6 +1,6 @@
---- src/Makefile.in	Wed Apr 12 15:42:26 2000
-+++ src/Makefile.in.new	Sat Apr 22 00:41:55 2000
-@@ -94,10 +94,10 @@
+--- src/Makefile.in.orig	Sun Aug 27 10:24:42 2000
++++ src/Makefile.in	Wed Sep 13 20:44:43 2000
+@@ -94,12 +94,12 @@
  		qhaccgrapher.h
  
  
@@ -12,5 +12,8 @@
 +qhacc_LDADD = -lqt2
 +MOC = $(QTDIR)/bin/moc2
  
- CXXFLAGS = -O2 -Wall $(MYFLAGS)
+-CXXFLAGS = -O2 -Wall $(MYFLAGS)
++CXXFLAGS = @CXXFLAGS@ $(MYFLAGS)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/finance/qhacc/files/patch-ab b/finance/qhacc/files/patch-ab
new file mode 100644
index 000000000000..c6fc49934823
--- /dev/null
+++ b/finance/qhacc/files/patch-ab
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Aug 21 05:14:11 2000
++++ configure	Wed Sep 13 20:51:38 2000
+@@ -1255,7 +1255,7 @@
+ 
+ 	for dir in $with_qt
+ 	do
+-		if test -f $dir/lib/libqt.so.2
++		if test -f $dir/lib/libqt2.so
+ 		then
+ 			qthome=$dir
+ 			echo "found in $dir"
diff --git a/finance/qhacc/pkg-message b/finance/qhacc/pkg-message
new file mode 100644
index 000000000000..8c0ab62f5892
--- /dev/null
+++ b/finance/qhacc/pkg-message
@@ -0,0 +1,10 @@
+************************************************************
+ Before running QHacc, users should prepare as follows:
+
+  $ mkdir ~/.qhacc
+  $ cp /usr/X11R6/share/qhacc/config.sample ~/.qhacc/config
+  $ chmod u+rw ~/.qhacc/config
+  $ export QHACC_HOME=~/.qhacc (sh or bash)
+  $ setenv QHACC_HOME ~/.qhacc (csh or tcsh)
+
+************************************************************
diff --git a/finance/qhacc/pkg-plist b/finance/qhacc/pkg-plist
index 4c4e15ad2ce6..bdb550a758a0 100644
--- a/finance/qhacc/pkg-plist
+++ b/finance/qhacc/pkg-plist
@@ -1,4 +1,9 @@
 bin/qhacc
-bin/qhacc.exec
+share/doc/qhacc/index.html
+share/doc/qhacc/intro.html
+share/doc/qhacc/formats.html
+share/doc/qhacc/using.html
+share/doc/qhacc/primer.html
 share/qhacc/config.sample
 @dirrm share/qhacc
+@dirrm share/doc/qhacc