- Update to 0.6.3

- Transfer maintainership

PR:		ports/113401
Submitted by:	Mark D. Foster <mark@foster.cc>
Approved by:	maintainership change - linimon (portmgr)

5 files changed, 63 insertions, 49 deletions

diff --git a/security/xca/Makefile b/security/xca/Makefile
index c7bbcd5b63f9..ef1accae6a41 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	xca
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	0.6.3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	curly@e-card.bg
+MAINTAINER=	mark@foster.cc
 COMMENT=	Graphical certification authority
 
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
-
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-USE_QT_VER=	3
+USE_QT_VER=	4
+CC?=		gcc
+CXX?=		g++
+
+MAN1=		xca.1
+MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -28,21 +30,23 @@ BROKEN=		Does not compile on FreeBSD >= 7.0
 .endif
 
 post-patch:
-	@echo "CPPFLAGS= -I. -I.. -I${OPENSSLINC} ${QTCPPFLAGS} -I${LOCALBASE}/include/db4" > ${WRKSRC}/Local.mak
-	@echo "CFLAGS= ${CFLAGS}" >> ${WRKSRC}/Local.mak
-	@echo "LDFLAGS= ${LDFLAGS}" >> ${WRKSRC}/Local.mak
-	@echo "LIBS= ${QTCFGLIBS} -lqt-mt -L${OPENSSLLIB} -lcrypto -ldb4_cxx ${PTHREAD_LIBS}" >> ${WRKSRC}/Local.mak
+	@echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I/usr/X11R6/include -I${QT_PREFIX}/include/Qt" > ${WRKSRC}/Local.mak
+	@echo "CFLAGS= ${CFLAGS} -Wall -ggdb" >> ${WRKSRC}/Local.mak
+	@echo "LDFLAGS= ${LDFLAGS} -L${LOCALBASE}/lib" >> ${WRKSRC}/Local.mak
+	@echo "LIBS= -lQtGui -lc_r -lcrypto" >> ${WRKSRC}/Local.mak
 	@echo "MOC=${MOC}" >> ${WRKSRC}/Local.mak
-	@echo "UIC=${QT_PREFIX}/bin/uic" >> ${WRKSRC}/Local.mak
-	@echo "CC=${CXX}" >> ${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
-	@${REINPLACE_CMD} -E -e 's|QFont\ font\(\ font\(\)\ \)|QFont font|' ${WRKSRC}/widgets/clicklabel.cpp
-	@${REINPLACE_CMD} -E -e 's|(install[\ \:]+xca\.1)\.gz|\1|g' ${WRKSRC}/doc/Makefile
-
-MAN1=	xca.1
+	@echo "#define PREFIX \"${PREFIX}\"" > ${WRKSRC}/local.h
+	@echo "#define ETC \"${PREFIX}/etc/xca\"" >> ${WRKSRC}/local.h
+	@echo "#define VER \"${PORTVERSION}\"" >> ${WRKSRC}/local.h
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/import.cpp
 
 .include <bsd.port.post.mk>
diff --git a/security/xca/distinfo b/security/xca/distinfo
index 696770f2f7a3..cd3a39570971 100644
--- a/security/xca/distinfo
+++ b/security/xca/distinfo
@@ -1,3 +1,3 @@
-MD5 (xca-0.5.1.tar.gz) = 24e0289c189b8db2f1f15a4ddac1b1c3
-SHA256 (xca-0.5.1.tar.gz) = cf51de5760c6d34b17b379c23f17699ee597a3264b9bed0f165bd302726757cb
-SIZE (xca-0.5.1.tar.gz) = 287025
+MD5 (xca-0.6.3.tar.gz) = 8e0c2f8fbd01451acb841a3fb99ca399
+SHA256 (xca-0.6.3.tar.gz) = 032e64ac3bbef15c3ddf58278593ef02d52680b183c0a2a0bceb8f887a90fc7b
+SIZE (xca-0.6.3.tar.gz) = 260070
diff --git a/security/xca/files/patch-doc-Makefile b/security/xca/files/patch-doc-Makefile
new file mode 100644
index 000000000000..d285c41c8337
--- /dev/null
+++ b/security/xca/files/patch-doc-Makefile
@@ -0,0 +1,29 @@
+--- doc/Makefile.orig	Tue Jun  5 22:16:31 2007
++++ doc/Makefile	Tue Jun  5 22:54:04 2007
+@@ -5,14 +5,11 @@
+ DELFILES=*.html xca.1.gz 
+ all: doc
+ mandir=man
+-doc: xca.1.gz xca.html
++doc: xca.1.gz
+ 
+ xca.1.gz: xca.1
+ 	gzip -9 <$^ >$@
+ 
+-xca.html: xca.sgml
+-	$(LINUXDOC) -B html $<
+-
+ install: xca.1.gz xca.html
+ 	install -m 755 -d $(destdir)$(prefix)/share/xca \
+ 		$(destdir)$(prefix)/$(mandir)/man1
+@@ -21,10 +18,6 @@
+ 
+ clean:
+ 	$(RM) xca.1.gz
+-
+-app: xca.html
+-	mkdir -p $(APPDIR)/Resources
+-	install -m 644 xca*.html $(APPDIR)/Resources
+ 
+ include $(TOPDIR)/Local.mak
+ 
diff --git a/security/xca/files/patch-doc-xca.html b/security/xca/files/patch-doc-xca.html
new file mode 100644
index 000000000000..d65457bffd0e
--- /dev/null
+++ b/security/xca/files/patch-doc-xca.html
@@ -0,0 +1,5 @@
+--- doc/xca.html	Tue Jun  5 22:44:01 2007
++++ doc/xca.html	Tue Jun  5 22:44:35 2007
+@@ -0,0 +1,2 @@
++The documentation for XCA can be viewed online at:
++http://xca.sourceforge.net/
diff --git a/security/xca/pkg-plist b/security/xca/pkg-plist
index 85c2ff7d9332..c83943323e6e 100644
--- a/security/xca/pkg-plist
+++ b/security/xca/pkg-plist
@@ -1,39 +1,15 @@
 @comment $FreeBSD$
 bin/xca
-share/applications/xca.desktop
-share/pixmaps/xca.xpm
+share/xca/CA.xca
+share/xca/HTTPS_client.xca
+share/xca/HTTPS_server.xca
 share/xca/aia.txt
-share/xca/bigcert.png
-share/xca/bigcrl.png
-share/xca/bigcsr.png
-share/xca/bigkey.png
-share/xca/bigtemp.png
-share/xca/crl.png
 share/xca/dn.txt
 share/xca/eku.txt
-share/xca/halfkey.png
-share/xca/invalidcert.png
-share/xca/invalidcertkey.png
-share/xca/key.png
-share/xca/netscape.png
 share/xca/oids.txt
-share/xca/req.png
-share/xca/reqkey.png
-share/xca/revoked.png
-share/xca/spki.png
-share/xca/template.png
-share/xca/validcert.png
-share/xca/validcertkey.png
-share/xca/xca-1.html
-share/xca/xca-10.html
-share/xca/xca-2.html
-share/xca/xca-3.html
-share/xca/xca-4.html
-share/xca/xca-5.html
-share/xca/xca-6.html
-share/xca/xca-7.html
-share/xca/xca-8.html
-share/xca/xca-9.html
+share/xca/xca_de.qm
+share/xca/xca_es.qm
 share/xca/xca.html
+share/applications/xca.desktop
 @dirrm share/xca
 @dirrmtry share/applications