Date: Sat, 5 Oct 2002 02:38:08 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/43702: Update port: misc/qhacc to 2.4 (fix ports/42740) Message-ID: <200210050938.g959c8Dg058990@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 43702
>Category: ports
>Synopsis: Update port: misc/qhacc to 2.4 (fix ports/42740)
>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: Sat Oct 05 02:40:06 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.4
New file:
files/patch-src::qhacctable.h
Following PRs should be superseded by this PR:
[2002/09/13] ports/42740 alane Update port: misc/qhacc to 2.3
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/misc/qhacc/Makefile misc/qhacc/Makefile
--- /usr/ports/misc/qhacc/Makefile Tue Sep 10 20:20:50 2002
+++ misc/qhacc/Makefile Wed Oct 2 04:01:33 2002
@@ -6,34 +6,34 @@
#
PORTNAME= qhacc
-PORTVERSION= 1.4
+PORTVERSION= 2.4
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- ftp://ftp.ostrich-emulators.cx/qhacc/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= kde@freebsd.org
+MAINTAINER= kde@FreeBSD.org
-USE_REINPLACE= yes
-USE_QT_VER= 2
+USE_QT_VER= 3
USE_X_PREFIX= yes
+USE_REINPLACE= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-qt-moc=${X11BASE}/bin \
- --with-qt-libs=${X11BASE}/lib
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS= --with-qt-moc=${QT_PREFIX}/bin \
+ --with-qt-libs=${QT_PREFIX}/lib
post-extract:
@${RM} -f ${WRKSRC}/src/moc_*.cpp
pre-patch:
-.for file in configure src/Makefile.in
- @${REINPLACE_CMD} -e 's|/moc|/${MOC:T}|g ; \
- s|-lqt|-l${QTNAME}|g ; \
- s|-O2 -Wall|\@CXXFLAGS\@|g' ${WRKSRC}/${file}
-.endfor
+ @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|^CXXFLAGS =.*$$|CXXFLAGS = \@CXXFLAGS\@|g'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin
@${MKDIR} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${DATADIR}
${INSTALL_DATA} ${FILESDIR}/config ${DATADIR}/config.sample
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
diff -urN /usr/ports/misc/qhacc/distinfo misc/qhacc/distinfo
--- /usr/ports/misc/qhacc/distinfo Sun Dec 9 05:22:55 2001
+++ misc/qhacc/distinfo Wed Oct 2 04:01:56 2002
@@ -1 +1 @@
-MD5 (qhacc-1.4.tar.gz) = 5cc9cb98286d44badedca3de77ee4c4c
+MD5 (qhacc-2.4.tar.gz) = 37a27b49e707e4656e47bed73c2c0c81
diff -urN /usr/ports/misc/qhacc/files/patch-src::qhacctable.h misc/qhacc/files/patch-src::qhacctable.h
--- /usr/ports/misc/qhacc/files/patch-src::qhacctable.h Thu Jan 1 09:00:00 1970
+++ misc/qhacc/files/patch-src::qhacctable.h Wed Oct 2 19:09:57 2002
@@ -0,0 +1,15 @@
+--- src/qhacctable.h.orig Sat Aug 17 13:19:35 2002
++++ src/qhacctable.h Wed Oct 2 19:08:15 2002
+@@ -26,9 +26,10 @@
+ #include <qstring.h>
+ #include <qdatetime.h>
+
+-class QFile;
++#include <fstream>
++using std::ostream;
+
+-class ostream;
++class QFile;
+
+ class QHaccTableIndex;
+
diff -urN /usr/ports/misc/qhacc/pkg-plist misc/qhacc/pkg-plist
--- /usr/ports/misc/qhacc/pkg-plist Wed Aug 29 20:35:57 2001
+++ misc/qhacc/pkg-plist Wed Sep 11 23:07:21 2002
@@ -7,5 +7,6 @@
%%PORTDOCS%%share/doc/qhacc/using.html
%%PORTDOCS%%share/doc/qhacc/primer.html
share/qhacc/config.sample
+share/qhacc/qhacc_es_ES.qm
@dirrm share/qhacc
%%PORTDOCS%%@dirrm share/doc/qhacc
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210050938.g959c8Dg058990>