diff options
| author | Will Andrews <will@FreeBSD.org> | 2000-04-22 05:30:31 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2000-04-22 05:30:31 +0000 |
| commit | e1bb955ab740a3f539005b0137d8509b0354a708 (patch) | |
| tree | 120295b5430c9ec5f4dfd79e2165f92992f1e270 /finance | |
| parent | Update gqview to 0.8.1. (diff) | |
Update qhacc to 0.5. This fixes the fennerism.
Notes
Notes:
svn path=/head/; revision=27881
Diffstat (limited to 'finance')
| -rw-r--r-- | finance/qhacc/Makefile | 15 | ||||
| -rw-r--r-- | finance/qhacc/distinfo | 2 | ||||
| -rw-r--r-- | finance/qhacc/files/patch-aa | 70 |
3 files changed, 27 insertions, 60 deletions
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile index 8be9234b6f79..c5fb25f5e50c 100644 --- a/finance/qhacc/Makefile +++ b/finance/qhacc/Makefile @@ -6,20 +6,25 @@ # 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 diff --git a/finance/qhacc/distinfo b/finance/qhacc/distinfo index f4a94bedceed..00d2c13d525c 100644 --- a/finance/qhacc/distinfo +++ b/finance/qhacc/distinfo @@ -1 +1 @@ -MD5 (qhacc_0.3.1.tar.gz) = 64825f41fdba9b9ba856d6ff5642043b +MD5 (qhacc-0.5.tar.gz) = d8ece4da9d86a6cdd8444aaeed8987f4 diff --git a/finance/qhacc/files/patch-aa b/finance/qhacc/files/patch-aa index ce038c739679..bb6f62b9719e 100644 --- a/finance/qhacc/files/patch-aa +++ b/finance/qhacc/files/patch-aa @@ -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 - - # 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 - - # 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) - +--- 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 + + +-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 + + CXXFLAGS = -O2 -Wall $(MYFLAGS) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |