- Update to 0.91

PR:		162788
Submitted by:	maintainer
Feature safe:	yes

5 files changed, 26 insertions, 21 deletions

diff --git a/security/xca/Makefile b/security/xca/Makefile
index a762ebfa146f..5df1900e6edb 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -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 @@ CXX?=		g++
 MAN1=		xca.1
 MANCOMPRESSED=	yes
 
-LICENSE=	BSD
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
@@ -54,6 +54,8 @@ post-patch:
 	@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 --git a/security/xca/distinfo b/security/xca/distinfo
index 8eb7422efd71..e2794abaf5b7 100644
--- a/security/xca/distinfo
+++ b/security/xca/distinfo
@@ -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 --git a/security/xca/files/patch-doc-Makefile b/security/xca/files/patch-doc-Makefile
index 7a1277b3e28e..7af154a8281b 100644
--- a/security/xca/files/patch-doc-Makefile
+++ b/security/xca/files/patch-doc-Makefile
@@ -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 --git a/security/xca/files/patch-img-Makefile b/security/xca/files/patch-img-Makefile
index 7bfdb16583f7..3350de844e52 100644
--- a/security/xca/files/patch-img-Makefile
+++ b/security/xca/files/patch-img-Makefile
@@ -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)] $@"
diff --git a/security/xca/pkg-plist b/security/xca/pkg-plist
index c1cf78e9d5d0..69c7b771eae7 100644
--- a/security/xca/pkg-plist
+++ b/security/xca/pkg-plist
@@ -9,7 +9,9 @@ bin/xca
 %%DATADIR%%/oids.txt
 %%DATADIR%%/xca_de.qm
 %%DATADIR%%/xca_es.qm
+%%DATADIR%%/xca_fr.qm
 %%DATADIR%%/xca_ru.qm
+%%DATADIR%%/xca_tr.qm
 %%DOCSDIR%%/xca.html
 share/applications/xca.desktop
 share/mime/packages/xca.xml