Date: Wed, 6 Feb 2008 18:42:18 +0300 (MSK) From: Dmitry Sivachenko <demon@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/120323: Update port: devel/qca Message-ID: <200802061542.m16FgI8T036306@cavia.yandex.ru> Resent-Message-ID: <200802061600.m16G009N072146@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120323 >Category: ports >Synopsis: Update port: devel/qca >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 06 16:00:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Dmitry Sivachenko >Release: FreeBSD 7.0-PRERELEASE i386 >Organization: >Environment: System: FreeBSD cavia.yandex.ru 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #0: Wed Jan 23 19:20:04 MSK 2008 mitya@cavia.yandex.ru:/usr/obj/usr/src/sys/CAVIA i386 >Description: >How-To-Repeat: >Fix: Update devel/qca port in preparations of update net-im/psi port. Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/qca/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 19 May 2007 20:03:37 -0000 1.8 +++ Makefile 6 Feb 2008 14:56:24 -0000 @@ -6,10 +6,9 @@ # PORTNAME= qca -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= devel security -MASTER_SITES= http://delta.affinix.com/download/qca/ \ +MASTER_SITES= http://delta.affinix.com/download/qca/2.0/ \ http://mirror.inerd.com/FreeBSD/distfiles/qca/ MAINTAINER= shaun@FreeBSD.org @@ -20,20 +19,18 @@ QT_NONSTANDARD= yes HAS_CONFIGURE= yes USE_BZIP2= yes -USE_QT_VER= 3 -USE_X_PREFIX= yes +USE_QT_VER= 4 USE_LDCONFIG= yes -CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -CONFIGURE_ARGS= --qtdir=${QT_PREFIX} +CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ +CONFIGURE_ARGS= --qtdir=${QT_PREFIX} --no-separate-debug-info \ + --disable-tests MAKE_ARGS+= QTDIR=${QT_PREFIX} \ - QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ + QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ -do-install: - ${TEST} -d ${PREFIX}/include/plugins/qca || ${MKDIR} ${PREFIX}/include/plugins/qca - ${INSTALL_SCRIPT} ${WRKSRC}/src/qca.h ${WRKSRC}/src/qcaprovider.h ${PREFIX}/include/plugins/qca - ${INSTALL_SCRIPT} -m 755 ${WRKSRC}/libqca.so.1.0.0 ${PREFIX}/lib - ${LN} -sf ${PREFIX}/lib/libqca.so.1.0.0 ${PREFIX}/lib/libqca.so.1 - ${LN} -sf ${PREFIX}/lib/libqca.so.1.0.0 ${PREFIX}/lib/libqca.so +MAN1= qcatool2.1 + +post-install: + ${STRIP_CMD} ${PREFIX}/bin/qcatool2 .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/pcvs/ports/devel/qca/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 22 Jan 2006 11:02:38 -0000 1.2 +++ distinfo 6 Feb 2008 14:56:24 -0000 @@ -1,3 +1,3 @@ -MD5 (qca-1.0.tar.bz2) = ee44022eb0e5b8b5df64c62630f6e6b6 -SHA256 (qca-1.0.tar.bz2) = 614b8c9e03d8796c90f7f316f2ace66a5356270a75921ea72cebf129de491c5b -SIZE (qca-1.0.tar.bz2) = 30677 +MD5 (qca-2.0.0.tar.bz2) = 07d54358ef4880d05b3c6f56b629aa55 +SHA256 (qca-2.0.0.tar.bz2) = 2ed0d49300459ae1f2d138fc2e68ed7f92850065981032c96f2538e1878fc2d3 +SIZE (qca-2.0.0.tar.bz2) = 5106520 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/qca/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 8 Apr 2005 05:21:14 -0000 1.2 +++ pkg-plist 6 Feb 2008 14:56:24 -0000 @@ -1,7 +1,28 @@ +bin/qcatool2 +lib/libqca.prl lib/libqca.so -lib/libqca.so.1 -lib/libqca.so.1.0.0 -include/plugins/qca/qca.h -include/plugins/qca/qcaprovider.h -@dirrm include/plugins/qca -@dirrm include/plugins +lib/libqca.so.2 +lib/libqca.so.2.0 +lib/libqca.so.2.0.0 +include/QtCrypto/QtCrypto +include/QtCrypto/qca.h +include/QtCrypto/qca_basic.h +include/QtCrypto/qca_cert.h +include/QtCrypto/qca_core.h +include/QtCrypto/qca_export.h +include/QtCrypto/qca_keystore.h +include/QtCrypto/qca_publickey.h +include/QtCrypto/qca_securelayer.h +include/QtCrypto/qca_securemessage.h +include/QtCrypto/qca_support.h +include/QtCrypto/qca_textfilter.h +include/QtCrypto/qca_tools.h +include/QtCrypto/qcaprovider.h +include/QtCrypto/qpipe.h +libdata/pkgconfig/qca2.pc +share/qt4/mkspecs/features/crypto.prf +share/qca/certs/README +share/qca/certs/rootcerts.pem +@dirrm share/qca/certs +@dirrm share/qca +@dirrm include/QtCrypto Index: files/patch-configure =================================================================== RCS file: /home/pcvs/ports/devel/qca/files/patch-configure,v retrieving revision 1.1 diff -u -r1.1 patch-configure --- files/patch-configure 5 Apr 2005 06:32:34 -0000 1.1 +++ files/patch-configure 6 Feb 2008 14:56:24 -0000 @@ -1,38 +1,11 @@ ---- configure.orig Wed Dec 10 03:06:43 2003 -+++ configure Sun Mar 27 23:43:58 2005 -@@ -17,12 +17,10 @@ - while [ $# -gt 0 ]; do - case "$1" in - --prefix=*) -- PREFIX=`expr "${1}" : "--prefix=\(.*\)"` - shift - ;; +--- configure.orig 2007-10-01 22:22:18.000000000 +0400 ++++ configure 2008-02-06 17:47:33.000000000 +0300 +@@ -776,7 +776,7 @@ + } - --qtdir=*) -- QTDIR=`expr "${1}" : "--qtdir=\(.*\)"` - shift - ;; - -@@ -76,7 +74,7 @@ - echo Warning: qmake not in \$QTDIR/bin/qmake - echo trying to find it in \$PATH - fi -- qm=`type -p qmake` -+ qm=`which qmake` - if [ -x "$qm" ]; then - if [ "$QC_DEBUG" = "Y" ]; then - echo qmake found in $qm -@@ -477,13 +475,6 @@ - echo - exit 1; - fi --cat >Makefile.tmp <<EOT --export QTDIR = $QTDIR --EOT --cat Makefile >> Makefile.tmp --rm -f Makefile --cp -f Makefile.tmp Makefile --rm -f Makefile.tmp - - echo - echo Good, your configure finished. Now run \'make\'. + str = QString( +- "pcfiles.path = \$\$PREFIX/lib/pkgconfig\n" ++ "pcfiles.path = \$\$PREFIX/libdata/pkgconfig\n" + "pcfiles.files = %1\n" + "INSTALLS += pcfiles\n" + ).arg(pcfiles.join(" ")); Index: files/patch-src-src.pro =================================================================== RCS file: files/patch-src-src.pro diff -N files/patch-src-src.pro --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src-src.pro 6 Feb 2008 14:56:24 -0000 @@ -0,0 +1,11 @@ +--- src/src.pro.orig 2007-08-15 01:00:28.000000000 +0400 ++++ src/src.pro 2008-02-06 17:30:57.000000000 +0300 +@@ -92,7 +92,7 @@ + incfiles.files += $$QCA_INC/qca.h $$QCA_INC/QtCrypto + INSTALLS += incfiles + +- manfiles.path = $$DATADIR/man/man1 ++ manfiles.path = $$PREFIX/man/man1 + manfiles.files = $$QCA_BASE/man/qcatool2.1 + INSTALLS += manfiles + } >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802061542.m16FgI8T036306>