Date: Tue, 5 Nov 2013 23:46:11 +0100 (CET) From: Guido Falsi <madpilot@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: freebsd@nagilum.org Subject: ports/183702: [PATCH] security/xca: Fix build on 10 and head Message-ID: <3dDmFH6T02zHb@micro.madpilot.net> Resent-Message-ID: <201311052300.rA5N000h049679@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183702
>Category: ports
>Synopsis: [PATCH] security/xca: Fix build on 10 and head
>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: Tue Nov 05 23:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 9.2-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 9.2-STABLE FreeBSD 9.2-STABLE #22 r255995: Wed Oct 2 22:15:55 CEST 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64
>Description:
- Fix build with new ld behavior (on 10 and head)
- Add USES=desktop-file-utils
- Convert to staging
- Use space in pkg-descr WWW line
- Remove redundant update-mime-database lines from pkg-plist
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
--- Makefile (revision 332835)
+++ Makefile (working copy)
@@ -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>
-NO_STAGE= yes
+.if ${OSVERSION} >= 1000054
+LD_CXX_LIB= -lc++
+.endif
+
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 ${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
@@ -48,4 +51,4 @@
post-configure:
${REINPLACE_CMD} -e 's/-lQtGui/-lQtCore -lQtGui/' ${WRKSRC}/Local.mak
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-descr
===================================================================
--- pkg-descr (revision 332835)
+++ pkg-descr (working copy)
@@ -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
Index: pkg-plist
===================================================================
--- pkg-plist (revision 332835)
+++ pkg-plist (working copy)
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3dDmFH6T02zHb>