Attachment #92361 for bug #130003

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

Lines 6-12 Link Here

(-)/kirby/shared/ports/doxygen/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= doxygen	8	PORTNAME= doxygen
9	PORTVERSION= 1.5.7.1	9	PORTVERSION= 1.5.8
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \	11	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
12	http://ftp.stack.nl/pub/users/dimitri/	12	http://ftp.stack.nl/pub/users/dimitri/
Lines 44-50 Link Here
44	.endif # !defined(NOPORTDOCS)	44	.endif # !defined(NOPORTDOCS)
45		45
46	.if !defined(WITHOUT_DOXYWIZARD)	46	.if !defined(WITHOUT_DOXYWIZARD)
47	USE_QT_VER= 3	47	USE_QT_VER= 4
48	QT_INC= ${LOCALBASE}/include	48	QT_INC= ${LOCALBASE}/include
49	QTNAME= qt-mt	49	QTNAME= qt-mt
50	QT_OPENGL=	50	QT_OPENGL=

Lines 1-3 Link Here

(-)/kirby/shared/ports/doxygen/distinfo (-3 / +3 lines)
1	MD5 (doxygen-1.5.7.1.src.tar.gz) = bc35dfd52bdae0247b862e67e0cbe7d7	1	MD5 (doxygen-1.5.8.src.tar.gz) = 7438b7ff875d522f02860eea39261953
2	SHA256 (doxygen-1.5.7.1.src.tar.gz) = 7ce9cf96731121aa22365d2aef3dde841a3c4622d4d70282398438275ad26d29	2	SHA256 (doxygen-1.5.8.src.tar.gz) = 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8
3	SIZE (doxygen-1.5.7.1.src.tar.gz) = 4096168	3	SIZE (doxygen-1.5.8.src.tar.gz) = 4125837




--- addon/doxywizard/Makefile.in.orig	2008-12-06 08:14:58.000000000 -0500
+++ addon/doxywizard/Makefile.in	2008-12-28 15:32:07.000000000 -0500
@@ -10,16 +10,16 @@
 # See the GNU General Public License for more details.
 # 
 
-QMAKE = qmake
+QMAKE = qmake-qt4
 
 all: Makefile.doxywizard  
 	$(MAKE) -f Makefile.doxywizard 
 
 Makefile.doxywizard: doxywizard.pro
