Index: head/finance/qhacc/Makefile
===================================================================
--- head/finance/qhacc/Makefile	(revision 27880)
+++ head/finance/qhacc/Makefile	(revision 27881)
@@ -1,29 +1,34 @@
 # New ports collection makefile for:	qhacc
 # Date created:		28 Dec 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	0.3.1
+PORTVERSION=	0.5
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ostrich-emulators.cx/qhacc/
-DISTNAME=	qhacc_${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
+LIB_DEPENDS=	qt2.3:${PORTSDIR}/x11-toolkits/qt21
+
+USE_NEWGCC=	yes
 USE_X_PREFIX=	yes
-USE_QT2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-qt="${X11BASE}"
 MAKE_ENV+=	QTDIR=${PREFIX} CXX="${CXX}" CC="${CC}"
-WRKSRC=		${WRKDIR}/qhacc
 
+pre-build:
+	@${RM} -f ${WRKSRC}/src/moc_*.cpp
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/qhacc ${PREFIX}/bin/qhacc.exec
+	@${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
 	@${MKDIR} ${PREFIX}/share/qhacc
 	@${INSTALL_DATA} ${FILESDIR}/config ${PREFIX}/share/qhacc/config.sample
 
 .include <bsd.port.mk>

Property changes on: head/finance/qhacc/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/finance/qhacc/distinfo
===================================================================
--- head/finance/qhacc/distinfo	(revision 27880)
+++ head/finance/qhacc/distinfo	(revision 27881)
@@ -1 +1 @@
-MD5 (qhacc_0.3.1.tar.gz) = 64825f41fdba9b9ba856d6ff5642043b
+MD5 (qhacc-0.5.tar.gz) = d8ece4da9d86a6cdd8444aaeed8987f4

Property changes on: head/finance/qhacc/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/finance/qhacc/files/patch-aa
===================================================================
--- head/finance/qhacc/files/patch-aa	(revision 27880)
+++ head/finance/qhacc/files/patch-aa	(revision 27881)
@@ -1,54 +1,16 @@
---- Makefile	Sun Jan  2 20:30:54 2000
-+++ Makefile.new	Thu Feb  3 00:52:21 2000
-@@ -3,11 +3,11 @@
- SYSCONF_CC		= gcc
+--- 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 @@
+ 		qhaccgrapher.h
  
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-+SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include/qt2
  
- # Linking with support libraries
- SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
--SYSCONF_LIBS_QT		= -lqt
-+SYSCONF_LIBS_QT		= -lqt2
+-INCLUDES = $(all_includes) -I$(QTDIR)/include
++INCLUDES = $(all_includes) -I$(QTDIR)/include/qt2
+ qhacc_LDFLAGS = -L$(QTDIR)/lib
+-qhacc_LDADD = -lqt
+-MOC = $(QTDIR)/bin/moc
++qhacc_LDADD = -lqt2
++MOC = $(QTDIR)/bin/moc2
  
- # Linking applications
- SYSCONF_LINK		= g++
-@@ -15,7 +15,7 @@
- SYSCONF_LIBS		=
- 
- # Meta-object compiler
--SYSCONF_MOC		= $(QTDIR)/bin/moc
-+SYSCONF_MOC		= $(QTDIR)/bin/moc2
- 
- # Compiling application source
- #SYSCONF_CXXFLAGS	= -pipe -DNO_DEBUG -O2
-@@ -26,12 +26,13 @@
- 
- ####### Compiler, tools and options
- 
--CXX	=	$(SYSCONF_CXX)
--CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
--CC	=	$(SYSCONF_CC)
--CFLAGS	=	$(SYSCONF_CFLAGS)
--INCPATH =	
--LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS)
-+QTDIR	?=	/usr/X11R6
-+CXX	?=	c++
-+CXXFLAGS?=	-O -pipe
-+CC	?=	cc
-+CFLAGS	?=	-O -pipe
-+INCPATH =	$(SYSCONF_CXXFLAGS_QT)
-+LFLAGS	=	$(CXXFLAGS) $(SYSCONF_LFLAGS_QT) $(SYSCONF_LIBS_QT)
- LIBS	=	$(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_X11) $(SYSCONF_LIBS)
- MOC	=	$(SYSCONF_MOC)
- 
-@@ -80,7 +81,7 @@
- all: $(DESTDIR)$(TARGET)
- 
- $(DESTDIR)$(TARGET): $(OBJECTS) $(OBJMOC) 
--	$(SYSCONF_LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-+	$(CXX) $(LFLAGS) $(INCPATH) -o $(TARGET) $(OBJECTS) $(OBJMOC)
- 
- moc: $(SRCMOC)
- 
+ CXXFLAGS = -O2 -Wall $(MYFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Property changes on: head/finance/qhacc/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/misc/qhacc/Makefile
===================================================================
--- head/misc/qhacc/Makefile	(revision 27880)
+++ head/misc/qhacc/Makefile	(revision 27881)
@@ -1,29 +1,34 @@
 # New ports collection makefile for:	qhacc
 # Date created:		28 Dec 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	0.3.1
+PORTVERSION=	0.5
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.ostrich-emulators.cx/qhacc/
-DISTNAME=	qhacc_${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
+LIB_DEPENDS=	qt2.3:${PORTSDIR}/x11-toolkits/qt21
+
+USE_NEWGCC=	yes
 USE_X_PREFIX=	yes
-USE_QT2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-qt="${X11BASE}"
 MAKE_ENV+=	QTDIR=${PREFIX} CXX="${CXX}" CC="${CC}"
-WRKSRC=		${WRKDIR}/qhacc
 
+pre-build:
+	@${RM} -f ${WRKSRC}/src/moc_*.cpp
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/qhacc ${PREFIX}/bin/qhacc.exec
+	@${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
 	@${MKDIR} ${PREFIX}/share/qhacc
 	@${INSTALL_DATA} ${FILESDIR}/config ${PREFIX}/share/qhacc/config.sample
 
 .include <bsd.port.mk>

Property changes on: head/misc/qhacc/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/misc/qhacc/distinfo
===================================================================
--- head/misc/qhacc/distinfo	(revision 27880)
+++ head/misc/qhacc/distinfo	(revision 27881)
@@ -1 +1 @@
-MD5 (qhacc_0.3.1.tar.gz) = 64825f41fdba9b9ba856d6ff5642043b
+MD5 (qhacc-0.5.tar.gz) = d8ece4da9d86a6cdd8444aaeed8987f4

Property changes on: head/misc/qhacc/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/misc/qhacc/files/patch-aa
===================================================================
--- head/misc/qhacc/files/patch-aa	(revision 27880)
+++ head/misc/qhacc/files/patch-aa	(revision 27881)
@@ -1,54 +1,16 @@
---- Makefile	Sun Jan  2 20:30:54 2000
-+++ Makefile.new	Thu Feb  3 00:52:21 2000
-@@ -3,11 +3,11 @@
- SYSCONF_CC		= gcc
+--- 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 @@
+ 		qhaccgrapher.h
  
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-+SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include/qt2
  
- # Linking with support libraries
- SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
--SYSCONF_LIBS_QT		= -lqt
-+SYSCONF_LIBS_QT		= -lqt2
+-INCLUDES = $(all_includes) -I$(QTDIR)/include
++INCLUDES = $(all_includes) -I$(QTDIR)/include/qt2
+ qhacc_LDFLAGS = -L$(QTDIR)/lib
+-qhacc_LDADD = -lqt
+-MOC = $(QTDIR)/bin/moc
++qhacc_LDADD = -lqt2
++MOC = $(QTDIR)/bin/moc2
  
- # Linking applications
- SYSCONF_LINK		= g++
-@@ -15,7 +15,7 @@
- SYSCONF_LIBS		=
- 
- # Meta-object compiler
--SYSCONF_MOC		= $(QTDIR)/bin/moc
-+SYSCONF_MOC		= $(QTDIR)/bin/moc2
- 
- # Compiling application source
- #SYSCONF_CXXFLAGS	= -pipe -DNO_DEBUG -O2
-@@ -26,12 +26,13 @@
- 
- ####### Compiler, tools and options
- 
--CXX	=	$(SYSCONF_CXX)
--CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
--CC	=	$(SYSCONF_CC)
--CFLAGS	=	$(SYSCONF_CFLAGS)
--INCPATH =	
--LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS)
-+QTDIR	?=	/usr/X11R6
-+CXX	?=	c++
-+CXXFLAGS?=	-O -pipe
-+CC	?=	cc
-+CFLAGS	?=	-O -pipe
-+INCPATH =	$(SYSCONF_CXXFLAGS_QT)
-+LFLAGS	=	$(CXXFLAGS) $(SYSCONF_LFLAGS_QT) $(SYSCONF_LIBS_QT)
- LIBS	=	$(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_X11) $(SYSCONF_LIBS)
- MOC	=	$(SYSCONF_MOC)
- 
-@@ -80,7 +81,7 @@
- all: $(DESTDIR)$(TARGET)
- 
- $(DESTDIR)$(TARGET): $(OBJECTS) $(OBJMOC) 
--	$(SYSCONF_LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
-+	$(CXX) $(LFLAGS) $(INCPATH) -o $(TARGET) $(OBJECTS) $(OBJMOC)
- 
- moc: $(SRCMOC)
- 
+ CXXFLAGS = -O2 -Wall $(MYFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Property changes on: head/misc/qhacc/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property