- Remove conflict with kde3libs by installing include files into a different directory

- Use PLIST_SUB
- Don't build the examples
- Bump PORTREVISION
- Update Maintainers Emailaddress

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

3 files changed, 49 insertions, 36 deletions

diff --git a/devel/qextmdi/Makefile b/devel/qextmdi/Makefile
index c9979bb9a2bf..f38cb739b352 100644
--- a/devel/qextmdi/Makefile
+++ b/devel/qextmdi/Makefile
@@ -6,41 +6,55 @@
 
 PORTNAME=	qextmdi
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.geocities.com/gigafalk/qextmdi/
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	KDE
 
-MAINTAINER=	jesse@cs.uni-magdeburg.de
+MAINTAINER=	roland.jesse@gmx.net
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-BUILD_WRKSRC=	${WRKSRC}/qextmdi
-USE_QT_VER=	3
-USE_X_PREFIX=	yes
 .if defined(WITH_KDE)
-USE_KDEBASE_VER=	3
-# The name of this option is misleading. It uses either KDE2 or KDE3.
-CONFIGURE_ARGS+=	-kde2
+USE_KDELIBS_VER=	3
+.else
+USE_QT_VER=	3
 .endif
-MAKE_ENV+=	QTDIR=${QT_PREFIX} QMAKESPEC=freebsd-g++
+WRKSRC=		${WRKDIR}/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/qextmdi
+MAKE_ENV+=	QTDIR=${QT_PREFIX} QMAKESPEC=freebsd-g++ KDE2DIR=${LOCALBASE}
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_KDE)
+LIBNAME=	kextmdi
+.else
+LIBNAME=	qextmdi
+.endif
+PLIST_SUB+=	LIBNAME=${LIBNAME}
+
 pre-configure:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|tmake|qmake|g' configure
-	@cd ${WRKSRC}/qextmdi && ${PERL} -e 's|warn_on|warn_on thread|g' *.pro
+	@cd ${WRKSRC}/qextmdi && ${REINPLACE_CMD} -e 's|warn_on|warn_on thread|g' *.pro
+.if !defined(WITH_KDE)
+	@${ECHO_CMD}
+	@${ECHO_CMD} "Note: The QextMDI library can be build with KDE support."
+	@${ECHO_CMD} "      Please specify WITH_KDE in case you want to do so."
+	@${ECHO_CMD}
+.endif
 
-# define this here to prevent any "--with-qt-includes" or similar:
 do-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIG_ARGS}
+	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} qmake ${LIBNAME}.pro
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libqextmdi.so.2.0.2 ${PREFIX}/lib/libqextmdi.so.2
-	${LN} ${PREFIX}/lib/libqextmdi.so.2 ${PREFIX}/lib/libqextmdi.so
-	${INSTALL_DATA} ${WRKSRC}/include/*.h  ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIBNAME}.so.2.0.2 ${PREFIX}/lib/lib${LIBNAME}.so.2
+	${LN} ${PREFIX}/lib/lib${LIBNAME}.so.2 ${PREFIX}/lib/lib${LIBNAME}.so
+	${MKDIR} ${PREFIX}/include/qextmdi
+	${INSTALL_DATA} ${WRKSRC}/include/*.h  ${PREFIX}/include/qextmdi
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/qextmdi
 	@cd ${WRKSRC}/doc && ${TAR} cf - * | (cd ${PREFIX}/share/doc/qextmdi && ${TAR} xf -)
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/qextmdi/pkg-descr b/devel/qextmdi/pkg-descr
index 8cc51ecdd135..54c50850efeb 100644
--- a/devel/qextmdi/pkg-descr
+++ b/devel/qextmdi/pkg-descr
@@ -5,4 +5,3 @@ MDI user interface.
 WWW: http://www.geocities.com/gigafalk/qextmdi.htm
 
  Roland
-jesse@cs.uni-magdeburg.de
diff --git a/devel/qextmdi/pkg-plist b/devel/qextmdi/pkg-plist
index 8732a5ced6c9..5b681d96148a 100644
--- a/devel/qextmdi/pkg-plist
+++ b/devel/qextmdi/pkg-plist
@@ -1,22 +1,22 @@
-include/dummykmainwindow.h
-include/dummykpartsdockmainwindow.h
-include/dummyktoolbar.h
-include/exportdockclass.h
-include/kdocktabctl.h
-include/kdockwidget.h
-include/kdockwidget_private.h
-include/qextmdichildarea.h
-include/qextmdichildfrm.h
-include/qextmdichildfrmcaption.h
-include/qextmdichildview.h
-include/qextmdidefines.h
-include/qextmdiiterator.h
-include/qextmdilistiterator.h
-include/qextmdimainfrm.h
-include/qextmdinulliterator.h
-include/qextmditaskbar.h
-lib/libqextmdi.so
-lib/libqextmdi.so.2
+include/qextmdi/dummykmainwindow.h
+include/qextmdi/dummykpartsdockmainwindow.h
+include/qextmdi/dummyktoolbar.h
+include/qextmdi/exportdockclass.h
+include/qextmdi/kdocktabctl.h
+include/qextmdi/kdockwidget.h
+include/qextmdi/kdockwidget_private.h
+include/qextmdi/qextmdichildarea.h
+include/qextmdi/qextmdichildfrm.h
+include/qextmdi/qextmdichildfrmcaption.h
+include/qextmdi/qextmdichildview.h
+include/qextmdi/qextmdidefines.h
+include/qextmdi/qextmdiiterator.h
+include/qextmdi/qextmdilistiterator.h
+include/qextmdi/qextmdimainfrm.h
+include/qextmdi/qextmdinulliterator.h
+include/qextmdi/qextmditaskbar.h
+lib/lib%%LIBNAME%%.so
+lib/lib%%LIBNAME%%.so.2
 %%PORTDOCS%%share/doc/qextmdi/handbook/logotp3.png
 %%PORTDOCS%%share/doc/qextmdi/handbook/index.html
 %%PORTDOCS%%share/doc/qextmdi/handbook/index.sgml