-	$(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard
+	$(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard
 
 qmake: 
-	$(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard
+	$(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard
 
 clean: Makefile.doxywizard 
 	$(MAKE) -f Makefile.doxywizard clean 




--- configure.orig	2008-12-26 14:22:39.000000000 -0500
+++ configure	2008-12-28 16:27:43.000000000 -0500
@@ -269,7 +269,7 @@
     echo "  QTDIR environment variable not set!"
     echo -n "  Checking for Qt..."
     for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
-      if test -x "$d/bin/qmake"; then
+      if test -x "$d/bin/qmake-qt4"; then
         QTDIR=$d
       fi
     done
@@ -280,7 +280,7 @@
   if test -z "$QTDIR"; then
     echo "QTDIR not set and Qt not found at standard locations!"
     echo
-    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
+    echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
     echo "check the Qt installation instructions!"
     exit 2
   fi
@@ -565,7 +565,7 @@
 fi
 if test "$f_wizard" = YES; then
   cat >> .tmakeconfig <<EOF
-TMAKE_MOC = $QTDIR/bin/moc
+TMAKE_MOC = $QTDIR/bin/moc-qt4
 EOF
 fi
 
@@ -575,7 +575,7 @@
 EOF
 fi
 

 
 for i in $f_inmakefiles ; do
      SRC=$i
@@ -591,10 +591,8 @@
      if test $i = Makefile.in; then
        echo "" >> $DST
        echo "all: src/version.cpp " >> $DST

        if test $f_wizard = YES; then
          echo "	\$(MAKE) -C addon/doxywizard" >> $DST
        fi
@@ -616,7 +614,7 @@
      echo "  Created $DST from $SRC..."
 done

Return to bug 130003

Line 0 Link Here

(-)/kirby/shared/ports/doxygen/files/patch-addon-doxywizard-Makefile.in (+22 lines)
	1	--- addon/doxywizard/Makefile.in.orig 2008-12-06 08:14:58.000000000 -0500
	2	+++ addon/doxywizard/Makefile.in 2008-12-28 15:32:07.000000000 -0500
	3	@@ -10,16 +10,16 @@
	4	# See the GNU General Public License for more details.
	5	#
	6
	7	-QMAKE = qmake
	8	+QMAKE = qmake-qt4
	9
	10	all: Makefile.doxywizard
	11	$(MAKE) -f Makefile.doxywizard
	12
	13	Makefile.doxywizard: doxywizard.pro
	14	- $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard
	15	+ $(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard
	16
	17	qmake:
	18	- $(QTDIR)/bin/qmake doxywizard.pro -o Makefile.doxywizard
	19	+ $(QTDIR)/bin/qmake-qt4 doxywizard.pro -o Makefile.doxywizard
	20
	21	clean: Makefile.doxywizard
	22	$(MAKE) -f Makefile.doxywizard clean

Lines 1-6 Link Here

(-)/kirby/shared/ports/doxygen/files/patch-configure (-5 / +32 lines)
1	--- configure.orig Sat Oct 28 18:20:11 2006	1	--- configure.orig 2008-12-26 14:22:39.000000000 -0500
2	+++ configure Sun Feb 25 15:23:52 2007	2	+++ configure 2008-12-28 16:27:43.000000000 -0500
3	@@ -525,7 +525,7 @@	3	@@ -269,7 +269,7 @@
		4	echo " QTDIR environment variable not set!"
		5	echo -n " Checking for Qt..."
		6	for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
		7	- if test -x "$d/bin/qmake"; then
		8	+ if test -x "$d/bin/qmake-qt4"; then
		9	QTDIR=$d
		10	fi
		11	done
		12	@@ -280,7 +280,7 @@
		13	if test -z "$QTDIR"; then
		14	echo "QTDIR not set and Qt not found at standard locations!"
		15	echo
		16	- echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists."
		17	+ echo "Set the QTDIR environment variable such that \$QTDIR/bin/qmake-qt4 exists."
		18	echo "check the Qt installation instructions!"
		19	exit 2
		20	fi
		21	@@ -565,7 +565,7 @@
		22	fi
		23	if test "$f_wizard" = YES; then
		24	cat >> .tmakeconfig <<EOF
		25	-TMAKE_MOC = $QTDIR/bin/moc
		26	+TMAKE_MOC = $QTDIR/bin/moc-qt4
		27	EOF
		28	fi
		29
		30	@@ -575,7 +575,7 @@
4	EOF	31	EOF
5	fi	32	fi
6		33
Lines 9-15 Link Here
9		36
10	for i in $f_inmakefiles ; do	37	for i in $f_inmakefiles ; do
11	SRC=$i	38	SRC=$i
12	@@ -541,10 +541,8 @@	39	@@ -591,10 +591,8 @@
13	if test $i = Makefile.in; then	40	if test $i = Makefile.in; then
14	echo "" >> $DST	41	echo "" >> $DST
15	echo "all: src/version.cpp " >> $DST	42	echo "all: src/version.cpp " >> $DST
Lines 22-28 Link Here
22	if test $f_wizard = YES; then	49	if test $f_wizard = YES; then
23	echo " \$(MAKE) -C addon/doxywizard" >> $DST	50	echo " \$(MAKE) -C addon/doxywizard" >> $DST
24	fi	51	fi
25	@@ -562,7 +560,7 @@	52	@@ -616,7 +614,7 @@
26	echo " Created $DST from $SRC..."	53	echo " Created $DST from $SRC..."
27	done	54	done