[pkgsrc/trunk]: pkgsrc/security/AiCA - Honor PKG_SYSCONFDIR.

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f9187048482
branches:  trunk
changeset: 484820:5f9187048482
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Nov 30 05:58:04 2004 +0000

description:
- Honor PKG_SYSCONFDIR.
- move store directory to under PKG_SYSCONFDIR.
- add missing fix to top level configure.

diffstat:

 security/AiCA/Makefile         |  25 ++++++++++--------
 security/AiCA/distinfo         |  15 ++++++-----
 security/AiCA/patches/patch-aa |  19 +++++++++++---
 security/AiCA/patches/patch-ab |  19 +++++++++++---
 security/AiCA/patches/patch-ac |   4 +-
 security/AiCA/patches/patch-ad |  26 +++++++++++++++---
 security/AiCA/patches/patch-ae |   4 +-
 security/AiCA/patches/patch-af |   4 +-
 security/AiCA/patches/patch-ag |  56 ++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 135 insertions(+), 37 deletions(-)

diffs (279 lines):

diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/Makefile
--- a/security/AiCA/Makefile    Tue Nov 30 03:43:16 2004 +0000
+++ b/security/AiCA/Makefile    Tue Nov 30 05:58:04 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/11/29 17:24:49 taca Exp $
+# $NetBSD: Makefile,v 1.8 2004/11/30 05:58:04 taca Exp $
 #
 
 DISTNAME=      AiCA-0.81
@@ -15,18 +15,21 @@
 GNU_CONFIGURE=         yes
 WRKSRC=                        ${WRKDIR}/AiCA
 
-CONFDIR=       ${PREFIX}/etc/AiCA
-DOCDIR=                ${PREFIX}/share/doc/AiCA
-EXAMPLESDIR=   ${PREFIX}/share/examples/AiCA
+PKG_SYSCONFSUBDIR?=    AiCA
+CONF_FILES+=           ${EXAMPLESDIR}/aica.cnf ${PKG_SYSCONFDIR}/aica.cnf
+OWN_DIRS+=             ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/store
 
-CONF_FILES+=   ${EXAMPLESDIR}/aica.cnf ${CONFDIR}/aica.cnf
-OWN_DIRS+=     ${CONFDIR}/store ${MAKE_DIRS}
+DOCDIR=                        ${PREFIX}/share/doc/AiCA
+EXAMPLESDIR=           ${PREFIX}/share/examples/AiCA
+COMMANDS=              aica/aica bin/aistore bin/asn1view bin/certconv \
+                       bin/certreq bin/certvfy bin/certview
+LIBRARIES=             libaica.a libaicrypto.a libaissl.a
+DOCS=                  COPYRIGHT README README.j
+EXAMPLES=              lib/aica.cnf sample.csv
 
-COMMANDS=      aica/aica bin/aistore bin/asn1view bin/certconv \
-               bin/certreq bin/certvfy bin/certview
-LIBRARIES=     libaica.a libaicrypto.a libaissl.a
-DOCS=          COPYRIGHT README README.j
-EXAMPLES=      lib/aica.cnf sample.csv
+pre-configure:
+       cd ${WRKSRC}; \
+               ${CP} README README.in; ${CP} README.j README.j.in
 
 do-install:
 .for f in ${LIBRARIES}
diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/distinfo
--- a/security/AiCA/distinfo    Tue Nov 30 03:43:16 2004 +0000
+++ b/security/AiCA/distinfo    Tue Nov 30 05:58:04 2004 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.3 2004/11/29 17:24:49 taca Exp $
+$NetBSD: distinfo,v 1.4 2004/11/30 05:58:04 taca Exp $
 
 SHA1 (AiCA-0.81.tar.gz) = aa74edda60b29f21cca17ff6b09b07509705db18
 Size (AiCA-0.81.tar.gz) = 703433 bytes
-SHA1 (patch-aa) = e05d26c1a8248ac757e5f98da2fcc643629bc440
-SHA1 (patch-ab) = 0a94ee9e5c434c34980f6f8798e689c647bc9cd5
-SHA1 (patch-ac) = 5b9d8ca4ceeb1319e72bc46b0b31e43def1bb9b1
-SHA1 (patch-ad) = 05985ad03ae87440ee45490d02e2d1ad3cde9be4
-SHA1 (patch-ae) = 0dde826a366e8dbaf664d83e517e6c4d9b7a9e77
-SHA1 (patch-af) = 36ce280f9c19f5fadd9675acfbd826a4fdfbb2f5
+SHA1 (patch-aa) = 45878a0aa80b3201c4e3e7c4d1fc593412745855
+SHA1 (patch-ab) = 524c4f8ca5daaea0c28d113ddf94fac52c2deeac
+SHA1 (patch-ac) = efff74bf4bc97c427b8a975d9cc81db721504cbe
+SHA1 (patch-ad) = e8a83263d262a7587876c2f972a79f0666df85f9
+SHA1 (patch-ae) = 514aa2677078acdfb0105ebfe2ea3b45dac9ecc7
+SHA1 (patch-af) = 698fa9e68a9c90d1bedc4320e554a324b76e5bc8
+SHA1 (patch-ag) = 4f557ebd4b82d1e99ae02eff57987e2c53d00e13
diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/patches/patch-aa
--- a/security/AiCA/patches/patch-aa    Tue Nov 30 03:43:16 2004 +0000
+++ b/security/AiCA/patches/patch-aa    Tue Nov 30 05:58:04 2004 +0000
@@ -1,13 +1,24 @@
-$NetBSD: patch-aa,v 1.1 2004/11/29 17:24:49 taca Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/30 05:58:04 taca Exp $
 
 --- README.j.orig      2002-11-04 23:21:08.000000000 +0900
 +++ README.j
-@@ -96,7 +96,7 @@
+@@ -96,8 +96,8 @@
      ȯ¹Ô¤µ¤ì¤¿¾ÚÌÀ½ñ¤ò¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¤Ë¡¢¼«Ê¬¤Ç¥³¥Ô¡¼¤ò¤·¤Æ²¼¤µ¤¤¡£
  
    2.3 aica.cnf¤ÎÀßÄê
 -    AiCA¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢¤½¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë lib¥Ç¥£¥ì¥¯¥È¥ê
-+    AiCA¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢PREFIX/etc¥Ç¥£¥ì¥¯¥È¥ê¤ËAiCA¥Ç¥£¥ì¥¯¥È¥ê
-     ¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£¤³¤ÎÃæ¤Ë¡¢AiCA¤ÎÆ°ºîÀßÄê¤ò¤¹¤ë aica.cnf ¤¬¤¢¤ê¤Þ¤¹¡£
+-    ¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£¤³¤ÎÃæ¤Ë¡¢AiCA¤ÎÆ°ºîÀßÄê¤ò¤¹¤ë aica.cnf ¤¬¤¢¤ê¤Þ¤¹¡£
++    AiCA¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢/usr/pkg/etc/AiCA¥Ç¥£¥ì¥¯¥È¥ê¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
++    ¤³¤ÎÃæ¤Ë¡¢AiCA¤ÎÆ°ºîÀßÄê¤ò¤¹¤ë aica.cnf ¤¬¤¢¤ê¤Þ¤¹¡£
  
    2.3.1 default CA¤ÎÀßÄê
+     ¤³¤³¤ÇÄ̾ï»È¤¦CA¤òÀßÄꤷ¤Þ¤¹¡£
+@@ -126,7 +126,7 @@
+   2.3.3 general info¤ÎÀßÄê
+     ¾ÚÌÀ½ñ¤ÎÊݸ¤ä¸¡¾Ú¤Ë»ÈÍѤ¹¤ë¾ÚÌÀ½ñ¥¹¥È¥¢¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÀßÄꤷ¤Þ¤¹¡£
+         [general info]
+-        store_dir =(¥¤¥ó¥¹¥È¡¼¥ëÀè)/store
++        store_dir =/usr/pkg/etc/AiCA/store
+     ½é´ü¤ÎÀßÄê¤Ç¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î store ¥Ç¥£¥ì¥¯¥È¥ê¤Ë
+     ¾ÚÌÀ½ñ¥¹¥È¥¢¤Î¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤Þ¤¹¡£ÆäËÊѹ¹¤¹¤ëɬÍפ¬¤Ê¤±¤ì¤Ð¡¢
+     ¤³¤Î¤Þ¤Þ¤ÎÀßÄê¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/patches/patch-ab
--- a/security/AiCA/patches/patch-ab    Tue Nov 30 03:43:16 2004 +0000
+++ b/security/AiCA/patches/patch-ab    Tue Nov 30 05:58:04 2004 +0000
@@ -1,13 +1,24 @@
-$NetBSD: patch-ab,v 1.1 2004/11/29 17:24:49 taca Exp $
+$NetBSD: patch-ab,v 1.2 2004/11/30 05:58:04 taca Exp $
 
 --- README.orig        2002-11-04 23:21:08.000000000 +0900
 +++ README
-@@ -103,7 +103,7 @@
+@@ -103,8 +103,8 @@
      operations.
  
    2.3 Settings of aica.cnf
 -      After installation of the AiCA, "PREFIX/lib/aica.cnf" file will be
-+      After installation of the AiCA, "PREFIX/etc/AiCA/aica.cnf" file will be
-     created for command configuration. ("PREFIX" means install directory)
+-    created for command configuration. ("PREFIX" means install directory)
++      After installation of the AiCA, "/usr/pkg/etc/AiCA/aica.cnf" file will be
++    created for command configuration.
  
    2.3.1 Settings of "default CA"
+     Set the default CA.
+@@ -135,7 +135,7 @@
+       It is neccessary to define certificate store directory which is
+     containing certificates and CRLs for certificate verification.
+         [general info]
+-        store_dir =PREFIX/store
++        store_dir =/usr/pkg/etc/AiCA/store
+     By default setting, store_dir is 'install_directory/store' and this
+     directory contains several files of aica certificate store. Use default
+     setting if you do not have any special reason.
diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/patches/patch-ac
--- a/security/AiCA/patches/patch-ac    Tue Nov 30 03:43:16 2004 +0000
+++ b/security/AiCA/patches/patch-ac    Tue Nov 30 05:58:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2004/11/29 17:24:49 taca Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/30 05:58:04 taca Exp $
 
 --- aica/Makefile.in.orig      2002-11-04 23:21:09.000000000 +0900
 +++ aica/Makefile.in
@@ -7,7 +7,7 @@
  CC=   @CC@
  PREFIX=       @prefix@
 -CFLAGS=       -O2 -I../ -I../include -I../aicrypto/include -DAICONFIG=\"$(PREFIX)/lib/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
-+CFLAGS=       -O2 -I../ -I../include -I../aicrypto/include -DAICONFIG=\"$(PREFIX)/etc/AiCA/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
++CFLAGS=       -O2 -I../ -I../include -I../aicrypto/include -DAICONFIG=\"${PKG_SYSCONFDIR}/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
  
  
  OBJ=  aica.o aica_file.o aica_print.o aica_setext.o aica_pol.o \
diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/patches/patch-ad
--- a/security/AiCA/patches/patch-ad    Tue Nov 30 03:43:16 2004 +0000
+++ b/security/AiCA/patches/patch-ad    Tue Nov 30 05:58:04 2004 +0000
@@ -1,13 +1,29 @@
-$NetBSD: patch-ad,v 1.1 2004/11/29 17:24:49 taca Exp $
+$NetBSD: patch-ad,v 1.2 2004/11/30 05:58:04 taca Exp $
 
 --- aicrypto/configure.orig    2002-11-04 23:21:10.000000000 +0900
 +++ aicrypto/configure
-@@ -633,7 +633,7 @@ EOF
+@@ -642,6 +642,24 @@ EOF
  #define UC_LOCAL_JCODE 3
  EOF
   ;;
-- freebsd*)
-+ freebsd*|netbsd*|openbsd*)
++ netbsd*)
++      cat >> confdefs.h <<\EOF
++#define __BSD__ 1
++EOF
++
++      cat >> confdefs.h <<\EOF
++#define UC_LOCAL_JCODE 3
++EOF
++ ;;
++ openbsd*)
++      cat >> confdefs.h <<\EOF
++#define __BSD__ 1
++EOF
++
++      cat >> confdefs.h <<\EOF
++#define UC_LOCAL_JCODE 3
++EOF
++ ;;
+     bsdi*)
        cat >> confdefs.h <<\EOF
  #define __BSD__ 1
- EOF
diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/patches/patch-ae
--- a/security/AiCA/patches/patch-ae    Tue Nov 30 03:43:16 2004 +0000
+++ b/security/AiCA/patches/patch-ae    Tue Nov 30 05:58:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2004/11/29 17:24:49 taca Exp $
+$NetBSD: patch-ae,v 1.2 2004/11/30 05:58:04 taca Exp $
 
 --- apps/Makefile.in.orig      2002-11-04 23:21:38.000000000 +0900
 +++ apps/Makefile.in
