Attachment #11668 for bug #22892

View | Details | Raw Unified | Return to bug 22892
Collapse All | Expand All

Lines 6-12 Link Here

(-)misc/qhacc/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= qhacc	8	PORTNAME= qhacc
9	PORTVERSION= 0.6.1a	9	PORTVERSION= 0.6.2
10	CATEGORIES= misc	10	CATEGORIES= misc
11	MASTER_SITES= ftp://ftp.ostrich-emulators.cx/qhacc/	11	MASTER_SITES= ftp://ftp.ostrich-emulators.cx/qhacc/
12		12
Lines 15-21 Link Here
15	USE_QT2= yes	15	USE_QT2= yes
16	USE_X_PREFIX= yes	16	USE_X_PREFIX= yes
17	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --with-qt="${X11BASE}"	18	CONFIGURE_ENV= QTDIR="${X11BASE}"
19		19
20	pre-build:	20	pre-build:
21	@${RM} -f ${WRKSRC}/src/moc_*.cpp	21	@${RM} -f ${WRKSRC}/src/moc_*.cpp

Line 1 Link Here

(-)misc/qhacc/distinfo (-1 / +1 lines)
1	MD5 (qhacc-0.6.1a.tar.gz) = b1fe659ab692d2814fbf0bd75a2ea9b1	1	MD5 (qhacc-0.6.2.tar.gz) = d2693ef38cba992c114c6ace1012de89




--- 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)
-INCLUDES = $(all_includes) -I$(QTDIR)/include
+INCLUDES = $(all_includes) -I$(QTDIR)/include/qt2
 qhacc_LDFLAGS = -L$(QTDIR)/lib
-qhacc_LDADD = -lqt
-MOC = $(QTMOCDIR)/moc
+qhacc_LDADD = -lqt2
+MOC = $(QTMOCDIR)/moc2
 
-CXXFLAGS = -O2 -Wall $(MYFLAGS)
+CXXFLAGS = @CXXFLAGS@ $(MYFLAGS)




--- 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_moc
 	do
-		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
 			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

Return to bug 22892

Lines 1-16 Link Here

(-)misc/qhacc/files/patch-aa (-11 / +8 lines)
1	--- src/Makefile.in.orig Sun Aug 27 10:24:42 2000	1	--- src/Makefile.in.orig Wed Nov 15 04:44:04 2000
2	+++ src/Makefile.in Wed Sep 13 20:44:43 2000	2	+++ src/Makefile.in Wed Nov 15 05:01:56 2000
3	@@ -94,12 +94,12 @@	3	@@ -85,10 +85,10 @@
4	qhaccgrapher.h	4	INCLUDES = $(all_includes) -I$(QTINCDIR)
5		5	LDFLAGS =
6		6	qhacc_LDFLAGS = -L$(QTLIBDIR) $(LDFLAGS)
7	-INCLUDES = $(all_includes) -I$(QTDIR)/include
8	+INCLUDES = $(all_includes) -I$(QTDIR)/include/qt2
9	qhacc_LDFLAGS = -L$(QTDIR)/lib
10	-qhacc_LDADD = -lqt	7	-qhacc_LDADD = -lqt
11	-MOC = $(QTDIR)/bin/moc	8	-MOC = $(QTMOCDIR)/moc
12	+qhacc_LDADD = -lqt2	9	+qhacc_LDADD = -lqt2
13	+MOC = $(QTDIR)/bin/moc2	10	+MOC = $(QTMOCDIR)/moc2
14		11
15	-CXXFLAGS = -O2 -Wall $(MYFLAGS)	12	-CXXFLAGS = -O2 -Wall $(MYFLAGS)
16	+CXXFLAGS = @CXXFLAGS@ $(MYFLAGS)	13	+CXXFLAGS = @CXXFLAGS@ $(MYFLAGS)

Lines 1-11 Link Here

(-)misc/qhacc/files/patch-ab (-7 / +28 lines)
1	--- configure.orig Mon Aug 21 05:14:11 2000	1	--- configure.orig Sat Sep 30 10:54:43 2000
2	+++ configure Wed Sep 13 20:51:38 2000	2	+++ configure Wed Nov 15 04:56:52 2000
3	@@ -1255,7 +1255,7 @@	3	@@ -1215,7 +1215,7 @@
4		4
5	for dir in $with_qt	5	for dir in $with_qt_moc
6	do	6	do
7	- if test -f $dir/lib/libqt.so.2	7	- if test -f $dir/bin/moc
		8	+ if test -f $dir/bin/moc2
		9	then
		10	qtmoc=$dir/bin
		11	echo "found in $qtmoc"
		12	@@ -1252,7 +1252,7 @@
		13
		14	for dir in $with_qt_libs
		15	do
		16	- if test -f $dir/lib/libqt.so.2 -o "$dir/lib/libqt.so.2." != "$dir/lib/libqt.so.2.\"
8	+ if test -f $dir/lib/libqt2.so	17	+ if test -f $dir/lib/libqt2.so
9	then	18	then
10	qthome=$dir	19	qtlibs=$dir/lib
11	echo "found in $dir"	20	echo "found in $qtlibs"
		21	@@ -1289,9 +1289,9 @@
		22
		23	for dir in $with_qt_incs
		24	do
		25	- if test -f $dir/include/qnamespace.h
		26	+ if test -f $dir/include/qt2/qnamespace.h
		27	then
		28	- qtincs=$dir/include
		29	+ qtincs=$dir/include/qt2
		30	echo "found in $qtincs"
		31	break
		32	fi