From mark@foster.cc  Wed Jun  6 06:39:27 2007
Return-Path: <mark@foster.cc>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 55FCA16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jun 2007 06:39:27 +0000 (UTC)
	(envelope-from mark@foster.cc)
Received: from sccrmhc14.comcast.net (sccrmhc14.comcast.net [63.240.77.84])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D81E13C483
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jun 2007 06:39:27 +0000 (UTC)
	(envelope-from mark@foster.cc)
Received: from fosgate.dyndns.org ([71.227.137.90])
          by comcast.net (sccrmhc14) with ESMTP
          id <2007060606392501400de2gee>; Wed, 6 Jun 2007 06:39:26 +0000
Received: from localhost (localhost [127.0.0.1])
	by fosgate.dyndns.org (Postfix) with ESMTP id 8444539836
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Jun 2007 23:37:39 -0700 (PDT)
Received: from fosgate.dyndns.org ([127.0.0.1])
	by localhost (sonar.foster.dmz [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id bdFpfLCMlCx6 for <FreeBSD-gnats-submit@freebsd.org>;
	Tue,  5 Jun 2007 23:37:34 -0700 (PDT)
Received: from [192.168.1.9] (monk.foster.dmz [192.168.1.9])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by fosgate.dyndns.org (Postfix) with ESMTP id F0F7F39835
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Jun 2007 23:37:33 -0700 (PDT)
Message-Id: <4666568F.9040605@foster.cc>
Date: Tue, 05 Jun 2007 23:39:11 -0700
From: "Mark D. Foster" <mark@foster.cc>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: security/xca to version 0.6.3

>Number:         113401
>Category:       ports
>Synopsis:       Update port: security/xca to version 0.6.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 06 06:40:01 GMT 2007
>Closed-Date:    Mon Jul 23 13:54:23 GMT 2007
>Last-Modified:  Mon Jul 23 14:00:04 GMT 2007
>Originator:     Mark Foster <mark@foster.cc>
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
Credentia
>Environment:
System: FreeBSD fred.dyn.portseattle.org 6.2-RELEASE FreeBSD 6.2-RELEASE
#0: Fri Jan 12 10:40:27 UTC 2007
root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	The patch shown below updates security/xca to version 0.6.3
	Note that 3 new patch files appear in files/
	patch-doc-Makefile      patch-doc-xca.html      patch-local.h
	The change also grants maintainership to myself, as former maintainer
	has not responded to ports/109045  for months. This update obviates the
	need to fix ports/109045.

>How-To-Repeat:
	n/a	
>Fix:

--- xca.patch begins here ---
diff -Pru ./Makefile ../xca/Makefile
--- ./Makefile	Wed May 30 13:30:09 2007
+++ ../xca/Makefile	Tue Jun  5 23:12:48 2007
@@ -6,43 +6,45 @@
 #

 PORTNAME=	xca
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6.3
 PORTREVISION=	1
 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++

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} >= 700019
-BROKEN=		Does not compile on FreeBSD >= 7.0
-.endif
+#.if ${OSVERSION} >= 700019
+#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
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/import.cpp

 MAN1=	xca.1
+MANCOMPRESSED=	yes

 .include <bsd.port.post.mk>
diff -Pru ./distinfo ../xca/distinfo
--- ./distinfo	Mon Jan 23 17:03:32 2006
+++ ../xca/distinfo	Mon Jun  4 11:54:56 2007
@@ -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 -Pru ./files/patch-doc-Makefile ../xca/files/patch-doc-Makefile
--- ./files/patch-doc-Makefile	Wed Dec 31 16:00:00 1969
+++ ../xca/files/patch-doc-Makefile	Tue Jun  5 22:54:23 2007
@@ -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 -Pru ./files/patch-doc-xca.html ../xca/files/patch-doc-xca.html
--- ./files/patch-doc-xca.html	Wed Dec 31 16:00:00 1969
+++ ../xca/files/patch-doc-xca.html	Tue Jun  5 23:02:20 2007
@@ -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 -Pru ./files/patch-local.h ../xca/files/patch-local.h
--- ./files/patch-local.h	Wed Dec 31 16:00:00 1969
+++ ../xca/files/patch-local.h	Tue Jun  5 12:14:48 2007
@@ -0,0 +1,6 @@
+--- local.h	Tue Jun  5 12:05:47 2007
++++ local.h	Tue Jun  5 07:40:06 2007
+@@ -0,0 +1,3 @@
++#define PREFIX "/usr/local"
++#define ETC "/usr/local/etc/xca"
++#define VER "0.6.3"
diff -Pru ./pkg-plist ../xca/pkg-plist
--- ./pkg-plist	Wed May 30 13:30:09 2007
+++ ../xca/pkg-plist	Tue Jun  5 23:19:30 2007
@@ -1,39 +1,14 @@
 @comment $FreeBSD: ports/security/xca/pkg-plist,v 1.6 2007/05/19
20:22:56 flz Exp $
 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
--- xca.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Jun 6 06:40:08 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113401 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Sat Jun 9 04:00:02 UTC 2007 
State-Changed-Why:  
With portmgr hat, approve the transfer of maintainership due to 
maintainer-timeout (see ports/109045). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113401 
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sat Jun 9 13:12:57 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113401 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Sat Jun 9 16:04:13 UTC 2007 
State-Changed-Why:  
Hi Mark, 

patch is rejected. 

[18:12][miwi@miwi] $ patch < pr-patch 
(~/dev/ports/security/xca) Hmm...  Looks like a unified diff to me... 
The text leading up to this was: -------------------------- | |--- 
xca.patch begins here --- |diff -Pru ./Makefile ../xca/Makefile |--- 
./Makefile Wed May 30 13:30:09 2007 |+++ ../xca/Makefile    Tue Jun  5 
23:12:48 2007 -------------------------- Patching file ./Makefile using 
Plan A...  patch: **** malformed patch at line 45: ${PTHREAD_LIBS}" >> 
${WRKSRC}/Local.mak [18:12][miwi@miwi] $ 
(~/dev/ports/security/xca) 


Can you please fix this. 

Thanks 


http://www.freebsd.org/cgi/query-pr.cgi?pr=113401 

From: "Mark D. Foster" <mark@foster.cc>
To: Martin Wilke <miwi@FreeBSD.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/113401: Update port: security/xca to version 0.6.3
Date: Sun, 10 Jun 2007 08:49:48 -0700

 This is a multi-part message in MIME format.
 --------------060709040202020307060103
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Martin Wilke wrote:
 > patch is rejected.
 >
 > Can you please fix this.
 >   
 
 Please try attached, it seems to work better.
 
 -- 
 Said one park ranger, 'There is considerable overlap between the 
  intelligence of the smartest bears and the dumbest tourists.'
 Mark D. Foster, CISSP <mark@foster.cc>  http://mark.foster.cc/
 
 
 --------------060709040202020307060103
 Content-Type: text/x-patch;
  name="xca-0.6.3_1.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="xca-0.6.3_1.patch"
 
 diff -Pru ../xca.old-clean/Makefile ./Makefile
 --- ../xca.old-clean/Makefile	Sat May 19 13:22:56 2007
 +++ ./Makefile	Tue Jun  5 23:12:48 2007
 @@ -6,43 +6,45 @@
  #
  
  PORTNAME=	xca
 -PORTVERSION=	0.5.1
 +PORTVERSION=	0.6.3
  PORTREVISION=	1
  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++
  
  .include <bsd.port.pre.mk>
  
 -.if ${OSVERSION} >= 700019
 -BROKEN=		Does not compile on FreeBSD >= 7.0
 -.endif
 +#.if ${OSVERSION} >= 700019
 +#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
 +	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/import.cpp
  
  MAN1=	xca.1
 +MANCOMPRESSED=	yes
  
  .include <bsd.port.post.mk>
 diff -Pru ../xca.old-clean/distinfo ./distinfo
 --- ../xca.old-clean/distinfo	Mon Jan 23 17:03:32 2006
 +++ ./distinfo	Mon Jun  4 11:54:56 2007
 @@ -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 -Pru ../xca.old-clean/files/patch-doc-Makefile ./files/patch-doc-Makefile
 --- ../xca.old-clean/files/patch-doc-Makefile	Wed Dec 31 16:00:00 1969
 +++ ./files/patch-doc-Makefile	Tue Jun  5 22:54:23 2007
 @@ -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 -Pru ../xca.old-clean/files/patch-doc-xca.html ./files/patch-doc-xca.html
 --- ../xca.old-clean/files/patch-doc-xca.html	Wed Dec 31 16:00:00 1969
 +++ ./files/patch-doc-xca.html	Tue Jun  5 23:02:20 2007
 @@ -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 -Pru ../xca.old-clean/files/patch-local.h ./files/patch-local.h
 --- ../xca.old-clean/files/patch-local.h	Wed Dec 31 16:00:00 1969
 +++ ./files/patch-local.h	Tue Jun  5 12:14:48 2007
 @@ -0,0 +1,6 @@
 +--- local.h	Tue Jun  5 12:05:47 2007
 ++++ local.h	Tue Jun  5 07:40:06 2007
 +@@ -0,0 +1,3 @@
 ++#define PREFIX "/usr/local"
 ++#define ETC "/usr/local/etc/xca"
 ++#define VER "0.6.3"
 diff -Pru ../xca.old-clean/pkg-plist ./pkg-plist
 --- ../xca.old-clean/pkg-plist	Sat May 19 13:22:56 2007
 +++ ./pkg-plist	Tue Jun  5 23:19:30 2007
 @@ -1,39 +1,14 @@
  @comment $FreeBSD: ports/security/xca/pkg-plist,v 1.6 2007/05/19 20:22:56 flz Exp $
  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
 
 --------------060709040202020307060103--

From: Mark Foster <mark@foster.cc>
To: Martin Wilke <miwi@FreeBSD.org>
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: ports/113401: Update port: security/xca to version 0.6.3
Date: Tue, 12 Jun 2007 15:52:53 -0700

 This is a multi-part message in MIME format.
 --------------010807060101090007090600
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 This new patch (attached as xca.patch_3) should take care of the two
 problems you identified.
 
 -- 
 Said one park ranger, 'There is considerable overlap between the
  intelligence of the smartest bears and the dumbest tourists.'
 Mark D. Foster, CISSP <mark@foster.cc>  http://mark.foster.cc/
 
 
 --------------010807060101090007090600
 Content-Type: text/plain;
  name="xca.patch_3"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="xca.patch_3"
 
 diff -ruN ../xca.orig/Makefile ./Makefile
 --- ../xca.orig/Makefile	Sat May 19 20:22:56 2007
 +++ ./Makefile	Sun Jun  3 23:24:26 2007
 @@ -6,43 +6,41 @@
  #
  
  PORTNAME=	xca
 -PORTVERSION=	0.5.1
 +PORTVERSION=	0.6.3
  PORTREVISION=	1
  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++
  
  .include <bsd.port.pre.mk>
  
 -.if ${OSVERSION} >= 700019
 -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 -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
 +	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/import.cpp
  
  MAN1=	xca.1
 +MANCOMPRESSED=	yes
  
  .include <bsd.port.post.mk>
 diff -ruN ../xca.orig/distinfo ./distinfo
 --- ../xca.orig/distinfo	Tue Jan 24 01:03:32 2006
 +++ ./distinfo	Sun Jun  3 20:15:08 2007
 @@ -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 -ruN ../xca.orig/files/patch-doc-Makefile ./files/patch-doc-Makefile
 --- ../xca.orig/files/patch-doc-Makefile	Thu Jan  1 00:00:00 1970
 +++ ./files/patch-doc-Makefile	Sun Jun  3 20:15:08 2007
 @@ -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 -ruN ../xca.orig/files/patch-doc-xca.html ./files/patch-doc-xca.html
 --- ../xca.orig/files/patch-doc-xca.html	Thu Jan  1 00:00:00 1970
 +++ ./files/patch-doc-xca.html	Sun Jun  3 20:15:08 2007
 @@ -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 -ruN ../xca.orig/files/patch-local.h ./files/patch-local.h
 --- ../xca.orig/files/patch-local.h	Thu Jan  1 00:00:00 1970
 +++ ./files/patch-local.h	Sun Jun  3 20:15:08 2007
 @@ -0,0 +1,6 @@
 +--- local.h	Tue Jun  5 12:05:47 2007
 ++++ local.h	Tue Jun  5 07:40:06 2007
 +@@ -0,0 +1,3 @@
 ++#define PREFIX "/usr/local"
 ++#define ETC "/usr/local/etc/xca"
 ++#define VER "0.6.3"
 diff -ruN ../xca.orig/pkg-plist ./pkg-plist
 --- ../xca.orig/pkg-plist	Sat May 19 20:22:56 2007
 +++ ./pkg-plist	Sun Jun  3 21:48:17 2007
 @@ -1,39 +1,15 @@
  @comment $FreeBSD: ports/security/xca/pkg-plist,v 1.6 2007/05/19 20:22:56 flz Exp $
  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
 
 --------------010807060101090007090600--
Responsible-Changed-From-To: miwi->freebsd-ports-bugs 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Jun 14 15:14:49 UTC 2007 
Responsible-Changed-Why:  
Back to pool. 

Notes for other commiter: you can find the last patch from mark here. 

http://people.freebsd.org/~miwi/patches/xca.patch_4 

Thanks. 



http://www.freebsd.org/cgi/query-pr.cgi?pr=113401 

From: Mark Foster <mark@foster.cc>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113401: Update port: security/xca to version 0.6.3
Date: Tue, 03 Jul 2007 10:33:46 -0700

 Could some other committer please pick this up?
 Thanks.
 
 -- 
 Said one park ranger, 'There is considerable overlap between the 
  intelligence of the smartest bears and the dumbest tourists.'
 Mark D. Foster, CISSP <mark@foster.cc>  http://mark.foster.cc/
 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Mon Jul 23 13:52:16 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113401 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113401: commit references a PR
Date: Mon, 23 Jul 2007 13:54:12 +0000 (UTC)

 pav         2007-07-23 13:54:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/xca         Makefile distinfo pkg-plist 
   Added files:
     security/xca/files   patch-doc-Makefile patch-doc-xca.html 
   Log:
   - Update to 0.6.3
   - Transfer maintainership
   
   PR:             ports/113401
   Submitted by:   Mark D. Foster <mark@foster.cc>
   Approved by:    maintainership change - linimon (portmgr)
   
   Revision  Changes    Path
   1.10      +20 -16    ports/security/xca/Makefile
   1.5       +3 -3      ports/security/xca/distinfo
   1.1       +29 -0     ports/security/xca/files/patch-doc-Makefile (new)
   1.1       +5 -0      ports/security/xca/files/patch-doc-xca.html (new)
   1.7       +7 -31     ports/security/xca/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
