Update to 0.23

PR:		47012,47050
Submitted by:	Roland Jesse <roland.jesse@gmx.net> (maintainer)

4 files changed, 55 insertions, 17 deletions

diff --git a/misc/mango/Makefile b/misc/mango/Makefile
index 63e41b069294..f1917a8253e5 100644
--- a/misc/mango/Makefile
+++ b/misc/mango/Makefile
@@ -1,31 +1,60 @@
 # New ports collection makefile for:   mango
 # Date created:        23 March 2001
-# Whom:                Roland Jesse <jesse@cs.uni-magdeburg.de>
+# Whom:                Roland Jesse <roland.jesse@gmx.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mango
-PORTVERSION=	0.3
-PORTREVISION=	2
+PORTVERSION=	0.23
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=mango
+DIST_SUBDIR=	KDE
 
-MAINTAINER=	jesse@cs.uni-magdeburg.de
+MAINTAINER=	roland.jesse@gmx.net
 
-BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
+.if defined(WITH_KDE)
+LIB_DEPENDS+=	kextmdi.2:${PORTSDIR}/devel/qextmdi
+.else
+LIB_DEPENDS+=	qextmdi.2:${PORTSDIR}/devel/qextmdi
+.endif
 
 USE_BZIP2=	yes
-USE_QT_VER=	2
-TMAKEENV=	TMAKEPATH=${PREFIX}/share/tmake/freebsd-g++ QTDIR=${X11BASE}
-MAKE_ENV+=	QTDIR=${X11BASE}
+USE_QT_VER=	3
+MAKE_ENV+=	QTDIR=${QT_PREFIX} LDFLAGS="-lkdevelopqextmdi"
+.if defined(WITH_KDE)
+USE_KDEBASE_VER=	3
+.endif
+.if defined(MAKE_JOBS)
+MAKE_ARGS+=	-j${MAKE_JOBS}
+.endif
 
-do-build:
-	(cd ${WRKSRC}; ${SETENV} ${TMAKEENV} tmake -o Makefile mango.pro)
-	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+.if !defined(WITH_KDE)
+pre-configure:
+	@${ECHO_CMD}
+	@${ECHO_CMD} "Note: Mango can be build with KDE support."
+	@${ECHO_CMD} "      Please specify WITH_KDE in case you want to do so."
+	@${ECHO_CMD} "      Make sure that the prerequisite QextMDI library"
+	@${ECHO_CMD} "      was also installed with KDE support. The easiest"
+	@${ECHO_CMD} "      way to accomplish this is to set WITH_KDE=yes in"
+	@${ECHO_CMD} "      /etc/make.conf."
+	@${ECHO_CMD}
+.endif
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mango ${PREFIX}/bin
+do-configure:
+.if defined(WITH_KDE)
+	@(cd ${WRKSRC} && \
+	${SED} -i -e 's|warn_on debug|warn_off release kde thread|' mango.pro)
+.else
+	@(cd ${WRKSRC} && \
+	${SED} -i -e 's|warn_on debug|warn_off release thread|' mango.pro)
+.endif
+	@(cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} PREFIX=${PREFIX} QMAKESPEC=freebsd-g++ \
+	qmake mango.pro)
+
+pre-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/mango
 
 .include <bsd.port.mk>
diff --git a/misc/mango/distinfo b/misc/mango/distinfo
index 2f5fef8c5169..a4c4f6f6c6d5 100644
--- a/misc/mango/distinfo
+++ b/misc/mango/distinfo
@@ -1 +1 @@
-MD5 (mango-0.3.tar.bz2) = ac9cb32f5174890552e4711065890f1d
+MD5 (KDE/mango-0.23.tar.bz2) = c982c2efcfb32ee654b345eb9d4e2e19
diff --git a/misc/mango/files/patch-mango.pro b/misc/mango/files/patch-mango.pro
new file mode 100644
index 000000000000..2211e86585b1
--- /dev/null
+++ b/misc/mango/files/patch-mango.pro
@@ -0,0 +1,10 @@
+--- mango.pro.orig	Wed Jan 15 17:01:32 2003
++++ mango.pro	Wed Jan 15 17:01:35 2003
+@@ -11,6 +11,7 @@
+ 
+ TEMPLATE =	app
+ CONFIG	+= 	qt opengl warn_on debug
++INCLUDEPATH += ${PREFIX}/include/qextmdi
+ unix:CONFIG +=	x11
+ win32:CONFIG +=	windows
+ #REQUIRES =	xml
diff --git a/misc/mango/pkg-descr b/misc/mango/pkg-descr
index bf55d9db3dac..62c70debae8d 100644
--- a/misc/mango/pkg-descr
+++ b/misc/mango/pkg-descr
@@ -1,8 +1,7 @@
 Mango is a recipe management software. The main motivation of the
-project is to provide a mealmaster compatible application for UNIX and
-similar systems.
+project is to provide an open source mealmaster compatible
+application.
                       
 WWW: http://mango.sourceforge.net/
 
 - Roland
-jesse@cs.uni-magdeburg.de