Index: head/security/xca/Makefile
===================================================================
--- head/security/xca/Makefile	(revision 399317)
+++ head/security/xca/Makefile	(revision 399318)
@@ -1,54 +1,55 @@
 # Created by: Valentin Zahariev <curly@e-card.bg>
 # $FreeBSD$
 
 PORTNAME=	xca
 PORTVERSION=	0.9.3
 PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical certification authority
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
 USE_OPENSSL=	yes
 USE_QT4=	gui moc_build uic_build qmake_build rcc_build linguist_build
 USES=		desktop-file-utils gmake shared-mime-info
 DESTDIRNAME=	destdir
 
 .include <bsd.port.pre.mk>
 
 BROKEN_sparc64=	fails to link
 
 .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}" >> ${WRKSRC}/Local.mak
 	@echo "LIBS= ${LIBS} -L${QT_LIBDIR} -L${LOCALBASE}/lib -lQtCore -lQtGui -lpthread -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
 	@echo "LRELEASE=${LOCALBASE}/bin/lrelease-qt4" >> ${WRKSRC}/Local.mak
 	@echo "CC=${CC}" >> ${WRKSRC}/Local.mak
 	@echo "LD=${LD}" >> ${WRKSRC}/Local.mak
 	@echo "STRIP=${STRIP_CMD}" >> ${WRKSRC}/Local.mak
 	@echo "prefix=${PREFIX}" >> ${WRKSRC}/Local.mak
 	@echo "etc=${PREFIX}/etc/xca" >> ${WRKSRC}/Local.mak
 	@echo "basedir=" >> ${WRKSRC}/Local.mak
 	@echo "docdir=${DOCSDIR}" >> ${WRKSRC}/Local.mak
 	@echo "#define PREFIX \"${PREFIX}\"" > ${WRKSRC}/local.h
 	@echo "#define ETC \"${PREFIX}/etc/xca\"" >> ${WRKSRC}/local.h
 	@echo "#define VER \"${PORTVERSION}\"" >> ${WRKSRC}/local.h
 	@echo "#define DOCDIR \"${DOCSDIR}\"" >> ${WRKSRC}/local.h
 	@${REINPLACE_CMD} -e "/rR/{G;s/$$/TOPDIR_/;}" -e "s:\(TOPDIR\)_:\1=${WRKSRC}:" ${WRKSRC}/Makefile
 	@${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
 
 .include <bsd.port.post.mk>
Index: head/security/xca/files/patch-doc__Makefile
===================================================================
--- head/security/xca/files/patch-doc__Makefile	(revision 399317)
+++ head/security/xca/files/patch-doc__Makefile	(revision 399318)
@@ -1,32 +1,32 @@
---- doc/Makefile.orig	2012-05-12 11:37:14.000000000 +0200
-+++ doc/Makefile	2012-05-14 11:19:34.000000000 +0200
-@@ -5,7 +5,7 @@
+--- doc/Makefile.orig	2012-05-12 09:37:14 UTC
++++ doc/Makefile
+@@ -5,7 +5,7 @@ endif
  
  DELFILES=xca*.html xca.1.gz
  
 -doc: xca.1.gz xca.html
 +doc: xca.1.gz
  include $(TOPDIR)/Rules.mak
  
  mandir=man
-@@ -15,10 +15,7 @@
+@@ -15,10 +15,7 @@ xca.1.gz: xca.1
  
  xca.html: xca.sgml
  	rm -f xca*.html
 -	echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' > $@
 -	test ! -f xca-doc.tgz || tar zxf xca-doc.tgz
 -	@$(PRINT) "  DOC    [$(BASENAME)] $@"
 -	$(LINUXDOC) -B html $< >/dev/null
 +	echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' >> $@
  
  install: xca.1.gz xca.html
  	install -m 755 -d $(destdir)$(docdir) \
-@@ -26,8 +23,4 @@
+@@ -26,8 +23,4 @@ install: xca.1.gz xca.html
  	install -m 644 xca*.html $(destdir)$(docdir)
  	install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
  
 -app: xca.html
 -	mkdir -p $(APPDIR)/Resources
 -	install -m 644 xca*.html $(APPDIR)/Resources
 -
  
Index: head/security/xca/files/patch-img__Makefile
===================================================================
--- head/security/xca/files/patch-img__Makefile	(revision 399317)
+++ head/security/xca/files/patch-img__Makefile	(revision 399318)
@@ -1,11 +1,11 @@
---- img/Makefile.orig	2011-11-07 07:09:32.000000000 +0100
-+++ img/Makefile	2011-11-23 11:15:40.000000000 +0100
-@@ -13,7 +13,7 @@
+--- img/Makefile.orig	2012-05-12 09:37:14 UTC
++++ img/Makefile
+@@ -13,7 +13,7 @@ include $(TOPDIR)/Rules.mak
  sinclude .depend
  
  install: xca-32x32.xpm
 -	install -D -m 644 $^ $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
 +	install -d -m 755 $(destdir)$(prefix)/share/pixmaps && install -m 644 $^ $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
  
  imgres.cpp: imgres.rcc
  	@$(PRINT) "  RCC    [$(BASENAME)] $@"
Index: head/security/xca/files/patch-lib__x509v3ext.cpp
===================================================================
--- head/security/xca/files/patch-lib__x509v3ext.cpp	(revision 399317)
+++ head/security/xca/files/patch-lib__x509v3ext.cpp	(revision 399318)
@@ -1,20 +1,20 @@
 --- lib/x509v3ext.cpp.orig	2012-05-12 09:37:14 UTC
 +++ lib/x509v3ext.cpp
-@@ -27,6 +27,8 @@
+@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSIO
  x509v3ext::x509v3ext(const x509v3ext &n)
  {
  	ext = NULL;
 +	if (!n.isValid())
 +		return;
  	set(n.ext);
  }
  
-@@ -743,7 +745,7 @@
+@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
  
  bool x509v3ext::isValid() const
  {
 -	return ext->value->length > 0 &&
 +	return ext && ext->value && ext->value->length > 0 &&
  		OBJ_obj2nid(ext->object) != NID_undef;
  }