Date: Tue, 14 Jan 2003 15:21:07 +0100 (MET) From: Roland Jesse <roland.jesse@gmx.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Tilman Linneweh <arved@FreeBSD.org> Subject: ports/47049: devel/qextmdi: Minor fixes for KDE support (SUPERCEEDS ports/47022) Message-ID: <200301141421.h0EEL7no087061@arthur.cs.uni-magdeburg.de>
next in thread | raw e-mail | index | archive | help
>Number: 47049 >Category: ports >Synopsis: devel/qextmdi: Minor fixes for KDE support (SUPERCEEDS ports/47022) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 14 06:20:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: Roland Jesse >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD 4.7-STABLE #9: Tue Nov 19 13:06:45 CET 2002 i386 >Description: Thanks to Tilman Linneweh for suggesting a couple of enhancements to PR ports/47022. These should now be taken care of. Specifically: the variable CONFIG_ENV was dropped in favour of MAKE_ENV, PLIST_SUB is used instead of directly trying to modify pkg-plist. Some changes needed to be made to Makefile and pkg-plist in order to link accordingly against KDE3 if the user wants to. This "wants to" is determined by the WITH_KDE variable. There still is a possible file conflict with KDE3 (include/kdockwidget.h). In order to not remove the KDE file accidently, a backup copy is made (pre-install target). The question of how to restore this file whenever this port/package is deleted, remains. My email address has changed, too. >How-To-Repeat: "env WITH_KDE=yes make install" in devel/qextmdi >Fix: diff -ruN qextmdi/Makefile qextmdi.new/Makefile --- qextmdi/Makefile Mon Jan 13 13:16:58 2003 +++ qextmdi.new/Makefile Tue Jan 14 15:16:58 2003 @@ -1,42 +1,64 @@ # New ports collection makefile for: qextmdi # Date created: 29 April 2002 -# Whom: jesse@cs.uni-magdeburg.de +# Whom: Roland Jesse <roland.jesse@gmx.net> # # $FreeBSD: ports/devel/qextmdi/Makefile,v 1.1 2003/01/13 12:16:58 arved Exp $ 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 +CONFIG_ARGS= -release +MAKE_ENV+= QTDIR=${QT_PREFIX} QMAKESPEC=freebsd-g++ .if defined(WITH_KDE) USE_KDEBASE_VER= 3 # The name of this option is misleading. It uses either KDE2 or KDE3. -CONFIGURE_ARGS+= -kde2 +CONFIG_ARGS+= -kde2 +MAKE_ENV+= KDE2DIR=${PREFIX} +PLIST_SUB+= LIBNAME=kextmdi +.else +PLIST_SUB+= LIBNAME=qextmdi +.endif +.if defined(MAKE_JOBS) +MAKE_ARGS+= -j${MAKE_JOBS} .endif -MAKE_ENV+= QTDIR=${QT_PREFIX} QMAKESPEC=freebsd-g++ INSTALLS_SHLIB= yes USE_REINPLACE= yes 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: +# define this here to prevent any "--with-qt-includes" passed to ./configure: do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIG_ARGS} +.if defined(WITH_KDE) +# Bad hack (TM): +# Because of a file conflict with x11/kdelibs3, back up KDE's include/kdockwidget.h. +# Open: Needs to be restored whenever QextMDI is removed from the system. +pre-install: + @cd ${PREFIX}/include && ${CP} kdockwidget.h kdockwidget.h.kde3 +.endif + 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 + @cd ${WRKSRC}/lib && ${TAR} cf - lib*[so,2] | (cd ${PREFIX}/lib && ${TAR} xf -) ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/qextmdi diff -ruN qextmdi/pkg-descr qextmdi.new/pkg-descr --- qextmdi/pkg-descr Mon Apr 29 11:13:23 2002 +++ qextmdi.new/pkg-descr Mon Nov 25 09:29:08 2002 @@ -5,4 +5,3 @@ WWW: http://www.geocities.com/gigafalk/qextmdi.htm Roland -jesse@cs.uni-magdeburg.de diff -ruN qextmdi/pkg-plist qextmdi.new/pkg-plist --- qextmdi/pkg-plist Mon Jan 13 13:16:58 2003 +++ qextmdi.new/pkg-plist Tue Jan 14 12:45:26 2003 @@ -15,8 +15,9 @@ include/qextmdimainfrm.h include/qextmdinulliterator.h include/qextmditaskbar.h -lib/libqextmdi.so -lib/libqextmdi.so.2 +lib/lib%%LIBNAME%%.so +lib/lib%%LIBNAME%%.so.2 +lib/lib%%LIBNAME%%.so.2.0.2 %%PORTDOCS%%share/doc/qextmdi/handbook/logotp3.png %%PORTDOCS%%share/doc/qextmdi/handbook/index.html %%PORTDOCS%%share/doc/qextmdi/handbook/index.sgml >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301141421.h0EEL7no087061>