summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/gnupg/Makefile15
-rw-r--r--security/gnupg/files/md54
-rw-r--r--security/gnupg/files/patch-sum7
-rw-r--r--security/gnupg/patches/patch-aa33
-rw-r--r--security/gnupg/patches/patch-ab38
-rw-r--r--security/gnupg/patches/patch-ac41
-rw-r--r--security/gnupg/pkg/PLIST5
7 files changed, 48 insertions, 95 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 25cee3b84f7..da6496ae81a 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,15 +1,20 @@
-# $NetBSD: Makefile,v 1.3 1999/04/09 09:39:20 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/12/02 15:50:43 frueauf Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
#
-DISTNAME= gnupg-0.9.5
+DISTNAME= gnupg-1.0.0
CATEGORIES= security
-MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/
+MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
MAINTAINER= packages@NetBSD.ORG
-HOMEPAGE= http://www.gnupg.org
+HOMEPAGE= http://www.gnupg.org/
+
+DEPENDS+= gettext-0.10.35:../../devel/gettext
+
+USE_GMAKE= yes
+
+GNU_CONFIGURE= yes
-GNU_CONFIGURE= yes
RESTRICTED= "Cryptographic software"
MIRROR_DISTFILE=no
diff --git a/security/gnupg/files/md5 b/security/gnupg/files/md5
index 833c80e1ac1..9cbf00ed4ed 100644
--- a/security/gnupg/files/md5
+++ b/security/gnupg/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1999/04/07 23:01:27 mellon Exp $
+$NetBSD: md5,v 1.2 1999/12/02 15:50:44 frueauf Exp $
-MD5 (gnupg-0.9.5.tar.gz) = 4dfbebbf3d1bcf18fbaa6446918432fe
+MD5 (gnupg-1.0.0.tar.gz) = bba45febd501acf8e19db402506dae94
diff --git a/security/gnupg/files/patch-sum b/security/gnupg/files/patch-sum
index 701bd4b65ba..6f45c9f58f1 100644
--- a/security/gnupg/files/patch-sum
+++ b/security/gnupg/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:02 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/12/02 15:50:44 frueauf Exp $
-MD5 (patch-aa) = 5a7d634db0c84e795f267e0763ca2c9e
-MD5 (patch-ab) = cf1a47350bbfb0af2338a4562107a691
-MD5 (patch-ac) = 6cef8ee78c6c7d81aba5d1dde857a59f
+MD5 (patch-ab) = 993d9c05ddd4afa998b7e075db776387
+MD5 (patch-ac) = 684e4698719a3032afe6330d90d7e568
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
deleted file mode 100644
index 4a40052199a..00000000000
--- a/security/gnupg/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/04/08 15:17:27 mellon Exp $
-
-diff -rc2 aclocal.m4 aclocal.m4
-*** aclocal.m4 Sat Mar 20 04:33:43 1999
---- aclocal.m4 Wed Apr 7 18:39:04 1999
-***************
-*** 213,217 ****
- ;;
-
-! freebsd2* | osf4* )
- CFLAGS_RDYNAMIC=""
- ;;
---- 213,217 ----
- ;;
-
-! freebsd2* | osf4* | netbsd*)
- CFLAGS_RDYNAMIC=""
- ;;
-***************
-*** 418,421 ****
---- 418,429 ----
- solaris*)
- ac_symcode='[BDTU]'
-+ ;;
-+ esac
-+
-+ # NetBSD/i386 has leading underscores.
-+ case "$target" in
-+ i[3456]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
-+ ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
-+ ac_symxfrm='_\1 \1'
- ;;
- esac
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index 6757bf84f2f..23e30e22246 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,44 +1,30 @@
-$NetBSD: patch-ab,v 1.3 1999/04/09 09:39:20 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/12/02 15:50:45 frueauf Exp $
Make this work on NetBSD.
For Solaris, make the DATADIRNAME share.
---- configure.orig Sat Mar 20 09:34:01 1999
-+++ configure Fri Apr 9 10:28:33 1999
-@@ -1596,6 +1596,13 @@
- ;;
- esac
-
-+case "$target" in
-+i[3456]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
-+ ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
-+ ac_symxfrm='_\1 \1'
-+ ;;
-+esac
-+
- # If we're using GNU nm, then use its standard symbol codes.
- if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
- ac_symcode='[ABCDGISTUW]'
-@@ -1840,7 +1847,7 @@
- CFLAGS_RDYNAMIC="-Wl,-dy"
+--- configure.orig Tue Sep 7 17:12:37 1999
++++ configure Thu Dec 2 16:03:10 1999
+@@ -2505,7 +2505,7 @@
+ CFLAGS_RDYNAMIC="-Wl,-E"
;;
-- freebsd2* | osf4* )
-+ freebsd2* | osf4* | netbsd*)
+- openbsd* | freebsd2* | osf4* | irix* )
++ openbsd* | freebsd2* | osf4* | irix* | netbsd* )
CFLAGS_RDYNAMIC=""
;;
- * )
-@@ -1880,6 +1887,9 @@
+
+@@ -2553,6 +2553,9 @@
NAME_OF_DEV_URANDOM="/dev/urandom"
DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
;;
+ *-netbsd*)
-+ DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
-+ ;;
++ DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
++ ;;
*)
NAME_OF_DEV_RANDOM="/dev/random"
NAME_OF_DEV_URANDOM="/dev/urandom"
-@@ -3248,7 +3258,7 @@
+@@ -3921,7 +3924,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
index e1cfe8ed984..6e505ed36cf 100644
--- a/security/gnupg/patches/patch-ac
+++ b/security/gnupg/patches/patch-ac
@@ -1,22 +1,21 @@
-$NetBSD: patch-ac,v 1.2 1999/04/08 15:17:28 mellon Exp $
+$NetBSD: patch-ac,v 1.3 1999/12/02 15:50:45 frueauf Exp $
-diff -rc2 config.links mpi/config.links
-*** mpi/config.links Mon Mar 8 12:51:20 1999
---- mpi/config.links Wed Apr 7 16:43:18 1999
-***************
-*** 35,38 ****
---- 35,48 ----
- path="i586 i386"
- ;;
-+ i[34]86*-*-netbsd*)
-+ echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
-+ cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
-+ path="i386"
-+ ;;
-+ i[56]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
-+ echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
-+ cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
-+ path="i586 i386"
-+ ;;
- i[34]86*-*-*)
- echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
+--- mpi/config.links.orig Mon Aug 30 11:06:48 1999
++++ mpi/config.links Thu Dec 2 15:42:48 1999
+@@ -22,6 +22,16 @@
+ cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
+ path="i586 i386"
+ ;;
++ i[34]86*-*-netbsd*)
++ echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
++ cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
++ path="i386"
++ ;;
++ i[56]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
++ echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
++ cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h
++ path="i586 i386"
++ ;;
+ i[34]86*-*-linuxaout* | i[34]86*-*-linuxoldld* | i[34]86*-*-*bsd*)
+ echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
+ echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
diff --git a/security/gnupg/pkg/PLIST b/security/gnupg/pkg/PLIST
index f8b1f787ce5..ee7039320fc 100644
--- a/security/gnupg/pkg/PLIST
+++ b/security/gnupg/pkg/PLIST
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 1999/04/07 23:01:28 mellon Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/12/02 15:50:46 frueauf Exp $
bin/gpg
-bin/gpgm
lib/gnupg/rndlinux
lib/gnupg/rndegd
lib/gnupg/tiger
-lib/gnupg/twofish
man/man1/gpg.1
-man/man1/gpgm.1
share/gnupg/options.skel
share/locale/de/LC_MESSAGES/gnupg.mo
share/locale/es_ES/LC_MESSAGES/gnupg.mo