Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Nov 2011 15:54:24 +0100 (CET)
From:      freebsd@nagilum.org
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        curly@e-card.bg
Subject:   ports/162788: port security/xca update from 0.9 to 0.91
Message-ID:  <20111123145424.57261679EC@cakebox.homeunix.net>
Resent-Message-ID: <201111231500.pANF0OUu006492@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         162788
>Category:       ports
>Synopsis:       port security/xca update from 0.9 to 0.91
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 23 15:00:23 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Nagilum
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD cakebox.tis 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Nov 19 05:28:47 CET 2011 root@cakebox.tis:/usr/obj/export/src/sys/net5501 i386


	apply attached patch to update security/xca to v0.91
>Description:
>How-To-Repeat:
>Fix:

	apply this patch:

--- xca.patch begins here ---
diff -Naur xca.old/Makefile xca/Makefile
--- xca.old/Makefile	2010-12-05 09:48:30.000000000 +0100
+++ xca/Makefile	2011-11-23 13:26:08.000000000 +0100
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	xca
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	freebsd@nagilum.org
 COMMENT=	Graphical certification authority
 
+LICENSE=	BSD
+
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
 USE_GMAKE=	yes
@@ -26,8 +28,6 @@
 MAN1=		xca.1
 MANCOMPRESSED=	yes
 
-LICENSE=	BSD
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
@@ -54,6 +54,8 @@
 	@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
 
 post-install:
diff -Naur xca.old/distinfo xca/distinfo
--- xca.old/distinfo	2011-07-03 18:34:16.000000000 +0200
+++ xca/distinfo	2011-11-23 11:02:48.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (xca-0.9.0.tar.gz) = 6f0c9a23281752b47a2bf8ee5e56486a5eec948462bb2f3528c3a1379975432d
-SIZE (xca-0.9.0.tar.gz) = 688445
+SHA256 (xca-0.9.1.tar.gz) = e5562d9af4e03e5e730a85a9ca4eb80386288f18f84de24bb9ff0dfcc7110cbc
+SIZE (xca-0.9.1.tar.gz) = 754570
diff -Naur xca.old/files/patch-doc-Makefile xca/files/patch-doc-Makefile
--- xca.old/files/patch-doc-Makefile	2010-09-02 08:03:07.000000000 +0200
+++ xca/files/patch-doc-Makefile	2011-11-23 11:08:50.000000000 +0100
@@ -1,6 +1,6 @@
---- doc/Makefile.orig	2010-08-29 10:28:32.000000000 +0200
-+++ doc/Makefile	2010-08-30 20:52:58.000000000 +0200
-@@ -4,7 +4,7 @@
+--- doc/Makefile.orig	2011-11-23 11:05:17.000000000 +0100
++++ doc/Makefile	2011-11-23 11:07:53.000000000 +0100
+@@ -5,7 +5,7 @@
  
  DELFILES=xca*.html xca.1.gz
  
@@ -9,17 +9,18 @@
  include $(TOPDIR)/Rules.mak
  
  mandir=man
-@@ -14,8 +14,7 @@
- 
+@@ -16,9 +16,7 @@
  xca.html: xca.sgml
  	rm -f xca*.html
--	echo '<h1>No documentation generated</h1>' > $@
--	$(LINUXDOC) -B html $<
+ 	echo '<h1>No documentation generated</h1>' > $@
+-	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) \
-@@ -23,8 +22,4 @@
+@@ -26,8 +24,4 @@
  	install -m 644 xca*.html $(destdir)$(docdir)
  	install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
  
diff -Naur xca.old/files/patch-img-Makefile xca/files/patch-img-Makefile
--- xca.old/files/patch-img-Makefile	2010-09-02 08:03:07.000000000 +0200
+++ xca/files/patch-img-Makefile	2011-11-23 11:18:01.000000000 +0100
@@ -1,11 +1,11 @@
---- img/Makefile.orig	2010-08-29 10:28:32.000000000 +0200
-+++ img/Makefile	2010-08-30 20:57:04.000000000 +0200
-@@ -15,7 +15,7 @@
- 	echo $(OBJS)
+--- 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 @@
+ sinclude .depend
  
- install:
--	install -D -m 644 xca-32x32.xpm $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
-+	install -d -m 755 $(destdir)$(prefix)/share/pixmaps && install -m 644 xca-32x32.xpm $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
+ 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
- 	$(RCC) -o $@ $<
+ 	@$(PRINT) "  RCC    [$(BASENAME)] $@"
--- xca.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111123145424.57261679EC>