svn commit: r399618 - in head/security/xca: . files

Sun Oct 18 13:41:17 UTC 2015

Author: madpilot
Date: Sun Oct 18 13:41:15 2015
New Revision: 399618
URL: https://svnweb.freebsd.org/changeset/ports/399618

Log:
  - Update to 1.3.2
  - Add QT4 and QT5 options, to choose toolkit.
  
  PR:		203804
  Submitted by:	Ports Fury

Deleted:
  head/security/xca/files/
Modified:
  head/security/xca/Makefile
  head/security/xca/distinfo
  head/security/xca/pkg-descr
  head/security/xca/pkg-plist

Modified: head/security/xca/Makefile
==============================================================================

--- head/security/xca/Makefile	Sun Oct 18 13:21:17 2015	(r399617)
+++ head/security/xca/Makefile	Sun Oct 18 13:41:15 2015	(r399618)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xca
-PORTVERSION=	0.9.3
-PORTREVISION=	3
+PORTVERSION=	1.3.2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -15,41 +14,35 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
+USES=		desktop-file-utils gmake localbase pkgconfig shared-mime-info
 USE_OPENSSL=	yes
-USE_QT4=	gui moc_build uic_build qmake_build rcc_build linguist_build
-USES=		desktop-file-utils gmake shared-mime-info
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-openssl=${OPENSSLDIR} \
+		--with-qt=${QT_PREFIX}
+MAKE_ARGS=	DOCTOOL="${TRUE}"
 DESTDIRNAME=	destdir
 
-.include <bsd.port.pre.mk>
-
-BROKEN_sparc64=	fails to link
-
-.if ${OSVERSION} >= 1000054
-LD_CXX_LIB=	-lc++
-.endif
+OPTIONS_DEFINE=		DOCS
+OPTIONS_SINGLE=		TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
+OPTIONS_DEFAULT=	QT4
+
+QT4_USE=		qt4=gui,linguist_build,moc_build,qmake_build \
+			qt4=rcc_build,uic_build
+QT5_USE=		qt5=widgets,buildtools_build,linguist_build
+TOOLKIT_DESC=		Qt toolkit
 
 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
+	@${REINPLACE_CMD} -e \
+		'/^CFLAGS/s|-O2||' ${WRKSRC}/Local.mak.in
+	@${REINPLACE_CMD} -e \
+		'/install/s|-D|-c|' ${WRKSRC}/img/Makefile
+
+post-patch-QT5-off:
+	@${REINPLACE_CMD} -e \
+		's|Qt5|Qt0|g' ${WRKSRC}/configure
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xca*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/xca/distinfo
==============================================================================
--- head/security/xca/distinfo	Sun Oct 18 13:21:17 2015	(r399617)
+++ head/security/xca/distinfo	Sun Oct 18 13:41:15 2015	(r399618)
@@ -1,2 +1,2 @@
-SHA256 (xca-0.9.3.tar.gz) = 6842b50c8b4478070d8af743cb72aee1f53a2c4ff2b8285fcec5f856119cc6ba
-SIZE (xca-0.9.3.tar.gz) = 755165
+SHA256 (xca-1.3.2.tar.gz) = 04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4
+SIZE (xca-1.3.2.tar.gz) = 897947

Modified: head/security/xca/pkg-descr
==============================================================================
--- head/security/xca/pkg-descr	Sun Oct 18 13:21:17 2015	(r399617)
+++ head/security/xca/pkg-descr	Sun Oct 18 13:41:15 2015	(r399618)
@@ -1,8 +1,8 @@
-Graphical certification authority is an interface for managing
-RSA keys and certificates, and the creation and signing of PKCS#10 requests.
-It uses the OpenSSL library and a Berkeley DB for key and certificate storage.
-It supports importing and exporting keys and PEM DER PKCS8 certificates,
-signing and revoking of PEM DER PKCS12, and selection of x509v3 extensions.
-A tree view of certificates is presented.
+Graphical certification authority is an interface for managing RSA keys
+and certificates, and the creation and signing of PKCS#10 requests. It
+uses the OpenSSL library and a Berkeley DB for key and certificate
+storage. It supports importing and exporting keys and PEM DER PKCS8
+certificates, signing and revoking of PEM DER PKCS12, and selection of
+x509v3 extensions. A tree view of certificates is presented.
 
-WWW: http://www.hohnstaedt.de/xca.html
+WWW: http://xca.hohnstaedt.de/

Modified: head/security/xca/pkg-plist
==============================================================================
--- head/security/xca/pkg-plist	Sun Oct 18 13:21:17 2015	(r399617)
+++ head/security/xca/pkg-plist	Sun Oct 18 13:41:15 2015	(r399618)
@@ -1,4 +1,26 @@
 bin/xca
+bin/xca_db_stat
+man/man1/xca.1.gz
+man/man1/xca_db_stat.1.gz
+share/applications/xca.desktop
+%%PORTDOCS%%%%DOCSDIR%%/xca-1.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-10.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-11.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-12.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-13.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-14.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-15.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-2.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-3.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-4.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-5.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-6.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-7.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-8.html
+%%PORTDOCS%%%%DOCSDIR%%/xca-9.html
+%%PORTDOCS%%%%DOCSDIR%%/xca.html
+share/mime/packages/xca.xml
+share/pixmaps/xca-32x32.xpm
 %%DATADIR%%/CA.xca
 %%DATADIR%%/HTTPS_client.xca
 %%DATADIR%%/HTTPS_server.xca
@@ -10,10 +32,6 @@ bin/xca
 %%DATADIR%%/xca_de.qm
 %%DATADIR%%/xca_es.qm
 %%DATADIR%%/xca_fr.qm
+%%DATADIR%%/xca_hr.qm
 %%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
