From owner-freebsd-ports Thu Nov 16 7:10:27 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 599BE37B4FE for ; Thu, 16 Nov 2000 07:10:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id HAA86306; Thu, 16 Nov 2000 07:10:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B77C637B479; Thu, 16 Nov 2000 07:06:02 -0800 (PST) Message-Id: <20001116150602.B77C637B479@hub.freebsd.org> Date: Thu, 16 Nov 2000 07:06:02 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/22892: Update port: misc/qhacc to 0.6.2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 22892 >Category: ports >Synopsis: Update port: misc/qhacc to 0.6.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 16 07:10:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD-4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.6.2 >How-To-Repeat: >Fix: diff -urN /usr/ports/misc/qhacc/Makefile misc/qhacc/Makefile --- /usr/ports/misc/qhacc/Makefile Sat Sep 30 12:47:12 2000 +++ misc/qhacc/Makefile Thu Nov 16 02:06:58 2000 @@ -6,7 +6,7 @@ # PORTNAME= qhacc -PORTVERSION= 0.6.1a +PORTVERSION= 0.6.2 CATEGORIES= misc MASTER_SITES= ftp://ftp.ostrich-emulators.cx/qhacc/ @@ -15,7 +15,7 @@ USE_QT2= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qt="${X11BASE}" +CONFIGURE_ENV= QTDIR="${X11BASE}" pre-build: @${RM} -f ${WRKSRC}/src/moc_*.cpp diff -urN /usr/ports/misc/qhacc/distinfo misc/qhacc/distinfo --- /usr/ports/misc/qhacc/distinfo Sat Sep 30 01:26:55 2000 +++ misc/qhacc/distinfo Wed Nov 15 04:34:12 2000 @@ -1 +1 @@ -MD5 (qhacc-0.6.1a.tar.gz) = b1fe659ab692d2814fbf0bd75a2ea9b1 +MD5 (qhacc-0.6.2.tar.gz) = d2693ef38cba992c114c6ace1012de89 diff -urN /usr/ports/misc/qhacc/files/patch-aa misc/qhacc/files/patch-aa --- /usr/ports/misc/qhacc/files/patch-aa Sun Sep 17 02:56:00 2000 +++ misc/qhacc/files/patch-aa Wed Nov 15 05:02:10 2000 @@ -1,16 +1,13 @@ ---- 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 - - --INCLUDES = $(all_includes) -I$(QTDIR)/include -+INCLUDES = $(all_includes) -I$(QTDIR)/include/qt2 - qhacc_LDFLAGS = -L$(QTDIR)/lib +--- src/Makefile.in.orig Wed Nov 15 04:44:04 2000 ++++ src/Makefile.in Wed Nov 15 05:01:56 2000 +@@ -85,10 +85,10 @@ + INCLUDES = $(all_includes) -I$(QTINCDIR) + LDFLAGS = + qhacc_LDFLAGS = -L$(QTLIBDIR) $(LDFLAGS) -qhacc_LDADD = -lqt --MOC = $(QTDIR)/bin/moc +-MOC = $(QTMOCDIR)/moc +qhacc_LDADD = -lqt2 -+MOC = $(QTDIR)/bin/moc2 ++MOC = $(QTMOCDIR)/moc2 -CXXFLAGS = -O2 -Wall $(MYFLAGS) +CXXFLAGS = @CXXFLAGS@ $(MYFLAGS) diff -urN /usr/ports/misc/qhacc/files/patch-ab misc/qhacc/files/patch-ab --- /usr/ports/misc/qhacc/files/patch-ab Sun Sep 17 02:56:00 2000 +++ misc/qhacc/files/patch-ab Wed Nov 15 05:01:10 2000 @@ -1,11 +1,32 @@ ---- configure.orig Mon Aug 21 05:14:11 2000 -+++ configure Wed Sep 13 20:51:38 2000 -@@ -1255,7 +1255,7 @@ +--- configure.orig Sat Sep 30 10:54:43 2000 ++++ configure Wed Nov 15 04:56:52 2000 +@@ -1215,7 +1215,7 @@ - for dir in $with_qt + for dir in $with_qt_moc do -- if test -f $dir/lib/libqt.so.2 +- if test -f $dir/bin/moc ++ if test -f $dir/bin/moc2 + then + qtmoc=$dir/bin + echo "found in $qtmoc" +@@ -1252,7 +1252,7 @@ + + for dir in $with_qt_libs + do +- if test -f $dir/lib/libqt.so.2 -o "$dir/lib/libqt.so.2.*" != "$dir/lib/libqt.so.2.\*" + if test -f $dir/lib/libqt2.so then - qthome=$dir - echo "found in $dir" + qtlibs=$dir/lib + echo "found in $qtlibs" +@@ -1289,9 +1289,9 @@ + + for dir in $with_qt_incs + do +- if test -f $dir/include/qnamespace.h ++ if test -f $dir/include/qt2/qnamespace.h + then +- qtincs=$dir/include ++ qtincs=$dir/include/qt2 + echo "found in $qtincs" + break + fi >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message