Date: Wed, 06 Nov 2013 00:41:59 +0100 From: FreeBSD@nagilum.org To: madpilot@freebsd.org Cc: freebsd-ports-bugs@freebsd.org, bug-followup@freebsd.org Subject: Re: ports/183702: [PATCH] security/xca: Fix build on 10 and head Message-ID: <20131106004159.Horde.eYr5m3tUWGkE18sIg1CHLA1@cakebox.homeunix.net> In-Reply-To: <201311052313.rA5NDCYW053982@freefall.freebsd.org> References: <201311052313.rA5NDCYW053982@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk> 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 <christian@hohnstaedt.de> -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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131106004159.Horde.eYr5m3tUWGkE18sIg1CHLA1>