@@ -7,7 +7,7 @@
  CC=   @CC@
  PREFIX=       @prefix@
 -CFLAGS=       -O2 -I../ -I../aicrypto/include -I../include -DAICONFIG=\"$(PREFIX)/lib/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
-+CFLAGS=       -O2 -I../ -I../aicrypto/include -I../include -DAICONFIG=\"$(PREFIX)/etc/AiCA/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
++CFLAGS=       -O2 -I../ -I../aicrypto/include -I../include -DAICONFIG=\"${PKG_SYSCONFDIR}/aica.cnf\" -DPREFIX=\"$(PREFIX)\"
  
  
  ASN1VW=       asn1view.o p12.o
diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/patches/patch-af
--- a/security/AiCA/patches/patch-af    Tue Nov 30 03:43:16 2004 +0000
+++ b/security/AiCA/patches/patch-af    Tue Nov 30 05:58:04 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2004/11/29 17:24:49 taca Exp $
+$NetBSD: patch-af,v 1.2 2004/11/30 05:58:04 taca Exp $
 
 --- lib/aica.cnf.in.orig       2002-11-04 23:21:40.000000000 +0900
 +++ lib/aica.cnf.in
@@ -7,7 +7,7 @@
  # default certificate store directory
  [general info]
 -store_dir =@prefix@/store
-+store_dir =@prefix@/etc/AiCA/store
++store_dir =@PKG_SYSCONFDIR@/store
  
  [general info end]
  
diff -r c291e3b4c747 -r 5f9187048482 security/AiCA/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/AiCA/patches/patch-ag    Tue Nov 30 05:58:04 2004 +0000
@@ -0,0 +1,56 @@
+$NetBSD: patch-ag,v 1.1 2004/11/30 05:58:04 taca Exp $
+
+--- configure.orig     2002-11-04 23:21:09.000000000 +0900
++++ configure
+@@ -659,6 +659,24 @@ EOF
+ #define UC_LOCAL_JCODE 3
+ EOF
+  ;;
++ netbsd*)
++      cat >> confdefs.h <<\EOF
++#define __BSD__ 1
++EOF
++
++      cat >> confdefs.h <<\EOF
++#define UC_LOCAL_JCODE 3
++EOF
++ ;;
++ openbsd*)
++      cat >> confdefs.h <<\EOF
++#define __BSD__ 1
++EOF
++
++      cat >> confdefs.h <<\EOF
++#define UC_LOCAL_JCODE 3
++EOF
++ ;;
+     bsdi*)
+       cat >> confdefs.h <<\EOF
+ #define __BSD__ 1
+@@ -1434,6 +1452,9 @@ else
+ fi
+ done
+ 
++if test -z "${PKG_SYSCONFDIR}"; then
++  PKG_SYSCONFDIR="`eval echo \`echo ${sysconfdir}\``/AiCA"
++fi
+ 
+ trap '' 1 2 15
+ cat > confcache <<\EOF
+@@ -1569,6 +1590,7 @@ s%@sbindir@%$sbindir%g
+ s%@libexecdir@%$libexecdir%g
+ s%@datadir@%$datadir%g
+ s%@sysconfdir@%$sysconfdir%g
++s%@PKG_SYSCONFDIR@%$PKG_SYSCONFDIR%g
+ s%@sharedstatedir@%$sharedstatedir%g
+ s%@localstatedir@%$localstatedir%g
+ s%@libdir@%$libdir%g
+@@ -1635,7 +1657,7 @@ aicrypto/lnm/Makefile aicrypto/pkcs/Make
+ aicrypto/asn1/Makefile aicrypto/x509/Makefile aicrypto/utf8/Makefile
+ aicrypto/tool/Makefile aicrypto/cmp/Makefile aicrypto/store/Makefile
+ aicrypto/smime/Makefile aicrypto/ssl/Makefile aicrypto/lib/Makefile
+-aicrypto/Makefile ca/Makefile apps/Makefile aica/Makefile lib/aica.cnf Makefile"}
++aicrypto/Makefile ca/Makefile apps/Makefile aica/Makefile lib/aica.cnf Makefile" README README.j}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then