From mad@micro.madpilot.net  Tue Nov  5 22:54:17 2013
Return-Path: <mad@micro.madpilot.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 64F44A20
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Nov 2013 22:54:17 +0000 (UTC)
	(envelope-from mad@micro.madpilot.net)
Received: from micro.madpilot.net (micro.madpilot.net [88.149.173.206])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E51B2D86
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Nov 2013 22:54:16 +0000 (UTC)
Received: from micro.madpilot.net (localhost [127.0.0.1])
	by micro.madpilot.net (Postfix) with ESMTP id 3dDmFM2mFfzHc;
	Tue,  5 Nov 2013 23:46:15 +0100 (CET)
Received: from micro.madpilot.net ([127.0.0.1])
	by micro.madpilot.net (micro.madpilot.net [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id oLNt9pHpbUPu; Tue,  5 Nov 2013 23:46:11 +0100 (CET)
Received: by micro.madpilot.net (Postfix, from userid 1000)
	id 3dDmFH6T02zHb; Tue,  5 Nov 2013 23:46:11 +0100 (CET)
Message-Id: <3dDmFH6T02zHb@micro.madpilot.net>
Date: Tue,  5 Nov 2013 23:46:11 +0100 (CET)
From: Guido Falsi <madpilot@FreeBSD.org>
Reply-To: Guido Falsi <madpilot@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: freebsd@nagilum.org
Subject: [PATCH] security/xca: Fix build on 10 and head
X-Send-Pr-Version: 3.114
X-GNATS-Notify: freebsd@nagilum.org

>Number:         183702
>Category:       ports
>Synopsis:       [PATCH] security/xca: Fix build on 10 and head
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 05 23:00:00 UTC 2013
>Closed-Date:    Wed Nov 06 18:11:31 UTC 2013
>Last-Modified:  Wed Nov  6 18:20:00 UTC 2013
>Originator:     Guido Falsi
>Release:        FreeBSD 9.2-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 9.2-STABLE FreeBSD 9.2-STABLE #22 r255995: Wed Oct 2 22:15:55 CEST 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64

>Description:

- 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

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
--- Makefile	(revision 332835)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xca
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -15,17 +15,20 @@
 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>
 
-NO_STAGE=	yes
+.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} -L${QT_LIBDIR} -L${LOCALBASE}/lib" >> ${WRKSRC}/Local.mak
-	@echo "LIBS= -lQtGui ${PTHREAD_LIBS} -lcrypto -lltdl" >> ${WRKSRC}/Local.mak
+	@echo "LIBS= -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
@@ -48,4 +51,4 @@
 post-configure:
 	${REINPLACE_CMD} -e 's/-lQtGui/-lQtCore -lQtGui/' ${WRKSRC}/Local.mak
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 332835)
+++ pkg-descr	(working copy)
@@ -6,4 +6,4 @@
 A tree view of certificates is presented.
 
 Author:	Christian Hohnstaedt <christian@hohnstaedt.de>
-WWW:	http://www.hohnstaedt.de/xca.html
+WWW: http://www.hohnstaedt.de/xca.html
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 332835)
+++ pkg-plist	(working copy)
@@ -14,6 +14,7 @@
 %%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 @@
 @dirrm %%DOCSDIR%%
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Nov 5 23:00:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: freebsd@nagilum.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/183702: [PATCH] security/xca: Fix build on 10 and head
Date: Tue, 5 Nov 2013 23:00:08 UT

 Maintainer of security/xca,
 
 Please note that PR ports/183702 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183702
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Tue Nov 5 23:13:12 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

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

From: FreeBSD@nagilum.org
To: madpilot@freebsd.org
Cc: freebsd-ports-bugs@freebsd.org, bug-followup@freebsd.org
Subject: Re: ports/183702: [PATCH] security/xca: Fix build on 10 and head
Date: Wed, 06 Nov 2013 00:41:59 +0100

 This message is in MIME format.
 
 --=_gBt7RX3OyoE2gSRE3rPjHQ1
 Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes
 Content-Disposition: inline
 
 Slightly modified patch that further simplifies the Makefile.
 I'll trust the original patch does indeed fix the link error as it  
 just works for me. :>
 Thanks & kind regards.
 Alex.
 
 Zitat von madpilot@freebsd.org:
 
 > Synopsis: [PATCH] security/xca: Fix build on 10 and head
 >
 > Responsible-Changed-From-To: freebsd-ports-bugs->madpilot
 > Responsible-Changed-By: madpilot
 > Responsible-Changed-When: Tue Nov 5 23:13:12 UTC 2013
 > Responsible-Changed-Why:
 > I'll take it.
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=183702
 
 
 
 --=_gBt7RX3OyoE2gSRE3rPjHQ1
 Content-Type: text/x-diff; name=patch.txt; charset=us-ascii
 Content-Disposition: attachment; size=2606; filename=patch.txt
 
 diff -Naur xca.orig/Makefile xca/Makefile
 --- xca.orig/Makefile	2013-11-06 00:27:36.000000000 +0100
 +++ xca/Makefile	2013-11-06 00:29:51.000000000 +0100
 @@ -3,7 +3,7 @@
  
  PORTNAME=	xca
  PORTVERSION=	0.9.3
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	security
  MASTER_SITES=	SF
  
 @@ -15,17 +15,20 @@
  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= -lQtGui -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 @@
  	@${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>
 diff -Naur xca.orig/pkg-descr xca/pkg-descr
 --- xca.orig/pkg-descr	2013-11-06 00:27:36.000000000 +0100
 +++ xca/pkg-descr	2013-11-06 00:29:16.000000000 +0100
 @@ -6,4 +6,4 @@
  A tree view of certificates is presented.
  
  Author:	Christian Hohnstaedt <christian@hohnstaedt.de>
 -WWW:	http://www.hohnstaedt.de/xca.html
 +WWW: http://www.hohnstaedt.de/xca.html
 diff -Naur xca.orig/pkg-plist xca/pkg-plist
 --- xca.orig/pkg-plist	2013-11-06 00:27:36.000000000 +0100
 +++ xca/pkg-plist	2013-11-06 00:29:16.000000000 +0100
 @@ -14,6 +14,7 @@
  %%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 @@
  @dirrm %%DOCSDIR%%
  @dirrmtry share/mime/packages
  @dirrmtry share/mime
 -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
 -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
 
 --=_gBt7RX3OyoE2gSRE3rPjHQ1--
State-Changed-From-To: feedback->closed 
State-Changed-By: madpilot 
State-Changed-When: Wed Nov 6 18:11:30 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183702: commit references a PR
Date: Wed,  6 Nov 2013 18:11:24 +0000 (UTC)

 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@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@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
 -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
 -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
