svn commit: r333020 - head/security/xca

[Guido Falsi]

Author: madpilot
Date: Wed Nov  6 18:11:17 2013
New Revision: 333020
URL: http://svnweb.freebsd.org/changeset/ports/333020

Log:
  - 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
  
  PR:		ports/183702
  Submitted by:	Me
  Approved by:	FreeBSD at nagilum.org (maintainer)

Modified:
  head/security/xca/Makefile   (contents, props changed)
  head/security/xca/pkg-descr   (contents, props changed)
  head/security/xca/pkg-plist   (contents, props changed)

Modified: head/security/xca/Makefile
==============================================================================
--- head/security/xca/Makefile	Wed Nov  6 18:04:20 2013	(r333019)
+++ head/security/xca/Makefile	Wed Nov  6 18:11:17 2013	(r333020)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xca
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -15,17 +15,20 @@ LICENSE=	BSD
 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=-lQtCore -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 @@ post-patch:
 	@${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>

Modified: head/security/xca/pkg-descr
==============================================================================
--- head/security/xca/pkg-descr	Wed Nov  6 18:04:20 2013	(r333019)
+++ head/security/xca/pkg-descr	Wed Nov  6 18:11:17 2013	(r333020)
@@ -6,4 +6,4 @@ signing and revoking of PEM DER PKCS12, 
 A tree view of certificates is presented.
 
 Author:	Christian Hohnstaedt <christian at hohnstaedt.de>
-WWW:	http://www.hohnstaedt.de/xca.html
+WWW: http://www.hohnstaedt.de/xca.html

Modified: head/security/xca/pkg-plist
==============================================================================
--- head/security/xca/pkg-plist	Wed Nov  6 18:04:20 2013	(r333019)
+++ head/security/xca/pkg-plist	Wed Nov  6 18:11:17 2013	(r333020)
@@ -14,6 +14,7 @@ bin/xca
 %%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 @@ share/pixmaps/xca-32x32.xpm
 @dirrm %%DOCSDIR%%
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
- at exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true