From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 5 23:47:11 2013 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1C71BF81; Tue, 5 Nov 2013 23:47:11 +0000 (UTC) (envelope-from FreeBSD@nagilum.org) Received: from mo6-p00-ob.rzone.de (mo6-p00-ob.rzone.de [IPv6:2a01:238:20a:202:5300::1]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4637F2054; Tue, 5 Nov 2013 23:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; t=1383695226; l=3558; s=domk; d=nagilum.de; h=MIME-Version:Content-Type:In-Reply-To:References:Subject:Cc:To:From: Date:X-RZG-CLASS-ID:X-RZG-AUTH; bh=S023O1jzCCfYqWLb9CFbWHnErPs=; b=DTKMJThMAh+ET1HrCQpPq/k0K5yd4j416hD+naY72jeXl0+W2P7P49BX2KjEz8l2vPD rpAwf1SOmjqL1Ute8FtftFFL/s3cmncASbgweOku0kCAXJQWpqE/WnoG2TB6fdSpS2doZ i1B0YQK75/dFcA9uOerWO02VI8xaWPu5xzA= X-RZG-AUTH: :O2kGeEG7b/pS1EO4THa/nJdkGexqY2koAkiM3P8W4OZGgXnciNPcJoCmfQ0bBjNatqU= X-RZG-CLASS-ID: mo00 Received: from cakebox.homeunix.net (014-011-186-093.dialin.vsenet.de [93.186.11.14]) by smtp.strato.de (RZmta 32.11 DYNA|AUTH) with (TLSv1.2:DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPSA id 00063bpA5NHZNQ ; Wed, 6 Nov 2013 00:47:06 +0100 (CET) Received: from cakebox.homeunix.net (localhost [127.0.0.1]) by cakebox.homeunix.net (Postfix) with ESMTP id 7C1232D504C; Wed, 6 Nov 2013 00:42:04 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on cakebox.tis X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.4 tests=ALL_TRUSTED, TIME_LIMIT_EXCEEDED autolearn=unavailable version=3.3.2 Received: by cakebox.homeunix.net (Postfix, from userid 80) id EB9672D504D; Wed, 6 Nov 2013 00:42:00 +0100 (CET) Received: from 10.1.2.16 ([10.1.2.16]) by cakebox.homeunix.net (Horde Framework) with HTTP; Wed, 06 Nov 2013 00:41:59 +0100 Date: Wed, 06 Nov 2013 00:41:59 +0100 Message-ID: <20131106004159.Horde.eYr5m3tUWGkE18sIg1CHLA1@cakebox.homeunix.net> From: FreeBSD@nagilum.org To: madpilot@freebsd.org Subject: Re: ports/183702: [PATCH] security/xca: Fix build on 10 and head References: <201311052313.rA5NDCYW053982@freefall.freebsd.org> In-Reply-To: <201311052313.rA5NDCYW053982@freefall.freebsd.org> User-Agent: Internet Messaging Program (IMP) H5 (6.1.5) Content-Type: multipart/mixed; boundary="=_gBt7RX3OyoE2gSRE3rPjHQ1" MIME-Version: 1.0 Cc: freebsd-ports-bugs@freebsd.org, bug-followup@freebsd.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 23:47:11 -0000 This message is in MIME format. --=_gBt7RX3OyoE2gSRE3rPjHQ1 Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes Content-Disposition: inline Slightly modified patch that further simplifies the Makefile. I'll trust the original patch does indeed fix the link error as it just works for me. :> Thanks & kind regards. Alex. Zitat von madpilot@freebsd.org: > Synopsis: [PATCH] security/xca: Fix build on 10 and head > > Responsible-Changed-From-To: freebsd-ports-bugs->madpilot > Responsible-Changed-By: madpilot > Responsible-Changed-When: Tue Nov 5 23:13:12 UTC 2013 > Responsible-Changed-Why: > I'll take it. > > http://www.freebsd.org/cgi/query-pr.cgi?pr=183702 --=_gBt7RX3OyoE2gSRE3rPjHQ1 Content-Type: text/x-diff; name=patch.txt; charset=us-ascii Content-Disposition: attachment; size=2606; filename=patch.txt diff -Naur xca.orig/Makefile xca/Makefile --- xca.orig/Makefile 2013-11-06 00:27:36.000000000 +0100 +++ xca/Makefile 2013-11-06 00:29:51.000000000 +0100 @@ -3,7 +3,7 @@ PORTNAME= xca PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF @@ -15,17 +15,20 @@ USE_OPENSSL= yes USE_QT4= gui moc_build uic_build qmake_build rcc_build linguist_build USE_AUTOTOOLS= libltdl -USES= gmake shared-mime-info +USES= desktop-file-utils gmake shared-mime-info +DESTDIRNAME= destdir -MAN1= xca.1 -MANCOMPRESSED= yes +.include + +.if ${OSVERSION} >= 1000054 +LD_CXX_LIB= -lc++ +.endif -NO_STAGE= yes post-patch: @echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include" > ${WRKSRC}/Local.mak @echo "CFLAGS= ${CFLAGS} -Wall -ggdb" >> ${WRKSRC}/Local.mak @echo "LDFLAGS= ${LDFLAGS} -L${QT_LIBDIR} -L${LOCALBASE}/lib" >> ${WRKSRC}/Local.mak - @echo "LIBS= -lQtGui ${PTHREAD_LIBS} -lcrypto -lltdl" >> ${WRKSRC}/Local.mak + @echo "LIBS= -lQtGui -lQtGui ${PTHREAD_LIBS} -lcrypto -lltdl ${LD_CXX_LIB}" >> ${WRKSRC}/Local.mak @echo "MOC=${MOC}" >> ${WRKSRC}/Local.mak @echo "UIC=${QT_PREFIX}/bin/uic-qt4" >> ${WRKSRC}/Local.mak @echo "RCC=${LOCALBASE}/bin/rcc" >> ${WRKSRC}/Local.mak @@ -45,7 +48,4 @@ @${REINPLACE_CMD} -e "/VPATH/{G;s/$$/TOPDIR_/;}" -e "s:\(TOPDIR\)_:\1=${WRKSRC}:" ${WRKSRC}/misc/Makefile @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/import.cpp -post-configure: - ${REINPLACE_CMD} -e 's/-lQtGui/-lQtCore -lQtGui/' ${WRKSRC}/Local.mak - -.include +.include diff -Naur xca.orig/pkg-descr xca/pkg-descr --- xca.orig/pkg-descr 2013-11-06 00:27:36.000000000 +0100 +++ xca/pkg-descr 2013-11-06 00:29:16.000000000 +0100 @@ -6,4 +6,4 @@ A tree view of certificates is presented. Author: Christian Hohnstaedt -WWW: http://www.hohnstaedt.de/xca.html +WWW: http://www.hohnstaedt.de/xca.html diff -Naur xca.orig/pkg-plist xca/pkg-plist --- xca.orig/pkg-plist 2013-11-06 00:27:36.000000000 +0100 +++ xca/pkg-plist 2013-11-06 00:29:16.000000000 +0100 @@ -14,6 +14,7 @@ %%DATADIR%%/xca_ru.qm %%DATADIR%%/xca_tr.qm %%DOCSDIR%%/xca.html +man/man1/xca.1.gz share/applications/xca.desktop share/mime/packages/xca.xml share/pixmaps/xca-32x32.xpm @@ -21,5 +22,3 @@ @dirrm %%DOCSDIR%% @dirrmtry share/mime/packages @dirrmtry share/mime -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true --=_gBt7RX3OyoE2gSRE3rPjHQ1--