From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 22 11:50:02 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50836106566B for ; Fri, 22 Jan 2010 11:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0FC1F8FC24 for ; Fri, 22 Jan 2010 11:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0MBo1hU099842 for ; Fri, 22 Jan 2010 11:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0MBo1Mv099841; Fri, 22 Jan 2010 11:50:01 GMT (envelope-from gnats) Resent-Date: Fri, 22 Jan 2010 11:50:01 GMT Resent-Message-Id: <201001221150.o0MBo1Mv099841@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0056106568B for ; Fri, 22 Jan 2010 11:43:41 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id 3AE658FC20 for ; Fri, 22 Jan 2010 11:43:40 +0000 (UTC) Received: from Fluffy.Khv.RU (85.9.168.188.retail.ttk.ru [188.168.9.85] (may be forged)) by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.3) with ESMTP id o0MBhWWN064187 for ; Fri, 22 Jan 2010 21:43:36 +1000 (VLAT) (envelope-from fluffy@FreeBSD.org) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.3/8.14.3/Fluffy/5.4.1) with ESMTP id o0MBhHYF032368 for ; Fri, 22 Jan 2010 21:43:17 +1000 (VLAT) (envelope-from fluffy@FreeBSD.org) Message-Id: <1264160597.32324@Fluffy.Khv.RU> Date: Fri, 22 Jan 2010 21:43:17 +1000 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/143081: x11-toolkits/qt4pas: unbroke with qt46 and update to 2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2010 11:50:02 -0000 >Number: 143081 >Category: ports >Synopsis: x11-toolkits/qt4pas: unbroke with qt46 and update to 2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 22 11:50:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 9.0-900008-CURRENT amd64 >Organization: Fluffy.Khv.RU >Environment: System: FreeBSD 9.0-900008-CURRENT #2: Fri Jan 22 10:19:12 VLAT 2010 fluffy@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: x11-toolkits/qt4pas: unbroke with qt46 and update to 2.0 Removed: files/patch-compile.sh Library renamed from libqt4intf to libQt4Pas >How-To-Repeat: >Fix: --- qt4pas.diff begins here --- Index: x11-toolkits/qt4pas/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt4pas/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- x11-toolkits/qt4pas/Makefile 14 Aug 2009 10:46:22 -0000 1.2 +++ x11-toolkits/qt4pas/Makefile 22 Jan 2010 11:19:46 -0000 @@ -6,7 +6,7 @@ # PORTNAME= qt4pas -PORTVERSION= 1.70 +PORTVERSION= 2.0 CATEGORIES= x11-toolkits MASTER_SITES= http://users.telenet.be/Jan.Van.hijfte/qtforfpc/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/^/V/}_Qt${QT4_VER_MIN} @@ -18,7 +18,7 @@ USE_QT_VER= 4 QT_COMPONENTS= corelib gui network script webkit -QT4_VER_MIN= 4.5.0 +QT4_VER_MIN= 4.5.3 .include @@ -26,16 +26,7 @@ IGNORE= Please update your current qt4 version to ${QT4_VER_MIN} .endif -post-patch: - @${REINPLACE_CMD} -e 's|%%QT_INCDIR%%|${QT_INCDIR}|' -e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|g' -e \ - 's|%%CXX%%|${CXX}|g' -e 's|%%STRIP_CMD%%|${STRIP_CMD}|g' -e 's|bash|sh|g' ${WRKSRC}/compile_lib.sh - -do-build: - @cd ${WRKSRC} && \ - ${SH} compile_lib.sh - -do-install: - @${MKDIR} ${PREFIX}/lib/qt4 - ${INSTALL_PROGRAM} ${WRKSRC}/libqt4intf.so ${PREFIX}/lib/qt4 +pre-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} .include Index: x11-toolkits/qt4pas/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt4pas/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- x11-toolkits/qt4pas/distinfo 14 Aug 2009 10:46:22 -0000 1.2 +++ x11-toolkits/qt4pas/distinfo 22 Jan 2010 11:00:44 -0000 @@ -1,3 +1,3 @@ -MD5 (qt4pas-V1.70_Qt4.5.0.tar.gz) = 1b44cd72a6c226524a54afe93b68ecb8 -SHA256 (qt4pas-V1.70_Qt4.5.0.tar.gz) = d20c6cf48b854074a5449e621aaf1f3fde7d38f13abb945887ef9b642fcbd01e -SIZE (qt4pas-V1.70_Qt4.5.0.tar.gz) = 403932 +MD5 (qt4pas-V2.0_Qt4.5.3.tar.gz) = 56afc2d3e4088c27fbffbc08b2e3862c +SHA256 (qt4pas-V2.0_Qt4.5.3.tar.gz) = 06486792523ea01b89a3985f844015a93a353719c85e700e5c56d3504ac8a428 +SIZE (qt4pas-V2.0_Qt4.5.3.tar.gz) = 347301 Index: x11-toolkits/qt4pas/pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt4pas/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- x11-toolkits/qt4pas/pkg-plist 22 Jan 2009 02:23:42 -0000 1.1 +++ x11-toolkits/qt4pas/pkg-plist 22 Jan 2010 11:39:42 -0000 @@ -1,2 +1,4 @@ -lib/qt4/libqt4intf.so -@dirrmtry lib/qt4 +lib/qt4/libQt4Pas.so +lib/qt4/libQt4Pas.so.5 +lib/qt4/libQt4Pas.so.5.2 +lib/qt4/libQt4Pas.so.5.2.0 Index: x11-toolkits/qt4pas/files/patch-compile_lib.sh =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt4pas/files/patch-compile_lib.sh,v retrieving revision 1.2 diff -u -r1.2 patch-compile_lib.sh --- x11-toolkits/qt4pas/files/patch-compile_lib.sh 14 Aug 2009 10:46:23 -0000 1.2 +++ x11-toolkits/qt4pas/files/patch-compile_lib.sh 22 Jan 2010 11:01:56 -0000 @@ -1,33 +0,0 @@ ---- ./compile_lib.sh.orig 2009-04-20 17:59:59.000000000 +0400 -+++ ./compile_lib.sh 2009-07-12 15:18:58.000000000 +0400 -@@ -1,4 +1,4 @@ --#!/bin/env bash -+#!/bin/env sh - # get latest from http://users.telenet.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html - # for more info, you can visit the links on above page to FreePascal and Lazarus wiki - -@@ -7,18 +7,16 @@ - # do configure and gmake in that Qt4 dir - - NAME=libqt4intf.so --QTDIR=../qt-all-opensource-src-4.5.0 --INCLUDE_PATH="-I. -I$QTDIR/include -I$QTDIR/include/Qt -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore -Iqlcl " --LIB_PATH=$QTDIR/lib --export LD_LIBRARY_PATH=$LIB_PATH -+QTDIR=%%QT_INCDIR%% -+INCLUDE_PATH="-I. -I$QTDIR -I$QTDIR/Qt -I$QTDIR/QtGui -I$QTDIR/QtCore -Iqlcl " -+LIB_PATH=%%QT_LIBDIR%% -+ - if [ -e "$LIB_PATH/libQtCore.so.4" ] - then - echo please wait for compile to finish ... -- g++ -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -lQtNetwork -lQtWebKit -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH -- echo Showing used Qt libraries when LD_LIBRARY_PATH=$LD_LIBRARY_PATH -- ldd $NAME | grep libQt -+ %%CXX%% -D BINUX $INCLUDE_PATH qtpas.cpp -o libqt4intf.so -shared -fPIC -lQtCore -lQtGui -lQtNetwork -lQtWebKit -Xlinker -soname=$NAME -Xlinker --library-path -Xlinker $LIB_PATH - echo stripping library -- strip --strip-all $NAME -+ %%STRIP_CMD%% --strip-all $NAME - echo Done - else - echo "Please Modify location of Qt4 in this script" --- qt4pas.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: