3 files changed, 57 insertions, 20 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 6b0912268742..96eec3b58ff2 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,38 +1,33 @@
 # New ports collection makefile for:   doxygen
-# Version required:    0.4
+# Version required:    1.1.0
 # Date created:        20 March 1998
 # Whom:                Joep Grooten <joep@di.nl>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	doxygen-0.4.src
-PKGNAME=	doxygen-0.4
+DISTNAME=	doxygen-${VERSION}.src
+PKGNAME=	doxygen-${VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.stack.nl/~dimitri/doxygen/dl/
 
 MAINTAINER=	joep@di.nl
 
-WRKSRC=		${WRKDIR}/doxygen-0.4
-
+WRKSRC=		${WRKDIR}/${PKGNAME}
+VERSION=	1.1.0
 USE_QT=		yes
 USE_PERL5=	yes
-MAKE_ARGS=	freebsd-g++
-MAKE_ENV+=	CC="${CC}" CXX="${CXX}"
+MAKE_ENV+=	QTDIR="${X11BASE}" PCFLAGS="${CFLAGS}" PCXXFLAGS="${CXXFLAGS}"
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS+=--prefix ${PREFIX} --perl ${PERL5} --make ${GMAKE}
+CONFIGURE_ENV+=	QTDIR=${X11BASE}
 
 pre-configure:
-	${PERL} -pi -e "s:gcc:${CC}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
-	${PERL} -pi -e "s:g\+\+:\${CXX}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
-
-do-configure:
-	cd ${WRKSRC}/src; \
-	${MAKE} tmake \
-	TMAKE=../tmake/bin/tmake \
-	TMAKEPATH=../tmake/lib/freebsd-g++ \
-	PERL=${PERL}
-
-do-build:
-	@(cd ${WRKSRC}/src; ${MAKE})
+	@${PERL} -pi -e "s:gcc:${CC}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
+	@${PERL} -pi -e "s:g\+\+:${CXX}:" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
+	@${PERL} -pi -e "s:%%CFLAGS%%:${CFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
+	@${PERL} -pi -e "s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${PREFIX}/bin
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 98436323d2d3..42b1e1410f83 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1 +1 @@
-MD5 (doxygen-0.4.src.tar.gz) = 6cee71d1331ba6f3019e3ee184663a6f
+MD5 (doxygen-1.1.0.src.tar.gz) = 721c198ae814917c273da18f291ded31
diff --git a/devel/doxygen/files/patch-af b/devel/doxygen/files/patch-af
new file mode 100644
index 000000000000..46f4467074e6
--- /dev/null
+++ b/devel/doxygen/files/patch-af
@@ -0,0 +1,42 @@
+--- tmake/lib/freebsd-g++/tmake.conf.orig	Wed Jul 28 08:21:38 1999
++++ tmake/lib/freebsd-g++/tmake.conf	Fri Feb 25 13:22:51 2000
+@@ -8,16 +8,16 @@
+ CONFIG			= qt warn_on release
+ 
+ TMAKE_CC		= gcc
+-TMAKE_CFLAGS		= -pipe
+-TMAKE_CFLAGS_WARN_ON	= -Wall -W
++TMAKE_CFLAGS		= %%CFLAGS%%
++TMAKE_CFLAGS_WARN_ON	=
+ TMAKE_CFLAGS_WARN_OFF	=
+-TMAKE_CFLAGS_RELEASE	= -O2
+-TMAKE_CFLAGS_DEBUG	= -g
++TMAKE_CFLAGS_RELEASE	=
++TMAKE_CFLAGS_DEBUG	=
+ TMAKE_CFLAGS_SHLIB	= -fPIC
+ TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ 
+ TMAKE_CXX		= g++
+-TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
++TMAKE_CXXFLAGS		= %%CXXFLAGS%%
+ TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
+ TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
+ TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
+@@ -27,12 +27,12 @@
+ 
+ TMAKE_INCDIR		=
+ TMAKE_LIBDIR		=
+-TMAKE_INCDIR_X11	= /usr/X11R6/include
+-TMAKE_LIBDIR_X11	= /usr/X11R6/lib
+-TMAKE_INCDIR_QT		= $(QTDIR)/include
++TMAKE_INCDIR_X11	= $(QTDIR)/include
++TMAKE_LIBDIR_X11	= $(QTDIR)/lib
++TMAKE_INCDIR_QT		= $(QTDIR)/include/X11/qt
+ TMAKE_LIBDIR_QT		= $(QTDIR)/lib
+-TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
++TMAKE_INCDIR_OPENGL	= $(QTDIR)/include
++TMAKE_LIBDIR_OPENGL	= $(QTDIR)/lib
+ 
+ TMAKE_LINK		= g++
+ TMAKE_LINK_SHLIB	= g++