Date: Mon, 15 Oct 2001 14:13:40 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/31301: Update port: misc/qhacc to 1.1 Message-ID: <200110152113.f9FLDea54889@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 31301
>Category: ports
>Synopsis: Update port: misc/qhacc to 1.1
>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: Mon Oct 15 14:20:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.1
Remove file:
files/patch-aa files/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/misc/qhacc/Makefile misc/qhacc/Makefile
--- /usr/ports/misc/qhacc/Makefile Fri Aug 31 21:40:22 2001
+++ misc/qhacc/Makefile Sun Oct 14 03:24:01 2001
@@ -6,7 +6,7 @@
#
PORTNAME= qhacc
-PORTVERSION= 1.0
+PORTVERSION= 1.1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.ostrich-emulators.cx/qhacc/
@@ -17,10 +17,18 @@
USE_QT_VER= 2
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= QTDIR="${X11BASE}"
+CONFIGURE_ARGS= --with-qt-moc=${X11BASE}/bin \
+ --with-qt-libs=${X11BASE}/lib
post-extract:
@${RM} -f ${WRKSRC}/src/moc_*.cpp
+
+pre-patch:
+.for file in configure src/Makefile.in
+ @${PERL} -pi -e 's|/moc|/${MOC:T}|g ; \
+ s|-lqt|-l${QTNAME}|g ; \
+ s|-O2 -Wall|\@CXXFLAGS\@|g' ${WRKSRC}/${file}
+.endfor
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin
diff -urN /usr/ports/misc/qhacc/distinfo misc/qhacc/distinfo
--- /usr/ports/misc/qhacc/distinfo Fri Aug 31 21:40:22 2001
+++ misc/qhacc/distinfo Sun Oct 14 02:55:26 2001
@@ -1 +1 @@
-MD5 (qhacc-1.0.tar.gz) = e695e4421aca690fa29e38e90a1ec96f
+MD5 (qhacc-1.1.tar.gz) = 53a3b31a236c8fd43b690e0f275fd5bf
diff -urN /usr/ports/misc/qhacc/files/patch-aa misc/qhacc/files/patch-aa
--- /usr/ports/misc/qhacc/files/patch-aa Fri Nov 17 23:59:51 2000
+++ misc/qhacc/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,16 +0,0 @@
---- 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 = $(QTMOCDIR)/moc
-+qhacc_LDADD = -lqt2
-+MOC = $(QTMOCDIR)/moc2
-
--CXXFLAGS = -O2 -Wall $(MYFLAGS)
-+CXXFLAGS = @CXXFLAGS@ $(MYFLAGS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
diff -urN /usr/ports/misc/qhacc/files/patch-ab misc/qhacc/files/patch-ab
--- /usr/ports/misc/qhacc/files/patch-ab Fri Aug 31 21:40:22 2001
+++ misc/qhacc/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,29 +0,0 @@
---- configure.orig Tue Aug 14 01:21:28 2001
-+++ configure Sat Aug 18 23:45:43 2001
-@@ -2197,7 +2197,7 @@
-
- for dir in $with_qt_moc
- do
-- if test -f $dir/moc
-+ if test -f $dir/moc2
- then
- qtmoc=$dir
- echo "found in $qtmoc"
-@@ -2231,7 +2231,7 @@
-
- for dir in $with_qt_libs
- do
-- if test -f $dir/libqt.so.2 -o "$dir/libqt.so.2.*" != "$dir/libqt.so.2.\*"
-+ if test -f $dir/libqt.so
- then
- qtlibs=$dir
- echo "found in $qtlibs"
-@@ -2265,7 +2265,7 @@
-
- for dir in $with_qt_incs
- do
-- if test -f $dir/qnamespace.h
-+ if test -f $dir/qt2/qnamespace.h
- then
- qtincs=$dir
- echo "found in $qtincs"
>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?200110152113.f9FLDea54889>